Merge pull request #23 from fusonic/bugfix-chained-where-orderby

Bugfix chained where orderby. Fixes #22
fusonic · Dec 12, 2015 · 68789c2 · 68789c2
2 parents f28a3ff + aff267b
commit 68789c2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/Fusonic/Linq/Iterator/OrderIterator.php b/src/Fusonic/Linq/Iterator/OrderIterator.php
@@ -66,7 +66,12 @@ public function orderItems()
         $direction = $this->direction;
 
         $itemIterator = $this->iterator;
-        $itemIterator->rewind();
+
+        if($itemIterator instanceof \IteratorAggregate) {
+            $itemIterator = $itemIterator->getIterator();
+            $itemIterator->rewind();
+        }
+
         if (!$itemIterator->valid()) {
             $this->orderedIterator = new ArrayIterator();
             return;
@@ -111,4 +116,4 @@ public function orderItems()
 
         $this->orderedIterator = $sorted;
     }
-}
+}
diff --git a/tests/Fusonic/Linq/Test/ChainedTest.php b/tests/Fusonic/Linq/Test/ChainedTest.php
@@ -0,0 +1,25 @@
+<?php
+
+require_once("TestBase.php");
+
+use Fusonic\Linq\Linq;
+
+class ChainedTest extends TestBase
+{
+    public function testWhereOrderBy_returnsFilteredValuesInCorrectOrder()
+    {
+        $source = [1, 4, 5, 2, 3];
+        $result = Linq::from($source)
+            ->where(function($x) {
+                return $x > 2;
+            })
+            ->orderBy(function($x) {
+                return $x;
+            });
+
+        $this->assertEquals([3,4,5], $result->toArray());
+
+        // Check multiple evaluations are working as well:
+        $this->assertEquals([3,4,5], $result->toArray());
+    }
+}