Merge pull request #99 from ondrejmirtes/phpstan-0.12-fixes

Small PR for PHPStan 0.12 upgrade

Author: mglaman

extension.neon

@@ -12,13 +12,14 @@ parameters:
 		- profile
 		- engine
 	drupal:
+		drupal_root: null
 		entityTypeStorageMapping:
 			node: Drupal\node\NodeStorage
 			taxonomy_term: Drupal\taxonomy\TermStorage
 			user: Drupal\user\UserStorage
 parametersSchema:
 	drupal: structure([
-		drupal_root: string()
+		drupal_root: schema(string(), nullable())
 		entityTypeStorageMapping: arrayOf(string())
 	])
 rules:

phpstan.neon

@@ -2,6 +2,6 @@ includes:
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 parameters:
-	level: 7
+	level: 8
 	checkGenericClassInNonGenericObjectType: false
 	checkMissingIterableValueType: false

src/Drupal/DrupalAutoloader.php

@@ -63,13 +63,9 @@ class DrupalAutoloader
     public function register(Container $container): void
     {
         $startPath = null;
-        $drupalParams = $container->hasParameter('drupal') ? $container->getParameter('drupal') : [
-          'drupal_root' => null,
-          'serviceMap' => [],
-          'entityTypeStorageMapping' => [],
-        ];
-        $drupalRoot = $drupalParams['drupal_root'];
-        if (realpath($drupalRoot) !== false && is_dir($drupalRoot)) {
+        $drupalParams = $container->getParameter('drupal');
+        $drupalRoot = $drupalParams['drupal_root'] ?? null;
+        if ($drupalRoot !== null && realpath($drupalRoot) !== false && is_dir($drupalRoot)) {
             $startPath = $drupalRoot;
         } else {
             $startPath = dirname($GLOBALS['autoloaderInWorkingDirectory']);