From c4b84c3ac92505ba6b410767f5626911690b0d16 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 2 Jun 2025 16:08:14 +0200 Subject: [PATCH 1/3] Allow Symfony ^8.0 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 98b9432..dc56a36 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,12 @@ "require": { "php": ">=8.2", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/var-dumper": "^6.4|^7.0|^8.0" }, "require-dev": { - "symfony/console": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/serializer": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/serializer": "^6.4|^7.0|^8.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/webpack-encore-bundle": "^1.0|^2.0" }, From 2a32f5f31da958543e5f9081e6eb5ad4fb9c0f56 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 2 Jun 2025 17:50:55 +0200 Subject: [PATCH 2/3] Bump Symfony 8 to PHP >= 8.4 --- composer.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index dc56a36..366dafb 100644 --- a/composer.json +++ b/composer.json @@ -16,20 +16,19 @@ } ], "require": { - "php": ">=8.2", + "php": ">=8.4", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^6.4|^7.0|^8.0" + "symfony/var-dumper": "^7.4|^8.0" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0", - "symfony/http-kernel": "^6.4|^7.0|^8.0", - "symfony/serializer": "^6.4|^7.0|^8.0", + "symfony/console": "^7.4|^8.0", "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^7.4|^8.0", + "symfony/serializer": "^7.4|^8.0", "symfony/webpack-encore-bundle": "^1.0|^2.0" }, "conflict": { - "symfony/deprecation-contracts": "<2.5", - "symfony/http-kernel": "<6.4" + "symfony/deprecation-contracts": "<2.5" }, "autoload": { "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" }, From aae9ff4f222dfd5502ff2ebd33db15355d91be2b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 3 Jun 2025 17:41:25 +0200 Subject: [PATCH 3/3] 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 @@ private function setReturnType(string $types, string $class, string $method, str $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 @@ public function __construct( ?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 @@ public function handleError(int $type, string $message, string $file, int $line) 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 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri // 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('#^\s*(.*)\s*#s', '\\1', $code); - // split multiline span tags - $code = preg_replace_callback('#]++)>((?:[^<\\n]*+\\n)++[^<]*+)#', function ($m) { - return "".str_replace("\n", "\n", $m[2]).''; - }, $code); - $content = explode("\n", $code); - } else { - // remove main code/span tags - $code = preg_replace('#^\s*(.*)\s*#s', '\\1', $code); - // split multiline spans - $code = preg_replace_callback('#]++)>((?:[^<]*+
)++[^<]*+)#', fn ($m) => "".str_replace('
', "
", $m[2]).'', $code); - $content = explode('
', $code); - } + // remove main pre/code tags + $code = preg_replace('#^\s*(.*)\s*#s', '\\1', $code); + // split multiline span tags + $code = preg_replace_callback('#]++)>((?:[^<\\n]*+\\n)++[^<]*+)#', function ($m) { + return "".str_replace("\n", "\n", $m[2]).''; + }, $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_exists('Test\\'.ReturnType::class, true); ], $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 @@ public function testDefaultLogger() \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 @@ public function testBootstrappingLogger() \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, []);