Merge pull request #240 from cakephp/3.x-phpunit10

3.x: upgrade to PHPUnit 10

Author: LordSimal

.gitignore

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

composer.json

@@ -22,7 +22,7 @@
         "cakephp/cakephp": "5.x-dev",
         "cakephp/cakephp-codesniffer": "^5.0",
         "cakephp/plugin-installer": "^1.3",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.1.0"
     },
     "suggest": {
         "cakephp/http": "To use \"RequestPolicyInterface\" (Not needed separately if using full CakePHP framework).",

phpunit.xml.dist

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    bootstrap="tests/bootstrap.php"
-    backupGlobals="true"
-    convertDeprecationsToExceptions="true"
-    >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         backupGlobals="true"
+         cacheDirectory=".phpunit.cache"
+         bootstrap="tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+>
 
     <!-- Add any additional test suites you want to run here -->
     <testsuites>
@@ -15,14 +16,14 @@
     </testsuites>
 
     <extensions>
-        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
     </extensions>
 
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
 
     <php>
         <ini name="memory_limit" value="-1"/>

tests/TestCase/AuthorizationServiceTest.php

@@ -301,7 +301,8 @@ public function testBeforeFalse()
         $entity = new Article();
 
         $policy = $this->getMockBuilder(BeforePolicyInterface::class)
-            ->setMethods(['before', 'canAdd'])
+            ->onlyMethods(['before'])
+            ->addMethods(['canAdd'])
             ->getMock();
 
         $policy->expects($this->once())
@@ -331,7 +332,8 @@ public function testBeforeTrue()
         $entity = new Article();
 
         $policy = $this->getMockBuilder(BeforePolicyInterface::class)
-            ->setMethods(['before', 'canAdd'])
+            ->onlyMethods(['before'])
+            ->addMethods(['canAdd'])
             ->getMock();
 
         $policy->expects($this->once())
@@ -361,7 +363,8 @@ public function testBeforeNull()
         $entity = new Article();
 
         $policy = $this->getMockBuilder(BeforePolicyInterface::class)
-            ->setMethods(['before', 'canAdd'])
+            ->onlyMethods(['before'])
+            ->addMethods(['canAdd'])
             ->getMock();
 
         $policy->expects($this->once())
@@ -393,7 +396,8 @@ public function testBeforeResultTrue()
         $entity = new Article();
 
         $policy = $this->getMockBuilder(BeforePolicyInterface::class)
-            ->setMethods(['before', 'canAdd'])
+            ->onlyMethods(['before'])
+            ->addMethods(['canAdd'])
             ->getMock();
 
         $policy->expects($this->once())
@@ -423,7 +427,8 @@ public function testBeforeResultFalse()
         $entity = new Article();
 
         $policy = $this->getMockBuilder(BeforePolicyInterface::class)
-            ->setMethods(['before', 'canAdd'])
+            ->onlyMethods(['before'])
+            ->addMethods(['canAdd'])
             ->getMock();
 
         $policy->expects($this->once())

tests/TestCase/IdentityDecoratorTest.php

@@ -16,7 +16,7 @@
  */
 class IdentityDecoratorTest extends TestCase
 {
-    public function constructorDataProvider()
+    public static function constructorDataProvider()
     {
         return [
             'array' => [

tests/TestCase/Middleware/UnauthorizedHandler/RedirectHandlerTest.php

@@ -88,7 +88,7 @@ public function testHandleRedirectionNoQuery()
         $this->assertSame('/users/login', $response->getHeaderLine('Location'));
     }
 
-    public function httpMethodProvider()
+    public static function httpMethodProvider()
     {
         return [
             ['POST'],