symfony
diff --git a/‎src/Symfony/Component/Form/DependencyInjection/FormPass.php
Lines changed: 4 additions & 10 deletions b/‎src/Symfony/Component/Form/DependencyInjection/FormPass.php
Lines changed: 4 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
Lines changed: 1 addition & 1 deletion
@@ -88,26 +88,20 @@ private function processFormTypeExtensions(ContainerBuilder $container)
                 throw new InvalidArgumentException(sprintf('"%s" tagged services must have the extended type configured using the extended_type/extended-type attribute, none was configured for the "%s" service.', $this->formTypeExtensionTag, $serviceId));
             }
 
-            $typeExtensions[$extendedType][] = $serviceId;
+            $typeExtensions[$extendedType][] = new Reference($serviceId);
         }
 
-        $allExtensions = array();
         foreach ($typeExtensions as $extendedType => $extensions) {
-            $allExtensions[$extendedType] = new IteratorArgument(array_map(
-                function ($extensionId) {
-                    return new Reference($extensionId);
-                },
-                $extensions
-            ));
+            $typeExtensions[$extendedType] = new IteratorArgument($typeExtensions[$extendedType]);
         }
 
-        return $allExtensions;
+        return $typeExtensions;
     }
 
     private function processFormTypeGuessers(ContainerBuilder $container)
     {
         $guessers = array();
-        foreach (array_keys($container->findTaggedServiceIds($this->formTypeGuesserTag)) as $serviceId) {
+        foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag) as $serviceId => $tags) {
             $guessers[] = new Reference($serviceId);
         }
 
 
@@ -31,7 +31,7 @@ class DependencyInjectionExtension implements FormExtensionInterface
      *
      * @param ContainerInterface $typeContainer
      * @param iterable[]         $typeExtensionServices
-     * @param array|\Traversable $guesserServices
+     * @param iterable           $guesserServices
      */
     public function __construct(ContainerInterface $typeContainer, array $typeExtensionServices, $guesserServices, array $guesserServiceIds = null)
     {
@@ -48,6 +48,7 @@ public function __construct(ContainerInterface $typeContainer, array $typeExtens
 
     public function getType($name)
     {
+        // BC - this "if" block must be removed in Symfony 4.0
         if (null !== $this->guesserServiceIds) {
             if (!isset($this->typeServiceIds[$name])) {
                 throw new InvalidArgumentException(sprintf('The field type "%s" is not registered in the service container.', $name));
@@ -65,6 +66,7 @@ public function getType($name)
 
     public function hasType($name)
     {
+        // BC - this "if" block must be removed in Symfony 4.0
         if (null !== $this->guesserServiceIds) {
             return isset($this->typeServiceIds[$name]);
         }
@@ -78,6 +80,7 @@ public function getTypeExtensions($name)
 
         if (isset($this->typeExtensionServices[$name])) {
             foreach ($this->typeExtensionServices[$name] as $extensionId => $extension) {
+                // BC - this "if" block must be removed in Symfony 4.0
                 if (is_string($extension)) {
                     $extensionId = $extension;
                     $extension = $this->typeContainer->get($extension);
@@ -113,6 +116,7 @@ public function getTypeGuesser()
             $guessers = array();
 
       
8000
      foreach ($this->guesserServices as $serviceId => $service) {
+                // BC - this "if" block must be removed in Symfony 4.0
                 if (is_string($service)) {
                     $serviceId = $service;
                     $service = $this->typeContainer->get($serviceId);
 
@@ -14,10 +14,10 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Form\DependencyInjection\FormPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Form\AbstractType;
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -88,26 +88,20 @@ private function processFormTypeExtensions(ContainerBuilder $container)`
`88`	`88`	`throw new InvalidArgumentException(sprintf('"%s" tagged services must have the extended type configured using the extended_type/extended-type attribute, none was configured for the "%s" service.', $this->formTypeExtensionTag, $serviceId));`
`89`	`89`	`}`
`90`	`90`
`91`		`- $typeExtensions[$extendedType][] = $serviceId;`
	`91`	`+ $typeExtensions[$extendedType][] = new Reference($serviceId);`
`92`	`92`	`}`
`93`	`93`
`94`		`- $allExtensions = array();`
`95`	`94`	`foreach ($typeExtensions as $extendedType => $extensions) {`
`96`		`- $allExtensions[$extendedType] = new IteratorArgument(array_map(`
`97`		`- function ($extensionId) {`
`98`		`- return new Reference($extensionId);`
`99`		`- },`
`100`		`- $extensions`
`101`		`- ));`
	`95`	`+ $typeExtensions[$extendedType] = new IteratorArgument($typeExtensions[$extendedType]);`
`102`	`96`	`}`
`103`	`97`
`104`		`- return $allExtensions;`
	`98`	`+ return $typeExtensions;`
`105`	`99`	`}`
`106`	`100`
`107`	`101`	`private function processFormTypeGuessers(ContainerBuilder $container)`
`108`	`102`	`{`
`109`	`103`	`$guessers = array();`
`110`		`- foreach (array_keys($container->findTaggedServiceIds($this->formTypeGuesserTag)) as $serviceId) {`
	`104`	`+ foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag) as $serviceId => $tags) {`
`111`	`105`	`$guessers[] = new Reference($serviceId);`
`112`	`106`	`}`
`113`	`107`