Removing static methods to allow for easier testing later on.

johannesx75 · Jan 27, 2014 · 2f6da48 · 2f6da48
1 parent 2d5a111
commit 2f6da48
Show file tree

Hide file tree

Showing 29 changed files with 906 additions and 186 deletions.
diff --git a/lib/Tmdb/Factory/AbstractFactory.php b/lib/Tmdb/Factory/AbstractFactory.php
@@ -15,23 +15,46 @@
 use Tmdb\Common\ObjectHydrator;
 use Tmdb\Factory\Common\GenericCollectionFactory;
 use Tmdb\Model\AbstractModel;
+use Tmdb\Model\Common\GenericCollection;
 
-abstract class AbstractFactory {
+abstract class AbstractFactory implements FactoryInterface {
     /**
      * Convert an array to an hydrated object
      *
      * @param array $data
      * @return AbstractModel
      */
-    abstract public static function create(array $data = array());
+    abstract public function create(array $data = array());
 
     /**
      * Convert an array with an collection of items to an hydrated object collection
      *
      * @param array $data
      * @return GenericCollectionFactory
      */
-    abstract public static function createCollection(array $data = array());
+    abstract public function createCollection(array $data = array());
+
+    /**
+     * Create a generic collection of data and map it on the class by it's static parameter $_properties
+     *
+     * @param array $data
+     * @param $class
+     * @return GenericCollection
+     */
+    protected function createGenericCollection(array $data = array(), $class)
+    {
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
+
+        $collection = new GenericCollection();
+
+        foreach($data as $item) {
+            $collection->add(null, $this->hydrate(new $class(), $item));
+        }
+
+        return $collection;
+    }
 
     /**
      * Hydrate the object with data
@@ -40,8 +63,8 @@ abstract public static function createCollection(array $data = array());
      * @param array $data
      * @return AbstractModel
      */
-    public function hydrate(AbstractModel $object, $data = array())
+    protected function hydrate(AbstractModel $object, $data = array())
     {
         return ObjectHydrator::hydrate($object, $data);
     }
-}
+}
diff --git a/lib/Tmdb/Factory/CollectionFactory.php b/lib/Tmdb/Factory/CollectionFactory.php
@@ -12,48 +12,105 @@
  */
 namespace Tmdb\Factory;
 
+use Tmdb\Model\Common\GenericCollection;
+
 class CollectionFactory extends AbstractFactory
 {
+    /**
+     * @var MovieFactory
+     */
+    private $movieFactory;
+
+    /**
+     * @var ImageFactory
+     */
+    private $imageFactory;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->movieFactory = new MovieFactory();
+        $this->imageFactory = new ImageFactory();
+    }
+
     /**
      * {@inheritdoc}
      * @return \Tmdb\Model\Collection
      */
-    public static function create(array $data = array())
+    public function create(array $data = array())
     {
         $collection = new \Tmdb\Model\Collection();
 
         if (array_key_exists('parts', $data)) {
             $collection->setParts(
-                MovieFactory::createCollection($data['parts'])
+                $this->getMovieFactory()->createCollection($data['parts'])
             );
         }
 
         if (array_key_exists('backdrop_path', $data)) {
-            $collection->setBackdrop(ImageFactory::createFromPath($data['backdrop_path'], 'backdrop_path'));
+            $collection->setBackdrop($this->getImageFactory()->createFromPath($data['backdrop_path'], 'backdrop_path'));
         }
 
         if (array_key_exists('images', $data)) {
-            $collection->setImages(ImageFactory::createCollectionFromMovie($data['images']));
+            $collection->setImages($this->getImageFactory()->createCollectionFromMovie($data['images']));
         }
 
         if (array_key_exists('poster_path', $data)) {
-            $collection->setPoster(ImageFactory::createFromPath($data['poster_path'], 'poster_path'));
+            $collection->setPoster($this->getImageFactory()->createFromPath($data['poster_path'], 'poster_path'));
         }
 
-        return parent::hydrate($collection, $data);
+        return $this->hydrate($collection, $data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function createCollection(array $data = array())
+    public function createCollection(array $data = array())
     {
-        $collection = new \Tmdb\Model\Common\Collection();
+        $collection = new GenericCollection();
 
         foreach($data as $item) {
-            $collection->add(null, self::create($item));
+            $collection->add(null, $this->create($item));
         }
 
         return $collection;
     }
-}
+
+    /**
+     * @param \Tmdb\Factory\ImageFactory $imageFactory
+     * @return $this
+     */
+    public function setImageFactory($imageFactory)
+    {
+        $this->imageFactory = $imageFactory;
+        return $this;
+    }
+
+    /**
+     * @return \Tmdb\Factory\ImageFactory
+     */
+    public function getImageFactory()
+    {
+        return $this->imageFactory;
+    }
+
+    /**
+     * @param \Tmdb\Factory\MovieFactory $movieFactory
+     * @return $this
+     */
+    public function setMovieFactory($movieFactory)
+    {
+        $this->movieFactory = $movieFactory;
+        return $this;
+    }
+
+    /**
+     * @return \Tmdb\Factory\MovieFactory
+     */
+    public function getMovieFactory()
+    {
+        return $this->movieFactory;
+    }
+}
diff --git a/lib/Tmdb/Factory/Common/GenericCollectionFactory.php b/lib/Tmdb/Factory/Common/GenericCollectionFactory.php
@@ -15,23 +15,29 @@
 use Tmdb\Common\ObjectHydrator;
 use Tmdb\Model\Common\GenericCollection;
 
+/**
+ * @deprecated
+ *
+ * Class GenericCollectionFactory
+ * @package Tmdb\Factory\Common
+ */
 class GenericCollectionFactory {
     /**
      * @param array $data
      * @param $class
      * @return GenericCollection
      */
-    public static function create(array $data = array(), $class)
+    public function create(array $data = array(), $class)
     {
-        return self::createCollection($data, $class);
+        return $this->createCollection($data, $class);
     }
 
     /**
      * @param array $data
      * @param $class
      * @return GenericCollection
      */
-    public static function createCollection(array $data = array(), $class)
+    public function createCollection(array $data = array(), $class)
     {
         if (is_object($class)) {
             $class = get_class($class);
@@ -45,4 +51,4 @@ public static function createCollection(array $data = array(), $class)
 
         return $collection;
     }
-}
+}
diff --git a/lib/Tmdb/Factory/CompanyFactory.php b/lib/Tmdb/Factory/CompanyFactory.php
@@ -20,22 +20,22 @@ class CompanyFactory extends AbstractFactory
     /**
      * {@inheritdoc}
      */
-    public static function create(array $data = array())
+    public function create(array $data = array())
     {
-        return parent::hydrate(new Company(), $data);
+        return $this->hydrate(new Company(), $data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function createCollection(array $data = array())
+    public function createCollection(array $data = array())
     {
         $collection = new GenericCollection();
 
         foreach($data as $item) {
-            $collection->add(null, self::create($item));
+            $collection->add(null, $this->create($item));
         }
 
         return $collection;
     }
-}
+}
diff --git a/lib/Tmdb/Factory/ConfigurationFactory.php b/lib/Tmdb/Factory/ConfigurationFactory.php
@@ -12,33 +12,25 @@
  */
 namespace Tmdb\Factory;
 
-use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Configuration;
 
 class ConfigurationFactory extends AbstractFactory
 {
     /**
      * {@inheritdoc}
      */
-    public static function create(array $data = array())
+    public function create(array $data = array())
     {
         $config = new Configuration();
 
-        return parent::hydrate($config, $data);
+        return $this->hydrate($config, $data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function createCollection(array $data = array())
+    public function createCollection(array $data = array())
     {
-        $collection = new GenericCollection();
-
-        foreach($data as $item) {
-            $collection->add(null, self::create($item));
-        }
-
-        return $collection;
+        return null;
     }
-
-} 
+}
diff --git a/lib/Tmdb/Factory/FactoryInterface.php b/lib/Tmdb/Factory/FactoryInterface.php
@@ -0,0 +1,17 @@
+<?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;
+
+interface FactoryInterface {
+    function create();
+}
diff --git a/lib/Tmdb/Factory/GenreFactory.php b/lib/Tmdb/Factory/GenreFactory.php
@@ -20,22 +20,22 @@ class GenreFactory extends AbstractFactory
     /**
      * {@inheritdoc}
      */
-    public static function create(array $data = array())
+    public function create(array $data = array())
     {
-        return parent::hydrate(new Genre(), $data);
+        return $this->hydrate(new Genre(), $data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function createCollection(array $data = array())
+    public function createCollection(array $data = array())
     {
         $collection = new Genres();
 
         foreach($data as $item) {
-            $collection->add(null, self::create($item));
+            $collection->add(null, $this->create($item));
         }
 
         return $collection;
     }
-}
+}