fixed recursion getBaseUrl() call

Author: bernard-ng

ecs.php

@@ -8,6 +8,7 @@
 return function (ECSConfig $ecsConfig): void {
     $ecsConfig->paths([
         __DIR__ . '/src',
+        __DIR__ . '/tests'
     ]);
 
     $ecsConfig->sets([

src/Client.php

@@ -60,10 +60,10 @@ public function __construct(
         );
     }
 
-
     /**
-     * Permet d'envoyer une directement intention de paiement sur le mobile money du client
+     * Cette interface permet d’envoyer une requête de paiement à FlexPay
      *
+     * @since flexpay v1
      * @throws NetworkException
      */
     public function mobile(MobileRequest $request): PaymentResponse
@@ -86,10 +86,12 @@ public function mobile(MobileRequest $request): PaymentResponse
     }
 
     /**
-     * Créer une URL unique de paiement via le gateway de Flexpay
-     * Cela permet d'utiliser différente méthode de paiement
-     * y compris une carte bancaire (VISA, MASTERCARD, etc.)
+     * Cette interface permet d’envoyer une requête de paiement à FlexPay
+     * Ce paiement va se faire en deux étapes :
+     * - Générer l’url de paiement
+     * - Redirection vers la page de paiements
      *
+     * @since flexpay v1.1
      * @throws NetworkException
      */
     public function card(CardRequest $request): CardResponse
@@ -128,6 +130,7 @@ public function pay(Request $request): PaymentResponse|CardResponse
      *
      * @param string $orderNumber Le code de la transaction généré par FlexPay lors de la requête de paiement
      *
+     * @since flexpay v1
      * @throws NetworkException quand une erreur
      */
     public function check(string $orderNumber): CheckResponse
@@ -146,10 +149,12 @@ public function check(string $orderNumber): CheckResponse
             $this->createExceptionFromResponse($e);
         }
     }
-  
+
     /**
-     * Permet d'envoyer une intention de paiement sur le mobile money du client
+     * Cette interface permet à un marchand d’envoyer à partir de son compte de l’argent électronique vers un
+     * numéro de téléphone qui a un compte mobile money.
      *
+     * @since flexpay v1.1
      * @throws NetworkException
      */
     public function payout(PayoutRequest $request): PayoutResponse
@@ -172,7 +177,7 @@ public function payout(PayoutRequest $request): PayoutResponse
     }
 
     /**
-     * Cette interface permet d'obtenir une réponse de paiement provenant de FlexPay
+     * Cette interface permet de vérifier l’état d’une requête de paiement envoyée à FlexPay
      */
     public function handleCallback(array $data): PaymentResponse
     {

src/Data/TransactionType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Devscast\Flexpay\Data;
+
+enum Type: int
+{
+    case MOBILE = 1;
+    case CARD = 2;
+}

src/Data/Type.php

@@ -47,8 +47,8 @@ public function getPayoutUrl(): string
     private function getBaseUrl(): string
     {
         return match ($this) {
-            self::LIVE => sprintf('%s/merchantPayOutService', $this->getBaseUrl()),
-            self::SANDBOX => sprintf('%s/merchantPayOutService', $this->getBaseUrl())
+            self::LIVE => 'https://backend.flexpay.cd/api/rest/v1',
+            self::SANDBOX => 'https://beta-backend.flexpay.cd/api/rest/v1',
         };
     }
 }

src/Environment.php

@@ -5,6 +5,7 @@
 namespace Devscast\Flexpay\Request;
 
 use Devscast\Flexpay\Data\Currency;
+use Devscast\Flexpay\Data\Type;
 use Webmozart\Assert\Assert;
 
 /**
@@ -20,7 +21,7 @@ public function __construct(
         Currency $currency,
         string $callbackUrl,
         public readonly string $phone,
-        public readonly int $type = 1,
+        public readonly Type $type = Type::MOBILE,
         ?string $description = null,
         ?string $approveUrl = null,
         ?string $cancelUrl = null,
@@ -36,7 +37,7 @@ public function getPayload(): array
     {
         return [
             'phone' => $this->phone,
-            'type' => $this->type,
+            'type' => $this->type->value,
             'amount' => $this->amount,
             'merchant' => $this->merchant,
             'reference' => $this->reference,

src/Request/MobileRequest.php

@@ -5,8 +5,14 @@
 namespace Devscast\Flexpay\Request;
 
 use Devscast\Flexpay\Data\Currency;
+use Devscast\Flexpay\Data\Type;
 use Webmozart\Assert\Assert;
 
+/**
+ * Class PayoutRequest.
+ *
+ * @author Rooney kalumba
+ */
 final class PayoutRequest extends Request
 {
     public function __construct(
@@ -15,9 +21,8 @@ public function __construct(
         Currency $currency,
         string $callbackUrl,
         public string $phone,
-        public int $type = 1,
+        public Type $type = Type::MOBILE,
     ) {
-
         Assert::length($this->phone, 12, 'The phone number should be 12 characters long, eg: 243123456789');
 
         parent::__construct($amount, $reference, $currency, $callbackUrl);
@@ -26,8 +31,8 @@ public function __construct(
     public function getPayload(): array
     {
         return [
-            'authorization' => $this->authorization,
-            'type' => $this->type,
+            'merchant' => $this->merchant,
+            'type' => $this->type->value,
             'reference' => $this->reference,
             'phone' => $this->phone,
             'amount' => $this->amount,

src/Request/PayoutRequest.php

@@ -5,19 +5,19 @@
 namespace Devscast\Flexpay\Tests;
 
 use Devscast\Flexpay\Client;
-use Devscast\Flexpay\Data\TransactionType;
-use Devscast\Flexpay\Exception\NetworkException;
-use Devscast\Flexpay\Request\PayoutRequest;
-use Devscast\Flexpay\Response\PayoutResponse;
-use PHPUnit\Framework\TestCase;
 use Devscast\Flexpay\Credential;
 use Devscast\Flexpay\Data\Currency;
 use Devscast\Flexpay\Data\Transaction;
+use Devscast\Flexpay\Data\Type;
+use Devscast\Flexpay\Exception\NetworkException;
 use Devscast\Flexpay\Request\CardRequest;
 use Devscast\Flexpay\Request\MobileRequest;
+use Devscast\Flexpay\Request\PayoutRequest;
 use Devscast\Flexpay\Response\CardResponse;
 use Devscast\Flexpay\Response\CheckResponse;
 use Devscast\Flexpay\Response\PaymentResponse;
+use Devscast\Flexpay\Response\PayoutResponse;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 
@@ -28,23 +28,6 @@
  */
 final class ClientTest extends TestCase
 {
-    private function getFlexpay(callable|MockResponse $mock): Client
-    {
-        $flexpay = new Client(new Credential('token', 'ZONDO'));
-        $reflection = new \ReflectionClass($flexpay);
-
-        $http = $reflection->getProperty('http');
-        $http->setAccessible(true);
-        $http->setValue($flexpay, new MockHttpClient($mock));
-
-        return $flexpay;
-    }
-
-    private function getResponse(string $file): MockResponse
-    {
-        return new MockResponse((string) file_get_contents(__DIR__ . '/fixtures/' . $file));
-    }
-
     public function testCard(): void
     {
         $flexpay = $this->getFlexpay($this->getResponse('card_success.json'));
@@ -72,24 +55,25 @@ public function testCard(): void
      */
     public function testPayout(): void
     {
-        $flexpay = $this->getFlexpay($this->getResponse('payout.json'));
+        $flexpay = $this->getFlexpay($this->getResponse('payout_success.json'));
 
         $request = new PayoutRequest(
             amount: 10,
             reference: 'ref',
             currency: Currency::USD,
             callbackUrl: 'http://localhost:8000/callback',
             phone: '243123456789',
-            type: 1
+            type: Type::MOBILE
         );
 
         $response = $flexpay->payout($request);
 
-        $this->assertInstanceOf(PayoutResponse::class,$response);
+        $this->assertInstanceOf(PayoutResponse::class, $response);
         $this->assertTrue($response->isSuccessful());
-        $this->assertEquals('6708a4708d470_1728619632', $response->orderNumber);
-
+        $this->assertEquals('Transaction envoyée avec succès.', $response->message);
+        $this->assertEquals('SQeCGunXEGnr243815877848', $response->orderNumber);
     }
+
     public function testSuccessCheck(): void
     {
         $flexpay = $this->getFlexpay($this->getResponse('check_success.json'));
@@ -129,8 +113,6 @@ public function testMobile(): void
         $this->assertEquals('DtX9SmCYojWW243123456789', $response->orderNumber);
     }
 
-
-
     public function testHandleCallback(): void
     {
         /** @var array $data */
@@ -143,4 +125,21 @@ public function testHandleCallback(): void
         $this->assertEquals('ZDN000003', $response->reference);
         $this->assertEquals('UBGC8s9L3VBm243815877848', $response->orderNumber);
     }
+
+    private function getFlexpay(callable|MockResponse $mock): Client
+    {
+        $flexpay = new Client(new Credential('token', 'ZONDO'));
+        $reflection = new \ReflectionClass($flexpay);
+
+        $http = $reflection->getProperty('http');
+        $http->setAccessible(true);
+        $http->setValue($flexpay, new MockHttpClient($mock));
+
+        return $flexpay;
+    }
+
+    private function getResponse(string $file): MockResponse
+    {
+        return new MockResponse((string) file_get_contents(__DIR__ . '/fixtures/' . $file));
+    }
 }

tests/ClientTest.php

@@ -4,8 +4,8 @@
 
 namespace Devscast\Flexpay\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Devscast\Flexpay\Environment;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class EnvironmentTest.
@@ -15,9 +15,10 @@
 final class EnvironmentTest extends TestCase
 {
     private Environment $dev;
+
     private Environment $prod;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->dev = Environment::SANDBOX;
         $this->prod = Environment::LIVE;
@@ -43,7 +44,6 @@ public function testGetCardPaymentUrl(): void
         );
     }
 
-
     public function testGetMobilePaymentUrl(): void
     {
         $this->assertEquals(

tests/EnvironmentTest.php

@@ -0,0 +1,5 @@
+{
+  "code" : "0",
+  "message" : "Transaction envoyée avec succès.",
+  "orderNumber": "SQeCGunXEGnr243815877848"
+}