Nette DI fixes (#49)

mglaman · web-flow · commit 85d29e10c028 · 2019-04-01T14:58:05.000-05:00
* Nette DI fixes Fixes #47 * Temporarily identify nette/di 3.0.0 as a conflict
diff --git 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."
     },
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ rules:`
`24`	`24`	`- PHPStan\Rules\Drupal\PluginManager\PluginManagerSetsCacheBackendRule`
`25`	`25`	`services:`
`26`	`26`	`drupal.serviceMapFactory:`
`27`		`- class: PHPStan\Drupal\ServiceMapFactoryInterface`
	`27`	`+ class: PHPStan\Drupal\ServiceMapFactory`
`28`	`28`	`factory: PHPStan\Drupal\ServiceMapFactory(%drupalServiceMap%)`
`29`	`29`	`-`
`30`		`- class: @drupal.serviceMapFactory::create()`
	`30`	`+ factory: @drupal.serviceMapFactory::create()`
`31`	`31`	`-`
`32`	`32`	`class: PHPStan\Type\EntityTypeManagerGetStorageDynamicReturnTypeExtension`
`33`	`33`	`arguments:`