symfony
diff --git a/‎src/Symfony/Component/Validator/Constraints/UrlValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/UrlValidator.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Validator/Constraints/UrlValidator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/UrlValidator.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+14Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+14Lines changed: 14 additions & 0 deletions
@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
             (
-                ([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or
 
@@ -67,11 +67,14 @@ public function getValidUrls()
     {
         return [
             ['http://a.pl'],
+<<<<<<< HEAD
             ['http://www.example.com'],
             ['http://www.example.com.'],
             ['http://www.example.museum'],
             ['https://example.com/'],
             ['https://example.com:80/'],
+            ['http://examp_le.com'],
+            ['http://www.sub_domain.examp_le.com'],
             ['http://www.example.coop/'],
             ['http://www.test-example.com/'],
             ['http://www.symfony.com/'],
@@ -148,6 +151,7 @@ public function testInvalidUrls($url)
     public function getInvalidUrls()
     {
         return [
+<<<<<<< HEAD
             ['example.com'],
             ['://example.com'],
             ['http ://example.com'],
@@ -157,6 +161,16 @@ public function getInvalidUrls()
             ['http://example.com:aa'],
             ['ftp://example.fr'],
             ['faked://example.fr'],
+=======
+            ['google.com'],
+            ['://google.com'],
+            ['http ://google.com'],
+            ['http:/google.com'],
+            ['http://google.com::aa'],
+            ['http://google.com:aa'],
+            ['ftp://google.fr'],
+            ['faked://google.fr'],
+>>>>>>> [Validator] Accept underscores in the URL validator as the URL will resolve correctly
             ['http://127.0.0.1:aa/'],
             ['ftp://[::1]/'],
             ['http://[::1'],