bug #37009 [Validator] use "allowedVariables" to configure the Expres…

…sionLanguageSyntax constraint (xabbuh) This PR was merged into the 5.1 branch. Discussion ---------- [Validator] use "allowedVariables" to configure the ExpressionLanguageSyntax constraint | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Fix symfony/symfony-docs#13669 | License | MIT | Doc PR | Commits ------- 4807dab [Validator] use "allowedVariables" to configure the ExpressionLanguageSyntax constraint
symfony · May 30, 2020 · af444f8 · af444f8
2 parents 3e05f1d + 4807dab
commit af444f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntax.php
@@ -29,8 +29,7 @@ class ExpressionLanguageSyntax extends Constraint
 
     public $message = 'This value should be a valid expression.';
     public $service;
-    public $validateNames = true;
-    public $names = [];
+    public $allowedVariables = null;
 
     /**
      * {@inheritdoc}

diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 /**
  * @author Andrey Sevastianov <mrpkmail@gmail.com>
@@ -39,15 +40,15 @@ public function validate($expression, Constraint $constraint): void
         }
 
         if (!\is_string($expression)) {
-            throw new UnexpectedTypeException($expression, 'string');
+            throw new UnexpectedValueException($expression, 'string');
         }
 
         if (null === $this->expressionLanguage) {
             $this->expressionLanguage = new ExpressionLanguage();
         }
 
         try {
-            $this->expressionLanguage->lint($expression, ($constraint->validateNames ? ($constraint->names ?? []) : null));
+            $this->expressionLanguage->lint($expression, $constraint->allowedVariables);
         } catch (SyntaxError $exception) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ syntax_error }}', $this->formatValue($exception->getMessage()))

diff --git a/...straints/ExpressionLanguageSyntaxTest.php → ...ExpressionLanguageSyntaxValidatorTest.php b/...straints/ExpressionLanguageSyntaxTest.php → ...ExpressionLanguageSyntaxValidatorTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Validator\Constraints\ExpressionLanguageSyntaxValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class ExpressionLanguageSyntaxTest extends ConstraintValidatorTestCase
+class ExpressionLanguageSyntaxValidatorTest extends ConstraintValidatorTestCase
 {
     /**
      * @var \PHPUnit\Framework\MockObject\MockObject|ExpressionLanguage
@@ -45,6 +45,7 @@ public function testExpressionValid(): void
 
         $this->validator->validate($this->value, new ExpressionLanguageSyntax([
             'message' => 'myMessage',
+            'allowedVariables' => [],
         ]));
 
         $this->assertNoViolation();
@@ -58,7 +59,6 @@ public function testExpressionWithoutNames(): void
 
         $this->validator->validate($this->value, new ExpressionLanguageSyntax([
             'message' => 'myMessage',
-            'validateNames' => false,
         ]));
 
         $this->assertNoViolation();
@@ -73,6 +73,7 @@ public function testExpressionIsNotValid(): void
 
         $this->validator->validate($this->value, new ExpressionLanguageSyntax([
             'message' => 'myMessage',
+            'allowedVariables' => [],
         ]));
 
         $this->buildViolation('myMessage')