Merge pull request #157 from amorebietakoUdala/master

Changes to make it work in Symfony 4

Author: Maks3w

Security/Factory/FormLoginLdapFactory.php

@@ -5,8 +5,8 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 
 class FormLoginLdapFactory implements SecurityFactoryInterface
 {
@@ -42,7 +42,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $userPro
         $providerId = $provider.'.'.$id;
 
         $container
-            ->setDefinition($providerId, new DefinitionDecorator($provider))
+            ->setDefinition($providerId, new ChildDefinition($provider))
             ->replaceArgument(1, $id) // Provider Key
             ->replaceArgument(2, new Reference($userProviderId)) // User Provider
         ;
@@ -54,7 +54,7 @@ protected function createListener(ContainerBuilder $container, $id, $config)
     {
         $listenerId = 'security.authentication.listener.form';
 
-        $listener = new DefinitionDecorator($listenerId);
+        $listener = new ChildDefinition($listenerId);
         $listener->replaceArgument(4, $id);
         $listener->replaceArgument(5, $config);
 

Security/Factory/HttpBasicLdapFactory.php

@@ -3,9 +3,9 @@
 namespace FR3D\LdapBundle\Security\Factory;
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 
 class HttpBasicLdapFactory implements SecurityFactoryInterface
@@ -50,7 +50,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $userPro
         $providerId = $provider.'.'.$id;
 
         $container
-            ->setDefinition($providerId, new DefinitionDecorator($provider))
+            ->setDefinition($providerId, new ChildDefinition($provider))
             ->replaceArgument(1, $id) // Provider Key
             ->replaceArgument(2, new Reference($userProviderId)) // User Provider
         ;
@@ -62,7 +62,7 @@ protected function createListener(ContainerBuilder $container, $id, $entryPointI
     {
         // listener
         $listenerId = 'security.authentication.listener.basic.'.$id;
-        $listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.authentication.listener.basic'));
+        $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.basic'));
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, new Reference($entryPointId));
 
@@ -77,7 +77,7 @@ protected function createEntryPoint(ContainerBuilder $container, $id, $config, $
 
         $entryPointId = 'security.authentication.basic_entry_point.'.$id;
         $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.basic_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.basic_entry_point'))
             ->addArgument($config['realm'])
         ;