Compiler: added addConfig() & loadConfig() as future replacement for parameter $config in compile()

Author: dg

src/DI/Compiler.php

@@ -25,7 +25,7 @@ class Compiler extends Nette\Object
 	private $builder;
 
 	/** @var array */
-	private $config;
+	private $config = array();
 
 	/** @var string[] of file names */
 	private $dependencies = array();
@@ -74,6 +74,30 @@ public function getContainerBuilder()
 	}
 
 
+	/**
+	 * Adds new configuration.
+	 * @return self
+	 */
+	public function addConfig(array $config)
+	{
+		$this->config = Config\Helpers::merge($config, $this->config);
+		return $this;
+	}
+
+
+	/**
+	 * Adds new configuration from file.
+	 * @return self
+	 */
+	public function loadConfig($file)
+	{
+		$loader = new Config\Loader;
+		$this->addConfig($loader->load($file));
+		$this->addDependencies($loader->getDependencies());
+		return $this;
+	}
+
+
 	/**
 	 * Returns configuration.
 	 * @return array
@@ -108,9 +132,9 @@ public function getDependencies()
 	/**
 	 * @return string
 	 */
-	public function compile(array $config, $className, $parentName = NULL)
+	public function compile(array $config = NULL, $className = NULL, $parentName = NULL)
 	{
-		$this->config = $config;
+		$this->config = $config ?: $this->config;
 		$this->processParameters();
 		$this->processExtensions();
 		$this->processServices();

tests/DI/Compiler.config.phpt

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Test: Nette\DI\Compiler and config.
+ */
+
+use Nette\DI,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+$compiler = new DI\Compiler;
+
+Assert::same(
+	array(),
+	$compiler->getConfig()
+);
+
+
+$compiler->addConfig(array(
+	'item1' => 1,
+));
+
+Assert::same(
+	array(
+		'item1' => 1,
+	),
+	$compiler->getConfig()
+);
+
+
+$compiler->loadConfig(Tester\FileMock::create('
+item1: 11
+item2: 2
+', 'neon'));
+
+Assert::same(
+	array(
+		'item1' => 11,
+		'item2' => 2,
+	),
+	$compiler->getConfig()
+);