Merge pull request #92 from mglaman/phpstan-0.12

Bump to PHPStan 0.12

Author: mglaman

README.md

@@ -83,18 +83,20 @@ includes:
 
 By default, the PHPStan Drupal extension will try to determine your Drupal project's root directory based on the working
 directory that PHPStan is checking. If this is not working properly, you can explicitly define the Drupal project's root
-directory using the `drupal_root` parameter.
+directory using the `drupal.drupal_root` parameter.
 
 ```
-drupal:
-    drupal_root: /path/to/drupal
+parameters:
+    drupal:
+        drupal_root: /path/to/drupal
 ```
 
 You can also use container parameters. For instance you can always set it to the current working directory.
 
 ```
-drupal:
-    drupal_root: %currentWorkingDirectory%
+parameters:
+    drupal:
+        drupal_root: %currentWorkingDirectory%
 ```
 
 ### Entity storage mappings.
@@ -104,19 +106,21 @@ passed entity type ID and tries to return a known storage class, besides the def
 default mapping can be found in `extension.neon`. For example:
 
 ```
-drupal:
-	entityTypeStorageMapping:
-		node: Drupal\node\NodeStorage
-		taxonomy_term: Drupal\taxonomy\TermStorage
-		user: Drupal\user\UserStorage
+parameters:
+    drupal:
+        entityTypeStorageMapping:
+            node: Drupal\node\NodeStorage
+            taxonomy_term: Drupal\taxonomy\TermStorage
+            user: Drupal\user\UserStorage
 ```
 
 To add support for custom entities, you may add the same definition in your project's `phpstan.neon`. See the following
 example for adding a mapping for Search API:
 
 ```
-drupal:
-	entityTypeStorageMapping:
-		search_api_index: Drupal\search_api\Entity\SearchApiConfigEntityStorage
-		search_api_server: Drupal\search_api\Entity\SearchApiConfigEntityStorage
+parameters:
+    drupal:
+        entityTypeStorageMapping:
+            search_api_index: Drupal\search_api\Entity\SearchApiConfigEntityStorage
+            search_api_server: Drupal\search_api\Entity\SearchApiConfigEntityStorage
 ```

composer.json

@@ -11,24 +11,20 @@
     ],
     "require": {
         "php": "^7.1",
-        "phpstan/phpstan": "~0.11.0",
+        "nette/finder": "^2.5",
+        "phpstan/phpstan": "^0.12.0",
         "symfony/yaml": "~3.4.5|^4.2",
-        "webflo/drupal-finder": "^1.2",
-        "nette/di": "^3.0"
+        "webflo/drupal-finder": "^1.2"
     },
     "require-dev": {
-        "phpstan/phpstan-strict-rules": "~0.11.0",
+        "phpstan/phpstan-strict-rules": "^0.12.0",
         "squizlabs/php_codesniffer": "^3.3",
         "phpunit/phpunit": "^7.5",
-        "phpstan/phpstan-deprecation-rules": "~0.11.0",
+        "phpstan/phpstan-deprecation-rules": "~0.12.0",
         "composer/installers": "^1.6",
         "drupal/core-recommended": "^8.8@alpha",
         "drush/drush": "^9.6"
     },
-    "conflict": {
-        "phpstan/phpstan": ">=0.12",
-        "phpstan/phpstan-deprecation-rules": ">=0.12"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "suggest": {

drupal-autoloader.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+use PHPStan\DependencyInjection\Container;
+use PHPStan\Drupal\DrupalAutoloader;
+
+assert($container instanceof Container);
+if ($container === NULL && !($container instanceof Container)) {
+    throw new \PHPStan\ShouldNotHappenException('The autoloader did not receive the container.');
+}
+
+if (!defined('DRUPAL_TEST_IN_CHILD_SITE')) {
+    define('DRUPAL_TEST_IN_CHILD_SITE', false);
+}
+
+$drupalAutoloader = new DrupalAutoloader();
+$drupalAutoloader->register($container);

extension.neon

@@ -1,4 +1,6 @@
 parameters:
+	autoload_files:
+		- drupal-autoloader.php
 	excludes_analyse:
 		- *.api.php
 		- */tests/fixtures/*.php
@@ -9,25 +11,27 @@ parameters:
 		- install
 		- profile
 		- engine
-extensions:
-	drupal: PHPStan\DependencyInjection\DrupalExtension
-drupal:
-	entityTypeStorageMapping:
-		node: Drupal\node\NodeStorage
-		taxonomy_term: Drupal\taxonomy\TermStorage
-		user: Drupal\user\UserStorage
+	drupal:
+		drupal_root: null
+		entityTypeStorageMapping:
+			node: Drupal\node\NodeStorage
+			taxonomy_term: Drupal\taxonomy\TermStorage
+			user: Drupal\user\UserStorage
+parametersSchema:
+	drupal: structure([
+		drupal_root: schema(string(), nullable())
+		entityTypeStorageMapping: arrayOf(string())
+	])
 rules:
 	- PHPStan\Rules\Classes\PluginManagerInspectionRule
 	- PHPStan\Rules\Drupal\Coder\DiscouragedFunctionsRule
 	- PHPStan\Rules\Drupal\GlobalDrupalDependencyInjectionRule
 	- PHPStan\Rules\Drupal\PluginManager\PluginManagerSetsCacheBackendRule
 	- PHPStan\Rules\Deprecations\AccessDeprecatedConstant
 services:
-	drupal.serviceMapFactory:
-		class: PHPStan\Drupal\ServiceMapFactory
-		factory: PHPStan\Drupal\ServiceMapFactory(%drupalServiceMap%)
 	-
-		factory: @drupal.serviceMapFactory::create()
+		class: PHPStan\Drupal\ServiceMap
+
 	-
 		class: PHPStan\Type\EntityTypeManagerGetStorageDynamicReturnTypeExtension
 		arguments:

phpstan-bootstrap.php

@@ -2,4 +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