revert breaking change

laravel · Jan 17, 2018 · 6197e56 · vlakoff · Jan 17, 2018 · 6197e56
1 parent 3f42299
commit 6197e56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -644,7 +644,7 @@ public function forget($keys)
      */
     public function get($key, $default = null)
     {
-        return Arr::get($this->items, $key, $default);
+        return is_null($key) ? null : Arr::get($this->items, $key, $default);
     }
 
     /**

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -2485,6 +2485,12 @@ public function testGetNestedValue()
         $this->assertEquals('Book 1', $collection->get('foo.books.0'));
         $this->assertEquals('Todo 2', $collection->get('foo.todos.second'));
     }
+
+    public function testGetWithNullReturnsNull()
+    {
+        $collection = new Collection([1, 2, 3]);
+        $this->assertNull($collection->get(null));
+    }
 }
 
 class TestSupportCollectionHigherOrderItem
-Original file line number
+Diff line change
@@ Expand Up / @@ -644,7 +644,7 @@ public function forget($keys) @@
          */
         public function get($key, $default = null)
         {
-            return Arr::get($this->items, $key, $default);
+            return is_null($key) ? null : Arr::get($this->items, $key, $default);
         }
         /**
@@ Expand Down @@