Skip to content
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

Add multibyte support for attributeSource getOptionId method #22033

Merged
merged 4 commits into from
Apr 23, 2019
Merged

Add multibyte support for attributeSource getOptionId method #22033

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7e1def
Add multibyte support for attributeSource getOptionId method
gomencal Mar 29, 2019
d061c54
drop optional unused parameter
gomencal Apr 9, 2019
a6b396f
Merge remote-tracking branch 'mainline/2.3-develop' into pr/mb_getopt…
nmalevanec Apr 19, 2019
a168a3e
Fix static tests.
nmalevanec Apr 19, 2019
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
20 changes: 19 additions & 1 deletion app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function getOptionText($value)
public function getOptionId($value)
{
foreach ($this->getAllOptions() as $option) {
if (strcasecmp($option['label'], $value) == 0 || $option['value'] == $value) {
if ($this->mbStrcasecmp($option['label'], $value) == 0 || $option['value'] == $value) {
return $option['value'];
}
}
Expand Down Expand Up @@ -166,4 +166,22 @@ public function toOptionArray()
{
return $this->getAllOptions();
}

/**
* Multibyte support strcasecmp function version
* @param string $str1
* @param string $str2
* @param null|string $encoding
* @return int|\\lt
*/
private function mbStrcasecmp($str1, $str2, $encoding = null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello,
why do you add an optional parameter if it's never used? Or am I missing something?
Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @gomenca, do you have any update on this? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @aleron75 , you are right. I've just used this function in another places and used this parameter. I drop it.

{
if (null === $encoding) {
$encoding = mb_internal_encoding();
}
return strcmp(
mb_strtoupper($str1, $encoding),
mb_strtoupper($str2, $encoding)
);
}
}