[10.x] Fix collection shift less than one item (#51686)

* fix collection shift less than 1 * throw exception earlier * Update Collection.php --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>

Author: faissaloux

src/Illuminate/Collections/Collection.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\CanBeEscapedWhenCastToString;
 use Illuminate\Support\Traits\EnumeratesValues;
 use Illuminate\Support\Traits\Macroable;
+use InvalidArgumentException;
 use stdClass;
 use Traversable;
 
@@ -1124,17 +1125,23 @@ public function search($value, $strict = false)
  *
  * @param int $count
  * @return static<int, TValue>|TValue|null
+ *
+ * @throws \InvalidArgumentException
  */
  public function shift($count = 1)
  {
- if ($count === 1) {
- return array_shift($this->items);
+ if ($count < 0) {
+ throw new InvalidArgumentException('Number of shifted items may not be less than zero.');
  }
 
- if ($this->isEmpty()) {
+ if ($count === 0 || $this->isEmpty()) {
  return new static;
  }
 
+ if ($count === 1) {
+ return array_shift($this->items);
+ }
+
  $results = [];
 
  $collectionCount = $this->count();

tests/Support/SupportCollectionTest.php

@@ -391,6 +391,17 @@ public function testShiftReturnsAndRemovesFirstXItemsInCollection()
  $this->assertSame('baz', $data->first());
 
  $this->assertEquals(new Collection(['foo', 'bar', 'baz']), (new Collection(['foo', 'bar', 'baz']))->shift(6));
+
+ $data = new Collection(['foo', 'bar', 'baz']);
+
+ $this->assertEquals(new Collection([]), $data->shift(0));
+ $this->assertEquals(collect(['foo', 'bar', 'baz']), $data);
+
+ $this->expectException('InvalidArgumentException');
+ (new Collection(['foo', 'bar', 'baz']))->shift(-1);
+
+ $this->expectException('InvalidArgumentException');
+ (new Collection(['foo', 'bar', 'baz']))->shift(-2);
  }
 
  /**