Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 7d6ae0cce3c3 · 2021-02-22T16:48:39.000+01:00
* 4.4:
  Switched to non-null defaults in exception constructors
  [Routing] fix conflict with param named class in attribute
  [Cache] fix setting items' metadata on commit()
diff --git a/Exception/ParseException.php b/Exception/ParseException.php
@@ -28,7 +28,6 @@ class ParseException extends RuntimeException
      * @param int             $parsedLine The line where the error occurred
      * @param string|null     $snippet    The snippet of code near the problem
      * @param string|null     $parsedFile The file name where the error occurred
-     * @param \Exception|null $previous   The previous exception
      */
     public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ class ParseException extends RuntimeException`
`28`	`28`	`* @param int $parsedLine The line where the error occurred`
`29`	`29`	`* @param string\|null $snippet The snippet of code near the problem`
`30`	`30`	`* @param string\|null $parsedFile The file name where the error occurred`
`31`		`- * @param \Exception\|null $previous The previous exception`
`32`	`31`	`*/`
`33`	`32`	`public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)`
`34`	`33`	`{`