Cherry-pick of d671fbe; use ChildDefinition instead of DefinitionDecorator.

Author: gharlan

DependencyInjection/Security/UserProvider/PropelFactory.php

@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of the Symfony package.
  *
@@ -8,14 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace Propel\Bundle\PropelBundle\DependencyInjection\Security\UserProvider;
 
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
-
 /**
  * PropelFactory creates services for Propel user provider.
  *
@@ -25,44 +22,29 @@ class PropelFactory implements UserProviderFactoryInterface
 {
     private $key;
     private $providerId;
-
-    /**
-     * Constructor.
-     *
-     * @param string $key
-     * @param string $providerId
-     */
     public function __construct($key, $providerId)
     {
         $this->key = $key;
         $this->providerId = $providerId;
     }
-
     public function create(ContainerBuilder $container, $id, $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator($this->providerId))
+            ->setDefinition($id, new ChildDefinition($this->providerId))
             ->addArgument($config['class'])
             ->addArgument($config['property'])
         ;
     }
-
     public function getKey()
     {
         return $this->key;
     }
-
     public function addConfiguration(NodeDefinition $node)
     {
         $node
             ->children()
-                ->scalarNode('class')
-                    ->isRequired()
-                    ->cannotBeEmpty()
-                ->end()
-                ->scalarNode('property')
-                    ->defaultNull()
-                ->end()
+            ->scalarNode('class')->isRequired()->cannotBeEmpty()->end()
+            ->scalarNode('property')->defaultNull()->end()
             ->end()
         ;
     }