bug twigphp#3957 rework the CaptureNode implementation (xabbuh)

This PR was squashed before being merged into the 3.x branch.

Discussion
----------

rework the CaptureNode implementation

fixes twigphp#3955

Commits
-------

665dce8 rework the CaptureNode implementation

src/Node/CaptureNode.php

@@ -57,7 +57,7 @@ public function compile(Compiler $compiler): void
             ->outdent()
             ->write("}\n")
             ->outdent()
-            ->write('})()')
+            ->write('})();')
         ;
     }
 }

src/Node/MacroNode.php

@@ -31,8 +31,6 @@ public function __construct(string $name, Node $body, Node $arguments, int $line
             }
         }
 
-        $body = new CaptureNode($body, $lineno, $tag);
-
         parent::__construct(['body' => $body, 'arguments' => $arguments], ['name' => $name], $lineno, $tag);
     }
 
@@ -88,8 +86,8 @@ public function compile(Compiler $compiler): void
             ->write("]);\n\n")
             ->write("\$blocks = [];\n\n")
             ->write('return ')
-            ->subcompile($this->getNode('body'))
-            ->raw(";\n")
+            ->subcompile(new CaptureNode($this->getNode('body'), $this->getNode('body')->lineno, $this->getNode('body')->tag))
+            ->raw("\n")
             ->outdent()
             ->write("}\n\n")
         ;

src/Node/SetNode.php

@@ -86,8 +86,10 @@ public function compile(Compiler $compiler): void
                     $compiler->subcompile($this->getNode('values'));
                 }
             }
+
+            $compiler->raw(';');
         }
 
-        $compiler->raw(";\n");
+        $compiler->raw("\n");
     }
 }

tests/Node/MacroTest.php

@@ -26,7 +26,7 @@ public function testConstructor()
         $arguments = new Node([new NameExpression('foo', 1)], [], 1);
         $node = new MacroNode('foo', $body, $arguments, 1);
 
-        $this->assertEquals($body, $node->getNode('body')->getNode('body'));
+        $this->assertEquals($body, $node->getNode('body'));
         $this->assertEquals($arguments, $node->getNode('arguments'));
         $this->assertEquals('foo', $node->getAttribute('name'));
     }