[HttpKernel] Backport type fixes

derrabus · derrabus · commit 50b09a75bc39 · 2021-09-07T12:47:48.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php
@@ -29,7 +29,7 @@ class LocaleAwareListener implements EventSubscriberInterface
     private $requestStack;
 
     /**
-     * @param LocaleAwareInterface[] $localeAwareServices
+     * @param iterable<mixed, LocaleAwareInterface> $localeAwareServices
      */
     public function __construct(iterable $localeAwareServices, RequestStack $requestStack)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -26,7 +26,11 @@ class Store implements StoreInterface
 {
     protected $root;
     private $keyCache;
-    private $locks;
+
+    /**
+     * @var array<string, resource>
+     */
+    private $locks = [];
 
     /**
      * @throws \RuntimeException
@@ -38,7 +42,6 @@ public function __construct(string $root)
             throw new \RuntimeException(sprintf('Unable to create the store directory (%s).', $this->root));
         }
         $this->keyCache = new \SplObjectStorage();
-        $this->locks = [];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class LocaleAwareListener implements EventSubscriberInterface`
`29`	`29`	`private $requestStack;`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * @param LocaleAwareInterface[] $localeAwareServices`
	`32`	`+ * @param iterable<mixed, LocaleAwareInterface> $localeAwareServices`
`33`	`33`	`*/`
`34`	`34`	`public function __construct(iterable $localeAwareServices, RequestStack $requestStack)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ class Store implements StoreInterface`
`26`	`26`	`{`
`27`	`27`	`protected $root;`
`28`	`28`	`private $keyCache;`
`29`		`- private $locks;`
	`29`	`+`
	`30`	`+ /**`
	`31`	`+ * @var array<string, resource>`
	`32`	`+ */`
	`33`	`+ private $locks = [];`
`30`	`34`
`31`	`35`	`/**`
`32`	`36`	`* @throws \RuntimeException`
`@@ -38,7 +42,6 @@ public function __construct(string $root)`
`38`	`42`	`throw new \RuntimeException(sprintf('Unable to create the store directory (%s).', $this->root));`
`39`	`43`	`}`
`40`	`44`	`$this->keyCache = new \SplObjectStorage();`
`41`		`- $this->locks = [];`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`/**`