From 9e1a73f26050aff8fb00dea22dbb31925082fb06 Mon Sep 17 00:00:00 2001
From: Merijn Wijngaard <mwijngaard@gmail.com>
Date: Sun, 25 Oct 2015 10:35:44 +0100
Subject: [PATCH] Removed lazy traversable in favour of just using plain
 traversables and iterator_to_array

---
 src/Lazy/AbstractLazyTraversable.php | 9 ---------
 src/Lazy/LazyConcat.php              | 2 +-
 src/Lazy/LazyCycle.php               | 2 +-
 src/Lazy/LazyFilter.php              | 2 +-
 src/Lazy/LazyIterate.php             | 2 +-
 src/Lazy/LazyMap.php                 | 2 +-
 src/Lazy/LazyRange.php               | 2 +-
 src/Lazy/LazyRepeat.php              | 2 +-
 src/Lazy/LazyReplicate.php           | 2 +-
 src/Lazy/LazyTraversable.php         | 6 ------
 test/Lazy/RangeTest.php              | 2 +-
 11 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 src/Lazy/AbstractLazyTraversable.php
 delete mode 100644 src/Lazy/LazyTraversable.php

diff --git a/src/Lazy/AbstractLazyTraversable.php b/src/Lazy/AbstractLazyTraversable.php
deleted file mode 100644
index b3a7d27..0000000
--- a/src/Lazy/AbstractLazyTraversable.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace mwijngaard\Lazy;
-
-abstract class AbstractLazyTraversable extends AbstractLazyValue implements LazyTraversable {
-	public function resolve() {
-		return iterator_to_array($this);
-	}
-}
\ No newline at end of file
diff --git a/src/Lazy/LazyConcat.php b/src/Lazy/LazyConcat.php
index f751dab..02699a0 100644
--- a/src/Lazy/LazyConcat.php
+++ b/src/Lazy/LazyConcat.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyConcat extends AbstractLazyTraversable {
+class LazyConcat implements \IteratorAggregate {
 	/** @var (array|\Traversable)[]  */
 	private $traversables;
 
diff --git a/src/Lazy/LazyCycle.php b/src/Lazy/LazyCycle.php
index fc44b81..8153207 100644
--- a/src/Lazy/LazyCycle.php
+++ b/src/Lazy/LazyCycle.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyCycle extends AbstractLazyTraversable {
+class LazyCycle implements \IteratorAggregate {
 	/** @var array|\Traversable */
 	private $traversable;
 
diff --git a/src/Lazy/LazyFilter.php b/src/Lazy/LazyFilter.php
index 7ff1d1c..642332f 100644
--- a/src/Lazy/LazyFilter.php
+++ b/src/Lazy/LazyFilter.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyFilter extends AbstractLazyTraversable {
+class LazyFilter implements \IteratorAggregate {
 	/** @var array|\Traversable  */
 	private $traversable;
 	/** @var callable  */
diff --git a/src/Lazy/LazyIterate.php b/src/Lazy/LazyIterate.php
index 10225b5..72b26b6 100644
--- a/src/Lazy/LazyIterate.php
+++ b/src/Lazy/LazyIterate.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyIterate extends AbstractLazyTraversable {
+class LazyIterate implements \IteratorAggregate {
 	/** @var callable  */
 	private $value_func;
 	/** @var  array */
diff --git a/src/Lazy/LazyMap.php b/src/Lazy/LazyMap.php
index 69d471f..288ceb6 100644
--- a/src/Lazy/LazyMap.php
+++ b/src/Lazy/LazyMap.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyMap extends AbstractLazyTraversable {
+class LazyMap implements \IteratorAggregate {
 	/** @var array|\Traversable  */
 	private $traversable;
 	/** @var callable  */
diff --git a/src/Lazy/LazyRange.php b/src/Lazy/LazyRange.php
index 830cb2f..0226c39 100644
--- a/src/Lazy/LazyRange.php
+++ b/src/Lazy/LazyRange.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyRange extends AbstractLazyTraversable {
+class LazyRange implements \IteratorAggregate {
 	private $start;
 	private $end;
 	private $step;
diff --git a/src/Lazy/LazyRepeat.php b/src/Lazy/LazyRepeat.php
index 9d0bfab..291c7b2 100644
--- a/src/Lazy/LazyRepeat.php
+++ b/src/Lazy/LazyRepeat.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyRepeat extends AbstractLazyTraversable {
+class LazyRepeat implements \IteratorAggregate {
 	/** @var  callable */
 	private $value_func;
 
diff --git a/src/Lazy/LazyReplicate.php b/src/Lazy/LazyReplicate.php
index e1c7b22..23ed441 100644
--- a/src/Lazy/LazyReplicate.php
+++ b/src/Lazy/LazyReplicate.php
@@ -2,7 +2,7 @@
 
 namespace mwijngaard\Lazy;
 
-class LazyReplicate extends AbstractLazyTraversable {
+class LazyReplicate implements \IteratorAggregate {
 	/** @var  int */
 	private $ct;
 	private $value;
diff --git a/src/Lazy/LazyTraversable.php b/src/Lazy/LazyTraversable.php
deleted file mode 100644
index b21a429..0000000
--- a/src/Lazy/LazyTraversable.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace mwijngaard\Lazy;
-
-interface LazyTraversable extends LazyValue, \IteratorAggregate {
-}
\ No newline at end of file
diff --git a/test/Lazy/RangeTest.php b/test/Lazy/RangeTest.php
index a3990a3..62c8bc5 100644
--- a/test/Lazy/RangeTest.php
+++ b/test/Lazy/RangeTest.php
@@ -13,7 +13,7 @@ public function testRangeIsEqualToNative() {
 			if ($end < $start) {
 				list($end, $start) = array($start, $end);
 			}
-			$this->assertEquals(range($start, $end), lazy_range($start, $end)->resolve());
+			$this->assertEquals(range($start, $end), iterator_to_array(lazy_range($start, $end)));
 		});
 	}
 }
\ No newline at end of file