Revert "Responsibility for loading config files moved from ContainerFactory to Compiler (BC break)"

This reverts commit 5b7f9b9.

Author: dg

src/DI/Compiler.php

@@ -29,7 +29,7 @@ class Compiler extends Nette\Object
 	private $builder;
 
 	/** @var array */
-	private $config = array();
+	private $config;
 
 	/** @var array reserved section names */
 	private static $reserved = array('services' => 1, 'factories' => 1, 'parameters' => 1);
@@ -75,27 +75,6 @@ public function getContainerBuilder()
 	}
 
 
-	/**
-	 * Sets configuration.
-	 * @param array
-	 * @param array [file => section]
-	 * @return ContainerBuilder
-	 */
-	public function setConfig(array $config, array $files = NULL)
-	{
-		$this->config = array();
-		$loader = new Config\Loader;
-		foreach ($files as $info) {
-			$this->config = Config\Helpers::merge($loader->load($info[0], $info[1]), $this->config);
-		}
-		foreach ($loader->getDependencies() as $file) {
-			$this->builder->addDependency($file);
-		}
-		$this->config = Config\Helpers::merge($this->config, $config);
-		return $this;
-	}
-
-
 	/**
 	 * Returns configuration.
 	 * @return array
@@ -109,9 +88,9 @@ public function getConfig()
 	/**
 	 * @return string
 	 */
-	public function compile(array $config = NULL, $className, $parentName = NULL)
+	public function compile(array $config, $className, $parentName = NULL)
 	{
-		$this->config = $config ?: $this->config;
+		$this->config = $config;
 		$this->processParameters();
 		$this->processExtensions();
 		$this->processServices();

src/DI/ContainerFactory.php

@@ -66,14 +66,14 @@ public function create()
 	protected function generateCode()
 	{
 		$compiler = $this->createCompiler();
-		$compiler->setConfig($this->config, $this->configFiles);
-		$this->onCompile($this, $compiler, $compiler->getConfig());
+		$config = $this->generateConfig();
+		$this->onCompile($this, $compiler, $config);
 
 		$code = "<?php\n";
 		foreach ($this->configFiles as $info) {
 			$code .= "// source: $info[0] $info[1]\n";
 		}
-		$code .= "\n" . $compiler->compile(NULL, $this->class, $this->parentClass);
+		$code .= "\n" . $compiler->compile($config, $this->class, $this->parentClass);
 
 		if ($this->autoRebuild !== 'compat') { // back compatibility
 			$this->dependencies = array_merge($this->dependencies, $compiler->getContainerBuilder()->getDependencies());
@@ -82,6 +82,22 @@ protected function generateCode()
 	}
 
 
+	/**
+	 * @return array
+	 */
+	protected function generateConfig()
+	{
+		$config = array();
+		$loader = $this->createLoader();
+		foreach ($this->configFiles as $info) {
+			$config = Config\Helpers::merge($loader->load($info[0], $info[1]), $config);
+		}
+		$this->dependencies = array_merge($this->dependencies, $loader->getDependencies());
+
+		return Config\Helpers::merge($config, $this->config);
+	}
+
+
 	/**
 	 * @return void
 	 */