bug #16537 [Validator] Allow an empty path with a non empty fragment or a query (jakzal)

fabpot · fabpot · commit f2e87224e0cd · 2015-11-13T09:06:49.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] Allow an empty path with a non empty fragment or a query | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16536 | License | MIT | Doc PR | - #16259 didn't fully fix the issue. Commits ------- 2d0af8e [Validator] Allow an empty path with a non empty fragment or a query
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -33,7 +33,7 @@ class UrlValidator extends ConstraintValidator
                 \]  # a IPv6 address
             )
             (:[0-9]+)?                              # a port (optional)
-            (/?|/\S+|\?|\#)                         # a /, nothing, a / with something, a query or a fragment
+            (/?|/\S+|\?\S*|\#\S*)                   # a /, nothing, a / with something, a query or a fragment
         $~ixu';
 
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -112,7 +112,11 @@ public function getValidUrls()
             array('http://username:password@symfony.com'),
             array('http://user-name@symfony.com'),
             array('http://symfony.com?'),
+            array('http://symfony.com?query=1'),
+            array('http://symfony.com/?query=1'),
             array('http://symfony.com#'),
+            array('http://symfony.com#fragment'),
+            array('http://symfony.com/#fragment'),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class UrlValidator extends ConstraintValidator`
`33`	`33`	`\] # a IPv6 address`
`34`	`34`	`)`
`35`	`35`	`(:[0-9]+)? # a port (optional)`
`36`		`- (/?\|/\S+\|\?\|\#) # a /, nothing, a / with something, a query or a fragment`
	`36`	`+ (/?\|/\S+\|\?\S\|\#\S) # a /, nothing, a / with something, a query or a fragment`
`37`	`37`	`$~ixu';`
`38`	`38`
`39`	`39`	`/**`