Adding NetworkFactory to TvFactory and removing networks from the $_p…

…roperties array to prevent regular hydration.
johannesx75 · Feb 8, 2014 · abe4a48 · abe4a48
1 parent f50bf6f
commit abe4a48
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/PROGRESS.md b/PROGRESS.md
@@ -27,9 +27,9 @@ The states for now defined as;
 | Movies                 | Partially Done * |
 | Networks               | Done        |
 | People                 | Done        |
-| Reviews                | Review        |
+| Reviews                | Done        |
 | Search                 | **TODO**        |
-| TV                     | Review        |
+| TV                     | Done        |
 | TV Seasons             | Review        |
 | TV Episodes            | Review        |
 

diff --git a/lib/Tmdb/Factory/TvFactory.php b/lib/Tmdb/Factory/TvFactory.php
@@ -47,6 +47,11 @@ class TvFactory extends AbstractFactory {
      */
     private $tvSeasonFactory;
 
+    /**
+     * @var NetworkFactory
+     */
+    private $networkFactory;
+
     /**
      * Constructor
      */
@@ -57,6 +62,7 @@ public function __construct()
         $this->genreFactory    = new GenreFactory();
         $this->imageFactory    = new ImageFactory();
         $this->tvSeasonFactory = new TvSeasonFactory();
+        $this->networkFactory  = new NetworkFactory();
     }
 
     /**
@@ -117,7 +123,7 @@ public function create(array $data = array())
 
         /** Networks */
         if (array_key_exists('networks', $data)) {
-            $tvShow->setNetworks($this->createGenericCollection($data['networks'], new Tv\Network()));
+            $tvShow->setNetworks($this->getNetworkFactory()->createCollection($data['networks']));
         }
 
         return $this->hydrate($tvShow, $data);
@@ -230,4 +236,22 @@ public function getTvSeasonFactory()
     {
         return $this->tvSeasonFactory;
     }
+
+    /**
+     * @param \Tmdb\Factory\NetworkFactory $networkFactory
+     * @return $this
+     */
+    public function setNetworkFactory($networkFactory)
+    {
+        $this->networkFactory = $networkFactory;
+        return $this;
+    }
+
+    /**
+     * @return \Tmdb\Factory\NetworkFactory
+     */
+    public function getNetworkFactory()
+    {
+        return $this->networkFactory;
+    }
 }
diff --git a/lib/Tmdb/Model/Tv.php b/lib/Tmdb/Model/Tv.php
@@ -194,8 +194,6 @@ class Tv extends AbstractModel {
         'languages',
         'last_air_date',
         'name',
-        //@todo remove networks
-        'networks',
         'number_of_episodes',
         'number_of_seasons',
         'original_name',