symfony
diff --git a/‎src/Symfony/Component/Validator/Constraints/Xml.php
Lines changed: 12 additions & 2 deletions b/‎src/Symfony/Component/Validator/Constraints/Xml.php
Lines changed: 12 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/XmlValidator.php
Lines changed: 26 additions & 7 deletions b/‎src/Symfony/Component/Validator/Constraints/XmlValidator.php
Lines changed: 26 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Validator/Tests/Constraints/XmlValidatorTest.php
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/Validator/Tests/Constraints/XmlValidatorTest.php
Lines changed: 0 additions & 1 deletion
@@ -11,19 +11,29 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\Validator\Attribute\HasNamedArguments;
+use Symfony\Component\Validator\Constraint;
+
 /**
  * Validates that a value is a valid xml format.
  *
  * @author Mokhtar Tlili <tlili.mokhtar@gmail.com>
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Xml extends AbstractFormat
+class Xml extends Constraint
 {
     public const INVALID_XML_ERROR = '0355230a-97b8-49da-b8cd-985bf3345bcf';
 
     protected const ERROR_NAMES = [
         self::INVALID_XML_ERROR => 'INVALID_XML_ERROR',
     ];
 
-    public string $format = 'XML';
+    #[HasNamedArguments]
+    public function __construct(
+        public string $message = 'This value is not valid XML.',
+        ?array $groups = null,
+        mixed $payload = null,
+    ) {
+        parent::__construct(null, $groups, $payload);
+    }
 }
@@ -11,18 +11,37 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
 /**
  * @author Mokhtar Tlili <tlili.mokhtar@gmail.com>
  */
-class XmlValidator extends AbstractFormatValidator
+class XmlValidator extends ConstraintValidator
 {
-    protected function validateFormat(string $value): bool
+    public function validate(mixed $value, Constraint $constraint): void
     {
-        return false !== @simplexml_load_string($value);
-    }
+        if (!$constraint instanceof Xml) {
+            throw new UnexpectedTypeException($constraint, Xml::class);
+        }
 
-    protected function getErrorCode(): string
-    {
-        return Xml::INVALID_XML_ERROR;
+        if (null === $value || '' === $value) {
+            return;
+        }
+
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
+            throw new UnexpectedValueException($value, 'string');
+        }
+
+        $value = (string) $value;
+
+        if (false === @simplexml_load_string($value)) {
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Xml::INVALID_XML_ERROR)
+                ->addViolation();
+        }
     }
 }
@@ -41,7 +41,6 @@ public function testInValidXmlValue($value)
         $this->validator->validate($value, $constraint);
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
-            ->setParameter('{{ format }}', $constraint->format)
             ->setCode(Xml::INVALID_XML_ERROR)
             ->assertRaised();
     }
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public function testInValidXmlValue($value)`
`41`	`41`	`$this->validator->validate($value, $constraint);`
`42`	`42`	`$this->buildViolation('myMessage')`
`43`	`43`	`->setParameter('{{ value }}', '"'.$value.'"')`
`44`		`- ->setParameter('{{ format }}', $constraint->format)`
`45`	`44`	`->setCode(Xml::INVALID_XML_ERROR)`
`46`	`45`	`->assertRaised();`
`47`	`46`	`}`