Version bump

- Bump minimal required version to PHP 7.2 - Update dependency for PHPUnit - Update tests for new PHPUnit version
canihavesomecoffee · Feb 24, 2019 · f24ead7 · f24ead7
1 parent 5577837
commit f24ead7
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 271 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@ build
 vendor
 # Composer lock
 composer.lock
+# PHP Unit cache
+.phpunit.result.cache
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/thetvdbapi.iml b/.idea/thetvdbapi.iml
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,8 @@ language: php
 sudo: false
 
 php:
-  - 7.1
-  - 7.1snapshot
   - 7.2
-  - 7.2snapshot
+  - 7.3
   - master
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -11,14 +11,15 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "guzzlehttp/guzzle": "^6.2",
     "symfony/serializer": "^3.2",
     "symfony/property-access": "^3.3",
-    "symfony/property-info": "^3.3"
+    "symfony/property-info": "^3.3",
+    "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.1"
+    "phpunit/phpunit": "^8"
   },
   "autoload": {
     "psr-4": {

diff --git a/tests/BaseUnitTest.php b/tests/BaseUnitTest.php
diff --git a/tests/DataParserTest.php b/tests/DataParserTest.php
@@ -19,9 +19,9 @@
 use CanIHaveSomeCoffee\TheTVDbAPI\DataParser;
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\BasicEpisode;
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\BasicSeries;
-use CanIHaveSomeCoffee\TheTVDbAPI\Model\Episode;
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\Image;
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\RatingsInfo;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class DataParserTest
@@ -32,7 +32,7 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class DataParserTest extends BaseUnitTest
+class DataParserTest extends TestCase
 {
     public function testParseBasicEpisodeData()
     {

diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
@@ -20,7 +20,7 @@
 use CanIHaveSomeCoffee\TheTVDbAPI\Exception\ResourceNotFoundException;
 use CanIHaveSomeCoffee\TheTVDbAPI\Exception\ParseException;
 use CanIHaveSomeCoffee\TheTVDbAPI\Exception\ConflictException;
-use function GuzzleHttp\Psr7\parse_query;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ExceptionTest
@@ -31,7 +31,7 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class ExceptionTest extends BaseUnitTest
+class ExceptionTest extends TestCase
 {
 
 

diff --git a/tests/Model/EpisodeTest.php b/tests/Model/EpisodeTest.php
@@ -17,7 +17,7 @@
 namespace CanIHaveSomeCoffee\TheTVDbAPI\Tests\Model;
 
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\Episode;
-use CanIHaveSomeCoffee\TheTVDbAPI\Tests\BaseUnitTest;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class EpisodeTest
@@ -28,23 +28,23 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class EpisodeTest extends BaseUnitTest
+class EpisodeTest extends TestCase
 {
     public function testDirectorCreation()
     {
         $director = 'Foo Bar Baz';
         $episode = new Episode();
-        static::assertAttributeCount(0, 'directors', $episode);
+        static::assertEquals(0, sizeof($episode->directors));
         $episode->setDirector($director);
-        static::assertAttributeCount(1, 'directors', $episode);
-        static::assertAttributeContains($director, 'directors', $episode);
+        static::assertEquals(1, sizeof($episode->directors));
+        static::assertContains($director, $episode->directors);
     }
 
     public function testDirectorRetrieval()
     {
         $director = 'Foo Bar Baz';
         $episode = new Episode();
-        static::assertAttributeCount(0, 'directors', $episode);
+        static::assertEquals(0, sizeof($episode->directors));
         static::assertEquals('', $episode->getDirector());
         $episode->directors[] = $director;
         static::assertEquals($director, $episode->getDirector());

diff --git a/tests/Model/JSONErrorTest.php b/tests/Model/JSONErrorTest.php
@@ -17,7 +17,7 @@
 namespace CanIHaveSomeCoffee\TheTVDbAPI\Tests\Model;
 
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\JSONError;
-use CanIHaveSomeCoffee\TheTVDbAPI\Tests\BaseUnitTest;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class JSONErrorTest
@@ -28,7 +28,7 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class JSONErrorTest extends BaseUnitTest
+class JSONErrorTest extends TestCase
 {
     public function testDataRetrieval()
     {

diff --git a/tests/Model/PaginatedResultsTest.php b/tests/Model/PaginatedResultsTest.php
@@ -17,7 +17,7 @@
 namespace CanIHaveSomeCoffee\TheTVDbAPI\Tests\Model;
 
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\PaginatedResults;
-use CanIHaveSomeCoffee\TheTVDbAPI\Tests\BaseUnitTest;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class PaginatedResultsTest
@@ -28,17 +28,8 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class PaginatedResultsTest extends BaseUnitTest
+class PaginatedResultsTest extends TestCase
 {
-    public function testCreation()
-    {
-        $data  = ['foo' => 'bar', 'baz' => 'foo'];
-        $links = ['previous' => 0, 'next' => 2, 'first' => 0, 'last' => 1337];
-        $instance = new PaginatedResults($data, $links);
-        static::assertAttributeSame($data, 'data', $instance);
-        static::assertAttributeSame($links, 'links', $instance);
-    }
-
     public function testRetrieveData()
     {
         $data  = ['foo' => 'bar', 'baz' => 'foo'];

diff --git a/tests/Model/RatingTest.php b/tests/Model/RatingTest.php
@@ -17,7 +17,6 @@
 namespace CanIHaveSomeCoffee\TheTVDbAPI\Tests\Model;
 
 use CanIHaveSomeCoffee\TheTVDbAPI\Model\Rating;
-use CanIHaveSomeCoffee\TheTVDbAPI\Tests\BaseUnitTest;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
@@ -30,7 +29,7 @@
  * @license  See start of document
  * @link     https://canihavesome.coffee/projects/theTVDbAPI
  */
-class RatingTest extends BaseUnitTest
+class RatingTest extends TestCase
 {
     public function testIsValidRatingType()
     {