fix tests

OXID-eSales · Feb 17, 2025 · b05c61c · b05c61c
1 parent 156b874
commit b05c61c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 35 deletions.
diff --git a/src/Service/PaymentExtensionLoader.php b/src/Service/PaymentExtensionLoader.php
@@ -56,60 +56,35 @@ class PaymentExtensionLoader
         UnzerDefinitions::WECHATPAY_UNZER_PAYMENT_ID => WeChatPay::class,
     ];
 
-    /**
-     * @var UnzerSDKLoader
-     */
-    private $unzerSdkLoader;
-
-    /**
-     * @var Unzer
-     */
-    private $unzerService;
+    private UnzerSDKLoader $unzerSdkLoader;
+    private Unzer $unzerService;
 
     private DebugHandler $logger;
+    private TmpOrderService $tmpOrderService;
 
-    /**
-     * @param UnzerSDKLoader $unzerSDKLoader
-     * @param Unzer $unzerService
-     */
     public function __construct(
         UnzerSDKLoader $unzerSDKLoader,
         Unzer $unzerService,
-        DebugHandler $logger
+        DebugHandler $logger,
+        TmpOrderService $tmpOrderService
     ) {
         $this->unzerSdkLoader = $unzerSDKLoader;
         $this->unzerService = $unzerService;
         $this->logger = $logger;
+        $this->tmpOrderService = $tmpOrderService;
     }
 
-    /**
-     * Please only use this method if you want to have static information about the payment method and do not
-     * need functions of the SDK. The SDK must always be loaded with the correct credentials. This is only
-     * guaranteed if method getPaymentExtensionByCustomerTypeAndCurrency is used, as only this loads the SDK
-     * with the correct credentials at all times
-     * @param PaymentModel $payment
-     * @return AbstractUnzerPayment
-     */
     public function getPaymentExtension(PaymentModel $payment): AbstractUnzerPayment
     {
         return oxNew(
             self::UNZERCLASSNAMEMAPPING[$payment->getId()],
             $this->unzerSdkLoader->getUnzerSDK(),
             $this->unzerService,
             $this->logger,
-            new TmpOrderService()
+            $this->tmpOrderService
         );
     }
 
-    /**
-     * Please only use this method if you need the SDK. This is the only way to load the SDK with the correct
-     * credentials. The getPaymentExtension method is only used to obtain static information about the payment
-     * method.
-     * @param PaymentModel $payment
-     * @param string $customerType
-     * @param string $currency
-     * @return AbstractUnzerPayment
-     */
     public function getPaymentExtensionByCustomerTypeAndCurrency(
         PaymentModel $payment,
         string $customerType,
@@ -123,7 +98,8 @@ public function getPaymentExtensionByCustomerTypeAndCurrency(
                 $customerType
             ),
             $this->unzerService,
-            $this->logger
+            $this->logger,
+            $this->tmpOrderService
         );
     }
 }
diff --git a/tests/Integration/Service/PaymentExtensionLoaderTest.php b/tests/Integration/Service/PaymentExtensionLoaderTest.php
@@ -39,7 +39,8 @@ public function testPaymentTypeCanBeLoaded($paymentId, $paymentClass): void
             $this->getMockBuilder(Unzer::class)
                 ->disableOriginalConstructor()
                 ->getMock(),
-            $this->logger
+            $this->logger,
+            new \OxidSolutionCatalysts\Unzer\Service\TmpOrderService()
         );
 
         $loadedPaymentType = $sut->getPaymentExtension($paymentStub);

diff --git a/tests/Unit/Service/PaymentTest.php b/tests/Unit/Service/PaymentTest.php
@@ -16,6 +16,7 @@
 use OxidSolutionCatalysts\Unzer\Exception\RedirectWithMessage;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Unzer as UnzerService;
 use OxidSolutionCatalysts\Unzer\Service\PaymentExtensionLoader;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
@@ -212,7 +213,8 @@ protected function getExtensionLoaderMock(
             ->setConstructorArgs([
                 $this->getUnzerSDKLoaderMock(),
                 $this->getUnzerServiceMock(),
-                $this->getLoggerMock()
+                $this->getLoggerMock(),
+                new TmpOrderService()
             ])->onlyMethods(['getPaymentExtension', 'getPaymentExtensionByCustomerTypeAndCurrency'])
             ->getMock();