Merge branch '9.x'

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Http/composer.json

Author: driesvints

CHANGELOG.md

@@ -3,6 +3,6 @@
 ## [Unreleased](https://github.com/laravel/framework/compare/v10.0.0..master)
 
 
-## [v10.0.0 (2022-??-??)](https://github.com/laravel/framework/compare/v9.1.0...master)
+## [v10.0.0 (2022-??-??)](https://github.com/laravel/framework/compare/v9.2.0...master)
 
 Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/10.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/10.x/releases).

composer.json

@@ -21,6 +21,7 @@
         "doctrine/inflector": "^2.0",
         "dragonmantank/cron-expression": "^3.1",
         "egulias/email-validator": "^3.1",
+        "fruitcake/php-cors": "^1.2",
         "laravel/serializable-closure": "^1.0",
         "league/commonmark": "^2.2",
         "league/flysystem": "^3.0",
@@ -90,8 +91,8 @@
         "orchestra/testbench-core": "^8.0",
         "pda/pheanstalk": "^4.0",
         "phpstan/phpstan": "^1.0",
-        "predis/predis": "^1.1.9",
         "phpunit/phpunit": "^9.5.8",
+        "predis/predis": "^1.1.9",
         "symfony/cache": "^6.1"
     },
     "provide": {
@@ -142,8 +143,8 @@
         "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.198.1).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
-        "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
+        "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
         "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.2).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",

src/Illuminate/Auth/Access/Gate.php

@@ -575,7 +575,7 @@ protected function callAfterCallbacks($user, $ability, array $arguments, $result
 
             $afterResult = $after($user, $ability, $result, $arguments);
 
-            $result = $result ?? $afterResult;
+            $result ??= $afterResult;
         }
 
         return $result;

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -346,7 +346,7 @@ public function setDefaultDriver($name)
      */
     public function purge($name = null)
     {
-        $name = $name ?? $this->getDefaultDriver();
+        $name ??= $this->getDefaultDriver();
 
         unset($this->drivers[$name]);
     }

src/Illuminate/Bus/Queueable.php

@@ -127,7 +127,7 @@ public function allOnQueue($queue)
     }
 
     /**
-     * Set the desired delay for the job.
+     * Set the desired delay in seconds for the job.
      *
      * @param  \DateTimeInterface|\DateInterval|int|null  $delay
      * @return $this

src/Illuminate/Cache/CacheManager.php

@@ -264,7 +264,7 @@ protected function newDynamodbClient(array $config)
             'endpoint' => $config['endpoint'] ?? null,
         ];
 
-        if (isset($config['key']) && isset($config['secret'])) {
+        if (isset($config['key'], $config['secret'])) {
             $dynamoConfig['credentials'] = Arr::only(
                 $config, ['key', 'secret', 'token']
             );
@@ -368,7 +368,7 @@ public function setDefaultDriver($name)
      */
     public function forgetDriver($name = null)
     {
-        $name = $name ?? $this->getDefaultDriver();
+        $name ??= $this->getDefaultDriver();
 
         foreach ((array) $name as $cacheName) {
             if (isset($this->stores[$cacheName])) {
@@ -387,7 +387,7 @@ public function forgetDriver($name = null)
      */
     public function purge($name = null)
     {
-        $name = $name ?? $this->getDefaultDriver();
+        $name ??= $this->getDefaultDriver();
 
         unset($this->stores[$name]);
     }

src/Illuminate/Cache/DatabaseLock.php

@@ -56,8 +56,6 @@ public function __construct(Connection $connection, $table, $name, $seconds, $ow
      */
     public function acquire()
     {
-        $acquired = false;
-
         try {
             $this->connection->table($this->table)->insert([
                 'key' => $this->name,

src/Illuminate/Collections/Collection.php

@@ -167,7 +167,7 @@ public function collapse()
     /**
      * Determine if an item exists in the collection.
      *
-     * @param  (callable(TValue): bool)|TValue|string  $key
+     * @param  (callable(TValue, TKey): bool)|TValue|string  $key
      * @param  mixed  $operator
      * @param  mixed  $value
      * @return bool
@@ -1208,12 +1208,14 @@ public function sole($key = null, $operator = null, $value = null)
 
         $items = $this->unless($filter == null)->filter($filter);
 
-        if ($items->isEmpty()) {
+        $count = $items->count();
+
+        if ($count === 0) {
             throw new ItemNotFoundException;
         }
 
-        if ($items->count() > 1) {
-            throw new MultipleItemsFoundException;
+        if ($count > 1) {
+            throw new MultipleItemsFoundException($count);
         }
 
         return $items->first();
@@ -1369,8 +1371,6 @@ protected function sortByMany(array $comparisons = [])
                 $ascending = Arr::get($comparison, 1, true) === true ||
                              Arr::get($comparison, 1, true) === 'asc';
 
-                $result = 0;
-
                 if (! is_string($prop) && is_callable($prop)) {
                     $result = $prop($a, $b);
                 } else {

src/Illuminate/Collections/Enumerable.php

@@ -1074,7 +1074,7 @@ public function pipe(callable $callback);
     /**
      * Pass the collection into a new class.
      *
-     * @param  string-class  $class
+     * @param  class-string  $class
      * @return mixed
      */
     public function pipeInto($class);

src/Illuminate/Collections/LazyCollection.php

@@ -207,7 +207,7 @@ public function collapse()
     /**
      * Determine if an item exists in the enumerable.
      *
-     * @param  (callable(TValue): bool)|TValue|string  $key
+     * @param  (callable(TValue, TKey): bool)|TValue|string  $key
      * @param  mixed  $operator
      * @param  mixed  $value
      * @return bool