Remove conflicts against nette/di ^3.0 (#73)

PHPStan has an indirect dependency against nette/di^3.0 due to nette/schema, this fixes our code and requires nette/di:^3.0

Author: mglaman

composer.json

@@ -12,7 +12,8 @@
         "php": "^7.1",
         "phpstan/phpstan": "^0.11",
         "symfony/yaml": "~3.4.5|^4.2",
-        "webflo/drupal-finder": "^1.1"
+        "webflo/drupal-finder": "^1.1",
+        "nette/di": "^3.0"
     },
     "require-dev": {
         "phpstan/phpstan-strict-rules": "^0.11",
@@ -23,9 +24,6 @@
         "drupal/core": "^8.6",
         "drush/drush": "^9.6"
     },
-    "conflict": {
-        "nette/di": ">=3.0"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "suggest": {

phpstan.neon

@@ -1,4 +1,5 @@
 includes:
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 parameters:
 	level: 7

src/DependencyInjection/DrupalExtension.php

@@ -59,7 +59,7 @@ class DrupalExtension extends CompilerExtension
     public function loadConfiguration(): void
     {
         /** @var array */
-        $config = Helpers::merge($this->config, $this->defaultConfig);
+        $config = Nette\Schema\Helpers::merge($this->config, $this->defaultConfig);
 
         $finder = new DrupalFinder();
 
@@ -87,12 +87,12 @@ public function loadConfiguration(): void
 
         $builder = $this->getContainerBuilder();
         foreach ($builder->getDefinitions() as $definition) {
-            $factory = $definition->getFactory();
-            if ($factory === null) {
-                continue;
-            }
-            if ($factory->entity === RequireParentConstructCallRule::class) {
-                $definition->setFactory(EnhancedRequireParentConstructCallRule::class);
+            if ($definition instanceof Nette\DI\Definitions\FactoryDefinition) {
+                $resultDefinition = $definition->getResultDefinition();
+                $factory = $resultDefinition->getFactory();
+                if ($factory->entity === RequireParentConstructCallRule::class) {
+                    $resultDefinition->setFactory(EnhancedRequireParentConstructCallRule::class);
+                }
             }
         }
 

tests/src/DeprecationRulesTest.php

@@ -24,14 +24,18 @@ public function dataDeprecatedSamples(): \Generator
             2,
             [
                 '\Drupal calls should be avoided in classes, use dependency injection instead',
-                'Call to deprecated method url() of class Drupal.'
+                'Call to deprecated method url() of class Drupal:
+as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+Instead create a \Drupal\Core\Url object directly, for example using
+Url::fromRoute().'
             ]
         ];
         yield [
             __DIR__ . '/../fixtures/drupal/core/lib/Drupal/Core/Entity/EntityManager.php',
             1,
             [
-                'Class Drupal\Core\Entity\EntityManager implements deprecated interface Drupal\Core\Entity\EntityManagerInterface.'
+                'Class Drupal\Core\Entity\EntityManager implements deprecated interface Drupal\Core\Entity\EntityManagerInterface:
+in Drupal 8.0.0, will be removed before Drupal 9.0.0.'
             ]
         ];
     }