Merge pull request #3 from judahnator/master

Integrating the ITU-T E.123 standard

Author: tylercd100

README.md

@@ -30,6 +30,7 @@ composer require laravel-validation-rules/phone
 
 ```php
 use LVR\Phone\Phone;
+use LVR\Phone\E123;
 use LVR\Phone\E164;
 use LVR\Phone\NANP;
 use LVR\Phone\Digits;
@@ -39,6 +40,9 @@ $request->validate(['test' => '15556667777'], ['test' => new Phone]); // Pass!
 $request->validate(['test' => '+15556667777'], ['test' => new Phone]); // Pass!
 $request->validate(['test' => '+1 (555) 666-7777'], ['test' => new Phone]); // Pass!
 
+// Test for E123
+$request->validate(['test' => '+22 555 666 7777'], ['test' => new E123]); // Pass!
+
 // Test for E164
 $request->validate(['test' => '+15556667777'], ['test' => new E164]); // Pass!
 

src/E123.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace LVR\Phone;
+
+
+class E123 extends Phone
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->isE123($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return ':attribute must be in E.123 phone format';
+    }
+}

src/Phone.php

@@ -36,7 +36,7 @@ public function message()
      */
     protected function isPhone($value)
     {
-        return $this->isE164($value) || $this->isNANP($value) || $this->isDigits($value);
+        return $this->isE123($value) || $this->isE164($value) || $this->isNANP($value) || $this->isDigits($value);
     }
 
     /**
@@ -53,6 +53,16 @@ protected function isDigits($value)
         return (bool) array_product($conditions);
     }
 
+    /**
+     * Format example +22 555 555 1234, (607) 555 1234, (022607) 555 1234
+     * @param $value
+     * @return bool
+     */
+    protected function isE123($value)
+    {
+        return preg_match('/^(?:\((\+?\d+)?\)|\+?\d+) ?\d*(-?\d{2,3} ?){0,4}$/', $value) === 1;
+    }
+
     /**
      * Format example +15555555555
      * @param  string  $value The phone number to check

tests/ValidatorTest.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use LVR\Phone\Digits;
+use LVR\Phone\E123;
 use LVR\Phone\E164;
 use LVR\Phone\NANP;
 use LVR\Phone\Phone;
@@ -21,6 +22,7 @@ public function testValidatorPhone()
         $this->assertEquals(true, $this->validate('+15556667777', new Phone));
         $this->assertEquals(true, $this->validate('(555) 666-7777', new Phone));
         $this->assertEquals(true, $this->validate('5556667777', new Phone));
+        $this->assertEquals(true, $this->validate('+22 555 666 7777', new Phone));
     }
 
     public function testValidatorPhoneDigits()
@@ -31,6 +33,14 @@ public function testValidatorPhoneDigits()
         $this->assertEquals(true, $this->validate('15556667777', new Digits));
     }
 
+    public function testValidatorPhoneE123()
+    {
+        $this->assertEquals(true, $this->validate('(607) 555 1234', new E123));
+        $this->assertEquals(true, $this->validate('(022607) 555 1234', new E123));
+        $this->assertEquals(true, $this->validate('+22 555 555 1234', new E123));
+        $this->assertEquals(false, $this->validate('+22 555 555 1234 ext 567', new E123));
+    }
+
     public function testValidatorPhoneE164()
     {
         $this->assertEquals(true, $this->validate('+15556660000', new E164));