Skip to content

[Validator] Make ExpressionLanguageSyntax validator usable with annotation #36886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 1 commit into from
May 22, 2020
+6 −2
Merged

[Validator] Make ExpressionLanguageSyntax validator usable with annotation #36886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ class ExpressionLanguageSyntax extends Constraint
*/
public function validatedBy()
{
return $this->service;
return $this->service ?? static::class.'Validator';
}
}
6 changes: 5 additions & 1 deletion src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ExpressionLanguageSyntaxValidator extends ConstraintValidator
{
private $expressionLanguage;

public function __construct(ExpressionLanguage $expressionLanguage)
public function __construct(ExpressionLanguage $expressionLanguage = null)
{
$this->expressionLanguage = $expressionLanguage;
}
Expand All @@ -42,6 +42,10 @@ public function validate($expression, Constraint $constraint): void
throw new UnexpectedTypeException($expression, 'string');
}

if (null === $this->expressionLanguage) {
$this->expressionLanguage = new ExpressionLanguage();
}

try {
$this->expressionLanguage->lint($expression, ($constraint->validateNames ? ($constraint->names ?? []) : null));
} catch (SyntaxError $exception) {
Expand Down