Merge remote branch 'Garfield-fr/master'

* Garfield-fr/master: [Container] Added function array_unique on getServiceIds to return only one service name
2011-04-21 18:31:55 +02:00 · 2011-04-21 18:31:55 +02:00 · 9a2d4c77c3
commit 9a2d4c77c3
parent 7e33159723 7ed8ea25d8
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@ -256,7 +256,7 @@ class Container implements ContainerInterface
            }
        }

-        return array_merge($ids, array_keys($this->services));
+        return array_unique(array_merge($ids, array_keys($this->services)));
    }

    /**