From 99ca50ba9398361e88dbe77b99f6d7d9df1c7395 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 19 Apr 2025 12:42:00 +0200
Subject: [PATCH 1/2] Small cleanup, removed duplicated keys from array

---
 .../Carrier/Tablerate/CSV/ColumnResolver.php     |  5 ++---
 .../Carrier/Tablerate/CSV/ColumnResolverTest.php | 16 ++++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
index d925d62238757..2ebfdafa63fdc 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All rights reserved.
  */
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV;
@@ -22,7 +22,6 @@ class ColumnResolver
         self::COLUMN_COUNTRY => 0,
         self::COLUMN_REGION => 1,
         self::COLUMN_ZIP => 2,
-        self::COLUMN_WEIGHT => 3, // @phpstan-ignore-line
         self::COLUMN_WEIGHT_DESTINATION => 3,
         self::COLUMN_PRICE => 4,
     ];
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
index 834275e50e864..c7091976efac1 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All rights reserved.
  */
 declare(strict_types=1);
 
@@ -16,14 +16,15 @@
  */
 class ColumnResolverTest extends TestCase
 {
-    const CUSTOM_FIELD = 'custom_field';
+    private const CUSTOM_FIELD = 'custom_field';
 
-    // phpstan:ignore
+    /**
+     * @var array<string, string>
+     */
     private static $values = [
         ColumnResolver::COLUMN_COUNTRY => 'country value',
         ColumnResolver::COLUMN_REGION => 'region value',
         ColumnResolver::COLUMN_ZIP => 'zip_value',
-        ColumnResolver::COLUMN_WEIGHT => 'weight_value',
         ColumnResolver::COLUMN_WEIGHT_DESTINATION => 'weight_destination_value',
         ColumnResolver::COLUMN_PRICE => 'price_value',
         self::CUSTOM_FIELD => 'custom_value',
@@ -87,11 +88,6 @@ public static function getColumnValueDataProvider()
                 ColumnResolver::COLUMN_ZIP,
                 self::$values[ColumnResolver::COLUMN_ZIP],
             ],
-            // phpstan:ignore
-            ColumnResolver::COLUMN_WEIGHT => [
-                ColumnResolver::COLUMN_WEIGHT,
-                self::$values[ColumnResolver::COLUMN_WEIGHT],
-            ],
             ColumnResolver::COLUMN_WEIGHT_DESTINATION => [
                 ColumnResolver::COLUMN_WEIGHT_DESTINATION,
                 self::$values[ColumnResolver::COLUMN_WEIGHT_DESTINATION],

From a762c6fef18341492a23dc8d9a018db420dedcbc Mon Sep 17 00:00:00 2001
From: engcom-Charlie <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 25 Aug 2025 17:22:59 +0530
Subject: [PATCH 2/2] Updated the copyright

---
 .../ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php      | 2 +-
 .../ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
index 2ebfdafa63fdc..597e09981a1a6 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright 2016 Adobe
- * All rights reserved.
+ * All Rights Reserved.
  */
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV;
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
index c7091976efac1..be28bb0da80da 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright 2016 Adobe
- * All rights reserved.
+ * All Rights Reserved.
  */
 declare(strict_types=1);