Merge branch 'master' into develop

.travis.yml

@@ -4,4 +4,9 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
-  - 5.5
+  - 5.5
+
+before_script:
+  - composer --prefer-source install
+
+script: phpunit --coverage-text --verbose

README.md

@@ -39,7 +39,7 @@ $ sudo mv composer.phar /usr/local/bin/composer
 Add the following to your require block in composer.json config.
 
 ```
-"wtfzdotnet/php-tmdb-api": "dev-develop"
+"wtfzdotnet/php-tmdb-api": "dev-master"
 ```
 
 Include Composer's autoloader:

lib/Tmdb/Factory/AbstractFactory.php

@@ -21,7 +21,7 @@
  * Class AbstractFactory
  * @package Tmdb\Factory
  */
-abstract class AbstractFactory implements FactoryInterface {
+abstract class AbstractFactory {
     /**
      * Convert an array to an hydrated object
      *

lib/Tmdb/Model/Collection/Jobs.php

@@ -35,7 +35,8 @@ function($key, $value) use ($department) {
         );
 
         if ($result && 1 === count($result)) {
-            return array_shift($result->toArray());
+            $results = $result->toArray();
+            return array_shift($results);
         }
 
         return $result;
@@ -56,7 +57,8 @@ function($key, $value) use ($department) {
         );
 
         if ($result && 1 === count($result)) {
-            $data =  array_shift($result->toArray());
+            $results = $result->toArray();
+            $data =  array_shift($results);
 
             return $data->getJobList();
         }
@@ -83,7 +85,8 @@ function($key, $value) use ($filterByJob) {
         );
 
         if ($result && 1 === count($result)) {
-            return array_shift($result->toArray());
+            $results = $result->toArray();
+            return array_shift($results);
         }
 
         return $result;

lib/Tmdb/Model/Common/QueryParameter/Type/CollectionToCommaSeperatedString.php

@@ -34,11 +34,6 @@ public function __construct(array $collection = array())
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    abstract public function getKey();
-
     /**
      * {@inheritdoc}
      */

test/Tmdb/Tests/HttpClient/HttpClientTest.php

@@ -12,7 +12,6 @@
  */
 namespace Tmdb\Tests\HttpClient;
 
-use \Exception;
 use Tmdb\Api\AbstractApi;
 use Tmdb\ApiToken;
 use Tmdb\Client;
@@ -131,7 +130,7 @@ public function shouldCallDelete()
     /**
      * @test
      */
-    public function put()
+    public function shouldCallPut()
     {
         $this->setUp();
 
@@ -184,27 +183,33 @@ public function __construct($client)
         $this->client = $client;
     }
 
-    public function get() {
+    public function get($path, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->get('/');
     }
 
-    public function head() {
+    public function head($path, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->head('/');
     }
 
-    public function post() {
+    public function post($path, $postBody = null, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->post('/', array('id' => 1));
     }
 
-    public function patch() {
+    public function patch($path, $body = null, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->patch('http://www.google.com/');
     }
 
-    public function delete() {
+    public function delete($path, $body = null, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->delete('http://www.google.com/');
     }
 
-    public function put() {
+    public function put($path, $body = null, array $parameters = array(), $headers = array())
+    {
         $this->client->getHttpClient()->put('http://www.google.com/');
     }
 

test/Tmdb/Tests/Model/ImageTest.php

@@ -57,7 +57,8 @@ public function shouldGetAndSet()
         /**
          * @var Image $subject
          */
-        $subject = array_pop($this->collection->toArray());
+        $results = $this->collection->toArray();
+        $subject = array_pop($results);
 
         $this->assertEquals('/abc.jpg', $subject->getFilePath());
         $this->assertEquals(1000, $subject->getWidth());