Merge branch 'master' into add-tests-mariadb

yiisoft · May 28, 2024 · c6c1eff · c6c1eff
2 parents ae84a4a + 7a8b9d6
commit c6c1eff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -28,6 +28,7 @@ Yii Framework 2 Change Log
 - Enh #20134: Raise minimum `PHP` version to `7.3` (@terabytesoftw)
 - Bug #20141: Update `ezyang/htmlpurifier` dependency to version `4.17` (@terabytesoftw)
 - Bug #19817: Add MySQL Query `addCheck()` and `dropCheck()` (@bobonov)
+- Bug #20165: Adjust pretty name of closures for PHP 8.4 compatibility (@staabm)
 
 2.0.49.2 October 12, 2023
 -------------------------

diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php
@@ -204,7 +204,7 @@ public function addTypeLinks($code)
         $url = null;
 
         $shouldGenerateLink = true;
-        if ($method !== null && substr_compare($method, '{closure}', -9) !== 0) {
+        if ($method !== null && strpos($method, '{closure') === false) {
             $reflection = new \ReflectionClass($class);
             if ($reflection->hasMethod($method)) {
                 $reflectionMethod = $reflection->getMethod($method);