Skip to content

Commit 5bc375b

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

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
@@ -24,7 +24,7 @@ class UrlValidator extends ConstraintValidator
2424
(%s):// # protocol
2525
(([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth
2626
(
27-
([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
27+
([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
2828
| # or
2929
\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address
3030
| # or

Validator/RecursiveContextualValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
374374
* objects are iterated as well. Nested arrays are always iterated,
375375
* regardless of the value of $recursive.
376376
*
377-
* @param array|\Traversable $collection The collection
377+
* @param iterable $collection The collection
378378
* @param string $propertyPath The current property path
379379
* @param string[] $groups The validated groups
380380
* @param ExecutionContextInterface $context The current execution context

0 commit comments

Comments
 (0)