fix implimentation

spatie · Jan 6, 2018 · a0ca00d · a0ca00d
1 parent 1e7da80
commit a0ca00d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/macros/transpose.php b/src/macros/transpose.php
@@ -16,14 +16,10 @@
 
     $firstItem = $this->first();
 
-    if (! $firstItem instanceof Countable) {
-        return new static();
-    }
-
-    $expectedLength = count($firstItem);
+    $expectedLength = is_array($firstItem) || $firstItem instanceof Countable ? count($firstItem) : 0;
 
     array_walk($this->items, function ($row) use ($expectedLength) {
-        if (count($row) !== $expectedLength) {
+        if ((is_array($row) || $row instanceof Countable) && count($row) !== $expectedLength) {
             throw new \LengthException("Element's length must be equal.");
         }
     });

diff --git a/tests/TransposeTest.php b/tests/TransposeTest.php
@@ -161,4 +161,20 @@ public function it_can_handle_null_values()
 
         $this->assertEquals($expected, $collection->transpose());
     }
+
+    /** @test */
+    public function it_can_handle_collections_values()
+    {
+        $collection = new Collection([
+            new Collection([1, 2, 3]),
+        ]);
+
+        $expected = new Collection([
+            new Collection([1]),
+            new Collection([2]),
+            new Collection([3]),
+        ]);
+
+        $this->assertEquals($expected, $collection->transpose());
+    }
 }