Commit247f0f9

committed

More bullet-proof expression evaluation

In some scenarios evaluating expression can lead to TypeError (unresolved DI params being strings, not expected integers etc).

1 parent594cdf6 commit247f0f9Copy full SHA for 247f0f9

File tree

-2

lines changed

src/Symfony/Component/DependencyInjection/Compiler
- CheckTypeDeclarationsPass.php

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect`
`231`	`231`	`}elseif ($valueinstanceof Expression) {`
`232`	`232`	`try {`
`233`	`233`	`$value =$this->getExpressionLanguage()->evaluate($value, ['container' =>$this->container]);`
`234`		`- }catch (\Exception) {`
	`234`	`+ }catch (\Throwable) {`
`235`	`235`	`// If a service from the expression cannot be fetched from the container, we skip the validation.`
`236`	`236`	`return;`
`237`	`237`	`}`
`@@ -246,7 +246,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect`
`246`	`246`	`if ('' ===preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U','',$value, -1,$c) &&1 ===$c) {`
`247`	`247`	`try {`
`248`	`248`	`$value =$this->container->resolveEnvPlaceholders($value,true);`
`249`		`- }catch (\Exception) {`
	`249`	`+ }catch (\Throwable) {`
`250`	`250`	`// If an env placeholder cannot be resolved, we skip the validation.`
`251`	`251`	`return;`
`252`	`252`	`}`

Comments

(0)