Merge branch '7.4' into 8.0

* 7.4:
  fix merge
  [FrameworkBundle] Remove extra argument from ContainerBuilder::willBeAvailable call
  fix ext-redis 6.2.0 compatibility
  [CssSelector] Fix incorrect return type for Token::getType()
  [Workflow] State contamination due to class-based setter cache
  fix: fixed State contamination in marking stores due to class-based getter cache
  [Validator] Fix call to undefined getParser() in YamlValidator
  [ObjectMapper] Update Map attribute PHPDoc to match TransformCallableInterface signature
  fix tests
  Fix contentId assignment for inline attachments
  [HtmlSanitizer] Remove `srcdoc` from allowed attributes
  [EventDispatcher][FrameworkBundle] Rework union types on `#[AsEventListener]`

Author: xabbuh

Constraints/YamlValidator.php

@@ -39,17 +39,19 @@ public function validate(mixed $value, Constraint $constraint): void
 
         $value = (string) $value;
 
+        $parser = new Parser();
+
         /** @see \Symfony\Component\Yaml\Command\LintCommand::validate() */
-        $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
+        $prevErrorHandler = set_error_handler(static function ($level, $message, $file, $line) use (&$prevErrorHandler, $parser) {
             if (\E_USER_DEPRECATED === $level) {
-                throw new ParseException($message, $this->getParser()->getRealCurrentLineNb() + 1);
+                throw new ParseException($message, $parser->getRealCurrentLineNb() + 1);
             }
 
             return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
         });
 
         try {
-            (new Parser())->parse($value, $constraint->flags);
+            $parser->parse($value, $constraint->flags);
         } catch (ParseException $e) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ error }}', $e->getMessage())

Tests/Constraints/YamlValidatorTest.php

@@ -68,6 +68,25 @@ public function testInvalidFlags()
             ->assertRaised();
     }
 
+    #[DataProvider('getDeprecationOnLinesData')]
+    public function testDeprecationTriggersParseException(int $yamlLine, string $yamlValue)
+    {
+        $lines = explode("\n", $yamlValue);
+        $errorLine = end($lines);
+        $expectedError = 'This is a simulated deprecation at line '.$yamlLine.' (near "'.$errorLine.'")';
+
+        $constraint = new Yaml(
+            message: 'myMessageTest',
+            flags: YamlParser::PARSE_OBJECT,
+        );
+        $this->validator->validate($yamlValue, $constraint);
+        $this->buildViolation('myMessageTest')
+            ->setParameter('{{ error }}', $expectedError)
+            ->setParameter('{{ line }}', $yamlLine)
+            ->setCode(Yaml::INVALID_YAML_ERROR)
+            ->assertRaised();
+    }
+
     public static function getValidValues()
     {
         return [
@@ -91,4 +110,34 @@ public static function getInvalidValues(): array
             ["key:\nvalue", 'Unable to parse at line 2 (near "value").', 2],
         ];
     }
+
+    /**
+     * @return array<string, array{0: int, 1: string}>
+     */
+    public static function getDeprecationOnLinesData(): array
+    {
+        $serialized = serialize(new DeprecatedObjectFixture());
+
+        return [
+            'deprecation at line 1' => [1, "object: !php/object '".$serialized."'"],
+            'deprecation at line 2' => [2, "valid: yaml\nobject: !php/object '".$serialized."'"],
+            'deprecation at line 5' => [5, "line1: value\nline2: value\nline3: value\nline4: value\nobject: !php/object '".$serialized."'"],
+        ];
+    }
+}
+
+/**
+ * Fixture class for triggering deprecation during unserialize.
+ */
+class DeprecatedObjectFixture
+{
+    public function __serialize(): array
+    {
+        return [];
+    }
+
+    public function __unserialize(array $data): void
+    {
+        @trigger_error('This is a simulated deprecation', \E_USER_DEPRECATED);
+    }
 }