Collection::only() with null returns all

laravel · Sep 30, 2016 · 91ace56 · 91ace56
1 parent c6bd7c4
commit 91ace56
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -195,6 +195,10 @@ public function unique($key = null, $strict = false)
      */
     public function only($keys)
     {
+        if (is_null($keys)) {
+            return $this;
+        }
+
         $dictionary = Arr::only($this->getDictionary(), $keys);
 
         return new static(array_values($dictionary));

diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -698,6 +698,10 @@ public function min($callback = null)
      */
     public function only($keys)
     {
+        if (is_null($keys)) {
+            return $this;
+        }
+
         $keys = is_array($keys) ? $keys : func_get_args();
 
         return new static(Arr::only($this->items, $keys));

diff --git a/tests/Database/DatabaseEloquentCollectionTest.php b/tests/Database/DatabaseEloquentCollectionTest.php
@@ -233,6 +233,7 @@ public function testOnlyReturnsCollectionWithGivenModelKeys()
 
         $c = new Collection([$one, $two, $three]);
 
+        $this->assertEquals($c, $c->only(null));
         $this->assertEquals(new Collection([$one]), $c->only(1));
         $this->assertEquals(new Collection([$two, $three]), $c->only([2, 3]));
     }

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -1338,6 +1338,7 @@ public function testOnly()
     {
         $data = new Collection(['first' => 'Taylor', 'last' => 'Otwell', 'email' => 'taylorotwell@gmail.com']);
 
+        $this->assertEquals($data->all(), $data->only(null)->all());
         $this->assertEquals(['first' => 'Taylor'], $data->only(['first', 'missing'])->all());
         $this->assertEquals(['first' => 'Taylor'], $data->only('first', 'missing')->all());