Merge branch '5.4' into 6.2

* 5.4:
  Fix some phpdoc
  [ErrorHandler] Do not patch return statements in closures
  [DI] keep `proxy` tag on original definition when decorating

Author: nicolas-grekas

DebugClassLoader.php

@@ -1129,7 +1129,20 @@ private function fixReturnStatements(\ReflectionMethod $method, string $returnTy
         }
 
         $end = $method->isGenerator() ? $i : $method->getEndLine();
+        $inClosure = false;
+        $braces = 0;
         for (; $i < $end; ++$i) {
+            if (!$inClosure) {
+                $inClosure = str_contains($code[$i], 'function (');
+            }
+
+            if ($inClosure) {
+                $braces += substr_count($code[$i], '{') - substr_count($code[$i], '}');
+                $inClosure = $braces > 0;
+
+                continue;
+            }
+
             if ('void' === $returnType) {
                 $fixedCode[$i] = str_replace('    return null;', '    return;', $code[$i]);
             } elseif ('mixed' === $returnType || '?' === $returnType[0]) {