If a (non-global) instanceof does not exist, throw an exception

Author: weaverryan

src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php

@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
  * Applies instanceof conditionals to definitions.
@@ -40,7 +41,6 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
     {
         $instanceofConditionals = $definition->getInstanceofConditionals();
         $automaticInstanceofConditionals = $definition->isAutoconfigured() ? $container->getAutomaticInstanceofDefinitions() : array();
-
         if (!$instanceofConditionals && !$automaticInstanceofConditionals) {
             return $definition;
         }
@@ -49,14 +49,14 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
             return $definition;
         }
 
-        $conditionals = $this->mergeConditionals($automaticInstanceofConditionals, $instanceofConditionals);
+        $conditionals = $this->mergeConditionals($automaticInstanceofConditionals, $instanceofConditionals, $container);
 
         $definition->setInstanceofConditionals(array());
         $parent = $shared = null;
         $instanceofTags = array();
 
         foreach ($conditionals as $interface => $instanceofDefs) {
-            if ($interface !== $class && (!$container->getReflectionClass($interface) || !$container->getReflectionClass($class))) {
+            if ($interface !== $class && (!$container->getReflectionClass($class))) {
                 continue;
             }
 
@@ -113,12 +113,17 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
         return $definition;
     }
 
-    private function mergeConditionals(array $automaticInstanceofConditionals, array $instanceofConditionals)
+    private function mergeConditionals(array $automaticInstanceofConditionals, array $instanceofConditionals, ContainerBuilder $container)
     {
         // make each value an array of ChildDefinition
-        $conditionals = array_map(function($childDef) { return array($childDef); }, $automaticInstanceofConditionals);
+        $conditionals = array_map(function ($childDef) { return array($childDef); }, $automaticInstanceofConditionals);
 
         foreach ($instanceofConditionals as $interface => $instanceofDef) {
+            // make sure the interface/class exists (but don't validate automaticInstanceofConditionals)
+            if (!$container->getReflectionClass($interface)) {
+                throw new RuntimeException(sprintf('"%s" is set as an "instanceof" conditional, but it does not exist.', $interface));
+            }
+
             if (!isset($automaticInstanceofConditionals[$interface])) {
                 $conditionals[$interface] = array();
             }

src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php

@@ -154,4 +154,32 @@ public function testProcessDoesNotUseAutomaticInstanceofDefinitionsIfNotEnabled(
         // no automatic_tag, it was not enabled on the Definition
         $this->assertFalse($def->isAutowired());
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage "App\FakeInterface" is set as an "instanceof" conditional, but it does not exist.
+     */
+    public function testBadInterfaceThrowsException()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('normal_service', self::class);
+        $def->setInstanceofConditionals(array(
+            'App\\FakeInterface' => (new ChildDefinition(''))
+                ->addTag('foo_tag'),
+        ));
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+    }
+
+    public function testBadInterfaceForAutomaticInstanceofIsOkException()
+    {
+        $container = new ContainerBuilder();
+        $container->register('normal_service', self::class)
+            ->setAutoconfigured(true);
+        $container->registerForAutoconfiguration('App\\FakeInterface')
+            ->setAutowired(true);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+        $this->assertTrue($container->hasDefinition('normal_service'));
+    }
 }