[ErrorHandler][VarDumper] Remove PHP 8.4 deprecations

alexandre-daubois · alexandre-daubois · commit 99c939a6d9fc · 2024-07-22T17:01:51.000+02:00
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -55,7 +55,6 @@ class ErrorHandler
         \E_USER_DEPRECATED => 'User Deprecated',
         \E_NOTICE => 'Notice',
         \E_USER_NOTICE => 'User Notice',
-        \E_STRICT => 'Runtime Notice',
         \E_WARNING => 'Warning',
         \E_USER_WARNING => 'User Warning',
         \E_COMPILE_WARNING => 'Compile Warning',
@@ -73,7 +72,6 @@ class ErrorHandler
         \E_USER_DEPRECATED => [null, LogLevel::INFO],
         \E_NOTICE => [null, LogLevel::WARNING],
         \E_USER_NOTICE => [null, LogLevel::WARNING],
-        \E_STRICT => [null, LogLevel::WARNING],
         \E_WARNING => [null, LogLevel::WARNING],
         \E_USER_WARNING => [null, LogLevel::WARNING],
         \E_COMPILE_WARNING => [null, LogLevel::WARNING],
@@ -196,6 +194,12 @@ public function __construct(?BufferingLogger $bootstrappingLogger = null, bool $
         }, null, new class() extends \Exception {
         });
         $this->debug = $debug;
+
+        // BC layer for PHP < 8.4
+        if (\defined('E_STRICT')) {
+            $this->levels[\E_STRICT] = 'Runtime Notice';
+            $this->loggers[\E_STRICT] = [$bootstrappingLogger, LogLevel::WARNING];
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -213,7 +213,6 @@ public function testDefaultLogger()
                 \E_USER_DEPRECATED => [null, LogLevel::INFO],
                 \E_NOTICE => [$logger, LogLevel::WARNING],
                 \E_USER_NOTICE => [$logger, LogLevel::CRITICAL],
-                \E_STRICT => [null, LogLevel::WARNING],
                 \E_WARNING => [null, LogLevel::WARNING],
                 \E_USER_WARNING => [null, LogLevel::WARNING],
                 \E_COMPILE_WARNING => [null, LogLevel::WARNING],
@@ -225,6 +224,12 @@ public function testDefaultLogger()
                 \E_ERROR => [null, LogLevel::CRITICAL],
                 \E_CORE_ERROR => [null, LogLevel::CRITICAL],
             ];
+
+            // BC layer for PHP < 8.4
+            if (\defined('E_STRICT')) {
+                $loggers[\E_STRICT] = [null, LogLevel::WARNING];
+            }
+
             $this->assertSame($loggers, $handler->setLoggers([]));
         } finally {
             restore_error_handler();
@@ -478,7 +483,6 @@ public function testBootstrappingLogger()
             \E_USER_DEPRECATED => [$bootLogger, LogLevel::INFO],
             \E_NOTICE => [$bootLogger, LogLevel::WARNING],
             \E_USER_NOTICE => [$bootLogger, LogLevel::WARNING],
-            \E_STRICT => [$bootLogger, LogLevel::WARNING],
             \E_WARNING => [$bootLogger, LogLevel::WARNING],
             \E_USER_WARNING => [$bootLogger, LogLevel::WARNING],
             \E_COMPILE_WARNING => [$bootLogger, LogLevel::WARNING],
@@ -491,6 +495,11 @@ public function testBootstrappingLogger()
             \E_CORE_ERROR => [$bootLogger, LogLevel::CRITICAL],
         ];
 
+        // BC layer for PHP < 8.4
+        if (\defined('E_STRICT')) {
+            $loggers[\E_STRICT] = [$bootLogger, LogLevel::WARNING];
+        }
+
         $this->assertSame($loggers, $handler->setLoggers([]));
 
         $handler->handleError(\E_DEPRECATED, 'Foo message', __FILE__, 123, []);
diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
@@ -23,7 +23,7 @@
 class DOMCaster
 {
     private const ERROR_CODES = [
-        \DOM_PHP_ERR => 'DOM_PHP_ERR',
+        0 => 'DOM_PHP_ERR',
         \DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
         \DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
         \DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
@@ -138,16 +138,16 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, boo
             'doctype' => $dom->doctype,
             'implementation' => $dom->implementation,
             'documentElement' => new CutStub($dom->documentElement),
-            'actualEncoding' => $dom->actualEncoding,
+            'actualEncoding' => $dom->encoding,
             'encoding' => $dom->encoding,
             'xmlEncoding' => $dom->xmlEncoding,
-            'standalone' => $dom->standalone,
+            'standalone' => $dom->xmlStandalone,
             'xmlStandalone' => $dom->xmlStandalone,
-            'version' => $dom->version,
+            'version' => $dom->xmlVersion,
             'xmlVersion' => $dom->xmlVersion,
             'strictErrorChecking' => $dom->strictErrorChecking,
             'documentURI' => $dom->documentURI ? new LinkStub($dom->documentURI) : $dom->documentURI,
-            'config' => $dom->config,
+            'config' => null,
             'formatOutput' => $dom->formatOutput,
             'validateOnParse' => $dom->validateOnParse,
             'resolveExternals' => $dom->resolveExternals,
@@ -275,9 +275,9 @@ public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $i
             'publicId' => $dom->publicId,
             'systemId' => $dom->systemId,
             'notationName' => $dom->notationName,
-            'actualEncoding' => $dom->actualEncoding,
-            'encoding' => $dom->encoding,
-            'version' => $dom->version,
+            'actualEncoding' => null,
+            'encoding' => null,
+            'version' => null,
         ];
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -41,7 +41,7 @@ class ExceptionCaster
         \E_USER_ERROR => 'E_USER_ERROR',
         \E_USER_WARNING => 'E_USER_WARNING',
         \E_USER_NOTICE => 'E_USER_NOTICE',
-        \E_STRICT => 'E_STRICT',
+        2048 => 'E_STRICT',
     ];
 
     private static $framesCache = [];
