From aae9ff4f222dfd5502ff2ebd33db15355d91be2b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 3 Jun 2025 17:41:25 +0200
Subject: [PATCH] Remove deadcode after the bump to PHP >= 8.4

---
 DebugClassLoader.php                |  2 +-
 ErrorHandler.php                    | 21 ---------------------
 ErrorRenderer/HtmlErrorRenderer.php | 22 +++++++---------------
 Tests/DebugClassLoaderTest.php      |  3 ---
 Tests/ErrorHandlerTest.php          |  8 --------
 5 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/DebugClassLoader.php b/DebugClassLoader.php
index fa90296..6993023 100644
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -868,7 +868,7 @@ class DebugClassLoader
 
                 $constant = new \ReflectionClassConstant($definingClass, $constantName);
 
-                if (\PHP_VERSION_ID >= 80300 && $constantType = $constant->getType()) {
+                if ($constantType = $constant->getType()) {
                     if ($constantType instanceof \ReflectionNamedType) {
                         $n = $constantType->getName();
                     } else {
diff --git a/ErrorHandler.php b/ErrorHandler.php
index 5ffe75e..b42075c 100644
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -180,11 +180,6 @@ class ErrorHandler
         ?BufferingLogger $bootstrappingLogger = null,
         private bool $debug = false,
     ) {
-        if (\PHP_VERSION_ID < 80400) {
-            $this->levels[\E_STRICT] = 'Runtime Notice';
-            $this->loggers[\E_STRICT] = [null, LogLevel::ERROR];
-        }
-
         if ($bootstrappingLogger) {
             $this->bootstrappingLogger = $bootstrappingLogger;
             $this->setDefaultLogger($bootstrappingLogger);
@@ -435,22 +430,6 @@ class ErrorHandler
                 return true;
             }
         } else {
-            if (\PHP_VERSION_ID < 80303 && str_contains($message, '@anonymous')) {
-                $backtrace = debug_backtrace(false, 5);
-
-                for ($i = 1; isset($backtrace[$i]); ++$i) {
-                    if (isset($backtrace[$i]['function'], $backtrace[$i]['args'][0])
-                        && ('trigger_error' === $backtrace[$i]['function'] || 'user_error' === $backtrace[$i]['function'])
-                    ) {
-                        if ($backtrace[$i]['args'][0] !== $message) {
-                            $message = $backtrace[$i]['args'][0];
-                        }
-
-                        break;
-                    }
-                }
-            }
-
             if (str_contains($message, "@anonymous\0")) {
                 $message = $this->parseAnonymousClass($message);
                 $logMessage = $this->levels[$type].': '.$message;
diff --git a/ErrorRenderer/HtmlErrorRenderer.php b/ErrorRenderer/HtmlErrorRenderer.php
index 7bd9a08..0d07a12 100644
--- a/ErrorRenderer/HtmlErrorRenderer.php
+++ b/ErrorRenderer/HtmlErrorRenderer.php
@@ -255,21 +255,13 @@ class HtmlErrorRenderer implements ErrorRendererInterface
             // highlight_file could throw warnings
             // see https://bugs.php.net/25725
             $code = @highlight_file($file, true);
-            if (\PHP_VERSION_ID >= 80300) {
-                // remove main pre/code tags
-                $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
-                // split multiline span tags
-                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<\\n]*+\\n)++[^<]*+)</span>#', function ($m) {
-                    return "<span $m[1]>".str_replace("\n", "</span>\n<span $m[1]>", $m[2]).'</span>';
-                }, $code);
-                $content = explode("\n", $code);
-            } else {
-                // remove main code/span tags
-                $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
-                // split multiline spans
-                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn ($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
-                $content = explode('<br />', $code);
-            }
+            // remove main pre/code tags
+            $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
+            // split multiline span tags
+            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<\\n]*+\\n)++[^<]*+)</span>#', function ($m) {
+                return "<span $m[1]>".str_replace("\n", "</span>\n<span $m[1]>", $m[2]).'</span>';
+            }, $code);
+            $content = explode("\n", $code);
 
             $lines = [];
             if (0 > $srcContext) {
diff --git a/Tests/DebugClassLoaderTest.php b/Tests/DebugClassLoaderTest.php
index 8575f89..0ee6031 100644
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -405,9 +405,6 @@ class DebugClassLoaderTest extends TestCase
         ], $deprecations);
     }
 
-    /**
-     * @requires PHP >= 8.3
-     */
     public function testReturnTypePhp83()
     {
         $deprecations = [];
diff --git a/Tests/ErrorHandlerTest.php b/Tests/ErrorHandlerTest.php
index 5f55cfb..350a8e8 100644
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -214,10 +214,6 @@ class ErrorHandlerTest extends TestCase
                 \E_CORE_ERROR => [null, LogLevel::CRITICAL],
             ];
 
-            if (\PHP_VERSION_ID < 80400) {
-                $loggers[\E_STRICT] = [null, LogLevel::ERROR];
-            }
-
             $this->assertSame($loggers, $handler->setLoggers([]));
         } finally {
             restore_error_handler();
@@ -455,10 +451,6 @@ class ErrorHandlerTest extends TestCase
             \E_CORE_ERROR => [$bootLogger, LogLevel::CRITICAL],
         ];
 
-        if (\PHP_VERSION_ID < 80400) {
-            $loggers[\E_STRICT] = [$bootLogger, LogLevel::ERROR];
-        }
-
         $this->assertSame($loggers, $handler->setLoggers([]));
 
         $handler->handleError(\E_DEPRECATED, 'Foo message', __FILE__, 123, []);