Merge pull request #11 from bowphp/code-formatting

papac · web-flow · commit 15bcd013346d · 2025-12-28T17:03:46.000Z
Fix php core lang
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,9 +2,9 @@ name: PHP Composer
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read
diff --git a/docs/en.md b/docs/en.md
@@ -332,9 +332,9 @@ $status = $gateway->verify([
 ### MTN Mobile Money Direct Usage
 
 ```php
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MTNMobileMoneyGateway;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoTokenGenerator;
+use Bow\Payment\Gateway\IvoryCost\Mono\MonoGateway;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoTokenGenerator;
 
 $config = [
     'subscription_key' => 'YOUR_SUBSCRIPTION_KEY',
@@ -351,7 +351,7 @@ $tokenGenerator = new MomoTokenGenerator(
     $environment
 );
 
-$gateway = new MTNMobileMoneyGateway($tokenGenerator, $config, $environment);
+$gateway = new MonoGateway($tokenGenerator, $config, $environment);
 
 $result = $gateway->payment([
     'amount' => 1000,
diff --git a/docs/fr.md b/docs/fr.md
@@ -332,9 +332,9 @@ $status = $gateway->verify([
 ### Utilisation Directe de MTN Mobile Money
 
 ```php
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MTNMobileMoneyGateway;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoTokenGenerator;
+use Bow\Payment\Gateway\IvoryCost\Mono\MonoGateway;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoTokenGenerator;
 
 $config = [
     'subscription_key' => 'VOTRE_SUBSCRIPTION_KEY',
@@ -351,7 +351,7 @@ $tokenGenerator = new MomoTokenGenerator(
     $environment
 );
 
-$gateway = new MTNMobileMoneyGateway($tokenGenerator, $config, $environment);
+$gateway = new MonoGateway($tokenGenerator, $config, $environment);
 
 $result = $gateway->payment([
     'amount' => 1000,
diff --git a/src/Exceptions/PaymentException.php b/src/Exceptions/PaymentException.php
@@ -14,9 +14,9 @@ class PaymentException extends Exception
      *
      * @param string $message
      * @param int $code
-     * @param Exception|null $previous
+     * @param ?Exception $previous
      */
-    public function __construct(string $message = "", int $code = 0, Exception $previous = null)
+    public function __construct(string $message = "", int $code = 0, ?Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Exceptions/PaymentRequestException.php b/src/Exceptions/PaymentRequestException.php
@@ -12,9 +12,9 @@ class PaymentRequestException extends PaymentException
      *
      * @param string $message
      * @param int $code
-     * @param \Exception|null $previous
+     * @param ?\Exception $previous
      */
-    public function __construct(string $message, int $code = 500, \Exception $previous = null)
+    public function __construct(string $message, int $code = 500, ?\Exception $previous = null)
     {
         parent::__construct("Payment request failed: {$message}", $code, $previous);
     }
diff --git a/src/Exceptions/TokenGenerationException.php b/src/Exceptions/TokenGenerationException.php
@@ -11,9 +11,9 @@ class TokenGenerationException extends PaymentException
      * Create a new token generation exception
      *
      * @param string $provider
-     * @param \Exception|null $previous
+     * @param ?\Exception $previous
      */
-    public function __construct(string $provider = '', \Exception $previous = null)
+    public function __construct(string $provider = '', ?\Exception $previous = null)
     {
         $message = $provider
             ? "Failed to generate authentication token for {$provider}"
diff --git a/src/Exceptions/TransactionVerificationException.php b/src/Exceptions/TransactionVerificationException.php
@@ -11,9 +11,9 @@ class TransactionVerificationException extends PaymentException
      * Create a new transaction verification exception
      *
      * @param string $transactionId
-     * @param \Exception|null $previous
+     * @param ?\Exception $previous
      */
-    public function __construct(string $transactionId = '', \Exception $previous = null)
+    public function __construct(string $transactionId = '', ?\Exception $previous = null)
     {
         $message = $transactionId
             ? "Failed to verify transaction [{$transactionId}]"
diff --git a/src/Gateway/IvoryCost/Mono/Collection/MomoPayment.php b/src/Gateway/IvoryCost/Mono/Collection/MomoPayment.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\Collection;
+namespace Bow\Payment\Gateway\IvoryCost\Mono\Collection;
 
 use Bow\Payment\Common\Utils;
 use GuzzleHttp\Client as HttpClient;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoToken;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoToken;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
 use Bow\Payment\Exceptions\PaymentRequestException;
 
 class MomoPayment
diff --git a/src/Gateway/IvoryCost/Mono/Collection/MomoPaymentStatus.php b/src/Gateway/IvoryCost/Mono/Collection/MomoPaymentStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\Collection;
+namespace Bow\Payment\Gateway\IvoryCost\Mono\Collection;
 
 use Bow\Payment\Common\ProcessorStatusInterface;
 
diff --git a/src/Gateway/IvoryCost/Mono/Collection/MomoTransaction.php b/src/Gateway/IvoryCost/Mono/Collection/MomoTransaction.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\Collection;
+namespace Bow\Payment\Gateway\IvoryCost\Mono\Collection;
 
 use GuzzleHttp\Client as HttpClient;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoToken;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoToken;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
 use Bow\Payment\Exceptions\TransactionVerificationException;
 
 class MomoTransaction
diff --git a/src/Gateway/IvoryCost/Mono/MTNMobileMoneyGateway.php b/src/Gateway/IvoryCost/Mono/MTNMobileMoneyGateway.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney;
+namespace Bow\Payment\Gateway\IvoryCost\Mono;
 
 use Bow\Payment\Common\ProcessorGatewayInterface;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\Collection\MomoPayment;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\Collection\MomoTransaction;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoTokenGenerator;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\Collection\MomoPayment;
+use Bow\Payment\Gateway\IvoryCost\Mono\Collection\MomoTransaction;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoTokenGenerator;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
 
-class MTNMobileMoneyGateway implements ProcessorGatewayInterface
+class MonoGateway implements ProcessorGatewayInterface
 {
     /**
      * Environment instance
diff --git a/src/Gateway/IvoryCost/Mono/MomoEnvironment.php b/src/Gateway/IvoryCost/Mono/MomoEnvironment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney;
+namespace Bow\Payment\Gateway\IvoryCost\Mono;
 
 class MomoEnvironment
 {
diff --git a/src/Gateway/IvoryCost/Mono/MomoToken.php b/src/Gateway/IvoryCost/Mono/MomoToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney;
+namespace Bow\Payment\Gateway\IvoryCost\Mono;
 
 class MomoToken
 {
diff --git a/src/Gateway/IvoryCost/Mono/MonoTokenGenerator.php b/src/Gateway/IvoryCost/Mono/MonoTokenGenerator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bow\Payment\Gateway\IvoryCost\MTNMobileMoney;
+namespace Bow\Payment\Gateway\IvoryCost\Mono;
 
 use GuzzleHttp\Client as HttpClient;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoToken;
-use Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MomoEnvironment;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoToken;
+use Bow\Payment\Gateway\IvoryCost\Mono\MomoEnvironment;
 use Bow\Payment\Exceptions\TokenGenerationException;
 
 class MomoTokenGenerator
diff --git a/src/Payment.php b/src/Payment.php
@@ -57,7 +57,7 @@ class Payment implements ProcessorGatewayInterface
      */
     public const CI_PROVIDER = [
         Payment::ORANGE => \Bow\Payment\Gateway\IvoryCost\OrangeMoney\OrangeMoneyGateway::class,
-        Payment::MTN => \Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MTNMobileMoneyGateway::class,
+        Payment::MTN => \Bow\Payment\Gateway\IvoryCost\Mono\MonoGateway::class,
         Payment::MOOV => \Bow\Payment\Gateway\IvoryCost\MoovFlooz\MoovFloozGateway::class,
         Payment::WAVE => \Bow\Payment\Gateway\IvoryCost\Wave\WaveGateway::class,
         Payment::DJAMO => \Bow\Payment\Gateway\IvoryCost\Djamo\DjamoGateway::class,
diff --git a/tests/PaymentTest.php b/tests/PaymentTest.php
@@ -34,7 +34,7 @@ public function testProviderMapping()
         );
         
         $this->assertEquals(
-            \Bow\Payment\Gateway\IvoryCost\MTNMobileMoney\MTNMobileMoneyGateway::class,
+            \Bow\Payment\Gateway\IvoryCost\Mono\MonoGateway::class,
             $providers[Payment::MTN]
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ class PaymentException extends Exception`
`14`	`14`	`*`
`15`	`15`	`* @param string $message`
`16`	`16`	`* @param int $code`
`17`		`- * @param Exception\|null $previous`
	`17`	`+ * @param ?Exception $previous`
`18`	`18`	`*/`
`19`		`- public function __construct(string $message = "", int $code = 0, Exception $previous = null)`
	`19`	`+ public function __construct(string $message = "", int $code = 0, ?Exception $previous = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct($message, $code, $previous);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ class PaymentRequestException extends PaymentException`
`12`	`12`	`*`
`13`	`13`	`* @param string $message`
`14`	`14`	`* @param int $code`
`15`		`- * @param \Exception\|null $previous`
	`15`	`+ * @param ?\Exception $previous`
`16`	`16`	`*/`
`17`		`- public function __construct(string $message, int $code = 500, \Exception $previous = null)`
	`17`	`+ public function __construct(string $message, int $code = 500, ?\Exception $previous = null)`
`18`	`18`	`{`
`19`	`19`	`parent::__construct("Payment request failed: {$message}", $code, $previous);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ class TokenGenerationException extends PaymentException`
`11`	`11`	`* Create a new token generation exception`
`12`	`12`	`*`
`13`	`13`	`* @param string $provider`
`14`		`- * @param \Exception\|null $previous`
	`14`	`+ * @param ?\Exception $previous`
`15`	`15`	`*/`
`16`		`- public function __construct(string $provider = '', \Exception $previous = null)`
	`16`	`+ public function __construct(string $provider = '', ?\Exception $previous = null)`
`17`	`17`	`{`
`18`	`18`	`$message = $provider`
`19`	`19`	`? "Failed to generate authentication token for {$provider}"`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ class TransactionVerificationException extends PaymentException`
`11`	`11`	`* Create a new transaction verification exception`
`12`	`12`	`*`
`13`	`13`	`* @param string $transactionId`
`14`		`- * @param \Exception\|null $previous`
	`14`	`+ * @param ?\Exception $previous`
`15`	`15`	`*/`
`16`		`- public function __construct(string $transactionId = '', \Exception $previous = null)`
	`16`	`+ public function __construct(string $transactionId = '', ?\Exception $previous = null)`
`17`	`17`	`{`
`18`	`18`	`$message = $transactionId`
`19`	`19`	`? "Failed to verify transaction [{$transactionId}]"`