Add encapsulated Collection constraint in Yaml constraint.

WedgeSama · WedgeSama · commit 5932e71ff7bd · 2024-10-15T14:20:17.000+02:00
Allow to use apply Collection constraint to Yaml parsed data array.
diff --git a/src/Symfony/Component/Validator/Constraints/Yaml.php b/src/Symfony/Component/Validator/Constraints/Yaml.php
@@ -38,6 +38,7 @@ public function __construct(
         public int $flags = 0,
         ?array $groups = null,
         mixed $payload = null,
+        public ?Collection $collection = null,
     ) {
         if (!class_exists(Parser::class)) {
             throw new LogicException('The Yaml component is required to use the Yaml constraint. Try running "composer require symfony/yaml".');
diff --git a/src/Symfony/Component/Validator/Constraints/YamlValidator.php b/src/Symfony/Component/Validator/Constraints/YamlValidator.php
@@ -49,7 +49,7 @@ public function validate(mixed $value, Constraint $constraint): void
         });
 
         try {
-            (new Parser())->parse($value, $constraint->flags);
+            $data = (new Parser())->parse($value, $constraint->flags);
         } catch (ParseException $e) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ error }}', $e->getMessage())
@@ -59,5 +59,12 @@ public function validate(mixed $value, Constraint $constraint): void
         } finally {
             restore_error_handler();
         }
+
+        if (isset($data) && null !== $constraint->collection) {
+            $validator = ($context = $this->context)
+                ->getValidator()->inContext($context);
+
+            $validator->validate($data, $constraint->collection);
+        }
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/YamlTest.php b/src/Symfony/Component/Validator/Tests/Constraints/YamlTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Yaml;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
@@ -38,6 +40,9 @@ public function testAttributes()
 
         [$cConstraint] = $metadata->properties['d']->getConstraints();
         self::assertSame(YamlParser::PARSE_CONSTANT | YamlParser::PARSE_CUSTOM_TAGS, $cConstraint->flags);
+
+        [$eConstraint] = $metadata->properties['e']->getConstraints();
+        self::assertInstanceOf(Collection::class, $eConstraint->collection);
     }
 }
 
@@ -54,4 +59,11 @@ class YamlDummy
 
     #[Yaml(flags: YamlParser::PARSE_CONSTANT | YamlParser::PARSE_CUSTOM_TAGS)]
     private $d;
+
+    #[Yaml(collection: new Collection(
+        fields: [
+            'foo' => new NotNull(),
+        ],
+    ))]
+    private $e;
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/YamlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/YamlValidatorTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Yaml;
 use Symfony\Component\Validator\Constraints\YamlValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -71,6 +73,16 @@ public function testInvalidFlags()
             ->assertRaised();
     }
 
+    public function testConfigValidData()
+    {
+        $constraint = new Yaml(
+            collection: new Collection(['foo' => new NotNull()]),
+        );
+
+        $this->validator->validate('foo: "bar"', $constraint);
+        $this->assertNoViolation();
+    }
+
     public static function getValidValues()
     {
         return [
