Update tests, update syntax used

DariusIII · DariusIII · commit 2f5c57f48edd · 2020-03-21T21:12:47.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,8 @@ sudo: false
 language: php
 
 php:
-  - 5.6
+  - 7.1
   - nightly
-  - hhvm
 
 before_script:
   - composer self-update
@@ -16,87 +15,21 @@ script: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --v
 
 matrix:
   include:
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
-    - php: 5.6
-      env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
-
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
-    - php: 7.0
-      env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
-
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
-    - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
     - php: 7.1
-      env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
+      env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.4"]
+
 
     - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
-    - php: 7.2
-      env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
+      env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.4"]
     - php: 7.2
       env: [SF_EVT_DISPATCHER_VERSION="^5.0", SF_OPT_RESOLVER_VERSION="^5.0"]
       
     - php: 7.3
       env: [SF_EVT_DISPATCHER_VERSION="^5.0", SF_OPT_RESOLVER_VERSION="^5.0"]
 
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
-    - php: hhvm
-      env: [SF_EVT_DISPATCHER_VERSION="^5.0", SF_OPT_RESOLVER_VERSION="^5.0"]
 
   allow_failures:
     - php: nightly
-    - php: hhvm
   fast_finish: true
 
 after_script:
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "rtheunissen/guzzle-log-middleware": "^0.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=5.7,<9",
+        "phpunit/phpunit": "^5.0",
         "monolog/monolog": ">=1.11.0"
     },
     "suggest": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="test/bootstrap.php"
         >
     <testsuites>
diff --git a/test/Tmdb/Tests/ApiTokenTest.php b/test/Tmdb/Tests/ApiTokenTest.php
@@ -12,7 +12,7 @@
  */
 namespace Tmdb\Tests;
 
-class ApiTokenTest extends \PHPUnit_Framework_TestCase
+class ApiTokenTest extends \PHPUnit\Framework\TestCase
 {
     const API_TOKEN = 'abcdefg';
 
diff --git a/test/Tmdb/Tests/ClientTest.php b/test/Tmdb/Tests/ClientTest.php
@@ -26,7 +26,7 @@ class ClientTest extends \Tmdb\Tests\TestCase
      */
     private $client = null;
 
-    public function setUp()
+    public function setUp() :void
     {
         $token        = new ApiToken(self::API_TOKEN);
         $sessionToken = new SessionToken(self::SESSION_TOKEN);
diff --git a/test/Tmdb/Tests/Common/ObjectHydratorTest.php b/test/Tmdb/Tests/Common/ObjectHydratorTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-class ObjectHydratorTest extends \PHPUnit_Framework_TestCase
+class ObjectHydratorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @test
diff --git a/test/Tmdb/Tests/Common/ParameterBagTest.php b/test/Tmdb/Tests/Common/ParameterBagTest.php
@@ -10,7 +10,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-class ParameterBagTest extends \PHPUnit_Framework_TestCase
+class ParameterBagTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @test
diff --git a/test/Tmdb/Tests/Event/RequestEventTest.php b/test/Tmdb/Tests/Event/RequestEventTest.php
@@ -15,7 +15,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-class RequestEventTest extends \PHPUnit_Framework_TestCase
+class RequestEventTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @test
diff --git a/test/Tmdb/Tests/Event/RequestSubscriberTest.php b/test/Tmdb/Tests/Event/RequestSubscriberTest.php
@@ -19,7 +19,7 @@
  * @copyright (c) 2013, Michael Roterman
  * @version 0.0.1
  */
-class RequestSubscriberTest extends \PHPUnit_Framework_TestCase
+class RequestSubscriberTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @expectedException \Tmdb\Exception\RuntimeException
diff --git a/test/Tmdb/Tests/Exception/TmdbApiExceptionTest.php b/test/Tmdb/Tests/Exception/TmdbApiExceptionTest.php
@@ -16,7 +16,7 @@
 use Tmdb\HttpClient\Request;
 use Tmdb\HttpClient\Response;
 
-class TmdbApiExceptionTest extends \PHPUnit_Framework_TestCase
+class TmdbApiExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @test
diff --git a/test/Tmdb/Tests/Factory/CertificationFactoryTest.php b/test/Tmdb/Tests/Factory/CertificationFactoryTest.php
@@ -19,7 +19,7 @@ class CertificationFactoryTest extends TestCase
 {
     private $data;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('certification/get.json');
     }
diff --git a/test/Tmdb/Tests/Factory/ChangesFactoryTest.php b/test/Tmdb/Tests/Factory/ChangesFactoryTest.php
@@ -24,7 +24,7 @@ class ChangesFactoryTest extends TestCase
      */
     private $changes;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('changes/movies.json');
 
diff --git a/test/Tmdb/Tests/Factory/CollectionFactoryTest.php b/test/Tmdb/Tests/Factory/CollectionFactoryTest.php
@@ -22,7 +22,7 @@ class CollectionFactoryTest extends TestCase
      */
     private $collection;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var CollectionFactory $factory
diff --git a/test/Tmdb/Tests/Factory/CompanyFactoryTest.php b/test/Tmdb/Tests/Factory/CompanyFactoryTest.php
@@ -22,7 +22,7 @@ class CompanyFactoryTest extends TestCase
 
     private $data;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('company/get.json');
     }
diff --git a/test/Tmdb/Tests/Factory/CreditsFactoryTest.php b/test/Tmdb/Tests/Factory/CreditsFactoryTest.php
@@ -24,7 +24,7 @@ class CreditsFactoryTest extends TestCase
      */
     private $credits;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('credits/get.json');
 
diff --git a/test/Tmdb/Tests/Factory/ImageFactoryTest.php b/test/Tmdb/Tests/Factory/ImageFactoryTest.php
@@ -22,7 +22,7 @@ class ImageFactoryTest extends TestCase
      */
     private $images;
 
-    public function setUp()
+    public function setUp() :void
     {
         $factory   = $this->getFactory();
 
@@ -115,7 +115,7 @@ public function shouldFilterStills()
      */
     public function shouldFilterMinHeight()
     {
-        $this->setUp();
+
 
         $images = $this->images->filterMinHeight(1000);
 
@@ -134,7 +134,7 @@ public function shouldFilterMinHeight()
      */
     public function shouldFilterMinWidth()
     {
-        $this->setUp();
+
 
         $images = $this->images->filterMinWidth(1000);
 
@@ -153,7 +153,7 @@ public function shouldFilterMinWidth()
      */
     public function shouldFilterMaxHeight()
     {
-        $this->setUp();
+
 
         $images = $this->images->filterMaxHeight(1000);
 
@@ -172,7 +172,7 @@ public function shouldFilterMaxHeight()
      */
     public function shouldFilterMaxWidth()
     {
-        $this->setUp();
+
 
         $images = $this->images->filterMaxWidth(1000);
 
diff --git a/test/Tmdb/Tests/Factory/JobsFactoryTest.php b/test/Tmdb/Tests/Factory/JobsFactoryTest.php
@@ -18,7 +18,7 @@ class JobsFactoryTest extends TestCase
 {
     private $jobs;
 
-    public function setUp()
+    public function setUp() :void
     {
         $factory = $this->getFactory();
         $data    = $this->loadByFile('jobs/list.json');
diff --git a/test/Tmdb/Tests/Factory/KeywordFactoryTest.php b/test/Tmdb/Tests/Factory/KeywordFactoryTest.php
@@ -18,7 +18,7 @@ class KeywordFactoryTest extends TestCase
 {
     private $data;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('keywords/get.json');
     }
diff --git a/test/Tmdb/Tests/Factory/ListFactoryTest.php b/test/Tmdb/Tests/Factory/ListFactoryTest.php
@@ -24,7 +24,7 @@ class ListFactoryTest extends TestCase
      */
     private $lists;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('lists/get.json');
 
diff --git a/test/Tmdb/Tests/Factory/MovieFactoryTest.php b/test/Tmdb/Tests/Factory/MovieFactoryTest.php
@@ -27,7 +27,7 @@ class MovieFactoryTest extends TestCase
      */
     private $movie;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var MovieFactory $factory
diff --git a/test/Tmdb/Tests/Factory/PeopleFactoryTest.php b/test/Tmdb/Tests/Factory/PeopleFactoryTest.php
@@ -24,7 +24,7 @@ class PeopleFactoryTest extends TestCase
      */
     private $person;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var PeopleFactory $factory
diff --git a/test/Tmdb/Tests/Factory/ReviewFactoryTest.php b/test/Tmdb/Tests/Factory/ReviewFactoryTest.php
@@ -19,7 +19,7 @@ class ReviewFactoryTest extends TestCase
 {
     private $data;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('reviews/get.json');
     }
diff --git a/test/Tmdb/Tests/Factory/TimezoneFactoryTest.php b/test/Tmdb/Tests/Factory/TimezoneFactoryTest.php
@@ -19,7 +19,7 @@ class TimezoneFactoryTest extends TestCase
 {
     private $data;
 
-    public function setUp()
+    public function setUp() :void
     {
         $this->data = $this->loadByFile('timezones/get.json');
     }
diff --git a/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php b/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php
@@ -22,7 +22,7 @@ class TvEpisodeFactoryTest extends TestCase
      */
     private $episode;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var TvEpisodeFactory $factory
diff --git a/test/Tmdb/Tests/Factory/TvFactoryTest.php b/test/Tmdb/Tests/Factory/TvFactoryTest.php
@@ -22,7 +22,7 @@ class TvFactoryTest extends TestCase
      */
     private $tv;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var TvFactory $factory
@@ -43,7 +43,7 @@ public function setUp()
      */
     public function shouldConstructTv()
     {
-        $this->setUp();
+
 
         $this->assertInstanceOf('Tmdb\Model\Tv', $this->tv);
 
@@ -58,7 +58,7 @@ public function shouldConstructTv()
      */
     public function shouldBeAbleToSetFactories()
     {
-        $this->setUp();
+
 
         $factory = new TvFactory($this->getHttpClient());
         $class  = new \stdClass();
@@ -87,7 +87,7 @@ public function shouldBeAbleToSetFactories()
      */
     public function shouldBeFunctional()
     {
-        $this->setUp();
+
 
         $this->assertEquals('/sIJyCJedGlZf1TId41gCtkblBGo.jpg', $this->tv->getBackdropPath());
         // created by
diff --git a/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php b/test/Tmdb/Tests/Factory/TvSeasonFactoryTest.php
@@ -22,7 +22,7 @@ class TvSeasonFactoryTest extends TestCase
      */
     private $season;
 
-    public function setUp()
+    public function setUp() :void
     {
         /**
          * @var TvSeasonFactory $factory
diff --git a/test/Tmdb/Tests/GuestSessionTokenTest.php b/test/Tmdb/Tests/GuestSessionTokenTest.php
@@ -12,7 +12,7 @@
  */
 namespace Tmdb\Tests;
 
-class GuestSessionTokenTest extends \PHPUnit_Framework_TestCase
+class GuestSessionTokenTest extends \PHPUnit\Framework\TestCase
 {
     const SESSION_TOKEN = '80b2bf99520cd795ff54e31af97917bc9e3a7c8d';
 
diff --git a/test/Tmdb/Tests/Helper/ImageHelperTest.php b/test/Tmdb/Tests/Helper/ImageHelperTest.php
diff --git a/test/Tmdb/Tests/HttpClient/HttpClientTest.php b/test/Tmdb/Tests/HttpClient/HttpClientTest.php
diff --git a/test/Tmdb/Tests/Model/Collection/KeywordsTest.php b/test/Tmdb/Tests/Model/Collection/KeywordsTest.php
diff --git a/test/Tmdb/Tests/Model/Collection/PeopleTest.php b/test/Tmdb/Tests/Model/Collection/PeopleTest.php
diff --git a/test/Tmdb/Tests/Model/Common/GenericCollectionTest.php b/test/Tmdb/Tests/Model/Common/GenericCollectionTest.php
diff --git a/test/Tmdb/Tests/Model/Common/Trailer/YoutubeTest.php b/test/Tmdb/Tests/Model/Common/Trailer/YoutubeTest.php
diff --git a/test/Tmdb/Tests/Model/ImageTest.php b/test/Tmdb/Tests/Model/ImageTest.php
diff --git a/test/Tmdb/Tests/RequestTokenTest.php b/test/Tmdb/Tests/RequestTokenTest.php
diff --git a/test/Tmdb/Tests/SessionTokenTest.php b/test/Tmdb/Tests/SessionTokenTest.php
diff --git a/test/Tmdb/Tests/TestCase.php b/test/Tmdb/Tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="false"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`bootstrap="test/bootstrap.php"`
`13`	`12`	`>`
`14`	`13`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`	`namespace Tmdb\Tests;`
`14`	`14`
`15`		`-class ApiTokenTest extends \PHPUnit_Framework_TestCase`
	`15`	`+class ApiTokenTest extends \PHPUnit\Framework\TestCase`
`16`	`16`	`{`
`17`	`17`	`const API_TOKEN = 'abcdefg';`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ClientTest extends \Tmdb\Tests\TestCase`
`26`	`26`	`*/`
`27`	`27`	`private $client = null;`
`28`	`28`
`29`		`- public function setUp()`
	`29`	`+ public function setUp() :void`
`30`	`30`	`{`
`31`	`31`	`$token = new ApiToken(self::API_TOKEN);`
`32`	`32`	`$sessionToken = new SessionToken(self::SESSION_TOKEN);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* @copyright (c) 2013, Michael Roterman`
`11`	`11`	`* @version 0.0.1`
`12`	`12`	`*/`
`13`		`-class ObjectHydratorTest extends \PHPUnit_Framework_TestCase`
	`13`	`+class ObjectHydratorTest extends \PHPUnit\Framework\TestCase`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* @test`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* @copyright (c) 2013, Michael Roterman`
`16`	`16`	`* @version 0.0.1`
`17`	`17`	`*/`
`18`		`-class RequestEventTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class RequestEventTest extends \PHPUnit\Framework\TestCase`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @test`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* @copyright (c) 2013, Michael Roterman`
`20`	`20`	`* @version 0.0.1`
`21`	`21`	`*/`
`22`		`-class RequestSubscriberTest extends \PHPUnit_Framework_TestCase`
	`22`	`+class RequestSubscriberTest extends \PHPUnit\Framework\TestCase`
`23`	`23`	`{`
`24`	`24`	`/**`
`25`	`25`	`* @expectedException \Tmdb\Exception\RuntimeException`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Tmdb\HttpClient\Request;`
`17`	`17`	`use Tmdb\HttpClient\Response;`
`18`	`18`
`19`		`-class TmdbApiExceptionTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class TmdbApiExceptionTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @test`