[Security] Backport type fixes

derrabus · derrabus · commit 6bad75bddb3d · 2021-11-03T15:30:24.000+01:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Role/RoleHierarchy.php b/Role/RoleHierarchy.php
@@ -19,10 +19,11 @@
 class RoleHierarchy implements RoleHierarchyInterface
 {
     private $hierarchy;
+    /** @var array<string, list<string>> */
     protected $map;
 
     /**
-     * @param array $hierarchy An array defining the hierarchy
+     * @param array<string, list<string>> $hierarchy
      */
     public function __construct(array $hierarchy)
     {
diff --git a/User/ChainUserProvider.php b/User/ChainUserProvider.php
@@ -27,7 +27,7 @@ class ChainUserProvider implements UserProviderInterface, PasswordUpgraderInterf
     private $providers;
 
     /**
-     * @param iterable<int, UserProviderInterface> $providers
+     * @param iterable<array-key, UserProviderInterface> $providers
      */
     public function __construct(iterable $providers)
     {
diff --git a/User/InMemoryUserProvider.php b/User/InMemoryUserProvider.php
@@ -24,13 +24,16 @@
  */
 class InMemoryUserProvider implements UserProviderInterface
 {
+    /**
+     * @var array<string, UserInterface>
+     */
     private $users;
 
     /**
      * The user array is a hash where the keys are usernames and the values are
      * an array of attributes: 'password', 'enabled', and 'roles'.
      *
-     * @param array $users An array of users
+     * @param array<string, array{password?: string, enabled?: bool, roles?: list<string>}> $users An array of users
      */
     public function __construct(array $users = [])
     {

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,11 @@`
`19`	`19`	`class RoleHierarchy implements RoleHierarchyInterface`
`20`	`20`	`{`
`21`	`21`	`private $hierarchy;`
	`22`	`+ /** @var array<string, list<string>> */`
`22`	`23`	`protected $map;`
`23`	`24`
`24`	`25`	`/**`
`25`		`- * @param array $hierarchy An array defining the hierarchy`
	`26`	`+ * @param array<string, list<string>> $hierarchy`
`26`	`27`	`*/`
`27`	`28`	`public function __construct(array $hierarchy)`
`28`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class ChainUserProvider implements UserProviderInterface, PasswordUpgraderInterf`
`27`	`27`	`private $providers;`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param iterable<int, UserProviderInterface> $providers`
	`30`	`+ * @param iterable<array-key, UserProviderInterface> $providers`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(iterable $providers)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,16 @@`
`24`	`24`	`*/`
`25`	`25`	`class InMemoryUserProvider implements UserProviderInterface`
`26`	`26`	`{`
	`27`	`+ /**`
	`28`	`+ * @var array<string, UserInterface>`
	`29`	`+ */`
`27`	`30`	`private $users;`
`28`	`31`
`29`	`32`	`/**`
`30`	`33`	`* The user array is a hash where the keys are usernames and the values are`
`31`	`34`	`* an array of attributes: 'password', 'enabled', and 'roles'.`
`32`	`35`	`*`
`33`		`- * @param array $users An array of users`
	`36`	`+ * @param array<string, array{password?: string, enabled?: bool, roles?: list<string>}> $users An array of users`
`34`	`37`	`*/`
`35`	`38`	`public function __construct(array $users = [])`
`36`	`39`	`{`