Loader: add includes recursive limitation [Closes #164][Closes #162]

Author: trejjam

src/DI/Config/Loader.php

@@ -30,6 +30,8 @@ class Loader
 
 	private $dependencies = [];
 
+	private $loadedFiles = [];
+
 
 	/**
 	 * Reads configuration from file.
@@ -39,6 +41,12 @@ public function load(string $file): array
 		if (!is_file($file) || !is_readable($file)) {
 			throw new Nette\FileNotFoundException("File '$file' is missing or is not readable.");
 		}
+
+		if (isset($this->loadedFiles[$file])) {
+			throw new Nette\InvalidStateException("Recursive included file '$file'");
+		}
+		$this->loadedFiles[$file] = true;
+
 		$this->dependencies[] = $file;
 		$data = $this->getAdapter($file)->load($file);
 
@@ -52,7 +60,8 @@ public function load(string $file): array
 				$merged = Helpers::merge($this->load($include), $merged);
 			}
 		}
-		unset($data[self::INCLUDES_KEY]);
+		unset($data[self::INCLUDES_KEY], $this->loadedFiles[$file]);
+
 
 		return Helpers::merge($data, $merged);
 	}

tests/DI/Loader.recursiveInclude.phpt

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Test: Nette\DI\Config\Loader max includes nesting.
+ */
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+$compiler = new DI\Config\Loader();
+
+Assert::exception(function () use ($compiler) {
+	$compiler->load('files/loader.recursiveInclude.neon');
+}, \Nette\InvalidStateException::class, "Recursive included file 'files/loader.recursiveInclude.neon'");

tests/DI/files/loader.recursiveInclude.neon

@@ -0,0 +1,2 @@
+includes:
+	- loader.recursiveInclude.neon