symfony
diff --git a/‎src/Symfony/Component/Validator/Context/ExecutionContext.php‎
Lines changed: 3 additions & 41 deletions b/‎src/Symfony/Component/Validator/Context/ExecutionContext.php‎
Lines changed: 3 additions & 41 deletions
diff --git a/‎src/Symfony/Component/Validator/Node/PropertyNode.php‎
Lines changed: 17 additions & 1 deletion b/‎src/Symfony/Component/Validator/Node/PropertyNode.php‎
Lines changed: 17 additions & 1 deletion
@@ -20,7 +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\NodeVisitor\NodeObserverInterface;
 use Symfony\Component\Validator\Util\PropertyPath;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
@@ -33,7 +33,7 @@
  *
  * @see ExecutionContextInterface
  */
-class ExecutionContext implements ExecutionContextInterface, LegacyExecutionContextInterface, NodeStackInterface
+class ExecutionContext implements ExecutionContextInterface, LegacyExecutionContextInterface, NodeObserverInterface
 {
     /**
      * @var ValidatorInterface
@@ -76,13 +76,6 @@ class ExecutionContext implements ExecutionContextInterface, LegacyExecutionCont
      */
     private $node;
 
-    /**
-     * The trace of nodes from the root node to the current node.
-     *
-     * @var \SplStack
-     */
-    private $nodeStack;
-
     /**
      * Creates a new execution context.
      *
@@ -108,49 +101,18 @@ public function __construct(ValidatorInterface $validator, $root, GroupManagerIn
         $this->translator = $translator;
         $this->translationDomain = $translationDomain;
         $this->violations = new ConstraintViolationList();
-        $this->nodeStack = new \SplStack();
     }
 
     /**
      * Sets the values of the context to match the given node.
      *
-     * Internally, all nodes are stored on a stack and can be removed from that
-     * stack using {@link popNode()}.
-     *
      * @param Node $node The currently validated node
      */
-    public function pushNode(Node $node)
+    public function setCurrentNode(Node $node)
     {
-        $this->nodeStack->push($node);
         $this->node = $node;
     }
 
-    /**
-     * Sets the values of the context to match the previous node.
-     *
-     * The current node is removed from the internal stack and returned.
-     *
-     * @return Node|null The currently validated node or null, if no node was
-     *                   on the stack
-     */
-    public function popNode()
-    {
-        // Nothing to do if the stack is empty
-        if (0 === count($this->nodeStack)) {
-            return null;
-        }
-
-        // Remove the current node from the stack
-        $poppedNode = $this->nodeStack->pop();
-
-        // Adjust the current node to the previous node
-        $this->node = count($this->nodeStack) > 0
-            ? $this->nodeStack->top()
-            : null;
-
-        return $poppedNode;
-    }
-
     /**
      * {@inheritdoc}
      */
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Node;
 
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
 
 /**
@@ -32,6 +33,11 @@
  */
 class PropertyNode extends Node
 {
+    /**
+     * @var object
+     */
+    public $object;
+
     /**
      * @var PropertyMetadataInterface
      */
@@ -40,6 +46,8 @@ class PropertyNode extends Node
     /**
      * Creates a new property node.
      *
+     * @param object                    $object         The object the property
+     *                                                  belongs to
      * @param mixed                     $value          The property value
      * @param PropertyMetadataInterface $metadata       The property's metadata
      * @param string                    $propertyPath   The property path leading
@@ -49,16 +57,24 @@ class PropertyNode extends Node
      * @param string[]|null             $cascadedGroups The groups in which
      *                                                  cascaded objects should
      *                                                  be validated
+     *
+     * @throws UnexpectedTypeException If $object is not an object
      */
-    public function __construct($value, PropertyMetadataInterface $metadata, $propertyPath, array $groups, $cascadedGroups = null)
+    public function __construct($object, $value, PropertyMetadataInterface $metadata, $propertyPath, array $groups, $cascadedGroups = null)
     {
+        if (!is_object($object)) {
+            throw new UnexpectedTypeException($object, 'object');
+        }
+
         parent::__construct(
             $value,
             $metadata,
             $propertyPath,
             $groups,
             $cascadedGroups
         );
+
+        $this->object = $object;
     }
 
 }