[ECP-9450] Update naming convention

Gateway/Request/CheckoutDataBuilder.php

@@ -16,7 +16,7 @@
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\OpenInvoice;
-use Adyen\Payment\Model\Config\Source\ThreeDSMode;
+use Adyen\Payment\Model\Config\Source\ThreeDSFlow;
 use Adyen\Payment\Model\Ui\AdyenPayByLinkConfigProvider;
 use Adyen\Payment\Observer\AdyenCcDataAssignObserver;
 use Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver;
@@ -211,7 +211,7 @@ public function build(array $buildSubject): array
         }
 
         $requestBody['additionalData']['allow3DS2'] =
-            $this->configHelper->getThreeDSMode($storeId) === ThreeDSMode::THREEDS_MODE_NATIVE;
+            $this->configHelper->getThreeDSFlow($storeId) === ThreeDSFlow::THREEDS_NATIVE;
 
         return [
             'body' => $requestBody

Gateway/Request/RecurringVaultDataBuilder.php

@@ -14,7 +14,7 @@
 use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\Vault;
-use Adyen\Payment\Model\Config\Source\ThreeDSMode;
+use Adyen\Payment\Model\Config\Source\ThreeDSFlow;
 use Adyen\Payment\Model\Ui\AdyenCcConfigProvider;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Payment\Gateway\Helper\SubjectReader;
@@ -68,7 +68,7 @@ public function build(array $buildSubject): array
          */
         if ($paymentMethod->getCode() === AdyenCcConfigProvider::CC_VAULT_CODE) {
             $requestBody['additionalData']['allow3DS2'] =
-                $this->configHelper->getThreeDSMode($order->getStoreId()) === ThreeDSMode::THREEDS_MODE_NATIVE;
+                $this->configHelper->getThreeDSFlow($order->getStoreId()) === ThreeDSFlow::THREEDS_NATIVE;
             $requestBody['paymentMethod']['holderName'] = $details['cardHolderName'] ?? null;
         }
 

Helper/Config.php

@@ -56,7 +56,7 @@ class Config
     const AUTO_CAPTURE_OPENINVOICE = 'auto';
     const XML_RECURRING_CONFIGURATION = 'recurring_configuration';
     const XML_ALLOW_MULTISTORE_TOKENS = 'allow_multistore_tokens';
-    const XML_THREEDS_MODE = 'threeds_mode';
+    const XML_THREEDS_FLOW = 'threeds_flow';
 
     protected ScopeConfigInterface $scopeConfig;
     private EncryptorInterface $encryptor;
@@ -583,10 +583,10 @@ public function getAllowMultistoreTokens(int $storeId = null): ?bool
      * @param int|null $storeId
      * @return string
      */
-    public function getThreeDSMode(int $storeId = null): string
+    public function getThreeDSFlow(int $storeId = null): string
     {
         return $this->getConfigData(
-            self::XML_THREEDS_MODE,
+            self::XML_THREEDS_FLOW,
             self::XML_ADYEN_CC,
             $storeId
         );

Model/Config/Source/ThreeDSMode.php → Model/Config/Source/ThreeDSFlow.php

@@ -13,19 +13,19 @@
 
 use Magento\Framework\Data\OptionSourceInterface;
 
-class ThreeDSMode implements OptionSourceInterface
+class ThreeDSFlow implements OptionSourceInterface
 {
-    const THREEDS_MODE_NATIVE = 'native';
-    const THREEDS_MODE_REDIRECT = 'redirect';
+    const THREEDS_NATIVE = 'native';
+    const THREEDS_REDIRECT = 'redirect';
 
     /**
      * @return array
      */
     public function toOptionArray(): array
     {
         return [
-            ['value' => self::THREEDS_MODE_NATIVE, 'label' => __('Native 3D Secure 2')],
-            ['value' => self::THREEDS_MODE_REDIRECT, 'label' => __('Redirect 3D Secure 2')],
+            ['value' => self::THREEDS_NATIVE, 'label' => __('Native 3D Secure 2')],
+            ['value' => self::THREEDS_REDIRECT, 'label' => __('Redirect 3D Secure 2')],
         ];
     }
 }

Test/Unit/Gateway/Request/CheckoutDataBuilderTest.php

@@ -8,7 +8,7 @@
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\OpenInvoice;
 use Adyen\Payment\Helper\StateData;
-use Adyen\Payment\Model\Config\Source\ThreeDSMode;
+use Adyen\Payment\Model\Config\Source\ThreeDSFlow;
 use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -72,9 +72,9 @@ public function testAllowThreeDSFlag()
         ];
 
         $this->configMock->expects($this->once())
-            ->method('getThreeDSMode')
+            ->method('getThreeDSFlow')
             ->with($storeId)
-            ->willReturn(ThreeDSMode::THREEDS_MODE_NATIVE);
+            ->willReturn(ThreeDSFlow::THREEDS_NATIVE);
 
         $request = $this->checkoutDataBuilder->build($buildSubject);
 

Test/Unit/Helper/ConfigTest.php

@@ -137,15 +137,15 @@ public function testGetThreeDSModes()
             "%s/%s/%s",
             Config::XML_PAYMENT_PREFIX,
             Config::XML_ADYEN_CC,
-            Config::XML_THREEDS_MODE
+            Config::XML_THREEDS_FLOW
         );
 
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with($this->equalTo($path), $this->equalTo(ScopeInterface::SCOPE_STORE), $this->equalTo($storeId))
             ->willReturn($expectedResult);
 
-        $result = $this->configHelper->getThreeDSMode($storeId);
+        $result = $this->configHelper->getThreeDSFlow($storeId);
         $this->assertEquals($expectedResult, $result);
     }
 }

Test/Unit/Model/Config/Source/ThreeDSModeTest.php

@@ -2,18 +2,18 @@
 
 namespace Adyen\Payment\Test\Unit\Model\Config\Source;
 
-use Adyen\Payment\Model\Config\Source\ThreeDSMode;
+use Adyen\Payment\Model\Config\Source\ThreeDSFlow;
 use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 
 class ThreeDSModeTest extends AbstractAdyenTestCase
 {
     public function testToOptionArray()
     {
-        $threeDSModeSource = new ThreeDSMode();
+        $threeDSModeSource = new ThreeDSFlow();
 
         $expected = [
-            ['value' => ThreeDSMode::THREEDS_MODE_NATIVE, 'label' => __('Native 3D Secure 2')],
-            ['value' => ThreeDSMode::THREEDS_MODE_REDIRECT, 'label' => __('Redirect 3D Secure 2')],
+            ['value' => ThreeDSFlow::THREEDS_NATIVE, 'label' => __('Native 3D Secure 2')],
+            ['value' => ThreeDSFlow::THREEDS_REDIRECT, 'label' => __('Redirect 3D Secure 2')],
         ];
 
         $this->assertEquals($expected, $threeDSModeSource->toOptionArray());

etc/adminhtml/system/adyen_card_payments.xml

@@ -74,10 +74,10 @@
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>payment/adyen_cc/enable_click_to_pay</config_path>
         </field>
-        <field id="threeds_mode" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-            <label>Preferred 3D Secure 2 authentication</label>
-            <source_model>Adyen\Payment\Model\Config\Source\ThreeDSMode</source_model>
-            <config_path>payment/adyen_cc/threeds_mode</config_path>
+        <field id="threeds_flow" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
+            <label>3D Secure 2 authentication flow</label>
+            <source_model>Adyen\Payment\Model\Config\Source\ThreeDSFlow</source_model>
+            <config_path>payment/adyen_cc/threeds_flow</config_path>
         </field>
     </group>
 </include>

etc/config.xml

@@ -61,7 +61,7 @@
                 <can_authorize_vault>1</can_authorize_vault>
                 <can_capture_vault>1</can_capture_vault>
                 <supports_recurring>1</supports_recurring>
-                <threeds_mode>native</threeds_mode>
+                <threeds_flow>native</threeds_flow>
                 <group>adyen</group>
             </adyen_cc>
             <adyen_cc_vault>