parameters added via addParameters() has higher priority (BC break) (#56

)
nette · Mar 26, 2019 · e1075af · e1075af
1 parent 1e78977
commit e1075af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Bootstrap/Configurator.php b/src/Bootstrap/Configurator.php
@@ -250,9 +250,6 @@ public function loadContainer(): string
 	 */
 	public function generateContainer(DI\Compiler $compiler): void
 	{
-		$compiler->addConfig(['parameters' => $this->parameters]);
-		$compiler->setDynamicParameterNames(array_keys($this->dynamicParameters));
-
 		$loader = $this->createLoader();
 		$loader->setParameters($this->parameters);
 
@@ -264,6 +261,9 @@ public function generateContainer(DI\Compiler $compiler): void
 			}
 		}
 
+		$compiler->addConfig(['parameters' => $this->parameters]);
+		$compiler->setDynamicParameterNames(array_keys($this->dynamicParameters));
+
 		$builder = $compiler->getContainerBuilder();
 		$builder->addExcludedClasses($this->autowireExcludedClasses);
 

diff --git a/tests/Bootstrap/Configurator.basic.phpt b/tests/Bootstrap/Configurator.basic.phpt
@@ -20,15 +20,15 @@ $configurator->setTempDirectory(TEMP_DIR);
 $configurator->addParameters([
 	'wwwDir' => 'overwritten', // overwrites default value
 	'foo2' => '%foo%',         // uses parameter from config file
-	'foo3' => '%foo%',         // will be overwritten by config file
+	'foo3' => '%foo%',         // will overwrite config file
 ]);
 $container = $configurator->addConfig('files/configurator.basic.neon')
 	->createContainer();
 
 Assert::same('overwritten', $container->parameters['wwwDir']);
 Assert::same('hello world', $container->parameters['foo']);
 Assert::same('hello world', $container->parameters['foo2']);
-Assert::same('overwritten', $container->parameters['foo3']);
+Assert::same('hello world', $container->parameters['foo3']);
 Assert::same('hello', $container->parameters['bar']);
 Assert::same('hello world', constant('BAR'));
 Assert::same('Europe/Prague', date_default_timezone_get());