minor #34739 [Security] Make remember-me user providers lazy (chalasr)

chalasr · chalasr · commit 0d2f4111d3a0 · 2019-12-06T04:56:42.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Security] Make remember-me user providers lazy | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As everywhere else Commits ------- bea7456 [Security} Make remember-me user providers lazy
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -104,7 +105,7 @@ public function create(ContainerBuilder $container, string $id, array $config, ?
             throw new \RuntimeException('You must configure at least one remember-me aware listener (such as form-login) for each firewall that has remember-me enabled.');
         }
 
-        $rememberMeServices->replaceArgument(0, array_unique($userProviders));
+        $rememberMeServices->replaceArgument(0, new IteratorArgument(array_unique($userProviders)));
 
         // remember-me listener
         $listenerId = 'security.authentication.listener.rememberme.'.$id;
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -24,7 +24,7 @@
         "symfony/security-core": "^4.4|^5.0",
         "symfony/security-csrf": "^4.4|^5.0",
         "symfony/security-guard": "^4.4|^5.0",
-        "symfony/security-http": "^4.4.1|^5.0.1"
+        "symfony/security-http": "^5.1"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.5|^2.0",
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -47,14 +47,17 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     /**
      * @throws \InvalidArgumentException
      */
-    public function __construct(array $userProviders, string $secret, string $providerKey, array $options = [], LoggerInterface $logger = null)
+    public function __construct(iterable $userProviders, string $secret, string $providerKey, array $options = [], LoggerInterface $logger = null)
     {
         if (empty($secret)) {
             throw new \InvalidArgumentException('$secret must not be empty.');
         }
         if (empty($providerKey)) {
             throw new \InvalidArgumentException('$providerKey must not be empty.');
         }
+        if (!\is_array($userProviders) && !$userProviders instanceof \Countable) {
+            $userProviders = iterator_to_array($userProviders, false);
+        }
         if (0 === \count($userProviders)) {
             throw new \InvalidArgumentException('You must provide at least one user provider.');
         }

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,17 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface`
`47`	`47`	`/**`
`48`	`48`	`* @throws \InvalidArgumentException`
`49`	`49`	`*/`
`50`		`- public function __construct(array $userProviders, string $secret, string $providerKey, array $options = [], LoggerInterface $logger = null)`
	`50`	`+ public function __construct(iterable $userProviders, string $secret, string $providerKey, array $options = [], LoggerInterface $logger = null)`
`51`	`51`	`{`
`52`	`52`	`if (empty($secret)) {`
`53`	`53`	`throw new \InvalidArgumentException('$secret must not be empty.');`
`54`	`54`	`}`
`55`	`55`	`if (empty($providerKey)) {`
`56`	`56`	`throw new \InvalidArgumentException('$providerKey must not be empty.');`
`57`	`57`	`}`
	`58`	`+ if (!\is_array($userProviders) && !$userProviders instanceof \Countable) {`
	`59`	`+ $userProviders = iterator_to_array($userProviders, false);`
	`60`	`+ }`
`58`	`61`	`if (0 === \count($userProviders)) {`
`59`	`62`	`throw new \InvalidArgumentException('You must provide at least one user provider.');`
`60`	`63`	`}`