Merge pull request #8 from vfalies/refactoring_get

Refactoring get
vfalies · Jun 2, 2017 · 67aa47b · 67aa47b
2 parents 7ac3f42 + f11fcef
commit 67aa47b
Show file tree

Hide file tree

Showing 20 changed files with 258 additions and 128 deletions.
diff --git a/README.md b/README.md
@@ -42,16 +42,17 @@ $tmdb = new Tmdb('your_api_key');
 $search    = new Search($tmdb);
 $responses = $search->movie('star wars');
 
-// Get title of the first result in API response
-echo $search->getMovie($responses->current()->id)->getTitle();
-
 // Get all results
 foreach ($responses as $response)
 {
     echo $search->getMovie($response->id)->getTitle();
 }
 
+// Get movie information
+$item  = new Item($tmdb);
+$infos = $item->getMovie(11, array('language' => 'fr-FR');
 
+echo $infos->getTitle();
 ```
 
 ## Documentation

diff --git a/src/Catalog.php b/src/Catalog.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace vfalies\tmdb;
+
+use vfalies\tmdb\Catalogs\Genres;
+
+class Catalog
+{
+
+    private $tmdb = null;
+
+    /**
+     * Constructor
+     * @param \vfalies\tmdb\Tmdb $tmdb
+     */
+    public function __construct(Tmdb $tmdb)
+    {
+        $this->tmdb = $tmdb;
+    }
+
+    /**
+     * Get movie genres list
+     * @param array $options
+     * @return \Generator
+     */
+    public function getMovieGenres(array $options = array()): \Generator
+    {
+        $catalog = new Genres($this->tmdb);
+        return $catalog->getMovieList($options);
+    }
+
+    /**
+     * Get TVShow genres list
+     * @param array $options
+     * @return \Generator
+     */
+    public function getTVShowGenres(array $options = array()): \Generator
+    {
+        $catalog = new Genres($this->tmdb);
+        return $catalog->getTVList($options);
+    }
+}
diff --git a/src/Genres.php → src/Catalogs/Genres.php b/src/Genres.php → src/Catalogs/Genres.php
@@ -1,8 +1,12 @@
 <?php
 
-namespace vfalies\tmdb;
+namespace vfalies\tmdb\Catalogs;
 
-class Genres implements Interfaces\GenresInterface
+use vfalies\tmdb\Interfaces\GenresInterface;
+use vfalies\tmdb\Tmdb;
+use vfalies\tmdb\lib\CurlRequest;
+
+class Genres implements GenresInterface
 {
 
     protected $tmdb = null;

diff --git a/src/Item.php b/src/Item.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace vfalies\tmdb;
+
+use vfalies\tmdb\Items\Movie;
+use vfalies\tmdb\Items\Collection;
+use vfalies\tmdb\Items\TVShow;
+
+class Item
+{
+    private $tmdb          = null;
+
+    /**
+     * Constructor
+     * @param \vfalies\tmdb\Tmdb $tmdb
+     */
+
+    public function __construct(Tmdb $tmdb)
+    {
+        $this->tmdb = $tmdb;
+    }
+
+    /**
+     * Get movie details
+     * @param int $movie_id
+     * @param array $options
+     * @return \vfalies\tmdb\Items\Movie
+     */
+    public function getMovie(int $movie_id, array $options = array()): Movie
+    {
+        $movie = new Movie($this->tmdb, $movie_id, $options);
+
+        return $movie;
+    }
+
+    /**
+     * Get collection details
+     * @param int $collection_id
+     * @param array $options
+     * @return \vfalies\tmdb\Items\Collection
+     */
+    public function getCollection(int $collection_id, array $options = array()): Collection
+    {
+        $collection = new Collection($this->tmdb, $collection_id, $options);
+
+        return $collection;
+    }
+
+    /**
+     * Get TV Show details
+     * @param int $tv_id
+     * @param array $options
+     * @return \vfalies\tmdb\Items\TVShow
+     */
+    public function getTVShow(int $tv_id, array $options = array()): TVShow
+    {
+        $tv = new TVShow($this->tmdb, $tv_id, $options);
+
+        return $tv;
+    }
+
+
+}
diff --git a/src/Items/Collection.php b/src/Items/Collection.php
@@ -2,7 +2,10 @@
 
 namespace vfalies\tmdb\Items;
 
-class Collection extends Item implements \vfalies\tmdb\Interfaces\CollectionInterface
+use vfalies\tmdb\Interfaces\CollectionInterface;
+use vfalies\tmdb\Tmdb;
+
+class Collection extends Item implements CollectionInterface
 {
 
     // Private loaded data
@@ -13,10 +16,11 @@ class Collection extends Item implements \vfalies\tmdb\Interfaces\CollectionInte
 
     /**
      * Constructor
-     * @param \vfalies\tmdb\Tmdb $tmdb
-     * @throws \Exception
+     * @param Tmdb $tmdb
+     * @param int $collection_id
+     * @param array $options
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, $collection_id, array $options = array())
+    public function __construct(Tmdb $tmdb, int $collection_id, array $options = array())
     {
         parent::__construct($tmdb, $collection_id, $options, 'collection');
     }
@@ -47,7 +51,7 @@ public function getName(): string
 
     /**
      * Get collection parts
-     * @return Generator|SearchMovieResult
+     * @return Generator
      */
     public function getParts(): \Generator
     {

diff --git a/src/Items/Item.php b/src/Items/Item.php
@@ -2,6 +2,9 @@
 
 namespace vfalies\tmdb\Items;
 
+use vfalies\tmdb\Tmdb;
+use vfalies\tmdb\lib\CurlRequest;
+
 abstract class Item
 {
     protected $data = null;
@@ -17,15 +20,15 @@ abstract class Item
      * @param string $item_name
      * @throws \Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, int $item_id, array $options, string $item_name)
+    public function __construct(Tmdb $tmdb, int $item_id, array $options, string $item_name)
     {
         try
         {
             $this->id   = (int) $item_id;
             $this->tmdb = $tmdb;
             $this->conf = $this->tmdb->getConfiguration();
             $params     = $this->tmdb->checkOptions($options);
-            $this->data = $this->tmdb->sendRequest(new \vfalies\tmdb\CurlRequest(), $item_name . '/'.(int) $item_id, null, $params);
+            $this->data = $this->tmdb->sendRequest(new CurlRequest(), $item_name . '/'.(int) $item_id, null, $params);
         }
         catch (\Exception $ex)
         {

diff --git a/src/Items/Movie.php b/src/Items/Movie.php
@@ -2,7 +2,10 @@
 
 namespace vfalies\tmdb\Items;
 
-class Movie extends Item implements \vfalies\tmdb\Interfaces\MovieInterface
+use vfalies\tmdb\Interfaces\MovieInterface;
+use vfalies\tmdb\Tmdb;
+
+class Movie extends Item implements MovieInterface
 {
     /**
      * Constructor
@@ -11,7 +14,7 @@ class Movie extends Item implements \vfalies\tmdb\Interfaces\MovieInterface
      * @param array $options
      * @throws Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, int $movie_id, array $options = array())
+    public function __construct(Tmdb $tmdb, int $movie_id, array $options = array())
     {
         parent::__construct($tmdb, $movie_id, $options, 'movie');
     }

diff --git a/src/Items/TVShow.php b/src/Items/TVShow.php
@@ -2,10 +2,13 @@
 
 namespace vfalies\tmdb\Items;
 
-class TVShow extends Item implements \vfalies\tmdb\Interfaces\TVShowInterface
+use vfalies\tmdb\Interfaces\TVShowInterface;
+use vfalies\tmdb\Tmdb;
+
+class TVShow extends Item implements TVShowInterface
 {
 
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, int $tv_id, array $options = array())
+    public function __construct(Tmdb $tmdb, int $tv_id, array $options = array())
     {
         parent::__construct($tmdb, $tv_id, $options, 'tv');
     }

diff --git a/src/Results/Collection.php b/src/Results/Collection.php
@@ -2,6 +2,8 @@
 
 namespace vfalies\tmdb\Results;
 
+use vfalies\tmdb\Tmdb;
+
 class Collection extends Results
 {
 
@@ -13,7 +15,7 @@ class Collection extends Results
      * @param \stdClass $result
      * @throws \Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, \stdClass $result)
+    public function __construct(Tmdb $tmdb, \stdClass $result)
     {
         parent::__construct($tmdb, $result);
 

diff --git a/src/Results/Movie.php b/src/Results/Movie.php
@@ -2,6 +2,8 @@
 
 namespace vfalies\tmdb\Results;
 
+use vfalies\tmdb\Tmdb;
+
 class Movie extends Results
 {
     protected $overview       = null;
@@ -15,7 +17,7 @@ class Movie extends Results
      * @param \stdClass $result
      * @throws \Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, \stdClass $result)
+    public function __construct(Tmdb $tmdb, \stdClass $result)
     {
         parent::__construct($tmdb, $result);
 

diff --git a/src/Results/Results.php b/src/Results/Results.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace vfalies\tmdb\Results;
+use vfalies\tmdb\Tmdb;
 
 abstract class Results implements \vfalies\tmdb\Interfaces\ResultsInterface
 {
@@ -16,7 +17,7 @@ abstract class Results implements \vfalies\tmdb\Interfaces\ResultsInterface
      * @param \stdClass $result
      * @throws \Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, \stdClass $result)
+    public function __construct(Tmdb $tmdb, \stdClass $result)
     {
         // Valid input object
         $properties = get_object_vars($this);

diff --git a/src/Results/TVShow.php b/src/Results/TVShow.php
@@ -2,6 +2,8 @@
 
 namespace vfalies\tmdb\Results;
 
+use vfalies\tmdb\Tmdb;
+
 class TVShow extends Results
 {
 
@@ -16,7 +18,7 @@ class TVShow extends Results
      * @param \stdClass $result
      * @throws \Exception
      */
-    public function __construct(\vfalies\tmdb\Tmdb $tmdb, \stdClass $result)
+    public function __construct(Tmdb $tmdb, \stdClass $result)
     {
         parent::__construct($tmdb, $result);
 

diff --git a/src/Search.php b/src/Search.php
@@ -2,6 +2,8 @@
 
 namespace vfalies\tmdb;
 
+use vfalies\tmdb\lib\CurlRequest;
+
 class Search
 {
 
@@ -124,45 +126,6 @@ public function searchCollection(string $query, array $options = array()): \Gene
         }
     }
 
-    /**
-     * Get movie details
-     * @param int $movie_id
-     * @param array $options
-     * @return \vfalies\tmdb\Items\Movie
-     */
-    public function getMovie(int $movie_id, array $options = array()): Items\Movie
-    {
-        $movie = new Items\Movie($this->tmdb, $movie_id, $options);
-
-        return $movie;
-    }
-
-    /**
-     * Get collection details
-     * @param int $collection_id
-     * @param array $options
-     * @return \vfalies\tmdb\Items\Collection
-     */
-    public function getCollection(int $collection_id, array $options = array()): Items\Collection
-    {
-        $collection = new Items\Collection($this->tmdb, $collection_id, $options);
-
-        return $collection;
-    }
-
-    /**
-     * Get TV Show details
-     * @param int $tv_id
-     * @param array $options
-     * @return \vfalies\tmdb\Items\TVShow
-     */
-    public function getTVShow(int $tv_id, array $options = array()): Items\TVShow
-    {
-        $tv = new Items\TVShow($this->tmdb, $tv_id, $options);
-
-        return $tv;
-    }
-
     /**
      * Get page from result search
      * @return int