bug #32522 [Validator] Accept underscores in the URL validator, as the URL will load (battye)

fabpot · fabpot · commit ad89564ebfaa · 2019-09-27T09:08:14.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Validator] Accept underscores in the URL validator, as the URL will load | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32506 | License | MIT | Doc PR | - As @javiereguiluz mentioned, regardless of convention a URL with an underscore in it will load perfectly fine - so in that respect it must be valid. Commits ------- c9c7a11 [Validator] Accept underscores in the URL validator as the URL will resolve correctly
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -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
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -72,6 +72,8 @@ public function getValidUrls()
             ['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/'],
@@ -152,7 +154,6 @@ public function getInvalidUrls()
             ['://example.com'],
             ['http ://example.com'],
             ['http:/example.com'],
-            ['http://examp_le.com'],
             ['http://example.com::aa'],
             ['http://example.com:aa'],
             ['ftp://example.fr'],

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator`
`25`	`25`	`(%s):// # protocol`
`26`	`26`	`(([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth`
`27`	`27`	`(`
`28`		`- ([\pL\pN\pS\-\.])+(\.?([\pL\pN]\|xn\-\-[\pL\pN-]+)+\.?) # a domain name`
	`28`	`+ ([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]\|xn\-\-[\pL\pN-]+)+\.?) # a domain name`
`29`	`29`	`\| # or`
`30`	`30`	`\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address`
`31`	`31`	`\| # or`