Handle aliases before parent resolving in service map (#583)

Author: mglaman

src/Drupal/ServiceMap.php

@@ -25,21 +25,16 @@ public function setDrupalServices(array $drupalServices): void
         self::$services = [];
 
         foreach ($drupalServices as $serviceId => $serviceDefinition) {
+            if (isset($serviceDefinition['alias'], $drupalServices[$serviceDefinition['alias']])) {
+                $serviceDefinition = $drupalServices[$serviceDefinition['alias']];
+            }
             if (isset($serviceDefinition['parent'], $drupalServices[$serviceDefinition['parent']])) {
                 $serviceDefinition = $this->resolveParentDefinition($serviceDefinition['parent'], $serviceDefinition, $drupalServices);
             }
 
             // @todo support factories
             if (!isset($serviceDefinition['class'])) {
-                if (isset($serviceDefinition['alias'], $drupalServices[$serviceDefinition['alias']])) {
-                    $aliasedService = $drupalServices[$serviceDefinition['alias']];
-
-                    if (isset($aliasedService['class'])) {
-                        $serviceDefinition['class'] = $drupalServices[$serviceDefinition['alias']]['class'];
-                    } elseif (class_exists($serviceDefinition['alias'])) {
-                        $serviceDefinition['class'] = $serviceDefinition['alias'];
-                    }
-                } elseif (class_exists($serviceId)) {
+                if (class_exists($serviceId)) {
                     $serviceDefinition['class'] = $serviceId;
                 } else {
                     continue;

tests/src/ServiceMapFactoryTest.php

@@ -2,6 +2,7 @@
 
 namespace mglaman\PHPStanDrupal\Tests;
 
+use Drupal\Core\Logger\LoggerChannel;
 use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
 use mglaman\PHPStanDrupal\Drupal\ServiceMap;
 use PHPUnit\Framework\TestCase;
@@ -81,6 +82,18 @@ public function testFactory(string $id, callable $validator): void
                 'class' => 'Drupal\service_map\Concrete',
                 'public' => true,
             ],
+            'logger.channel_base' => [
+                'abstract' => true,
+                'class' => LoggerChannel::class,
+                'factory' => ['@logger.factory', 'get'],
+            ],
+            'logger.channel.workspaces' => [
+                'parent' => 'logger.channel_base',
+                'arguments' => ['workspaces'],
+            ],
+            'Psr\Log\LoggerInterface $loggerWorkspaces' => [
+                'alias' => 'logger.channel.workspaces'
+            ]
         ]);
         $validator($service->getService($id));
     }
@@ -112,7 +125,7 @@ function (?DrupalServiceDefinition $service): void {
         yield [
             'config.storage.sync',
             function (DrupalServiceDefinition $service): void {
-                self::assertEquals('config.storage.staging', $service->getAlias());
+                self::assertEquals('Drupal\Core\Config\FileStorage', $service->getClass());
             }
         ];
         yield [
@@ -193,6 +206,12 @@ function (DrupalServiceDefinition $service): void {
                 self::assertNull($service->getAlias());
             }
         ];
+        yield [
+            'Psr\Log\LoggerInterface $loggerWorkspaces',
+            function (DrupalServiceDefinition $service): void {
+                self::assertEquals(LoggerChannel::class, $service->getClass());
+            }
+        ];
     }
 
 }