change: resolve conflict

src/MTNMobileMoney/MomoToken.php → src/Common/PaymentToken.php

@@ -1,39 +1,39 @@
 <?php
 
-namespace Bow\Payment\MTNMobileMoney;
+namespace Bow\Payment\Common;
 
-class MomoToken
+class PaymentToken
 {
     /**
-     * The access token value
+     * Define the access token value
      *
      * @var string
      */
     private $access_token;
 
     /**
-     * The type of token who define how to call the API
+     * Define the type of token who define how to call the API
      *
      * @var string
      */
     private $token_type;
 
     /**
-     * The token expiration time
+     * Define the token expiration time
      *
      * @var int
      */
     private $expires_in;
 
     /**
-     * The realy time for token expiration
+     * Define the realy time for token expiration
      *
      * @var int
      */
     private $expires_realy_in;
 
     /**
-     * OrangeMoneyToken constructor
+     * PaymentToken constructor
      *
      * @param string $access_token
      * @param string $token_type

src/MTNMobileMoney/Collection/MomoPayment.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Bow\Payment\MTNMobileMoney\Collection;
+namespace Bow\Payment\MTNMobileMoney\Collection
 
 class MomoPayment
 {
-
+    // Do something
 }

src/MTNMobileMoney/Collection/MomoPaymentStatus.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Bow\Payment\MTNMobileMoney\Collection
+
+class MomoPaymentStatus
+{
+    // Do something
+}

src/MTNMobileMoney/MomoEnvironment.php

@@ -5,21 +5,29 @@
 class MomoEnvironment
 {
     /**
-     * The environment flag
+     * Define the environment flag
      *
      * @var string
      */
     private $environment = 'sandbox';
 
+    /**
+     * Define the basic auth value
+     *
+     * @var string
+     */
+    private $basic_auth;
+
     /**
      * MomoEnvironment constructor
      *
      * @param string $subscription_key
      * @return void
      */
-    public function __construct(string $subscription_key)
+    public function __construct(string $subscription_key. string $basic_auth)
     {
         $this->subscription_key = $subscription_key;
+        $this->basic_auth = $basic_auth;
     }
 
     /**
@@ -32,6 +40,16 @@ public function getSubscriptionKey()
         return $this->subscription_key;
     }
 
+    /**
+     * Get the basic authorization key
+     *
+     * @return string
+     */
+    public function getBasicAuthorizationKey()
+    {
+        return $this->basic_auth;
+    }
+
     /**
      * Check the environment
      *
@@ -69,7 +87,7 @@ public function switchToSandbox()
      */
     public function switchToProduction()
     {
-        $this->environment = 'sandbox';
+        $this->environment = 'production';
     }
 
     /**
@@ -96,7 +114,7 @@ public function getBaseUri()
     public function getAuthorzition()
     {
         return [
-            'Authorization' => 'Basic ' . base64_encode('API URI and API Key'),
+            'Authorization' => 'Basic ' . $this->basic_auth,
             'Ocp-Apim-Subscription-Key' => $this->subscription_key,
         ];
     }

src/MTNMobileMoney/MonoTokenGenerator.php

@@ -2,7 +2,8 @@
 
 namespace Bow\Payment\MTMMobileMoney;
 
-use \GuzzleHttp\Client as HttpClient;
+use Bow\Payment\Common\PaymentToken as MomoToken;
+use GuzzleHttp\Client as HttpClient;
 
 class MomoEnvironment
 {

src/OrangeMoney/OrangeMoneyPayment.php

@@ -2,6 +2,7 @@
 
 namespace Bow\Payment\OrangeMoney;
 
+use Bow\Payment\Common\PaymentToken as OrangeMoneyToken;
 use \GuzzleHttp\Client as HttpClient;
 
 class OrangeMoneyPayment
@@ -60,19 +61,20 @@ class OrangeMoneyPayment
      *
      * @param OrangeMoneyToken $token
      * @param string $merchant_key
+     * @param string $currency
      * @return mixed
      */
-    public function __construct(OrangeMoneyToken $token, $merchant_key)
+    public function __construct(OrangeMoneyToken $token, $merchant_key, string $currency = 'OUV')
     {
         $this->token = $token;
 
         $this->http = new HttpClient(['base_uri' => 'https://api.orange.com']);
 
         $this->merchant_key = $merchant_key;
 
-        $this->currency = 'OUV';
+        $this->currency = $currency;
     }
-    
+
     /**
      * Make payment
      *

src/OrangeMoney/OrangeMoneyTokenGenerator.php

@@ -2,6 +2,7 @@
 
 namespace Bow\Payment\OrangeMoney;
 
+use Bow\Payment\Common\PaymentToken as OrangeMoneyToken;
 use \GuzzleHttp\Client as HttpClient;
 
 class OrangeMoneyTokenGenerator

src/OrangeMoney/OrangeMoneyTransaction.php

@@ -2,6 +2,7 @@
 
 namespace Bow\Payment\OrangeMoney;
 
+use Bow\Payment\Common\PaymentToken as OrangeMoneyToken;
 use \GuzzleHttp\Client as HttpClient;
 
 class OrangeMoneyTransaction