Commitf22ebf9

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 parent1a7bf06 commitf22ebf9Copy full SHA for f22ebf9

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
`@@ -228,7 +228,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect`
`228`	`228`	`}elseif ($valueinstanceof Expression) {`
`229`	`229`	`try {`
`230`	`230`	`$value =$this->getExpressionLanguage()->evaluate($value, ['container' =>$this->container]);`
`231`		`- }catch (\Exception) {`
	`231`	`+ }catch (\Throwable$e) {`
`232`	`232`	`// If a service from the expression cannot be fetched from the container, we skip the validation.`
`233`	`233`	`return;`
`234`	`234`	`}`
`@@ -243,7 +243,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect`
`243`	`243`	`if ('' ===preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U','',$value, -1,$c) &&1 ===$c) {`
`244`	`244`	`try {`
`245`	`245`	`$value =$this->container->resolveEnvPlaceholders($value,true);`
`246`		`- }catch (\Exception) {`
	`246`	`+ }catch (\Throwable) {`
`247`	`247`	`// If an env placeholder cannot be resolved, we skip the validation.`
`248`	`248`	`return;`
`249`	`249`	`}`

Comments

(0)