[ECP-9482] Put magentoDetails method in data class

Adyen · Oct 9, 2024 · 7cc3e2a · 7cc3e2a
1 parent 06aa3c6
commit 7cc3e2a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/...der/ExternalPlatformHeaderDataBuilder.php → Gateway/Request/Header/HeaderDataBuilder.php b/...der/ExternalPlatformHeaderDataBuilder.php → Gateway/Request/Header/HeaderDataBuilder.php
@@ -16,12 +16,12 @@
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Payment\Gateway\Helper\SubjectReader;
 
-class ExternalPlatformHeaderDataBuilder implements ExternalPlatformHeaderDataBuilderInterface
+class HeaderDataBuilder implements HeaderDataBuilderInterface
 {
-    /**
-     * @var ProductMetadataInterface
-     */
-    protected ProductMetadataInterface $productMetadata;
+//    /**
+//     * @var ProductMetadataInterface
+//     */
+//    protected ProductMetadataInterface $productMetadata;
 
     /**
      * @var Data

diff --git a/...nalPlatformHeaderDataBuilderInterface.php → ...est/Header/HeaderDataBuilderInterface.php b/...nalPlatformHeaderDataBuilderInterface.php → ...est/Header/HeaderDataBuilderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Adyen\Payment\Gateway\Request\Header;
 
-interface ExternalPlatformHeaderDataBuilderInterface
+interface HeaderDataBuilderInterface
 {
     const EXTERNAL_PLATFORM_NAME = 'external-platform-name';
     const EXTERNAL_PLATFORM_VERSION = 'external-platform-version';
@@ -21,3 +21,4 @@ interface ExternalPlatformHeaderDataBuilderInterface
     */
     public function build(array $buildSubject);
 }
+
diff --git a/Helper/PaymentsDetails.php b/Helper/PaymentsDetails.php
@@ -13,7 +13,7 @@
 
 use Adyen\AdyenException;
 use Adyen\Model\Checkout\PaymentDetailsRequest;
-use Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder;
+use Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder;
 use Adyen\Payment\Helper\Util\DataArrayValidator;
 use Adyen\Payment\Logger\AdyenLogger;
 use Magento\Checkout\Model\Session;
@@ -46,9 +46,9 @@ class PaymentsDetails
     private Data $adyenHelper;
 
     /**
-     * @var ExternalPlatformHeaderDataBuilder
+     * @var HeaderDataBuilder
      */
-    private ExternalPlatformHeaderDataBuilder $headerBuilder;
+    private HeaderDataBuilder $headerBuilder;
 
     /**
      * @var AdyenLogger

diff --git a/...ExternalPlatformHeaderDataBuilderTest.php → ...Gateway/Request/HeaderDataBuilderTest.php b/...ExternalPlatformHeaderDataBuilderTest.php → ...Gateway/Request/HeaderDataBuilderTest.php
@@ -2,8 +2,7 @@
 
 namespace Adyen\Payment\Test\Unit\Gateway\Request;
 
-use Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder;
-use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
+use Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder;
 use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 use Adyen\Payment\Helper\Data;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -15,7 +14,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-class ExternalPlatformHeaderDataBuilderTest extends AbstractAdyenTestCase
+class HeaderDataBuilderTest extends AbstractAdyenTestCase
 {
     /**
      * @var HeaderDataBuilder
@@ -36,7 +35,7 @@ protected function setUp(): void
             ->getMock();
 
         $this->headerDataBuilder = $objectManager->getObject(
-            ExternalPlatformHeaderDataBuilder::class,
+            HeaderDataBuilder::class,
             [
                 'adyenHelper' => $this->adyenHelperMock
             ]

diff --git a/etc/di.xml b/etc/di.xml
@@ -1079,7 +1079,7 @@
                 <item name="returnurl" xsi:type="string">Adyen\Payment\Gateway\Request\ReturnUrlDataBuilder</item>
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
             </argument>
         </arguments>
@@ -1132,7 +1132,7 @@
                 <item name="browserinfo" xsi:type="string">Adyen\Payment\Gateway\Request\BrowserInfoDataBuilder</item>
                 <item name="recurring" xsi:type="string">Adyen\Payment\Gateway\Request\RecurringVaultDataBuilder</item>
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
             </argument>
         </arguments>
@@ -1152,7 +1152,7 @@
                 <item name="browserinfo" xsi:type="string">Adyen\Payment\Gateway\Request\BrowserInfoDataBuilder</item>
                 <item name="recurring" xsi:type="string">Adyen\Payment\Gateway\Request\RecurringVaultDataBuilder</item>
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
             </argument>
         </arguments>
@@ -1200,7 +1200,7 @@
                 <item name="recurring" xsi:type="string">Adyen\Payment\Gateway\Request\RecurringDataBuilder</item>
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="transaction" xsi:type="string">Adyen\Payment\Gateway\Request\CheckoutDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="returnurl" xsi:type="string">Adyen\Payment\Gateway\Request\ReturnUrlDataBuilder</item>
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
@@ -1220,7 +1220,7 @@
                 <item name="browserinfo" xsi:type="string">Adyen\Payment\Gateway\Request\BrowserInfoDataBuilder</item>
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="transaction" xsi:type="string">Adyen\Payment\Gateway\Request\CheckoutDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="returnurl" xsi:type="string">Adyen\Payment\Gateway\Request\ReturnUrlDataBuilder</item>
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
@@ -1248,7 +1248,7 @@
                 <item name="recurring" xsi:type="string">Adyen\Payment\Gateway\Request\RecurringDataBuilder</item>
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="transaction" xsi:type="string">Adyen\Payment\Gateway\Request\CheckoutDataBuilder</item>
-                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\ExternalPlatformHeaderDataBuilder</item>
+                <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="returnurl" xsi:type="string">Adyen\Payment\Gateway\Request\ReturnUrlDataBuilder</item>
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>