Merge pull request #20 from madewithlove/newer-php-versions

Add support for newer PHP versions

.travis.yml

@@ -5,10 +5,15 @@ services:
 
 matrix:
   include:
-    - php: 7.0
     - php: 7.1
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.1
+    - php: 7.2
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.2
+    - php: 7.3
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.3
       env: COLLECT_COVERAGE="--coverage-clover build/coverage.clover"
 
 before_script:

composer.json

@@ -9,9 +9,10 @@
         "psr/cache": "^1.0"
     },
     "require-dev": {
-        "cache/integration-tests": "^0.16.0",
         "illuminate/cache": "^5.0",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^7.0",
+        "cache/integration-tests": "dev-master",
+        "symfony/phpunit-bridge": "^5.0"
     },
     "provide": {
         "psr/cache-implementation": "1.0.0"

tests/integration/IntegrationTest.php

@@ -10,6 +10,10 @@
 
 class IntegrationTest extends CachePoolTest
 {
+    protected $skippedTests = [
+        'testBasicUsageWithLongKey' => 'Memcached does not support key lenght over 250 characters.',
+    ];
+
     /**
      * @return CacheItemPoolInterface that is used in the tests
      */

tests/unit/Exceptions/InvalidArgumentExceptionTest.php

@@ -3,9 +3,9 @@
 
 use Exception;
 use Madewithlove\IlluminatePsrCacheBridge\Exceptions\InvalidArgumentException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class InvalidArgumentExceptionTest extends PHPUnit_Framework_TestCase
+class InvalidArgumentExceptionTest extends TestCase
 {
     /** @test */
     public function it_can_be_constructed()

tests/unit/Laravel/CacheItemPoolTest.php

@@ -5,11 +5,11 @@
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Contracts\Cache\Store;
 use Madewithlove\IlluminatePsrCacheBridge\Laravel\CacheItemPool;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Cache\InvalidArgumentException;
 
-class CacheItemPoolTest extends PHPUnit_Framework_TestCase
+class CacheItemPoolTest extends TestCase
 {
     /** @test */
     public function it_can_be_constructed()
@@ -104,7 +104,7 @@ public function it_throws_exception_for_invalid_key()
         $repository = $this->getMockBuilder(Repository::class)->getMock();
         $pool = new CacheItemPool($repository);
 
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         // Act
         $pool->hasItem('foo@bar');
@@ -179,7 +179,7 @@ public function it_validates_key_before_deletion()
         $repository = $this->getMockBuilder(Repository::class)->getMock();
         $pool = new CacheItemPool($repository);
 
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         // Act
         $pool->deleteItem('@');
@@ -194,7 +194,7 @@ public function it_validates_all_keys_before_deleting_items()
         $repository = $this->getMockBuilder(Repository::class)->getMock();
         $pool = new CacheItemPool($repository);
 
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
 
         // Act
         $pool->deleteItems(['bar', 'foo', '{', '@']);

tests/unit/Laravel/CacheItemTest.php

@@ -4,10 +4,10 @@
 use DateTime;
 use DateTimeImmutable;
 use Madewithlove\IlluminatePsrCacheBridge\Laravel\CacheItem;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemInterface;
 
-class CacheItemTest extends PHPUnit_Framework_TestCase
+class CacheItemTest extends TestCase
 {
     /** @test */
     public function it_can_be_constructed()