fixed a regression when using a number in template attributes (closes #733)

diff --git a/CHANGELOG b/CHANGELOG
index 5f4d0b8..eb53dc1 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.8.2 (2012-XX-XX)
 
+ * fixed a regression when using a number in template attributes
  * fixed compiler when mbstring.func_overload is set to 2
 
 * 1.8.1 (2012-05-17)

diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php
index 1693596..7ecdba4 100644 (file)
--- a/lib/Twig/Template.php
+++ b/lib/Twig/Template.php
@@ -326,7 +326,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
      */
     protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_TemplateInterface::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
     {
-        $item = is_numeric($item) ? (int) $item : (string) $item;
+        $item = ctype_digit((string) $item) ? (int) $item : (string) $item;
 
         // array
         if (Twig_TemplateInterface::METHOD_CALL !== $type) {

diff --git a/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test b/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
new file mode 100644 (file)
index 0000000..e18e110
--- /dev/null
+++ b/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
@@ -0,0 +1,8 @@
+--TEST--
+Twig does not confuse strings with integers in getAttribute()
+--TEMPLATE--
+{{ hash['2e2'] }}
+--DATA--
+return array('hash' => array('2e2' => 'works'))
+--EXPECT--
+works