Compatibilité Symfony 4

webnet-fr · Jun 26, 2018 · 28578c1 · 28578c1
1 parent b73b81f
commit 28578c1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/DependencyInjection/Security/Factory/AbstractSsoFactory.php b/DependencyInjection/Security/Factory/AbstractSsoFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -38,7 +38,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         $provider = 'security.authentication.provider.sso.'.$id;
 
         $container
-            ->setDefinition($provider, new DefinitionDecorator('security.authentication.provider.sso'))
+            ->setDefinition($provider, new ChildDefinition('security.authentication.provider.sso'))
             ->replaceArgument(0, new Reference($userProviderId))
             ->replaceArgument(2, $config['create_users'])
             ->replaceArgument(3, $config['created_users_roles'])
@@ -67,7 +67,7 @@ protected function createLogoutSuccessHandler(ContainerBuilder $container, $id,
 
         // don't know if this is the right way, but it works
         $container
-            ->setDefinition($realHandler.'.'.$id, new DefinitionDecorator($templateHandler))
+            ->setDefinition($realHandler.'.'.$id, new ChildDefinition($templateHandler))
             ->addArgument($config)
         ;
     }

diff --git a/DependencyInjection/Security/Factory/OpenSsoFactory.php b/DependencyInjection/Security/Factory/OpenSsoFactory.php
@@ -2,7 +2,7 @@
 
 namespace Webnet\SsoAuthBundle\DependencyInjection\Security\Factory;
 
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 
 /**
  * @author: Jean-François Simon <contact@jfsimon.fr>
@@ -29,7 +29,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
         $entryPointId = 'security.authentication.open_sso_entry_point.'.$id;
 
         $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.open_sso_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.open_sso_entry_point'))
             ->addArgument($config)
         ;
 

diff --git a/DependencyInjection/Security/Factory/TrustedSsoFactory.php b/DependencyInjection/Security/Factory/TrustedSsoFactory.php
@@ -2,7 +2,7 @@
 
 namespace Webnet\SsoAuthBundle\DependencyInjection\Security\Factory;
 
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -32,7 +32,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
         $entryPointId = 'security.authentication.trusted_sso_entry_point.'.$id;
 
         $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.trusted_sso_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.trusted_sso_entry_point'))
             ->addArgument($config)
         ;
 

diff --git a/Resources/config/cas.xml b/Resources/config/cas.xml
@@ -10,11 +10,11 @@
     </parameters>
 
     <services>
-        <service id="webnet.sso_auth.protocol.cas" class="%webnet.sso_auth.protocol.cas.class%">
+        <service id="webnet.sso_auth.protocol.cas" class="%webnet.sso_auth.protocol.cas.class%" public="true">
             <tag name="webnet.sso_auth.protocol" id="cas" />
         </service>
 
-        <service id="webnet.sso_auth.server.cas" class="%webnet.sso_auth.server.cas.class%">
+        <service id="webnet.sso_auth.server.cas" class="%webnet.sso_auth.server.cas.class%" public="true">
             <tag name="webnet.sso_auth.server" id="cas" />
         </service>
     </services>

diff --git a/Sso/Factory.php b/Sso/Factory.php
@@ -43,7 +43,7 @@ class Factory
      * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
      * @param \Buzz\Client\ClientInterface $client
      */
-    public function __construct(ContainerInterface $container, ClientInterface $client)
+    public function __construct(ContainerInterface $container, $client)
     {
         $this->container = $container;
         $this->servers   = array();

diff --git a/Sso/Manager.php b/Sso/Manager.php
@@ -34,7 +34,7 @@ class Manager
      * @param ProtocolInterface            $protocol
      * @param \Buzz\Client\ClientInterface $client
      */
-    public function __construct(ServerInterface $server, ProtocolInterface $protocol, ClientInterface $client)
+    public function __construct(ServerInterface $server, ProtocolInterface $protocol, $client)
     {
         $this->server   = $server;
         $this->protocol = $protocol;

diff --git a/Tests/DependencyInjection/Security/Factory/AbstractSsoFactory.php b/Tests/DependencyInjection/Security/Factory/AbstractSsoFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -38,7 +38,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         $provider = 'security.authentication.provider.sso.'.$id;
 
         $container
-            ->setDefinition($provider, new DefinitionDecorator('security.authentication.provider.sso'))
+            ->setDefinition($provider, new ChildDefinition('security.authentication.provider.sso'))
             ->replaceArgument(0, new Reference($userProviderId))
             ->replaceArgument(2, $config['create_users'])
             ->replaceArgument(3, $config['created_users_roles'])
@@ -67,7 +67,7 @@ protected function createLogoutSuccessHandler(ContainerBuilder $container, $id,
 
         // don't know if this is the right way, but it works
         $container
-            ->setDefinition($realHandler.'.'.$id, new DefinitionDecorator($templateHandler))
+            ->setDefinition($realHandler.'.'.$id, new ChildDefinition($templateHandler))
             ->addArgument($config)
         ;
     }

diff --git a/Tests/DependencyInjection/Security/Factory/OpenSsoFactory.php b/Tests/DependencyInjection/Security/Factory/OpenSsoFactory.php
@@ -2,7 +2,7 @@
 
 namespace BeSimple\SsoAuthBundle\DependencyInjection\Security\Factory;
 
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 
 /**
  * @author: Jean-François Simon <contact@jfsimon.fr>
@@ -29,7 +29,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
         $entryPointId = 'security.authentication.open_sso_entry_point.'.$id;
 
         $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.open_sso_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.open_sso_entry_point'))
             ->addArgument($config)
         ;
 

diff --git a/Tests/DependencyInjection/Security/Factory/TrustedSsoFactory.php b/Tests/DependencyInjection/Security/Factory/TrustedSsoFactory.php
@@ -2,7 +2,7 @@
 
 namespace BeSimple\SsoAuthBundle\DependencyInjection\Security\Factory;
 
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -32,7 +32,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
         $entryPointId = 'security.authentication.trusted_sso_entry_point.'.$id;
 
         $container
-            ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.trusted_sso_entry_point'))
+            ->setDefinition($entryPointId, new ChildDefinition('security.authentication.trusted_sso_entry_point'))
             ->addArgument($config)
         ;