Merge branch '2.x' into 3.x

* 2.x:
  fixed tests for PHP 7.4

tests/ParserTest.php

@@ -14,6 +14,7 @@ namespace Twig\Tests;
 use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\LoaderInterface;
+use Twig\Node\MacroNode;
 use Twig\Node\Node;
 use Twig\Node\SetNode;
 use Twig\Node\TextNode;

tests/TemplateTest.php

@@ -29,7 +29,8 @@ class TemplateTest extends TestCase
      */
     public function testDisplayBlocksAcceptTemplateOnlyAsBlocks()
     {
-        $template = $this->getMockForAbstractClass(Template::class, [], '', false);
+        $twig = new Environment($this->getMockBuilder(LoaderInterface::class)->getMock());
+        $template = new TemplateForTest($twig);
         $template->displayBlock('foo', [], ['foo' => [new \stdClass(), 'foo']]);
     }