PHPUnit 10 upgrade

LordSimal · LordSimal · commit 24f3034b8991 · 2023-07-14T08:54:58.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@
 tmp/
 vendor/
 .php_cs.cache
-.phpunit.result.cache
+.phpunit.cache
 composer.lock
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.1",
         "cakephp/cakephp-codesniffer": "^5.0"
     },
     "extra": {
@@ -55,5 +55,10 @@
             "@test",
             "@stan-integration"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,16 +1,18 @@
-<phpunit
-        bootstrap="./vendor/autoload.php"
-        backupGlobals="false"
-        colors="true"
-        verbose="true">
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="./vendor/autoload.php"
+         backupGlobals="false"
+         colors="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
 
-    <testsuite name="CakeDCPhpStan">
-        <directory>./tests</directory>
-    </testsuite>
+  <testsuite name="CakeDCPhpStan">
+    <directory>./tests</directory>
+  </testsuite>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/TestCase/Type/ComponentLoadDynamicReturnTypeExtensionTest.php b/tests/TestCase/Type/ComponentLoadDynamicReturnTypeExtensionTest.php
@@ -35,7 +35,7 @@ public function testGetClass()
      *
      * @return array
      */
-    public function dataProviderIsMethodSupported()
+    public static function dataProviderIsMethodSupported()
     {
         return [
             ['loadComponent', true],
diff --git a/tests/TestCase/Type/ShellHelperLoadDynamicReturnTypeExtensionTest.php b/tests/TestCase/Type/ShellHelperLoadDynamicReturnTypeExtensionTest.php
@@ -47,7 +47,7 @@ public function testGetClassWithCustom()
      *
      * @return array
      */
-    public function dataProviderIsMethodSupported()
+    public static function dataProviderIsMethodSupported()
     {
         return [
             ['get', null, false],
diff --git a/tests/TestCase/Type/TableLocatorDynamicReturnTypeExtensionTest.php b/tests/TestCase/Type/TableLocatorDynamicReturnTypeExtensionTest.php
@@ -23,7 +23,7 @@ class TableLocatorDynamicReturnTypeExtensionTest extends TestCase
      *
      * @return array
      */
-    public function dataProviderGetClass()
+    public static function dataProviderGetClass()
     {
         return [
             ['Cake\ORM\Locator\LocatorInterface', 'get'],
@@ -49,7 +49,7 @@ public function testGetClass(string $targetClass, string $methodName)
      *
      * @return array
      */
-    public function dataProviderIsMethodSupported()
+    public static function dataProviderIsMethodSupported()
     {
         return [
             ['get', 'get', true],

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`},`
`19`	`19`	`"require-dev": {`
`20`	`20`	`"phpstan/phpstan-phpunit": "^1.0",`
`21`		`- "phpunit/phpunit": "^9.5",`
	`21`	`+ "phpunit/phpunit": "^10.1",`
`22`	`22`	`"cakephp/cakephp-codesniffer": "^5.0"`
`23`	`23`	`},`
`24`	`24`	`"extra": {`
`@@ -55,5 +55,10 @@`
`55`	`55`	`"@test",`
`56`	`56`	`"@stan-integration"`
`57`	`57`	`]`
	`58`	`+ },`
	`59`	`+ "config": {`
	`60`	`+ "allow-plugins": {`
	`61`	`+ "dealerdirect/phpcodesniffer-composer-installer": true`
	`62`	`+ }`
`58`	`63`	`}`
`59`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testGetClass()`
`35`	`35`	`*`
`36`	`36`	`* @return array`
`37`	`37`	`*/`
`38`		`- public function dataProviderIsMethodSupported()`
	`38`	`+ public static function dataProviderIsMethodSupported()`
`39`	`39`	`{`
`40`	`40`	`return [`
`41`	`41`	`['loadComponent', true],`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function testGetClassWithCustom()`
`47`	`47`	`*`
`48`	`48`	`* @return array`
`49`	`49`	`*/`
`50`		`- public function dataProviderIsMethodSupported()`
	`50`	`+ public static function dataProviderIsMethodSupported()`
`51`	`51`	`{`
`52`	`52`	`return [`
`53`	`53`	`['get', null, false],`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class TableLocatorDynamicReturnTypeExtensionTest extends TestCase`
`23`	`23`	`*`
`24`	`24`	`* @return array`
`25`	`25`	`*/`
`26`		`- public function dataProviderGetClass()`
	`26`	`+ public static function dataProviderGetClass()`
`27`	`27`	`{`
`28`	`28`	`return [`
`29`	`29`	`['Cake\ORM\Locator\LocatorInterface', 'get'],`
`@@ -49,7 +49,7 @@ public function testGetClass(string $targetClass, string $methodName)`
`49`	`49`	`*`
`50`	`50`	`* @return array`
`51`	`51`	`*/`
`52`		`- public function dataProviderIsMethodSupported()`
	`52`	`+ public static function dataProviderIsMethodSupported()`
`53`	`53`	`{`
`54`	`54`	`return [`
`55`	`55`	`['get', 'get', true],`