Merge branch '10.x'

phpstan.src.neon.dist

@@ -12,7 +12,6 @@ parameters:
     - "#Class [a-zA-Z0-9\\\\_]+ not found.#"
     - "#has invalid type#"
     - "#should always throw an exception or terminate script execution#"
-    - "#Function GuzzleHttp\\\\Psr7#"
     - "#Instantiated class [a-zA-Z0-9\\\\_]+ not found.#"
     - "#Unsafe usage of new static#"
   excludePaths:

src/Illuminate/Database/Eloquent/Builder.php

@@ -969,19 +969,26 @@ protected function ensureOrderForCursorPagination($shouldReverse = false)
             $this->enforceOrderBy();
         }
 
-        if ($shouldReverse) {
-            $this->query->orders = collect($this->query->orders)->map(function ($order) {
-                $order['direction'] = $order['direction'] === 'asc' ? 'desc' : 'asc';
-
+        $reverseDirection = function ($order) {
+            if (! isset($order['direction'])) {
                 return $order;
-            })->toArray();
-        }
+            }
+
+            $order['direction'] = $order['direction'] === 'asc' ? 'desc' : 'asc';
 
-        if ($this->query->unionOrders) {
-            return collect($this->query->unionOrders);
+            return $order;
+        };
+
+        if ($shouldReverse) {
+            $this->query->orders = collect($this->query->orders)->map($reverseDirection)->toArray();
+            $this->query->unionOrders = collect($this->query->unionOrders)->map($reverseDirection)->toArray();
         }
 
-        return collect($this->query->orders);
+        $orders = ! empty($this->query->unionOrders) ? $this->query->unionOrders : $this->query->orders;
+
+        return collect($orders)
+            ->filter(fn ($order) => Arr::has($order, 'direction'))
+            ->values();
     }
 
     /**

src/Illuminate/Database/Query/Builder.php

@@ -2793,17 +2793,30 @@ public function cursorPaginate($perPage = 15, $columns = ['*'], $cursorName = 'c
      */
     protected function ensureOrderForCursorPagination($shouldReverse = false)
     {
-        $this->enforceOrderBy();
-
-        return collect($this->orders ?? $this->unionOrders ?? [])->filter(function ($order) {
-            return Arr::has($order, 'direction');
-        })->when($shouldReverse, function (Collection $orders) {
-            return $orders->map(function ($order) {
-                $order['direction'] = $order['direction'] === 'asc' ? 'desc' : 'asc';
+        if (empty($this->orders) && empty($this->unionOrders)) {
+            $this->enforceOrderBy();
+        }
 
+        $reverseDirection = function ($order) {
+            if (! isset($order['direction'])) {
                 return $order;
-            });
-        })->values();
+            }
+
+            $order['direction'] = $order['direction'] === 'asc' ? 'desc' : 'asc';
+
+            return $order;
+        };
+
+        if ($shouldReverse) {
+            $this->orders = collect($this->orders)->map($reverseDirection)->toArray();
+            $this->unionOrders = collect($this->unionOrders)->map($reverseDirection)->toArray();
+        }
+
+        $orders = ! empty($this->unionOrders) ? $this->unionOrders : $this->orders;
+
+        return collect($orders)
+            ->filter(fn ($order) => Arr::has($order, 'direction'))
+            ->values();
     }
 
     /**

src/Illuminate/Foundation/Precognition.php

@@ -14,7 +14,7 @@ public static function afterValidationHook($request)
     {
         return function ($validator) use ($request) {
             if ($validator->messages()->isEmpty() && $request->headers->has('Precognition-Validate-Only')) {
-                abort(204);
+                abort(204, headers: ['Precognition-Success' => 'true']);
             }
         };
     }

src/Illuminate/Foundation/Routing/PrecognitionCallableDispatcher.php

@@ -18,6 +18,6 @@ public function dispatch(Route $route, $callable)
     {
         $this->resolveParameters($route, $callable);
 
-        abort(204);
+        abort(204, headers: ['Precognition-Success' => 'true']);
     }
 }

src/Illuminate/Foundation/Routing/PrecognitionControllerDispatcher.php

@@ -22,7 +22,7 @@ public function dispatch(Route $route, $controller, $method)
 
         $this->resolveParameters($route, $controller, $method);
 
-        abort(204);
+        abort(204, headers: ['Precognition-Success' => 'true']);
     }
 
     /**

src/Illuminate/Foundation/Testing/Concerns/InteractsWithContainer.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Foundation\Mix;
 use Illuminate\Foundation\Vite;
+use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\HtmlString;
 use Mockery;
 
@@ -110,6 +111,8 @@ protected function withoutVite()
             $this->originalVite = app(Vite::class);
         }
 
+        Facade::clearResolvedInstance(Vite::class);
+
         $this->swap(Vite::class, new class
         {
             public function __invoke()

src/Illuminate/Foundation/helpers.php

@@ -612,7 +612,7 @@ function precognitive($callable = null)
         });
 
         if (request()->isPrecognitive()) {
-            abort(204);
+            abort(204, headers: ['Precognition-Success' => 'true']);
         }
 
         return $payload;

src/Illuminate/Http/Client/Factory.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Http\Client;
 
 use Closure;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\Response as Psr7Response;
 use GuzzleHttp\TransferStats;
@@ -93,9 +94,7 @@ public static function response($body = null, $status = 200, $headers = [])
 
         $response = new Psr7Response($status, $headers, $body);
 
-        return class_exists(\GuzzleHttp\Promise\Create::class)
-            ? \GuzzleHttp\Promise\Create::promiseFor($response)
-            : \GuzzleHttp\Promise\promise_for($response);
+        return Create::promiseFor($response);
     }
 
     /**

src/Illuminate/Http/Client/Pool.php

@@ -39,12 +39,7 @@ class Pool
     public function __construct(Factory $factory = null)
     {
         $this->factory = $factory ?: new Factory();
-
-        if (method_exists(Utils::class, 'chooseHandler')) {
-            $this->handler = Utils::chooseHandler();
-        } else {
-            $this->handler = \GuzzleHttp\choose_handler();
-        }
+        $this->handler = Utils::chooseHandler();
     }
 
     /**

src/Illuminate/Http/Client/RequestException.php

@@ -2,6 +2,8 @@
 
 namespace Illuminate\Http\Client;
 
+use GuzzleHttp\Psr7\Message;
+
 class RequestException extends HttpClientException
 {
     /**
@@ -34,9 +36,7 @@ protected function prepareMessage(Response $response)
     {
         $message = "HTTP request returned status code {$response->status()}";
 
-        $summary = class_exists(\GuzzleHttp\Psr7\Message::class)
-            ? \GuzzleHttp\Psr7\Message::bodySummary($response->toPsrResponse())
-            : \GuzzleHttp\Psr7\get_message_body_summary($response->toPsrResponse());
+        $summary = Message::bodySummary($response->toPsrResponse());
 
         return is_null($summary) ? $message : $message .= ":\n{$summary}\n";
     }

tests/Database/DatabaseQueryBuilderTest.php

@@ -5008,7 +5008,7 @@ public function testCursorPaginateWithUnionWheresReverseOrder()
 
         $builder->shouldReceive('get')->once()->andReturnUsing(function () use ($builder, $results, $ts) {
             $this->assertEquals(
-                '(select "id", "start_time" as "created_at", \'video\' as type from "videos" where ("start_time" < ?)) union (select "id", "created_at", \'news\' as type from "news" where ("start_time" < ?)) order by "created_at" asc limit 17',
+                '(select "id", "start_time" as "created_at", \'video\' as type from "videos" where ("start_time" < ?)) union (select "id", "created_at", \'news\' as type from "news" where ("start_time" < ?)) order by "created_at" desc limit 17',
                 $builder->toSql());
             $this->assertEquals([$ts], $builder->bindings['where']);
             $this->assertEquals([$ts], $builder->bindings['union']);