[Validator] Simplified validateNodeForGroup

webmozart · webmozart · commit 5c479d803c46 · 2014-03-30T18:28:59.000+02:00
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -646,43 +646,34 @@ private function stepThroughGroupSequence($value, $object, MetadataInterface $me
      */
     private function validateNodeForGroup($value, $objectHash, MetadataInterface $metadata = null, $group, ExecutionContextInterface $context)
     {
-        try {
-            $context->setGroup($group);
-
-            foreach ($metadata->findConstraints($group) as $constraint) {
-                // Prevent duplicate validation of constraints, in the case
-                // that constraints belong to multiple validated groups
-                if (null !== $objectHash) {
-                    $constraintHash = spl_object_hash($constraint);
+        $context->setGroup($group);
 
-                    if ($metadata instanceof ClassMetadataInterface) {
-                        if ($context->isClassConstraintValidated($objectHash, $constraintHash)) {
-                            continue;
-                        }
+        foreach ($metadata->findConstraints($group) as $constraint) {
+            // Prevent duplicate validation of constraints, in the case
+            // that constraints belong to multiple validated groups
+            if (null !== $objectHash) {
+                $constraintHash = spl_object_hash($constraint);
 
-                        $context->markClassConstraintAsValidated($objectHash, $constraintHash);
-                    } elseif ($metadata instanceof PropertyMetadataInterface) {
-                        $propertyName = $metadata->getPropertyName();
+                if ($metadata instanceof ClassMetadataInterface) {
+                    if ($context->isClassConstraintValidated($objectHash, $constraintHash)) {
+                        continue;
+                    }
 
-                        if ($context->isPropertyConstraintValidated($objectHash, $propertyName, $constraintHash)) {
-                            continue;
-                        }
+                    $context->markClassConstraintAsValidated($objectHash, $constraintHash);
+                } elseif ($metadata instanceof PropertyMetadataInterface) {
+                    $propertyName = $metadata->getPropertyName();
 
-                        $context->markPropertyConstraintAsValidated($objectHash, $propertyName, $constraintHash);
+                    if ($context->isPropertyConstraintValidated($objectHash, $propertyName, $constraintHash)) {
+                        continue;
                     }
-                }
 
-                $validator = $this->validatorFactory->getInstance($constraint);
-                $validator->initialize($context);
-                $validator->validate($value, $constraint);
+                    $context->markPropertyConstraintAsValidated($objectHash, $propertyName, $constraintHash);
+                }
             }
 
-            $context->setGroup(null);
-        } catch (\Exception $e) {
-            // Should be put into a finally block once we switch to PHP 5.5
-            $context->setGroup(null);
-
-            throw $e;
+            $validator = $this->validatorFactory->getInstance($constraint);
+            $validator->initialize($context);
+            $validator->validate($value, $constraint);
         }
     }
 
