fixed variable that defines __isset() (closes #71)

diff --git a/CHANGELOG b/CHANGELOG
index 296567a..20ced20 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 0.9.8
 
+ * fixed objects with __isset() defined
  * fixed set tag when used with a capture
  * fixed type hinting for Twig_Environment::addFilter() method
 

diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php
index 71819e7..84d8ae5 100644 (file)
--- a/lib/Twig/Template.php
+++ b/lib/Twig/Template.php
@@ -105,7 +105,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
 
         // object property
         if (Twig_Node_Expression_GetAttr::TYPE_METHOD !== $type) {
-            if (property_exists($object, $item)) {
+            if (property_exists($object, $item) || isset($object->$item)) {
                 if ($this->env->hasExtension('sandbox')) {
                     $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
                 }

diff --git a/test/Twig/Tests/TemplateTest.php b/test/Twig/Tests/TemplateTest.php
new file mode 100644 (file)
index 0000000..d8a3157
--- /dev/null
+++ b/test/Twig/Tests/TemplateTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Tests_TemplateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getGetAttributeTests
+     */
+    public function testGetAttribute($expected, $object, $item, $arguments, $type)
+    {
+        $template = new Twig_TemplateTest(new Twig_Environment());
+
+        $this->assertEquals($expected, $template->getAttribute($object, $item, $arguments, $type));
+    }
+
+    public function getGetAttributeTests()
+    {
+        $array = array('foo' => 'foo');
+        $object = new Twig_TemplateObject();
+        $objectArray = new Twig_TemplateObjectArrayAccess();
+        $objectMagic = new Twig_TemplateObjectMagic();
+
+        $anyType = Twig_Node_Expression_GetAttr::TYPE_ANY;
+        $methodType = Twig_Node_Expression_GetAttr::TYPE_METHOD;
+        $arrayType = Twig_Node_Expression_GetAttr::TYPE_ARRAY;
+
+        $tests = array(
+            // ARRAY
+                array('foo', $array, 'foo', array(), $arrayType),
+                array(null, $array, 'foobar', array(), $arrayType),
+                array('foo', $objectArray, 'foo', array(), $arrayType),
+                array(null, $objectArray, 'foobar', array(), $arrayType),
+
+            // METHOD
+                array('bar', $object, 'bar', array(), $methodType),
+                array('bar', $object, 'getBar', array(), $methodType),
+                array('foobar', $object, 'foobar', array(), $methodType),
+                array('__call_baz', $objectMagic, 'baz', array(), $methodType),
+
+            // ANY
+                array('foo', $object, 'foo', array(), $anyType),
+                array('foo', $objectMagic, 'foo', array(), $anyType),
+                array(null, $object, 'null', array(), $anyType),
+        );
+
+        // add the same tests for the any type
+        foreach ($tests as $test) {
+            if ($anyType !== $test[4]) {
+                $test[4] = $anyType;
+                $tests[] = $test;
+            }
+        }
+
+        return $tests;
+    }
+}
+
+class Twig_TemplateTest extends Twig_Template
+{
+    public function display(array $context)
+    {
+    }
+
+    public function getAttribute($object, $item, array $arguments = array(), $type = Twig_Node_Expression_GetAttr::TYPE_ANY)
+    {
+        return parent::getAttribute($object, $item, $arguments, $type);
+    }
+}
+
+class Twig_TemplateObject
+{
+    public $foo = 'foo';
+    public $null = null;
+
+    public function getNull()
+    {
+        return 'null...';
+    }
+
+    public function getBar()
+    {
+        return 'bar';
+    }
+
+    public function fooBar()
+    {
+        return 'foobar';
+    }
+}
+
+class Twig_TemplateObjectArrayAccess implements ArrayAccess
+{
+    public $attributes = array('foo' => 'foo');
+
+    public function offsetExists($name)
+    {
+        return isset($this->attributes[$name]);
+    }
+
+    public function offsetGet($name)
+    {
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+    }
+
+    public function offsetSet($name, $value)
+    {
+    }
+
+    public function offsetUnset($name)
+    {
+    }
+}
+
+class Twig_TemplateObjectMagic
+{
+    public $attributes = array('foo' => 'foo');
+
+    public function __isset($name)
+    {
+        return isset($this->attributes[$name]);
+    }
+
+    public function __get($name)
+    {
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+    }
+
+    public function __call($method, $arguments)
+    {
+        return '__call_'.$method;
+    }
+}