|
@@ -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'
|
|
|
))));
|
|
|
|