feature #16161 [Validator] Add expressionLanguage to ExpressionValidator constructor (enumag)

fabpot · fabpot · commit cb273537ee34 · 2015-10-19T13:49:28.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Validator] Add expressionLanguage to ExpressionValidator constructor | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 4ad1e20 [Validator] Add expressionLanguage to ExpressionValidator constructor
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -37,18 +37,10 @@ class ExpressionValidator extends ConstraintValidator
      */
     private $expressionLanguage;
 
-    /**
-     * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5
-     *
-     * @throws UnexpectedTypeException If the property accessor is invalid
-     */
-    public function __construct($propertyAccessor = null)
+    public function __construct(PropertyAccessorInterface $propertyAccessor = null, ExpressionLanguage $expressionLanguage = null)
     {
-        if (null !== $propertyAccessor && !$propertyAccessor instanceof PropertyAccessorInterface) {
-            throw new UnexpectedTypeException($propertyAccessor, 'null or \Symfony\Component\PropertyAccess\PropertyAccessorInterface');
-        }
-
         $this->propertyAccessor = $propertyAccessor;
+        $this->expressionLanguage = $expressionLanguage;
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -217,4 +217,28 @@ public function testFailingExpressionAtPropertyLevelWithoutRoot()
             ->setCode(Expression::EXPRESSION_FAILED_ERROR)
             ->assertRaised();
     }
+
+    public function testExpressionLanguageUsage()
+    {
+        $constraint = new Expression(array(
+            'expression' => 'false',
+        ));
+
+        $expressionLanguage = $this->getMock('Symfony\Component\ExpressionLanguage\ExpressionLanguage');
+
+        $used = false;
+
+        $expressionLanguage->method('evaluate')
+            ->will($this->returnCallback(function () use (&$used) {
+                $used = true;
+
+                return true;
+            }));
+
+        $validator = new ExpressionValidator(null, $expressionLanguage);
+        $validator->initialize($this->createContext());
+        $validator->validate(null, $constraint);
+
+        $this->assertTrue($used, 'Failed asserting that custom ExpressionLanguage instance is used.');
+    }
 }
