Skip to content

#40138 - Fix string manipulations errors with multibyte characters #40142

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 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

#40138 - Fix string manipulations errors with multibyte characters #40142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Tax/Model/Calculation/Rate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function beforeSave()
$zipFrom = $this->getZipFrom();
$zipTo = $this->getZipTo();

if (($zipFrom && strlen($zipFrom) > 9) || ($zipTo && strlen($zipTo) > 9)) {
if (($zipFrom && mb_strlen($zipFrom) > 9) || ($zipTo && mb_strlen($zipTo) > 9)) {
throw new \Magento\Framework\Exception\LocalizedException(
__(
'The ZIP Code length is invalid. '
Expand All @@ -167,8 +167,8 @@ public function beforeSave()
} else {
$taxPostCode = $this->getTaxPostcode();

if ($taxPostCode !== null && strlen($taxPostCode) > 10) {
$taxPostCode = substr($taxPostCode, 0, 10);
if ($taxPostCode !== null && mb_strlen($taxPostCode) > 10) {
$taxPostCode = mb_substr($taxPostCode, 0, 10);
}

$this->setTaxPostcode($taxPostCode)->setZipIsRange(null)->setZipFrom(null)->setZipTo(null);
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Tax/Model/ResourceModel/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,21 @@ protected function _createSearchPostCodeTemplates($postcode, $exactPostcode = nu
{
// as needed, reduce the postcode to the correct length
$len = $this->_taxData->getPostCodeSubStringLength();
$postcode = $postcode !== null ? substr($postcode, 0, $len) : '';
$postcode = $postcode !== null ? mb_substr($postcode, 0, $len) : '';

// begin creating the search template array
$strArr = [$postcode, $postcode . '*'];

// if supplied, use the exact postcode as the basis for the search templates
if ($exactPostcode) {
$postcode = substr($exactPostcode, 0, $len);
$postcode = mb_substr($exactPostcode, 0, $len);
$strArr[] = $postcode;
}

// finish building out the search template array
$strlen = strlen($postcode);
$strlen = mb_strlen($postcode);
for ($i = 1; $i < $strlen; $i++) {
$strArr[] = sprintf('%s*', substr($postcode, 0, -$i));
$strArr[] = sprintf('%s*', mb_substr($postcode, 0, -$i));
}

return $strArr;
Expand Down Expand Up @@ -346,8 +346,8 @@ protected function _getRates($request)
$zipFrom = null;
$zipTo = null;
if (is_string($postcode) && preg_match('/^(.+)-(.+)$/', $postcode, $matches)) {
if ((self::USA_COUNTRY_CODE === $countryId && is_numeric($matches[2]) && 4 === strlen($matches[2])) ||
(self::PORTUGAL_COUNTRY_CODE === $countryId && is_numeric($matches[2]) && 3 === strlen($matches[2]))
if ((self::USA_COUNTRY_CODE === $countryId && is_numeric($matches[2]) && 4 === mb_strlen($matches[2])) ||
(self::PORTUGAL_COUNTRY_CODE === $countryId && is_numeric($matches[2]) && 3 === mb_strlen($matches[2]))
) {
$postcodeIsNumeric = true;
$originalPostcode = $postcode;
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Tax/Test/Unit/Model/ResourceModel/CalculationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public function testCreateSearchPostCodeTemplates($postalCode, $exactPostalcode)
private function verifyResults($resultsArr, $code1, $code2 = null)
{
// determine expected size of the results array
$expectedSize = strlen($code1) + 1; // array will also include the vanilla 'code1' value
$expectedSize = mb_strlen($code1) + 1; // array will also include the vanilla 'code1' value
if ($code2) {
$expectedSize = strlen($code2) + 2; // array will include both 'code1' and 'code2'
$expectedSize = mb_strlen($code2) + 2; // array will include both 'code1' and 'code2'
}
$actualSize = count($resultsArr);
$this->assertEquals(
Expand Down