add support for class string service ids

Author: Laytan Laats

src/Type/DrupalServiceDynamicReturnTypeExtension.php

@@ -5,7 +5,9 @@
 use Drupal;
 use mglaman\PHPStanDrupal\Drupal\DrupalServiceDefinition;
 use mglaman\PHPStanDrupal\Drupal\ServiceMap;
+use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\VariadicPlaceholder;
 use PHPStan\Analyser\Scope;
@@ -51,17 +53,29 @@ public function getTypeFromStaticMethodCall(
         if ($arg1 instanceof VariadicPlaceholder) {
             throw new ShouldNotHappenException();
         }
+
         $arg1 = $arg1->value;
-        if (!$arg1 instanceof String_) {
-            // @todo determine what these types are.
-            return $returnType;
+
+        if ($arg1 instanceof String_) {
+            $serviceId = $arg1->value;
+            return $this->getServiceType($serviceId) ?? $returnType;
         }
 
-        $serviceId = $arg1->value;
+        if ($arg1 instanceof ClassConstFetch && $arg1->class instanceof FullyQualified) {
+            $serviceId = (string) $arg1->class;
+            return $this->getServiceType($serviceId) ?? $returnType;
+        }
+
+        return $returnType;
+    }
+
+    protected function getServiceType(string $serviceId): ?Type
+    {
         $service = $this->serviceMap->getService($serviceId);
         if ($service instanceof DrupalServiceDefinition) {
             return $service->getType();
         }
-        return $returnType;
+
+        return null;
     }
 }

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

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

tests/src/Type/data/drupal-service-static.php

@@ -7,4 +7,5 @@
 
 function test(): void {
     assertType(MyService::class, \Drupal::service('service_map.my_service'));
+    assertType(MyService::class, \Drupal::service(MyService::class));
 }