Skip to content

Commit 6641e87

Browse files
Merge branch '3.3' into 3.4
* 3.3: [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit [SecurityBundle] Fix syntax error in test [Console] Remove remaining dead code bumped Symfony version to 3.3.14 bumped Symfony version to 2.8.32 bumped Symfony version to 2.7.39 updated VERSION for 3.3.13 updated CHANGELOG for 3.3.13 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 2c58094 + 5bc375b commit 6641e87

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
@@ -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)