fix: WhatsApp number validation

OvidiuGi · OvidiuGi · commit 36971812802f · 2025-09-17T10:00:56.000+03:00
This commit modifies the validation regex to handle 'whatsapp:' prefixes. The regex now correctly validates WhatsApp numbers without breaking existing functionality for standard phone numbers.
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php
@@ -146,5 +146,21 @@ public static function validFromProvider(): iterable
         yield ['+1123456789123'];
         yield ['+11234567891234'];
         yield ['+112345678912345'];
+
+        // whatsapp
+        yield ['whatsapp:+11'];
+        yield ['whatsapp:+112'];
+        yield ['whatsapp:+1123'];
+        yield ['whatsapp:+11234'];
+        yield ['whatsapp:+112345'];
+        yield ['whatsapp:+1123456'];
+        yield ['whatsapp:+11234567'];
+        yield ['whatsapp:+112345678'];
+        yield ['whatsapp:+1123456789'];
+        yield ['whatsapp:+11234567891'];
+        yield ['whatsapp:+112345678912'];
+        yield ['whatsapp:+1123456789123'];
+        yield ['whatsapp:+11234567891234'];
+        yield ['whatsapp:+112345678912345'];
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php
@@ -60,7 +60,7 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $from = $message->getFrom() ?: $this->from;
 
-        if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $from) && !preg_match('/^\+[1-9]\d{1,14}$/', $from)) {
+        if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $from) && !preg_match('/^(?:whatsapp:)?\+[1-9]\d{1,14}$/', $from)) {
             throw new InvalidArgumentException(\sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID.', $from));
         }
 
@@ -88,7 +88,7 @@ protected function doSend(MessageInterface $message): SentMessage
         if (201 !== $statusCode) {
             $error = $response->toArray(false);
 
-            throw new TransportException('Unable to send the SMS: '.$error['message'].\sprintf(' (see %s).', $error['more_info']), $response);
+            throw new TransportException('Unable to send the SMS: '.$error['message'].\sprintf(' (see "%s").', $error['more_info']), $response);
         }
 
         $success = $response->toArray(false);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`60`	`60`
`61`	`61`	`$from = $message->getFrom() ?: $this->from;`
`62`	`62`
`63`		`- if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $from) && !preg_match('/^\+[1-9]\d{1,14}$/', $from)) {`
	`63`	`+ if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $from) && !preg_match('/^(?:whatsapp:)?\+[1-9]\d{1,14}$/', $from)) {`
`64`	`64`	`throw new InvalidArgumentException(\sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID.', $from));`
`65`	`65`	`}`
`66`	`66`
`@@ -88,7 +88,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`88`	`88`	`if (201 !== $statusCode) {`
`89`	`89`	`$error = $response->toArray(false);`
`90`	`90`
`91`		`- throw new TransportException('Unable to send the SMS: '.$error['message'].\sprintf(' (see %s).', $error['more_info']), $response);`
	`91`	`+ throw new TransportException('Unable to send the SMS: '.$error['message'].\sprintf(' (see "%s").', $error['more_info']), $response);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`$success = $response->toArray(false);`