wip

Author: patinthehat

src/Support/Collections/Collection.php

@@ -5,8 +5,10 @@
 use Permafrost\PhpCodeSearch\Support\Arr;
 
 /** @codeCoverageIgnore */
-class Collection implements Arrayable, \ArrayAccess
+class Collection implements Arrayable, \ArrayAccess, \Countable, \Iterator
 {
+    use Enumerable;
+
     protected $items = [];
 
     public function __construct($items = [])
@@ -26,7 +28,7 @@ public function count(): int
 
     public function each(callable $callback): self
     {
-        foreach ($this->getIterator() as $key => $item) {
+        foreach ($this as $key => $item) {
             if ($callback($item, $key) === false) {
                 break;
             }
@@ -239,28 +241,4 @@ public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->items);
     }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->items[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->items[$offset];
-    }
-
-    public function offsetSet($key, $value)
-    {
-        if (is_null($key)) {
-            $this->items[] = $value;
-        } else {
-            $this->items[$key] = $value;
-        }
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->items[$offset]);
-    }
 }

src/Support/Collections/Enumerable.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Permafrost\PhpCodeSearch\Support\Collections;
+
+trait Enumerable
+{
+    protected $position = 0;
+
+    public function offsetExists($offset)
+    {
+        return isset($this->items[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->items[$offset];
+    }
+
+    public function offsetSet($key, $value)
+    {
+        if (is_null($key)) {
+            $this->items[] = $value;
+        } else {
+            $this->items[$key] = $value;
+        }
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->items[$offset]);
+    }
+
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    public function current()
+    {
+        return $this->items[$this->position];
+    }
+
+    public function key()
+    {
+        return $this->position;
+    }
+
+    public function next()
+    {
+        ++$this->position;
+    }
+
+    public function valid()
+    {
+        return isset($this->items[$this->position]);
+    }
+}