Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit d9a62d899938 · 2021-09-07T14:43:17.000+02:00
* 5.4:
  cs fix
  [Console] Add more context when CommandIsSuccessful fails
  [HttpKernel] Backport type fixes
diff --git a/HttpCache/Store.php b/HttpCache/Store.php
@@ -26,6 +26,10 @@ class Store implements StoreInterface
 {
     protected $root;
     private \SplObjectStorage $keyCache;
+
+    /**
+     * @var array<string, resource>
+     */
     private array $locks = [];
 
     /**
diff --git a/HttpKernelBrowser.php b/HttpKernelBrowser.php
@@ -25,8 +25,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @method Request  getRequest()  A Request instance
- * @method Response getResponse() A Response instance
+ * @method Request  getRequest()
+ * @method Response getResponse()
  */
 class HttpKernelBrowser extends AbstractBrowser
 {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Fabien Potencier <fabien@symfony.com>`
`27`	`27`	`*`
`28`		`- * @method Request getRequest() A Request instance`
`29`		`- * @method Response getResponse() A Response instance`
	`28`	`+ * @method Request getRequest()`
	`29`	`+ * @method Response getResponse()`
`30`	`30`	`*/`
`31`	`31`	`class HttpKernelBrowser extends AbstractBrowser`
`32`	`32`	`{`