Fix master (#258)

* Migrate PHPUnit configuration to new format

* Replace assertRegExp

* Add void

* Remove coverage from PHPUnit config

It's not expected anymore.

* Use `$this->expectException` instead of comment

* Ignore some tests

* Only PHP >7.4

Co-authored-by: Nyholm <[email protected]>

Author: ruudk

Tests/FilesystemCachePoolTest.php

@@ -12,6 +12,7 @@
 namespace Cache\Adapter\Filesystem\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Cache\InvalidArgumentException;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -20,11 +21,10 @@ class FilesystemCachePoolTest extends TestCase
 {
     use CreatePoolTrait;
 
-    /**
-     * @expectedException \Psr\Cache\InvalidArgumentException
-     */
     public function testInvalidKey()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $pool = $this->createCachePool();
 
         $pool->getItem('test%string')->get();

Tests/IntegrationPoolTest.php

@@ -16,4 +16,8 @@
 class IntegrationPoolTest extends CachePoolTest
 {
     use CreatePoolTrait;
+
+    protected $skippedTests = [
+        'testBasicUsageWithLongKey' => 'Long keys are not supported.',
+    ];
 }

Tests/IntegrationSimpleCacheTest.php

@@ -16,4 +16,8 @@
 class IntegrationSimpleCacheTest extends SimpleCacheTest
 {
     use CreatePoolTrait;
+
+    protected $skippedTests = [
+        'testBasicUsageWithLongKey' => 'Long keys are not supported.',
+    ];
 }

composer.json

@@ -23,7 +23,7 @@
     ],
     "homepage": "http://www.php-cache.com/en/latest/",
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": ">=7.4",
         "cache/adapter-common": "^1.0",
         "league/flysystem": "^1.0",
         "psr/cache": "^1.0 || ^2.0",

phpunit.xml.dist

@@ -1,34 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-  backupStaticAttributes="false"
-  colors="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  processIsolation="false"
-  stopOnFailure="false"
-  bootstrap="vendor/autoload.php"
-  >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <testsuites>
     <testsuite name="Main Test Suite">
       <directory>./Tests/</directory>
     </testsuite>
   </testsuites>
-
   <groups>
     <exclude>
       <group>benchmark</group>
     </exclude>
   </groups>
-
-  <filter>
-    <whitelist>
-      <directory>./</directory>
-      <exclude>
-        <directory>./Tests</directory>
-        <directory>./vendor</directory>
-      </exclude>
-    </whitelist>
-  </filter>
 </phpunit>