[TASK] Mitigate PHP 8.4.0-RC1 breaking changes

Note that this change addresses three different issues, which
need to be done in one step, otherwise none of isolated patches
would get a +1 CI verification:

* Alignment for changed `$escape` parameter handling of CSV
  related methods, which must be avoided with PHP versions below
  8.4.0-beta5, but is required as of PHP 8.4.0-RC1.
* This `$escape` issue needs to be addressed directly in
  the `typo3/testing-framework` and thus needs a raised
  dependency directly.
* PHP 8.4.0.0-RC1 also deprecated the `E_STRICT` constant,
  which needs to be addressed directly.

With [1] the `$escape` parameter for the following method calls

* `str_getcsv()`
* `fputcsv()`
* `fgetcsv()`

must be provided as a 1 character long value. Omitting and
using the default value will emit a PHP deprecation [2] warning
as of PHP 8.4.0-RC1, for example:

  str_getcsv(): the $escape parameter must be provided
  as its default value will change

To mitigate this, PHP recommends following:

  It must be passed explicitly either positionally or
  via named arguments.

This change adjusts all occurences (function calls) and ensures
that the `$escape` parameter is explicitly provided via
specifying all parameters up to that position and not
using a `named arguments` approach for easier backporting.

The TYPO3 testing framework also needs to be aligned to
mitigate `fgetcsv()` issues, and is raised in the same
step - otherwise none of these changes would get a green
CI pipeline run.

The following testing-framework updates are adjusted:

* main: simple update `main` pointer
* 12.4: Raise to tag `8.2.2`
* 11.5: Raise to tag `6.16.10`

Used command(s):

> composer require --dev "typo3/testing-framework":"^6.16.10"

Additionally, PHP 8.4.0-RC1 deprecated the `E_STRICT`
constant, which now emits a E_DEPRECATED which leads to
failed CI tests. This change introduces a core internal
constant with the same integer value, and replaces usages
with this constant to mitigate the E_DEPRECATION. This constant
can then be dropped with TYPO3 v14, preventing a breaking change
at this time. [3][4]

[1] php/php-src#15569
[2] https://github.com/php/php-src/blob/ebee8df27ed/UPGRADING#L617-L622
[3] https://github.com/php/php-src/blob/ebee8df27edf7/UPGRADING#L47-L49
[4] php/php-src#13053

Resolves: #105155
Releases: main, 12.4, 11.5
Change-Id: Ie8b7d46eeb75ba6e32c0e8f6e7e947775083cc15
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/86377
Tested-by: Stefan Bürk <[email protected]>
Reviewed-by: Garvin Hicking <[email protected]>
Tested-by: core-ci <[email protected]>
Reviewed-by: Stefan Bürk <[email protected]>
Tested-by: Garvin Hicking <[email protected]>

Author: sbuerk

Classes/Error/ErrorHandler.php

@@ -61,10 +61,11 @@ class ErrorHandler implements ErrorHandlerInterface, LoggerAwareInterface
         E_USER_ERROR => 'PHP User Error',
         E_USER_WARNING => 'PHP User Warning',
         E_USER_NOTICE => 'PHP User Notice',
-        E_STRICT => 'PHP Runtime Notice',
         E_RECOVERABLE_ERROR => 'PHP Catchable Fatal Error',
         E_USER_DEPRECATED => 'TYPO3 Deprecation Notice',
         E_DEPRECATED => 'PHP Runtime Deprecation Notice',
+        // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+        E_STRICT_DEPRECATED => 'PHP Runtime Notice',
     ];
 
     /**

Classes/Resource/Index/FileIndexRepository.php

@@ -259,7 +259,7 @@ public function findByFolders(array $folders, $includeMissing = true, $fileName
             );
 
         if (isset($fileName)) {
-            $nameParts = str_getcsv($fileName, ' ');
+            $nameParts = str_getcsv($fileName, ' ', '"', '\\');
             foreach ($nameParts as $part) {
                 $part = trim($part);
                 if ($part !== '') {

Classes/Resource/Search/QueryRestrictions/SearchTermRestriction.php

@@ -72,7 +72,7 @@ private function makeQuerySearchByTable(string $tableName, string $tableAlias):
         $searchTerm = (string)$this->searchDemand->getSearchTerm();
         $constraints = [];
 
-        $searchTermParts = str_getcsv($searchTerm, ' ');
+        $searchTermParts = str_getcsv($searchTerm, ' ', '"', '\\');
         foreach ($searchTermParts as $searchTermPart) {
             $searchTermPart = trim($searchTermPart);
             if ($searchTermPart === '') {

Classes/Utility/ArrayUtility.php

@@ -185,7 +185,7 @@ public static function getValueByPath(array $array, $path, $delimiter = '/')
                 // Programming error has to be sanitized before calling the method -> global exception
                 throw new \RuntimeException('Path must not be empty', 1341397767);
             }
-            $path = str_getcsv($path, $delimiter);
+            $path = str_getcsv($path, $delimiter, '"', '\\');
         } elseif (!is_array($path)) {
             // Programming error has to be sanitized before calling the method -> global exception
             throw new \InvalidArgumentException('getValueByPath() expects $path to be string or array, "' . gettype($path) . '" given.', 1476557628);

Classes/Utility/CsvUtility.php

@@ -57,7 +57,7 @@ public static function csvToArray($input, $fieldDelimiter = ',', $fieldEnclosure
         if (($handle = fopen('php://memory', 'r+')) !== false) {
             fwrite($handle, $input);
             rewind($handle);
-            while (($cells = fgetcsv($handle, 0, $fieldDelimiter, $fieldEnclosure)) !== false) {
+            while (($cells = fgetcsv($handle, 0, $fieldDelimiter, $fieldEnclosure, '\\')) !== false) {
                 $cells = is_array($cells) ? $cells : [];
                 $maximumCellCount = max(count($cells), $maximumCellCount);
                 $multiArray[] = preg_replace('|<br */?>|i', LF, $cells);

Configuration/DefaultConfiguration.php

@@ -260,9 +260,13 @@
         'productionExceptionHandler' => \TYPO3\CMS\Core\Error\ProductionExceptionHandler::class,
         'debugExceptionHandler' => \TYPO3\CMS\Core\Error\DebugExceptionHandler::class,
         'errorHandler' => \TYPO3\CMS\Core\Error\ErrorHandler::class,
-        'errorHandlerErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR),
-        'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING),
-        'belogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE),
+        // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+        'errorHandlerErrors' => E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR),
+        // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+        'exceptionalErrors' => E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING),
+        // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+        'belogErrorReporting' => E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE),
+        'allowedPhpDisableFunctions' => [],
         'locallangXMLOverride' => [], // For extension/overriding of the arrays in 'locallang' files in frontend  and backend.
         'generateApacheHtaccess' => 1,
         'ipAnonymization' => 1,

Resources/PHP/DeprecatedConstants.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * @internal only for TYPO3 internal work and not part of public API. Remove usage in custom extension code to mitigate
+ *           PHP deprecated constant E_STRICT.
+ * @deprecated since v13, will be removed in v14. This constant is only for TYPO3 internal usage to replace the
+ *             deprecated `E_STRICT` constant of PHP since PHP 8.4.0 RC1 to avoid E_DEPRECATED messages within
+ *             automatic testing.
+ */
+define('E_STRICT_DEPRECATED', 2048);

Tests/Functional/Error/ErrorHandlerTest.php

@@ -93,7 +93,8 @@ public function handleErrorOnlyHandlesRegisteredErrorLevels(): void
         $logger->expects(self::never())->method('log');
 
         $coreErrorHandler = new ErrorHandler(
-            E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)
+            // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+            E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)
         );
         $coreErrorHandler->setLogger($logger);
 

Tests/Unit/Error/ErrorHandlerTest.php

@@ -38,8 +38,10 @@ class ErrorHandlerTest extends UnitTestCase
     protected LoggerInterface $trackingLogger;
 
     // These are borrowed from DefaultConfiguration.php.
-    protected const DEFAULT_ERROR_HANDLER_LEVELS = E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR);
-    protected const DEFAULT_EXCEPTIONAL_ERROR_LEVELS = E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING);
+    // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+    protected const DEFAULT_ERROR_HANDLER_LEVELS = E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR);
+    // @todo Remove intermediate constant E_STRICT_DEPRECATED with TYPO3 v14. E_STRICT (2048) constant deprecated since PHP 8.4.0 RC1.
+    protected const DEFAULT_EXCEPTIONAL_ERROR_LEVELS = E_ALL & ~(E_STRICT_DEPRECATED | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING);
 
     protected $resetSingletonInstances = true;
 

composer.json

@@ -119,6 +119,9 @@
 			"TYPO3\\CMS\\Core\\": "Classes/"
 		},
 		"classmap": ["Resources/PHP/"],
-		"files": ["Resources/PHP/GlobalDebugFunctions.php"]
+		"files": [
+			"Resources/PHP/DeprecatedConstants.php",
+			"Resources/PHP/GlobalDebugFunctions.php"
+		]
 	}
 }