From a09269b6e65425aa1e41d79ababe99706c1a8ea9 Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Mon, 1 Apr 2019 14:34:14 -0500 Subject: [PATCH 1/2] Nette DI fixes Fixes #47 --- extension.neon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension.neon b/extension.neon index 8c976a1e..fa8fa391 100644 --- a/extension.neon +++ b/extension.neon @@ -24,10 +24,10 @@ rules: - PHPStan\Rules\Drupal\PluginManager\PluginManagerSetsCacheBackendRule services: drupal.serviceMapFactory: - class: PHPStan\Drupal\ServiceMapFactoryInterface + class: PHPStan\Drupal\ServiceMapFactory factory: PHPStan\Drupal\ServiceMapFactory(%drupalServiceMap%) - - class: @drupal.serviceMapFactory::create() + factory: @drupal.serviceMapFactory::create() - class: PHPStan\Type\EntityTypeManagerGetStorageDynamicReturnTypeExtension arguments: From 223d878e4da2542b6dd1d654a0c15c1756e699e1 Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Mon, 1 Apr 2019 14:40:52 -0500 Subject: [PATCH 2/2] Temporarily identify nette/di 3.0.0 as a conflict --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 43760144..aee46860 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,11 @@ "squizlabs/php_codesniffer": "^3.3", "phpunit/phpunit": "^7.5" }, + "conflict": { + "nette/di": ">=3.0" + }, + "minimum-stability": "dev", + "prefer-stable": true, "suggest": { "phpstan/phpstan-deprecation-rules": "For catching deprecations, especially in Drupal core." },