Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 6b63fd347bc0 · 2021-08-12T16:08:08.000+02:00
* 5.4:
  More return type fixes (bis)
  Cleanup `@return` annotations
diff --git a/Tests/phpt/kernel.php b/Tests/phpt/kernel.php
@@ -15,7 +15,7 @@ public function __construct(string $var)
         $this->var = $var;
     }
 
-    public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true)
+    public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true): Response
     {
         return new Response('OK Kernel '.$this->var);
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function __construct(string $var)`
`15`	`15`	`$this->var = $var;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true)`
	`18`	`+ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true): Response`
`19`	`19`	`{`
`20`	`20`	`return new Response('OK Kernel '.$this->var);`
`21`	`21`	`}`