[Validator] Decoupled ContextRefresher from ExecutionContext

webmozart · webmozart · commit e057b19964f8 · 2014-03-30T18:28:56.000+02:00
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Validator\Group\GroupManagerInterface;
 use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
 use Symfony\Component\Validator\Node\Node;
+use Symfony\Component\Validator\Util\NodeStackInterface;
 use Symfony\Component\Validator\Util\PropertyPath;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
@@ -32,7 +33,7 @@
  *
  * @see ExecutionContextInterface
  */
-class ExecutionContext implements ExecutionContextInterface, LegacyExecutionContextInterface
+class ExecutionContext implements ExecutionContextInterface, LegacyExecutionContextInterface, NodeStackInterface
 {
     /**
      * @var ValidatorInterface
diff --git a/src/Symfony/Component/Validator/NodeVisitor/ContextRefresher.php b/src/Symfony/Component/Validator/NodeVisitor/ContextRefresher.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Validator\NodeVisitor;
 
-use Symfony\Component\Validator\Context\ExecutionContext;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Exception\RuntimeException;
 use Symfony\Component\Validator\Node\Node;
+use Symfony\Component\Validator\Util\NodeStackInterface;
 
 /**
  * Updates the current context with the current node of the validation
@@ -27,7 +27,7 @@ class ContextRefresher extends AbstractVisitor
 {
     public function enterNode(Node $node, ExecutionContextInterface $context)
     {
-        if (!$context instanceof ExecutionContext) {
+        if (!$context instanceof NodeStackInterface) {
             throw new RuntimeException(sprintf(
                 'The ContextRefresher only supports instances of class '.
                 '"Symfony\Component\Validator\Context\ExecutionContext". '.
@@ -46,7 +46,7 @@ public function enterNode(Node $node, ExecutionContextInterface $context)
      */
     public function leaveNode(Node $node, ExecutionContextInterface $context)
     {
-        if (!$context instanceof ExecutionContext) {
+        if (!$context instanceof NodeStackInterface) {
             throw new RuntimeException(sprintf(
                 'The ContextRefresher only supports instances of class '.
                 '"Symfony\Component\Validator\Context\ExecutionContext". '.
diff --git a/src/Symfony/Component/Validator/Util/NodeStackInterface.php b/src/Symfony/Component/Validator/Util/NodeStackInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Util;
+
+use Symfony\Component\Validator\Node\Node;
+
+/**
+ * @since  %%NextVersion%%
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface NodeStackInterface
+{
+    public function pushNode(Node $node);
+
+    public function popNode();
+}
