Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ArrayAccess priority:

Browse Source 
* Methods brump properties and ArrayAccess
 * Properties beat ArrayAccess
 * ArrayAccess beats nothing at all
 * ArrayAccess also beats private properties

Add a test case to verify.

See #178
This commit is contained in:
Justin Hileman
2013-12-06 19:45:28 -08:00
parent 04b016016e
commit 38b6b245b1
2 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Context.php
+7 -11
View File
@@ -133,17 +133,13 @@ class Mustache_Context
private function findVariableInStack($id, array $stack)
{
for ($i = count($stack) - 1; $i >= 0; $i--) {
if (is_object($stack[$i])) {
if ($stack[$i] instanceof ArrayAccess) {
if (isset($stack[$i][$id])) {
return $stack[$i][$id];
}
} elseif (!($stack[$i] instanceof Closure)) {
if (method_exists($stack[$i], $id)) {
return $stack[$i]->$id();
} elseif (isset($stack[$i]->$id)) {
return $stack[$i]->$id;
}
if (is_object($stack[$i]) && !($stack[$i] instanceof Closure)) {
if (method_exists($stack[$i], $id)) {
return $stack[$i]->$id();
} elseif (isset($stack[$i]->$id)) {
return $stack[$i]->$id;
} elseif ($stack[$i] instanceof ArrayAccess && isset($stack[$i][$id])) {
return $stack[$i][$id];
}
} elseif (is_array($stack[$i]) && array_key_exists($id, $stack[$i])) {
return $stack[$i][$id];