Merge branch '2.x' into 3.x

* 2.x:
  removed usage of getmockBuilder() when not needed
  removed usage of getmockBuilder() when not needed
This commit is contained in:
Fabien Potencier
2019-08-08 13:35:34 +02:00
19 changed files with 108 additions and 108 deletions
+2 -2
View File
@@ -45,7 +45,7 @@ class ModuleTest extends NodeTestCase
public function getTests()
{
$twig = new Environment($this->getMockBuilder(LoaderInterface::class)->getMock());
$twig = new Environment($this->createMock(LoaderInterface::class));
$tests = [];
@@ -200,7 +200,7 @@ EOF
2
);
$twig = new Environment($this->getMockBuilder(LoaderInterface::class)->getMock(), ['debug' => true]);
$twig = new Environment($this->createMock(LoaderInterface::class), ['debug' => true]);
$node = new ModuleNode($body, $extends, $blocks, $macros, $traits, new Node([]), $source);
$tests[] = [$node, <<<EOF
<?php