Laravel 5.3.20 changes (#23)

tighten · Oct 25, 2016 · 07547aa · 07547aa
1 parent 321ff9a
commit 07547aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -483,7 +483,13 @@ public function keyBy($keyBy)
         $results = [];
 
         foreach ($this->items as $key => $item) {
-            $results[$keyBy($item, $key)] = $item;
+            $resolvedKey = $keyBy($item, $key);
+
+            if (is_object($resolvedKey)) {
+                $resolvedKey = (string) $resolvedKey;
+            }
+
+            $results[$resolvedKey] = $item;
         }
 
         return new static($results);
@@ -698,6 +704,10 @@ public function min($callback = null)
      */
     public function only($keys)
     {
+        if (is_null($keys)) {
+            return new static($this->items);
+        }
+
         $keys = is_array($keys) ? $keys : func_get_args();
 
         return new static(Arr::only($this->items, $keys));

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' => '[email protected]']);
 
+        $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());