Skip to content

Commit 1effc73

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: [Filesystem] Handle paths on different drives [WebProfiler] Do not add src-elem CSP directives if they do not exist [Yaml] fix parse error when unindented collections contain a comment [3.4][Inflector] Improve testSingularize() argument name [PhpUnitBridge] fix PHP 5.3 compat again Skip validation when email is an empty object fix sr_Latn translation [Validator] fix lazy property usage. Fix annotation [PhpUnitBridge] fix compat with PHP 5.3 [DX] Show the ParseException message in YAML file loaders
2 parents 1780dff + 2e78223 commit 1effc73

File tree

7 files changed

+76
-15
lines changed

7 files changed

+76
-15
lines changed

‎Constraints/EmailValidator.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ public function validate($value, Constraint $constraint)
8080
}
8181

8282
$value = (string) $value;
83+
if ('' === $value) {
84+
return;
85+
}
8386

8487
if (null !== $constraint->normalizer) {
8588
$value = ($constraint->normalizer)($value);

‎Mapping/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private function parseFile(string $path): array
114114
try {
115115
$classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
116116
} catch (ParseException $e) {
117-
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
117+
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
118118
}
119119

120120
// empty file

‎Resources/translations/validators.sr_Latn.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
</trans-unit>
353353
<trans-unit id="91">
354354
<source>This value should be either negative or zero.</source>
355-
<target>Ova vrednost bi trebala biti pozitivna ili nula.</target>
355+
<target>Ova vrednost bi trebala biti negativna ili nula.</target>
356356
</trans-unit>
357357
<trans-unit id="92">
358358
<source>This value is not a valid timezone.</source>

‎Tests/Constraints/EmailValidatorTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ public function testEmptyStringIsValid()
6060
$this->assertNoViolation();
6161
}
6262

63+
public function testObjectEmptyStringIsValid()
64+
{
65+
$this->validator->validate(new EmptyEmailObject(), new Email());
66+
67+
$this->assertNoViolation();
68+
}
69+
6370
public function testExpectsStringCompatibleType()
6471
{
6572
$this->expectException('Symfony\Component\Validator\Exception\UnexpectedValueException');
@@ -411,3 +418,11 @@ public function provideCheckTypes()
411418
];
412419
}
413420
}
421+
422+
class EmptyEmailObject
423+
{
424+
public function __toString()
425+
{
426+
return '';
427+
}
428+
}

‎Tests/Fixtures/Entity.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ public function __construct($internal = null)
5353
$this->internal = $internal;
5454
}
5555

56+
public function getFirstName()
57+
{
58+
return $this->firstName;
59+
}
60+
5661
public function getInternal()
5762
{
5863
return $this->internal.' from getter';
@@ -141,4 +146,9 @@ public function setChildB($childB)
141146
{
142147
$this->childB = $childB;
143148
}
149+
150+
public function getReference()
151+
{
152+
return $this->reference;
153+
}
144154
}

‎Tests/Validator/AbstractValidatorTest.php

Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ abstract class AbstractValidatorTest extends TestCase
3232

3333
const REFERENCE_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\Reference';
3434

35+
const LAZY_PROPERTY = 'Symfony\Component\Validator\Validator\LazyProperty';
36+
3537
/**
3638
* @var FakeMetadataFactory
3739
*/
@@ -54,6 +56,7 @@ protected function setUp(): void
5456
$this->referenceMetadata = new ClassMetadata(self::REFERENCE_CLASS);
5557
$this->metadataFactory->addMetadata($this->metadata);
5658
$this->metadataFactory->addMetadata($this->referenceMetadata);
59+
$this->metadataFactory->addMetadata(new ClassMetadata(self::LAZY_PROPERTY));
5760
}
5861

5962
protected function tearDown(): void
@@ -510,7 +513,10 @@ public function testFailOnScalarReferences()
510513
$this->validate($entity);
511514
}
512515

513-
public function testArrayReference()
516+
/**
517+
* @dataProvider getConstraintMethods
518+
*/
519+
public function testArrayReference($constraintMethod)
514520
{
515521
$entity = new Entity();
516522
$entity->reference = ['key' => new Reference()];
@@ -528,7 +534,7 @@ public function testArrayReference()
528534
$context->addViolation('Message %param%', ['%param%' => 'value']);
529535
};
530536

531-
$this->metadata->addPropertyConstraint('reference', new Valid());
537+
$this->metadata->$constraintMethod('reference', new Valid());
532538
$this->referenceMetadata->addConstraint(new Callback([
533539
'callback' => $callback,
534540
'groups' => 'Group',
@@ -548,8 +554,10 @@ public function testArrayReference()
548554
$this->assertNull($violations[0]->getCode());
549555
}
550556

551-
// https://github.com/symfony/symfony/issues/6246
552-
public function testRecursiveArrayReference()
557+
/**
558+
* @dataProvider getConstraintMethods
559+
*/
560+
public function testRecursiveArrayReference($constraintMethod)
553561
{
554562
$entity = new Entity();
555563
$entity->reference = [2 => ['key' => new Reference()]];
@@ -567,7 +575,7 @@ public function testRecursiveArrayReference()
567575
$context->addViolation('Message %param%', ['%param%' => 'value']);
568576
};
569577

570-
$this->metadata->addPropertyConstraint('reference', new Valid());
578+
$this->metadata->$constraintMethod('reference', new Valid());
571579
$this->referenceMetadata->addConstraint(new Callback([
572580
'callback' => $callback,
573581
'groups' => 'Group',
@@ -611,7 +619,10 @@ public function testOnlyCascadedArraysAreTraversed()
611619
$this->assertCount(0, $violations);
612620
}
613621

614-
public function testArrayTraversalCannotBeDisabled()
622+
/**
623+
* @dataProvider getConstraintMethods
624+
*/
625+
public function testArrayTraversalCannotBeDisabled($constraintMethod)
615626
{
616627
$entity = new Entity();
617628
$entity->reference = ['key' => new Reference()];
@@ -620,7 +631,7 @@ public function testArrayTraversalCannotBeDisabled()
620631
$context->addViolation('Message %param%', ['%param%' => 'value']);
621632
};
622633

623-
$this->metadata->addPropertyConstraint('reference', new Valid([
634+
$this->metadata->$constraintMethod('reference', new Valid([
624635
'traverse' => false,
625636
]));
626637
$this->referenceMetadata->addConstraint(new Callback($callback));
@@ -631,7 +642,10 @@ public function testArrayTraversalCannotBeDisabled()
631642
$this->assertCount(1, $violations);
632643
}
633644

634-
public function testRecursiveArrayTraversalCannotBeDisabled()
645+
/**
646+
* @dataProvider getConstraintMethods
647+
*/
648+
public function testRecursiveArrayTraversalCannotBeDisabled($constraintMethod)
635649
{
636650
$entity = new Entity();
637651
$entity->reference = [2 => ['key' => new Reference()]];
@@ -640,9 +654,10 @@ public function testRecursiveArrayTraversalCannotBeDisabled()
640654
$context->addViolation('Message %param%', ['%param%' => 'value']);
641655
};
642656

643-
$this->metadata->addPropertyConstraint('reference', new Valid([
657+
$this->metadata->$constraintMethod('reference', new Valid([
644658
'traverse' => false,
645659
]));
660+
646661
$this->referenceMetadata->addConstraint(new Callback($callback));
647662

648663
$violations = $this->validate($entity);
@@ -651,25 +666,31 @@ public function testRecursiveArrayTraversalCannotBeDisabled()
651666
$this->assertCount(1, $violations);
652667
}
653668

654-
public function testIgnoreScalarsDuringArrayTraversal()
669+
/**
670+
* @dataProvider getConstraintMethods
671+
*/
672+
public function testIgnoreScalarsDuringArrayTraversal($constraintMethod)
655673
{
656674
$entity = new Entity();
657675
$entity->reference = ['string', 1234];
658676

659-
$this->metadata->addPropertyConstraint('reference', new Valid());
677+
$this->metadata->$constraintMethod('reference', new Valid());
660678

661679
$violations = $this->validate($entity);
662680

663681
/* @var ConstraintViolationInterface[] $violations */
664682
$this->assertCount(0, $violations);
665683
}
666684

667-
public function testIgnoreNullDuringArrayTraversal()
685+
/**
686+
* @dataProvider getConstraintMethods
687+
*/
688+
public function testIgnoreNullDuringArrayTraversal($constraintMethod)
668689
{
669690
$entity = new Entity();
670691
$entity->reference = [null];
671692

672-
$this->metadata->addPropertyConstraint('reference', new Valid());
693+
$this->metadata->$constraintMethod('reference', new Valid());
673694

674695
$violations = $this->validate($entity);
675696

@@ -1218,6 +1239,14 @@ public function testReplaceDefaultGroup($sequence, array $assertViolations)
12181239
}
12191240
}
12201241

1242+
public function getConstraintMethods()
1243+
{
1244+
return [
1245+
['addPropertyConstraint'],
1246+
['addGetterConstraint'],
1247+
];
1248+
}
1249+
12211250
public function getTestReplaceDefaultGroup()
12221251
{
12231252
return [

‎Validator/RecursiveContextualValidator.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,10 @@ private function validateGenericNode($value, $object, ?string $cacheKey, ?Metada
634634
// See validateClassNode()
635635
$cascadedGroups = null !== $cascadedGroups && \count($cascadedGroups) > 0 ? $cascadedGroups : $groups;
636636

637+
if ($value instanceof LazyProperty) {
638+
$value = $value->getPropertyValue();
639+
}
640+
637641
if (\is_array($value)) {
638642
// Arrays are always traversed, independent of the specified
639643
// traversal strategy

0 commit comments

Comments
 (0)