[Validator] Add pattern in Regex constraint violations

alamirault · alamirault · commit 88fab2585afe · 2022-11-17T23:08:19.000+01:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add the `pattern` parameter in violations of the `Regex` constraint
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Validator/Constraints/RegexValidator.php b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
@@ -47,6 +47,7 @@ public function validate(mixed $value, Constraint $constraint)
         if ($constraint->match xor preg_match($constraint->pattern, $value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setParameter('{{ pattern }}', $constraint->pattern)
                 ->setCode(Regex::REGEX_FAILED_ERROR)
                 ->addViolation();
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
@@ -118,6 +118,7 @@ public function testInvalidValues($value)
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
+            ->setParameter('{{ pattern }}', '/^[0-9]+$/')
             ->setCode(Regex::REGEX_FAILED_ERROR)
             ->assertRaised();
     }
@@ -133,6 +134,7 @@ public function testInvalidValuesNamed($value)
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
+            ->setParameter('{{ pattern }}', '/^[0-9]+$/')
             ->setCode(Regex::REGEX_FAILED_ERROR)
             ->assertRaised();
     }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public function validate(mixed $value, Constraint $constraint)`
`47`	`47`	`if ($constraint->match xor preg_match($constraint->pattern, $value)) {`
`48`	`48`	`$this->context->buildViolation($constraint->message)`
`49`	`49`	`->setParameter('{{ value }}', $this->formatValue($value))`
	`50`	`+ ->setParameter('{{ pattern }}', $constraint->pattern)`
`50`	`51`	`->setCode(Regex::REGEX_FAILED_ERROR)`
`51`	`52`	`->addViolation();`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ public function testInvalidValues($value)`
`118`	`118`
`119`	`119`	`$this->buildViolation('myMessage')`
`120`	`120`	`->setParameter('{{ value }}', '"'.$value.'"')`
	`121`	`+ ->setParameter('{{ pattern }}', '/^[0-9]+$/')`
`121`	`122`	`->setCode(Regex::REGEX_FAILED_ERROR)`
`122`	`123`	`->assertRaised();`
`123`	`124`	`}`
`@@ -133,6 +134,7 @@ public function testInvalidValuesNamed($value)`
`133`	`134`
`134`	`135`	`$this->buildViolation('myMessage')`
`135`	`136`	`->setParameter('{{ value }}', '"'.$value.'"')`
	`137`	`+ ->setParameter('{{ pattern }}', '/^[0-9]+$/')`
`136`	`138`	`->setCode(Regex::REGEX_FAILED_ERROR)`
`137`	`139`	`->assertRaised();`
`138`	`140`	`}`