Skip to content

Small cleanup, removed duplicated keys from array #39844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 29, 2025
Merged

Small cleanup, removed duplicated keys from array #39844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99ca50b
Small cleanup, removed duplicated keys from array
hostep Apr 19, 2025
bad07af
Merge branch '2.4-develop' into cleanup-remove-duplicated-values-in-a…
engcom-Charlie Aug 6, 2025
b15e2d1
Merge branch '2.4-develop' into cleanup-remove-duplicated-values-in-a…
engcom-Charlie Aug 25, 2025
a762c6f
Updated the copyright
engcom-Charlie Aug 25, 2025
8e9f853
Merge branch '2.4-develop' into cleanup-remove-duplicated-values-in-a…
engcom-Charlie Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
];
Expand Down
16 changes: 6 additions & 10 deletions ...fflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand All @@ -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',
Expand Down Expand Up @@ -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],
Expand Down