Merge pull request #224 from mglaman/service-alias-shortcut

Handle shortcut service aliasing

Author: mglaman

src/Drupal/DrupalAutoloader.php

@@ -161,6 +161,13 @@ public function register(Container $container): void
                 continue;
             }
             foreach ($yaml['services'] as $serviceId => $serviceDefinition) {
+                // Check if this is an alias shortcut.
+                // @link https://symfony.com/doc/4.4/service_container/alias_private.html#aliasing
+                if (is_string($serviceDefinition)) {
+                    $serviceDefinition = [
+                        'alias' => str_replace('@', '', $serviceDefinition),
+                    ];
+                }
                 // Prevent \Nette\DI\ContainerBuilder::completeStatement from array_walk_recursive into the arguments
                 // and thinking these are real services for PHPStan's container.
                 if (isset($serviceDefinition['arguments']) && is_array($serviceDefinition['arguments'])) {

tests/fixtures/drupal/modules/service_map/service_map.services.yml

@@ -1,3 +1,8 @@
 services:
   service_map.my_service:
     class: Drupal\service_map\MyService
+  GuzzleHttp\Client: '@http_client'
+  Drupal\Core\Config\ConfigFactoryInterface: '@config.factory'
+  Drupal\Core\Messenger\MessengerInterface: '@messenger'
+  Drupal\Core\Logger\LoggerChannelFactory: '@logger.factory'
+  Drupal\Core\Logger\LoggerChannelFactoryInterface: '@logger.factory'