feature #21516 [HttpKernel][FrameworkBundle] Lazy load argument value resolvers (chalasr)

fabpot · fabpot · commit 2e13d4efa655 · 2017-02-02T11:44:56.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [HttpKernel][FrameworkBundle] Lazy load argument value resolvers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a The ArgumentResolver resolves an arg using the first ArgumentValueResolver which `supports()` it (which can be complex, see e.g. [sensiolabs/SensioFrameworkExtraBundle#436](https://github.com/sensiolabs/SensioFrameworkExtraBundle/pull/436/files#diff-865d48d9369c4431bce36ba642834570R10)). Commits ------- 02b4aaa [HttpKernel] Lazy load argument value resolvers
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ControllerArgumentValueResolverPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ControllerArgumentValueResolverPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -32,6 +33,6 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('argument_resolver');
         $argumentResolvers = $this->findAndSortTaggedServices('controller.argument_value_resolver', $container);
-        $definition->replaceArgument(1, $argumentResolvers);
+        $definition->replaceArgument(1, new IteratorArgument($argumentResolvers));
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -21,7 +21,7 @@
 
         <service id="argument_resolver" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver" public="false">
             <argument type="service" id="argument_metadata_factory" />
-            <argument type="collection" />
+            <argument /> <!-- argument value resolvers -->
         </service>
 
         <service id="argument_resolver.request_attribute" class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver" public="false">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ControllerArgumentValueResolverPassTest.php
@@ -42,7 +42,7 @@ public function testServicesAreOrderedAccordingToPriority()
         }
 
         (new ControllerArgumentValueResolverPass())->process($container);
-        $this->assertEquals($expected, $definition->getArgument(1));
+        $this->assertEquals($expected, $definition->getArgument(1)->getValues());
     }
 
     public function testReturningEmptyArrayWhenNoService()
@@ -52,7 +52,7 @@ public function testReturningEmptyArrayWhenNoService()
         $container->setDefinition('argument_resolver', $definition);
 
         (new ControllerArgumentValueResolverPass())->process($container);
-        $this->assertEquals(array(), $definition->getArgument(1));
+        $this->assertEquals(array(), $definition->getArgument(1)->getValues());
     }
 
     public function testNoArgumentResolver()
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -29,11 +29,11 @@ final class ArgumentResolver implements ArgumentResolverInterface
     private $argumentMetadataFactory;
 
     /**
-     * @var ArgumentValueResolverInterface[]
+     * @var iterable|ArgumentValueResolverInterface[]
      */
     private $argumentValueResolvers;
 
-    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, array $argumentValueResolvers = array())
+    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, $argumentValueResolvers = array())
     {
         $this->argumentMetadataFactory = $argumentMetadataFactory ?: new ArgumentMetadataFactory();
         $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;`
`14`	`15`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`15`	`16`	`use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;`
`16`	`17`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`@@ -32,6 +33,6 @@ public function process(ContainerBuilder $container)`
`32`	`33`
`33`	`34`	`$definition = $container->getDefinition('argument_resolver');`
`34`	`35`	`$argumentResolvers = $this->findAndSortTaggedServices('controller.argument_value_resolver', $container);`
`35`		`- $definition->replaceArgument(1, $argumentResolvers);`
	`36`	`+ $definition->replaceArgument(1, new IteratorArgument($argumentResolvers));`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testServicesAreOrderedAccordingToPriority()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`(new ControllerArgumentValueResolverPass())->process($container);`
`45`		`- $this->assertEquals($expected, $definition->getArgument(1));`
	`45`	`+ $this->assertEquals($expected, $definition->getArgument(1)->getValues());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function testReturningEmptyArrayWhenNoService()`
`@@ -52,7 +52,7 @@ public function testReturningEmptyArrayWhenNoService()`
`52`	`52`	`$container->setDefinition('argument_resolver', $definition);`
`53`	`53`
`54`	`54`	`(new ControllerArgumentValueResolverPass())->process($container);`
`55`		`- $this->assertEquals(array(), $definition->getArgument(1));`
	`55`	`+ $this->assertEquals(array(), $definition->getArgument(1)->getValues());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testNoArgumentResolver()`