Merge pull request #15 from pascalbaljet/global-middleware-fix

Apply global middleware also to Saloon requests

.github/workflows/tests.yml

@@ -20,11 +20,9 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
         php: [ 8.1, 8.2 ]
-        laravel: [ 9.*, 10.* ]
+        laravel: [ 10.* ]
         stability: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 9.*
-            testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
 

composer.json

@@ -13,15 +13,15 @@
     "homepage": "https://github.com/sammyjo20",
     "require": {
         "php": "^8.1",
-        "illuminate/http": "^9.52 || ^10.0",
-        "saloonphp/saloon": "^3.0"
+        "illuminate/http": "^10.32",
+        "saloonphp/saloon": "^3.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
         "pestphp/pest": "^1.23",
         "phpstan/phpstan": "^1.9",
         "spatie/ray": "^1.33",
-        "orchestra/testbench": "^7.30 || ^8.0"
+        "orchestra/testbench": "^8.0"
     },
     "minimum-stability": "stable",
     "autoload": {

src/HttpPendingRequest.php

@@ -14,10 +14,12 @@ class HttpPendingRequest extends PendingRequest
 {
     /**
      * Constructor
+     *
+     * @param array<int, callable> $middleware
      */
-    public function __construct(Factory $factory = null)
+    public function __construct(Factory $factory = null, array $middleware = [])
     {
-        parent::__construct($factory);
+        parent::__construct($factory, $middleware);
 
         $this->options = [];
     }

src/HttpSender.php

@@ -56,7 +56,7 @@ public function send(PendingRequest $pendingRequest): Response
                 (string)$psrRequest->getUri(),
                 $this->createRequestOptions($pendingRequest, $psrRequest),
             );
-        } catch (ConnectionException|ConnectException $exception) {
+        } catch (ConnectionException | ConnectException $exception) {
             throw new FatalRequestException($exception, $pendingRequest);
         }
 
@@ -168,7 +168,10 @@ protected function createRequestOptions(PendingRequest $pendingRequest, RequestI
      */
     protected function createLaravelPendingRequest(RequestInterface $psrRequest, bool $asynchronous): HttpPendingRequest
     {
-        $httpPendingRequest = new HttpPendingRequest(resolve(Factory::class));
+        /** @var Factory $httpFactory */
+        $httpFactory = resolve(Factory::class);
+
+        $httpPendingRequest = new HttpPendingRequest($httpFactory, $httpFactory->getGlobalMiddleware());
         $httpPendingRequest->setClient($this->client);
 
         $this->laravelMiddleware->setRequest($httpPendingRequest);

tests/Feature/GlobalMiddlewareTest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Saloon\HttpSender\HttpSender;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Config;
+use Saloon\HttpSender\Tests\Fixtures\Requests\UserRequest;
+use Saloon\HttpSender\Tests\Fixtures\Connectors\HttpSenderConnector;
+
+test('the global middleware of the http client factory is also applied to saloon requests', function () {
+    Config::set('saloon.default_sender', HttpSender::class);
+
+    $globalMiddlewareWasCalled = false;
+
+    Http::globalRequestMiddleware(function ($request) use (&$globalMiddlewareWasCalled) {
+        $globalMiddlewareWasCalled = true;
+
+        return $request;
+    });
+
+    $connector = new HttpSenderConnector;
+    $connector->send(new UserRequest);
+
+    expect($globalMiddlewareWasCalled)->toBeTrue();
+});