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

fix BC, revert to pre 1.23 behavior, and make use of pattern an option

Browse Source
This commit is contained in:
Remi Collet
2015-11-02 15:13:46 +01:00
parent a4597a4c00
commit ee5e25eb46
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Test/NodeTestCase.php
+8 -4
View File
@@ -15,17 +15,21 @@ abstract class Twig_Test_NodeTestCase extends PHPUnit_Framework_TestCase
/** /**
* @dataProvider getTests * @dataProvider getTests
*/ */
public function testCompile($node, $source, $environment = null) public function testCompile($node, $source, $environment = null, $isPattern = false)
{ {
$this->assertNodeCompilation($source, $node, $environment); $this->assertNodeCompilation($source, $node, $environment, $isPattern);
} }
public function assertNodeCompilation($source, Twig_Node $node, Twig_Environment $environment = null) public function assertNodeCompilation($source, Twig_Node $node, Twig_Environment $environment = null, $isPattern = false)
{ {
$compiler = $this->getCompiler($environment); $compiler = $this->getCompiler($environment);
$compiler->compile($node); $compiler->compile($node);
$this->assertStringMatchesFormat($source, trim($compiler->getSource())); if ($isPattern) {
$this->assertStringMatchesFormat($source, trim($compiler->getSource()));
} else {
$this->assertEquals($source, trim($compiler->getSource()));
}
} }
protected function getCompiler(Twig_Environment $environment = null) protected function getCompiler(Twig_Environment $environment = null)
test/Twig/Tests/Node/ModuleTest.php
+3 -3
View File
@@ -75,7 +75,7 @@ class __TwigTemplate_%x extends Twig_Template
} }
} }
EOF EOF
, $twig); , $twig, true);
$import = new Twig_Node_Import(new Twig_Node_Expression_Constant('foo.twig', 1), new Twig_Node_Expression_AssignName('macro', 1), 2); $import = new Twig_Node_Import(new Twig_Node_Expression_Constant('foo.twig', 1), new Twig_Node_Expression_AssignName('macro', 1), 2);
@@ -128,7 +128,7 @@ class __TwigTemplate_%x extends Twig_Template
} }
} }
EOF EOF
, $twig); , $twig, true);
$set = new Twig_Node_Set(false, new Twig_Node(array(new Twig_Node_Expression_AssignName('foo', 4))), new Twig_Node(array(new Twig_Node_Expression_Constant('foo', 4))), 4); $set = new Twig_Node_Set(false, new Twig_Node(array(new Twig_Node_Expression_AssignName('foo', 4))), new Twig_Node(array(new Twig_Node_Expression_Constant('foo', 4))), 4);
$body = new Twig_Node(array($set)); $body = new Twig_Node(array($set));
@@ -176,7 +176,7 @@ class __TwigTemplate_%x extends Twig_Template
} }
} }
EOF EOF
, $twig); , $twig, true);
return $tests; return $tests;
} }