From b91182bdce7be15e9f9731de601972f9e010dce9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 13 Dec 2016 11:43:21 +0100 Subject: [PATCH] fixed some tests --- test/Twig/Tests/Loader/ChainTest.php | 6 +++++- test/Twig/Tests/ParserTest.php | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Twig/Tests/Loader/ChainTest.php b/test/Twig/Tests/Loader/ChainTest.php index 7818343d4..17ec482a2 100644 --- a/test/Twig/Tests/Loader/ChainTest.php +++ b/test/Twig/Tests/Loader/ChainTest.php @@ -98,7 +98,7 @@ class Twig_Tests_Loader_ChainTest extends PHPUnit_Framework_TestCase public function testExists() { - $loader1 = $this->getMockBuilder('Twig_Loader_Array')->setMethods(array('exists', 'getSourceContext'))->disableOriginalConstructor()->getMock(); + $loader1 = $this->getMockBuilder('Twig_ChainTestLoaderWithExistsInterface')->getMock(); $loader1->expects($this->once())->method('exists')->will($this->returnValue(false)); $loader1->expects($this->never())->method('getSourceContext'); @@ -118,3 +118,7 @@ class Twig_Tests_Loader_ChainTest extends PHPUnit_Framework_TestCase interface Twig_ChainTestLoaderInterface extends Twig_LoaderInterface, Twig_SourceContextLoaderInterface { } + +interface Twig_ChainTestLoaderWithExistsInterface extends Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface +{ +} diff --git a/test/Twig/Tests/ParserTest.php b/test/Twig/Tests/ParserTest.php index b5d83793a..3d0d769d8 100644 --- a/test/Twig/Tests/ParserTest.php +++ b/test/Twig/Tests/ParserTest.php @@ -155,8 +155,7 @@ EOF { $parser = new TestParser(new Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock())); $parser->setParent(new Twig_Node()); - $parser->stream = $this->getMockBuilder('Twig_TokenStream')->disableOriginalConstructor()->getMock(); - $parser->stream->expects($this->any())->method('getSourceContext')->will($this->returnValue(new Twig_Source('', ''))); + $parser->stream = new Twig_TokenStream(array()); return $parser; }