Typo3 13 compatibility

Build/phpstan/phpstan-baseline.neon

@@ -1,3 +1,3 @@
 parameters:
-		# Ignore specific errors:
-		ignoreErrors:
+	# Ignore specific errors:
+	ignoreErrors:

Build/phpstan/phpstan.neon

@@ -1,5 +1,6 @@
 includes:
 	- phpstan-baseline.neon
+
 parameters:
 	level: 6
 

Build/phpunit/UnitTestsBootstrap.php

@@ -56,15 +56,7 @@
     // We can use the "typo3/cms-composer-installers" constant "TYPO3_COMPOSER_MODE" to determine composer mode.
     // This should be always true except for TYPO3 mono repository.
     $composerMode = defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE === true;
-
-    // @todo: Remove else branch when dropping support for v12
-    $hasConsolidatedHttpEntryPoint = class_exists(CoreHttpApplication::class);
-    if ($hasConsolidatedHttpEntryPoint) {
-        SystemEnvironmentBuilder::run(0, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_CLI, $composerMode);
-    } else {
-        $requestType = \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_BE | \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_CLI;
-        SystemEnvironmentBuilder::run(0, $requestType, $composerMode);
-    }
+    SystemEnvironmentBuilder::run(0, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_CLI, $composerMode);
 
     $testbase->createDirectory(Environment::getPublicPath() . '/typo3conf/ext');
     $testbase->createDirectory(Environment::getPublicPath() . '/typo3temp/assets');

Classes/Command/SynchronizeCropVariantsCommand.php

@@ -137,7 +137,7 @@ protected function getStatementForSysFileReferences(): Result
             ->where(
                 $queryBuilder->expr()->eq(
                     'sync_crop_area',
-                    $queryBuilder->createNamedParameter(1)
+                    1
                 )
             )
             ->executeQuery();

Tests/Functional/Command/SynchronizeCropVariantsCommandTest.php

@@ -123,11 +123,16 @@ public function runWithEmptyCropColumnWillSkipRecord(): void
         $this->outputMock
             ->expects(self::exactly(3))
             ->method('writeln')
-            ->willReturnOnConsecutiveCalls(
-                'Start synchronizing crop variants of table sys_file_reference',
-                'SKIP: Column "crop" of sys_file_reference record with UID 1 is empty',
-                'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
-            );
+            ->willReturnCallback(function () {
+                static $calls = 0;
+                $responses = [
+                    'Start synchronizing crop variants of table sys_file_reference',
+                    'SKIP: Column "crop" of sys_file_reference record with UID 1 is empty',
+                    'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
+                ];
+
+                return $responses[$calls++];
+            });
 
         $this->subject->run(
             $this->inputMock,
@@ -159,11 +164,16 @@ public function runWithEmptyPidColumnWillSkipRecord(): void
         $this->outputMock
             ->expects(self::exactly(3))
             ->method('writeln')
-            ->willReturnOnConsecutiveCalls(
-                'Start synchronizing crop variants of table sys_file_reference',
-                'SKIP: Column "pid" of sys_file_reference record with UID 1 is empty',
-                'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
-            );
+            ->willReturnCallback(function () {
+                static $calls = 0;
+                $responses = [
+                    'Start synchronizing crop variants of table sys_file_reference',
+                    'SKIP: Column "pid" of sys_file_reference record with UID 1 is empty',
+                    'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
+                ];
+
+                return $responses[$calls++];
+            });
 
         $this->subject->run(
             $this->inputMock,
@@ -197,11 +207,16 @@ public function runWithUnchangedCropWillSkipRecord(): void
         $this->outputMock
             ->expects(self::exactly(3))
             ->method('writeln')
-            ->willReturnOnConsecutiveCalls(
-                'Start synchronizing crop variants of table sys_file_reference',
-                'SKIP: Column "crop" of table "sys_file_reference" with UID 1 because it is unchanged, empty or invalid JSON',
-                'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
-            );
+            ->willReturnCallback(function () {
+                static $calls = 0;
+                $responses = [
+                    'Start synchronizing crop variants of table sys_file_reference',
+                    'SKIP: Column "crop" of table "sys_file_reference" with UID 1 because it is unchanged, empty or invalid JSON',
+                    'We had 1 sys_file_reference records in total. 0 records were processed successfully and 1 records must be skipped because of invalid values',
+                ];
+
+                return $responses[$calls++];
+            });
 
         $this->updateCropVariantsServiceMock
             ->expects(self::atLeastOnce())
@@ -225,10 +240,15 @@ public function runWithChangedCropWillUpdateRecord(): void
         $this->outputMock
             ->expects(self::exactly(2))
             ->method('writeln')
-            ->willReturnOnConsecutiveCalls(
-                'Start synchronizing crop variants of table sys_file_reference',
-                'We had 3 sys_file_reference records in total. 3 records were processed successfully and 0 records must be skipped because of invalid values',
-            );
+            ->willReturnCallback(function () {
+                static $calls = 0;
+                $responses = [
+                    'Start synchronizing crop variants of table sys_file_reference',
+                    'We had 3 sys_file_reference records in total. 3 records were processed successfully and 0 records must be skipped because of invalid values',
+                ];
+
+                return $responses[$calls++];
+            });
 
         $this->updateCropVariantsServiceMock
             ->expects(self::atLeastOnce())

composer.json

@@ -38,7 +38,6 @@
 		"ergebnis/composer-normalize": "^2.44",
 		"friendsofphp/php-cs-fixer": "^3.14",
 		"phpstan/phpstan": "^1.10",
-		"phpunit/phpunit": "^11.2.5",
 		"roave/security-advisories": "dev-latest",
 		"sbuerk/typo3-cmscomposerinstallers-testingframework-bridge": "^0.1",
 		"typo3/coding-standards": "^0.8",