symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
Lines changed: 3 additions & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
Lines changed: 81 additions & 82 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
Lines changed: 81 additions & 82 deletions
diff --git a/‎src/Symfony/Component/Form/DependencyInjection/FormPass.php
Lines changed: 28 additions & 21 deletions b/‎src/Symfony/Component/Form/DependencyInjection/FormPass.php
Lines changed: 28 additions & 21 deletions
@@ -30,13 +30,11 @@
 
         <!-- DependencyInjectionExtension -->
         <service id="form.extension" class="Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension" public="false">
-            <argument type="service" id="service_container" />
+            <argument type="service-locator" />
             <!-- All services with tag "form.type" are inserted here by FormPass -->
-            <argument type="collection" />
+            <argument type="iterator" />
             <!-- All services with tag "form.type_extension" are inserted here by FormPass -->
-            <argument type="collection" />
-            <!-- All services with tag "form.type_guesser" are inserted here by FormPass -->
-            <argument type="collection" />
+            <argument type="iterator" />
         </service>
 
         <!-- ValidatorTypeGuesser -->
 
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -27,8 +29,7 @@ class FormPassTest extends TestCase
 {
     public function testDoNothingIfFormExtensionNotLoaded()
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
+        $container = $this->createContainerBuilder();
 
         $container->compile();
 
@@ -37,47 +38,37 @@ public function testDoNothingIfFormExtensionNotLoaded()
 
     public function testAddTaggedTypes()
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
-
-        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
-        $extDefinition->setArguments(array(
-            new Reference('service_container'),
-            array(),
-            array(),
-            array(),
-        ));
+        $container = $this->createContainerBuilder();
 
-        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('form.extension', $this->createExtensionDefinition());
         $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type');
         $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type');
 
         $container->compile();
 
         $extDefinition = $container->getDefinition('form.extension');
-
-        $this->assertEquals(array(
-            __CLASS__.'_Type1' => 'my.type1',
-            __CLASS__.'_Type2' => 'my.type2',
-        ), $extDefinition->getArgument(1));
+        $locator = $extDefinition->getArgument(0);
+
+        $this->assertInstanceOf(ServiceLocatorArgument::class, $locator);
+        $this->assertEquals(
+            new ServiceLocatorArgument(array(
+                __CLASS__.'_Type1' => new Reference('my.type1'),
+                __CLASS__.'_Type2' => new Reference('my.type2'),
+                'my.type1' => new Reference('my.type1'),
+                'my.type2' => new Reference('my.type2'),
+            )),
+            $locator
+        );
     }
 
     /**
      * @dataProvider addTaggedTypeExtensionsDataProvider
      */
-    public function testAddTaggedTypeExtensions(array $extensions, array $expectedRegisteredExtensions)
+    public function testAddTaggedTypeExtensions(array $extensions, IteratorArgument $expectedRegisteredExtensions)
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
+        $container = $this->createContainerBuilder();
 
-        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension', array(
-            new Reference('service_container'),
-            array(),
-            array(),
-            array(),
-        ));
-
-        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('form.extension', $this->createExtensionDefinition());
 
         foreach ($extensions as $serviceId => $tag) {
             $container->register($serviceId, 'stdClass')->addTag('form.type_extension', $tag);
@@ -86,7 +77,7 @@ public function testAddTaggedTypeExtensions(array $extensions, array $expectedRe
         $container->compile();
 
         $extDefinition = $container->getDefinition('form.extension');
-        $this->assertSame($expectedRegisteredExtensions, $extDefinition->getArgument(2));
+        $this->assertEquals($expectedRegisteredExtensions, $extDefinition->getArgument(1));
     }
 
     /**
@@ -101,10 +92,13 @@ public function addTaggedTypeExtensionsDataProvider()
                     'my.type_extension2' => array('extended_type' => 'type1'),
                     'my.type_extension3' => array('extended_type' => 'type2'),
                 ),
-                array(
-                    'type1' => array('my.type_extension1', 'my.type_extension2'),
-                    'type2' => array('my.type_extension3'),
-                ),
+                new IteratorArgument(array(
+                    'type1' => new IteratorArgument(array(
+                        new Reference('my.type_extension1'),
+                        new Reference('my.type_extension2'),
+                    )),
+                    'type2' => new IteratorArgument(array(new Reference('my.type_extension3'))),
+                )),
             ),
             array(
                 array(
@@ -115,10 +109,18 @@ public function addTaggedTypeExtensionsDataProvider()
                     'my.type_extension5' => array('extended_type' => 'type2', 'priority' => 1),
                     'my.type_extension6' => array('extended_type' => 'type2', 'priority' => 1),
                 ),
-                array(
-                    'type1' => array('my.type_extension2', 'my.type_extension1', 'my.type_extension3'),
-                    'type2' => array('my.type_extension4', 'my.type_extension5', 'my.type_extension6'),
-                ),
+                new IteratorArgument(array(
+                    'type1' => new IteratorArgument(array(
+                        new Reference('my.type_extension2'),
+                        new Reference('my.type_extension1'),
+                        new Reference('my.type_extension3'),
+                    )),
+                    'type2' => new IteratorArgument(array(
+                        new Reference('my.type_extension4'),
+                        new Reference('my.type_extension5'),
+                        new Reference('my.type_extension6'),
+                    )),
+                )),
             ),
         );
     }
@@ -129,17 +131,9 @@ public function addTaggedTypeExtensionsDataProvider()
      */
     public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
+        $container = $this->createContainerBuilder();
 
-        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension', array(
-            new Reference('service_container'),
-            array(),
-            array(),
-            array(),
-        ));
-
-        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('form.extension', $this->createExtensionDefinition());
         $container->register('my.type_extension', 'stdClass')
             ->addTag('form.type_extension');
 
@@ -148,68 +142,73 @@ public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
 
     public function testAddTaggedGuessers()
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
-
-        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
-        $extDefinition->setArguments(array(
-            new Reference('service_container'),
-            array(),
-            array(),
-            array(),
-        ));
+        $container = $this->createContainerBuilder();
 
         $definition1 = new Definition('stdClass');
         $definition1->addTag('form.type_guesser');
         $definition2 = new Definition('stdClass');
         $definition2->addTag('form.type_guesser');
 
-        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('form.extension', $this->createExtensionDefinition());
         $container->setDefinition('my.guesser1', $definition1);
         $container->setDefinition('my.guesser2', $definition2);
 
         $container->compile();
 
         $extDefinition = $container->getDefinition('form.extension');
-
-        $this->assertSame(array(
-            'my.guesser1',
-            'my.guesser2',
-        ), $extDefinition->getArgument(3));
+        $iteratorArgument = $extDefinition->getArgument(2);
+
+        $this->assertInstanceOf(IteratorArgument::class, $iteratorArgument);
+        $this->assertEquals(
+            new IteratorArgument(array(
+                new Reference('my.guesser1'),
+                new Reference('my.guesser2'),
+            )),
+            $iteratorArgument
+        );
     }
 
     /**
      * @dataProvider privateTaggedServicesProvider
      */
-    public function testPrivateTaggedServices($id, $tagName, $expectedExceptionMessage)
+    public function testPrivateTaggedServices($id, $tagName, array $tagAttributes = array())
     {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new FormPass());
-
-        $extDefinition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
-        $extDefinition->setArguments(array(
-            new Reference('service_container'),
-            array(),
-            array(),
-            array(),
-        ));
+        $container = $this->createContainerBuilder();
 
-        $container->setDefinition('form.extension', $extDefinition);
-        $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
-
-        $this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
+        $container->setDefinition('form.extension', $this->createExtensionDefinition());
+        $container->register($id, 'stdClass')->setPublic(false)->addTag($tagName, $tagAttributes);
 
         $container->compile();
     }
 
     public function privateTaggedServicesProvider()
     {
         return array(
-            array('my.type', 'form.type', 'The service "my.type" must be public as form types are lazy-loaded'),
-            array('my.type_extension', 'form.type_extension', 'The service "my.type_extension" must be public as form type extensions are lazy-loaded'),
-            array('my.guesser', 'form.type_guesser', 'The service "my.guesser" must be public as form type guessers are lazy-loaded'),
+            array('my.type', 'form.type'),
+            array('my.type_extension', 'form.type_extension', array('extended_type' => 'Symfony\Component\Form\Extension\Core\Type\FormType')),
+            array('my.guesser', 'form.type_guesser'),
         );
     }
+
+    private function createContainerBuilder()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new FormPass());
+
+        return $container;
+    }
+
+    private function createExtensionDefinition()
+    {
+        $definition = new Definition('Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension');
+        $definition->setArguments(array(
+            new ServiceLocatorArgument(array()),
+            new IteratorArgument(array()),
+            new IteratorArgument(array()),
+        ));
+
+        return $definition;
+    }
 }
 
 class FormPassTest_Type1 extends AbstractType
 
@@ -11,10 +11,13 @@
 
 namespace Symfony\Component\Form\DependencyInjection;
 
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds all services with the tags "form.type" and "form.type_guesser" as
@@ -47,28 +50,25 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition($this->formExtensionService);
 
+        // Get service locator argument
+        $servicesMap = array();
+        $locator = $definition->getArgument(0);
+        if ($locator instanceof ServiceLocatorArgument) {
+            $servicesMap = $locator->getValues();
+        }
+
         // Builds an array with fully-qualified type class names as keys and service IDs as values
-        $types = array();
         foreach ($container->findTaggedServiceIds($this->formTypeTag) as $serviceId => $tag) {
             $serviceDefinition = $container->getDefinition($serviceId);
-            if (!$serviceDefinition->isPublic()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must be public as form types are lazy-loaded.', $serviceId));
-            }
-
-            // Support type access by FQCN
-            $types[$serviceDefinition->getClass()] = $serviceId;
+            // Add form type service to the service locator
+            $servicesMap[$serviceId] = new Reference($serviceId);
+            $servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);
         }
 
-        $definition->replaceArgument(1, $types);
-
         $typeExtensions = array();
-
         foreach ($this->findAndSortTaggedServices($this->formTypeExtensionTag, $container) as $reference) {
             $serviceId = (string) $reference;
             $serviceDefinition = $container->getDefinition($serviceId);
-            if (!$serviceDefinition->isPublic()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must be public as form type extensions are lazy-loaded.', $serviceId));
-            }
 
             $tag = $serviceDefinition->getTag($this->formTypeExtensionTag);
             if (isset($tag[0]['extended_type'])) {
@@ -80,16 +80,23 @@ public function process(ContainerBuilder $container)
             $typeExtensions[$extendedType][] = $serviceId;
         }
 
-        $definition->replaceArgument(2, $typeExtensions);
+        $allExtensions = array();
+        foreach ($typeExtensions as $extendedType => $extensions) {
+            $allExtensions[$extendedType] = new IteratorArgument(array_map(
+                function ($extensionId) {
+                    return new Reference($extensionId);
+                },
+                $extensions
+            ));
+        }
 
-        $guessers = array_keys($container->findTaggedServiceIds($this->formTypeGuesserTag));
-        foreach ($guessers as $serviceId) {
-            $serviceDefinition = $container->getDefinition($serviceId);
-            if (!$serviceDefinition->isPublic()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must be public as form type guessers are lazy-loaded.', $serviceId));
-            }
+        $guessers = array();
+        foreach (array_keys($container->findTaggedServiceIds($this->formTypeGuesserTag)) as $serviceId) {
+            $guessers[] = new Reference($serviceId);
         }
 
-        $definition->replaceArgument(3, $guessers);
+        $definition->replaceArgument(0, new ServiceLocatorArgument($servicesMap));
+        $definition->replaceArgument(1, new IteratorArgument($allExtensions));
+        $definition->replaceArgument(2, new IteratorArgument($guessers));
     }
 }