Parameters: all parameters are expanded at once

Author: dg

src/DI/Extensions/DefinitionSchema.php

@@ -48,7 +48,6 @@ public function complete($def, Context $context)
 			}
 		}
 
-		$def = $this->expandParameters($def);
 		$type = $this->sniffType(end($context->path), $def);
 		$def = $this->getSchema($type)->complete($def, $context);
 		if ($def) {
@@ -171,12 +170,6 @@ private function sniffType($key, array $def): string
 	}
 
 
-	private function expandParameters(array $config): array
-	{
-		return Nette\DI\Helpers::expand($config, $this->builder->parameters);
-	}
-
-
 	private static function getSchema(string $type): Schema
 	{
 		static $cache;

src/DI/Extensions/ParametersExtension.php

@@ -44,11 +44,7 @@ public function loadConfiguration(): void
 		}
 
 		$builder->parameters = Helpers::expand($params, $params, recursive: true);
-
-		// expand all except 'services'
-		$slice = array_diff_key($this->compilerConfig, ['services' => 1]);
-		$slice = Helpers::expand($slice, $builder->parameters);
-		$this->compilerConfig = $slice + $this->compilerConfig;
+		$this->compilerConfig = Helpers::expand($this->compilerConfig, $builder->parameters);
 	}