Fixed boot method location

Author: Sammyjo20

src/Repositories/Body/FormBodyRepository.php

@@ -4,21 +4,8 @@
 
 namespace Saloon\Repositories\Body;
 
-use Saloon\Contracts\PendingRequest;
-
 class FormBodyRepository extends ArrayBodyRepository
 {
-    /**
-     * Boot the FormBodyRepository trait
-     *
-     * @param \Saloon\Contracts\PendingRequest $pendingRequest
-     * @return void
-     */
-    public function bootFormBodyRepository(PendingRequest $pendingRequest): void
-    {
-        $pendingRequest->headers()->add('Content-Type', 'application/x-www-form-urlencoded');
-    }
-
     /**
      * Convert into a string.
      *

src/Repositories/Body/JsonBodyRepository.php

@@ -4,21 +4,8 @@
 
 namespace Saloon\Repositories\Body;
 
-use Saloon\Contracts\PendingRequest;
-
 class JsonBodyRepository extends ArrayBodyRepository
 {
-    /**
-     * Boot the JsonBodyRepository trait
-     *
-     * @param \Saloon\Contracts\PendingRequest $pendingRequest
-     * @return void
-     */
-    public function bootJsonBodyRepository(PendingRequest $pendingRequest): void
-    {
-        $pendingRequest->headers()->add('Content-Type', 'application/json');
-    }
-
     /**
      * Convert the body repository into a string.
      *

src/Traits/Body/HasFormBody.php

@@ -4,6 +4,7 @@
 
 namespace Saloon\Traits\Body;
 
+use Saloon\Contracts\PendingRequest;
 use Saloon\Repositories\Body\FormBodyRepository;
 
 trait HasFormBody
@@ -17,6 +18,17 @@ trait HasFormBody
      */
     protected FormBodyRepository $body;
 
+    /**
+     * Boot the HasFormBody trait
+     *
+     * @param \Saloon\Contracts\PendingRequest $pendingRequest
+     * @return void
+     */
+    public function bootHasFormBody(PendingRequest $pendingRequest): void
+    {
+        $pendingRequest->headers()->add('Content-Type', 'application/x-www-form-urlencoded');
+    }
+
     /**
      * Retrieve the data repository
      *

tests/Feature/Body/HasFormBodyTest.php

@@ -5,6 +5,7 @@
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
+use Saloon\Http\PendingRequest;
 use Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Tests\Fixtures\Requests\HasFormBodyRequest;
 
@@ -21,6 +22,10 @@
     $connector = new TestConnector;
     $request = new HasFormBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/x-www-form-urlencoded');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
             expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/x-www-form-urlencoded']);

tests/Feature/Body/HasJsonBodyTest.php

@@ -5,6 +5,7 @@
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
+use Saloon\Http\PendingRequest;
 use Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Tests\Fixtures\Requests\HasJsonBodyRequest;
 
@@ -32,6 +33,10 @@
     $connector = new TestConnector;
     $request = new HasJsonBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/json');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
             expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/json']);

tests/Feature/Body/HasXmlBodyTest.php

@@ -5,6 +5,7 @@
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
+use Saloon\Http\PendingRequest;
 use Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Saloon\Tests\Fixtures\Requests\HasXmlBodyRequest;
 
@@ -26,6 +27,10 @@
     $connector = new TestConnector;
     $request = new HasXmlBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/xml');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
             expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/xml']);

tests/Feature/Oauth2/AuthCodeFlowConnectorTest.php

@@ -152,6 +152,7 @@
     expect($pendingRequest->headers()->all())->toEqual([
         'Accept' => 'application/json',
         'Authorization' => 'Bearer access',
+        'Content-Type' => 'application/x-www-form-urlencoded'
     ]);
 });