rework compile, evaluate

symfony · verdet23 · Aug 2, 2022 · Aug 4, 2022 · Aug 8, 2022 · Aug 9, 2022
commit 4f48c40a1fdb966bc1633bde4aaaf3b7a9bb9d54
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageProvider.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageProvider.php
@@ -11,10 +11,8 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use LogicException;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Define some ExpressionLanguage functions.
@@ -23,26 +21,16 @@
  */
 class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 {
-    private ExecutionContextInterface $context;
-
-    public function __construct(ExecutionContextInterface $context)
-    {
-        $this->context = $context;
-    }
-
     public function getFunctions(): array
     {
         return [
-            new ExpressionFunction('is_valid', function () {
-                throw new LogicException('The "is_valid" function cannot be compiled.');
+            new ExpressionFunction('is_valid', function (...$arguments) {
+                return sprintf(
+                    '0 === $context->getValidator()->inContext($context)->validate(%s)->getViolations()->count()',
+                    implode(', ', $arguments)
+                );
             }, function (array $variables, ...$arguments): bool {
-                $context = $this->context;
-
-                $validator = $context->getValidator()->inContext($context);
-
-                $violations = $validator->validate(...$arguments)->getViolations();
-
-                return 0 === $violations->count();
+                return 0 === $variables['context']->getValidator()->inContext($variables['context'])->validate(...$arguments)->getViolations()->count();
             }),
         ];
     }

diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -41,6 +41,7 @@ public function validate(mixed $value, Constraint $constraint)
         $variables = $constraint->values;
         $variables['value'] = $value;
         $variables['this'] = $this->context->getObject();
+        $variables['context'] = $this->context;
 
         if ($constraint->negate xor $this->getExpressionLanguage()->evaluate($constraint->expression, $variables)) {
             $this->context->buildViolation($constraint->message)
@@ -57,7 +58,7 @@ private function getExpressionLanguage(): ExpressionLanguage
         }
 
         if (false === $this->expressionLanguage->hasFunctionByName('is_valid')) {
-            $this->expressionLanguage->registerProvider(new ExpressionLanguageProvider($this->context));
+            $this->expressionLanguage->registerProvider(new ExpressionLanguageProvider());
         }
 
         return $this->expressionLanguage;

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionLanguageProviderTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionLanguageProviderTest.php
@@ -11,7 +11,6 @@
 
 namespace Constraints;
 
-use LogicException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Validator\Constraints\ExpressionLanguageProvider;
@@ -24,19 +23,35 @@
 
 class ExpressionLanguageProviderTest extends TestCase
 {
-    public function testCompile(): void
+    /**
+     * @dataProvider dataProviderCompile
+     */
+    public function testCompile(string $expression, array $names, string $expected): void
     {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The "is_valid" function cannot be compiled.');
-
-        $context = $this->createMock(ExecutionContextInterface::class);
-
-        $provider = new ExpressionLanguageProvider($context);
+        $provider = new ExpressionLanguageProvider();
 
         $expressionLanguage = new ExpressionLanguage();
         $expressionLanguage->registerProvider($provider);
 
-        $expressionLanguage->compile('is_valid()');
+        $result = $expressionLanguage->compile($expression, $names);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function dataProviderCompile(): array
+    {
+        return [
+            [
+                'is_valid("foo", constraints)',
+                ['constraints'],
+                '0 === $context->getValidator()->inContext($context)->validate("foo", $constraints)->getViolations()->count()',
+            ],
+            [
+                'is_valid(this.data, constraints, groups)',
+                ['this', 'constraints', 'groups'],
+                '0 === $context->getValidator()->inContext($context)->validate($this->data, $constraints, $groups)->getViolations()->count()',
+            ]
+        ];
     }
 
     /**
@@ -80,12 +95,15 @@ public function testEvaluate(bool $expected, int $errorsCount): void
             ->with($context)
             ->willReturn($contextualValidator);
 
-        $provider = new ExpressionLanguageProvider($context);
+        $provider = new ExpressionLanguageProvider();
 
         $expressionLanguage = new ExpressionLanguage();
         $expressionLanguage->registerProvider($provider);
 
-        $this->assertSame($expected, $expressionLanguage->evaluate('is_valid("foo", a)', ['a' => $constraints]));
+        $this->assertSame(
+            $expected,
+            $expressionLanguage->evaluate('is_valid("foo", a)', ['a' => $constraints, 'context' => $context])
+        );
     }
 
     public function dataProviderEvaluate(): array