Merge branch '8.x'

# Conflicts:
#	CHANGELOG-8.x.md
#	src/Illuminate/Foundation/Application.php

Author: driesvints

src/Illuminate/Auth/Access/Gate.php

@@ -157,10 +157,10 @@ public function resource($name, $class, array $abilities = null)
     {
         $abilities = $abilities ?: [
             'viewAny' => 'viewAny',
-            'view'    => 'view',
-            'create'  => 'create',
-            'update'  => 'update',
-            'delete'  => 'delete',
+            'view' => 'view',
+            'create' => 'create',
+            'update' => 'update',
+            'delete' => 'delete',
         ];
 
         foreach ($abilities as $ability => $method) {

src/Illuminate/Auth/SessionGuard.php

@@ -628,7 +628,7 @@ protected function cycleRememberToken(AuthenticatableContract $user)
      *
      * @param  string  $password
      * @param  string  $attribute
-     * @return bool|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      *
      * @throws \Illuminate\Auth\AuthenticationException
      */
@@ -655,7 +655,7 @@ public function logoutOtherDevices($password, $attribute = 'password')
      *
      * @param  string  $password
      * @param  string  $attribute
-     * @return bool|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      *
      * @throws \InvalidArgumentException
      */

src/Illuminate/Bus/Batch.php

@@ -11,6 +11,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use JsonSerializable;
+use ReturnTypeWillChange;
 use Throwable;
 
 class Batch implements Arrayable, JsonSerializable
@@ -459,6 +460,7 @@ public function toArray()
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Enumerable;
 use Illuminate\Support\HigherOrderCollectionProxy;
 use JsonSerializable;
+use ReturnTypeWillChange;
 use Symfony\Component\VarDumper\VarDumper;
 use Traversable;
 
@@ -802,6 +803,7 @@ public function toArray()
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_map(function ($value) {

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -332,7 +332,7 @@ protected function simplePaginator($items, $perPage, $currentPage, $options)
      * @param  int  $perPage
      * @param  \Illuminate\Pagination\Cursor  $cursor
      * @param  array  $options
-     * @return \Illuminate\Pagination\Paginator
+     * @return \Illuminate\Pagination\CursorPaginator
      */
     protected function cursorPaginator($items, $perPage, $cursor, $options)
     {

src/Illuminate/Database/Eloquent/Casts/ArrayObject.php

@@ -5,6 +5,7 @@
 use ArrayObject as BaseArrayObject;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 class ArrayObject extends BaseArrayObject implements Arrayable, JsonSerializable
 {
@@ -33,6 +34,7 @@ public function toArray()
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getArrayCopy();

src/Illuminate/Database/Eloquent/Model.php

@@ -21,6 +21,7 @@
 use Illuminate\Support\Traits\ForwardsCalls;
 use JsonSerializable;
 use LogicException;
+use ReturnTypeWillChange;
 
 abstract class Model implements Arrayable, ArrayAccess, HasBroadcastChannel, Jsonable, JsonSerializable, QueueableEntity, UrlRoutable
 {
@@ -1426,6 +1427,7 @@ public function toJson($options = 0)
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

src/Illuminate/Database/Migrations/Migrator.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Migrations;
 
+use Doctrine\DBAL\Schema\SchemaException;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 use Illuminate\Database\Events\MigrationEnded;
@@ -411,16 +412,22 @@ protected function runMigration($migration, $method)
      */
     protected function pretendToRun($migration, $method)
     {
-        foreach ($this->getQueries($migration, $method) as $query) {
-            $name = get_class($migration);
+        try {
+            foreach ($this->getQueries($migration, $method) as $query) {
+                $name = get_class($migration);
+
+                $reflectionClass = new ReflectionClass($migration);
 
-            $reflectionClass = new ReflectionClass($migration);
+                if ($reflectionClass->isAnonymous()) {
+                    $name = $this->getMigrationName($reflectionClass->getFileName());
+                }
 
-            if ($reflectionClass->isAnonymous()) {
-                $name = $this->getMigrationName($reflectionClass->getFileName());
+                $this->note("<info>{$name}:</info> {$query['query']}");
             }
+        } catch (SchemaException $e) {
+            $name = get_class($migration);
 
-            $this->note("<info>{$name}:</info> {$query['query']}");
+            $this->note("<info>{$name}:</info> failed to dump queries. This may be due to changing database columns using Doctrine, which is not supported while pretending to run migrations.");
         }
     }
 

src/Illuminate/Database/PDO/Connection.php

@@ -110,7 +110,7 @@ public function lastInsertId($name = null)
     /**
      * Create a new statement instance.
      *
-     * @param  \PDOStatement
+     * @param  \PDOStatement  $stmt
      * @return \Doctrine\DBAL\Driver\PDO\Statement
      */
     protected function createStatement(PDOStatement $stmt): Statement

src/Illuminate/Database/Query/Builder.php

@@ -2460,7 +2460,7 @@ public function simplePaginate($perPage = 15, $columns = ['*'], $pageName = 'pag
      * @param  array  $columns
      * @param  string  $cursorName
      * @param  string|null  $cursor
-     * @return \Illuminate\Contracts\Pagination\Paginator
+     * @return \Illuminate\Contracts\Pagination\CursorPaginator
      * @throws \Illuminate\Pagination\CursorPaginationException
      */
     public function cursorPaginate($perPage = 15, $columns = ['*'], $cursorName = 'cursor', $cursor = null)
@@ -2630,7 +2630,7 @@ protected function enforceOrderBy()
     }
 
     /**
-     * Get an array with the values of a given column.
+     * Get a collection instance containing the values of a given column.
      *
      * @param  string  $column
      * @param  string|null  $key