Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b9c2693

Browse files
nicolas-grekasnicolas-grekas
committed
bug #36245 [Validator] Fixed calling getters before resolving groups (HeahDude)
This PR was merged into the 3.4 branch. Discussion ---------- [Validator] Fixed calling getters before resolving groups | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #9939 | License | MIT | Doc PR | ~ Commits ------- edcfd60 [Validator] Fixed calling getters before resolving groups
2 parents e1c48f3 + edcfd60 commit b9c2693

File tree

5 files changed

+103
-3
lines changed

5 files changed

+103
-3
lines changed

‎src/Symfony/Component/Validator/Context/ExecutionContext.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Symfony\Component\Validator\Mapping\MetadataInterface;
2121
use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
2222
use Symfony\Component\Validator\Util\PropertyPath;
23+
use Symfony\Component\Validator\Validator\LazyProperty;
2324
use Symfony\Component\Validator\Validator\ValidatorInterface;
2425
use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
2526

@@ -187,7 +188,7 @@ public function addViolation($message, array $parameters = [])
187188
$parameters,
188189
$this->root,
189190
$this->propertyPath,
190-
$this->value,
191+
$this->getValue(),
191192
null,
192193
null,
193194
$this->constraint
@@ -206,7 +207,7 @@ public function buildViolation($message, array $parameters = [])
206207
$parameters,
207208
$this->root,
208209
$this->propertyPath,
209-
$this->value,
210+
$this->getValue(),
210211
$this->translator,
211212
$this->translationDomain
212213
);
@@ -241,6 +242,10 @@ public function getRoot()
241242
*/
242243
public function getValue()
243244
{
245+
if ($this->value instanceof LazyProperty) {
246+
return $this->value->getPropertyValue();
247+
}
248+
244249
return $this->value;
245250
}
246251

‎src/Symfony/Component/Validator/Tests/Fixtures/EntityWithGroupedConstraintOnMethods.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Validator\Tests\Fixtures;
13+
14+
class EntityWithGroupedConstraintOnMethods
15+
{
16+
public $bar;
17+
18+
public function isValidInFoo()
19+
{
20+
return false;
21+
}
22+
23+
public function getBar()
24+
{
25+
throw new \Exception('Should not be called');
26+
}
27+
}

‎src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@
1414
use Symfony\Component\Translation\IdentityTranslator;
1515
use Symfony\Component\Validator\Constraints\All;
1616
use Symfony\Component\Validator\Constraints\Collection;
17+
use Symfony\Component\Validator\Constraints\GroupSequence;
18+
use Symfony\Component\Validator\Constraints\IsTrue;
1719
use Symfony\Component\Validator\Constraints\Length;
1820
use Symfony\Component\Validator\Constraints\NotBlank;
21+
use Symfony\Component\Validator\Constraints\NotNull;
1922
use Symfony\Component\Validator\ConstraintValidatorFactory;
2023
use Symfony\Component\Validator\Context\ExecutionContextFactory;
24+
use Symfony\Component\Validator\Mapping\ClassMetadata;
2125
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
2226
use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
2327
use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
2428
use Symfony\Component\Validator\Tests\Fixtures\Entity;
29+
use Symfony\Component\Validator\Tests\Fixtures\EntityWithGroupedConstraintOnMethods;
2530
use Symfony\Component\Validator\Validator\RecursiveValidator;
2631

2732
class RecursiveValidatorTest extends AbstractTest
@@ -117,6 +122,25 @@ public function testCollectionConstraintValidateAllGroupsForNestedConstraints()
117122
$this->assertInstanceOf(NotBlank::class, $violations->get(1)->getConstraint());
118123
}
119124

125+
public function testGroupedMethodConstraintValidateInSequence()
126+
{
127+
$metadata = new ClassMetadata(EntityWithGroupedConstraintOnMethods::class);
128+
$metadata->addPropertyConstraint('bar', new NotNull(['groups' => 'Foo']));
129+
$metadata->addGetterMethodConstraint('validInFoo', 'isValidInFoo', new IsTrue(['groups' => 'Foo']));
130+
$metadata->addGetterMethodConstraint('bar', 'getBar', new NotNull(['groups' => 'Bar']));
131+
132+
$this->metadataFactory->addMetadata($metadata);
133+
134+
$entity = new EntityWithGroupedConstraintOnMethods();
135+
$groups = new GroupSequence(['EntityWithGroupedConstraintOnMethods', 'Foo', 'Bar']);
136+
137+
$violations = $this->validator->validate($entity, null, $groups);
138+
139+
$this->assertCount(2, $violations);
140+
$this->assertInstanceOf(NotNull::class, $violations->get(0)->getConstraint());
141+
$this->assertInstanceOf(IsTrue::class, $violations->get(1)->getConstraint());
142+
}
143+
120144
public function testAllConstraintValidateAllGroupsForNestedConstraints()
121145
{
122146
$this->metadata->addPropertyConstraint('data', new All(['constraints' => [

‎src/Symfony/Component/Validator/Validator/LazyProperty.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Validator\Validator;
13+
14+
/**
15+
* A wrapper for a callable initializing a property from a getter.
16+
*
17+
* @internal
18+
*/
19+
class LazyProperty
20+
{
21+
private $propertyValueCallback;
22+
23+
public function __construct(\Closure $propertyValueCallback)
24+
{
25+
$this->propertyValueCallback = $propertyValueCallback;
26+
}
27+
28+
public function getPropertyValue()
29+
{
30+
return \call_user_func($this->propertyValueCallback);
31+
}
32+
}

‎src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
2828
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
2929
use Symfony\Component\Validator\Mapping\GenericMetadata;
30+
use Symfony\Component\Validator\Mapping\GetterMetadata;
3031
use Symfony\Component\Validator\Mapping\MetadataInterface;
3132
use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
3233
use Symfony\Component\Validator\Mapping\TraversalStrategy;
@@ -535,7 +536,13 @@ private function validateClassNode($object, $cacheKey, ClassMetadataInterface $m
535536
throw new UnsupportedMetadataException(sprintf('The property metadata instances should implement "Symfony\Component\Validator\Mapping\PropertyMetadataInterface", got: "%s".', \is_object($propertyMetadata) ? \get_class($propertyMetadata) : \gettype($propertyMetadata)));
536537
}
537538

538-
$propertyValue = $propertyMetadata->getPropertyValue($object);
539+
if ($propertyMetadata instanceof GetterMetadata) {
540+
$propertyValue = new LazyProperty(static function () use ($propertyMetadata, $object) {
541+
return $propertyMetadata->getPropertyValue($object);
542+
});
543+
} else {
544+
$propertyValue = $propertyMetadata->getPropertyValue($object);
545+
}
539546

540547
$this->validateGenericNode(
541548
$propertyValue,
@@ -800,6 +807,11 @@ private function validateInGroup($value, $cacheKey, MetadataInterface $metadata,
800807

801808
$validator = $this->validatorFactory->getInstance($constraint);
802809
$validator->initialize($context);
810+
811+
if ($value instanceof LazyProperty) {
812+
$value = $value->getPropertyValue();
813+
}
814+
803815
$validator->validate($value, $constraint);
804816
}
805817
}

0 commit comments

Comments
 (0)