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/HierarchicalCachePoolTest.php

@@ -153,11 +153,11 @@ public function testExplodeKeyWithTags()
         $result = $method->invoke($pool, '|key|bar!hash');
         $this->assertCount(3, $result);
         foreach ($result as $r) {
-            $this->assertRegExp('|.*!hash|s', $r, 'Tag hash must be on every level in hierarchy key');
+            $this->assertMatchesRegularExpression('|.*!hash|s', $r, 'Tag hash must be on every level in hierarchy key');
         }
 
         $result = $method->invoke($pool, '|!hash');
         $this->assertCount(1, $result);
-        $this->assertRegExp('|.*!hash|s', $result[0], 'Tag hash must on root level in hierarchy key');
+        $this->assertMatchesRegularExpression('|.*!hash|s', $result[0], 'Tag hash must on root level in hierarchy key');
     }
 }

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",
         "psr/cache": "^1.0 || ^2.0"
     },

phpunit.xml.dist

@@ -1,34 +1,22 @@
 <?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">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
   <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>