From 46ddceb4d58d8ca3b54ff80d7d9459fbf14abe93 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:13:46 +0000
Subject: [PATCH 01/13] Feature | PHP 8.5 Support

---
 .github/workflows/phpstan.yml | 2 +-
 .github/workflows/tests.yml   | 2 +-
 composer.json                 | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 20b26c16..9780b78e 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
 
       - name: Install composer dependencies
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 46e301fa..bbc2489d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.2, 8.3, 8.4, 8.5 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
diff --git a/composer.json b/composer.json
index 9fd431cc..bea82480 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     ],
     "homepage": "https://github.com/saloonphp/saloon",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "guzzlehttp/guzzle": "^7.6",
         "guzzlehttp/promises": "^1.5 || ^2.0",
         "guzzlehttp/psr7": "^2.0",
@@ -29,12 +29,11 @@
     "require-dev": {
         "ext-simplexml": "*",
         "friendsofphp/php-cs-fixer": "^3.5",
-        "illuminate/collections": "^9.39 || ^10.0",
+        "illuminate/collections": "^10.0 || ^11.0 || ^12.0",
         "league/flysystem": "^3.0",
-        "pestphp/pest": "^2.36.0 || ^3.8.2",
+        "pestphp/pest": "^2.36.0 || ^3.8.2 || ^4.1.4",
         "phpstan/phpstan": "^2.1.13",
         "saloonphp/xml-wrangler": "^1.1",
-        "spatie/ray": "^1.33",
         "symfony/dom-crawler": "^6.0 || ^7.0",
         "symfony/var-dumper": "^6.3 || ^7.0"
     },

From 68e068a243a799c8db339acf72b5975a8ed9208b Mon Sep 17 00:00:00 2001
From: Sammyjo20 <Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:14:21 +0000
Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=AA=84=20Code=20Style=20Fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Helpers/Storage.php                      | 2 +-
 src/Helpers/URLHelper.php                    | 4 ++--
 src/Http/Auth/TokenAuthenticator.php         | 2 +-
 src/Traits/OAuth2/AuthorizationCodeGrant.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Helpers/Storage.php b/src/Helpers/Storage.php
index db8eafba..01b332a1 100644
--- a/src/Helpers/Storage.php
+++ b/src/Helpers/Storage.php
@@ -48,7 +48,7 @@ protected function buildPath(string $path): string
     {
         $trimRules = DIRECTORY_SEPARATOR . ' ';
 
-        return rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . ltrim($path, $trimRules);
+        return mb_rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . mb_ltrim($path, $trimRules);
     }
 
     /**
diff --git a/src/Helpers/URLHelper.php b/src/Helpers/URLHelper.php
index 9622c481..4427ceb4 100644
--- a/src/Helpers/URLHelper.php
+++ b/src/Helpers/URLHelper.php
@@ -27,12 +27,12 @@ public static function join(string $baseUrl, string $endpoint): string
         }
 
         if ($endpoint !== '/') {
-            $endpoint = ltrim($endpoint, '/ ');
+            $endpoint = mb_ltrim($endpoint, '/ ');
         }
 
         $requiresTrailingSlash = ! empty($endpoint) && $endpoint !== '/';
 
-        $baseEndpoint = rtrim($baseUrl, '/ ');
+        $baseEndpoint = mb_rtrim($baseUrl, '/ ');
 
         $baseEndpoint = $requiresTrailingSlash ? $baseEndpoint . '/' : $baseEndpoint;
 
diff --git a/src/Http/Auth/TokenAuthenticator.php b/src/Http/Auth/TokenAuthenticator.php
index 402ebe74..0c3bbf3f 100644
--- a/src/Http/Auth/TokenAuthenticator.php
+++ b/src/Http/Auth/TokenAuthenticator.php
@@ -22,6 +22,6 @@ public function __construct(
      */
     public function set(PendingRequest $pendingRequest): void
     {
-        $pendingRequest->headers()->add('Authorization', trim($this->prefix . ' ' . $this->token));
+        $pendingRequest->headers()->add('Authorization', mb_trim($this->prefix . ' ' . $this->token));
     }
 }
diff --git a/src/Traits/OAuth2/AuthorizationCodeGrant.php b/src/Traits/OAuth2/AuthorizationCodeGrant.php
index 8db18a81..aa31993c 100644
--- a/src/Traits/OAuth2/AuthorizationCodeGrant.php
+++ b/src/Traits/OAuth2/AuthorizationCodeGrant.php
@@ -58,7 +58,7 @@ public function getAuthorizationUrl(array $scopes = [], ?string $state = null, s
         ]);
 
         $query = http_build_query($queryParameters, '', '&', PHP_QUERY_RFC3986);
-        $query = trim($query, '?&');
+        $query = mb_trim($query, '?&');
 
         $url = URLHelper::join($this->resolveBaseUrl(), $config->getAuthorizeEndpoint());
 

From 65de90e7eeb7a0534eaff5f71e6b3c35982d9be8 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:15:16 +0000
Subject: [PATCH 03/13] Code style fixer

---
 src/Http/BaseResource.php                                 | 2 +-
 .../Fixtures/Authenticators/CustomOAuthAuthenticator.php  | 8 ++++----
 tests/Fixtures/Requests/QueryParameterRequest.php         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Http/BaseResource.php b/src/Http/BaseResource.php
index 3188bebf..b37441e6 100644
--- a/src/Http/BaseResource.php
+++ b/src/Http/BaseResource.php
@@ -9,7 +9,7 @@ class BaseResource
     /**
      * Constructor
      */
-    public function __construct(readonly protected Connector $connector)
+    public function __construct(protected readonly Connector $connector)
     {
         //
     }
diff --git a/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php b/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
index 8ea17b3b..b56237f6 100644
--- a/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
+++ b/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
@@ -13,10 +13,10 @@ class CustomOAuthAuthenticator extends AccessTokenAuthenticator
      * Constructor
      */
     public function __construct(
-        readonly public string             $accessToken,
-        readonly public string             $greeting,
-        readonly public ?string            $refreshToken = null,
-        readonly public ?DateTimeImmutable $expiresAt = null,
+        public readonly string             $accessToken,
+        public readonly string             $greeting,
+        public readonly ?string            $refreshToken = null,
+        public readonly ?DateTimeImmutable $expiresAt = null,
     ) {
         //
     }
diff --git a/tests/Fixtures/Requests/QueryParameterRequest.php b/tests/Fixtures/Requests/QueryParameterRequest.php
index b7c8e5fd..9f4c863e 100644
--- a/tests/Fixtures/Requests/QueryParameterRequest.php
+++ b/tests/Fixtures/Requests/QueryParameterRequest.php
@@ -25,7 +25,7 @@ class QueryParameterRequest extends Request
     /**
      * Constructor
      */
-    public function __construct(readonly public string $endpoint = '/user')
+    public function __construct(public readonly string $endpoint = '/user')
     {
         //
     }

From 31f626faf6bea8ac57d1401b15a574588ec45684 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:16:48 +0000
Subject: [PATCH 04/13] Updated workflows

---
 .github/workflows/php-cs-fixer.yml | 4 +++-
 .github/workflows/phpstan.yml      | 2 +-
 .github/workflows/tests.yml        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index 07ea4a2c..416f9562 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -23,11 +23,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@4
+
       - name: Run PHP CS Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
           args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 9780b78e..9792a19e 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -19,7 +19,7 @@ jobs:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bbc2489d..2002a394 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From eacff1804de90390b60a1bd0c0a21f9977ebe8e0 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:17:56 +0000
Subject: [PATCH 05/13] Fixed typo

---
 .github/workflows/php-cs-fixer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index 416f9562..bbf3edf8 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@4
+        uses: actions/checkout@v4
 
       - name: Run PHP CS Fixer
         uses: docker://oskarstark/php-cs-fixer-ga

From ce5c9060d187a29ddadf9df6a715e2195e49a1b5 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:22:33 +0000
Subject: [PATCH 06/13] =?UTF-8?q?Revert=20"=F0=9F=AA=84=20Code=20Style=20F?=
 =?UTF-8?q?ixes"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 68e068a243a799c8db339acf72b5975a8ed9208b.
---
 src/Helpers/Storage.php                      | 2 +-
 src/Helpers/URLHelper.php                    | 4 ++--
 src/Http/Auth/TokenAuthenticator.php         | 2 +-
 src/Traits/OAuth2/AuthorizationCodeGrant.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Helpers/Storage.php b/src/Helpers/Storage.php
index 01b332a1..db8eafba 100644
--- a/src/Helpers/Storage.php
+++ b/src/Helpers/Storage.php
@@ -48,7 +48,7 @@ protected function buildPath(string $path): string
     {
         $trimRules = DIRECTORY_SEPARATOR . ' ';
 
-        return mb_rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . mb_ltrim($path, $trimRules);
+        return rtrim($this->baseDirectory, $trimRules) . DIRECTORY_SEPARATOR . ltrim($path, $trimRules);
     }
 
     /**
diff --git a/src/Helpers/URLHelper.php b/src/Helpers/URLHelper.php
index 4427ceb4..9622c481 100644
--- a/src/Helpers/URLHelper.php
+++ b/src/Helpers/URLHelper.php
@@ -27,12 +27,12 @@ public static function join(string $baseUrl, string $endpoint): string
         }
 
         if ($endpoint !== '/') {
-            $endpoint = mb_ltrim($endpoint, '/ ');
+            $endpoint = ltrim($endpoint, '/ ');
         }
 
         $requiresTrailingSlash = ! empty($endpoint) && $endpoint !== '/';
 
-        $baseEndpoint = mb_rtrim($baseUrl, '/ ');
+        $baseEndpoint = rtrim($baseUrl, '/ ');
 
         $baseEndpoint = $requiresTrailingSlash ? $baseEndpoint . '/' : $baseEndpoint;
 
diff --git a/src/Http/Auth/TokenAuthenticator.php b/src/Http/Auth/TokenAuthenticator.php
index 0c3bbf3f..402ebe74 100644
--- a/src/Http/Auth/TokenAuthenticator.php
+++ b/src/Http/Auth/TokenAuthenticator.php
@@ -22,6 +22,6 @@ public function __construct(
      */
     public function set(PendingRequest $pendingRequest): void
     {
-        $pendingRequest->headers()->add('Authorization', mb_trim($this->prefix . ' ' . $this->token));
+        $pendingRequest->headers()->add('Authorization', trim($this->prefix . ' ' . $this->token));
     }
 }
diff --git a/src/Traits/OAuth2/AuthorizationCodeGrant.php b/src/Traits/OAuth2/AuthorizationCodeGrant.php
index aa31993c..8db18a81 100644
--- a/src/Traits/OAuth2/AuthorizationCodeGrant.php
+++ b/src/Traits/OAuth2/AuthorizationCodeGrant.php
@@ -58,7 +58,7 @@ public function getAuthorizationUrl(array $scopes = [], ?string $state = null, s
         ]);
 
         $query = http_build_query($queryParameters, '', '&', PHP_QUERY_RFC3986);
-        $query = mb_trim($query, '?&');
+        $query = trim($query, '?&');
 
         $url = URLHelper::join($this->resolveBaseUrl(), $config->getAuthorizeEndpoint());
 

From fb8f89fd0cfef95bae8d9982d07317a3b350d5e9 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:22:41 +0000
Subject: [PATCH 07/13] Revert "Code style fixer"

This reverts commit 65de90e7eeb7a0534eaff5f71e6b3c35982d9be8.
---
 src/Http/BaseResource.php                                 | 2 +-
 .../Fixtures/Authenticators/CustomOAuthAuthenticator.php  | 8 ++++----
 tests/Fixtures/Requests/QueryParameterRequest.php         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Http/BaseResource.php b/src/Http/BaseResource.php
index b37441e6..3188bebf 100644
--- a/src/Http/BaseResource.php
+++ b/src/Http/BaseResource.php
@@ -9,7 +9,7 @@ class BaseResource
     /**
      * Constructor
      */
-    public function __construct(protected readonly Connector $connector)
+    public function __construct(readonly protected Connector $connector)
     {
         //
     }
diff --git a/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php b/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
index b56237f6..8ea17b3b 100644
--- a/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
+++ b/tests/Fixtures/Authenticators/CustomOAuthAuthenticator.php
@@ -13,10 +13,10 @@ class CustomOAuthAuthenticator extends AccessTokenAuthenticator
      * Constructor
      */
     public function __construct(
-        public readonly string             $accessToken,
-        public readonly string             $greeting,
-        public readonly ?string            $refreshToken = null,
-        public readonly ?DateTimeImmutable $expiresAt = null,
+        readonly public string             $accessToken,
+        readonly public string             $greeting,
+        readonly public ?string            $refreshToken = null,
+        readonly public ?DateTimeImmutable $expiresAt = null,
     ) {
         //
     }
diff --git a/tests/Fixtures/Requests/QueryParameterRequest.php b/tests/Fixtures/Requests/QueryParameterRequest.php
index 9f4c863e..b7c8e5fd 100644
--- a/tests/Fixtures/Requests/QueryParameterRequest.php
+++ b/tests/Fixtures/Requests/QueryParameterRequest.php
@@ -25,7 +25,7 @@ class QueryParameterRequest extends Request
     /**
      * Constructor
      */
-    public function __construct(public readonly string $endpoint = '/user')
+    public function __construct(readonly public string $endpoint = '/user')
     {
         //
     }

From b3a374fef14643795456f2c6870d760b12e403d9 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:22:57 +0000
Subject: [PATCH 08/13] Added PHP CS Fixer with PHP 8.2

---
 .github/workflows/php-cs-fixer.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index bbf3edf8..348e4205 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -18,19 +18,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  php-cs-fixer:
+  quality:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+          php-version: '8.2'
+
+      - name: Install Dependencies
+        run: |
+          composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Run PHP CS Fixer
+        run: ./vendor/bin/php-cs-fixer fix --allow-risky=true
+
+      - name: Format Frontend
+        run: npm run format
 
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit Changes
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: 🪄 Code Style Fixes
+          commit_options: '--no-verify'

From d73d6272c82a32daae69b59e4e2de6fb513d0d83 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:23:37 +0000
Subject: [PATCH 09/13] Updated --allow-risky value

---
 .github/workflows/php-cs-fixer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index 348e4205..9ebce1bf 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -33,7 +33,7 @@ jobs:
           composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: Run PHP CS Fixer
-        run: ./vendor/bin/php-cs-fixer fix --allow-risky=true
+        run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes
 
       - name: Format Frontend
         run: npm run format

From 6e296f159a1735cd7cd60a28e5b83649a24d16af Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:24:26 +0000
Subject: [PATCH 10/13] Remove front-end step

---
 .github/workflows/php-cs-fixer.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index 9ebce1bf..00ec14de 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -18,7 +18,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  quality:
+  lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -35,9 +35,6 @@ jobs:
       - name: Run PHP CS Fixer
         run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes
 
-      - name: Format Frontend
-        run: npm run format
-
       - name: Commit Changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:

From 1489b8828e60641c5de0bf64eba65acb505d03f7 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:38:47 +0000
Subject: [PATCH 11/13] Fixed tests

---
 composer.json                      |  1 +
 tests/Feature/GuzzleSenderTest.php | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index bea82480..4626f630 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,7 @@
         "pestphp/pest": "^2.36.0 || ^3.8.2 || ^4.1.4",
         "phpstan/phpstan": "^2.1.13",
         "saloonphp/xml-wrangler": "^1.1",
+        "spatie/invade": "^2.1",
         "symfony/dom-crawler": "^6.0 || ^7.0",
         "symfony/var-dumper": "^6.3 || ^7.0"
     },
diff --git a/tests/Feature/GuzzleSenderTest.php b/tests/Feature/GuzzleSenderTest.php
index 181e17b9..7307758a 100644
--- a/tests/Feature/GuzzleSenderTest.php
+++ b/tests/Feature/GuzzleSenderTest.php
@@ -7,6 +7,8 @@
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use Illuminate\Support\Arr;
+use Laravel\SerializableClosure\SerializableClosure;
 use Saloon\Http\Senders\GuzzleSender;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
@@ -76,9 +78,20 @@
 
     $handlerStack = $sender->getHandlerStack();
 
-    // The HandlerStack::create() loads important default middleware
+    $saloonStack = invade($handlerStack)->stack;
+    $defaultStack = invade(HandlerStack::create())->stack;
 
-    expect($handlerStack)->toEqual(HandlerStack::create());
+    expect($saloonStack)->toHaveSameSize($defaultStack)->toHaveCount(4);
+
+    expect($saloonStack[0][1])->toBe($defaultStack[0][1]);
+    expect($saloonStack[1][1])->toBe($defaultStack[1][1]);
+    expect($saloonStack[2][1])->toBe($defaultStack[2][1]);
+    expect($saloonStack[3][1])->toBe($defaultStack[3][1]);
+
+    expect($saloonStack[0][0])->toBeCallable();
+    expect($saloonStack[1][0])->toBeCallable();
+    expect($saloonStack[2][0])->toBeCallable();
+    expect($saloonStack[3][0])->toBeCallable();
 });
 
 test('the guzzle sender has default options configured', function () {
@@ -96,7 +109,15 @@
         'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
     ]);
 
-    expect($freshClient->getConfig())->toEqual($client->getConfig());
+    $saloonConfig = $client->getConfig();
+    $defaultConfig = $freshClient->getConfig();
+
+    expect(Arr::except($saloonConfig, 'handler'))->toEqual(Arr::except($defaultConfig, 'handler'));
+
+    $saloonStack = invade($saloonConfig['handler'])->stack;
+    $defaultStack = invade($defaultConfig['handler'])->stack;
+
+    expect($saloonStack)->toHaveSameSize($defaultStack)->toHaveCount(4);
 });
 
 test('you can set a custom handler stack on the guzzle sender', function () {

From 861436f1cb0525f0f2a51d120613871c36f1dd19 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:39:19 +0000
Subject: [PATCH 12/13] =?UTF-8?q?=F0=9F=AA=84=20Code=20Style=20Fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/Feature/GuzzleSenderTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/Feature/GuzzleSenderTest.php b/tests/Feature/GuzzleSenderTest.php
index 7307758a..a19c28b9 100644
--- a/tests/Feature/GuzzleSenderTest.php
+++ b/tests/Feature/GuzzleSenderTest.php
@@ -5,10 +5,9 @@
 use GuzzleHttp\Utils;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Uri;
+use Illuminate\Support\Arr;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use Illuminate\Support\Arr;
-use Laravel\SerializableClosure\SerializableClosure;
 use Saloon\Http\Senders\GuzzleSender;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;

From ea96a4545cf9d96222f530b60dd23be11002ad35 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:39:58 +0000
Subject: [PATCH 13/13] Trigger build