Skip to content

Commit 497b140

Browse files
Merge branch '2.7' into 2.8
* 2.7: [SecurityBundle] Fix syntax error in test [Console] Remove remaining dead code bumped Symfony version to 2.7.39 updated VERSION for 2.7.38 updated CHANGELOG for 2.7.38 Replace array|\Traversable by iterable Fix ambiguous pattern
2 parents 2c5ae6f + f8c91fd commit 497b140

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Constraints/UrlValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
2525
(%s):// # protocol
2626
(([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth
2727
(
28-
([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
28+
([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
2929
| # or
3030
\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address
3131
| # or

Validator/RecursiveContextualValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
378378
* objects are iterated as well. Nested arrays are always iterated,
379379
* regardless of the value of $recursive.
380380
*
381-
* @param array|\Traversable $collection The collection
381+
* @param iterable $collection The collection
382382
* @param string $propertyPath The current property path
383383
* @param string[] $groups The validated groups
384384
* @param bool $stopRecursion Whether to disable

0 commit comments

Comments
 (0)