Skip to content

Commit 72c9298

Browse files
committed
Merge branch '2.8' into 3.3
* 2.8: Username and password in basic auth are allowed to contain '.' Remove obsolete PHPDoc from UriSigner [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed [PropertyInfo] Add support for the iterable type pdo session fix Fixed unsetting from loosely equal keys OrderedHashMap [Debug] Fix same vendor detection in class loader Updated the source text and translation reject remember-me token if user check fails
2 parents 21c0c62 + 115047b commit 72c9298

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Constraints/UrlValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class UrlValidator extends ConstraintValidator
2222
{
2323
const PATTERN = '~^
2424
(%s):// # protocol
25-
(([\pL\pN-]+:)?([\pL\pN-]+)@)? # basic auth
25+
(([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth
2626
(
2727
([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
2828
| # or

Tests/Constraints/UrlValidatorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ public function getValidUrls()
116116
array('http://xn--d1abbgf6aiiy.xn--p1ai/'),
117117
array('http://☎.com/'),
118118
array('http://username:password@symfony.com'),
119+
array('http://user.name:password@symfony.com'),
120+
array('http://username:pass.word@symfony.com'),
121+
array('http://user.name:pass.word@symfony.com'),
119122
array('http://user-name@symfony.com'),
120123
array('http://symfony.com?'),
121124
array('http://symfony.com?query=1'),

0 commit comments

Comments
 (0)