8000 property constraints can be added in child classes · symfony/symfony@9513a8a · GitHub
[go: up one dir, main page]
Skip to content

Commit 9513a8a

Browse files
xabbuhxabbuh
committed
property constraints can be added in child classes
1 parent a266ff7 commit 9513a8a

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

‎src/Symfony/Component/Validator/Mapping/ClassMetadata.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ public function mergeConstraints(ClassMetadata $source)
346346
}
347347

348348
foreach ($source->getConstrainedProperties() as $property) {
349-
if ($this->hasPropertyMetadata($property)) {
350-
continue;
351-
}
352-
353349
foreach ($source->getPropertyMetadata($property) as $member) {
354350
$member = clone $member;
355351

‎src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Validator\Tests\Mapping;
1313

1414
use Symfony\Component\Validator\Constraint;
15-
use Symfony\Component\Validator\Constraints\GreaterThan;
1615
use Symfony\Component\Validator\Constraints\Valid;
1716
use Symfony\Component\Validator\Mapping\ClassMetadata;
1817
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
@@ -304,21 +303,6 @@ public function testGetPropertyMetadataReturnsEmptyArrayWithoutConfiguredMetadat
304303
{
305304
$this->assertCount(0, $this->metadata->getPropertyMetadata('foo'), '->getPropertyMetadata() returns an empty collection if no metadata is configured for the given property');
306305
}
307-
308-
public function testMergeDoesOverrideConstraintsFromParentClassIfPropertyIsOverriddenInChildClass()
309-
{
310-
$parentMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ParentClass');
311-
$parentMetadata->addPropertyConstraint('example', new GreaterThan(0));
312-
313-
$childMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ChildClass');
314-
$childMetadata->addPropertyConstraint('example', new GreaterThan(1));
315-
$childMetadata->mergeConstraints($parentMetadata);
316-
317-
$expectedMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ChildClass');
318-
$expectedMetadata->addPropertyConstraint('example', new GreaterThan(1));
319-
320-
$this->assertEquals($expectedMetadata, $childMetadata);
321-
}
322306
}
323307

324308
class ParentClass

‎src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,14 @@ public function testGroupsFromParent()
174174
$reader = new \Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader();
175175
$factory = new LazyLoadingMetadataFactory($reader);
176176
$metadata = $factory->getMetadataFor('Symfony\Component\Validator\Tests\Fixtures\EntityStaticCarTurbo');
177-
$classMetaData = $metadata->getPropertyMetadata('wheels');
178-
$constraints = $classMetaData[0]->getConstraints();
179-
$groups = $constraints[0]->groups;
177+
$groups = array();
180178

179+
foreach ($metadata->getPropertyMetadata('wheels') as $propertyMetadata) {
180+
$constraints = $propertyMetadata->getConstraints();
181+
$groups = array_replace($groups, $constraints[0]->groups);
182+
}
183+
184+
$this->assertCount(4, $groups);
181185
$this->assertContains('Default', $groups);
182186
$this->assertContains('EntityStaticCarTurbo', $groups);
183187
$this->assertContains('EntityStaticCar', $groups);

0 commit comments

Comments
 (0)
0