Skip to content

Fix #40361 - Customer address telephone validation does not work if there is no allowed characters #40362

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
VincentMarmiesse wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
+4 −6
Open

Fix #40361 - Customer address telephone validation does not work if there is no allowed characters #40362

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
10 changes: 4 additions & 6 deletions app/code/Magento/Customer/Model/Validator/Telephone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Telephone extends AbstractValidator
* \d: Digits (0-9).
*/
private const PATTERN_TELEPHONE = '/(?:[\d\s\+\-\()]{1,20})/u';

/**
* Validate telephone fields.
*
Expand All @@ -50,12 +50,10 @@ public function isValid($customer)
*/
private function isValidTelephone($telephoneValue)
{
if ($telephoneValue != null) {
if (preg_match(self::PATTERN_TELEPHONE, (string) $telephoneValue, $matches)) {
return $matches[0] == $telephoneValue;
}
if ($telephoneValue === null) {
return true;
}

return true;
return (bool) preg_match(self::PATTERN_TELEPHONE, (string) $telephoneValue);
}
}