[Validator] Renamed validateCollection() to validateObjects()

webmozart · webmozart · commit e440690bb496 · 2014-03-30T18:28:56.000+02:00
diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -59,9 +59,9 @@ protected function validateObject($object, $groups = null)
         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 @@ public function testValidateArrayInContext()
                 ->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
@@ -57,9 +57,9 @@ protected function validateObject($object, $groups = null)
         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
@@ -67,7 +67,7 @@ abstract protected function validate($value, $constraints, $groups = null);
 
     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 @@ public function testArray()
             'groups' => 'Group',
         )));
 
-        $violations = $this->validateCollection($array, 'Group');
+        $violations = $this->validateObjects($array, 'Group');
 
         /** @var ConstraintViolationInterface[] $violations */
         $this->assertCount(1, $violations);
@@ -287,7 +287,7 @@ public function testRecursiveArray()
             'groups' => 'Group',
         )));
 
-        $violations = $this->validateCollection($array, 'Group');
+        $violations = $this->validateObjects($array, 'Group');
 
         /** @var ConstraintViolationInterface[] $violations */
         $this->assertCount(1, $violations);
@@ -325,7 +325,7 @@ public function testTraversable()
             'groups' => 'Group',
         )));
 
-        $violations = $this->validateCollection($traversable, 'Group');
+        $violations = $this->validateObjects($traversable, 'Group');
 
         /** @var ConstraintViolationInterface[] $violations */
         $this->assertCount(1, $violations);
@@ -359,7 +359,7 @@ public function testRecursiveTraversableRecursiveTraversalDisabled()
             'groups' => 'Group',
         )));
 
-        $this->validateCollection($traversable, 'Group');
+        $this->validateObjects($traversable, 'Group');
     }
 
     public function testRecursiveTraversableRecursiveTraversalEnabled()
@@ -388,7 +388,7 @@ public function testRecursiveTraversableRecursiveTraversalEnabled()
             '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
@@ -110,14 +110,14 @@ public function validateObject($object, $groups = null)
         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
@@ -51,7 +51,7 @@ public function validate($value, $constraints, $groups = null);
      */
     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
@@ -98,10 +98,10 @@ public function validateObject($object, $groups = null)
             ->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
@@ -47,7 +47,7 @@ public function validate($value, $constraints, $groups = null);
      */
     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.

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ protected function validateObject($object, $groups = null)`
`59`	`59`	`return $this->validator->validateObject($object, $groups);`
`60`	`60`	`}`
`61`	`61`
`62`		`- protected function validateCollection($collection, $groups = null, $deep = false)`
	`62`	`+ protected function validateObjects($objects, $groups = null, $deep = false)`
`63`	`63`	`{`
`64`		`- return $this->validator->validateCollection($collection, $groups, $deep);`
	`64`	`+ return $this->validator->validateObjects($objects, $groups, $deep);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`protected function validateProperty($object, $propertyName, $groups = null)`
`@@ -276,7 +276,7 @@ public function testValidateArrayInContext()`
`276`	`276`	`->getValidator()`
`277`	`277`	`->inContext($context)`
`278`	`278`	`->atPath('subpath')`
`279`		`- ->validateCollection(array('key' => $value->reference))`
	`279`	`+ ->validateObjects(array('key' => $value->reference))`
`280`	`280`	`;`
`281`	`281`	`};`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ protected function validateObject($object, $groups = null)`
`57`	`57`	`return $this->validator->validate($object, $groups);`
`58`	`58`	`}`
`59`	`59`
`60`		`- protected function validateCollection($collection, $groups = null, $deep = false)`
	`60`	`+ protected function validateObjects($objects, $groups = null, $deep = false)`
`61`	`61`	`{`
`62`		`- return $this->validator->validate($collection, $groups, true, $deep);`
	`62`	`+ return $this->validator->validate($objects, $groups, true, $deep);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`protected function validateProperty($object, $propertyName, $groups = null)`
Original file line number	Diff line number	Diff line change
`@@ -110,14 +110,14 @@ public function validateObject($object, $groups = null)`
`110`	`110`	`return $this;`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function validateCollection($collection, $groups = null, $deep = false)`
	`113`	`+ public function validateObjects($objects, $groups = null, $deep = false)`
`114`	`114`	`{`
`115`	`115`	`$constraint = new Traverse(array(`
`116`	`116`	`'traverse' => true,`
`117`	`117`	`'deep' => $deep,`
`118`	`118`	`));`
`119`	`119`
`120`		`- return $this->validate($collection, $constraint, $groups);`
	`120`	`+ return $this->validate($objects, $constraint, $groups);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public function validateProperty($object, $propertyName, $groups = null)`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,10 @@ public function validateObject($object, $groups = null)`
`98`	`98`	`->getViolations();`
`99`	`99`	`}`
`100`	`100`
`101`		`- public function validateCollection($collection, $groups = null, $deep = false)`
	`101`	`+ public function validateObjects($objects, $groups = null, $deep = false)`
`102`	`102`	`{`
`103`		`- return $this->startContext($collection)`
`104`		`- ->validateCollection($collection, $groups, $deep)`
	`103`	`+ return $this->startContext($objects)`
	`104`	`+ ->validateObjects($objects, $groups, $deep)`
`105`	`105`	`->getViolations();`
`106`	`106`	`}`
`107`	`107`