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

Skip to content

Commit a379051

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.4
* 3.4: [Yaml] Fix for #36624; Allow PHP constant as first key in block Use PHPUnit 9.3 on php 8. fix mapping errors from unmapped forms [Validator] Add target guards for Composite nested constraints
2 parents 969b902 + 78cc0ef commit a379051

File tree

11 files changed

+215
-25
lines changed

11 files changed

+215
-25
lines changed

‎phpunit

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
1212
if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
1313
putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
1414
}
15-
putenv('SYMFONY_PHPUNIT_VERSION=8.3');
15+
if (\PHP_VERSION_ID >= 80000) {
16+
putenv('SYMFONY_PHPUNIT_VERSION=9.3');
17+
} else {
18+
putenv('SYMFONY_PHPUNIT_VERSION=8.3');
19+
}
1620
} elseif (\PHP_VERSION_ID >= 70000) {
1721
putenv('SYMFONY_PHPUNIT_VERSION=6.5');
1822
}

‎src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,6 @@ private function reconstructPath(ViolationPath $violationPath, FormInterface $or
231231
// Form inherits its parent data
232232
// Cut the piece out of the property path and proceed
233233
$propertyPathBuilder->remove($i);
234-
} elseif (!$scope->getConfig()->getMapped()) {
235-
// Form is not mapped
236-
// Set the form as new origin and strip everything
237-
// we have so far in the path
238-
$origin = $scope;
239-
$propertyPathBuilder->remove(0, $i + 1);
240-
$i = 0;
241234
} else {
242235
/* @var \Symfony\Component\PropertyAccess\PropertyPathInterface $propertyPath */
243236
$propertyPath = $scope->getPropertyPath();

‎src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/Fixtures/Issue.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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\Form\Tests\Extension\Validator\ViolationMapper\Fixtures;
13+
14+
class Issue
15+
{
16+
}

‎src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\Form\FormConfigBuilder;
2323
use Symfony\Component\Form\FormError;
2424
use Symfony\Component\Form\FormInterface;
25+
use Symfony\Component\Form\Tests\Extension\Validator\ViolationMapper\Fixtures\Issue;
2526
use Symfony\Component\PropertyAccess\PropertyPath;
2627
use Symfony\Component\Validator\ConstraintViolation;
2728
use Symfony\Component\Validator\ConstraintViolationInterface;
@@ -70,12 +71,12 @@ protected function setUp(): void
7071
$this->params = ['foo' => 'bar'];
7172
}
7273

73-
protected function getForm($name = 'name', $propertyPath = null, $dataClass = null, $errorMapping = [], $inheritData = false, $synchronized = true)
74+
protected function getForm($name = 'name', $propertyPath = null, $dataClass = null, $errorMapping = [], $inheritData = false, $synchronized = true, array $options = [])
7475
{
7576
$config = new FormConfigBuilder($name, $dataClass, $this->dispatcher, [
7677
'error_mapping' => $errorMapping,
77-
]);
78-
$config->setMapped(true);
78+
] + $options);
79+
$config->setMapped(isset($options['mapped']) ? $options['mapped'] : true);
7980
$config->setInheritData($inheritData);
8081
$config->setPropertyPath($propertyPath);
8182
$config->setCompound(true);
@@ -91,12 +92,9 @@ function () { throw new TransformationFailedException(); }
9192
return new Form($config);
9293
}
9394

94-
/**
95-
* @param $propertyPath
96-
*/
97-
protected function getConstraintViolation($propertyPath): ConstraintViolation
95+
protected function getConstraintViolation($propertyPath, $root = null): ConstraintViolation
9896
{
99-
return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, null, $propertyPath, null);
97+
return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, $root, $propertyPath, null);
10098
}
10199

102100
protected function getFormError(ConstraintViolationInterface $violation, FormInterface $form): FormError
@@ -107,6 +105,33 @@ protected function getFormError(ConstraintViolationInterface $violation, FormInt
107105
return $error;
108106
}
109107

108+
public function testMappingErrorsWhenFormIsNotMapped()
109+
{
110+
$form = $this->getForm('name', null, Issue::class, [
111+
'child1' => 'child2',
112+
]);
113+
114+
$violation = $this->getConstraintViolation('children[child1].data', $form);
115+
116+
$child1Form = $this->getForm('child1', null, null, [], false, true, [
117+
'mapped' => false,
118+
]);
119+
$child2Form = $this->getForm('child2', null, null, [], false, true, [
120+
'mapped' => false,
121+
]);
122+
123+
$form->add($child1Form);
124+
$form->add($child2Form);
125+
126+
$form->submit([]);
127+
128+
$this->mapper->mapViolation($violation, $form);
129+
130+
$this->assertCount(0, $form->getErrors());
131+
$this->assertCount(0, $form->get('child1')->getErrors());
132+
$this->assertCount(1, $form->get('child2')->getErrors());
133+
}
134+
110135
public function testMapToFormInheritingParentDataIfDataDoesNotMatch()
111136
{
112137
$violation = $this->getConstraintViolation('children[address].data.foo');

‎src/Symfony/Component/Validator/Constraints/Composite.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,17 @@ public function addImplicitGroupName($group)
136136
*/
137137
abstract protected function getCompositeOption();
138138

139+
/**
140+
* @internal Used by metadata
141+
*
142+
* @return Constraint[]
143+
*/
144+
public function getNestedContraints()
145+
{
146+
/* @var Constraint[] $nestedConstraints */
147+
return $this->{$this->getCompositeOption()};
148+
}
149+
139150
/**
140151
* Initializes the nested constraints.
141152
*

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

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

1414
use Symfony\Component\Validator\Constraint;
15+
use Symfony\Component\Validator\Constraints\Composite;
1516
use Symfony\Component\Validator\Constraints\GroupSequence;
1617
use Symfony\Component\Validator\Constraints\Traverse;
1718
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -173,9 +174,7 @@ public function getDefaultGroup()
173174
*/
174175
public function addConstraint(Constraint $constraint)
175176
{
176-
if (!\in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets())) {
177-
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
178-
}
177+
$this->checkConstraint($constraint);
179178

180179
if ($constraint instanceof Traverse) {
181180
if ($constraint->traverse) {
@@ -487,4 +486,17 @@ private function addPropertyMetadata(PropertyMetadataInterface $metadata)
487486

488487
$this->members[$property][] = $metadata;
489488
}
489+
490+
private function checkConstraint(Constraint $constraint)
491+
{
492+
if (!\in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets(), true)) {
493+
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
494+
}
495+
496+
if ($constraint instanceof Composite) {
497+
foreach ($constraint->getNestedContraints() as $nestedContraint) {
498+
$this->checkConstraint($nestedContraint);
499+
}
500+
}
501+
}
490502
}

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

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

1414
use Symfony\Component\Validator\Constraint;
15+
use Symfony\Component\Validator\Constraints\Composite;
1516
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
1617

1718
/**
@@ -71,9 +72,7 @@ public function __construct(string $class, string $name, string $property)
7172
*/
7273
public function addConstraint(Constraint $constraint)
7374
{
74-
if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) {
75-
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', \get_class($constraint)));
76-
}
75+
$this->checkConstraint($constraint);
7776

7877
parent::addConstraint($constraint);
7978

@@ -181,4 +180,17 @@ public function getReflectionMember($objectOrClassName)
181180
* @return \ReflectionMethod|\ReflectionProperty The reflection instance
182181
*/
183182
abstract protected function newReflectionMember($objectOrClassName);
183+
184+
private function checkConstraint(Constraint $constraint)
185+
{
186+
if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets(), true)) {
187+
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', \get_class($constraint)));
188+
}
189+
190+
if ($constraint instanceof Composite) {
191+
foreach ($constraint->getNestedContraints() as $nestedContraint) {
192+
$this->checkConstraint($nestedContraint);
193+
}
194+
}
195+
}
184196
}

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Validator\Constraint;
16+
use Symfony\Component\Validator\Constraints\Composite;
1617
use Symfony\Component\Validator\Constraints\Valid;
18+
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
1719
use Symfony\Component\Validator\Mapping\ClassMetadata;
20+
use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
1821
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
1922
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
2023
use Symfony\Component\Validator\Tests\Fixtures\PropertyConstraint;
@@ -52,6 +55,20 @@ public function testAddConstraintRequiresClassConstraints()
5255
$this->metadata->addConstraint(new PropertyConstraint());
5356
}
5457

58+
public function testAddCompositeConstraintRejectsNestedPropertyConstraints()
59+
{
60+
$this->expectException(ConstraintDefinitionException::class);
61+
$this->expectExceptionMessage('The constraint "Symfony\Component\Validator\Tests\Fixtures\PropertyConstraint" cannot be put on classes.');
62+
63+
$this->metadata->addConstraint(new ClassCompositeConstraint([new PropertyConstraint()]));
64+
}
65+
66+
public function testAddCompositeConstraintAcceptsNestedClassConstraints()
67+
{
68+
$this->metadata->addConstraint($constraint = new ClassCompositeConstraint([new ClassConstraint()]));
69+
$this->assertSame($this->metadata->getConstraints(), [$constraint]);
70+
}
71+
5572
public function testAddPropertyConstraints()
5673
{
5774
$this->metadata->addPropertyConstraint('firstName', new ConstraintA());
@@ -311,3 +328,23 @@ public function testGetPropertyMetadataReturnsEmptyArrayWithoutConfiguredMetadat
311328
$this->assertCount(0, $this->metadata->getPropertyMetadata('foo'), '->getPropertyMetadata() returns an empty collection if no metadata is configured for the given property');
312329
}
313330
}
331+
332+
class ClassCompositeConstraint extends Composite
333+
{
334+
public $nested;
335+
336+
public function getDefaultOption()
337+
{
338+
return $this->getCompositeOption();
339+
}
340+
341+
protected function getCompositeOption()
342+
{
343+
return 'nested';
344+
}
345+
346+
public function getTargets()
347+
{
348+
return [self::CLASS_CONSTRAINT];
349+
}
350+
}

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

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

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Validator\Constraints\Collection;
16+
use Symfony\Component\Validator\Constraints\Composite;
17+
use Symfony\Component\Validator\Constraints\Required;
1518
use Symfony\Component\Validator\Constraints\Valid;
19+
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
1620
use Symfony\Component\Validator\Mapping\MemberMetadata;
1721
use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
1822
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
1923
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
24+
use Symfony\Component\Validator\Tests\Fixtures\PropertyConstraint;
2025

2126
class MemberMetadataTest extends TestCase
2227
{
@@ -43,6 +48,34 @@ public function testAddConstraintRequiresClassConstraints()
4348
$this->metadata->addConstraint(new ClassConstraint());
4449
}
4550

51+
public function testAddCompositeConstraintRejectsNestedClassConstraints()
52+
{
53+
$this->expectException(ConstraintDefinitionException::class);
54+
$this->expectExceptionMessage('The constraint "Symfony\Component\Validator\Tests\Fixtures\ClassConstraint" cannot be put on properties or getters.');
55+
56+
$this->metadata->addConstraint(new PropertyCompositeConstraint([new ClassConstraint()]));
57+
}
58+
59+
public function testAddCompositeConstraintRejectsDeepNestedClassConstraints()
60+
{
61+
$this->expectException(ConstraintDefinitionException::class);
62+
$this->expectExceptionMessage('The constraint "Symfony\Component\Validator\Tests\Fixtures\ClassConstraint" cannot be put on properties or getters.');
63+
64+
$this->metadata->addConstraint(new Collection(['field1' => new Required([new ClassConstraint()])]));
65+
}
66+
67+
public function testAddCompositeConstraintAcceptsNestedPropertyConstraints()
68+
{
69+
$this->metadata->addConstraint($constraint = new PropertyCompositeConstraint([new PropertyConstraint()]));
70+
$this->assertSame($this->metadata->getConstraints(), [$constraint]);
71+
}
72+
73+
public function testAddCompositeConstraintAcceptsDeepNestedPropertyConstraints()
74+
{
75+
$this->metadata->addConstraint($constraint = new Collection(['field1' => new Required([new PropertyConstraint()])]));
76+
$this->assertSame($this->metadata->getConstraints(), [$constraint]);
77+
}
78+
4679
public function testSerialize()
4780
{
4881
$this->metadata->addConstraint(new ConstraintA(['property1' => 'A']));
@@ -82,3 +115,18 @@ protected function newReflectionMember($object)
82115
{
83116
}
84117
}
118+
119+
class PropertyCompositeConstraint extends Composite
120+
{
121+
public $nested;
122+
123+
public function getDefaultOption()
124+
{
125+
return $this->getCompositeOption();
126+
}
127+
128+
protected function getCompositeOption()
129+
{
130+
return 'nested';
131+
}
132+
}

‎src/Symfony/Component/Yaml/Parser.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,12 @@ private function doParse(string $value, int $flags)
176176
$this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(null, true), $flags)
177177
);
178178
} else {
179-
if (isset($values['leadspaces'])
180-
&& self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->trimTag($values['value']), $matches)
179+
if (
180+
isset($values['leadspaces'])
181+
&& (
182+
'!' === $values['value'][0]
183+
|| self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->trimTag($values['value']), $matches)
184+
)
181185
) {
182186
// this is a compact notation element, add to next block and parse
183187
$block = $values['value'];

‎src/Symfony/Component/Yaml/Tests/ParserTest.php

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,34 @@ public function testDeprecatedPhpConstantSyntax()
20772077
$this->parser->parse('!php/const:App\Kernel::SEMART_VERSION', Yaml::PARSE_CUSTOM_TAGS | Yaml::PARSE_CONSTANT);
20782078
}
20792079

2080+
public function testPhpConstantTagMappingAsScalarKey()
2081+
{
2082+
$yaml = <<<YAML
2083+
map1:
2084+
- foo: 'value_0'
2085+
!php/const 'Symfony\Component\Yaml\Tests\B::BAR': 'value_1'
2086+
map2:
2087+
- !php/const 'Symfony\Component\Yaml\Tests\B::FOO': 'value_0'
2088+
bar: 'value_1'
2089+
YAML;
2090+
$this->assertSame([
2091+
'map1' => [['foo' => 'value_0', 'bar' => 'value_1']],
2092+
'map2' => [['foo' => 'value_0', 'bar' => 'value_1']],
2093+
], $this->parser->parse($yaml, Yaml::PARSE_CONSTANT));
2094+
}
2095+
2096+
public function testTagMappingAsScalarKey()
2097+
{
2098+
$yaml = <<<YAML
2099+
map1:
2100+
- !!str 0: 'value_0'
2101+
!!str 1: 'value_1'
2102+
YAML;
2103+
$this->assertSame([
2104+
'map1' => [['0' => 'value_0', '1' => 'value_1']],
2105+
], $this->parser->parse($yaml));
2106+
}
2107+
20802108
public function testMergeKeysWhenMappingsAreParsedAsObjects()
20812109
{
20822110
$yaml = <<<YAML
@@ -2339,7 +2367,7 @@ public function testMultiLineComment()
23392367
parameters:
23402368
abc
23412369
2342-
# Comment
2370+
# Comment
23432371
YAML;
23442372

23452373
$this->assertSame(['parameters' => 'abc'], $this->parser->parse($yaml));

0 commit comments

Comments
 (0)