symfony
diff --git a/‎src/Symfony/Component/Validator/NodeVisitor/ContextUpdateVisitor.php‎
Lines changed: 0 additions & 37 deletions b/‎src/Symfony/Component/Validator/NodeVisitor/ContextUpdateVisitor.php‎
Lines changed: 0 additions & 37 deletions
diff --git a/‎src/Symfony/Component/Validator/NodeVisitor/DefaultGroupReplacingVisitor.php‎
Lines changed: 0 additions & 73 deletions b/‎src/Symfony/Component/Validator/NodeVisitor/DefaultGroupReplacingVisitor.php‎
Lines changed: 0 additions & 73 deletions
diff --git a/‎src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php‎
Lines changed: 47 additions & 0 deletions b/‎src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Tests/Validator/TraversingValidator2Dot5ApiTest.php‎
Lines changed: 1 addition & 7 deletions b/‎src/Symfony/Component/Validator/Tests/Validator/TraversingValidator2Dot5ApiTest.php‎
Lines changed: 1 addition & 7 deletions
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\NodeVisitor;
 
+use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -68,7 +69,13 @@ public function visit(Node $node, ExecutionContextInterface $context)
             return true;
         }
 
+        $context->setValue($node->value);
+        $context->setMetadata($node->metadata);
+        $context->setPropertyPath($node->propertyPath);
+
         if ($node instanceof ClassNode) {
+            $this->replaceDefaultGroup($node);
+
             $objectHash = spl_object_hash($node->value);
         } elseif ($node instanceof PropertyNode) {
             $objectHash = spl_object_hash($node->object);
@@ -203,4 +210,44 @@ private function validateNodeForGroup(Node $node, $group, ExecutionContextInterf
             throw $e;
         }
     }
+
+    /**
+     * Checks class nodes whether their "Default" group is replaced by a group
+     * sequence and adjusts the validation groups accordingly.
+     *
+     * If the "Default" group is replaced for a class node, and if the validated
+     * groups of the node contain the group "Default", that group is replaced by
+     * the group sequence specified in the class' metadata.
+     *
+     * @param ClassNode $node The node
+     */
+    private function replaceDefaultGroup(ClassNode $node)
+    {
+        if ($node->metadata->hasGroupSequence()) {
+            // The group sequence is statically defined for the class
+            $groupSequence = $node->metadata->getGroupSequence();
+        } elseif ($node->metadata->isGroupSequenceProvider()) {
+            // The group sequence is dynamically obtained from the validated
+            // object
+            /** @var \Symfony\Component\Validator\GroupSequenceProviderInterface $value */
+            $groupSequence = $node->value->getGroupSequence();
+
+            if (!$groupSequence instanceof GroupSequence) {
+                $groupSequence = new GroupSequence($groupSequence);
+            }
+        } else {
+            // The "Default" group is not overridden. Quit.
+            return;
+        }
+
+        $key = array_search(Constraint::DEFAULT_GROUP, $node->groups);
+
+        if (false !== $key) {
+            // Replace the "Default" group by the group sequence
+            $node->groups[$key] = $groupSequence;
+
+            // Cascade the "Default" group when validating the sequence
+            $groupSequence->cascadedGroup = Constraint::DEFAULT_GROUP;
+        }
+    }
 }
@@ -29,13 +29,7 @@ protected function createValidator(MetadataFactoryInterface $metadataFactory)
         $contextFactory = new ExecutionContextFactory(new DefaultTranslator());
         $validator = new TraversingValidator($contextFactory, $nodeTraverser, $metadataFactory);
 
-        $groupSequenceResolver = new DefaultGroupReplacingVisitor();
-        $contextRefresher = new ContextUpdateVisitor();
-        $nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
-
-        $nodeTraverser->addVisitor($groupSequenceResolver);
-        $nodeTraverser->addVisitor($contextRefresher);
-        $nodeTraverser->addVisitor($nodeValidator);
+        $nodeTraverser->addVisitor(new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory()));
 
         return $validator;
     }