File tree Expand file tree Collapse file tree 2 files changed +28
-9
lines changed
src/Symfony/Component/Validator Expand file tree Collapse file tree 2 files changed +28
-9
lines changed Original file line number Diff line number Diff line change @@ -350,6 +350,7 @@ public function mergeConstraints(ClassMetadata $source)
350
350
$ member = clone $ member ;
351
351
352
352
foreach ($ member ->getConstraints () as $ constraint ) {
353
+ $ member ->constraintsByGroup [$ this ->getDefaultGroup ()][] = $ constraint ;
353
354
$ constraint ->addImplicitGroupName ($ this ->getDefaultGroup ());
354
355
}
355
356
Original file line number Diff line number Diff line change @@ -138,23 +138,41 @@ public function testMergeConstraintsMergesMemberConstraints()
138
138
$ this ->metadata ->mergeConstraints ($ parent );
139
139
$ this ->metadata ->addPropertyConstraint ('firstName ' , new ConstraintA ());
140
140
141
+ $ constraintA1 = new ConstraintA (array ('groups ' => array (
142
+ 'Default ' ,
143
+ 'EntityParent ' ,
144
+ 'Entity ' ,
145
+ )));
146
+ $ constraintA2 = new ConstraintA (array ('groups ' => array (
147
+ 'Default ' ,
148
+ 'Entity ' ,
149
+ )));
150
+
141
151
$ constraints = array (
142
- new ConstraintA (array ('groups ' => array (
143
- 'Default ' ,
144
- 'EntityParent ' ,
145
- 'Entity ' ,
146
- ))),
147
- new ConstraintA (array ('groups ' => array (
148
- 'Default ' ,
149
- 'Entity ' ,
150
- ))),
152
+ $ constraintA1 ,
153
+ $ constraintA2 ,
154
+ );
155
+
156
+ $ constraintsByGroup = array (
157
+ 'Default ' => array (
158
+ $ constraintA1 ,
159
+ $ constraintA2 ,
160
+ ),
161
+ 'EntityParent ' => array (
162
+ $ constraintA1 ,
163
+ ),
164
+ 'Entity ' => array (
165
+ $ constraintA1 ,
166
+ $ constraintA2 ,
167
+ ),
151
168
);
152
169
153
170
$ members = $ this ->metadata ->getPropertyMetadata ('firstName ' );
154
171
155
172
$ this ->assertCount (1 , $ members );
156
173
$ this ->assertEquals (self ::PARENTCLASS , $ members [0 ]->getClassName ());
157
174
$ this ->assertEquals ($ constraints , $ members [0 ]->getConstraints ());
175
+ $ this ->assertEquals ($ constraintsByGroup , $ members [0 ]->constraintsByGroup );
158
176
}
159
177
160
178
public function testMemberMetadatas ()
You can’t perform that action at this time.
0 commit comments