fixed including extension.neon from phpstan.phar

nette/di#153
fprochazka · May 5, 2017 · 0cd7738 · 0cd7738 · lookyman · May 5, 2017
1 parent 321fc3d
commit 0cd7738
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/patches/nette/di/include-scheme.patch b/patches/nette/di/include-scheme.patch
@@ -0,0 +1,13 @@
+diff --git i/src/DI/Config/Loader.php w/src/DI/Config/Loader.php
+index 6e0ce50..03a728e 100644
+--- i/src/DI/Config/Loader.php
++++ w/src/DI/Config/Loader.php
+@@ -48,7 +48,7 @@
+ 		if (isset($data[self::INCLUDES_KEY])) {
+ 			Validators::assert($data[self::INCLUDES_KEY], 'list', "section 'includes' in file '$file'");
+ 			foreach ($data[self::INCLUDES_KEY] as $include) {
+-				if (!preg_match('#([a-z]:)?[/\\\\]#Ai', $include)) {
++				if (!preg_match('#([a-z]+:)?[/\\\\]#Ai', $include)) {
+ 					$include = dirname($file) . '/' . $include;
+ 				}
+ 				$merged = Helpers::merge($this->load($include), $merged);
diff --git a/src/Compiler/Compiler.php b/src/Compiler/Compiler.php
@@ -67,6 +67,12 @@ class Compiler
 							'url' => self::PATCHES_DIR . '/nikic/php-parser/prefixing.patch',
 						],
 					],
+					'nette/di' => [
+						[
+							'title' => 'Fixed including of paths with scheme in config loader',
+							'url' => self::PATCHES_DIR . '/nette/di/include-scheme.patch',
+						],
+					],
 				],
 			],
 		],