fixed issues with static analysis

Author: MusahMusah

src/Gateways/StripeService.php

@@ -2,10 +2,8 @@
 
 namespace MusahMusah\LaravelMultipaymentGateways\Gateways;
 
-use GuzzleHttp\Exception\GuzzleException;
 use MusahMusah\LaravelMultipaymentGateways\Abstracts\BaseGateWay;
 use MusahMusah\LaravelMultipaymentGateways\Contracts\StripeContract;
-use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpMethodFoundException;
 use MusahMusah\LaravelMultipaymentGateways\Exceptions\InvalidConfigurationException;
 
 class StripeService extends BaseGateWay implements StripeContract
@@ -61,32 +59,22 @@ public function decodeResponse(): array
 
     /**
      * Create a new payment intent
-     *
-     *
-     * @throws GuzzleException
-     * @throws HttpMethodFoundException
      */
     public function createIntent(array $data): array
     {
-        return $this->makeRequest(
-            'POST',
-            '/v1/payment_intents',
-            $data,
+        return $this->httpClient()->post(
+            url: '/v1/payment_intents',
+            formParams: $data,
         );
     }
 
     /**
      * Confirm a payment intent
-     *
-     *
-     * @throws GuzzleException
-     * @throws HttpMethodFoundException
      */
     public function confirmIntent(string $paymentIntentId): array
     {
-        return $this->makeRequest(
-            'POST',
-            "/v1/payment_intents/{$paymentIntentId}/confirm",
+        return $this->httpClient()->post(
+            url: "/v1/payment_intents/{$paymentIntentId}/confirm",
         );
     }
 }

src/Traits/Flutterwave/BankTrait.php

@@ -2,9 +2,7 @@
 
 namespace MusahMusah\LaravelMultipaymentGateways\Traits\Flutterwave;
 
-use GuzzleHttp\Exception\GuzzleException;
 use MusahMusah\LaravelMultipaymentGateways\Constants\FlutterwaveConstant;
-use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpMethodFoundException;
 
 trait BankTrait
 {
@@ -13,7 +11,7 @@ trait BankTrait
      */
     public function getBanks(string $countryCode): array
     {
-        $banks = flutterwave()->httpClient()->get(
+        $banks = $this->httpClient()->get(
             url: FlutterwaveConstant::BANK_ENDPOINT.$countryCode,
         );
 
@@ -27,12 +25,10 @@ public function getBanks(string $countryCode): array
      * Get all branches of a bank
      *
      * @param  int  $bankId The ID of the bank for which to retrieve branches
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function getBankBranches(int $bankId): array
     {
-        return flutterwave()->httpClient()->get(
+        return $this->httpClient()->get(
             url: FlutterwaveConstant::BANK_ENDPOINT.$bankId.'/branches',
         );
     }

src/Traits/Flutterwave/ChargeTrait.php

@@ -2,9 +2,7 @@
 
 namespace MusahMusah\LaravelMultipaymentGateways\Traits\Flutterwave;
 
-use GuzzleHttp\Exception\GuzzleException;
 use MusahMusah\LaravelMultipaymentGateways\Constants\FlutterwaveConstant;
-use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpMethodFoundException;
 use MusahMusah\LaravelMultipaymentGateways\Exceptions\InvalidConfigurationException;
 
 trait ChargeTrait
@@ -14,15 +12,15 @@ trait ChargeTrait
      *
      * @param  array  $formParams An associative array of payment data.
      *
-     * @throws InvalidConfigurationException|GuzzleException|HttpMethodFoundException
+     * @throws InvalidConfigurationException
      */
     public function initiateCardCharge(array $formParams): array
     {
         $queryParams = [
             'type' => FlutterwaveConstant::CARD_PAYMENT_CHARGE_TYPE,
         ];
 
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT,
             formParams: $this->encryptPayload($formParams),
             query: $queryParams
@@ -33,8 +31,6 @@ public function initiateCardCharge(array $formParams): array
      * Initiate a bank transfer payment.
      *
      * @param  array  $formParams An associative array of transfer data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function initiateBankTransfer(array $formParams): array
     {
@@ -48,8 +44,6 @@ public function initiateBankTransfer(array $formParams): array
      * amount, email address and transaction reference to be provided in the request body.
      *
      * @param  array  $formParams An associative array of transfer data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeNigerianBankAccount(array $formParams): array
     {
@@ -63,8 +57,6 @@ public function chargeNigerianBankAccount(array $formParams): array
      * We recommend you read the method overview before you proceed.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeUkBankAccount(array $formParams): array
     {
@@ -77,8 +69,6 @@ public function chargeUkBankAccount(array $formParams): array
      * This payment method allows you to collect USD and ZAR payments via ACH.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeAchPayment(array $formParams): array
     {
@@ -92,8 +82,6 @@ public function chargeAchPayment(array $formParams): array
      * We recommend you read the method overview before you proceed.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeApplePay(array $formParams): array
     {
@@ -107,8 +95,6 @@ public function chargeApplePay(array $formParams): array
      * We recommend you read the method overview before you proceed.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeGooglePay(array $formParams): array
     {
@@ -121,8 +107,6 @@ public function chargeGooglePay(array $formParams): array
      * This payment method allows you to accept payments from your customers via Fawry Pay.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeFawryPay(array $formParams): array
     {
@@ -135,8 +119,6 @@ public function chargeFawryPay(array $formParams): array
      * This payment method allows you to accept payments from your customers via PayPal.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargePaypal(array $formParams): array
     {
@@ -149,8 +131,6 @@ public function chargePaypal(array $formParams): array
      * This payment method allows you to accept payments from your customers via M-Pesa.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeMpesa(array $formParams): array
     {
@@ -163,8 +143,6 @@ public function chargeMpesa(array $formParams): array
      * This payment method allows you to accept payments from your customers via mobile money in Ghana.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeGhanaMobileMoney(array $formParams): array
     {
@@ -177,8 +155,6 @@ public function chargeGhanaMobileMoney(array $formParams): array
      * This payment method allows you to accept payments from your customers via mobile money in Uganda.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeUgandaMobileMoney(array $formParams): array
     {
@@ -191,8 +167,6 @@ public function chargeUgandaMobileMoney(array $formParams): array
      * This payment method allows you to accept payments from your customers via Mobile Money Franco.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeMobileMoneyFranco(array $formParams): array
     {
@@ -205,8 +179,6 @@ public function chargeMobileMoneyFranco(array $formParams): array
      * This payment method allows you to accept payments from your customers via Mobile Money Rwanda.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeMobileMoneyRwanda(array $formParams): array
     {
@@ -219,8 +191,6 @@ public function chargeMobileMoneyRwanda(array $formParams): array
      * This payment method allows you to accept payments from your customers via mobile money in Zambia.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeZambiaMobileMoney(array $formParams): array
     {
@@ -233,8 +203,6 @@ public function chargeZambiaMobileMoney(array $formParams): array
      * This payment method allows you to accept payments from your customers via USSD.
      *
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function chargeUssd(array $formParams): array
     {
@@ -246,16 +214,14 @@ public function chargeUssd(array $formParams): array
      *
      * @param  string  $paymentMethod The payment method to use.
      * @param  array  $formParams An associative array of charge data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     private function chargePayment(string $paymentMethod, array $formParams): array
     {
         $queryParams = [
             'type' => $paymentMethod,
         ];
 
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT,
             formParams: $formParams,
             query: $queryParams
@@ -287,12 +253,10 @@ private function encryptPayload(array $payload): string
      * Validate a charge.
      *
      * @param  array  $formParams An associative array of charge validation data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function validateCharge(array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::VALIDATE_CHARGE_ENDPOINT,
             formParams: $formParams,
         );
@@ -303,12 +267,10 @@ public function validateCharge(array $formParams): array
      *
      * @param  string  $flwRef The data.flw_ref returned in the charge response.
      * @param  array  $formParams An associative array of charge validation data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function captureCharge(string $flwRef, array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT.$flwRef.'/capture',
             formParams: $formParams
         );
@@ -318,12 +280,10 @@ public function captureCharge(string $flwRef, array $formParams): array
      * Void a previously captured charge to release the hold on the funds.
      *
      * @param  string  $flwRef The data.flw_ref returned in the charge response.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function voidCharge(string $flwRef): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT.$flwRef.'/void',
         );
     }
@@ -333,12 +293,10 @@ public function voidCharge(string $flwRef): array
      *
      * @param  string  $flwRef The data.flw_ref returned in the charge response.
      * @param  array  $formParams An associative array of charge validation data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function createRefund(string $flwRef, array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT.$flwRef.'/refund',
             formParams: $formParams,
         );
@@ -348,12 +306,10 @@ public function createRefund(string $flwRef, array $formParams): array
      * Capture the payment of a previously uncaptured PayPal charge
      *
      * @param  array  $formParams An associative array of charge validation data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function capturePaypalCharge(array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT.'/paypal-capture',
             formParams: $formParams,
         );
@@ -363,12 +319,10 @@ public function capturePaypalCharge(array $formParams): array
      * Void a previously captured charge to release the hold on the funds.
      *
      * @param  array  $formParams An associative array of charge validation data.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function voidPaypalCharge(array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::CHARGE_ENDPOINT.'/void',
             formParams: $formParams,
         );

src/Traits/Flutterwave/OtpTrait.php

@@ -2,22 +2,18 @@
 
 namespace MusahMusah\LaravelMultipaymentGateways\Traits\Flutterwave;
 
-use GuzzleHttp\Exception\GuzzleException;
 use MusahMusah\LaravelMultipaymentGateways\Constants\FlutterwaveConstant;
-use MusahMusah\LaravelMultipaymentGateways\Exceptions\HttpMethodFoundException;
 
 trait OtpTrait
 {
     /**
      * Create an OTP
      *
      * This method allows you to generate an OTP via Flutterwave for any validation.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function createOtp(array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::OTP_ENDPOINT,
             formParams: $formParams
         );
@@ -27,12 +23,10 @@ public function createOtp(array $formParams): array
      * Validate an OTP
      *
      * This method allows you to validate OTPs generated by the /create endpoint.
-     *
-     * @throws GuzzleException|HttpMethodFoundException
      */
     public function verifyOtp(string $reference, array $formParams): array
     {
-        return flutterwave()->httpClient()->post(
+        return $this->httpClient()->post(
             url: FlutterwaveConstant::OTP_ENDPOINT.$reference.'/validate',
             formParams: $formParams
         );