Adding the implementation of Collection, this caused some disturbance…

… and decided to rename the generic collection object to GenericCollection to avoid confusion with the Collection api method
johannesx75 · Jan 18, 2014 · 3a6ce54 · 3a6ce54
1 parent 5d31af3
commit 3a6ce54
Show file tree

Hide file tree

Showing 40 changed files with 568 additions and 142 deletions.
diff --git a/examples/collection/model/all.php b/examples/collection/model/all.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * This file is part of the Tmdb PHP API created by Michael Roterman.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package Tmdb
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, Michael Roterman
+ * @version 0.0.1
+ */
+require_once('../../../vendor/autoload.php');
+require_once('../../../apikey.php');
+
+$token  = new \Tmdb\ApiToken(TMDB_API_KEY);
+$client = new \Tmdb\Client($token);
+
+$repository = new \Tmdb\Repository\CollectionRepository($client);
+$collection = $repository->load(10);
+
+var_dump($collection);
diff --git a/examples/people/model/all.php b/examples/people/model/all.php
@@ -16,7 +16,7 @@
 $token  = new \Tmdb\ApiToken(TMDB_API_KEY);
 $client = new \Tmdb\Client($token);
 
-$repository = new \Tmdb\Repository\PersonRepository($client);
+$repository = new \Tmdb\Repository\PeopleRepository($client);
 $person      = $repository->load(33);
 
 var_dump($person);
diff --git a/lib/Tmdb/Factory/CollectionFactory.php b/lib/Tmdb/Factory/CollectionFactory.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This file is part of the Tmdb PHP API created by Michael Roterman.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package Tmdb
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, Michael Roterman
+ * @version 0.0.1
+ */
+namespace Tmdb\Factory;
+
+class CollectionFactory extends AbstractFactory
+{
+    /**
+     * {@inheritdoc}
+     * @return \Tmdb\Model\Collection
+     */
+    public static function create(array $data = array())
+    {
+        $collection = new \Tmdb\Model\Collection();
+
+        if (array_key_exists('parts', $data)) {
+            $collection->setParts(
+                MovieFactory::createCollection($data['parts'])
+            );
+        }
+
+        if (array_key_exists('backdrop_path', $data)) {
+            $collection->setBackdrop(ImageFactory::createFromPath($data['backdrop_path'], 'backdrop_path'));
+        }
+
+        if (array_key_exists('images', $data)) {
+            $collection->setImages(ImageFactory::createCollectionFromMovie($data['images']));
+        }
+
+        if (array_key_exists('poster_path', $data)) {
+            $collection->setPoster(ImageFactory::createFromPath($data['poster_path'], 'poster_path'));
+        }
+
+        return parent::hydrate($collection, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function createCollection(array $data = array())
+    {
+        $collection = new \Tmdb\Model\Common\Collection();
+
+        foreach($data as $item) {
+            $collection->add(null, self::create($item));
+        }
+
+        return $collection;
+    }
+}
diff --git a/lib/Tmdb/Factory/Common/GenericCollectionFactory.php b/lib/Tmdb/Factory/Common/GenericCollectionFactory.php
@@ -13,7 +13,7 @@
 namespace Tmdb\Factory\Common;
 
 use Tmdb\Common\ObjectHydrator;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 
 class GenericCollectionFactory {
     /**
@@ -33,7 +33,7 @@ public static function createCollection(array $data = array(), $class)
             $class = get_class($class);
         }
 
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, ObjectHydrator::hydrate(new $class(), $item));

diff --git a/lib/Tmdb/Factory/CompanyFactory.php b/lib/Tmdb/Factory/CompanyFactory.php
@@ -12,7 +12,7 @@
  */
 namespace Tmdb\Factory;
 
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Company;
 
 class CompanyFactory extends AbstractFactory
@@ -30,7 +30,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/ConfigurationFactory.php b/lib/Tmdb/Factory/ConfigurationFactory.php
@@ -12,7 +12,7 @@
  */
 namespace Tmdb\Factory;
 
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Configuration;
 
 class ConfigurationFactory extends AbstractFactory
@@ -32,7 +32,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php b/lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php
@@ -13,7 +13,7 @@
 namespace Tmdb\Factory\Movie;
 
 use Tmdb\Factory\AbstractFactory;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Movie\AlternativeTitle;
 
 class AlternativeTitleFactory extends AbstractFactory
@@ -33,7 +33,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/MovieFactory.php b/lib/Tmdb/Factory/MovieFactory.php
@@ -15,7 +15,7 @@
 use Tmdb\Factory\Common\GenericCollectionFactory;
 use Tmdb\Factory\People\CastFactory;
 use Tmdb\Factory\People\CrewFactory;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Common\Trailer\Youtube;
 use Tmdb\Model\Common\Translation;
 use Tmdb\Model\Movie;
@@ -107,7 +107,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/People/PeopleFactory.php b/lib/Tmdb/Factory/People/PeopleFactory.php
@@ -15,7 +15,7 @@
 use Tmdb\Factory\AbstractFactory;
 use Tmdb\Factory\ImageFactory;
 
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Person\CastMember;
 use Tmdb\Model\Person\CrewMember;
 use Tmdb\Model\Person;
@@ -57,7 +57,7 @@ public static function create(array $data = array(), Person\AbstractMember $pers
      */
     public static function createCollection(array $data = array(), Person\AbstractMember $person = null)
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item, $person));

diff --git a/lib/Tmdb/Factory/TvEpisodeFactory.php b/lib/Tmdb/Factory/TvEpisodeFactory.php
@@ -15,7 +15,7 @@
 use Tmdb\Factory\Common\GenericCollectionFactory;
 use Tmdb\Factory\People\CastFactory;
 use Tmdb\Factory\People\CrewFactory;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 
 use Tmdb\Model\Tv\ExternalIds;
 use Tmdb\Model\Tv\Person\CastMember;
@@ -64,7 +64,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/TvFactory.php b/lib/Tmdb/Factory/TvFactory.php
@@ -16,7 +16,7 @@
 use Tmdb\Factory\People\CastFactory;
 use Tmdb\Factory\People\CrewFactory;
 
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 
 use Tmdb\Model\Common\Translation;
 use Tmdb\Model\Tv\ExternalIds;
@@ -84,7 +84,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Factory/TvSeasonFactory.php b/lib/Tmdb/Factory/TvSeasonFactory.php
@@ -15,7 +15,7 @@
 use Tmdb\Factory\Common\GenericCollectionFactory;
 use Tmdb\Factory\People\CastFactory;
 use Tmdb\Factory\People\CrewFactory;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 
 use Tmdb\Model\Tv\Episode;
 use Tmdb\Model\Tv\ExternalIds;
@@ -70,7 +70,7 @@ public static function create(array $data = array())
      */
     public static function createCollection(array $data = array())
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
             $collection->add(null, self::create($item));

diff --git a/lib/Tmdb/Model/Changes.php b/lib/Tmdb/Model/Changes.php
@@ -13,7 +13,7 @@
 namespace Tmdb\Model;
 
 use Tmdb\Model\Changes\Change;
-use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Common\GenericCollection;
 
 class Changes extends AbstractModel {
 
@@ -62,11 +62,11 @@ public function page($page = 1) {
     /**
      * Execute the current state
      *
-     * @return Collection
+     * @return GenericCollection
      */
     public function execute()
     {
-        $collection = new Collection();
+        $collection = new GenericCollection();
 
         $response = $this->getClient()->api('changes')->getMovieChanges(array(
             'from' => $this->from,