From e440690bb496c5d32bb892ef23714d6d9e407e3e Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Wed, 19 Feb 2014 20:20:50 +0100 Subject: [PATCH] [Validator] Renamed validateCollection() to validateObjects() --- .../Tests/Validator/Abstract2Dot5ApiTest.php | 6 +++--- .../Tests/Validator/AbstractLegacyApiTest.php | 4 ++-- .../Tests/Validator/AbstractValidatorTest.php | 12 ++++++------ .../Validator/Validator/ContextualValidator.php | 4 ++-- .../Validator/ContextualValidatorInterface.php | 2 +- .../Component/Validator/Validator/Validator.php | 6 +++--- .../Validator/Validator/ValidatorInterface.php | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php index ad529f3750..97c982d116 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php @@ -59,9 +59,9 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest return $this->validator->validateObject($object, $groups); } - protected function validateCollection($collection, $groups = null, $deep = false) + protected function validateObjects($objects, $groups = null, $deep = false) { - return $this->validator->validateCollection($collection, $groups, $deep); + return $this->validator->validateObjects($objects, $groups, $deep); } protected function validateProperty($object, $propertyName, $groups = null) @@ -276,7 +276,7 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest ->getValidator() ->inContext($context) ->atPath('subpath') - ->validateCollection(array('key' => $value->reference)) + ->validateObjects(array('key' => $value->reference)) ; }; diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php index 4d76fa38c1..956537d22f 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php @@ -57,9 +57,9 @@ abstract class AbstractLegacyApiTest extends AbstractValidatorTest return $this->validator->validate($object, $groups); } - protected function validateCollection($collection, $groups = null, $deep = false) + protected function validateObjects($objects, $groups = null, $deep = false) { - return $this->validator->validate($collection, $groups, true, $deep); + return $this->validator->validate($objects, $groups, true, $deep); } protected function validateProperty($object, $propertyName, $groups = null) diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php index 99d250fb5a..f4751e47c4 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php @@ -67,7 +67,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase abstract protected function validateObject($object, $groups = null); - abstract protected function validateCollection($collection, $groups = null, $deep = false); + abstract protected function validateObjects($objects, $groups = null, $deep = false); abstract protected function validateProperty($object, $propertyName, $groups = null); @@ -249,7 +249,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase 'groups' => 'Group', ))); - $violations = $this->validateCollection($array, 'Group'); + $violations = $this->validateObjects($array, 'Group'); /** @var ConstraintViolationInterface[] $violations */ $this->assertCount(1, $violations); @@ -287,7 +287,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase 'groups' => 'Group', ))); - $violations = $this->validateCollection($array, 'Group'); + $violations = $this->validateObjects($array, 'Group'); /** @var ConstraintViolationInterface[] $violations */ $this->assertCount(1, $violations); @@ -325,7 +325,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase 'groups' => 'Group', ))); - $violations = $this->validateCollection($traversable, 'Group'); + $violations = $this->validateObjects($traversable, 'Group'); /** @var ConstraintViolationInterface[] $violations */ $this->assertCount(1, $violations); @@ -359,7 +359,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase 'groups' => 'Group', ))); - $this->validateCollection($traversable, 'Group'); + $this->validateObjects($traversable, 'Group'); } public function testRecursiveTraversableRecursiveTraversalEnabled() @@ -388,7 +388,7 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase 'groups' => 'Group', ))); - $violations = $this->validateCollection($traversable, 'Group', true); + $violations = $this->validateObjects($traversable, 'Group', true); /** @var ConstraintViolationInterface[] $violations */ $this->assertCount(1, $violations); diff --git a/src/Symfony/Component/Validator/Validator/ContextualValidator.php b/src/Symfony/Component/Validator/Validator/ContextualValidator.php index cb9951bf77..588beaa423 100644 --- a/src/Symfony/Component/Validator/Validator/ContextualValidator.php +++ b/src/Symfony/Component/Validator/Validator/ContextualValidator.php @@ -110,14 +110,14 @@ class ContextualValidator implements ContextualValidatorInterface return $this; } - public function validateCollection($collection, $groups = null, $deep = false) + public function validateObjects($objects, $groups = null, $deep = false) { $constraint = new Traverse(array( 'traverse' => true, 'deep' => $deep, )); - return $this->validate($collection, $constraint, $groups); + return $this->validate($objects, $constraint, $groups); } public function validateProperty($object, $propertyName, $groups = null) diff --git a/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php index 69a224cb19..4e1a9a680b 100644 --- a/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php @@ -51,7 +51,7 @@ interface ContextualValidatorInterface */ public function validateObject($object, $groups = null); - public function validateCollection($collection, $groups = null, $deep = false); + public function validateObjects($objects, $groups = null, $deep = false); /** * Validates a property of a value against its current value. diff --git a/src/Symfony/Component/Validator/Validator/Validator.php b/src/Symfony/Component/Validator/Validator/Validator.php index 820b01a149..fe7b80c817 100644 --- a/src/Symfony/Component/Validator/Validator/Validator.php +++ b/src/Symfony/Component/Validator/Validator/Validator.php @@ -98,10 +98,10 @@ class Validator implements ValidatorInterface ->getViolations(); } - public function validateCollection($collection, $groups = null, $deep = false) + public function validateObjects($objects, $groups = null, $deep = false) { - return $this->startContext($collection) - ->validateCollection($collection, $groups, $deep) + return $this->startContext($objects) + ->validateObjects($objects, $groups, $deep) ->getViolations(); } diff --git a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php index f69395284a..5eccf3f739 100644 --- a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php @@ -47,7 +47,7 @@ interface ValidatorInterface */ public function validateObject($object, $groups = null); - public function validateCollection($collection, $groups = null, $deep = false); + public function validateObjects($objects, $groups = null, $deep = false); /** * Validates a property of a value against its current value.