Merge branch '8.x'

# Conflicts:
#	composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Mail/composer.json
#	src/Illuminate/Queue/composer.json

Author: driesvints

Collection.php

@@ -797,9 +797,15 @@ public function pop($count = 1)
             return array_pop($this->items);
         }
 
+        if ($this->isEmpty()) {
+            return new static;
+        }
+
         $results = [];
 
-        foreach (range(1, $count) as $item) {
+        $collectionCount = $this->count();
+
+        foreach (range(1, min($count, $collectionCount)) as $item) {
             array_push($results, array_pop($this->items));
         }
 
@@ -961,9 +967,15 @@ public function shift($count = 1)
             return array_shift($this->items);
         }
 
+        if ($this->isEmpty()) {
+            return new static;
+        }
+
         $results = [];
 
-        foreach (range(1, $count) as $item) {
+        $collectionCount = $this->count();
+
+        foreach (range(1, min($count, $collectionCount)) as $item) {
             array_push($results, array_shift($this->items));
         }