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

do not overridde case-insentive cache entries

Browse Source
This commit is contained in:
Christian Flothmann
2017-01-11 18:30:44 +01:00
parent 9ef01e8cbc
commit 2c153bd10f
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+10 -7
View File
@@ -1486,10 +1486,10 @@ function twig_get_attribute(Twig_Environment $env, Twig_Source $source, $object,
$methods = get_class_methods($object);
sort($methods);
$lcMethods = array_map('strtolower', $methods);
$cache = array();
$classCache = array();
foreach ($methods as $i => $method) {
$cache[$method] = $method;
$cache[$lcName = $lcMethods[$i]] = $method;
$classCache[$method] = $method;
$classCache[$lcName = $lcMethods[$i]] = $method;
if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
$name = substr($method, 3);
@@ -1507,12 +1507,15 @@ function twig_get_attribute(Twig_Environment $env, Twig_Source $source, $object,
continue;
}
if (!isset($cache[$name])) {
$cache[$name] = $method;
$cache[$lcName] = $method;
if (!isset($classCache[$name])) {
$classCache[$name] = $method;
}
if (!isset($classCache[$lcName])) {
$classCache[$lcName] = $method;
}
}
$cache[$class] = $cache;
$cache[$class] = $classCache;
}
$call = false;
test/Twig/Tests/TemplateTest.php
+5
View File
@@ -582,6 +582,11 @@ class Twig_TemplateMethodObject
}
public function getBaz()
{
return 'Baz';
}
public function baz()
{
return 'baz';
}