CC-1768 : Refactor code

Author: m-xhixha

src/Resources/PaymentTypes/OpenBanking.php renamed to src/Resources/PaymentTypes/OpenbankingPis.php

@@ -2,10 +2,8 @@
 
 namespace UnzerSDK\Resources\PaymentTypes;
 
-use UnzerSDK\Traits\CanAuthorize;
-use UnzerSDK\Traits\CanDirectCharge;
 
-class OpenBanking extends BasePaymentType
+class OpenbankingPis extends BasePaymentType
 {
     use CanAuthorize;
     use CanDirectCharge;
@@ -29,9 +27,9 @@ public function getIbanCountry(): ?string
     /**
      * @param string|null $ibanCountry
      *
-     * @return OpenBanking
+     * @return OpenbankingPis
      */
-    public function setIbanCountry(string $ibanCountry): OpenBanking
+    public function setIbanCountry(string $ibanCountry): OpenbankingPis
     {
         $this->ibanCountry = $ibanCountry;
         return $this;

src/Services/ResourceService.php

@@ -34,7 +34,7 @@
 use UnzerSDK\Resources\PaymentTypes\Invoice;
 use UnzerSDK\Resources\PaymentTypes\InvoiceSecured;
 use UnzerSDK\Resources\PaymentTypes\Klarna;
-use UnzerSDK\Resources\PaymentTypes\OpenBanking;
+use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 use UnzerSDK\Resources\PaymentTypes\PaylaterDirectDebit;
 use UnzerSDK\Resources\PaymentTypes\PaylaterInstallment;
 use UnzerSDK\Resources\PaymentTypes\PaylaterInvoice;
@@ -947,7 +947,7 @@ public static function getTypeInstanceFromIdString($typeId): BasePaymentType
                 $paymentType = new Wechatpay();
                 break;
             case IdStrings::OPEN_BANKING:
-                $paymentType = new OpenBanking();
+                $paymentType = new OpenbankingPis();
                 break;
             default:
                 throw new RuntimeException('Invalid payment type!');

test/integration/PaymentTypes/OpenBankingTest.php

@@ -12,7 +12,7 @@
 namespace UnzerSDK\test\integration\PaymentTypes;
 
 use UnzerSDK\Resources\PaymentTypes\BasePaymentType;
-use UnzerSDK\Resources\PaymentTypes\OpenBanking;
+use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 use UnzerSDK\test\BaseIntegrationTest;
 
 class OpenBankingTest extends BaseIntegrationTest
@@ -26,12 +26,12 @@ class OpenBankingTest extends BaseIntegrationTest
      */
     public function openBankingShouldBeCreatableAndFetchable(): BasePaymentType
     {
-        $openBanking = $this->unzer->createPaymentType(new OpenBanking('DE'));
-        $this->assertInstanceOf(OpenBanking::class, $openBanking);
+        $openBanking = $this->unzer->createPaymentType(new OpenbankingPis('DE'));
+        $this->assertInstanceOf(OpenbankingPis::class, $openBanking);
         $this->assertNotEmpty($openBanking->getId());
 
         $fetchedOpenBanking = $this->unzer->fetchPaymentType($openBanking->getId());
-        $this->assertInstanceOf(OpenBanking::class, $fetchedOpenBanking);
+        $this->assertInstanceOf(OpenbankingPis::class, $fetchedOpenBanking);
         $this->assertNotSame($openBanking, $fetchedOpenBanking);
         $this->assertEquals($openBanking->expose(), $fetchedOpenBanking->expose());
 
@@ -40,39 +40,18 @@ public function openBankingShouldBeCreatableAndFetchable(): BasePaymentType
 
 
 
-    /**
-     * Verify OpenBanking can authorize.
-     *
-     * @test
-     *
-     * @depends openBankingShouldBeCreatableAndFetchable
-     *
-     * @param OpenBanking $openBanking
-     */
-    public function openBankingShouldBeAuthorizable(OpenBanking $openBanking): void
-    {
-        $authorization = $openBanking->authorize(100.0, 'EUR', self::RETURN_URL);
-        $this->assertNotNull($authorization);
-        $this->assertNotEmpty($authorization->getId());
-        $this->assertNotEmpty($authorization->getRedirectUrl());
-
-        $payment = $authorization->getPayment();
-        $this->assertNotNull($payment);
-        $this->assertTrue($payment->isPending());
-    }
-
     /**
      * Verify OpenBanking can charge.
      *
      * @test
      *
      * @depends openBankingShouldBeCreatableAndFetchable
      *
-     * @param OpenBanking $openBanking
+     * @param OpenbankingPis $openBanking
      */
-    public function openBankingShouldBeChargeable(OpenBanking $openBanking): void
+    public function openBankingShouldBeChargeable(OpenbankingPis $openBanking): void
     {
-        $charge = $openBanking->charge(100.0, 'EUR', self::RETURN_URL);
+        $charge = $this->unzer->performCharge(100.0, 'EUR', self::RETURN_URL);
         $this->assertNotNull($charge);
         $this->assertNotEmpty($charge->getId());
     }

test/integration/Resources/PaypageV2Test.php

@@ -19,7 +19,7 @@
 use UnzerSDK\Resources\PaymentTypes\Googlepay;
 use UnzerSDK\Resources\PaymentTypes\Ideal;
 use UnzerSDK\Resources\PaymentTypes\Klarna;
-use UnzerSDK\Resources\PaymentTypes\OpenBanking;
+use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 use UnzerSDK\Resources\PaymentTypes\PaylaterDirectDebit;
 use UnzerSDK\Resources\PaymentTypes\PaylaterInstallment;
 use UnzerSDK\Resources\PaymentTypes\PaylaterInvoice;
@@ -297,7 +297,7 @@ public function paymentMethodsConfigsDataProvider()
             ->addMethodConfig(PostFinanceEfinance::class, $enabledConfig)
             ->addMethodConfig(PostFinanceCard::class, $enabledConfig)
             ->addMethodConfig(Twint::class, $enabledConfig)
-            ->addMethodConfig(OpenBanking::class, $enabledConfig)
+            ->addMethodConfig(OpenbankingPis::class, $enabledConfig)
         ;
 
         $withPaylaterConfig = (new PaymentMethodsConfigs())

test/unit/Resources/PaymentTypes/OpenBankingTest.php

@@ -3,7 +3,7 @@
 namespace UnzerSDK\test\unit\Resources\PaymentTypes;
 
 use UnzerSDK\Resources\PaymentTypes\Clicktopay;
-use UnzerSDK\Resources\PaymentTypes\OpenBanking;
+use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 use UnzerSDK\test\BasePaymentTest;
 use UnzerSDK\test\Fixtures\JsonProvider;
 
@@ -18,7 +18,7 @@ public function constructorShouldSetParameters(): void
     {
         $countryCode = 'DE';
 
-        $openBanking = new OpenBanking($countryCode);
+        $openBanking = new OpenbankingPis($countryCode);
 
 
         $this->assertEquals($countryCode, $openBanking->getIbanCountry());
@@ -31,7 +31,7 @@ public function constructorShouldSetParameters(): void
      */
     public function jsonSerialization(): void
     {
-        $openBankingObject = new OpenBanking("DE",);
+        $openBankingObject = new OpenbankingPis("DE",);
 
         $expectedJson = JsonProvider::getJsonFromFile('openBanking/createRequest.json');
         $this->assertJsonStringEqualsJsonString($expectedJson, $openBankingObject->jsonSerialize());
@@ -44,7 +44,7 @@ public function jsonSerialization(): void
      */
     public function openBankingAuthorizationShouldBeMappedCorrectly(): void
     {
-        $openBanking = new OpenBanking('DE');
+        $openBanking = new OpenbankingPis('DE');
 
         $jsonResponse = JsonProvider::getJsonFromFile('openBanking/fetchResponse.json');
 

test/unit/Services/ResourceServiceTest.php

@@ -37,7 +37,7 @@
 use UnzerSDK\Resources\PaymentTypes\Invoice;
 use UnzerSDK\Resources\PaymentTypes\InvoiceSecured;
 use UnzerSDK\Resources\PaymentTypes\Klarna;
-use UnzerSDK\Resources\PaymentTypes\OpenBanking;
+use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 use UnzerSDK\Resources\PaymentTypes\PaylaterInvoice;
 use UnzerSDK\Resources\PaymentTypes\Paypal;
 use UnzerSDK\Resources\PaymentTypes\PIS;
@@ -1425,7 +1425,7 @@ public function fetchShouldCallFetchResourceDP(): array
             'PaymentType HirePurchaseDirectDebit sandbox' => ['fetchPaymentType', ['s-hdd-12345678'], $getPaymentTypeCB(InstallmentSecured::class)],
             'PaymentType InstallmentSecured sandbox' => ['fetchPaymentType', ['s-ins-12345678'], $getPaymentTypeCB(InstallmentSecured::class)],
             'PaymentType Bancontact sandbox' => ['fetchPaymentType', ['s-bct-12345678'], $getPaymentTypeCB(Bancontact::class)],
-            'PaymentType OpenBanking sandbox' => ['fetchPaymentType', ['s-obp-12345678'], $getPaymentTypeCB(OpenBanking::class)],
+            'PaymentType OpenBanking sandbox' => ['fetchPaymentType', ['s-obp-12345678'], $getPaymentTypeCB(OpenbankingPis::class)],
             'PaymentType Alipay production' => ['fetchPaymentType', ['p-ali-12345678'], $getPaymentTypeCB(Alipay::class)],
             'PaymentType Bancontact production' => ['fetchPaymentType', ['p-bct-12345678'], $getPaymentTypeCB(Bancontact::class)],
             'PaymentType Card production' => ['fetchPaymentType', ['p-crd-12345678'], $getPaymentTypeCB(Card::class)],
@@ -1448,7 +1448,7 @@ public function fetchShouldCallFetchResourceDP(): array
             'PaymentType SepaDirectDebitSecured production' => ['fetchPaymentType', ['p-dds-12345678'], $getPaymentTypeCB(SepaDirectDebitSecured::class)],
             'PaymentType Sofort production' => ['fetchPaymentType', ['p-sft-12345678'], $getPaymentTypeCB(Sofort::class)],
             'PaymentType Wechatpay production' => ['fetchPaymentType', ['p-wcp-12345678'], $getPaymentTypeCB(Wechatpay::class)],
-            'PaymentType OpenBanking production' => ['fetchPaymentType', ['p-obp-12345678'], $getPaymentTypeCB(OpenBanking::class)],
+            'PaymentType OpenBanking production' => ['fetchPaymentType', ['p-obp-12345678'], $getPaymentTypeCB(OpenbankingPis::class)],
         ];
     }