Merge pull request #163 from yukoff/hotfix/2.1/fix-incompatible-declarations

Fix fatal error on php-nightly

Author: yukoff

.travis.yml

@@ -1,6 +1,11 @@
 sudo: false
 language: php
 
+php:
+  - 5.6
+  - nightly
+  - hhvm
+
 before_script:
   - composer self-update
   - if [ "$SF_EVT_DISPATCHER_VERSION" != "" ]; then composer require --no-update symfony/event-dispatcher:${SF_EVT_DISPATCHER_VERSION}; fi;

lib/Tmdb/Factory/People/CastFactory.php

@@ -23,9 +23,9 @@ class CastFactory extends PeopleFactory
 {
     /**
      * {@inheritdoc}
-     * @param \Tmdb\Model\Person\CastMember $person
+     * @param \Tmdb\Model\Person\CastMember|null $person
      */
-    public function createCollection(array $data = [], $person = null)
+    public function createCollection(array $data = [], $person = null, $collection = null)
     {
         $collection = new Cast();
 

lib/Tmdb/Factory/People/CrewFactory.php

@@ -23,9 +23,9 @@ class CrewFactory extends PeopleFactory
 {
     /**
      * {@inheritdoc}
-     * @param \Tmdb\Model\Person\CrewMember $person
+     * @param \Tmdb\Model\Person\CrewMember|null $person
      */
-    public function createCollection(array $data = [], $person = null)
+    public function createCollection(array $data = [], $person = null, $collection = null)
     {
         $collection = new Crew();
 

lib/Tmdb/Factory/People/GuestStarFactory.php

@@ -23,9 +23,9 @@ class GuestStarFactory extends PeopleFactory
 {
     /**
      * {@inheritdoc}
-     * @param \Tmdb\Model\Person\CastMember $person
+     * @param \Tmdb\Model\Person\CastMember|null $person
      */
-    public function createCollection(array $data = [], $person = null)
+    public function createCollection(array $data = [], $person = null, $collection = null)
     {
         $collection = new GuestStars();
 

lib/Tmdb/Factory/PeopleFactory.php

@@ -17,6 +17,7 @@
 use Tmdb\HttpClient\HttpClient;
 use Tmdb\Model\Collection\People;
 use Tmdb\Model\Common\ExternalIds;
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Person\CastMember;
 use Tmdb\Model\Person\CrewMember;
 use Tmdb\Model\Person;
@@ -165,6 +166,8 @@ protected function getPosterImageForCredit($posterPath)
 
     /**
      * {@inheritdoc}
+     * @param Person\AbstractMember|null $person
+     * @param GenericCollection|null $collection
      */
     public function createCollection(array $data = [], $person = null, $collection = null)
     {