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

Parser/Token.php

@@ -31,14 +31,20 @@ class Token
     public const TYPE_NUMBER = 'number';
     public const TYPE_STRING = 'string';
 
+    /**
+     * @param self::TYPE_*|null $type
+     */
     public function __construct(
         private ?string $type,
         private ?string $value,
         private ?int $position,
     ) {
     }
 
-    public function getType(): ?int
+    /**
+     * @return self::TYPE_*|null
+     */
+    public function getType(): ?string
     {
         return $this->type;
     }