default parameters (wwwDir, appDir, ...) are now overridable in user configs

Previously, parameters from getDefaultParameters() were injected into the
compiler AFTER all user configs, which silently overrode any redefinition
in common.neon. As a result, e.g. `wwwDir: %rootDir%/www` in a config had
no effect when the entry script lived outside %rootDir%/www (CLI scripts,
MCP servers, scheduled tasks).

Fix: snapshot defaults into $defaultParameters at construction. In
generateContainer(), inject defaults BEFORE user configs (overridable),
then inject array_diff_key($staticParameters, $defaultParameters) AFTER
configs as authoritative explicit overrides.

Bookkeeping: setters (setTempDirectory, setDebugMode) route through
addStaticParameters(), which removes the touched keys from $defaultParameters.
That preserves the rule "what user explicitly set wins over configs" even
when the explicit value coincidentally equals the auto-detected default.

The container cache key includes the explicit set so two configurators
with identical $staticParameters but different "user-touched" keys
compile to distinct containers.

Author: dg

src/Bootstrap/Configurator.php

@@ -76,10 +76,13 @@ class Configurator
 	/** @var list<string|array<string, mixed>> */
 	protected array $configs = [];
 
+	/** @var array<string, mixed> */
+	private array $defaultParameters;
+
 
 	public function __construct()
 	{
-		$this->staticParameters = $this->getDefaultParameters();
+		$this->defaultParameters = $this->staticParameters = $this->getDefaultParameters();
 
 		if (class_exists(InstalledVersions::class) // back compatibility
 			&& InstalledVersions::isInstalled('nette/caching')
@@ -100,9 +103,10 @@ public function setDebugMode(bool|string|array $value): static
 			$value = static::detectDebugMode($value);
 		}
 
-		$this->staticParameters['debugMode'] = $value;
-		$this->staticParameters['productionMode'] = !$this->staticParameters['debugMode']; // compatibility
-		return $this;
+		return $this->addStaticParameters([
+			'debugMode' => $value,
+			'productionMode' => !$value, // compatibility
+		]);
 	}
 
 
@@ -117,8 +121,7 @@ public function isDebugMode(): bool
 	 */
 	public function setTempDirectory(string $path): static
 	{
-		$this->staticParameters['tempDir'] = $path;
-		return $this;
+		return $this->addStaticParameters(['tempDir' => $path]);
 	}
 
 
@@ -150,6 +153,7 @@ public function addParameters(array $params): static
 	public function addStaticParameters(array $params): static
 	{
 		$this->staticParameters = DI\Config\Helpers::merge($params, $this->staticParameters);
+		$this->defaultParameters = array_diff_key($this->defaultParameters, $params);
 		return $this;
 	}
 
@@ -305,6 +309,8 @@ public function generateContainer(DI\Compiler $compiler): void
 		$loader = $this->createLoader();
 		$loader->setParameters($this->staticParameters);
 
+		$compiler->addConfig(['parameters' => DI\Helpers::escape($this->defaultParameters)]);
+
 		foreach ($this->configs as $config) {
 			if (is_string($config)) {
 				$compiler->loadConfig($config, $loader);
@@ -313,7 +319,8 @@ public function generateContainer(DI\Compiler $compiler): void
 			}
 		}
 
-		$compiler->addConfig(['parameters' => DI\Helpers::escape($this->staticParameters)]);
+		$explicit = array_diff_key($this->staticParameters, $this->defaultParameters);
+		$compiler->addConfig(['parameters' => DI\Helpers::escape($explicit)]);
 		$compiler->setDynamicParameterNames(array_merge(array_keys($this->dynamicParameters), ['baseUrl']));
 
 		$builder = $compiler->getContainerBuilder();
@@ -344,6 +351,7 @@ protected function generateContainerKey(): array
 	{
 		return [
 			$this->staticParameters,
+			array_diff_key($this->staticParameters, $this->defaultParameters),
 			array_keys($this->dynamicParameters),
 			$this->configs,
 			PHP_VERSION_ID - PHP_RELEASE_VERSION, // minor PHP version

tests/Bootstrap/Configurator.developmentContainer.phpt

@@ -36,9 +36,9 @@ Assert::same([
 	'wwwDir' => __DIR__,
 	'vendorDir' => dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'vendor',
 	'rootDir' => dirname(__DIR__, 2),
+	'consoleMode' => PHP_SAPI === 'cli',
 	'debugMode' => true,
 	'productionMode' => false,
-	'consoleMode' => PHP_SAPI === 'cli',
 	'tempDir' => getTempDir(),
 ], $container->parameters);
 

tests/Bootstrap/Configurator.overrideDefaults.phpt

@@ -0,0 +1,72 @@
+<?php declare(strict_types=1);
+
+use Nette\Bootstrap\Configurator;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('config overrides default wwwDir', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->addConfig([
+		'parameters' => ['wwwDir' => '/from/config'],
+	]);
+	$container = $configurator->createContainer();
+	Assert::same('/from/config', $container->parameters['wwwDir']);
+});
+
+
+test('addStaticParameters wins over config', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->addStaticParameters(['wwwDir' => '/from/static']);
+	$configurator->addConfig([
+		'parameters' => ['wwwDir' => '/from/config'],
+	]);
+	$container = $configurator->createContainer();
+	Assert::same('/from/static', $container->parameters['wwwDir']);
+});
+
+
+test('setTempDirectory wins over config', function () {
+	$tempDir = getTempDir();
+	$configurator = new Configurator;
+	$configurator->setTempDirectory($tempDir);
+	$configurator->addConfig([
+		'parameters' => ['tempDir' => '/from/config'],
+	]);
+	$container = $configurator->createContainer();
+	Assert::same($tempDir, $container->parameters['tempDir']);
+});
+
+
+test('config can reference default parameter', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->addStaticParameters(['rootDir' => '/my/root']);
+	$configurator->addConfig([
+		'parameters' => ['wwwDir' => '%rootDir%/www'],
+	]);
+	$container = $configurator->createContainer();
+	Assert::same('/my/root/www', $container->parameters['wwwDir']);
+});
+
+
+test('setter with default-equivalent value still wins over config', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+
+	// pin debugMode to its current (default) value via the setter
+	$defaultDebugMode = $configurator->isDebugMode();
+	$configurator->setDebugMode($defaultDebugMode);
+
+	// config tries to flip it
+	$configurator->addConfig([
+		'parameters' => ['debugMode' => !$defaultDebugMode],
+	]);
+
+	$container = $configurator->createContainer();
+	Assert::same($defaultDebugMode, $container->parameters['debugMode']);
+});