Collection::only with null or '*' returns all

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

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -193,8 +193,12 @@ public function unique($key = null, $strict = false)
      * @param  mixed  $keys
      * @return static
      */
-    public function only($keys)
+    public function only($keys = '*')
     {
+        if (is_null($keys) || $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
@@ -696,8 +696,12 @@ public function min($callback = null)
      * @param  mixed  $keys
      * @return static
      */
-    public function only($keys)
+    public function only($keys = '*')
     {
+        if (is_null($keys) || $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,8 @@ public function testOnlyReturnsCollectionWithGivenModelKeys()
 
         $c = new Collection([$one, $two, $three]);
 
+        $this->assertEquals($c, $c->only(null));
+        $this->assertEquals($c, $c->only('*'));
         $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,10 @@ public function testOnly()
     {
         $data = new Collection(['first' => 'Taylor', 'last' => 'Otwell', 'email' => 'taylorotwell@gmail.com']);
 
+        $this->assertEquals($data->all(), $data->only()->all());
+        $this->assertEquals($data->all(), $data->only(null)->all());
+        $this->assertEquals($data->all(), $data->only('*')->all());
+
         $this->assertEquals(['first' => 'Taylor'], $data->only(['first', 'missing'])->all());
         $this->assertEquals(['first' => 'Taylor'], $data->only('first', 'missing')->all());