[8.x] Collection prevent null being added to resulting collection with pop and shift

src/Illuminate/Collections/Collection.php

@@ -788,15 +788,21 @@ public function only($keys)
     /**
      * Get and remove the last N items from the collection.
      *
-     * @param  int  $count
+     * @param  int|null  $count
      * @return mixed
      */
-    public function pop($count = 1)
+    public function pop($count = null)
     {
-        if ($count === 1) {
+        if (is_null($count)) {
             return array_pop($this->items);
         }
 
+        if ($count < 1 || $this->count() === 0) {
+            return new static([]);
+        }
+
+        $count = $count > $this->count() ? $this->count() : $count;
+
         $results = [];
 
         foreach (range(1, $count) as $item) {
@@ -952,17 +958,23 @@ public function search($value, $strict = false)
     /**
      * Get and remove the first N items from the collection.
      *
-     * @param  int  $count
+     * @param  int|null  $count
      * @return mixed
      */
-    public function shift($count = 1)
+    public function shift($count = null)
     {
-        if ($count === 1) {
+        if (is_null($count)) {
             return array_shift($this->items);
         }
 
+        if ($count < 1 || $this->count() === 0) {
+            return new static([]);
+        }
+
         $results = [];
 
+        $count = $count > $this->count() ? $this->count() : $count;
+
         foreach (range(1, $count) as $item) {
             array_push($results, array_shift($this->items));
         }

tests/Support/SupportCollectionTest.php

@@ -233,6 +233,28 @@ public function testPopReturnsAndRemovesLastXItemsInCollection()
         $this->assertSame('foo', $c->first());
     }
 
+    public function testPopOnlyReturnsCollectionItemsWhenParamGreaterThanCollectionLength()
+    {
+        $c = new Collection(['foo', 'bar']);
+        $this->assertEquals(new Collection(['bar', 'foo']), $c->pop(3));
+        $this->assertEmpty($c);
+    }
+
+    public function testPopReturnsEmptyCollectionWhenParameterLessThanOne()
+    {
+        $c = new Collection(['foo', 'bar', 'baz']);
+
+        $this->assertEquals(new Collection([]), $c->pop(0));
+        $this->assertSame('foo', $c->first());
+    }
+
+    public function testPopReturnsNullWhenNoItemsInCollectionAndParamSupplied()
+    {
+        $c = new Collection([]);
+        $this->assertEquals(new Collection([]), $c->pop(2));
+        $this->assertCount(0, $c);
+    }
+
     public function testShiftReturnsAndRemovesFirstItemInCollection()
     {
         $data = new Collection(['Taylor', 'Otwell']);
@@ -251,6 +273,27 @@ public function testShiftReturnsAndRemovesFirstXItemsInCollection()
         $this->assertSame('baz', $data->first());
     }
 
+    public function testShiftOnlyReturnsCollectionItemsWhenParamGreaterThanCollectionLength()
+    {
+        $c = new Collection(['foo', 'bar']);
+        $this->assertEquals(new Collection(['foo', 'bar']), $c->shift(3));
+        $this->assertEmpty($c);
+    }
+
+    public function testShiftReturnsEmptyColeectionWhenParameterLessThanOne()
+    {
+        $c = new Collection(['foo', 'bar']);
+        $this->assertEquals(new Collection([]), $c->shift(0));
+        $this->assertCount(2, $c);
+    }
+
+    public function testShiftReturnsNullWhenNoItemsInCollectionAndParamSupplied()
+    {
+        $c = new Collection([]);
+        $this->assertEquals(new Collection([]), $c->shift(2));
+        $this->assertCount(0, $c);
+    }
+
     /**
      * @dataProvider collectionClassProvider
      */