Fix Phone field allowing invalid phone numbers and country codes

Megafry · Jul 4, 2024 · 596a1b3 · 596a1b3
1 parent 57ebc70
commit 596a1b3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/models/Phone.php b/src/models/Phone.php
@@ -70,8 +70,9 @@ public function __toString()
 
                 return $phoneUtil->format($numberProto, PhoneNumberFormat::INTERNATIONAL);
             } catch (NumberParseException $e) {
-                if ($this->number) {
-                    $countryString = $this->country ? '(' . $this->country . ') ' : '';
+                if ($this->number && is_numeric($this->number)) {
+                    // Consider the number still valid
+                    $countryString = $this->country && is_numeric($this->country) ? '(' . $this->country . ') ' : '';
 
                     return $countryString . $this->number;
                 }
@@ -105,7 +106,11 @@ public function getCountryCode(): string
     public function getCountryName(): string
     {
         if ($this->country) {
-            return Craft::$app->getAddresses()->getCountryRepository()->get($this->country)->getName();
+            try {
+                return Craft::$app->getAddresses()->getCountryRepository()->get($this->country)->getName();
+            } catch (Throwable $e) {
+
+            }
         }
 
         return '';