Make alias resolution recursive

laravel · Jun 14, 2016 · d236b89 · d236b89
1 parent 163efce
commit d236b89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -1062,7 +1062,12 @@ protected function isBuildable($concrete, $abstract)
      */
     protected function getAlias($abstract)
     {
-        return isset($this->aliases[$abstract]) ? $this->aliases[$abstract] : $abstract;
+        if (! isset($this->aliases[$abstract])) {
+            return $abstract;
+        }
+        $abstract = $this->aliases[$abstract];
+
+        return $this->getAlias($abstract);
     }
 
     /**

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -114,8 +114,10 @@ public function testAliases()
         $container = new Container;
         $container['foo'] = 'bar';
         $container->alias('foo', 'baz');
+        $container->alias('baz', 'bat');
         $this->assertEquals('bar', $container->make('foo'));
         $this->assertEquals('bar', $container->make('baz'));
+        $this->assertEquals('bar', $container->make('bat'));
         $container->bind(['bam' => 'boom'], function () {
             return 'pow';
         });