From 22ece9f0b3671ff12c6f3fe47deb99fb58284f4f Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Wed, 9 Apr 2025 21:05:45 +0200
Subject: [PATCH 1/2] [TASK] Allow PHPunit 12 (#668)

---
 Classes/Core/BaseTestCase.php             | 6 ------
 Tests/Unit/Core/PackageCollectionTest.php | 5 ++---
 composer.json                             | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Classes/Core/BaseTestCase.php b/Classes/Core/BaseTestCase.php
index 8d00451c..8f020559 100644
--- 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
index 2a7bbfac..35521ecf 100644
--- 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
index 22a245a6..2a41c3f7 100644
--- 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",

From 14c8cbd09ea670d5d637dee62c841bf65a93bfe6 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 10 Apr 2025 12:33:27 +0200
Subject: [PATCH 2/2] [BUGFIX] Allow to process versions of language variants

This change allows for YAML-based fixtures
to also add version variants for a language variant
thus, making it fully overlayable.

See https://review.typo3.org/c/Packages/TYPO3.CMS/+/72015
---
 .../DataHandling/Scenario/DataHandlerFactory.php          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Classes/Core/Functional/Framework/DataHandling/Scenario/DataHandlerFactory.php b/Classes/Core/Functional/Framework/DataHandling/Scenario/DataHandlerFactory.php
index 18e026a5..4fc3fac1 100644
--- a/Classes/Core/Functional/Framework/DataHandling/Scenario/DataHandlerFactory.php
+++ b/Classes/Core/Functional/Framework/DataHandling/Scenario/DataHandlerFactory.php
@@ -186,6 +186,14 @@ private function processLanguageVariantItem(
         if (isset($itemSettings['actions'])) {
             $this->setInCommandMap($tableName, $newId, $nodeId, $itemSettings['actions'], (int)$workspaceId);
         }
+        foreach ($itemSettings['versionVariants'] ?? [] as $versionVariantSettings) {
+            $this->processVersionVariantItem(
+                $entityConfiguration,
+                $versionVariantSettings,
+                $newId,
+                $nodeId
+            );
+        }
         foreach ($itemSettings['languageVariants'] ?? [] as $variantItemSettings) {
             $this->processLanguageVariantItem(
                 $entityConfiguration,