Handle stringified values of PhoneNumberType (fixes #60)

Propaganistas · Feb 13, 2018 · e660b58 · e660b58
1 parent a291e83
commit e660b58
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/Traits/ParsesTypes.php b/src/Traits/ParsesTypes.php
@@ -38,8 +38,8 @@ protected static function parseTypes($types)
         return Collection::make(is_array($types) ? $types : func_get_args())
                          ->map(function ($type) {
                              // If the type equals a constant's value, just return it.
-                             if (in_array($type, static::$types, true)) {
-                                 return $type;
+                             if (is_numeric($type) && in_array($type, static::$types)) {
+                                 return (int) $type;
                              }
 
                              // Otherwise we'll assume the type is the constant's name.

diff --git a/tests/PhoneNumberTest.php b/tests/PhoneNumberTest.php
@@ -286,8 +286,10 @@ public function it_can_check_the_type()
     public function it_can_verify_types()
     {
         $this->assertTrue(PhoneNumber::isValidType(PhoneNumberType::MOBILE));
+        $this->assertTrue(PhoneNumber::isValidType((string) PhoneNumberType::MOBILE));
         $this->assertTrue(PhoneNumber::isValidType('mobile'));
         $this->assertFalse(PhoneNumber::isValidType(99999));
+        $this->assertFalse(PhoneNumber::isValidType('99999'));
         $this->assertFalse(PhoneNumber::isValidType('foo'));
     }
 

diff --git a/tests/PhoneValidatorTest.php b/tests/PhoneValidatorTest.php
@@ -505,4 +505,13 @@ public function it_has_a_rule_class()
         $expected = 'phone:BE,toll_free,6,my_field,AUTO,LENIENT';
         $this->assertEquals($expected, (string) $actual);
     }
+
+    /** @test */
+    public function it_validates_with_stringified_type_constant()
+    {
+        $this->assertTrue($this->validator->make(
+            ['field' => '0470123456'],
+            ['field' => 'phone:BE,' . PhoneNumberType::MOBILE])->passes()
+        );
+    }
 }