Clean up service map and remove legacy extension

Author: mglaman

extension.neon

@@ -12,15 +12,13 @@ parameters:
 		- profile
 		- engine
 	drupal:
-		serviceMap: {}
 		entityTypeStorageMapping:
 			node: Drupal\node\NodeStorage
 			taxonomy_term: Drupal\taxonomy\TermStorage
 			user: Drupal\user\UserStorage
 parametersSchema:
 	drupal: structure([
 		drupal_root: string()
-		serviceMap: listOf(string())
 		entityTypeStorageMapping: arrayOf(string())
 	])
 rules:
@@ -30,11 +28,9 @@ rules:
 	- PHPStan\Rules\Drupal\PluginManager\PluginManagerSetsCacheBackendRule
 	- PHPStan\Rules\Deprecations\AccessDeprecatedConstant
 services:
-	drupal.serviceMapFactory:
-		class: PHPStan\Drupal\ServiceMapFactory
-		factory: PHPStan\Drupal\ServiceMapFactory(%drupal.serviceMap%)
 	-
-		factory: @drupal.serviceMapFactory::create()
+		class: PHPStan\Drupal\ServiceMap
+
 	-
 		class: PHPStan\Type\EntityTypeManagerGetStorageDynamicReturnTypeExtension
 		arguments:

phpstan.neon

@@ -3,3 +3,5 @@ includes:
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 parameters:
 	level: 7
+	checkGenericClassInNonGenericObjectType: false
+	checkMissingIterableValueType: false

src/DependencyInjection/DrupalExtension.php

@@ -6,16 +6,10 @@
 use DrupalFinder\DrupalFinder;
 use Nette\Utils\Finder;
 use PHPStan\DependencyInjection\Container;
+use Symfony\Component\Yaml\Yaml;
 
 class DrupalAutoloader
 {
-    /**
-     * @var array
-     */
-    protected $defaultConfig = [
-        'modules' => [],
-        'themes' => [],
-    ];
 
     /**
      * @var \Composer\Autoload\ClassLoader
@@ -42,14 +36,19 @@ class DrupalAutoloader
     protected $themeData = [];
 
     /**
-     * @var array
+     * @var array<array<string, string>>
      */
-    private $modules = [];
+    private $serviceMap = [];
 
     /**
-     * @var array
+     * @var array<string, string>
      */
-    private $themes = [];
+    private $serviceYamls = [];
+
+    /**
+     * @var array<string, string>
+     */
+    private $serviceClassProviders = [];
 
     /**
      * @var ?\PHPStan\Drupal\ExtensionDiscovery
@@ -88,6 +87,10 @@ public function register(Container $container): void
 
         $this->autoloader = include $drupalVendorRoot . '/autoload.php';
 
+        $this->serviceYamls['core'] = $drupalRoot . '/core/core.services.yml';
+        $this->serviceClassProviders['core'] = '\Drupal\Core\CoreServiceProvider';
+        $this->serviceMap['service_provider.core.service_provider'] = ['class' => $this->serviceClassProviders['core']];
+
         $this->extensionDiscovery = new ExtensionDiscovery($this->drupalRoot);
         $this->extensionDiscovery->setProfileDirectories([]);
         $profiles = $this->extensionDiscovery->scan('profile');
@@ -156,6 +159,45 @@ public function register(Container $container): void
                 }
             }
         }
+
+        foreach ($this->serviceYamls as $extension => $serviceYaml) {
+            $yaml = Yaml::parseFile($serviceYaml);
+            // Weed out service files which only provide parameters.
+            if (!isset($yaml['services']) || !is_array($yaml['services'])) {
+                continue;
+            }
+            foreach ($yaml['services'] as $serviceId => $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'])) {
+                    array_walk($serviceDefinition['arguments'], function (&$argument) : void {
+                        if (is_array($argument)) {
+                            // @todo fix for @http_kernel.controller.argument_metadata_factory
+                            $argument = '';
+                        } else {
+                            $argument = str_replace('@', '', $argument);
+                        }
+                    });
+                }
+                // @todo sanitize "calls" and "configurator" and "factory"
+                /**
+                jsonapi.params.enhancer:
+                class: Drupal\jsonapi\Routing\JsonApiParamEnhancer
+                calls:
+                - [setContainer, ['@service_container']]
+                tags:
+                - { name: route_enhancer }
+                 */
+                unset($serviceDefinition['tags'], $serviceDefinition['calls'], $serviceDefinition['configurator'], $serviceDefinition['factory']);
+                $this->serviceMap[$serviceId] = $serviceDefinition;
+            }
+        }
+
+        $service_map = $container->getByType(ServiceMap::class);
+        assert($service_map instanceof ServiceMap);
+        // @todo this is not updating the reference in the container.
+        $service_map->setDrupalServices($this->serviceMap);
+
     }
 
     protected function loadLegacyIncludes(): void
@@ -216,6 +258,18 @@ protected function addModuleNamespaces(): void
                     }
                 }
             }
+
+            $servicesFileName = $module_dir . '/' . $module_name . '.services.yml';
+            if (file_exists($servicesFileName)) {
+                $this->serviceYamls[$module_name] = $servicesFileName;
+            }
+            $camelized = $this->camelize($module_name);
+            $name = "{$camelized}ServiceProvider";
+            $class = "Drupal\\{$module_name}\\{$name}";
+
+            $this->serviceClassProviders[$module_name] = $class;
+            $serviceId = "service_provider.$module_name.service_provider";
+            $this->serviceMap[$serviceId] = ['class' => $class];
         }
     }
     protected function addThemeNamespaces(): void
@@ -261,4 +315,9 @@ protected function loadAndCatchErrors(string $path): void
             @trigger_error("$path failed loading due to {$e->getMessage()}", E_USER_WARNING);
         }
     }
+
+    protected function camelize(string $id): string
+    {
+        return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
+    }
 }

src/Drupal/DrupalAutoloader.php

@@ -7,11 +7,12 @@ class ServiceMap
     /** @var \PHPStan\Drupal\DrupalServiceDefinition[] */
     private $services;
 
-    /**
-     * ServiceMap constructor.
-     * @param array $drupalServices
-     */
-    public function __construct(array $drupalServices)
+    public function getService(string $id): ?DrupalServiceDefinition
+    {
+        return $this->services[$id] ?? null;
+    }
+
+    public function setDrupalServices(array $drupalServices): void
     {
         $this->services = [];
 
@@ -32,9 +33,4 @@ public function __construct(array $drupalServices)
             );
         }
     }
-
-    public function getService(string $id): ?DrupalServiceDefinition
-    {
-        return $this->services[$id] ?? null;
-    }
 }

src/Drupal/ServiceMap.php

@@ -98,7 +98,7 @@ private function inspectYamlPluginManager(Node\Stmt\Class_ $class): array
     {
         $errors = [];
 
-        $fqn = (string)$class->namespacedName;
+        $fqn = $class->namespacedName;
         $reflection = new \ReflectionClass($fqn);
         $constructor = $reflection->getConstructor();
 

src/Drupal/ServiceMapFactory.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\Broker;
 use PHPStan\Reflection\DeprecatableReflection;
+use PHPStan\Reflection\FunctionReflection;
 
 class AccessDeprecatedConstant implements \PHPStan\Rules\Rule
 {
@@ -33,7 +34,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
         $function = $scope->getFunction();
-        if ($function instanceof DeprecatableReflection && $function->isDeprecated()) {
+        if ($function instanceof FunctionReflection && $function->isDeprecated()->yes()) {
             return [];
         }