Skip to content

Fixed broken Iterator interface implementation in EnrichedActivity class #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2015
Merged

Fixed broken Iterator interface implementation in EnrichedActivity class #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions src/GetStream/StreamLaravel/EnrichedActivity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php namespace GetStream\StreamLaravel;

class EnrichedActivity implements \ArrayAccess, \Iterator {
class EnrichedActivity implements \ArrayAccess, \IteratorAggregate {
private $activityData = array();
private $notEnrichedData = array();

Expand Down Expand Up @@ -49,30 +49,9 @@ public function offsetGet($offset)
return isset($this->activityData[$offset]) ? $this->activityData[$offset] : null;
}

// Array iteration methods
public function rewind()
{
reset($this->activityData);
}

public function current()
{
return current($this->activityData);
}

public function key()
{
return key($this->activityData);
}

public function next()
{
return next($this->activityData);
}

public function valid()
{
return (bool) $this->current();
// Support iteration over private activityData array
public function getIterator() {
return new \ArrayIterator($this->activityData);
}

}