tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 14:39:25 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Don’t change state in ArrayList::getIterator()

Browse Source 
This prevents the map-to-ArrayData conversion from changing object
state and making the result of toArray() non-deterministic.

Fixes #2636. Other solutions were suggested on that ticket, but there is
no way of putting special code in for a SSViewer-specific iterator, and
having object state pre-emptively converted to ArrayData would
be an SS5-level change.
This commit is contained in:
Sam Minnee 2018-10-02 09:54:06 +13:00
parent 755907d117
commit ad87890b2e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ORM/ArrayList.php
View File

@ -84,12 +84,13 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
*/
public function getIterator()
{
foreach ($this->items as $i => $item) {
if (is_array($item)) {
$this->items[$i] = new ArrayData($item);
}
}
return new ArrayIterator($this->items);
$items = array_map(
function ($item) {
return is_array($item) ? new ArrayData($item) : $item;
},
$this->items
);
return new ArrayIterator($items);
}
/**