3.x: upgrade to PHPUnit 10

.gitignore

@@ -5,7 +5,7 @@
 /tmp
 /tools
 /vendor
-.phpunit.result.cache
+.phpunit.cache
 
 # OS generated files #
 ######################

composer.json

@@ -21,7 +21,7 @@
         "cakephp/cakephp": "5.x-dev",
         "cakephp/cakephp-codesniffer": "^5.0",
         "firebase/php-jwt": "^6.2",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.1.0"
     },
     "suggest": {
         "cakephp/orm": "To use \"OrmResolver\" (Not needed separately if using full CakePHP framework).",

phpunit.xml.dist

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="./tests/bootstrap.php"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <exclude>
-      <file>src/Identifier/Ldap/ExtensionAdapter.php</file>
-    </exclude>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         cacheDirectory=".phpunit.cache"
+         bootstrap="./tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
 
-  <php>
-    <ini name="memory_limit" value="-1"/>
-    <env name="FIXTURE_SCHEMA_METADATA" value="./vendor/cakephp/cakephp/tests/schema.php"/>
-  </php>
+    <testsuites>
+        <testsuite name="authentication">
+            <directory>tests/TestCase/</directory>
+        </testsuite>
+    </testsuites>
 
-  <testsuites>
-    <testsuite name="authentication">
-      <directory>tests/TestCase/</directory>
-    </testsuite>
-  </testsuites>
+    <extensions>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
+    </extensions>
 
-  <extensions>
-    <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
-  </extensions>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <exclude>
+            <file>src/Identifier/Ldap/ExtensionAdapter.php</file>
+        </exclude>
+    </source>
+
+    <php>
+        <ini name="memory_limit" value="-1"/>
+        <env name="FIXTURE_SCHEMA_METADATA" value="./vendor/cakephp/cakephp/tests/schema.php"/>
+    </php>
 </phpunit>

src/UrlChecker/UrlCheckerTrait.php

@@ -62,16 +62,19 @@ protected function _getUrlChecker(): UrlCheckerInterface
             throw new RuntimeException(sprintf('URL checker class `%s` was not found.', $options['className']));
         }
 
-        $checker = new $className();
+        $interfaces = class_implements($className);
 
-        if (!($checker instanceof UrlCheckerInterface)) {
+        if (!isset($interfaces[UrlCheckerInterface::class])) {
             throw new RuntimeException(sprintf(
                 'The provided URL checker class `%s` does not implement the `%s` interface.',
                 $options['className'],
                 UrlCheckerInterface::class
             ));
         }
 
-        return $checker;
+        /** @var \Authentication\UrlChecker\UrlCheckerInterface $obj */
+        $obj = new $className();
+
+        return $obj;
     }
 }

tests/TestCase/Authenticator/HttpDigestAuthenticatorTest.php

@@ -26,7 +26,6 @@
 use Cake\I18n\DateTime;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use PHPUnit\Framework\Constraint\RegularExpression;
 use function Cake\Core\env;
 
 /**
@@ -517,19 +516,4 @@ protected function generateNonce($secret = null, $expires = 300, $time = null)
 
         return base64_encode($nonceValue);
     }
-
-    /**
-     * Asserts that a string matches a given regular expression.
-     *
-     * @param string $pattern Regex pattern
-     * @param string $string String to test
-     * @param string $message Message
-     * @return void
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @codeCoverageIgnore
-     */
-    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
-    {
-        static::assertThat($string, new RegularExpression($pattern), $message);
-    }
 }

tests/TestCase/Authenticator/JwtAuthenticatorTest.php

@@ -183,7 +183,7 @@ public function testAuthenticateInvalidPayloadNotAnObject()
             ->setConstructorArgs([
                 $this->identifiers,
             ])
-            ->setMethods([
+            ->onlyMethods([
                 'getPayLoad',
             ])
             ->getMock();
@@ -214,7 +214,7 @@ public function testAuthenticateInvalidPayloadEmpty()
             ->setConstructorArgs([
                 $this->identifiers,
             ])
-            ->setMethods([
+            ->onlyMethods([
                 'getPayLoad',
             ])
             ->getMock();

tests/TestCase/Authenticator/SessionAuthenticatorTest.php

@@ -57,7 +57,7 @@ public function setUp(): void
         }
         $this->sessionMock = $this->getMockBuilder($class)
             ->disableOriginalConstructor()
-            ->setMethods(['read', 'write', 'delete', 'renew', 'check'])
+            ->onlyMethods(['read', 'write', 'delete', 'renew', 'check'])
             ->getMock();
     }
 
@@ -183,7 +183,9 @@ public function testPersistIdentity()
         $this->sessionMock
             ->expects($this->exactly(2))
             ->method('check')
-            ->withConsecutive(['Auth'], ['Auth'])
+            ->with(
+                ...self::withConsecutive(['Auth'], ['Auth'])
+            )
             ->willReturnOnConsecutiveCalls(false, true);
 
         $this->sessionMock
@@ -261,7 +263,9 @@ public function testImpersonate()
         $this->sessionMock
             ->expects($this->exactly(2))
             ->method('write')
-            ->withConsecutive(['AuthImpersonate', $impersonator], ['Auth', $impersonated]);
+            ->with(
+                ...self::withConsecutive(['AuthImpersonate', $impersonator], ['Auth', $impersonated])
+            );
 
         $result = $authenticator->impersonate($request, $response, $impersonator, $impersonated);
 

tests/TestCase/Identifier/Resolver/ResolverAwareTraitTest.php

@@ -26,7 +26,7 @@ class ResolverAwareTraitTest extends TestCase
     public function testBuildResolverFromClassName()
     {
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -40,7 +40,7 @@ public function testBuildResolverFromClassName()
     public function testBuildResolverFromArray()
     {
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -58,7 +58,7 @@ public function testBuildResolverInvalid()
         $this->expectException('RuntimeException');
         $this->expectExceptionMessage('Resolver must implement `Authentication\Identifier\Resolver\ResolverInterface`.');
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -73,7 +73,7 @@ public function testBuildResolverMissing()
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Resolver class `Missing` does not exist.');
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -88,7 +88,7 @@ public function testBuildResolverMissingClassNameOption()
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Option `className` is not present.');
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -103,7 +103,7 @@ public function testGetResolverNotSet()
         $this->expectException('RuntimeException');
         $this->expectExceptionMessage('Resolver has not been set.');
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $object->expects($this->once())
@@ -116,7 +116,7 @@ public function testGetResolverNotSet()
     public function testSetResolver()
     {
         $object = $this->getMockBuilder(ResolverAwareTrait::class)
-            ->setMethods(['getConfig'])
+            ->addMethods(['getConfig'])
             ->getMockForTrait();
 
         $resolver = $this->createMock(ResolverInterface::class);

tests/TestCase/Middleware/AuthenticationMiddlewareTest.php

@@ -117,7 +117,7 @@ public function testApplicationAuthenticationRequestResponse()
 
         $application = $this->getMockBuilder(Application::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getAuthenticationService', 'middleware'])
+            ->onlyMethods(['getAuthenticationService', 'middleware'])
             ->getMock();
 
         $application->expects($this->once())