fix: eligibility return type & Bridge return types

src/Bridge/AlmaBridge.php

@@ -6,6 +6,7 @@
 
 
 use Alma\API\Client;
+use Alma\API\Endpoints\Results\Eligibility;
 use Alma\API\Entities\Instalment;
 use Alma\API\Entities\Merchant;
 use Alma\API\Entities\Payment;
@@ -23,7 +24,7 @@
 final class AlmaBridge implements AlmaBridgeInterface
 {
     /**
-     * @var GatewayConfig
+     * @var null|GatewayConfig
      */
     private $gatewayConfig = null;
 
@@ -47,19 +48,33 @@ public function __construct(LoggerInterface $logger, PaymentDataBuilderInterface
         $this->paymentDataBuilder = $paymentDataBuilder;
     }
 
+    /**
+     * @param Eligibility|Eligibility[] $eligibility
+     *
+     * @return Eligibility[]
+     */
+    private function formatEligibility($eligibility): array
+    {
+        if ($eligibility instanceof Eligibility) {
+            return [$eligibility];
+        }
+
+        return $eligibility;
+    }
+
     public function initialize(ArrayObject $config): void
     {
         self::$almaClient = null;
         $this->gatewayConfig = new GatewayConfig($config);
     }
 
-    public function getDefaultClient(?string $mode = null): Client
+    public function getDefaultClient(?string $mode = null): ?Client
     {
-        if ($mode === null) {
+        if ($mode === null && $this->gatewayConfig) {
             $mode = $this->gatewayConfig->getApiMode();
         }
 
-        if (!self::$almaClient) {
+        if (!self::$almaClient && $mode && $this->gatewayConfig) {
             self::$almaClient = self::createClientInstance(
                 $this->gatewayConfig->getActiveApiKey(),
                 $mode,
@@ -110,9 +125,9 @@ function getMerchantInfo(): ?Merchant
     }
 
     /**
-     * @return GatewayConfig
+     * @return GatewayConfig|null
      */
-    public function getGatewayConfig(): GatewayConfig
+    public function getGatewayConfig(): ?GatewayConfig
     {
         return $this->gatewayConfig;
     }
@@ -124,16 +139,20 @@ function getEligibilities(PaymentInterface $payment, array $installmentsCounts):
     {
         $builder = $this->paymentDataBuilder;
         $builder->addBuilder(function (array $data, PaymentInterface $payment) use ($installmentsCounts): array {
-            $data['payment'] = array_merge($data['payment'], [
-                "installments_count" => $installmentsCounts
-            ]);
+            if (is_array($data['payment'])) {
+                $data['payment'] += ["installments_count" => $installmentsCounts];
+            }
 
             return $data;
         });
 
         $alma = $this->getDefaultClient();
         try {
-            return $alma->payments->eligibility($builder([], $payment), true);
+            if ($alma) {
+                $eligibility = $alma->payments->eligibility($builder([], $payment), true);
+
+                return $this->formatEligibility($eligibility);
+            }
         } catch (RequestError $e) {
             $this->logger->error("[Alma] Eligibility call failed with error: " . $e->getMessage());
         }
@@ -152,13 +171,23 @@ public function validatePayment(
         /** @var int $pid */
         $pid = $payment->getId();
 
+        $alma      = $this->getDefaultClient();
         try {
-            $paymentData = $this->getDefaultClient()->payments->fetch($almaPaymentId);
+            if ($alma) {
+                $paymentData = $alma->payments->fetch($almaPaymentId);
+            }
         } catch (RequestError $e) {
             $this->logger->error("[Alma] Could not fetch payment $almaPaymentId to validate payment $pid");
             throw $e;
         }
 
+        if (!$paymentData) {
+            $error = "PaymentData not found for payment $pid";
+            $this->logger->error("[Alma] $error");
+
+            throw new PaymentException($error);
+        }
+
         if ($pid !== $paymentData->custom_data['payment_id']) {
             $error = "Attempt to validate payment $pid with Alma payment $almaPaymentId";
             $this->logger->error("[Alma] $error");

src/Bridge/AlmaBridgeInterface.php

@@ -26,7 +26,7 @@ interface AlmaBridgeInterface
 
     function initialize(ArrayObject $config): void;
 
-    function getGatewayConfig(): GatewayConfig;
+    function getGatewayConfig(): ?GatewayConfig;
 
     function getDefaultClient(?string $mode = null): ?Client;
     static function createClientInstance(string $apiKey, string $mode, LoggerInterface $logger): ?Client;

src/Bridge/PaymentException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Alma\SyliusPaymentPlugin\Bridge;
+
+use RuntimeException;
+
+final class PaymentException extends RuntimeException
+{
+}