Skip to content

Commit 0806755

Browse files
author
symfonyaml
committed
Use constructor property promotion + No need options parameter anymore as we do no longer support annotations
1 parent a02144d commit 0806755

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

src/Symfony/Component/Validator/Constraints/Yaml.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,12 @@ class Yaml extends Constraint
2222
self::INVALID_YAML_ERROR => 'INVALID_YAML_ERROR',
2323
];
2424

25-
public $message = 'This value should be valid YAML.';
26-
public $flags = 0;
27-
2825
public function __construct(
29-
?array $options = null,
30-
?string $message = null,
31-
?int $flags = null,
26+
public string $message = 'This value is not valid YAML.',
27+
public int $flags = 0,
3228
?array $groups = null,
3329
mixed $payload = null,
3430
) {
35-
parent::__construct($options, $groups, $payload);
36-
37-
$this->message = $message ?? $this->message;
38-
$this->flags = $flags ?? $this->flags;
31+
parent::__construct(null, $groups, $payload);
3932
}
4033
}

src/Symfony/Component/Validator/Constraints/YamlValidator.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public function validate(mixed $value, Constraint $constraint): void
5353
$parser->parse($value, $constraint->flags);
5454
} catch (ParseException $e) {
5555
$this->context->buildViolation($constraint->message)
56-
->setParameter('{{ value }}', $this->formatValue($value))
5756
->setParameter('{{ error }}', $e->getMessage())
5857
->setParameter('{{ line }}', $e->getParsedLine())
5958
->setCode(Yaml::INVALID_YAML_ERROR)

src/Symfony/Component/Validator/Tests/Constraints/YamlValidatorTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ public function testYamlWithFlags()
4444
*/
4545
public function testInvalidValues($value, $message, $line)
4646
{
47-
$constraint = new Yaml([
48-
'message' => 'myMessageTest',
49-
]);
47+
$constraint = new Yaml(
48+
message: 'myMessageTest',
49+
);
5050

5151
$this->validator->validate($value, $constraint);
5252

5353
$this->buildViolation('myMessageTest')
54-
->setParameter('{{ value }}', '"'.$value.'"')
5554
->setParameter('{{ error }}', $message)
5655
->setParameter('{{ line }}', $line)
5756
->setCode(Yaml::INVALID_YAML_ERROR)
@@ -62,8 +61,7 @@ public function testInvalidFlags()
6261
{
6362
$value = 'tags: [!tagged app.myclass]';
6463
$this->validator->validate($value, new Yaml());
65-
$this->buildViolation('This value should be valid YAML.')
66-
->setParameter('{{ value }}', sprintf('"%s"', $value))
64+
$this->buildViolation('This value is not valid YAML.')
6765
->setParameter('{{ error }}', 'Tags support is not enabled. Enable the "Yaml::PARSE_CUSTOM_TAGS" flag to use "!tagged" at line 1 (near "tags: [!tagged app.myclass]").')
6866
->setParameter('{{ line }}', 1)
6967
->setCode(Yaml::INVALID_YAML_ERROR)

0 commit comments

Comments
 (0)