Merge branch '10.x'

Author: GrahamCampbell

src/Illuminate/Cache/RedisStore.php

@@ -253,7 +253,7 @@ public function flush()
     /**
      * Remove all expired tag set entries.
      *
-     * @return bool
+     * @return void
      */
     public function flushStaleTags()
     {

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -955,21 +955,17 @@ protected function getArrayableItems($items)
     {
         if (is_array($items)) {
             return $items;
-        } elseif ($items instanceof Enumerable) {
-            return $items->all();
-        } elseif ($items instanceof Arrayable) {
-            return $items->toArray();
-        } elseif ($items instanceof Traversable) {
-            return iterator_to_array($items);
-        } elseif ($items instanceof Jsonable) {
-            return json_decode($items->toJson(), true);
-        } elseif ($items instanceof JsonSerializable) {
-            return (array) $items->jsonSerialize();
-        } elseif ($items instanceof UnitEnum) {
-            return [$items];
         }
 
-        return (array) $items;
+        return match (true) {
+            $items instanceof Enumerable => $items->all(),
+            $items instanceof Arrayable => $items->toArray(),
+            $items instanceof Traversable => iterator_to_array($items),
+            $items instanceof Jsonable => json_decode($items->toJson(), true),
+            $items instanceof JsonSerializable => (array) $items->jsonSerialize(),
+            $items instanceof UnitEnum => [$items],
+            default => (array) $items,
+        };
     }
 
     /**

src/Illuminate/Console/Signals.php

@@ -84,7 +84,7 @@ protected function initializeSignal($signal)
     /**
      * Unregister the current signal handlers.
      *
-     * @return array<int, array<int, callable(int $signal): void>>
+     * @return void
      */
     public function unregister()
     {

src/Illuminate/Contracts/Events/Dispatcher.php

@@ -34,7 +34,7 @@ public function subscribe($subscriber);
      *
      * @param  string|object  $event
      * @param  mixed  $payload
-     * @return array|null
+     * @return mixed
      */
     public function until($event, $payload = []);
 

src/Illuminate/Database/Console/DumpCommand.php

@@ -36,7 +36,7 @@ class DumpCommand extends Command
      *
      * @param  \Illuminate\Database\ConnectionResolverInterface  $connections
      * @param  \Illuminate\Contracts\Events\Dispatcher  $dispatcher
-     * @return int
+     * @return void
      */
     public function handle(ConnectionResolverInterface $connections, Dispatcher $dispatcher)
     {

src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php

@@ -103,7 +103,7 @@ public function handle()
      * @param  string  $name
      * @param  string  $table
      * @param  bool  $create
-     * @return string
+     * @return void
      */
     protected function writeMigration($name, $table, $create)
     {

src/Illuminate/Database/Eloquent/Model.php

@@ -746,7 +746,7 @@ public function loadMissing($relations)
      *
      * @param  array|string  $relations
      * @param  string  $column
-     * @param  string  $function
+     * @param  string|null  $function
      * @return $this
      */
     public function loadAggregate($relations, $column, $function = null)
@@ -834,7 +834,7 @@ public function loadExists($relations)
      * @param  string  $relation
      * @param  array  $relations
      * @param  string  $column
-     * @param  string  $function
+     * @param  string|null  $function
      * @return $this
      */
     public function loadMorphAggregate($relation, $relations, $column, $function = null)

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -754,23 +754,16 @@ protected function compileHaving(array $having)
         // If the having clause is "raw", we can just return the clause straight away
         // without doing any more processing on it. Otherwise, we will compile the
         // clause into SQL based on the components that make it up from builder.
-        if ($having['type'] === 'Raw') {
-            return $having['sql'];
-        } elseif ($having['type'] === 'between') {
-            return $this->compileHavingBetween($having);
-        } elseif ($having['type'] === 'Null') {
-            return $this->compileHavingNull($having);
-        } elseif ($having['type'] === 'NotNull') {
-            return $this->compileHavingNotNull($having);
-        } elseif ($having['type'] === 'bit') {
-            return $this->compileHavingBit($having);
-        } elseif ($having['type'] === 'Expression') {
-            return $this->compileHavingExpression($having);
-        } elseif ($having['type'] === 'Nested') {
-            return $this->compileNestedHavings($having);
-        }
-
-        return $this->compileBasicHaving($having);
+        return match ($having['type']) {
+            'Raw' => $having['sql'],
+            'between' => $this->compileHavingBetween($having),
+            'Null' => $this->compileHavingNull($having),
+            'NotNull' => $this->compileHavingNotNull($having),
+            'bit' => $this->compileHavingBit($having),
+            'Expression' => $this->compileHavingExpression($having),
+            'Nested' => $this->compileNestedHavings($having),
+            default => $this->compileBasicHaving($having),
+        };
     }
 
     /**

src/Illuminate/Events/Dispatcher.php

@@ -215,7 +215,7 @@ protected function resolveSubscriber($subscriber)
      *
      * @param  string|object  $event
      * @param  mixed  $payload
-     * @return array|null
+     * @return mixed
      */
     public function until($event, $payload = [])
     {

src/Illuminate/Events/NullDispatcher.php

@@ -57,7 +57,7 @@ public function push($event, $payload = [])
      *
      * @param  string|object  $event
      * @param  mixed  $payload
-     * @return array|null
+     * @return mixed
      */
     public function until($event, $payload = [])
     {