smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix remove special treatment of classes implementing ArrayAccess in {foreach}

Browse Source 
https://github.com/smarty-php/smarty/issues/332
This commit is contained in:
uwetews
2017-05-21 02:23:53 +02:00
parent da22c961bb
commit 61b59a9ec3
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
change_log.txt
View File

@@ -1,4 +1,8 @@
===== 3.1.32 - dev ===
21.5.2017
- bugfix remove special treatment of classes implementing ArrayAccess in {foreach}
https://github.com/smarty-php/smarty/issues/332
19.5.2017
- change properties $accessMap and $obsoleteProperties from private to protected
https://github.com/smarty-php/smarty/issues/351
@@ -6,7 +10,7 @@
See NEWS_FEATURES.txt https://github.com/smarty-php/smarty/issues/366
- improvement check if ini_get() and ini_set() not disabled
https://github.com/smarty-php/smarty/pull/362
24.4.2017
- fix spelling https://github.com/smarty-php/smarty/commit/e3eda8a5f5653d8abb960eb1bc47e3eca679b1b4#commitcomment-21803095

2
libs/Smarty.class.php
View File

@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
const SMARTY_VERSION = '3.1.32-dev-3';
const SMARTY_VERSION = '3.1.32-dev-5';
/**
* define variable scopes

66
libs/sysplugins/smarty_internal_runtime_foreach.php
View File

@@ -50,7 +50,8 @@ class Smarty_Internal_Runtime_Foreach
$total = empty($from) ? 0 : (($needTotal || isset($properties[ 'total' ])) ? count($from) : 1);
}
if (isset($tpl->tpl_vars[ $item ])) {
$saveVars[ 'item' ] = array($item, $tpl->tpl_vars[ $item ]);
$saveVars[ 'item' ] = array($item,
$tpl->tpl_vars[ $item ]);
}
$tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
if ($total === 0) {
@@ -58,7 +59,8 @@ class Smarty_Internal_Runtime_Foreach
} else {
if ($key) {
if (isset($tpl->tpl_vars[ $key ])) {
$saveVars[ 'key' ] = array($key, $tpl->tpl_vars[ $key ]);
$saveVars[ 'key' ] = array($key,
$tpl->tpl_vars[ $key ]);
}
$tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
}
@@ -69,7 +71,8 @@ class Smarty_Internal_Runtime_Foreach
if ($name) {
$namedVar = "__smarty_foreach_{$name}";
if (isset($tpl->tpl_vars[ $namedVar ])) {
$saveVars[ 'named' ] = array($namedVar, $tpl->tpl_vars[ $namedVar ]);
$saveVars[ 'named' ] = array($namedVar,
$tpl->tpl_vars[ $namedVar ]);
}
$namedProp = array();
if (isset($properties[ 'total' ])) {
@@ -90,6 +93,33 @@ class Smarty_Internal_Runtime_Foreach
return $from;
}
/**
*
* [util function] counts an array, arrayAccess/traversable or PDOStatement object
*
* @param mixed $value
*
* @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
* for empty elements
*/
public function count($value)
{
if ($value instanceof IteratorAggregate) {
// Note: getIterator() returns a Traversable, not an Iterator
// thus rewind() and valid() methods may not be present
return iterator_count($value->getIterator());
} elseif ($value instanceof Iterator) {
return $value instanceof Generator ? 1 : iterator_count($value);
} elseif ($value instanceof Countable) {
return count($value);
} elseif ($value instanceof PDOStatement) {
return $value->rowCount();
} elseif ($value instanceof Traversable) {
return iterator_count($value);
}
return count((array) $value);
}
/**
* Restore saved variables
*
@@ -114,36 +144,8 @@ class Smarty_Internal_Runtime_Foreach
$tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ];
}
}
$levels--;
$levels --;
}
}
/*
*
* [util function] counts an array, arrayAccess/traversable or PDOStatement object
*
* @param mixed $value
*
* @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
* for empty elements
*/
public function count($value)
{
if ($value instanceof Countable) {
return count($value);
} elseif ($value instanceof IteratorAggregate) {
// Note: getIterator() returns a Traversable, not an Iterator
// thus rewind() and valid() methods may not be present
return iterator_count($value->getIterator());
} elseif ($value instanceof Iterator) {
return $value instanceof Generator ? 1 : iterator_count($value);
} elseif ($value instanceof PDOStatement) {
return $value->rowCount();
} elseif ($value instanceof Traversable) {
return iterator_count($value);
} elseif ($value instanceof ArrayAccess) {
return $value->offsetExists(0) ? 1 : 0;
}
return count((array) $value);
}
}