Fixing a bug where class_alias would cause incorrect items in debug:a…

…utowiring

src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php

@@ -103,9 +103,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $serviceIdsNb = 0;
         foreach ($serviceIds as $serviceId) {
             $text = [];
+            $resolvedServiceId = $serviceId;
             if (0 !== strpos($serviceId, $previousId)) {
                 $text[] = '';
-                if ('' !== $description = Descriptor::getClassDescription($serviceId, $serviceId)) {
+                if ('' !== $description = Descriptor::getClassDescription($serviceId, $resolvedServiceId)) {
                     if (isset($hasAlias[$serviceId])) {
                         continue;
                     }

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ClassAliasExampleClass.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class_alias(
+    ClassAliasTargetClass::class,
+    __NAMESPACE__ . '\ClassAliasExampleClass'
+);
+
+if (false) {
+    class ClassAliasExampleClass
+    {
+    }
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ClassAliasTargetClass.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class ClassAliasTargetClass
+{
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php

@@ -97,4 +97,16 @@ public function testSearchNotAliasedServiceWithAll()
         $tester->run(['command' => 'debug:autowiring', 'search' => 'redirect', '--all' => true]);
         $this->assertStringContainsString('Pro-tip: use interfaces in your type-hints instead of classes to benefit from the dependency inversion principle.', $tester->getDisplay());
     }
+
+    public function testNotConfusedByClassAliases()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias', '--all' => true]);
+        $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass (public)', $tester->getDisplay());
+    }
 }

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml

@@ -13,6 +13,7 @@ services:
         public: false
     Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass:
         class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass: '@public'
     env:
         class: stdClass
         arguments: