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

Allow is defined test on complex variables

Browse Source
This commit is contained in:
Jordi Boggiano
2010-11-26 18:58:49 +01:00
committed by Fabien Potencier
parent a511b9bd64
commit 3c94b3c033
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/Expression/GetAttr.php
+7 -2
View File
@@ -39,7 +39,12 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
$compiler
->raw('), ')
->repr($this->getAttribute('type'))
->raw(')');
->repr($this->getAttribute('type'));
if ($this->hasAttribute('is_defined_test')) {
$compiler->raw(', true');
}
$compiler->raw(')');
}
}
lib/Twig/Node/Expression/Test.php
+10 -8
View File
@@ -24,16 +24,18 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression
// defined is a special case
if ('defined' === $this->getAttribute('name')) {
if (!$this->getNode('node') instanceof Twig_Node_Expression_Name){
if ($this->getNode('node') instanceof Twig_Node_Expression_Name) {
$compiler
->raw($testMap[$this->getAttribute('name')]->compile().'(')
->repr($this->getNode('node')->getAttribute('name'))
->raw(', $context)')
;
} elseif ($this->getNode('node') instanceof Twig_Node_Expression_GetAttr) {
$this->getNode('node')->setAttribute('is_defined_test', true);
$compiler->subcompile($this->getNode('node'));
} else {
throw new Twig_Error_Syntax('The "defined" test only works with simple variables', $this->getLine());
}
$compiler
->raw($testMap[$this->getAttribute('name')]->compile().'(')
->repr($this->getNode('node')->getAttribute('name'))
->raw(', $context)')
;
return;
}
lib/Twig/Template.php
+4 -5
View File
@@ -96,7 +96,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
return $context[$item];
}
protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_Node_Expression_GetAttr::TYPE_ANY)
protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_Node_Expression_GetAttr::TYPE_ANY, $noStrictCheck = false)
{
// array
if (Twig_Node_Expression_GetAttr::TYPE_METHOD !== $type) {
@@ -105,7 +105,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
}
if (Twig_Node_Expression_GetAttr::TYPE_ARRAY === $type) {
if (!$this->env->isStrictVariables()) {
if (!$this->env->isStrictVariables() || $noStrictCheck) {
return null;
}
@@ -114,10 +114,9 @@ abstract class Twig_Template implements Twig_TemplateInterface
}
if (!is_object($object)) {
if (!$this->env->isStrictVariables()) {
if (!$this->env->isStrictVariables() || $noStrictCheck) {
return null;
}
throw new Twig_Error_Runtime(sprintf('Item "%s" for "%s" does not exist.', $item, $object));
}
@@ -157,7 +156,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
} elseif (isset(self::$cache[$class]['methods']['__call'])) {
$method = $item;
} else {
if (!$this->env->isStrictVariables()) {
if (!$this->env->isStrictVariables() || $noStrictCheck) {
return null;
}