[DependencyInjection] Add support for aliases of aliases + regression test

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -855,7 +855,11 @@ EOF;
         $code = "        \$this->aliases = array(\n";
         ksort($aliases);
         foreach ($aliases as $alias => $id) {
-            $code .= '            '.var_export($alias, true).' => '.var_export((string) $id, true).",\n";
+            $id = (string) $id;
+            while (isset($aliases[$id])) {
+                $id = (string) $aliases[$id];
+            }
+            $code .= '            '.var_export($alias, true).' => '.var_export($id, true).",\n";
         }
 
         return $code . "        );\n";

src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php

@@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
@@ -182,10 +183,10 @@ class XmlDumper extends Dumper
      * Adds a service alias.
      *
      * @param string      $alias
-     * @param string      $id
+     * @param Alias       $id
      * @param \DOMElement $parent
      */
-    private function addServiceAlias($alias, $id, \DOMElement $parent)
+    private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
     {
         $service = $this->document->createElement('service');
         $service->setAttribute('id', $alias);
@@ -213,7 +214,11 @@ class XmlDumper extends Dumper
             $this->addService($definition, $id, $services);
         }
 
-        foreach ($this->container->getAliases() as $alias => $id) {
+        $aliases = $this->container->getAliases();
+        foreach ($aliases as $alias => $id) {
+            while (isset($aliases[(string) $id])) {
+                $id = $aliases[(string) $id];
+            }
             $this->addServiceAlias($alias, $id, $services);
         }
         $parent->appendChild($services);

src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php

@@ -182,7 +182,11 @@ class YamlDumper extends Dumper
             $code .= $this->addService($id, $definition);
         }
 
-        foreach ($this->container->getAliases() as $alias => $id) {
+        $aliases = $this->container->getAliases();
+        foreach ($aliases as $alias => $id) {
+            while (isset($aliases[(string) $id])) {
+                $id = $aliases[(string) $id];
+            }
             $code .= $this->addServiceAlias($alias, $id);
         }
 

src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

@@ -120,6 +120,20 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testAliases()
+    {
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Aliases')));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Aliases();
+        $container->set('foo', $foo = new \stdClass);
+        $this->assertSame($foo, $container->get('foo'));
+        $this->assertSame($foo, $container->get('alias_for_foo'));
+        $this->assertSame($foo, $container->get('alias_for_alias'));
+    }
+
     public function testOverrideServiceWhenUsingADumpedContainer()
     {
         require_once self::$fixturesPath.'/php/services9.php';

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php

@@ -43,6 +43,7 @@ $container->getParameterBag()->add(array(
     'foo' => 'bar',
 ));
 $container->setAlias('alias_for_foo', 'foo');
+$container->setAlias('alias_for_alias', 'alias_for_foo');
 $container->
     register('method_call1', 'FooClass')->
     setFile(realpath(__DIR__.'/../includes/foo.php'))->

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php

@@ -38,6 +38,7 @@ class ProjectServiceContainer extends Container
             'request' => 'getRequestService',
         );
         $this->aliases = array(
+            'alias_for_alias' => 'foo',
             'alias_for_foo' => 'foo',
         );
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php

@@ -46,6 +46,7 @@ class ProjectServiceContainer extends Container
             'request' => 'getRequestService',
         );
         $this->aliases = array(
+            'alias_for_alias' => 'foo',
             'alias_for_foo' => 'foo',
         );
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml

@@ -74,5 +74,6 @@
       </call>
     </service>
     <service id="alias_for_foo" alias="foo"/>
+    <service id="alias_for_alias" alias="foo"/>
   </services>
 </container>

src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml

@@ -69,3 +69,4 @@ services:
             - [setRequest, ['@?request']]
 
     alias_for_foo: @foo
+    alias_for_alias: @foo