瀏覽代碼

[Validator] Renamed Execute constraint to Callback

Bernhard Schussek 14 年之前
父節點
當前提交
9c6a6e13bf

+ 1 - 1
src/Symfony/Component/Form/Resources/config/validation.xml

@@ -13,7 +13,7 @@
   </class>
 
   <class name="Symfony\Component\Form\Form">
-    <constraint name="Execute">validateData</constraint>
+    <constraint name="Callback">validateData</constraint>
     <property name="fields">
       <constraint name="Valid" />
     </property>

+ 1 - 1
src/Symfony/Component/Validator/Constraints/Execute.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-class Execute extends \Symfony\Component\Validator\Constraint
+class Callback extends \Symfony\Component\Validator\Constraint
 {
     public $methods;
 

+ 3 - 3
src/Symfony/Component/Validator/Constraints/ExecuteValidator.php

@@ -17,11 +17,11 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 /**
- * Validator for Execute constraint
+ * Validator for Callback constraint
  *
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
-class ExecuteValidator extends ConstraintValidator
+class CallbackValidator extends ConstraintValidator
 {
     public function isValid($object, Constraint $constraint)
     {
@@ -40,7 +40,7 @@ class ExecuteValidator extends ConstraintValidator
 
         foreach ($methods as $method) {
             if (!method_exists($object, $method)) {
-                throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Execute constraint does not exist', $method));
+                throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist', $method));
             }
 
             $object->$method($context);

+ 12 - 12
tests/Symfony/Tests/Component/Validator/Constraints/ExecuteValidatorTest.php

@@ -14,10 +14,10 @@ namespace Symfony\Tests\Component\Validator;
 use Symfony\Component\Validator\ExecutionContext;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\Constraints\Execute;
-use Symfony\Component\Validator\Constraints\ExecuteValidator;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Constraints\CallbackValidator;
 
-class ExecuteValidatorTest_Object
+class CallbackValidatorTest_Object
 {
     public function validateOne(ExecutionContext $context)
     {
@@ -35,7 +35,7 @@ class ExecuteValidatorTest_Object
     }
 }
 
-class ExecuteValidatorTest extends \PHPUnit_Framework_TestCase
+class CallbackValidatorTest extends \PHPUnit_Framework_TestCase
 {
     protected $validator;
     protected $walker;
@@ -52,20 +52,20 @@ class ExecuteValidatorTest extends \PHPUnit_Framework_TestCase
         $this->context->setGroup('InitialGroup');
         $this->context->setPropertyPath('initial.property.path');
 
-        $this->validator = new ExecuteValidator();
+        $this->validator = new CallbackValidator();
         $this->validator->initialize($this->context);
     }
 
     public function testNullIsValid()
     {
-        $this->assertTrue($this->validator->isValid(null, new Execute('foo')));
+        $this->assertTrue($this->validator->isValid(null, new Callback('foo')));
     }
 
-    public function testExecuteSingleMethod()
+    public function testCallbackSingleMethod()
     {
-        $object = new ExecuteValidatorTest_Object();
+        $object = new CallbackValidatorTest_Object();
 
-        $this->assertTrue($this->validator->isValid($object, new Execute('validateOne')));
+        $this->assertTrue($this->validator->isValid($object, new Callback('validateOne')));
 
         $violations = new ConstraintViolationList();
         $violations->add(new ConstraintViolation(
@@ -83,11 +83,11 @@ class ExecuteValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('initial.property.path', $this->context->getPropertyPath());
     }
 
-    public function testExecuteMultipleMethods()
+    public function testCallbackMultipleMethods()
     {
-        $object = new ExecuteValidatorTest_Object();
+        $object = new CallbackValidatorTest_Object();
 
-        $this->assertTrue($this->validator->isValid($object, new Execute(array(
+        $this->assertTrue($this->validator->isValid($object, new Callback(array(
             'validateOne', 'validateTwo'
         ))));