Fix: compatibility for laravel 8

.github/workflows/run-tests.yml

@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3]
-        laravel: ['8.*', '9.*', '10.*', '11.*']
+        php: [7.4, 8.1, 8.2, 8.3]
+        laravel: ['7.*', 8.*', '9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*

src/Concerns/MpesaAuth.php

@@ -45,7 +45,7 @@ public function generateToken(bool $force = false): ?string
         if (! $force && ($token = app(config('mpesa.models.token'))->latest()->first())) {
             $this->token = $token->token;
 
-            $this->http_client->replaceHeaders([
+            self::updateHttpClient([
                 'Authorization' => 'Bearer '.$this->token,
             ]);
 
@@ -58,10 +58,11 @@ public function generateToken(bool $force = false): ?string
         }
 
         // If the token is not valid, generate a new one
-        $response = $this->http_client
-            ->replaceHeaders([
+        self::updateHttpClient([
                 'Authorization' => 'Basic '.$this->getCredentials(),
-            ])
+            ]);
+
+        $response = $this->http_client
             ->get('/oauth/v1/generate', [
                 'grant_type' => 'client_credentials',
             ]);
@@ -102,7 +103,7 @@ public function generateToken(bool $force = false): ?string
         $this->addRequestTraceId();
 
         // Update the headers
-        $this->http_client->replaceHeaders([
+        self::updateHttpClient([
             'Authorization' => 'Bearer '.$this->token,
         ]);
 

src/Concerns/MpesaGlobalConfig.php

@@ -27,6 +27,26 @@ public function __construct()
         $this->refreshEnv();
     }
 
+    protected function updateHttpClient(array $headers = [], array $options = []): PendingRequest
+    {
+        $this->addRequestTraceId();
+
+        // Get the original headers
+        $original_headers = $this->http_client->getHeaders();
+
+        // Merge the headers
+        $headers = array_merge($original_headers, $headers);
+
+        // Update the headers
+        $this->http_client->withHeaders($headers);
+
+        // Update the options
+        $original_options = $this->http_client->getOptions();
+        $this->http_client->withOptions(array_merge($original_options, $options));
+
+        return $this->http_client;
+    }
+
     /**
      * Refresh the environment variables, this prevents errors between requests
      * during the app lifecycle
@@ -56,7 +76,7 @@ protected function refreshEnv()
      */
     protected function addRequestTraceId()
     {
-        $this->http_client->replaceHeaders([
+        self::updateHttpClient([
             'X-Ghostscypher-Laravel-Mpesa-Request-ID' => uniqid(microtime(true), true),
             'X-Ghostscypher-Laravel-Mpesa-Request-Timestamp' => now()->format('Y-m-d H:i:s'),
         ]);

src/Mpesa.php

@@ -35,8 +35,7 @@ public function rawRequest(string $method, string $url, array $data = [], array
             $this->generateToken();
         }
 
-        $response = $this->http_client
-            ->replaceHeaders($headers)
+        $response = self::getHttpClient($headers)
             ->send($method, $url, $data);
 
         return $response;