geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 10:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed deep nested defined tests

Browse Source
This commit is contained in:
Fabien Potencier
2011-10-26 09:33:02 +02:00
parent 5da378ceaa
commit 5e290cbb4d
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/Expression/Test.php
+12 -1
View File
@@ -16,14 +16,25 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression
// defined is a special case
if ('defined' === $name) {
if ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr) {
if ($node instanceof Twig_Node_Expression_Name) {
$node->setAttribute('is_defined_test', true);
} elseif ($node instanceof Twig_Node_Expression_GetAttr) {
$this->changeIsDefined($node);
} else {
throw new Twig_Error_Syntax('The "defined" test only works with simple variables', $this->getLine());
}
}
}
protected function changeIsDefined(Twig_Node_Expression_GetAttr $node)
{
$node->setAttribute('is_defined_test', true);
if ($node->getNode('node') instanceof Twig_Node_Expression_GetAttr) {
$this->changeIsDefined($node->getNode('node'));
}
}
public function compile(Twig_Compiler $compiler)
{
$testMap = $compiler->getEnvironment()->getTests();
test/Twig/Tests/Fixtures/filters/default.test
+40 -1
View File
@@ -23,7 +23,7 @@ Precedence:
{{ 'o' ~ nullVar|default('k') }}
{{ 'o' ~ nested.nullVar|default('k') }}
Deep nested:
{{ nested.definedVar.undefinedVar.foo.bar|default('default') is sameas('default') ? 'ok' : 'ko' }}
{{ nested.undefinedVar.foo.bar|default('default') is sameas('default') ? 'ok' : 'ko' }}
--DATA--
return array(
'definedVar' => 'defined',
@@ -63,3 +63,42 @@ ok
ok
Deep nested:
ok
--DATA--
return array(
'definedVar' => 'defined',
'zeroVar' => 0,
'emptyVar' => '',
'nullVar' => null,
'nested' => array(
'definedVar' => 'defined',
'zeroVar' => 0,
'emptyVar' => '',
'nullVar' => null,
),
)
--CONFIG--
return array('strict_variables' => true)
--EXPECT--
Variable:
ok
ok
ok
ok
ok
Array access:
ok
ok
ok
ok
ok
ok
Plain values:
ok
ok
ok
ok
Precedence:
ok
ok
Deep nested:
ok