changed the order of execution for node visitors

CHANGELOG

@@ -15,6 +15,7 @@ Backward incompatibilities:
 
 Changes:
 
+ * changed the order of execution for node visitors
  * fixed default() filter behavior when used with strict_variables set to on
  * fixed filesystem loader compatibility with PHAR files
  * enhanced error messages when an unexpected token is parsed in an expression

lib/Twig/NodeTraverser.php

@@ -56,33 +56,34 @@ class Twig_NodeTraverser
      *
      * @param Twig_NodeInterface $node A Twig_NodeInterface instance
      */
-    public function traverse(Twig_NodeInterface $node = null)
+    public function traverse(Twig_NodeInterface $node)
+    {
+        ksort($this->visitors);
+        foreach ($this->visitors as $visitors) {
+            foreach ($visitors as $visitor) {
+                $node = $this->traverseForVisitor($visitor, $node);
+            }
+        }
+
+        return $node;
+    }
+
+    protected function traverseForVisitor($visitor, Twig_NodeInterface $node = null)
     {
         if (null === $node) {
             return null;
         }
 
-        ksort($this->visitors);
-        foreach ($this->visitors as $visitors) {
-            foreach ($visitors as $visitor) {
-                $node = $visitor->enterNode($node, $this->env);
-            }
-        }
+        $node = $visitor->enterNode($node, $this->env);
 
         foreach ($node as $k => $n) {
-            if (false !== $n = $this->traverse($n)) {
+            if (false !== $n = $this->traverseForVisitor($visitor, $n)) {
                 $node->setNode($k, $n);
             } else {
                 $node->removeNode($k);
             }
         }
 
-        foreach ($this->visitors as $visitors) {
-            foreach ($visitors as $visitor) {
-                $node = $visitor->leaveNode($node, $this->env);
-            }
-        }
-
-        return $node;
+        return $visitor->leaveNode($node, $this->env);
     }
 }

test/Twig/Tests/Extension/SandboxTest.php

@@ -121,7 +121,7 @@ class Twig_Tests_Extension_SandboxTest extends PHPUnit_Framework_TestCase
     protected function getEnvironment($sandboxed, $templates, $tags = array(), $filters = array(), $methods = array(), $properties = array())
     {
         $loader = new Twig_Loader_Array($templates);
-        $twig = new Twig_Environment($loader, array('debug' => true, 'cache' => false));
+        $twig = new Twig_Environment($loader, array('debug' => true, 'cache' => false, 'autoescape' => false));
         $policy = new Twig_Sandbox_SecurityPolicy($tags, $filters, $methods, $properties);
         $twig->addExtension(new Twig_Extension_Sandbox($policy, $sandboxed));