From def217b320fea0a974afbf750088c472e9b7f8eb Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 28 Sep 2023 18:04:17 +0200 Subject: [PATCH] ParametersExtension: generates 'match' --- src/DI/Extensions/ParametersExtension.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DI/Extensions/ParametersExtension.php b/src/DI/Extensions/ParametersExtension.php index d47a1f559..0622b73f7 100644 --- a/src/DI/Extensions/ParametersExtension.php +++ b/src/DI/Extensions/ParametersExtension.php @@ -87,14 +87,14 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class) $class->addMember($getAll); $resolver = new Nette\DI\Resolver($builder); $generator = new Nette\DI\PhpGenerator($builder); - $getOne->addBody('switch (true) {'); + $getOne->addBody('return match($key) {'); foreach ($this->dynamicParams as $key => $foo) { $value = Nette\DI\Helpers::expand($this->config[$key] ?? null, $builder->parameters); $value = $resolver->completeArguments(Nette\DI\Helpers::filterArguments([$value])); - $getOne->addBody("\tcase \$key === ?: return ?;", [$key, $generator->convertArguments($value)[0]]); + $getOne->addBody("\t? => ?,", [$key, $generator->convertArguments($value)[0]]); $getAll->addBody('$this->getParameter(?);', [$key]); } - $getOne->addBody("\tdefault: parent::getDynamicParameter(\$key);\n};"); + $getOne->addBody("\tdefault => parent::getDynamicParameter(\$key),\n};"); $getAll->addBody('return parent::getParameters();'); foreach ($this->dynamicValidators as [$param, $expected]) {