From d14288bd677df56962d824f44ddf5dedc0ca955c Mon Sep 17 00:00:00 2001 From: Niklan Date: Fri, 24 Jan 2025 19:01:46 +0500 Subject: [PATCH 1/2] Sync DrupalKernel synthetic services --- src/Drupal/DrupalAutoloader.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php index 291b4979..6a6489ab 100644 --- a/src/Drupal/DrupalAutoloader.php +++ b/src/Drupal/DrupalAutoloader.php @@ -12,6 +12,7 @@ use PHPUnit\Framework\Test; use ReflectionClass; use RuntimeException; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Finder\Finder; use Symfony\Component\Yaml\Yaml; use Throwable; @@ -108,7 +109,10 @@ public function register(Container $container): void // Attach synthetic services // @see \Drupal\Core\DrupalKernel::attachSynthetic $this->serviceMap['kernel'] = ['class' => DrupalKernelInterface::class]; + $this->serviceMap[DrupalKernelInterface::class] = ['alias' => 'kernel']; $this->serviceMap['class_loader'] = ['class' => ClassLoader::class]; + $this->serviceMap['service_container'] = ['class' => \Drupal\Component\DependencyInjection\Container::class]; + $this->serviceMap[ContainerInterface::class] = ['alias' => 'service_container']; $extensionDiscovery = new ExtensionDiscovery($this->drupalRoot); $extensionDiscovery->setProfileDirectories([]); From f7032cf87c63ec19a1dd9859f6c155682d1b6d4b Mon Sep 17 00:00:00 2001 From: Niklan Date: Fri, 24 Jan 2025 19:07:35 +0500 Subject: [PATCH 2/2] Add alias for DrupalContainer --- src/Drupal/DrupalAutoloader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php index 6a6489ab..89d5ddb3 100644 --- a/src/Drupal/DrupalAutoloader.php +++ b/src/Drupal/DrupalAutoloader.php @@ -3,6 +3,7 @@ namespace mglaman\PHPStanDrupal\Drupal; use Composer\Autoload\ClassLoader; +use Drupal\Component\DependencyInjection\Container as DrupalContainer; use Drupal\Core\DependencyInjection\ContainerNotInitializedException; use Drupal\Core\DrupalKernelInterface; use Drupal\TestTools\PhpUnitCompatibility\PhpUnit8\ClassWriter; @@ -111,7 +112,7 @@ public function register(Container $container): void $this->serviceMap['kernel'] = ['class' => DrupalKernelInterface::class]; $this->serviceMap[DrupalKernelInterface::class] = ['alias' => 'kernel']; $this->serviceMap['class_loader'] = ['class' => ClassLoader::class]; - $this->serviceMap['service_container'] = ['class' => \Drupal\Component\DependencyInjection\Container::class]; + $this->serviceMap['service_container'] = ['class' => DrupalContainer::class]; $this->serviceMap[ContainerInterface::class] = ['alias' => 'service_container']; $extensionDiscovery = new ExtensionDiscovery($this->drupalRoot);