Skip to content

Commit d2ab255

Browse files
jderussefabpot
authored andcommitted
Make ExpressionLanguageSyntax validator usable with annotation
1 parent 929544d commit d2ab255

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Constraints/ExpressionLanguageSyntax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ class ExpressionLanguageSyntax extends Constraint
3737
*/
3838
public function validatedBy()
3939
{
40-
return $this->service;
40+
return $this->service ?? static::class.'Validator';
4141
}
4242
}

Constraints/ExpressionLanguageSyntaxValidator.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ExpressionLanguageSyntaxValidator extends ConstraintValidator
2424
{
2525
private $expressionLanguage;
2626

27-
public function __construct(ExpressionLanguage $expressionLanguage)
27+
public function __construct(ExpressionLanguage $expressionLanguage = null)
2828
{
2929
$this->expressionLanguage = $expressionLanguage;
3030
}
@@ -42,6 +42,10 @@ public function validate($expression, Constraint $constraint): void
4242
throw new UnexpectedTypeException($expression, 'string');
4343
}
4444

45+
if (null === $this->expressionLanguage) {
46+
$this->expressionLanguage = new ExpressionLanguage();
47+
}
48+
4549
try {
4650
$this->expressionLanguage->lint($expression, ($constraint->validateNames ? ($constraint->names ?? []) : null));
4751
} catch (SyntaxError $exception) {

0 commit comments

Comments
 (0)