[TASK] Allow PHPunit 12

Wouter Wolters · Wouter Wolters · commit b5cbeff78d63 · 2025-04-09T20:52:56.000+02:00
diff --git a/Classes/Core/BaseTestCase.php b/Classes/Core/BaseTestCase.php
@@ -101,7 +101,6 @@ protected function tearDown(): void
      * @param string $mockClassName the class name to use for the mock class
      * @param bool $callOriginalConstructor whether to call the constructor
      * @param bool $callOriginalClone whether to call the __clone method
-     * @param bool $callAutoload whether to call any autoload function
      *
      * @return MockObject&AccessibleObjectInterface&T a mock of `$originalClassName` with access methods added
      */
@@ -112,7 +111,6 @@ protected function getAccessibleMock(
         string $mockClassName = '',
         bool $callOriginalConstructor = true,
         bool $callOriginalClone = true,
-        bool $callAutoload = true
     ) {
         $mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName))
             ->setConstructorArgs($arguments)
@@ -132,10 +130,6 @@ protected function getAccessibleMock(
             $mockBuilder->disableOriginalClone();
         }
 
-        if (!$callAutoload) {
-            $mockBuilder->disableAutoload();
-        }
-
         return $mockBuilder->getMock();
     }
 
diff --git a/Tests/Unit/Core/PackageCollectionTest.php b/Tests/Unit/Core/PackageCollectionTest.php
@@ -23,6 +23,7 @@
 
 namespace Typo3\TestingFramework\Tests\Unit\Core;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Service\DependencyOrderingService;
@@ -31,9 +32,7 @@
 
 final class PackageCollectionTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function sortsComposerPackages(): void
     {
         $packageStates = require __DIR__ . '/../Fixtures/Packages/PackageStates.php';
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "php": "^8.2",
     "composer/class-map-generator": "^1.3.4",
     "guzzlehttp/psr7": "^2.5.0",
-    "phpunit/phpunit": "^11.2.5",
+    "phpunit/phpunit": "^11.2.5 || ^12.1.2",
     "psr/container": "^2.0",
     "typo3/cms-backend": "13.*.*@dev || 14.*.*@dev",
     "typo3/cms-core": "13.*.*@dev || 14.*.*@dev",
