Compiler, CompilerExtension: improved Loader extendability (#62)

src/DI/Compiler.php

@@ -105,9 +105,9 @@ public function addConfig(array $config)
 	 * Adds new configuration from file.
 	 * @return static
 	 */
-	public function loadConfig(string $file)
+	public function loadConfig(string $file, Config\Loader $loader = NULL)
 	{
-		$loader = new Config\Loader;
+		$loader = $loader ?: new Config\Loader;
 		$this->addConfig($loader->load($file));
 		$this->dependencies->add($loader->getDependencies());
 		return $this;

src/DI/CompilerExtension.php

@@ -90,13 +90,19 @@ public function getContainerBuilder(): ContainerBuilder
 	 */
 	public function loadFromFile(string $file): array
 	{
-		$loader = new Config\Loader;
+		$loader = $this->createLoader();
 		$res = $loader->load($file);
 		$this->compiler->addDependencies($loader->getDependencies());
 		return $res;
 	}
 
 
+	protected function createLoader(): Config\Loader
+	{
+		return new Config\Loader;
+	}
+
+
 	/**
 	 * Prepend extension name to identifier or service name.
 	 */

tests/DI/CompilerExtension.loadFromFile.phpt

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Test: Nette\DI\CompilerExtension::loadFromFile()
+ */
+
+use Nette\DI;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class MyExtension extends Nette\DI\CompilerExtension
+{
+}
+
+
+test(function () {
+	$ext = new MyExtension;
+	$ext->setCompiler(new DI\Compiler, 'my');
+	$res = $ext->loadFromFile(__DIR__ . '/files/compilerExtension.loadFromFile.neon');
+	Assert::equal([
+		'services' => [
+			'one' => [
+				'class' => 'Ipsum',
+			],
+		],
+	], $res);
+});

tests/DI/files/compilerExtension.loadFromFile.neon

@@ -0,0 +1,3 @@
+services:
+	one:
+		class: Ipsum