Update Pluck operation.

loophp · Sep 9, 2019 · 9e96a94 · 9e96a94
1 parent 2351988
commit 9e96a94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/drupol/collection/CollectionSpec.php b/spec/drupol/collection/CollectionSpec.php
@@ -702,16 +702,19 @@ public function it_can_pluck(): void
 
         $input = [
             [
+                0 => 'A',
                 'foo' => [
                     'bar' => 0,
                 ],
             ],
             [
+                0 => 'B',
                 'foo' => [
                     'bar' => 1,
                 ],
             ],
             [
+                0 => 'C',
                 'foo' => [
                     'bar' => 2,
                 ],
@@ -734,6 +737,7 @@ public function it_can_pluck(): void
                 ];
             },
             [
+                0 => 'D',
                 'foo' => [
                     'bar' => $six,
                 ],
@@ -759,6 +763,10 @@ public function it_can_pluck(): void
         $this::with($input)
             ->pluck('azerty', 'taz')
             ->shouldIterateAs([0 => 'taz', 1 => 'taz', 2 => 'taz', 3 => 'taz', 4 => 'taz', 5 => 'taz', 6 => 'taz']);
+
+        $this::with($input)
+            ->pluck(0)
+            ->shouldIterateAs([0 => 'A', 1 => 'B', 2 => 'C', null, null, null, 6 => 'D']);
     }
 
     public function it_can_prepend(): void

diff --git a/src/Operation/Pluck.php b/src/Operation/Pluck.php
@@ -20,7 +20,7 @@ final class Pluck implements Operation
     private $default;
 
     /**
-     * @var array|string
+     * @var mixed
      */
     private $key;
 
@@ -47,7 +47,7 @@ public function on(iterable $collection): \Closure
         $operation = $this;
 
         return static function () use ($key, $default, $collection, $operation) {
-            $key = \is_string($key) ? \explode('.', \trim($key, '.')) : $key;
+            $key = true === \is_scalar($key) ? \explode('.', \trim((string) $key, '.')) : $key;
 
             foreach ($collection as $value) {
                 yield $operation->pick($collection, $value, $key, $default);