Implement dependent validation (#51)

Propaganistas · May 26, 2017 · 7705023 · 7705023
1 parent a2bb726
commit 7705023
Show file tree

Hide file tree

Showing 2 changed files with 121 additions and 1 deletion.
diff --git a/src/LaravelPhoneServiceProvider.php b/src/LaravelPhoneServiceProvider.php
@@ -1,5 +1,6 @@
 <?php namespace Propaganistas\LaravelPhone;
 
+use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 use libphonenumber\PhoneNumberUtil;
 
@@ -13,7 +14,11 @@ class LaravelPhoneServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app['validator']->extend('phone', 'Propaganistas\LaravelPhone\PhoneValidator@validatePhone');
+        $extend = version_compare(Application::VERSION, '5.4.18', '>=')
+            ? 'extendDependent'
+            : 'extend';
+
+        $this->app['validator']->{$extend}('phone', 'Propaganistas\LaravelPhone\PhoneValidator@validatePhone');
     }
 
     /**

diff --git a/tests/PhoneValidatorTest.php b/tests/PhoneValidatorTest.php
@@ -334,6 +334,121 @@ public function testValidatePhoneFaultyParameters()
         )->passes();
     }
 
+    public function testValidatePhoneWithArrayInput()
+    {
+        if (version_compare(Application::VERSION, '5.4.18', '>=')) {
+            // Validator with correct country value.
+            $this->assertTrue($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456'],
+                        ['field' => '0499123456']
+                    ]
+                ],
+                ['container.*.field' => 'phone:BE'])->passes()
+            );
+
+            // Validator with wrong country value.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456'],
+                        ['field' => '0499123456']
+                    ]
+                ],
+                ['container.*.field' => 'phone:NL'])->passes()
+            );
+
+            // Validator with correct country value, one wrong input.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '01612'],
+                        ['field' => '0499123456']
+                    ]
+                ],
+                ['container.*.field' => 'phone:BE'])->passes()
+            );
+
+            // Validator with correct country value, one wrong input.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456'],
+                        ['field' => '049912']
+                    ]
+                ],
+                ['container.*.field' => 'phone:BE'])->passes()
+            );
+
+            // Validator with correct country value.
+            $this->assertTrue($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '0477123456'],
+                        ['field' => '0499123456']
+                    ]
+                ],
+                ['container.*.field' => 'phone:BE,mobile'])->passes()
+            );
+
+            // Validator with correct country value, one input wrong type.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456'],
+                        ['field' => '0499123456']
+                    ]
+                ],
+                ['container.*.field' => 'phone:BE,mobile'])->passes()
+            );
+
+            // Validator with correct country fields.
+            $this->assertTrue($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456', 'field_country' => 'BE'],
+                        ['field' => '6502530000', 'field_country' => 'US']
+                    ]
+                ],
+                ['container.*.field' => 'phone'])->passes()
+            );
+
+            // Validator with correct country fields.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456', 'field_country' => 'BE'],
+                        ['field' => '6502530000', 'field_country' => 'BE']
+                    ]
+                ],
+                ['container.*.field' => 'phone'])->passes()
+            );
+
+            // Validator with correct custom country fields.
+            $this->assertTrue($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456', 'country_code' => 'BE'],
+                        ['field' => '6502530000', 'country_code' => 'US']
+                    ]
+                ],
+                ['container.*.field' => 'phone:container.*.country_code'])->passes()
+            );
+
+            // Validator with wrong custom country fields.
+            $this->assertFalse($this->validator->make(
+                [
+                    'container' => [
+                        ['field' => '016123456', 'country_code' => 'BE'],
+                        ['field' => '6502530000', 'country_code' => 'BE']
+                    ]
+                ],
+                ['container.*.field' => 'phone:container.*.country_code'])->passes()
+            );
+        }
+    }
+
     public function testHelperFunction()
     {
         // Test landline number without format parameter.