[Validator] Optimized RecursiveContextualValidator

webmozart · webmozart · commit 50bb84d06bc8 · 2014-03-30T18:28:59.000+02:00
diff --git a/src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php b/src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php
@@ -103,18 +103,18 @@ public function visit(Node $node, ExecutionContextInterface $context)
                 $context->markObjectAsValidatedForGroup($objectHash, $groupHash);
             }
 
-            // Validate normal group
-            if (!$group instanceof GroupSequence) {
-                $this->validateNodeForGroup($node, $group, $context, $objectHash);
+            if ($group instanceof GroupSequence) {
+                // Traverse group sequence until a violation is generated
+                $this->traverseGroupSequence($node, $group, $context);
+
+                // Skip the group sequence when validating successor nodes
+                unset($node->groups[$key]);
 
                 continue;
             }
 
-            // Traverse group sequence until a violation is generated
-            $this->traverseGroupSequence($node, $group, $context);
-
-            // Skip the group sequence when validating successor nodes
-            unset($node->groups[$key]);
+            // Validate normal group
+            $this->validateNodeForGroup($node, $group, $context, $objectHash);
         }
 
         return true;
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -268,6 +268,9 @@ protected function normalizeGroups($groups)
      */
     private function traverseClassNode($value, ClassMetadataInterface $metadata = null, $propertyPath, array $groups, $cascadedGroups, $traversalStrategy, ExecutionContextInterface $context)
     {
+        // Replace "Default" group by group sequence, if appropriate
+        $groups = $this->replaceDefaultGroup($value, $metadata, $groups);
+
         $groups = $this->validateNode($value, $value, $metadata, $propertyPath, $groups, $traversalStrategy, $context);
 
         if (0 === count($groups)) {
@@ -566,10 +569,6 @@ public function validateNode($value, $object, MetadataInterface $metadata = null
         $context->setMetadata($metadata);
         $context->setPropertyPath($propertyPath);
 
-        if ($metadata instanceof ClassMetadataInterface) {
-            $groups = $this->replaceDefaultGroup($value, $metadata, $groups);
-        }
-
         $objectHash = is_object($object) ? spl_object_hash($object) : null;
 
         // if group (=[<G1,G2>,G3,G4]) contains group sequence (=<G1,G2>)
@@ -599,18 +598,18 @@ public function validateNode($value, $object, MetadataInterface $metadata = null
                 $context->markObjectAsValidatedForGroup($objectHash, $groupHash);
             }
 
-            // Validate normal group
-            if (!$group instanceof GroupSequence) {
-                $this->validateNodeForGroup($value, $objectHash, $metadata, $group, $context);
+            if ($group instanceof GroupSequence) {
+                // Traverse group sequence until a violation is generated
+                $this->stepThroughGroupSequence($value, $object, $metadata, $propertyPath, $traversalStrategy, $group, $context);
+
+                // Skip the group sequence when validating successor nodes
+                unset($groups[$key]);
 
                 continue;
             }
 
-            // Traverse group sequence until a violation is generated
-            $this->stepThroughGroupSequence($value, $object, $metadata, $propertyPath, $traversalStrategy, $group, $context);
-
-            // Skip the group sequence when validating successor nodes
-            unset($groups[$key]);
+            // Validate normal group
+            $this->validateNodeForGroup($value, $objectHash, $metadata, $group, $context);
         }
 
         return $groups;
