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

Token.php

@@ -30,8 +30,8 @@ class Token
     public const PUNCTUATION_TYPE = 'punctuation';
 
     /**
-     * @param string $type   The type of the token (self::*_TYPE)
-     * @param int    $cursor The cursor position in the source
+     * @param string   $type   The type of the token (self::*_TYPE)
+     * @param int|null $cursor The cursor position in the source
      */
     public function __construct(string $type, string|int|float|null $value, ?int $cursor)
     {