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

removed usage of Reflection in Twig_Template::getAttribute() (thanks Pierre Joye for the property tip)

Browse Source
This commit is contained in:
Fabien Potencier
2011-11-21 10:36:47 +01:00
parent 7a2c444054
commit 7bc07dc132
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,5 +1,6 @@
* 1.4.0-RC2
* removed usage of Reflection in Twig_Template::getAttribute()
* added the Twig C extension (replaces the implementation of Twig_Template::getAttribute() by a C function)
* added negative timestamp support to the date filter
lib/Twig/Template.php
+12 -12
View File
@@ -352,22 +352,16 @@ abstract class Twig_Template implements Twig_TemplateInterface
throw new Twig_Error_Runtime(sprintf('Item "%s" for "%s" does not exist', $item, is_array($object) ? 'Array' : $object));
}
// get some information about the object
$class = get_class($object);
if (!isset(self::$cache[$class])) {
$r = new ReflectionClass($class);
self::$cache[$class] = array('methods' => array(), 'properties' => array());
foreach ($r->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
self::$cache[$class]['methods'][strtolower($method->getName())] = true;
}
foreach ($r->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
self::$cache[$class]['properties'][$property->getName()] = true;
}
}
// object property
if (Twig_TemplateInterface::METHOD_CALL !== $type) {
if (!isset(self::$cache[$class]['properties'])) {
foreach ($object as $k => $v) {
self::$cache[$class]['properties'][$k] = true;
}
}
if (isset(self::$cache[$class]['properties'][$item])
|| isset($object->$item) || array_key_exists($item, $object)
) {
@@ -384,6 +378,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
}
// object method
if (!isset(self::$cache[$class]['methods'])) {
foreach (get_class_methods($object) as $method) {
self::$cache[$class]['methods'][strtolower($method)] = true;
}
}
$lcItem = strtolower($item);
if (isset(self::$cache[$class]['methods'][$lcItem])) {
$method = $item;