Deprecated alias setting of form tags

wouterj · wouterj · commit 3a62981201dd · 2015-09-30T14:50:22.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
@@ -34,6 +34,10 @@ public function process(ContainerBuilder $container)
         $types = array();
 
         foreach ($container->findTaggedServiceIds('form.type') as $serviceId => $tag) {
+            // Support type access by FQCN
+            $serviceDefinition = $container->getDefinition($serviceId);
+            $types[$serviceDefinition->getClass()] = $serviceId;
+
             // The following if-else block is deprecated and will be removed
             // in Symfony 3.0
             // Deprecation errors are triggered in the form registry
@@ -42,22 +46,22 @@ public function process(ContainerBuilder $container)
             } else {
                 $types[$serviceId] = $serviceId;
             }
-
-            // Support type access by FQCN
-            $serviceDefinition = $container->getDefinition($serviceId);
-            $types[$serviceDefinition->getClass()] = $serviceId;
         }
 
         $definition->replaceArgument(1, $types);
 
         $typeExtensions = array();
 
         foreach ($container->findTaggedServiceIds('form.type_extension') as $serviceId => $tag) {
-            $alias = isset($tag[0]['alias'])
-                ? $tag[0]['alias']
-                : $serviceId;
+            $extendedType = $serviceId;
+            if (isset($tag[0]['extended_type'])) {
+                $extendedType = $tag[0]['extended_type'];
+            } elseif (isset($tag[0]['alias'])) {
+                @trigger_error('The alias option of the form.type_extension tag is deprecated since version 2.8 and will be removed in 3.0. Use the extended_type option instead.', E_USER_DEPRECATED);
+                $extendedType = $tag[0]['alias'];
+            }
 
-            $typeExtensions[$alias][] = $serviceId;
+            $typeExtensions[$extendedType][] = $serviceId;
         }
 
         $definition->replaceArgument(2, $typeExtensions);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
@@ -68,6 +68,9 @@ public function testAddTaggedTypes()
         ), $extDefinition->getArgument(1));
     }
 
+    /**
+     * @group legacy
+     */
     public function testUseCustomAliasIfSet()
     {
         $container = new ContainerBuilder();
@@ -116,11 +119,11 @@ public function testAddTaggedTypeExtensions()
         ));
 
         $definition1 = new Definition('stdClass');
-        $definition1->addTag('form.type_extension', array('alias' => 'type1'));
+        $definition1->addTag('form.type_extension', array('extended_type' => 'type1'));
         $definition2 = new Definition('stdClass');
-        $definition2->addTag('form.type_extension', array('alias' => 'type1'));
+        $definition2->addTag('form.type_extension', array('extended_type' => 'type1'));
         $definition3 = new Definition('stdClass');
-        $definition3->addTag('form.type_extension', array('alias' => 'type2'));
+        $definition3->addTag('form.type_extension', array('extended_type' => 'type2'));
 
         $container->setDefinition('form.extension', $extDefinition);
         $container->setDefinition('my.type_extension1', $definition1);
@@ -142,6 +145,45 @@ public function testAddTaggedTypeExtensions()
         ), $extDefinition->getArgument(2));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testAliasOptionForTaggedTypeExtensions()
+    {
+        $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(),
+        ));
+
+        $definition1 = new Definition('stdClass');
+        $definition1->addTag('form.type_extension', array('alias' => 'type1'));
+        $definition2 = new Definition('stdClass');
+        $definition2->addTag('form.type_extension', array('alias' => 'type2'));
+
+        $container->setDefinition('form.extension', $extDefinition);
+        $container->setDefinition('my.type_extension1', $definition1);
+        $container->setDefinition('my.type_extension2', $definition2);
+
+        $container->compile();
+
+        $extDefinition = $container->getDefinition('form.extension');
+
+        $this->assertSame(array(
+            'type1' => array(
+                'my.type_extension1',
+            ),
+            'type2' => array(
+                'my.type_extension2',
+            ),
+        ), $extDefinition->getArgument(2));
+    }
+
     public function testAddTaggedGuessers()
     {
         $container = new ContainerBuilder();
