[DependencyInjection] Improve autowiring errors when named autowiring aliases exist

Author: nicolas-grekas

Compiler/AutowirePass.php

@@ -33,6 +33,7 @@ class AutowirePass extends AbstractRecursivePass
 {
     private $types;
     private $ambiguousServiceTypes;
+    private $autowiringAliases;
     private $lastFailure;
     private $throwOnAutowiringException;
     private $decoratedClass;
@@ -343,10 +344,15 @@ private function populateAvailableTypes(ContainerBuilder $container)
     {
         $this->types = [];
         $this->ambiguousServiceTypes = [];
+        $this->autowiringAliases = [];
 
         foreach ($container->getDefinitions() as $id => $definition) {
             $this->populateAvailableType($container, $id, $definition);
         }
+
+        foreach ($container->getAliases() as $id => $alias) {
+            $this->populateAutowiringAlias($id);
+        }
     }
 
     /**
@@ -370,6 +376,8 @@ private function populateAvailableType(ContainerBuilder $container, string $id,
         do {
             $this->set($reflectionClass->name, $id);
         } while ($reflectionClass = $reflectionClass->getParentClass());
+
+        $this->populateAutowiringAlias($id);
     }
 
     /**
@@ -459,6 +467,10 @@ private function createTypeAlternatives(ContainerBuilder $container, TypedRefere
         }
 
         $servicesAndAliases = $container->getServiceIds();
+        if (null !== ($autowiringAliases = $this->autowiringAliases[$type] ?? null) && !isset($autowiringAliases[''])) {
+            return sprintf(' Available autowiring aliases for this %s are: "$%s".', class_exists($type, false) ? 'class' : 'interface', implode('", "$', $autowiringAliases));
+        }
+
         if (!$container->has($type) && false !== $key = array_search(strtolower($type), array_map('strtolower', $servicesAndAliases))) {
             return sprintf(' Did you mean "%s"?', $servicesAndAliases[$key]);
         } elseif (isset($this->ambiguousServiceTypes[$type])) {
@@ -497,4 +509,18 @@ private function getAliasesSuggestionForType(ContainerBuilder $container, string
 
         return null;
     }
+
+    private function populateAutowiringAlias(string $id): void
+    {
+        if (!preg_match('/(?(DEFINE)(?<V>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))^((?&V)(?:\\\\(?&V))*+)(?: \$((?&V)))?$/', $id, $m)) {
+            return;
+        }
+
+        $type = $m[2];
+        $name = $m[3] ?? '';
+
+        if (class_exists($type, false) || interface_exists($type, false)) {
+            $this->autowiringAliases[$type][$name] = $name;
+        }
+    }
 }