SmsValidator.from: consider allowed special characters

Author: matthiez

src/Validator/SmsValidator.php

@@ -5,10 +5,8 @@
 use Sms77\Api\Exception\InvalidOptionalArgumentException;
 use Sms77\Api\Exception\InvalidRequiredArgumentException;
 
-class SmsValidator extends BaseValidator implements ValidatorInterface
-{
-    public function validate()
-    {
+class SmsValidator extends BaseValidator implements ValidatorInterface {
+    public function validate() {
         $this->debug();
         $this->delay();
         $this->details();
@@ -28,17 +26,15 @@ public function validate()
         $this->ttl();
     }
 
-    public function debug()
-    {
+    public function debug() {
         $debug = isset($this->parameters['debug']) ? $this->parameters['debug'] : null;
 
         if ((null !== $debug) && !$this->isValidBool($debug)) {
             throw new InvalidOptionalArgumentException('debug can be either 1 or 0.');
         }
     }
 
-    public function delay()
-    {
+    public function delay() {
         $delay = isset($this->parameters['delay']) ? $this->parameters['delay'] : null;
 
         if (null !== $delay) {
@@ -48,31 +44,31 @@ public function delay()
 
             if (false === strpos($delay, '-')) {
                 if (!$this->isValidUnixTimestamp($delay)) {
-                    throw new InvalidOptionalArgumentException("Delay must be a valid UNIX timestamp or in the format of $dateFormat.");
+                    throw new InvalidOptionalArgumentException(
+                        "Delay must be a valid UNIX timestamp or in the format of $dateFormat.");
                 }
             } else {
                 if (!preg_match('/^([0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/', $hour . ':' . $min)) {
                     throw new InvalidOptionalArgumentException('date seems to have an invalid format.');
                 }
 
                 if (!checkdate($month, $day, $year)) {
-                    throw new InvalidOptionalArgumentException("Delay must be a valid UNIX timestamp or in the format of $dateFormat.");
+                    throw new InvalidOptionalArgumentException(
+                        "Delay must be a valid UNIX timestamp or in the format of $dateFormat.");
                 }
             }
         }
     }
 
-    public function details()
-    {
+    public function details() {
         $details = isset($this->parameters['details']) ? $this->parameters['details'] : null;
 
         if (null !== $details && !$this->isValidBool($details)) {
             throw new InvalidOptionalArgumentException('details can be either 1 or 0.');
         }
     }
 
-    public function label()
-    {
+    public function label() {
         //TODO: max length?! there must be one.
 
         $label = isset($this->parameters['label']) ? $this->parameters['label'] : null;
@@ -86,8 +82,7 @@ public function label()
         }
     }
 
-    public function flash()
-    {
+    public function flash() {
         $flash = isset($this->parameters['flash']) ? $this->parameters['flash'] : null;
 
         if (null !== $flash) {
@@ -103,8 +98,7 @@ public function flash()
         }
     }
 
-    public function from()
-    {
+    public function from() {
         $from = isset($this->parameters['from']) ? $this->parameters['from'] : null;
 
         if (null !== $from) {
@@ -124,50 +118,47 @@ public function from()
                     "Argument 'from' must be numeric. if > $alphaNumericMax chars.");
             }
 
-            if (!ctype_alnum($from)) {
+            $allowedSpecialChars = ['/', ' ', '.', '-', '@', '_', '!', '(', ')', '+', '$', ',', '&',];
+            if (!ctype_alnum(str_ireplace($allowedSpecialChars, '', $from))) {
                 throw new InvalidOptionalArgumentException("Argument 'from' must be alphanumeric.");
             }
         }
     }
 
-    public function json()
-    {
+    public function json() {
         $json = isset($this->parameters['json']) ? $this->parameters['json'] : null;
 
         if ((null !== $json) && !$this->isValidBool($json)) {
             throw new InvalidOptionalArgumentException('json can be either 1 or 0.');
         }
     }
 
-    public function no_reload()
-    {
+    public function no_reload() {
         $noReload = isset($this->parameters['no_reload']) ? $this->parameters['no_reload'] : null;
 
         if ((null !== $noReload) && !$this->isValidBool($noReload)) {
             throw new InvalidOptionalArgumentException('no_reload can be either 1 or 0.');
         }
     }
 
-    public function performance_tracking()
-    {
-        $performanceTracking = isset($this->parameters['performance_tracking']) ? $this->parameters['performance_tracking'] : null;
+    public function performance_tracking() {
+        $performanceTracking =
+            isset($this->parameters['performance_tracking']) ? $this->parameters['performance_tracking'] : null;
 
         if ((null !== $performanceTracking) && !$this->isValidBool($performanceTracking)) {
             throw new InvalidOptionalArgumentException('performance_tracking can be either 1 or 0.');
         }
     }
 
-    public function return_msg_id()
-    {
+    public function return_msg_id() {
         $returnMsgId = isset($this->parameters['return_msg_id']) ? $this->parameters['return_msg_id'] : null;
 
         if ((null !== $returnMsgId) && !$this->isValidBool($returnMsgId)) {
             throw new InvalidOptionalArgumentException('return_msg_id can be either 1 or 0.');
         }
     }
 
-    public function text()
-    {
+    public function text() {
         $text = isset($this->parameters['text']) ? $this->parameters['text'] : null;
 
         if (null === $text) {
@@ -183,21 +174,21 @@ public function text()
         $maxTextLength = 1520;
 
         if ($maxTextLength < $length) {
-            throw new InvalidRequiredArgumentException("The text can not be longer than $maxTextLength characters.");
+            throw new InvalidRequiredArgumentException(
+                "The text can not be longer than $maxTextLength characters.");
         }
     }
 
-    public function to()
-    {
+    public function to() {
         $to = isset($this->parameters['to']) ? $this->parameters['to'] : null;
 
         if (null === $to) {
-            throw new InvalidRequiredArgumentException('You cannot send a message without specifying a recipient.');
+            throw new InvalidRequiredArgumentException(
+                'You cannot send a message without specifying a recipient.');
         }
     }
 
-    public function ttl()
-    {
+    public function ttl() {
         $ttl = isset($this->parameters['ttl']) ? $this->parameters['ttl'] : null;
 
         if (null !== $ttl) {
@@ -214,13 +205,11 @@ public function ttl()
         }
     }
 
-    public function type()
-    {
+    public function type() {
         $this->throwOnOptionalBadType();
     }
 
-    public function udh()
-    {
+    public function udh() {
         $udh = isset($this->parameters['udh']) ? $this->parameters['udh'] : null;
 
         if (null !== $udh) {
@@ -234,8 +223,7 @@ public function udh()
         }
     }
 
-    public function unicode()
-    {
+    public function unicode() {
         $unicode = isset($this->parameters['unicode']) ? $this->parameters['unicode'] : null;
 
         if (null !== $unicode) {
@@ -249,8 +237,7 @@ public function unicode()
         }
     }
 
-    public function utf8()
-    {
+    public function utf8() {
         $utf8 = isset($this->parameters['utf8']) ? $this->parameters['utf8'] : null;
 
         if ((null !== $utf8) && !$this->isValidBool($utf8)) {