Merge pull request #407 from cakephp/6.x-phpunit12

LordSimal · web-flow · commit ef93d0770f3b · 2026-06-30T11:09:18.000+02:00
PHPUnit 12 upgrade
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [3.x, 4.x, 5.x, 6.x]
+    branches: [6.x]
   pull_request:
     branches: ['*']
   workflow_dispatch:
@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
+        php-version: ['8.3', '8.4', '8.5']
         prefer-lowest: ['']
         include:
-          - php-version: '8.2'
+          - php-version: '8.3'
             prefer-lowest: 'prefer-lowest'
 
     steps:
@@ -27,7 +27,7 @@ jobs:
       with:
         php-version: ${{ matrix.php-version }}
         extensions: mbstring, intl
-        coverage: none
+        coverage: pcov
 
     - name: Get composer cache directory
       id: composer-cache
@@ -52,20 +52,20 @@ jobs:
         fi
 
     - name: Setup problem matchers for PHPUnit
-      if: matrix.php-version == '8.2'
+      if: matrix.php-version == '8.3'
       run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       run: |
-        if [[ "${{ matrix.php-version }}" == "8.2" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
+        if [[ "${{ matrix.php-version }}" == "8.3" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
           export CODECOVERAGE=1
           vendor/bin/phpunit --display-incomplete --display-skipped --coverage-clover=coverage.xml
         else
           vendor/bin/phpunit
         fi
 
     - name: Submit code coverage
-      if: matrix.php-version == '8.2' && matrix.prefer-lowest != 'prefer-lowest'
+      if: matrix.php-version == '8.3' && matrix.prefer-lowest != 'prefer-lowest'
       uses: codecov/codecov-action@v5
 
   cs-stan:
@@ -78,7 +78,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: mbstring, intl
           tools: cs2pr
           coverage: none
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 DEV_DEPENDENCIES = cakephp/cakephp:5.x-dev \
   cakephp/cakephp-codesniffer:^5.0 \
   mikey179/vfsstream:^1.6.8 \
-  phpunit/phpunit:^10.5.38 \
+  phpunit/phpunit:^12.1.3 \
   cakephp/migrations:^5.0.0
 
 install-dev:
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "setup": "cp composer.json composer.backup && make install-dev && mv composer.backup composer.json",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit"
+        "test": "phpunit --display-all-issues"
     },
     "config": {
         "sort-packages": true,
diff --git a/tests/TestCase/Command/LinterCommandTest.php b/tests/TestCase/Command/LinterCommandTest.php
@@ -51,7 +51,9 @@ public function testLinterSuccess()
      */
     public function testLinterFail()
     {
-        mkdir(TMP . 'linter', 0777, true);
+        if (!file_exists(TMP . 'linter')) {
+            mkdir(TMP . 'linter', 0777, true);
+        }
         file_put_contents(TMP . 'linter/BrokenExample.php', '<?php class X }');
         $this->exec('linter tmp/linter/ -v');
 
diff --git a/tests/TestCase/Rector/ClassMethod/FormBuildValidatorRector/FormBuildValidatorRectorTest.php b/tests/TestCase/Rector/ClassMethod/FormBuildValidatorRector/FormBuildValidatorRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\ClassMethod\FormBuildValidatorRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class FormBuildValidatorRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/ClassMethod/FormExecuteToProcessRector/FormExecuteToProcessRectorTest.php b/tests/TestCase/Rector/ClassMethod/FormExecuteToProcessRector/FormExecuteToProcessRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\ClassMethod\FormExecuteToProcessRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class FormExecuteToProcessRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/AddMethodCallArgsRector/AddMethodCallArgsRectorTest.php b/tests/TestCase/Rector/MethodCall/AddMethodCallArgsRector/AddMethodCallArgsRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class AddMethodCallArgsRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/ArrayToFluentCallRector/ArrayToFluentCallRectorTest.php b/tests/TestCase/Rector/MethodCall/ArrayToFluentCallRector/ArrayToFluentCallRectorTest.php
@@ -5,13 +5,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\ArrayToFluentCallRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class ArrayToFluentCallRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/BinaryColumnToVarbinaryRector/BinaryColumnToVarbinaryRectorTest.php b/tests/TestCase/Rector/MethodCall/BinaryColumnToVarbinaryRector/BinaryColumnToVarbinaryRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\BinaryColumnToVarbinaryRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class BinaryColumnToVarbinaryRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/BreadcrumbsHelperAddManyRector/BreadcrumbsHelperAddManyRectorTest.php b/tests/TestCase/Rector/MethodCall/BreadcrumbsHelperAddManyRector/BreadcrumbsHelperAddManyRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\BreadcrumbsHelperAddManyRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class BreadcrumbsHelperAddManyRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/ChangeEntityTraitSetArrayToPatch/ChangeEntityTraitSetArrayToPatchTest.php b/tests/TestCase/Rector/MethodCall/ChangeEntityTraitSetArrayToPatch/ChangeEntityTraitSetArrayToPatchTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\ChangeEntityTraitSetArrayToPatch;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class ChangeEntityTraitSetArrayToPatchTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/EntityPatchRector/EntityPatchRectorTest.php b/tests/TestCase/Rector/MethodCall/EntityPatchRector/EntityPatchRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\EntityPatchRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class EntityPatchRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/EventManagerOnRector/EventManagerOnRectorTest.php b/tests/TestCase/Rector/MethodCall/EventManagerOnRector/EventManagerOnRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\EventManagerOnRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class EventManagerOnRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php b/tests/TestCase/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\ModalToGetSetRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class ModalToGetSetRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/NewEntityToNewEmptyEntityRector/NewEntityToNewEmptyEntityRectorTest.php b/tests/TestCase/Rector/MethodCall/NewEntityToNewEmptyEntityRector/NewEntityToNewEmptyEntityRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\NewEntityToNewEmptyEntityRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class NewEntityToNewEmptyEntityRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/NewExprToFuncRector/NewExprToFuncRectorTest.php b/tests/TestCase/Rector/MethodCall/NewExprToFuncRector/NewExprToFuncRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\NewExprToFuncRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class NewExprToFuncRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/OptionsArrayToNamedParametersRector/OptionsArrayToNamedParametersRectorTest.php b/tests/TestCase/Rector/MethodCall/OptionsArrayToNamedParametersRector/OptionsArrayToNamedParametersRectorTest.php
@@ -5,13 +5,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\OptionsArrayToNamedParametersRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class OptionsArrayToNamedParametersRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/PaginatorCounterFormatRector/PaginatorCounterFormatRectorTest.php b/tests/TestCase/Rector/MethodCall/PaginatorCounterFormatRector/PaginatorCounterFormatRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\PaginatorCounterFormatRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class PaginatorCounterFormatRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/QueryParamAccessRector/QueryParamAccessRectorTest.php b/tests/TestCase/Rector/MethodCall/QueryParamAccessRector/QueryParamAccessRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\QueryParamAccessRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class QueryParamAccessRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/RemoveIntermediaryMethodRector/RemoveIntermediaryMethodRectorTest.php b/tests/TestCase/Rector/MethodCall/RemoveIntermediaryMethodRector/RemoveIntermediaryMethodRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveIntermediaryMethodRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class RemoveIntermediaryMethodRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/RemoveMethodCallArgsRectorTest.php b/tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/RemoveMethodCallArgsRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RemoveMethodCallArgsRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class RemoveMethodCallArgsRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php b/tests/TestCase/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/RenameMethodCallBasedOnParameterRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\RenameMethodCallBasedOnParameterRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class RenameMethodCallBasedOnParameterRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/ReplaceCommandArgsIoWithPorpertiesRector/ReplaceCommandArgsIoWithPropertiesRectorTest.php b/tests/TestCase/Rector/MethodCall/ReplaceCommandArgsIoWithPorpertiesRector/ReplaceCommandArgsIoWithPropertiesRectorTest.php
@@ -4,13 +4,12 @@
 namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\AddMethodCallArgsRector;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 final class ReplaceCommandArgsIoWithPropertiesRectorTest extends AbstractRectorTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/tests/TestCase/Rector/MethodCall/RouteBuilderToCallbackFirstRector/RouteBuilderToCallbackFirstRectorTest.php b/tests/TestCase/Rector/MethodCall/RouteBuilderToCallbackFirstRector/RouteBuilderToCallbackFirstRectorTest.php
diff --git a/tests/TestCase/Rector/MethodCall/StaticConnectionHelperRector/StaticConnectionHelperRectorTest.php b/tests/TestCase/Rector/MethodCall/StaticConnectionHelperRector/StaticConnectionHelperRectorTest.php
diff --git a/tests/TestCase/Rector/MethodCall/TranslationToGetOrCreateTranslationRector/TranslationToGetOrCreateTranslationRectorTest.php b/tests/TestCase/Rector/MethodCall/TranslationToGetOrCreateTranslationRector/TranslationToGetOrCreateTranslationRectorTest.php
diff --git a/tests/TestCase/Rector/MethodCall/TypeFactoryGetMappedRector/TypeFactoryGetMappedRectorTest.php b/tests/TestCase/Rector/MethodCall/TypeFactoryGetMappedRector/TypeFactoryGetMappedRectorTest.php
diff --git a/tests/TestCase/Rector/Namespace_/AppUsesStaticCallToUseStatementRector/AppUsesStaticCallToUseStatementRectorTest.php b/tests/TestCase/Rector/Namespace_/AppUsesStaticCallToUseStatementRector/AppUsesStaticCallToUseStatementRectorTest.php
diff --git a/tests/TestCase/Rector/Property/ChangeSnakedFixtureNameToPascal/ChangeSnakedFixtureNameToPascalTest.php b/tests/TestCase/Rector/Property/ChangeSnakedFixtureNameToPascal/ChangeSnakedFixtureNameToPascalTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,12 @@`
`4`	`4`	`namespace Cake\Upgrade\Test\TestCase\Rector\ClassMethod\FormBuildValidatorRector;`
`5`	`5`
`6`	`6`	`use Iterator;`
	`7`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`7`	`8`	`use Rector\Testing\PHPUnit\AbstractRectorTestCase;`
`8`	`9`
`9`	`10`	`final class FormBuildValidatorRectorTest extends AbstractRectorTestCase`
`10`	`11`	`{`
`11`		`- /**`
`12`		`- * @dataProvider provideData()`
`13`		`- */`
	`12`	`+ #[DataProvider('provideData')]`
`14`	`13`	`public function test(string $filePath): void`
`15`	`14`	`{`
`16`	`15`	`$this->doTestFile($filePath);`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,12 @@`
`5`	`5`	`namespace Cake\Upgrade\Test\TestCase\Rector\MethodCall\ArrayToFluentCallRector;`
`6`	`6`
`7`	`7`	`use Iterator;`
	`8`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`8`	`9`	`use Rector\Testing\PHPUnit\AbstractRectorTestCase;`
`9`	`10`
`10`	`11`	`final class ArrayToFluentCallRectorTest extends AbstractRectorTestCase`
`11`	`12`	`{`
`12`		`- /**`
`13`		`- * @dataProvider provideData()`
`14`		`- */`
	`13`	`+ #[DataProvider('provideData')]`
`15`	`14`	`public function test(string $filePath): void`
`16`	`15`	`{`
`17`	`16`	`$this->doTestFile($filePath);`