Merge pull request #55 from vfalies/php7.4Compatibility

Php Versions
vfalies · Apr 29, 2021 · 95cb4c6 · 95cb4c6
2 parents 036225b + 321db87
commit 95cb4c6
Show file tree

Hide file tree

Showing 34 changed files with 616 additions and 268 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -7,31 +7,36 @@ build:
             tests:
                 override:
                     -
-                        command: 'vendor/bin/phpunit --coverage-clover=coverage.clover'
-                        coverage:
-                            file: 'coverage.clover'
-                            format: 'clover'
-
+                        command: 'vendor/bin/phpunit'
         php72:
             environment:
                 php:
                     version: 7.2
             tests:
                 override:
                     -
-                        command: 'vendor/bin/phpunit --coverage-clover=coverage.clover'
-                        coverage:
-                            file: 'coverage.clover'
-                            format: 'clover'
-
+                        command: 'vendor/bin/phpunit'
         php73:
             environment:
                 php:
                     version: 7.3
             tests:
                 override:
                     -
-                        command: 'vendor/bin/phpunit --coverage-clover=coverage.clover'
-                        coverage:
-                            file: 'coverage.clover'
-                            format: 'clover'
+                        command: 'vendor/bin/phpunit'
+        php74:
+            environment:
+                php:
+                    version: 7.4
+            tests:
+                override:
+                    -
+                        command: 'vendor/bin/phpunit'
+        php8:
+            environment:
+                php:
+                    version: 8.0
+            tests:
+                override:
+                    -
+                        command: 'vendor/bin/phpunit'
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ php:
     - '7.1'
     - '7.2'
     - '7.3'
+    - '7.4'
+    - '8.0'
 
 env:
   global:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Tmdb - PHP Wrapper for The Movie Database API V3
 
-[![Latest Stable Version](https://poser.pugx.org/vfalies/tmdb/version)](https://packagist.org/packages/vfalies/tmdb) [![Build Status](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/build.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/build-status/master) [![Code Coverage](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/?branch=master) [![License](https://poser.pugx.org/vfalies/tmdb/license)](https://packagist.org/packages/vfalies/tmdb) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/6bf2cf4c-4b74-4a06-a5ca-afcc259df86e/mini.png)](https://insight.sensiolabs.com/projects/6bf2cf4c-4b74-4a06-a5ca-afcc259df86e)
+[![Latest Stable Version](https://poser.pugx.org/vfalies/tmdb/version)](https://packagist.org/packages/vfalies/tmdb) ![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/vfalies/tmdb) [![Build Status](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/build.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/build-status/master) [![Code Coverage](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/vfalies/tmdb/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/vfalies/tmdb/?branch=master) [![License](https://poser.pugx.org/vfalies/tmdb/license)](https://packagist.org/packages/vfalies/tmdb)
 
 Tmdb is a PHP wrapper for [The Movie Database](https://www.themoviedb.org/) API [V3](https://developers.themoviedb.org).
 

diff --git a/composer.json b/composer.json
@@ -17,16 +17,15 @@
             "email": "vincent@vfac.fr"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": ">= 7.1",
-        "psr/log": "~1.0",
+        "psr/log": "~1.1.3",
         "guzzlehttp/guzzle": ">= 6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "7.5",
-        "friendsofphp/php-cs-fixer": "~2.15.3",
-        "monolog/monolog": "~1.25.1"
+        "phpunit/phpunit": ">=7.0 <9.5.4",
+        "friendsofphp/php-cs-fixer": ">=2.15.3",
+        "monolog/monolog": ">1.25.1"
     },
     "suggest": {
         "monolog/monolog": "Allows more advanced logging of the application flow"

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Vfac TMDB Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <testsuites>
+    <testsuite name="Vfac TMDB Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
     <filter>
         <whitelist>
             <directory suffix=".php">./src/</directory>
         </whitelist>
     </filter>
-
-<!--
     <logging>
-      <log type="coverage-clover" target="build/logs/clover.xml"/>
       <log type="coverage-html" target="logs/build/coverage" lowUpperBound="35" highLowerBound="70"/>
     </logging>
--->
-
 </phpunit>
diff --git a/src/VfacTmdb/Tmdb.php b/src/VfacTmdb/Tmdb.php
@@ -89,7 +89,7 @@ class Tmdb implements TmdbInterface
      * @param LoggerInterface $logger Logger used in the class
      * @param HttpRequestInterface $http_request
      */
-    public function __construct(string $api_key, int $version = 3, LoggerInterface $logger, HttpRequestInterface $http_request)
+    public function __construct(string $api_key, int $version, LoggerInterface $logger, HttpRequestInterface $http_request)
     {
         $this->api_key      = $api_key;
         $this->logger       = $logger;

diff --git a/tests/VfacTmdb/Account/FavoriteTest.php b/tests/VfacTmdb/Account/FavoriteTest.php
@@ -40,21 +40,32 @@ public function tearDown() : void
     public function createSession()
     {
         $json_object = json_decode(file_get_contents('tests/json/sessionOk.json'));
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn($json_object);
+        $this->tmdb->method('sendRequest')->willReturn($json_object);
 
         $this->auth = new Auth($this->tmdb);
         return $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
     }
 
     public function testGetMovies()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountFavoriteMoviesOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
+
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountFavoriteMoviesOk.json')));
         $favorite = $account->getFavorite();
         $movies   = $favorite->getMovies();
 
@@ -71,13 +82,23 @@ public function testGetMovies()
 
     public function testGetTVShows()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountFavoriteTVShowsOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountFavoriteTVShowsOk.json')));
         $tvs = $account->getFavorite()->getTVShows();
 
         $this->assertEquals('/3/account/'.$account->getId().'/favorite/tv', parse_url($this->tmdb->url, PHP_URL_PATH));
@@ -87,30 +108,49 @@ public function testGetTVShows()
         }
     }
 
-    /**
-     * @expectedException \VfacTmdb\Exceptions\ServerErrorException
-     */
     public function testMarkMovieAsFavoriteFailed()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $this->throwException(new ServerErrorException)
+                   ));
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->will($this->throwException(new ServerErrorException));
+        $this->expectException(\VfacTmdb\Exceptions\ServerErrorException::class);
+
         $fav = $account->getFavorite()->markMovieAsFavorite(11);
     }
 
     public function testMarkMovieAsFavorite()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
+
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json')));
         $fav = $account->getFavorite()->markMovieAsFavorite(11);
 
         $this->assertEquals('/3/account/'.$account->getId().'/favorite', parse_url($this->tmdb->url, PHP_URL_PATH));
@@ -119,13 +159,24 @@ public function testMarkMovieAsFavorite()
 
     public function testUnMarkMovieAsFavorite()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
+
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json')));
         $fav = $account->getFavorite()->unmarkMovieAsFavorite(11);
 
         $this->assertEquals('/3/account/'.$account->getId().'/favorite', parse_url($this->tmdb->url, PHP_URL_PATH));
@@ -134,13 +185,24 @@ public function testUnMarkMovieAsFavorite()
 
     public function testMarkTVShowAsFavorite()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
+
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json')));
         $fav = $account->getFavorite()->markTVShowAsFavorite(11);
 
         $this->assertEquals('/3/account/'.$account->getId().'/favorite', parse_url($this->tmdb->url, PHP_URL_PATH));
@@ -149,13 +211,24 @@ public function testMarkTVShowAsFavorite()
 
     public function testUnMarkTVShowAsFavorite()
     {
-        $session_id = $this->createSession();
+        $sessionOk       = json_decode(file_get_contents('tests/json/sessionOk.json'));
+        $configurationOk = json_decode(file_get_contents('tests/json/configurationOk.json'));
+        $accountOk       = json_decode(file_get_contents('tests/json/accountOk.json'));
+        $accountFavoriteMoviesOk = json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json'));
+
+        $this->tmdb->method('sendRequest')
+                   ->will($this->onConsecutiveCalls(
+                       $sessionOk,
+                       $configurationOk,
+                       $accountOk,
+                       $accountFavoriteMoviesOk
+                   ));
+
+        $this->auth = new Auth($this->tmdb);
+        $session_id = $this->auth->createSession('991c25974a2fcf3d923ae722f46e9c44788ff3ea');
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/configurationOk.json')));
-        $this->tmdb->expects($this->at(1))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountOk.json')));
         $account = new Account($this->tmdb, $session_id);
 
-        $this->tmdb->expects($this->at(0))->method('sendRequest')->willReturn(json_decode(file_get_contents('tests/json/accountMarkFavoriteOk.json')));
         $fav = $account->getFavorite()->unmarkTVShowAsFavorite(11);
 
         $this->assertEquals('/3/account/'.$account->getId().'/favorite', parse_url($this->tmdb->url, PHP_URL_PATH));