Replace classResolver extension for generics

Author: mglaman

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^1.6.0",
         "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0",
         "webflo/drupal-finder": "^1.2"
     },

extension.neon

@@ -264,9 +264,6 @@ services:
 	-
 		class: mglaman\PHPStanDrupal\Type\ContainerDynamicReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
-	-
-		class: mglaman\PHPStanDrupal\Type\DrupalClassResolverDynamicReturnTypeExtension
-		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 	-
 		class: mglaman\PHPStanDrupal\Type\EntityQuery\EntityQueryDynamicReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
@@ -282,9 +279,6 @@ services:
 	-
 		class: mglaman\PHPStanDrupal\Type\EntityAccessControlHandlerReturnTypeExtension
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
-	-
-		class: mglaman\PHPStanDrupal\Type\DrupalClassResolverDynamicStaticReturnTypeExtension
-		tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]
 	-
 		class: mglaman\PHPStanDrupal\Type\DrupalServiceDynamicReturnTypeExtension
 		tags: [phpstan.broker.dynamicStaticMethodReturnTypeExtension]

src/Type/DrupalClassResolverDynamicReturnTypeExtension.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\Core\DependencyInjection;
+
+interface ClassResolverInterface {
+
+    /**
+     * @template T of object
+     * @param class-string<T> $definition
+     * @return T
+     */
+    public function getInstanceFromDefinition(string $definition): object;
+}

src/Type/DrupalClassResolverDynamicStaticReturnTypeExtension.php

@@ -0,0 +1,13 @@
+<?php
+
+class Drupal {
+
+    /**
+     * @template T of object
+     * @param ?class-string<T> $class
+     * @return ($class is null ? \Drupal\Core\DependencyInjection\ClassResolverInterface : T)
+     */
+    public static function classResolver(?string $class = NULL) {
+
+    }
+}