[DI] Reported cascades of autowiring error messages

nicolas-grekas · nicolas-grekas · commit 90a4f6907260 · 2017-04-06T23:57:10.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -30,6 +30,7 @@ class AutowirePass extends AbstractRecursivePass
     private $types;
     private $ambiguousServiceTypes = array();
     private $autowired = array();
+    private $lastFailure;
 
     /**
      * {@inheritdoc}
@@ -77,21 +78,19 @@ protected function processValue($value, $isRoot = false)
     {
         if ($value instanceof TypedReference) {
             if ($ref = $this->getAutowiredReference($value)) {
-                $value = $ref;
-            } else {
-                $this->container->log($this, $this->createTypeNotFoundMessage($value->getType(), 'typed reference'));
+                return $ref;
             }
+            $this->container->log($this, $this->createTypeNotFoundMessage($value->getType(), 'it'));
         }
-        if (!$value instanceof Definition) {
-            return parent::processValue($value, $isRoot);
-        }
-        if (!$value->isAutowired() || $value->isAbstract() || !$value->getClass()) {
-            return parent::processValue($value, $isRoot);
+        $value = parent::processValue($value, $isRoot);
+
+        if (!$value instanceof Definition || !$value->isAutowired() || $value->isAbstract() || !$value->getClass()) {
+            return $value;
         }
         if (!$reflectionClass = $this->container->getReflectionClass($value->getClass())) {
             $this->container->log($this, sprintf('Skipping service "%s": Class or interface "%s" does not exist.', $this->currentId, $value->getClass()));
 
-            return parent::processValue($value, $isRoot);
+            return $value;
         }
 
         $autowiredMethods = $this->getMethodsToAutowire($reflectionClass);
@@ -115,7 +114,7 @@ protected function processValue($value, $isRoot = false)
             $value->setMethodCalls($methodCalls);
         }
 
-        return parent::processValue($value, $isRoot);
+        return $value;
     }
 
     /**
@@ -246,9 +245,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
                 if ($parameter->isDefaultValueAvailable()) {
                     $value = $parameter->getDefaultValue();
-                } elseif ($parameter->allowsNull()) {
-                    $value = null;
-                } else {
+                } elseif (!$parameter->allowsNull()) {
                     throw new RuntimeException($failureMessage);
                 }
                 $this->container->log($this, $failureMessage);
@@ -279,6 +276,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
      */
     private function getAutowiredReference(TypedReference $reference)
     {
+        $this->lastFailure = null;
         $type = $reference->getType();
 
         if ($type !== (string) $reference || ($this->container->has($type) && !$this->container->findDefinition($type)->isAbstract())) {
@@ -406,6 +404,7 @@ private function createAutowiredDefinition($type)
             $this->container->setDefinition($argumentId, $argumentDefinition);
         } catch (RuntimeException $e) {
             $this->autowired[$type] = false;
+            $this->lastFailure = ' - '.$e->getMessage();
             $this->container->log($this, $e->getMessage());
 
             return;
@@ -427,7 +426,14 @@ private function createTypeNotFoundMessage($type, $label)
             $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $this->createTypeAlternatives($type));
         }
 
-        return sprintf('Cannot autowire service "%s": %s %s', $this->currentId, $label, $message);
+        $message = sprintf('Cannot autowire service "%s": %s %s', $this->currentId, $label, $message);
+
+        if (null !== $this->lastFailure) {
+            $message = $this->lastFailure."\n - ".$message;
+            $this->lastFailure = null;
+        }
+
+        return $message;
     }
 
     private function createTypeAlternatives($type)
