geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  fixed some tests
This commit is contained in:
Fabien Potencier
2016-12-13 11:45:35 +01:00
parent 502ddadf8a b91182bdce
commit 5e0e1bd699
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Twig/Tests/Loader/ChainTest.php
+1 -1
View File
@@ -73,7 +73,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_LoaderInterface')->getMock();
$loader1->expects($this->once())->method('exists')->will($this->returnValue(false));
$loader1->expects($this->never())->method('getSourceContext');
test/Twig/Tests/ParserTest.php
+1 -4
View File
@@ -155,12 +155,9 @@ EOF
$parser = new Twig_Parser(new Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$parser->setParent(new Twig_Node());
$stream = $this->getMockBuilder('Twig_TokenStream')->disableOriginalConstructor()->getMock();
$stream->expects($this->any())->method('getSourceContext')->will($this->returnValue(new Twig_Source('', '')));
$p = new ReflectionProperty($parser, 'stream');
$p->setAccessible(true);
$p->setValue($parser, $stream);
$p->setValue($parser, new Twig_TokenStream(array()));
return $parser;
}