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

moved filters/functions/tests syntax errors to the parser

Browse Source
This commit is contained in:
Fabien Potencier
2012-11-14 14:31:49 +01:00
parent 2243a14e3d
commit e1ad2bde9c
10 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Twig/Tests/ExpressionParserTest.php
+36
View File
@@ -214,4 +214,40 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
),
);
}
/**
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The function "cycl" does not exist. Did you mean "cycle" in "index" at line 1
*/
public function testUnknownFunction()
{
$env = new Twig_Environment(new Twig_Loader_String(), array('cache' => false, 'autoescape' => false));
$parser = new Twig_Parser($env);
$parser->parse($env->tokenize('{{ cycl() }}', 'index'));
}
/**
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The filter "lowe" does not exist. Did you mean "lower" in "index" at line 1
*/
public function testUnknownFilter()
{
$env = new Twig_Environment(new Twig_Loader_String(), array('cache' => false, 'autoescape' => false));
$parser = new Twig_Parser($env);
$parser->parse($env->tokenize('{{ 1|lowe }}', 'index'));
}
/**
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The test "nul" does not exist. Did you mean "null" in "index" at line 1
*/
public function testUnknownTest()
{
$env = new Twig_Environment(new Twig_Loader_String(), array('cache' => false, 'autoescape' => false));
$parser = new Twig_Parser($env);
$parser->parse($env->tokenize('{{ 1 is nul }}', 'index'));
}
}
test/Twig/Tests/Node/Expression/FilterTest.php
-24
View File
@@ -35,19 +35,6 @@ class Twig_Tests_Node_Expression_FilterTest extends Twig_Test_NodeTestCase
parent::testCompile($node, $source, $environment);
}
/**
* @covers Twig_Node_Expression_Filter::compile
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The filter "lowe" does not exist. Did you mean "lower" at line 1
*/
public function testCompileUnknownFilter()
{
$expr = new Twig_Node_Expression_Constant('foo', 1);
$node = $this->createFilter($expr, 'lowe', array(new Twig_Node_Expression_Constant('bar', 1), new Twig_Node_Expression_Constant('foobar', 1)));
$node->compile($this->getCompiler());
}
public function getTests()
{
$tests = array();
@@ -65,17 +52,6 @@ class Twig_Tests_Node_Expression_FilterTest extends Twig_Test_NodeTestCase
return $tests;
}
/**
* @covers Twig_Node_Expression_Filter::compile
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The filter "uppe" does not exist. Did you mean "upper" at line 1
*/
public function testUnknownFilter()
{
$node = $this->createFilter(new Twig_Node_Expression_Constant('foo', 1), 'uppe');
$node->compile($this->getCompiler());
}
protected function createFilter($node, $name, array $arguments = array())
{
$name = new Twig_Node_Expression_Constant($name, 1);
test/Twig/Tests/Node/Expression/FunctionTest.php
-11
View File
@@ -33,17 +33,6 @@ class Twig_Tests_Node_Expression_FunctionTest extends Twig_Test_NodeTestCase
parent::testCompile($node, $source, $environment);
}
/**
* @covers Twig_Node_Expression_Filter::compile
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The function "cycl" does not exist. Did you mean "cycle" at line 1
*/
public function testUnknownFunction()
{
$node = $this->createFunction('cycl', array());
$node->compile($this->getCompiler());
}
public function getTests()
{
$environment = new Twig_Environment();
test/Twig/Tests/Node/Expression/TestTest.php
-11
View File
@@ -47,17 +47,6 @@ class Twig_Tests_Node_Expression_TestTest extends Twig_Test_NodeTestCase
return $tests;
}
/**
* @covers Twig_Node_Expression_Filter::compile
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage The test "nul" does not exist. Did you mean "null" at line 1
*/
public function testUnknownTest()
{
$node = $this->createTest(new Twig_Node_Expression_Constant('foo', 1), 'nul');
$node->compile($this->getCompiler());
}
protected function createTest($node, $name, array $arguments = array())
{
return new Twig_Node_Expression_Test($node, $name, new Twig_Node($arguments), 1);