Merge pull request #27 from robations/hotfix/26

Fix problem using IteratorAggregates with skip and take

src/Fusonic/Linq/Linq.php

@@ -91,17 +91,17 @@ public function where(callable $func)
         return new Linq(new WhereIterator($this->iterator, $func));
     }
 
-	/**
-	 * Filters the Linq object according to type.
-	 *
-	 * @param string $type
-	 *
-	 * @return Linq Filtered results according to $func
-	 */
-	public function ofType($type)
-	{
-		return new Linq(new OfTypeIterator($this->iterator, $type));
-	}
+    /**
+     * Filters the Linq object according to type.
+     *
+     * @param string $type
+     *
+     * @return Linq Filtered results according to $func
+     */
+    public function ofType($type)
+    {
+        return new Linq(new OfTypeIterator($this->iterator, $type));
+    }
 
     /**
      * Bypasses a specified number of elements and then returns the remaining elements.
@@ -119,6 +119,11 @@ public function skip($count)
                 return new Linq([]);
             }
         }
+        if (!($innerIterator instanceof \Iterator)) {
+            // IteratorIterator wraps $innerIterator because it is Traversable but not an Iterator.
+            // (see https://bugs.php.net/bug.php?id=52280)
+            $innerIterator = new \IteratorIterator($innerIterator);
+        }
 
         return new Linq(new \LimitIterator($innerIterator, $count, -1));
     }
@@ -134,8 +139,14 @@ public function take($count)
         if ($count == 0) {
             return new Linq([]);
         }
+        $innerIterator = $this->iterator;
+        if (!($innerIterator instanceof \Iterator)) {
+            // IteratorIterator wraps $this->iterator because it is Traversable but not an Iterator.
+            // (see https://bugs.php.net/bug.php?id=52280)
+            $innerIterator = new \IteratorIterator($innerIterator);
+        }
 
-        return new Linq(new \LimitIterator($this->iterator, 0, $count));
+        return new Linq(new \LimitIterator($innerIterator, 0, $count));
     }
 
     /**

tests/Fusonic/Linq/Test/SkipTakeTest.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once("TestBase.php");
+require_once(__DIR__ . "/TestIteratorAggregate.php");
 
 use Fusonic\Linq\Linq;
 
@@ -112,4 +113,22 @@ public function testTake_TakeValuesByAmount()
         $matching = Linq::from($items)->take(0);
         $this->assertEquals(0, $matching->count());
     }
+
+    public function testTake_WithIteratorAggregate()
+    {
+        $items = new TestIteratorAggregate(["a", "b", "c", "d", "e", "f"]);
+        $matching = Linq::from($items)->take(4);
+
+        $this->assertTrue($matching instanceof Linq);
+        $this->assertEquals(4, $matching->count());
+    }
+
+    public function testSkip_WithIteratorAggregate()
+    {
+        $items = new TestIteratorAggregate(["a", "b", "c", "d", "e", "f"]);
+        $matching = Linq::from($items)->skip(2);
+
+        $this->assertTrue($matching instanceof Linq);
+        $this->assertEquals(4, $matching->count());
+    }
 }

tests/Fusonic/Linq/Test/TestIteratorAggregate.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @property array x
+ */
+class TestIteratorAggregate implements \IteratorAggregate
+{
+    public function __construct(array $x)
+    {
+        $this->x = $x;
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->x);
+    }
+}