Squash commits

Author: Ghostscypher

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3]
+        php: [7.4, "8.0", 8.1, 8.2, 8.3]
         laravel: ["7.*", 8.*', "9.*", "10.*", "11.*"]
         stability: [prefer-stable]
         include:
@@ -20,23 +20,40 @@ jobs:
           - laravel: 9.*
             testbench: 7.*
           - laravel: 8.*
-            testbench: 6.*
+            testbench: ^6.23
+            carbon: ^2.63
           - laravel: 7.*
             testbench: 5.*
-        # Skip laravel 7.* with php ^8.0
+            carbon: ^2.63
         exclude:
           - php: 8.1
             laravel: 7.*
           - php: 8.2
             laravel: 7.*
           - php: 8.3
             laravel: 7.*
+          - php: "8.0"
+            laravel: 7.*
+          - php: 8.1
+            laravel: 8.*
+          - php: 8.2
+            laravel: 8.*
+          - php: 8.3
+            laravel: 8.*
+          - php: 7.4
+            laravel: 9.*
+          - php: 7.4
+            laravel: 10.*
+          - php: "8.0"
+            laravel: 10.*
           - php: 7.4
             laravel: 11.*
+          - php: "8.0"
+            laravel: 11.*
           - php: 8.1
             laravel: 11.*
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
+    name: PHP${{ matrix.php }} - Laravel_${{ matrix.laravel }} - ${{ matrix.stability }}
 
     services:
       mysql:
@@ -70,14 +87,23 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install dependencies
+      - name: Install Laravel 9+ dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        if: (matrix.laravel == '9.*' || matrix.laravel == '10.*' || matrix.laravel == '11.*') && matrix.php != ''
+
+      - name: Install Laravel 7/8 dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        if: matrix.laravel == '7.*' || matrix.laravel == '8.*' && matrix.php != ''
+
       - name: Execute tests
         run: vendor/bin/pest
         env:
           DB_USERNAME: user
           DB_PASSWORD: secret
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           REDIS_PORT: 6379
+        if: matrix.testbench != '' && matrix.php != ''

composer.json

@@ -31,7 +31,8 @@
         "php": "^7.4|^8.0",
         "ext-json": "*",
         "ext-openssl": "*",
-        "guzzlehttp/guzzle": "^6.0|^7.0",
+        "guzzlehttp/guzzle": "^7.3",
+        "guzzlehttp/promises": "^2.0",
         "illuminate/contracts": "^7.0|^8.0|^9.0|^10.0|^11.0",
         "illuminate/support": "^7.0|8.0|^9.0|^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.0"
@@ -45,7 +46,10 @@
     "autoload": {
         "psr-4": {
             "Ghostscypher\\Mpesa\\": "src/"
-        }
+        },
+        "files": [
+            "src/GuzzlePromisePolyfill.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

composer.lock

@@ -7,7 +7,7 @@
 return new class extends Migration
 {
     public function up()
-    {   
+    {
         // Stores mpesa callbacks in a table
         Schema::create('mpesa_callbacks', function (Blueprint $table) {
             $table->id();

database/migrations/create_mpesa_callbacks_table.php.stub renamed to database/migrations/2024_08_01_000000_create_mpesa_callbacks_table.php

@@ -7,12 +7,12 @@
 return new class extends Migration
 {
     public function up()
-    {  
+    {
         Schema::create('mpesa_logs', function (Blueprint $table) {
             $table->id();
             $table->string('app_id')->index(); // Hashed consumer_key + secret
             $table->string('x_reference_id')->unique(); // This is the unique reference id that is generated by the system and can be used to track the transaction
-            
+
             // Before calling the endpoint
             $table->string('endpoint')->default('');
             $table->string('environment')->default('');

database/migrations/create_mpesa_logs_table.php.stub renamed to database/migrations/2024_08_27_000000_create_mpesa_logs_table.php

@@ -7,7 +7,7 @@
 return new class extends Migration
 {
     public function up()
-    {   
+    {
         Schema::create('mpesa_tokens', function (Blueprint $table) {
             $table->id();
             $table->string('app_id')->index(); // Hashed consumer_key + secret

database/migrations/create_mpesa_tokens_table.php.stub renamed to database/migrations/2024_08_27_000000_create_mpesa_tokens_table.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Ghostscypher\Mpesa\Commands;
+
+use Illuminate\Console\Command;
+
+class InstallMpesaPackageCommand extends Command
+{
+    protected $signature = 'mpesa:install';
+
+    public function handle(): int
+    {
+        $this->info('Installing Mpesa package...');
+
+        $this->call('vendor:publish', [
+            '--provider' => 'Ghostscypher\Mpesa\MpesaServiceProvider',
+            '--tag' => 'controllers',
+        ]);
+
+        $this->call('vendor:publish', [
+            '--provider' => 'Ghostscypher\Mpesa\MpesaServiceProvider',
+            '--tag' => 'config',
+        ]);
+
+        $this->call('vendor:publish', [
+            '--provider' => 'Ghostscypher\Mpesa\MpesaServiceProvider',
+            '--tag' => 'migrations',
+        ]);
+
+        // Ask the user to run the migrations
+        if ($this->confirm('Do you want to run the migrations now?')) {
+            $this->call('migrate');
+        }
+
+        $this->info('Mpesa package installed successfully!');
+
+        return 0;
+    }
+}

src/Commands/InstallMpesaPackageCommand.php

@@ -30,12 +30,8 @@ public function __construct()
     // Update the HTTP client with the required headers
     protected function updateHttpClient(array $headers = [], array $options = []): PendingRequest
     {
-        // Get the original headers
-        $original_headers = $this->http_client->getOptions()['headers'] ?? [];
-
         // Merge the headers
         $headers = array_merge(
-            $original_headers,
             $headers,
             [
                 // Add the request ID and timestamp, this is for tracking requests
@@ -44,12 +40,15 @@ protected function updateHttpClient(array $headers = [], array $options = []): P
             ]
         );
 
-        // Update the headers
-        $this->http_client->withHeaders($headers);
+        // Merge data
+        $options = array_merge(
+            $options,
+            [
+                'headers' => $headers,
+            ]
+        );
 
-        // Update the options
-        $original_options = $this->http_client->getOptions();
-        $this->http_client->withOptions(array_merge($original_options, $options));
+        $this->http_client->withOptions($options);
 
         return $this->http_client;
     }

src/Concerns/MpesaGlobalConfig.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace GuzzleHttp\Promise;
+
+require_once __DIR__.'/../vendor/autoload.php';
+
+// Polyfill for GuzzleHttp\Promise\Create::promiseFor for Laravel 7
+if (! function_exists('\GuzzleHttp\Promise\promise_for')) {
+    function promise_for($response)
+    {
+        return class_exists(\GuzzleHttp\Promise\Create::class)
+            ? \GuzzleHttp\Promise\Create::promiseFor($response)
+            : \GuzzleHttp\Promise\promise_for($response);
+    }
+}

src/GuzzlePromisePolyfill.php

@@ -3,12 +3,10 @@
 namespace Ghostscypher\Mpesa\Models;
 
 use Ghostscypher\Mpesa\Concerns\UsesMpesaEnv;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class MpesaCallback extends Model
 {
-    use HasFactory;
     use UsesMpesaEnv;
 
     protected $table = 'mpesa_callbacks';