[5.2] Fix URL validator (#13700)

Fixed #13680 Based on a Simfony patch: symfony/validator@dbac482
laravel · May 25, 2016 · 6f95210 · 6f95210
1 parent b5b49e8
commit 6f95210
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1502,7 +1502,7 @@ protected function validateUrl($attribute, $value)
                 \]  # a IPv6 address
             )
             (:[0-9]+)?                              # a port (optional)
-            (/?|/\S+)                               # a /, nothing or a / with something
+            (/?|/\S+|\?\S*|\#\S*)                   # a /, nothing, a / with something, a query or a fragment
         $~ixu';
 
         return preg_match($pattern, $value) === 1;

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1576,6 +1576,12 @@ public function validUrls()
             ['http://президент.рф/'],
             ['http://스타벅스코리아.com'],
             ['http://xn--d1abbgf6aiiy.xn--p1ai/'],
+            ['http://laravel.com?'],
+            ['http://laravel.com?q=1'],
+            ['http://laravel.com/?q=1'],
+            ['http://laravel.com#'],
+            ['http://laravel.com#fragment'],
+            ['http://laravel.com/#fragment'],
         ];
     }
 
@@ -1591,8 +1597,6 @@ public function invalidUrls()
             ['http://goog_le.com'],
             ['http://google.com::aa'],
             ['http://google.com:aa'],
-            ['http://laravel.com?'],
-            ['http://laravel.com#'],
             ['http://127.0.0.1:aa'],
             ['http://[::1'],
             ['foo://bar'],