Loader: fixed including of paths with scheme in config loader (#153)

fprochazka · dg · commit e8187b3592c4 · 2017-09-01T00:43:21.000+02:00
diff --git a/src/DI/Config/Loader.php b/src/DI/Config/Loader.php
@@ -48,7 +48,7 @@ public function load(string $file): array
 		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);

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function load(string $file): array`
`48`	`48`	`if (isset($data[self::INCLUDES_KEY])) {`
`49`	`49`	`Validators::assert($data[self::INCLUDES_KEY], 'list', "section 'includes' in file '$file'");`
`50`	`50`	`foreach ($data[self::INCLUDES_KEY] as $include) {`
`51`		`- if (!preg_match('#([a-z]:)?[/\\\\]#Ai', $include)) {`
	`51`	`+ if (!preg_match('#([a-z]+:)?[/\\\\]#Ai', $include)) {`
`52`	`52`	`$include = dirname($file) . '/' . $include;`
`53`	`53`	`}`
`54`	`54`	`$merged = Helpers::merge($this->load($include), $merged);`