Skip to content

Commit 08929b0

Browse files
Merge branch '3.1'
* 3.1: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 3.1.5 updated VERSION for 3.1.4 updated CHANGELOG for 3.1.4 bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 10fdc38 + 007e7e1 commit 08929b0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Constraints/GroupSequence.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* When validating a group sequence, each group will only be validated if all
1818
* of the previous groups in the sequence succeeded. For example:
1919
*
20-
* $validator->validate($address, null, new GroupSequence('Basic', 'Strict'));
20+
* $validator->validate($address, null, new GroupSequence(array('Basic', 'Strict')));
2121
*
2222
* In the first step, all constraints that belong to the group "Basic" will be
2323
* validated. If none of the constraints fail, the validator will then validate

Tests/Validator/AbstractTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ abstract class AbstractTest extends AbstractValidatorTest
3737

3838
/**
3939
* @param MetadataFactoryInterface $metadataFactory
40+
* @param array $objectInitializers
4041
*
4142
* @return ValidatorInterface
4243
*/

0 commit comments

Comments
 (0)