Merge branch '1.x' into 2.x

* 1.x:
  fixed Parser contract for some implementations

src/TokenParser/MacroTokenParser.php

@@ -14,6 +14,7 @@ namespace Twig\TokenParser;
 use Twig\Error\SyntaxError;
 use Twig\Node\BodyNode;
 use Twig\Node\MacroNode;
+use Twig\Node\Node;
 use Twig\Token;
 
 /**
@@ -47,6 +48,8 @@ final class MacroTokenParser extends AbstractTokenParser
         $stream->expect(/* Token::BLOCK_END_TYPE */ 3);
 
         $this->parser->setMacro($name, new MacroNode($name, new BodyNode([$body]), $arguments, $lineno, $this->getTag()));
+
+        return new Node();
     }
 
     public function decideBlockEnd(Token $token)