Merge branch '8.x'

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

Author: driesvints

composer.json

@@ -77,7 +77,7 @@
         "illuminate/view": "self.version"
     },
     "require-dev": {
-        "aws/aws-sdk-php": "^3.186.4",
+        "aws/aws-sdk-php": "^3.189.0",
         "doctrine/dbal": "^2.12|^3.0",
         "fakerphp/faker": "^1.9.2",
         "guzzlehttp/guzzle": "^7.2",
@@ -129,7 +129,7 @@
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
         "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
-        "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.186.4).",
+        "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.189.0).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.12|^3.0).",
         "filp/whoops": "Required for friendly error pages in development (^2.8).",

src/Illuminate/Bus/Batch.php

@@ -156,7 +156,7 @@ public function fresh()
     /**
      * Add additional jobs to the batch.
      *
-     * @param  \Illuminate\Support\Collection|array  $jobs
+     * @param  \Illuminate\Support\Enumerable|array  $jobs
      * @return self
      */
     public function add($jobs)
@@ -427,9 +427,15 @@ public function delete()
      */
     protected function invokeHandlerCallback($handler, Batch $batch, Throwable $e = null)
     {
-        return $handler instanceof SerializableClosure
-                    ? $handler->__invoke($batch, $e)
-                    : call_user_func($handler, $batch, $e);
+        try {
+            return $handler instanceof SerializableClosure
+                ? $handler->__invoke($batch, $e)
+                : call_user_func($handler, $batch, $e);
+        } catch (Throwable $e) {
+            if (function_exists('report')) {
+                report($e);
+            }
+        }
     }
 
     /**

src/Illuminate/Cache/RateLimiter.php

@@ -60,6 +60,26 @@ public function limiter(string $name)
         return $this->limiters[$name] ?? null;
     }
 
+    /**
+     * Attempts to execute a callback if it's not limited.
+     *
+     * @param  string  $key
+     * @param  int  $maxAttempts
+     * @param  \Closure  $callback
+     * @param  int  $decaySeconds
+     * @return mixed
+     */
+    public function attempt($key, $maxAttempts, Closure $callback, $decaySeconds = 60)
+    {
+        if ($this->tooManyAttempts($key, $maxAttempts)) {
+            return false;
+        }
+
+        return tap($callback() ?: true, function () use ($key, $decaySeconds) {
+            $this->hit($key, $decaySeconds);
+        });
+    }
+
     /**
      * Determine if the given key has been "accessed" too many times.
      *

src/Illuminate/Collections/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));
         }
 

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -422,7 +422,7 @@ protected function cursorPaginator($items, $perPage, $cursor, $options)
      * Pass the query to a given callback.
      *
      * @param  callable  $callback
-     * @return $this
+     * @return $this|mixed
      */
     public function tap($callback)
     {

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -244,9 +244,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt
             // If the attribute cast was a date or a datetime, we will serialize the date as
             // a string. This allows the developers to customize how dates are serialized
             // into an array without affecting how they are persisted into the storage.
-            if ($attributes[$key] &&
-                ($value === 'date' || $value === 'datetime' ||
-                 $value === 'immutable_date' || $value === 'immutable_datetime')) {
+            if ($attributes[$key] && in_array($value, ['date', 'datetime', 'immutable_date', 'immutable_datetime'])) {
                 $attributes[$key] = $this->serializeDate($attributes[$key]);
             }
 
@@ -1219,7 +1217,7 @@ public function getCasts()
      */
     protected function isDateCastable($key)
     {
-        return $this->hasCast($key, ['date', 'datetime']);
+        return $this->hasCast($key, ['date', 'datetime', 'immutable_date', 'immutable_datetime']);
     }
 
     /**

src/Illuminate/Database/Eloquent/Factories/Factory.php

@@ -211,9 +211,9 @@ public function createOne($attributes = [])
     public function createMany(iterable $records)
     {
         return new EloquentCollection(
-            array_map(function ($record) {
+            collect($records)->map(function ($record) {
                 return $this->state($record)->create();
-            }, $records)
+            })
         );
     }
 

src/Illuminate/Database/Query/Builder.php

@@ -196,7 +196,7 @@ class Builder implements BuilderContract
     public $operators = [
         '=', '<', '>', '<=', '>=', '<>', '!=', '<=>',
         'like', 'like binary', 'not like', 'ilike',
-        '&', '|', '^', '<<', '>>',
+        '&', '|', '^', '<<', '>>', '&~',
         'rlike', 'not rlike', 'regexp', 'not regexp',
         '~', '~*', '!~', '!~*', 'similar to',
         'not similar to', 'not ilike', '~~*', '!~~*',

src/Illuminate/Database/Query/JoinClause.php

@@ -104,7 +104,7 @@ public function on($first, $operator = null, $second = null, $boolean = 'and')
      *
      * @param  \Closure|string  $first
      * @param  string|null  $operator
-     * @param  string|null  $second
+     * @param  \Illuminate\Database\Query\Expression|string|null  $second
      * @return \Illuminate\Database\Query\JoinClause
      */
     public function orOn($first, $operator = null, $second = null)

src/Illuminate/Events/Dispatcher.php

@@ -387,7 +387,7 @@ protected function prepareListeners(string $eventName)
     /**
      * Register an event listener with the dispatcher.
      *
-     * @param  \Closure|string  $listener
+     * @param  \Closure|string|array  $listener
      * @param  bool  $wildcard
      * @return \Closure
      */