Merge pull request #21 from Roave/enable-support-for-php72

Added build for PHP 7.2 to Travis
Roave · Jan 30, 2018 · 431f119 · 431f119
2 parents c787d27 + 674a8d7
commit 431f119
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 
 php:
   - 7.1
+  - 7.2
 
 env:
   matrix:

diff --git a/composer.json b/composer.json
@@ -3,14 +3,14 @@
     "description": "Doctrine Cache adapter for PSR-16 Simple Cache",
     "type": "library",
     "require": {
-        "php": "~7.1.0",
+        "php": "~7.1.0 || ~7.2.0",
         "doctrine/cache": "^1.7",
         "psr/simple-cache": "^1.0"
     },
     "require-dev": {
-        "cache/integration-tests": "^0.15.0",
+        "cache/integration-tests": "dev-master#ff86c07073a5d6b7a7fe9019dd4f6d8fdaaca5ea",
         "cache/tag-interop": "^1.0@dev",
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^6.5",
         "humbug/humbug": "~1.0@dev"
     },
     "license": "MIT",

diff --git a/src/SimpleCacheAdapter.php b/src/SimpleCacheAdapter.php
@@ -60,7 +60,7 @@ private function validateKey($key) : void
     private function filterValidateMultipleKeys($keys) : array
     {
         if ($keys instanceof \Traversable) {
-            $keys = iterator_to_array($keys);
+            $keys = iterator_to_array($keys, false);
         }
 
         if (!is_array($keys)) {

diff --git a/test/unit/CacheIntegrationTest.php b/test/unit/CacheIntegrationTest.php
@@ -28,6 +28,6 @@ protected function setUp() : void
         $this->skippedTests['testObjectDoesNotChangeInCache'] = true;
 
         // https://github.com/php-cache/integration-tests/pull/74/files
-        $this->skippedTests['testSetMultiple'] = true;
+        $this->skippedTests['testSetMultipleWithIntegerArrayKey'] = true;
     }
 }
diff --git a/test/unit/Exception/CacheExceptionTest.php b/test/unit/Exception/CacheExceptionTest.php
@@ -4,13 +4,14 @@
 namespace RoaveTest\DoctrineSimpleCache\Exception;
 
 use Doctrine\Common\Cache\Cache as DoctrineCache;
+use PHPUnit\Framework\TestCase;
 use Psr\SimpleCache\CacheException as PsrCacheException;
 use Roave\DoctrineSimpleCache\Exception\CacheException;
 
 /**
  * @covers \Roave\DoctrineSimpleCache\Exception\CacheException
  */
-final class CacheExceptionTest extends \PHPUnit_Framework_TestCase
+final class CacheExceptionTest extends TestCase
 {
     public function testFromNonClearableCache()
     {

diff --git a/test/unit/Exception/InvalidArgumentExceptionTest.php b/test/unit/Exception/InvalidArgumentExceptionTest.php
@@ -4,12 +4,13 @@
 namespace RoaveTest\DoctrineSimpleCache\Exception;
 
 use Roave\DoctrineSimpleCache\Exception\InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 use Psr\SimpleCache\InvalidArgumentException as PsrInvalidArgumentException;
 
 /**
  * @covers \Roave\DoctrineSimpleCache\Exception\InvalidArgumentException
  */
-final class InvalidArgumentExceptionTest extends \PHPUnit_Framework_TestCase
+final class InvalidArgumentExceptionTest extends TestCase
 {
     public function testFromKeyAndInvalidTTLObject()
     {

diff --git a/test/unit/SimpleCacheAdapterTest.php b/test/unit/SimpleCacheAdapterTest.php
@@ -4,6 +4,7 @@
 namespace RoaveTest\DoctrineSimpleCache;
 
 use Doctrine\Common\Cache\ArrayCache;
+use PHPUnit\Framework\TestCase;
 use Roave\DoctrineSimpleCache\Exception\CacheException;
 use Roave\DoctrineSimpleCache\Exception\InvalidArgumentException;
 use Roave\DoctrineSimpleCache\SimpleCacheAdapter;
@@ -14,7 +15,7 @@
 /**
  * @covers \Roave\DoctrineSimpleCache\SimpleCacheAdapter
  */
-final class SimpleCacheAdapterTest extends \PHPUnit_Framework_TestCase
+final class SimpleCacheAdapterTest extends TestCase
 {
     public function invalidTTLs() : array
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ language: php @@
     php:
       - 7.1
+      - 7.2
     env:
       matrix:
@@ Expand Down @@