add parameter type declarations where possible

xabbuh · xabbuh · commit 2d5ccc38e73b · 2019-07-29T16:35:50.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php b/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php
@@ -34,7 +34,7 @@ public function isOptional()
         return true;
     }
 
-    public function warmUp($cacheDir)
+    public function warmUp(string $cacheDir)
     {
         foreach ($this->expressions as $expression) {
             $this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']);
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php
@@ -45,7 +45,7 @@ public function __invoke(RequestEvent $event)
     /**
      * Proxies all method calls to the original listener.
      */
-    public function __call($method, $arguments)
+    public function __call(string $method, array $arguments)
     {
         return $this->listener->{$method}(...$arguments);
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -47,7 +47,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
         'failure_path_parameter' => '_failure_path',
     ];
 
-    public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
+    public function create(ContainerBuilder $container, string $id, array $config, string $userProviderId, ?string $defaultEntryPointId)
     {
         // authentication provider
         $authProviderId = $this->createAuthProvider($container, $id, $config, $userProviderId);
@@ -89,7 +89,7 @@ public function addConfiguration(NodeDefinition $node)
         }
     }
 
-    final public function addOption($name, $default = null)
+    final public function addOption(string $name, $default = null)
     {
         $this->options[$name] = $default;
     }
@@ -98,14 +98,9 @@ final public function addOption($name, $default = null)
      * Subclasses must return the id of a service which implements the
      * AuthenticationProviderInterface.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id             The unique id of the firewall
-     * @param array            $config         The options array for this listener
-     * @param string           $userProviderId The id of the user provider
-     *
      * @return string never null, the id of the authentication provider
      */
-    abstract protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId);
+    abstract protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId);
 
     /**
      * Subclasses must return the id of the abstract listener template.
@@ -128,14 +123,9 @@ abstract protected function getListenerId();
      * Subclasses may create an entry point of their as they see fit. The
      * default implementation does not change the default entry point.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id
-     * @param array            $config
-     * @param string           $defaultEntryPointId
-     *
-     * @return string the entry point id
+     * @return string|null the entry point id
      */
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPointId)
+    protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPointId)
     {
         return $defaultEntryPointId;
     }
@@ -146,12 +136,12 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
      *
      * @return bool Whether a possibly configured RememberMeServices should be set for this listener
      */
-    protected function isRememberMeAware($config)
+    protected function isRememberMeAware(array $config)
     {
         return $config['remember_me'];
     }
 
-    protected function createListener($container, $id, $config, $userProvider)
+    protected function createListener(ContainerBuilder $container, string $id, array $config, string $userProvider)
     {
         $listenerId = $this->getListenerId();
         $listener = new ChildDefinition($listenerId);
@@ -166,7 +156,7 @@ protected function createListener($container, $id, $config, $userProvider)
         return $listenerId;
     }
 
-    protected function createAuthenticationSuccessHandler($container, $id, $config)
+    protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config)
     {
         $successHandlerId = $this->getSuccessHandlerId($id);
         $options = array_intersect_key($config, $this->defaultSuccessHandlerOptions);
@@ -185,7 +175,7 @@ protected function createAuthenticationSuccessHandler($container, $id, $config)
         return $successHandlerId;
     }
 
-    protected function createAuthenticationFailureHandler($container, $id, $config)
+    protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config)
     {
         $id = $this->getFailureHandlerId($id);
         $options = array_intersect_key($config, $this->defaultFailureHandlerOptions);
@@ -202,12 +192,12 @@ protected function createAuthenticationFailureHandler($container, $id, $config)
         return $id;
     }
 
-    protected function getSuccessHandlerId($id)
+    protected function getSuccessHandlerId(string $id)
     {
         return 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
     }
 
-    protected function getFailureHandlerId($id)
+    protected function getFailureHandlerId(string $id)
     {
         return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
@@ -59,7 +59,7 @@ protected function getListenerId()
         return 'security.authentication.listener.form';
     }
 
-    protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
+    protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
         $container
@@ -72,7 +72,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         return $provider;
     }
 
-    protected function createListener($container, $id, $config, $userProvider)
+    protected function createListener(ContainerBuilder $container, string $id, array $config, string $userProvider)
     {
         $listenerId = parent::createListener($container, $id, $config, $userProvider);
 
@@ -84,7 +84,7 @@ protected function createListener($container, $id, $config, $userProvider)
         return $listenerId;
     }
 
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)
+    protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)
     {
         $entryPointId = 'security.authentication.form_entry_point.'.$id;
         $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -25,7 +25,7 @@
  */
 class FormLoginLdapFactory extends FormLoginFactory
 {
-    protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
+    protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)
     {
         $provider = 'security.authentication.provider.ldap_bind.'.$id;
         $definition = $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
@@ -55,7 +55,7 @@ public function addConfiguration(NodeDefinition $node)
         ;
     }
 
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         $authenticatorIds = $config['authenticators'];
         $authenticatorReferences = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
@@ -23,7 +23,7 @@
  */
 class HttpBasicFactory implements SecurityFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
         $container
@@ -66,7 +66,7 @@ public function addConfiguration(NodeDefinition $node)
         ;
     }
 
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)
+    protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)
     {
         if (null !== $defaultEntryPoint) {
             return $defaultEntryPoint;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -26,7 +26,7 @@
  */
 class HttpBasicLdapFactory extends HttpBasicFactory
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         $provider = 'security.authentication.provider.ldap_bind.'.$id;
         $definition = $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
@@ -49,7 +49,7 @@ public function getKey()
     /**
      * {@inheritdoc}
      */
-    protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
+    protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
         $container
@@ -81,7 +81,7 @@ protected function isRememberMeAware($config)
     /**
      * {@inheritdoc}
      */
-    protected function createListener($container, $id, $config, $userProvider)
+    protected function createListener(ContainerBuilder $container, string $id, array $config, string $userProvider)
     {
         $listenerId = $this->getListenerId();
         $listener = new ChildDefinition($listenerId);
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
@@ -27,7 +27,7 @@ public function getKey()
         return 'json-login-ldap';
     }
 
-    protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)
+    protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)
     {
         $provider = 'security.authentication.provider.ldap_bind.'.$id;
         $definition = $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -31,7 +31,7 @@ class RememberMeFactory implements SecurityFactoryInterface
         'remember_me_parameter' => '_remember_me',
     ];
 
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         // authentication provider
         $authProviderId = 'security.authentication.provider.rememberme.'.$id;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
@@ -24,7 +24,7 @@
  */
 class RemoteUserFactory implements SecurityFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         $providerId = 'security.authentication.provider.pre_authenticated.'.$id;
         $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
@@ -24,18 +24,12 @@ interface SecurityFactoryInterface
     /**
      * Configures the container services required to use the authentication listener.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id                The unique id of the firewall
-     * @param array            $config            The options array for the listener
-     * @param string           $userProvider      The service id of the user provider
-     * @param string           $defaultEntryPoint
-     *
      * @return array containing three values:
      *               - the provider id
      *               - the listener id
      *               - the entry point id
      */
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint);
+    public function create(ContainerBuilder $container, string $id, array $config, string $userProvider, ?string $defaultEntryPoint);
 
     /**
      * Defines the position at which the provider is called.
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
@@ -23,7 +23,7 @@
  */
 class X509Factory implements SecurityFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)
     {
         $providerId = 'security.authentication.provider.pre_authenticated.'.$id;
         $container
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -24,7 +24,7 @@
  */
 class InMemoryFactory implements UserProviderFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config)
+    public function create(ContainerBuilder $container, string $id, array $config)
     {
         $definition = $container->setDefinition($id, new ChildDefinition('security.user.provider.in_memory'));
         $defaultPassword = new Parameter('container.build_id');
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -24,7 +24,7 @@
  */
 class LdapFactory implements UserProviderFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config)
+    public function create(ContainerBuilder $container, string $id, array $config)
     {
         $container
             ->setDefinition($id, new ChildDefinition('security.user.provider.ldap'))
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/config": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
-        "symfony/http-kernel": "^4.4|^5.0",
+        "symfony/http-kernel": "^5.0",
         "symfony/security-core": "^4.4|^5.0",
         "symfony/security-csrf": "^4.4|^5.0",
         "symfony/security-guard": "^4.4|^5.0",

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function isOptional()`
`34`	`34`	`return true;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function warmUp($cacheDir)`
	`37`	`+ public function warmUp(string $cacheDir)`
`38`	`38`	`{`
`39`	`39`	`foreach ($this->expressions as $expression) {`
`40`	`40`	`$this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __invoke(RequestEvent $event)`
`45`	`45`	`/**`
`46`	`46`	`* Proxies all method calls to the original listener.`
`47`	`47`	`*/`
`48`		`- public function __call($method, $arguments)`
	`48`	`+ public function __call(string $method, array $arguments)`
`49`	`49`	`{`
`50`	`50`	`return $this->listener->{$method}(...$arguments);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface`
`47`	`47`	`'failure_path_parameter' => '_failure_path',`
`48`	`48`	`];`
`49`	`49`
`50`		`- public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)`
	`50`	`+ public function create(ContainerBuilder $container, string $id, array $config, string $userProviderId, ?string $defaultEntryPointId)`
`51`	`51`	`{`
`52`	`52`	`// authentication provider`
`53`	`53`	`$authProviderId = $this->createAuthProvider($container, $id, $config, $userProviderId);`
`@@ -89,7 +89,7 @@ public function addConfiguration(NodeDefinition $node)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`- final public function addOption($name, $default = null)`
	`92`	`+ final public function addOption(string $name, $default = null)`
`93`	`93`	`{`
`94`	`94`	`$this->options[$name] = $default;`
`95`	`95`	`}`
`@@ -98,14 +98,9 @@ final public function addOption($name, $default = null)`
`98`	`98`	`* Subclasses must return the id of a service which implements the`
`99`	`99`	`* AuthenticationProviderInterface.`
`100`	`100`	`*`
`101`		`- * @param ContainerBuilder $container`
`102`		`- * @param string $id The unique id of the firewall`
`103`		`- * @param array $config The options array for this listener`
`104`		`- * @param string $userProviderId The id of the user provider`
`105`		`- *`
`106`	`101`	`* @return string never null, the id of the authentication provider`
`107`	`102`	`*/`
`108`		`- abstract protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId);`
	`103`	`+ abstract protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId);`
`109`	`104`
`110`	`105`	`/**`
`111`	`106`	`* Subclasses must return the id of the abstract listener template.`
`@@ -128,14 +123,9 @@ abstract protected function getListenerId();`
`128`	`123`	`* Subclasses may create an entry point of their as they see fit. The`
`129`	`124`	`* default implementation does not change the default entry point.`
`130`	`125`	`*`
`131`		`- * @param ContainerBuilder $container`
`132`		`- * @param string $id`
`133`		`- * @param array $config`
`134`		`- * @param string $defaultEntryPointId`
`135`		`- *`
`136`		`- * @return string the entry point id`
	`126`	`+ * @return string\|null the entry point id`
`137`	`127`	`*/`
`138`		`- protected function createEntryPoint($container, $id, $config, $defaultEntryPointId)`
	`128`	`+ protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPointId)`
`139`	`129`	`{`
`140`	`130`	`return $defaultEntryPointId;`
`141`	`131`	`}`
`@@ -146,12 +136,12 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint`
`146`	`136`	`*`
`147`	`137`	`* @return bool Whether a possibly configured RememberMeServices should be set for this listener`
`148`	`138`	`*/`
`149`		`- protected function isRememberMeAware($config)`
	`139`	`+ protected function isRememberMeAware(array $config)`
`150`	`140`	`{`
`151`	`141`	`return $config['remember_me'];`
`152`	`142`	`}`
`153`	`143`
`154`		`- protected function createListener($container, $id, $config, $userProvider)`
	`144`	`+ protected function createListener(ContainerBuilder $container, string $id, array $config, string $userProvider)`
`155`	`145`	`{`
`156`	`146`	`$listenerId = $this->getListenerId();`
`157`	`147`	`$listener = new ChildDefinition($listenerId);`
`@@ -166,7 +156,7 @@ protected function createListener($container, $id, $config, $userProvider)`
`166`	`156`	`return $listenerId;`
`167`	`157`	`}`
`168`	`158`
`169`		`- protected function createAuthenticationSuccessHandler($container, $id, $config)`
	`159`	`+ protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config)`
`170`	`160`	`{`
`171`	`161`	`$successHandlerId = $this->getSuccessHandlerId($id);`
`172`	`162`	`$options = array_intersect_key($config, $this->defaultSuccessHandlerOptions);`
`@@ -185,7 +175,7 @@ protected function createAuthenticationSuccessHandler($container, $id, $config)`
`185`	`175`	`return $successHandlerId;`
`186`	`176`	`}`
`187`	`177`
`188`		`- protected function createAuthenticationFailureHandler($container, $id, $config)`
	`178`	`+ protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config)`
`189`	`179`	`{`
`190`	`180`	`$id = $this->getFailureHandlerId($id);`
`191`	`181`	`$options = array_intersect_key($config, $this->defaultFailureHandlerOptions);`
`@@ -202,12 +192,12 @@ protected function createAuthenticationFailureHandler($container, $id, $config)`
`202`	`192`	`return $id;`
`203`	`193`	`}`
`204`	`194`
`205`		`- protected function getSuccessHandlerId($id)`
	`195`	`+ protected function getSuccessHandlerId(string $id)`
`206`	`196`	`{`
`207`	`197`	`return 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());`
`208`	`198`	`}`
`209`	`199`
`210`		`- protected function getFailureHandlerId($id)`
	`200`	`+ protected function getFailureHandlerId(string $id)`
`211`	`201`	`{`
`212`	`202`	`return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());`
`213`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function getListenerId()`
`59`	`59`	`return 'security.authentication.listener.form';`
`60`	`60`	`}`
`61`	`61`
`62`		`- protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)`
	`62`	`+ protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)`
`63`	`63`	`{`
`64`	`64`	`$provider = 'security.authentication.provider.dao.'.$id;`
`65`	`65`	`$container`
`@@ -72,7 +72,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,`
`72`	`72`	`return $provider;`
`73`	`73`	`}`
`74`	`74`
`75`		`- protected function createListener($container, $id, $config, $userProvider)`
	`75`	`+ protected function createListener(ContainerBuilder $container, string $id, array $config, string $userProvider)`
`76`	`76`	`{`
`77`	`77`	`$listenerId = parent::createListener($container, $id, $config, $userProvider);`
`78`	`78`
`@@ -84,7 +84,7 @@ protected function createListener($container, $id, $config, $userProvider)`
`84`	`84`	`return $listenerId;`
`85`	`85`	`}`
`86`	`86`
`87`		`- protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)`
	`87`	`+ protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)`
`88`	`88`	`{`
`89`	`89`	`$entryPointId = 'security.authentication.form_entry_point.'.$id;`
`90`	`90`	`$container`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`class FormLoginLdapFactory extends FormLoginFactory`
`27`	`27`	`{`
`28`		`- protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)`
	`28`	`+ protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)`
`29`	`29`	`{`
`30`	`30`	`$provider = 'security.authentication.provider.ldap_bind.'.$id;`
`31`	`31`	`$definition = $container`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function addConfiguration(NodeDefinition $node)`
`55`	`55`	`;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)`
	`58`	`+ public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)`
`59`	`59`	`{`
`60`	`60`	`$authenticatorIds = $config['authenticators'];`
`61`	`61`	`$authenticatorReferences = [];`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class HttpBasicFactory implements SecurityFactoryInterface`
`25`	`25`	`{`
`26`		`- public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)`
	`26`	`+ public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)`
`27`	`27`	`{`
`28`	`28`	`$provider = 'security.authentication.provider.dao.'.$id;`
`29`	`29`	`$container`
`@@ -66,7 +66,7 @@ public function addConfiguration(NodeDefinition $node)`
`66`	`66`	`;`
`67`	`67`	`}`
`68`	`68`
`69`		`- protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)`
	`69`	`+ protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)`
`70`	`70`	`{`
`71`	`71`	`if (null !== $defaultEntryPoint) {`
`72`	`72`	`return $defaultEntryPoint;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`class HttpBasicLdapFactory extends HttpBasicFactory`
`28`	`28`	`{`
`29`		`- public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)`
	`29`	`+ public function create(ContainerBuilder $container, string $id, array $config, ?string $userProvider, ?string $defaultEntryPoint)`
`30`	`30`	`{`
`31`	`31`	`$provider = 'security.authentication.provider.ldap_bind.'.$id;`
`32`	`32`	`$definition = $container`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function getKey()`
`27`	`27`	`return 'json-login-ldap';`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected function createAuthProvider(ContainerBuilder $container, $id, $config, $userProviderId)`
	`30`	`+ protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId)`
`31`	`31`	`{`
`32`	`32`	`$provider = 'security.authentication.provider.ldap_bind.'.$id;`
`33`	`33`	`$definition = $container`