This commit fixes two bugs:

- interfaces can now also be defined on containers which are built with an Extension - interface injection can also be used on classes that require constructor arguments
symfony · Dec 10, 2010 · e49cc36 · e49cc36
1 parent cc3a783
commit e49cc36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -241,6 +241,7 @@ public function merge(ContainerBuilder $container)
 
         $this->addDefinitions($container->getDefinitions());
         $this->addAliases($container->getAliases());
+        $this->addInterfaceInjectors($container->getInterfaceInjectors());
         $this->parameterBag->add($container->getParameterBag()->all());
 
         foreach ($container->getResources() as $resource) {

diff --git a/src/Symfony/Component/DependencyInjection/InterfaceInjector.php b/src/Symfony/Component/DependencyInjection/InterfaceInjector.php
@@ -79,8 +79,11 @@ public function processDefinition(Definition $definition, $class = null)
     public function supports($object)
     {
         if (is_string($object)) {
-            $class = new \ReflectionClass($object);
-            $object = $class->newInstance();
+            $reflection = new \ReflectionClass($object);
+
+            return $reflection->implementsInterface($this->class)
+                   || $reflection->isSubClassOf($this->class)
+                   || $object === $this->class;
         }
 
         if ( ! is_object($object)) {