Merge pull request #69 from Abraham-Flutterwave/dev

General Update: Enhanced Features and Improved Performance

Author: corneliusyaovi

.docker/.gitpod.Dockerfile

@@ -0,0 +1,3 @@
+FROM gitpod/workspace-full
+
+RUN sudo install-packages php-xdebug

.env.example

@@ -1,4 +1,5 @@
-PUBLIC_KEY=FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
-SECRET_KEY=FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
-ENCRYPTION_KEY=FLWSECK_XXXXXXXXXXXXXXXX
-ENV=staging
+FLW_PUBLIC_KEY=FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
+FLW_SECRET_KEY=FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
+FLW_ENCRYPTION_KEY=FLWSECK_XXXXXXXXXXXXXXXX
+FLW_ENV=staging
+FLW_LOG_DIR=logs

.github/workflows/artifact-release.yml

@@ -0,0 +1,44 @@
+name: Build and Upload PHP Artifacts
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'  # Match tags like 1.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: ['7.4', '8.1', '8.2', '8.3', '8.4']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
+
+      - name: Install dependencies
+        run: composer install --no-dev --optimize-autoloader
+
+      - name: Get tag version
+        id: tag
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+
+      - name: Create release artifact
+        run: |
+          mkdir -p build
+          cp -r vendor src tests assets composer.json composer.lock .gitignore LICENSE phpunit.xml.dist .env.example processPayment.php paymentForm.php setup.php README.md CHANGELOG.md build/
+          cd build && zip -r ../flutterwave-php-${VERSION}-php${{ matrix.php }}.zip . && cd ..
+
+      - name: Upload artifact to release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: flutterwave-php-${{ env.VERSION }}-php${{ matrix.php }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/change-review.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 8.1, 8.2]
+        php: [7.4, 8.1, 8.2, 8.3]
 
     env:
       XDEBUG_MODE: coverage
@@ -48,17 +48,13 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress
 
-      - name: 'Create env file'
-        run: |
-          touch .env
-          echo PUBLIC_KEY=${PUBLIC_KEY} >> .env
-          echo SECRET_KEY=${SECRET_KEY} >> .env
-          echo ENCRYPTION_KEY=${ENCRYPTION_KEY} >> .env
-          echo ENV=${ENV} >> .env
-          ls -a ${{ github.workspace }}
-
       - name: run unit tests and coverage scan
         run: ./vendor/bin/pest --coverage --min=20 --coverage-clover ./coverage.xml
+        env:
+          PUBLIC_KEY: ${{ secrets.PUBLIC_KEY }}
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+          ENCRYPTION_KEY: ${{ secrets.ENCRYPTION_KEY }}
+          ENV: ${{ secrets.ENV }}
 
       - name: Upload to Codecov
         uses: codecov/codecov-action@v2

.gitignore

@@ -198,4 +198,6 @@ example.php
 .phpunit.cache
 coverage.xml
 .env.local
-.php-cs-fixer.cache
+.php-cs-fixer.cache
+.idx/
+.vscode/

.gitpod.yml

@@ -0,0 +1,15 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+image:
+    file: .docker/.gitpod.Dockerfile
+
+tasks:
+  - init: make
+
+vscode:
+    extensions:
+        - felixfbecker.php-debug

Makefile

@@ -1,8 +1,15 @@
 .PHONY: init
-test:
+check:
 	@echo "Installing dependencies..."
 	@composer install
 	@echo "Installing dependencies... Done"
 	@./vendor/bin/pest --coverage --min=0 --coverage-clover ./coverage.xml
 
 
+test:
+	@./vendor/bin/pest --coverage --min=0 --coverage-clover ./coverage.xml
+
+debug:
+	XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --coverage-html .log
+
+

README.md

@@ -47,6 +47,9 @@ Available features include:
 
 ## Installation
 
+### Download Release Artifact
+If you do not want to make use of composer. each [release](https://github.com/Flutterwave/PHP-v3/releases/) contains a zip with all the dependencies installed. Simply download the one that supports your php version.
+
 ### Installation via Composer.
 
 To install the package via Composer, run the following command.
@@ -67,10 +70,11 @@ cp .env.example .env
 Your `.env` file should look this.
 
 ```env
-PUBLIC_KEY=FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
-SECRET_KEY=FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
-ENCRYPTION_KEY=FLWSECK_XXXXXXXXXXXXXXXX
-ENV='staging/production'
+FLW_PUBLIC_KEY=FLWSECK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
+FLW_SECRET_KEY=FLWPUBK_TEST-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
+FLW_ENCRYPTION_KEY=FLWSECK_XXXXXXXXXXXXXXXX
+FLW_ENV='staging/production'
+FLW_LOG_DIR=logs
 ```
 
 ### Render Payment Modal

composer.json

@@ -21,6 +21,7 @@
         "ext-openssl": "*",
         "guzzlehttp/guzzle": "^7.5",
         "psr/http-client": "^1.0",
+        "psr/log": "^1.1 || ^2.0 || ^3.0",
         "php-http/guzzle7-adapter": "^1.0",
         "composer/ca-bundle": "^1.3"
     },

examples/card.php

@@ -4,7 +4,26 @@
 
 use Flutterwave\Util\AuthMode;
 use Flutterwave\Util\Currency;
-\Flutterwave\Flutterwave::bootstrap();
+use Flutterwave\Config\ForkConfig;
+use Dotenv\Dotenv;
+// custom config.
+
+if(!file_exists( '.env' )) {
+    $dotenv = Dotenv::createImmutable(__DIR__."/../"); 
+} else {
+    $dotenv = Dotenv::createImmutable(__DIR__."/");
+}
+
+$dotenv->safeLoad();
+
+$config = ForkConfig::setUp(
+    $_ENV['SECRET_KEY'],
+    $_ENV['PUBLIC_KEY'],
+    $_ENV['ENV'],
+    $_ENV['ENCRYPTION_KEY']
+);
+
+\Flutterwave\Flutterwave::bootstrap($config);
 
 try {
 
@@ -48,6 +67,8 @@
     $data['customer'] = $customerObj;
     $payload  = $cardpayment->payload->create($data);
 
+    
+
     if(!empty($_REQUEST))
     {
         $request = $_REQUEST;
@@ -59,7 +80,7 @@
 
         if(isset($request['make'])){
             $result = $cardpayment->initiate($payload);
-
+            dd($cardpayment);
             if($result['mode'] === AuthMode::PIN){
                 $instruction = $result['instruction'];
                 require __DIR__."/view/form/pin.php";