Skip to content

Remove column name character restrictions for import functionality #39810

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

Open
wants to merge 4 commits into
base: 2.4-develop
Choose a base branch
from
Open

Remove column name character restrictions for import functionality #39810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a0af70
Remove column name character restrictions for import functionality
magentoabu Apr 12, 2025
c26146e
static test fixed
magentoabu Apr 14, 2025
aa6f3bb
static test warnings fixed
magentoabu Apr 15, 2025
7c52530
fixed space issue
magentoabu Apr 16, 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
6 changes: 3 additions & 3 deletions app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.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 2013 Adobe
* All Rights Reserved.
*/
namespace Magento\ImportExport\Model\Import\Entity;

Expand Down Expand Up @@ -813,7 +813,7 @@ public function validateData()
if (!$this->isAttributeParticular($columnName)) {
if (trim($columnName ?? '') == '') {
$emptyHeaderColumns[] = $columnNumber;
} elseif (!$columnName || !preg_match('/^[a-z][a-z0-9_]*$/', $columnName)) {
} elseif (!$columnName || !preg_match('/^[a-zA-Z][a-z0-9_]*$/', $columnName)) {
$invalidColumns[] = $columnName;
} elseif ($this->needColumnCheck && !in_array($columnName, $this->getValidColumnNames())) {
$invalidAttributes[] = $columnName;
Expand Down
21 changes: 18 additions & 3 deletions app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.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 2015 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -125,6 +125,21 @@ public function testValidateDataColumnNameWithWhitespaces()
$errorAggregator->getRowsGroupedByErrorCode()
);
}

/**
* Test for method validateData()
*
* @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::validateData
*/
public function testValidateColumnName()
{
$this->_createSourceAdapterMock(['Test_1']);
$errorAggregator = $this->_model->validateData();
$this->assertArrayNotHasKey(
AbstractEntity::ERROR_CODE_COLUMN_NAME_INVALID,
$errorAggregator->getRowsGroupedByErrorCode()
);
}

/**
* Test for method validateData()
Expand All @@ -133,7 +148,7 @@ public function testValidateDataColumnNameWithWhitespaces()
*/
public function testValidateDataAttributeNames()
{
$this->_createSourceAdapterMock(['_test1']);
$this->_createSourceAdapterMock(['test.1', '@test']);
$errorAggregator = $this->_model->validateData();
$this->assertArrayHasKey(
AbstractEntity::ERROR_CODE_COLUMN_NAME_INVALID,
Expand Down