diff --git a/brick/math/src/BigDecimal.php b/brick/math/src/BigDecimal.php
index 31d22ab30..0932fd642 100644
--- a/brick/math/src/BigDecimal.php
+++ b/brick/math/src/BigDecimal.php
@@ -8,6 +8,7 @@
 use Brick\Math\Exception\MathException;
 use Brick\Math\Exception\NegativeNumberException;
 use Brick\Math\Internal\Calculator;
+use Override;
 
 /**
  * Immutable, arbitrary-precision signed decimal numbers.
@@ -47,6 +48,7 @@ protected function __construct(string $value, int $scale = 0)
     /**
      * @psalm-pure
      */
+    #[Override]
     protected static function from(BigNumber $number): static
     {
         return $number->toBigDecimal();
@@ -58,19 +60,23 @@ protected static function from(BigNumber $number): static
      * Example: `(12345, 3)` will result in the BigDecimal `12.345`.
      *
      * @param BigNumber|int|float|string $value The unscaled value. Must be convertible to a BigInteger.
-     * @param int                        $scale The scale of the number, positive or zero.
-     *
-     * @throws \InvalidArgumentException If the scale is negative.
+     * @param int                        $scale The scale of the number. If negative, the scale will be set to zero
+     *                                          and the unscaled value will be adjusted accordingly.
      *
      * @psalm-pure
      */
     public static function ofUnscaledValue(BigNumber|int|float|string $value, int $scale = 0) : BigDecimal
     {
+        $value = (string) BigInteger::of($value);
+
         if ($scale < 0) {
-            throw new \InvalidArgumentException('The scale cannot be negative.');
+            if ($value !== '0') {
+                $value .= \str_repeat('0', -$scale);
+            }
+            $scale = 0;
         }
 
-        return new BigDecimal((string) BigInteger::of($value), $scale);
+        return new BigDecimal($value, $scale);
     }
 
     /**
@@ -535,6 +541,7 @@ public function negated() : BigDecimal
         return new BigDecimal(Calculator::get()->neg($this->value), $this->scale);
     }
 
+    #[Override]
     public function compareTo(BigNumber|int|float|string $that) : int
     {
         $that = BigNumber::of($that);
@@ -552,6 +559,7 @@ public function compareTo(BigNumber|int|float|string $that) : int
         return - $that->compareTo($this);
     }
 
+    #[Override]
     public function getSign() : int
     {
         return ($this->value === '0') ? 0 : (($this->value[0] === '-') ? -1 : 1);
@@ -567,6 +575,33 @@ public function getScale() : int
         return $this->scale;
     }
 
+    /**
+     * Returns the number of significant digits in the number.
+     *
+     * This is the number of digits to both sides of the decimal point, stripped of leading zeros.
+     * The sign has no impact on the result.
+     *
+     * Examples:
+     *   0 => 0
+     *   0.0 => 0
+     *   123 => 3
+     *   123.456 => 6
+     *   0.00123 => 3
+     *   0.0012300 => 5
+     */
+    public function getPrecision(): int
+    {
+        $value = $this->value;
+
+        if ($value === '0') {
+            return 0;
+        }
+
+        $length = \strlen($value);
+
+        return ($value[0] === '-') ? $length - 1 : $length;
+    }
+
     /**
      * Returns a string representing the integral part of this decimal number.
      *
@@ -609,6 +644,7 @@ public function hasNonZeroFractionalPart() : bool
         return $this->getFractionalPart() !== \str_repeat('0', $this->scale);
     }
 
+    #[Override]
     public function toBigInteger() : BigInteger
     {
         $zeroScaleDecimal = $this->scale === 0 ? $this : $this->dividedBy(1, 0);
@@ -616,11 +652,13 @@ public function toBigInteger() : BigInteger
         return self::newBigInteger($zeroScaleDecimal->value);
     }
 
+    #[Override]
     public function toBigDecimal() : BigDecimal
     {
         return $this;
     }
 
+    #[Override]
     public function toBigRational() : BigRational
     {
         $numerator = self::newBigInteger($this->value);
@@ -629,6 +667,7 @@ public function toBigRational() : BigRational
         return self::newBigRational($numerator, $denominator, false);
     }
 
+    #[Override]
     public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal
     {
         if ($scale === $this->scale) {
@@ -638,24 +677,32 @@ public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::U
         return $this->dividedBy(BigDecimal::one(), $scale, $roundingMode);
     }
 
+    #[Override]
     public function toInt() : int
     {
         return $this->toBigInteger()->toInt();
     }
 
+    #[Override]
     public function toFloat() : float
     {
         return (float) (string) $this;
     }
 
+    /**
+     * @return numeric-string
+     */
+    #[Override]
     public function __toString() : string
     {
         if ($this->scale === 0) {
+            /** @var numeric-string */
             return $this->value;
         }
 
         $value = $this->getUnscaledValueWithLeadingZeros();
 
+        /** @var numeric-string */
         return \substr($value, 0, -$this->scale) . '.' . \substr($value, -$this->scale);
     }
 
diff --git a/brick/math/src/BigInteger.php b/brick/math/src/BigInteger.php
index 73dcc89a2..6ede65e3a 100644
--- a/brick/math/src/BigInteger.php
+++ b/brick/math/src/BigInteger.php
@@ -10,6 +10,7 @@
 use Brick\Math\Exception\NegativeNumberException;
 use Brick\Math\Exception\NumberFormatException;
 use Brick\Math\Internal\Calculator;
+use Override;
 
 /**
  * An arbitrary-size integer.
@@ -42,6 +43,7 @@ protected function __construct(string $value)
     /**
      * @psalm-pure
      */
+    #[Override]
     protected static function from(BigNumber $number): static
     {
         return $number->toBigInteger();
@@ -856,6 +858,7 @@ public function testBit(int $n) : bool
         return $this->shiftedRight($n)->isOdd();
     }
 
+    #[Override]
     public function compareTo(BigNumber|int|float|string $that) : int
     {
         $that = BigNumber::of($that);
@@ -867,31 +870,37 @@ public function compareTo(BigNumber|int|float|string $that) : int
         return - $that->compareTo($this);
     }
 
+    #[Override]
     public function getSign() : int
     {
         return ($this->value === '0') ? 0 : (($this->value[0] === '-') ? -1 : 1);
     }
 
+    #[Override]
     public function toBigInteger() : BigInteger
     {
         return $this;
     }
 
+    #[Override]
     public function toBigDecimal() : BigDecimal
     {
         return self::newBigDecimal($this->value);
     }
 
+    #[Override]
     public function toBigRational() : BigRational
     {
         return self::newBigRational($this, BigInteger::one(), false);
     }
 
+    #[Override]
     public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal
     {
         return $this->toBigDecimal()->toScale($scale, $roundingMode);
     }
 
+    #[Override]
     public function toInt() : int
     {
         $intValue = (int) $this->value;
@@ -903,6 +912,7 @@ public function toInt() : int
         return $intValue;
     }
 
+    #[Override]
     public function toFloat() : float
     {
         return (float) $this->value;
@@ -1013,8 +1023,13 @@ public function toBytes(bool $signed = true) : string
         return \hex2bin($hex);
     }
 
+    /**
+     * @return numeric-string
+     */
+    #[Override]
     public function __toString() : string
     {
+        /** @var numeric-string */
         return $this->value;
     }
 
diff --git a/brick/math/src/BigNumber.php b/brick/math/src/BigNumber.php
index 5a0df7837..5dabd314b 100644
--- a/brick/math/src/BigNumber.php
+++ b/brick/math/src/BigNumber.php
@@ -8,6 +8,7 @@
 use Brick\Math\Exception\MathException;
 use Brick\Math\Exception\NumberFormatException;
 use Brick\Math\Exception\RoundingNecessaryException;
+use Override;
 
 /**
  * Common interface for arbitrary-precision rational numbers.
@@ -51,8 +52,9 @@ abstract class BigNumber implements \JsonSerializable
      * - strings containing a `.` character or using an exponential notation are returned as BigDecimal
      * - strings containing only digits with an optional leading `+` or `-` sign are returned as BigInteger
      *
-     * @throws NumberFormatException   If the format of the number is not valid.
+     * @throws NumberFormatException If the format of the number is not valid.
      * @throws DivisionByZeroException If the value represents a rational number with a denominator of zero.
+     * @throws RoundingNecessaryException If the value cannot be converted to an instance of the subclass without rounding.
      *
      * @psalm-pure
      */
@@ -71,6 +73,9 @@ final public static function of(BigNumber|int|float|string $value) : static
     }
 
     /**
+     * @throws NumberFormatException If the format of the number is not valid.
+     * @throws DivisionByZeroException If the value represents a rational number with a denominator of zero.
+     *
      * @psalm-pure
      */
     private static function _of(BigNumber|int|float|string $value) : BigNumber
@@ -163,7 +168,7 @@ private static function _of(BigNumber|int|float|string $value) : BigNumber
     /**
      * Overridden by subclasses to convert a BigNumber to an instance of the subclass.
      *
-     * @throws MathException If the value cannot be converted.
+     * @throws RoundingNecessaryException If the value cannot be converted.
      *
      * @psalm-pure
      */
@@ -502,6 +507,7 @@ abstract public function toFloat() : float;
      */
     abstract public function __toString() : string;
 
+    #[Override]
     final public function jsonSerialize() : string
     {
         return $this->__toString();
diff --git a/brick/math/src/BigRational.php b/brick/math/src/BigRational.php
index fc3060ede..fc36e5573 100644
--- a/brick/math/src/BigRational.php
+++ b/brick/math/src/BigRational.php
@@ -8,6 +8,7 @@
 use Brick\Math\Exception\MathException;
 use Brick\Math\Exception\NumberFormatException;
 use Brick\Math\Exception\RoundingNecessaryException;
+use Override;
 
 /**
  * An arbitrarily large rational number.
@@ -57,6 +58,7 @@ protected function __construct(BigInteger $numerator, BigInteger $denominator, b
     /**
      * @psalm-pure
      */
+    #[Override]
     protected static function from(BigNumber $number): static
     {
         return $number->toBigRational();
@@ -320,16 +322,19 @@ public function simplified() : BigRational
         return new BigRational($numerator, $denominator, false);
     }
 
+    #[Override]
     public function compareTo(BigNumber|int|float|string $that) : int
     {
         return $this->minus($that)->getSign();
     }
 
+    #[Override]
     public function getSign() : int
     {
         return $this->numerator->getSign();
     }
 
+    #[Override]
     public function toBigInteger() : BigInteger
     {
         $simplified = $this->simplified();
@@ -341,32 +346,38 @@ public function toBigInteger() : BigInteger
         return $simplified->numerator;
     }
 
+    #[Override]
     public function toBigDecimal() : BigDecimal
     {
         return $this->numerator->toBigDecimal()->exactlyDividedBy($this->denominator);
     }
 
+    #[Override]
     public function toBigRational() : BigRational
     {
         return $this;
     }
 
+    #[Override]
     public function toScale(int $scale, RoundingMode $roundingMode = RoundingMode::UNNECESSARY) : BigDecimal
     {
         return $this->numerator->toBigDecimal()->dividedBy($this->denominator, $scale, $roundingMode);
     }
 
+    #[Override]
     public function toInt() : int
     {
         return $this->toBigInteger()->toInt();
     }
 
+    #[Override]
     public function toFloat() : float
     {
         $simplified = $this->simplified();
         return $simplified->numerator->toFloat() / $simplified->denominator->toFloat();
     }
 
+    #[Override]
     public function __toString() : string
     {
         $numerator   = (string) $this->numerator;
@@ -376,7 +387,7 @@ public function __toString() : string
             return $numerator;
         }
 
-        return $this->numerator . '/' . $this->denominator;
+        return $numerator . '/' . $denominator;
     }
 
     /**
diff --git a/brick/math/src/Exception/MathException.php b/brick/math/src/Exception/MathException.php
index 46e9c3fe4..8facd9c62 100644
--- a/brick/math/src/Exception/MathException.php
+++ b/brick/math/src/Exception/MathException.php
@@ -7,6 +7,6 @@
 /**
  * Base class for all math exceptions.
  */
-class MathException extends \Exception
+class MathException extends \RuntimeException
 {
 }
diff --git a/brick/math/src/Internal/Calculator/BcMathCalculator.php b/brick/math/src/Internal/Calculator/BcMathCalculator.php
index 067085e21..93a27ff81 100644
--- a/brick/math/src/Internal/Calculator/BcMathCalculator.php
+++ b/brick/math/src/Internal/Calculator/BcMathCalculator.php
@@ -5,6 +5,7 @@
 namespace Brick\Math\Internal\Calculator;
 
 use Brick\Math\Internal\Calculator;
+use Override;
 
 /**
  * Calculator implementation built around the bcmath library.
@@ -15,31 +16,37 @@
  */
 class BcMathCalculator extends Calculator
 {
+    #[Override]
     public function add(string $a, string $b) : string
     {
         return \bcadd($a, $b, 0);
     }
 
+    #[Override]
     public function sub(string $a, string $b) : string
     {
         return \bcsub($a, $b, 0);
     }
 
+    #[Override]
     public function mul(string $a, string $b) : string
     {
         return \bcmul($a, $b, 0);
     }
 
+    #[Override]
     public function divQ(string $a, string $b) : string
     {
         return \bcdiv($a, $b, 0);
     }
 
+    #[Override]
     public function divR(string $a, string $b) : string
     {
         return \bcmod($a, $b, 0);
     }
 
+    #[Override]
     public function divQR(string $a, string $b) : array
     {
         $q = \bcdiv($a, $b, 0);
@@ -48,16 +55,19 @@ public function divQR(string $a, string $b) : array
         return [$q, $r];
     }
 
+    #[Override]
     public function pow(string $a, int $e) : string
     {
         return \bcpow($a, (string) $e, 0);
     }
 
+    #[Override]
     public function modPow(string $base, string $exp, string $mod) : string
     {
         return \bcpowmod($base, $exp, $mod, 0);
     }
 
+    #[Override]
     public function sqrt(string $n) : string
     {
         return \bcsqrt($n, 0);
diff --git a/brick/math/src/Internal/Calculator/GmpCalculator.php b/brick/math/src/Internal/Calculator/GmpCalculator.php
index 42d4c6927..0e44deeb3 100644
--- a/brick/math/src/Internal/Calculator/GmpCalculator.php
+++ b/brick/math/src/Internal/Calculator/GmpCalculator.php
@@ -5,6 +5,7 @@
 namespace Brick\Math\Internal\Calculator;
 
 use Brick\Math\Internal\Calculator;
+use Override;
 
 /**
  * Calculator implementation built around the GMP library.
@@ -15,31 +16,37 @@
  */
 class GmpCalculator extends Calculator
 {
+    #[Override]
     public function add(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_add($a, $b));
     }
 
+    #[Override]
     public function sub(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_sub($a, $b));
     }
 
+    #[Override]
     public function mul(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_mul($a, $b));
     }
 
+    #[Override]
     public function divQ(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_div_q($a, $b));
     }
 
+    #[Override]
     public function divR(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_div_r($a, $b));
     }
 
+    #[Override]
     public function divQR(string $a, string $b) : array
     {
         [$q, $r] = \gmp_div_qr($a, $b);
@@ -50,11 +57,13 @@ public function divQR(string $a, string $b) : array
         ];
     }
 
+    #[Override]
     public function pow(string $a, int $e) : string
     {
         return \gmp_strval(\gmp_pow($a, $e));
     }
 
+    #[Override]
     public function modInverse(string $x, string $m) : ?string
     {
         $result = \gmp_invert($x, $m);
@@ -66,41 +75,49 @@ public function modInverse(string $x, string $m) : ?string
         return \gmp_strval($result);
     }
 
+    #[Override]
     public function modPow(string $base, string $exp, string $mod) : string
     {
         return \gmp_strval(\gmp_powm($base, $exp, $mod));
     }
 
+    #[Override]
     public function gcd(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_gcd($a, $b));
     }
 
+    #[Override]
     public function fromBase(string $number, int $base) : string
     {
         return \gmp_strval(\gmp_init($number, $base));
     }
 
+    #[Override]
     public function toBase(string $number, int $base) : string
     {
         return \gmp_strval($number, $base);
     }
 
+    #[Override]
     public function and(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_and($a, $b));
     }
 
+    #[Override]
     public function or(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_or($a, $b));
     }
 
+    #[Override]
     public function xor(string $a, string $b) : string
     {
         return \gmp_strval(\gmp_xor($a, $b));
     }
 
+    #[Override]
     public function sqrt(string $n) : string
     {
         return \gmp_strval(\gmp_sqrt($n));
diff --git a/brick/math/src/Internal/Calculator/NativeCalculator.php b/brick/math/src/Internal/Calculator/NativeCalculator.php
index 6acd06382..f71c55bed 100644
--- a/brick/math/src/Internal/Calculator/NativeCalculator.php
+++ b/brick/math/src/Internal/Calculator/NativeCalculator.php
@@ -5,6 +5,7 @@
 namespace Brick\Math\Internal\Calculator;
 
 use Brick\Math\Internal\Calculator;
+use Override;
 
 /**
  * Calculator implementation using only native PHP code.
@@ -37,6 +38,7 @@ public function __construct()
         };
     }
 
+    #[Override]
     public function add(string $a, string $b) : string
     {
         /**
@@ -68,11 +70,13 @@ public function add(string $a, string $b) : string
         return $result;
     }
 
+    #[Override]
     public function sub(string $a, string $b) : string
     {
         return $this->add($a, $this->neg($b));
     }
 
+    #[Override]
     public function mul(string $a, string $b) : string
     {
         /**
@@ -116,16 +120,19 @@ public function mul(string $a, string $b) : string
         return $result;
     }
 
+    #[Override]
     public function divQ(string $a, string $b) : string
     {
         return $this->divQR($a, $b)[0];
     }
 
+    #[Override]
     public function divR(string $a, string $b): string
     {
         return $this->divQR($a, $b)[1];
     }
 
+    #[Override]
     public function divQR(string $a, string $b) : array
     {
         if ($a === '0') {
@@ -179,6 +186,7 @@ public function divQR(string $a, string $b) : array
         return [$q, $r];
     }
 
+    #[Override]
     public function pow(string $a, int $e) : string
     {
         if ($e === 0) {
@@ -207,6 +215,7 @@ public function pow(string $a, int $e) : string
     /**
      * Algorithm from: https://www.geeksforgeeks.org/modular-exponentiation-power-in-modular-arithmetic/
      */
+    #[Override]
     public function modPow(string $base, string $exp, string $mod) : string
     {
         // special case: the algorithm below fails with 0 power 0 mod 1 (returns 1 instead of 0)
@@ -241,6 +250,7 @@ public function modPow(string $base, string $exp, string $mod) : string
     /**
      * Adapted from https://cp-algorithms.com/num_methods/roots_newton.html
      */
+    #[Override]
     public function sqrt(string $n) : string
     {
         if ($n === '0') {
@@ -488,6 +498,22 @@ private function doDiv(string $a, string $b) : array
         $r = $a; // remainder
         $z = $y; // focus length, always $y or $y+1
 
+        /** @psalm-var numeric-string $b */
+        $nb = $b * 1; // cast to number
+        // performance optimization in cases where the remainder will never cause int overflow
+        if (is_int(($nb - 1) * 10 + 9)) {
+            $r = (int) \substr($a, 0, $z - 1);
+
+            for ($i = $z - 1; $i < $x; $i++) {
+                $n = $r * 10 + (int) $a[$i];
+                /** @psalm-var int $nb */
+                $q .= \intdiv($n, $nb);
+                $r = $n % $nb;
+            }
+
+            return [\ltrim($q, '0') ?: '0', (string) $r];
+        }
+
         for (;;) {
             $focus = \substr($a, 0, $z);
 
diff --git a/composer.json b/composer.json
index ea9fd0860..7c05d21fd 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
 		"symfony/routing": "^6.4.12",
 		"symfony/translation": "^6.4.4",
 		"wapmorgan/mp3info": "^0.1.1",
-		"web-auth/webauthn-lib": "^4.9.1"
+		"web-auth/webauthn-lib": "^5.2.2"
 	},
 	 "replace": {
         "symfony/polyfill-php80": "*",
diff --git a/composer.lock b/composer.lock
index 71cc3ddae..98253ac0b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ccac2d93769d160abe1b2e4502a5f6f0",
+    "content-hash": "8e41b835fdf30270e11a6e58fd4906bd",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -193,16 +193,16 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.1",
+            "version": "0.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
                 "shasum": ""
             },
             "require": {
@@ -211,7 +211,7 @@
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "5.16.0"
+                "vimeo/psalm": "6.8.8"
             },
             "type": "library",
             "autoload": {
@@ -241,7 +241,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.1"
+                "source": "https://github.com/brick/math/tree/0.13.1"
             },
             "funding": [
                 {
@@ -249,7 +249,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-29T23:19:16+00:00"
+            "time": "2025-03-29T13:50:30+00:00"
         },
         {
             "name": "cweagans/composer-patches",
@@ -1695,70 +1695,6 @@
             },
             "time": "2025-03-19T13:51:03+00:00"
         },
-        {
-            "name": "lcobucci/clock",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lcobucci/clock.git",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~8.1.0 || ~8.2.0",
-                "psr/clock": "^1.0"
-            },
-            "provide": {
-                "psr/clock-implementation": "1.0"
-            },
-            "require-dev": {
-                "infection/infection": "^0.26",
-                "lcobucci/coding-standard": "^9.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-deprecation-rules": "^1.1.1",
-                "phpstan/phpstan-phpunit": "^1.3.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.27"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Lcobucci\\Clock\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Luís Cobucci",
-                    "email": "lcobucci@gmail.com"
-                }
-            ],
-            "description": "Yet another clock abstraction",
-            "support": {
-                "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/3.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/lcobucci",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/lcobucci",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2022-12-19T15:00:24+00:00"
-        },
         {
             "name": "marc-mabe/php-enum",
             "version": "v4.7.1",
@@ -2250,24 +2186,26 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
                 "shasum": ""
             },
             "require": {
-                "php": "^7|^8"
+                "php": "^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
+                "infection/infection": "^0",
+                "nikic/php-fuzzer": "^0",
+                "phpunit/phpunit": "^9|^10|^11",
+                "vimeo/psalm": "^4|^5|^6"
             },
             "type": "library",
             "autoload": {
@@ -2313,7 +2251,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2025-09-24T15:06:41+00:00"
         },
         {
             "name": "pear/archive_tar",
@@ -2789,6 +2727,181 @@
             },
             "time": "2025-05-30T09:26:42+00:00"
         },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "5.6.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761",
+                "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.1",
+                "ext-filter": "*",
+                "php": "^7.4 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7|^2.0",
+                "webmozart/assert": "^1.9.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.3.5 || ~1.6.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "psalm/phar": "^5.26"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5"
+            },
+            "time": "2025-11-27T19:50:05+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.0",
+                "php": "^7.3 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpstan/phpdoc-parser": "^1.18|^2.0"
+            },
+            "require-dev": {
+                "ext-tokenizer": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0"
+            },
+            "time": "2025-11-21T15:09:14+00:00"
+        },
         {
             "name": "phpseclib/phpseclib",
             "version": "2.0.47",
@@ -2899,6 +3012,53 @@
             ],
             "time": "2024-02-26T04:55:38+00:00"
         },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^5.3.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0"
+            },
+            "time": "2025-08-30T15:50:23+00:00"
+        },
         {
             "name": "pimple/pimple",
             "version": "v3.6.0",
@@ -3940,40 +4100,28 @@
         },
         {
             "name": "spomky-labs/cbor-php",
-            "version": "3.0.4",
+            "version": "3.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/cbor-php.git",
-                "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b"
+                "reference": "2a5fb86aacfe1004611370ead6caa2bfc88435d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b",
-                "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b",
+                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/2a5fb86aacfe1004611370ead6caa2bfc88435d0",
+                "reference": "2a5fb86aacfe1004611370ead6caa2bfc88435d0",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13|^0.14",
                 "ext-mbstring": "*",
                 "php": ">=8.0"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
                 "ext-json": "*",
-                "infection/infection": "^0.27",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-beberlei-assert": "^1.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^10.1",
-                "qossmic/deptrac-shim": "^1.0",
-                "rector/rector": "^0.19",
                 "roave/security-advisories": "dev-latest",
-                "symfony/var-dumper": "^6.0|^7.0",
-                "symplify/easy-coding-standard": "^12.0"
+                "symfony/error-handler": "^6.4|^7.1|^8.0",
+                "symfony/var-dumper": "^6.4|^7.1|^8.0"
             },
             "suggest": {
                 "ext-bcmath": "GMP or BCMath extensions will drastically improve the library performance. BCMath extension needed to handle the Big Float and Decimal Fraction Tags",
@@ -4007,7 +4155,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/cbor-php/issues",
-                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.0.4"
+                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.2.2"
             },
             "funding": [
                 {
@@ -4019,45 +4167,43 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-01-29T20:33:48+00:00"
+            "time": "2025-11-13T13:00:34+00:00"
         },
         {
             "name": "spomky-labs/pki-framework",
-            "version": "1.2.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/pki-framework.git",
-                "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6"
+                "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/0b10c8b53366729417d6226ae89a665f9e2d61b6",
-                "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6",
+                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/bf6f55a9d9eb25b7781640221cb54f5c727850d7",
+                "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.10|^0.11|^0.12",
+                "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14",
                 "ext-mbstring": "*",
                 "php": ">=8.1"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
+                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
                 "ext-gmp": "*",
                 "ext-openssl": "*",
-                "infection/infection": "^0.28",
+                "infection/infection": "^0.28|^0.29|^0.31",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-beberlei-assert": "^1.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^10.1|^11.0",
-                "rector/rector": "^1.0",
+                "phpstan/extension-installer": "^1.3|^2.0",
+                "phpstan/phpstan": "^1.8|^2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.1|^2.0",
+                "phpstan/phpstan-strict-rules": "^1.3|^2.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0",
+                "rector/rector": "^1.0|^2.0",
                 "roave/security-advisories": "dev-latest",
-                "symfony/phpunit-bridge": "^6.4|^7.0",
-                "symfony/string": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
                 "symplify/easy-coding-standard": "^12.0"
             },
             "suggest": {
@@ -4118,7 +4264,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
-                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.1"
+                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.0"
             },
             "funding": [
                 {
@@ -4130,7 +4276,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-03-30T18:03:49+00:00"
+            "time": "2025-10-22T08:24:34+00:00"
         },
         {
             "name": "stecman/symfony-console-completion",
@@ -4182,6 +4328,84 @@
             },
             "time": "2024-11-09T03:07:26+00:00"
         },
+        {
+            "name": "symfony/clock",
+            "version": "v7.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "9169f24776edde469914c1e7a1442a50f7a4e110"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/9169f24776edde469914c1e7a1442a50f7a4e110",
+                "reference": "9169f24776edde469914c1e7a1442a50f7a4e110",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Clock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Decouples applications from the system clock",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/clock/tree/v7.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-11-12T15:39:26+00:00"
+        },
         {
             "name": "symfony/console",
             "version": "v6.4.17",
@@ -4879,16 +5103,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
@@ -4937,7 +5161,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -4948,12 +5172,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-06-27T09:58:17+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
@@ -5365,20 +5593,20 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.29.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -5389,8 +5617,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5424,7 +5652,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5435,12 +5663,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
@@ -5503,6 +5735,177 @@
             ],
             "time": "2024-11-06T14:19:14+00:00"
         },
+        {
+            "name": "symfony/property-access",
+            "version": "v7.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/property-access.git",
+                "reference": "537626149d2910ca43eb9ce465654366bf4442f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/537626149d2910ca43eb9ce465654366bf4442f4",
+                "reference": "537626149d2910ca43eb9ce465654366bf4442f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/property-info": "^6.4|^7.0|^8.0"
+            },
+            "require-dev": {
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4.1|^7.0.1|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\PropertyAccess\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides functions to read and write from/to an object or array using a simple string notation",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "access",
+                "array",
+                "extraction",
+                "index",
+                "injection",
+                "object",
+                "property",
+                "property-path",
+                "reflection"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/property-access/tree/v7.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-08T21:14:32+00:00"
+        },
+        {
+            "name": "symfony/property-info",
+            "version": "v7.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/property-info.git",
+                "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/912aafe70bee5cfd09fec5916fe35b83f04ae6ae",
+                "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/type-info": "~7.3.8|^7.4.1|^8.0.1"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "<5.2",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/cache": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/serializer": "<6.4"
+            },
+            "require-dev": {
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "phpstan/phpdoc-parser": "^1.0|^2.0",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\PropertyInfo\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kévin Dunglas",
+                    "email": "dunglas@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Extracts information about PHP class' properties using metadata of popular sources",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "doctrine",
+                "phpdoc",
+                "property",
+                "symfony",
+                "type",
+                "validator"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/property-info/tree/v7.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-12-05T14:04:53+00:00"
+        },
         {
             "name": "symfony/routing",
             "version": "v6.4.12",
@@ -5586,6 +5989,109 @@
             ],
             "time": "2024-09-20T08:32:26+00:00"
         },
+        {
+            "name": "symfony/serializer",
+            "version": "v7.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/serializer.git",
+                "reference": "1a957acb613b520e443c2c659a67c782b67794bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/1a957acb613b520e443c2c659a67c782b67794bc",
+                "reference": "1a957acb613b520e443c2c659a67c782b67794bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php84": "^1.30"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/property-access": "<6.4",
+                "symfony/property-info": "<6.4",
+                "symfony/uid": "<6.4",
+                "symfony/validator": "<6.4",
+                "symfony/yaml": "<6.4"
+            },
+            "require-dev": {
+                "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+                "phpstan/phpdoc-parser": "^1.0|^2.0",
+                "seld/jsonlint": "^1.10",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^7.2|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/filesystem": "^6.4|^7.0|^8.0",
+                "symfony/form": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^6.4|^7.0|^8.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/translation-contracts": "^2.5|^3",
+                "symfony/type-info": "^7.1.8|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Serializer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/serializer/tree/v7.4.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-12-07T17:35:40+00:00"
+        },
         {
             "name": "symfony/service-contracts",
             "version": "v3.5.1",
@@ -5671,22 +6177,23 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.15",
+            "version": "v7.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f"
+                "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d50e862cb0a0e0886f73ca1f31b865efbb795003",
+                "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -5694,11 +6201,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5737,7 +6244,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.15"
+                "source": "https://github.com/symfony/string/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -5748,12 +6255,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:12+00:00"
+            "time": "2025-11-27T13:27:24+00:00"
         },
         {
             "name": "symfony/translation",
@@ -5928,26 +6439,109 @@
             ],
             "time": "2024-01-23T14:51:35+00:00"
         },
+        {
+            "name": "symfony/type-info",
+            "version": "v7.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/type-info.git",
+                "reference": "ac5ab66b21c758df71b7210cf1033d1ac807f202"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/type-info/zipball/ac5ab66b21c758df71b7210cf1033d1ac807f202",
+                "reference": "ac5ab66b21c758df71b7210cf1033d1ac807f202",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.30"
+            },
+            "require-dev": {
+                "phpstan/phpdoc-parser": "^1.30|^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\TypeInfo\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mathias Arlaud",
+                    "email": "mathias.arlaud@gmail.com"
+                },
+                {
+                    "name": "Baptiste LEDUC",
+                    "email": "baptiste.leduc@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Extracts PHP types information.",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "PHPStan",
+                "phpdoc",
+                "symfony",
+                "type"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/type-info/tree/v7.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-12-05T14:04:53+00:00"
+        },
         {
             "name": "symfony/uid",
-            "version": "v6.4.3",
+            "version": "v7.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0"
+                "reference": "2498e9f81b7baa206f44de583f2f48350b90142c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2498e9f81b7baa206f44de583f2f48350b90142c",
+                "reference": "2498e9f81b7baa206f44de583f2f48350b90142c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5984,7 +6578,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.3"
+                "source": "https://github.com/symfony/uid/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -5995,12 +6589,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2025-09-25T11:02:55+00:00"
         },
         {
             "name": "wapmorgan/mp3info",
@@ -6050,38 +6648,37 @@
         },
         {
             "name": "web-auth/cose-lib",
-            "version": "4.3.0",
+            "version": "4.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/cose-lib.git",
-                "reference": "e5c417b3b90e06c84638a18d350e438d760cb955"
+                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/e5c417b3b90e06c84638a18d350e438d760cb955",
-                "reference": "e5c417b3b90e06c84638a18d350e438d760cb955",
+                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/a93b61c48fb587855f64a9ec11ad7b60e867cb15",
+                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13",
                 "ext-json": "*",
-                "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "php": ">=8.1",
                 "spomky-labs/pki-framework": "^1.0"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
-                "infection/infection": "^0.27",
+                "deptrac/deptrac": "^3.0",
+                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
+                "infection/infection": "^0.29",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
                 "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.7",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.2",
-                "phpunit/phpunit": "^10.1",
-                "qossmic/deptrac-shim": "^1.0",
-                "rector/rector": "^0.19",
+                "phpstan/phpstan": "^1.7|^2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.1|^2.0",
+                "phpstan/phpstan-strict-rules": "^1.0|^2.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0",
+                "rector/rector": "^2.0",
                 "symfony/phpunit-bridge": "^6.4|^7.0",
                 "symplify/easy-coding-standard": "^12.0"
             },
@@ -6117,7 +6714,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-auth/cose-lib/issues",
-                "source": "https://github.com/web-auth/cose-lib/tree/4.3.0"
+                "source": "https://github.com/web-auth/cose-lib/tree/4.4.2"
             },
             "funding": [
                 {
@@ -6129,55 +6726,51 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-02-05T21:00:39+00:00"
+            "time": "2025-08-14T20:33:29+00:00"
         },
         {
             "name": "web-auth/webauthn-lib",
-            "version": "4.9.1",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/webauthn-lib.git",
-                "reference": "fd7a0943c663b325e92ad562c2bcc943e77beeac"
+                "reference": "8937c397c8ae91b5af422ca8aa915c756062da74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/fd7a0943c663b325e92ad562c2bcc943e77beeac",
-                "reference": "fd7a0943c663b325e92ad562c2bcc943e77beeac",
+                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/8937c397c8ae91b5af422ca8aa915c756062da74",
+                "reference": "8937c397c8ae91b5af422ca8aa915c756062da74",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "ext-mbstring": "*",
                 "ext-openssl": "*",
-                "lcobucci/clock": "^2.2|^3.0",
                 "paragonie/constant_time_encoding": "^2.6|^3.0",
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "phpdocumentor/reflection-docblock": "^5.3",
                 "psr/clock": "^1.0",
                 "psr/event-dispatcher": "^1.0",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "spomky-labs/cbor-php": "^3.0",
                 "spomky-labs/pki-framework": "^1.0",
+                "symfony/clock": "^6.4|^7.0",
                 "symfony/deprecation-contracts": "^3.2",
-                "symfony/uid": "^6.1|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
                 "web-auth/cose-lib": "^4.2.3"
             },
             "suggest": {
-                "phpdocumentor/reflection-docblock": "As of 4.5.x, the phpdocumentor/reflection-docblock component will become mandatory for converting objects such as the Metadata Statement",
-                "psr/clock-implementation": "As of 4.5.x, the PSR Clock implementation will replace lcobucci/clock",
                 "psr/log-implementation": "Recommended to receive logs from the library",
                 "symfony/event-dispatcher": "Recommended to use dispatched events",
-                "symfony/property-access": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-                "symfony/property-info": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-                "symfony/serializer": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
                 "web-token/jwt-library": "Mandatory for fetching Metadata Statement from distant sources"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "web-auth/webauthn-framework",
-                    "url": "https://github.com/web-auth/webauthn-framework"
+                    "url": "https://github.com/web-auth/webauthn-framework",
+                    "name": "web-auth/webauthn-framework"
                 }
             },
             "autoload": {
@@ -6207,7 +6800,7 @@
                 "webauthn"
             ],
             "support": {
-                "source": "https://github.com/web-auth/webauthn-lib/tree/4.9.1"
+                "source": "https://github.com/web-auth/webauthn-lib/tree/5.2.2"
             },
             "funding": [
                 {
@@ -6219,7 +6812,65 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-07-16T18:36:36+00:00"
+            "time": "2025-03-16T14:38:43+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.12.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-date": "*",
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "suggest": {
+                "ext-intl": "",
+                "ext-simplexml": "",
+                "ext-spl": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
+            },
+            "time": "2025-10-29T15:56:20+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index 914486b4a..e3a5af3f9 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -347,6 +347,8 @@
     'CBOR\\CBORObject' => $vendorDir . '/spomky-labs/cbor-php/src/CBORObject.php',
     'CBOR\\Decoder' => $vendorDir . '/spomky-labs/cbor-php/src/Decoder.php',
     'CBOR\\DecoderInterface' => $vendorDir . '/spomky-labs/cbor-php/src/DecoderInterface.php',
+    'CBOR\\Encoder' => $vendorDir . '/spomky-labs/cbor-php/src/Encoder.php',
+    'CBOR\\EncoderInterface' => $vendorDir . '/spomky-labs/cbor-php/src/EncoderInterface.php',
     'CBOR\\IndefiniteLengthByteStringObject' => $vendorDir . '/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php',
     'CBOR\\IndefiniteLengthListObject' => $vendorDir . '/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php',
     'CBOR\\IndefiniteLengthMapObject' => $vendorDir . '/spomky-labs/cbor-php/src/IndefiniteLengthMapObject.php',
@@ -1172,9 +1174,6 @@
     'Laravel\\SerializableClosure\\Support\\ReflectionClosure' => $vendorDir . '/laravel/serializable-closure/src/Support/ReflectionClosure.php',
     'Laravel\\SerializableClosure\\Support\\SelfReference' => $vendorDir . '/laravel/serializable-closure/src/Support/SelfReference.php',
     'Laravel\\SerializableClosure\\UnsignedSerializableClosure' => $vendorDir . '/laravel/serializable-closure/src/UnsignedSerializableClosure.php',
-    'Lcobucci\\Clock\\Clock' => $vendorDir . '/lcobucci/clock/src/Clock.php',
-    'Lcobucci\\Clock\\FrozenClock' => $vendorDir . '/lcobucci/clock/src/FrozenClock.php',
-    'Lcobucci\\Clock\\SystemClock' => $vendorDir . '/lcobucci/clock/src/SystemClock.php',
     'MabeEnum\\Enum' => $vendorDir . '/marc-mabe/php-enum/src/Enum.php',
     'MabeEnum\\EnumMap' => $vendorDir . '/marc-mabe/php-enum/src/EnumMap.php',
     'MabeEnum\\EnumSerializableTrait' => $vendorDir . '/marc-mabe/php-enum/src/EnumSerializableTrait.php',
@@ -1472,6 +1471,96 @@
     'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
     'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
     'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
+    'PHPStan\\PhpDocParser\\Ast\\AbstractNodeVisitor' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/AbstractNodeVisitor.php',
+    'PHPStan\\PhpDocParser\\Ast\\Attribute' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Attribute.php',
+    'PHPStan\\PhpDocParser\\Ast\\Comment' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Comment.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprArrayItemNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprArrayNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprFalseNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFalseNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprFloatNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprIntegerNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNullNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNullNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprStringNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprTrueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstFetchNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\DoctrineConstExprStringNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Node' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Node.php',
+    'PHPStan\\PhpDocParser\\Ast\\NodeAttributes' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php',
+    'PHPStan\\PhpDocParser\\Ast\\NodeTraverser' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php',
+    'PHPStan\\PhpDocParser\\Ast\\NodeVisitor' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeVisitor.php',
+    'PHPStan\\PhpDocParser\\Ast\\NodeVisitor\\CloningVisitor' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagMethodValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagPropertyValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\DeprecatedTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineAnnotation' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArgument' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArray' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArrayItem' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArrayItem.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ExtendsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\GenericTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ImplementsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\InvalidTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MethodTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MethodTagValueParameterNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MixinTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamClosureThisTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamImmediatelyInvokedCallableTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamLaterInvokedCallableTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamOutTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocChildNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocChildNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTextNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PropertyTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PureUnlessCallableIsImpureTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireExtendsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireImplementsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ReturnTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\SealedTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/SealedTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\SelfOutTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TemplateTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ThrowsTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypeAliasImportTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypeAliasTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypelessParamTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\UsesTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\VarTagValueNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeItemNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeUnsealedTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\CallableTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\CallableTypeParameterNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ConditionalTypeForParameterNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ConditionalTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ConstTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\GenericTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\IdentifierTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\IntersectionTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\InvalidTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\NullableTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ObjectShapeItemNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ObjectShapeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\OffsetAccessTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\ThisTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/ThisTypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\TypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php',
+    'PHPStan\\PhpDocParser\\Ast\\Type\\UnionTypeNode' => $vendorDir . '/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php',
+    'PHPStan\\PhpDocParser\\Lexer\\Lexer' => $vendorDir . '/phpstan/phpdoc-parser/src/Lexer/Lexer.php',
+    'PHPStan\\PhpDocParser\\ParserConfig' => $vendorDir . '/phpstan/phpdoc-parser/src/ParserConfig.php',
+    'PHPStan\\PhpDocParser\\Parser\\ConstExprParser' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php',
+    'PHPStan\\PhpDocParser\\Parser\\ParserException' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/ParserException.php',
+    'PHPStan\\PhpDocParser\\Parser\\PhpDocParser' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php',
+    'PHPStan\\PhpDocParser\\Parser\\StringUnescaper' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php',
+    'PHPStan\\PhpDocParser\\Parser\\TokenIterator' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/TokenIterator.php',
+    'PHPStan\\PhpDocParser\\Parser\\TypeParser' => $vendorDir . '/phpstan/phpdoc-parser/src/Parser/TypeParser.php',
+    'PHPStan\\PhpDocParser\\Printer\\DiffElem' => $vendorDir . '/phpstan/phpdoc-parser/src/Printer/DiffElem.php',
+    'PHPStan\\PhpDocParser\\Printer\\Differ' => $vendorDir . '/phpstan/phpdoc-parser/src/Printer/Differ.php',
+    'PHPStan\\PhpDocParser\\Printer\\Printer' => $vendorDir . '/phpstan/phpdoc-parser/src/Printer/Printer.php',
     'ParagonIE\\ConstantTime\\Base32' => $vendorDir . '/paragonie/constant_time_encoding/src/Base32.php',
     'ParagonIE\\ConstantTime\\Base32Hex' => $vendorDir . '/paragonie/constant_time_encoding/src/Base32Hex.php',
     'ParagonIE\\ConstantTime\\Base64' => $vendorDir . '/paragonie/constant_time_encoding/src/Base64.php',
@@ -2229,6 +2318,13 @@
     'Stecman\\Component\\Symfony\\Console\\BashCompletion\\EnvironmentCompletionContext' => $vendorDir . '/stecman/symfony-console-completion/src/EnvironmentCompletionContext.php',
     'Stecman\\Component\\Symfony\\Console\\BashCompletion\\HookFactory' => $vendorDir . '/stecman/symfony-console-completion/src/HookFactory.php',
     'Stringable' => $vendorDir . '/marc-mabe/php-enum/stubs/Stringable.php',
+    'Symfony\\Component\\Clock\\Clock' => $vendorDir . '/symfony/clock/Clock.php',
+    'Symfony\\Component\\Clock\\ClockAwareTrait' => $vendorDir . '/symfony/clock/ClockAwareTrait.php',
+    'Symfony\\Component\\Clock\\ClockInterface' => $vendorDir . '/symfony/clock/ClockInterface.php',
+    'Symfony\\Component\\Clock\\DatePoint' => $vendorDir . '/symfony/clock/DatePoint.php',
+    'Symfony\\Component\\Clock\\MockClock' => $vendorDir . '/symfony/clock/MockClock.php',
+    'Symfony\\Component\\Clock\\MonotonicClock' => $vendorDir . '/symfony/clock/MonotonicClock.php',
+    'Symfony\\Component\\Clock\\NativeClock' => $vendorDir . '/symfony/clock/NativeClock.php',
     'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
     'Symfony\\Component\\Console\\Attribute\\AsCommand' => $vendorDir . '/symfony/console/Attribute/AsCommand.php',
     'Symfony\\Component\\Console\\CI\\GithubActionReporter' => $vendorDir . '/symfony/console/CI/GithubActionReporter.php',
@@ -2654,6 +2750,51 @@
     'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => $vendorDir . '/symfony/process/Pipes/WindowsPipes.php',
     'Symfony\\Component\\Process\\Process' => $vendorDir . '/symfony/process/Process.php',
     'Symfony\\Component\\Process\\ProcessUtils' => $vendorDir . '/symfony/process/ProcessUtils.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\AccessException' => $vendorDir . '/symfony/property-access/Exception/AccessException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/property-access/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/property-access/Exception/InvalidArgumentException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\InvalidPropertyPathException' => $vendorDir . '/symfony/property-access/Exception/InvalidPropertyPathException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\InvalidTypeException' => $vendorDir . '/symfony/property-access/Exception/InvalidTypeException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\NoSuchIndexException' => $vendorDir . '/symfony/property-access/Exception/NoSuchIndexException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\NoSuchPropertyException' => $vendorDir . '/symfony/property-access/Exception/NoSuchPropertyException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\OutOfBoundsException' => $vendorDir . '/symfony/property-access/Exception/OutOfBoundsException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\RuntimeException' => $vendorDir . '/symfony/property-access/Exception/RuntimeException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/property-access/Exception/UnexpectedTypeException.php',
+    'Symfony\\Component\\PropertyAccess\\Exception\\UninitializedPropertyException' => $vendorDir . '/symfony/property-access/Exception/UninitializedPropertyException.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyAccess' => $vendorDir . '/symfony/property-access/PropertyAccess.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyAccessor' => $vendorDir . '/symfony/property-access/PropertyAccessor.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder' => $vendorDir . '/symfony/property-access/PropertyAccessorBuilder.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyAccessorInterface' => $vendorDir . '/symfony/property-access/PropertyAccessorInterface.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyPath' => $vendorDir . '/symfony/property-access/PropertyPath.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyPathBuilder' => $vendorDir . '/symfony/property-access/PropertyPathBuilder.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyPathInterface' => $vendorDir . '/symfony/property-access/PropertyPathInterface.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyPathIterator' => $vendorDir . '/symfony/property-access/PropertyPathIterator.php',
+    'Symfony\\Component\\PropertyAccess\\PropertyPathIteratorInterface' => $vendorDir . '/symfony/property-access/PropertyPathIteratorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\DependencyInjection\\PropertyInfoConstructorPass' => $vendorDir . '/symfony/property-info/DependencyInjection/PropertyInfoConstructorPass.php',
+    'Symfony\\Component\\PropertyInfo\\DependencyInjection\\PropertyInfoPass' => $vendorDir . '/symfony/property-info/DependencyInjection/PropertyInfoPass.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\ConstructorArgumentTypeExtractorInterface' => $vendorDir . '/symfony/property-info/Extractor/ConstructorArgumentTypeExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\ConstructorExtractor' => $vendorDir . '/symfony/property-info/Extractor/ConstructorExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\PhpDocExtractor' => $vendorDir . '/symfony/property-info/Extractor/PhpDocExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\PhpStanExtractor' => $vendorDir . '/symfony/property-info/Extractor/PhpStanExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\ReflectionExtractor' => $vendorDir . '/symfony/property-info/Extractor/ReflectionExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\Extractor\\SerializerExtractor' => $vendorDir . '/symfony/property-info/Extractor/SerializerExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyAccessExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyAccessExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyDescriptionExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyDescriptionExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyDocBlockExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyDocBlockExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyInfoCacheExtractor' => $vendorDir . '/symfony/property-info/PropertyInfoCacheExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyInfoExtractor' => $vendorDir . '/symfony/property-info/PropertyInfoExtractor.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyInfoExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyInfoExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyInitializableExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyInitializableExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyListExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyListExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyReadInfo' => $vendorDir . '/symfony/property-info/PropertyReadInfo.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyReadInfoExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyReadInfoExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyTypeExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyTypeExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyWriteInfo' => $vendorDir . '/symfony/property-info/PropertyWriteInfo.php',
+    'Symfony\\Component\\PropertyInfo\\PropertyWriteInfoExtractorInterface' => $vendorDir . '/symfony/property-info/PropertyWriteInfoExtractorInterface.php',
+    'Symfony\\Component\\PropertyInfo\\Type' => $vendorDir . '/symfony/property-info/Type.php',
+    'Symfony\\Component\\PropertyInfo\\Util\\LegacyTypeConverter' => $vendorDir . '/symfony/property-info/Util/LegacyTypeConverter.php',
+    'Symfony\\Component\\PropertyInfo\\Util\\PhpDocTypeHelper' => $vendorDir . '/symfony/property-info/Util/PhpDocTypeHelper.php',
+    'Symfony\\Component\\PropertyInfo\\Util\\PhpStanTypeHelper' => $vendorDir . '/symfony/property-info/Util/PhpStanTypeHelper.php',
     'Symfony\\Component\\Routing\\Alias' => $vendorDir . '/symfony/routing/Alias.php',
     'Symfony\\Component\\Routing\\Annotation\\Route' => $vendorDir . '/symfony/routing/Annotation/Route.php',
     'Symfony\\Component\\Routing\\Attribute\\Route' => $vendorDir . '/symfony/routing/Attribute/Route.php',
@@ -2725,6 +2866,139 @@
     'Symfony\\Component\\Routing\\RouteCompilerInterface' => $vendorDir . '/symfony/routing/RouteCompilerInterface.php',
     'Symfony\\Component\\Routing\\Router' => $vendorDir . '/symfony/routing/Router.php',
     'Symfony\\Component\\Routing\\RouterInterface' => $vendorDir . '/symfony/routing/RouterInterface.php',
+    'Symfony\\Component\\Serializer\\Annotation\\Context' => $vendorDir . '/symfony/serializer/Annotation/Context.php',
+    'Symfony\\Component\\Serializer\\Annotation\\DiscriminatorMap' => $vendorDir . '/symfony/serializer/Annotation/DiscriminatorMap.php',
+    'Symfony\\Component\\Serializer\\Annotation\\Groups' => $vendorDir . '/symfony/serializer/Annotation/Groups.php',
+    'Symfony\\Component\\Serializer\\Annotation\\Ignore' => $vendorDir . '/symfony/serializer/Annotation/Ignore.php',
+    'Symfony\\Component\\Serializer\\Annotation\\MaxDepth' => $vendorDir . '/symfony/serializer/Annotation/MaxDepth.php',
+    'Symfony\\Component\\Serializer\\Annotation\\SerializedName' => $vendorDir . '/symfony/serializer/Annotation/SerializedName.php',
+    'Symfony\\Component\\Serializer\\Annotation\\SerializedPath' => $vendorDir . '/symfony/serializer/Annotation/SerializedPath.php',
+    'Symfony\\Component\\Serializer\\Attribute\\Context' => $vendorDir . '/symfony/serializer/Attribute/Context.php',
+    'Symfony\\Component\\Serializer\\Attribute\\DiscriminatorMap' => $vendorDir . '/symfony/serializer/Attribute/DiscriminatorMap.php',
+    'Symfony\\Component\\Serializer\\Attribute\\ExtendsSerializationFor' => $vendorDir . '/symfony/serializer/Attribute/ExtendsSerializationFor.php',
+    'Symfony\\Component\\Serializer\\Attribute\\Groups' => $vendorDir . '/symfony/serializer/Attribute/Groups.php',
+    'Symfony\\Component\\Serializer\\Attribute\\Ignore' => $vendorDir . '/symfony/serializer/Attribute/Ignore.php',
+    'Symfony\\Component\\Serializer\\Attribute\\MaxDepth' => $vendorDir . '/symfony/serializer/Attribute/MaxDepth.php',
+    'Symfony\\Component\\Serializer\\Attribute\\SerializedName' => $vendorDir . '/symfony/serializer/Attribute/SerializedName.php',
+    'Symfony\\Component\\Serializer\\Attribute\\SerializedPath' => $vendorDir . '/symfony/serializer/Attribute/SerializedPath.php',
+    'Symfony\\Component\\Serializer\\CacheWarmer\\CompiledClassMetadataCacheWarmer' => $vendorDir . '/symfony/serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php',
+    'Symfony\\Component\\Serializer\\Command\\DebugCommand' => $vendorDir . '/symfony/serializer/Command/DebugCommand.php',
+    'Symfony\\Component\\Serializer\\Context\\ContextBuilderInterface' => $vendorDir . '/symfony/serializer/Context/ContextBuilderInterface.php',
+    'Symfony\\Component\\Serializer\\Context\\ContextBuilderTrait' => $vendorDir . '/symfony/serializer/Context/ContextBuilderTrait.php',
+    'Symfony\\Component\\Serializer\\Context\\Encoder\\CsvEncoderContextBuilder' => $vendorDir . '/symfony/serializer/Context/Encoder/CsvEncoderContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Encoder\\JsonEncoderContextBuilder' => $vendorDir . '/symfony/serializer/Context/Encoder/JsonEncoderContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Encoder\\XmlEncoderContextBuilder' => $vendorDir . '/symfony/serializer/Context/Encoder/XmlEncoderContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Encoder\\YamlEncoderContextBuilder' => $vendorDir . '/symfony/serializer/Context/Encoder/YamlEncoderContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\AbstractNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/AbstractNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\AbstractObjectNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/AbstractObjectNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\BackedEnumNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\ConstraintViolationListNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/ConstraintViolationListNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\DateIntervalNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/DateIntervalNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\DateTimeNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/DateTimeNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\FormErrorNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/FormErrorNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\GetSetMethodNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/GetSetMethodNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\JsonSerializableNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/JsonSerializableNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\ObjectNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/ObjectNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\ProblemNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/ProblemNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\PropertyNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/PropertyNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\UidNormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/UidNormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\Normalizer\\UnwrappingDenormalizerContextBuilder' => $vendorDir . '/symfony/serializer/Context/Normalizer/UnwrappingDenormalizerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\Context\\SerializerContextBuilder' => $vendorDir . '/symfony/serializer/Context/SerializerContextBuilder.php',
+    'Symfony\\Component\\Serializer\\DataCollector\\SerializerDataCollector' => $vendorDir . '/symfony/serializer/DataCollector/SerializerDataCollector.php',
+    'Symfony\\Component\\Serializer\\Debug\\TraceableEncoder' => $vendorDir . '/symfony/serializer/Debug/TraceableEncoder.php',
+    'Symfony\\Component\\Serializer\\Debug\\TraceableNormalizer' => $vendorDir . '/symfony/serializer/Debug/TraceableNormalizer.php',
+    'Symfony\\Component\\Serializer\\Debug\\TraceableSerializer' => $vendorDir . '/symfony/serializer/Debug/TraceableSerializer.php',
+    'Symfony\\Component\\Serializer\\DependencyInjection\\AttributeMetadataPass' => $vendorDir . '/symfony/serializer/DependencyInjection/AttributeMetadataPass.php',
+    'Symfony\\Component\\Serializer\\DependencyInjection\\SerializerPass' => $vendorDir . '/symfony/serializer/DependencyInjection/SerializerPass.php',
+    'Symfony\\Component\\Serializer\\Encoder\\ChainDecoder' => $vendorDir . '/symfony/serializer/Encoder/ChainDecoder.php',
+    'Symfony\\Component\\Serializer\\Encoder\\ChainEncoder' => $vendorDir . '/symfony/serializer/Encoder/ChainEncoder.php',
+    'Symfony\\Component\\Serializer\\Encoder\\ContextAwareDecoderInterface' => $vendorDir . '/symfony/serializer/Encoder/ContextAwareDecoderInterface.php',
+    'Symfony\\Component\\Serializer\\Encoder\\ContextAwareEncoderInterface' => $vendorDir . '/symfony/serializer/Encoder/ContextAwareEncoderInterface.php',
+    'Symfony\\Component\\Serializer\\Encoder\\CsvEncoder' => $vendorDir . '/symfony/serializer/Encoder/CsvEncoder.php',
+    'Symfony\\Component\\Serializer\\Encoder\\DecoderInterface' => $vendorDir . '/symfony/serializer/Encoder/DecoderInterface.php',
+    'Symfony\\Component\\Serializer\\Encoder\\EncoderInterface' => $vendorDir . '/symfony/serializer/Encoder/EncoderInterface.php',
+    'Symfony\\Component\\Serializer\\Encoder\\JsonDecode' => $vendorDir . '/symfony/serializer/Encoder/JsonDecode.php',
+    'Symfony\\Component\\Serializer\\Encoder\\JsonEncode' => $vendorDir . '/symfony/serializer/Encoder/JsonEncode.php',
+    'Symfony\\Component\\Serializer\\Encoder\\JsonEncoder' => $vendorDir . '/symfony/serializer/Encoder/JsonEncoder.php',
+    'Symfony\\Component\\Serializer\\Encoder\\NormalizationAwareInterface' => $vendorDir . '/symfony/serializer/Encoder/NormalizationAwareInterface.php',
+    'Symfony\\Component\\Serializer\\Encoder\\XmlEncoder' => $vendorDir . '/symfony/serializer/Encoder/XmlEncoder.php',
+    'Symfony\\Component\\Serializer\\Encoder\\YamlEncoder' => $vendorDir . '/symfony/serializer/Encoder/YamlEncoder.php',
+    'Symfony\\Component\\Serializer\\Exception\\BadMethodCallException' => $vendorDir . '/symfony/serializer/Exception/BadMethodCallException.php',
+    'Symfony\\Component\\Serializer\\Exception\\CircularReferenceException' => $vendorDir . '/symfony/serializer/Exception/CircularReferenceException.php',
+    'Symfony\\Component\\Serializer\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/serializer/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\Serializer\\Exception\\ExtraAttributesException' => $vendorDir . '/symfony/serializer/Exception/ExtraAttributesException.php',
+    'Symfony\\Component\\Serializer\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/serializer/Exception/InvalidArgumentException.php',
+    'Symfony\\Component\\Serializer\\Exception\\LogicException' => $vendorDir . '/symfony/serializer/Exception/LogicException.php',
+    'Symfony\\Component\\Serializer\\Exception\\MappingException' => $vendorDir . '/symfony/serializer/Exception/MappingException.php',
+    'Symfony\\Component\\Serializer\\Exception\\MissingConstructorArgumentsException' => $vendorDir . '/symfony/serializer/Exception/MissingConstructorArgumentsException.php',
+    'Symfony\\Component\\Serializer\\Exception\\NotEncodableValueException' => $vendorDir . '/symfony/serializer/Exception/NotEncodableValueException.php',
+    'Symfony\\Component\\Serializer\\Exception\\NotNormalizableValueException' => $vendorDir . '/symfony/serializer/Exception/NotNormalizableValueException.php',
+    'Symfony\\Component\\Serializer\\Exception\\PartialDenormalizationException' => $vendorDir . '/symfony/serializer/Exception/PartialDenormalizationException.php',
+    'Symfony\\Component\\Serializer\\Exception\\RuntimeException' => $vendorDir . '/symfony/serializer/Exception/RuntimeException.php',
+    'Symfony\\Component\\Serializer\\Exception\\UnexpectedPropertyException' => $vendorDir . '/symfony/serializer/Exception/UnexpectedPropertyException.php',
+    'Symfony\\Component\\Serializer\\Exception\\UnexpectedValueException' => $vendorDir . '/symfony/serializer/Exception/UnexpectedValueException.php',
+    'Symfony\\Component\\Serializer\\Exception\\UnsupportedException' => $vendorDir . '/symfony/serializer/Exception/UnsupportedException.php',
+    'Symfony\\Component\\Serializer\\Exception\\UnsupportedFormatException' => $vendorDir . '/symfony/serializer/Exception/UnsupportedFormatException.php',
+    'Symfony\\Component\\Serializer\\Extractor\\ObjectPropertyListExtractor' => $vendorDir . '/symfony/serializer/Extractor/ObjectPropertyListExtractor.php',
+    'Symfony\\Component\\Serializer\\Extractor\\ObjectPropertyListExtractorInterface' => $vendorDir . '/symfony/serializer/Extractor/ObjectPropertyListExtractorInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\AttributeMetadata' => $vendorDir . '/symfony/serializer/Mapping/AttributeMetadata.php',
+    'Symfony\\Component\\Serializer\\Mapping\\AttributeMetadataInterface' => $vendorDir . '/symfony/serializer/Mapping/AttributeMetadataInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorFromClassMetadata' => $vendorDir . '/symfony/serializer/Mapping/ClassDiscriminatorFromClassMetadata.php',
+    'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorMapping' => $vendorDir . '/symfony/serializer/Mapping/ClassDiscriminatorMapping.php',
+    'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorResolverInterface' => $vendorDir . '/symfony/serializer/Mapping/ClassDiscriminatorResolverInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\ClassMetadata' => $vendorDir . '/symfony/serializer/Mapping/ClassMetadata.php',
+    'Symfony\\Component\\Serializer\\Mapping\\ClassMetadataInterface' => $vendorDir . '/symfony/serializer/Mapping/ClassMetadataInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\CacheClassMetadataFactory' => $vendorDir . '/symfony/serializer/Mapping/Factory/CacheClassMetadataFactory.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory' => $vendorDir . '/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactoryCompiler' => $vendorDir . '/symfony/serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactoryInterface' => $vendorDir . '/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassResolverTrait' => $vendorDir . '/symfony/serializer/Mapping/Factory/ClassResolverTrait.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Factory\\CompiledClassMetadataFactory' => $vendorDir . '/symfony/serializer/Mapping/Factory/CompiledClassMetadataFactory.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\AttributeLoader' => $vendorDir . '/symfony/serializer/Mapping/Loader/AttributeLoader.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\FileLoader' => $vendorDir . '/symfony/serializer/Mapping/Loader/FileLoader.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\LoaderChain' => $vendorDir . '/symfony/serializer/Mapping/Loader/LoaderChain.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\LoaderInterface' => $vendorDir . '/symfony/serializer/Mapping/Loader/LoaderInterface.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/serializer/Mapping/Loader/XmlFileLoader.php',
+    'Symfony\\Component\\Serializer\\Mapping\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/serializer/Mapping/Loader/YamlFileLoader.php',
+    'Symfony\\Component\\Serializer\\NameConverter\\AdvancedNameConverterInterface' => $vendorDir . '/symfony/serializer/NameConverter/AdvancedNameConverterInterface.php',
+    'Symfony\\Component\\Serializer\\NameConverter\\CamelCaseToSnakeCaseNameConverter' => $vendorDir . '/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php',
+    'Symfony\\Component\\Serializer\\NameConverter\\MetadataAwareNameConverter' => $vendorDir . '/symfony/serializer/NameConverter/MetadataAwareNameConverter.php',
+    'Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface' => $vendorDir . '/symfony/serializer/NameConverter/NameConverterInterface.php',
+    'Symfony\\Component\\Serializer\\NameConverter\\SnakeCaseToCamelCaseNameConverter' => $vendorDir . '/symfony/serializer/NameConverter/SnakeCaseToCamelCaseNameConverter.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/AbstractNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\AbstractObjectNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/AbstractObjectNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer' => $vendorDir . '/symfony/serializer/Normalizer/ArrayDenormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\BackedEnumNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/BackedEnumNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\ConstraintViolationListNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/ConstraintViolationListNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\CustomNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/CustomNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DataUriNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/DataUriNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DateIntervalNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/DateIntervalNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DateTimeNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/DateTimeNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DateTimeZoneNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/DateTimeZoneNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DenormalizableInterface' => $vendorDir . '/symfony/serializer/Normalizer/DenormalizableInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerAwareInterface' => $vendorDir . '/symfony/serializer/Normalizer/DenormalizerAwareInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerAwareTrait' => $vendorDir . '/symfony/serializer/Normalizer/DenormalizerAwareTrait.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerInterface' => $vendorDir . '/symfony/serializer/Normalizer/DenormalizerInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\FormErrorNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/FormErrorNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/GetSetMethodNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\JsonSerializableNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/JsonSerializableNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\MimeMessageNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/MimeMessageNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\NormalizableInterface' => $vendorDir . '/symfony/serializer/Normalizer/NormalizableInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\NormalizerAwareInterface' => $vendorDir . '/symfony/serializer/Normalizer/NormalizerAwareInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\NormalizerAwareTrait' => $vendorDir . '/symfony/serializer/Normalizer/NormalizerAwareTrait.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\NormalizerInterface' => $vendorDir . '/symfony/serializer/Normalizer/NormalizerInterface.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\NumberNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/NumberNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/ObjectNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\ObjectToPopulateTrait' => $vendorDir . '/symfony/serializer/Normalizer/ObjectToPopulateTrait.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\ProblemNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/ProblemNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/PropertyNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\TranslatableNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/TranslatableNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\UidNormalizer' => $vendorDir . '/symfony/serializer/Normalizer/UidNormalizer.php',
+    'Symfony\\Component\\Serializer\\Normalizer\\UnwrappingDenormalizer' => $vendorDir . '/symfony/serializer/Normalizer/UnwrappingDenormalizer.php',
+    'Symfony\\Component\\Serializer\\Serializer' => $vendorDir . '/symfony/serializer/Serializer.php',
+    'Symfony\\Component\\Serializer\\SerializerAwareInterface' => $vendorDir . '/symfony/serializer/SerializerAwareInterface.php',
+    'Symfony\\Component\\Serializer\\SerializerAwareTrait' => $vendorDir . '/symfony/serializer/SerializerAwareTrait.php',
+    'Symfony\\Component\\Serializer\\SerializerInterface' => $vendorDir . '/symfony/serializer/SerializerInterface.php',
     'Symfony\\Component\\String\\AbstractString' => $vendorDir . '/symfony/string/AbstractString.php',
     'Symfony\\Component\\String\\AbstractUnicodeString' => $vendorDir . '/symfony/string/AbstractUnicodeString.php',
     'Symfony\\Component\\String\\ByteString' => $vendorDir . '/symfony/string/ByteString.php',
@@ -2735,9 +3009,11 @@
     'Symfony\\Component\\String\\Inflector\\EnglishInflector' => $vendorDir . '/symfony/string/Inflector/EnglishInflector.php',
     'Symfony\\Component\\String\\Inflector\\FrenchInflector' => $vendorDir . '/symfony/string/Inflector/FrenchInflector.php',
     'Symfony\\Component\\String\\Inflector\\InflectorInterface' => $vendorDir . '/symfony/string/Inflector/InflectorInterface.php',
+    'Symfony\\Component\\String\\Inflector\\SpanishInflector' => $vendorDir . '/symfony/string/Inflector/SpanishInflector.php',
     'Symfony\\Component\\String\\LazyString' => $vendorDir . '/symfony/string/LazyString.php',
     'Symfony\\Component\\String\\Slugger\\AsciiSlugger' => $vendorDir . '/symfony/string/Slugger/AsciiSlugger.php',
     'Symfony\\Component\\String\\Slugger\\SluggerInterface' => $vendorDir . '/symfony/string/Slugger/SluggerInterface.php',
+    'Symfony\\Component\\String\\TruncateMode' => $vendorDir . '/symfony/string/TruncateMode.php',
     'Symfony\\Component\\String\\UnicodeString' => $vendorDir . '/symfony/string/UnicodeString.php',
     'Symfony\\Component\\Translation\\CatalogueMetadataAwareInterface' => $vendorDir . '/symfony/translation/CatalogueMetadataAwareInterface.php',
     'Symfony\\Component\\Translation\\Catalogue\\AbstractOperation' => $vendorDir . '/symfony/translation/Catalogue/AbstractOperation.php',
@@ -2833,17 +3109,52 @@
     'Symfony\\Component\\Translation\\Util\\XliffUtils' => $vendorDir . '/symfony/translation/Util/XliffUtils.php',
     'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => $vendorDir . '/symfony/translation/Writer/TranslationWriter.php',
     'Symfony\\Component\\Translation\\Writer\\TranslationWriterInterface' => $vendorDir . '/symfony/translation/Writer/TranslationWriterInterface.php',
+    'Symfony\\Component\\TypeInfo\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/type-info/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\TypeInfo\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/type-info/Exception/InvalidArgumentException.php',
+    'Symfony\\Component\\TypeInfo\\Exception\\LogicException' => $vendorDir . '/symfony/type-info/Exception/LogicException.php',
+    'Symfony\\Component\\TypeInfo\\Exception\\RuntimeException' => $vendorDir . '/symfony/type-info/Exception/RuntimeException.php',
+    'Symfony\\Component\\TypeInfo\\Exception\\UnsupportedException' => $vendorDir . '/symfony/type-info/Exception/UnsupportedException.php',
+    'Symfony\\Component\\TypeInfo\\Type' => $vendorDir . '/symfony/type-info/Type.php',
+    'Symfony\\Component\\TypeInfo\\TypeContext\\TypeContext' => $vendorDir . '/symfony/type-info/TypeContext/TypeContext.php',
+    'Symfony\\Component\\TypeInfo\\TypeContext\\TypeContextFactory' => $vendorDir . '/symfony/type-info/TypeContext/TypeContextFactory.php',
+    'Symfony\\Component\\TypeInfo\\TypeFactoryTrait' => $vendorDir . '/symfony/type-info/TypeFactoryTrait.php',
+    'Symfony\\Component\\TypeInfo\\TypeIdentifier' => $vendorDir . '/symfony/type-info/TypeIdentifier.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\PhpDocAwareReflectionTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/PhpDocAwareReflectionTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionParameterTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/ReflectionParameterTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionPropertyTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/ReflectionPropertyTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionReturnTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/ReflectionReturnTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/ReflectionTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\StringTypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/StringTypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\TypeResolver' => $vendorDir . '/symfony/type-info/TypeResolver/TypeResolver.php',
+    'Symfony\\Component\\TypeInfo\\TypeResolver\\TypeResolverInterface' => $vendorDir . '/symfony/type-info/TypeResolver/TypeResolverInterface.php',
+    'Symfony\\Component\\TypeInfo\\Type\\ArrayShapeType' => $vendorDir . '/symfony/type-info/Type/ArrayShapeType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\BackedEnumType' => $vendorDir . '/symfony/type-info/Type/BackedEnumType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\BuiltinType' => $vendorDir . '/symfony/type-info/Type/BuiltinType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\CollectionType' => $vendorDir . '/symfony/type-info/Type/CollectionType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\CompositeTypeInterface' => $vendorDir . '/symfony/type-info/Type/CompositeTypeInterface.php',
+    'Symfony\\Component\\TypeInfo\\Type\\EnumType' => $vendorDir . '/symfony/type-info/Type/EnumType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\GenericType' => $vendorDir . '/symfony/type-info/Type/GenericType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\IntersectionType' => $vendorDir . '/symfony/type-info/Type/IntersectionType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\NullableType' => $vendorDir . '/symfony/type-info/Type/NullableType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\ObjectType' => $vendorDir . '/symfony/type-info/Type/ObjectType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\TemplateType' => $vendorDir . '/symfony/type-info/Type/TemplateType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\UnionType' => $vendorDir . '/symfony/type-info/Type/UnionType.php',
+    'Symfony\\Component\\TypeInfo\\Type\\WrappingTypeInterface' => $vendorDir . '/symfony/type-info/Type/WrappingTypeInterface.php',
     'Symfony\\Component\\Uid\\AbstractUid' => $vendorDir . '/symfony/uid/AbstractUid.php',
     'Symfony\\Component\\Uid\\BinaryUtil' => $vendorDir . '/symfony/uid/BinaryUtil.php',
     'Symfony\\Component\\Uid\\Command\\GenerateUlidCommand' => $vendorDir . '/symfony/uid/Command/GenerateUlidCommand.php',
     'Symfony\\Component\\Uid\\Command\\GenerateUuidCommand' => $vendorDir . '/symfony/uid/Command/GenerateUuidCommand.php',
     'Symfony\\Component\\Uid\\Command\\InspectUlidCommand' => $vendorDir . '/symfony/uid/Command/InspectUlidCommand.php',
     'Symfony\\Component\\Uid\\Command\\InspectUuidCommand' => $vendorDir . '/symfony/uid/Command/InspectUuidCommand.php',
+    'Symfony\\Component\\Uid\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/uid/Exception/InvalidArgumentException.php',
+    'Symfony\\Component\\Uid\\Exception\\LogicException' => $vendorDir . '/symfony/uid/Exception/LogicException.php',
+    'Symfony\\Component\\Uid\\Factory\\MockUuidFactory' => $vendorDir . '/symfony/uid/Factory/MockUuidFactory.php',
     'Symfony\\Component\\Uid\\Factory\\NameBasedUuidFactory' => $vendorDir . '/symfony/uid/Factory/NameBasedUuidFactory.php',
     'Symfony\\Component\\Uid\\Factory\\RandomBasedUuidFactory' => $vendorDir . '/symfony/uid/Factory/RandomBasedUuidFactory.php',
     'Symfony\\Component\\Uid\\Factory\\TimeBasedUuidFactory' => $vendorDir . '/symfony/uid/Factory/TimeBasedUuidFactory.php',
     'Symfony\\Component\\Uid\\Factory\\UlidFactory' => $vendorDir . '/symfony/uid/Factory/UlidFactory.php',
     'Symfony\\Component\\Uid\\Factory\\UuidFactory' => $vendorDir . '/symfony/uid/Factory/UuidFactory.php',
+    'Symfony\\Component\\Uid\\HashableInterface' => $vendorDir . '/symfony/uid/HashableInterface.php',
     'Symfony\\Component\\Uid\\MaxUlid' => $vendorDir . '/symfony/uid/MaxUlid.php',
     'Symfony\\Component\\Uid\\MaxUuid' => $vendorDir . '/symfony/uid/MaxUuid.php',
     'Symfony\\Component\\Uid\\NilUlid' => $vendorDir . '/symfony/uid/NilUlid.php',
@@ -2885,7 +3196,6 @@
     'Symfony\\Polyfill\\Uuid\\Uuid' => $vendorDir . '/symfony/polyfill-uuid/Uuid.php',
     'System' => $vendorDir . '/pear/pear-core-minimal/src/System.php',
     'Webauthn\\AttestationStatement\\AndroidKeyAttestationStatementSupport' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php',
-    'Webauthn\\AttestationStatement\\AndroidSafetyNetAttestationStatementSupport' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php',
     'Webauthn\\AttestationStatement\\AppleAttestationStatementSupport' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/AppleAttestationStatementSupport.php',
     'Webauthn\\AttestationStatement\\AttestationObject' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php',
     'Webauthn\\AttestationStatement\\AttestationObjectLoader' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/AttestationObjectLoader.php',
@@ -2897,14 +3207,19 @@
     'Webauthn\\AttestationStatement\\PackedAttestationStatementSupport' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php',
     'Webauthn\\AttestationStatement\\TPMAttestationStatementSupport' => $vendorDir . '/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php',
     'Webauthn\\AttestedCredentialData' => $vendorDir . '/web-auth/webauthn-lib/src/AttestedCredentialData.php',
+    'Webauthn\\AuthenticationExtensions\\AppIdExcludeInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdExcludeInputExtension.php',
+    'Webauthn\\AuthenticationExtensions\\AppIdInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdInputExtension.php',
     'Webauthn\\AuthenticationExtensions\\AuthenticationExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php',
+    'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionLoader' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionLoader.php',
     'Webauthn\\AuthenticationExtensions\\AuthenticationExtensions' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php',
-    'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientInputs' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php',
-    'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientOutputs' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php',
-    'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientOutputsLoader' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php',
+    'Webauthn\\AuthenticationExtensions\\CredentialPropertiesInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/CredentialPropertiesInputExtension.php',
     'Webauthn\\AuthenticationExtensions\\ExtensionOutputChecker' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputChecker.php',
     'Webauthn\\AuthenticationExtensions\\ExtensionOutputCheckerHandler' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputCheckerHandler.php',
     'Webauthn\\AuthenticationExtensions\\ExtensionOutputError' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php',
+    'Webauthn\\AuthenticationExtensions\\LargeBlobInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/LargeBlobInputExtension.php',
+    'Webauthn\\AuthenticationExtensions\\PseudoRandomFunctionInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtension.php',
+    'Webauthn\\AuthenticationExtensions\\PseudoRandomFunctionInputExtensionBuilder' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtensionBuilder.php',
+    'Webauthn\\AuthenticationExtensions\\UvmInputExtension' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticationExtensions/UvmInputExtension.php',
     'Webauthn\\AuthenticatorAssertionResponse' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php',
     'Webauthn\\AuthenticatorAssertionResponseValidator' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php',
     'Webauthn\\AuthenticatorAttestationResponse' => $vendorDir . '/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php',
@@ -2918,6 +3233,7 @@
     'Webauthn\\CeremonyStep\\CeremonyStepManagerFactory' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php',
     'Webauthn\\CeremonyStep\\CheckAlgorithm' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php',
     'Webauthn\\CeremonyStep\\CheckAllowedCredentialList' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedCredentialList.php',
+    'Webauthn\\CeremonyStep\\CheckAllowedOrigins' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedOrigins.php',
     'Webauthn\\CeremonyStep\\CheckAttestationFormatIsKnownAndValid' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php',
     'Webauthn\\CeremonyStep\\CheckBackupBitsAreConsistent' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckBackupBitsAreConsistent.php',
     'Webauthn\\CeremonyStep\\CheckChallenge' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckChallenge.php',
@@ -2936,9 +3252,6 @@
     'Webauthn\\CeremonyStep\\CheckUserWasPresent' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/CheckUserWasPresent.php',
     'Webauthn\\CeremonyStep\\HostTopOriginValidator' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php',
     'Webauthn\\CeremonyStep\\TopOriginValidator' => $vendorDir . '/web-auth/webauthn-lib/src/CeremonyStep/TopOriginValidator.php',
-    'Webauthn\\CertificateChainChecker\\CertificateChainChecker' => $vendorDir . '/web-auth/webauthn-lib/src/CertificateChainChecker/CertificateChainChecker.php',
-    'Webauthn\\CertificateChainChecker\\PhpCertificateChainChecker' => $vendorDir . '/web-auth/webauthn-lib/src/CertificateChainChecker/PhpCertificateChainChecker.php',
-    'Webauthn\\CertificateToolbox' => $vendorDir . '/web-auth/webauthn-lib/src/CertificateToolbox.php',
     'Webauthn\\ClientDataCollector\\ClientDataCollector' => $vendorDir . '/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollector.php',
     'Webauthn\\ClientDataCollector\\ClientDataCollectorManager' => $vendorDir . '/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php',
     'Webauthn\\ClientDataCollector\\WebauthnAuthenticationCollector' => $vendorDir . '/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php',
@@ -3006,25 +3319,6 @@
     'Webauthn\\MetadataService\\CertificateChain\\CertificateChainValidator' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateChainValidator.php',
     'Webauthn\\MetadataService\\CertificateChain\\CertificateToolbox' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php',
     'Webauthn\\MetadataService\\CertificateChain\\PhpCertificateChainValidator' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php',
-    'Webauthn\\MetadataService\\Denormalizer\\ExtensionDescriptorDenormalizer' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Denormalizer/ExtensionDescriptorDenormalizer.php',
-    'Webauthn\\MetadataService\\Denormalizer\\MetadataStatementSerializerFactory' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Denormalizer/MetadataStatementSerializerFactory.php',
-    'Webauthn\\MetadataService\\Event\\BeforeCertificateChainValidation' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/BeforeCertificateChainValidation.php',
-    'Webauthn\\MetadataService\\Event\\CanDispatchEvents' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/CanDispatchEvents.php',
-    'Webauthn\\MetadataService\\Event\\CertificateChainValidationFailed' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationFailed.php',
-    'Webauthn\\MetadataService\\Event\\CertificateChainValidationSucceeded' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationSucceeded.php',
-    'Webauthn\\MetadataService\\Event\\MetadataStatementFound' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/MetadataStatementFound.php',
-    'Webauthn\\MetadataService\\Event\\NullEventDispatcher' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/NullEventDispatcher.php',
-    'Webauthn\\MetadataService\\Event\\WebauthnEvent' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Event/WebauthnEvent.php',
-    'Webauthn\\MetadataService\\Exception\\CertificateChainException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateChainException.php',
-    'Webauthn\\MetadataService\\Exception\\CertificateException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateException.php',
-    'Webauthn\\MetadataService\\Exception\\CertificateRevocationListException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateRevocationListException.php',
-    'Webauthn\\MetadataService\\Exception\\ExpiredCertificateException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/ExpiredCertificateException.php',
-    'Webauthn\\MetadataService\\Exception\\InvalidCertificateException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/InvalidCertificateException.php',
-    'Webauthn\\MetadataService\\Exception\\MetadataServiceException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataServiceException.php',
-    'Webauthn\\MetadataService\\Exception\\MetadataStatementException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementException.php',
-    'Webauthn\\MetadataService\\Exception\\MetadataStatementLoadingException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementLoadingException.php',
-    'Webauthn\\MetadataService\\Exception\\MissingMetadataStatementException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/MissingMetadataStatementException.php',
-    'Webauthn\\MetadataService\\Exception\\RevokedCertificateException' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Exception/RevokedCertificateException.php',
     'Webauthn\\MetadataService\\MetadataStatementRepository' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/MetadataStatementRepository.php',
     'Webauthn\\MetadataService\\Psr18HttpClient' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php',
     'Webauthn\\MetadataService\\Service\\ChainedMetadataServices' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Service/ChainedMetadataServices.php',
@@ -3037,7 +3331,6 @@
     'Webauthn\\MetadataService\\Service\\MetadataBLOBPayload' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php',
     'Webauthn\\MetadataService\\Service\\MetadataBLOBPayloadEntry' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php',
     'Webauthn\\MetadataService\\Service\\MetadataService' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataService.php',
-    'Webauthn\\MetadataService\\Service\\StringMetadataService' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Service/StringMetadataService.php',
     'Webauthn\\MetadataService\\Statement\\AbstractDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php',
     'Webauthn\\MetadataService\\Statement\\AlternativeDescriptions' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php',
     'Webauthn\\MetadataService\\Statement\\AuthenticatorGetInfo' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php',
@@ -3046,7 +3339,6 @@
     'Webauthn\\MetadataService\\Statement\\BiometricStatusReport' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php',
     'Webauthn\\MetadataService\\Statement\\CodeAccuracyDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php',
     'Webauthn\\MetadataService\\Statement\\DisplayPNGCharacteristicsDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php',
-    'Webauthn\\MetadataService\\Statement\\EcdaaTrustAnchor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/EcdaaTrustAnchor.php',
     'Webauthn\\MetadataService\\Statement\\ExtensionDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php',
     'Webauthn\\MetadataService\\Statement\\MetadataStatement' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php',
     'Webauthn\\MetadataService\\Statement\\PatternAccuracyDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php',
@@ -3057,35 +3349,27 @@
     'Webauthn\\MetadataService\\Statement\\VerificationMethodDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php',
     'Webauthn\\MetadataService\\Statement\\Version' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php',
     'Webauthn\\MetadataService\\StatusReportRepository' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/StatusReportRepository.php',
-    'Webauthn\\MetadataService\\ValueFilter' => $vendorDir . '/web-auth/webauthn-lib/src/MetadataService/ValueFilter.php',
     'Webauthn\\PublicKeyCredential' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredential.php',
     'Webauthn\\PublicKeyCredentialCreationOptions' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php',
     'Webauthn\\PublicKeyCredentialDescriptor' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php',
-    'Webauthn\\PublicKeyCredentialDescriptorCollection' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptorCollection.php',
     'Webauthn\\PublicKeyCredentialEntity' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php',
-    'Webauthn\\PublicKeyCredentialLoader' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialLoader.php',
     'Webauthn\\PublicKeyCredentialOptions' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php',
     'Webauthn\\PublicKeyCredentialParameters' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php',
     'Webauthn\\PublicKeyCredentialRequestOptions' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php',
     'Webauthn\\PublicKeyCredentialRpEntity' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php',
     'Webauthn\\PublicKeyCredentialSource' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php',
-    'Webauthn\\PublicKeyCredentialSourceRepository' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialSourceRepository.php',
     'Webauthn\\PublicKeyCredentialUserEntity' => $vendorDir . '/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php',
     'Webauthn\\SimpleFakeCredentialGenerator' => $vendorDir . '/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php',
     'Webauthn\\StringStream' => $vendorDir . '/web-auth/webauthn-lib/src/StringStream.php',
-    'Webauthn\\TokenBinding\\IgnoreTokenBindingHandler' => $vendorDir . '/web-auth/webauthn-lib/src/TokenBinding/IgnoreTokenBindingHandler.php',
-    'Webauthn\\TokenBinding\\SecTokenBindingHandler' => $vendorDir . '/web-auth/webauthn-lib/src/TokenBinding/SecTokenBindingHandler.php',
-    'Webauthn\\TokenBinding\\TokenBinding' => $vendorDir . '/web-auth/webauthn-lib/src/TokenBinding/TokenBinding.php',
-    'Webauthn\\TokenBinding\\TokenBindingHandler' => $vendorDir . '/web-auth/webauthn-lib/src/TokenBinding/TokenBindingHandler.php',
-    'Webauthn\\TokenBinding\\TokenBindingNotSupportedHandler' => $vendorDir . '/web-auth/webauthn-lib/src/TokenBinding/TokenBindingNotSupportedHandler.php',
     'Webauthn\\TrustPath\\CertificateTrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php',
-    'Webauthn\\TrustPath\\EcdaaKeyIdTrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/EcdaaKeyIdTrustPath.php',
     'Webauthn\\TrustPath\\EmptyTrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php',
     'Webauthn\\TrustPath\\TrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPath.php',
-    'Webauthn\\TrustPath\\TrustPathLoader' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php',
     'Webauthn\\U2FPublicKey' => $vendorDir . '/web-auth/webauthn-lib/src/U2FPublicKey.php',
     'Webauthn\\Util\\Base64' => $vendorDir . '/web-auth/webauthn-lib/src/Util/Base64.php',
     'Webauthn\\Util\\CoseSignatureFixer' => $vendorDir . '/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php',
+    'Webmozart\\Assert\\Assert' => $vendorDir . '/webmozart/assert/src/Assert.php',
+    'Webmozart\\Assert\\InvalidArgumentException' => $vendorDir . '/webmozart/assert/src/InvalidArgumentException.php',
+    'Webmozart\\Assert\\Mixin' => $vendorDir . '/webmozart/assert/src/Mixin.php',
     'ZipStreamer\\COMPR' => $vendorDir . '/deepdiver/zipstreamer/src/COMPR.php',
     'ZipStreamer\\Count64' => $vendorDir . '/deepdiver/zipstreamer/src/Count64.php',
     'ZipStreamer\\Lib\\Count64Base' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64Base.php',
@@ -3619,6 +3903,147 @@
     'libphonenumber\\data\\ShortNumberMetadata_ZW' => $vendorDir . '/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ZW.php',
     'ownCloud\\TarStreamer\\TarHeader' => $vendorDir . '/deepdiver1975/tarstreamer/src/TarHeader.php',
     'ownCloud\\TarStreamer\\TarStreamer' => $vendorDir . '/deepdiver1975/tarstreamer/src/TarStreamer.php',
+    'phpDocumentor\\Reflection\\DocBlock' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock.php',
+    'phpDocumentor\\Reflection\\DocBlockFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlockFactory.php',
+    'phpDocumentor\\Reflection\\DocBlockFactoryInterface' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlockFactoryInterface.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Description' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Description.php',
+    'phpDocumentor\\Reflection\\DocBlock\\DescriptionFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\ExampleFinder' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Serializer' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php',
+    'phpDocumentor\\Reflection\\DocBlock\\StandardTagFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tag' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tag.php',
+    'phpDocumentor\\Reflection\\DocBlock\\TagFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/TagFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Author' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Author.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\BaseTag' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/BaseTag.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Covers' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Deprecated' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Example' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Extends_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\AbstractPHPStanFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ExtendsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\Factory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ImplementsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodParameterFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PHPStanFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ParamFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyReadFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyReadFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyWriteFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ReturnFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\StaticMethod' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateExtendsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateImplementsFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\VarFactory' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\AlignFormatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\PassthroughFormatter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Generic' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Implements_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\InvalidTag' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Link' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Method' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\MethodParameter' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Mixin' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Param' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Property' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyRead' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyWrite' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyWrite.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Fqsen' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Fqsen.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Reference' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Reference.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Url' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Url.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Return_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\See' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/See.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Since' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Source' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\TagWithType' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Template' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateCovariant' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateExtends' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateImplements' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Throws' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Uses' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Var_' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php',
+    'phpDocumentor\\Reflection\\DocBlock\\Tags\\Version' => $vendorDir . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php',
+    'phpDocumentor\\Reflection\\Element' => $vendorDir . '/phpdocumentor/reflection-common/src/Element.php',
+    'phpDocumentor\\Reflection\\Exception\\PcreException' => $vendorDir . '/phpdocumentor/reflection-docblock/src/Exception/PcreException.php',
+    'phpDocumentor\\Reflection\\File' => $vendorDir . '/phpdocumentor/reflection-common/src/File.php',
+    'phpDocumentor\\Reflection\\Fqsen' => $vendorDir . '/phpdocumentor/reflection-common/src/Fqsen.php',
+    'phpDocumentor\\Reflection\\FqsenResolver' => $vendorDir . '/phpdocumentor/type-resolver/src/FqsenResolver.php',
+    'phpDocumentor\\Reflection\\Location' => $vendorDir . '/phpdocumentor/reflection-common/src/Location.php',
+    'phpDocumentor\\Reflection\\Project' => $vendorDir . '/phpdocumentor/reflection-common/src/Project.php',
+    'phpDocumentor\\Reflection\\ProjectFactory' => $vendorDir . '/phpdocumentor/reflection-common/src/ProjectFactory.php',
+    'phpDocumentor\\Reflection\\PseudoType' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoType.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ArrayShape' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShape.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ArrayShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\CallableString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/CallableString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\Conditional' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/Conditional.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ConditionalForParameter' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ConditionalForParameter.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ConstExpression' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ConstExpression.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\False_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/False_.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\FloatValue' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/FloatValue.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\HtmlEscapedString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\IntMask' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntMask.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\IntMaskOf' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntMaskOf.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\IntegerRange' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\IntegerValue' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\KeyOf' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/KeyOf.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ListShape' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ListShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\List_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/List_.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\LiteralString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\LowercaseString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NegativeInteger' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyArray' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyList' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyLowercaseString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\NumericString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\Numeric_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShape' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\OffsetAccess' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/OffsetAccess.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\PositiveInteger' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ShapeItem' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\StringValue' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\TraitString' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\True_' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/True_.php',
+    'phpDocumentor\\Reflection\\PseudoTypes\\ValueOf' => $vendorDir . '/phpdocumentor/type-resolver/src/PseudoTypes/ValueOf.php',
+    'phpDocumentor\\Reflection\\Type' => $vendorDir . '/phpdocumentor/type-resolver/src/Type.php',
+    'phpDocumentor\\Reflection\\TypeResolver' => $vendorDir . '/phpdocumentor/type-resolver/src/TypeResolver.php',
+    'phpDocumentor\\Reflection\\Types\\AbstractList' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/AbstractList.php',
+    'phpDocumentor\\Reflection\\Types\\AggregatedType' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/AggregatedType.php',
+    'phpDocumentor\\Reflection\\Types\\ArrayKey' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/ArrayKey.php',
+    'phpDocumentor\\Reflection\\Types\\Array_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Array_.php',
+    'phpDocumentor\\Reflection\\Types\\Boolean' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Boolean.php',
+    'phpDocumentor\\Reflection\\Types\\CallableParameter' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/CallableParameter.php',
+    'phpDocumentor\\Reflection\\Types\\Callable_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Callable_.php',
+    'phpDocumentor\\Reflection\\Types\\ClassString' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/ClassString.php',
+    'phpDocumentor\\Reflection\\Types\\Collection' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Collection.php',
+    'phpDocumentor\\Reflection\\Types\\Compound' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Compound.php',
+    'phpDocumentor\\Reflection\\Types\\Context' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Context.php',
+    'phpDocumentor\\Reflection\\Types\\ContextFactory' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/ContextFactory.php',
+    'phpDocumentor\\Reflection\\Types\\Expression' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Expression.php',
+    'phpDocumentor\\Reflection\\Types\\Float_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Float_.php',
+    'phpDocumentor\\Reflection\\Types\\Integer' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Integer.php',
+    'phpDocumentor\\Reflection\\Types\\InterfaceString' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/InterfaceString.php',
+    'phpDocumentor\\Reflection\\Types\\Intersection' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Intersection.php',
+    'phpDocumentor\\Reflection\\Types\\Iterable_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Iterable_.php',
+    'phpDocumentor\\Reflection\\Types\\Mixed_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Mixed_.php',
+    'phpDocumentor\\Reflection\\Types\\Never_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Never_.php',
+    'phpDocumentor\\Reflection\\Types\\Null_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Null_.php',
+    'phpDocumentor\\Reflection\\Types\\Nullable' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Nullable.php',
+    'phpDocumentor\\Reflection\\Types\\Object_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Object_.php',
+    'phpDocumentor\\Reflection\\Types\\Parent_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Parent_.php',
+    'phpDocumentor\\Reflection\\Types\\Resource_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Resource_.php',
+    'phpDocumentor\\Reflection\\Types\\Scalar' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Scalar.php',
+    'phpDocumentor\\Reflection\\Types\\Self_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Self_.php',
+    'phpDocumentor\\Reflection\\Types\\Static_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Static_.php',
+    'phpDocumentor\\Reflection\\Types\\String_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/String_.php',
+    'phpDocumentor\\Reflection\\Types\\This' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/This.php',
+    'phpDocumentor\\Reflection\\Types\\Void_' => $vendorDir . '/phpdocumentor/type-resolver/src/Types/Void_.php',
+    'phpDocumentor\\Reflection\\Utils' => $vendorDir . '/phpdocumentor/reflection-docblock/src/Utils.php',
     'phpseclib\\Crypt\\AES' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/AES.php',
     'phpseclib\\Crypt\\Base' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Base.php',
     'phpseclib\\Crypt\\Blowfish' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php',
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index b75903312..1fa756d79 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -7,9 +7,11 @@
 
 return array(
     '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
+    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
     '383eaff206634a77a1be54e64e6459c7' => $vendorDir . '/sabre/uri/lib/functions.php',
     '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
-    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     '2b9d0f43f9552984cfa82fee95491826' => $vendorDir . '/sabre/event/lib/coroutine.php',
     'd81bab31d3feb45bfe2f283ea3c8fdf7' => $vendorDir . '/sabre/event/lib/Loop/functions.php',
@@ -17,15 +19,14 @@
     '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php',
     '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php',
     'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
-    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+    '662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
     'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php',
+    '9d2b9fc6db0f153a0a149fefb182415e' => $vendorDir . '/symfony/polyfill-php84/bootstrap.php',
     '09f6b20656683369174dd6fa83b7e5fb' => $vendorDir . '/symfony/polyfill-uuid/bootstrap.php',
-    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
     'b067bc7112e384b61c701452d53a14a8' => $vendorDir . '/mtdowling/jmespath.php/src/JmesPath.php',
-    '662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
+    '2203a247e6fda86070a5e4e07aed533a' => $vendorDir . '/symfony/clock/Resources/now.php',
     '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-    '9d2b9fc6db0f153a0a149fefb182415e' => $vendorDir . '/symfony/polyfill-php84/bootstrap.php',
     '606a39d89246991a373564698c2d8383' => $vendorDir . '/symfony/polyfill-php85/bootstrap.php',
     'a1105708a18b76903365ca1c4aa61b02' => $vendorDir . '/symfony/translation/Resources/functions.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
index ca9d5ecbf..cb7e335fc 100644
--- a/composer/autoload_psr4.php
+++ b/composer/autoload_psr4.php
@@ -8,12 +8,14 @@
 return array(
     'wapmorgan\\Mp3Info\\' => array($vendorDir . '/wapmorgan/mp3info/src'),
     'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
+    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-common/src'),
     'ownCloud\\TarStreamer\\' => array($vendorDir . '/deepdiver1975/tarstreamer/src'),
     'libphonenumber\\' => array($vendorDir . '/giggsey/libphonenumber-for-php-lite/src'),
     'kornrunner\\Blurhash\\' => array($vendorDir . '/kornrunner/blurhash/src'),
     'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'),
     'bantu\\IniGetWrapper\\' => array($vendorDir . '/bantu/ini-get-wrapper/src'),
     'ZipStreamer\\' => array($vendorDir . '/deepdiver/zipstreamer/src'),
+    'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
     'Webauthn\\' => array($vendorDir . '/web-auth/webauthn-lib/src'),
     'Symfony\\Polyfill\\Uuid\\' => array($vendorDir . '/symfony/polyfill-uuid'),
     'Symfony\\Polyfill\\Php85\\' => array($vendorDir . '/symfony/polyfill-php85'),
@@ -26,9 +28,13 @@
     'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
     'Symfony\\Contracts\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher-contracts'),
     'Symfony\\Component\\Uid\\' => array($vendorDir . '/symfony/uid'),
+    'Symfony\\Component\\TypeInfo\\' => array($vendorDir . '/symfony/type-info'),
     'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
     'Symfony\\Component\\String\\' => array($vendorDir . '/symfony/string'),
+    'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
     'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
+    'Symfony\\Component\\PropertyInfo\\' => array($vendorDir . '/symfony/property-info'),
+    'Symfony\\Component\\PropertyAccess\\' => array($vendorDir . '/symfony/property-access'),
     'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
     'Symfony\\Component\\Mime\\' => array($vendorDir . '/symfony/mime'),
     'Symfony\\Component\\Mailer\\' => array($vendorDir . '/symfony/mailer'),
@@ -37,6 +43,7 @@
     'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
     'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
     'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
+    'Symfony\\Component\\Clock\\' => array($vendorDir . '/symfony/clock'),
     'Stecman\\Component\\Symfony\\Console\\BashCompletion\\' => array($vendorDir . '/stecman/symfony-console-completion/src'),
     'SpomkyLabs\\Pki\\' => array($vendorDir . '/spomky-labs/pki-framework/src'),
     'SearchDAV\\' => array($vendorDir . '/icewind/searchdav/src'),
@@ -55,13 +62,13 @@
     'Psr\\Clock\\' => array($vendorDir . '/psr/clock/src'),
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
+    'PHPStan\\PhpDocParser\\' => array($vendorDir . '/phpstan/phpdoc-parser/src'),
     'OpenStack\\' => array($vendorDir . '/php-opencloud/openstack/src'),
     'Nextcloud\\LogNormalizer\\' => array($vendorDir . '/nextcloud/lognormalizer/src'),
     'MicrosoftAzure\\Storage\\Common\\' => array($vendorDir . '/microsoft/azure-storage-common/src/Common'),
     'MicrosoftAzure\\Storage\\Blob\\' => array($vendorDir . '/microsoft/azure-storage-blob/src/Blob'),
     'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
     'MabeEnum\\' => array($vendorDir . '/marc-mabe/php-enum/src'),
-    'Lcobucci\\Clock\\' => array($vendorDir . '/lcobucci/clock/src'),
     'Laravel\\SerializableClosure\\' => array($vendorDir . '/laravel/serializable-closure/src'),
     'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
     'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'),
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index b91eeb906..54c261de5 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -8,9 +8,11 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
 {
     public static $files = array (
         '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
+        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
-        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php',
         'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php',
@@ -18,15 +20,14 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
         '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
         'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
-        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+        '662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
         'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
+        '9d2b9fc6db0f153a0a149fefb182415e' => __DIR__ . '/..' . '/symfony/polyfill-php84/bootstrap.php',
         '09f6b20656683369174dd6fa83b7e5fb' => __DIR__ . '/..' . '/symfony/polyfill-uuid/bootstrap.php',
-        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
         'b067bc7112e384b61c701452d53a14a8' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/JmesPath.php',
-        '662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
+        '2203a247e6fda86070a5e4e07aed533a' => __DIR__ . '/..' . '/symfony/clock/Resources/now.php',
         '8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-        '9d2b9fc6db0f153a0a149fefb182415e' => __DIR__ . '/..' . '/symfony/polyfill-php84/bootstrap.php',
         '606a39d89246991a373564698c2d8383' => __DIR__ . '/..' . '/symfony/polyfill-php85/bootstrap.php',
         'a1105708a18b76903365ca1c4aa61b02' => __DIR__ . '/..' . '/symfony/translation/Resources/functions.php',
     );
@@ -39,6 +40,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'p' =>
         array (
             'phpseclib\\' => 10,
+            'phpDocumentor\\Reflection\\' => 25,
         ),
         'o' =>
         array (
@@ -66,6 +68,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         ),
         'W' =>
         array (
+            'Webmozart\\Assert\\' => 17,
             'Webauthn\\' => 9,
         ),
         'S' =>
@@ -81,9 +84,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
             'Symfony\\Contracts\\Service\\' => 26,
             'Symfony\\Contracts\\EventDispatcher\\' => 34,
             'Symfony\\Component\\Uid\\' => 22,
+            'Symfony\\Component\\TypeInfo\\' => 27,
             'Symfony\\Component\\Translation\\' => 30,
             'Symfony\\Component\\String\\' => 25,
+            'Symfony\\Component\\Serializer\\' => 29,
             'Symfony\\Component\\Routing\\' => 26,
+            'Symfony\\Component\\PropertyInfo\\' => 31,
+            'Symfony\\Component\\PropertyAccess\\' => 33,
             'Symfony\\Component\\Process\\' => 26,
             'Symfony\\Component\\Mime\\' => 23,
             'Symfony\\Component\\Mailer\\' => 25,
@@ -92,6 +99,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
             'Symfony\\Component\\DomCrawler\\' => 29,
             'Symfony\\Component\\CssSelector\\' => 30,
             'Symfony\\Component\\Console\\' => 26,
+            'Symfony\\Component\\Clock\\' => 24,
             'Stecman\\Component\\Symfony\\Console\\BashCompletion\\' => 49,
             'SpomkyLabs\\Pki\\' => 15,
             'SearchDAV\\' => 10,
@@ -113,6 +121,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
             'Psr\\Clock\\' => 10,
             'Psr\\Cache\\' => 10,
             'ParagonIE\\ConstantTime\\' => 23,
+            'PHPStan\\PhpDocParser\\' => 21,
         ),
         'O' =>
         array (
@@ -131,7 +140,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         ),
         'L' =>
         array (
-            'Lcobucci\\Clock\\' => 15,
             'Laravel\\SerializableClosure\\' => 28,
         ),
         'J' =>
@@ -197,6 +205,12 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
         ),
+        'phpDocumentor\\Reflection\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
+            1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
+            2 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
+        ),
         'ownCloud\\TarStreamer\\' =>
         array (
             0 => __DIR__ . '/..' . '/deepdiver1975/tarstreamer/src',
@@ -221,6 +235,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/deepdiver/zipstreamer/src',
         ),
+        'Webmozart\\Assert\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/webmozart/assert/src',
+        ),
         'Webauthn\\' =>
         array (
             0 => __DIR__ . '/..' . '/web-auth/webauthn-lib/src',
@@ -269,6 +287,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/symfony/uid',
         ),
+        'Symfony\\Component\\TypeInfo\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/symfony/type-info',
+        ),
         'Symfony\\Component\\Translation\\' =>
         array (
             0 => __DIR__ . '/..' . '/symfony/translation',
@@ -277,10 +299,22 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/symfony/string',
         ),
+        'Symfony\\Component\\Serializer\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/symfony/serializer',
+        ),
         'Symfony\\Component\\Routing\\' =>
         array (
             0 => __DIR__ . '/..' . '/symfony/routing',
         ),
+        'Symfony\\Component\\PropertyInfo\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/symfony/property-info',
+        ),
+        'Symfony\\Component\\PropertyAccess\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/symfony/property-access',
+        ),
         'Symfony\\Component\\Process\\' =>
         array (
             0 => __DIR__ . '/..' . '/symfony/process',
@@ -313,6 +347,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/symfony/console',
         ),
+        'Symfony\\Component\\Clock\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/symfony/clock',
+        ),
         'Stecman\\Component\\Symfony\\Console\\BashCompletion\\' =>
         array (
             0 => __DIR__ . '/..' . '/stecman/symfony-console-completion/src',
@@ -386,6 +424,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src',
         ),
+        'PHPStan\\PhpDocParser\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src',
+        ),
         'OpenStack\\' =>
         array (
             0 => __DIR__ . '/..' . '/php-opencloud/openstack/src',
@@ -410,10 +452,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         array (
             0 => __DIR__ . '/..' . '/marc-mabe/php-enum/src',
         ),
-        'Lcobucci\\Clock\\' =>
-        array (
-            0 => __DIR__ . '/..' . '/lcobucci/clock/src',
-        ),
         'Laravel\\SerializableClosure\\' =>
         array (
             0 => __DIR__ . '/..' . '/laravel/serializable-closure/src',
@@ -874,6 +912,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'CBOR\\CBORObject' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/CBORObject.php',
         'CBOR\\Decoder' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/Decoder.php',
         'CBOR\\DecoderInterface' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/DecoderInterface.php',
+        'CBOR\\Encoder' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/Encoder.php',
+        'CBOR\\EncoderInterface' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/EncoderInterface.php',
         'CBOR\\IndefiniteLengthByteStringObject' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php',
         'CBOR\\IndefiniteLengthListObject' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php',
         'CBOR\\IndefiniteLengthMapObject' => __DIR__ . '/..' . '/spomky-labs/cbor-php/src/IndefiniteLengthMapObject.php',
@@ -1699,9 +1739,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Laravel\\SerializableClosure\\Support\\ReflectionClosure' => __DIR__ . '/..' . '/laravel/serializable-closure/src/Support/ReflectionClosure.php',
         'Laravel\\SerializableClosure\\Support\\SelfReference' => __DIR__ . '/..' . '/laravel/serializable-closure/src/Support/SelfReference.php',
         'Laravel\\SerializableClosure\\UnsignedSerializableClosure' => __DIR__ . '/..' . '/laravel/serializable-closure/src/UnsignedSerializableClosure.php',
-        'Lcobucci\\Clock\\Clock' => __DIR__ . '/..' . '/lcobucci/clock/src/Clock.php',
-        'Lcobucci\\Clock\\FrozenClock' => __DIR__ . '/..' . '/lcobucci/clock/src/FrozenClock.php',
-        'Lcobucci\\Clock\\SystemClock' => __DIR__ . '/..' . '/lcobucci/clock/src/SystemClock.php',
         'MabeEnum\\Enum' => __DIR__ . '/..' . '/marc-mabe/php-enum/src/Enum.php',
         'MabeEnum\\EnumMap' => __DIR__ . '/..' . '/marc-mabe/php-enum/src/EnumMap.php',
         'MabeEnum\\EnumSerializableTrait' => __DIR__ . '/..' . '/marc-mabe/php-enum/src/EnumSerializableTrait.php',
@@ -1999,6 +2036,96 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'PEAR_Error' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
         'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
         'PEAR_Exception' => __DIR__ . '/..' . '/pear/pear_exception/PEAR/Exception.php',
+        'PHPStan\\PhpDocParser\\Ast\\AbstractNodeVisitor' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/AbstractNodeVisitor.php',
+        'PHPStan\\PhpDocParser\\Ast\\Attribute' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Attribute.php',
+        'PHPStan\\PhpDocParser\\Ast\\Comment' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Comment.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprArrayItemNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprArrayNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprFalseNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFalseNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprFloatNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprIntegerNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNullNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNullNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprStringNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprTrueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstFetchNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\ConstExpr\\DoctrineConstExprStringNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Node' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Node.php',
+        'PHPStan\\PhpDocParser\\Ast\\NodeAttributes' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php',
+        'PHPStan\\PhpDocParser\\Ast\\NodeTraverser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php',
+        'PHPStan\\PhpDocParser\\Ast\\NodeVisitor' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeVisitor.php',
+        'PHPStan\\PhpDocParser\\Ast\\NodeVisitor\\CloningVisitor' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagMethodValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagPropertyValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\AssertTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\DeprecatedTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineAnnotation' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArgument' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArray' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineArrayItem' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArrayItem.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\Doctrine\\DoctrineTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ExtendsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\GenericTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ImplementsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\InvalidTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MethodTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MethodTagValueParameterNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\MixinTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamClosureThisTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamImmediatelyInvokedCallableTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamLaterInvokedCallableTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamOutTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ParamTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocChildNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocChildNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTextNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PropertyTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PureUnlessCallableIsImpureTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireExtendsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\RequireImplementsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ReturnTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\SealedTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/SealedTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\SelfOutTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TemplateTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\ThrowsTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypeAliasImportTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypeAliasTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\TypelessParamTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\UsesTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\PhpDoc\\VarTagValueNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeItemNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayShapeUnsealedTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ArrayTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\CallableTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\CallableTypeParameterNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ConditionalTypeForParameterNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ConditionalTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ConstTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\GenericTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\IdentifierTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\IntersectionTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\InvalidTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\NullableTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ObjectShapeItemNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ObjectShapeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\OffsetAccessTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\ThisTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/ThisTypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\TypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php',
+        'PHPStan\\PhpDocParser\\Ast\\Type\\UnionTypeNode' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php',
+        'PHPStan\\PhpDocParser\\Lexer\\Lexer' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Lexer/Lexer.php',
+        'PHPStan\\PhpDocParser\\ParserConfig' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/ParserConfig.php',
+        'PHPStan\\PhpDocParser\\Parser\\ConstExprParser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php',
+        'PHPStan\\PhpDocParser\\Parser\\ParserException' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/ParserException.php',
+        'PHPStan\\PhpDocParser\\Parser\\PhpDocParser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php',
+        'PHPStan\\PhpDocParser\\Parser\\StringUnescaper' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php',
+        'PHPStan\\PhpDocParser\\Parser\\TokenIterator' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/TokenIterator.php',
+        'PHPStan\\PhpDocParser\\Parser\\TypeParser' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Parser/TypeParser.php',
+        'PHPStan\\PhpDocParser\\Printer\\DiffElem' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Printer/DiffElem.php',
+        'PHPStan\\PhpDocParser\\Printer\\Differ' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Printer/Differ.php',
+        'PHPStan\\PhpDocParser\\Printer\\Printer' => __DIR__ . '/..' . '/phpstan/phpdoc-parser/src/Printer/Printer.php',
         'ParagonIE\\ConstantTime\\Base32' => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src/Base32.php',
         'ParagonIE\\ConstantTime\\Base32Hex' => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src/Base32Hex.php',
         'ParagonIE\\ConstantTime\\Base64' => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src/Base64.php',
@@ -2756,6 +2883,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Stecman\\Component\\Symfony\\Console\\BashCompletion\\EnvironmentCompletionContext' => __DIR__ . '/..' . '/stecman/symfony-console-completion/src/EnvironmentCompletionContext.php',
         'Stecman\\Component\\Symfony\\Console\\BashCompletion\\HookFactory' => __DIR__ . '/..' . '/stecman/symfony-console-completion/src/HookFactory.php',
         'Stringable' => __DIR__ . '/..' . '/marc-mabe/php-enum/stubs/Stringable.php',
+        'Symfony\\Component\\Clock\\Clock' => __DIR__ . '/..' . '/symfony/clock/Clock.php',
+        'Symfony\\Component\\Clock\\ClockAwareTrait' => __DIR__ . '/..' . '/symfony/clock/ClockAwareTrait.php',
+        'Symfony\\Component\\Clock\\ClockInterface' => __DIR__ . '/..' . '/symfony/clock/ClockInterface.php',
+        'Symfony\\Component\\Clock\\DatePoint' => __DIR__ . '/..' . '/symfony/clock/DatePoint.php',
+        'Symfony\\Component\\Clock\\MockClock' => __DIR__ . '/..' . '/symfony/clock/MockClock.php',
+        'Symfony\\Component\\Clock\\MonotonicClock' => __DIR__ . '/..' . '/symfony/clock/MonotonicClock.php',
+        'Symfony\\Component\\Clock\\NativeClock' => __DIR__ . '/..' . '/symfony/clock/NativeClock.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\Attribute\\AsCommand' => __DIR__ . '/..' . '/symfony/console/Attribute/AsCommand.php',
         'Symfony\\Component\\Console\\CI\\GithubActionReporter' => __DIR__ . '/..' . '/symfony/console/CI/GithubActionReporter.php',
@@ -3181,6 +3315,51 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/WindowsPipes.php',
         'Symfony\\Component\\Process\\Process' => __DIR__ . '/..' . '/symfony/process/Process.php',
         'Symfony\\Component\\Process\\ProcessUtils' => __DIR__ . '/..' . '/symfony/process/ProcessUtils.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\AccessException' => __DIR__ . '/..' . '/symfony/property-access/Exception/AccessException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/property-access/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/property-access/Exception/InvalidArgumentException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\InvalidPropertyPathException' => __DIR__ . '/..' . '/symfony/property-access/Exception/InvalidPropertyPathException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\InvalidTypeException' => __DIR__ . '/..' . '/symfony/property-access/Exception/InvalidTypeException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\NoSuchIndexException' => __DIR__ . '/..' . '/symfony/property-access/Exception/NoSuchIndexException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\NoSuchPropertyException' => __DIR__ . '/..' . '/symfony/property-access/Exception/NoSuchPropertyException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\OutOfBoundsException' => __DIR__ . '/..' . '/symfony/property-access/Exception/OutOfBoundsException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/property-access/Exception/RuntimeException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/property-access/Exception/UnexpectedTypeException.php',
+        'Symfony\\Component\\PropertyAccess\\Exception\\UninitializedPropertyException' => __DIR__ . '/..' . '/symfony/property-access/Exception/UninitializedPropertyException.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyAccess' => __DIR__ . '/..' . '/symfony/property-access/PropertyAccess.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyAccessor' => __DIR__ . '/..' . '/symfony/property-access/PropertyAccessor.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder' => __DIR__ . '/..' . '/symfony/property-access/PropertyAccessorBuilder.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyAccessorInterface' => __DIR__ . '/..' . '/symfony/property-access/PropertyAccessorInterface.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyPath' => __DIR__ . '/..' . '/symfony/property-access/PropertyPath.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyPathBuilder' => __DIR__ . '/..' . '/symfony/property-access/PropertyPathBuilder.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyPathInterface' => __DIR__ . '/..' . '/symfony/property-access/PropertyPathInterface.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyPathIterator' => __DIR__ . '/..' . '/symfony/property-access/PropertyPathIterator.php',
+        'Symfony\\Component\\PropertyAccess\\PropertyPathIteratorInterface' => __DIR__ . '/..' . '/symfony/property-access/PropertyPathIteratorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\DependencyInjection\\PropertyInfoConstructorPass' => __DIR__ . '/..' . '/symfony/property-info/DependencyInjection/PropertyInfoConstructorPass.php',
+        'Symfony\\Component\\PropertyInfo\\DependencyInjection\\PropertyInfoPass' => __DIR__ . '/..' . '/symfony/property-info/DependencyInjection/PropertyInfoPass.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\ConstructorArgumentTypeExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/Extractor/ConstructorArgumentTypeExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\ConstructorExtractor' => __DIR__ . '/..' . '/symfony/property-info/Extractor/ConstructorExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\PhpDocExtractor' => __DIR__ . '/..' . '/symfony/property-info/Extractor/PhpDocExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\PhpStanExtractor' => __DIR__ . '/..' . '/symfony/property-info/Extractor/PhpStanExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\ReflectionExtractor' => __DIR__ . '/..' . '/symfony/property-info/Extractor/ReflectionExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\Extractor\\SerializerExtractor' => __DIR__ . '/..' . '/symfony/property-info/Extractor/SerializerExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyAccessExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyAccessExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyDescriptionExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyDescriptionExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyDocBlockExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyDocBlockExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyInfoCacheExtractor' => __DIR__ . '/..' . '/symfony/property-info/PropertyInfoCacheExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyInfoExtractor' => __DIR__ . '/..' . '/symfony/property-info/PropertyInfoExtractor.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyInfoExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyInfoExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyInitializableExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyInitializableExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyListExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyListExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyReadInfo' => __DIR__ . '/..' . '/symfony/property-info/PropertyReadInfo.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyReadInfoExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyReadInfoExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyTypeExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyTypeExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyWriteInfo' => __DIR__ . '/..' . '/symfony/property-info/PropertyWriteInfo.php',
+        'Symfony\\Component\\PropertyInfo\\PropertyWriteInfoExtractorInterface' => __DIR__ . '/..' . '/symfony/property-info/PropertyWriteInfoExtractorInterface.php',
+        'Symfony\\Component\\PropertyInfo\\Type' => __DIR__ . '/..' . '/symfony/property-info/Type.php',
+        'Symfony\\Component\\PropertyInfo\\Util\\LegacyTypeConverter' => __DIR__ . '/..' . '/symfony/property-info/Util/LegacyTypeConverter.php',
+        'Symfony\\Component\\PropertyInfo\\Util\\PhpDocTypeHelper' => __DIR__ . '/..' . '/symfony/property-info/Util/PhpDocTypeHelper.php',
+        'Symfony\\Component\\PropertyInfo\\Util\\PhpStanTypeHelper' => __DIR__ . '/..' . '/symfony/property-info/Util/PhpStanTypeHelper.php',
         'Symfony\\Component\\Routing\\Alias' => __DIR__ . '/..' . '/symfony/routing/Alias.php',
         'Symfony\\Component\\Routing\\Annotation\\Route' => __DIR__ . '/..' . '/symfony/routing/Annotation/Route.php',
         'Symfony\\Component\\Routing\\Attribute\\Route' => __DIR__ . '/..' . '/symfony/routing/Attribute/Route.php',
@@ -3252,6 +3431,139 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Symfony\\Component\\Routing\\RouteCompilerInterface' => __DIR__ . '/..' . '/symfony/routing/RouteCompilerInterface.php',
         'Symfony\\Component\\Routing\\Router' => __DIR__ . '/..' . '/symfony/routing/Router.php',
         'Symfony\\Component\\Routing\\RouterInterface' => __DIR__ . '/..' . '/symfony/routing/RouterInterface.php',
+        'Symfony\\Component\\Serializer\\Annotation\\Context' => __DIR__ . '/..' . '/symfony/serializer/Annotation/Context.php',
+        'Symfony\\Component\\Serializer\\Annotation\\DiscriminatorMap' => __DIR__ . '/..' . '/symfony/serializer/Annotation/DiscriminatorMap.php',
+        'Symfony\\Component\\Serializer\\Annotation\\Groups' => __DIR__ . '/..' . '/symfony/serializer/Annotation/Groups.php',
+        'Symfony\\Component\\Serializer\\Annotation\\Ignore' => __DIR__ . '/..' . '/symfony/serializer/Annotation/Ignore.php',
+        'Symfony\\Component\\Serializer\\Annotation\\MaxDepth' => __DIR__ . '/..' . '/symfony/serializer/Annotation/MaxDepth.php',
+        'Symfony\\Component\\Serializer\\Annotation\\SerializedName' => __DIR__ . '/..' . '/symfony/serializer/Annotation/SerializedName.php',
+        'Symfony\\Component\\Serializer\\Annotation\\SerializedPath' => __DIR__ . '/..' . '/symfony/serializer/Annotation/SerializedPath.php',
+        'Symfony\\Component\\Serializer\\Attribute\\Context' => __DIR__ . '/..' . '/symfony/serializer/Attribute/Context.php',
+        'Symfony\\Component\\Serializer\\Attribute\\DiscriminatorMap' => __DIR__ . '/..' . '/symfony/serializer/Attribute/DiscriminatorMap.php',
+        'Symfony\\Component\\Serializer\\Attribute\\ExtendsSerializationFor' => __DIR__ . '/..' . '/symfony/serializer/Attribute/ExtendsSerializationFor.php',
+        'Symfony\\Component\\Serializer\\Attribute\\Groups' => __DIR__ . '/..' . '/symfony/serializer/Attribute/Groups.php',
+        'Symfony\\Component\\Serializer\\Attribute\\Ignore' => __DIR__ . '/..' . '/symfony/serializer/Attribute/Ignore.php',
+        'Symfony\\Component\\Serializer\\Attribute\\MaxDepth' => __DIR__ . '/..' . '/symfony/serializer/Attribute/MaxDepth.php',
+        'Symfony\\Component\\Serializer\\Attribute\\SerializedName' => __DIR__ . '/..' . '/symfony/serializer/Attribute/SerializedName.php',
+        'Symfony\\Component\\Serializer\\Attribute\\SerializedPath' => __DIR__ . '/..' . '/symfony/serializer/Attribute/SerializedPath.php',
+        'Symfony\\Component\\Serializer\\CacheWarmer\\CompiledClassMetadataCacheWarmer' => __DIR__ . '/..' . '/symfony/serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php',
+        'Symfony\\Component\\Serializer\\Command\\DebugCommand' => __DIR__ . '/..' . '/symfony/serializer/Command/DebugCommand.php',
+        'Symfony\\Component\\Serializer\\Context\\ContextBuilderInterface' => __DIR__ . '/..' . '/symfony/serializer/Context/ContextBuilderInterface.php',
+        'Symfony\\Component\\Serializer\\Context\\ContextBuilderTrait' => __DIR__ . '/..' . '/symfony/serializer/Context/ContextBuilderTrait.php',
+        'Symfony\\Component\\Serializer\\Context\\Encoder\\CsvEncoderContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Encoder/CsvEncoderContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Encoder\\JsonEncoderContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Encoder/JsonEncoderContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Encoder\\XmlEncoderContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Encoder/XmlEncoderContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Encoder\\YamlEncoderContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Encoder/YamlEncoderContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\AbstractNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/AbstractNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\AbstractObjectNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/AbstractObjectNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\BackedEnumNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\ConstraintViolationListNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/ConstraintViolationListNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\DateIntervalNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/DateIntervalNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\DateTimeNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/DateTimeNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\FormErrorNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/FormErrorNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\GetSetMethodNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/GetSetMethodNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\JsonSerializableNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/JsonSerializableNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\ObjectNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/ObjectNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\ProblemNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/ProblemNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\PropertyNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/PropertyNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\UidNormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/UidNormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\Normalizer\\UnwrappingDenormalizerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/Normalizer/UnwrappingDenormalizerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\Context\\SerializerContextBuilder' => __DIR__ . '/..' . '/symfony/serializer/Context/SerializerContextBuilder.php',
+        'Symfony\\Component\\Serializer\\DataCollector\\SerializerDataCollector' => __DIR__ . '/..' . '/symfony/serializer/DataCollector/SerializerDataCollector.php',
+        'Symfony\\Component\\Serializer\\Debug\\TraceableEncoder' => __DIR__ . '/..' . '/symfony/serializer/Debug/TraceableEncoder.php',
+        'Symfony\\Component\\Serializer\\Debug\\TraceableNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Debug/TraceableNormalizer.php',
+        'Symfony\\Component\\Serializer\\Debug\\TraceableSerializer' => __DIR__ . '/..' . '/symfony/serializer/Debug/TraceableSerializer.php',
+        'Symfony\\Component\\Serializer\\DependencyInjection\\AttributeMetadataPass' => __DIR__ . '/..' . '/symfony/serializer/DependencyInjection/AttributeMetadataPass.php',
+        'Symfony\\Component\\Serializer\\DependencyInjection\\SerializerPass' => __DIR__ . '/..' . '/symfony/serializer/DependencyInjection/SerializerPass.php',
+        'Symfony\\Component\\Serializer\\Encoder\\ChainDecoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/ChainDecoder.php',
+        'Symfony\\Component\\Serializer\\Encoder\\ChainEncoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/ChainEncoder.php',
+        'Symfony\\Component\\Serializer\\Encoder\\ContextAwareDecoderInterface' => __DIR__ . '/..' . '/symfony/serializer/Encoder/ContextAwareDecoderInterface.php',
+        'Symfony\\Component\\Serializer\\Encoder\\ContextAwareEncoderInterface' => __DIR__ . '/..' . '/symfony/serializer/Encoder/ContextAwareEncoderInterface.php',
+        'Symfony\\Component\\Serializer\\Encoder\\CsvEncoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/CsvEncoder.php',
+        'Symfony\\Component\\Serializer\\Encoder\\DecoderInterface' => __DIR__ . '/..' . '/symfony/serializer/Encoder/DecoderInterface.php',
+        'Symfony\\Component\\Serializer\\Encoder\\EncoderInterface' => __DIR__ . '/..' . '/symfony/serializer/Encoder/EncoderInterface.php',
+        'Symfony\\Component\\Serializer\\Encoder\\JsonDecode' => __DIR__ . '/..' . '/symfony/serializer/Encoder/JsonDecode.php',
+        'Symfony\\Component\\Serializer\\Encoder\\JsonEncode' => __DIR__ . '/..' . '/symfony/serializer/Encoder/JsonEncode.php',
+        'Symfony\\Component\\Serializer\\Encoder\\JsonEncoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/JsonEncoder.php',
+        'Symfony\\Component\\Serializer\\Encoder\\NormalizationAwareInterface' => __DIR__ . '/..' . '/symfony/serializer/Encoder/NormalizationAwareInterface.php',
+        'Symfony\\Component\\Serializer\\Encoder\\XmlEncoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/XmlEncoder.php',
+        'Symfony\\Component\\Serializer\\Encoder\\YamlEncoder' => __DIR__ . '/..' . '/symfony/serializer/Encoder/YamlEncoder.php',
+        'Symfony\\Component\\Serializer\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/symfony/serializer/Exception/BadMethodCallException.php',
+        'Symfony\\Component\\Serializer\\Exception\\CircularReferenceException' => __DIR__ . '/..' . '/symfony/serializer/Exception/CircularReferenceException.php',
+        'Symfony\\Component\\Serializer\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/serializer/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\Serializer\\Exception\\ExtraAttributesException' => __DIR__ . '/..' . '/symfony/serializer/Exception/ExtraAttributesException.php',
+        'Symfony\\Component\\Serializer\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/serializer/Exception/InvalidArgumentException.php',
+        'Symfony\\Component\\Serializer\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/serializer/Exception/LogicException.php',
+        'Symfony\\Component\\Serializer\\Exception\\MappingException' => __DIR__ . '/..' . '/symfony/serializer/Exception/MappingException.php',
+        'Symfony\\Component\\Serializer\\Exception\\MissingConstructorArgumentsException' => __DIR__ . '/..' . '/symfony/serializer/Exception/MissingConstructorArgumentsException.php',
+        'Symfony\\Component\\Serializer\\Exception\\NotEncodableValueException' => __DIR__ . '/..' . '/symfony/serializer/Exception/NotEncodableValueException.php',
+        'Symfony\\Component\\Serializer\\Exception\\NotNormalizableValueException' => __DIR__ . '/..' . '/symfony/serializer/Exception/NotNormalizableValueException.php',
+        'Symfony\\Component\\Serializer\\Exception\\PartialDenormalizationException' => __DIR__ . '/..' . '/symfony/serializer/Exception/PartialDenormalizationException.php',
+        'Symfony\\Component\\Serializer\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/serializer/Exception/RuntimeException.php',
+        'Symfony\\Component\\Serializer\\Exception\\UnexpectedPropertyException' => __DIR__ . '/..' . '/symfony/serializer/Exception/UnexpectedPropertyException.php',
+        'Symfony\\Component\\Serializer\\Exception\\UnexpectedValueException' => __DIR__ . '/..' . '/symfony/serializer/Exception/UnexpectedValueException.php',
+        'Symfony\\Component\\Serializer\\Exception\\UnsupportedException' => __DIR__ . '/..' . '/symfony/serializer/Exception/UnsupportedException.php',
+        'Symfony\\Component\\Serializer\\Exception\\UnsupportedFormatException' => __DIR__ . '/..' . '/symfony/serializer/Exception/UnsupportedFormatException.php',
+        'Symfony\\Component\\Serializer\\Extractor\\ObjectPropertyListExtractor' => __DIR__ . '/..' . '/symfony/serializer/Extractor/ObjectPropertyListExtractor.php',
+        'Symfony\\Component\\Serializer\\Extractor\\ObjectPropertyListExtractorInterface' => __DIR__ . '/..' . '/symfony/serializer/Extractor/ObjectPropertyListExtractorInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\AttributeMetadata' => __DIR__ . '/..' . '/symfony/serializer/Mapping/AttributeMetadata.php',
+        'Symfony\\Component\\Serializer\\Mapping\\AttributeMetadataInterface' => __DIR__ . '/..' . '/symfony/serializer/Mapping/AttributeMetadataInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorFromClassMetadata' => __DIR__ . '/..' . '/symfony/serializer/Mapping/ClassDiscriminatorFromClassMetadata.php',
+        'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorMapping' => __DIR__ . '/..' . '/symfony/serializer/Mapping/ClassDiscriminatorMapping.php',
+        'Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorResolverInterface' => __DIR__ . '/..' . '/symfony/serializer/Mapping/ClassDiscriminatorResolverInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\ClassMetadata' => __DIR__ . '/..' . '/symfony/serializer/Mapping/ClassMetadata.php',
+        'Symfony\\Component\\Serializer\\Mapping\\ClassMetadataInterface' => __DIR__ . '/..' . '/symfony/serializer/Mapping/ClassMetadataInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\CacheClassMetadataFactory' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/CacheClassMetadataFactory.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactoryCompiler' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactoryInterface' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassResolverTrait' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/ClassResolverTrait.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Factory\\CompiledClassMetadataFactory' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Factory/CompiledClassMetadataFactory.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\AttributeLoader' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/AttributeLoader.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\FileLoader' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/FileLoader.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\LoaderChain' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/LoaderChain.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\LoaderInterface' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/LoaderInterface.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/XmlFileLoader.php',
+        'Symfony\\Component\\Serializer\\Mapping\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/serializer/Mapping/Loader/YamlFileLoader.php',
+        'Symfony\\Component\\Serializer\\NameConverter\\AdvancedNameConverterInterface' => __DIR__ . '/..' . '/symfony/serializer/NameConverter/AdvancedNameConverterInterface.php',
+        'Symfony\\Component\\Serializer\\NameConverter\\CamelCaseToSnakeCaseNameConverter' => __DIR__ . '/..' . '/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php',
+        'Symfony\\Component\\Serializer\\NameConverter\\MetadataAwareNameConverter' => __DIR__ . '/..' . '/symfony/serializer/NameConverter/MetadataAwareNameConverter.php',
+        'Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface' => __DIR__ . '/..' . '/symfony/serializer/NameConverter/NameConverterInterface.php',
+        'Symfony\\Component\\Serializer\\NameConverter\\SnakeCaseToCamelCaseNameConverter' => __DIR__ . '/..' . '/symfony/serializer/NameConverter/SnakeCaseToCamelCaseNameConverter.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/AbstractNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\AbstractObjectNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/AbstractObjectNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/ArrayDenormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\BackedEnumNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/BackedEnumNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\ConstraintViolationListNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/ConstraintViolationListNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\CustomNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/CustomNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DataUriNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DataUriNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DateIntervalNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DateIntervalNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DateTimeNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DateTimeNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DateTimeZoneNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DateTimeZoneNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DenormalizableInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DenormalizableInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerAwareInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DenormalizerAwareInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerAwareTrait' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DenormalizerAwareTrait.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\DenormalizerInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/DenormalizerInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\FormErrorNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/FormErrorNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/GetSetMethodNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\JsonSerializableNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/JsonSerializableNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\MimeMessageNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/MimeMessageNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\NormalizableInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/NormalizableInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\NormalizerAwareInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/NormalizerAwareInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\NormalizerAwareTrait' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/NormalizerAwareTrait.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\NormalizerInterface' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/NormalizerInterface.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\NumberNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/NumberNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/ObjectNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\ObjectToPopulateTrait' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/ObjectToPopulateTrait.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\ProblemNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/ProblemNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/PropertyNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\TranslatableNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/TranslatableNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\UidNormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/UidNormalizer.php',
+        'Symfony\\Component\\Serializer\\Normalizer\\UnwrappingDenormalizer' => __DIR__ . '/..' . '/symfony/serializer/Normalizer/UnwrappingDenormalizer.php',
+        'Symfony\\Component\\Serializer\\Serializer' => __DIR__ . '/..' . '/symfony/serializer/Serializer.php',
+        'Symfony\\Component\\Serializer\\SerializerAwareInterface' => __DIR__ . '/..' . '/symfony/serializer/SerializerAwareInterface.php',
+        'Symfony\\Component\\Serializer\\SerializerAwareTrait' => __DIR__ . '/..' . '/symfony/serializer/SerializerAwareTrait.php',
+        'Symfony\\Component\\Serializer\\SerializerInterface' => __DIR__ . '/..' . '/symfony/serializer/SerializerInterface.php',
         'Symfony\\Component\\String\\AbstractString' => __DIR__ . '/..' . '/symfony/string/AbstractString.php',
         'Symfony\\Component\\String\\AbstractUnicodeString' => __DIR__ . '/..' . '/symfony/string/AbstractUnicodeString.php',
         'Symfony\\Component\\String\\ByteString' => __DIR__ . '/..' . '/symfony/string/ByteString.php',
@@ -3262,9 +3574,11 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Symfony\\Component\\String\\Inflector\\EnglishInflector' => __DIR__ . '/..' . '/symfony/string/Inflector/EnglishInflector.php',
         'Symfony\\Component\\String\\Inflector\\FrenchInflector' => __DIR__ . '/..' . '/symfony/string/Inflector/FrenchInflector.php',
         'Symfony\\Component\\String\\Inflector\\InflectorInterface' => __DIR__ . '/..' . '/symfony/string/Inflector/InflectorInterface.php',
+        'Symfony\\Component\\String\\Inflector\\SpanishInflector' => __DIR__ . '/..' . '/symfony/string/Inflector/SpanishInflector.php',
         'Symfony\\Component\\String\\LazyString' => __DIR__ . '/..' . '/symfony/string/LazyString.php',
         'Symfony\\Component\\String\\Slugger\\AsciiSlugger' => __DIR__ . '/..' . '/symfony/string/Slugger/AsciiSlugger.php',
         'Symfony\\Component\\String\\Slugger\\SluggerInterface' => __DIR__ . '/..' . '/symfony/string/Slugger/SluggerInterface.php',
+        'Symfony\\Component\\String\\TruncateMode' => __DIR__ . '/..' . '/symfony/string/TruncateMode.php',
         'Symfony\\Component\\String\\UnicodeString' => __DIR__ . '/..' . '/symfony/string/UnicodeString.php',
         'Symfony\\Component\\Translation\\CatalogueMetadataAwareInterface' => __DIR__ . '/..' . '/symfony/translation/CatalogueMetadataAwareInterface.php',
         'Symfony\\Component\\Translation\\Catalogue\\AbstractOperation' => __DIR__ . '/..' . '/symfony/translation/Catalogue/AbstractOperation.php',
@@ -3360,17 +3674,52 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Symfony\\Component\\Translation\\Util\\XliffUtils' => __DIR__ . '/..' . '/symfony/translation/Util/XliffUtils.php',
         'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => __DIR__ . '/..' . '/symfony/translation/Writer/TranslationWriter.php',
         'Symfony\\Component\\Translation\\Writer\\TranslationWriterInterface' => __DIR__ . '/..' . '/symfony/translation/Writer/TranslationWriterInterface.php',
+        'Symfony\\Component\\TypeInfo\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/type-info/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\TypeInfo\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/type-info/Exception/InvalidArgumentException.php',
+        'Symfony\\Component\\TypeInfo\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/type-info/Exception/LogicException.php',
+        'Symfony\\Component\\TypeInfo\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/type-info/Exception/RuntimeException.php',
+        'Symfony\\Component\\TypeInfo\\Exception\\UnsupportedException' => __DIR__ . '/..' . '/symfony/type-info/Exception/UnsupportedException.php',
+        'Symfony\\Component\\TypeInfo\\Type' => __DIR__ . '/..' . '/symfony/type-info/Type.php',
+        'Symfony\\Component\\TypeInfo\\TypeContext\\TypeContext' => __DIR__ . '/..' . '/symfony/type-info/TypeContext/TypeContext.php',
+        'Symfony\\Component\\TypeInfo\\TypeContext\\TypeContextFactory' => __DIR__ . '/..' . '/symfony/type-info/TypeContext/TypeContextFactory.php',
+        'Symfony\\Component\\TypeInfo\\TypeFactoryTrait' => __DIR__ . '/..' . '/symfony/type-info/TypeFactoryTrait.php',
+        'Symfony\\Component\\TypeInfo\\TypeIdentifier' => __DIR__ . '/..' . '/symfony/type-info/TypeIdentifier.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\PhpDocAwareReflectionTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/PhpDocAwareReflectionTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionParameterTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/ReflectionParameterTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionPropertyTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/ReflectionPropertyTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionReturnTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/ReflectionReturnTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\ReflectionTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/ReflectionTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\StringTypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/StringTypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\TypeResolver' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/TypeResolver.php',
+        'Symfony\\Component\\TypeInfo\\TypeResolver\\TypeResolverInterface' => __DIR__ . '/..' . '/symfony/type-info/TypeResolver/TypeResolverInterface.php',
+        'Symfony\\Component\\TypeInfo\\Type\\ArrayShapeType' => __DIR__ . '/..' . '/symfony/type-info/Type/ArrayShapeType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\BackedEnumType' => __DIR__ . '/..' . '/symfony/type-info/Type/BackedEnumType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\BuiltinType' => __DIR__ . '/..' . '/symfony/type-info/Type/BuiltinType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\CollectionType' => __DIR__ . '/..' . '/symfony/type-info/Type/CollectionType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\CompositeTypeInterface' => __DIR__ . '/..' . '/symfony/type-info/Type/CompositeTypeInterface.php',
+        'Symfony\\Component\\TypeInfo\\Type\\EnumType' => __DIR__ . '/..' . '/symfony/type-info/Type/EnumType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\GenericType' => __DIR__ . '/..' . '/symfony/type-info/Type/GenericType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\IntersectionType' => __DIR__ . '/..' . '/symfony/type-info/Type/IntersectionType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\NullableType' => __DIR__ . '/..' . '/symfony/type-info/Type/NullableType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\ObjectType' => __DIR__ . '/..' . '/symfony/type-info/Type/ObjectType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\TemplateType' => __DIR__ . '/..' . '/symfony/type-info/Type/TemplateType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\UnionType' => __DIR__ . '/..' . '/symfony/type-info/Type/UnionType.php',
+        'Symfony\\Component\\TypeInfo\\Type\\WrappingTypeInterface' => __DIR__ . '/..' . '/symfony/type-info/Type/WrappingTypeInterface.php',
         'Symfony\\Component\\Uid\\AbstractUid' => __DIR__ . '/..' . '/symfony/uid/AbstractUid.php',
         'Symfony\\Component\\Uid\\BinaryUtil' => __DIR__ . '/..' . '/symfony/uid/BinaryUtil.php',
         'Symfony\\Component\\Uid\\Command\\GenerateUlidCommand' => __DIR__ . '/..' . '/symfony/uid/Command/GenerateUlidCommand.php',
         'Symfony\\Component\\Uid\\Command\\GenerateUuidCommand' => __DIR__ . '/..' . '/symfony/uid/Command/GenerateUuidCommand.php',
         'Symfony\\Component\\Uid\\Command\\InspectUlidCommand' => __DIR__ . '/..' . '/symfony/uid/Command/InspectUlidCommand.php',
         'Symfony\\Component\\Uid\\Command\\InspectUuidCommand' => __DIR__ . '/..' . '/symfony/uid/Command/InspectUuidCommand.php',
+        'Symfony\\Component\\Uid\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/uid/Exception/InvalidArgumentException.php',
+        'Symfony\\Component\\Uid\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/uid/Exception/LogicException.php',
+        'Symfony\\Component\\Uid\\Factory\\MockUuidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/MockUuidFactory.php',
         'Symfony\\Component\\Uid\\Factory\\NameBasedUuidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/NameBasedUuidFactory.php',
         'Symfony\\Component\\Uid\\Factory\\RandomBasedUuidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/RandomBasedUuidFactory.php',
         'Symfony\\Component\\Uid\\Factory\\TimeBasedUuidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/TimeBasedUuidFactory.php',
         'Symfony\\Component\\Uid\\Factory\\UlidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/UlidFactory.php',
         'Symfony\\Component\\Uid\\Factory\\UuidFactory' => __DIR__ . '/..' . '/symfony/uid/Factory/UuidFactory.php',
+        'Symfony\\Component\\Uid\\HashableInterface' => __DIR__ . '/..' . '/symfony/uid/HashableInterface.php',
         'Symfony\\Component\\Uid\\MaxUlid' => __DIR__ . '/..' . '/symfony/uid/MaxUlid.php',
         'Symfony\\Component\\Uid\\MaxUuid' => __DIR__ . '/..' . '/symfony/uid/MaxUuid.php',
         'Symfony\\Component\\Uid\\NilUlid' => __DIR__ . '/..' . '/symfony/uid/NilUlid.php',
@@ -3412,7 +3761,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Symfony\\Polyfill\\Uuid\\Uuid' => __DIR__ . '/..' . '/symfony/polyfill-uuid/Uuid.php',
         'System' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/System.php',
         'Webauthn\\AttestationStatement\\AndroidKeyAttestationStatementSupport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php',
-        'Webauthn\\AttestationStatement\\AndroidSafetyNetAttestationStatementSupport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php',
         'Webauthn\\AttestationStatement\\AppleAttestationStatementSupport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/AppleAttestationStatementSupport.php',
         'Webauthn\\AttestationStatement\\AttestationObject' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php',
         'Webauthn\\AttestationStatement\\AttestationObjectLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/AttestationObjectLoader.php',
@@ -3424,14 +3772,19 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\AttestationStatement\\PackedAttestationStatementSupport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php',
         'Webauthn\\AttestationStatement\\TPMAttestationStatementSupport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php',
         'Webauthn\\AttestedCredentialData' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AttestedCredentialData.php',
+        'Webauthn\\AuthenticationExtensions\\AppIdExcludeInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdExcludeInputExtension.php',
+        'Webauthn\\AuthenticationExtensions\\AppIdInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdInputExtension.php',
         'Webauthn\\AuthenticationExtensions\\AuthenticationExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php',
+        'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionLoader.php',
         'Webauthn\\AuthenticationExtensions\\AuthenticationExtensions' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php',
-        'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientInputs' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php',
-        'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientOutputs' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php',
-        'Webauthn\\AuthenticationExtensions\\AuthenticationExtensionsClientOutputsLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php',
+        'Webauthn\\AuthenticationExtensions\\CredentialPropertiesInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/CredentialPropertiesInputExtension.php',
         'Webauthn\\AuthenticationExtensions\\ExtensionOutputChecker' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputChecker.php',
         'Webauthn\\AuthenticationExtensions\\ExtensionOutputCheckerHandler' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputCheckerHandler.php',
         'Webauthn\\AuthenticationExtensions\\ExtensionOutputError' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php',
+        'Webauthn\\AuthenticationExtensions\\LargeBlobInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/LargeBlobInputExtension.php',
+        'Webauthn\\AuthenticationExtensions\\PseudoRandomFunctionInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtension.php',
+        'Webauthn\\AuthenticationExtensions\\PseudoRandomFunctionInputExtensionBuilder' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtensionBuilder.php',
+        'Webauthn\\AuthenticationExtensions\\UvmInputExtension' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticationExtensions/UvmInputExtension.php',
         'Webauthn\\AuthenticatorAssertionResponse' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php',
         'Webauthn\\AuthenticatorAssertionResponseValidator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php',
         'Webauthn\\AuthenticatorAttestationResponse' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php',
@@ -3445,6 +3798,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\CeremonyStep\\CeremonyStepManagerFactory' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php',
         'Webauthn\\CeremonyStep\\CheckAlgorithm' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php',
         'Webauthn\\CeremonyStep\\CheckAllowedCredentialList' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedCredentialList.php',
+        'Webauthn\\CeremonyStep\\CheckAllowedOrigins' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedOrigins.php',
         'Webauthn\\CeremonyStep\\CheckAttestationFormatIsKnownAndValid' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php',
         'Webauthn\\CeremonyStep\\CheckBackupBitsAreConsistent' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckBackupBitsAreConsistent.php',
         'Webauthn\\CeremonyStep\\CheckChallenge' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckChallenge.php',
@@ -3463,9 +3817,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\CeremonyStep\\CheckUserWasPresent' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/CheckUserWasPresent.php',
         'Webauthn\\CeremonyStep\\HostTopOriginValidator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php',
         'Webauthn\\CeremonyStep\\TopOriginValidator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CeremonyStep/TopOriginValidator.php',
-        'Webauthn\\CertificateChainChecker\\CertificateChainChecker' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CertificateChainChecker/CertificateChainChecker.php',
-        'Webauthn\\CertificateChainChecker\\PhpCertificateChainChecker' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CertificateChainChecker/PhpCertificateChainChecker.php',
-        'Webauthn\\CertificateToolbox' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/CertificateToolbox.php',
         'Webauthn\\ClientDataCollector\\ClientDataCollector' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollector.php',
         'Webauthn\\ClientDataCollector\\ClientDataCollectorManager' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php',
         'Webauthn\\ClientDataCollector\\WebauthnAuthenticationCollector' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php',
@@ -3533,25 +3884,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\MetadataService\\CertificateChain\\CertificateChainValidator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateChainValidator.php',
         'Webauthn\\MetadataService\\CertificateChain\\CertificateToolbox' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php',
         'Webauthn\\MetadataService\\CertificateChain\\PhpCertificateChainValidator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php',
-        'Webauthn\\MetadataService\\Denormalizer\\ExtensionDescriptorDenormalizer' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Denormalizer/ExtensionDescriptorDenormalizer.php',
-        'Webauthn\\MetadataService\\Denormalizer\\MetadataStatementSerializerFactory' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Denormalizer/MetadataStatementSerializerFactory.php',
-        'Webauthn\\MetadataService\\Event\\BeforeCertificateChainValidation' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/BeforeCertificateChainValidation.php',
-        'Webauthn\\MetadataService\\Event\\CanDispatchEvents' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/CanDispatchEvents.php',
-        'Webauthn\\MetadataService\\Event\\CertificateChainValidationFailed' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationFailed.php',
-        'Webauthn\\MetadataService\\Event\\CertificateChainValidationSucceeded' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationSucceeded.php',
-        'Webauthn\\MetadataService\\Event\\MetadataStatementFound' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/MetadataStatementFound.php',
-        'Webauthn\\MetadataService\\Event\\NullEventDispatcher' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/NullEventDispatcher.php',
-        'Webauthn\\MetadataService\\Event\\WebauthnEvent' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Event/WebauthnEvent.php',
-        'Webauthn\\MetadataService\\Exception\\CertificateChainException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateChainException.php',
-        'Webauthn\\MetadataService\\Exception\\CertificateException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateException.php',
-        'Webauthn\\MetadataService\\Exception\\CertificateRevocationListException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateRevocationListException.php',
-        'Webauthn\\MetadataService\\Exception\\ExpiredCertificateException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/ExpiredCertificateException.php',
-        'Webauthn\\MetadataService\\Exception\\InvalidCertificateException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/InvalidCertificateException.php',
-        'Webauthn\\MetadataService\\Exception\\MetadataServiceException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataServiceException.php',
-        'Webauthn\\MetadataService\\Exception\\MetadataStatementException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementException.php',
-        'Webauthn\\MetadataService\\Exception\\MetadataStatementLoadingException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementLoadingException.php',
-        'Webauthn\\MetadataService\\Exception\\MissingMetadataStatementException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/MissingMetadataStatementException.php',
-        'Webauthn\\MetadataService\\Exception\\RevokedCertificateException' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Exception/RevokedCertificateException.php',
         'Webauthn\\MetadataService\\MetadataStatementRepository' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/MetadataStatementRepository.php',
         'Webauthn\\MetadataService\\Psr18HttpClient' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php',
         'Webauthn\\MetadataService\\Service\\ChainedMetadataServices' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Service/ChainedMetadataServices.php',
@@ -3564,7 +3896,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\MetadataService\\Service\\MetadataBLOBPayload' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php',
         'Webauthn\\MetadataService\\Service\\MetadataBLOBPayloadEntry' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php',
         'Webauthn\\MetadataService\\Service\\MetadataService' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Service/MetadataService.php',
-        'Webauthn\\MetadataService\\Service\\StringMetadataService' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Service/StringMetadataService.php',
         'Webauthn\\MetadataService\\Statement\\AbstractDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php',
         'Webauthn\\MetadataService\\Statement\\AlternativeDescriptions' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php',
         'Webauthn\\MetadataService\\Statement\\AuthenticatorGetInfo' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php',
@@ -3573,7 +3904,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\MetadataService\\Statement\\BiometricStatusReport' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php',
         'Webauthn\\MetadataService\\Statement\\CodeAccuracyDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php',
         'Webauthn\\MetadataService\\Statement\\DisplayPNGCharacteristicsDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php',
-        'Webauthn\\MetadataService\\Statement\\EcdaaTrustAnchor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/EcdaaTrustAnchor.php',
         'Webauthn\\MetadataService\\Statement\\ExtensionDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php',
         'Webauthn\\MetadataService\\Statement\\MetadataStatement' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php',
         'Webauthn\\MetadataService\\Statement\\PatternAccuracyDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php',
@@ -3584,35 +3914,27 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Webauthn\\MetadataService\\Statement\\VerificationMethodDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php',
         'Webauthn\\MetadataService\\Statement\\Version' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php',
         'Webauthn\\MetadataService\\StatusReportRepository' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/StatusReportRepository.php',
-        'Webauthn\\MetadataService\\ValueFilter' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/MetadataService/ValueFilter.php',
         'Webauthn\\PublicKeyCredential' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredential.php',
         'Webauthn\\PublicKeyCredentialCreationOptions' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php',
         'Webauthn\\PublicKeyCredentialDescriptor' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php',
-        'Webauthn\\PublicKeyCredentialDescriptorCollection' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptorCollection.php',
         'Webauthn\\PublicKeyCredentialEntity' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php',
-        'Webauthn\\PublicKeyCredentialLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialLoader.php',
         'Webauthn\\PublicKeyCredentialOptions' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php',
         'Webauthn\\PublicKeyCredentialParameters' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php',
         'Webauthn\\PublicKeyCredentialRequestOptions' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php',
         'Webauthn\\PublicKeyCredentialRpEntity' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php',
         'Webauthn\\PublicKeyCredentialSource' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php',
-        'Webauthn\\PublicKeyCredentialSourceRepository' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialSourceRepository.php',
         'Webauthn\\PublicKeyCredentialUserEntity' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php',
         'Webauthn\\SimpleFakeCredentialGenerator' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php',
         'Webauthn\\StringStream' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/StringStream.php',
-        'Webauthn\\TokenBinding\\IgnoreTokenBindingHandler' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TokenBinding/IgnoreTokenBindingHandler.php',
-        'Webauthn\\TokenBinding\\SecTokenBindingHandler' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TokenBinding/SecTokenBindingHandler.php',
-        'Webauthn\\TokenBinding\\TokenBinding' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TokenBinding/TokenBinding.php',
-        'Webauthn\\TokenBinding\\TokenBindingHandler' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TokenBinding/TokenBindingHandler.php',
-        'Webauthn\\TokenBinding\\TokenBindingNotSupportedHandler' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TokenBinding/TokenBindingNotSupportedHandler.php',
         'Webauthn\\TrustPath\\CertificateTrustPath' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php',
-        'Webauthn\\TrustPath\\EcdaaKeyIdTrustPath' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/EcdaaKeyIdTrustPath.php',
         'Webauthn\\TrustPath\\EmptyTrustPath' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php',
         'Webauthn\\TrustPath\\TrustPath' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/TrustPath.php',
-        'Webauthn\\TrustPath\\TrustPathLoader' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php',
         'Webauthn\\U2FPublicKey' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/U2FPublicKey.php',
         'Webauthn\\Util\\Base64' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/Util/Base64.php',
         'Webauthn\\Util\\CoseSignatureFixer' => __DIR__ . '/..' . '/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php',
+        'Webmozart\\Assert\\Assert' => __DIR__ . '/..' . '/webmozart/assert/src/Assert.php',
+        'Webmozart\\Assert\\InvalidArgumentException' => __DIR__ . '/..' . '/webmozart/assert/src/InvalidArgumentException.php',
+        'Webmozart\\Assert\\Mixin' => __DIR__ . '/..' . '/webmozart/assert/src/Mixin.php',
         'ZipStreamer\\COMPR' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/COMPR.php',
         'ZipStreamer\\Count64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Count64.php',
         'ZipStreamer\\Lib\\Count64Base' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64Base.php',
@@ -4146,6 +4468,147 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'libphonenumber\\data\\ShortNumberMetadata_ZW' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_ZW.php',
         'ownCloud\\TarStreamer\\TarHeader' => __DIR__ . '/..' . '/deepdiver1975/tarstreamer/src/TarHeader.php',
         'ownCloud\\TarStreamer\\TarStreamer' => __DIR__ . '/..' . '/deepdiver1975/tarstreamer/src/TarStreamer.php',
+        'phpDocumentor\\Reflection\\DocBlock' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock.php',
+        'phpDocumentor\\Reflection\\DocBlockFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlockFactory.php',
+        'phpDocumentor\\Reflection\\DocBlockFactoryInterface' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlockFactoryInterface.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Description' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Description.php',
+        'phpDocumentor\\Reflection\\DocBlock\\DescriptionFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\ExampleFinder' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Serializer' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php',
+        'phpDocumentor\\Reflection\\DocBlock\\StandardTagFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tag' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tag.php',
+        'phpDocumentor\\Reflection\\DocBlock\\TagFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/TagFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Author' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Author.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\BaseTag' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/BaseTag.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Covers' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Deprecated' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Example' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Extends_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\AbstractPHPStanFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ExtendsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\Factory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ImplementsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\MethodParameterFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PHPStanFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ParamFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyReadFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyReadFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\PropertyWriteFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\ReturnFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\StaticMethod' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateExtendsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\TemplateImplementsFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Factory\\VarFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\AlignFormatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Formatter\\PassthroughFormatter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Generic' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Implements_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\InvalidTag' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Link' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Method' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\MethodParameter' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Mixin' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Param' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Property' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyRead' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\PropertyWrite' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyWrite.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Fqsen' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Fqsen.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Reference' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Reference.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Reference\\Url' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Url.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Return_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\See' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/See.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Since' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Source' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\TagWithType' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Template' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateCovariant' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateExtends' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\TemplateImplements' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Throws' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Uses' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Var_' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php',
+        'phpDocumentor\\Reflection\\DocBlock\\Tags\\Version' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php',
+        'phpDocumentor\\Reflection\\Element' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/Element.php',
+        'phpDocumentor\\Reflection\\Exception\\PcreException' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/Exception/PcreException.php',
+        'phpDocumentor\\Reflection\\File' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/File.php',
+        'phpDocumentor\\Reflection\\Fqsen' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/Fqsen.php',
+        'phpDocumentor\\Reflection\\FqsenResolver' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/FqsenResolver.php',
+        'phpDocumentor\\Reflection\\Location' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/Location.php',
+        'phpDocumentor\\Reflection\\Project' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/Project.php',
+        'phpDocumentor\\Reflection\\ProjectFactory' => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src/ProjectFactory.php',
+        'phpDocumentor\\Reflection\\PseudoType' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoType.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ArrayShape' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShape.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ArrayShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\CallableString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/CallableString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\Conditional' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/Conditional.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ConditionalForParameter' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ConditionalForParameter.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ConstExpression' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ConstExpression.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\False_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/False_.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\FloatValue' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/FloatValue.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\HtmlEscapedString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\IntMask' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntMask.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\IntMaskOf' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntMaskOf.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\IntegerRange' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\IntegerValue' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\KeyOf' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/KeyOf.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ListShape' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ListShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\List_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/List_.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\LiteralString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\LowercaseString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NegativeInteger' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyArray' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyList' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyLowercaseString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NonEmptyString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\NumericString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\Numeric_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShape' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ObjectShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\OffsetAccess' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/OffsetAccess.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\PositiveInteger' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ShapeItem' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\StringValue' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\TraitString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\True_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/True_.php',
+        'phpDocumentor\\Reflection\\PseudoTypes\\ValueOf' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/PseudoTypes/ValueOf.php',
+        'phpDocumentor\\Reflection\\Type' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Type.php',
+        'phpDocumentor\\Reflection\\TypeResolver' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/TypeResolver.php',
+        'phpDocumentor\\Reflection\\Types\\AbstractList' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/AbstractList.php',
+        'phpDocumentor\\Reflection\\Types\\AggregatedType' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/AggregatedType.php',
+        'phpDocumentor\\Reflection\\Types\\ArrayKey' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/ArrayKey.php',
+        'phpDocumentor\\Reflection\\Types\\Array_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Array_.php',
+        'phpDocumentor\\Reflection\\Types\\Boolean' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Boolean.php',
+        'phpDocumentor\\Reflection\\Types\\CallableParameter' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/CallableParameter.php',
+        'phpDocumentor\\Reflection\\Types\\Callable_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Callable_.php',
+        'phpDocumentor\\Reflection\\Types\\ClassString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/ClassString.php',
+        'phpDocumentor\\Reflection\\Types\\Collection' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Collection.php',
+        'phpDocumentor\\Reflection\\Types\\Compound' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Compound.php',
+        'phpDocumentor\\Reflection\\Types\\Context' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Context.php',
+        'phpDocumentor\\Reflection\\Types\\ContextFactory' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/ContextFactory.php',
+        'phpDocumentor\\Reflection\\Types\\Expression' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Expression.php',
+        'phpDocumentor\\Reflection\\Types\\Float_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Float_.php',
+        'phpDocumentor\\Reflection\\Types\\Integer' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Integer.php',
+        'phpDocumentor\\Reflection\\Types\\InterfaceString' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/InterfaceString.php',
+        'phpDocumentor\\Reflection\\Types\\Intersection' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Intersection.php',
+        'phpDocumentor\\Reflection\\Types\\Iterable_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Iterable_.php',
+        'phpDocumentor\\Reflection\\Types\\Mixed_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Mixed_.php',
+        'phpDocumentor\\Reflection\\Types\\Never_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Never_.php',
+        'phpDocumentor\\Reflection\\Types\\Null_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Null_.php',
+        'phpDocumentor\\Reflection\\Types\\Nullable' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Nullable.php',
+        'phpDocumentor\\Reflection\\Types\\Object_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Object_.php',
+        'phpDocumentor\\Reflection\\Types\\Parent_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Parent_.php',
+        'phpDocumentor\\Reflection\\Types\\Resource_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Resource_.php',
+        'phpDocumentor\\Reflection\\Types\\Scalar' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Scalar.php',
+        'phpDocumentor\\Reflection\\Types\\Self_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Self_.php',
+        'phpDocumentor\\Reflection\\Types\\Static_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Static_.php',
+        'phpDocumentor\\Reflection\\Types\\String_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/String_.php',
+        'phpDocumentor\\Reflection\\Types\\This' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/This.php',
+        'phpDocumentor\\Reflection\\Types\\Void_' => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src/Types/Void_.php',
+        'phpDocumentor\\Reflection\\Utils' => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src/Utils.php',
         'phpseclib\\Crypt\\AES' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/AES.php',
         'phpseclib\\Crypt\\Base' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Base.php',
         'phpseclib\\Crypt\\Blowfish' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php',
diff --git a/composer/installed.json b/composer/installed.json
index 9d0ff8405..65d81ef1a 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -196,17 +196,17 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.1",
-            "version_normalized": "0.12.1.0",
+            "version": "0.13.1",
+            "version_normalized": "0.13.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
                 "shasum": ""
             },
             "require": {
@@ -215,9 +215,9 @@
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "5.16.0"
+                "vimeo/psalm": "6.8.8"
             },
-            "time": "2023-11-29T23:19:16+00:00",
+            "time": "2025-03-29T13:50:30+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -247,7 +247,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.1"
+                "source": "https://github.com/brick/math/tree/0.13.1"
             },
             "funding": [
                 {
@@ -1761,73 +1761,6 @@
             },
             "install-path": "../laravel/serializable-closure"
         },
-        {
-            "name": "lcobucci/clock",
-            "version": "3.0.0",
-            "version_normalized": "3.0.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lcobucci/clock.git",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~8.1.0 || ~8.2.0",
-                "psr/clock": "^1.0"
-            },
-            "provide": {
-                "psr/clock-implementation": "1.0"
-            },
-            "require-dev": {
-                "infection/infection": "^0.26",
-                "lcobucci/coding-standard": "^9.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-deprecation-rules": "^1.1.1",
-                "phpstan/phpstan-phpunit": "^1.3.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.27"
-            },
-            "time": "2022-12-19T15:00:24+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Lcobucci\\Clock\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Luís Cobucci",
-                    "email": "lcobucci@gmail.com"
-                }
-            ],
-            "description": "Yet another clock abstraction",
-            "support": {
-                "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/3.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/lcobucci",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/lcobucci",
-                    "type": "patreon"
-                }
-            ],
-            "install-path": "../lcobucci/clock"
-        },
         {
             "name": "marc-mabe/php-enum",
             "version": "v4.7.1",
@@ -2343,27 +2276,29 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
-            "version_normalized": "2.6.3.0",
+            "version": "v3.1.3",
+            "version_normalized": "3.1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
+                "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77",
                 "shasum": ""
             },
             "require": {
-                "php": "^7|^8"
+                "php": "^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
+                "infection/infection": "^0",
+                "nikic/php-fuzzer": "^0",
+                "phpunit/phpunit": "^9|^10|^11",
+                "vimeo/psalm": "^4|^5|^6"
             },
-            "time": "2022-06-14T06:56:20+00:00",
+            "time": "2025-09-24T15:06:41+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2909,6 +2844,190 @@
             },
             "install-path": "../php-opencloud/openstack"
         },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.2.0",
+            "version_normalized": "2.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "time": "2020-06-27T09:03:43+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "install-path": "../phpdocumentor/reflection-common"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "5.6.5",
+            "version_normalized": "5.6.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761",
+                "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.1",
+                "ext-filter": "*",
+                "php": "^7.4 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7|^2.0",
+                "webmozart/assert": "^1.9.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.3.5 || ~1.6.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "psalm/phar": "^5.26"
+            },
+            "time": "2025-11-27T19:50:05+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5"
+            },
+            "install-path": "../phpdocumentor/reflection-docblock"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "1.12.0",
+            "version_normalized": "1.12.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/deprecations": "^1.0",
+                "php": "^7.3 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpstan/phpdoc-parser": "^1.18|^2.0"
+            },
+            "require-dev": {
+                "ext-tokenizer": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
+            },
+            "time": "2025-11-21T15:09:14+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0"
+            },
+            "install-path": "../phpdocumentor/type-resolver"
+        },
         {
             "name": "phpseclib/phpseclib",
             "version": "2.0.47",
@@ -3022,6 +3141,56 @@
             ],
             "install-path": "../phpseclib/phpseclib"
         },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "2.3.0",
+            "version_normalized": "2.3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^5.3.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "symfony/process": "^5.2"
+            },
+            "time": "2025-08-30T15:50:23+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0"
+            },
+            "install-path": "../phpstan/phpdoc-parser"
+        },
         {
             "name": "pimple/pimple",
             "version": "v3.6.0",
@@ -4122,47 +4291,35 @@
         },
         {
             "name": "spomky-labs/cbor-php",
-            "version": "3.0.4",
-            "version_normalized": "3.0.4.0",
+            "version": "3.2.2",
+            "version_normalized": "3.2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/cbor-php.git",
-                "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b"
+                "reference": "2a5fb86aacfe1004611370ead6caa2bfc88435d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b",
-                "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b",
+                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/2a5fb86aacfe1004611370ead6caa2bfc88435d0",
+                "reference": "2a5fb86aacfe1004611370ead6caa2bfc88435d0",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13|^0.14",
                 "ext-mbstring": "*",
                 "php": ">=8.0"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
                 "ext-json": "*",
-                "infection/infection": "^0.27",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-beberlei-assert": "^1.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^10.1",
-                "qossmic/deptrac-shim": "^1.0",
-                "rector/rector": "^0.19",
                 "roave/security-advisories": "dev-latest",
-                "symfony/var-dumper": "^6.0|^7.0",
-                "symplify/easy-coding-standard": "^12.0"
+                "symfony/error-handler": "^6.4|^7.1|^8.0",
+                "symfony/var-dumper": "^6.4|^7.1|^8.0"
             },
             "suggest": {
                 "ext-bcmath": "GMP or BCMath extensions will drastically improve the library performance. BCMath extension needed to handle the Big Float and Decimal Fraction Tags",
                 "ext-gmp": "GMP or BCMath extensions will drastically improve the library performance"
             },
-            "time": "2024-01-29T20:33:48+00:00",
+            "time": "2025-11-13T13:00:34+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4192,7 +4349,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/cbor-php/issues",
-                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.0.4"
+                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.2.2"
             },
             "funding": [
                 {
@@ -4208,42 +4365,40 @@
         },
         {
             "name": "spomky-labs/pki-framework",
-            "version": "1.2.1",
-            "version_normalized": "1.2.1.0",
+            "version": "1.4.0",
+            "version_normalized": "1.4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/pki-framework.git",
-                "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6"
+                "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/0b10c8b53366729417d6226ae89a665f9e2d61b6",
-                "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6",
+                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/bf6f55a9d9eb25b7781640221cb54f5c727850d7",
+                "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.10|^0.11|^0.12",
+                "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14",
                 "ext-mbstring": "*",
                 "php": ">=8.1"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
+                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
                 "ext-gmp": "*",
                 "ext-openssl": "*",
-                "infection/infection": "^0.28",
+                "infection/infection": "^0.28|^0.29|^0.31",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-beberlei-assert": "^1.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^10.1|^11.0",
-                "rector/rector": "^1.0",
+                "phpstan/extension-installer": "^1.3|^2.0",
+                "phpstan/phpstan": "^1.8|^2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.1|^2.0",
+                "phpstan/phpstan-strict-rules": "^1.3|^2.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0",
+                "rector/rector": "^1.0|^2.0",
                 "roave/security-advisories": "dev-latest",
-                "symfony/phpunit-bridge": "^6.4|^7.0",
-                "symfony/string": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
                 "symplify/easy-coding-standard": "^12.0"
             },
             "suggest": {
@@ -4251,7 +4406,7 @@
                 "ext-gmp": "For better performance (or BCMath)",
                 "ext-openssl": "For OpenSSL based cyphering"
             },
-            "time": "2024-03-30T18:03:49+00:00",
+            "time": "2025-10-22T08:24:34+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4306,7 +4461,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
-                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.1"
+                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.0"
             },
             "funding": [
                 {
@@ -4373,6 +4528,87 @@
             },
             "install-path": "../stecman/symfony-console-completion"
         },
+        {
+            "name": "symfony/clock",
+            "version": "v7.4.0",
+            "version_normalized": "7.4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "9169f24776edde469914c1e7a1442a50f7a4e110"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/9169f24776edde469914c1e7a1442a50f7a4e110",
+                "reference": "9169f24776edde469914c1e7a1442a50f7a4e110",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "time": "2025-11-12T15:39:26+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Clock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Decouples applications from the system clock",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/clock/tree/v7.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/clock"
+        },
         {
             "name": "symfony/console",
             "version": "v6.4.17",
@@ -5097,17 +5333,17 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.32.0",
-            "version_normalized": "1.32.0.0",
+            "version": "v1.33.0",
+            "version_normalized": "1.33.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
@@ -5116,7 +5352,7 @@
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2024-09-09T11:45:10+00:00",
+            "time": "2025-06-27T09:58:17+00:00",
             "type": "library",
             "extra": {
                 "thanks": {
@@ -5158,7 +5394,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5169,6 +5405,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -5601,21 +5841,21 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.29.0",
-            "version_normalized": "1.29.0.0",
+            "version": "v1.33.0",
+            "version_normalized": "1.33.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -5623,12 +5863,12 @@
             "suggest": {
                 "ext-uuid": "For best performance"
             },
-            "time": "2024-01-29T20:11:03+00:00",
+            "time": "2024-09-09T11:45:10+00:00",
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "installation-source": "dist",
@@ -5663,7 +5903,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5674,6 +5914,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -5745,6 +5989,183 @@
             ],
             "install-path": "../symfony/process"
         },
+        {
+            "name": "symfony/property-access",
+            "version": "v7.4.0",
+            "version_normalized": "7.4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/property-access.git",
+                "reference": "537626149d2910ca43eb9ce465654366bf4442f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/537626149d2910ca43eb9ce465654366bf4442f4",
+                "reference": "537626149d2910ca43eb9ce465654366bf4442f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/property-info": "^6.4|^7.0|^8.0"
+            },
+            "require-dev": {
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4.1|^7.0.1|^8.0"
+            },
+            "time": "2025-09-08T21:14:32+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\PropertyAccess\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides functions to read and write from/to an object or array using a simple string notation",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "access",
+                "array",
+                "extraction",
+                "index",
+                "injection",
+                "object",
+                "property",
+                "property-path",
+                "reflection"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/property-access/tree/v7.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/property-access"
+        },
+        {
+            "name": "symfony/property-info",
+            "version": "v7.4.1",
+            "version_normalized": "7.4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/property-info.git",
+                "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/912aafe70bee5cfd09fec5916fe35b83f04ae6ae",
+                "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/type-info": "~7.3.8|^7.4.1|^8.0.1"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "<5.2",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/cache": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/serializer": "<6.4"
+            },
+            "require-dev": {
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "phpstan/phpdoc-parser": "^1.0|^2.0",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0"
+            },
+            "time": "2025-12-05T14:04:53+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\PropertyInfo\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kévin Dunglas",
+                    "email": "dunglas@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Extracts information about PHP class' properties using metadata of popular sources",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "doctrine",
+                "phpdoc",
+                "property",
+                "symfony",
+                "type",
+                "validator"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/property-info/tree/v7.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/property-info"
+        },
         {
             "name": "symfony/routing",
             "version": "v6.4.12",
@@ -5831,6 +6252,112 @@
             ],
             "install-path": "../symfony/routing"
         },
+        {
+            "name": "symfony/serializer",
+            "version": "v7.4.2",
+            "version_normalized": "7.4.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/serializer.git",
+                "reference": "1a957acb613b520e443c2c659a67c782b67794bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/1a957acb613b520e443c2c659a67c782b67794bc",
+                "reference": "1a957acb613b520e443c2c659a67c782b67794bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php84": "^1.30"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/property-access": "<6.4",
+                "symfony/property-info": "<6.4",
+                "symfony/uid": "<6.4",
+                "symfony/validator": "<6.4",
+                "symfony/yaml": "<6.4"
+            },
+            "require-dev": {
+                "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+                "phpstan/phpdoc-parser": "^1.0|^2.0",
+                "seld/jsonlint": "^1.10",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^7.2|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/filesystem": "^6.4|^7.0|^8.0",
+                "symfony/form": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^6.4|^7.0|^8.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/translation-contracts": "^2.5|^3",
+                "symfony/type-info": "^7.1.8|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0"
+            },
+            "time": "2025-12-07T17:35:40+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Serializer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/serializer/tree/v7.4.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/serializer"
+        },
         {
             "name": "symfony/service-contracts",
             "version": "v3.5.1",
@@ -5919,23 +6446,24 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.15",
-            "version_normalized": "6.4.15.0",
+            "version": "v7.4.0",
+            "version_normalized": "7.4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f"
+                "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d50e862cb0a0e0886f73ca1f31b865efbb795003",
+                "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -5943,13 +6471,13 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
-            "time": "2024-11-13T13:31:12+00:00",
+            "time": "2025-11-27T13:27:24+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5988,7 +6516,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.15"
+                "source": "https://github.com/symfony/string/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -5999,6 +6527,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6185,29 +6717,115 @@
             ],
             "install-path": "../symfony/translation-contracts"
         },
+        {
+            "name": "symfony/type-info",
+            "version": "v7.4.1",
+            "version_normalized": "7.4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/type-info.git",
+                "reference": "ac5ab66b21c758df71b7210cf1033d1ac807f202"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/type-info/zipball/ac5ab66b21c758df71b7210cf1033d1ac807f202",
+                "reference": "ac5ab66b21c758df71b7210cf1033d1ac807f202",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.30"
+            },
+            "require-dev": {
+                "phpstan/phpdoc-parser": "^1.30|^2.0"
+            },
+            "time": "2025-12-05T14:04:53+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\TypeInfo\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mathias Arlaud",
+                    "email": "mathias.arlaud@gmail.com"
+                },
+                {
+                    "name": "Baptiste LEDUC",
+                    "email": "baptiste.leduc@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Extracts PHP types information.",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "PHPStan",
+                "phpdoc",
+                "symfony",
+                "type"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/type-info/tree/v7.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/type-info"
+        },
         {
             "name": "symfony/uid",
-            "version": "v6.4.3",
-            "version_normalized": "6.4.3.0",
+            "version": "v7.4.0",
+            "version_normalized": "7.4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0"
+                "reference": "2498e9f81b7baa206f44de583f2f48350b90142c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2498e9f81b7baa206f44de583f2f48350b90142c",
+                "reference": "2498e9f81b7baa206f44de583f2f48350b90142c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0|^8.0"
             },
-            "time": "2024-01-23T14:51:35+00:00",
+            "time": "2025-09-25T11:02:55+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -6244,7 +6862,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.3"
+                "source": "https://github.com/symfony/uid/tree/v7.4.0"
             },
             "funding": [
                 {
@@ -6255,6 +6873,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6319,39 +6941,38 @@
         },
         {
             "name": "web-auth/cose-lib",
-            "version": "4.3.0",
-            "version_normalized": "4.3.0.0",
+            "version": "4.4.2",
+            "version_normalized": "4.4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/cose-lib.git",
-                "reference": "e5c417b3b90e06c84638a18d350e438d760cb955"
+                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/e5c417b3b90e06c84638a18d350e438d760cb955",
-                "reference": "e5c417b3b90e06c84638a18d350e438d760cb955",
+                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/a93b61c48fb587855f64a9ec11ad7b60e867cb15",
+                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13",
                 "ext-json": "*",
-                "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "php": ">=8.1",
                 "spomky-labs/pki-framework": "^1.0"
             },
             "require-dev": {
-                "ekino/phpstan-banned-code": "^1.0",
-                "infection/infection": "^0.27",
+                "deptrac/deptrac": "^3.0",
+                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
+                "infection/infection": "^0.29",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
                 "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.7",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.2",
-                "phpunit/phpunit": "^10.1",
-                "qossmic/deptrac-shim": "^1.0",
-                "rector/rector": "^0.19",
+                "phpstan/phpstan": "^1.7|^2.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.1|^2.0",
+                "phpstan/phpstan-strict-rules": "^1.0|^2.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0",
+                "rector/rector": "^2.0",
                 "symfony/phpunit-bridge": "^6.4|^7.0",
                 "symplify/easy-coding-standard": "^12.0"
             },
@@ -6359,7 +6980,7 @@
                 "ext-bcmath": "For better performance, please install either GMP (recommended) or BCMath extension",
                 "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension"
             },
-            "time": "2024-02-05T21:00:39+00:00",
+            "time": "2025-08-14T20:33:29+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -6389,7 +7010,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-auth/cose-lib/issues",
-                "source": "https://github.com/web-auth/cose-lib/tree/4.3.0"
+                "source": "https://github.com/web-auth/cose-lib/tree/4.4.2"
             },
             "funding": [
                 {
@@ -6405,53 +7026,49 @@
         },
         {
             "name": "web-auth/webauthn-lib",
-            "version": "4.9.1",
-            "version_normalized": "4.9.1.0",
+            "version": "5.2.2",
+            "version_normalized": "5.2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/webauthn-lib.git",
-                "reference": "fd7a0943c663b325e92ad562c2bcc943e77beeac"
+                "reference": "8937c397c8ae91b5af422ca8aa915c756062da74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/fd7a0943c663b325e92ad562c2bcc943e77beeac",
-                "reference": "fd7a0943c663b325e92ad562c2bcc943e77beeac",
+                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/8937c397c8ae91b5af422ca8aa915c756062da74",
+                "reference": "8937c397c8ae91b5af422ca8aa915c756062da74",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "ext-mbstring": "*",
                 "ext-openssl": "*",
-                "lcobucci/clock": "^2.2|^3.0",
                 "paragonie/constant_time_encoding": "^2.6|^3.0",
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "phpdocumentor/reflection-docblock": "^5.3",
                 "psr/clock": "^1.0",
                 "psr/event-dispatcher": "^1.0",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "spomky-labs/cbor-php": "^3.0",
                 "spomky-labs/pki-framework": "^1.0",
+                "symfony/clock": "^6.4|^7.0",
                 "symfony/deprecation-contracts": "^3.2",
-                "symfony/uid": "^6.1|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
                 "web-auth/cose-lib": "^4.2.3"
             },
             "suggest": {
-                "phpdocumentor/reflection-docblock": "As of 4.5.x, the phpdocumentor/reflection-docblock component will become mandatory for converting objects such as the Metadata Statement",
-                "psr/clock-implementation": "As of 4.5.x, the PSR Clock implementation will replace lcobucci/clock",
                 "psr/log-implementation": "Recommended to receive logs from the library",
                 "symfony/event-dispatcher": "Recommended to use dispatched events",
-                "symfony/property-access": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-                "symfony/property-info": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
-                "symfony/serializer": "As of 4.5.x, the symfony/serializer component will become mandatory for converting objects such as the Metadata Statement",
                 "web-token/jwt-library": "Mandatory for fetching Metadata Statement from distant sources"
             },
-            "time": "2024-07-16T18:36:36+00:00",
+            "time": "2025-03-16T14:38:43+00:00",
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "web-auth/webauthn-framework",
-                    "url": "https://github.com/web-auth/webauthn-framework"
+                    "url": "https://github.com/web-auth/webauthn-framework",
+                    "name": "web-auth/webauthn-framework"
                 }
             },
             "installation-source": "dist",
@@ -6482,7 +7099,7 @@
                 "webauthn"
             ],
             "support": {
-                "source": "https://github.com/web-auth/webauthn-lib/tree/4.9.1"
+                "source": "https://github.com/web-auth/webauthn-lib/tree/5.2.2"
             },
             "funding": [
                 {
@@ -6495,6 +7112,67 @@
                 }
             ],
             "install-path": "../web-auth/webauthn-lib"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.12.1",
+            "version_normalized": "1.12.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-date": "*",
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "suggest": {
+                "ext-intl": "",
+                "ext-simplexml": "",
+                "ext-spl": ""
+            },
+            "time": "2025-10-29T15:56:20+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
+            },
+            "install-path": "../webmozart/assert"
         }
     ],
     "dev": false,
diff --git a/composer/installed.php b/composer/installed.php
index a6c1af166..cb6148657 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -38,9 +38,9 @@
             'dev_requirement' => false,
         ),
         'brick/math' => array(
-            'pretty_version' => '0.12.1',
-            'version' => '0.12.1.0',
-            'reference' => 'f510c0a40911935b77b86859eb5223d58d660df1',
+            'pretty_version' => '0.13.1',
+            'version' => '0.13.1.0',
+            'reference' => 'fc7ed316430118cc7836bf45faff18d5dfc8de04',
             'type' => 'library',
             'install_path' => __DIR__ . '/../brick/math',
             'aliases' => array(),
@@ -226,15 +226,6 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
-        'lcobucci/clock' => array(
-            'pretty_version' => '3.0.0',
-            'version' => '3.0.0.0',
-            'reference' => '039ef98c6b57b101d10bd11d8fdfda12cbd996dc',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../lcobucci/clock',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
         'marc-mabe/php-enum' => array(
             'pretty_version' => 'v4.7.1',
             'version' => '4.7.1.0',
@@ -317,9 +308,9 @@
             'dev_requirement' => false,
         ),
         'paragonie/constant_time_encoding' => array(
-            'pretty_version' => 'v2.6.3',
-            'version' => '2.6.3.0',
-            'reference' => '58c3f47f650c94ec05a151692652a868995d2938',
+            'pretty_version' => 'v3.1.3',
+            'version' => '3.1.3.0',
+            'reference' => 'd5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/constant_time_encoding',
             'aliases' => array(),
@@ -409,6 +400,33 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'phpdocumentor/reflection-common' => array(
+            'pretty_version' => '2.2.0',
+            'version' => '2.2.0.0',
+            'reference' => '1d01c49d4ed62f25aa84a747ad35d5a16924662b',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpdocumentor/reflection-common',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'phpdocumentor/reflection-docblock' => array(
+            'pretty_version' => '5.6.5',
+            'version' => '5.6.5.0',
+            'reference' => '90614c73d3800e187615e2dd236ad0e2a01bf761',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpdocumentor/reflection-docblock',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'phpdocumentor/type-resolver' => array(
+            'pretty_version' => '1.12.0',
+            'version' => '1.12.0.0',
+            'reference' => '92a98ada2b93d9b201a613cb5a33584dde25f195',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpdocumentor/type-resolver',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'phpseclib/phpseclib' => array(
             'pretty_version' => '2.0.47',
             'version' => '2.0.47.0',
@@ -418,6 +436,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'phpstan/phpdoc-parser' => array(
+            'pretty_version' => '2.3.0',
+            'version' => '2.3.0.0',
+            'reference' => '1e0cd5370df5dd2e556a36b9c62f62e555870495',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpstan/phpdoc-parser',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'pimple/pimple' => array(
             'pretty_version' => 'v3.6.0',
             'version' => '3.6.0.0',
@@ -626,18 +653,18 @@
             'dev_requirement' => false,
         ),
         'spomky-labs/cbor-php' => array(
-            'pretty_version' => '3.0.4',
-            'version' => '3.0.4.0',
-            'reference' => '658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b',
+            'pretty_version' => '3.2.2',
+            'version' => '3.2.2.0',
+            'reference' => '2a5fb86aacfe1004611370ead6caa2bfc88435d0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../spomky-labs/cbor-php',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'spomky-labs/pki-framework' => array(
-            'pretty_version' => '1.2.1',
-            'version' => '1.2.1.0',
-            'reference' => '0b10c8b53366729417d6226ae89a665f9e2d61b6',
+            'pretty_version' => '1.4.0',
+            'version' => '1.4.0.0',
+            'reference' => 'bf6f55a9d9eb25b7781640221cb54f5c727850d7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../spomky-labs/pki-framework',
             'aliases' => array(),
@@ -652,6 +679,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'symfony/clock' => array(
+            'pretty_version' => 'v7.4.0',
+            'version' => '7.4.0.0',
+            'reference' => '9169f24776edde469914c1e7a1442a50f7a4e110',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/clock',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'symfony/console' => array(
             'pretty_version' => 'v6.4.17',
             'version' => '6.4.17.0',
@@ -746,9 +782,9 @@
             ),
         ),
         'symfony/polyfill-intl-grapheme' => array(
-            'pretty_version' => 'v1.32.0',
-            'version' => '1.32.0.0',
-            'reference' => 'b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe',
+            'pretty_version' => 'v1.33.0',
+            'version' => '1.33.0.0',
+            'reference' => '380872130d3a5dd3ace2f4010d95125fde5d5c70',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme',
             'aliases' => array(),
@@ -824,9 +860,9 @@
             'dev_requirement' => false,
         ),
         'symfony/polyfill-uuid' => array(
-            'pretty_version' => 'v1.29.0',
-            'version' => '1.29.0.0',
-            'reference' => '3abdd21b0ceaa3000ee950097bc3cf9efc137853',
+            'pretty_version' => 'v1.33.0',
+            'version' => '1.33.0.0',
+            'reference' => '21533be36c24be3f4b1669c4725c7d1d2bab4ae2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-uuid',
             'aliases' => array(),
@@ -841,6 +877,24 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'symfony/property-access' => array(
+            'pretty_version' => 'v7.4.0',
+            'version' => '7.4.0.0',
+            'reference' => '537626149d2910ca43eb9ce465654366bf4442f4',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/property-access',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/property-info' => array(
+            'pretty_version' => 'v7.4.1',
+            'version' => '7.4.1.0',
+            'reference' => '912aafe70bee5cfd09fec5916fe35b83f04ae6ae',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/property-info',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'symfony/routing' => array(
             'pretty_version' => 'v6.4.12',
             'version' => '6.4.12.0',
@@ -850,6 +904,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'symfony/serializer' => array(
+            'pretty_version' => 'v7.4.2',
+            'version' => '7.4.2.0',
+            'reference' => '1a957acb613b520e443c2c659a67c782b67794bc',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/serializer',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'symfony/service-contracts' => array(
             'pretty_version' => 'v3.5.1',
             'version' => '3.5.1.0',
@@ -860,9 +923,9 @@
             'dev_requirement' => false,
         ),
         'symfony/string' => array(
-            'pretty_version' => 'v6.4.15',
-            'version' => '6.4.15.0',
-            'reference' => '73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f',
+            'pretty_version' => 'v7.4.0',
+            'version' => '7.4.0.0',
+            'reference' => 'd50e862cb0a0e0886f73ca1f31b865efbb795003',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/string',
             'aliases' => array(),
@@ -892,10 +955,19 @@
                 0 => '2.3|3.0',
             ),
         ),
+        'symfony/type-info' => array(
+            'pretty_version' => 'v7.4.1',
+            'version' => '7.4.1.0',
+            'reference' => 'ac5ab66b21c758df71b7210cf1033d1ac807f202',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/type-info',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'symfony/uid' => array(
-            'pretty_version' => 'v6.4.3',
-            'version' => '6.4.3.0',
-            'reference' => '1d31267211cc3a2fff32bcfc7c1818dac41b6fc0',
+            'pretty_version' => 'v7.4.0',
+            'version' => '7.4.0.0',
+            'reference' => '2498e9f81b7baa206f44de583f2f48350b90142c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/uid',
             'aliases' => array(),
@@ -911,22 +983,31 @@
             'dev_requirement' => false,
         ),
         'web-auth/cose-lib' => array(
-            'pretty_version' => '4.3.0',
-            'version' => '4.3.0.0',
-            'reference' => 'e5c417b3b90e06c84638a18d350e438d760cb955',
+            'pretty_version' => '4.4.2',
+            'version' => '4.4.2.0',
+            'reference' => 'a93b61c48fb587855f64a9ec11ad7b60e867cb15',
             'type' => 'library',
             'install_path' => __DIR__ . '/../web-auth/cose-lib',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'web-auth/webauthn-lib' => array(
-            'pretty_version' => '4.9.1',
-            'version' => '4.9.1.0',
-            'reference' => 'fd7a0943c663b325e92ad562c2bcc943e77beeac',
+            'pretty_version' => '5.2.2',
+            'version' => '5.2.2.0',
+            'reference' => '8937c397c8ae91b5af422ca8aa915c756062da74',
             'type' => 'library',
             'install_path' => __DIR__ . '/../web-auth/webauthn-lib',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'webmozart/assert' => array(
+            'pretty_version' => '1.12.1',
+            'version' => '1.12.1.0',
+            'reference' => '9be6926d8b485f55b9229203f962b51ed377ba68',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../webmozart/assert',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
     ),
 );
diff --git a/lcobucci/clock/src/Clock.php b/lcobucci/clock/src/Clock.php
deleted file mode 100644
index 45a033b87..000000000
--- a/lcobucci/clock/src/Clock.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Lcobucci\Clock;
-
-use DateTimeImmutable;
-use Psr\Clock\ClockInterface;
-
-interface Clock extends ClockInterface
-{
-    public function now(): DateTimeImmutable;
-}
diff --git a/lcobucci/clock/src/FrozenClock.php b/lcobucci/clock/src/FrozenClock.php
deleted file mode 100644
index 0aad70162..000000000
--- a/lcobucci/clock/src/FrozenClock.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Lcobucci\Clock;
-
-use DateTimeImmutable;
-use DateTimeZone;
-
-final class FrozenClock implements Clock
-{
-    public function __construct(private DateTimeImmutable $now)
-    {
-    }
-
-    public static function fromUTC(): self
-    {
-        return new self(new DateTimeImmutable('now', new DateTimeZone('UTC')));
-    }
-
-    public function setTo(DateTimeImmutable $now): void
-    {
-        $this->now = $now;
-    }
-
-    public function now(): DateTimeImmutable
-    {
-        return $this->now;
-    }
-}
diff --git a/lcobucci/clock/src/SystemClock.php b/lcobucci/clock/src/SystemClock.php
deleted file mode 100644
index 69de81f81..000000000
--- a/lcobucci/clock/src/SystemClock.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Lcobucci\Clock;
-
-use DateTimeImmutable;
-use DateTimeZone;
-
-use function date_default_timezone_get;
-
-final class SystemClock implements Clock
-{
-    public function __construct(private readonly DateTimeZone $timezone)
-    {
-    }
-
-    public static function fromUTC(): self
-    {
-        return new self(new DateTimeZone('UTC'));
-    }
-
-    public static function fromSystemTimezone(): self
-    {
-        return new self(new DateTimeZone(date_default_timezone_get()));
-    }
-
-    public function now(): DateTimeImmutable
-    {
-        return new DateTimeImmutable('now', $this->timezone);
-    }
-}
diff --git a/paragonie/constant_time_encoding/src/Base32.php b/paragonie/constant_time_encoding/src/Base32.php
index 7508b3df6..379552af5 100644
--- a/paragonie/constant_time_encoding/src/Base32.php
+++ b/paragonie/constant_time_encoding/src/Base32.php
@@ -3,8 +3,15 @@
 namespace ParagonIE\ConstantTime;
 
 use InvalidArgumentException;
+use Override;
 use RangeException;
+use SensitiveParameter;
 use TypeError;
+use function pack;
+use function rtrim;
+use function strlen;
+use function substr;
+use function unpack;
 
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
@@ -44,8 +51,12 @@ abstract class Base32 implements EncoderInterface
      * @param bool $strictPadding
      * @return string
      */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
+    #[Override]
+    public static function decode(
+        #[SensitiveParameter]
+        string $encodedString,
+        bool $strictPadding = false
+    ): string {
         return static::doDecode($encodedString, false, $strictPadding);
     }
 
@@ -56,8 +67,11 @@ public static function decode(string $encodedString, bool $strictPadding = false
      * @param bool $strictPadding
      * @return string
      */
-    public static function decodeUpper(string $src, bool $strictPadding = false): string
-    {
+    public static function decodeUpper(
+        #[SensitiveParameter]
+        string $src,
+        bool $strictPadding = false
+    ): string {
         return static::doDecode($src, true, $strictPadding);
     }
 
@@ -68,19 +82,26 @@ public static function decodeUpper(string $src, bool $strictPadding = false): st
      * @return string
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    #[Override]
+    public static function encode(
+        #[SensitiveParameter]
+        string $binString
+    ): string {
         return static::doEncode($binString, false, true);
     }
+
     /**
      * Encode into Base32 (RFC 4648)
      *
      * @param string $src
      * @return string
      * @throws TypeError
+     * @api
      */
-    public static function encodeUnpadded(string $src): string
-    {
+    public static function encodeUnpadded(
+        #[SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, false, false);
     }
 
@@ -90,9 +111,12 @@ public static function encodeUnpadded(string $src): string
      * @param string $src
      * @return string
      * @throws TypeError
+     * @api
      */
-    public static function encodeUpper(string $src): string
-    {
+    public static function encodeUpper(
+        #[SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, true, true);
     }
 
@@ -102,9 +126,12 @@ public static function encodeUpper(string $src): string
      * @param string $src
      * @return string
      * @throws TypeError
+     * @api
      */
-    public static function encodeUpperUnpadded(string $src): string
-    {
+    public static function encodeUpperUnpadded(
+        #[SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, true, false);
     }
 
@@ -114,6 +141,7 @@ public static function encodeUpperUnpadded(string $src): string
      *
      * @param int $src
      * @return int
+     * @api
      */
     protected static function decode5Bits(int $src): int
     {
@@ -136,6 +164,7 @@ protected static function decode5Bits(int $src): int
      *
      * @param int $src
      * @return int
+     * @api
      */
     protected static function decode5BitsUpper(int $src): int
     {
@@ -156,6 +185,7 @@ protected static function decode5BitsUpper(int $src): int
      *
      * @param int $src
      * @return string
+     * @api
      */
     protected static function encode5Bits(int $src): string
     {
@@ -164,7 +194,7 @@ protected static function encode5Bits(int $src): string
         // if ($src > 25) $ret -= 72;
         $diff -= ((25 - $src) >> 8) & 73;
 
-        return \pack('C', $src + $diff);
+        return pack('C', $src + $diff);
     }
 
     /**
@@ -175,6 +205,7 @@ protected static function encode5Bits(int $src): string
      *
      * @param int $src
      * @return string
+     * @api
      */
     protected static function encode5BitsUpper(int $src): string
     {
@@ -183,17 +214,21 @@ protected static function encode5BitsUpper(int $src): string
         // if ($src > 25) $ret -= 40;
         $diff -= ((25 - $src) >> 8) & 41;
 
-        return \pack('C', $src + $diff);
+        return pack('C', $src + $diff);
     }
 
     /**
      * @param string $encodedString
      * @param bool $upper
      * @return string
+     * @api
      */
-    public static function decodeNoPadding(string $encodedString, bool $upper = false): string
-    {
-        $srcLen = Binary::safeStrlen($encodedString);
+    public static function decodeNoPadding(
+        #[SensitiveParameter]
+        string $encodedString,
+        bool $upper = false
+    ): string {
+        $srcLen = strlen($encodedString);
         if ($srcLen === 0) {
             return '';
         }
@@ -222,9 +257,9 @@ public static function decodeNoPadding(string $encodedString, bool $upper = fals
      * @return string
      *
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
     protected static function doDecode(
+        #[SensitiveParameter]
         string $src,
         bool $upper = false,
         bool $strictPadding = false
@@ -235,7 +270,7 @@ protected static function doDecode(
             : 'decode5Bits';
 
         // Remove padding
-        $srcLen = Binary::safeStrlen($src);
+        $srcLen = strlen($src);
         if ($srcLen === 0) {
             return '';
         }
@@ -255,8 +290,8 @@ protected static function doDecode(
                 );
             }
         } else {
-            $src = \rtrim($src, '=');
-            $srcLen = Binary::safeStrlen($src);
+            $src = rtrim($src, '=');
+            $srcLen = strlen($src);
         }
 
         $err = 0;
@@ -264,7 +299,7 @@ protected static function doDecode(
         // Main loop (no padding):
         for ($i = 0; $i + 8 <= $srcLen; $i += 8) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 8));
+            $chunk = unpack('C*', substr($src, $i, 8));
             /** @var int $c0 */
             $c0 = static::$method($chunk[1]);
             /** @var int $c1 */
@@ -282,7 +317,7 @@ protected static function doDecode(
             /** @var int $c7 */
             $c7 = static::$method($chunk[8]);
 
-            $dest .= \pack(
+            $dest .= pack(
                 'CCCCC',
                 (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                 (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
@@ -295,7 +330,7 @@ protected static function doDecode(
         // The last chunk, which may have padding:
         if ($i < $srcLen) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
+            $chunk = unpack('C*', substr($src, $i, $srcLen - $i));
             /** @var int $c0 */
             $c0 = static::$method($chunk[1]);
 
@@ -313,7 +348,7 @@ protected static function doDecode(
                 /** @var int $c6 */
                 $c6 = static::$method($chunk[7]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'CCCC',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                     (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
@@ -336,7 +371,7 @@ protected static function doDecode(
                 /** @var int $c5 */
                 $c5 = static::$method($chunk[6]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'CCCC',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                     (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
@@ -354,7 +389,7 @@ protected static function doDecode(
                 /** @var int $c4 */
                 $c4 = static::$method($chunk[5]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'CCC',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                     (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
@@ -372,7 +407,7 @@ protected static function doDecode(
                 /** @var int $c3 */
                 $c3 = static::$method($chunk[4]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'CC',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                     (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff
@@ -387,7 +422,7 @@ protected static function doDecode(
                 /** @var int $c2 */
                 $c2 = static::$method($chunk[3]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'CC',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
                     (($c1 << 6) | ($c2 << 1)             ) & 0xff
@@ -400,7 +435,7 @@ protected static function doDecode(
                 /** @var int $c1 */
                 $c1 = static::$method($chunk[2]);
 
-                $dest .= \pack(
+                $dest .= pack(
                     'C',
                     (($c0 << 3) | ($c1 >> 2)             ) & 0xff
                 );
@@ -409,7 +444,7 @@ protected static function doDecode(
                     $err |= ($c1 << 6) & 0xff;
                 }
             } else {
-                $dest .= \pack(
+                $dest .= pack(
                     'C',
                     (($c0 << 3)                          ) & 0xff
                 );
@@ -434,20 +469,24 @@ protected static function doDecode(
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode(string $src, bool $upper = false, $pad = true): string
-    {
+    protected static function doEncode(
+        #[SensitiveParameter]
+        string $src,
+        bool $upper = false,
+        bool $pad = true
+    ): string {
         // We do this to reduce code duplication:
         $method = $upper
             ? 'encode5BitsUpper'
             : 'encode5Bits';
         
         $dest = '';
-        $srcLen = Binary::safeStrlen($src);
+        $srcLen = strlen($src);
 
         // Main loop (no padding):
         for ($i = 0; $i + 5 <= $srcLen; $i += 5) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 5));
+            $chunk = unpack('C*', substr($src, $i, 5));
             $b0 = $chunk[1];
             $b1 = $chunk[2];
             $b2 = $chunk[3];
@@ -466,7 +505,7 @@ protected static function doEncode(string $src, bool $upper = false, $pad = true
         // The last chunk, which may have padding:
         if ($i < $srcLen) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
+            $chunk = unpack('C*', substr($src, $i, $srcLen - $i));
             $b0 = $chunk[1];
             if ($i + 3 < $srcLen) {
                 $b1 = $chunk[2];
diff --git a/paragonie/constant_time_encoding/src/Base32Hex.php b/paragonie/constant_time_encoding/src/Base32Hex.php
index b868dd048..4323a573a 100644
--- a/paragonie/constant_time_encoding/src/Base32Hex.php
+++ b/paragonie/constant_time_encoding/src/Base32Hex.php
@@ -2,6 +2,9 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use Override;
+use function pack;
+
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
@@ -40,6 +43,7 @@ abstract class Base32Hex extends Base32
      * @param int $src
      * @return int
      */
+    #[Override]
     protected static function decode5Bits(int $src): int
     {
         $ret = -1;
@@ -60,6 +64,7 @@ protected static function decode5Bits(int $src): int
      * @param int $src
      * @return int
      */
+    #[Override]
     protected static function decode5BitsUpper(int $src): int
     {
         $ret = -1;
@@ -80,6 +85,7 @@ protected static function decode5BitsUpper(int $src): int
      * @param int $src
      * @return string
      */
+    #[Override]
     protected static function encode5Bits(int $src): string
     {
         $src += 0x30;
@@ -87,7 +93,7 @@ protected static function encode5Bits(int $src): string
         // if ($src > 0x39) $src += 0x61 - 0x3a; // 39
         $src += ((0x39 - $src) >> 8) & 39;
 
-        return \pack('C', $src);
+        return pack('C', $src);
     }
 
     /**
@@ -99,6 +105,7 @@ protected static function encode5Bits(int $src): string
      * @param int $src
      * @return string
      */
+    #[Override]
     protected static function encode5BitsUpper(int $src): string
     {
         $src += 0x30;
@@ -106,6 +113,6 @@ protected static function encode5BitsUpper(int $src): string
         // if ($src > 0x39) $src += 0x41 - 0x3a; // 7
         $src += ((0x39 - $src) >> 8) & 7;
 
-        return \pack('C', $src);
+        return pack('C', $src);
     }
 }
\ No newline at end of file
diff --git a/paragonie/constant_time_encoding/src/Base64.php b/paragonie/constant_time_encoding/src/Base64.php
index f5716179f..9679748dc 100644
--- a/paragonie/constant_time_encoding/src/Base64.php
+++ b/paragonie/constant_time_encoding/src/Base64.php
@@ -3,8 +3,23 @@
 namespace ParagonIE\ConstantTime;
 
 use InvalidArgumentException;
+use Override;
 use RangeException;
+use SensitiveParameter;
+use SodiumException;
 use TypeError;
+use function extension_loaded;
+use function pack;
+use function rtrim;
+use function sodium_base642bin;
+use function sodium_bin2base64;
+use function strlen;
+use function substr;
+use function unpack;
+use const SODIUM_BASE64_VARIANT_ORIGINAL;
+use const SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING;
+use const SODIUM_BASE64_VARIANT_URLSAFE;
+use const SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING;
 
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
@@ -47,8 +62,25 @@ abstract class Base64 implements EncoderInterface
      *
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    #[Override]
+    public static function encode(
+        #[SensitiveParameter]
+        string $binString
+    ): string {
+        if (extension_loaded('sodium')) {
+            $variant = match(static::class) {
+                Base64::class => SODIUM_BASE64_VARIANT_ORIGINAL,
+                Base64UrlSafe::class => SODIUM_BASE64_VARIANT_URLSAFE,
+                default => 0,
+            };
+            if ($variant > 0) {
+                try {
+                    return sodium_bin2base64($binString, $variant);
+                } catch (SodiumException $ex) {
+                    throw new RangeException($ex->getMessage(), $ex->getCode(), $ex);
+                }
+            }
+        }
         return static::doEncode($binString, true);
     }
 
@@ -61,9 +93,26 @@ public static function encode(string $binString): string
      * @return string
      *
      * @throws TypeError
+     * @api
      */
-    public static function encodeUnpadded(string $src): string
-    {
+    public static function encodeUnpadded(
+        #[SensitiveParameter]
+        string $src
+    ): string {
+        if (extension_loaded('sodium')) {
+            $variant = match(static::class) {
+                Base64::class => SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING,
+                Base64UrlSafe::class => SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING,
+                default => 0,
+            };
+            if ($variant > 0) {
+                try {
+                    return sodium_bin2base64($src, $variant);
+                } catch (SodiumException $ex) {
+                    throw new RangeException($ex->getMessage(), $ex->getCode(), $ex);
+                }
+            }
+        }
         return static::doEncode($src, false);
     }
 
@@ -74,14 +123,17 @@ public static function encodeUnpadded(string $src): string
      *
      * @throws TypeError
      */
-    protected static function doEncode(string $src, bool $pad = true): string
-    {
+    protected static function doEncode(
+        #[SensitiveParameter]
+        string $src,
+        bool $pad = true
+    ): string {
         $dest = '';
-        $srcLen = Binary::safeStrlen($src);
+        $srcLen = strlen($src);
         // Main loop (no padding):
         for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 3));
+            $chunk = unpack('C*', substr($src, $i, 3));
             $b0 = $chunk[1];
             $b1 = $chunk[2];
             $b2 = $chunk[3];
@@ -95,7 +147,7 @@ protected static function doEncode(string $src, bool $pad = true): string
         // The last chunk, which may have padding:
         if ($i < $srcLen) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
+            $chunk = unpack('C*', substr($src, $i, $srcLen - $i));
             $b0 = $chunk[1];
             if ($i + 1 < $srcLen) {
                 $b1 = $chunk[2];
@@ -129,12 +181,15 @@ protected static function doEncode(string $src, bool $pad = true): string
      *
      * @throws RangeException
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
+    #[Override]
+    public static function decode(
+        #[SensitiveParameter]
+        string $encodedString,
+        bool $strictPadding = false
+    ): string {
         // Remove padding
-        $srcLen = Binary::safeStrlen($encodedString);
+        $srcLen = strlen($encodedString);
         if ($srcLen === 0) {
             return '';
         }
@@ -158,9 +213,24 @@ public static function decode(string $encodedString, bool $strictPadding = false
                     'Incorrect padding'
                 );
             }
+            if (extension_loaded('sodium')) {
+                $variant = match(static::class) {
+                    Base64::class => SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING,
+                    Base64UrlSafe::class => SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING,
+                    default => 0,
+                };
+                if ($variant > 0) {
+                    try {
+                        return sodium_base642bin(substr($encodedString, 0, $srcLen), $variant);
+                    } catch (SodiumException $ex) {
+                        throw new RangeException($ex->getMessage(), $ex->getCode(), $ex);
+                    }
+                }
+            }
         } else {
-            $encodedString = \rtrim($encodedString, '=');
-            $srcLen = Binary::safeStrlen($encodedString);
+            // Just remove all padding.
+            $encodedString = rtrim($encodedString, '=');
+            $srcLen = strlen($encodedString);
         }
 
         $err = 0;
@@ -168,13 +238,13 @@ public static function decode(string $encodedString, bool $strictPadding = false
         // Main loop (no padding):
         for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($encodedString, $i, 4));
+            $chunk = unpack('C*', substr($encodedString, $i, 4));
             $c0 = static::decode6Bits($chunk[1]);
             $c1 = static::decode6Bits($chunk[2]);
             $c2 = static::decode6Bits($chunk[3]);
             $c3 = static::decode6Bits($chunk[4]);
 
-            $dest .= \pack(
+            $dest .= pack(
                 'CCC',
                 ((($c0 << 2) | ($c1 >> 4)) & 0xff),
                 ((($c1 << 4) | ($c2 >> 2)) & 0xff),
@@ -185,13 +255,13 @@ public static function decode(string $encodedString, bool $strictPadding = false
         // The last chunk, which may have padding:
         if ($i < $srcLen) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($encodedString, $i, $srcLen - $i));
+            $chunk = unpack('C*', substr($encodedString, $i, $srcLen - $i));
             $c0 = static::decode6Bits($chunk[1]);
 
             if ($i + 2 < $srcLen) {
                 $c1 = static::decode6Bits($chunk[2]);
                 $c2 = static::decode6Bits($chunk[3]);
-                $dest .= \pack(
+                $dest .= pack(
                     'CC',
                     ((($c0 << 2) | ($c1 >> 4)) & 0xff),
                     ((($c1 << 4) | ($c2 >> 2)) & 0xff)
@@ -202,7 +272,7 @@ public static function decode(string $encodedString, bool $strictPadding = false
                 }
             } elseif ($i + 1 < $srcLen) {
                 $c1 = static::decode6Bits($chunk[2]);
-                $dest .= \pack(
+                $dest .= pack(
                     'C',
                     ((($c0 << 2) | ($c1 >> 4)) & 0xff)
                 );
@@ -226,26 +296,23 @@ public static function decode(string $encodedString, bool $strictPadding = false
     /**
      * @param string $encodedString
      * @return string
+     * @api
      */
-    public static function decodeNoPadding(string $encodedString): string
-    {
-        $srcLen = Binary::safeStrlen($encodedString);
+    public static function decodeNoPadding(
+        #[SensitiveParameter]
+        string $encodedString
+    ): string {
+        $srcLen = strlen($encodedString);
         if ($srcLen === 0) {
             return '';
         }
         if (($srcLen & 3) === 0) {
-            if ($encodedString[$srcLen - 1] === '=') {
+            // If $strLen is not zero, and it is divisible by 4, then it's at least 4.
+            if ($encodedString[$srcLen - 1] === '=' || $encodedString[$srcLen - 2] === '=') {
                 throw new InvalidArgumentException(
                     "decodeNoPadding() doesn't tolerate padding"
                 );
             }
-            if (($srcLen & 3) > 1) {
-                if ($encodedString[$srcLen - 2] === '=') {
-                    throw new InvalidArgumentException(
-                        "decodeNoPadding() doesn't tolerate padding"
-                    );
-                }
-            }
         }
         return static::decode(
             $encodedString,
@@ -309,6 +376,6 @@ protected static function encode6Bits(int $src): string
         // if ($src > 62) $diff += 0x2f - 0x2b - 1; // 3
         $diff += ((62 - $src) >> 8) & 3;
 
-        return \pack('C', $src + $diff);
+        return pack('C', $src + $diff);
     }
 }
diff --git a/paragonie/constant_time_encoding/src/Base64DotSlash.php b/paragonie/constant_time_encoding/src/Base64DotSlash.php
index 5e98a8f79..847751767 100644
--- a/paragonie/constant_time_encoding/src/Base64DotSlash.php
+++ b/paragonie/constant_time_encoding/src/Base64DotSlash.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use Override;
+
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
@@ -44,6 +46,7 @@ abstract class Base64DotSlash extends Base64
      * @param int $src
      * @return int
      */
+    #[Override]
     protected static function decode6Bits(int $src): int
     {
         $ret = -1;
@@ -70,6 +73,7 @@ protected static function decode6Bits(int $src): int
      * @param int $src
      * @return string
      */
+    #[Override]
     protected static function encode6Bits(int $src): string
     {
         $src += 0x2e;
diff --git a/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php b/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php
index 9780b14bb..2c42db37f 100644
--- a/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php
+++ b/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use Override;
+
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
@@ -44,6 +46,7 @@ abstract class Base64DotSlashOrdered extends Base64
      * @param int $src
      * @return int
      */
+    #[Override]
     protected static function decode6Bits(int $src): int
     {
         $ret = -1;
@@ -67,6 +70,7 @@ protected static function decode6Bits(int $src): int
      * @param int $src
      * @return string
      */
+    #[Override]
     protected static function encode6Bits(int $src): string
     {
         $src += 0x2e;
diff --git a/paragonie/constant_time_encoding/src/Base64UrlSafe.php b/paragonie/constant_time_encoding/src/Base64UrlSafe.php
index 8192c63d5..845aaf626 100644
--- a/paragonie/constant_time_encoding/src/Base64UrlSafe.php
+++ b/paragonie/constant_time_encoding/src/Base64UrlSafe.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use Override;
+
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
@@ -45,6 +47,7 @@ abstract class Base64UrlSafe extends Base64
      * @param int $src
      * @return int
      */
+    #[Override]
     protected static function decode6Bits(int $src): int
     {
         $ret = -1;
@@ -74,6 +77,7 @@ protected static function decode6Bits(int $src): int
      * @param int $src
      * @return string
      */
+    #[Override]
     protected static function encode6Bits(int $src): string
     {
         $diff = 0x41;
diff --git a/paragonie/constant_time_encoding/src/Binary.php b/paragonie/constant_time_encoding/src/Binary.php
index 828f3e0f6..369584407 100644
--- a/paragonie/constant_time_encoding/src/Binary.php
+++ b/paragonie/constant_time_encoding/src/Binary.php
@@ -2,7 +2,10 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use SensitiveParameter;
 use TypeError;
+use function strlen;
+use function substr;
 
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
@@ -45,15 +48,11 @@ abstract class Binary
      * @param string $str
      * @return int
      */
-    public static function safeStrlen(string $str): int
-    {
-        if (\function_exists('mb_strlen')) {
-            // mb_strlen in PHP 7.x can return false.
-            /** @psalm-suppress RedundantCast */
-            return (int) \mb_strlen($str, '8bit');
-        } else {
-            return \strlen($str);
-        }
+    public static function safeStrlen(
+        #[SensitiveParameter]
+        string $str
+    ): int {
+        return strlen($str);
     }
 
     /**
@@ -70,21 +69,19 @@ public static function safeStrlen(string $str): int
      * @throws TypeError
      */
     public static function safeSubstr(
+        #[SensitiveParameter]
         string $str,
         int $start = 0,
-        $length = null
+        ?int $length = null
     ): string {
         if ($length === 0) {
             return '';
         }
-        if (\function_exists('mb_substr')) {
-            return \mb_substr($str, $start, $length, '8bit');
-        }
         // Unlike mb_substr(), substr() doesn't accept NULL for length
         if ($length !== null) {
-            return \substr($str, $start, $length);
+            return substr($str, $start, $length);
         } else {
-            return \substr($str, $start);
+            return substr($str, $start);
         }
     }
 }
diff --git a/paragonie/constant_time_encoding/src/EncoderInterface.php b/paragonie/constant_time_encoding/src/EncoderInterface.php
index 9cafbf96c..cb358ea0d 100644
--- a/paragonie/constant_time_encoding/src/EncoderInterface.php
+++ b/paragonie/constant_time_encoding/src/EncoderInterface.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use SensitiveParameter;
+
 /**
  *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
@@ -38,7 +40,10 @@ interface EncoderInterface
      * @param string $binString (raw binary)
      * @return string
      */
-    public static function encode(string $binString): string;
+    public static function encode(
+        #[SensitiveParameter]
+        string $binString
+    ): string;
 
     /**
      * Convert a binary string into a hexadecimal string without cache-timing
@@ -48,5 +53,9 @@ public static function encode(string $binString): string;
      * @param bool $strictPadding Error on invalid padding
      * @return string (raw binary)
      */
-    public static function decode(string $encodedString, bool $strictPadding = false): string;
+    public static function decode(
+        #[SensitiveParameter]
+        string $encodedString,
+        bool $strictPadding = false
+    ): string;
 }
diff --git a/paragonie/constant_time_encoding/src/Encoding.php b/paragonie/constant_time_encoding/src/Encoding.php
index 8649f31fc..b28a5014e 100644
--- a/paragonie/constant_time_encoding/src/Encoding.php
+++ b/paragonie/constant_time_encoding/src/Encoding.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use RangeException;
+use SensitiveParameter;
 use TypeError;
 
 /**
@@ -30,6 +32,7 @@
 /**
  * Class Encoding
  * @package ParagonIE\ConstantTime
+ * @api
  */
 abstract class Encoding
 {
@@ -40,8 +43,10 @@ abstract class Encoding
      * @return string
      * @throws TypeError
      */
-    public static function base32Encode(string $str): string
-    {
+    public static function base32Encode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encode($str);
     }
 
@@ -52,8 +57,10 @@ public static function base32Encode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32EncodeUpper(string $str): string
-    {
+    public static function base32EncodeUpper(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -64,8 +71,10 @@ public static function base32EncodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32Decode(string $str): string
-    {
+    public static function base32Decode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decode($str);
     }
 
@@ -76,8 +85,10 @@ public static function base32Decode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32DecodeUpper(string $str): string
-    {
+    public static function base32DecodeUpper(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str);
     }
 
@@ -88,8 +99,10 @@ public static function base32DecodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexEncode(string $str): string
-    {
+    public static function base32HexEncode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::encode($str);
     }
 
@@ -100,8 +113,10 @@ public static function base32HexEncode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexEncodeUpper(string $str): string
-    {
+    public static function base32HexEncodeUpper(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::encodeUpper($str);
     }
 
@@ -112,8 +127,10 @@ public static function base32HexEncodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexDecode(string $str): string
-    {
+    public static function base32HexDecode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::decode($str);
     }
 
@@ -124,8 +141,10 @@ public static function base32HexDecode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexDecodeUpper(string $str): string
-    {
+    public static function base32HexDecodeUpper(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::decodeUpper($str);
     }
 
@@ -136,8 +155,10 @@ public static function base32HexDecodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64Encode(string $str): string
-    {
+    public static function base64Encode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64::encode($str);
     }
 
@@ -148,8 +169,10 @@ public static function base64Encode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64Decode(string $str): string
-    {
+    public static function base64Decode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64::decode($str);
     }
 
@@ -161,8 +184,10 @@ public static function base64Decode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64EncodeDotSlash(string $str): string
-    {
+    public static function base64EncodeDotSlash(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlash::encode($str);
     }
 
@@ -173,11 +198,13 @@ public static function base64EncodeDotSlash(string $str): string
      *
      * @param string $str
      * @return string
-     * @throws \RangeException
+     * @throws RangeException
      * @throws TypeError
      */
-    public static function base64DecodeDotSlash(string $str): string
-    {
+    public static function base64DecodeDotSlash(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlash::decode($str);
     }
 
@@ -189,8 +216,10 @@ public static function base64DecodeDotSlash(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64EncodeDotSlashOrdered(string $str): string
-    {
+    public static function base64EncodeDotSlashOrdered(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlashOrdered::encode($str);
     }
 
@@ -201,11 +230,13 @@ public static function base64EncodeDotSlashOrdered(string $str): string
      *
      * @param string $str
      * @return string
-     * @throws \RangeException
+     * @throws RangeException
      * @throws TypeError
      */
-    public static function base64DecodeDotSlashOrdered(string $str): string
-    {
+    public static function base64DecodeDotSlashOrdered(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlashOrdered::decode($str);
     }
 
@@ -217,8 +248,10 @@ public static function base64DecodeDotSlashOrdered(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function hexEncode(string $bin_string): string
-    {
+    public static function hexEncode(
+        #[SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::encode($bin_string);
     }
 
@@ -228,10 +261,12 @@ public static function hexEncode(string $bin_string): string
      *
      * @param string $hex_string
      * @return string (raw binary)
-     * @throws \RangeException
+     * @throws RangeException
      */
-    public static function hexDecode(string $hex_string): string
-    {
+    public static function hexDecode(
+        #[SensitiveParameter]
+        string $hex_string
+    ): string {
         return Hex::decode($hex_string);
     }
 
@@ -243,8 +278,10 @@ public static function hexDecode(string $hex_string): string
      * @return string
      * @throws TypeError
      */
-    public static function hexEncodeUpper(string $bin_string): string
-    {
+    public static function hexEncodeUpper(
+        #[SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::encodeUpper($bin_string);
     }
 
@@ -255,8 +292,10 @@ public static function hexEncodeUpper(string $bin_string): string
      * @param string $bin_string (raw binary)
      * @return string
      */
-    public static function hexDecodeUpper(string $bin_string): string
-    {
+    public static function hexDecodeUpper(
+        #[SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::decode($bin_string);
     }
 }
diff --git a/paragonie/constant_time_encoding/src/Hex.php b/paragonie/constant_time_encoding/src/Hex.php
index a9e058cd3..b515b9758 100644
--- a/paragonie/constant_time_encoding/src/Hex.php
+++ b/paragonie/constant_time_encoding/src/Hex.php
@@ -2,11 +2,20 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use Override;
 use RangeException;
+use SensitiveParameter;
+use SodiumException;
 use TypeError;
+use function extension_loaded;
+use function pack;
+use function sodium_bin2hex;
+use function sodium_hex2bin;
+use function strlen;
+use function unpack;
 
 /**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
+ *  Copyright (c) 2016 - 2025 Paragon Initiative Enterprises.
  *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -42,17 +51,27 @@ abstract class Hex implements EncoderInterface
      * @return string
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    #[Override]
+    public static function encode(
+        #[SensitiveParameter]
+        string $binString
+    ): string {
+        if (extension_loaded('sodium')) {
+            try {
+                return sodium_bin2hex($binString);
+            } catch (SodiumException $ex) {
+                throw new RangeException($ex->getMessage(), $ex->getCode(), $ex);
+            }
+        }
         $hex = '';
-        $len = Binary::safeStrlen($binString);
+        $len = strlen($binString);
         for ($i = 0; $i < $len; ++$i) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C', $binString[$i]);
+            $chunk = unpack('C', $binString[$i]);
             $c = $chunk[1] & 0xf;
             $b = $chunk[1] >> 4;
 
-            $hex .= \pack(
+            $hex .= pack(
                 'CC',
                 (87 + $b + ((($b - 10) >> 8) & ~38)),
                 (87 + $c + ((($c - 10) >> 8) & ~38))
@@ -69,18 +88,20 @@ public static function encode(string $binString): string
      * @return string
      * @throws TypeError
      */
-    public static function encodeUpper(string $binString): string
-    {
+    public static function encodeUpper(
+        #[SensitiveParameter]
+        string $binString
+    ): string {
         $hex = '';
-        $len = Binary::safeStrlen($binString);
+        $len = strlen($binString);
 
         for ($i = 0; $i < $len; ++$i) {
             /** @var array<int, int> $chunk */
-            $chunk = \unpack('C', $binString[$i]);
+            $chunk = unpack('C', $binString[$i]);
             $c = $chunk[1] & 0xf;
             $b = $chunk[1] >> 4;
 
-            $hex .= \pack(
+            $hex .= pack(
                 'CC',
                 (55 + $b + ((($b - 10) >> 8) & ~6)),
                 (55 + $c + ((($c - 10) >> 8) & ~6))
@@ -98,14 +119,23 @@ public static function encodeUpper(string $binString): string
      * @return string (raw binary)
      * @throws RangeException
      */
+    #[Override]
     public static function decode(
+        #[SensitiveParameter]
         string $encodedString,
         bool $strictPadding = false
     ): string {
+        if (extension_loaded('sodium') && $strictPadding) {
+            try {
+                return sodium_hex2bin($encodedString);
+            } catch (SodiumException $ex) {
+                throw new RangeException($ex->getMessage(), $ex->getCode(), $ex);
+            }
+        }
         $hex_pos = 0;
         $bin = '';
         $c_acc = 0;
-        $hex_len = Binary::safeStrlen($encodedString);
+        $hex_len = strlen($encodedString);
         $state = 0;
         if (($hex_len & 1) !== 0) {
             if ($strictPadding) {
@@ -119,7 +149,7 @@ public static function decode(
         }
 
         /** @var array<int, int> $chunk */
-        $chunk = \unpack('C*', $encodedString);
+        $chunk = unpack('C*', $encodedString);
         while ($hex_pos < $hex_len) {
             ++$hex_pos;
             $c = $chunk[$hex_pos];
@@ -137,7 +167,7 @@ public static function decode(
             if ($state === 0) {
                 $c_acc = $c_val * 16;
             } else {
-                $bin .= \pack('C', $c_acc | $c_val);
+                $bin .= pack('C', $c_acc | $c_val);
             }
             $state ^= 1;
         }
diff --git a/paragonie/constant_time_encoding/src/RFC4648.php b/paragonie/constant_time_encoding/src/RFC4648.php
index f124d65bf..fb66f73d7 100644
--- a/paragonie/constant_time_encoding/src/RFC4648.php
+++ b/paragonie/constant_time_encoding/src/RFC4648.php
@@ -2,6 +2,7 @@
 declare(strict_types=1);
 namespace ParagonIE\ConstantTime;
 
+use SensitiveParameter;
 use TypeError;
 
 /**
@@ -33,6 +34,7 @@
  * This class conforms strictly to the RFC
  *
  * @package ParagonIE\ConstantTime
+ * @api
  */
 abstract class RFC4648
 {
@@ -46,8 +48,10 @@ abstract class RFC4648
      *
      * @throws TypeError
      */
-    public static function base64Encode(string $str): string
-    {
+    public static function base64Encode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64::encode($str);
     }
 
@@ -61,8 +65,10 @@ public static function base64Encode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64Decode(string $str): string
-    {
+    public static function base64Decode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64::decode($str, true);
     }
 
@@ -76,8 +82,10 @@ public static function base64Decode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64UrlSafeEncode(string $str): string
-    {
+    public static function base64UrlSafeEncode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64UrlSafe::encode($str);
     }
 
@@ -91,8 +99,10 @@ public static function base64UrlSafeEncode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64UrlSafeDecode(string $str): string
-    {
+    public static function base64UrlSafeDecode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base64UrlSafe::decode($str, true);
     }
 
@@ -106,8 +116,10 @@ public static function base64UrlSafeDecode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32Encode(string $str): string
-    {
+    public static function base32Encode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -121,8 +133,10 @@ public static function base32Encode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32Decode(string $str): string
-    {
+    public static function base32Decode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str, true);
     }
 
@@ -136,8 +150,10 @@ public static function base32Decode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32HexEncode(string $str): string
-    {
+    public static function base32HexEncode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -151,8 +167,10 @@ public static function base32HexEncode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32HexDecode(string $str): string
-    {
+    public static function base32HexDecode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str, true);
     }
 
@@ -166,8 +184,10 @@ public static function base32HexDecode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base16Encode(string $str): string
-    {
+    public static function base16Encode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Hex::encodeUpper($str);
     }
 
@@ -179,8 +199,10 @@ public static function base16Encode(string $str): string
      * @param string $str
      * @return string
      */
-    public static function base16Decode(string $str): string
-    {
+    public static function base16Decode(
+        #[SensitiveParameter]
+        string $str
+    ): string {
         return Hex::decode($str, true);
     }
-}
\ No newline at end of file
+}
diff --git a/lcobucci/clock/LICENSE b/phpdocumentor/reflection-common/LICENSE
similarity index 94%
rename from lcobucci/clock/LICENSE
rename to phpdocumentor/reflection-common/LICENSE
index 58ea9440e..ed6926c1e 100644
--- a/lcobucci/clock/LICENSE
+++ b/phpdocumentor/reflection-common/LICENSE
@@ -1,6 +1,6 @@
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2017 Luís Cobucci
+Copyright (c) 2015 phpDocumentor
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
diff --git a/phpdocumentor/reflection-common/src/Element.php b/phpdocumentor/reflection-common/src/Element.php
new file mode 100644
index 000000000..8923e4fb0
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/Element.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * phpDocumentor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for Api Elements
+ */
+interface Element
+{
+    /**
+     * Returns the Fqsen of the element.
+     */
+    public function getFqsen() : Fqsen;
+
+    /**
+     * Returns the name of the element.
+     */
+    public function getName() : string;
+}
diff --git a/phpdocumentor/reflection-common/src/File.php b/phpdocumentor/reflection-common/src/File.php
new file mode 100644
index 000000000..239c137e7
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/File.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for files processed by the ProjectFactory
+ */
+interface File
+{
+    /**
+     * Returns the content of the file as a string.
+     */
+    public function getContents() : string;
+
+    /**
+     * Returns md5 hash of the file.
+     */
+    public function md5() : string;
+
+    /**
+     * Returns an relative path to the file.
+     */
+    public function path() : string;
+}
diff --git a/phpdocumentor/reflection-common/src/Fqsen.php b/phpdocumentor/reflection-common/src/Fqsen.php
new file mode 100644
index 000000000..8fc5d3441
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/Fqsen.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * phpDocumentor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use InvalidArgumentException;
+use function assert;
+use function end;
+use function explode;
+use function is_string;
+use function preg_match;
+use function sprintf;
+use function trim;
+
+/**
+ * Value Object for Fqsen.
+ *
+ * @link https://github.com/phpDocumentor/fig-standards/blob/master/proposed/phpdoc-meta.md
+ *
+ * @psalm-immutable
+ */
+final class Fqsen
+{
+    /** @var string full quallified class name */
+    private $fqsen;
+
+    /** @var string name of the element without path. */
+    private $name;
+
+    /**
+     * Initializes the object.
+     *
+     * @throws InvalidArgumentException when $fqsen is not matching the format.
+     */
+    public function __construct(string $fqsen)
+    {
+        $matches = [];
+
+        $result = preg_match(
+            //phpcs:ignore Generic.Files.LineLength.TooLong
+            '/^\\\\([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff\\\\]*)?(?:[:]{2}\\$?([a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*))?(?:\\(\\))?$/',
+            $fqsen,
+            $matches
+        );
+
+        if ($result === 0) {
+            throw new InvalidArgumentException(
+                sprintf('"%s" is not a valid Fqsen.', $fqsen)
+            );
+        }
+
+        $this->fqsen = $fqsen;
+
+        if (isset($matches[2])) {
+            $this->name = $matches[2];
+        } else {
+            $matches = explode('\\', $fqsen);
+            $name = end($matches);
+            assert(is_string($name));
+            $this->name = trim($name, '()');
+        }
+    }
+
+    /**
+     * converts this class to string.
+     */
+    public function __toString() : string
+    {
+        return $this->fqsen;
+    }
+
+    /**
+     * Returns the name of the element without path.
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+}
diff --git a/phpdocumentor/reflection-common/src/Location.php b/phpdocumentor/reflection-common/src/Location.php
new file mode 100644
index 000000000..177deede6
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/Location.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * The location where an element occurs within a file.
+ *
+ * @psalm-immutable
+ */
+final class Location
+{
+    /** @var int */
+    private $lineNumber = 0;
+
+    /** @var int */
+    private $columnNumber = 0;
+
+    /**
+     * Initializes the location for an element using its line number in the file and optionally the column number.
+     */
+    public function __construct(int $lineNumber, int $columnNumber = 0)
+    {
+        $this->lineNumber = $lineNumber;
+        $this->columnNumber = $columnNumber;
+    }
+
+    /**
+     * Returns the line number that is covered by this location.
+     */
+    public function getLineNumber() : int
+    {
+        return $this->lineNumber;
+    }
+
+    /**
+     * Returns the column number (character position on a line) for this location object.
+     */
+    public function getColumnNumber() : int
+    {
+        return $this->columnNumber;
+    }
+}
diff --git a/phpdocumentor/reflection-common/src/Project.php b/phpdocumentor/reflection-common/src/Project.php
new file mode 100644
index 000000000..57839fd14
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/Project.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * phpDocumentor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for project. Since the definition of a project can be different per factory this interface will be small.
+ */
+interface Project
+{
+    /**
+     * Returns the name of the project.
+     */
+    public function getName() : string;
+}
diff --git a/phpdocumentor/reflection-common/src/ProjectFactory.php b/phpdocumentor/reflection-common/src/ProjectFactory.php
new file mode 100644
index 000000000..8bdc60678
--- /dev/null
+++ b/phpdocumentor/reflection-common/src/ProjectFactory.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * phpDocumentor
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for project factories. A project factory shall convert a set of files
+ * into an object implementing the Project interface.
+ */
+interface ProjectFactory
+{
+    /**
+     * Creates a project from the set of files.
+     *
+     * @param File[] $files
+     */
+    public function create(string $name, array $files) : Project;
+}
diff --git a/phpdocumentor/reflection-docblock/LICENSE b/phpdocumentor/reflection-docblock/LICENSE
new file mode 100644
index 000000000..792e4040f
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2010 Mike van Riel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock.php b/phpdocumentor/reflection-docblock/src/DocBlock.php
new file mode 100644
index 000000000..90d8066d5
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock.php
@@ -0,0 +1,228 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\TagWithType;
+use Webmozart\Assert\Assert;
+
+final class DocBlock
+{
+    /** @var string The opening line for this docblock. */
+    private string $summary;
+
+    /** @var DocBlock\Description The actual description for this docblock. */
+    private DocBlock\Description $description;
+
+    /** @var Tag[] An array containing all the tags in this docblock; except inline. */
+    private array $tags = [];
+
+    /** @var Types\Context|null Information about the context of this DocBlock. */
+    private ?Types\Context $context = null;
+
+    /** @var Location|null Information about the location of this DocBlock. */
+    private ?Location $location = null;
+
+    /** @var bool Is this DocBlock (the start of) a template? */
+    private bool $isTemplateStart;
+
+    /** @var bool Does this DocBlock signify the end of a DocBlock template? */
+    private bool $isTemplateEnd;
+
+    /**
+     * @param DocBlock\Tag[] $tags
+     * @param Types\Context  $context  The context in which the DocBlock occurs.
+     * @param Location       $location The location within the file that this DocBlock occurs in.
+     */
+    public function __construct(
+        string $summary = '',
+        ?DocBlock\Description $description = null,
+        array $tags = [],
+        ?Types\Context $context = null,
+        ?Location $location = null,
+        bool $isTemplateStart = false,
+        bool $isTemplateEnd = false
+    ) {
+        Assert::allIsInstanceOf($tags, Tag::class);
+
+        $this->summary     = $summary;
+        $this->description = $description ?: new DocBlock\Description('');
+        foreach ($tags as $tag) {
+            $this->addTag($tag);
+        }
+
+        $this->context  = $context;
+        $this->location = $location;
+
+        $this->isTemplateEnd   = $isTemplateEnd;
+        $this->isTemplateStart = $isTemplateStart;
+    }
+
+    public function getSummary(): string
+    {
+        return $this->summary;
+    }
+
+    public function getDescription(): DocBlock\Description
+    {
+        return $this->description;
+    }
+
+    /**
+     * Returns the current context.
+     */
+    public function getContext(): ?Types\Context
+    {
+        return $this->context;
+    }
+
+    /**
+     * Returns the current location.
+     */
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    /**
+     * Returns whether this DocBlock is the start of a Template section.
+     *
+     * A Docblock may serve as template for a series of subsequent DocBlocks. This is indicated by a special marker
+     * (`#@+`) that is appended directly after the opening `/**` of a DocBlock.
+     *
+     * An example of such an opening is:
+     *
+     * ```
+     * /**#@+
+     *  * My DocBlock
+     *  * /
+     * ```
+     *
+     * The description and tags (not the summary!) are copied onto all subsequent DocBlocks and also applied to all
+     * elements that follow until another DocBlock is found that contains the closing marker (`#@-`).
+     *
+     * @see self::isTemplateEnd() for the check whether a closing marker was provided.
+     */
+    public function isTemplateStart(): bool
+    {
+        return $this->isTemplateStart;
+    }
+
+    /**
+     * Returns whether this DocBlock is the end of a Template section.
+     *
+     * @see self::isTemplateStart() for a more complete description of the Docblock Template functionality.
+     */
+    public function isTemplateEnd(): bool
+    {
+        return $this->isTemplateEnd;
+    }
+
+    /**
+     * Returns the tags for this DocBlock.
+     *
+     * @return Tag[]
+     */
+    public function getTags(): array
+    {
+        return $this->tags;
+    }
+
+    /**
+     * Returns an array of tags matching the given name. If no tags are found
+     * an empty array is returned.
+     *
+     * @param string $name String to search by.
+     *
+     * @return Tag[]
+     */
+    public function getTagsByName(string $name): array
+    {
+        $result = [];
+
+        foreach ($this->getTags() as $tag) {
+            if ($tag->getName() !== $name) {
+                continue;
+            }
+
+            $result[] = $tag;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns an array of tags with type matching the given name. If no tags are found
+     * an empty array is returned.
+     *
+     * @param string $name String to search by.
+     *
+     * @return TagWithType[]
+     */
+    public function getTagsWithTypeByName(string $name): array
+    {
+        $result = [];
+
+        foreach ($this->getTagsByName($name) as $tag) {
+            if (!$tag instanceof TagWithType) {
+                continue;
+            }
+
+            $result[] = $tag;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if a tag of a certain type is present in this DocBlock.
+     *
+     * @param string $name Tag name to check for.
+     */
+    public function hasTag(string $name): bool
+    {
+        foreach ($this->getTags() as $tag) {
+            if ($tag->getName() === $name) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove a tag from this DocBlock.
+     *
+     * @param Tag $tagToRemove The tag to remove.
+     */
+    public function removeTag(Tag $tagToRemove): void
+    {
+        foreach ($this->tags as $key => $tag) {
+            if ($tag === $tagToRemove) {
+                unset($this->tags[$key]);
+                break;
+            }
+        }
+    }
+
+    /**
+     * Adds a tag to this DocBlock.
+     *
+     * @param Tag $tag The tag to add.
+     */
+    private function addTag(Tag $tag): void
+    {
+        $this->tags[] = $tag;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Description.php b/phpdocumentor/reflection-docblock/src/DocBlock/Description.php
new file mode 100644
index 000000000..a188ae30f
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Description.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
+
+use function vsprintf;
+
+/**
+ * Object representing to description for a DocBlock.
+ *
+ * A Description object can consist of plain text but can also include tags. A Description Formatter can then combine
+ * a body template with sprintf-style placeholders together with formatted tags in order to reconstitute a complete
+ * description text using the format that you would prefer.
+ *
+ * Because parsing a Description text can be a verbose process this is handled by the {@see DescriptionFactory}. It is
+ * thus recommended to use that to create a Description object, like this:
+ *
+ *     $description = $descriptionFactory->create('This is a {@see Description}', $context);
+ *
+ * The description factory will interpret the given body and create a body template and list of tags from them, and pass
+ * that onto the constructor if this class.
+ *
+ * > The $context variable is a class of type {@see \phpDocumentor\Reflection\Types\Context} and contains the namespace
+ * > and the namespace aliases that apply to this DocBlock. These are used by the Factory to resolve and expand partial
+ * > type names and FQSENs.
+ *
+ * If you do not want to use the DescriptionFactory you can pass a body template and tag listing like this:
+ *
+ *     $description = new Description(
+ *         'This is a %1$s',
+ *         [ new See(new Fqsen('\phpDocumentor\Reflection\DocBlock\Description')) ]
+ *     );
+ *
+ * It is generally recommended to use the Factory as that will also apply escaping rules, while the Description object
+ * is mainly responsible for rendering.
+ *
+ * @see DescriptionFactory to create a new Description.
+ * @see Tags\Formatter for the formatting of the body and tags.
+ */
+class Description
+{
+    private string $bodyTemplate;
+
+    /** @var Tag[] */
+    private array $tags;
+
+    /**
+     * Initializes a Description with its body (template) and a listing of the tags used in the body template.
+     *
+     * @param Tag[] $tags
+     */
+    public function __construct(string $bodyTemplate, array $tags = [])
+    {
+        $this->bodyTemplate = $bodyTemplate;
+        $this->tags         = $tags;
+    }
+
+    /**
+     * Returns the body template.
+     */
+    public function getBodyTemplate(): string
+    {
+        return $this->bodyTemplate;
+    }
+
+    /**
+     * Returns the tags for this DocBlock.
+     *
+     * @return Tag[]
+     */
+    public function getTags(): array
+    {
+        return $this->tags;
+    }
+
+    /**
+     * Renders this description as a string where the provided formatter will format the tags in the expected string
+     * format.
+     */
+    public function render(?Formatter $formatter = null): string
+    {
+        if ($this->tags === []) {
+            return vsprintf($this->bodyTemplate, []);
+        }
+
+        if ($formatter === null) {
+            $formatter = new PassthroughFormatter();
+        }
+
+        $tags = [];
+        foreach ($this->tags as $tag) {
+            $tags[] = '{' . $formatter->format($tag) . '}';
+        }
+
+        return vsprintf($this->bodyTemplate, $tags);
+    }
+
+    /**
+     * Returns a plain string representation of this description.
+     */
+    public function __toString(): string
+    {
+        return $this->render();
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php
new file mode 100644
index 000000000..e7bc616d1
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/DescriptionFactory.php
@@ -0,0 +1,178 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+
+use function count;
+use function implode;
+use function ltrim;
+use function min;
+use function str_replace;
+use function strlen;
+use function strpos;
+use function substr;
+use function trim;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Creates a new Description object given a body of text.
+ *
+ * Descriptions in phpDocumentor are somewhat complex entities as they can contain one or more tags inside their
+ * body that can be replaced with a readable output. The replacing is done by passing a Formatter object to the
+ * Description object's `render` method.
+ *
+ * In addition to the above does a Description support two types of escape sequences:
+ *
+ * 1. `{@}` to escape the `@` character to prevent it from being interpreted as part of a tag, i.e. `{{@}link}`
+ * 2. `{}` to escape the `}` character, this can be used if you want to use the `}` character in the description
+ *    of an inline tag.
+ *
+ * If a body consists of multiple lines then this factory will also remove any superfluous whitespace at the beginning
+ * of each line while maintaining any indentation that is used. This will prevent formatting parsers from tripping
+ * over unexpected spaces as can be observed with tag descriptions.
+ */
+class DescriptionFactory
+{
+    private Factory $tagFactory;
+
+    /**
+     * Initializes this factory with the means to construct (inline) tags.
+     */
+    public function __construct(Factory $tagFactory)
+    {
+        $this->tagFactory = $tagFactory;
+    }
+
+    /**
+     * Returns the parsed text of this description.
+     */
+    public function create(string $contents, ?TypeContext $context = null): Description
+    {
+        $tokens   = $this->lex($contents);
+        $count    = count($tokens);
+        $tagCount = 0;
+        $tags     = [];
+
+        for ($i = 1; $i < $count; $i += 2) {
+            $tags[]     = $this->tagFactory->create($tokens[$i], $context);
+            $tokens[$i] = '%' . ++$tagCount . '$s';
+        }
+
+        //In order to allow "literal" inline tags, the otherwise invalid
+        //sequence "{@}" is changed to "@", and "{}" is changed to "}".
+        //"%" is escaped to "%%" because of vsprintf.
+        //See unit tests for examples.
+        for ($i = 0; $i < $count; $i += 2) {
+            $tokens[$i] = str_replace(['{@}', '{}', '%'], ['@', '}', '%%'], $tokens[$i]);
+        }
+
+        return new Description(implode('', $tokens), $tags);
+    }
+
+    /**
+     * Strips the contents from superfluous whitespace and splits the description into a series of tokens.
+     *
+     * @return string[] A series of tokens of which the description text is composed.
+     */
+    private function lex(string $contents): array
+    {
+        $contents = $this->removeSuperfluousStartingWhitespace($contents);
+
+        // performance optimalization; if there is no inline tag, don't bother splitting it up.
+        if (strpos($contents, '{@') === false) {
+            return [$contents];
+        }
+
+        return Utils::pregSplit(
+            '/\{
+                # "{@}" is not a valid inline tag. This ensures that we do not treat it as one, but treat it literally.
+                (?!@\})
+                # We want to capture the whole tag line, but without the inline tag delimiters.
+                (\@
+                    # Match everything up to the next delimiter.
+                    [^{}]*
+                    # Nested inline tag content should not be captured, or it will appear in the result separately.
+                    (?:
+                        # Match nested inline tags.
+                        (?:
+                            # Because we did not catch the tag delimiters earlier, we must be explicit with them here.
+                            # Notice that this also matches "{}", as a way to later introduce it as an escape sequence.
+                            \{(?1)?\}
+                            |
+                            # Make sure we match hanging "{".
+                            \{
+                        )
+                        # Match content after the nested inline tag.
+                        [^{}]*
+                    )* # If there are more inline tags, match them as well. We use "*" since there may not be any
+                       # nested inline tags.
+                )
+            \}/Sux',
+            $contents,
+            0,
+            PREG_SPLIT_DELIM_CAPTURE
+        );
+    }
+
+    /**
+     * Removes the superfluous from a multi-line description.
+     *
+     * When a description has more than one line then it can happen that the second and subsequent lines have an
+     * additional indentation. This is commonly in use with tags like this:
+     *
+     *     {@}since 1.1.0 This is an example
+     *         description where we have an
+     *         indentation in the second and
+     *         subsequent lines.
+     *
+     * If we do not normalize the indentation then we have superfluous whitespace on the second and subsequent
+     * lines and this may cause rendering issues when, for example, using a Markdown converter.
+     */
+    private function removeSuperfluousStartingWhitespace(string $contents): string
+    {
+        $lines = Utils::pregSplit("/\r\n?|\n/", $contents);
+
+        // if there is only one line then we don't have lines with superfluous whitespace and
+        // can use the contents as-is
+        if (count($lines) <= 1) {
+            return $contents;
+        }
+
+        // determine how many whitespace characters need to be stripped
+        $startingSpaceCount = 9999999;
+        for ($i = 1, $iMax = count($lines); $i < $iMax; ++$i) {
+            // lines with a no length do not count as they are not indented at all
+            if (trim($lines[$i]) === '') {
+                continue;
+            }
+
+            // determine the number of prefixing spaces by checking the difference in line length before and after
+            // an ltrim
+            $startingSpaceCount = min($startingSpaceCount, strlen($lines[$i]) - strlen(ltrim($lines[$i])));
+        }
+
+        // strip the number of spaces from each line
+        if ($startingSpaceCount > 0) {
+            for ($i = 1, $iMax = count($lines); $i < $iMax; ++$i) {
+                $lines[$i] = substr($lines[$i], $startingSpaceCount);
+            }
+        }
+
+        return implode("\n", $lines);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php b/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php
new file mode 100644
index 000000000..0fb24a68b
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/ExampleFinder.php
@@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock\Tags\Example;
+
+use function array_slice;
+use function file;
+use function getcwd;
+use function implode;
+use function is_readable;
+use function rtrim;
+use function sprintf;
+use function trim;
+
+use const DIRECTORY_SEPARATOR;
+
+/**
+ * Class used to find an example file's location based on a given ExampleDescriptor.
+ */
+class ExampleFinder
+{
+    private string $sourceDirectory = '';
+
+    /** @var string[] */
+    private array $exampleDirectories = [];
+
+    /**
+     * Attempts to find the example contents for the given descriptor.
+     */
+    public function find(Example $example): string
+    {
+        $filename = $example->getFilePath();
+
+        $file = $this->getExampleFileContents($filename);
+        if ($file === null) {
+            return sprintf('** File not found : %s **', $filename);
+        }
+
+        return implode('', array_slice($file, $example->getStartingLine() - 1, $example->getLineCount()));
+    }
+
+    /**
+     * Registers the project's root directory where an 'examples' folder can be expected.
+     */
+    public function setSourceDirectory(string $directory = ''): void
+    {
+        $this->sourceDirectory = $directory;
+    }
+
+    /**
+     * Returns the project's root directory where an 'examples' folder can be expected.
+     */
+    public function getSourceDirectory(): string
+    {
+        return $this->sourceDirectory;
+    }
+
+    /**
+     * Registers a series of directories that may contain examples.
+     *
+     * @param string[] $directories
+     */
+    public function setExampleDirectories(array $directories): void
+    {
+        $this->exampleDirectories = $directories;
+    }
+
+    /**
+     * Returns a series of directories that may contain examples.
+     *
+     * @return string[]
+     */
+    public function getExampleDirectories(): array
+    {
+        return $this->exampleDirectories;
+    }
+
+    /**
+     * Attempts to find the requested example file and returns its contents or null if no file was found.
+     *
+     * This method will try several methods in search of the given example file, the first one it encounters is
+     * returned:
+     *
+     * 1. Iterates through all examples folders for the given filename
+     * 2. Checks the source folder for the given filename
+     * 3. Checks the 'examples' folder in the current working directory for examples
+     * 4. Checks the path relative to the current working directory for the given filename
+     *
+     * @return string[] all lines of the example file
+     */
+    private function getExampleFileContents(string $filename): ?array
+    {
+        $normalizedPath = null;
+
+        foreach ($this->exampleDirectories as $directory) {
+            $exampleFileFromConfig = $this->constructExamplePath($directory, $filename);
+            if (is_readable($exampleFileFromConfig)) {
+                $normalizedPath = $exampleFileFromConfig;
+                break;
+            }
+        }
+
+        if ($normalizedPath === null) {
+            if (is_readable($this->getExamplePathFromSource($filename))) {
+                $normalizedPath = $this->getExamplePathFromSource($filename);
+            } elseif (is_readable($this->getExamplePathFromExampleDirectory($filename))) {
+                $normalizedPath = $this->getExamplePathFromExampleDirectory($filename);
+            } elseif (is_readable($filename)) {
+                $normalizedPath = $filename;
+            }
+        }
+
+        $lines = $normalizedPath !== null && is_readable($normalizedPath) ? file($normalizedPath) : false;
+
+        return $lines !== false ? $lines : null;
+    }
+
+    /**
+     * Get example filepath based on the example directory inside your project.
+     */
+    private function getExamplePathFromExampleDirectory(string $file): string
+    {
+        return getcwd() . DIRECTORY_SEPARATOR . 'examples' . DIRECTORY_SEPARATOR . $file;
+    }
+
+    /**
+     * Returns a path to the example file in the given directory..
+     */
+    private function constructExamplePath(string $directory, string $file): string
+    {
+        return rtrim($directory, '\\/') . DIRECTORY_SEPARATOR . $file;
+    }
+
+    /**
+     * Get example filepath based on sourcecode.
+     */
+    private function getExamplePathFromSource(string $file): string
+    {
+        return sprintf(
+            '%s%s%s',
+            trim($this->getSourceDirectory(), '\\/'),
+            DIRECTORY_SEPARATOR,
+            trim($file, '"')
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php b/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php
new file mode 100644
index 000000000..2c257dd50
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Serializer.php
@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
+
+use function sprintf;
+use function str_repeat;
+use function str_replace;
+use function strlen;
+use function wordwrap;
+
+/**
+ * Converts a DocBlock back from an object to a complete DocComment including Asterisks.
+ */
+class Serializer
+{
+    /** @var string The string to indent the comment with. */
+    protected string $indentString = ' ';
+
+    /** @var int The number of times the indent string is repeated. */
+    protected int $indent = 0;
+
+    /** @var bool Whether to indent the first line with the given indent amount and string. */
+    protected bool $isFirstLineIndented = true;
+
+    /** @var int|null The max length of a line. */
+    protected ?int $lineLength = null;
+
+    /** @var Formatter A custom tag formatter. */
+    protected Formatter $tagFormatter;
+    private string $lineEnding;
+
+    /**
+     * Create a Serializer instance.
+     *
+     * @param int       $indent          The number of times the indent string is repeated.
+     * @param string    $indentString    The string to indent the comment with.
+     * @param bool      $indentFirstLine Whether to indent the first line.
+     * @param int|null  $lineLength      The max length of a line or NULL to disable line wrapping.
+     * @param Formatter $tagFormatter    A custom tag formatter, defaults to PassthroughFormatter.
+     * @param string    $lineEnding      Line ending used in the output, by default \n is used.
+     */
+    public function __construct(
+        int $indent = 0,
+        string $indentString = ' ',
+        bool $indentFirstLine = true,
+        ?int $lineLength = null,
+        ?Formatter $tagFormatter = null,
+        string $lineEnding = "\n"
+    ) {
+        $this->indent              = $indent;
+        $this->indentString        = $indentString;
+        $this->isFirstLineIndented = $indentFirstLine;
+        $this->lineLength          = $lineLength;
+        $this->tagFormatter        = $tagFormatter ?: new PassthroughFormatter();
+        $this->lineEnding = $lineEnding;
+    }
+
+    /**
+     * Generate a DocBlock comment.
+     *
+     * @param DocBlock $docblock The DocBlock to serialize.
+     *
+     * @return string The serialized doc block.
+     */
+    public function getDocComment(DocBlock $docblock): string
+    {
+        $indent      = str_repeat($this->indentString, $this->indent);
+        $firstIndent = $this->isFirstLineIndented ? $indent : '';
+        // 3 === strlen(' * ')
+        $wrapLength = $this->lineLength !== null ? $this->lineLength - strlen($indent) - 3 : null;
+
+        $text = $this->removeTrailingSpaces(
+            $indent,
+            $this->addAsterisksForEachLine(
+                $indent,
+                $this->getSummaryAndDescriptionTextBlock($docblock, $wrapLength)
+            )
+        );
+
+        $comment = $firstIndent . "/**\n";
+        if ($text) {
+            $comment .= $indent . ' * ' . $text . "\n";
+            $comment .= $indent . " *\n";
+        }
+
+        $comment = $this->addTagBlock($docblock, $wrapLength, $indent, $comment);
+
+        return str_replace("\n", $this->lineEnding, $comment . $indent . ' */');
+    }
+
+    private function removeTrailingSpaces(string $indent, string $text): string
+    {
+        return str_replace(
+            sprintf("\n%s * \n", $indent),
+            sprintf("\n%s *\n", $indent),
+            $text
+        );
+    }
+
+    private function addAsterisksForEachLine(string $indent, string $text): string
+    {
+        return str_replace(
+            "\n",
+            sprintf("\n%s * ", $indent),
+            $text
+        );
+    }
+
+    private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, ?int $wrapLength): string
+    {
+        $text = $docblock->getSummary() . ((string) $docblock->getDescription() ? "\n\n" . $docblock->getDescription()
+                : '');
+        if ($wrapLength !== null) {
+            $text = wordwrap($text, $wrapLength);
+
+            return $text;
+        }
+
+        return $text;
+    }
+
+    private function addTagBlock(DocBlock $docblock, ?int $wrapLength, string $indent, string $comment): string
+    {
+        foreach ($docblock->getTags() as $tag) {
+            $tagText = $this->tagFormatter->format($tag);
+            if ($wrapLength !== null) {
+                $tagText = wordwrap($tagText, $wrapLength);
+            }
+
+            $tagText = str_replace(
+                "\n",
+                sprintf("\n%s * ", $indent),
+                $tagText
+            );
+
+            $comment .= sprintf("%s * %s\n", $indent, $tagText);
+        }
+
+        return $comment;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php
new file mode 100644
index 000000000..e580ef6a1
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/StandardTagFactory.php
@@ -0,0 +1,363 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Tags\Author;
+use phpDocumentor\Reflection\DocBlock\Tags\Covers;
+use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
+use phpDocumentor\Reflection\DocBlock\Tags\Generic;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Method;
+use phpDocumentor\Reflection\DocBlock\Tags\Mixin;
+use phpDocumentor\Reflection\DocBlock\Tags\Param;
+use phpDocumentor\Reflection\DocBlock\Tags\Property;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite;
+use phpDocumentor\Reflection\DocBlock\Tags\Return_;
+use phpDocumentor\Reflection\DocBlock\Tags\See as SeeTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Since;
+use phpDocumentor\Reflection\DocBlock\Tags\Source;
+use phpDocumentor\Reflection\DocBlock\Tags\TemplateCovariant;
+use phpDocumentor\Reflection\DocBlock\Tags\Throws;
+use phpDocumentor\Reflection\DocBlock\Tags\Uses;
+use phpDocumentor\Reflection\DocBlock\Tags\Var_;
+use phpDocumentor\Reflection\DocBlock\Tags\Version;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use ReflectionMethod;
+use ReflectionNamedType;
+use ReflectionParameter;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function array_merge;
+use function array_slice;
+use function call_user_func_array;
+use function get_class;
+use function is_object;
+use function preg_match;
+use function sprintf;
+use function strpos;
+use function trim;
+
+/**
+ * Creates a Tag object given the contents of a tag.
+ *
+ * This Factory is capable of determining the appropriate class for a tag and instantiate it using its `create`
+ * factory method. The `create` factory method of a Tag can have a variable number of arguments; this way you can
+ * pass the dependencies that you need to construct a tag object.
+ *
+ * > Important: each parameter in addition to the body variable for the `create` method must default to null, otherwise
+ * > it violates the constraint with the interface; it is recommended to use the {@see Assert::notNull()} method to
+ * > verify that a dependency is actually passed.
+ *
+ * This Factory also features a Service Locator component that is used to pass the right dependencies to the
+ * `create` method of a tag; each dependency should be registered as a service or as a parameter.
+ *
+ * When you want to use a Tag of your own with custom handling you need to call the `registerTagHandler` method, pass
+ * the name of the tag and a Fully Qualified Class Name pointing to a class that implements the Tag interface.
+ */
+final class StandardTagFactory implements TagFactory
+{
+    /** PCRE regular expression matching a tag name. */
+    public const REGEX_TAGNAME = '[\w\-\_\\\\:]+';
+
+    /**
+     * @var array<class-string<Tag>|Factory> An array with a tag as a key, and an
+     *                               FQCN to a class that handles it as an array value.
+     */
+    private array $tagHandlerMappings = [
+        'author'             => Author::class,
+        'covers'             => Covers::class,
+        'deprecated'         => Deprecated::class,
+        // 'example'         => '\phpDocumentor\Reflection\DocBlock\Tags\Example',
+        'link'               => LinkTag::class,
+        'mixin'              => Mixin::class,
+        'method'             => Method::class,
+        'param'              => Param::class,
+        'property-read'      => PropertyRead::class,
+        'property'           => Property::class,
+        'property-write'     => PropertyWrite::class,
+        'return'             => Return_::class,
+        'see'                => SeeTag::class,
+        'since'              => Since::class,
+        'source'             => Source::class,
+        'template-covariant' => TemplateCovariant::class,
+        'throw'              => Throws::class,
+        'throws'             => Throws::class,
+        'uses'               => Uses::class,
+        'var'                => Var_::class,
+        'version'            => Version::class,
+    ];
+
+    /**
+     * @var array<class-string<Tag>> An array with an annotation as a key, and an
+     *      FQCN to a class that handles it as an array value.
+     */
+    private array $annotationMappings = [];
+
+    /**
+     * @var ReflectionParameter[][] a lazy-loading cache containing parameters
+     *      for each tagHandler that has been used.
+     */
+    private array $tagHandlerParameterCache = [];
+
+    private FqsenResolver $fqsenResolver;
+
+    /**
+     * @var mixed[] an array representing a simple Service Locator where we can store parameters and
+     *     services that can be inserted into the Factory Methods of Tag Handlers.
+     */
+    private array $serviceLocator = [];
+
+    /**
+     * Initialize this tag factory with the means to resolve an FQSEN and optionally a list of tag handlers.
+     *
+     * If no tag handlers are provided than the default list in the {@see self::$tagHandlerMappings} property
+     * is used.
+     *
+     * @see self::registerTagHandler() to add a new tag handler to the existing default list.
+     *
+     * @param array<class-string<Tag>> $tagHandlers
+     */
+    public function __construct(FqsenResolver $fqsenResolver, ?array $tagHandlers = null)
+    {
+        $this->fqsenResolver = $fqsenResolver;
+        if ($tagHandlers !== null) {
+            $this->tagHandlerMappings = $tagHandlers;
+        }
+
+        $this->addService($fqsenResolver, FqsenResolver::class);
+    }
+
+    public function create(string $tagLine, ?TypeContext $context = null): Tag
+    {
+        if (!$context) {
+            $context = new TypeContext('');
+        }
+
+        [$tagName, $tagBody] = $this->extractTagParts($tagLine);
+
+        return $this->createTag(trim($tagBody), $tagName, $context);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function addParameter(string $name, $value): void
+    {
+        $this->serviceLocator[$name] = $value;
+    }
+
+    public function addService(object $service, ?string $alias = null): void
+    {
+        $this->serviceLocator[$alias ?? get_class($service)] = $service;
+    }
+
+    /** {@inheritDoc} */
+    public function registerTagHandler(string $tagName, $handler): void
+    {
+        Assert::stringNotEmpty($tagName);
+        if (strpos($tagName, '\\') !== false && $tagName[0] !== '\\') {
+            throw new InvalidArgumentException(
+                'A namespaced tag must have a leading backslash as it must be fully qualified'
+            );
+        }
+
+        if (is_object($handler)) {
+            Assert::isInstanceOf($handler, Factory::class);
+            $this->tagHandlerMappings[$tagName] = $handler;
+
+            return;
+        }
+
+        Assert::classExists($handler);
+        Assert::implementsInterface($handler, Tag::class);
+        $this->tagHandlerMappings[$tagName] = $handler;
+    }
+
+    /**
+     * Extracts all components for a tag.
+     *
+     * @return string[]
+     */
+    private function extractTagParts(string $tagLine): array
+    {
+        $matches = [];
+        if (!preg_match('/^@(' . self::REGEX_TAGNAME . ')((?:[\s\(\{])\s*([^\s].*)|$)/us', $tagLine, $matches)) {
+            throw new InvalidArgumentException(
+                'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors'
+            );
+        }
+
+        return array_slice($matches, 1);
+    }
+
+    /**
+     * Creates a new tag object with the given name and body or returns null if the tag name was recognized but the
+     * body was invalid.
+     */
+    private function createTag(string $body, string $name, TypeContext $context): Tag
+    {
+        $handlerClassName = $this->findHandlerClassName($name, $context);
+        $arguments        = $this->getArgumentsForParametersFromWiring(
+            $this->fetchParametersForHandlerFactoryMethod($handlerClassName),
+            $this->getServiceLocatorWithDynamicParameters($context, $name, $body)
+        );
+
+        if (array_key_exists('tagLine', $arguments)) {
+            $arguments['tagLine'] = sprintf('@%s %s', $name, $body);
+        }
+
+        try {
+            $callable = [$handlerClassName, 'create'];
+            Assert::isCallable($callable);
+            /** @phpstan-var callable(string): ?Tag $callable */
+            $tag = call_user_func_array($callable, $arguments);
+
+            return $tag ?? InvalidTag::create($body, $name);
+        } catch (InvalidArgumentException $e) {
+            return InvalidTag::create($body, $name)->withError($e);
+        }
+    }
+
+    /**
+     * Determines the Fully Qualified Class Name of the Factory or Tag (containing a Factory Method `create`).
+     *
+     * @return class-string<Tag>|Factory
+     */
+    private function findHandlerClassName(string $tagName, TypeContext $context)
+    {
+        $handlerClassName = Generic::class;
+        if (isset($this->tagHandlerMappings[$tagName])) {
+            $handlerClassName = $this->tagHandlerMappings[$tagName];
+        } elseif ($this->isAnnotation($tagName)) {
+            // TODO: Annotation support is planned for a later stage and as such is disabled for now
+            $tagName = (string) $this->fqsenResolver->resolve($tagName, $context);
+            if (isset($this->annotationMappings[$tagName])) {
+                $handlerClassName = $this->annotationMappings[$tagName];
+            }
+        }
+
+        return $handlerClassName;
+    }
+
+    /**
+     * Retrieves the arguments that need to be passed to the Factory Method with the given Parameters.
+     *
+     * @param ReflectionParameter[] $parameters
+     * @param mixed[]               $locator
+     *
+     * @return mixed[] A series of values that can be passed to the Factory Method of the tag whose parameters
+     *     is provided with this method.
+     */
+    private function getArgumentsForParametersFromWiring(array $parameters, array $locator): array
+    {
+        $arguments = [];
+        foreach ($parameters as $parameter) {
+            $type     = $parameter->getType();
+            $typeHint = null;
+            if ($type instanceof ReflectionNamedType) {
+                $typeHint = $type->getName();
+                if ($typeHint === 'self') {
+                    $declaringClass = $parameter->getDeclaringClass();
+                    if ($declaringClass !== null) {
+                        $typeHint = $declaringClass->getName();
+                    }
+                }
+            }
+
+            $parameterName = $parameter->getName();
+            if (isset($locator[$typeHint ?? ''])) {
+                $arguments[$parameterName] = $locator[$typeHint ?? ''];
+                continue;
+            }
+
+            if (isset($locator[$parameterName])) {
+                $arguments[$parameterName] = $locator[$parameterName];
+                continue;
+            }
+
+            $arguments[$parameterName] = null;
+        }
+
+        return $arguments;
+    }
+
+    /**
+     * Retrieves a series of ReflectionParameter objects for the static 'create' method of the given
+     * tag handler class name.
+     *
+     * @param class-string|Factory $handler
+     *
+     * @return ReflectionParameter[]
+     */
+    private function fetchParametersForHandlerFactoryMethod($handler): array
+    {
+        $handlerClassName = is_object($handler) ? get_class($handler) : $handler;
+
+        if (!isset($this->tagHandlerParameterCache[$handlerClassName])) {
+            $methodReflection                                  = new ReflectionMethod($handlerClassName, 'create');
+            $this->tagHandlerParameterCache[$handlerClassName] = $methodReflection->getParameters();
+        }
+
+        return $this->tagHandlerParameterCache[$handlerClassName];
+    }
+
+    /**
+     * Returns a copy of this class' Service Locator with added dynamic parameters,
+     * such as the tag's name, body and Context.
+     *
+     * @param TypeContext $context The Context (namespace and aliases) that may be
+     *  passed and is used to resolve FQSENs.
+     * @param string      $tagName The name of the tag that may be
+     *  passed onto the factory method of the Tag class.
+     * @param string      $tagBody The body of the tag that may be
+     *  passed onto the factory method of the Tag class.
+     *
+     * @return mixed[]
+     */
+    private function getServiceLocatorWithDynamicParameters(
+        TypeContext $context,
+        string $tagName,
+        string $tagBody
+    ): array {
+        return array_merge(
+            $this->serviceLocator,
+            [
+                'name' => $tagName,
+                'body' => $tagBody,
+                TypeContext::class => $context,
+            ]
+        );
+    }
+
+    /**
+     * Returns whether the given tag belongs to an annotation.
+     *
+     * @todo this method should be populated once we implement Annotation notation support.
+     */
+    private function isAnnotation(string $tagContent): bool
+    {
+        // 1. Contains a namespace separator
+        // 2. Contains parenthesis
+        // 3. Is present in a list of known annotations (make the algorithm smart by first checking is the last part
+        //    of the annotation class name matches the found tag name
+
+        return false;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tag.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tag.php
new file mode 100644
index 000000000..7cf07b4dd
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tag.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+
+interface Tag
+{
+    public function getName(): string;
+
+    /**
+     * @return Tag|mixed Class that implements Tag
+     * @phpstan-return ?Tag
+     */
+    public static function create(string $body);
+
+    public function render(?Formatter $formatter = null): string;
+
+    public function __toString(): string;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/TagFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/TagFactory.php
new file mode 100644
index 000000000..a6f1ae8d5
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/TagFactory.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
+
+interface TagFactory extends Factory
+{
+    /**
+     * Adds a parameter to the service locator that can be injected in a tag's factory method.
+     *
+     * When calling a tag's "create" method we always check the signature for dependencies to inject. One way is to
+     * typehint a parameter in the signature so that we can use that interface or class name to inject a dependency
+     * (see {@see addService()} for more information on that).
+     *
+     * Another way is to check the name of the argument against the names in the Service Locator. With this method
+     * you can add a variable that will be inserted when a tag's create method is not typehinted and has a matching
+     * name.
+     *
+     * Be aware that there are two reserved names:
+     *
+     * - name, representing the name of the tag.
+     * - body, representing the complete body of the tag.
+     *
+     * These parameters are injected at the last moment and will override any existing parameter with those names.
+     *
+     * @param mixed $value
+     */
+    public function addParameter(string $name, $value): void;
+
+    /**
+     * Registers a service with the Service Locator using the FQCN of the class or the alias, if provided.
+     *
+     * When calling a tag's "create" method we always check the signature for dependencies to inject. If a parameter
+     * has a typehint then the ServiceLocator is queried to see if a Service is registered for that typehint.
+     *
+     * Because interfaces are regularly used as type-hints this method provides an alias parameter; if the FQCN of the
+     * interface is passed as alias then every time that interface is requested the provided service will be returned.
+     */
+    public function addService(object $service): void;
+
+    /**
+     * Registers a handler for tags.
+     *
+     * If you want to use your own tags then you can use this method to instruct the TagFactory
+     * to register the name of a tag with the FQCN of a 'Tag Handler'. The Tag handler should implement
+     * the {@see Tag} interface (and thus the create method).
+     *
+     * @param string                    $tagName Name of tag to register a handler for. When registering a namespaced
+     *                                   tag, the full name, along with a prefixing slash MUST be provided.
+     * @param class-string<Tag>|Factory $handler FQCN of handler.
+     *
+     * @throws InvalidArgumentException If the tag name is not a string.
+     * @throws InvalidArgumentException If the tag name is namespaced (contains backslashes) but
+     *                                   does not start with a backslash.
+     * @throws InvalidArgumentException If the handler is not a string.
+     * @throws InvalidArgumentException If the handler is not an existing class.
+     * @throws InvalidArgumentException If the handler does not implement the {@see Tag} interface.
+     */
+    public function registerTagHandler(string $tagName, $handler): void;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Author.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Author.php
new file mode 100644
index 000000000..290e5a957
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Author.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use InvalidArgumentException;
+
+use function filter_var;
+use function preg_match;
+use function trim;
+
+use const FILTER_VALIDATE_EMAIL;
+
+/**
+ * Reflection class for an {@}author tag in a Docblock.
+ */
+final class Author extends BaseTag implements Factory\StaticMethod
+{
+    /** @var string register that this is the author tag. */
+    protected string $name = 'author';
+
+    /** @var string The name of the author */
+    private string $authorName;
+
+    /** @var string The email of the author */
+    private string $authorEmail;
+
+    /**
+     * Initializes this tag with the author name and e-mail.
+     */
+    public function __construct(string $authorName, string $authorEmail)
+    {
+        if ($authorEmail && !filter_var($authorEmail, FILTER_VALIDATE_EMAIL)) {
+            throw new InvalidArgumentException('The author tag does not have a valid e-mail address');
+        }
+
+        $this->authorName  = $authorName;
+        $this->authorEmail = $authorEmail;
+    }
+
+    /**
+     * Gets the author's name.
+     *
+     * @return string The author's name.
+     */
+    public function getAuthorName(): string
+    {
+        return $this->authorName;
+    }
+
+    /**
+     * Returns the author's email.
+     *
+     * @return string The author's email.
+     */
+    public function getEmail(): string
+    {
+        return $this->authorEmail;
+    }
+
+    /**
+     * Returns this tag in string form.
+     */
+    public function __toString(): string
+    {
+        if ($this->authorEmail) {
+            $authorEmail = '<' . $this->authorEmail . '>';
+        } else {
+            $authorEmail = '';
+        }
+
+        $authorName = $this->authorName;
+
+        return $authorName . ($authorEmail !== '' ? ($authorName !== '' ? ' ' : '') . $authorEmail : '');
+    }
+
+    /**
+     * Attempts to create a new Author object based on the tag body.
+     */
+    public static function create(string $body): ?self
+    {
+        $splitTagContent = preg_match('/^([^\<]*)(?:\<([^\>]*)\>)?$/u', $body, $matches);
+        if (!$splitTagContent) {
+            return null;
+        }
+
+        $authorName = trim($matches[1]);
+        $email      = isset($matches[2]) ? trim($matches[2]) : '';
+
+        return new static($authorName, $email);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/BaseTag.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/BaseTag.php
new file mode 100644
index 000000000..98b0d881d
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/BaseTag.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Description;
+
+/**
+ * Parses a tag definition for a DocBlock.
+ */
+abstract class BaseTag implements DocBlock\Tag
+{
+    /** @var string Name of the tag */
+    protected string $name = '';
+
+    /** @var Description|null Description of the tag. */
+    protected ?Description $description = null;
+
+    /**
+     * Gets the name of this tag.
+     *
+     * @return string The name of this tag.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getDescription(): ?Description
+    {
+        return $this->description;
+    }
+
+    public function render(?Formatter $formatter = null): string
+    {
+        if ($formatter === null) {
+            $formatter = new Formatter\PassthroughFormatter();
+        }
+
+        return $formatter->format($this);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php
new file mode 100644
index 000000000..022594e20
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Covers.php
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function explode;
+
+/**
+ * Reflection class for a @covers tag in a Docblock.
+ */
+final class Covers extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'covers';
+
+    private Fqsen $refers;
+
+    /**
+     * Initializes this tag.
+     */
+    public function __construct(Fqsen $refers, ?Description $description = null)
+    {
+        $this->refers      = $refers;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?FqsenResolver $resolver = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::stringNotEmpty($body);
+        Assert::notNull($descriptionFactory);
+        Assert::notNull($resolver);
+
+        $parts = Utils::pregSplit('/\s+/Su', $body, 2);
+
+        return new static(
+            self::resolveFqsen($parts[0], $resolver, $context),
+            $descriptionFactory->create($parts[1] ?? '', $context)
+        );
+    }
+
+    private static function resolveFqsen(string $parts, ?FqsenResolver $fqsenResolver, ?TypeContext $context): Fqsen
+    {
+        Assert::notNull($fqsenResolver);
+        $fqsenParts = explode('::', $parts);
+        $resolved = $fqsenResolver->resolve($fqsenParts[0], $context);
+
+        if (!array_key_exists(1, $fqsenParts)) {
+            return $resolved;
+        }
+
+        return new Fqsen($resolved . '::' . $fqsenParts[1]);
+    }
+
+    /**
+     * Returns the structural element this tag refers to.
+     */
+    public function getReference(): Fqsen
+    {
+        return $this->refers;
+    }
+
+    /**
+     * Returns a string representation of this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $refers = (string) $this->refers;
+
+        return $refers . ($description !== '' ? ($refers !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php
new file mode 100644
index 000000000..fff591f9d
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Deprecated.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+use function preg_match;
+
+/**
+ * Reflection class for a {@}deprecated tag in a Docblock.
+ */
+final class Deprecated extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'deprecated';
+
+    /**
+     * PCRE regular expression matching a version vector.
+     * Assumes the "x" modifier.
+     */
+    public const REGEX_VECTOR = '(?:
+        # Normal release vectors.
+        \d\S*
+        |
+        # VCS version vectors. Per PHPCS, they are expected to
+        # follow the form of the VCS name, followed by ":", followed
+        # by the version vector itself.
+        # By convention, popular VCSes like CVS, SVN and GIT use "$"
+        # around the actual version vector.
+        [^\s\:]+\:\s*\$[^\$]+\$
+    )';
+
+    /** @var string|null The version vector. */
+    private ?string $version = null;
+
+    public function __construct(?string $version = null, ?Description $description = null)
+    {
+        Assert::nullOrNotEmpty($version);
+
+        $this->version     = $version;
+        $this->description = $description;
+    }
+
+    /**
+     * @return static
+     */
+    public static function create(
+        ?string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        if ($body === null || $body === '') {
+            return new static();
+        }
+
+        $matches = [];
+        if (!preg_match('/^(' . self::REGEX_VECTOR . ')\s*(.+)?$/sux', $body, $matches)) {
+            return new static(
+                null,
+                $descriptionFactory !== null ? $descriptionFactory->create($body, $context) : null
+            );
+        }
+
+        Assert::notNull($descriptionFactory);
+
+        return new static(
+            $matches[1],
+            $descriptionFactory->create($matches[2] ?? '', $context)
+        );
+    }
+
+    /**
+     * Gets the version section of the tag.
+     */
+    public function getVersion(): ?string
+    {
+        return $this->version;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $version = (string) $this->version;
+
+        return $version . ($description !== '' ? ($version !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php
new file mode 100644
index 000000000..3ddbb686c
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Example.php
@@ -0,0 +1,197 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function preg_match;
+use function rawurlencode;
+use function str_replace;
+use function strpos;
+use function trim;
+
+/**
+ * Reflection class for a {@}example tag in a Docblock.
+ */
+final class Example implements Tag, Factory\StaticMethod
+{
+    /** @var string Path to a file to use as an example. May also be an absolute URI. */
+    private string $filePath;
+
+    /**
+     * @var bool Whether the file path component represents an URI. This determines how the file portion
+     *     appears at {@link getContent()}.
+     */
+    private bool $isURI;
+
+    private int $startingLine;
+
+    private int $lineCount;
+
+    private ?string $content = null;
+
+    public function __construct(
+        string $filePath,
+        bool $isURI,
+        int $startingLine,
+        int $lineCount,
+        ?string $content
+    ) {
+        Assert::stringNotEmpty($filePath);
+        Assert::greaterThanEq($startingLine, 1);
+        Assert::greaterThanEq($lineCount, 0);
+
+        $this->filePath     = $filePath;
+        $this->startingLine = $startingLine;
+        $this->lineCount    = $lineCount;
+        if ($content !== null) {
+            $this->content = trim($content);
+        }
+
+        $this->isURI = $isURI;
+    }
+
+    public function getContent(): string
+    {
+        if ($this->content === null || $this->content === '') {
+            $filePath = $this->filePath;
+            if ($this->isURI) {
+                $filePath = $this->isUriRelative($this->filePath)
+                    ? str_replace('%2F', '/', rawurlencode($this->filePath))
+                    : $this->filePath;
+            }
+
+            return trim($filePath);
+        }
+
+        return $this->content;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->content;
+    }
+
+    public static function create(string $body): ?Tag
+    {
+        // File component: File path in quotes or File URI / Source information
+        if (!preg_match('/^\s*(?:(\"[^\"]+\")|(\S+))(?:\s+(.*))?$/sux', $body, $matches)) {
+            return null;
+        }
+
+        $filePath = null;
+        $fileUri  = null;
+        if (array_key_exists(1, $matches) && $matches[1] !== '') {
+            $filePath = $matches[1];
+        } else {
+            $fileUri = array_key_exists(2, $matches) ? $matches[2] : '';
+        }
+
+        $startingLine = 1;
+        $lineCount    = 0;
+        $description  = null;
+
+        if (array_key_exists(3, $matches)) {
+            $description = $matches[3];
+
+            // Starting line / Number of lines / Description
+            if (preg_match('/^([1-9]\d*)(?:\s+((?1))\s*)?(.*)$/sux', $matches[3], $contentMatches)) {
+                $startingLine = (int) $contentMatches[1];
+                if (isset($contentMatches[2])) {
+                    $lineCount = (int) $contentMatches[2];
+                }
+
+                if (array_key_exists(3, $contentMatches)) {
+                    $description = $contentMatches[3];
+                }
+            }
+        }
+
+        return new static(
+            $filePath ?? ($fileUri ?? ''),
+            $fileUri !== null,
+            $startingLine,
+            $lineCount,
+            $description
+        );
+    }
+
+    /**
+     * Returns the file path.
+     *
+     * @return string Path to a file to use as an example.
+     *     May also be an absolute URI.
+     */
+    public function getFilePath(): string
+    {
+        return trim($this->filePath, '"');
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        $filePath = $this->filePath;
+        $isDefaultLine = $this->startingLine === 1 && $this->lineCount === 0;
+        $startingLine = !$isDefaultLine ? (string) $this->startingLine : '';
+        $lineCount = !$isDefaultLine ? (string) $this->lineCount : '';
+        $content = (string) $this->content;
+
+        return $filePath
+            . ($startingLine !== ''
+                ? ($filePath !== '' ? ' ' : '') . $startingLine
+                : '')
+            . ($lineCount !== ''
+                ? ($filePath !== '' || $startingLine !== '' ? ' ' : '') . $lineCount
+                : '')
+            . ($content !== ''
+                ? ($filePath !== '' || $startingLine !== '' || $lineCount !== '' ? ' ' : '') . $content
+                : '');
+    }
+
+    /**
+     * Returns true if the provided URI is relative or contains a complete scheme (and thus is absolute).
+     */
+    private function isUriRelative(string $uri): bool
+    {
+        return strpos($uri, ':') === false;
+    }
+
+    public function getStartingLine(): int
+    {
+        return $this->startingLine;
+    }
+
+    public function getLineCount(): int
+    {
+        return $this->lineCount;
+    }
+
+    public function getName(): string
+    {
+        return 'example';
+    }
+
+    public function render(?Formatter $formatter = null): string
+    {
+        if ($formatter === null) {
+            $formatter = new Formatter\PassthroughFormatter();
+        }
+
+        return $formatter->format($this);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php
new file mode 100644
index 000000000..831af03d6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Extends_.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Reflection class for a {@}extends tag in a Docblock.
+ */
+class Extends_ extends TagWithType
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'extends';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(string $body): ?Tag
+    {
+        Deprecation::trigger(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        return null;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php
new file mode 100644
index 000000000..f8bababfb
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use RuntimeException;
+
+use function class_exists;
+use function ltrim;
+use function property_exists;
+use function rtrim;
+
+/**
+ * Factory class creating tags using phpstan's parser
+ *
+ * This class uses {@see PHPStanFactory} implementations to create tags
+ * from the ast of the phpstan docblock parser.
+ *
+ * @internal This class is not part of the BC promise of this library.
+ */
+class AbstractPHPStanFactory implements Factory
+{
+    private PhpDocParser $parser;
+    private Lexer $lexer;
+    /** @var PHPStanFactory[] */
+    private array $factories;
+
+    public function __construct(PHPStanFactory ...$factories)
+    {
+        if (class_exists(ParserConfig::class)) {
+            $config = new ParserConfig(['indexes' => true, 'lines' => true]);
+            $this->lexer = new Lexer($config);
+            $constParser = new ConstExprParser($config);
+            $this->parser = new PhpDocParser(
+                $config,
+                new TypeParser($config, $constParser),
+                $constParser
+            );
+        } else {
+            $this->lexer = new Lexer(true);
+            $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]);
+            $this->parser = new PhpDocParser(
+                new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]),
+                $constParser,
+                true,
+                true,
+                ['lines' => true, 'indexes' => true],
+                true
+            );
+        }
+
+        $this->factories = $factories;
+    }
+
+    public function create(string $tagLine, ?TypeContext $context = null): Tag
+    {
+        $tokens = $this->tokenizeLine($tagLine . "\n");
+        $ast = $this->parser->parseTag($tokens);
+        if (property_exists($ast->value, 'description') === true) {
+            $ast->value->setAttribute(
+                'description',
+                rtrim($ast->value->description . $tokens->joinUntil(Lexer::TOKEN_END), "\n")
+            );
+        }
+
+        if ($context === null) {
+            $context = new TypeContext('');
+        }
+
+        try {
+            foreach ($this->factories as $factory) {
+                if ($factory->supports($ast, $context)) {
+                    return $factory->create($ast, $context);
+                }
+            }
+        } catch (RuntimeException $e) {
+            return InvalidTag::create((string) $ast->value, 'method')->withError($e);
+        }
+
+        return InvalidTag::create(
+            (string) $ast->value,
+            $ast->name
+        );
+    }
+
+    /**
+     * Solve the issue with the lexer not tokenizing the line correctly
+     *
+     * This method is a workaround for the lexer that includes newline tokens with spaces. For
+     * phpstan this isn't an issue, as it doesn't do a lot of things with the indentation of descriptions.
+     * But for us is important to keep the indentation of the descriptions, so we need to fix the lexer output.
+     */
+    private function tokenizeLine(string $tagLine): TokenIterator
+    {
+        $tokens = $this->lexer->tokenize($tagLine);
+        $fixed = [];
+        foreach ($tokens as $token) {
+            if (($token[1] === Lexer::TOKEN_PHPDOC_EOL) && rtrim($token[0], " \t") !== $token[0]) {
+                $fixed[] = [
+                    rtrim($token[Lexer::VALUE_OFFSET], " \t"),
+                    Lexer::TOKEN_PHPDOC_EOL,
+                    $token[2] ?? 0,
+                ];
+                $fixed[] = [
+                    ltrim($token[Lexer::VALUE_OFFSET], "\n\r"),
+                    Lexer::TOKEN_HORIZONTAL_WS,
+                    ($token[2] ?? 0) + 1,
+                ];
+                continue;
+            }
+
+            $fixed[] = $token;
+        }
+
+        return new TokenIterator($fixed);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php
new file mode 100644
index 000000000..9a5528de2
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ExtendsFactory.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Extends_;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class ExtendsFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ExtendsTagValueNode && $node->name === '@extends';
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, ExtendsTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Extends_(
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php
new file mode 100644
index 000000000..190d3ff85
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/Factory.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+
+interface Factory
+{
+    /**
+     * Factory method responsible for instantiating the correct sub type.
+     *
+     * @param string $tagLine The text for this tag, including description.
+     *
+     * @return Tag A new tag object.
+     *
+     * @throws InvalidArgumentException If an invalid tag line was presented.
+     */
+    public function create(string $tagLine, ?TypeContext $context = null): Tag;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php
new file mode 100644
index 000000000..20aed24a6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ImplementsFactory.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Implements_;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class ImplementsFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ImplementsTagValueNode && $node->name === '@implements';
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, ImplementsTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Implements_(
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php
new file mode 100644
index 000000000..17c768f85
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodFactory.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Method;
+use phpDocumentor\Reflection\DocBlock\Tags\MethodParameter;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\Mixed_;
+use phpDocumentor\Reflection\Types\Void_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueParameterNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function array_map;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class MethodFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, MethodTagValueNode::class);
+
+        return new Method(
+            $tagValue->methodName,
+            [],
+            $this->createReturnType($tagValue, $context),
+            $tagValue->isStatic,
+            $this->descriptionFactory->create($tagValue->description, $context),
+            false,
+            array_map(
+                function (MethodTagValueParameterNode $param) use ($context) {
+                    return new MethodParameter(
+                        trim($param->parameterName, '$'),
+                        $param->type === null ? new Mixed_() : $this->typeResolver->createType(
+                            $param->type,
+                            $context
+                        ),
+                        $param->isReference,
+                        $param->isVariadic,
+                        $param->defaultValue === null ?
+                            MethodParameter::NO_DEFAULT_VALUE :
+                            (string) $param->defaultValue
+                    );
+                },
+                $tagValue->parameters
+            ),
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof MethodTagValueNode;
+    }
+
+    private function createReturnType(MethodTagValueNode $tagValue, Context $context): Type
+    {
+        if ($tagValue->returnType === null) {
+            return new Void_();
+        }
+
+        return $this->typeResolver->createType($tagValue->returnType, $context);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php
new file mode 100644
index 000000000..da968967b
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/MethodParameterFactory.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use function array_key_last;
+use function get_class;
+use function gettype;
+use function method_exists;
+use function ucfirst;
+use function var_export;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class MethodParameterFactory
+{
+    /**
+     * Formats the given default value to a string-able mixin
+     *
+     * @param mixed $defaultValue
+     */
+    public function format($defaultValue): string
+    {
+        $method = 'format' . ucfirst(gettype($defaultValue));
+        if (method_exists($this, $method)) {
+            return ' = ' . $this->{$method}($defaultValue);
+        }
+
+        return '';
+    }
+
+    private function formatDouble(float $defaultValue): string
+    {
+        return var_export($defaultValue, true);
+    }
+
+    /**
+     * @param mixed $defaultValue
+     */
+    private function formatNull($defaultValue): string
+    {
+        return 'null';
+    }
+
+    private function formatInteger(int $defaultValue): string
+    {
+        return var_export($defaultValue, true);
+    }
+
+    private function formatString(string $defaultValue): string
+    {
+        return var_export($defaultValue, true);
+    }
+
+    private function formatBoolean(bool $defaultValue): string
+    {
+        return var_export($defaultValue, true);
+    }
+
+    /**
+     * @param array<(array<mixed>|int|float|bool|string|object|null)> $defaultValue
+     */
+    private function formatArray(array $defaultValue): string
+    {
+        $formatedValue = '[';
+
+        foreach ($defaultValue as $key => $value) {
+            $method = 'format' . ucfirst(gettype($value));
+            if (!method_exists($this, $method)) {
+                continue;
+            }
+
+            $formatedValue .= $this->{$method}($value);
+
+            if ($key === array_key_last($defaultValue)) {
+                continue;
+            }
+
+            $formatedValue .= ',';
+        }
+
+        return $formatedValue . ']';
+    }
+
+    private function formatObject(object $defaultValue): string
+    {
+        return 'new ' . get_class($defaultValue) . '()';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php
new file mode 100644
index 000000000..cf04a06e6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PHPStanFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+
+interface PHPStanFactory
+{
+    public function create(PhpDocTagNode $node, Context $context): Tag;
+
+    public function supports(PhpDocTagNode $node, Context $context): bool;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php
new file mode 100644
index 000000000..7d680d9c6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ParamFactory.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Param;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypelessParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\OffsetAccessTypeNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+use function sprintf;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class ParamFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+
+        if ($tagValue instanceof InvalidTagValueNode) {
+            Deprecation::trigger(
+                'phpdocumentor/reflection-docblock',
+                'https://github.com/phpDocumentor/ReflectionDocBlock/issues/362',
+                sprintf(
+                    'Param tag value "%s" is invalid, falling back to legacy parsing. Please update your docblocks.',
+                    $tagValue->value
+                )
+            );
+
+            return Param::create($tagValue->value, $this->typeResolver, $this->descriptionFactory, $context);
+        }
+
+        Assert::isInstanceOfAny(
+            $tagValue,
+            [
+                ParamTagValueNode::class,
+                TypelessParamTagValueNode::class,
+            ]
+        );
+
+        if (($tagValue->type ?? null) instanceof OffsetAccessTypeNode) {
+            return InvalidTag::create(
+                (string) $tagValue,
+                'param'
+            );
+        }
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Param(
+            trim($tagValue->parameterName, '$'),
+            $this->typeResolver->createType($tagValue->type ?? new IdentifierTypeNode('mixed'), $context),
+            $tagValue->isVariadic,
+            $this->descriptionFactory->create($description, $context),
+            $tagValue->isReference
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ParamTagValueNode
+            || $node->value instanceof TypelessParamTagValueNode
+            || $node->name === '@param';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php
new file mode 100644
index 000000000..b744ed08f
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Property;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class PropertyFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, PropertyTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Property(
+            trim($tagValue->propertyName, '$'),
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof PropertyTagValueNode && $node->name === '@property';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyReadFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyReadFactory.php
new file mode 100644
index 000000000..b0898aa73
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyReadFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class PropertyReadFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->typeResolver = $typeResolver;
+        $this->descriptionFactory = $descriptionFactory;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, PropertyTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new PropertyRead(
+            trim($tagValue->propertyName, '$'),
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof PropertyTagValueNode && $node->name === '@property-read';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php
new file mode 100644
index 000000000..749b1eda9
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/PropertyWriteFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class PropertyWriteFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, PropertyTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new PropertyWrite(
+            trim($tagValue->propertyName, '$'),
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof PropertyTagValueNode && $node->name === '@property-write';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php
new file mode 100644
index 000000000..4a17dc245
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/ReturnFactory.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Return_;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class ReturnFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, ReturnTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Return_(
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ReturnTagValueNode;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php
new file mode 100644
index 000000000..f6f0bb5a4
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/StaticMethod.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+/**
+ * @deprecated This contract is totally covered by Tag contract. Every class using StaticMethod also use Tag
+ */
+interface StaticMethod
+{
+    /**
+     * @return mixed
+     */
+    public static function create(string $body);
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php
new file mode 100644
index 000000000..e23444a68
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateExtendsFactory.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\TemplateExtends;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class TemplateExtendsFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ExtendsTagValueNode && $node->name === '@template-extends';
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, ExtendsTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new TemplateExtends(
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php
new file mode 100644
index 000000000..9e4b3c896
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateFactory.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Template;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class TemplateFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+
+        Assert::isInstanceOf($tagValue, TemplateTagValueNode::class);
+        $name = $tagValue->name;
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Template(
+            $name,
+            $this->typeResolver->createType($tagValue->bound, $context),
+            $this->typeResolver->createType($tagValue->default, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof TemplateTagValueNode && $node->name === '@template';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php
new file mode 100644
index 000000000..bb3d11dad
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/TemplateImplementsFactory.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\TemplateImplements;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class TemplateImplementsFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ImplementsTagValueNode && $node->name === '@template-implements';
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, ImplementsTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new TemplateImplements(
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php
new file mode 100644
index 000000000..479ceb27d
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Factory/VarFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
+
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Var_;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
+use function trim;
+
+/**
+ * @internal This class is not part of the BC promise of this library.
+ */
+final class VarFactory implements PHPStanFactory
+{
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
+    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function create(PhpDocTagNode $node, Context $context): Tag
+    {
+        $tagValue = $node->value;
+        Assert::isInstanceOf($tagValue, VarTagValueNode::class);
+
+        $description = $tagValue->getAttribute('description');
+        if (is_string($description) === false) {
+            $description = $tagValue->description;
+        }
+
+        return new Var_(
+            trim($tagValue->variableName, '$'),
+            $this->typeResolver->createType($tagValue->type, $context),
+            $this->descriptionFactory->create($description, $context)
+        );
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof VarTagValueNode;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php
new file mode 100644
index 000000000..36b9983ea
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+
+interface Formatter
+{
+    /**
+     * Formats a tag into a string representation according to a specific format, such as Markdown.
+     */
+    public function format(Tag $tag): string;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php
new file mode 100644
index 000000000..ea5c16f5a
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/AlignFormatter.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+
+use function max;
+use function str_repeat;
+use function strlen;
+
+class AlignFormatter implements Formatter
+{
+    /** @var int The maximum tag name length. */
+    protected int $maxLen = 0;
+
+    /**
+     * @param Tag[] $tags All tags that should later be aligned with the formatter.
+     */
+    public function __construct(array $tags)
+    {
+        foreach ($tags as $tag) {
+            $this->maxLen = max($this->maxLen, strlen($tag->getName()));
+        }
+    }
+
+    /**
+     * Formats the given tag to return a simple plain text version.
+     */
+    public function format(Tag $tag): string
+    {
+        return '@' . $tag->getName() .
+            str_repeat(
+                ' ',
+                $this->maxLen - strlen($tag->getName()) + 1
+            ) .
+            $tag;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php
new file mode 100644
index 000000000..2afdfe55d
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Formatter/PassthroughFormatter.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+
+use function trim;
+
+class PassthroughFormatter implements Formatter
+{
+    /**
+     * Formats the given tag to return a simple plain text version.
+     */
+    public function format(Tag $tag): string
+    {
+        return trim('@' . $tag->getName() . ' ' . $tag);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php
new file mode 100644
index 000000000..bc1ab10c1
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+use function preg_match;
+
+/**
+ * Parses a tag definition for a DocBlock.
+ */
+final class Generic extends BaseTag implements Factory\StaticMethod
+{
+    /**
+     * Parses a tag and populates the member variables.
+     *
+     * @param string      $name        Name of the tag.
+     * @param Description $description The contents of the given tag.
+     */
+    public function __construct(string $name, ?Description $description = null)
+    {
+        $this->validateTagName($name);
+
+        $this->name        = $name;
+        $this->description = $description;
+    }
+
+    /**
+     * Creates a new tag that represents any unknown tag type.
+     *
+     * @return static
+     */
+    public static function create(
+        string $body,
+        string $name = '',
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::stringNotEmpty($name);
+        Assert::notNull($descriptionFactory);
+
+        $description = $body !== '' ? $descriptionFactory->create($body, $context) : null;
+
+        return new static($name, $description);
+    }
+
+    /**
+     * Returns the tag as a serialized string
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        return $description;
+    }
+
+    /**
+     * Validates if the tag name matches the expected format, otherwise throws an exception.
+     */
+    private function validateTagName(string $name): void
+    {
+        if (!preg_match('/^' . StandardTagFactory::REGEX_TAGNAME . '$/u', $name)) {
+            throw new InvalidArgumentException(
+                'The tag name "' . $name . '" is not wellformed. Tags may only consist of letters, underscores, '
+                . 'hyphens and backslashes.'
+            );
+        }
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php
new file mode 100644
index 000000000..2070828cc
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Implements_.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Reflection class for a {@}implements tag in a Docblock.
+ */
+class Implements_ extends TagWithType
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'implements';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(string $body): ?Tag
+    {
+        Deprecation::trigger(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        return null;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php
new file mode 100644
index 000000000..848f34d7b
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/InvalidTag.php
@@ -0,0 +1,150 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Closure;
+use Exception;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionFunction;
+use Throwable;
+
+use function array_map;
+use function get_class;
+use function get_resource_type;
+use function is_array;
+use function is_object;
+use function is_resource;
+use function sprintf;
+
+use const PHP_VERSION_ID;
+
+/**
+ * This class represents an exception during the tag creation
+ *
+ * Since the internals of the library are relaying on the correct syntax of a docblock
+ * we cannot simply throw exceptions at all time because the exceptions will break the creation of a
+ * docklock. Just silently ignore the exceptions is not an option because the user as an issue to fix.
+ *
+ * This tag holds that error information until a using application is able to display it. The object will just behave
+ * like any normal tag. So the normal application flow will not break.
+ */
+final class InvalidTag implements Tag
+{
+    private string $name;
+
+    private string $body;
+
+    private ?Throwable $throwable = null;
+
+    private function __construct(string $name, string $body)
+    {
+        $this->name = $name;
+        $this->body = $body;
+    }
+
+    public function getException(): ?Throwable
+    {
+        return $this->throwable;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public static function create(string $body, string $name = ''): self
+    {
+        return new self($name, $body);
+    }
+
+    public function withError(Throwable $exception): self
+    {
+        $this->flattenExceptionBacktrace($exception);
+        $tag            = new self($this->name, $this->body);
+        $tag->throwable = $exception;
+
+        return $tag;
+    }
+
+    /**
+     * Removes all complex types from backtrace
+     *
+     * Not all objects are serializable. So we need to remove them from the
+     * stored exception to be sure that we do not break existing library usage.
+     */
+    private function flattenExceptionBacktrace(Throwable $exception): void
+    {
+        $traceProperty = (new ReflectionClass(Exception::class))->getProperty('trace');
+        if (PHP_VERSION_ID < 80100) {
+            $traceProperty->setAccessible(true);
+        }
+
+        do {
+            $trace = $exception->getTrace();
+            if (isset($trace[0]['args'])) {
+                $trace = array_map(
+                    function (array $call): array {
+                        $call['args'] = array_map([$this, 'flattenArguments'], $call['args'] ?? []);
+
+                        return $call;
+                    },
+                    $trace
+                );
+            }
+
+            $traceProperty->setValue($exception, $trace);
+            $exception = $exception->getPrevious();
+        } while ($exception !== null);
+
+        if (PHP_VERSION_ID >= 80100) {
+            return;
+        }
+
+        $traceProperty->setAccessible(false);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     *
+     * @throws ReflectionException
+     */
+    private function flattenArguments($value)
+    {
+        if ($value instanceof Closure) {
+            $closureReflection = new ReflectionFunction($value);
+            $value             = sprintf(
+                '(Closure at %s:%s)',
+                $closureReflection->getFileName(),
+                $closureReflection->getStartLine()
+            );
+        } elseif (is_object($value)) {
+            $value = sprintf('object(%s)', get_class($value));
+        } elseif (is_resource($value)) {
+            $value = sprintf('resource(%s)', get_resource_type($value));
+        } elseif (is_array($value)) {
+            $value = array_map([$this, 'flattenArguments'], $value);
+        }
+
+        return $value;
+    }
+
+    public function render(?Formatter $formatter = null): string
+    {
+        if ($formatter === null) {
+            $formatter = new Formatter\PassthroughFormatter();
+        }
+
+        return $formatter->format($this);
+    }
+
+    public function __toString(): string
+    {
+        return $this->body;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php
new file mode 100644
index 000000000..fcb6ec193
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Link.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+/**
+ * Reflection class for a {@}link tag in a Docblock.
+ */
+final class Link extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'link';
+
+    private string $link;
+
+    /**
+     * Initializes a link to a URL.
+     */
+    public function __construct(string $link, ?Description $description = null)
+    {
+        $this->link        = $link;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($descriptionFactory);
+
+        $parts = Utils::pregSplit('/\s+/Su', $body, 2);
+        $description = isset($parts[1]) ? $descriptionFactory->create($parts[1], $context) : null;
+
+        return new static($parts[0], $description);
+    }
+
+    /**
+     * Gets the link
+     */
+    public function getLink(): string
+    {
+        return $this->link;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $link = $this->link;
+
+        return $link . ($description !== '' ? ($link !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php
new file mode 100644
index 000000000..41e0eed19
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Method.php
@@ -0,0 +1,355 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Types\Mixed_;
+use phpDocumentor\Reflection\Types\Void_;
+use Webmozart\Assert\Assert;
+
+use function array_keys;
+use function array_map;
+use function explode;
+use function implode;
+use function is_string;
+use function preg_match;
+use function sort;
+use function strpos;
+use function substr;
+use function trigger_error;
+use function trim;
+use function var_export;
+
+use const E_USER_DEPRECATED;
+
+/**
+ * Reflection class for an {@}method in a Docblock.
+ */
+final class Method extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'method';
+
+    private string $methodName;
+
+    private bool $isStatic;
+
+    private Type $returnType;
+
+    private bool $returnsReference;
+
+    /** @var MethodParameter[] */
+    private array $parameters;
+
+    /**
+     * @param array<int, array<string, Type|string>> $arguments
+     * @param MethodParameter[] $parameters
+     * @phpstan-param array<int, array{name: string, type: Type}|string> $arguments
+     */
+    public function __construct(
+        string $methodName,
+        array $arguments = [],
+        ?Type $returnType = null,
+        bool $static = false,
+        ?Description $description = null,
+        bool $returnsReference = false,
+        ?array $parameters = null
+    ) {
+        Assert::stringNotEmpty($methodName);
+
+        if ($returnType === null) {
+            $returnType = new Void_();
+        }
+
+        $arguments = $this->filterArguments($arguments);
+
+        $this->methodName       = $methodName;
+        $this->returnType       = $returnType;
+        $this->isStatic         = $static;
+        $this->description      = $description;
+        $this->returnsReference = $returnsReference;
+        $this->parameters = $parameters ?? $this->fromLegacyArguments($arguments);
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): ?self {
+        trigger_error(
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+            E_USER_DEPRECATED
+        );
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        // 1. none or more whitespace
+        // 2. optionally the keyword "static" followed by whitespace
+        // 3. optionally a word with underscores followed by whitespace : as
+        //    type for the return value
+        // 4. optionally an ampersand followed or not by whitespace : as
+        //    a reference
+        // 5. then optionally a word with underscores followed by () and
+        //    whitespace : as method name as used by phpDocumentor
+        // 6. then a word with underscores, followed by ( and any character
+        //    until a ) and whitespace : as method name with signature
+        // 7. any remaining text : as description
+        if (
+            !preg_match(
+                '/^
+                # Static keyword
+                # Declares a static method ONLY if type is also present
+                (?:
+                    (static)
+                    \s+
+                )?
+                # Return type
+                (?:
+                    (
+                        (?:[\w\|_\\\\]*\$this[\w\|_\\\\]*)
+                        |
+                        (?:
+                            (?:[\w\|_\\\\]+)
+                            # array notation
+                            (?:\[\])*
+                        )*+
+                    )
+                    \s+
+                )?
+                # Returns reference
+                (?:
+                    (&)
+                    \s*
+                )?
+                # Method name
+                ([\w_]+)
+                # Arguments
+                (?:
+                    \(([^\)]*)\)
+                )?
+                \s*
+                # Description
+                (.*)
+            $/sux',
+                $body,
+                $matches
+            )
+        ) {
+            return null;
+        }
+
+        [, $static, $returnType, $returnsReference, $methodName, $argumentLines, $description] = $matches;
+
+        $static = $static === 'static';
+
+        if ($returnType === '') {
+            $returnType = 'void';
+        }
+
+        $returnsReference = $returnsReference === '&';
+
+        $returnType  = $typeResolver->resolve($returnType, $context);
+        $description = $descriptionFactory->create($description, $context);
+
+        /** @phpstan-var array<int, array{name: string, type: Type}> $arguments */
+        $arguments = [];
+        if ($argumentLines !== '') {
+            $argumentsExploded = explode(',', $argumentLines);
+            foreach ($argumentsExploded as $argument) {
+                $argument = explode(' ', self::stripRestArg(trim($argument)), 2);
+                if (strpos($argument[0], '$') === 0) {
+                    $argumentName = substr($argument[0], 1);
+                    $argumentType = new Mixed_();
+                } else {
+                    $argumentType = $typeResolver->resolve($argument[0], $context);
+                    $argumentName = '';
+                    if (isset($argument[1])) {
+                        $argument[1]  = self::stripRestArg($argument[1]);
+                        $argumentName = substr($argument[1], 1);
+                    }
+                }
+
+                $arguments[] = ['name' => $argumentName, 'type' => $argumentType];
+            }
+        }
+
+        return new static(
+            $methodName,
+            $arguments,
+            $returnType,
+            $static,
+            $description,
+            $returnsReference
+        );
+    }
+
+    /**
+     * Retrieves the method name.
+     */
+    public function getMethodName(): string
+    {
+        return $this->methodName;
+    }
+
+    /**
+     * @deprecated Method deprecated, use {@see self::getParameters()}
+     *
+     * @return array<int, array<string, Type|string>>
+     * @phpstan-return array<int, array{name: string, type: Type}>
+     */
+    public function getArguments(): array
+    {
+        trigger_error('Method deprecated, use ::getParameters()', E_USER_DEPRECATED);
+
+        return array_map(
+            static function (MethodParameter $methodParameter) {
+                return ['name' => $methodParameter->getName(), 'type' => $methodParameter->getType()];
+            },
+            $this->parameters
+        );
+    }
+
+    /** @return MethodParameter[] */
+    public function getParameters(): array
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * Checks whether the method tag describes a static method or not.
+     *
+     * @return bool TRUE if the method declaration is for a static method, FALSE otherwise.
+     */
+    public function isStatic(): bool
+    {
+        return $this->isStatic;
+    }
+
+    public function getReturnType(): Type
+    {
+        return $this->returnType;
+    }
+
+    public function returnsReference(): bool
+    {
+        return $this->returnsReference;
+    }
+
+    public function __toString(): string
+    {
+        $arguments = [];
+        foreach ($this->parameters as $parameter) {
+            $arguments[] = (string) $parameter;
+        }
+
+        $argumentStr = '(' . implode(', ', $arguments) . ')';
+
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $static = $this->isStatic ? 'static' : '';
+
+        $returnType = (string) $this->returnType;
+
+        $methodName = $this->methodName;
+
+        $reference = $this->returnsReference ? '&' : '';
+
+        return $static
+            . ($returnType !== '' ? ($static !== '' ? ' ' : '') . $returnType : '')
+            . ($methodName !== '' ? ($static !== '' || $returnType !== '' ? ' ' : '') . $reference . $methodName : '')
+            . $argumentStr
+            . ($description !== '' ? ' ' . $description : '');
+    }
+
+    /**
+     * @param mixed[][]|string[] $arguments
+     * @phpstan-param array<int, array{name: string, type: Type}|string> $arguments
+     *
+     * @return mixed[][]
+     * @phpstan-return array<int, array{name: string, type: Type}>
+     */
+    private function filterArguments(array $arguments = []): array
+    {
+        $result = [];
+        foreach ($arguments as $argument) {
+            if (is_string($argument)) {
+                $argument = ['name' => $argument];
+            }
+
+            if (!isset($argument['type'])) {
+                $argument['type'] = new Mixed_();
+            }
+
+            $keys = array_keys($argument);
+            sort($keys);
+            if ($keys !== ['name', 'type']) {
+                throw new InvalidArgumentException(
+                    'Arguments can only have the "name" and "type" fields, found: ' . var_export($keys, true)
+                );
+            }
+
+            $result[] = $argument;
+        }
+
+        return $result;
+    }
+
+    private static function stripRestArg(string $argument): string
+    {
+        if (strpos($argument, '...') === 0) {
+            $argument = trim(substr($argument, 3));
+        }
+
+        return $argument;
+    }
+
+    /**
+     * @param array{name: string, type: Type} $arguments
+     * @phpstan-param array<int, array{name: string, type: Type}> $arguments
+     *
+     * @return MethodParameter[]
+     */
+    private function fromLegacyArguments(array $arguments): array
+    {
+        trigger_error(
+            'Create method parameters via legacy format is deprecated add parameters via the constructor',
+            E_USER_DEPRECATED
+        );
+
+        return array_map(
+            static function ($arg) {
+                return new MethodParameter(
+                    $arg['name'],
+                    $arg['type']
+                );
+            },
+            $arguments
+        );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php
new file mode 100644
index 000000000..ceb870241
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/MethodParameter.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\MethodParameterFactory;
+use phpDocumentor\Reflection\Type;
+
+final class MethodParameter
+{
+    private Type $type;
+
+    private bool $isReference;
+
+    private bool $isVariadic;
+
+    private string $name;
+
+    /** @var mixed */
+    private $defaultValue;
+
+    public const NO_DEFAULT_VALUE = '__NO_VALUE__';
+
+    /**
+     * @param mixed $defaultValue
+     */
+    public function __construct(
+        string $name,
+        Type $type,
+        bool $isReference = false,
+        bool $isVariadic = false,
+        $defaultValue = self::NO_DEFAULT_VALUE
+    ) {
+        $this->type = $type;
+        $this->isReference = $isReference;
+        $this->isVariadic = $isVariadic;
+        $this->name = $name;
+        $this->defaultValue = $defaultValue;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function isReference(): bool
+    {
+        return $this->isReference;
+    }
+
+    public function isVariadic(): bool
+    {
+        return $this->isVariadic;
+    }
+
+    public function getDefaultValue(): ?string
+    {
+        if ($this->defaultValue === self::NO_DEFAULT_VALUE) {
+            return null;
+        }
+
+        return (new MethodParameterFactory())->format($this->defaultValue);
+    }
+
+    public function __toString(): string
+    {
+        return $this->getType() . ' ' .
+            ($this->isReference() ? '&' : '') .
+            ($this->isVariadic() ? '...' : '') .
+            '$' . $this->getName() .
+            (
+                $this->defaultValue !== self::NO_DEFAULT_VALUE ?
+                (new MethodParameterFactory())->format($this->defaultValue) :
+                ''
+            );
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php
new file mode 100644
index 000000000..c15d30c11
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Mixin.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+/**
+ * Reflection class for a {@}mixin tag in a Docblock.
+ */
+final class Mixin extends TagWithType implements Factory\StaticMethod
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'mixin';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$type, $description] = self::extractTypeFromBody($body);
+
+        $type        = $typeResolver->resolve($type, $context);
+        $description = $descriptionFactory->create($description, $context);
+
+        return new static($type, $description);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php
new file mode 100644
index 000000000..6d46686d5
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Param.php
@@ -0,0 +1,185 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function array_unshift;
+use function implode;
+use function strpos;
+use function substr;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Reflection class for the {@}param tag in a Docblock.
+ */
+final class Param extends TagWithType implements Factory\StaticMethod
+{
+    private ?string $variableName = null;
+
+    /** @var bool determines whether this is a variadic argument */
+    private bool $isVariadic;
+
+    /** @var bool determines whether this is passed by reference */
+    private bool $isReference;
+
+    public function __construct(
+        ?string $variableName,
+        ?Type $type = null,
+        bool $isVariadic = false,
+        ?Description $description = null,
+        bool $isReference = false
+    ) {
+        $this->name         = 'param';
+        $this->variableName = $variableName;
+        $this->type         = $type;
+        $this->isVariadic   = $isVariadic;
+        $this->description  = $description;
+        $this->isReference  = $isReference;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$firstPart, $body] = self::extractTypeFromBody($body);
+
+        $type         = null;
+        $parts        = Utils::pregSplit('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        $variableName = '';
+        $isVariadic   = false;
+        $isReference   = false;
+
+        // if the first item that is encountered is not a variable; it is a type
+        if ($firstPart && !self::strStartsWithVariable($firstPart)) {
+            $type = $typeResolver->resolve($firstPart, $context);
+        } else {
+            // first part is not a type; we should prepend it to the parts array for further processing
+            array_unshift($parts, $firstPart);
+        }
+
+        // if the next item starts with a $ or ...$ or &$ or &...$ it must be the variable name
+        if (isset($parts[0]) && self::strStartsWithVariable($parts[0])) {
+            $variableName = array_shift($parts);
+            if ($type) {
+                array_shift($parts);
+            }
+
+            Assert::notNull($variableName);
+
+            if (strpos($variableName, '$') === 0) {
+                $variableName = substr($variableName, 1);
+            } elseif (strpos($variableName, '&$') === 0) {
+                $isReference = true;
+                $variableName = substr($variableName, 2);
+            } elseif (strpos($variableName, '...$') === 0) {
+                $isVariadic = true;
+                $variableName = substr($variableName, 4);
+            } elseif (strpos($variableName, '&...$') === 0) {
+                $isVariadic   = true;
+                $isReference  = true;
+                $variableName = substr($variableName, 5);
+            }
+        }
+
+        $description = $descriptionFactory->create(implode('', $parts), $context);
+
+        return new static($variableName, $type, $isVariadic, $description, $isReference);
+    }
+
+    /**
+     * Returns the variable's name.
+     */
+    public function getVariableName(): ?string
+    {
+        return $this->variableName;
+    }
+
+    /**
+     * Returns whether this tag is variadic.
+     */
+    public function isVariadic(): bool
+    {
+        return $this->isVariadic;
+    }
+
+    /**
+     * Returns whether this tag is passed by reference.
+     */
+    public function isReference(): bool
+    {
+        return $this->isReference;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $variableName = '';
+        if ($this->variableName !== null && $this->variableName !== '') {
+            $variableName .= ($this->isReference ? '&' : '') . ($this->isVariadic ? '...' : '');
+            $variableName .= '$' . $this->variableName;
+        }
+
+        $type = (string) $this->type;
+
+        return $type
+            . ($variableName !== '' ? ($type !== '' ? ' ' : '') . $variableName : '')
+            . ($description !== '' ? ($type !== '' || $variableName !== '' ? ' ' : '') . $description : '');
+    }
+
+    private static function strStartsWithVariable(string $str): bool
+    {
+        return strpos($str, '$') === 0
+               ||
+               strpos($str, '...$') === 0
+               ||
+               strpos($str, '&$') === 0
+               ||
+               strpos($str, '&...$') === 0;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php
new file mode 100644
index 000000000..3328b0807
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Property.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function array_unshift;
+use function implode;
+use function strpos;
+use function substr;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Reflection class for a {@}property tag in a Docblock.
+ */
+final class Property extends TagWithType implements Factory\StaticMethod
+{
+    protected ?string $variableName = null;
+
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
+    {
+        Assert::string($variableName);
+
+        $this->name         = 'property';
+        $this->variableName = $variableName;
+        $this->type         = $type;
+        $this->description  = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$firstPart, $body] = self::extractTypeFromBody($body);
+        $type               = null;
+        $parts              = Utils::pregSplit('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        $variableName = '';
+
+        // if the first item that is encountered is not a variable; it is a type
+        if ($firstPart && $firstPart[0] !== '$') {
+            $type = $typeResolver->resolve($firstPart, $context);
+        } else {
+            // first part is not a type; we should prepend it to the parts array for further processing
+            array_unshift($parts, $firstPart);
+        }
+
+        // if the next item starts with a $ it must be the variable name
+        if (isset($parts[0]) && strpos($parts[0], '$') === 0) {
+            $variableName = array_shift($parts);
+            if ($type) {
+                array_shift($parts);
+            }
+
+            Assert::notNull($variableName);
+
+            $variableName = substr($variableName, 1);
+        }
+
+        $description = $descriptionFactory->create(implode('', $parts), $context);
+
+        return new static($variableName, $type, $description);
+    }
+
+    /**
+     * Returns the variable's name.
+     */
+    public function getVariableName(): ?string
+    {
+        return $this->variableName;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description !== null) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        if ($this->variableName !== null && $this->variableName !== '') {
+            $variableName = '$' . $this->variableName;
+        } else {
+            $variableName = '';
+        }
+
+        $type = (string) $this->type;
+
+        return $type
+            . ($variableName !== '' ? ($type !== '' ? ' ' : '') . $variableName : '')
+            . ($description !== '' ? ($type !== '' || $variableName !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php
new file mode 100644
index 000000000..8ac1eb02b
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyRead.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function array_unshift;
+use function implode;
+use function strpos;
+use function substr;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Reflection class for a {@}property-read tag in a Docblock.
+ */
+final class PropertyRead extends TagWithType implements Factory\StaticMethod
+{
+    protected ?string $variableName = null;
+
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
+    {
+        Assert::string($variableName);
+
+        $this->name         = 'property-read';
+        $this->variableName = $variableName;
+        $this->type         = $type;
+        $this->description  = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$firstPart, $body] = self::extractTypeFromBody($body);
+        $type               = null;
+        $parts              = Utils::pregSplit('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        $variableName = '';
+
+        // if the first item that is encountered is not a variable; it is a type
+        if ($firstPart && $firstPart[0] !== '$') {
+            $type = $typeResolver->resolve($firstPart, $context);
+        } else {
+            // first part is not a type; we should prepend it to the parts array for further processing
+            array_unshift($parts, $firstPart);
+        }
+
+        // if the next item starts with a $ it must be the variable name
+        if (isset($parts[0]) && strpos($parts[0], '$') === 0) {
+            $variableName = array_shift($parts);
+            if ($type) {
+                array_shift($parts);
+            }
+
+            Assert::notNull($variableName);
+
+            $variableName = substr($variableName, 1);
+        }
+
+        $description = $descriptionFactory->create(implode('', $parts), $context);
+
+        return new static($variableName, $type, $description);
+    }
+
+    /**
+     * Returns the variable's name.
+     */
+    public function getVariableName(): ?string
+    {
+        return $this->variableName;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description !== null) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        if ($this->variableName !== null && $this->variableName !== '') {
+            $variableName = '$' . $this->variableName;
+        } else {
+            $variableName = '';
+        }
+
+        $type = (string) $this->type;
+
+        return $type
+            . ($variableName !== '' ? ($type !== '' ? ' ' : '') . $variableName : '')
+            . ($description !== '' ? ($type !== '' || $variableName !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyWrite.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyWrite.php
new file mode 100644
index 000000000..57e7eb103
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/PropertyWrite.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function array_unshift;
+use function implode;
+use function strpos;
+use function substr;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Reflection class for a {@}property-write tag in a Docblock.
+ */
+final class PropertyWrite extends TagWithType implements Factory\StaticMethod
+{
+    protected string $variableName;
+
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
+    {
+        Assert::string($variableName);
+
+        $this->name         = 'property-write';
+        $this->variableName = $variableName;
+        $this->type         = $type;
+        $this->description  = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$firstPart, $body] = self::extractTypeFromBody($body);
+        $type               = null;
+        $parts              = Utils::pregSplit('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        $variableName = '';
+
+        // if the first item that is encountered is not a variable; it is a type
+        if ($firstPart && $firstPart[0] !== '$') {
+            $type = $typeResolver->resolve($firstPart, $context);
+        } else {
+            // first part is not a type; we should prepend it to the parts array for further processing
+            array_unshift($parts, $firstPart);
+        }
+
+        // if the next item starts with a $ it must be the variable name
+        if (isset($parts[0]) && strpos($parts[0], '$') === 0) {
+            $variableName = array_shift($parts);
+            if ($type) {
+                array_shift($parts);
+            }
+
+            Assert::notNull($variableName);
+
+            $variableName = substr($variableName, 1);
+        }
+
+        $description = $descriptionFactory->create(implode('', $parts), $context);
+
+        return new static($variableName, $type, $description);
+    }
+
+    /**
+     * Returns the variable's name.
+     */
+    public function getVariableName(): ?string
+    {
+        return $this->variableName;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        if ($this->variableName) {
+            $variableName = '$' . $this->variableName;
+        } else {
+            $variableName = '';
+        }
+
+        $type = (string) $this->type;
+
+        return $type
+            . ($variableName !== '' ? ($type !== '' ? ' ' : '') . $variableName : '')
+            . ($description !== '' ? ($type !== '' || $variableName !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Fqsen.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Fqsen.php
new file mode 100644
index 000000000..e4e7e31c6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Fqsen.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
+
+use phpDocumentor\Reflection\Fqsen as RealFqsen;
+
+/**
+ * Fqsen reference used by {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
+ */
+final class Fqsen implements Reference
+{
+    private RealFqsen $fqsen;
+
+    public function __construct(RealFqsen $fqsen)
+    {
+        $this->fqsen = $fqsen;
+    }
+
+    /**
+     * @return string string representation of the referenced fqsen
+     */
+    public function __toString(): string
+    {
+        return (string) $this->fqsen;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Reference.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Reference.php
new file mode 100644
index 000000000..e7dea868d
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Reference.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
+
+/**
+ * Interface for references in {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
+ */
+interface Reference
+{
+    public function __toString(): string;
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Url.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Url.php
new file mode 100644
index 000000000..5954a4717
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Reference/Url.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
+
+use Webmozart\Assert\Assert;
+
+/**
+ * Url reference used by {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
+ */
+final class Url implements Reference
+{
+    private string $uri;
+
+    public function __construct(string $uri)
+    {
+        Assert::stringNotEmpty($uri);
+        $this->uri = $uri;
+    }
+
+    public function __toString(): string
+    {
+        return $this->uri;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php
new file mode 100644
index 000000000..7e9b0c7a9
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Return_.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+/**
+ * Reflection class for a {@}return tag in a Docblock.
+ */
+final class Return_ extends TagWithType implements Factory\StaticMethod
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'return';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$type, $description] = self::extractTypeFromBody($body);
+
+        $type        = $typeResolver->resolve($type, $context);
+        $description = $descriptionFactory->create($description, $context);
+
+        return new static($type, $description);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/See.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/See.php
new file mode 100644
index 000000000..e7330e887
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/See.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen as FqsenRef;
+use phpDocumentor\Reflection\DocBlock\Tags\Reference\Reference;
+use phpDocumentor\Reflection\DocBlock\Tags\Reference\Url;
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function explode;
+use function preg_match;
+
+/**
+ * Reflection class for an {@}see tag in a Docblock.
+ */
+final class See extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'see';
+
+    protected Reference $refers;
+
+    /**
+     * Initializes this tag.
+     */
+    public function __construct(Reference $refers, ?Description $description = null)
+    {
+        $this->refers      = $refers;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?FqsenResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($descriptionFactory);
+
+        $parts = Utils::pregSplit('/\s+/Su', $body, 2);
+        $description = isset($parts[1]) ? $descriptionFactory->create($parts[1], $context) : null;
+
+        // https://tools.ietf.org/html/rfc2396#section-3
+        if (preg_match('#\w://\w#', $parts[0])) {
+            return new static(new Url($parts[0]), $description);
+        }
+
+        return new static(new FqsenRef(self::resolveFqsen($parts[0], $typeResolver, $context)), $description);
+    }
+
+    private static function resolveFqsen(string $parts, ?FqsenResolver $fqsenResolver, ?TypeContext $context): Fqsen
+    {
+        Assert::notNull($fqsenResolver);
+        $fqsenParts = explode('::', $parts);
+        $resolved = $fqsenResolver->resolve($fqsenParts[0], $context);
+
+        if (!array_key_exists(1, $fqsenParts)) {
+            return $resolved;
+        }
+
+        return new Fqsen($resolved . '::' . $fqsenParts[1]);
+    }
+
+    /**
+     * Returns the ref of this tag.
+     */
+    public function getReference(): Reference
+    {
+        return $this->refers;
+    }
+
+    /**
+     * Returns a string representation of this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $refers = (string) $this->refers;
+
+        return $refers . ($description !== '' ? ($refers !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php
new file mode 100644
index 000000000..8ec59e91c
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Since.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+use function preg_match;
+
+/**
+ * Reflection class for a {@}since tag in a Docblock.
+ */
+final class Since extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'since';
+
+    /**
+     * PCRE regular expression matching a version vector.
+     * Assumes the "x" modifier.
+     */
+    public const REGEX_VECTOR = '(?:
+        # Normal release vectors.
+        \d\S*
+        |
+        # VCS version vectors. Per PHPCS, they are expected to
+        # follow the form of the VCS name, followed by ":", followed
+        # by the version vector itself.
+        # By convention, popular VCSes like CVS, SVN and GIT use "$"
+        # around the actual version vector.
+        [^\s\:]+\:\s*\$[^\$]+\$
+    )';
+
+    /** @var string|null The version vector. */
+    private ?string $version = null;
+
+    public function __construct(?string $version = null, ?Description $description = null)
+    {
+        Assert::nullOrNotEmpty($version);
+
+        $this->version     = $version;
+        $this->description = $description;
+    }
+
+    public static function create(
+        ?string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): ?self {
+        if ($body === null || $body === '') {
+            return new static();
+        }
+
+        $matches = [];
+        if (!preg_match('/^(' . self::REGEX_VECTOR . ')\s*(.+)?$/sux', $body, $matches)) {
+            return null;
+        }
+
+        Assert::notNull($descriptionFactory);
+
+        return new static(
+            $matches[1],
+            $descriptionFactory->create($matches[2] ?? '', $context)
+        );
+    }
+
+    /**
+     * Gets the version section of the tag.
+     */
+    public function getVersion(): ?string
+    {
+        return $this->version;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description !== null) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $version = (string) $this->version;
+
+        return $version . ($description !== '' ? ($version !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php
new file mode 100644
index 000000000..f6b4f57fa
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Source.php
@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+use function preg_match;
+
+/**
+ * Reflection class for a {@}source tag in a Docblock.
+ */
+final class Source extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'source';
+
+    /** @var int The starting line, relative to the structural element's location. */
+    private int $startingLine;
+
+    /** @var int|null The number of lines, relative to the starting line. NULL means "to the end". */
+    private ?int $lineCount = null;
+
+    /**
+     * @param int|string      $startingLine should be a to int convertible value
+     * @param int|string|null $lineCount    should be a to int convertible value
+     */
+    public function __construct($startingLine, $lineCount = null, ?Description $description = null)
+    {
+        Assert::integerish($startingLine);
+        Assert::nullOrIntegerish($lineCount);
+
+        $this->startingLine = (int) $startingLine;
+        $this->lineCount    = $lineCount !== null ? (int) $lineCount : null;
+        $this->description  = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::stringNotEmpty($body);
+        Assert::notNull($descriptionFactory);
+
+        $startingLine = 1;
+        $lineCount    = null;
+        $description  = null;
+
+        // Starting line / Number of lines / Description
+        if (preg_match('/^([1-9]\d*)\s*(?:((?1))\s+)?(.*)$/sux', $body, $matches)) {
+            $startingLine = (int) $matches[1];
+            if (isset($matches[2]) && $matches[2] !== '') {
+                $lineCount = (int) $matches[2];
+            }
+
+            $description = $matches[3];
+        }
+
+        return new static($startingLine, $lineCount, $descriptionFactory->create($description ?? '', $context));
+    }
+
+    /**
+     * Gets the starting line.
+     *
+     * @return int The starting line, relative to the structural element's
+     *     location.
+     */
+    public function getStartingLine(): int
+    {
+        return $this->startingLine;
+    }
+
+    /**
+     * Returns the number of lines.
+     *
+     * @return int|null The number of lines, relative to the starting line. NULL
+     *     means "to the end".
+     */
+    public function getLineCount(): ?int
+    {
+        return $this->lineCount;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $startingLine = (string) $this->startingLine;
+
+        $lineCount = $this->lineCount !== null ? ' ' . $this->lineCount : '';
+
+        return $startingLine
+            . $lineCount
+            . ($description !== ''
+                ? ' ' . $description
+                : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php
new file mode 100644
index 000000000..89e29e5ea
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TagWithType.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\Type;
+
+use function in_array;
+use function sprintf;
+use function strlen;
+use function substr;
+use function trim;
+
+abstract class TagWithType extends BaseTag
+{
+    /** @var ?Type */
+    protected ?Type $type = null;
+
+    /**
+     * Returns the type section of the variable.
+     */
+    public function getType(): ?Type
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string[]
+     */
+    protected static function extractTypeFromBody(string $body): array
+    {
+        $type         = '';
+        $nestingLevel = 0;
+        for ($i = 0, $iMax = strlen($body); $i < $iMax; $i++) {
+            $character = $body[$i];
+
+            if ($nestingLevel === 0 && trim($character) === '') {
+                break;
+            }
+
+            $type .= $character;
+            if (in_array($character, ['<', '(', '[', '{'])) {
+                $nestingLevel++;
+                continue;
+            }
+
+            if (in_array($character, ['>', ')', ']', '}'])) {
+                $nestingLevel--;
+                continue;
+            }
+        }
+
+        if ($nestingLevel < 0 || $nestingLevel > 0) {
+            throw new InvalidArgumentException(
+                sprintf('Could not find type in %s, please check for malformed notations', $body)
+            );
+        }
+
+        $description = trim(substr($body, strlen($type)));
+
+        return [$type, $description];
+    }
+
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $type = (string) $this->type;
+
+        return $type . ($description !== '' ? ($type !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php
new file mode 100644
index 000000000..cfd6b6996
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Template.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Reflection class for a {@}template tag in a Docblock.
+ */
+final class Template extends BaseTag
+{
+    /** @var non-empty-string */
+    private string $templateName;
+
+    /** @var ?Type The real type */
+    private ?Type $bound;
+
+    private ?Type $default;
+
+    /** @param non-empty-string $templateName */
+    public function __construct(
+        string $templateName,
+        ?Type $bound = null,
+        ?Type $default = null,
+        ?Description $description = null
+    ) {
+        $this->name = 'template';
+        $this->templateName = $templateName;
+        $this->bound = $bound;
+        $this->default = $default;
+        $this->description = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(string $body): ?Tag
+    {
+        Deprecation::trigger(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+
+        return null;
+    }
+
+    public function getTemplateName(): string
+    {
+        return $this->templateName;
+    }
+
+    public function getBound(): ?Type
+    {
+        return $this->bound;
+    }
+
+    public function getDefault(): ?Type
+    {
+        return $this->default;
+    }
+
+    public function __toString(): string
+    {
+        $bound = $this->bound !== null ? ' of ' . $this->bound : '';
+        $default = $this->default !== null ? ' = ' . $this->default : '';
+
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        return $this->templateName . $bound . $default . ($description !== '' ? ' ' . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php
new file mode 100644
index 000000000..d5d509872
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateCovariant.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+/**
+ * Reflection class for a {@}template-covariant tag in a Docblock.
+ */
+final class TemplateCovariant extends TagWithType implements Factory\StaticMethod
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'template-covariant';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$type, $description] = self::extractTypeFromBody($body);
+
+        $type        = $typeResolver->resolve($type, $context);
+        $description = $descriptionFactory->create($description, $context);
+
+        return new static($type, $description);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php
new file mode 100644
index 000000000..8de4681d8
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateExtends.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Reflection class for a {@}template-extends tag in a Docblock.
+ */
+final class TemplateExtends extends Extends_
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        parent::__construct($type, $description);
+        $this->name = 'template-extends';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php
new file mode 100644
index 000000000..1fb073d99
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/TemplateImplements.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Reflection class for a {@}template-implements tag in a Docblock.
+ */
+final class TemplateImplements extends Implements_
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        parent::__construct($type, $description);
+        $this->name = 'template-implements';
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php
new file mode 100644
index 000000000..e08184681
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Throws.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+/**
+ * Reflection class for a {@}throws tag in a Docblock.
+ */
+final class Throws extends TagWithType implements Factory\StaticMethod
+{
+    public function __construct(Type $type, ?Description $description = null)
+    {
+        $this->name        = 'throws';
+        $this->type        = $type;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$type, $description] = self::extractTypeFromBody($body);
+
+        $type        = $typeResolver->resolve($type, $context);
+        $description = $descriptionFactory->create($description, $context);
+
+        return new static($type, $description);
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php
new file mode 100644
index 000000000..d9aa3608f
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Uses.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function explode;
+
+/**
+ * Reflection class for a {@}uses tag in a Docblock.
+ */
+final class Uses extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'uses';
+
+    protected Fqsen $refers;
+
+    /**
+     * Initializes this tag.
+     */
+    public function __construct(Fqsen $refers, ?Description $description = null)
+    {
+        $this->refers      = $refers;
+        $this->description = $description;
+    }
+
+    public static function create(
+        string $body,
+        ?FqsenResolver $resolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Assert::notNull($resolver);
+        Assert::notNull($descriptionFactory);
+
+        $parts = Utils::pregSplit('/\s+/Su', $body, 2);
+
+        return new static(
+            self::resolveFqsen($parts[0], $resolver, $context),
+            $descriptionFactory->create($parts[1] ?? '', $context)
+        );
+    }
+
+    private static function resolveFqsen(string $parts, ?FqsenResolver $fqsenResolver, ?TypeContext $context): Fqsen
+    {
+        Assert::notNull($fqsenResolver);
+        $fqsenParts = explode('::', $parts);
+        $resolved = $fqsenResolver->resolve($fqsenParts[0], $context);
+
+        if (!array_key_exists(1, $fqsenParts)) {
+            return $resolved;
+        }
+
+        return new Fqsen($resolved . '::' . $fqsenParts[1]);
+    }
+
+    /**
+     * Returns the structural element this tag refers to.
+     */
+    public function getReference(): Fqsen
+    {
+        return $this->refers;
+    }
+
+    /**
+     * Returns a string representation of this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $refers = (string) $this->refers;
+
+        return $refers . ($description !== '' ? ($refers !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php
new file mode 100644
index 000000000..b0bd8c21e
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Var_.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use Doctrine\Deprecations\Deprecation;
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use phpDocumentor\Reflection\Utils;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function array_unshift;
+use function implode;
+use function strpos;
+use function substr;
+
+use const PREG_SPLIT_DELIM_CAPTURE;
+
+/**
+ * Reflection class for a {@}var tag in a Docblock.
+ */
+final class Var_ extends TagWithType implements Factory\StaticMethod
+{
+    protected ?string $variableName = '';
+
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
+    {
+        Assert::string($variableName);
+
+        $this->name         = 'var';
+        $this->variableName = $variableName;
+        $this->type         = $type;
+        $this->description  = $description;
+    }
+
+    /**
+     * @deprecated Create using static factory is deprecated,
+     *  this method should not be called directly by library consumers
+     */
+    public static function create(
+        string $body,
+        ?TypeResolver $typeResolver = null,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): self {
+        Deprecation::triggerIfCalledFromOutside(
+            'phpdocumentor/reflection-docblock',
+            'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
+            'Create using static factory is deprecated, this method should not be called directly
+             by library consumers',
+        );
+        Assert::stringNotEmpty($body);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
+
+        [$firstPart, $body] = self::extractTypeFromBody($body);
+
+        $parts = Utils::pregSplit('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        $type         = null;
+        $variableName = '';
+
+        // if the first item that is encountered is not a variable; it is a type
+        if ($firstPart && $firstPart[0] !== '$') {
+            $type = $typeResolver->resolve($firstPart, $context);
+        } else {
+            // first part is not a type; we should prepend it to the parts array for further processing
+            array_unshift($parts, $firstPart);
+        }
+
+        // if the next item starts with a $ it must be the variable name
+        if (isset($parts[0]) && strpos($parts[0], '$') === 0) {
+            $variableName = array_shift($parts);
+            if ($type) {
+                array_shift($parts);
+            }
+
+            Assert::notNull($variableName);
+
+            $variableName = substr($variableName, 1);
+        }
+
+        $description = $descriptionFactory->create(implode('', $parts), $context);
+
+        return new static($variableName, $type, $description);
+    }
+
+    /**
+     * Returns the variable's name.
+     */
+    public function getVariableName(): ?string
+    {
+        return $this->variableName;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description !== null) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        if ($this->variableName !== null && $this->variableName !== '') {
+            $variableName = '$' . $this->variableName;
+        } else {
+            $variableName = '';
+        }
+
+        $type = (string) $this->type;
+
+        return $type
+            . ($variableName !== '' ? ($type !== '' ? ' ' : '') . $variableName : '')
+            . ($description !== '' ? ($type !== '' || $variableName !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php
new file mode 100644
index 000000000..8ea96ed38
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Version.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock\Tags;
+
+use phpDocumentor\Reflection\DocBlock\Description;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+
+use function preg_match;
+
+/**
+ * Reflection class for a {@}version tag in a Docblock.
+ */
+final class Version extends BaseTag implements Factory\StaticMethod
+{
+    protected string $name = 'version';
+
+    /**
+     * PCRE regular expression matching a version vector.
+     * Assumes the "x" modifier.
+     */
+    public const REGEX_VECTOR = '(?:
+        # Normal release vectors.
+        \d\S*
+        |
+        # VCS version vectors. Per PHPCS, they are expected to
+        # follow the form of the VCS name, followed by ":", followed
+        # by the version vector itself.
+        # By convention, popular VCSes like CVS, SVN and GIT use "$"
+        # around the actual version vector.
+        [^\s\:]+\:\s*\$[^\$]+\$
+    )';
+
+    /** @var string|null The version vector. */
+    private ?string $version = null;
+
+    public function __construct(?string $version = null, ?Description $description = null)
+    {
+        Assert::nullOrStringNotEmpty($version);
+
+        $this->version     = $version;
+        $this->description = $description;
+    }
+
+    public static function create(
+        ?string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ): ?self {
+        if ($body === null || $body === '') {
+            return new static();
+        }
+
+        $matches = [];
+        if (!preg_match('/^(' . self::REGEX_VECTOR . ')\s*(.+)?$/sux', $body, $matches)) {
+            return null;
+        }
+
+        $description = null;
+        if ($descriptionFactory !== null) {
+            $description = $descriptionFactory->create($matches[2] ?? '', $context);
+        }
+
+        return new static(
+            $matches[1],
+            $description
+        );
+    }
+
+    /**
+     * Gets the version section of the tag.
+     */
+    public function getVersion(): ?string
+    {
+        return $this->version;
+    }
+
+    /**
+     * Returns a string representation for this tag.
+     */
+    public function __toString(): string
+    {
+        if ($this->description) {
+            $description = $this->description->render();
+        } else {
+            $description = '';
+        }
+
+        $version = (string) $this->version;
+
+        return $version . ($description !== '' ? ($version !== '' ? ' ' : '') . $description : '');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlockFactory.php b/phpdocumentor/reflection-docblock/src/DocBlockFactory.php
new file mode 100644
index 000000000..ca33fbbb6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlockFactory.php
@@ -0,0 +1,328 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use InvalidArgumentException;
+use LogicException;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\TagFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\AbstractPHPStanFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\ExtendsFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\ImplementsFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\MethodFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\ParamFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyReadFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\PropertyWriteFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\ReturnFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateExtendsFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\TemplateImplementsFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\VarFactory;
+use Webmozart\Assert\Assert;
+
+use function array_shift;
+use function count;
+use function explode;
+use function is_object;
+use function method_exists;
+use function preg_match;
+use function preg_replace;
+use function str_replace;
+use function strpos;
+use function substr;
+use function trim;
+
+final class DocBlockFactory implements DocBlockFactoryInterface
+{
+    private DocBlock\DescriptionFactory $descriptionFactory;
+
+    private TagFactory $tagFactory;
+
+    /**
+     * Initializes this factory with the required subcontractors.
+     */
+    public function __construct(DescriptionFactory $descriptionFactory, TagFactory $tagFactory)
+    {
+        $this->descriptionFactory = $descriptionFactory;
+        $this->tagFactory = $tagFactory;
+    }
+
+    /**
+     * Factory method for easy instantiation.
+     *
+     * @param array<string, class-string<Tag>|Factory> $additionalTags
+     */
+    public static function createInstance(array $additionalTags = []): DocBlockFactoryInterface
+    {
+        $fqsenResolver = new FqsenResolver();
+        $tagFactory = new StandardTagFactory($fqsenResolver);
+        $descriptionFactory = new DescriptionFactory($tagFactory);
+        $typeResolver = new TypeResolver($fqsenResolver);
+
+        $phpstanTagFactory = new AbstractPHPStanFactory(
+            new ParamFactory($typeResolver, $descriptionFactory),
+            new VarFactory($typeResolver, $descriptionFactory),
+            new ReturnFactory($typeResolver, $descriptionFactory),
+            new PropertyFactory($typeResolver, $descriptionFactory),
+            new PropertyReadFactory($typeResolver, $descriptionFactory),
+            new PropertyWriteFactory($typeResolver, $descriptionFactory),
+            new MethodFactory($typeResolver, $descriptionFactory),
+            new ImplementsFactory($typeResolver, $descriptionFactory),
+            new ExtendsFactory($typeResolver, $descriptionFactory),
+            new TemplateFactory($typeResolver, $descriptionFactory),
+            new TemplateImplementsFactory($typeResolver, $descriptionFactory),
+            new TemplateExtendsFactory($typeResolver, $descriptionFactory),
+        );
+
+        $tagFactory->addService($descriptionFactory);
+        $tagFactory->addService($typeResolver);
+        $tagFactory->registerTagHandler('param', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('var', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('return', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('property', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('property-read', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('property-write', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('method', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('extends', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('implements', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('template', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('template-extends', $phpstanTagFactory);
+        $tagFactory->registerTagHandler('template-implements', $phpstanTagFactory);
+
+        $docBlockFactory = new self($descriptionFactory, $tagFactory);
+        foreach ($additionalTags as $tagName => $tagHandler) {
+            $docBlockFactory->registerTagHandler($tagName, $tagHandler);
+        }
+
+        return $docBlockFactory;
+    }
+
+    /**
+     * @param object|string $docblock A string containing the DocBlock to parse or an object supporting the
+     *                                getDocComment method (such as a ReflectionClass object).
+     */
+    public function create($docblock, ?Types\Context $context = null, ?Location $location = null): DocBlock
+    {
+        if (is_object($docblock)) {
+            if (!method_exists($docblock, 'getDocComment')) {
+                $exceptionMessage = 'Invalid object passed; the given object must support the getDocComment method';
+
+                throw new InvalidArgumentException($exceptionMessage);
+            }
+
+            $docblock = $docblock->getDocComment();
+            Assert::string($docblock);
+        }
+
+        Assert::stringNotEmpty($docblock);
+
+        if ($context === null) {
+            $context = new Types\Context('');
+        }
+
+        $parts = $this->splitDocBlock($this->stripDocComment($docblock));
+
+        [$templateMarker, $summary, $description, $tags] = $parts;
+
+        return new DocBlock(
+            $summary,
+            $description ? $this->descriptionFactory->create($description, $context) : null,
+            $this->parseTagBlock($tags, $context),
+            $context,
+            $location,
+            $templateMarker === '#@+',
+            $templateMarker === '#@-'
+        );
+    }
+
+    /**
+     * @param class-string<Tag>|Factory $handler
+     */
+    public function registerTagHandler(string $tagName, $handler): void
+    {
+        $this->tagFactory->registerTagHandler($tagName, $handler);
+    }
+
+    /**
+     * Strips the asterisks from the DocBlock comment.
+     *
+     * @param string $comment String containing the comment text.
+     */
+    private function stripDocComment(string $comment): string
+    {
+        $comment = preg_replace('#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]?(.*)?#u', '$1', $comment);
+        Assert::string($comment);
+        $comment = trim($comment);
+
+        // reg ex above is not able to remove */ from a single line docblock
+        if (substr($comment, -2) === '*/') {
+            $comment = trim(substr($comment, 0, -2));
+        }
+
+        return str_replace(["\r\n", "\r"], "\n", $comment);
+    }
+
+    // phpcs:disable
+
+    /**
+     * Splits the DocBlock into a template marker, summary, description and block of tags.
+     *
+     * @param string $comment Comment to split into the sub-parts.
+     *
+     * @return string[] containing the template marker (if any), summary, description and a string containing the tags.
+     *
+     * @author Mike van Riel <me@mikevanriel.com> for extending the regex with template marker support.
+     *
+     * @author Richard van Velzen (@_richardJ) Special thanks to Richard for the regex responsible for the split.
+     */
+    private function splitDocBlock(string $comment): array
+    {
+        // phpcs:enable
+        // Performance improvement cheat: if the first character is an @ then only tags are in this DocBlock. This
+        // method does not split tags so we return this verbatim as the fourth result (tags). This saves us the
+        // performance impact of running a regular expression
+        if (strpos($comment, '@') === 0) {
+            return ['', '', '', $comment];
+        }
+
+        // clears all extra horizontal whitespace from the line endings to prevent parsing issues
+        $comment = preg_replace('/\h*$/Sum', '', $comment);
+        Assert::string($comment);
+        /*
+         * Splits the docblock into a template marker, summary, description and tags section.
+         *
+         * - The template marker is empty, #@+ or #@- if the DocBlock starts with either of those (a newline may
+         *   occur after it and will be stripped).
+         * - The short description is started from the first character until a dot is encountered followed by a
+         *   newline OR two consecutive newlines (horizontal whitespace is taken into account to consider spacing
+         *   errors). This is optional.
+         * - The long description, any character until a new line is encountered followed by an @ and word
+         *   characters (a tag). This is optional.
+         * - Tags; the remaining characters
+         *
+         * Big thanks to RichardJ for contributing this Regular Expression
+         */
+        preg_match(
+            '/
+            \A
+            # 1. Extract the template marker
+            (?:(\#\@\+|\#\@\-)\n?)?
+
+            # 2. Extract the summary
+            (?:
+              (?! @\pL ) # The summary may not start with an @
+              (
+                [^\n.]+
+                (?:
+                  (?! \. \n | \n{2} )     # End summary upon a dot followed by newline or two newlines
+                  [\n.]* (?! [ \t]* @\pL ) # End summary when an @ is found as first character on a new line
+                  [^\n.]+                 # Include anything else
+                )*
+                \.?
+              )?
+            )
+
+            # 3. Extract the description
+            (?:
+              \s*        # Some form of whitespace _must_ precede a description because a summary must be there
+              (?! @\pL ) # The description may not start with an @
+              (
+                [^\n]+
+                (?: \n+
+                  (?! [ \t]* @\pL ) # End description when an @ is found as first character on a new line
+                  [^\n]+            # Include anything else
+                )*
+              )
+            )?
+
+            # 4. Extract the tags (anything that follows)
+            (\s+ [\s\S]*)? # everything that follows
+            /ux',
+            $comment,
+            $matches
+        );
+        array_shift($matches);
+
+        while (count($matches) < 4) {
+            $matches[] = '';
+        }
+
+        return $matches;
+    }
+
+    /**
+     * Creates the tag objects.
+     *
+     * @param string $tags Tag block to parse.
+     * @param Types\Context $context Context of the parsed Tag
+     *
+     * @return DocBlock\Tag[]
+     */
+    private function parseTagBlock(string $tags, Types\Context $context): array
+    {
+        $tags = $this->filterTagBlock($tags);
+        if ($tags === null) {
+            return [];
+        }
+
+        $result = [];
+        $lines = $this->splitTagBlockIntoTagLines($tags);
+        foreach ($lines as $key => $tagLine) {
+            $result[$key] = $this->tagFactory->create(trim($tagLine), $context);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function splitTagBlockIntoTagLines(string $tags): array
+    {
+        $result = [];
+        foreach (explode("\n", $tags) as $tagLine) {
+            if ($tagLine !== '' && strpos($tagLine, '@') === 0) {
+                $result[] = $tagLine;
+            } else {
+                $result[count($result) - 1] .= "\n" . $tagLine;
+            }
+        }
+
+        return $result;
+    }
+
+    private function filterTagBlock(string $tags): ?string
+    {
+        $tags = trim($tags);
+        if (!$tags) {
+            return null;
+        }
+
+        if ($tags[0] !== '@') {
+            // @codeCoverageIgnoreStart
+            // Can't simulate this; this only happens if there is an error with the parsing of the DocBlock that
+            // we didn't foresee.
+
+            throw new LogicException('A tag block started with text instead of an at-sign(@): ' . $tags);
+
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $tags;
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/DocBlockFactoryInterface.php b/phpdocumentor/reflection-docblock/src/DocBlockFactoryInterface.php
new file mode 100644
index 000000000..cacc382e6
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/DocBlockFactoryInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+
+// phpcs:ignore SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix
+interface DocBlockFactoryInterface
+{
+    /**
+     * Factory method for easy instantiation.
+     *
+     * @param array<string, class-string<Tag>> $additionalTags
+     */
+    public static function createInstance(array $additionalTags = []): self;
+
+    /**
+     * @param string|object $docblock
+     */
+    public function create($docblock, ?Types\Context $context = null, ?Location $location = null): DocBlock;
+}
diff --git a/phpdocumentor/reflection-docblock/src/Exception/PcreException.php b/phpdocumentor/reflection-docblock/src/Exception/PcreException.php
new file mode 100644
index 000000000..b8b6da8cf
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/Exception/PcreException.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Exception;
+
+use InvalidArgumentException;
+
+use const PREG_BACKTRACK_LIMIT_ERROR;
+use const PREG_BAD_UTF8_ERROR;
+use const PREG_BAD_UTF8_OFFSET_ERROR;
+use const PREG_INTERNAL_ERROR;
+use const PREG_JIT_STACKLIMIT_ERROR;
+use const PREG_NO_ERROR;
+use const PREG_RECURSION_LIMIT_ERROR;
+
+final class PcreException extends InvalidArgumentException
+{
+    public static function createFromPhpError(int $errorCode): self
+    {
+        switch ($errorCode) {
+            case PREG_BACKTRACK_LIMIT_ERROR:
+                return new self('Backtrack limit error');
+
+            case PREG_RECURSION_LIMIT_ERROR:
+                return new self('Recursion limit error');
+
+            case PREG_BAD_UTF8_ERROR:
+                return new self('Bad UTF8 error');
+
+            case PREG_BAD_UTF8_OFFSET_ERROR:
+                return new self('Bad UTF8 offset error');
+
+            case PREG_JIT_STACKLIMIT_ERROR:
+                return new self('Jit stacklimit error');
+
+            case PREG_NO_ERROR:
+            case PREG_INTERNAL_ERROR:
+            default:
+        }
+
+        return new self('Unknown Pcre error');
+    }
+}
diff --git a/phpdocumentor/reflection-docblock/src/Utils.php b/phpdocumentor/reflection-docblock/src/Utils.php
new file mode 100644
index 000000000..fe311c9e0
--- /dev/null
+++ b/phpdocumentor/reflection-docblock/src/Utils.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use phpDocumentor\Reflection\Exception\PcreException;
+use Webmozart\Assert\Assert;
+
+use function preg_last_error;
+use function preg_split as php_preg_split;
+
+abstract class Utils
+{
+    /**
+     * Wrapper function for phps preg_split
+     *
+     * This function is inspired by {@link https://github.com/thecodingmachine/safe/blob/master/generated/pcre.php}. But
+     * since this library is all about performance we decided to strip everything we don't need. Reducing the amount
+     * of files that have to be loaded, etc.
+     *
+     * @param string $pattern The pattern to search for, as a string.
+     * @param string $subject The input string.
+     * @param int $limit If specified, then only substrings up to limit are returned with the
+     *      rest of the string being placed in the last substring. A limit of -1 or 0 means "no limit".
+     * @param int $flags flags can be any combination of the following flags (combined with the | bitwise operator):
+     * *PREG_SPLIT_NO_EMPTY*
+     *      If this flag is set, only non-empty pieces will be returned by preg_split().
+     * *PREG_SPLIT_DELIM_CAPTURE*
+     *      If this flag is set, parenthesized expression in the delimiter pattern will be captured
+     *      and returned as well.
+     * *PREG_SPLIT_OFFSET_CAPTURE*
+     *      If this flag is set, for every occurring match the appendant string offset will also be returned.
+     *      Note that this changes the return value in an array where every element is an array consisting of the
+     *      matched string at offset 0 and its string offset into subject at offset 1.
+     *
+     * @return string[] Returns an array containing substrings of subject
+     *                                                      split along boundaries matched by pattern
+     *
+     * @throws PcreException
+     */
+    public static function pregSplit(string $pattern, string $subject, int $limit = -1, int $flags = 0): array
+    {
+        $parts = php_preg_split($pattern, $subject, $limit, $flags);
+        if ($parts === false) {
+            throw PcreException::createFromPhpError(preg_last_error());
+        }
+
+        Assert::allString($parts);
+
+        return $parts;
+    }
+}
diff --git a/phpdocumentor/type-resolver/.phpdoc/template/base.html.twig b/phpdocumentor/type-resolver/.phpdoc/template/base.html.twig
new file mode 100644
index 000000000..194b21921
--- /dev/null
+++ b/phpdocumentor/type-resolver/.phpdoc/template/base.html.twig
@@ -0,0 +1,15 @@
+{% extends 'layout.html.twig' %}
+
+{% set topMenu = {
+    "menu": [
+        { "name": "About", "url": "https://phpdoc.org/"},
+        { "name": "Components", "url": "https://phpdoc.org/components.html"},
+        { "name": "Documentation", "url": "https://docs.phpdoc.org/"},
+    ],
+    "social": [
+        { "iconClass": "fab fa-mastodon", "url": "https://phpc.social/@phpdoc"},
+        { "iconClass": "fab fa-github", "url": "https://github.com/phpdocumentor/typeresolver"},
+        { "iconClass": "fas fa-envelope-open-text", "url": "https://github.com/orgs/phpDocumentor/discussions"}
+    ]
+}
+%}
diff --git a/phpdocumentor/type-resolver/LICENSE b/phpdocumentor/type-resolver/LICENSE
new file mode 100644
index 000000000..792e4040f
--- /dev/null
+++ b/phpdocumentor/type-resolver/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2010 Mike van Riel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/phpdocumentor/type-resolver/docs/getting-started.rst b/phpdocumentor/type-resolver/docs/getting-started.rst
new file mode 100644
index 000000000..1c8ea676a
--- /dev/null
+++ b/phpdocumentor/type-resolver/docs/getting-started.rst
@@ -0,0 +1,32 @@
+===============
+Getting started
+===============
+
+On this page you will find a brief introduction on how to use the TypeResolver in your project.
+
+Installation
+============
+
+The TypeResolver is available on Packagist and can be installed using Composer:
+
+.. code:: bash
+    composer require phpdocumentor/type-resolver
+
+
+General usage
+===========
+
+After you installed the TypeResolver you can use it in your project. This can be done by creating a new instance
+of the :php:class:`\phpDocumentor\Reflection\TypeResolver` class and calling
+:php:method:`\phpDocumentor\Reflection\TypeResolver::resolve()` with the type you want to resolve.
+
+.. code:: php
+    $typeResolver = new \phpDocumentor\Reflection\TypeResolver();
+    $type = $typeResolver->resolve('string');
+    echo get_class($type); // phpDocumentor\Reflection\Types\String_
+
+The real power of this resolver is in its capability to expand partial class names into fully qualified class names;
+but in order to do that we need an additional :php:class:`\phpDocumentor\Reflection\Types\Context` class that
+will inform the resolver in which namespace the given expression occurs and which namespace aliases (or imports) apply.
+
+Read more about the Context class in the next section.
diff --git a/phpdocumentor/type-resolver/docs/index.rst b/phpdocumentor/type-resolver/docs/index.rst
new file mode 100644
index 000000000..0ff9a8b25
--- /dev/null
+++ b/phpdocumentor/type-resolver/docs/index.rst
@@ -0,0 +1,17 @@
+=============
+Type resolver
+=============
+
+This project part of the phpDocumentor project. It is capable of creating an object structure of the type
+specifications found in the PHPDoc blocks of a project. This can be useful for static analysis of a project
+or other behavior that requires knowledge of the types used in a project like automatically build forms.
+
+This project aims to cover all types that are available in PHPDoc and PHP itself. And is open for extension by
+third party developers.
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   index
+   getting-started
diff --git a/phpdocumentor/type-resolver/phpdoc.dist.xml b/phpdocumentor/type-resolver/phpdoc.dist.xml
new file mode 100644
index 000000000..6c9899114
--- /dev/null
+++ b/phpdocumentor/type-resolver/phpdoc.dist.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdocumentor
+        configVersion="3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://www.phpdoc.org"
+        xsi:noNamespaceSchemaLocation="data/xsd/phpdoc.xsd"
+>
+    <title>Type Resolver</title>
+    <paths>
+        <output>build/docs</output>
+    </paths>
+    <version number="0.2.0">
+        <folder>latest</folder>
+        <api>
+            <source dsn="./">
+                <path>src/</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>tests/**/*</path>
+                <path>build/**/*</path>
+                <path>var/**/*</path>
+                <path>vendor/**/*</path>
+            </ignore>
+            <extensions>
+                <extension>php</extension>
+            </extensions>
+            <ignore-tags>
+                <ignore-tag>template</ignore-tag>
+                <ignore-tag>template-extends</ignore-tag>
+                <ignore-tag>template-implements</ignore-tag>
+                <ignore-tag>extends</ignore-tag>
+                <ignore-tag>implements</ignore-tag>
+            </ignore-tags>
+            <default-package-name>phpDocumentor</default-package-name>
+        </api>
+        <guide>
+            <source dsn=".">
+                <path>docs</path>
+            </source>
+            <output>guides</output>
+        </guide>
+    </version>
+    <setting name="guides.enabled" value="true"/>
+    <template name="default" />
+</phpdocumentor>
diff --git a/phpdocumentor/type-resolver/src/FqsenResolver.php b/phpdocumentor/type-resolver/src/FqsenResolver.php
new file mode 100644
index 000000000..068fa2085
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/FqsenResolver.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\Types\Context;
+
+use function explode;
+use function implode;
+use function strpos;
+
+/**
+ * Resolver for Fqsen using Context information
+ *
+ * @psalm-immutable
+ */
+class FqsenResolver
+{
+    /** @var string Definition of the NAMESPACE operator in PHP */
+    private const OPERATOR_NAMESPACE = '\\';
+
+    public function resolve(string $fqsen, ?Context $context = null): Fqsen
+    {
+        if ($context === null) {
+            $context = new Context('');
+        }
+
+        if ($this->isFqsen($fqsen)) {
+            return new Fqsen($fqsen);
+        }
+
+        return $this->resolvePartialStructuralElementName($fqsen, $context);
+    }
+
+    /**
+     * Tests whether the given type is a Fully Qualified Structural Element Name.
+     */
+    private function isFqsen(string $type): bool
+    {
+        return strpos($type, self::OPERATOR_NAMESPACE) === 0;
+    }
+
+    /**
+     * Resolves a partial Structural Element Name (i.e. `Reflection\DocBlock`) to its FQSEN representation
+     * (i.e. `\phpDocumentor\Reflection\DocBlock`) based on the Namespace and aliases mentioned in the Context.
+     *
+     * @throws InvalidArgumentException When type is not a valid FQSEN.
+     */
+    private function resolvePartialStructuralElementName(string $type, Context $context): Fqsen
+    {
+        $typeParts = explode(self::OPERATOR_NAMESPACE, $type, 2);
+
+        $namespaceAliases = $context->getNamespaceAliases();
+
+        // if the first segment is not an alias; prepend namespace name and return
+        if (!isset($namespaceAliases[$typeParts[0]])) {
+            $namespace = $context->getNamespace();
+            if ($namespace !== '') {
+                $namespace .= self::OPERATOR_NAMESPACE;
+            }
+
+            return new Fqsen(self::OPERATOR_NAMESPACE . $namespace . $type);
+        }
+
+        $typeParts[0] = $namespaceAliases[$typeParts[0]];
+
+        return new Fqsen(self::OPERATOR_NAMESPACE . implode(self::OPERATOR_NAMESPACE, $typeParts));
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoType.php b/phpdocumentor/type-resolver/src/PseudoType.php
new file mode 100644
index 000000000..dd91ed798
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoType.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+interface PseudoType extends Type
+{
+    public function underlyingType(): Type;
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShape.php b/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShape.php
new file mode 100644
index 000000000..e0d0c7366
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShape.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\ArrayKey;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+use function implode;
+
+/** @psalm-immutable */
+class ArrayShape implements PseudoType
+{
+    /** @var ArrayShapeItem[] */
+    private $items;
+
+    public function __construct(ArrayShapeItem ...$items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @return ArrayShapeItem[]
+     */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Array_(new Mixed_(), new ArrayKey());
+    }
+
+    public function __toString(): string
+    {
+        return 'array{' . implode(', ', $this->items) . '}';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php b/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php
new file mode 100644
index 000000000..81187d905
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ArrayShapeItem.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+class ArrayShapeItem extends ShapeItem
+{
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/CallableString.php b/phpdocumentor/type-resolver/src/PseudoTypes/CallableString.php
new file mode 100644
index 000000000..b69345617
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/CallableString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class CallableString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'callable-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/Conditional.php b/phpdocumentor/type-resolver/src/PseudoTypes/Conditional.php
new file mode 100644
index 000000000..dbccd89d9
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/Conditional.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+use function sprintf;
+
+/**
+ * Value Object representing the conditional type.
+ *
+ * @psalm-immutable
+ */
+final class Conditional extends Mixed_ implements PseudoType
+{
+    /** @var bool */
+    private $negated;
+    /** @var Type */
+    private $subjectType;
+    /** @var Type */
+    private $targetType;
+    /** @var Type */
+    private $if;
+    /** @var Type */
+    private $else;
+
+    public function __construct(bool $negated, Type $subjectType, Type $targetType, Type $if, Type $else)
+    {
+        $this->negated = $negated;
+        $this->subjectType = $subjectType;
+        $this->targetType = $targetType;
+        $this->if = $if;
+        $this->else = $else;
+    }
+
+    public function isNegated(): bool
+    {
+        return $this->negated;
+    }
+
+    public function getSubjectType(): Type
+    {
+        return $this->subjectType;
+    }
+
+    public function getTargetType(): Type
+    {
+        return $this->targetType;
+    }
+
+    public function getIf(): Type
+    {
+        return $this->if;
+    }
+
+    public function getElse(): Type
+    {
+        return $this->else;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Mixed_();
+    }
+
+    public function __toString(): string
+    {
+        return sprintf(
+            '(%s %s %s ? %s : %s)',
+            (string) $this->subjectType,
+            $this->negated ? 'is not' : 'is',
+            (string) $this->targetType,
+            (string) $this->if,
+            (string) $this->else
+        );
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ConditionalForParameter.php b/phpdocumentor/type-resolver/src/PseudoTypes/ConditionalForParameter.php
new file mode 100644
index 000000000..a9fccc5a0
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ConditionalForParameter.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+use function sprintf;
+
+/**
+ * Value Object representing the conditional type for parameter.
+ *
+ * @psalm-immutable
+ */
+final class ConditionalForParameter extends Mixed_ implements PseudoType
+{
+    /** @var bool */
+    private $negated;
+    /** @var string */
+    private $parameterName;
+    /** @var Type */
+    private $targetType;
+    /** @var Type */
+    private $if;
+    /** @var Type */
+    private $else;
+
+    public function __construct(bool $negated, string $parameterName, Type $targetType, Type $if, Type $else)
+    {
+        $this->negated = $negated;
+        $this->parameterName = $parameterName;
+        $this->targetType = $targetType;
+        $this->if = $if;
+        $this->else = $else;
+    }
+
+    public function isNegated(): bool
+    {
+        return $this->negated;
+    }
+
+    public function getParameterName(): string
+    {
+        return $this->parameterName;
+    }
+
+    public function getTargetType(): Type
+    {
+        return $this->targetType;
+    }
+
+    public function getIf(): Type
+    {
+        return $this->if;
+    }
+
+    public function getElse(): Type
+    {
+        return $this->else;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Mixed_();
+    }
+
+    public function __toString(): string
+    {
+        return sprintf(
+            '(%s %s %s ? %s : %s)',
+            '$' . $this->parameterName,
+            $this->negated ? 'is not' : 'is',
+            (string) $this->targetType,
+            (string) $this->if,
+            (string) $this->else
+        );
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ConstExpression.php b/phpdocumentor/type-resolver/src/PseudoTypes/ConstExpression.php
new file mode 100644
index 000000000..73349339f
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ConstExpression.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+use function sprintf;
+
+/** @psalm-immutable */
+final class ConstExpression implements PseudoType
+{
+    /** @var Type */
+    private $owner;
+    /** @var string */
+    private $expression;
+
+    public function __construct(Type $owner, string $expression)
+    {
+        $this->owner = $owner;
+        $this->expression = $expression;
+    }
+
+    public function getOwner(): Type
+    {
+        return $this->owner;
+    }
+
+    public function getExpression(): string
+    {
+        return $this->expression;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Mixed_();
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('%s::%s', (string) $this->owner, $this->expression);
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/False_.php b/phpdocumentor/type-resolver/src/PseudoTypes/False_.php
new file mode 100644
index 000000000..871c17209
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/False_.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link https://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Boolean;
+
+use function class_alias;
+
+/**
+ * Value Object representing the PseudoType 'False', which is a Boolean type.
+ *
+ * @psalm-immutable
+ */
+final class False_ extends Boolean implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Boolean();
+    }
+
+    public function __toString(): string
+    {
+        return 'false';
+    }
+}
+
+class_alias(False_::class, 'phpDocumentor\Reflection\Types\False_', false);
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/FloatValue.php b/phpdocumentor/type-resolver/src/PseudoTypes/FloatValue.php
new file mode 100644
index 000000000..0dbbce000
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/FloatValue.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Float_;
+
+/** @psalm-immutable */
+class FloatValue implements PseudoType
+{
+    /** @var float */
+    private $value;
+
+    public function __construct(float $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): float
+    {
+        return $this->value;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Float_();
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->value;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php b/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php
new file mode 100644
index 000000000..aa4d8db56
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/HtmlEscapedString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class HtmlEscapedString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'html-escaped-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/IntMask.php b/phpdocumentor/type-resolver/src/PseudoTypes/IntMask.php
new file mode 100644
index 000000000..a4b50b97f
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/IntMask.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+use function implode;
+
+/**
+ * Value Object representing the `int-mask` type.
+ *
+ * @psalm-immutable
+ */
+final class IntMask extends Integer implements PseudoType
+{
+    /** @var Type[] */
+    private $types;
+
+    public function __construct(Type ...$types)
+    {
+        $this->types = $types;
+    }
+
+    /**
+     * @return Type[]
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    public function __toString(): string
+    {
+        return 'int-mask<' . implode(', ', $this->types) . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/IntMaskOf.php b/phpdocumentor/type-resolver/src/PseudoTypes/IntMaskOf.php
new file mode 100644
index 000000000..80340e659
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/IntMaskOf.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+/**
+ * Value Object representing the `int-mask-of` type.
+ *
+ * @psalm-immutable
+ */
+final class IntMaskOf extends Integer implements PseudoType
+{
+    /** @var Type */
+    private $type;
+
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    public function __toString(): string
+    {
+        return 'int-mask-of<' . $this->type . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php b/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php
new file mode 100644
index 000000000..c5a3bc535
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/IntegerRange.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+/**
+ * Value Object representing the type 'int'.
+ *
+ * @psalm-immutable
+ */
+final class IntegerRange extends Integer implements PseudoType
+{
+    /** @var string */
+    private $minValue;
+
+    /** @var string */
+    private $maxValue;
+
+    public function __construct(string $minValue, string $maxValue)
+    {
+        $this->minValue = $minValue;
+        $this->maxValue = $maxValue;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    public function getMinValue(): string
+    {
+        return $this->minValue;
+    }
+
+    public function getMaxValue(): string
+    {
+        return $this->maxValue;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'int<' . $this->minValue . ', ' . $this->maxValue . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php b/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php
new file mode 100644
index 000000000..51f0d34af
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/IntegerValue.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+/** @psalm-immutable */
+final class IntegerValue implements PseudoType
+{
+    /** @var int */
+    private $value;
+
+    public function __construct(int $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): int
+    {
+        return $this->value;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->value;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/KeyOf.php b/phpdocumentor/type-resolver/src/PseudoTypes/KeyOf.php
new file mode 100644
index 000000000..6cf5e0a7e
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/KeyOf.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\ArrayKey;
+
+/**
+ * Value Object representing the `key-of` type.
+ *
+ * @psalm-immutable
+ */
+final class KeyOf extends ArrayKey implements PseudoType
+{
+    /** @var Type */
+    private $type;
+
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new ArrayKey();
+    }
+
+    public function __toString(): string
+    {
+        return 'key-of<' . $this->type . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php b/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php
new file mode 100644
index 000000000..deef3abc5
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ListShape.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use function implode;
+
+/** @psalm-immutable */
+final class ListShape extends ArrayShape
+{
+    public function __toString(): string
+    {
+        return 'list{' . implode(', ', $this->getItems()) . '}';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php b/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php
new file mode 100644
index 000000000..d3eb7d753
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ListShapeItem.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+final class ListShapeItem extends ArrayShapeItem
+{
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/List_.php b/phpdocumentor/type-resolver/src/PseudoTypes/List_.php
new file mode 100644
index 000000000..f9f0c6b5c
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/List_.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+/**
+ * Value Object representing the type 'list'.
+ *
+ * @psalm-immutable
+ */
+final class List_ extends Array_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Array_();
+    }
+
+    public function __construct(?Type $valueType = null)
+    {
+        parent::__construct($valueType, new Integer());
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->valueType instanceof Mixed_) {
+            return 'list';
+        }
+
+        return 'list<' . $this->valueType . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php b/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php
new file mode 100644
index 000000000..690f782b7
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/LiteralString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class LiteralString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'literal-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php b/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php
new file mode 100644
index 000000000..6325492ad
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/LowercaseString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class LowercaseString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'lowercase-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php b/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php
new file mode 100644
index 000000000..c51d3feab
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NegativeInteger.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+/**
+ * Value Object representing the type 'int'.
+ *
+ * @psalm-immutable
+ */
+final class NegativeInteger extends Integer implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'negative-int';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php
new file mode 100644
index 000000000..f0cc4a67d
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyArray.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+/**
+ * Value Object representing the type 'non-empty-array'.
+ *
+ * @psalm-immutable
+ */
+final class NonEmptyArray extends Array_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Array_($this->valueType, $this->keyType);
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->keyType) {
+            return 'non-empty-array<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
+        if ($this->valueType instanceof Mixed_) {
+            return 'non-empty-array';
+        }
+
+        return 'non-empty-array<' . $this->valueType . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php
new file mode 100644
index 000000000..384b6296d
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyList.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+/**
+ * Value Object representing the type 'non-empty-list'.
+ *
+ * @psalm-immutable
+ */
+final class NonEmptyList extends Array_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Array_($this->valueType, $this->keyType);
+    }
+
+    public function __construct(?Type $valueType = null)
+    {
+        parent::__construct($valueType, new Integer());
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->valueType instanceof Mixed_) {
+            return 'non-empty-list';
+        }
+
+        return 'non-empty-list<' . $this->valueType . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php
new file mode 100644
index 000000000..86400165a
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyLowercaseString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class NonEmptyLowercaseString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'non-empty-lowercase-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php
new file mode 100644
index 000000000..d72d127cf
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NonEmptyString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class NonEmptyString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'non-empty-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php b/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php
new file mode 100644
index 000000000..b62aa45a5
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/NumericString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class NumericString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'numeric-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php b/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php
new file mode 100644
index 000000000..46620cd21
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/Numeric_.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\AggregatedType;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\Integer;
+
+/**
+ * Value Object representing the 'numeric' pseudo-type, which is either a numeric-string, integer or float.
+ *
+ * @psalm-immutable
+ */
+final class Numeric_ extends AggregatedType implements PseudoType
+{
+    public function __construct()
+    {
+        AggregatedType::__construct([new NumericString(), new Integer(), new Float_()], '|');
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Compound([new NumericString(), new Integer(), new Float_()]);
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'numeric';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php b/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php
new file mode 100644
index 000000000..0acd93144
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShape.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Object_;
+
+use function implode;
+
+/** @psalm-immutable */
+final class ObjectShape implements PseudoType
+{
+    /** @var ObjectShapeItem[] */
+    private $items;
+
+    public function __construct(ObjectShapeItem ...$items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @return ObjectShapeItem[]
+     */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Object_();
+    }
+
+    public function __toString(): string
+    {
+        return 'object{' . implode(', ', $this->items) . '}';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php b/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php
new file mode 100644
index 000000000..3aaecfdbf
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ObjectShapeItem.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+final class ObjectShapeItem extends ShapeItem
+{
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/OffsetAccess.php b/phpdocumentor/type-resolver/src/PseudoTypes/OffsetAccess.php
new file mode 100644
index 000000000..5d0d0b602
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/OffsetAccess.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Callable_;
+use phpDocumentor\Reflection\Types\Mixed_;
+use phpDocumentor\Reflection\Types\Nullable;
+
+/**
+ * Value Object representing the offset access type.
+ *
+ * @psalm-immutable
+ */
+final class OffsetAccess extends Mixed_ implements PseudoType
+{
+    /** @var Type */
+    private $type;
+    /** @var Type */
+    private $offset;
+
+    public function __construct(Type $type, Type $offset)
+    {
+        $this->type = $type;
+        $this->offset = $offset;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function getOffset(): Type
+    {
+        return $this->offset;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Mixed_();
+    }
+
+    public function __toString(): string
+    {
+        if (
+            $this->type instanceof Callable_
+            || $this->type instanceof ConstExpression
+            || $this->type instanceof Nullable
+        ) {
+            return '(' . $this->type . ')[' . $this->offset . ']';
+        }
+
+        return $this->type . '[' . $this->offset . ']';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php b/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php
new file mode 100644
index 000000000..c52184dc5
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/PositiveInteger.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Integer;
+
+/**
+ * Value Object representing the type 'int'.
+ *
+ * @psalm-immutable
+ */
+final class PositiveInteger extends Integer implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Integer();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'positive-int';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php b/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php
new file mode 100644
index 000000000..10a9a8983
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ShapeItem.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+use function sprintf;
+
+abstract class ShapeItem
+{
+    /** @var string|null */
+    private $key;
+    /** @var Type */
+    private $value;
+    /** @var bool */
+    private $optional;
+
+    public function __construct(?string $key, ?Type $value, bool $optional)
+    {
+        $this->key = $key;
+        $this->value = $value ?? new Mixed_();
+        $this->optional = $optional;
+    }
+
+    public function getKey(): ?string
+    {
+        return $this->key;
+    }
+
+    public function getValue(): Type
+    {
+        return $this->value;
+    }
+
+    public function isOptional(): bool
+    {
+        return $this->optional;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->key !== null && $this->key !== '') {
+            return sprintf(
+                '%s%s: %s',
+                $this->key,
+                $this->optional ? '?' : '',
+                (string) $this->value
+            );
+        }
+
+        return (string) $this->value;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php b/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php
new file mode 100644
index 000000000..98e104699
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/StringValue.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+use function sprintf;
+
+/** @psalm-immutable */
+class StringValue implements PseudoType
+{
+    /** @var string */
+    private $value;
+
+    public function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('"%s"', $this->value);
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php b/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php
new file mode 100644
index 000000000..ac217c25d
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/TraitString.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\String_;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class TraitString extends String_ implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'trait-string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/True_.php b/phpdocumentor/type-resolver/src/PseudoTypes/True_.php
new file mode 100644
index 000000000..c9ad1cb10
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/True_.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link https://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Boolean;
+
+use function class_alias;
+
+/**
+ * Value Object representing the PseudoType 'False', which is a Boolean type.
+ *
+ * @psalm-immutable
+ */
+final class True_ extends Boolean implements PseudoType
+{
+    public function underlyingType(): Type
+    {
+        return new Boolean();
+    }
+
+    public function __toString(): string
+    {
+        return 'true';
+    }
+}
+
+class_alias(True_::class, 'phpDocumentor\Reflection\Types\True_', false);
diff --git a/phpdocumentor/type-resolver/src/PseudoTypes/ValueOf.php b/phpdocumentor/type-resolver/src/PseudoTypes/ValueOf.php
new file mode 100644
index 000000000..608b63408
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/PseudoTypes/ValueOf.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ *
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Mixed_;
+
+/**
+ * Value Object representing the `value-of` type.
+ *
+ * @psalm-immutable
+ */
+final class ValueOf extends Mixed_ implements PseudoType
+{
+    /** @var Type */
+    private $type;
+
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Mixed_();
+    }
+
+    public function __toString(): string
+    {
+        return 'value-of<' . $this->type . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Type.php b/phpdocumentor/type-resolver/src/Type.php
new file mode 100644
index 000000000..c71d8b08b
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Type.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * @psalm-immutable
+ */
+interface Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string;
+}
diff --git a/phpdocumentor/type-resolver/src/TypeResolver.php b/phpdocumentor/type-resolver/src/TypeResolver.php
new file mode 100644
index 000000000..9e2ba2055
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/TypeResolver.php
@@ -0,0 +1,721 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+use Doctrine\Deprecations\Deprecation;
+use InvalidArgumentException;
+use phpDocumentor\Reflection\PseudoTypes\ArrayShape;
+use phpDocumentor\Reflection\PseudoTypes\ArrayShapeItem;
+use phpDocumentor\Reflection\PseudoTypes\CallableString;
+use phpDocumentor\Reflection\PseudoTypes\Conditional;
+use phpDocumentor\Reflection\PseudoTypes\ConditionalForParameter;
+use phpDocumentor\Reflection\PseudoTypes\ConstExpression;
+use phpDocumentor\Reflection\PseudoTypes\False_;
+use phpDocumentor\Reflection\PseudoTypes\FloatValue;
+use phpDocumentor\Reflection\PseudoTypes\HtmlEscapedString;
+use phpDocumentor\Reflection\PseudoTypes\IntegerRange;
+use phpDocumentor\Reflection\PseudoTypes\IntegerValue;
+use phpDocumentor\Reflection\PseudoTypes\IntMask;
+use phpDocumentor\Reflection\PseudoTypes\IntMaskOf;
+use phpDocumentor\Reflection\PseudoTypes\KeyOf;
+use phpDocumentor\Reflection\PseudoTypes\List_;
+use phpDocumentor\Reflection\PseudoTypes\ListShape;
+use phpDocumentor\Reflection\PseudoTypes\ListShapeItem;
+use phpDocumentor\Reflection\PseudoTypes\LiteralString;
+use phpDocumentor\Reflection\PseudoTypes\LowercaseString;
+use phpDocumentor\Reflection\PseudoTypes\NegativeInteger;
+use phpDocumentor\Reflection\PseudoTypes\NonEmptyArray;
+use phpDocumentor\Reflection\PseudoTypes\NonEmptyList;
+use phpDocumentor\Reflection\PseudoTypes\NonEmptyLowercaseString;
+use phpDocumentor\Reflection\PseudoTypes\NonEmptyString;
+use phpDocumentor\Reflection\PseudoTypes\Numeric_;
+use phpDocumentor\Reflection\PseudoTypes\NumericString;
+use phpDocumentor\Reflection\PseudoTypes\ObjectShape;
+use phpDocumentor\Reflection\PseudoTypes\ObjectShapeItem;
+use phpDocumentor\Reflection\PseudoTypes\OffsetAccess;
+use phpDocumentor\Reflection\PseudoTypes\PositiveInteger;
+use phpDocumentor\Reflection\PseudoTypes\StringValue;
+use phpDocumentor\Reflection\PseudoTypes\TraitString;
+use phpDocumentor\Reflection\PseudoTypes\True_;
+use phpDocumentor\Reflection\PseudoTypes\ValueOf;
+use phpDocumentor\Reflection\Types\AggregatedType;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\ArrayKey;
+use phpDocumentor\Reflection\Types\Boolean;
+use phpDocumentor\Reflection\Types\Callable_;
+use phpDocumentor\Reflection\Types\CallableParameter;
+use phpDocumentor\Reflection\Types\ClassString;
+use phpDocumentor\Reflection\Types\Collection;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\Expression;
+use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\InterfaceString;
+use phpDocumentor\Reflection\Types\Intersection;
+use phpDocumentor\Reflection\Types\Iterable_;
+use phpDocumentor\Reflection\Types\Mixed_;
+use phpDocumentor\Reflection\Types\Never_;
+use phpDocumentor\Reflection\Types\Null_;
+use phpDocumentor\Reflection\Types\Nullable;
+use phpDocumentor\Reflection\Types\Object_;
+use phpDocumentor\Reflection\Types\Parent_;
+use phpDocumentor\Reflection\Types\Resource_;
+use phpDocumentor\Reflection\Types\Scalar;
+use phpDocumentor\Reflection\Types\Self_;
+use phpDocumentor\Reflection\Types\Static_;
+use phpDocumentor\Reflection\Types\String_;
+use phpDocumentor\Reflection\Types\This;
+use phpDocumentor\Reflection\Types\Void_;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFloatNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeItemNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConditionalTypeForParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConditionalTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ObjectShapeItemNode;
+use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\OffsetAccessTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\ParserException;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use RuntimeException;
+
+use function array_filter;
+use function array_key_exists;
+use function array_map;
+use function array_reverse;
+use function class_exists;
+use function class_implements;
+use function get_class;
+use function in_array;
+use function sprintf;
+use function strpos;
+use function strtolower;
+use function substr;
+use function trim;
+
+final class TypeResolver
+{
+    /** @var string Definition of the NAMESPACE operator in PHP */
+    private const OPERATOR_NAMESPACE = '\\';
+
+    /**
+     * @var array<string, string> List of recognized keywords and unto which Value Object they map
+     * @psalm-var array<string, class-string<Type>>
+     */
+    private $keywords = [
+        'string' => String_::class,
+        'class-string' => ClassString::class,
+        'interface-string' => InterfaceString::class,
+        'html-escaped-string' => HtmlEscapedString::class,
+        'lowercase-string' => LowercaseString::class,
+        'non-empty-lowercase-string' => NonEmptyLowercaseString::class,
+        'non-empty-string' => NonEmptyString::class,
+        'numeric-string' => NumericString::class,
+        'numeric' => Numeric_::class,
+        'trait-string' => TraitString::class,
+        'int' => Integer::class,
+        'integer' => Integer::class,
+        'positive-int' => PositiveInteger::class,
+        'negative-int' => NegativeInteger::class,
+        'bool' => Boolean::class,
+        'boolean' => Boolean::class,
+        'real' => Float_::class,
+        'float' => Float_::class,
+        'double' => Float_::class,
+        'object' => Object_::class,
+        'mixed' => Mixed_::class,
+        'array' => Array_::class,
+        'array-key' => ArrayKey::class,
+        'non-empty-array' => NonEmptyArray::class,
+        'resource' => Resource_::class,
+        'void' => Void_::class,
+        'null' => Null_::class,
+        'scalar' => Scalar::class,
+        'callback' => Callable_::class,
+        'callable' => Callable_::class,
+        'callable-string' => CallableString::class,
+        'false' => False_::class,
+        'true' => True_::class,
+        'literal-string' => LiteralString::class,
+        'self' => Self_::class,
+        '$this' => This::class,
+        'static' => Static_::class,
+        'parent' => Parent_::class,
+        'iterable' => Iterable_::class,
+        'never' => Never_::class,
+        'list' => List_::class,
+        'non-empty-list' => NonEmptyList::class,
+    ];
+
+    /**
+     * @psalm-readonly
+     * @var FqsenResolver
+     */
+    private $fqsenResolver;
+    /**
+     * @psalm-readonly
+     * @var TypeParser
+     */
+    private $typeParser;
+    /**
+     * @psalm-readonly
+     * @var Lexer
+     */
+    private $lexer;
+
+    /**
+     * Initializes this TypeResolver with the means to create and resolve Fqsen objects.
+     */
+    public function __construct(?FqsenResolver $fqsenResolver = null)
+    {
+        $this->fqsenResolver = $fqsenResolver ?: new FqsenResolver();
+
+        if (class_exists(ParserConfig::class)) {
+            $this->typeParser = new TypeParser(new ParserConfig([]), new ConstExprParser(new ParserConfig([])));
+            $this->lexer = new Lexer(new ParserConfig([]));
+        } else {
+            $this->typeParser = new TypeParser(new ConstExprParser());
+            $this->lexer = new Lexer();
+        }
+    }
+
+    /**
+     * Analyzes the given type and returns the FQCN variant.
+     *
+     * When a type is provided this method checks whether it is not a keyword or
+     * Fully Qualified Class Name. If so it will use the given namespace and
+     * aliases to expand the type to a FQCN representation.
+     *
+     * This method only works as expected if the namespace and aliases are set;
+     * no dynamic reflection is being performed here.
+     *
+     * @uses Context::getNamespace()        to determine with what to prefix the type name.
+     * @uses Context::getNamespaceAliases() to check whether the first part of the relative type name should not be
+     * replaced with another namespace.
+     *
+     * @param string $type The relative or absolute type.
+     */
+    public function resolve(string $type, ?Context $context = null): Type
+    {
+        $type = trim($type);
+        if (!$type) {
+            throw new InvalidArgumentException('Attempted to resolve "' . $type . '" but it appears to be empty');
+        }
+
+        if ($context === null) {
+            $context = new Context('');
+        }
+
+        $tokens = $this->lexer->tokenize($type);
+        $tokenIterator = new TokenIterator($tokens);
+
+        $ast = $this->parse($tokenIterator);
+        $type = $this->createType($ast, $context);
+
+        return $this->tryParseRemainingCompoundTypes($tokenIterator, $context, $type);
+    }
+
+    public function createType(?TypeNode $type, Context $context): Type
+    {
+        if ($type === null) {
+            return new Mixed_();
+        }
+
+        switch (get_class($type)) {
+            case ArrayTypeNode::class:
+                return new Array_(
+                    $this->createType($type->type, $context)
+                );
+
+            case ArrayShapeNode::class:
+                switch ($type->kind) {
+                    case ArrayShapeNode::KIND_ARRAY:
+                        return new ArrayShape(
+                            ...array_map(
+                                function (ArrayShapeItemNode $item) use ($context): ArrayShapeItem {
+                                    return new ArrayShapeItem(
+                                        $item->keyName !== null ? (string) $item->keyName : null,
+                                        $this->createType($item->valueType, $context),
+                                        $item->optional
+                                    );
+                                },
+                                $type->items
+                            )
+                        );
+
+                    case ArrayShapeNode::KIND_LIST:
+                        return new ListShape(
+                            ...array_map(
+                                function (ArrayShapeItemNode $item) use ($context): ListShapeItem {
+                                    return new ListShapeItem(
+                                        null,
+                                        $this->createType($item->valueType, $context),
+                                        $item->optional
+                                    );
+                                },
+                                $type->items
+                            )
+                        );
+
+                    default:
+                        throw new RuntimeException('Unsupported array shape kind');
+                }
+            case ObjectShapeNode::class:
+                return new ObjectShape(
+                    ...array_map(
+                        function (ObjectShapeItemNode $item) use ($context): ObjectShapeItem {
+                            return new ObjectShapeItem(
+                                (string) $item->keyName,
+                                $this->createType($item->valueType, $context),
+                                $item->optional
+                            );
+                        },
+                        $type->items
+                    )
+                );
+
+            case CallableTypeNode::class:
+                return $this->createFromCallable($type, $context);
+
+            case ConstTypeNode::class:
+                return $this->createFromConst($type, $context);
+
+            case GenericTypeNode::class:
+                return $this->createFromGeneric($type, $context);
+
+            case IdentifierTypeNode::class:
+                return $this->resolveSingleType($type->name, $context);
+
+            case IntersectionTypeNode::class:
+                return new Intersection(
+                    array_filter(
+                        array_map(
+                            function (TypeNode $nestedType) use ($context): Type {
+                                $type = $this->createType($nestedType, $context);
+                                if ($type instanceof AggregatedType) {
+                                    return new Expression($type);
+                                }
+
+                                return $type;
+                            },
+                            $type->types
+                        )
+                    )
+                );
+
+            case NullableTypeNode::class:
+                $nestedType = $this->createType($type->type, $context);
+
+                return new Nullable($nestedType);
+
+            case UnionTypeNode::class:
+                return new Compound(
+                    array_filter(
+                        array_map(
+                            function (TypeNode $nestedType) use ($context): Type {
+                                $type = $this->createType($nestedType, $context);
+                                if ($type instanceof AggregatedType) {
+                                    return new Expression($type);
+                                }
+
+                                return $type;
+                            },
+                            $type->types
+                        )
+                    )
+                );
+
+            case ThisTypeNode::class:
+                return new This();
+
+            case ConditionalTypeNode::class:
+                return new Conditional(
+                    $type->negated,
+                    $this->createType($type->subjectType, $context),
+                    $this->createType($type->targetType, $context),
+                    $this->createType($type->if, $context),
+                    $this->createType($type->else, $context),
+                );
+
+            case ConditionalTypeForParameterNode::class:
+                return new ConditionalForParameter(
+                    $type->negated,
+                    substr($type->parameterName, 1),
+                    $this->createType($type->targetType, $context),
+                    $this->createType($type->if, $context),
+                    $this->createType($type->else, $context),
+                );
+
+            case OffsetAccessTypeNode::class:
+                return new OffsetAccess(
+                    $this->createType($type->type, $context),
+                    $this->createType($type->offset, $context)
+                );
+
+            default:
+                return new Mixed_();
+        }
+    }
+
+    private function createFromGeneric(GenericTypeNode $type, Context $context): Type
+    {
+        switch (strtolower($type->type->name)) {
+            case 'array':
+                return $this->createArray($type->genericTypes, $context);
+
+            case 'class-string':
+                $subType = $this->createType($type->genericTypes[0], $context);
+                if (!$subType instanceof Object_ || $subType->getFqsen() === null) {
+                    throw new RuntimeException(
+                        $subType . ' is not a class string'
+                    );
+                }
+
+                return new ClassString(
+                    $subType->getFqsen()
+                );
+
+            case 'interface-string':
+                $subType = $this->createType($type->genericTypes[0], $context);
+                if (!$subType instanceof Object_ || $subType->getFqsen() === null) {
+                    throw new RuntimeException(
+                        $subType . ' is not a class string'
+                    );
+                }
+
+                return new InterfaceString(
+                    $subType->getFqsen()
+                );
+
+            case 'list':
+                return new List_(
+                    $this->createType($type->genericTypes[0], $context)
+                );
+
+            case 'non-empty-list':
+                return new NonEmptyList(
+                    $this->createType($type->genericTypes[0], $context)
+                );
+
+            case 'int':
+                if (isset($type->genericTypes[1]) === false) {
+                    throw new RuntimeException('int<min,max> has not the correct format');
+                }
+
+                return new IntegerRange((string) $type->genericTypes[0], (string) $type->genericTypes[1]);
+
+            case 'iterable':
+                return new Iterable_(...array_reverse($this->createTypesByTypeNodes($type->genericTypes, $context)));
+
+            case 'key-of':
+                return new KeyOf($this->createType($type->genericTypes[0], $context));
+
+            case 'value-of':
+                return new ValueOf($this->createType($type->genericTypes[0], $context));
+
+            case 'int-mask':
+                return new IntMask(...$this->createTypesByTypeNodes($type->genericTypes, $context));
+
+            case 'int-mask-of':
+                return new IntMaskOf($this->createType($type->genericTypes[0], $context));
+
+            case 'static':
+                return new Static_(...$this->createTypesByTypeNodes($type->genericTypes, $context));
+
+            case 'self':
+                return new Self_(...$this->createTypesByTypeNodes($type->genericTypes, $context));
+
+            default:
+                $collectionType = $this->createType($type->type, $context);
+                if ($collectionType instanceof Object_ === false) {
+                    throw new RuntimeException(sprintf('%s is not a collection', (string) $collectionType));
+                }
+
+                return new Collection(
+                    $collectionType->getFqsen(),
+                    ...array_reverse($this->createTypesByTypeNodes($type->genericTypes, $context))
+                );
+        }
+    }
+
+    private function createFromCallable(CallableTypeNode $type, Context $context): Callable_
+    {
+        return new Callable_(array_map(
+            function (CallableTypeParameterNode $param) use ($context): CallableParameter {
+                return new CallableParameter(
+                    $this->createType($param->type, $context),
+                    $param->parameterName !== '' ? trim($param->parameterName, '$') : null,
+                    $param->isReference,
+                    $param->isVariadic,
+                    $param->isOptional
+                );
+            },
+            $type->parameters
+        ), $this->createType($type->returnType, $context));
+    }
+
+    private function createFromConst(ConstTypeNode $type, Context $context): Type
+    {
+        switch (true) {
+            case $type->constExpr instanceof ConstExprIntegerNode:
+                return new IntegerValue((int) $type->constExpr->value);
+
+            case $type->constExpr instanceof ConstExprFloatNode:
+                return new FloatValue((float) $type->constExpr->value);
+
+            case $type->constExpr instanceof ConstExprStringNode:
+                return new StringValue($type->constExpr->value);
+
+            case $type->constExpr instanceof ConstFetchNode:
+                return new ConstExpression(
+                    $this->resolve($type->constExpr->className, $context),
+                    $type->constExpr->name
+                );
+
+            default:
+                throw new RuntimeException(sprintf('Unsupported constant type %s', get_class($type)));
+        }
+    }
+
+    /**
+     * resolve the given type into a type object
+     *
+     * @param string $type the type string, representing a single type
+     *
+     * @return Type|Array_|Object_
+     *
+     * @psalm-mutation-free
+     */
+    private function resolveSingleType(string $type, Context $context): object
+    {
+        switch (true) {
+            case $this->isKeyword($type):
+                return $this->resolveKeyword($type);
+
+            case $this->isFqsen($type):
+                return $this->resolveTypedObject($type);
+
+            case $this->isPartialStructuralElementName($type):
+                return $this->resolveTypedObject($type, $context);
+
+            // @codeCoverageIgnoreStart
+            default:
+                // I haven't got the foggiest how the logic would come here but added this as a defense.
+                throw new RuntimeException(
+                    'Unable to resolve type "' . $type . '", there is no known method to resolve it'
+                );
+        }
+
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * Adds a keyword to the list of Keywords and associates it with a specific Value Object.
+     *
+     * @psalm-param class-string<Type> $typeClassName
+     */
+    public function addKeyword(string $keyword, string $typeClassName): void
+    {
+        if (!class_exists($typeClassName)) {
+            throw new InvalidArgumentException(
+                'The Value Object that needs to be created with a keyword "' . $keyword . '" must be an existing class'
+                . ' but we could not find the class ' . $typeClassName
+            );
+        }
+
+        $interfaces = class_implements($typeClassName);
+        if ($interfaces === false) {
+            throw new InvalidArgumentException(
+                'The Value Object that needs to be created with a keyword "' . $keyword . '" must be an existing class'
+                . ' but we could not find the class ' . $typeClassName
+            );
+        }
+
+        if (!in_array(Type::class, $interfaces, true)) {
+            throw new InvalidArgumentException(
+                'The class "' . $typeClassName . '" must implement the interface "phpDocumentor\Reflection\Type"'
+            );
+        }
+
+        $this->keywords[$keyword] = $typeClassName;
+    }
+
+    /**
+     * Detects whether the given type represents a PHPDoc keyword.
+     *
+     * @param string $type A relative or absolute type as defined in the phpDocumentor documentation.
+     *
+     * @psalm-mutation-free
+     */
+    private function isKeyword(string $type): bool
+    {
+        return array_key_exists(strtolower($type), $this->keywords);
+    }
+
+    /**
+     * Detects whether the given type represents a relative structural element name.
+     *
+     * @param string $type A relative or absolute type as defined in the phpDocumentor documentation.
+     *
+     * @psalm-mutation-free
+     */
+    private function isPartialStructuralElementName(string $type): bool
+    {
+        return (isset($type[0]) && $type[0] !== self::OPERATOR_NAMESPACE) && !$this->isKeyword($type);
+    }
+
+    /**
+     * Tests whether the given type is a Fully Qualified Structural Element Name.
+     *
+     * @psalm-mutation-free
+     */
+    private function isFqsen(string $type): bool
+    {
+        return strpos($type, self::OPERATOR_NAMESPACE) === 0;
+    }
+
+    /**
+     * Resolves the given keyword (such as `string`) into a Type object representing that keyword.
+     *
+     * @psalm-mutation-free
+     */
+    private function resolveKeyword(string $type): Type
+    {
+        $className = $this->keywords[strtolower($type)];
+
+        return new $className();
+    }
+
+    /**
+     * Resolves the given FQSEN string into an FQSEN object.
+     *
+     * @psalm-mutation-free
+     */
+    private function resolveTypedObject(string $type, ?Context $context = null): Object_
+    {
+        return new Object_($this->fqsenResolver->resolve($type, $context));
+    }
+
+    /** @param TypeNode[] $typeNodes */
+    private function createArray(array $typeNodes, Context $context): Array_
+    {
+        $types = array_reverse($this->createTypesByTypeNodes($typeNodes, $context));
+
+        if (isset($types[1]) === false) {
+            return new Array_(...$types);
+        }
+
+        if ($this->validArrayKeyType($types[1]) || $types[1] instanceof ArrayKey) {
+            return new Array_(...$types);
+        }
+
+        if ($types[1] instanceof Compound && $types[1]->getIterator()->count() === 2) {
+            if ($this->validArrayKeyType($types[1]->get(0)) && $this->validArrayKeyType($types[1]->get(1))) {
+                return new Array_(...$types);
+            }
+        }
+
+        throw new RuntimeException('An array can have only integers or strings as keys');
+    }
+
+    private function validArrayKeyType(?Type $type): bool
+    {
+        return $type instanceof String_ || $type instanceof Integer;
+    }
+
+    private function parse(TokenIterator $tokenIterator): TypeNode
+    {
+        try {
+            $ast = $this->typeParser->parse($tokenIterator);
+        } catch (ParserException $e) {
+            throw new RuntimeException($e->getMessage(), 0, $e);
+        }
+
+        return $ast;
+    }
+
+    /**
+     * Will try to parse unsupported type notations by phpstan
+     *
+     * The phpstan parser doesn't support the illegal nullable combinations like this library does.
+     * This method will warn the user about those notations but for bc purposes we will still have it here.
+     */
+    private function tryParseRemainingCompoundTypes(TokenIterator $tokenIterator, Context $context, Type $type): Type
+    {
+        if (
+            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_UNION) ||
+            $tokenIterator->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)
+        ) {
+            Deprecation::trigger(
+                'phpdocumentor/type-resolver',
+                'https://github.com/phpDocumentor/TypeResolver/issues/184',
+                'Legacy nullable type detected, please update your code as
+                you are using nullable types in a docblock. support will be removed in v2.0.0'
+            );
+        }
+
+        $continue = true;
+        while ($continue) {
+            $continue = false;
+            while ($tokenIterator->tryConsumeTokenType(Lexer::TOKEN_UNION)) {
+                $ast = $this->parse($tokenIterator);
+                $type2 = $this->createType($ast, $context);
+                $type = new Compound([$type, $type2]);
+                $continue = true;
+            }
+
+            while ($tokenIterator->tryConsumeTokenType(Lexer::TOKEN_INTERSECTION)) {
+                $ast = $this->typeParser->parse($tokenIterator);
+                $type2 = $this->createType($ast, $context);
+                $type = new Intersection([$type, $type2]);
+                $continue = true;
+            }
+        }
+
+        return $type;
+    }
+
+    /**
+     * @param TypeNode[] $nodes
+     *
+     * @return Type[]
+     */
+    private function createTypesByTypeNodes(array $nodes, Context $context): array
+    {
+        return array_map(
+            function (TypeNode $node) use ($context): Type {
+                return $this->createType($node, $context);
+            },
+            $nodes
+        );
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/AbstractList.php b/phpdocumentor/type-resolver/src/Types/AbstractList.php
new file mode 100644
index 000000000..d5fe03d7a
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/AbstractList.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Represents a list of values. This is an abstract class for Array_ and Collection.
+ *
+ * @psalm-immutable
+ */
+abstract class AbstractList implements Type
+{
+    /** @var Type */
+    protected $valueType;
+
+    /** @var Type|null */
+    protected $keyType;
+
+    /** @var Type */
+    protected $defaultKeyType;
+
+    /**
+     * Initializes this representation of an array with the given Type.
+     */
+    public function __construct(?Type $valueType = null, ?Type $keyType = null)
+    {
+        if ($valueType === null) {
+            $valueType = new Mixed_();
+        }
+
+        $this->valueType      = $valueType;
+        $this->defaultKeyType = new Compound([new String_(), new Integer()]);
+        $this->keyType        = $keyType;
+    }
+
+    public function getOriginalKeyType(): ?Type
+    {
+        return $this->keyType;
+    }
+
+    /**
+     * Returns the type for the keys of this array.
+     */
+    public function getKeyType(): Type
+    {
+        return $this->keyType ?? $this->defaultKeyType;
+    }
+
+    /**
+     * Returns the type for the values of this array.
+     */
+    public function getValueType(): Type
+    {
+        return $this->valueType;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->keyType) {
+            return 'array<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
+        if ($this->valueType instanceof Mixed_) {
+            return 'array';
+        }
+
+        if ($this->valueType instanceof Compound) {
+            return '(' . $this->valueType . ')[]';
+        }
+
+        return $this->valueType . '[]';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/AggregatedType.php b/phpdocumentor/type-resolver/src/Types/AggregatedType.php
new file mode 100644
index 000000000..e1da6cb28
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/AggregatedType.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Types;
+
+use ArrayIterator;
+use IteratorAggregate;
+use phpDocumentor\Reflection\Type;
+
+use function array_key_exists;
+use function implode;
+
+/**
+ * Base class for aggregated types like Compound and Intersection
+ *
+ * A Aggregated Type is not so much a special keyword or object reference but is a series of Types that are separated
+ * using separator.
+ *
+ * @psalm-immutable
+ * @template-implements IteratorAggregate<int, Type>
+ */
+abstract class AggregatedType implements Type, IteratorAggregate
+{
+    /**
+     * @psalm-allow-private-mutation
+     * @var array<int, Type>
+     */
+    private $types = [];
+
+    /** @var string */
+    private $token;
+
+    /**
+     * @param array<Type> $types
+     */
+    public function __construct(array $types, string $token)
+    {
+        foreach ($types as $type) {
+            $this->add($type);
+        }
+
+        $this->token = $token;
+    }
+
+    /**
+     * Returns the type at the given index.
+     */
+    public function get(int $index): ?Type
+    {
+        if (!$this->has($index)) {
+            return null;
+        }
+
+        return $this->types[$index];
+    }
+
+    /**
+     * Tests if this compound type has a type with the given index.
+     */
+    public function has(int $index): bool
+    {
+        return array_key_exists($index, $this->types);
+    }
+
+    /**
+     * Tests if this compound type contains the given type.
+     */
+    public function contains(Type $type): bool
+    {
+        foreach ($this->types as $typePart) {
+            // if the type is duplicate; do not add it
+            if ((string) $typePart === (string) $type) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return implode($this->token, $this->types);
+    }
+
+    /**
+     * @return ArrayIterator<int, Type>
+     */
+    public function getIterator(): ArrayIterator
+    {
+        return new ArrayIterator($this->types);
+    }
+
+    /**
+     * @psalm-suppress ImpureMethodCall
+     */
+    private function add(Type $type): void
+    {
+        if ($type instanceof static) {
+            foreach ($type->getIterator() as $subType) {
+                $this->add($subType);
+            }
+
+            return;
+        }
+
+        // if the type is duplicate; do not add it
+        if ($this->contains($type)) {
+            return;
+        }
+
+        $this->types[] = $type;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/ArrayKey.php b/phpdocumentor/type-resolver/src/Types/ArrayKey.php
new file mode 100644
index 000000000..fc3641ed0
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/ArrayKey.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a array-key Type.
+ *
+ * A array-key Type is the supertype (but not a union) of int and string.
+ *
+ * @psalm-immutable
+ */
+class ArrayKey extends AggregatedType implements PseudoType
+{
+    public function __construct()
+    {
+        parent::__construct([new String_(), new Integer()], '|');
+    }
+
+    public function underlyingType(): Type
+    {
+        return new Compound([new String_(), new Integer()]);
+    }
+
+    public function __toString(): string
+    {
+        return 'array-key';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Array_.php b/phpdocumentor/type-resolver/src/Types/Array_.php
new file mode 100644
index 000000000..bc17225f5
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Array_.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+/**
+ * Represents an array type as described in the PSR-5, the PHPDoc Standard.
+ *
+ * An array can be represented in two forms:
+ *
+ * 1. Untyped (`array`), where the key and value type is unknown and hence classified as 'Mixed_'.
+ * 2. Types (`string[]`), where the value type is provided by preceding an opening and closing square bracket with a
+ *    type name.
+ *
+ * @psalm-immutable
+ */
+class Array_ extends AbstractList
+{
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Boolean.php b/phpdocumentor/type-resolver/src/Types/Boolean.php
new file mode 100644
index 000000000..8b1a3f34e
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Boolean.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Boolean type.
+ *
+ * @psalm-immutable
+ */
+class Boolean implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'bool';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/CallableParameter.php b/phpdocumentor/type-resolver/src/Types/CallableParameter.php
new file mode 100644
index 000000000..51c550b62
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/CallableParameter.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Callable parameters.
+ *
+ * @psalm-immutable
+ */
+final class CallableParameter
+{
+    /** @var Type */
+    private $type;
+
+    /** @var bool */
+    private $isReference;
+
+    /** @var bool */
+    private $isVariadic;
+
+    /** @var bool */
+    private $isOptional;
+
+    /** @var string|null */
+    private $name;
+
+    public function __construct(
+        Type $type,
+        ?string $name = null,
+        bool $isReference = false,
+        bool $isVariadic = false,
+        bool $isOptional = false
+    ) {
+        $this->type = $type;
+        $this->isReference = $isReference;
+        $this->isVariadic = $isVariadic;
+        $this->isOptional = $isOptional;
+        $this->name = $name;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function isReference(): bool
+    {
+        return $this->isReference;
+    }
+
+    public function isVariadic(): bool
+    {
+        return $this->isVariadic;
+    }
+
+    public function isOptional(): bool
+    {
+        return $this->isOptional;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Callable_.php b/phpdocumentor/type-resolver/src/Types/Callable_.php
new file mode 100644
index 000000000..6b06489e2
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Callable_.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Callable type.
+ *
+ * @psalm-immutable
+ */
+final class Callable_ implements Type
+{
+    /** @var Type|null */
+    private $returnType;
+    /** @var CallableParameter[] */
+    private $parameters;
+
+    /**
+     * @param CallableParameter[] $parameters
+     */
+    public function __construct(array $parameters = [], ?Type $returnType = null)
+    {
+        $this->parameters = $parameters;
+        $this->returnType = $returnType;
+    }
+
+    /** @return CallableParameter[] */
+    public function getParameters(): array
+    {
+        return $this->parameters;
+    }
+
+    public function getReturnType(): ?Type
+    {
+        return $this->returnType;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'callable';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/ClassString.php b/phpdocumentor/type-resolver/src/Types/ClassString.php
new file mode 100644
index 000000000..fbdd879bb
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/ClassString.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class ClassString extends String_ implements PseudoType
+{
+    /** @var Fqsen|null */
+    private $fqsen;
+
+    /**
+     * Initializes this representation of a class string with the given Fqsen.
+     */
+    public function __construct(?Fqsen $fqsen = null)
+    {
+        $this->fqsen = $fqsen;
+    }
+
+    public function underlyingType(): Type
+    {
+        return new String_();
+    }
+
+    /**
+     * Returns the FQSEN associated with this object.
+     */
+    public function getFqsen(): ?Fqsen
+    {
+        return $this->fqsen;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->fqsen === null) {
+            return 'class-string';
+        }
+
+        return 'class-string<' . (string) $this->fqsen . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Collection.php b/phpdocumentor/type-resolver/src/Types/Collection.php
new file mode 100644
index 000000000..943cc22e5
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Collection.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Represents a collection type as described in the PSR-5, the PHPDoc Standard.
+ *
+ * A collection can be represented in two forms:
+ *
+ * 1. `ACollectionObject<aValueType>`
+ * 2. `ACollectionObject<aValueType,aKeyType>`
+ *
+ * - ACollectionObject can be 'array' or an object that can act as an array
+ * - aValueType and aKeyType can be any type expression
+ *
+ * @psalm-immutable
+ */
+final class Collection extends AbstractList
+{
+    /** @var Fqsen|null */
+    private $fqsen;
+
+    /**
+     * Initializes this representation of an array with the given Type or Fqsen.
+     */
+    public function __construct(?Fqsen $fqsen, Type $valueType, ?Type $keyType = null)
+    {
+        parent::__construct($valueType, $keyType);
+
+        $this->fqsen = $fqsen;
+    }
+
+    /**
+     * Returns the FQSEN associated with this object.
+     */
+    public function getFqsen(): ?Fqsen
+    {
+        return $this->fqsen;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        $objectType = (string) ($this->fqsen ?? 'object');
+
+        if ($this->keyType === null) {
+            return $objectType . '<' . $this->valueType . '>';
+        }
+
+        return $objectType . '<' . $this->keyType . ',' . $this->valueType . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Compound.php b/phpdocumentor/type-resolver/src/Types/Compound.php
new file mode 100644
index 000000000..ad426cc2c
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Compound.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Compound Type.
+ *
+ * A Compound Type is not so much a special keyword or object reference but is a series of Types that are separated
+ * using an OR operator (`|`). This combination of types signifies that whatever is associated with this compound type
+ * may contain a value with any of the given types.
+ *
+ * @psalm-immutable
+ */
+final class Compound extends AggregatedType
+{
+    /**
+     * Initializes a compound type (i.e. `string|int`) and tests if the provided types all implement the Type interface.
+     *
+     * @param array<Type> $types
+     */
+    public function __construct(array $types)
+    {
+        parent::__construct($types, '|');
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Context.php b/phpdocumentor/type-resolver/src/Types/Context.php
new file mode 100644
index 000000000..bb3b6ef12
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Context.php
@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use function strlen;
+use function substr;
+use function trim;
+
+/**
+ * Provides information about the Context in which the DocBlock occurs that receives this context.
+ *
+ * A DocBlock does not know of its own accord in which namespace it occurs and which namespace aliases are applicable
+ * for the block of code in which it is in. This information is however necessary to resolve Class names in tags since
+ * you can provide a short form or make use of namespace aliases.
+ *
+ * The phpDocumentor Reflection component knows how to create this class but if you use the DocBlock parser from your
+ * own application it is possible to generate a Context class using the ContextFactory; this will analyze the file in
+ * which an associated class resides for its namespace and imports.
+ *
+ * @see ContextFactory::createFromReflector()
+ * @see ContextFactory::createForNamespace()
+ *
+ * @psalm-immutable
+ */
+final class Context
+{
+    /** @var string The current namespace. */
+    private $namespace;
+
+    /**
+     * @var string[] List of namespace aliases => Fully Qualified Namespace.
+     * @psalm-var array<string, string>
+     */
+    private $namespaceAliases;
+
+    /**
+     * Initializes the new context and normalizes all passed namespaces to be in Qualified Namespace Name (QNN)
+     * format (without a preceding `\`).
+     *
+     * @param string   $namespace        The namespace where this DocBlock resides in.
+     * @param string[] $namespaceAliases List of namespace aliases => Fully Qualified Namespace.
+     * @psalm-param array<string, string> $namespaceAliases
+     */
+    public function __construct(string $namespace, array $namespaceAliases = [])
+    {
+        $this->namespace = $namespace !== 'global' && $namespace !== 'default'
+            ? trim($namespace, '\\')
+            : '';
+
+        foreach ($namespaceAliases as $alias => $fqnn) {
+            if ($fqnn[0] === '\\') {
+                $fqnn = substr($fqnn, 1);
+            }
+
+            if ($fqnn[strlen($fqnn) - 1] === '\\') {
+                $fqnn = substr($fqnn, 0, -1);
+            }
+
+            $namespaceAliases[$alias] = $fqnn;
+        }
+
+        $this->namespaceAliases = $namespaceAliases;
+    }
+
+    /**
+     * Returns the Qualified Namespace Name (thus without `\` in front) where the associated element is in.
+     */
+    public function getNamespace(): string
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * Returns a list of Qualified Namespace Names (thus without `\` in front) that are imported, the keys represent
+     * the alias for the imported Namespace.
+     *
+     * @return string[]
+     * @psalm-return array<string, string>
+     */
+    public function getNamespaceAliases(): array
+    {
+        return $this->namespaceAliases;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/ContextFactory.php b/phpdocumentor/type-resolver/src/Types/ContextFactory.php
new file mode 100644
index 000000000..2018ff52c
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/ContextFactory.php
@@ -0,0 +1,422 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use ArrayIterator;
+use InvalidArgumentException;
+use ReflectionClass;
+use ReflectionClassConstant;
+use ReflectionMethod;
+use ReflectionParameter;
+use ReflectionProperty;
+use Reflector;
+use RuntimeException;
+use UnexpectedValueException;
+
+use function define;
+use function defined;
+use function file_exists;
+use function file_get_contents;
+use function get_class;
+use function in_array;
+use function is_string;
+use function strrpos;
+use function substr;
+use function token_get_all;
+use function trim;
+
+use const T_AS;
+use const T_CLASS;
+use const T_CURLY_OPEN;
+use const T_DOLLAR_OPEN_CURLY_BRACES;
+use const T_NAME_FULLY_QUALIFIED;
+use const T_NAME_QUALIFIED;
+use const T_NAMESPACE;
+use const T_NS_SEPARATOR;
+use const T_STRING;
+use const T_TRAIT;
+use const T_USE;
+
+if (!defined('T_NAME_QUALIFIED')) {
+    define('T_NAME_QUALIFIED', 10001);
+}
+
+if (!defined('T_NAME_FULLY_QUALIFIED')) {
+    define('T_NAME_FULLY_QUALIFIED', 10002);
+}
+
+/**
+ * Convenience class to create a Context for DocBlocks when not using the Reflection Component of phpDocumentor.
+ *
+ * For a DocBlock to be able to resolve types that use partial namespace names or rely on namespace imports we need to
+ * provide a bit of context so that the DocBlock can read that and based on it decide how to resolve the types to
+ * Fully Qualified names.
+ *
+ * @see Context for more information.
+ */
+final class ContextFactory
+{
+    /** The literal used at the end of a use statement. */
+    private const T_LITERAL_END_OF_USE = ';';
+
+    /** The literal used between sets of use statements */
+    private const T_LITERAL_USE_SEPARATOR = ',';
+
+    /**
+     * Build a Context given a Class Reflection.
+     *
+     * @see Context for more information on Contexts.
+     */
+    public function createFromReflector(Reflector $reflector): Context
+    {
+        if ($reflector instanceof ReflectionClass) {
+            //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
+            /** @var ReflectionClass<object> $reflector */
+
+            return $this->createFromReflectionClass($reflector);
+        }
+
+        if ($reflector instanceof ReflectionParameter) {
+            return $this->createFromReflectionParameter($reflector);
+        }
+
+        if ($reflector instanceof ReflectionMethod) {
+            return $this->createFromReflectionMethod($reflector);
+        }
+
+        if ($reflector instanceof ReflectionProperty) {
+            return $this->createFromReflectionProperty($reflector);
+        }
+
+        if ($reflector instanceof ReflectionClassConstant) {
+            return $this->createFromReflectionClassConstant($reflector);
+        }
+
+        throw new UnexpectedValueException('Unhandled \Reflector instance given:  ' . get_class($reflector));
+    }
+
+    private function createFromReflectionParameter(ReflectionParameter $parameter): Context
+    {
+        $class = $parameter->getDeclaringClass();
+        if (!$class) {
+            throw new InvalidArgumentException('Unable to get class of ' . $parameter->getName());
+        }
+
+        return $this->createFromReflectionClass($class);
+    }
+
+    private function createFromReflectionMethod(ReflectionMethod $method): Context
+    {
+        $class = $method->getDeclaringClass();
+
+        return $this->createFromReflectionClass($class);
+    }
+
+    private function createFromReflectionProperty(ReflectionProperty $property): Context
+    {
+        $class = $property->getDeclaringClass();
+
+        return $this->createFromReflectionClass($class);
+    }
+
+    private function createFromReflectionClassConstant(ReflectionClassConstant $constant): Context
+    {
+        //phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
+        /** @phpstan-var ReflectionClass<object> $class */
+        $class = $constant->getDeclaringClass();
+
+        return $this->createFromReflectionClass($class);
+    }
+
+    /**
+     * @phpstan-param ReflectionClass<object> $class
+     */
+    private function createFromReflectionClass(ReflectionClass $class): Context
+    {
+        $fileName  = $class->getFileName();
+        $namespace = $class->getNamespaceName();
+
+        if (is_string($fileName) && file_exists($fileName)) {
+            $contents = file_get_contents($fileName);
+            if ($contents === false) {
+                throw new RuntimeException('Unable to read file "' . $fileName . '"');
+            }
+
+            return $this->createForNamespace($namespace, $contents);
+        }
+
+        return new Context($namespace, []);
+    }
+
+    /**
+     * Build a Context for a namespace in the provided file contents.
+     *
+     * @see Context for more information on Contexts.
+     *
+     * @param string $namespace    It does not matter if a `\` precedes the namespace name,
+     * this method first normalizes.
+     * @param string $fileContents The file's contents to retrieve the aliases from with the given namespace.
+     */
+    public function createForNamespace(string $namespace, string $fileContents): Context
+    {
+        $namespace        = trim($namespace, '\\');
+        $useStatements    = [];
+        $currentNamespace = '';
+        $tokens           = new ArrayIterator(token_get_all($fileContents));
+
+        while ($tokens->valid()) {
+            $currentToken = $tokens->current();
+            switch ($currentToken[0]) {
+                case T_NAMESPACE:
+                    $currentNamespace = $this->parseNamespace($tokens);
+                    break;
+                case T_CLASS:
+                case T_TRAIT:
+                    // Fast-forward the iterator through the class so that any
+                    // T_USE tokens found within are skipped - these are not
+                    // valid namespace use statements so should be ignored.
+                    $braceLevel      = 0;
+                    $firstBraceFound = false;
+                    while ($tokens->valid() && ($braceLevel > 0 || !$firstBraceFound)) {
+                        $currentToken = $tokens->current();
+                        if (
+                            $currentToken === '{'
+                            || in_array($currentToken[0], [T_CURLY_OPEN, T_DOLLAR_OPEN_CURLY_BRACES], true)
+                        ) {
+                            if (!$firstBraceFound) {
+                                $firstBraceFound = true;
+                            }
+
+                            ++$braceLevel;
+                        }
+
+                        if ($currentToken === '}') {
+                            --$braceLevel;
+                        }
+
+                        $tokens->next();
+                    }
+
+                    break;
+                case T_USE:
+                    if ($currentNamespace === $namespace) {
+                        $useStatements += $this->parseUseStatement($tokens);
+                    }
+
+                    break;
+            }
+
+            $tokens->next();
+        }
+
+        return new Context($namespace, $useStatements);
+    }
+
+    /**
+     * Deduce the name from tokens when we are at the T_NAMESPACE token.
+     *
+     * @param ArrayIterator<int, string|array{0:int,1:string,2:int}> $tokens
+     */
+    private function parseNamespace(ArrayIterator $tokens): string
+    {
+        // skip to the first string or namespace separator
+        $this->skipToNextStringOrNamespaceSeparator($tokens);
+
+        $name = '';
+        $acceptedTokens = [T_STRING, T_NS_SEPARATOR, T_NAME_QUALIFIED];
+        while ($tokens->valid() && in_array($tokens->current()[0], $acceptedTokens, true)) {
+            $name .= $tokens->current()[1];
+            $tokens->next();
+        }
+
+        return $name;
+    }
+
+    /**
+     * Deduce the names of all imports when we are at the T_USE token.
+     *
+     * @param ArrayIterator<int, string|array{0:int,1:string,2:int}> $tokens
+     *
+     * @return string[]
+     * @psalm-return array<string, string>
+     */
+    private function parseUseStatement(ArrayIterator $tokens): array
+    {
+        $uses = [];
+
+        while ($tokens->valid()) {
+            $this->skipToNextStringOrNamespaceSeparator($tokens);
+
+            $uses += $this->extractUseStatements($tokens);
+            $currentToken = $tokens->current();
+            if ($currentToken[0] === self::T_LITERAL_END_OF_USE) {
+                return $uses;
+            }
+        }
+
+        return $uses;
+    }
+
+    /**
+     * Fast-forwards the iterator as longs as we don't encounter a T_STRING or T_NS_SEPARATOR token.
+     *
+     * @param ArrayIterator<int, string|array{0:int,1:string,2:int}> $tokens
+     */
+    private function skipToNextStringOrNamespaceSeparator(ArrayIterator $tokens): void
+    {
+        while ($tokens->valid()) {
+            $currentToken = $tokens->current();
+            if (in_array($currentToken[0], [T_STRING, T_NS_SEPARATOR], true)) {
+                break;
+            }
+
+            if ($currentToken[0] === T_NAME_QUALIFIED) {
+                break;
+            }
+
+            if (defined('T_NAME_FULLY_QUALIFIED') && $currentToken[0] === T_NAME_FULLY_QUALIFIED) {
+                break;
+            }
+
+            $tokens->next();
+        }
+    }
+
+    /**
+     * Deduce the namespace name and alias of an import when we are at the T_USE token or have not reached the end of
+     * a USE statement yet. This will return a key/value array of the alias => namespace.
+     *
+     * @param ArrayIterator<int, string|array{0:int,1:string,2:int}> $tokens
+     *
+     * @return string[]
+     * @psalm-return array<string, string>
+     *
+     * @psalm-suppress TypeDoesNotContainType
+     */
+    private function extractUseStatements(ArrayIterator $tokens): array
+    {
+        $extractedUseStatements = [];
+        $groupedNs              = '';
+        $currentNs              = '';
+        $currentAlias           = '';
+        $state                  = 'start';
+
+        while ($tokens->valid()) {
+            $currentToken = $tokens->current();
+            $tokenId      = is_string($currentToken) ? $currentToken : $currentToken[0];
+            $tokenValue   = is_string($currentToken) ? null : $currentToken[1];
+            switch ($state) {
+                case 'start':
+                    switch ($tokenId) {
+                        case T_STRING:
+                        case T_NS_SEPARATOR:
+                            $currentNs   .= (string) $tokenValue;
+                            $currentAlias =  $tokenValue;
+                            break;
+                        case T_NAME_QUALIFIED:
+                        case T_NAME_FULLY_QUALIFIED:
+                            $currentNs   .= (string) $tokenValue;
+                            $currentAlias = substr(
+                                (string) $tokenValue,
+                                (int) (strrpos((string) $tokenValue, '\\')) + 1
+                            );
+                            break;
+                        case T_CURLY_OPEN:
+                        case '{':
+                            $state     = 'grouped';
+                            $groupedNs = $currentNs;
+                            break;
+                        case T_AS:
+                            $state = 'start-alias';
+                            break;
+                        case self::T_LITERAL_USE_SEPARATOR:
+                        case self::T_LITERAL_END_OF_USE:
+                            $state = 'end';
+                            break;
+                        default:
+                            break;
+                    }
+
+                    break;
+                case 'start-alias':
+                    switch ($tokenId) {
+                        case T_STRING:
+                            $currentAlias = $tokenValue;
+                            break;
+                        case self::T_LITERAL_USE_SEPARATOR:
+                        case self::T_LITERAL_END_OF_USE:
+                            $state = 'end';
+                            break;
+                        default:
+                            break;
+                    }
+
+                    break;
+                case 'grouped':
+                    switch ($tokenId) {
+                        case T_STRING:
+                        case T_NS_SEPARATOR:
+                            $currentNs   .= (string) $tokenValue;
+                            $currentAlias = $tokenValue;
+                            break;
+                        case T_AS:
+                            $state = 'grouped-alias';
+                            break;
+                        case self::T_LITERAL_USE_SEPARATOR:
+                            $state                                          = 'grouped';
+                            $extractedUseStatements[(string) $currentAlias] = $currentNs;
+                            $currentNs                                      = $groupedNs;
+                            $currentAlias                                   = '';
+                            break;
+                        case self::T_LITERAL_END_OF_USE:
+                            $state = 'end';
+                            break;
+                        default:
+                            break;
+                    }
+
+                    break;
+                case 'grouped-alias':
+                    switch ($tokenId) {
+                        case T_STRING:
+                            $currentAlias = $tokenValue;
+                            break;
+                        case self::T_LITERAL_USE_SEPARATOR:
+                            $state                                          = 'grouped';
+                            $extractedUseStatements[(string) $currentAlias] = $currentNs;
+                            $currentNs                                      = $groupedNs;
+                            $currentAlias                                   = '';
+                            break;
+                        case self::T_LITERAL_END_OF_USE:
+                            $state = 'end';
+                            break;
+                        default:
+                            break;
+                    }
+            }
+
+            if ($state === 'end') {
+                break;
+            }
+
+            $tokens->next();
+        }
+
+        if ($groupedNs !== $currentNs) {
+            $extractedUseStatements[(string) $currentAlias] = $currentNs;
+        }
+
+        return $extractedUseStatements;
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Expression.php b/phpdocumentor/type-resolver/src/Types/Expression.php
new file mode 100644
index 000000000..da5f65d59
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Expression.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Represents an expression type as described in the PSR-5, the PHPDoc Standard.
+ *
+ * @psalm-immutable
+ */
+final class Expression implements Type
+{
+    /** @var Type */
+    protected $valueType;
+
+    /**
+     * Initializes this representation of an array with the given Type.
+     */
+    public function __construct(Type $valueType)
+    {
+        $this->valueType = $valueType;
+    }
+
+    /**
+     * Returns the value for the keys of this array.
+     */
+    public function getValueType(): Type
+    {
+        return $this->valueType;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return '(' . $this->valueType . ')';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Float_.php b/phpdocumentor/type-resolver/src/Types/Float_.php
new file mode 100644
index 000000000..85313a784
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Float_.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Float.
+ *
+ * @psalm-immutable
+ */
+class Float_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'float';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Integer.php b/phpdocumentor/type-resolver/src/Types/Integer.php
new file mode 100644
index 000000000..10ce3c58c
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Integer.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value object representing Integer type
+ *
+ * @psalm-immutable
+ */
+class Integer implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'int';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/InterfaceString.php b/phpdocumentor/type-resolver/src/Types/InterfaceString.php
new file mode 100644
index 000000000..9836961fd
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/InterfaceString.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+final class InterfaceString implements Type
+{
+    /** @var Fqsen|null */
+    private $fqsen;
+
+    /**
+     * Initializes this representation of a class string with the given Fqsen.
+     */
+    public function __construct(?Fqsen $fqsen = null)
+    {
+        $this->fqsen = $fqsen;
+    }
+
+    /**
+     * Returns the FQSEN associated with this object.
+     */
+    public function getFqsen(): ?Fqsen
+    {
+        return $this->fqsen;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->fqsen === null) {
+            return 'interface-string';
+        }
+
+        return 'interface-string<' . (string) $this->fqsen . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Intersection.php b/phpdocumentor/type-resolver/src/Types/Intersection.php
new file mode 100644
index 000000000..ced37b626
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Intersection.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * This file is part of phpDocumentor.
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ *
+ *  @link      http://phpdoc.org
+ */
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a Compound Type.
+ *
+ * A Intersection Type is not so much a special keyword or object reference but is a series of Types that are separated
+ * using an AND operator (`&`). This combination of types signifies that whatever is associated with this Intersection
+ * type may contain a value with any of the given types.
+ *
+ * @psalm-immutable
+ */
+final class Intersection extends AggregatedType
+{
+    /**
+     * Initializes a intersection type (i.e. `\A&\B`) and tests if the provided types all implement the Type interface.
+     *
+     * @param array<Type> $types
+     */
+    public function __construct(array $types)
+    {
+        parent::__construct($types, '&');
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Iterable_.php b/phpdocumentor/type-resolver/src/Types/Iterable_.php
new file mode 100644
index 000000000..1ca069f2e
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Iterable_.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+/**
+ * Value Object representing iterable type
+ *
+ * @psalm-immutable
+ */
+final class Iterable_ extends AbstractList
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->keyType) {
+            return 'iterable<' . $this->keyType . ',' . $this->valueType . '>';
+        }
+
+        if ($this->valueType instanceof Mixed_) {
+            return 'iterable';
+        }
+
+        return 'iterable<' . $this->valueType . '>';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Mixed_.php b/phpdocumentor/type-resolver/src/Types/Mixed_.php
new file mode 100644
index 000000000..908f45edf
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Mixed_.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing an unknown, or mixed, type.
+ *
+ * @psalm-immutable
+ */
+class Mixed_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'mixed';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Never_.php b/phpdocumentor/type-resolver/src/Types/Never_.php
new file mode 100644
index 000000000..40a99c9ad
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Never_.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the return-type 'never'.
+ *
+ * Never is generally only used when working with return types as it signifies that the method that only
+ * ever throw or exit.
+ *
+ * @psalm-immutable
+ */
+final class Never_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'never';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Null_.php b/phpdocumentor/type-resolver/src/Types/Null_.php
new file mode 100644
index 000000000..7ae802c4c
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Null_.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a null value or type.
+ *
+ * @psalm-immutable
+ */
+final class Null_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'null';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Nullable.php b/phpdocumentor/type-resolver/src/Types/Nullable.php
new file mode 100644
index 000000000..a94693507
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Nullable.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing a nullable type. The real type is wrapped.
+ *
+ * @psalm-immutable
+ */
+final class Nullable implements Type
+{
+    /** @var Type The actual type that is wrapped */
+    private $realType;
+
+    /**
+     * Initialises this nullable type using the real type embedded
+     */
+    public function __construct(Type $realType)
+    {
+        $this->realType = $realType;
+    }
+
+    /**
+     * Provide access to the actual type directly, if needed.
+     */
+    public function getActualType(): Type
+    {
+        return $this->realType;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return '?' . $this->realType->__toString();
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Object_.php b/phpdocumentor/type-resolver/src/Types/Object_.php
new file mode 100644
index 000000000..90dee57ac
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Object_.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use InvalidArgumentException;
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Type;
+
+use function strpos;
+
+/**
+ * Value Object representing an object.
+ *
+ * An object can be either typed or untyped. When an object is typed it means that it has an identifier, the FQSEN,
+ * pointing to an element in PHP. Object types that are untyped do not refer to a specific class but represent objects
+ * in general.
+ *
+ * @psalm-immutable
+ */
+final class Object_ implements Type
+{
+    /** @var Fqsen|null */
+    private $fqsen;
+
+    /**
+     * Initializes this object with an optional FQSEN, if not provided this object is considered 'untyped'.
+     *
+     * @throws InvalidArgumentException When provided $fqsen is not a valid type.
+     */
+    public function __construct(?Fqsen $fqsen = null)
+    {
+        if (strpos((string) $fqsen, '::') !== false || strpos((string) $fqsen, '()') !== false) {
+            throw new InvalidArgumentException(
+                'Object types can only refer to a class, interface or trait but a method, function, constant or '
+                . 'property was received: ' . (string) $fqsen
+            );
+        }
+
+        $this->fqsen = $fqsen;
+    }
+
+    /**
+     * Returns the FQSEN associated with this object.
+     */
+    public function getFqsen(): ?Fqsen
+    {
+        return $this->fqsen;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->fqsen) {
+            return (string) $this->fqsen;
+        }
+
+        return 'object';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Parent_.php b/phpdocumentor/type-resolver/src/Types/Parent_.php
new file mode 100644
index 000000000..348385991
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Parent_.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the 'parent' type.
+ *
+ * Parent, as a Type, represents the parent class of class in which the associated element was defined.
+ *
+ * @psalm-immutable
+ */
+final class Parent_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'parent';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Resource_.php b/phpdocumentor/type-resolver/src/Types/Resource_.php
new file mode 100644
index 000000000..1998ee0ad
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Resource_.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the 'resource' Type.
+ *
+ * @psalm-immutable
+ */
+final class Resource_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'resource';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Scalar.php b/phpdocumentor/type-resolver/src/Types/Scalar.php
new file mode 100644
index 000000000..80241c21e
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Scalar.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the 'scalar' pseudo-type, which is either a string, integer, float or boolean.
+ *
+ * @psalm-immutable
+ */
+final class Scalar implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'scalar';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Self_.php b/phpdocumentor/type-resolver/src/Types/Self_.php
new file mode 100644
index 000000000..b3fc78347
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Self_.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+use function implode;
+
+/**
+ * Value Object representing the 'self' type.
+ *
+ * Self, as a Type, represents the class in which the associated element was defined.
+ *
+ * @psalm-immutable
+ */
+final class Self_ implements Type
+{
+    /** @var Type[] */
+    private $genericTypes;
+
+    public function __construct(Type ...$genericTypes)
+    {
+        $this->genericTypes = $genericTypes;
+    }
+
+    /**
+     * @return Type[]
+     */
+    public function getGenericTypes(): array
+    {
+        return $this->genericTypes;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->genericTypes) {
+            return 'self<' . implode(', ', $this->genericTypes) . '>';
+        }
+
+        return 'self';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Static_.php b/phpdocumentor/type-resolver/src/Types/Static_.php
new file mode 100644
index 000000000..eb14ecbbe
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Static_.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+use function implode;
+
+/**
+ * Value Object representing the 'static' type.
+ *
+ * Self, as a Type, represents the class in which the associated element was called. This differs from self as self does
+ * not take inheritance into account but static means that the return type is always that of the class of the called
+ * element.
+ *
+ * See the documentation on late static binding in the PHP Documentation for more information on the difference between
+ * static and self.
+ *
+ * @psalm-immutable
+ */
+final class Static_ implements Type
+{
+    /** @var Type[] */
+    private $genericTypes;
+
+    public function __construct(Type ...$genericTypes)
+    {
+        $this->genericTypes = $genericTypes;
+    }
+
+    /**
+     * @return Type[]
+     */
+    public function getGenericTypes(): array
+    {
+        return $this->genericTypes;
+    }
+
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        if ($this->genericTypes) {
+            return 'static<' . implode(', ', $this->genericTypes) . '>';
+        }
+
+        return 'static';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/String_.php b/phpdocumentor/type-resolver/src/Types/String_.php
new file mode 100644
index 000000000..a4bb47f1a
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/String_.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the type 'string'.
+ *
+ * @psalm-immutable
+ */
+class String_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'string';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/This.php b/phpdocumentor/type-resolver/src/Types/This.php
new file mode 100644
index 000000000..602fc698f
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/This.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the '$this' pseudo-type.
+ *
+ * $this, as a Type, represents the instance of the class associated with the element as it was called. $this is
+ * commonly used when documenting fluent interfaces since it represents that the same object is returned.
+ *
+ * @psalm-immutable
+ */
+final class This implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return '$this';
+    }
+}
diff --git a/phpdocumentor/type-resolver/src/Types/Void_.php b/phpdocumentor/type-resolver/src/Types/Void_.php
new file mode 100644
index 000000000..23a601d47
--- /dev/null
+++ b/phpdocumentor/type-resolver/src/Types/Void_.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\Types;
+
+use phpDocumentor\Reflection\Type;
+
+/**
+ * Value Object representing the return-type 'void'.
+ *
+ * Void is generally only used when working with return types as it signifies that the method intentionally does not
+ * return any value.
+ *
+ * @psalm-immutable
+ */
+final class Void_ implements Type
+{
+    /**
+     * Returns a rendered output of the Type as it would be used in a DocBlock.
+     */
+    public function __toString(): string
+    {
+        return 'void';
+    }
+}
diff --git a/phpstan/phpdoc-parser/LICENSE b/phpstan/phpdoc-parser/LICENSE
new file mode 100644
index 000000000..e5f34e607
--- /dev/null
+++ b/phpstan/phpdoc-parser/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2016 Ondřej Mirtes
+Copyright (c) 2025 PHPStan s.r.o.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/phpstan/phpdoc-parser/src/Ast/AbstractNodeVisitor.php b/phpstan/phpdoc-parser/src/Ast/AbstractNodeVisitor.php
new file mode 100644
index 000000000..2b9c10ec2
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/AbstractNodeVisitor.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ */
+abstract class AbstractNodeVisitor implements NodeVisitor // phpcs:ignore SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix
+{
+
+	public function beforeTraverse(array $nodes): ?array
+	{
+		return null;
+	}
+
+	public function enterNode(Node $node)
+	{
+		return null;
+	}
+
+	public function leaveNode(Node $node)
+	{
+		return null;
+	}
+
+	public function afterTraverse(array $nodes): ?array
+	{
+		return null;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Attribute.php b/phpstan/phpdoc-parser/src/Ast/Attribute.php
new file mode 100644
index 000000000..1f770dedc
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Attribute.php
@@ -0,0 +1,18 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+final class Attribute
+{
+
+	public const START_LINE = 'startLine';
+	public const END_LINE = 'endLine';
+
+	public const START_INDEX = 'startIndex';
+	public const END_INDEX = 'endIndex';
+
+	public const ORIGINAL_NODE = 'originalNode';
+
+	public const COMMENTS = 'comments';
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Comment.php b/phpstan/phpdoc-parser/src/Ast/Comment.php
new file mode 100644
index 000000000..79e24ebb0
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Comment.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+use function trim;
+
+class Comment
+{
+
+	public string $text;
+
+	public int $startLine;
+
+	public int $startIndex;
+
+	public function __construct(string $text, int $startLine = -1, int $startIndex = -1)
+	{
+		$this->text = $text;
+		$this->startLine = $startLine;
+		$this->startIndex = $startIndex;
+	}
+
+	public function getReformattedText(): string
+	{
+		return trim($this->text);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php
new file mode 100644
index 000000000..cd067cac3
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayItemNode.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ConstExprArrayItemNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public ?ConstExprNode $key = null;
+
+	public ConstExprNode $value;
+
+	public function __construct(?ConstExprNode $key, ConstExprNode $value)
+	{
+		$this->key = $key;
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->key !== null) {
+			return sprintf('%s => %s', $this->key, $this->value);
+
+		}
+
+		return (string) $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php
new file mode 100644
index 000000000..dc7ad4a92
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprArrayNode.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+
+class ConstExprArrayNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	/** @var ConstExprArrayItemNode[] */
+	public array $items;
+
+	/**
+	 * @param ConstExprArrayItemNode[] $items
+	 */
+	public function __construct(array $items)
+	{
+		$this->items = $items;
+	}
+
+
+	public function __toString(): string
+	{
+		return '[' . implode(', ', $this->items) . ']';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFalseNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFalseNode.php
new file mode 100644
index 000000000..e6811277e
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFalseNode.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstExprFalseNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public function __toString(): string
+	{
+		return 'false';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php
new file mode 100644
index 000000000..30ab41ded
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprFloatNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstExprFloatNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php
new file mode 100644
index 000000000..9f0285f35
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprIntegerNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstExprIntegerNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNode.php
new file mode 100644
index 000000000..1859f03e5
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNode.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\Node;
+
+interface ConstExprNode extends Node
+{
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNullNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNullNode.php
new file mode 100644
index 000000000..b6e227715
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprNullNode.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstExprNullNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public function __toString(): string
+	{
+		return 'null';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php
new file mode 100644
index 000000000..26e5ef4a2
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprStringNode.php
@@ -0,0 +1,80 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function addcslashes;
+use function assert;
+use function dechex;
+use function ord;
+use function preg_replace_callback;
+use function sprintf;
+use function str_pad;
+use function strlen;
+use const STR_PAD_LEFT;
+
+class ConstExprStringNode implements ConstExprNode
+{
+
+	public const SINGLE_QUOTED = 1;
+	public const DOUBLE_QUOTED = 2;
+
+	use NodeAttributes;
+
+	public string $value;
+
+	/** @var self::SINGLE_QUOTED|self::DOUBLE_QUOTED */
+	public $quoteType;
+
+	/**
+	 * @param self::SINGLE_QUOTED|self::DOUBLE_QUOTED $quoteType
+	 */
+	public function __construct(string $value, int $quoteType)
+	{
+		$this->value = $value;
+		$this->quoteType = $quoteType;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->quoteType === self::SINGLE_QUOTED) {
+			// from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1007
+			return sprintf("'%s'", addcslashes($this->value, '\'\\'));
+		}
+
+		// from https://github.com/nikic/PHP-Parser/blob/0ffddce52d816f72d0efc4d9b02e276d3309ef01/lib/PhpParser/PrettyPrinter/Standard.php#L1010-L1040
+		return sprintf('"%s"', $this->escapeDoubleQuotedString());
+	}
+
+	private function escapeDoubleQuotedString(): string
+	{
+		$quote = '"';
+		$escaped = addcslashes($this->value, "\n\r\t\f\v$" . $quote . '\\');
+
+		// Escape control characters and non-UTF-8 characters.
+		// Regex based on https://stackoverflow.com/a/11709412/385378.
+		$regex = '/(
+              [\x00-\x08\x0E-\x1F] # Control characters
+            | [\xC0-\xC1] # Invalid UTF-8 Bytes
+            | [\xF5-\xFF] # Invalid UTF-8 Bytes
+            | \xE0(?=[\x80-\x9F]) # Overlong encoding of prior code point
+            | \xF0(?=[\x80-\x8F]) # Overlong encoding of prior code point
+            | [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start
+            | [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start
+            | [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start
+            | (?<=[\x00-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle
+            | (?<![\xC2-\xDF]|[\xE0-\xEF]|[\xE0-\xEF][\x80-\xBF]|[\xF0-\xF4]|[\xF0-\xF4][\x80-\xBF]|[\xF0-\xF4][\x80-\xBF]{2})[\x80-\xBF] # Overlong Sequence
+            | (?<=[\xE0-\xEF])[\x80-\xBF](?![\x80-\xBF]) # Short 3 byte sequence
+            | (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2}) # Short 4 byte sequence
+            | (?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence (2)
+        )/x';
+		return preg_replace_callback($regex, static function ($matches) {
+			assert(strlen($matches[0]) === 1);
+			$hex = dechex(ord($matches[0]));
+
+			return '\\x' . str_pad($hex, 2, '0', STR_PAD_LEFT);
+		}, $escaped);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php
new file mode 100644
index 000000000..ec9803202
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstExprTrueNode.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstExprTrueNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	public function __toString(): string
+	{
+		return 'true';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php
new file mode 100644
index 000000000..51c339891
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/ConstFetchNode.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstFetchNode implements ConstExprNode
+{
+
+	use NodeAttributes;
+
+	/** @var string class name for class constants or empty string for non-class constants */
+	public string $className;
+
+	public string $name;
+
+	public function __construct(string $className, string $name)
+	{
+		$this->className = $className;
+		$this->name = $name;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->className === '') {
+			return $this->name;
+
+		}
+
+		return "{$this->className}::{$this->name}";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php b/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php
new file mode 100644
index 000000000..4515e8926
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/ConstExpr/DoctrineConstExprStringNode.php
@@ -0,0 +1,41 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\ConstExpr;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+use function str_replace;
+use function strlen;
+use function substr;
+
+class DoctrineConstExprStringNode extends ConstExprStringNode
+{
+
+	use NodeAttributes;
+
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		parent::__construct($value, self::DOUBLE_QUOTED);
+		$this->value = $value;
+	}
+
+	public function __toString(): string
+	{
+		return self::escape($this->value);
+	}
+
+	public static function unescape(string $value): string
+	{
+		// from https://github.com/doctrine/annotations/blob/a9ec7af212302a75d1f92fa65d3abfbd16245a2a/lib/Doctrine/Common/Annotations/DocLexer.php#L103-L107
+		return str_replace('""', '"', substr($value, 1, strlen($value) - 2));
+	}
+
+	private static function escape(string $value): string
+	{
+		// from https://github.com/phpstan/phpdoc-parser/issues/205#issuecomment-1662323656
+		return sprintf('"%s"', str_replace('"', '""', $value));
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Node.php b/phpstan/phpdoc-parser/src/Ast/Node.php
new file mode 100644
index 000000000..51a1a19a1
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Node.php
@@ -0,0 +1,22 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+interface Node
+{
+
+	public function __toString(): string;
+
+	/**
+	 * @param mixed $value
+	 */
+	public function setAttribute(string $key, $value): void;
+
+	public function hasAttribute(string $key): bool;
+
+	/**
+	 * @return mixed
+	 */
+	public function getAttribute(string $key);
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php b/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php
new file mode 100644
index 000000000..4f2ca76dd
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/NodeAttributes.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+use function array_key_exists;
+
+trait NodeAttributes
+{
+
+	/** @var array<string, mixed> */
+	private array $attributes = [];
+
+	/**
+	 * @param mixed $value
+	 */
+	public function setAttribute(string $key, $value): void
+	{
+		if ($value === null) {
+			unset($this->attributes[$key]);
+			return;
+		}
+		$this->attributes[$key] = $value;
+	}
+
+	public function hasAttribute(string $key): bool
+	{
+		return array_key_exists($key, $this->attributes);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getAttribute(string $key)
+	{
+		if ($this->hasAttribute($key)) {
+			return $this->attributes[$key];
+		}
+
+		return null;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php b/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php
new file mode 100644
index 000000000..76c88f0ce
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/NodeTraverser.php
@@ -0,0 +1,312 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+use LogicException;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function array_keys;
+use function array_pop;
+use function array_splice;
+use function count;
+use function get_class;
+use function get_object_vars;
+use function gettype;
+use function is_array;
+use function sprintf;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ */
+final class NodeTraverser
+{
+
+	/**
+	 * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CHILDREN, child nodes
+	 * of the current node will not be traversed for any visitors.
+	 *
+	 * For subsequent visitors enterNode() will still be called on the current
+	 * node and leaveNode() will also be invoked for the current node.
+	 */
+	public const DONT_TRAVERSE_CHILDREN = 1;
+
+	/**
+	 * If NodeVisitor::enterNode() or NodeVisitor::leaveNode() returns
+	 * STOP_TRAVERSAL, traversal is aborted.
+	 *
+	 * The afterTraverse() method will still be invoked.
+	 */
+	public const STOP_TRAVERSAL = 2;
+
+	/**
+	 * If NodeVisitor::leaveNode() returns REMOVE_NODE for a node that occurs
+	 * in an array, it will be removed from the array.
+	 *
+	 * For subsequent visitors leaveNode() will still be invoked for the
+	 * removed node.
+	 */
+	public const REMOVE_NODE = 3;
+
+	/**
+	 * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CURRENT_AND_CHILDREN, child nodes
+	 * of the current node will not be traversed for any visitors.
+	 *
+	 * For subsequent visitors enterNode() will not be called as well.
+	 * leaveNode() will be invoked for visitors that has enterNode() method invoked.
+	 */
+	public const DONT_TRAVERSE_CURRENT_AND_CHILDREN = 4;
+
+	/** @var list<NodeVisitor> Visitors */
+	private array $visitors = [];
+
+	/** @var bool Whether traversal should be stopped */
+	private bool $stopTraversal;
+
+	/**
+	 * @param list<NodeVisitor> $visitors
+	 */
+	public function __construct(array $visitors)
+	{
+		$this->visitors = $visitors;
+	}
+
+	/**
+	 * Traverses an array of nodes using the registered visitors.
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return Node[] Traversed array of nodes
+	 */
+	public function traverse(array $nodes): array
+	{
+		$this->stopTraversal = false;
+
+		foreach ($this->visitors as $visitor) {
+			$return = $visitor->beforeTraverse($nodes);
+			if ($return === null) {
+				continue;
+			}
+
+			$nodes = $return;
+		}
+
+		$nodes = $this->traverseArray($nodes);
+
+		foreach ($this->visitors as $visitor) {
+			$return = $visitor->afterTraverse($nodes);
+			if ($return === null) {
+				continue;
+			}
+
+			$nodes = $return;
+		}
+
+		return $nodes;
+	}
+
+	/**
+	 * Recursively traverse a node.
+	 *
+	 * @param Node $node Node to traverse.
+	 *
+	 * @return Node Result of traversal (may be original node or new one)
+	 */
+	private function traverseNode(Node $node): Node
+	{
+		$subNodeNames = array_keys(get_object_vars($node));
+		foreach ($subNodeNames as $name) {
+			$subNode =& $node->$name;
+
+			if (is_array($subNode)) {
+				$subNode = $this->traverseArray($subNode);
+				if ($this->stopTraversal) {
+					break;
+				}
+			} elseif ($subNode instanceof Node) {
+				$traverseChildren = true;
+				$breakVisitorIndex = null;
+
+				foreach ($this->visitors as $visitorIndex => $visitor) {
+					$return = $visitor->enterNode($subNode);
+					if ($return === null) {
+						continue;
+					}
+
+					if ($return instanceof Node) {
+						$this->ensureReplacementReasonable($subNode, $return);
+						$subNode = $return;
+					} elseif ($return === self::DONT_TRAVERSE_CHILDREN) {
+						$traverseChildren = false;
+					} elseif ($return === self::DONT_TRAVERSE_CURRENT_AND_CHILDREN) {
+						$traverseChildren = false;
+						$breakVisitorIndex = $visitorIndex;
+						break;
+					} elseif ($return === self::STOP_TRAVERSAL) {
+						$this->stopTraversal = true;
+						break 2;
+					} else {
+						throw new LogicException(
+							'enterNode() returned invalid value of type ' . gettype($return),
+						);
+					}
+				}
+
+				if ($traverseChildren) {
+					$subNode = $this->traverseNode($subNode);
+					if ($this->stopTraversal) {
+						break;
+					}
+				}
+
+				foreach ($this->visitors as $visitorIndex => $visitor) {
+					$return = $visitor->leaveNode($subNode);
+
+					if ($return !== null) {
+						if ($return instanceof Node) {
+							$this->ensureReplacementReasonable($subNode, $return);
+							$subNode = $return;
+						} elseif ($return === self::STOP_TRAVERSAL) {
+							$this->stopTraversal = true;
+							break 2;
+						} elseif (is_array($return)) {
+							throw new LogicException(
+								'leaveNode() may only return an array ' .
+								'if the parent structure is an array',
+							);
+						} else {
+							throw new LogicException(
+								'leaveNode() returned invalid value of type ' . gettype($return),
+							);
+						}
+					}
+
+					if ($breakVisitorIndex === $visitorIndex) {
+						break;
+					}
+				}
+			}
+		}
+
+		return $node;
+	}
+
+	/**
+	 * Recursively traverse array (usually of nodes).
+	 *
+	 * @param mixed[] $nodes Array to traverse
+	 *
+	 * @return mixed[] Result of traversal (may be original array or changed one)
+	 */
+	private function traverseArray(array $nodes): array
+	{
+		$doNodes = [];
+
+		foreach ($nodes as $i => &$node) {
+			if ($node instanceof Node) {
+				$traverseChildren = true;
+				$breakVisitorIndex = null;
+
+				foreach ($this->visitors as $visitorIndex => $visitor) {
+					$return = $visitor->enterNode($node);
+					if ($return === null) {
+						continue;
+					}
+
+					if ($return instanceof Node) {
+						$this->ensureReplacementReasonable($node, $return);
+						$node = $return;
+					} elseif (is_array($return)) {
+						$doNodes[] = [$i, $return];
+						continue 2;
+					} elseif ($return === self::REMOVE_NODE) {
+						$doNodes[] = [$i, []];
+						continue 2;
+					} elseif ($return === self::DONT_TRAVERSE_CHILDREN) {
+						$traverseChildren = false;
+					} elseif ($return === self::DONT_TRAVERSE_CURRENT_AND_CHILDREN) {
+						$traverseChildren = false;
+						$breakVisitorIndex = $visitorIndex;
+						break;
+					} elseif ($return === self::STOP_TRAVERSAL) {
+						$this->stopTraversal = true;
+						break 2;
+					} else {
+						throw new LogicException(
+							'enterNode() returned invalid value of type ' . gettype($return),
+						);
+					}
+				}
+
+				if ($traverseChildren) {
+					$node = $this->traverseNode($node);
+					if ($this->stopTraversal) {
+						break;
+					}
+				}
+
+				foreach ($this->visitors as $visitorIndex => $visitor) {
+					$return = $visitor->leaveNode($node);
+
+					if ($return !== null) {
+						if ($return instanceof Node) {
+							$this->ensureReplacementReasonable($node, $return);
+							$node = $return;
+						} elseif (is_array($return)) {
+							$doNodes[] = [$i, $return];
+							break;
+						} elseif ($return === self::REMOVE_NODE) {
+							$doNodes[] = [$i, []];
+							break;
+						} elseif ($return === self::STOP_TRAVERSAL) {
+							$this->stopTraversal = true;
+							break 2;
+						} else {
+							throw new LogicException(
+								'leaveNode() returned invalid value of type ' . gettype($return),
+							);
+						}
+					}
+
+					if ($breakVisitorIndex === $visitorIndex) {
+						break;
+					}
+				}
+			} elseif (is_array($node)) {
+				throw new LogicException('Invalid node structure: Contains nested arrays');
+			}
+		}
+
+		if (count($doNodes) > 0) {
+			while ([$i, $replace] = array_pop($doNodes)) {
+				array_splice($nodes, $i, 1, $replace);
+			}
+		}
+
+		return $nodes;
+	}
+
+	private function ensureReplacementReasonable(Node $old, Node $new): void
+	{
+		if ($old instanceof TypeNode && !$new instanceof TypeNode) {
+			throw new LogicException(sprintf('Trying to replace TypeNode with %s', get_class($new)));
+		}
+
+		if ($old instanceof ConstExprNode && !$new instanceof ConstExprNode) {
+			throw new LogicException(sprintf('Trying to replace ConstExprNode with %s', get_class($new)));
+		}
+
+		if ($old instanceof PhpDocChildNode && !$new instanceof PhpDocChildNode) {
+			throw new LogicException(sprintf('Trying to replace PhpDocChildNode with %s', get_class($new)));
+		}
+
+		if ($old instanceof PhpDocTagValueNode && !$new instanceof PhpDocTagValueNode) {
+			throw new LogicException(sprintf('Trying to replace PhpDocTagValueNode with %s', get_class($new)));
+		}
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/NodeVisitor.php b/phpstan/phpdoc-parser/src/Ast/NodeVisitor.php
new file mode 100644
index 000000000..bf7d784e4
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/NodeVisitor.php
@@ -0,0 +1,87 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ */
+interface NodeVisitor
+{
+
+	/**
+	 * Called once before traversal.
+	 *
+	 * Return value semantics:
+	 *  * null:      $nodes stays as-is
+	 *  * otherwise: $nodes is set to the return value
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return Node[]|null Array of nodes
+	 */
+	public function beforeTraverse(array $nodes): ?array;
+
+	/**
+	 * Called when entering a node.
+	 *
+	 * Return value semantics:
+	 *  * null
+	 *        => $node stays as-is
+	 *  * array (of Nodes)
+	 *        => The return value is merged into the parent array (at the position of the $node)
+	 *  * NodeTraverser::REMOVE_NODE
+	 *        => $node is removed from the parent array
+	 *  * NodeTraverser::DONT_TRAVERSE_CHILDREN
+	 *        => Children of $node are not traversed. $node stays as-is
+	 *  * NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN
+	 *        => Further visitors for the current node are skipped, and its children are not
+	 *           traversed. $node stays as-is.
+	 *  * NodeTraverser::STOP_TRAVERSAL
+	 *        => Traversal is aborted. $node stays as-is
+	 *  * otherwise
+	 *        => $node is set to the return value
+	 *
+	 * @param Node $node Node
+	 *
+	 * @return Node|Node[]|NodeTraverser::*|null Replacement node (or special return value)
+	 */
+	public function enterNode(Node $node);
+
+	/**
+	 * Called when leaving a node.
+	 *
+	 * Return value semantics:
+	 *  * null
+	 *        => $node stays as-is
+	 *  * NodeTraverser::REMOVE_NODE
+	 *        => $node is removed from the parent array
+	 *  * NodeTraverser::STOP_TRAVERSAL
+	 *        => Traversal is aborted. $node stays as-is
+	 *  * array (of Nodes)
+	 *        => The return value is merged into the parent array (at the position of the $node)
+	 *  * otherwise
+	 *        => $node is set to the return value
+	 *
+	 * @param Node $node Node
+	 *
+	 * @return Node|Node[]|NodeTraverser::REMOVE_NODE|NodeTraverser::STOP_TRAVERSAL|null Replacement node (or special return value)
+	 */
+	public function leaveNode(Node $node);
+
+	/**
+	 * Called once after traversal.
+	 *
+	 * Return value semantics:
+	 *  * null:      $nodes stays as-is
+	 *  * otherwise: $nodes is set to the return value
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return Node[]|null Array of nodes
+	 */
+	public function afterTraverse(array $nodes): ?array;
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php b/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php
new file mode 100644
index 000000000..486e2aaef
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/NodeVisitor/CloningVisitor.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\NodeVisitor;
+
+use PHPStan\PhpDocParser\Ast\AbstractNodeVisitor;
+use PHPStan\PhpDocParser\Ast\Attribute;
+use PHPStan\PhpDocParser\Ast\Node;
+
+final class CloningVisitor extends AbstractNodeVisitor
+{
+
+	public function enterNode(Node $originalNode): Node
+	{
+		$node = clone $originalNode;
+		$node->setAttribute(Attribute::ORIGINAL_NODE, $originalNode);
+
+		return $node;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php
new file mode 100644
index 000000000..0dfee3141
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagMethodValueNode.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class AssertTagMethodValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $parameter;
+
+	public string $method;
+
+	public bool $isNegated;
+
+	public bool $isEquality;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $parameter, string $method, bool $isNegated, string $description, bool $isEquality)
+	{
+		$this->type = $type;
+		$this->parameter = $parameter;
+		$this->method = $method;
+		$this->isNegated = $isNegated;
+		$this->isEquality = $isEquality;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$isNegated = $this->isNegated ? '!' : '';
+		$isEquality = $this->isEquality ? '=' : '';
+		return trim("{$isNegated}{$isEquality}{$this->type} {$this->parameter}->{$this->method}() {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php
new file mode 100644
index 000000000..8bfd1d0e5
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagPropertyValueNode.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class AssertTagPropertyValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $parameter;
+
+	public string $property;
+
+	public bool $isNegated;
+
+	public bool $isEquality;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $parameter, string $property, bool $isNegated, string $description, bool $isEquality)
+	{
+		$this->type = $type;
+		$this->parameter = $parameter;
+		$this->property = $property;
+		$this->isNegated = $isNegated;
+		$this->isEquality = $isEquality;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$isNegated = $this->isNegated ? '!' : '';
+		$isEquality = $this->isEquality ? '=' : '';
+		return trim("{$isNegated}{$isEquality}{$this->type} {$this->parameter}->{$this->property} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php
new file mode 100644
index 000000000..5dc9e8c3c
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/AssertTagValueNode.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class AssertTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $parameter;
+
+	public bool $isNegated;
+
+	public bool $isEquality;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $parameter, bool $isNegated, string $description, bool $isEquality)
+	{
+		$this->type = $type;
+		$this->parameter = $parameter;
+		$this->isNegated = $isNegated;
+		$this->isEquality = $isEquality;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$isNegated = $this->isNegated ? '!' : '';
+		$isEquality = $this->isEquality ? '=' : '';
+		return trim("{$isNegated}{$isEquality}{$this->type} {$this->parameter} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php
new file mode 100644
index 000000000..facdd2b42
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/DeprecatedTagValueNode.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class DeprecatedTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(string $description)
+	{
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim($this->description);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php
new file mode 100644
index 000000000..778b21fa0
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineAnnotation.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+
+class DoctrineAnnotation implements Node
+{
+
+	use NodeAttributes;
+
+	public string $name;
+
+	/** @var list<DoctrineArgument> */
+	public array $arguments;
+
+	/**
+	 * @param list<DoctrineArgument> $arguments
+	 */
+	public function __construct(string $name, array $arguments)
+	{
+		$this->name = $name;
+		$this->arguments = $arguments;
+	}
+
+	public function __toString(): string
+	{
+		$arguments = implode(', ', $this->arguments);
+		return $this->name . '(' . $arguments . ')';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php
new file mode 100644
index 000000000..30fe98796
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArgument.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+
+/**
+ * @phpstan-type ValueType = DoctrineAnnotation|IdentifierTypeNode|DoctrineArray|ConstExprNode
+ */
+class DoctrineArgument implements Node
+{
+
+	use NodeAttributes;
+
+	public ?IdentifierTypeNode $key = null;
+
+	/** @var ValueType */
+	public $value;
+
+	/**
+	 * @param ValueType $value
+	 */
+	public function __construct(?IdentifierTypeNode $key, $value)
+	{
+		$this->key = $key;
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->key === null) {
+			return (string) $this->value;
+		}
+
+		return $this->key . '=' . $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php
new file mode 100644
index 000000000..06686a521
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArray.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+
+class DoctrineArray implements Node
+{
+
+	use NodeAttributes;
+
+	/** @var list<DoctrineArrayItem> */
+	public array $items;
+
+	/**
+	 * @param list<DoctrineArrayItem> $items
+	 */
+	public function __construct(array $items)
+	{
+		$this->items = $items;
+	}
+
+	public function __toString(): string
+	{
+		$items = implode(', ', $this->items);
+
+		return '{' . $items . '}';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArrayItem.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArrayItem.php
new file mode 100644
index 000000000..d2dbf2b67
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineArrayItem.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+
+/**
+ * @phpstan-import-type ValueType from DoctrineArgument
+ * @phpstan-type KeyType = ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|ConstFetchNode|null
+ */
+class DoctrineArrayItem implements Node
+{
+
+	use NodeAttributes;
+
+	/** @var KeyType */
+	public $key;
+
+	/** @var ValueType */
+	public $value;
+
+	/**
+	 * @param KeyType $key
+	 * @param ValueType $value
+	 */
+	public function __construct($key, $value)
+	{
+		$this->key = $key;
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->key === null) {
+			return (string) $this->value;
+		}
+
+		return $this->key . '=' . $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php
new file mode 100644
index 000000000..3940e24fb
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/Doctrine/DoctrineTagValueNode.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use function trim;
+
+class DoctrineTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public DoctrineAnnotation $annotation;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+
+	public function __construct(
+		DoctrineAnnotation $annotation,
+		string $description
+	)
+	{
+		$this->annotation = $annotation;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->annotation} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php
new file mode 100644
index 000000000..d9bbeec56
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ExtendsTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use function trim;
+
+class ExtendsTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public GenericTypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(GenericTypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php
new file mode 100644
index 000000000..de77051a0
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/GenericTagValueNode.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class GenericTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	/** @var string (may be empty) */
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php
new file mode 100644
index 000000000..34a30b0d3
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ImplementsTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use function trim;
+
+class ImplementsTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public GenericTypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(GenericTypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php
new file mode 100644
index 000000000..7bb20b222
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/InvalidTagValueNode.php
@@ -0,0 +1,53 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Parser\ParserException;
+use function sprintf;
+use function trigger_error;
+use const E_USER_WARNING;
+
+/**
+ * @property ParserException $exception
+ */
+class InvalidTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	/** @var string (may be empty) */
+	public string $value;
+
+	/** @var mixed[] */
+	private array $exceptionArgs;
+
+	public function __construct(string $value, ParserException $exception)
+	{
+		$this->value = $value;
+		$this->exceptionArgs = [
+			$exception->getCurrentTokenValue(),
+			$exception->getCurrentTokenType(),
+			$exception->getCurrentOffset(),
+			$exception->getExpectedTokenType(),
+			$exception->getExpectedTokenValue(),
+			$exception->getCurrentTokenLine(),
+		];
+	}
+
+	public function __get(string $name): ?ParserException
+	{
+		if ($name !== 'exception') {
+			trigger_error(sprintf('Undefined property: %s::$%s', self::class, $name), E_USER_WARNING);
+			return null;
+		}
+
+		return new ParserException(...$this->exceptionArgs);
+	}
+
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php
new file mode 100644
index 000000000..223d6e476
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueNode.php
@@ -0,0 +1,55 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function count;
+use function implode;
+
+class MethodTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public bool $isStatic;
+
+	public ?TypeNode $returnType = null;
+
+	public string $methodName;
+
+	/** @var TemplateTagValueNode[] */
+	public array $templateTypes;
+
+	/** @var MethodTagValueParameterNode[] */
+	public array $parameters;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	/**
+	 * @param MethodTagValueParameterNode[] $parameters
+	 * @param TemplateTagValueNode[] $templateTypes
+	 */
+	public function __construct(bool $isStatic, ?TypeNode $returnType, string $methodName, array $parameters, string $description, array $templateTypes)
+	{
+		$this->isStatic = $isStatic;
+		$this->returnType = $returnType;
+		$this->methodName = $methodName;
+		$this->parameters = $parameters;
+		$this->description = $description;
+		$this->templateTypes = $templateTypes;
+	}
+
+
+	public function __toString(): string
+	{
+		$static = $this->isStatic ? 'static ' : '';
+		$returnType = $this->returnType !== null ? "{$this->returnType} " : '';
+		$parameters = implode(', ', $this->parameters);
+		$description = $this->description !== '' ? " {$this->description}" : '';
+		$templateTypes = count($this->templateTypes) > 0 ? '<' . implode(', ', $this->templateTypes) . '>' : '';
+		return "{$static}{$returnType}{$this->methodName}{$templateTypes}({$parameters}){$description}";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php
new file mode 100644
index 000000000..ebf33e324
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MethodTagValueParameterNode.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+
+class MethodTagValueParameterNode implements Node
+{
+
+	use NodeAttributes;
+
+	public ?TypeNode $type = null;
+
+	public bool $isReference;
+
+	public bool $isVariadic;
+
+	public string $parameterName;
+
+	public ?ConstExprNode $defaultValue = null;
+
+	public function __construct(?TypeNode $type, bool $isReference, bool $isVariadic, string $parameterName, ?ConstExprNode $defaultValue)
+	{
+		$this->type = $type;
+		$this->isReference = $isReference;
+		$this->isVariadic = $isVariadic;
+		$this->parameterName = $parameterName;
+		$this->defaultValue = $defaultValue;
+	}
+
+
+	public function __toString(): string
+	{
+		$type = $this->type !== null ? "{$this->type} " : '';
+		$isReference = $this->isReference ? '&' : '';
+		$isVariadic = $this->isVariadic ? '...' : '';
+		$default = $this->defaultValue !== null ? " = {$this->defaultValue}" : '';
+		return "{$type}{$isReference}{$isVariadic}{$this->parameterName}{$default}";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php
new file mode 100644
index 000000000..7a4e43ead
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/MixinTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class MixinTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php
new file mode 100644
index 000000000..54feff9e8
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamClosureThisTagValueNode.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class ParamClosureThisTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $parameterName, string $description)
+	{
+		$this->type = $type;
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php
new file mode 100644
index 000000000..9a6761f7d
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamImmediatelyInvokedCallableTagValueNode.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class ParamImmediatelyInvokedCallableTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(string $parameterName, string $description)
+	{
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+	public function __toString(): string
+	{
+		return trim("{$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php
new file mode 100644
index 000000000..84db67a9c
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamLaterInvokedCallableTagValueNode.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class ParamLaterInvokedCallableTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(string $parameterName, string $description)
+	{
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+	public function __toString(): string
+	{
+		return trim("{$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php
new file mode 100644
index 000000000..3e89f9d7f
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamOutTagValueNode.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class ParamOutTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $parameterName, string $description)
+	{
+		$this->type = $type;
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php
new file mode 100644
index 000000000..8d1ef27a8
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ParamTagValueNode.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class ParamTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public bool $isReference;
+
+	public bool $isVariadic;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, bool $isVariadic, string $parameterName, string $description, bool $isReference)
+	{
+		$this->type = $type;
+		$this->isReference = $isReference;
+		$this->isVariadic = $isVariadic;
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$reference = $this->isReference ? '&' : '';
+		$variadic = $this->isVariadic ? '...' : '';
+		return trim("{$this->type} {$reference}{$variadic}{$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocChildNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocChildNode.php
new file mode 100644
index 000000000..6162f92df
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocChildNode.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\Node;
+
+interface PhpDocChildNode extends Node
+{
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php
new file mode 100644
index 000000000..a3dd3e4cd
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocNode.php
@@ -0,0 +1,401 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function array_column;
+use function array_filter;
+use function array_map;
+use function implode;
+
+class PhpDocNode implements Node
+{
+
+	use NodeAttributes;
+
+	/** @var PhpDocChildNode[] */
+	public array $children;
+
+	/**
+	 * @param PhpDocChildNode[] $children
+	 */
+	public function __construct(array $children)
+	{
+		$this->children = $children;
+	}
+
+
+	/**
+	 * @return PhpDocTagNode[]
+	 */
+	public function getTags(): array
+	{
+		return array_filter($this->children, static fn (PhpDocChildNode $child): bool => $child instanceof PhpDocTagNode);
+	}
+
+
+	/**
+	 * @return PhpDocTagNode[]
+	 */
+	public function getTagsByName(string $tagName): array
+	{
+		return array_filter($this->getTags(), static fn (PhpDocTagNode $tag): bool => $tag->name === $tagName);
+	}
+
+
+	/**
+	 * @return VarTagValueNode[]
+	 */
+	public function getVarTagValues(string $tagName = '@var'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof VarTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ParamTagValueNode[]
+	 */
+	public function getParamTagValues(string $tagName = '@param'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return TypelessParamTagValueNode[]
+	 */
+	public function getTypelessParamTagValues(string $tagName = '@param'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof TypelessParamTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ParamImmediatelyInvokedCallableTagValueNode[]
+	 */
+	public function getParamImmediatelyInvokedCallableTagValues(string $tagName = '@param-immediately-invoked-callable'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamImmediatelyInvokedCallableTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ParamLaterInvokedCallableTagValueNode[]
+	 */
+	public function getParamLaterInvokedCallableTagValues(string $tagName = '@param-later-invoked-callable'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamLaterInvokedCallableTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ParamClosureThisTagValueNode[]
+	 */
+	public function getParamClosureThisTagValues(string $tagName = '@param-closure-this'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamClosureThisTagValueNode,
+		);
+	}
+
+	/**
+	 * @return PureUnlessCallableIsImpureTagValueNode[]
+	 */
+	public function getPureUnlessCallableIsImpureTagValues(string $tagName = '@pure-unless-callable-is-impure'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof PureUnlessCallableIsImpureTagValueNode,
+		);
+	}
+
+	/**
+	 * @return TemplateTagValueNode[]
+	 */
+	public function getTemplateTagValues(string $tagName = '@template'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof TemplateTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ExtendsTagValueNode[]
+	 */
+	public function getExtendsTagValues(string $tagName = '@extends'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ExtendsTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ImplementsTagValueNode[]
+	 */
+	public function getImplementsTagValues(string $tagName = '@implements'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ImplementsTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return UsesTagValueNode[]
+	 */
+	public function getUsesTagValues(string $tagName = '@use'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof UsesTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ReturnTagValueNode[]
+	 */
+	public function getReturnTagValues(string $tagName = '@return'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ReturnTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ThrowsTagValueNode[]
+	 */
+	public function getThrowsTagValues(string $tagName = '@throws'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ThrowsTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return MixinTagValueNode[]
+	 */
+	public function getMixinTagValues(string $tagName = '@mixin'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof MixinTagValueNode,
+		);
+	}
+
+	/**
+	 * @return RequireExtendsTagValueNode[]
+	 */
+	public function getRequireExtendsTagValues(string $tagName = '@phpstan-require-extends'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof RequireExtendsTagValueNode,
+		);
+	}
+
+	/**
+	 * @return RequireImplementsTagValueNode[]
+	 */
+	public function getRequireImplementsTagValues(string $tagName = '@phpstan-require-implements'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof RequireImplementsTagValueNode,
+		);
+	}
+
+	/**
+	 * @return SealedTagValueNode[]
+	 */
+	public function getSealedTagValues(string $tagName = '@phpstan-sealed'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof SealedTagValueNode,
+		);
+	}
+
+	/**
+	 * @return DeprecatedTagValueNode[]
+	 */
+	public function getDeprecatedTagValues(): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName('@deprecated'), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof DeprecatedTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return PropertyTagValueNode[]
+	 */
+	public function getPropertyTagValues(string $tagName = '@property'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return PropertyTagValueNode[]
+	 */
+	public function getPropertyReadTagValues(string $tagName = '@property-read'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return PropertyTagValueNode[]
+	 */
+	public function getPropertyWriteTagValues(string $tagName = '@property-write'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof PropertyTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return MethodTagValueNode[]
+	 */
+	public function getMethodTagValues(string $tagName = '@method'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof MethodTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return TypeAliasTagValueNode[]
+	 */
+	public function getTypeAliasTagValues(string $tagName = '@phpstan-type'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof TypeAliasTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return TypeAliasImportTagValueNode[]
+	 */
+	public function getTypeAliasImportTagValues(string $tagName = '@phpstan-import-type'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof TypeAliasImportTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return AssertTagValueNode[]
+	 */
+	public function getAssertTagValues(string $tagName = '@phpstan-assert'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return AssertTagPropertyValueNode[]
+	 */
+	public function getAssertPropertyTagValues(string $tagName = '@phpstan-assert'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagPropertyValueNode,
+		);
+	}
+
+
+	/**
+	 * @return AssertTagMethodValueNode[]
+	 */
+	public function getAssertMethodTagValues(string $tagName = '@phpstan-assert'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof AssertTagMethodValueNode,
+		);
+	}
+
+
+	/**
+	 * @return SelfOutTagValueNode[]
+	 */
+	public function getSelfOutTypeTagValues(string $tagName = '@phpstan-this-out'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof SelfOutTagValueNode,
+		);
+	}
+
+
+	/**
+	 * @return ParamOutTagValueNode[]
+	 */
+	public function getParamOutTypeTagValues(string $tagName = '@param-out'): array
+	{
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static fn (PhpDocTagValueNode $value): bool => $value instanceof ParamOutTagValueNode,
+		);
+	}
+
+
+	public function __toString(): string
+	{
+		$children = array_map(
+			static function (PhpDocChildNode $child): string {
+				$s = (string) $child;
+				return $s === '' ? '' : ' ' . $s;
+			},
+			$this->children,
+		);
+		return "/**\n *" . implode("\n *", $children) . "\n */";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php
new file mode 100644
index 000000000..cac2feeb9
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagNode.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineTagValueNode;
+use function trim;
+
+class PhpDocTagNode implements PhpDocChildNode
+{
+
+	use NodeAttributes;
+
+	public string $name;
+
+	public PhpDocTagValueNode $value;
+
+	public function __construct(string $name, PhpDocTagValueNode $value)
+	{
+		$this->name = $name;
+		$this->value = $value;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->value instanceof DoctrineTagValueNode) {
+			return (string) $this->value;
+		}
+
+		return trim("{$this->name} {$this->value}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php
new file mode 100644
index 000000000..7723fa0c4
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTagValueNode.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\Node;
+
+interface PhpDocTagValueNode extends Node
+{
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php
new file mode 100644
index 000000000..97a96894d
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PhpDocTextNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class PhpDocTextNode implements PhpDocChildNode
+{
+
+	use NodeAttributes;
+
+	public string $text;
+
+	public function __construct(string $text)
+	{
+		$this->text = $text;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->text;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php
new file mode 100644
index 000000000..cbf622f8d
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PropertyTagValueNode.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class PropertyTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public string $propertyName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $propertyName, string $description)
+	{
+		$this->type = $type;
+		$this->propertyName = $propertyName;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->propertyName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php
new file mode 100644
index 000000000..1a0cff89a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/PureUnlessCallableIsImpureTagValueNode.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class PureUnlessCallableIsImpureTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(string $parameterName, string $description)
+	{
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+	public function __toString(): string
+	{
+		return trim("{$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php
new file mode 100644
index 000000000..5d8e1d22a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireExtendsTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class RequireExtendsTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php
new file mode 100644
index 000000000..6b7f7baed
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/RequireImplementsTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class RequireImplementsTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php
new file mode 100644
index 000000000..c063bf480
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ReturnTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class ReturnTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/SealedTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/SealedTagValueNode.php
new file mode 100644
index 000000000..230cf3e8d
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/SealedTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class SealedTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php
new file mode 100644
index 000000000..d2377620b
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/SelfOutTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class SelfOutTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim($this->type . ' ' . $this->description);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php
new file mode 100644
index 000000000..ba1068255
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TemplateTagValueNode.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class TemplateTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	/** @var non-empty-string */
+	public string $name;
+
+	public ?TypeNode $bound;
+
+	public ?TypeNode $default;
+
+	public ?TypeNode $lowerBound;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	/**
+	 * @param non-empty-string $name
+	 */
+	public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode $default = null, ?TypeNode $lowerBound = null)
+	{
+		$this->name = $name;
+		$this->bound = $bound;
+		$this->lowerBound = $lowerBound;
+		$this->default = $default;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$upperBound = $this->bound !== null ? " of {$this->bound}" : '';
+		$lowerBound = $this->lowerBound !== null ? " super {$this->lowerBound}" : '';
+		$default = $this->default !== null ? " = {$this->default}" : '';
+		return trim("{$this->name}{$upperBound}{$lowerBound}{$default} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php
new file mode 100644
index 000000000..dc5521b49
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/ThrowsTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class ThrowsTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php
new file mode 100644
index 000000000..d0f945d24
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasImportTagValueNode.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use function trim;
+
+class TypeAliasImportTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public string $importedAlias;
+
+	public IdentifierTypeNode $importedFrom;
+
+	public ?string $importedAs = null;
+
+	public function __construct(string $importedAlias, IdentifierTypeNode $importedFrom, ?string $importedAs)
+	{
+		$this->importedAlias = $importedAlias;
+		$this->importedFrom = $importedFrom;
+		$this->importedAs = $importedAs;
+	}
+
+	public function __toString(): string
+	{
+		return trim(
+			"{$this->importedAlias} from {$this->importedFrom}"
+			. ($this->importedAs !== null ? " as {$this->importedAs}" : ''),
+		);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php
new file mode 100644
index 000000000..ae366b50d
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypeAliasTagValueNode.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class TypeAliasTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public string $alias;
+
+	public TypeNode $type;
+
+	public function __construct(string $alias, TypeNode $type)
+	{
+		$this->alias = $alias;
+		$this->type = $type;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->alias} {$this->type}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php
new file mode 100644
index 000000000..bb99e7819
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/TypelessParamTagValueNode.php
@@ -0,0 +1,38 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class TypelessParamTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public bool $isReference;
+
+	public bool $isVariadic;
+
+	public string $parameterName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(bool $isVariadic, string $parameterName, string $description, bool $isReference)
+	{
+		$this->isReference = $isReference;
+		$this->isVariadic = $isVariadic;
+		$this->parameterName = $parameterName;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		$reference = $this->isReference ? '&' : '';
+		$variadic = $this->isVariadic ? '...' : '';
+		return trim("{$reference}{$variadic}{$this->parameterName} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php
new file mode 100644
index 000000000..b33fff607
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/UsesTagValueNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use function trim;
+
+class UsesTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public GenericTypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(GenericTypeNode $type, string $description)
+	{
+		$this->type = $type;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("{$this->type} {$this->description}");
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php b/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php
new file mode 100644
index 000000000..5b0538c8a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/PhpDoc/VarTagValueNode.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use function trim;
+
+class VarTagValueNode implements PhpDocTagValueNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	/** @var string (may be empty) */
+	public string $variableName;
+
+	/** @var string (may be empty) */
+	public string $description;
+
+	public function __construct(TypeNode $type, string $variableName, string $description)
+	{
+		$this->type = $type;
+		$this->variableName = $variableName;
+		$this->description = $description;
+	}
+
+
+	public function __toString(): string
+	{
+		return trim("$this->type " . trim("{$this->variableName} {$this->description}"));
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php
new file mode 100644
index 000000000..11c611d46
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeItemNode.php
@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ArrayShapeItemNode implements Node
+{
+
+	use NodeAttributes;
+
+	/** @var ConstExprIntegerNode|ConstExprStringNode|ConstFetchNode|IdentifierTypeNode|null */
+	public $keyName;
+
+	public bool $optional;
+
+	public TypeNode $valueType;
+
+	/**
+	 * @param ConstExprIntegerNode|ConstExprStringNode|ConstFetchNode|IdentifierTypeNode|null $keyName
+	 */
+	public function __construct($keyName, bool $optional, TypeNode $valueType)
+	{
+		$this->keyName = $keyName;
+		$this->optional = $optional;
+		$this->valueType = $valueType;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->keyName !== null) {
+			return sprintf(
+				'%s%s: %s',
+				(string) $this->keyName,
+				$this->optional ? '?' : '',
+				(string) $this->valueType,
+			);
+		}
+
+		return (string) $this->valueType;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php
new file mode 100644
index 000000000..1d9cf850e
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeNode.php
@@ -0,0 +1,76 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+
+class ArrayShapeNode implements TypeNode
+{
+
+	public const KIND_ARRAY = 'array';
+	public const KIND_LIST = 'list';
+	public const KIND_NON_EMPTY_ARRAY = 'non-empty-array';
+	public const KIND_NON_EMPTY_LIST = 'non-empty-list';
+
+	use NodeAttributes;
+
+	/** @var ArrayShapeItemNode[] */
+	public array $items;
+
+	public bool $sealed;
+
+	/** @var self::KIND_* */
+	public $kind;
+
+	public ?ArrayShapeUnsealedTypeNode $unsealedType = null;
+
+	/**
+	 * @param ArrayShapeItemNode[] $items
+	 * @param self::KIND_* $kind
+	 */
+	private function __construct(
+		array $items,
+		bool $sealed = true,
+		?ArrayShapeUnsealedTypeNode $unsealedType = null,
+		string $kind = self::KIND_ARRAY
+	)
+	{
+		$this->items = $items;
+		$this->sealed = $sealed;
+		$this->unsealedType = $unsealedType;
+		$this->kind = $kind;
+	}
+
+
+	/**
+	 * @param ArrayShapeItemNode[] $items
+	 * @param self::KIND_* $kind
+	 */
+	public static function createSealed(array $items, string $kind = self::KIND_ARRAY): self
+	{
+		return new self($items, true, null, $kind);
+	}
+
+	/**
+	 * @param ArrayShapeItemNode[] $items
+	 * @param self::KIND_* $kind
+	 */
+	public static function createUnsealed(array $items, ?ArrayShapeUnsealedTypeNode $unsealedType, string $kind = self::KIND_ARRAY): self
+	{
+		return new self($items, false, $unsealedType, $kind);
+	}
+
+
+	public function __toString(): string
+	{
+		$items = $this->items;
+
+		if (! $this->sealed) {
+			$items[] = '...' . $this->unsealedType;
+		}
+
+		return $this->kind . '{' . implode(', ', $items) . '}';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php
new file mode 100644
index 000000000..68d6b36fb
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ArrayShapeUnsealedTypeNode.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ArrayShapeUnsealedTypeNode implements Node
+{
+
+	use NodeAttributes;
+
+	public TypeNode $valueType;
+
+	public ?TypeNode $keyType = null;
+
+	public function __construct(TypeNode $valueType, ?TypeNode $keyType)
+	{
+		$this->valueType = $valueType;
+		$this->keyType = $keyType;
+	}
+
+	public function __toString(): string
+	{
+		if ($this->keyType !== null) {
+			return sprintf('<%s, %s>', $this->keyType, $this->valueType);
+		}
+		return sprintf('<%s>', $this->valueType);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php
new file mode 100644
index 000000000..95c020d88
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ArrayTypeNode.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ArrayTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public function __construct(TypeNode $type)
+	{
+		$this->type = $type;
+	}
+
+
+	public function __toString(): string
+	{
+		if (
+			$this->type instanceof CallableTypeNode
+			|| $this->type instanceof ConstTypeNode
+			|| $this->type instanceof NullableTypeNode
+		) {
+			return '(' . $this->type . ')[]';
+		}
+
+		return $this->type . '[]';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php
new file mode 100644
index 000000000..0a9e3442a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php
@@ -0,0 +1,50 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use function implode;
+
+class CallableTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public IdentifierTypeNode $identifier;
+
+	/** @var TemplateTagValueNode[] */
+	public array $templateTypes;
+
+	/** @var CallableTypeParameterNode[] */
+	public array $parameters;
+
+	public TypeNode $returnType;
+
+	/**
+	 * @param CallableTypeParameterNode[] $parameters
+	 * @param TemplateTagValueNode[]  $templateTypes
+	 */
+	public function __construct(IdentifierTypeNode $identifier, array $parameters, TypeNode $returnType, array $templateTypes)
+	{
+		$this->identifier = $identifier;
+		$this->parameters = $parameters;
+		$this->returnType = $returnType;
+		$this->templateTypes = $templateTypes;
+	}
+
+
+	public function __toString(): string
+	{
+		$returnType = $this->returnType;
+		if ($returnType instanceof self) {
+			$returnType = "({$returnType})";
+		}
+		$template = $this->templateTypes !== []
+			? '<' . implode(', ', $this->templateTypes) . '>'
+			: '';
+		$parameters = implode(', ', $this->parameters);
+		return "{$this->identifier}{$template}({$parameters}): {$returnType}";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php b/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php
new file mode 100644
index 000000000..08119670c
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeParameterNode.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function trim;
+
+class CallableTypeParameterNode implements Node
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public bool $isReference;
+
+	public bool $isVariadic;
+
+	/** @var string (may be empty) */
+	public string $parameterName;
+
+	public bool $isOptional;
+
+	public function __construct(TypeNode $type, bool $isReference, bool $isVariadic, string $parameterName, bool $isOptional)
+	{
+		$this->type = $type;
+		$this->isReference = $isReference;
+		$this->isVariadic = $isVariadic;
+		$this->parameterName = $parameterName;
+		$this->isOptional = $isOptional;
+	}
+
+
+	public function __toString(): string
+	{
+		$type = "{$this->type} ";
+		$isReference = $this->isReference ? '&' : '';
+		$isVariadic = $this->isVariadic ? '...' : '';
+		$isOptional = $this->isOptional ? '=' : '';
+		return trim("{$type}{$isReference}{$isVariadic}{$this->parameterName}") . $isOptional;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php
new file mode 100644
index 000000000..4c120d225
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeForParameterNode.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ConditionalTypeForParameterNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public string $parameterName;
+
+	public TypeNode $targetType;
+
+	public TypeNode $if;
+
+	public TypeNode $else;
+
+	public bool $negated;
+
+	public function __construct(string $parameterName, TypeNode $targetType, TypeNode $if, TypeNode $else, bool $negated)
+	{
+		$this->parameterName = $parameterName;
+		$this->targetType = $targetType;
+		$this->if = $if;
+		$this->else = $else;
+		$this->negated = $negated;
+	}
+
+	public function __toString(): string
+	{
+		return sprintf(
+			'(%s %s %s ? %s : %s)',
+			$this->parameterName,
+			$this->negated ? 'is not' : 'is',
+			$this->targetType,
+			$this->if,
+			$this->else,
+		);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php
new file mode 100644
index 000000000..89c1c63f5
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ConditionalTypeNode.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ConditionalTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $subjectType;
+
+	public TypeNode $targetType;
+
+	public TypeNode $if;
+
+	public TypeNode $else;
+
+	public bool $negated;
+
+	public function __construct(TypeNode $subjectType, TypeNode $targetType, TypeNode $if, TypeNode $else, bool $negated)
+	{
+		$this->subjectType = $subjectType;
+		$this->targetType = $targetType;
+		$this->if = $if;
+		$this->else = $else;
+		$this->negated = $negated;
+	}
+
+	public function __toString(): string
+	{
+		return sprintf(
+			'(%s %s %s ? %s : %s)',
+			$this->subjectType,
+			$this->negated ? 'is not' : 'is',
+			$this->targetType,
+			$this->if,
+			$this->else,
+		);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php
new file mode 100644
index 000000000..22823e5b1
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ConstTypeNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ConstTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public ConstExprNode $constExpr;
+
+	public function __construct(ConstExprNode $constExpr)
+	{
+		$this->constExpr = $constExpr;
+	}
+
+	public function __toString(): string
+	{
+		return $this->constExpr->__toString();
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php
new file mode 100644
index 000000000..4e52c00a5
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/GenericTypeNode.php
@@ -0,0 +1,57 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+use function sprintf;
+
+class GenericTypeNode implements TypeNode
+{
+
+	public const VARIANCE_INVARIANT = 'invariant';
+	public const VARIANCE_COVARIANT = 'covariant';
+	public const VARIANCE_CONTRAVARIANT = 'contravariant';
+	public const VARIANCE_BIVARIANT = 'bivariant';
+
+	use NodeAttributes;
+
+	public IdentifierTypeNode $type;
+
+	/** @var TypeNode[] */
+	public array $genericTypes;
+
+	/** @var (self::VARIANCE_*)[] */
+	public array $variances;
+
+	/**
+	 * @param TypeNode[] $genericTypes
+	 * @param (self::VARIANCE_*)[] $variances
+	 */
+	public function __construct(IdentifierTypeNode $type, array $genericTypes, array $variances = [])
+	{
+		$this->type = $type;
+		$this->genericTypes = $genericTypes;
+		$this->variances = $variances;
+	}
+
+
+	public function __toString(): string
+	{
+		$genericTypes = [];
+
+		foreach ($this->genericTypes as $index => $type) {
+			$variance = $this->variances[$index] ?? self::VARIANCE_INVARIANT;
+			if ($variance === self::VARIANCE_INVARIANT) {
+				$genericTypes[] = (string) $type;
+			} elseif ($variance === self::VARIANCE_BIVARIANT) {
+				$genericTypes[] = '*';
+			} else {
+				$genericTypes[] = sprintf('%s %s', $variance, $type);
+			}
+		}
+
+		return $this->type . '<' . implode(', ', $genericTypes) . '>';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php
new file mode 100644
index 000000000..df93fa869
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/IdentifierTypeNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class IdentifierTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public string $name;
+
+	public function __construct(string $name)
+	{
+		$this->name = $name;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->name;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php
new file mode 100644
index 000000000..b3059cf5c
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/IntersectionTypeNode.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function array_map;
+use function implode;
+
+class IntersectionTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	/** @var TypeNode[] */
+	public array $types;
+
+	/**
+	 * @param TypeNode[] $types
+	 */
+	public function __construct(array $types)
+	{
+		$this->types = $types;
+	}
+
+
+	public function __toString(): string
+	{
+		return '(' . implode(' & ', array_map(static function (TypeNode $type): string {
+			if ($type instanceof NullableTypeNode) {
+				return '(' . $type . ')';
+			}
+
+			return (string) $type;
+		}, $this->types)) . ')';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php
new file mode 100644
index 000000000..318176e71
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/InvalidTypeNode.php
@@ -0,0 +1,38 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use PHPStan\PhpDocParser\Parser\ParserException;
+
+class InvalidTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	/** @var mixed[] */
+	private array $exceptionArgs;
+
+	public function __construct(ParserException $exception)
+	{
+		$this->exceptionArgs = [
+			$exception->getCurrentTokenValue(),
+			$exception->getCurrentTokenType(),
+			$exception->getCurrentOffset(),
+			$exception->getExpectedTokenType(),
+			$exception->getExpectedTokenValue(),
+			$exception->getCurrentTokenLine(),
+		];
+	}
+
+	public function getException(): ParserException
+	{
+		return new ParserException(...$this->exceptionArgs);
+	}
+
+	public function __toString(): string
+	{
+		return '*Invalid type*';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php
new file mode 100644
index 000000000..080a13f21
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/NullableTypeNode.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class NullableTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public function __construct(TypeNode $type)
+	{
+		$this->type = $type;
+	}
+
+
+	public function __toString(): string
+	{
+		return '?' . $this->type;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php
new file mode 100644
index 000000000..f7aa9efbe
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeItemNode.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function sprintf;
+
+class ObjectShapeItemNode implements Node
+{
+
+	use NodeAttributes;
+
+	/** @var ConstExprStringNode|IdentifierTypeNode */
+	public $keyName;
+
+	public bool $optional;
+
+	public TypeNode $valueType;
+
+	/**
+	 * @param ConstExprStringNode|IdentifierTypeNode $keyName
+	 */
+	public function __construct($keyName, bool $optional, TypeNode $valueType)
+	{
+		$this->keyName = $keyName;
+		$this->optional = $optional;
+		$this->valueType = $valueType;
+	}
+
+
+	public function __toString(): string
+	{
+		if ($this->keyName !== null) {
+			return sprintf(
+				'%s%s: %s',
+				(string) $this->keyName,
+				$this->optional ? '?' : '',
+				(string) $this->valueType,
+			);
+		}
+
+		return (string) $this->valueType;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php
new file mode 100644
index 000000000..41dc68c3a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ObjectShapeNode.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function implode;
+
+class ObjectShapeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	/** @var ObjectShapeItemNode[] */
+	public array $items;
+
+	/**
+	 * @param ObjectShapeItemNode[] $items
+	 */
+	public function __construct(array $items)
+	{
+		$this->items = $items;
+	}
+
+	public function __toString(): string
+	{
+		$items = $this->items;
+
+		return 'object{' . implode(', ', $items) . '}';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php
new file mode 100644
index 000000000..4bd67d8d7
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/OffsetAccessTypeNode.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class OffsetAccessTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public TypeNode $type;
+
+	public TypeNode $offset;
+
+	public function __construct(TypeNode $type, TypeNode $offset)
+	{
+		$this->type = $type;
+		$this->offset = $offset;
+	}
+
+	public function __toString(): string
+	{
+		if (
+			$this->type instanceof CallableTypeNode
+			|| $this->type instanceof NullableTypeNode
+		) {
+			return '(' . $this->type . ')[' . $this->offset . ']';
+		}
+
+		return $this->type . '[' . $this->offset . ']';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/ThisTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/ThisTypeNode.php
new file mode 100644
index 000000000..d94e6f838
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/ThisTypeNode.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+
+class ThisTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	public function __toString(): string
+	{
+		return '$this';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php
new file mode 100644
index 000000000..849e04e06
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/TypeNode.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\Node;
+
+interface TypeNode extends Node
+{
+
+}
diff --git a/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php b/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php
new file mode 100644
index 000000000..602cb3dd2
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Ast/Type/UnionTypeNode.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\Type;
+
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
+use function array_map;
+use function implode;
+
+class UnionTypeNode implements TypeNode
+{
+
+	use NodeAttributes;
+
+	/** @var TypeNode[] */
+	public array $types;
+
+	/**
+	 * @param TypeNode[] $types
+	 */
+	public function __construct(array $types)
+	{
+		$this->types = $types;
+	}
+
+
+	public function __toString(): string
+	{
+		return '(' . implode(' | ', array_map(static function (TypeNode $type): string {
+			if ($type instanceof NullableTypeNode) {
+				return '(' . $type . ')';
+			}
+
+				return (string) $type;
+		}, $this->types)) . ')';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Lexer/Lexer.php b/phpstan/phpdoc-parser/src/Lexer/Lexer.php
new file mode 100644
index 000000000..b26691317
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Lexer/Lexer.php
@@ -0,0 +1,199 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Lexer;
+
+use PHPStan\PhpDocParser\ParserConfig;
+use function implode;
+use function preg_match_all;
+use const PREG_SET_ORDER;
+
+/**
+ * Implementation based on Nette Tokenizer (New BSD License; https://github.com/nette/tokenizer)
+ */
+class Lexer
+{
+
+	public const TOKEN_REFERENCE = 0;
+	public const TOKEN_UNION = 1;
+	public const TOKEN_INTERSECTION = 2;
+	public const TOKEN_NULLABLE = 3;
+	public const TOKEN_OPEN_PARENTHESES = 4;
+	public const TOKEN_CLOSE_PARENTHESES = 5;
+	public const TOKEN_OPEN_ANGLE_BRACKET = 6;
+	public const TOKEN_CLOSE_ANGLE_BRACKET = 7;
+	public const TOKEN_OPEN_SQUARE_BRACKET = 8;
+	public const TOKEN_CLOSE_SQUARE_BRACKET = 9;
+	public const TOKEN_COMMA = 10;
+	public const TOKEN_VARIADIC = 11;
+	public const TOKEN_DOUBLE_COLON = 12;
+	public const TOKEN_DOUBLE_ARROW = 13;
+	public const TOKEN_EQUAL = 14;
+	public const TOKEN_OPEN_PHPDOC = 15;
+	public const TOKEN_CLOSE_PHPDOC = 16;
+	public const TOKEN_PHPDOC_TAG = 17;
+	public const TOKEN_DOCTRINE_TAG = 18;
+	public const TOKEN_FLOAT = 19;
+	public const TOKEN_INTEGER = 20;
+	public const TOKEN_SINGLE_QUOTED_STRING = 21;
+	public const TOKEN_DOUBLE_QUOTED_STRING = 22;
+	public const TOKEN_DOCTRINE_ANNOTATION_STRING = 23;
+	public const TOKEN_IDENTIFIER = 24;
+	public const TOKEN_THIS_VARIABLE = 25;
+	public const TOKEN_VARIABLE = 26;
+	public const TOKEN_HORIZONTAL_WS = 27;
+	public const TOKEN_PHPDOC_EOL = 28;
+	public const TOKEN_OTHER = 29;
+	public const TOKEN_END = 30;
+	public const TOKEN_COLON = 31;
+	public const TOKEN_WILDCARD = 32;
+	public const TOKEN_OPEN_CURLY_BRACKET = 33;
+	public const TOKEN_CLOSE_CURLY_BRACKET = 34;
+	public const TOKEN_NEGATED = 35;
+	public const TOKEN_ARROW = 36;
+
+	public const TOKEN_COMMENT = 37;
+
+	public const TOKEN_LABELS = [
+		self::TOKEN_REFERENCE => '\'&\'',
+		self::TOKEN_UNION => '\'|\'',
+		self::TOKEN_INTERSECTION => '\'&\'',
+		self::TOKEN_NULLABLE => '\'?\'',
+		self::TOKEN_NEGATED => '\'!\'',
+		self::TOKEN_OPEN_PARENTHESES => '\'(\'',
+		self::TOKEN_CLOSE_PARENTHESES => '\')\'',
+		self::TOKEN_OPEN_ANGLE_BRACKET => '\'<\'',
+		self::TOKEN_CLOSE_ANGLE_BRACKET => '\'>\'',
+		self::TOKEN_OPEN_SQUARE_BRACKET => '\'[\'',
+		self::TOKEN_CLOSE_SQUARE_BRACKET => '\']\'',
+		self::TOKEN_OPEN_CURLY_BRACKET => '\'{\'',
+		self::TOKEN_CLOSE_CURLY_BRACKET => '\'}\'',
+		self::TOKEN_COMMA => '\',\'',
+		self::TOKEN_COMMENT => '\'//\'',
+		self::TOKEN_COLON => '\':\'',
+		self::TOKEN_VARIADIC => '\'...\'',
+		self::TOKEN_DOUBLE_COLON => '\'::\'',
+		self::TOKEN_DOUBLE_ARROW => '\'=>\'',
+		self::TOKEN_ARROW => '\'->\'',
+		self::TOKEN_EQUAL => '\'=\'',
+		self::TOKEN_OPEN_PHPDOC => '\'/**\'',
+		self::TOKEN_CLOSE_PHPDOC => '\'*/\'',
+		self::TOKEN_PHPDOC_TAG => 'TOKEN_PHPDOC_TAG',
+		self::TOKEN_DOCTRINE_TAG => 'TOKEN_DOCTRINE_TAG',
+		self::TOKEN_PHPDOC_EOL => 'TOKEN_PHPDOC_EOL',
+		self::TOKEN_FLOAT => 'TOKEN_FLOAT',
+		self::TOKEN_INTEGER => 'TOKEN_INTEGER',
+		self::TOKEN_SINGLE_QUOTED_STRING => 'TOKEN_SINGLE_QUOTED_STRING',
+		self::TOKEN_DOUBLE_QUOTED_STRING => 'TOKEN_DOUBLE_QUOTED_STRING',
+		self::TOKEN_DOCTRINE_ANNOTATION_STRING => 'TOKEN_DOCTRINE_ANNOTATION_STRING',
+		self::TOKEN_IDENTIFIER => 'type',
+		self::TOKEN_THIS_VARIABLE => '\'$this\'',
+		self::TOKEN_VARIABLE => 'variable',
+		self::TOKEN_HORIZONTAL_WS => 'TOKEN_HORIZONTAL_WS',
+		self::TOKEN_OTHER => 'TOKEN_OTHER',
+		self::TOKEN_END => 'TOKEN_END',
+		self::TOKEN_WILDCARD => '*',
+	];
+
+	public const VALUE_OFFSET = 0;
+	public const TYPE_OFFSET = 1;
+	public const LINE_OFFSET = 2;
+
+	private ParserConfig $config; // @phpstan-ignore property.onlyWritten
+
+	private ?string $regexp = null;
+
+	public function __construct(ParserConfig $config)
+	{
+		$this->config = $config;
+	}
+
+
+	/**
+	 * @return list<array{string, int, int}>
+	 */
+	public function tokenize(string $s): array
+	{
+		if ($this->regexp === null) {
+			$this->regexp = $this->generateRegexp();
+		}
+
+		preg_match_all($this->regexp, $s, $matches, PREG_SET_ORDER);
+
+		$tokens = [];
+		$line = 1;
+		foreach ($matches as $match) {
+			$type = (int) $match['MARK'];
+			$tokens[] = [$match[0], $type, $line];
+			if ($type !== self::TOKEN_PHPDOC_EOL) {
+				continue;
+			}
+
+			$line++;
+		}
+
+		$tokens[] = ['', self::TOKEN_END, $line];
+
+		return $tokens;
+	}
+
+
+	private function generateRegexp(): string
+	{
+		$patterns = [
+			self::TOKEN_HORIZONTAL_WS => '[\\x09\\x20]++',
+
+			self::TOKEN_IDENTIFIER => '(?:[\\\\]?+[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF-]*+)++',
+			self::TOKEN_THIS_VARIABLE => '\\$this(?![0-9a-z_\\x80-\\xFF])',
+			self::TOKEN_VARIABLE => '\\$[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF]*+',
+
+			// '&' followed by TOKEN_VARIADIC, TOKEN_VARIABLE, TOKEN_EQUAL, TOKEN_EQUAL or TOKEN_CLOSE_PARENTHESES
+			self::TOKEN_REFERENCE => '&(?=\\s*+(?:[.,=)]|(?:\\$(?!this(?![0-9a-z_\\x80-\\xFF])))))',
+			self::TOKEN_UNION => '\\|',
+			self::TOKEN_INTERSECTION => '&',
+			self::TOKEN_NULLABLE => '\\?',
+			self::TOKEN_NEGATED => '!',
+
+			self::TOKEN_OPEN_PARENTHESES => '\\(',
+			self::TOKEN_CLOSE_PARENTHESES => '\\)',
+			self::TOKEN_OPEN_ANGLE_BRACKET => '<',
+			self::TOKEN_CLOSE_ANGLE_BRACKET => '>',
+			self::TOKEN_OPEN_SQUARE_BRACKET => '\\[',
+			self::TOKEN_CLOSE_SQUARE_BRACKET => '\\]',
+			self::TOKEN_OPEN_CURLY_BRACKET => '\\{',
+			self::TOKEN_CLOSE_CURLY_BRACKET => '\\}',
+
+			self::TOKEN_COMMA => ',',
+			self::TOKEN_COMMENT => '\/\/[^\\r\\n]*(?=\n|\r|\*/)',
+			self::TOKEN_VARIADIC => '\\.\\.\\.',
+			self::TOKEN_DOUBLE_COLON => '::',
+			self::TOKEN_DOUBLE_ARROW => '=>',
+			self::TOKEN_ARROW => '->',
+			self::TOKEN_EQUAL => '=',
+			self::TOKEN_COLON => ':',
+
+			self::TOKEN_OPEN_PHPDOC => '/\\*\\*(?=\\s)\\x20?+',
+			self::TOKEN_CLOSE_PHPDOC => '\\*/',
+			self::TOKEN_PHPDOC_TAG => '@(?:[a-z][a-z0-9-\\\\]+:)?[a-z][a-z0-9-\\\\]*+',
+			self::TOKEN_DOCTRINE_TAG => '@[a-z_\\\\][a-z0-9_\:\\\\]*[a-z_][a-z0-9_]*',
+			self::TOKEN_PHPDOC_EOL => '\\r?+\\n[\\x09\\x20]*+(?:\\*(?!/)\\x20?+)?',
+
+			self::TOKEN_FLOAT => '[+\-]?(?:(?:[0-9]++(_[0-9]++)*\\.[0-9]*+(_[0-9]++)*(?:e[+\-]?[0-9]++(_[0-9]++)*)?)|(?:[0-9]*+(_[0-9]++)*\\.[0-9]++(_[0-9]++)*(?:e[+\-]?[0-9]++(_[0-9]++)*)?)|(?:[0-9]++(_[0-9]++)*e[+\-]?[0-9]++(_[0-9]++)*))',
+			self::TOKEN_INTEGER => '[+\-]?(?:(?:0b[0-1]++(_[0-1]++)*)|(?:0o[0-7]++(_[0-7]++)*)|(?:0x[0-9a-f]++(_[0-9a-f]++)*)|(?:[0-9]++(_[0-9]++)*))',
+			self::TOKEN_SINGLE_QUOTED_STRING => '\'(?:\\\\[^\\r\\n]|[^\'\\r\\n\\\\])*+\'',
+			self::TOKEN_DOUBLE_QUOTED_STRING => '"(?:\\\\[^\\r\\n]|[^"\\r\\n\\\\])*+"',
+			self::TOKEN_DOCTRINE_ANNOTATION_STRING => '"(?:""|[^"])*+"',
+
+			self::TOKEN_WILDCARD => '\\*',
+
+			// anything but TOKEN_CLOSE_PHPDOC or TOKEN_HORIZONTAL_WS or TOKEN_EOL
+			self::TOKEN_OTHER => '(?:(?!\\*/)[^\\s])++',
+		];
+
+		foreach ($patterns as $type => &$pattern) {
+			$pattern = '(?:' . $pattern . ')(*MARK:' . $type . ')';
+		}
+
+		return '~' . implode('|', $patterns) . '~Asi';
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php b/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php
new file mode 100644
index 000000000..396b8d7c7
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/ConstExprParser.php
@@ -0,0 +1,292 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use PHPStan\PhpDocParser\Ast;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\ParserConfig;
+use function str_replace;
+use function strtolower;
+
+class ConstExprParser
+{
+
+	private ParserConfig $config;
+
+	private bool $parseDoctrineStrings;
+
+	public function __construct(
+		ParserConfig $config
+	)
+	{
+		$this->config = $config;
+		$this->parseDoctrineStrings = false;
+	}
+
+	/**
+	 * @internal
+	 */
+	public function toDoctrine(): self
+	{
+		$self = new self($this->config);
+		$self->parseDoctrineStrings = true;
+		return $self;
+	}
+
+	public function parse(TokenIterator $tokens): Ast\ConstExpr\ConstExprNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_FLOAT)) {
+			$value = $tokens->currentTokenValue();
+			$tokens->next();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\ConstExpr\ConstExprFloatNode(str_replace('_', '', $value)),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_INTEGER)) {
+			$value = $tokens->currentTokenValue();
+			$tokens->next();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\ConstExpr\ConstExprIntegerNode(str_replace('_', '', $value)),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		if ($this->parseDoctrineStrings && $tokens->isCurrentTokenType(Lexer::TOKEN_DOCTRINE_ANNOTATION_STRING)) {
+			$value = $tokens->currentTokenValue();
+			$tokens->next();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\ConstExpr\DoctrineConstExprStringNode(Ast\ConstExpr\DoctrineConstExprStringNode::unescape($value)),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING, Lexer::TOKEN_DOUBLE_QUOTED_STRING)) {
+			if ($this->parseDoctrineStrings) {
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) {
+					throw new ParserException(
+						$tokens->currentTokenValue(),
+						$tokens->currentTokenType(),
+						$tokens->currentTokenOffset(),
+						Lexer::TOKEN_DOUBLE_QUOTED_STRING,
+						null,
+						$tokens->currentTokenLine(),
+					);
+				}
+
+				$value = $tokens->currentTokenValue();
+				$tokens->next();
+
+				return $this->enrichWithAttributes(
+					$tokens,
+					$this->parseDoctrineString($value, $tokens),
+					$startLine,
+					$startIndex,
+				);
+			}
+
+			$value = StringUnescaper::unescapeString($tokens->currentTokenValue());
+			$type = $tokens->currentTokenType();
+			$tokens->next();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\ConstExpr\ConstExprStringNode(
+					$value,
+					$type === Lexer::TOKEN_SINGLE_QUOTED_STRING
+						? Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED
+						: Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED,
+				),
+				$startLine,
+				$startIndex,
+			);
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			$identifier = $tokens->currentTokenValue();
+			$tokens->next();
+
+			switch (strtolower($identifier)) {
+				case 'true':
+					return $this->enrichWithAttributes(
+						$tokens,
+						new Ast\ConstExpr\ConstExprTrueNode(),
+						$startLine,
+						$startIndex,
+					);
+				case 'false':
+					return $this->enrichWithAttributes(
+						$tokens,
+						new Ast\ConstExpr\ConstExprFalseNode(),
+						$startLine,
+						$startIndex,
+					);
+				case 'null':
+					return $this->enrichWithAttributes(
+						$tokens,
+						new Ast\ConstExpr\ConstExprNullNode(),
+						$startLine,
+						$startIndex,
+					);
+				case 'array':
+					$tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES);
+					return $this->parseArray($tokens, Lexer::TOKEN_CLOSE_PARENTHESES, $startIndex);
+			}
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+				$classConstantName = '';
+				$lastType = null;
+				while (true) {
+					if ($lastType !== Lexer::TOKEN_IDENTIFIER && $tokens->currentTokenType() === Lexer::TOKEN_IDENTIFIER) {
+						$classConstantName .= $tokens->currentTokenValue();
+						$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+						$lastType = Lexer::TOKEN_IDENTIFIER;
+
+						continue;
+					}
+
+					if ($lastType !== Lexer::TOKEN_WILDCARD && $tokens->tryConsumeTokenType(Lexer::TOKEN_WILDCARD)) {
+						$classConstantName .= '*';
+						$lastType = Lexer::TOKEN_WILDCARD;
+
+						if ($tokens->getSkippedHorizontalWhiteSpaceIfAny() !== '') {
+							break;
+						}
+
+						continue;
+					}
+
+					if ($lastType === null) {
+						// trigger parse error if nothing valid was consumed
+						$tokens->consumeTokenType(Lexer::TOKEN_WILDCARD);
+					}
+
+					break;
+				}
+
+				return $this->enrichWithAttributes(
+					$tokens,
+					new Ast\ConstExpr\ConstFetchNode($identifier, $classConstantName),
+					$startLine,
+					$startIndex,
+				);
+
+			}
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\ConstExpr\ConstFetchNode('', $identifier),
+				$startLine,
+				$startIndex,
+			);
+
+		} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+			return $this->parseArray($tokens, Lexer::TOKEN_CLOSE_SQUARE_BRACKET, $startIndex);
+		}
+
+		throw new ParserException(
+			$tokens->currentTokenValue(),
+			$tokens->currentTokenType(),
+			$tokens->currentTokenOffset(),
+			Lexer::TOKEN_IDENTIFIER,
+			null,
+			$tokens->currentTokenLine(),
+		);
+	}
+
+
+	private function parseArray(TokenIterator $tokens, int $endToken, int $startIndex): Ast\ConstExpr\ConstExprArrayNode
+	{
+		$items = [];
+
+		$startLine = $tokens->currentTokenLine();
+
+		if (!$tokens->tryConsumeTokenType($endToken)) {
+			do {
+				$items[] = $this->parseArrayItem($tokens);
+			} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA) && !$tokens->isCurrentTokenType($endToken));
+			$tokens->consumeTokenType($endToken);
+		}
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\ConstExpr\ConstExprArrayNode($items),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+
+	/**
+	 * This method is supposed to be called with TokenIterator after reading TOKEN_DOUBLE_QUOTED_STRING and shifting
+	 * to the next token.
+	 */
+	public function parseDoctrineString(string $text, TokenIterator $tokens): Ast\ConstExpr\DoctrineConstExprStringNode
+	{
+		// Because of how Lexer works, a valid Doctrine string
+		// can consist of a sequence of TOKEN_DOUBLE_QUOTED_STRING and TOKEN_DOCTRINE_ANNOTATION_STRING
+		while ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING, Lexer::TOKEN_DOCTRINE_ANNOTATION_STRING)) {
+			$text .= $tokens->currentTokenValue();
+			$tokens->next();
+		}
+
+		return new Ast\ConstExpr\DoctrineConstExprStringNode(Ast\ConstExpr\DoctrineConstExprStringNode::unescape($text));
+	}
+
+
+	private function parseArrayItem(TokenIterator $tokens): Ast\ConstExpr\ConstExprArrayItemNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		$expr = $this->parse($tokens);
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_DOUBLE_ARROW)) {
+			$key = $expr;
+			$value = $this->parse($tokens);
+
+		} else {
+			$key = null;
+			$value = $expr;
+		}
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\ConstExpr\ConstExprArrayItemNode($key, $value),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	/**
+	 * @template T of Ast\ConstExpr\ConstExprNode
+	 * @param T $node
+	 * @return T
+	 */
+	private function enrichWithAttributes(TokenIterator $tokens, Ast\ConstExpr\ConstExprNode $node, int $startLine, int $startIndex): Ast\ConstExpr\ConstExprNode
+	{
+		if ($this->config->useLinesAttributes) {
+			$node->setAttribute(Ast\Attribute::START_LINE, $startLine);
+			$node->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine());
+		}
+
+		if ($this->config->useIndexAttributes) {
+			$node->setAttribute(Ast\Attribute::START_INDEX, $startIndex);
+			$node->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken());
+		}
+
+		return $node;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/ParserException.php b/phpstan/phpdoc-parser/src/Parser/ParserException.php
new file mode 100644
index 000000000..ae72fd9c4
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/ParserException.php
@@ -0,0 +1,100 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use Exception;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use function assert;
+use function json_encode;
+use function sprintf;
+use const JSON_INVALID_UTF8_SUBSTITUTE;
+use const JSON_UNESCAPED_SLASHES;
+use const JSON_UNESCAPED_UNICODE;
+
+class ParserException extends Exception
+{
+
+	private string $currentTokenValue;
+
+	private int $currentTokenType;
+
+	private int $currentOffset;
+
+	private int $expectedTokenType;
+
+	private ?string $expectedTokenValue;
+
+	private ?int $currentTokenLine;
+
+	public function __construct(
+		string $currentTokenValue,
+		int $currentTokenType,
+		int $currentOffset,
+		int $expectedTokenType,
+		?string $expectedTokenValue,
+		?int $currentTokenLine
+	)
+	{
+		$this->currentTokenValue = $currentTokenValue;
+		$this->currentTokenType = $currentTokenType;
+		$this->currentOffset = $currentOffset;
+		$this->expectedTokenType = $expectedTokenType;
+		$this->expectedTokenValue = $expectedTokenValue;
+		$this->currentTokenLine = $currentTokenLine;
+
+		parent::__construct(sprintf(
+			'Unexpected token %s, expected %s%s at offset %d%s',
+			$this->formatValue($currentTokenValue),
+			Lexer::TOKEN_LABELS[$expectedTokenType],
+			$expectedTokenValue !== null ? sprintf(' (%s)', $this->formatValue($expectedTokenValue)) : '',
+			$currentOffset,
+			$currentTokenLine === null ? '' : sprintf(' on line %d', $currentTokenLine),
+		));
+	}
+
+
+	public function getCurrentTokenValue(): string
+	{
+		return $this->currentTokenValue;
+	}
+
+
+	public function getCurrentTokenType(): int
+	{
+		return $this->currentTokenType;
+	}
+
+
+	public function getCurrentOffset(): int
+	{
+		return $this->currentOffset;
+	}
+
+
+	public function getExpectedTokenType(): int
+	{
+		return $this->expectedTokenType;
+	}
+
+
+	public function getExpectedTokenValue(): ?string
+	{
+		return $this->expectedTokenValue;
+	}
+
+
+	public function getCurrentTokenLine(): ?int
+	{
+		return $this->currentTokenLine;
+	}
+
+
+	private function formatValue(string $value): string
+	{
+		$json = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE);
+		assert($json !== false);
+
+		return $json;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php b/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php
new file mode 100644
index 000000000..f36b91364
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php
@@ -0,0 +1,1265 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use LogicException;
+use PHPStan\PhpDocParser\Ast;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\ParserConfig;
+use PHPStan\ShouldNotHappenException;
+use function array_key_exists;
+use function count;
+use function rtrim;
+use function str_replace;
+use function trim;
+
+/**
+ * @phpstan-import-type ValueType from Doctrine\DoctrineArgument as DoctrineValueType
+ */
+class PhpDocParser
+{
+
+	private const DISALLOWED_DESCRIPTION_START_TOKENS = [
+		Lexer::TOKEN_UNION,
+		Lexer::TOKEN_INTERSECTION,
+	];
+
+	private ParserConfig $config;
+
+	private TypeParser $typeParser;
+
+	private ConstExprParser $constantExprParser;
+
+	private ConstExprParser $doctrineConstantExprParser;
+
+	public function __construct(
+		ParserConfig $config,
+		TypeParser $typeParser,
+		ConstExprParser $constantExprParser
+	)
+	{
+		$this->config = $config;
+		$this->typeParser = $typeParser;
+		$this->constantExprParser = $constantExprParser;
+		$this->doctrineConstantExprParser = $constantExprParser->toDoctrine();
+	}
+
+
+	public function parse(TokenIterator $tokens): Ast\PhpDoc\PhpDocNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_PHPDOC);
+		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+
+		$children = [];
+
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
+			$lastChild = $this->parseChild($tokens);
+			$children[] = $lastChild;
+			while (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
+				if (
+					$lastChild instanceof Ast\PhpDoc\PhpDocTagNode
+					&& (
+						$lastChild->value instanceof Doctrine\DoctrineTagValueNode
+						|| $lastChild->value instanceof Ast\PhpDoc\GenericTagValueNode
+					)
+				) {
+					$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+					if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
+						break;
+					}
+					$lastChild = $this->parseChild($tokens);
+					$children[] = $lastChild;
+					continue;
+				}
+
+				if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+					break;
+				}
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
+					break;
+				}
+
+				$lastChild = $this->parseChild($tokens);
+				$children[] = $lastChild;
+			}
+		}
+
+		try {
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PHPDOC);
+		} catch (ParserException $e) {
+			$name = '';
+			$startLine = $tokens->currentTokenLine();
+			$startIndex = $tokens->currentTokenIndex();
+			if (count($children) > 0) {
+				$lastChild = $children[count($children) - 1];
+				if ($lastChild instanceof Ast\PhpDoc\PhpDocTagNode) {
+					$name = $lastChild->name;
+					$startLine = $tokens->currentTokenLine();
+					$startIndex = $tokens->currentTokenIndex();
+				}
+			}
+
+			$tag = new Ast\PhpDoc\PhpDocTagNode(
+				$name,
+				$this->enrichWithAttributes(
+					$tokens,
+					new Ast\PhpDoc\InvalidTagValueNode($e->getMessage(), $e),
+					$startLine,
+					$startIndex,
+				),
+			);
+
+			$tokens->forwardToTheEnd();
+
+			$comments = $tokens->flushComments();
+			if ($comments !== []) {
+				throw new LogicException('Comments should already be flushed');
+			}
+
+			return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocNode([$this->enrichWithAttributes($tokens, $tag, $startLine, $startIndex)]), 1, 0);
+		}
+
+		$comments = $tokens->flushComments();
+		if ($comments !== []) {
+			throw new LogicException('Comments should already be flushed');
+		}
+
+		return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocNode($children), 1, 0);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseChild(TokenIterator $tokens): Ast\PhpDoc\PhpDocChildNode
+	{
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG)) {
+			$startLine = $tokens->currentTokenLine();
+			$startIndex = $tokens->currentTokenIndex();
+			return $this->enrichWithAttributes($tokens, $this->parseTag($tokens), $startLine, $startIndex);
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_DOCTRINE_TAG)) {
+			$startLine = $tokens->currentTokenLine();
+			$startIndex = $tokens->currentTokenIndex();
+			$tag = $tokens->currentTokenValue();
+			$tokens->next();
+
+			$tagStartLine = $tokens->currentTokenLine();
+			$tagStartIndex = $tokens->currentTokenIndex();
+
+			return $this->enrichWithAttributes($tokens, new Ast\PhpDoc\PhpDocTagNode(
+				$tag,
+				$this->enrichWithAttributes(
+					$tokens,
+					$this->parseDoctrineTagValue($tokens, $tag),
+					$tagStartLine,
+					$tagStartIndex,
+				),
+			), $startLine, $startIndex);
+		}
+
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		$text = $this->parseText($tokens);
+
+		return $this->enrichWithAttributes($tokens, $text, $startLine, $startIndex);
+	}
+
+	/**
+	 * @template T of Ast\Node
+	 * @param T $tag
+	 * @return T
+	 */
+	private function enrichWithAttributes(TokenIterator $tokens, Ast\Node $tag, int $startLine, int $startIndex): Ast\Node
+	{
+		if ($this->config->useLinesAttributes) {
+			$tag->setAttribute(Ast\Attribute::START_LINE, $startLine);
+			$tag->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine());
+		}
+
+		if ($this->config->useIndexAttributes) {
+			$tag->setAttribute(Ast\Attribute::START_INDEX, $startIndex);
+			$tag->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken());
+		}
+
+		return $tag;
+	}
+
+
+	private function parseText(TokenIterator $tokens): Ast\PhpDoc\PhpDocTextNode
+	{
+		$text = '';
+
+		$endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END];
+
+		$savepoint = false;
+
+		// if the next token is EOL, everything below is skipped and empty string is returned
+		while (true) {
+			$tmpText = $tokens->getSkippedHorizontalWhiteSpaceIfAny() . $tokens->joinUntil(Lexer::TOKEN_PHPDOC_EOL, ...$endTokens);
+			$text .= $tmpText;
+
+			// stop if we're not at EOL - meaning it's the end of PHPDoc
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) {
+				break;
+			}
+
+			if (!$savepoint) {
+				$tokens->pushSavePoint();
+				$savepoint = true;
+			} elseif ($tmpText !== '') {
+				$tokens->dropSavePoint();
+				$tokens->pushSavePoint();
+			}
+
+			$tokens->pushSavePoint();
+			$tokens->next();
+
+			// if we're at EOL, check what's next
+			// if next is a PHPDoc tag, EOL, or end of PHPDoc, stop
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_DOCTRINE_TAG, ...$endTokens)) {
+				$tokens->rollback();
+				break;
+			}
+
+			// otherwise if the next is text, continue building the description string
+
+			$tokens->dropSavePoint();
+			$text .= $tokens->getDetectedNewline() ?? "\n";
+		}
+
+		if ($savepoint) {
+			$tokens->rollback();
+			$text = rtrim($text, $tokens->getDetectedNewline() ?? "\n");
+		}
+
+		return new Ast\PhpDoc\PhpDocTextNode(trim($text, " \t"));
+	}
+
+
+	private function parseOptionalDescriptionAfterDoctrineTag(TokenIterator $tokens): string
+	{
+		$text = '';
+
+		$endTokens = [Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END];
+
+		$savepoint = false;
+
+		// if the next token is EOL, everything below is skipped and empty string is returned
+		while (true) {
+			$tmpText = $tokens->getSkippedHorizontalWhiteSpaceIfAny() . $tokens->joinUntil(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_DOCTRINE_TAG, Lexer::TOKEN_PHPDOC_EOL, ...$endTokens);
+			$text .= $tmpText;
+
+			// stop if we're not at EOL - meaning it's the end of PHPDoc
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) {
+				if (!$tokens->isPrecededByHorizontalWhitespace()) {
+					return trim($text . $this->parseText($tokens)->text, " \t");
+				}
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG)) {
+					$tokens->pushSavePoint();
+					$child = $this->parseChild($tokens);
+					if ($child instanceof Ast\PhpDoc\PhpDocTagNode) {
+						if (
+							$child->value instanceof Ast\PhpDoc\GenericTagValueNode
+							|| $child->value instanceof Doctrine\DoctrineTagValueNode
+						) {
+							$tokens->rollback();
+							break;
+						}
+						if ($child->value instanceof Ast\PhpDoc\InvalidTagValueNode) {
+							$tokens->rollback();
+							$tokens->pushSavePoint();
+							$tokens->next();
+							if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+								$tokens->rollback();
+								break;
+							}
+							$tokens->rollback();
+							return trim($text . $this->parseText($tokens)->text, " \t");
+						}
+					}
+
+					$tokens->rollback();
+					return trim($text . $this->parseText($tokens)->text, " \t");
+				}
+				break;
+			}
+
+			if (!$savepoint) {
+				$tokens->pushSavePoint();
+				$savepoint = true;
+			} elseif ($tmpText !== '') {
+				$tokens->dropSavePoint();
+				$tokens->pushSavePoint();
+			}
+
+			$tokens->pushSavePoint();
+			$tokens->next();
+
+			// if we're at EOL, check what's next
+			// if next is a PHPDoc tag, EOL, or end of PHPDoc, stop
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_DOCTRINE_TAG, ...$endTokens)) {
+				$tokens->rollback();
+				break;
+			}
+
+			// otherwise if the next is text, continue building the description string
+
+			$tokens->dropSavePoint();
+			$text .= $tokens->getDetectedNewline() ?? "\n";
+		}
+
+		if ($savepoint) {
+			$tokens->rollback();
+			$text = rtrim($text, $tokens->getDetectedNewline() ?? "\n");
+		}
+
+		return trim($text, " \t");
+	}
+
+
+	public function parseTag(TokenIterator $tokens): Ast\PhpDoc\PhpDocTagNode
+	{
+		$tag = $tokens->currentTokenValue();
+		$tokens->next();
+		$value = $this->parseTagValue($tokens, $tag);
+
+		return new Ast\PhpDoc\PhpDocTagNode($tag, $value);
+	}
+
+
+	public function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\PhpDocTagValueNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		try {
+			$tokens->pushSavePoint();
+
+			switch ($tag) {
+				case '@param':
+				case '@phpstan-param':
+				case '@psalm-param':
+				case '@phan-param':
+					$tagValue = $this->parseParamTagValue($tokens);
+					break;
+
+				case '@param-immediately-invoked-callable':
+				case '@phpstan-param-immediately-invoked-callable':
+					$tagValue = $this->parseParamImmediatelyInvokedCallableTagValue($tokens);
+					break;
+
+				case '@param-later-invoked-callable':
+				case '@phpstan-param-later-invoked-callable':
+					$tagValue = $this->parseParamLaterInvokedCallableTagValue($tokens);
+					break;
+
+				case '@param-closure-this':
+				case '@phpstan-param-closure-this':
+					$tagValue = $this->parseParamClosureThisTagValue($tokens);
+					break;
+
+				case '@pure-unless-callable-is-impure':
+				case '@phpstan-pure-unless-callable-is-impure':
+					$tagValue = $this->parsePureUnlessCallableIsImpureTagValue($tokens);
+					break;
+
+				case '@var':
+				case '@phpstan-var':
+				case '@psalm-var':
+				case '@phan-var':
+					$tagValue = $this->parseVarTagValue($tokens);
+					break;
+
+				case '@return':
+				case '@phpstan-return':
+				case '@psalm-return':
+				case '@phan-return':
+				case '@phan-real-return':
+					$tagValue = $this->parseReturnTagValue($tokens);
+					break;
+
+				case '@throws':
+				case '@phpstan-throws':
+					$tagValue = $this->parseThrowsTagValue($tokens);
+					break;
+
+				case '@mixin':
+				case '@phan-mixin':
+					$tagValue = $this->parseMixinTagValue($tokens);
+					break;
+
+				case '@psalm-require-extends':
+				case '@phpstan-require-extends':
+					$tagValue = $this->parseRequireExtendsTagValue($tokens);
+					break;
+
+				case '@psalm-require-implements':
+				case '@phpstan-require-implements':
+					$tagValue = $this->parseRequireImplementsTagValue($tokens);
+					break;
+
+				case '@psalm-inheritors':
+				case '@phpstan-sealed':
+					$tagValue = $this->parseSealedTagValue($tokens);
+					break;
+
+				case '@deprecated':
+					$tagValue = $this->parseDeprecatedTagValue($tokens);
+					break;
+
+				case '@property':
+				case '@property-read':
+				case '@property-write':
+				case '@phpstan-property':
+				case '@phpstan-property-read':
+				case '@phpstan-property-write':
+				case '@psalm-property':
+				case '@psalm-property-read':
+				case '@psalm-property-write':
+				case '@phan-property':
+				case '@phan-property-read':
+				case '@phan-property-write':
+					$tagValue = $this->parsePropertyTagValue($tokens);
+					break;
+
+				case '@method':
+				case '@phpstan-method':
+				case '@psalm-method':
+				case '@phan-method':
+					$tagValue = $this->parseMethodTagValue($tokens);
+					break;
+
+				case '@template':
+				case '@phpstan-template':
+				case '@psalm-template':
+				case '@phan-template':
+				case '@template-covariant':
+				case '@phpstan-template-covariant':
+				case '@psalm-template-covariant':
+				case '@template-contravariant':
+				case '@phpstan-template-contravariant':
+				case '@psalm-template-contravariant':
+					$tagValue = $this->typeParser->parseTemplateTagValue(
+						$tokens,
+						fn ($tokens) => $this->parseOptionalDescription($tokens, true),
+					);
+					break;
+
+				case '@extends':
+				case '@phpstan-extends':
+				case '@phan-extends':
+				case '@phan-inherits':
+				case '@template-extends':
+					$tagValue = $this->parseExtendsTagValue('@extends', $tokens);
+					break;
+
+				case '@implements':
+				case '@phpstan-implements':
+				case '@template-implements':
+					$tagValue = $this->parseExtendsTagValue('@implements', $tokens);
+					break;
+
+				case '@use':
+				case '@phpstan-use':
+				case '@template-use':
+					$tagValue = $this->parseExtendsTagValue('@use', $tokens);
+					break;
+
+				case '@phpstan-type':
+				case '@psalm-type':
+				case '@phan-type':
+					$tagValue = $this->parseTypeAliasTagValue($tokens);
+					break;
+
+				case '@phpstan-import-type':
+				case '@psalm-import-type':
+					$tagValue = $this->parseTypeAliasImportTagValue($tokens);
+					break;
+
+				case '@phpstan-assert':
+				case '@phpstan-assert-if-true':
+				case '@phpstan-assert-if-false':
+				case '@psalm-assert':
+				case '@psalm-assert-if-true':
+				case '@psalm-assert-if-false':
+				case '@phan-assert':
+				case '@phan-assert-if-true':
+				case '@phan-assert-if-false':
+					$tagValue = $this->parseAssertTagValue($tokens);
+					break;
+
+				case '@phpstan-this-out':
+				case '@phpstan-self-out':
+				case '@psalm-this-out':
+				case '@psalm-self-out':
+					$tagValue = $this->parseSelfOutTagValue($tokens);
+					break;
+
+				case '@param-out':
+				case '@phpstan-param-out':
+				case '@psalm-param-out':
+					$tagValue = $this->parseParamOutTagValue($tokens);
+					break;
+
+				default:
+					if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+						$tagValue = $this->parseDoctrineTagValue($tokens, $tag);
+					} else {
+						$tagValue = new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescriptionAfterDoctrineTag($tokens));
+					}
+					break;
+			}
+
+			$tokens->dropSavePoint();
+
+		} catch (ParserException $e) {
+			$tokens->rollback();
+			$tagValue = new Ast\PhpDoc\InvalidTagValueNode($this->parseOptionalDescription($tokens, false), $e);
+		}
+
+		return $this->enrichWithAttributes($tokens, $tagValue, $startLine, $startIndex);
+	}
+
+
+	private function parseDoctrineTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\PhpDocTagValueNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		return new Doctrine\DoctrineTagValueNode(
+			$this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineAnnotation($tag, $this->parseDoctrineArguments($tokens, false)),
+				$startLine,
+				$startIndex,
+			),
+			$this->parseOptionalDescriptionAfterDoctrineTag($tokens),
+		);
+	}
+
+
+	/**
+	 * @return list<Doctrine\DoctrineArgument>
+	 */
+	private function parseDoctrineArguments(TokenIterator $tokens, bool $deep): array
+	{
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+			return [];
+		}
+
+		if (!$deep) {
+			$tokens->addEndOfLineToSkippedTokens();
+		}
+
+		$arguments = [];
+
+		try {
+			$tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES);
+
+			do {
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
+					break;
+				}
+				$arguments[] = $this->parseDoctrineArgument($tokens);
+			} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+		} finally {
+			if (!$deep) {
+				$tokens->removeEndOfLineFromSkippedTokens();
+			}
+		}
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+
+		return $arguments;
+	}
+
+
+	private function parseDoctrineArgument(TokenIterator $tokens): Doctrine\DoctrineArgument
+	{
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			$startLine = $tokens->currentTokenLine();
+			$startIndex = $tokens->currentTokenIndex();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArgument(null, $this->parseDoctrineArgumentValue($tokens)),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		try {
+			$tokens->pushSavePoint();
+			$currentValue = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+			$key = $this->enrichWithAttributes(
+				$tokens,
+				new IdentifierTypeNode($currentValue),
+				$startLine,
+				$startIndex,
+			);
+			$tokens->consumeTokenType(Lexer::TOKEN_EQUAL);
+
+			$value = $this->parseDoctrineArgumentValue($tokens);
+
+			$tokens->dropSavePoint();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArgument($key, $value),
+				$startLine,
+				$startIndex,
+			);
+		} catch (ParserException $e) {
+			$tokens->rollback();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArgument(null, $this->parseDoctrineArgumentValue($tokens)),
+				$startLine,
+				$startIndex,
+			);
+		}
+	}
+
+
+	/**
+	 * @return DoctrineValueType
+	 */
+	private function parseDoctrineArgumentValue(TokenIterator $tokens)
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_DOCTRINE_TAG)) {
+			$name = $tokens->currentTokenValue();
+			$tokens->next();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineAnnotation($name, $this->parseDoctrineArguments($tokens, true)),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET)) {
+			$items = [];
+			do {
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
+					break;
+				}
+				$items[] = $this->parseDoctrineArrayItem($tokens);
+			} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArray($items),
+				$startLine,
+				$startIndex,
+			);
+		}
+
+		$currentTokenValue = $tokens->currentTokenValue();
+		$tokens->pushSavePoint(); // because of ConstFetchNode
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			$identifier = $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\IdentifierTypeNode($currentTokenValue),
+				$startLine,
+				$startIndex,
+			);
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+				$tokens->dropSavePoint();
+				return $identifier;
+			}
+
+			$tokens->rollback(); // because of ConstFetchNode
+		} else {
+			$tokens->dropSavePoint(); // because of ConstFetchNode
+		}
+
+		$currentTokenValue = $tokens->currentTokenValue();
+		$currentTokenType = $tokens->currentTokenType();
+		$currentTokenOffset = $tokens->currentTokenOffset();
+		$currentTokenLine = $tokens->currentTokenLine();
+
+		try {
+			$constExpr = $this->doctrineConstantExprParser->parse($tokens);
+			if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
+				throw new ParserException(
+					$currentTokenValue,
+					$currentTokenType,
+					$currentTokenOffset,
+					Lexer::TOKEN_IDENTIFIER,
+					null,
+					$currentTokenLine,
+				);
+			}
+
+			return $constExpr;
+		} catch (LogicException $e) {
+			throw new ParserException(
+				$currentTokenValue,
+				$currentTokenType,
+				$currentTokenOffset,
+				Lexer::TOKEN_IDENTIFIER,
+				null,
+				$currentTokenLine,
+			);
+		}
+	}
+
+
+	private function parseDoctrineArrayItem(TokenIterator $tokens): Doctrine\DoctrineArrayItem
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		try {
+			$tokens->pushSavePoint();
+
+			$key = $this->parseDoctrineArrayKey($tokens);
+			if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL)) {
+				if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_COLON)) {
+					$tokens->consumeTokenType(Lexer::TOKEN_EQUAL); // will throw exception
+				}
+			}
+
+			$value = $this->parseDoctrineArgumentValue($tokens);
+
+			$tokens->dropSavePoint();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArrayItem($key, $value),
+				$startLine,
+				$startIndex,
+			);
+		} catch (ParserException $e) {
+			$tokens->rollback();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Doctrine\DoctrineArrayItem(null, $this->parseDoctrineArgumentValue($tokens)),
+				$startLine,
+				$startIndex,
+			);
+		}
+	}
+
+
+	/**
+	 * @return ConstExprIntegerNode|ConstExprStringNode|IdentifierTypeNode|ConstFetchNode
+	 */
+	private function parseDoctrineArrayKey(TokenIterator $tokens)
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_INTEGER)) {
+			$key = new Ast\ConstExpr\ConstExprIntegerNode(str_replace('_', '', $tokens->currentTokenValue()));
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOCTRINE_ANNOTATION_STRING)) {
+			$key = $this->doctrineConstantExprParser->parseDoctrineString($tokens->currentTokenValue(), $tokens);
+
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) {
+			$key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED);
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) {
+			$value = $tokens->currentTokenValue();
+			$tokens->next();
+			$key = $this->doctrineConstantExprParser->parseDoctrineString($value, $tokens);
+
+		} else {
+			$currentTokenValue = $tokens->currentTokenValue();
+			$tokens->pushSavePoint(); // because of ConstFetchNode
+			if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_IDENTIFIER)) {
+				$tokens->dropSavePoint();
+				throw new ParserException(
+					$tokens->currentTokenValue(),
+					$tokens->currentTokenType(),
+					$tokens->currentTokenOffset(),
+					Lexer::TOKEN_IDENTIFIER,
+					null,
+					$tokens->currentTokenLine(),
+				);
+			}
+
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+				$tokens->dropSavePoint();
+
+				return $this->enrichWithAttributes(
+					$tokens,
+					new IdentifierTypeNode($currentTokenValue),
+					$startLine,
+					$startIndex,
+				);
+			}
+
+			$tokens->rollback();
+			$constExpr = $this->doctrineConstantExprParser->parse($tokens);
+			if (!$constExpr instanceof Ast\ConstExpr\ConstFetchNode) {
+				throw new ParserException(
+					$tokens->currentTokenValue(),
+					$tokens->currentTokenType(),
+					$tokens->currentTokenOffset(),
+					Lexer::TOKEN_IDENTIFIER,
+					null,
+					$tokens->currentTokenLine(),
+				);
+			}
+
+			return $constExpr;
+		}
+
+		return $this->enrichWithAttributes($tokens, $key, $startLine, $startIndex);
+	}
+
+
+	/**
+	 * @return Ast\PhpDoc\ParamTagValueNode|Ast\PhpDoc\TypelessParamTagValueNode
+	 */
+	private function parseParamTagValue(TokenIterator $tokens): Ast\PhpDoc\PhpDocTagValueNode
+	{
+		if (
+			$tokens->isCurrentTokenType(Lexer::TOKEN_REFERENCE, Lexer::TOKEN_VARIADIC, Lexer::TOKEN_VARIABLE)
+		) {
+			$type = null;
+		} else {
+			$type = $this->typeParser->parse($tokens);
+		}
+
+		$isReference = $tokens->tryConsumeTokenType(Lexer::TOKEN_REFERENCE);
+		$isVariadic = $tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC);
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		if ($type !== null) {
+			return new Ast\PhpDoc\ParamTagValueNode($type, $isVariadic, $parameterName, $description, $isReference);
+		}
+
+		return new Ast\PhpDoc\TypelessParamTagValueNode($isVariadic, $parameterName, $description, $isReference);
+	}
+
+
+	private function parseParamImmediatelyInvokedCallableTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamImmediatelyInvokedCallableTagValueNode
+	{
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		return new Ast\PhpDoc\ParamImmediatelyInvokedCallableTagValueNode($parameterName, $description);
+	}
+
+
+	private function parseParamLaterInvokedCallableTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamLaterInvokedCallableTagValueNode
+	{
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		return new Ast\PhpDoc\ParamLaterInvokedCallableTagValueNode($parameterName, $description);
+	}
+
+
+	private function parseParamClosureThisTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamClosureThisTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		return new Ast\PhpDoc\ParamClosureThisTagValueNode($type, $parameterName, $description);
+	}
+
+	private function parsePureUnlessCallableIsImpureTagValue(TokenIterator $tokens): Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode
+	{
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		return new Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode($parameterName, $description);
+	}
+
+	private function parseVarTagValue(TokenIterator $tokens): Ast\PhpDoc\VarTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$variableName = $this->parseOptionalVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, $variableName === '');
+		return new Ast\PhpDoc\VarTagValueNode($type, $variableName, $description);
+	}
+
+
+	private function parseReturnTagValue(TokenIterator $tokens): Ast\PhpDoc\ReturnTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\ReturnTagValueNode($type, $description);
+	}
+
+
+	private function parseThrowsTagValue(TokenIterator $tokens): Ast\PhpDoc\ThrowsTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\ThrowsTagValueNode($type, $description);
+	}
+
+	private function parseMixinTagValue(TokenIterator $tokens): Ast\PhpDoc\MixinTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\MixinTagValueNode($type, $description);
+	}
+
+	private function parseRequireExtendsTagValue(TokenIterator $tokens): Ast\PhpDoc\RequireExtendsTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\RequireExtendsTagValueNode($type, $description);
+	}
+
+	private function parseRequireImplementsTagValue(TokenIterator $tokens): Ast\PhpDoc\RequireImplementsTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\RequireImplementsTagValueNode($type, $description);
+	}
+
+	private function parseSealedTagValue(TokenIterator $tokens): Ast\PhpDoc\SealedTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+		return new Ast\PhpDoc\SealedTagValueNode($type, $description);
+	}
+
+	private function parseDeprecatedTagValue(TokenIterator $tokens): Ast\PhpDoc\DeprecatedTagValueNode
+	{
+		$description = $this->parseOptionalDescription($tokens, false);
+		return new Ast\PhpDoc\DeprecatedTagValueNode($description);
+	}
+
+
+	private function parsePropertyTagValue(TokenIterator $tokens): Ast\PhpDoc\PropertyTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+		return new Ast\PhpDoc\PropertyTagValueNode($type, $parameterName, $description);
+	}
+
+
+	private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTagValueNode
+	{
+		$staticKeywordOrReturnTypeOrMethodName = $this->typeParser->parse($tokens);
+
+		if ($staticKeywordOrReturnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode && $staticKeywordOrReturnTypeOrMethodName->name === 'static') {
+			$isStatic = true;
+			$returnTypeOrMethodName = $this->typeParser->parse($tokens);
+
+		} else {
+			$isStatic = false;
+			$returnTypeOrMethodName = $staticKeywordOrReturnTypeOrMethodName;
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			$returnType = $returnTypeOrMethodName;
+			$methodName = $tokens->currentTokenValue();
+			$tokens->next();
+
+		} elseif ($returnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode) {
+			$returnType = $isStatic ? $staticKeywordOrReturnTypeOrMethodName : null;
+			$methodName = $returnTypeOrMethodName->name;
+			$isStatic = false;
+
+		} else {
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); // will throw exception
+			exit;
+		}
+
+		$templateTypes = [];
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+			do {
+				$startLine = $tokens->currentTokenLine();
+				$startIndex = $tokens->currentTokenIndex();
+				$templateTypes[] = $this->enrichWithAttributes(
+					$tokens,
+					$this->typeParser->parseTemplateTagValue($tokens),
+					$startLine,
+					$startIndex,
+				);
+			} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
+		}
+
+		$parameters = [];
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES);
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
+			$parameters[] = $this->parseMethodTagValueParameter($tokens);
+			while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+				$parameters[] = $this->parseMethodTagValueParameter($tokens);
+			}
+		}
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+
+		$description = $this->parseOptionalDescription($tokens, false);
+		return new Ast\PhpDoc\MethodTagValueNode($isStatic, $returnType, $methodName, $parameters, $description, $templateTypes);
+	}
+
+	private function parseMethodTagValueParameter(TokenIterator $tokens): Ast\PhpDoc\MethodTagValueParameterNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		switch ($tokens->currentTokenType()) {
+			case Lexer::TOKEN_IDENTIFIER:
+			case Lexer::TOKEN_OPEN_PARENTHESES:
+			case Lexer::TOKEN_NULLABLE:
+				$parameterType = $this->typeParser->parse($tokens);
+				break;
+
+			default:
+				$parameterType = null;
+		}
+
+		$isReference = $tokens->tryConsumeTokenType(Lexer::TOKEN_REFERENCE);
+		$isVariadic = $tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC);
+
+		$parameterName = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_VARIABLE);
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL)) {
+			$defaultValue = $this->constantExprParser->parse($tokens);
+
+		} else {
+			$defaultValue = null;
+		}
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\PhpDoc\MethodTagValueParameterNode($parameterType, $isReference, $isVariadic, $parameterName, $defaultValue),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	private function parseExtendsTagValue(string $tagName, TokenIterator $tokens): Ast\PhpDoc\PhpDocTagValueNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		$baseType = new IdentifierTypeNode($tokens->currentTokenValue());
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+		$type = $this->typeParser->parseGeneric(
+			$tokens,
+			$this->typeParser->enrichWithAttributes($tokens, $baseType, $startLine, $startIndex),
+		);
+
+		$description = $this->parseOptionalDescription($tokens, true);
+
+		switch ($tagName) {
+			case '@extends':
+				return new Ast\PhpDoc\ExtendsTagValueNode($type, $description);
+			case '@implements':
+				return new Ast\PhpDoc\ImplementsTagValueNode($type, $description);
+			case '@use':
+				return new Ast\PhpDoc\UsesTagValueNode($type, $description);
+		}
+
+		throw new ShouldNotHappenException();
+	}
+
+	private function parseTypeAliasTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeAliasTagValueNode
+	{
+		$alias = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+		// support phan-type/psalm-type syntax
+		$tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
+
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		try {
+			$type = $this->typeParser->parse($tokens);
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC)) {
+				if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+					throw new ParserException(
+						$tokens->currentTokenValue(),
+						$tokens->currentTokenType(),
+						$tokens->currentTokenOffset(),
+						Lexer::TOKEN_PHPDOC_EOL,
+						null,
+						$tokens->currentTokenLine(),
+					);
+				}
+			}
+
+			return new Ast\PhpDoc\TypeAliasTagValueNode($alias, $type);
+		} catch (ParserException $e) {
+			$this->parseOptionalDescription($tokens, false);
+			return new Ast\PhpDoc\TypeAliasTagValueNode(
+				$alias,
+				$this->enrichWithAttributes($tokens, new Ast\Type\InvalidTypeNode($e), $startLine, $startIndex),
+			);
+		}
+	}
+
+	private function parseTypeAliasImportTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeAliasImportTagValueNode
+	{
+		$importedAlias = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+		$tokens->consumeTokenValue(Lexer::TOKEN_IDENTIFIER, 'from');
+
+		$identifierStartLine = $tokens->currentTokenLine();
+		$identifierStartIndex = $tokens->currentTokenIndex();
+		$importedFrom = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+		$importedFromType = $this->enrichWithAttributes(
+			$tokens,
+			new IdentifierTypeNode($importedFrom),
+			$identifierStartLine,
+			$identifierStartIndex,
+		);
+
+		$importedAs = null;
+		if ($tokens->tryConsumeTokenValue('as')) {
+			$importedAs = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+		}
+
+		return new Ast\PhpDoc\TypeAliasImportTagValueNode($importedAlias, $importedFromType, $importedAs);
+	}
+
+	/**
+	 * @return Ast\PhpDoc\AssertTagValueNode|Ast\PhpDoc\AssertTagPropertyValueNode|Ast\PhpDoc\AssertTagMethodValueNode
+	 */
+	private function parseAssertTagValue(TokenIterator $tokens): Ast\PhpDoc\PhpDocTagValueNode
+	{
+		$isNegated = $tokens->tryConsumeTokenType(Lexer::TOKEN_NEGATED);
+		$isEquality = $tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
+		$type = $this->typeParser->parse($tokens);
+		$parameter = $this->parseAssertParameter($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		if (array_key_exists('method', $parameter)) {
+			return new Ast\PhpDoc\AssertTagMethodValueNode($type, $parameter['parameter'], $parameter['method'], $isNegated, $description, $isEquality);
+		} elseif (array_key_exists('property', $parameter)) {
+			return new Ast\PhpDoc\AssertTagPropertyValueNode($type, $parameter['parameter'], $parameter['property'], $isNegated, $description, $isEquality);
+		}
+
+		return new Ast\PhpDoc\AssertTagValueNode($type, $parameter['parameter'], $isNegated, $description, $isEquality);
+	}
+
+	/**
+	 * @return array{parameter: string}|array{parameter: string, property: string}|array{parameter: string, method: string}
+	 */
+	private function parseAssertParameter(TokenIterator $tokens): array
+	{
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
+			$parameter = '$this';
+			$tokens->next();
+		} else {
+			$parameter = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_VARIABLE);
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_ARROW)) {
+			$tokens->consumeTokenType(Lexer::TOKEN_ARROW);
+
+			$propertyOrMethod = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+				$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+
+				return ['parameter' => $parameter, 'method' => $propertyOrMethod];
+			}
+
+			return ['parameter' => $parameter, 'property' => $propertyOrMethod];
+		}
+
+		return ['parameter' => $parameter];
+	}
+
+	private function parseSelfOutTagValue(TokenIterator $tokens): Ast\PhpDoc\SelfOutTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$description = $this->parseOptionalDescription($tokens, true);
+
+		return new Ast\PhpDoc\SelfOutTagValueNode($type, $description);
+	}
+
+	private function parseParamOutTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamOutTagValueNode
+	{
+		$type = $this->typeParser->parse($tokens);
+		$parameterName = $this->parseRequiredVariableName($tokens);
+		$description = $this->parseOptionalDescription($tokens, false);
+
+		return new Ast\PhpDoc\ParamOutTagValueNode($type, $parameterName, $description);
+	}
+
+	private function parseOptionalVariableName(TokenIterator $tokens): string
+	{
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_VARIABLE)) {
+			$parameterName = $tokens->currentTokenValue();
+			$tokens->next();
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
+			$parameterName = '$this';
+			$tokens->next();
+
+		} else {
+			$parameterName = '';
+		}
+
+		return $parameterName;
+	}
+
+
+	private function parseRequiredVariableName(TokenIterator $tokens): string
+	{
+		$parameterName = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_VARIABLE);
+
+		return $parameterName;
+	}
+
+	/**
+	 * @param bool $limitStartToken true should be used when the description immediately follows a parsed type
+	 */
+	private function parseOptionalDescription(TokenIterator $tokens, bool $limitStartToken): string
+	{
+		if ($limitStartToken) {
+			foreach (self::DISALLOWED_DESCRIPTION_START_TOKENS as $disallowedStartToken) {
+				if (!$tokens->isCurrentTokenType($disallowedStartToken)) {
+					continue;
+				}
+
+				$tokens->consumeTokenType(Lexer::TOKEN_OTHER); // will throw exception
+			}
+
+			if (
+				!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END)
+				&& !$tokens->isPrecededByHorizontalWhitespace()
+			) {
+				$tokens->consumeTokenType(Lexer::TOKEN_HORIZONTAL_WS); // will throw exception
+			}
+		}
+
+		return $this->parseText($tokens)->text;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php b/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php
new file mode 100644
index 000000000..e8e0a3d60
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/StringUnescaper.php
@@ -0,0 +1,100 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use PHPStan\ShouldNotHappenException;
+use function chr;
+use function hexdec;
+use function octdec;
+use function preg_replace_callback;
+use function str_replace;
+use function substr;
+
+class StringUnescaper
+{
+
+	private const REPLACEMENTS = [
+		'\\' => '\\',
+		'n' => "\n",
+		'r' => "\r",
+		't' => "\t",
+		'f' => "\f",
+		'v' => "\v",
+		'e' => "\x1B",
+	];
+
+	public static function unescapeString(string $string): string
+	{
+		$quote = $string[0];
+
+		if ($quote === '\'') {
+			return str_replace(
+				['\\\\', '\\\''],
+				['\\', '\''],
+				substr($string, 1, -1),
+			);
+		}
+
+		return self::parseEscapeSequences(substr($string, 1, -1), '"');
+	}
+
+	/**
+	 * Implementation based on https://github.com/nikic/PHP-Parser/blob/b0edd4c41111042d43bb45c6c657b2e0db367d9e/lib/PhpParser/Node/Scalar/String_.php#L90-L130
+	 */
+	private static function parseEscapeSequences(string $str, string $quote): string
+	{
+		$str = str_replace('\\' . $quote, $quote, $str);
+
+		return preg_replace_callback(
+			'~\\\\([\\\\nrtfve]|[xX][0-9a-fA-F]{1,2}|[0-7]{1,3}|u\{([0-9a-fA-F]+)\})~',
+			static function ($matches) {
+				$str = $matches[1];
+
+				if (isset(self::REPLACEMENTS[$str])) {
+					return self::REPLACEMENTS[$str];
+				}
+				if ($str[0] === 'x' || $str[0] === 'X') {
+					return chr((int) hexdec(substr($str, 1)));
+				}
+				if ($str[0] === 'u') {
+					if (!isset($matches[2])) {
+						throw new ShouldNotHappenException();
+					}
+					return self::codePointToUtf8((int) hexdec($matches[2]));
+				}
+
+				return chr((int) octdec($str));
+			},
+			$str,
+		);
+	}
+
+	/**
+	 * Implementation based on https://github.com/nikic/PHP-Parser/blob/b0edd4c41111042d43bb45c6c657b2e0db367d9e/lib/PhpParser/Node/Scalar/String_.php#L132-L154
+	 */
+	private static function codePointToUtf8(int $num): string
+	{
+		if ($num <= 0x7F) {
+			return chr($num);
+		}
+		if ($num <= 0x7FF) {
+			return chr(($num >> 6) + 0xC0)
+				. chr(($num & 0x3F) + 0x80);
+		}
+		if ($num <= 0xFFFF) {
+			return chr(($num >> 12) + 0xE0)
+				. chr((($num >> 6) & 0x3F) + 0x80)
+				. chr(($num & 0x3F) + 0x80);
+		}
+		if ($num <= 0x1FFFFF) {
+			return chr(($num >> 18) + 0xF0)
+				. chr((($num >> 12) & 0x3F) + 0x80)
+				. chr((($num >> 6) & 0x3F) + 0x80)
+				. chr(($num & 0x3F) + 0x80);
+		}
+
+		// Invalid UTF-8 codepoint escape sequence: Codepoint too large
+		return "\xef\xbf\xbd";
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/TokenIterator.php b/phpstan/phpdoc-parser/src/Parser/TokenIterator.php
new file mode 100644
index 000000000..f2be3da4a
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/TokenIterator.php
@@ -0,0 +1,428 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use LogicException;
+use PHPStan\PhpDocParser\Ast\Comment;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use function array_pop;
+use function assert;
+use function count;
+use function in_array;
+use function strlen;
+use function substr;
+
+class TokenIterator
+{
+
+	/** @var list<array{string, int, int}> */
+	private array $tokens;
+
+	private int $index;
+
+	/** @var list<Comment> */
+	private array $comments = [];
+
+	/** @var list<array{int, list<Comment>}> */
+	private array $savePoints = [];
+
+	/** @var list<int> */
+	private array $skippedTokenTypes = [Lexer::TOKEN_HORIZONTAL_WS];
+
+	private ?string $newline = null;
+
+	/**
+	 * @param list<array{string, int, int}> $tokens
+	 */
+	public function __construct(array $tokens, int $index = 0)
+	{
+		$this->tokens = $tokens;
+		$this->index = $index;
+
+		$this->skipIrrelevantTokens();
+	}
+
+
+	/**
+	 * @return list<array{string, int, int}>
+	 */
+	public function getTokens(): array
+	{
+		return $this->tokens;
+	}
+
+
+	public function getContentBetween(int $startPos, int $endPos): string
+	{
+		if ($startPos < 0 || $endPos > count($this->tokens)) {
+			throw new LogicException();
+		}
+
+		$content = '';
+		for ($i = $startPos; $i < $endPos; $i++) {
+			$content .= $this->tokens[$i][Lexer::VALUE_OFFSET];
+		}
+
+		return $content;
+	}
+
+
+	public function getTokenCount(): int
+	{
+		return count($this->tokens);
+	}
+
+
+	public function currentTokenValue(): string
+	{
+		return $this->tokens[$this->index][Lexer::VALUE_OFFSET];
+	}
+
+
+	public function currentTokenType(): int
+	{
+		return $this->tokens[$this->index][Lexer::TYPE_OFFSET];
+	}
+
+
+	public function currentTokenOffset(): int
+	{
+		$offset = 0;
+		for ($i = 0; $i < $this->index; $i++) {
+			$offset += strlen($this->tokens[$i][Lexer::VALUE_OFFSET]);
+		}
+
+		return $offset;
+	}
+
+
+	public function currentTokenLine(): int
+	{
+		return $this->tokens[$this->index][Lexer::LINE_OFFSET];
+	}
+
+
+	public function currentTokenIndex(): int
+	{
+		return $this->index;
+	}
+
+
+	public function endIndexOfLastRelevantToken(): int
+	{
+		$endIndex = $this->currentTokenIndex();
+		$endIndex--;
+		while (in_array($this->tokens[$endIndex][Lexer::TYPE_OFFSET], $this->skippedTokenTypes, true)) {
+			if (!isset($this->tokens[$endIndex - 1])) {
+				break;
+			}
+			$endIndex--;
+		}
+
+		return $endIndex;
+	}
+
+
+	public function isCurrentTokenValue(string $tokenValue): bool
+	{
+		return $this->tokens[$this->index][Lexer::VALUE_OFFSET] === $tokenValue;
+	}
+
+
+	public function isCurrentTokenType(int ...$tokenType): bool
+	{
+		return in_array($this->tokens[$this->index][Lexer::TYPE_OFFSET], $tokenType, true);
+	}
+
+
+	public function isPrecededByHorizontalWhitespace(): bool
+	{
+		return ($this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] ?? -1) === Lexer::TOKEN_HORIZONTAL_WS;
+	}
+
+
+	/**
+	 * @throws ParserException
+	 */
+	public function consumeTokenType(int $tokenType): void
+	{
+		if ($this->tokens[$this->index][Lexer::TYPE_OFFSET] !== $tokenType) {
+			$this->throwError($tokenType);
+		}
+
+		if ($tokenType === Lexer::TOKEN_PHPDOC_EOL) {
+			if ($this->newline === null) {
+				$this->detectNewline();
+			}
+		}
+
+		$this->next();
+	}
+
+
+	/**
+	 * @throws ParserException
+	 */
+	public function consumeTokenValue(int $tokenType, string $tokenValue): void
+	{
+		if ($this->tokens[$this->index][Lexer::TYPE_OFFSET] !== $tokenType || $this->tokens[$this->index][Lexer::VALUE_OFFSET] !== $tokenValue) {
+			$this->throwError($tokenType, $tokenValue);
+		}
+
+		$this->next();
+	}
+
+
+	/** @phpstan-impure */
+	public function tryConsumeTokenValue(string $tokenValue): bool
+	{
+		if ($this->tokens[$this->index][Lexer::VALUE_OFFSET] !== $tokenValue) {
+			return false;
+		}
+
+		$this->next();
+
+		return true;
+	}
+
+	/**
+	 * @return list<Comment>
+	 */
+	public function flushComments(): array
+	{
+		$res = $this->comments;
+		$this->comments = [];
+		return $res;
+	}
+
+	/** @phpstan-impure */
+	public function tryConsumeTokenType(int $tokenType): bool
+	{
+		if ($this->tokens[$this->index][Lexer::TYPE_OFFSET] !== $tokenType) {
+			return false;
+		}
+
+		if ($tokenType === Lexer::TOKEN_PHPDOC_EOL) {
+			if ($this->newline === null) {
+				$this->detectNewline();
+			}
+		}
+
+		$this->next();
+
+		return true;
+	}
+
+
+	/**
+	 * @deprecated Use skipNewLineTokensAndConsumeComments instead (when parsing a type)
+	 */
+	public function skipNewLineTokens(): void
+	{
+		if (!$this->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+			return;
+		}
+
+		do {
+			$foundNewLine = $this->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+		} while ($foundNewLine === true);
+	}
+
+
+	public function skipNewLineTokensAndConsumeComments(): void
+	{
+		if ($this->currentTokenType() === Lexer::TOKEN_COMMENT) {
+			$this->comments[] = new Comment($this->currentTokenValue(), $this->currentTokenLine(), $this->currentTokenIndex());
+			$this->next();
+		}
+
+		if (!$this->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+			return;
+		}
+
+		do {
+			$foundNewLine = $this->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+			if ($this->currentTokenType() !== Lexer::TOKEN_COMMENT) {
+				continue;
+			}
+
+			$this->comments[] = new Comment($this->currentTokenValue(), $this->currentTokenLine(), $this->currentTokenIndex());
+			$this->next();
+		} while ($foundNewLine === true);
+	}
+
+
+	private function detectNewline(): void
+	{
+		$value = $this->currentTokenValue();
+		if (substr($value, 0, 2) === "\r\n") {
+			$this->newline = "\r\n";
+		} elseif (substr($value, 0, 1) === "\n") {
+			$this->newline = "\n";
+		}
+	}
+
+
+	public function getSkippedHorizontalWhiteSpaceIfAny(): string
+	{
+		if ($this->index > 0 && $this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
+			return $this->tokens[$this->index - 1][Lexer::VALUE_OFFSET];
+		}
+
+		return '';
+	}
+
+
+	/** @phpstan-impure */
+	public function joinUntil(int ...$tokenType): string
+	{
+		$s = '';
+		while (!in_array($this->tokens[$this->index][Lexer::TYPE_OFFSET], $tokenType, true)) {
+			$s .= $this->tokens[$this->index++][Lexer::VALUE_OFFSET];
+		}
+		return $s;
+	}
+
+
+	public function next(): void
+	{
+		$this->index++;
+		$this->skipIrrelevantTokens();
+	}
+
+
+	private function skipIrrelevantTokens(): void
+	{
+		if (!isset($this->tokens[$this->index])) {
+			return;
+		}
+
+		while (in_array($this->tokens[$this->index][Lexer::TYPE_OFFSET], $this->skippedTokenTypes, true)) {
+			if (!isset($this->tokens[$this->index + 1])) {
+				break;
+			}
+			$this->index++;
+		}
+	}
+
+
+	public function addEndOfLineToSkippedTokens(): void
+	{
+		$this->skippedTokenTypes = [Lexer::TOKEN_HORIZONTAL_WS, Lexer::TOKEN_PHPDOC_EOL];
+	}
+
+
+	public function removeEndOfLineFromSkippedTokens(): void
+	{
+		$this->skippedTokenTypes = [Lexer::TOKEN_HORIZONTAL_WS];
+	}
+
+	/** @phpstan-impure */
+	public function forwardToTheEnd(): void
+	{
+		$lastToken = count($this->tokens) - 1;
+		$this->index = $lastToken;
+	}
+
+
+	public function pushSavePoint(): void
+	{
+		$this->savePoints[] = [$this->index, $this->comments];
+	}
+
+
+	public function dropSavePoint(): void
+	{
+		array_pop($this->savePoints);
+	}
+
+
+	public function rollback(): void
+	{
+		$savepoint = array_pop($this->savePoints);
+		assert($savepoint !== null);
+		[$this->index, $this->comments] = $savepoint;
+	}
+
+
+	/**
+	 * @throws ParserException
+	 */
+	private function throwError(int $expectedTokenType, ?string $expectedTokenValue = null): void
+	{
+		throw new ParserException(
+			$this->currentTokenValue(),
+			$this->currentTokenType(),
+			$this->currentTokenOffset(),
+			$expectedTokenType,
+			$expectedTokenValue,
+			$this->currentTokenLine(),
+		);
+	}
+
+	/**
+	 * Check whether the position is directly preceded by a certain token type.
+	 *
+	 * During this check TOKEN_HORIZONTAL_WS and TOKEN_PHPDOC_EOL are skipped
+	 */
+	public function hasTokenImmediatelyBefore(int $pos, int $expectedTokenType): bool
+	{
+		$tokens = $this->tokens;
+		$pos--;
+		for (; $pos >= 0; $pos--) {
+			$token = $tokens[$pos];
+			$type = $token[Lexer::TYPE_OFFSET];
+			if ($type === $expectedTokenType) {
+				return true;
+			}
+			if (!in_array($type, [
+				Lexer::TOKEN_HORIZONTAL_WS,
+				Lexer::TOKEN_PHPDOC_EOL,
+			], true)) {
+				break;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Check whether the position is directly followed by a certain token type.
+	 *
+	 * During this check TOKEN_HORIZONTAL_WS and TOKEN_PHPDOC_EOL are skipped
+	 */
+	public function hasTokenImmediatelyAfter(int $pos, int $expectedTokenType): bool
+	{
+		$tokens = $this->tokens;
+		$pos++;
+		for ($c = count($tokens); $pos < $c; $pos++) {
+			$token = $tokens[$pos];
+			$type = $token[Lexer::TYPE_OFFSET];
+			if ($type === $expectedTokenType) {
+				return true;
+			}
+			if (!in_array($type, [
+				Lexer::TOKEN_HORIZONTAL_WS,
+				Lexer::TOKEN_PHPDOC_EOL,
+			], true)) {
+				break;
+			}
+		}
+
+		return false;
+	}
+
+	public function getDetectedNewline(): ?string
+	{
+		return $this->newline;
+	}
+
+	/**
+	 * Whether the given position is immediately surrounded by parenthesis.
+	 */
+	public function hasParentheses(int $startPos, int $endPos): bool
+	{
+		return $this->hasTokenImmediatelyBefore($startPos, Lexer::TOKEN_OPEN_PARENTHESES)
+			&& $this->hasTokenImmediatelyAfter($endPos, Lexer::TOKEN_CLOSE_PARENTHESES);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Parser/TypeParser.php b/phpstan/phpdoc-parser/src/Parser/TypeParser.php
new file mode 100644
index 000000000..62f80406b
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Parser/TypeParser.php
@@ -0,0 +1,1145 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Parser;
+
+use LogicException;
+use PHPStan\PhpDocParser\Ast;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\ParserConfig;
+use function in_array;
+use function str_replace;
+use function strlen;
+use function strpos;
+use function substr_compare;
+
+class TypeParser
+{
+
+	private ParserConfig $config;
+
+	private ConstExprParser $constExprParser;
+
+	public function __construct(
+		ParserConfig $config,
+		ConstExprParser $constExprParser
+	)
+	{
+		$this->config = $config;
+		$this->constExprParser = $constExprParser;
+	}
+
+	/** @phpstan-impure */
+	public function parse(TokenIterator $tokens): Ast\Type\TypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_NULLABLE)) {
+			$type = $this->parseNullable($tokens);
+
+		} else {
+			$type = $this->parseAtomic($tokens);
+
+			$tokens->pushSavePoint();
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			try {
+				$enrichedType = $this->enrichTypeOnUnionOrIntersection($tokens, $type);
+
+			} catch (ParserException $parserException) {
+				$enrichedType = null;
+			}
+
+			if ($enrichedType !== null) {
+				$type = $enrichedType;
+				$tokens->dropSavePoint();
+
+			} else {
+				$tokens->rollback();
+				$type = $this->enrichTypeOnUnionOrIntersection($tokens, $type) ?? $type;
+			}
+		}
+
+		return $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+	}
+
+	/** @phpstan-impure */
+	private function enrichTypeOnUnionOrIntersection(TokenIterator $tokens, Ast\Type\TypeNode $type): ?Ast\Type\TypeNode
+	{
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_UNION)) {
+			return $this->parseUnion($tokens, $type);
+
+		}
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)) {
+			return $this->parseIntersection($tokens, $type);
+		}
+
+		return null;
+	}
+
+	/**
+	 * @internal
+	 * @template T of Ast\Node
+	 * @param T $type
+	 * @return T
+	 */
+	public function enrichWithAttributes(TokenIterator $tokens, Ast\Node $type, int $startLine, int $startIndex): Ast\Node
+	{
+		if ($this->config->useLinesAttributes) {
+			$type->setAttribute(Ast\Attribute::START_LINE, $startLine);
+			$type->setAttribute(Ast\Attribute::END_LINE, $tokens->currentTokenLine());
+		}
+
+		$comments = $tokens->flushComments();
+		if ($this->config->useCommentsAttributes) {
+			$type->setAttribute(Ast\Attribute::COMMENTS, $comments);
+		}
+
+		if ($this->config->useIndexAttributes) {
+			$type->setAttribute(Ast\Attribute::START_INDEX, $startIndex);
+			$type->setAttribute(Ast\Attribute::END_INDEX, $tokens->endIndexOfLastRelevantToken());
+		}
+
+		return $type;
+	}
+
+	/** @phpstan-impure */
+	private function subParse(TokenIterator $tokens): Ast\Type\TypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_NULLABLE)) {
+			$type = $this->parseNullable($tokens);
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_VARIABLE)) {
+			$type = $this->parseConditionalForParameter($tokens, $tokens->currentTokenValue());
+
+		} else {
+			$type = $this->parseAtomic($tokens);
+
+			if ($tokens->isCurrentTokenValue('is')) {
+				$type = $this->parseConditional($tokens, $type);
+			} else {
+				$tokens->skipNewLineTokensAndConsumeComments();
+
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_UNION)) {
+					$type = $this->subParseUnion($tokens, $type);
+
+				} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)) {
+					$type = $this->subParseIntersection($tokens, $type);
+				}
+			}
+		}
+
+		return $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+			$type = $this->subParse($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+		}
+
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
+			$type = $this->enrichWithAttributes($tokens, new Ast\Type\ThisTypeNode(), $startLine, $startIndex);
+
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+		}
+
+		$currentTokenValue = $tokens->currentTokenValue();
+		$tokens->pushSavePoint(); // because of ConstFetchNode
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			$type = $this->enrichWithAttributes($tokens, new Ast\Type\IdentifierTypeNode($currentTokenValue), $startLine, $startIndex);
+
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+				$tokens->dropSavePoint(); // because of ConstFetchNode
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+					$tokens->pushSavePoint();
+
+					$isHtml = $this->isHtml($tokens);
+					$tokens->rollback();
+					if ($isHtml) {
+						return $type;
+					}
+
+					$origType = $type;
+					$type = $this->tryParseCallable($tokens, $type, true);
+					if ($type === $origType) {
+						$type = $this->parseGeneric($tokens, $type);
+
+						if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+							$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+						}
+					}
+				} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+					$type = $this->tryParseCallable($tokens, $type, false);
+
+				} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+					$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+
+				} elseif (in_array($type->name, [
+					Ast\Type\ArrayShapeNode::KIND_ARRAY,
+					Ast\Type\ArrayShapeNode::KIND_LIST,
+					Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+					Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST,
+					'object',
+				], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
+					if ($type->name === 'object') {
+						$type = $this->parseObjectShape($tokens);
+					} else {
+						$type = $this->parseArrayShape($tokens, $type, $type->name);
+					}
+
+					if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+						$type = $this->tryParseArrayOrOffsetAccess(
+							$tokens,
+							$this->enrichWithAttributes($tokens, $type, $startLine, $startIndex),
+						);
+					}
+				}
+
+				return $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+			} else {
+				$tokens->rollback(); // because of ConstFetchNode
+			}
+		} else {
+			$tokens->dropSavePoint(); // because of ConstFetchNode
+		}
+
+		$currentTokenValue = $tokens->currentTokenValue();
+		$currentTokenType = $tokens->currentTokenType();
+		$currentTokenOffset = $tokens->currentTokenOffset();
+		$currentTokenLine = $tokens->currentTokenLine();
+
+		try {
+			$constExpr = $this->constExprParser->parse($tokens);
+			if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
+				throw new ParserException(
+					$currentTokenValue,
+					$currentTokenType,
+					$currentTokenOffset,
+					Lexer::TOKEN_IDENTIFIER,
+					null,
+					$currentTokenLine,
+				);
+			}
+
+			$type = $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ConstTypeNode($constExpr),
+				$startLine,
+				$startIndex,
+			);
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $type;
+		} catch (LogicException $e) {
+			throw new ParserException(
+				$currentTokenValue,
+				$currentTokenType,
+				$currentTokenOffset,
+				Lexer::TOKEN_IDENTIFIER,
+				null,
+				$currentTokenLine,
+			);
+		}
+	}
+
+
+	/** @phpstan-impure */
+	private function parseUnion(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
+	{
+		$types = [$type];
+
+		while ($tokens->tryConsumeTokenType(Lexer::TOKEN_UNION)) {
+			$types[] = $this->parseAtomic($tokens);
+			$tokens->pushSavePoint();
+			$tokens->skipNewLineTokensAndConsumeComments();
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_UNION)) {
+				$tokens->rollback();
+				break;
+			}
+
+			$tokens->dropSavePoint();
+		}
+
+		return new Ast\Type\UnionTypeNode($types);
+	}
+
+
+	/** @phpstan-impure */
+	private function subParseUnion(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
+	{
+		$types = [$type];
+
+		while ($tokens->tryConsumeTokenType(Lexer::TOKEN_UNION)) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+			$types[] = $this->parseAtomic($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+		}
+
+		return new Ast\Type\UnionTypeNode($types);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseIntersection(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
+	{
+		$types = [$type];
+
+		while ($tokens->tryConsumeTokenType(Lexer::TOKEN_INTERSECTION)) {
+			$types[] = $this->parseAtomic($tokens);
+			$tokens->pushSavePoint();
+			$tokens->skipNewLineTokensAndConsumeComments();
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_INTERSECTION)) {
+				$tokens->rollback();
+				break;
+			}
+
+			$tokens->dropSavePoint();
+		}
+
+		return new Ast\Type\IntersectionTypeNode($types);
+	}
+
+
+	/** @phpstan-impure */
+	private function subParseIntersection(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
+	{
+		$types = [$type];
+
+		while ($tokens->tryConsumeTokenType(Lexer::TOKEN_INTERSECTION)) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+			$types[] = $this->parseAtomic($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+		}
+
+		return new Ast\Type\IntersectionTypeNode($types);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseConditional(TokenIterator $tokens, Ast\Type\TypeNode $subjectType): Ast\Type\TypeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+		$negated = false;
+		if ($tokens->isCurrentTokenValue('not')) {
+			$negated = true;
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+		}
+
+		$targetType = $this->parse($tokens);
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_NULLABLE);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$ifType = $this->parse($tokens);
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$elseType = $this->subParse($tokens);
+
+		return new Ast\Type\ConditionalTypeNode($subjectType, $targetType, $ifType, $elseType, $negated);
+	}
+
+	/** @phpstan-impure */
+	private function parseConditionalForParameter(TokenIterator $tokens, string $parameterName): Ast\Type\TypeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_VARIABLE);
+		$tokens->consumeTokenValue(Lexer::TOKEN_IDENTIFIER, 'is');
+
+		$negated = false;
+		if ($tokens->isCurrentTokenValue('not')) {
+			$negated = true;
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+		}
+
+		$targetType = $this->parse($tokens);
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_NULLABLE);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$ifType = $this->parse($tokens);
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$elseType = $this->subParse($tokens);
+
+		return new Ast\Type\ConditionalTypeForParameterNode($parameterName, $targetType, $ifType, $elseType, $negated);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseNullable(TokenIterator $tokens): Ast\Type\TypeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_NULLABLE);
+
+		$type = $this->parseAtomic($tokens);
+
+		return new Ast\Type\NullableTypeNode($type);
+	}
+
+	/** @phpstan-impure */
+	public function isHtml(TokenIterator $tokens): bool
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
+
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) {
+			return false;
+		}
+
+		$htmlTagName = $tokens->currentTokenValue();
+
+		$tokens->next();
+
+		if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {
+			return false;
+		}
+
+		$endTag = '</' . $htmlTagName . '>';
+		$endTagSearchOffset = - strlen($endTag);
+
+		while (!$tokens->isCurrentTokenType(Lexer::TOKEN_END)) {
+			if (
+				(
+					$tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)
+					&& strpos($tokens->currentTokenValue(), '/' . $htmlTagName . '>') !== false
+				)
+				|| substr_compare($tokens->currentTokenValue(), $endTag, $endTagSearchOffset) === 0
+			) {
+				return true;
+			}
+
+			$tokens->next();
+		}
+
+		return false;
+	}
+
+	/** @phpstan-impure */
+	public function parseGeneric(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $baseType): Ast\Type\GenericTypeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$startLine = $baseType->getAttribute(Ast\Attribute::START_LINE);
+		$startIndex = $baseType->getAttribute(Ast\Attribute::START_INDEX);
+		$genericTypes = [];
+		$variances = [];
+
+		$isFirst = true;
+		while (
+			$isFirst
+			|| $tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)
+		) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			// trailing comma case
+			if (!$isFirst && $tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {
+				break;
+			}
+			$isFirst = false;
+
+			[$genericTypes[], $variances[]] = $this->parseGenericTypeArgument($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+		}
+
+		$type = new Ast\Type\GenericTypeNode($baseType, $genericTypes, $variances);
+		if ($startLine !== null && $startIndex !== null) {
+			$type = $this->enrichWithAttributes($tokens, $type, $startLine, $startIndex);
+		}
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
+
+		return $type;
+	}
+
+
+	/**
+	 * @phpstan-impure
+	 * @return array{Ast\Type\TypeNode, Ast\Type\GenericTypeNode::VARIANCE_*}
+	 */
+	public function parseGenericTypeArgument(TokenIterator $tokens): array
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_WILDCARD)) {
+			return [
+				$this->enrichWithAttributes($tokens, new Ast\Type\IdentifierTypeNode('mixed'), $startLine, $startIndex),
+				Ast\Type\GenericTypeNode::VARIANCE_BIVARIANT,
+			];
+		}
+
+		if ($tokens->tryConsumeTokenValue('contravariant')) {
+			$variance = Ast\Type\GenericTypeNode::VARIANCE_CONTRAVARIANT;
+		} elseif ($tokens->tryConsumeTokenValue('covariant')) {
+			$variance = Ast\Type\GenericTypeNode::VARIANCE_COVARIANT;
+		} else {
+			$variance = Ast\Type\GenericTypeNode::VARIANCE_INVARIANT;
+		}
+
+		$type = $this->parse($tokens);
+		return [$type, $variance];
+	}
+
+	/**
+	 * @throws ParserException
+	 * @param ?callable(TokenIterator): string $parseDescription
+	 */
+	public function parseTemplateTagValue(
+		TokenIterator $tokens,
+		?callable $parseDescription = null
+	): TemplateTagValueNode
+	{
+		$name = $tokens->currentTokenValue();
+		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+		$upperBound = $lowerBound = null;
+
+		if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) {
+			$upperBound = $this->parse($tokens);
+		}
+
+		if ($tokens->tryConsumeTokenValue('super')) {
+			$lowerBound = $this->parse($tokens);
+		}
+
+		if ($tokens->tryConsumeTokenValue('=')) {
+			$default = $this->parse($tokens);
+		} else {
+			$default = null;
+		}
+
+		if ($parseDescription !== null) {
+			$description = $parseDescription($tokens);
+		} else {
+			$description = '';
+		}
+
+		if ($name === '') {
+			throw new LogicException('Template tag name cannot be empty.');
+		}
+
+		return new Ast\PhpDoc\TemplateTagValueNode($name, $upperBound, $description, $default, $lowerBound);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier, bool $hasTemplate): Ast\Type\TypeNode
+	{
+		$templates = $hasTemplate
+			? $this->parseCallableTemplates($tokens)
+			: [];
+
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$parameters = [];
+		if (!$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
+			$parameters[] = $this->parseCallableParameter($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+			while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+				$tokens->skipNewLineTokensAndConsumeComments();
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PARENTHESES)) {
+					break;
+				}
+				$parameters[] = $this->parseCallableParameter($tokens);
+				$tokens->skipNewLineTokensAndConsumeComments();
+			}
+		}
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
+
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		$returnType = $this->enrichWithAttributes($tokens, $this->parseCallableReturnType($tokens), $startLine, $startIndex);
+
+		return new Ast\Type\CallableTypeNode($identifier, $parameters, $returnType, $templates);
+	}
+
+
+	/**
+	 * @return Ast\PhpDoc\TemplateTagValueNode[]
+	 *
+	 * @phpstan-impure
+	 */
+	private function parseCallableTemplates(TokenIterator $tokens): array
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
+
+		$templates = [];
+
+		$isFirst = true;
+		while ($isFirst || $tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			// trailing comma case
+			if (!$isFirst && $tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {
+				break;
+			}
+			$isFirst = false;
+
+			$templates[] = $this->parseCallableTemplateArgument($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+		}
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
+
+		return $templates;
+	}
+
+
+	private function parseCallableTemplateArgument(TokenIterator $tokens): Ast\PhpDoc\TemplateTagValueNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			$this->parseTemplateTagValue($tokens),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseCallableParameter(TokenIterator $tokens): Ast\Type\CallableTypeParameterNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		$type = $this->parse($tokens);
+		$isReference = $tokens->tryConsumeTokenType(Lexer::TOKEN_REFERENCE);
+		$isVariadic = $tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC);
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_VARIABLE)) {
+			$parameterName = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_VARIABLE);
+
+		} else {
+			$parameterName = '';
+		}
+
+		$isOptional = $tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\Type\CallableTypeParameterNode($type, $isReference, $isVariadic, $parameterName, $isOptional),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_NULLABLE)) {
+			return $this->parseNullable($tokens);
+
+		} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
+			$type = $this->subParse($tokens);
+			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $type;
+		} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
+			$type = new Ast\Type\ThisTypeNode();
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(
+					$tokens,
+					$type,
+					$startLine,
+					$startIndex,
+				));
+			}
+
+			return $type;
+		} else {
+			$currentTokenValue = $tokens->currentTokenValue();
+			$tokens->pushSavePoint(); // because of ConstFetchNode
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_IDENTIFIER)) {
+				$type = new Ast\Type\IdentifierTypeNode($currentTokenValue);
+
+				if (!$tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+					if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+						$type = $this->parseGeneric(
+							$tokens,
+							$this->enrichWithAttributes(
+								$tokens,
+								$type,
+								$startLine,
+								$startIndex,
+							),
+						);
+						if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+							$type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(
+								$tokens,
+								$type,
+								$startLine,
+								$startIndex,
+							));
+						}
+
+					} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+						$type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(
+							$tokens,
+							$type,
+							$startLine,
+							$startIndex,
+						));
+
+					} elseif (in_array($type->name, [
+						Ast\Type\ArrayShapeNode::KIND_ARRAY,
+						Ast\Type\ArrayShapeNode::KIND_LIST,
+						Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+						Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST,
+						'object',
+					], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
+						if ($type->name === 'object') {
+							$type = $this->parseObjectShape($tokens);
+						} else {
+							$type = $this->parseArrayShape($tokens, $this->enrichWithAttributes(
+								$tokens,
+								$type,
+								$startLine,
+								$startIndex,
+							), $type->name);
+						}
+
+						if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+							$type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(
+								$tokens,
+								$type,
+								$startLine,
+								$startIndex,
+							));
+						}
+					}
+
+					return $type;
+				} else {
+					$tokens->rollback(); // because of ConstFetchNode
+				}
+			} else {
+				$tokens->dropSavePoint(); // because of ConstFetchNode
+			}
+		}
+
+		$currentTokenValue = $tokens->currentTokenValue();
+		$currentTokenType = $tokens->currentTokenType();
+		$currentTokenOffset = $tokens->currentTokenOffset();
+		$currentTokenLine = $tokens->currentTokenLine();
+
+		try {
+			$constExpr = $this->constExprParser->parse($tokens);
+			if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
+				throw new ParserException(
+					$currentTokenValue,
+					$currentTokenType,
+					$currentTokenOffset,
+					Lexer::TOKEN_IDENTIFIER,
+					null,
+					$currentTokenLine,
+				);
+			}
+
+			$type = $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ConstTypeNode($constExpr),
+				$startLine,
+				$startIndex,
+			);
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $type;
+		} catch (LogicException $e) {
+			throw new ParserException(
+				$currentTokenValue,
+				$currentTokenType,
+				$currentTokenOffset,
+				Lexer::TOKEN_IDENTIFIER,
+				null,
+				$currentTokenLine,
+			);
+		}
+	}
+
+
+	/** @phpstan-impure */
+	private function tryParseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier, bool $hasTemplate): Ast\Type\TypeNode
+	{
+		try {
+			$tokens->pushSavePoint();
+			$type = $this->parseCallable($tokens, $identifier, $hasTemplate);
+			$tokens->dropSavePoint();
+
+		} catch (ParserException $e) {
+			$tokens->rollback();
+			$type = $identifier;
+		}
+
+		return $type;
+	}
+
+
+	/** @phpstan-impure */
+	private function tryParseArrayOrOffsetAccess(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
+	{
+		$startLine = $type->getAttribute(Ast\Attribute::START_LINE);
+		$startIndex = $type->getAttribute(Ast\Attribute::START_INDEX);
+		try {
+			while ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$tokens->pushSavePoint();
+
+				$canBeOffsetAccessType = !$tokens->isPrecededByHorizontalWhitespace();
+				$tokens->consumeTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET);
+
+				if ($canBeOffsetAccessType && !$tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_SQUARE_BRACKET)) {
+					$offset = $this->parse($tokens);
+					$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_SQUARE_BRACKET);
+					$tokens->dropSavePoint();
+					$type = new Ast\Type\OffsetAccessTypeNode($type, $offset);
+
+					if ($startLine !== null && $startIndex !== null) {
+						$type = $this->enrichWithAttributes(
+							$tokens,
+							$type,
+							$startLine,
+							$startIndex,
+						);
+					}
+				} else {
+					$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_SQUARE_BRACKET);
+					$tokens->dropSavePoint();
+					$type = new Ast\Type\ArrayTypeNode($type);
+
+					if ($startLine !== null && $startIndex !== null) {
+						$type = $this->enrichWithAttributes(
+							$tokens,
+							$type,
+							$startLine,
+							$startIndex,
+						);
+					}
+				}
+			}
+
+		} catch (ParserException $e) {
+			$tokens->rollback();
+		}
+
+		return $type;
+	}
+
+
+	/**
+	 * @phpstan-impure
+	 * @param Ast\Type\ArrayShapeNode::KIND_* $kind
+	 */
+	private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type, string $kind): Ast\Type\ArrayShapeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
+
+		$items = [];
+		$sealed = true;
+		$unsealedType = null;
+
+		$done = false;
+
+		do {
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
+				return Ast\Type\ArrayShapeNode::createSealed($items, $kind);
+			}
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC)) {
+				$sealed = false;
+
+				$tokens->skipNewLineTokensAndConsumeComments();
+				if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+					if ($kind === Ast\Type\ArrayShapeNode::KIND_ARRAY) {
+						$unsealedType = $this->parseArrayShapeUnsealedType($tokens);
+					} else {
+						$unsealedType = $this->parseListShapeUnsealedType($tokens);
+					}
+					$tokens->skipNewLineTokensAndConsumeComments();
+				}
+
+				$tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA);
+				break;
+			}
+
+			$items[] = $this->parseArrayShapeItem($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+			if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+				$done = true;
+			}
+			if ($tokens->currentTokenType() !== Lexer::TOKEN_COMMENT) {
+				continue;
+			}
+
+			$tokens->next();
+
+		} while (!$done);
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);
+
+		if ($sealed) {
+			return Ast\Type\ArrayShapeNode::createSealed($items, $kind);
+		}
+
+		return Ast\Type\ArrayShapeNode::createUnsealed($items, $unsealedType, $kind);
+	}
+
+
+	/** @phpstan-impure */
+	private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShapeItemNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		// parse any comments above the item
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		try {
+			$tokens->pushSavePoint();
+			$key = $this->parseArrayShapeKey($tokens);
+			$optional = $tokens->tryConsumeTokenType(Lexer::TOKEN_NULLABLE);
+			$tokens->consumeTokenType(Lexer::TOKEN_COLON);
+			$value = $this->parse($tokens);
+
+			$tokens->dropSavePoint();
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ArrayShapeItemNode($key, $optional, $value),
+				$startLine,
+				$startIndex,
+			);
+		} catch (ParserException $e) {
+			$tokens->rollback();
+			$value = $this->parse($tokens);
+
+			return $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ArrayShapeItemNode(null, false, $value),
+				$startLine,
+				$startIndex,
+			);
+		}
+	}
+
+	/**
+	 * @phpstan-impure
+	 * @return Ast\ConstExpr\ConstExprIntegerNode|Ast\ConstExpr\ConstExprStringNode|Ast\ConstExpr\ConstFetchNode|Ast\Type\IdentifierTypeNode
+	 */
+	private function parseArrayShapeKey(TokenIterator $tokens)
+	{
+		$startIndex = $tokens->currentTokenIndex();
+		$startLine = $tokens->currentTokenLine();
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_INTEGER)) {
+			$key = new Ast\ConstExpr\ConstExprIntegerNode(str_replace('_', '', $tokens->currentTokenValue()));
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) {
+			$key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED);
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) {
+			$key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED);
+
+			$tokens->next();
+
+		} else {
+			$identifier = $tokens->currentTokenValue();
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
+				$classConstantName = $tokens->currentTokenValue();
+				$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+
+				$key = new Ast\ConstExpr\ConstFetchNode($identifier, $classConstantName);
+			} else {
+				$key = new Ast\Type\IdentifierTypeNode($identifier);
+			}
+		}
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			$key,
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	/**
+	 * @phpstan-impure
+	 */
+	private function parseArrayShapeUnsealedType(TokenIterator $tokens): Ast\Type\ArrayShapeUnsealedTypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$valueType = $this->parse($tokens);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$keyType = null;
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			$keyType = $valueType;
+			$valueType = $this->parse($tokens);
+			$tokens->skipNewLineTokensAndConsumeComments();
+		}
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\Type\ArrayShapeUnsealedTypeNode($valueType, $keyType),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	/**
+	 * @phpstan-impure
+	 */
+	private function parseListShapeUnsealedType(TokenIterator $tokens): Ast\Type\ArrayShapeUnsealedTypeNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$valueType = $this->parse($tokens);
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\Type\ArrayShapeUnsealedTypeNode($valueType, null),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	/**
+	 * @phpstan-impure
+	 */
+	private function parseObjectShape(TokenIterator $tokens): Ast\Type\ObjectShapeNode
+	{
+		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
+
+		$items = [];
+
+		do {
+			$tokens->skipNewLineTokensAndConsumeComments();
+
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
+				return new Ast\Type\ObjectShapeNode($items);
+			}
+
+			$items[] = $this->parseObjectShapeItem($tokens);
+
+			$tokens->skipNewLineTokensAndConsumeComments();
+		} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);
+
+		return new Ast\Type\ObjectShapeNode($items);
+	}
+
+	/** @phpstan-impure */
+	private function parseObjectShapeItem(TokenIterator $tokens): Ast\Type\ObjectShapeItemNode
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		$tokens->skipNewLineTokensAndConsumeComments();
+
+		$key = $this->parseObjectShapeKey($tokens);
+		$optional = $tokens->tryConsumeTokenType(Lexer::TOKEN_NULLABLE);
+		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
+		$value = $this->parse($tokens);
+
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\Type\ObjectShapeItemNode($key, $optional, $value),
+			$startLine,
+			$startIndex,
+		);
+	}
+
+	/**
+	 * @phpstan-impure
+	 * @return Ast\ConstExpr\ConstExprStringNode|Ast\Type\IdentifierTypeNode
+	 */
+	private function parseObjectShapeKey(TokenIterator $tokens)
+	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) {
+			$key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::SINGLE_QUOTED);
+			$tokens->next();
+
+		} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_DOUBLE_QUOTED_STRING)) {
+			$key = new Ast\ConstExpr\ConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\ConstExprStringNode::DOUBLE_QUOTED);
+			$tokens->next();
+
+		} else {
+			$key = new Ast\Type\IdentifierTypeNode($tokens->currentTokenValue());
+			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
+		}
+
+		return $this->enrichWithAttributes($tokens, $key, $startLine, $startIndex);
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/ParserConfig.php b/phpstan/phpdoc-parser/src/ParserConfig.php
new file mode 100644
index 000000000..0c4377adc
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/ParserConfig.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser;
+
+class ParserConfig
+{
+
+	public bool $useLinesAttributes;
+
+	public bool $useIndexAttributes;
+
+	public bool $useCommentsAttributes;
+
+	/**
+	 * @param array{lines?: bool, indexes?: bool, comments?: bool} $usedAttributes
+	 */
+	public function __construct(array $usedAttributes)
+	{
+		$this->useLinesAttributes = $usedAttributes['lines'] ?? false;
+		$this->useIndexAttributes = $usedAttributes['indexes'] ?? false;
+		$this->useCommentsAttributes = $usedAttributes['comments'] ?? false;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Printer/DiffElem.php b/phpstan/phpdoc-parser/src/Printer/DiffElem.php
new file mode 100644
index 000000000..2684dfc7e
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Printer/DiffElem.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Printer;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ *
+ * Implements the Myers diff algorithm.
+ *
+ * @internal
+ */
+class DiffElem
+{
+
+	public const TYPE_KEEP = 0;
+	public const TYPE_REMOVE = 1;
+	public const TYPE_ADD = 2;
+	public const TYPE_REPLACE = 3;
+
+	/** @var self::TYPE_* */
+	public $type;
+
+	/** @var mixed Is null for add operations */
+	public $old;
+
+	/** @var mixed Is null for remove operations */
+	public $new;
+
+	/**
+	 * @param self::TYPE_* $type
+	 * @param mixed $old Is null for add operations
+	 * @param mixed $new Is null for remove operations
+	 */
+	public function __construct(int $type, $old, $new)
+	{
+		$this->type = $type;
+		$this->old = $old;
+		$this->new = $new;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Printer/Differ.php b/phpstan/phpdoc-parser/src/Printer/Differ.php
new file mode 100644
index 000000000..c60fd4ad6
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Printer/Differ.php
@@ -0,0 +1,196 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Printer;
+
+use Exception;
+use function array_reverse;
+use function count;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ *
+ * Implements the Myers diff algorithm.
+ *
+ * Myers, Eugene W. "An O (ND) difference algorithm and its variations."
+ * Algorithmica 1.1 (1986): 251-266.
+ *
+ * @template T
+ * @internal
+ */
+class Differ
+{
+
+	/** @var callable(T, T): bool */
+	private $isEqual;
+
+	/**
+	 * Create differ over the given equality relation.
+	 *
+	 * @param callable(T, T): bool $isEqual Equality relation
+	 */
+	public function __construct(callable $isEqual)
+	{
+		$this->isEqual = $isEqual;
+	}
+
+	/**
+	 * Calculate diff (edit script) from $old to $new.
+	 *
+	 * @param T[] $old Original array
+	 * @param T[] $new New array
+	 *
+	 * @return DiffElem[] Diff (edit script)
+	 */
+	public function diff(array $old, array $new): array
+	{
+		[$trace, $x, $y] = $this->calculateTrace($old, $new);
+		return $this->extractDiff($trace, $x, $y, $old, $new);
+	}
+
+	/**
+	 * Calculate diff, including "replace" operations.
+	 *
+	 * If a sequence of remove operations is followed by the same number of add operations, these
+	 * will be coalesced into replace operations.
+	 *
+	 * @param T[] $old Original array
+	 * @param T[] $new New array
+	 *
+	 * @return DiffElem[] Diff (edit script), including replace operations
+	 */
+	public function diffWithReplacements(array $old, array $new): array
+	{
+		return $this->coalesceReplacements($this->diff($old, $new));
+	}
+
+	/**
+	 * @param T[] $old
+	 * @param T[] $new
+	 * @return array{array<int, array<int, int>>, int, int}
+	 */
+	private function calculateTrace(array $old, array $new): array
+	{
+		$n = count($old);
+		$m = count($new);
+		$max = $n + $m;
+		$v = [1 => 0];
+		$trace = [];
+		for ($d = 0; $d <= $max; $d++) {
+			$trace[] = $v;
+			for ($k = -$d; $k <= $d; $k += 2) {
+				if ($k === -$d || ($k !== $d && $v[$k - 1] < $v[$k + 1])) {
+					$x = $v[$k + 1];
+				} else {
+					$x = $v[$k - 1] + 1;
+				}
+
+				$y = $x - $k;
+				while ($x < $n && $y < $m && ($this->isEqual)($old[$x], $new[$y])) {
+					$x++;
+					$y++;
+				}
+
+				$v[$k] = $x;
+				if ($x >= $n && $y >= $m) {
+					return [$trace, $x, $y];
+				}
+			}
+		}
+		throw new Exception('Should not happen');
+	}
+
+	/**
+	 * @param array<int, array<int, int>> $trace
+	 * @param T[] $old
+	 * @param T[] $new
+	 * @return DiffElem[]
+	 */
+	private function extractDiff(array $trace, int $x, int $y, array $old, array $new): array
+	{
+		$result = [];
+		for ($d = count($trace) - 1; $d >= 0; $d--) {
+			$v = $trace[$d];
+			$k = $x - $y;
+
+			if ($k === -$d || ($k !== $d && $v[$k - 1] < $v[$k + 1])) {
+				$prevK = $k + 1;
+			} else {
+				$prevK = $k - 1;
+			}
+
+			$prevX = $v[$prevK];
+			$prevY = $prevX - $prevK;
+
+			while ($x > $prevX && $y > $prevY) {
+				$result[] = new DiffElem(DiffElem::TYPE_KEEP, $old[$x - 1], $new[$y - 1]);
+				$x--;
+				$y--;
+			}
+
+			if ($d === 0) {
+				break;
+			}
+
+			while ($x > $prevX) {
+				$result[] = new DiffElem(DiffElem::TYPE_REMOVE, $old[$x - 1], null);
+				$x--;
+			}
+
+			while ($y > $prevY) {
+				$result[] = new DiffElem(DiffElem::TYPE_ADD, null, $new[$y - 1]);
+				$y--;
+			}
+		}
+		return array_reverse($result);
+	}
+
+	/**
+	 * Coalesce equal-length sequences of remove+add into a replace operation.
+	 *
+	 * @param DiffElem[] $diff
+	 * @return DiffElem[]
+	 */
+	private function coalesceReplacements(array $diff): array
+	{
+		$newDiff = [];
+		$c = count($diff);
+		for ($i = 0; $i < $c; $i++) {
+			$diffType = $diff[$i]->type;
+			if ($diffType !== DiffElem::TYPE_REMOVE) {
+				$newDiff[] = $diff[$i];
+				continue;
+			}
+
+			$j = $i;
+			while ($j < $c && $diff[$j]->type === DiffElem::TYPE_REMOVE) {
+				$j++;
+			}
+
+			$k = $j;
+			while ($k < $c && $diff[$k]->type === DiffElem::TYPE_ADD) {
+				$k++;
+			}
+
+			if ($j - $i === $k - $j) {
+				$len = $j - $i;
+				for ($n = 0; $n < $len; $n++) {
+					$newDiff[] = new DiffElem(
+						DiffElem::TYPE_REPLACE,
+						$diff[$i + $n]->old,
+						$diff[$j + $n]->new,
+					);
+				}
+			} else {
+				for (; $i < $k; $i++) {
+					$newDiff[] = $diff[$i];
+				}
+			}
+			$i = $k - 1;
+		}
+		return $newDiff;
+	}
+
+}
diff --git a/phpstan/phpdoc-parser/src/Printer/Printer.php b/phpstan/phpdoc-parser/src/Printer/Printer.php
new file mode 100644
index 000000000..36f6ebe15
--- /dev/null
+++ b/phpstan/phpdoc-parser/src/Printer/Printer.php
@@ -0,0 +1,920 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Printer;
+
+use LogicException;
+use PHPStan\PhpDocParser\Ast\Attribute;
+use PHPStan\PhpDocParser\Ast\Comment;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\PhpDocParser\Ast\PhpDoc\AssertTagMethodValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\AssertTagPropertyValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\AssertTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineAnnotation;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArgument;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArray;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArrayItem;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueParameterNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\MixinTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamClosureThisTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamImmediatelyInvokedCallableTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamLaterInvokedCallableTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamOutTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PureUnlessCallableIsImpureTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\RequireExtendsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\RequireImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\SealedTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\SelfOutTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ThrowsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasImportTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\UsesTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeItemNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeUnsealedTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConditionalTypeForParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConditionalTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\InvalidTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ObjectShapeItemNode;
+use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\OffsetAccessTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use function array_keys;
+use function array_map;
+use function assert;
+use function count;
+use function get_class;
+use function get_object_vars;
+use function implode;
+use function in_array;
+use function is_array;
+use function preg_match_all;
+use function sprintf;
+use function str_replace;
+use function strlen;
+use function strpos;
+use function trim;
+use const PREG_SET_ORDER;
+
+/**
+ * Inspired by https://github.com/nikic/PHP-Parser/tree/36a6dcd04e7b0285e8f0868f44bd4927802f7df1
+ *
+ * Copyright (c) 2011, Nikita Popov
+ * All rights reserved.
+ */
+final class Printer
+{
+
+	/** @var Differ<Node> */
+	private Differ $differ;
+
+	/**
+	 * Map From "{$class}->{$subNode}" to string that should be inserted
+	 * between elements of this list subnode
+	 *
+	 * @var array<string, string>
+	 */
+	private array $listInsertionMap = [
+		PhpDocNode::class . '->children' => "\n * ",
+		UnionTypeNode::class . '->types' => '|',
+		IntersectionTypeNode::class . '->types' => '&',
+		ArrayShapeNode::class . '->items' => ', ',
+		ObjectShapeNode::class . '->items' => ', ',
+		CallableTypeNode::class . '->parameters' => ', ',
+		CallableTypeNode::class . '->templateTypes' => ', ',
+		GenericTypeNode::class . '->genericTypes' => ', ',
+		ConstExprArrayNode::class . '->items' => ', ',
+		MethodTagValueNode::class . '->parameters' => ', ',
+		DoctrineArray::class . '->items' => ', ',
+		DoctrineAnnotation::class . '->arguments' => ', ',
+	];
+
+	/**
+	 * [$find, $extraLeft, $extraRight]
+	 *
+	 * @var array<string, array{string|null, string, string}>
+	 */
+	private array $emptyListInsertionMap = [
+		CallableTypeNode::class . '->parameters' => ['(', '', ''],
+		ArrayShapeNode::class . '->items' => ['{', '', ''],
+		ObjectShapeNode::class . '->items' => ['{', '', ''],
+		DoctrineArray::class . '->items' => ['{', '', ''],
+		DoctrineAnnotation::class . '->arguments' => ['(', '', ''],
+	];
+
+	/** @var array<string, list<class-string<TypeNode>>> */
+	private array $parenthesesMap = [
+		CallableTypeNode::class . '->returnType' => [
+			CallableTypeNode::class,
+			UnionTypeNode::class,
+			IntersectionTypeNode::class,
+		],
+		ArrayTypeNode::class . '->type' => [
+			CallableTypeNode::class,
+			UnionTypeNode::class,
+			IntersectionTypeNode::class,
+			ConstTypeNode::class,
+			NullableTypeNode::class,
+		],
+		OffsetAccessTypeNode::class . '->type' => [
+			CallableTypeNode::class,
+			UnionTypeNode::class,
+			IntersectionTypeNode::class,
+			NullableTypeNode::class,
+		],
+	];
+
+	/** @var array<string, list<class-string<TypeNode>>> */
+	private array $parenthesesListMap = [
+		IntersectionTypeNode::class . '->types' => [
+			IntersectionTypeNode::class,
+			UnionTypeNode::class,
+			NullableTypeNode::class,
+		],
+		UnionTypeNode::class . '->types' => [
+			IntersectionTypeNode::class,
+			UnionTypeNode::class,
+			NullableTypeNode::class,
+		],
+	];
+
+	public function printFormatPreserving(PhpDocNode $node, PhpDocNode $originalNode, TokenIterator $originalTokens): string
+	{
+		$this->differ = new Differ(static function ($a, $b) {
+			if ($a instanceof Node && $b instanceof Node) {
+				return $a === $b->getAttribute(Attribute::ORIGINAL_NODE);
+			}
+
+			return false;
+		});
+
+		$tokenIndex = 0;
+		$result = $this->printArrayFormatPreserving(
+			$node->children,
+			$originalNode->children,
+			$originalTokens,
+			$tokenIndex,
+			PhpDocNode::class,
+			'children',
+		);
+		if ($result !== null) {
+			return $result . $originalTokens->getContentBetween($tokenIndex, $originalTokens->getTokenCount());
+		}
+
+		return $this->print($node);
+	}
+
+	public function print(Node $node): string
+	{
+		if ($node instanceof PhpDocNode) {
+			return "/**\n *" . implode("\n *", array_map(
+				function (PhpDocChildNode $child): string {
+					$s = $this->print($child);
+					return $s === '' ? '' : ' ' . $s;
+				},
+				$node->children,
+			)) . "\n */";
+		}
+		if ($node instanceof PhpDocTextNode) {
+			return $node->text;
+		}
+		if ($node instanceof PhpDocTagNode) {
+			if ($node->value instanceof DoctrineTagValueNode) {
+				return $this->print($node->value);
+			}
+
+			return trim(sprintf('%s %s', $node->name, $this->print($node->value)));
+		}
+		if ($node instanceof PhpDocTagValueNode) {
+			return $this->printTagValue($node);
+		}
+		if ($node instanceof TypeNode) {
+			return $this->printType($node);
+		}
+		if ($node instanceof ConstExprNode) {
+			return $this->printConstExpr($node);
+		}
+		if ($node instanceof MethodTagValueParameterNode) {
+			$type = $node->type !== null ? $this->print($node->type) . ' ' : '';
+			$isReference = $node->isReference ? '&' : '';
+			$isVariadic = $node->isVariadic ? '...' : '';
+			$default = $node->defaultValue !== null ? ' = ' . $this->print($node->defaultValue) : '';
+			return "{$type}{$isReference}{$isVariadic}{$node->parameterName}{$default}";
+		}
+		if ($node instanceof CallableTypeParameterNode) {
+			$type = $this->print($node->type) . ' ';
+			$isReference = $node->isReference ? '&' : '';
+			$isVariadic = $node->isVariadic ? '...' : '';
+			$isOptional = $node->isOptional ? '=' : '';
+			return trim("{$type}{$isReference}{$isVariadic}{$node->parameterName}") . $isOptional;
+		}
+		if ($node instanceof ArrayShapeUnsealedTypeNode) {
+			if ($node->keyType !== null) {
+				return sprintf('<%s, %s>', $this->printType($node->keyType), $this->printType($node->valueType));
+			}
+			return sprintf('<%s>', $this->printType($node->valueType));
+		}
+		if ($node instanceof DoctrineAnnotation) {
+			return (string) $node;
+		}
+		if ($node instanceof DoctrineArgument) {
+			return (string) $node;
+		}
+		if ($node instanceof DoctrineArray) {
+			return (string) $node;
+		}
+		if ($node instanceof DoctrineArrayItem) {
+			return (string) $node;
+		}
+		if ($node instanceof ArrayShapeItemNode) {
+			if ($node->keyName !== null) {
+				return sprintf(
+					'%s%s: %s',
+					$this->print($node->keyName),
+					$node->optional ? '?' : '',
+					$this->printType($node->valueType),
+				);
+			}
+
+			return $this->printType($node->valueType);
+		}
+		if ($node instanceof ObjectShapeItemNode) {
+			if ($node->keyName !== null) {
+				return sprintf(
+					'%s%s: %s',
+					$this->print($node->keyName),
+					$node->optional ? '?' : '',
+					$this->printType($node->valueType),
+				);
+			}
+
+			return $this->printType($node->valueType);
+		}
+
+		throw new LogicException(sprintf('Unknown node type %s', get_class($node)));
+	}
+
+	private function printTagValue(PhpDocTagValueNode $node): string
+	{
+		// only nodes that contain another node are handled here
+		// the rest falls back on (string) $node
+
+		if ($node instanceof AssertTagMethodValueNode) {
+			$isNegated = $node->isNegated ? '!' : '';
+			$isEquality = $node->isEquality ? '=' : '';
+			$type = $this->printType($node->type);
+			return trim("{$isNegated}{$isEquality}{$type} {$node->parameter}->{$node->method}() {$node->description}");
+		}
+		if ($node instanceof AssertTagPropertyValueNode) {
+			$isNegated = $node->isNegated ? '!' : '';
+			$isEquality = $node->isEquality ? '=' : '';
+			$type = $this->printType($node->type);
+			return trim("{$isNegated}{$isEquality}{$type} {$node->parameter}->{$node->property} {$node->description}");
+		}
+		if ($node instanceof AssertTagValueNode) {
+			$isNegated = $node->isNegated ? '!' : '';
+			$isEquality = $node->isEquality ? '=' : '';
+			$type = $this->printType($node->type);
+			return trim("{$isNegated}{$isEquality}{$type} {$node->parameter} {$node->description}");
+		}
+		if ($node instanceof ExtendsTagValueNode || $node instanceof ImplementsTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof MethodTagValueNode) {
+			$static = $node->isStatic ? 'static ' : '';
+			$returnType = $node->returnType !== null ? $this->printType($node->returnType) . ' ' : '';
+			$parameters = implode(', ', array_map(fn (MethodTagValueParameterNode $parameter): string => $this->print($parameter), $node->parameters));
+			$description = $node->description !== '' ? " {$node->description}" : '';
+			$templateTypes = count($node->templateTypes) > 0 ? '<' . implode(', ', array_map(fn (TemplateTagValueNode $templateTag): string => $this->print($templateTag), $node->templateTypes)) . '>' : '';
+			return "{$static}{$returnType}{$node->methodName}{$templateTypes}({$parameters}){$description}";
+		}
+		if ($node instanceof MixinTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof RequireExtendsTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof RequireImplementsTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof SealedTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof ParamOutTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof ParamTagValueNode) {
+			$reference = $node->isReference ? '&' : '';
+			$variadic = $node->isVariadic ? '...' : '';
+			$type = $this->printType($node->type);
+			return trim("{$type} {$reference}{$variadic}{$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof ParamImmediatelyInvokedCallableTagValueNode) {
+			return trim("{$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof ParamLaterInvokedCallableTagValueNode) {
+			return trim("{$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof ParamClosureThisTagValueNode) {
+			return trim("{$node->type} {$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof PureUnlessCallableIsImpureTagValueNode) {
+			return trim("{$node->parameterName} {$node->description}");
+		}
+		if ($node instanceof PropertyTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->propertyName} {$node->description}");
+		}
+		if ($node instanceof ReturnTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof SelfOutTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim($type . ' ' . $node->description);
+		}
+		if ($node instanceof TemplateTagValueNode) {
+			$upperBound = $node->bound !== null ? ' of ' . $this->printType($node->bound) : '';
+			$lowerBound = $node->lowerBound !== null ? ' super ' . $this->printType($node->lowerBound) : '';
+			$default = $node->default !== null ? ' = ' . $this->printType($node->default) : '';
+			return trim("{$node->name}{$upperBound}{$lowerBound}{$default} {$node->description}");
+		}
+		if ($node instanceof ThrowsTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof TypeAliasImportTagValueNode) {
+			return trim(
+				"{$node->importedAlias} from " . $this->printType($node->importedFrom)
+				. ($node->importedAs !== null ? " as {$node->importedAs}" : ''),
+			);
+		}
+		if ($node instanceof TypeAliasTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$node->alias} {$type}");
+		}
+		if ($node instanceof UsesTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} {$node->description}");
+		}
+		if ($node instanceof VarTagValueNode) {
+			$type = $this->printType($node->type);
+			return trim("{$type} " . trim("{$node->variableName} {$node->description}"));
+		}
+
+		return (string) $node;
+	}
+
+	private function printType(TypeNode $node): string
+	{
+		if ($node instanceof ArrayShapeNode) {
+			$items = array_map(fn (ArrayShapeItemNode $item): string => $this->print($item), $node->items);
+
+			if (! $node->sealed) {
+				$items[] = '...' . ($node->unsealedType === null ? '' : $this->print($node->unsealedType));
+			}
+
+			return $node->kind . '{' . implode(', ', $items) . '}';
+		}
+		if ($node instanceof ArrayTypeNode) {
+			return $this->printOffsetAccessType($node->type) . '[]';
+		}
+		if ($node instanceof CallableTypeNode) {
+			if ($node->returnType instanceof CallableTypeNode || $node->returnType instanceof UnionTypeNode || $node->returnType instanceof IntersectionTypeNode) {
+				$returnType = $this->wrapInParentheses($node->returnType);
+			} else {
+				$returnType = $this->printType($node->returnType);
+			}
+			$template = $node->templateTypes !== []
+				? '<' . implode(', ', array_map(fn (TemplateTagValueNode $templateNode): string => $this->print($templateNode), $node->templateTypes)) . '>'
+				: '';
+			$parameters = implode(', ', array_map(fn (CallableTypeParameterNode $parameterNode): string => $this->print($parameterNode), $node->parameters));
+			return "{$node->identifier}{$template}({$parameters}): {$returnType}";
+		}
+		if ($node instanceof ConditionalTypeForParameterNode) {
+			return sprintf(
+				'(%s %s %s ? %s : %s)',
+				$node->parameterName,
+				$node->negated ? 'is not' : 'is',
+				$this->printType($node->targetType),
+				$this->printType($node->if),
+				$this->printType($node->else),
+			);
+		}
+		if ($node instanceof ConditionalTypeNode) {
+			return sprintf(
+				'(%s %s %s ? %s : %s)',
+				$this->printType($node->subjectType),
+				$node->negated ? 'is not' : 'is',
+				$this->printType($node->targetType),
+				$this->printType($node->if),
+				$this->printType($node->else),
+			);
+		}
+		if ($node instanceof ConstTypeNode) {
+			return $this->printConstExpr($node->constExpr);
+		}
+		if ($node instanceof GenericTypeNode) {
+			$genericTypes = [];
+
+			foreach ($node->genericTypes as $index => $type) {
+				$variance = $node->variances[$index] ?? GenericTypeNode::VARIANCE_INVARIANT;
+				if ($variance === GenericTypeNode::VARIANCE_INVARIANT) {
+					$genericTypes[] = $this->printType($type);
+				} elseif ($variance === GenericTypeNode::VARIANCE_BIVARIANT) {
+					$genericTypes[] = '*';
+				} else {
+					$genericTypes[] = sprintf('%s %s', $variance, $this->print($type));
+				}
+			}
+
+			return $node->type . '<' . implode(', ', $genericTypes) . '>';
+		}
+		if ($node instanceof IdentifierTypeNode) {
+			return $node->name;
+		}
+		if ($node instanceof IntersectionTypeNode || $node instanceof UnionTypeNode) {
+			$items = [];
+			foreach ($node->types as $type) {
+				if (
+					$type instanceof IntersectionTypeNode
+					|| $type instanceof UnionTypeNode
+					|| $type instanceof NullableTypeNode
+				) {
+					$items[] = $this->wrapInParentheses($type);
+					continue;
+				}
+
+				$items[] = $this->printType($type);
+			}
+
+			return implode($node instanceof IntersectionTypeNode ? '&' : '|', $items);
+		}
+		if ($node instanceof InvalidTypeNode) {
+			return (string) $node;
+		}
+		if ($node instanceof NullableTypeNode) {
+			if ($node->type instanceof IntersectionTypeNode || $node->type instanceof UnionTypeNode) {
+				return '?(' . $this->printType($node->type) . ')';
+			}
+
+			return '?' . $this->printType($node->type);
+		}
+		if ($node instanceof ObjectShapeNode) {
+			$items = array_map(fn (ObjectShapeItemNode $item): string => $this->print($item), $node->items);
+
+			return 'object{' . implode(', ', $items) . '}';
+		}
+		if ($node instanceof OffsetAccessTypeNode) {
+			return $this->printOffsetAccessType($node->type) . '[' . $this->printType($node->offset) . ']';
+		}
+		if ($node instanceof ThisTypeNode) {
+			return (string) $node;
+		}
+
+		throw new LogicException(sprintf('Unknown node type %s', get_class($node)));
+	}
+
+	private function wrapInParentheses(TypeNode $node): string
+	{
+		return '(' . $this->printType($node) . ')';
+	}
+
+	private function printOffsetAccessType(TypeNode $type): string
+	{
+		if (
+			$type instanceof CallableTypeNode
+			|| $type instanceof UnionTypeNode
+			|| $type instanceof IntersectionTypeNode
+			|| $type instanceof NullableTypeNode
+		) {
+			return $this->wrapInParentheses($type);
+		}
+
+		return $this->printType($type);
+	}
+
+	private function printConstExpr(ConstExprNode $node): string
+	{
+		// this is fine - ConstExprNode classes do not contain nodes that need smart printer logic
+		return (string) $node;
+	}
+
+	/**
+	 * @param Node[] $nodes
+	 * @param Node[] $originalNodes
+	 */
+	private function printArrayFormatPreserving(array $nodes, array $originalNodes, TokenIterator $originalTokens, int &$tokenIndex, string $parentNodeClass, string $subNodeName): ?string
+	{
+		$diff = $this->differ->diffWithReplacements($originalNodes, $nodes);
+		$mapKey = $parentNodeClass . '->' . $subNodeName;
+		$insertStr = $this->listInsertionMap[$mapKey] ?? null;
+		$result = '';
+		$beforeFirstKeepOrReplace = true;
+		$delayedAdd = [];
+
+		$insertNewline = false;
+		[$isMultiline, $beforeAsteriskIndent, $afterAsteriskIndent] = $this->isMultiline($tokenIndex, $originalNodes, $originalTokens);
+
+		if ($insertStr === "\n * ") {
+			$insertStr = sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+		}
+
+		foreach ($diff as $i => $diffElem) {
+			$diffType = $diffElem->type;
+			$arrItem = $diffElem->new;
+			$origArrayItem = $diffElem->old;
+			if ($diffType === DiffElem::TYPE_KEEP || $diffType === DiffElem::TYPE_REPLACE) {
+				$beforeFirstKeepOrReplace = false;
+				if (!$arrItem instanceof Node || !$origArrayItem instanceof Node) {
+					return null;
+				}
+
+				/** @var int $itemStartPos */
+				$itemStartPos = $origArrayItem->getAttribute(Attribute::START_INDEX);
+
+				/** @var int $itemEndPos */
+				$itemEndPos = $origArrayItem->getAttribute(Attribute::END_INDEX);
+
+				if ($itemStartPos < 0 || $itemEndPos < 0 || $itemStartPos < $tokenIndex) {
+					throw new LogicException();
+				}
+
+				$comments = $arrItem->getAttribute(Attribute::COMMENTS) ?? [];
+				$origComments = $origArrayItem->getAttribute(Attribute::COMMENTS) ?? [];
+
+				$commentStartPos = count($origComments) > 0 ? $origComments[0]->startIndex : $itemStartPos;
+				assert($commentStartPos >= 0);
+
+				$result .= $originalTokens->getContentBetween($tokenIndex, $itemStartPos);
+
+				if (count($delayedAdd) > 0) {
+					foreach ($delayedAdd as $delayedAddNode) {
+						$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
+							&& in_array(get_class($delayedAddNode), $this->parenthesesListMap[$mapKey], true);
+						if ($parenthesesNeeded) {
+							$result .= '(';
+						}
+
+						if ($insertNewline) {
+							$delayedAddComments = $delayedAddNode->getAttribute(Attribute::COMMENTS) ?? [];
+							if (count($delayedAddComments) > 0) {
+								$result .= $this->printComments($delayedAddComments, $beforeAsteriskIndent, $afterAsteriskIndent);
+								$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+							}
+						}
+
+						$result .= $this->printNodeFormatPreserving($delayedAddNode, $originalTokens);
+						if ($parenthesesNeeded) {
+							$result .= ')';
+						}
+
+						if ($insertNewline) {
+							$result .= $insertStr . sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+						} else {
+							$result .= $insertStr;
+						}
+					}
+
+					$delayedAdd = [];
+				}
+
+				$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
+					&& in_array(get_class($arrItem), $this->parenthesesListMap[$mapKey], true)
+					&& !in_array(get_class($origArrayItem), $this->parenthesesListMap[$mapKey], true);
+				$addParentheses = $parenthesesNeeded && !$originalTokens->hasParentheses($itemStartPos, $itemEndPos);
+				if ($addParentheses) {
+					$result .= '(';
+				}
+
+				if ($comments !== $origComments) {
+					if (count($comments) > 0) {
+						$result .= $this->printComments($comments, $beforeAsteriskIndent, $afterAsteriskIndent);
+						$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+					}
+				}
+
+				$result .= $this->printNodeFormatPreserving($arrItem, $originalTokens);
+				if ($addParentheses) {
+					$result .= ')';
+				}
+				$tokenIndex = $itemEndPos + 1;
+
+			} elseif ($diffType === DiffElem::TYPE_ADD) {
+				if ($insertStr === null) {
+					return null;
+				}
+				if (!$arrItem instanceof Node) {
+					return null;
+				}
+
+				if ($insertStr === ', ' && $isMultiline || count($arrItem->getAttribute(Attribute::COMMENTS) ?? []) > 0) {
+					$insertStr = ',';
+					$insertNewline = true;
+				}
+
+				if ($beforeFirstKeepOrReplace) {
+					// Will be inserted at the next "replace" or "keep" element
+					$delayedAdd[] = $arrItem;
+					continue;
+				}
+
+				/** @var int $itemEndPos */
+				$itemEndPos = $tokenIndex - 1;
+				if ($insertNewline) {
+					$comments = $arrItem->getAttribute(Attribute::COMMENTS) ?? [];
+					$result .= $insertStr;
+					if (count($comments) > 0) {
+						$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+						$result .= $this->printComments($comments, $beforeAsteriskIndent, $afterAsteriskIndent);
+					}
+					$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+				} else {
+					$result .= $insertStr;
+				}
+
+				$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
+					&& in_array(get_class($arrItem), $this->parenthesesListMap[$mapKey], true);
+				if ($parenthesesNeeded) {
+					$result .= '(';
+				}
+
+				$result .= $this->printNodeFormatPreserving($arrItem, $originalTokens);
+				if ($parenthesesNeeded) {
+					$result .= ')';
+				}
+
+				$tokenIndex = $itemEndPos + 1;
+
+			} elseif ($diffType === DiffElem::TYPE_REMOVE) {
+				if (!$origArrayItem instanceof Node) {
+					return null;
+				}
+
+				/** @var int $itemStartPos */
+				$itemStartPos = $origArrayItem->getAttribute(Attribute::START_INDEX);
+
+				/** @var int $itemEndPos */
+				$itemEndPos = $origArrayItem->getAttribute(Attribute::END_INDEX);
+				if ($itemStartPos < 0 || $itemEndPos < 0) {
+					throw new LogicException();
+				}
+
+				if ($i === 0) {
+					// If we're removing from the start, keep the tokens before the node and drop those after it,
+					// instead of the other way around.
+					$originalTokensArray = $originalTokens->getTokens();
+					for ($j = $tokenIndex; $j < $itemStartPos; $j++) {
+						if ($originalTokensArray[$j][Lexer::TYPE_OFFSET] === Lexer::TOKEN_PHPDOC_EOL) {
+							break;
+						}
+						$result .= $originalTokensArray[$j][Lexer::VALUE_OFFSET];
+					}
+				}
+
+				$tokenIndex = $itemEndPos + 1;
+			}
+		}
+
+		if (count($delayedAdd) > 0) {
+			if (!isset($this->emptyListInsertionMap[$mapKey])) {
+				return null;
+			}
+
+			[$findToken, $extraLeft, $extraRight] = $this->emptyListInsertionMap[$mapKey];
+			if ($findToken !== null) {
+				$originalTokensArray = $originalTokens->getTokens();
+				for (; $tokenIndex < count($originalTokensArray); $tokenIndex++) {
+					$result .= $originalTokensArray[$tokenIndex][Lexer::VALUE_OFFSET];
+					if ($originalTokensArray[$tokenIndex][Lexer::VALUE_OFFSET] !== $findToken) {
+						continue;
+					}
+
+					$tokenIndex++;
+					break;
+				}
+			}
+			$first = true;
+			$result .= $extraLeft;
+			foreach ($delayedAdd as $delayedAddNode) {
+				if (!$first) {
+					$result .= $insertStr;
+					if ($insertNewline) {
+						$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
+					}
+				}
+
+				$result .= $this->printNodeFormatPreserving($delayedAddNode, $originalTokens);
+				$first = false;
+			}
+			$result .= $extraRight;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param list<Comment> $comments
+	 */
+	private function printComments(array $comments, string $beforeAsteriskIndent, string $afterAsteriskIndent): string
+	{
+		$formattedComments = [];
+
+		foreach ($comments as $comment) {
+			$formattedComments[] = str_replace("\n", "\n" . $beforeAsteriskIndent . '*' . $afterAsteriskIndent, $comment->getReformattedText());
+		}
+
+		return implode("\n$beforeAsteriskIndent*$afterAsteriskIndent", $formattedComments);
+	}
+
+	/**
+	 * @param array<Node|null> $nodes
+	 * @return array{bool, string, string}
+	 */
+	private function isMultiline(int $initialIndex, array $nodes, TokenIterator $originalTokens): array
+	{
+		$isMultiline = count($nodes) > 1;
+		$pos = $initialIndex;
+		$allText = '';
+		/** @var Node|null $node */
+		foreach ($nodes as $node) {
+			if (!$node instanceof Node) {
+				continue;
+			}
+
+			$endPos = $node->getAttribute(Attribute::END_INDEX) + 1;
+			$text = $originalTokens->getContentBetween($pos, $endPos);
+			$allText .= $text;
+			if (strpos($text, "\n") === false) {
+				// We require that a newline is present between *every* item. If the formatting
+				// is inconsistent, with only some items having newlines, we don't consider it
+				// as multiline
+				$isMultiline = false;
+			}
+			$pos = $endPos;
+		}
+
+		$c = preg_match_all('~\n(?<before>[\\x09\\x20]*)\*(?<after>\\x20*)~', $allText, $matches, PREG_SET_ORDER);
+		if ($c === 0) {
+			return [$isMultiline, ' ', '  '];
+		}
+
+		$before = '';
+		$after = '';
+		foreach ($matches as $match) {
+			if (strlen($match['before']) > strlen($before)) {
+				$before = $match['before'];
+			}
+			if (strlen($match['after']) <= strlen($after)) {
+				continue;
+			}
+
+			$after = $match['after'];
+		}
+
+		$before = strlen($before) === 0 ? ' ' : $before;
+		$after = strlen($after) === 0 ? '  ' : $after;
+
+		return [$isMultiline, $before, $after];
+	}
+
+	private function printNodeFormatPreserving(Node $node, TokenIterator $originalTokens): string
+	{
+		/** @var Node|null $originalNode */
+		$originalNode = $node->getAttribute(Attribute::ORIGINAL_NODE);
+		if ($originalNode === null) {
+			return $this->print($node);
+		}
+
+		$class = get_class($node);
+		if ($class !== get_class($originalNode)) {
+			throw new LogicException();
+		}
+
+		$startPos = $originalNode->getAttribute(Attribute::START_INDEX);
+		$endPos = $originalNode->getAttribute(Attribute::END_INDEX);
+		if ($startPos < 0 || $endPos < 0) {
+			throw new LogicException();
+		}
+
+		$result = '';
+		$pos = $startPos;
+		$subNodeNames = array_keys(get_object_vars($node));
+		foreach ($subNodeNames as $subNodeName) {
+			$subNode = $node->$subNodeName;
+			$origSubNode = $originalNode->$subNodeName;
+
+			if (
+				(!$subNode instanceof Node && $subNode !== null)
+				|| (!$origSubNode instanceof Node && $origSubNode !== null)
+			) {
+				if ($subNode === $origSubNode) {
+					// Unchanged, can reuse old code
+					continue;
+				}
+
+				if (is_array($subNode) && is_array($origSubNode)) {
+					// Array subnode changed, we might be able to reconstruct it
+					$listResult = $this->printArrayFormatPreserving(
+						$subNode,
+						$origSubNode,
+						$originalTokens,
+						$pos,
+						$class,
+						$subNodeName,
+					);
+
+					if ($listResult === null) {
+						return $this->print($node);
+					}
+
+					$result .= $listResult;
+					continue;
+				}
+
+				return $this->print($node);
+			}
+
+			if ($origSubNode === null) {
+				if ($subNode === null) {
+					// Both null, nothing to do
+					continue;
+				}
+
+				return $this->print($node);
+			}
+
+			$subStartPos = $origSubNode->getAttribute(Attribute::START_INDEX);
+			$subEndPos = $origSubNode->getAttribute(Attribute::END_INDEX);
+			if ($subStartPos < 0 || $subEndPos < 0) {
+				throw new LogicException();
+			}
+
+			if ($subEndPos < $subStartPos) {
+				return $this->print($node);
+			}
+
+			if ($subNode === null) {
+				return $this->print($node);
+			}
+
+			$result .= $originalTokens->getContentBetween($pos, $subStartPos);
+			$mapKey = get_class($node) . '->' . $subNodeName;
+			$parenthesesNeeded = isset($this->parenthesesMap[$mapKey])
+				&& in_array(get_class($subNode), $this->parenthesesMap[$mapKey], true);
+
+			if ($subNode->getAttribute(Attribute::ORIGINAL_NODE) !== null) {
+				$parenthesesNeeded = $parenthesesNeeded
+					&& !in_array(get_class($subNode->getAttribute(Attribute::ORIGINAL_NODE)), $this->parenthesesMap[$mapKey], true);
+			}
+
+			$addParentheses = $parenthesesNeeded && !$originalTokens->hasParentheses($subStartPos, $subEndPos);
+			if ($addParentheses) {
+				$result .= '(';
+			}
+
+			$result .= $this->printNodeFormatPreserving($subNode, $originalTokens);
+			if ($addParentheses) {
+				$result .= ')';
+			}
+
+			$pos = $subEndPos + 1;
+		}
+
+		return $result . $originalTokens->getContentBetween($pos, $endPos + 1);
+	}
+
+}
diff --git a/spomky-labs/cbor-php/RELEASES.md b/spomky-labs/cbor-php/RELEASES.md
new file mode 100644
index 000000000..b685c6b6f
--- /dev/null
+++ b/spomky-labs/cbor-php/RELEASES.md
@@ -0,0 +1,18 @@
+# Versioning and Release
+
+This document describes the versioning and release process of the Webauthn Framework.
+This document is a living document, contents will be updated according to each release.
+
+## Releases
+
+Webauthn Framework releases will be versioned using dotted triples, similar to [Semantic Version](http://semver.org/).
+For this specific document, we will refer to the respective components of this triple as `<major>.<minor>.<patch>`.
+The version number may have additional information, such as "-rc1,-rc2,-rc3" to mark release candidate builds for earlier access.
+Such releases will be considered as "pre-releases".
+
+## Minor Release Support Matrix
+
+| Version | Supported          |
+|---------|--------------------|
+| 3.2.x   | :white_check_mark: |
+| < 3.2.x | :x:                |
diff --git a/spomky-labs/cbor-php/src/AbstractCBORObject.php b/spomky-labs/cbor-php/src/AbstractCBORObject.php
index 0e0351d64..2fbd96ddb 100644
--- a/spomky-labs/cbor-php/src/AbstractCBORObject.php
+++ b/spomky-labs/cbor-php/src/AbstractCBORObject.php
@@ -4,10 +4,9 @@
 
 namespace CBOR;
 
-use Stringable;
 use function chr;
 
-abstract class AbstractCBORObject implements CBORObject, Stringable
+abstract class AbstractCBORObject implements CBORObject
 {
     public function __construct(
         private int $majorType,
diff --git a/spomky-labs/cbor-php/src/ByteStringObject.php b/spomky-labs/cbor-php/src/ByteStringObject.php
index b7bb01fd9..ab271187d 100644
--- a/spomky-labs/cbor-php/src/ByteStringObject.php
+++ b/spomky-labs/cbor-php/src/ByteStringObject.php
@@ -4,6 +4,8 @@
 
 namespace CBOR;
 
+use function strlen;
+
 /**
  * @see \CBOR\Test\ByteStringObjectTest
  */
@@ -13,7 +15,7 @@ final class ByteStringObject extends AbstractCBORObject implements Normalizable
 
     private string $value;
 
-    private ?string $length = null;
+    private ?string $length;
 
     public function __construct(string $data)
     {
@@ -27,9 +29,7 @@ public function __construct(string $data)
     public function __toString(): string
     {
         $result = parent::__toString();
-        if ($this->length !== null) {
-            $result .= $this->length;
-        }
+        $result .= $this->length ?? '';
 
         return $result . $this->value;
     }
@@ -46,7 +46,7 @@ public function getValue(): string
 
     public function getLength(): int
     {
-        return mb_strlen($this->value, '8bit');
+        return strlen($this->value);
     }
 
     public function normalize(): string
diff --git a/spomky-labs/cbor-php/src/CBORObject.php b/spomky-labs/cbor-php/src/CBORObject.php
index 2da9f8ae1..816b86a60 100644
--- a/spomky-labs/cbor-php/src/CBORObject.php
+++ b/spomky-labs/cbor-php/src/CBORObject.php
@@ -4,7 +4,9 @@
 
 namespace CBOR;
 
-interface CBORObject
+use Stringable;
+
+interface CBORObject extends Stringable
 {
     public const MAJOR_TYPE_UNSIGNED_INTEGER = 0b000;
 
@@ -86,8 +88,6 @@ interface CBORObject
 
     public const TAG_CBOR = 55799;
 
-    public function __toString(): string;
-
     public function getMajorType(): int;
 
     public function getAdditionalInformation(): int;
diff --git a/spomky-labs/cbor-php/src/Decoder.php b/spomky-labs/cbor-php/src/Decoder.php
index 67e98f7ec..c0c0de97a 100644
--- a/spomky-labs/cbor-php/src/Decoder.php
+++ b/spomky-labs/cbor-php/src/Decoder.php
@@ -35,6 +35,7 @@
 use InvalidArgumentException;
 use RuntimeException;
 use function ord;
+use function sprintf;
 use const STR_PAD_LEFT;
 
 final class Decoder implements DecoderInterface
@@ -150,7 +151,7 @@ private function processInfinite(Stream $stream, int $mt, bool $breakable): CBOR
                 }
 
                 return $object;
-            case CBORObject::MAJOR_TYPE_TEXT_STRING : //3
+            case CBORObject::MAJOR_TYPE_TEXT_STRING: //3
                 $object = IndefiniteLengthTextStringObject::create();
                 while (! ($it = $this->process($stream, true)) instanceof BreakObject) {
                     if (! $it instanceof TextStringObject) {
@@ -162,7 +163,7 @@ private function processInfinite(Stream $stream, int $mt, bool $breakable): CBOR
                 }
 
                 return $object;
-            case CBORObject::MAJOR_TYPE_LIST : //4
+            case CBORObject::MAJOR_TYPE_LIST: //4
                 $object = IndefiniteLengthListObject::create();
                 $it = $this->process($stream, true);
                 while (! $it instanceof BreakObject) {
@@ -171,23 +172,23 @@ private function processInfinite(Stream $stream, int $mt, bool $breakable): CBOR
                 }
 
                 return $object;
-            case CBORObject::MAJOR_TYPE_MAP : //5
+            case CBORObject::MAJOR_TYPE_MAP: //5
                 $object = IndefiniteLengthMapObject::create();
                 while (! ($it = $this->process($stream, true)) instanceof BreakObject) {
                     $object->add($it, $this->process($stream, false));
                 }
 
                 return $object;
-            case CBORObject::MAJOR_TYPE_OTHER_TYPE : //7
+            case CBORObject::MAJOR_TYPE_OTHER_TYPE: //7
                 if (! $breakable) {
                     throw new InvalidArgumentException('Cannot parse the data. No enclosing indefinite.');
                 }
 
                 return BreakObject::create();
-            case CBORObject::MAJOR_TYPE_UNSIGNED_INTEGER : //0
-            case CBORObject::MAJOR_TYPE_NEGATIVE_INTEGER : //1
-            case CBORObject::MAJOR_TYPE_TAG : //6
-            default :
+            case CBORObject::MAJOR_TYPE_UNSIGNED_INTEGER: //0
+            case CBORObject::MAJOR_TYPE_NEGATIVE_INTEGER: //1
+            case CBORObject::MAJOR_TYPE_TAG: //6
+            default:
                 throw new InvalidArgumentException(sprintf(
                     'Cannot parse the data. Found infinite length for Major Type "%s" (%d).',
                     str_pad(decbin($mt), 5, '0', STR_PAD_LEFT),
@@ -198,28 +199,28 @@ private function processInfinite(Stream $stream, int $mt, bool $breakable): CBOR
 
     private function generateTagManager(): TagManagerInterface
     {
-        return TagManager::create()
-            ->add(DatetimeTag::class)
-            ->add(TimestampTag::class)
+        return TagManager::create([
+            DatetimeTag::class,
+            TimestampTag::class,
 
-            ->add(UnsignedBigIntegerTag::class)
-            ->add(NegativeBigIntegerTag::class)
+            UnsignedBigIntegerTag::class,
+            NegativeBigIntegerTag::class,
 
-            ->add(DecimalFractionTag::class)
-            ->add(BigFloatTag::class)
+            DecimalFractionTag::class,
+            BigFloatTag::class,
 
-            ->add(Base64UrlEncodingTag::class)
-            ->add(Base64EncodingTag::class)
-            ->add(Base16EncodingTag::class)
-            ->add(CBOREncodingTag::class)
+            Base64UrlEncodingTag::class,
+            Base64EncodingTag::class,
+            Base16EncodingTag::class,
+            CBOREncodingTag::class,
 
-            ->add(UriTag::class)
-            ->add(Base64UrlTag::class)
-            ->add(Base64Tag::class)
-            ->add(MimeTag::class)
+            UriTag::class,
+            Base64UrlTag::class,
+            Base64Tag::class,
+            MimeTag::class,
 
-            ->add(CBORTag::class)
-        ;
+            CBORTag::class,
+        ]);
     }
 
     private function generateOtherObjectManager(): OtherObjectManagerInterface
diff --git a/spomky-labs/cbor-php/src/Encoder.php b/spomky-labs/cbor-php/src/Encoder.php
new file mode 100644
index 000000000..d8ed60eb2
--- /dev/null
+++ b/spomky-labs/cbor-php/src/Encoder.php
@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CBOR;
+
+use CBOR\OtherObject\DoublePrecisionFloatObject;
+use CBOR\OtherObject\FalseObject;
+use CBOR\OtherObject\NullObject;
+use CBOR\OtherObject\SinglePrecisionFloatObject;
+use CBOR\OtherObject\TrueObject;
+use InvalidArgumentException;
+use function is_array;
+use function is_float;
+use function is_int;
+use function is_string;
+
+final class Encoder implements EncoderInterface
+{
+    public const FLOAT_FORMAT_SINGLE_PRECISION = 0b0000001;
+
+    public const INDEFINITE_BYTE_STRING_LENGTH = 0b00000010;
+
+    public const INDEFINITE_TEXT_STRING_LENGTH = 0b00000100;
+
+    public const INDEFINITE_LIST_LENGTH = 0b00001000;
+
+    public const INDEFINITE_MAP_LENGTH = 0b00010000;
+
+    public function encode(mixed $data, int $options = 0): string
+    {
+        return (string) $this->processData($data, $options);
+    }
+
+    private function processData(mixed $data, int $option): CBORObject
+    {
+        return match (true) {
+            $data instanceof CBORObject => $data,
+            is_string($data) => preg_match('//u', $data) === 1 ? $this->processTextString(
+                $data,
+                $option
+            ) : $this->processByteString($data, $option),
+            is_array($data) => array_is_list($data) ? $this->processList($data, $option) : $this->processMap(
+                $data,
+                $option
+            ),
+            is_int($data) => $data < 0 ? NegativeIntegerObject::create($data) : UnsignedIntegerObject::create($data),
+            is_float($data) => $this->processFloat($data, $option),
+            $data === null => NullObject::create(),
+            $data === false => FalseObject::create(),
+            $data === true => TrueObject::create(),
+            default => throw new InvalidArgumentException('Unsupported data type'),
+        };
+    }
+
+    /**
+     * @param array<array-key, mixed> $data
+     */
+    private function processList(array $data, int $option): ListObject|IndefiniteLengthListObject
+    {
+        $isIndefinite = 0 !== ($option & self::INDEFINITE_LIST_LENGTH);
+        $list = $isIndefinite ? IndefiniteLengthListObject::create() : ListObject::create();
+        foreach ($data as $item) {
+            $list->add($this->processData($item, $option));
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param array<array-key, mixed> $data
+     */
+    private function processMap(array $data, int $option): MapObject|IndefiniteLengthMapObject
+    {
+        $isIndefinite = 0 !== ($option & self::INDEFINITE_MAP_LENGTH);
+        $map = $isIndefinite ? IndefiniteLengthMapObject::create() : MapObject::create();
+        foreach ($data as $key => $value) {
+            $map->add($this->processData($key, $option), $this->processData($value, $option));
+        }
+
+        return $map;
+    }
+
+    private function processFloat(float $data, int $option): SinglePrecisionFloatObject|DoublePrecisionFloatObject
+    {
+        $isSinglePrecisionFloat = 0 !== ($option & self::FLOAT_FORMAT_SINGLE_PRECISION);
+
+        return match (true) {
+            $isSinglePrecisionFloat => SinglePrecisionFloatObject::createFromFloat($data),
+            default => DoublePrecisionFloatObject::createFromFloat($data),
+        };
+    }
+
+    private function processTextString(string $data, int $option): TextStringObject|IndefiniteLengthTextStringObject
+    {
+        $isIndefinite = 0 !== ($option & self::INDEFINITE_TEXT_STRING_LENGTH);
+        $cbor = TextStringObject::create($data);
+
+        if (! $isIndefinite) {
+            return $cbor;
+        }
+
+        return IndefiniteLengthTextStringObject::create()->add($cbor);
+    }
+
+    private function processByteString(string $data, int $option): ByteStringObject|IndefiniteLengthByteStringObject
+    {
+        $isIndefinite = 0 !== ($option & self::INDEFINITE_BYTE_STRING_LENGTH);
+        $cbor = ByteStringObject::create($data);
+
+        if (! $isIndefinite) {
+            return $cbor;
+        }
+
+        return IndefiniteLengthByteStringObject::create()->add($cbor);
+    }
+}
diff --git a/spomky-labs/cbor-php/src/EncoderInterface.php b/spomky-labs/cbor-php/src/EncoderInterface.php
new file mode 100644
index 000000000..f9c18ee9a
--- /dev/null
+++ b/spomky-labs/cbor-php/src/EncoderInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CBOR;
+
+interface EncoderInterface
+{
+    public function encode(mixed $data, int $options = 0): string;
+}
diff --git a/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php b/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php
index ebe97c1b4..56dc4115c 100644
--- a/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php
+++ b/spomky-labs/cbor-php/src/IndefiniteLengthByteStringObject.php
@@ -27,15 +27,20 @@ public function __toString(): string
     {
         $result = parent::__toString();
         foreach ($this->chunks as $chunk) {
-            $result .= $chunk->__toString();
+            $result .= (string) $chunk;
         }
 
         return $result . "\xFF";
     }
 
-    public static function create(): self
+    public static function create(string ...$chunks): self
     {
-        return new self();
+        $object = new self();
+        foreach ($chunks as $chunk) {
+            $object->append($chunk);
+        }
+
+        return $object;
     }
 
     public function add(ByteStringObject $chunk): self
diff --git a/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php b/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php
index e1bef93e6..480d94a9d 100644
--- a/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php
+++ b/spomky-labs/cbor-php/src/IndefiniteLengthListObject.php
@@ -42,9 +42,14 @@ public function __toString(): string
         return $result . "\xFF";
     }
 
-    public static function create(): self
+    public static function create(CBORObject ...$items): self
     {
-        return new self();
+        $object = new self();
+        foreach ($items as $item) {
+            $object->add($item);
+        }
+
+        return $object;
     }
 
     /**
diff --git a/spomky-labs/cbor-php/src/IndefiniteLengthTextStringObject.php b/spomky-labs/cbor-php/src/IndefiniteLengthTextStringObject.php
index bc3a15da9..ccb6d7830 100644
--- a/spomky-labs/cbor-php/src/IndefiniteLengthTextStringObject.php
+++ b/spomky-labs/cbor-php/src/IndefiniteLengthTextStringObject.php
@@ -33,9 +33,14 @@ public function __toString(): string
         return $result . "\xFF";
     }
 
-    public static function create(): self
+    public static function create(string ...$chunks): self
     {
-        return new self();
+        $object = new self();
+        foreach ($chunks as $chunk) {
+            $object->append($chunk);
+        }
+
+        return $object;
     }
 
     public function add(TextStringObject $chunk): self
diff --git a/spomky-labs/cbor-php/src/LengthCalculator.php b/spomky-labs/cbor-php/src/LengthCalculator.php
index ec8c678c5..da43ce8db 100644
--- a/spomky-labs/cbor-php/src/LengthCalculator.php
+++ b/spomky-labs/cbor-php/src/LengthCalculator.php
@@ -8,6 +8,7 @@
 use InvalidArgumentException;
 use function chr;
 use function count;
+use function strlen;
 use const STR_PAD_LEFT;
 
 final class LengthCalculator
@@ -17,7 +18,7 @@ final class LengthCalculator
      */
     public static function getLengthOfString(string $data): array
     {
-        $length = mb_strlen($data, '8bit');
+        $length = strlen($data);
 
         return self::computeLength($length);
     }
@@ -54,7 +55,7 @@ private static function computeLength(int $length): array
 
     private static function hex2bin(string $data): string
     {
-        $data = str_pad($data, (int) (2 ** ceil(log(mb_strlen($data, '8bit'), 2))), '0', STR_PAD_LEFT);
+        $data = str_pad($data, (int) (2 ** ceil(log(strlen($data), 2))), '0', STR_PAD_LEFT);
         $result = hex2bin($data);
         if ($result === false) {
             throw new InvalidArgumentException('Unable to convert the data');
diff --git a/spomky-labs/cbor-php/src/ListObject.php b/spomky-labs/cbor-php/src/ListObject.php
index 4f8da7260..06f7f26e9 100644
--- a/spomky-labs/cbor-php/src/ListObject.php
+++ b/spomky-labs/cbor-php/src/ListObject.php
@@ -46,9 +46,7 @@ public function __construct(array $data = [])
     public function __toString(): string
     {
         $result = parent::__toString();
-        if ($this->length !== null) {
-            $result .= $this->length;
-        }
+        $result .= $this->length ?? '';
         foreach ($this->data as $object) {
             $result .= (string) $object;
         }
diff --git a/spomky-labs/cbor-php/src/MapObject.php b/spomky-labs/cbor-php/src/MapObject.php
index 72a7431fa..a7c11397c 100644
--- a/spomky-labs/cbor-php/src/MapObject.php
+++ b/spomky-labs/cbor-php/src/MapObject.php
@@ -26,7 +26,7 @@ final class MapObject extends AbstractCBORObject implements Countable, IteratorA
      */
     private array $data;
 
-    private ?string $length = null;
+    private ?string $length;
 
     /**
      * @param MapItem[] $data
@@ -34,12 +34,6 @@ final class MapObject extends AbstractCBORObject implements Countable, IteratorA
     public function __construct(array $data = [])
     {
         [$additionalInformation, $length] = LengthCalculator::getLengthOfArray($data);
-        array_map(static function ($item): void {
-            if (! $item instanceof MapItem) {
-                throw new InvalidArgumentException('The list must contain only MapItem objects.');
-            }
-        }, $data);
-
         parent::__construct(self::MAJOR_TYPE, $additionalInformation);
         $this->data = $data;
         $this->length = $length;
@@ -48,16 +42,10 @@ public function __construct(array $data = [])
     public function __toString(): string
     {
         $result = parent::__toString();
-        if ($this->length !== null) {
-            $result .= $this->length;
-        }
+        $result .= $this->length ?? '';
         foreach ($this->data as $object) {
-            $result .= $object->getKey()
-                ->__toString()
-            ;
-            $result .= $object->getValue()
-                ->__toString()
-            ;
+            $result .= (string) $object->getKey();
+            $result .= (string) $object->getValue();
         }
 
         return $result;
diff --git a/spomky-labs/cbor-php/src/NegativeIntegerObject.php b/spomky-labs/cbor-php/src/NegativeIntegerObject.php
index 93c0ee708..26caecc8c 100644
--- a/spomky-labs/cbor-php/src/NegativeIntegerObject.php
+++ b/spomky-labs/cbor-php/src/NegativeIntegerObject.php
@@ -46,6 +46,9 @@ public static function createFromString(string $value): self
         return self::createBigInteger($integer);
     }
 
+    /**
+     * @return numeric-string
+     */
     public function getValue(): string
     {
         if ($this->data === null) {
@@ -60,6 +63,9 @@ public function getValue(): string
         ;
     }
 
+    /**
+     * @return numeric-string
+     */
     public function normalize(): string
     {
         return $this->getValue();
diff --git a/spomky-labs/cbor-php/src/OtherObject/DoublePrecisionFloatObject.php b/spomky-labs/cbor-php/src/OtherObject/DoublePrecisionFloatObject.php
index db3a1d2f6..230174628 100644
--- a/spomky-labs/cbor-php/src/OtherObject/DoublePrecisionFloatObject.php
+++ b/spomky-labs/cbor-php/src/OtherObject/DoublePrecisionFloatObject.php
@@ -9,6 +9,7 @@
 use CBOR\OtherObject as Base;
 use CBOR\Utils;
 use InvalidArgumentException;
+use function strlen;
 use const INF;
 use const NAN;
 
@@ -19,6 +20,21 @@ public static function supportedAdditionalInformation(): array
         return [self::OBJECT_DOUBLE_PRECISION_FLOAT];
     }
 
+    public static function createFromFloat(float $number): self
+    {
+        $value = match (true) {
+            is_nan($number) => hex2bin('7FF8000000000000'),
+            is_infinite($number) && $number > 0 => hex2bin('7FF0000000000000'),
+            is_infinite($number) && $number < 0 => hex2bin('FFF0000000000000'),
+            default => (fn (): string => unpack('S', "\x01\x00")[1] === 1 ? strrev(pack('d', $number)) : pack(
+                'd',
+                $number
+            ))(),
+        };
+
+        return new self(self::OBJECT_DOUBLE_PRECISION_FLOAT, $value);
+    }
+
     public static function createFromLoadedData(int $additionalInformation, ?string $data): Base
     {
         return new self($additionalInformation, $data);
@@ -26,7 +42,7 @@ public static function createFromLoadedData(int $additionalInformation, ?string
 
     public static function create(string $value): self
     {
-        if (mb_strlen($value, '8bit') !== 8) {
+        if (strlen($value) !== 8) {
             throw new InvalidArgumentException('The value is not a valid double precision floating point');
         }
 
diff --git a/spomky-labs/cbor-php/src/OtherObject/HalfPrecisionFloatObject.php b/spomky-labs/cbor-php/src/OtherObject/HalfPrecisionFloatObject.php
index 467e0c292..ba114b9d6 100644
--- a/spomky-labs/cbor-php/src/OtherObject/HalfPrecisionFloatObject.php
+++ b/spomky-labs/cbor-php/src/OtherObject/HalfPrecisionFloatObject.php
@@ -9,6 +9,7 @@
 use CBOR\OtherObject as Base;
 use CBOR\Utils;
 use InvalidArgumentException;
+use function strlen;
 use const INF;
 use const NAN;
 
@@ -26,7 +27,7 @@ public static function createFromLoadedData(int $additionalInformation, ?string
 
     public static function create(string $value): self
     {
-        if (mb_strlen($value, '8bit') !== 2) {
+        if (strlen($value) !== 2) {
             throw new InvalidArgumentException('The value is not a valid half precision floating point');
         }
 
diff --git a/spomky-labs/cbor-php/src/OtherObject/OtherObjectManager.php b/spomky-labs/cbor-php/src/OtherObject/OtherObjectManager.php
index e691c3dd2..ababcbbb7 100644
--- a/spomky-labs/cbor-php/src/OtherObject/OtherObjectManager.php
+++ b/spomky-labs/cbor-php/src/OtherObject/OtherObjectManager.php
@@ -4,22 +4,30 @@
 
 namespace CBOR\OtherObject;
 
-use CBOR\OtherObject;
 use InvalidArgumentException;
 use function array_key_exists;
 
-class OtherObjectManager implements OtherObjectManagerInterface
+final class OtherObjectManager implements OtherObjectManagerInterface
 {
     /**
-     * @var string[]
+     * @param  class-string<OtherObjectInterface>[] $classes
      */
-    private array $classes = [];
+    public function __construct(
+        private array $classes = [],
+    ) {
+    }
 
-    public static function create(): self
+    /**
+     * @param  class-string<OtherObjectInterface>[] $classes
+     */
+    public static function create(array $classes = []): self
     {
-        return new self();
+        return new self($classes);
     }
 
+    /**
+     * @param class-string<OtherObjectInterface> $class
+     */
     public function add(string $class): self
     {
         foreach ($class::supportedAdditionalInformation() as $ai) {
@@ -32,6 +40,9 @@ public function add(string $class): self
         return $this;
     }
 
+    /**
+     * @return class-string<OtherObjectInterface>
+     */
     public function getClassForValue(int $value): string
     {
         return array_key_exists($value, $this->classes) ? $this->classes[$value] : GenericObject::class;
@@ -39,7 +50,6 @@ public function getClassForValue(int $value): string
 
     public function createObjectForValue(int $value, ?string $data): OtherObjectInterface
     {
-        /** @var OtherObject $class */
         $class = $this->getClassForValue($value);
 
         return $class::createFromLoadedData($value, $data);
diff --git a/spomky-labs/cbor-php/src/OtherObject/SimpleObject.php b/spomky-labs/cbor-php/src/OtherObject/SimpleObject.php
index 702542f22..f43a6910a 100644
--- a/spomky-labs/cbor-php/src/OtherObject/SimpleObject.php
+++ b/spomky-labs/cbor-php/src/OtherObject/SimpleObject.php
@@ -10,12 +10,13 @@
 use InvalidArgumentException;
 use function chr;
 use function ord;
+use function strlen;
 
 final class SimpleObject extends Base implements Normalizable
 {
     public static function supportedAdditionalInformation(): array
     {
-        return array_merge(range(0, 19), [24]);
+        return [...range(0, 19), 24];
     }
 
     public static function create(int $value): self|FalseObject|TrueObject|NullObject|UndefinedObject
@@ -46,7 +47,7 @@ public static function createFromLoadedData(int $additionalInformation, ?string
             if ($data === null) {
                 throw new InvalidArgumentException('Invalid simple value. Content data is missing.');
             }
-            if (mb_strlen($data, '8bit') !== 1) {
+            if (strlen($data) !== 1) {
                 throw new InvalidArgumentException('Invalid simple value. Content data is too long.');
             }
             if (ord($data) < 32) {
diff --git a/spomky-labs/cbor-php/src/OtherObject/SinglePrecisionFloatObject.php b/spomky-labs/cbor-php/src/OtherObject/SinglePrecisionFloatObject.php
index d47cd3095..72e9da363 100644
--- a/spomky-labs/cbor-php/src/OtherObject/SinglePrecisionFloatObject.php
+++ b/spomky-labs/cbor-php/src/OtherObject/SinglePrecisionFloatObject.php
@@ -8,6 +8,7 @@
 use CBOR\OtherObject as Base;
 use CBOR\Utils;
 use InvalidArgumentException;
+use function strlen;
 use const INF;
 use const NAN;
 
@@ -18,6 +19,21 @@ public static function supportedAdditionalInformation(): array
         return [self::OBJECT_SINGLE_PRECISION_FLOAT];
     }
 
+    public static function createFromFloat(float $number): self
+    {
+        $value = match (true) {
+            is_nan($number) => hex2bin('7FC00000'),
+            is_infinite($number) && $number > 0 => hex2bin('7F800000'),
+            is_infinite($number) && $number < 0 => hex2bin('FF800000'),
+            default => (fn (): string => unpack('S', "\x01\x00")[1] === 1 ? strrev(pack('f', $number)) : pack(
+                'f',
+                $number
+            ))(),
+        };
+
+        return new self(self::OBJECT_SINGLE_PRECISION_FLOAT, $value);
+    }
+
     public static function createFromLoadedData(int $additionalInformation, ?string $data): Base
     {
         return new self($additionalInformation, $data);
@@ -25,7 +41,7 @@ public static function createFromLoadedData(int $additionalInformation, ?string
 
     public static function create(string $value): self
     {
-        if (mb_strlen($value, '8bit') !== 4) {
+        if (strlen($value) !== 4) {
             throw new InvalidArgumentException('The value is not a valid single precision floating point');
         }
 
diff --git a/spomky-labs/cbor-php/src/StringStream.php b/spomky-labs/cbor-php/src/StringStream.php
index d522813a2..a6858e099 100644
--- a/spomky-labs/cbor-php/src/StringStream.php
+++ b/spomky-labs/cbor-php/src/StringStream.php
@@ -6,6 +6,8 @@
 
 use InvalidArgumentException;
 use RuntimeException;
+use function sprintf;
+use function strlen;
 
 final class StringStream implements Stream
 {
@@ -53,21 +55,21 @@ public function read(int $length): string
             if ($newData === false) {
                 throw new RuntimeException('Unable to read the memory');
             }
-            if (mb_strlen($newData, '8bit') < $sizeToRead) {
+            if (strlen($newData) < $sizeToRead) {
                 throw new InvalidArgumentException(sprintf(
                     'Out of range. Expected: %d, read: %d.',
                     $length,
-                    mb_strlen($data, '8bit')
+                    strlen($data)
                 ));
             }
             $data .= $newData;
         }
 
-        if (mb_strlen($data, '8bit') !== $length) {
+        if (strlen($data) !== $length) {
             throw new InvalidArgumentException(sprintf(
                 'Out of range. Expected: %d, read: %d.',
                 $length,
-                mb_strlen($data, '8bit')
+                strlen($data)
             ));
         }
 
diff --git a/spomky-labs/cbor-php/src/Tag/BigFloatTag.php b/spomky-labs/cbor-php/src/Tag/BigFloatTag.php
index 1de2cbe76..088fba6f8 100644
--- a/spomky-labs/cbor-php/src/Tag/BigFloatTag.php
+++ b/spomky-labs/cbor-php/src/Tag/BigFloatTag.php
@@ -78,6 +78,6 @@ public function normalize()
         /** @var UnsignedIntegerObject|NegativeIntegerObject|NegativeBigIntegerTag|UnsignedBigIntegerTag $m */
         $m = $object->get(1);
 
-        return rtrim(bcmul($m->normalize(), bcpow('2', $e->normalize(), 100), 100), '0');
+        return rtrim(bcmul((string) $m->normalize(), bcpow('2', (string) $e->normalize(), 100), 100), '0');
     }
 }
diff --git a/spomky-labs/cbor-php/src/Tag/DecimalFractionTag.php b/spomky-labs/cbor-php/src/Tag/DecimalFractionTag.php
index 9eafd2532..27980e9ab 100644
--- a/spomky-labs/cbor-php/src/Tag/DecimalFractionTag.php
+++ b/spomky-labs/cbor-php/src/Tag/DecimalFractionTag.php
@@ -77,6 +77,6 @@ public function normalize()
         /** @var UnsignedIntegerObject|NegativeIntegerObject|NegativeBigIntegerTag|UnsignedBigIntegerTag $m */
         $m = $object->get(1);
 
-        return rtrim(bcmul($m->normalize(), bcpow('10', $e->normalize(), 100), 100), '0');
+        return rtrim(bcmul((string) $m->normalize(), bcpow('10', (string) $e->normalize(), 100), 100), '0');
     }
 }
diff --git a/spomky-labs/cbor-php/src/Tag/TagManager.php b/spomky-labs/cbor-php/src/Tag/TagManager.php
index 0d3eb6d8f..40c0a8c96 100644
--- a/spomky-labs/cbor-php/src/Tag/TagManager.php
+++ b/spomky-labs/cbor-php/src/Tag/TagManager.php
@@ -5,7 +5,6 @@
 namespace CBOR\Tag;
 
 use CBOR\CBORObject;
-use CBOR\Tag;
 use CBOR\Utils;
 use InvalidArgumentException;
 use function array_key_exists;
@@ -13,15 +12,24 @@
 final class TagManager implements TagManagerInterface
 {
     /**
-     * @var string[]
+     * @param class-string<TagInterface>[] $classes
      */
-    private array $classes = [];
+    public function __construct(
+        private array $classes = []
+    ) {
+    }
 
-    public static function create(): self
+    /**
+     * @param array<class-string<TagInterface>> $classes
+     */
+    public static function create(array $classes = []): self
     {
-        return new self();
+        return new self($classes);
     }
 
+    /**
+     * @param class-string<TagInterface> $class
+     */
     public function add(string $class): self
     {
         if ($class::getTagId() < 0) {
@@ -32,6 +40,9 @@ public function add(string $class): self
         return $this;
     }
 
+    /**
+     * @return class-string<TagInterface>
+     */
     public function getClassForValue(int $value): string
     {
         return array_key_exists($value, $this->classes) ? $this->classes[$value] : GenericTag::class;
@@ -44,7 +55,6 @@ public function createObjectForValue(int $additionalInformation, ?string $data,
             Utils::assertString($data, 'Invalid data');
             $value = Utils::binToInt($data);
         }
-        /** @var Tag $class */
         $class = $this->getClassForValue($value);
 
         return $class::createFromLoadedData($additionalInformation, $data, $object);
diff --git a/spomky-labs/cbor-php/src/Tag/TimestampTag.php b/spomky-labs/cbor-php/src/Tag/TimestampTag.php
index afdec9fdf..a3b457e9a 100644
--- a/spomky-labs/cbor-php/src/Tag/TimestampTag.php
+++ b/spomky-labs/cbor-php/src/Tag/TimestampTag.php
@@ -15,6 +15,7 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use InvalidArgumentException;
+use function strlen;
 use const STR_PAD_RIGHT;
 
 final class TimestampTag extends Tag implements Normalizable
@@ -60,8 +61,8 @@ public function normalize(): DateTimeInterface
                 $value = (string) $object->normalize();
                 $parts = explode('.', $value);
                 if (isset($parts[1])) {
-                    if (mb_strlen($parts[1], '8bit') > 6) {
-                        $parts[1] = mb_substr($parts[1], 0, 6, '8bit');
+                    if (strlen($parts[1]) > 6) {
+                        $parts[1] = substr($parts[1], 0, 6);
                     } else {
                         $parts[1] = str_pad($parts[1], 6, '0', STR_PAD_RIGHT);
                     }
diff --git a/spomky-labs/cbor-php/src/TextStringObject.php b/spomky-labs/cbor-php/src/TextStringObject.php
index a0ca87a57..08f77e44b 100644
--- a/spomky-labs/cbor-php/src/TextStringObject.php
+++ b/spomky-labs/cbor-php/src/TextStringObject.php
@@ -27,9 +27,7 @@ public function __construct(string $data)
     public function __toString(): string
     {
         $result = parent::__toString();
-        if ($this->length !== null) {
-            $result .= $this->length;
-        }
+        $result .= $this->length ?? '';
 
         return $result . $this->data;
     }
diff --git a/spomky-labs/cbor-php/src/UnsignedIntegerObject.php b/spomky-labs/cbor-php/src/UnsignedIntegerObject.php
index 348333442..a7ef1577f 100644
--- a/spomky-labs/cbor-php/src/UnsignedIntegerObject.php
+++ b/spomky-labs/cbor-php/src/UnsignedIntegerObject.php
@@ -58,17 +58,21 @@ public function getMajorType(): int
         return self::MAJOR_TYPE;
     }
 
+    /**
+     * @return numeric-string
+     */
     public function getValue(): string
     {
         if ($this->data === null) {
             return (string) $this->additionalInformation;
         }
 
-        $integer = BigInteger::fromBase(bin2hex($this->data), 16);
-
-        return $integer->toBase(10);
+        return BigInteger::fromBase(bin2hex($this->data), 16)->toBase(10);
     }
 
+    /**
+     * @return numeric-string
+     */
     public function normalize(): string
     {
         return $this->getValue();
diff --git a/spomky-labs/pki-framework/src/ASN1/Component/Identifier.php b/spomky-labs/pki-framework/src/ASN1/Component/Identifier.php
index c2f15492d..dc21d7948 100644
--- a/spomky-labs/pki-framework/src/ASN1/Component/Identifier.php
+++ b/spomky-labs/pki-framework/src/ASN1/Component/Identifier.php
@@ -87,7 +87,7 @@ public static function create(int $class, int $pc, BigInteger|int $tag): self
      * Variable is updated to the offset next to the
      * parsed identifier. If null, start from offset 0.
      */
-    public static function fromDER(string $data, int &$offset = null): self
+    public static function fromDER(string $data, ?int &$offset = null): self
     {
         $idx = $offset ?? 0;
         $datalen = mb_strlen($data, '8bit');
diff --git a/spomky-labs/pki-framework/src/ASN1/Component/Length.php b/spomky-labs/pki-framework/src/ASN1/Component/Length.php
index feb5ab311..e69e92daa 100644
--- a/spomky-labs/pki-framework/src/ASN1/Component/Length.php
+++ b/spomky-labs/pki-framework/src/ASN1/Component/Length.php
@@ -13,6 +13,7 @@
 use function count;
 use function mb_strlen;
 use function ord;
+use function sprintf;
 
 /**
  * Class to represent BER/DER length octets.
@@ -49,7 +50,7 @@ public static function create(BigInteger|int $length, bool $_indefinite = false)
      * Variable is updated to the offset next to the
      * parsed length component. If null, start from offset 0.
      */
-    public static function fromDER(string $data, int &$offset = null): self
+    public static function fromDER(string $data, ?int &$offset = null): self
     {
         $idx = $offset ?? 0;
         $datalen = mb_strlen($data, '8bit');
@@ -89,7 +90,7 @@ public static function fromDER(string $data, int &$offset = null): self
      * @param null|int $expected Expected length, null to bypass checking
      * @see self::fromDER
      */
-    public static function expectFromDER(string $data, int &$offset, int $expected = null): self
+    public static function expectFromDER(string $data, int &$offset, ?int $expected = null): self
     {
         $idx = $offset;
         $length = self::fromDER($data, $idx);
diff --git a/spomky-labs/pki-framework/src/ASN1/Element.php b/spomky-labs/pki-framework/src/ASN1/Element.php
index 3d05aaa88..fa7795c00 100644
--- a/spomky-labs/pki-framework/src/ASN1/Element.php
+++ b/spomky-labs/pki-framework/src/ASN1/Element.php
@@ -46,6 +46,7 @@
 use UnexpectedValueException;
 use function array_key_exists;
 use function mb_strlen;
+use function sprintf;
 
 /**
  * Base class for all ASN.1 type elements.
@@ -240,7 +241,7 @@ abstract public function isConstructed(): bool;
      * Variable is updated to the offset next to the
      * parsed element. If null, start from offset 0.
      */
-    public static function fromDER(string $data, int &$offset = null): static
+    public static function fromDER(string $data, ?int &$offset = null): static
     {
         $idx = $offset ?? 0;
         // decode identifier
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/BaseString.php b/spomky-labs/pki-framework/src/ASN1/Type/BaseString.php
index 34cae98ba..b777e8a08 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/BaseString.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/BaseString.php
@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use SpomkyLabs\Pki\ASN1\Element;
 use Stringable;
+use function sprintf;
 
 /**
  * Base class for all string types.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/GeneralizedTime.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/GeneralizedTime.php
index 62de771da..07adb8174 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/GeneralizedTime.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/GeneralizedTime.php
@@ -34,15 +34,15 @@ final class GeneralizedTime extends BaseTime
      * @var string
      */
     final public const REGEX = '#^' .
-    '(\d\d\d\d)' . // YYYY
-    '(\d\d)' . // MM
-    '(\d\d)' . // DD
-    '(\d\d)' . // hh
-    '(\d\d)' . // mm
-    '(\d\d)' . // ss
-    '(?:\.(\d+))?' . // frac
-    'Z' . // TZ
-    '$#';
+        '(\d\d\d\d)' . // YYYY
+        '(\d\d)' . // MM
+        '(\d\d)' . // DD
+        '(\d\d)' . // hh
+        '(\d\d)' . // mm
+        '(\d\d)' . // ss
+        '(?:\.(\d+))?' . // frac
+        'Z' . // TZ
+        '$#';
 
     /**
      * Cached formatted date.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Number.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Number.php
index bbf5ed2d8..8fe2afc7a 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Number.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Number.php
@@ -14,6 +14,7 @@
 use function is_int;
 use function is_scalar;
 use function is_string;
+use function sprintf;
 use function strval;
 
 abstract class Number extends Element
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/ObjectIdentifier.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/ObjectIdentifier.php
index 207842a61..3a4c003f0 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/ObjectIdentifier.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/ObjectIdentifier.php
@@ -20,6 +20,7 @@
 use function is_int;
 use function mb_strlen;
 use function ord;
+use function sprintf;
 
 /**
  * Implements *OBJECT IDENTIFIER* type.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Real.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Real.php
index 725692aaf..cbc7c4356 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Real.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/Real.php
@@ -22,6 +22,7 @@
 use function in_array;
 use function mb_strlen;
 use function ord;
+use function sprintf;
 use const INF;
 
 /**
@@ -38,9 +39,9 @@ final class Real extends Element implements Stringable
      * @var string
      */
     final public const NR1_REGEX = '/^\s*' .
-    '(?<s>[+\-])?' .    // sign
-    '(?<i>\d+)' .       // integer
-    '$/';
+        '(?<s>[+\-])?' .    // sign
+        '(?<i>\d+)' .       // integer
+        '$/';
 
     /**
      * Regex pattern to parse NR2 form number.
@@ -48,9 +49,9 @@ final class Real extends Element implements Stringable
      * @var string
      */
     final public const NR2_REGEX = '/^\s*' .
-    '(?<s>[+\-])?' .                            // sign
-    '(?<d>(?:\d+[\.,]\d*)|(?:\d*[\.,]\d+))' .   // decimal number
-    '$/';
+        '(?<s>[+\-])?' .                            // sign
+        '(?<d>(?:\d+[\.,]\d*)|(?:\d*[\.,]\d+))' .   // decimal number
+        '$/';
 
     /**
      * Regex pattern to parse NR3 form number.
@@ -58,11 +59,11 @@ final class Real extends Element implements Stringable
      * @var string
      */
     final public const NR3_REGEX = '/^\s*' .
-    '(?<ms>[+\-])?' .                           // mantissa sign
-    '(?<m>(?:\d+[\.,]\d*)|(?:\d*[\.,]\d+))' .   // mantissa
-    '[Ee](?<es>[+\-])?' .                       // exponent sign
-    '(?<e>\d+)' .                               // exponent
-    '$/';
+        '(?<ms>[+\-])?' .                           // mantissa sign
+        '(?<m>(?:\d+[\.,]\d*)|(?:\d*[\.,]\d+))' .   // mantissa
+        '[Ee](?<es>[+\-])?' .                       // exponent sign
+        '(?<e>\d+)' .                               // exponent
+        '$/';
 
     /**
      * Regex pattern to parse PHP exponent number format.
@@ -72,14 +73,14 @@ final class Real extends Element implements Stringable
      * @var string
      */
     final public const PHP_EXPONENT_DNUM = '/^' .
-    '(?<ms>[+\-])?' .               // sign
-    '(?<m>' .
-    '\d+' .                     // LNUM
-    '|' .
-    '(?:\d*\.\d+|\d+\.\d*)' .   // DNUM
-    ')[eE]' .
-    '(?<es>[+\-])?(?<e>\d+)' .      // exponent
-    '$/';
+        '(?<ms>[+\-])?' .               // sign
+        '(?<m>' .
+        '\d+' .                     // LNUM
+        '|' .
+        '(?:\d*\.\d+|\d+\.\d*)' .   // DNUM
+        ')[eE]' .
+        '(?<es>[+\-])?(?<e>\d+)' .      // exponent
+        '$/';
 
     /**
      * Exponent when value is positive or negative infinite.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/RelativeOID.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/RelativeOID.php
index f09ac6b82..5f308817f 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/RelativeOID.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/RelativeOID.php
@@ -18,6 +18,7 @@
 use function chr;
 use function is_int;
 use function ord;
+use function sprintf;
 
 /**
  * Implements *RELATIVE-OID* type.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/UTCTime.php b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/UTCTime.php
index 87e18facf..dd31ba9e3 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Primitive/UTCTime.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Primitive/UTCTime.php
@@ -30,14 +30,14 @@ final class UTCTime extends BaseTime
      * @var string
      */
     final public const REGEX = '#^' .
-    '(\d\d)' . // YY
-    '(\d\d)' . // MM
-    '(\d\d)' . // DD
-    '(\d\d)' . // hh
-    '(\d\d)' . // mm
-    '(\d\d)' . // ss
-    'Z' . // TZ
-    '$#';
+        '(\d\d)' . // YY
+        '(\d\d)' . // MM
+        '(\d\d)' . // DD
+        '(\d\d)' . // hh
+        '(\d\d)' . // mm
+        '(\d\d)' . // ss
+        'Z' . // TZ
+        '$#';
 
     private function __construct(DateTimeImmutable $dt)
     {
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Structure.php b/spomky-labs/pki-framework/src/ASN1/Type/Structure.php
index e7d5bf374..903899c90 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Structure.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Structure.php
@@ -182,10 +182,7 @@ public function withoutElement(int $idx): self
     public function elements(): array
     {
         if (! isset($this->unspecifiedTypes)) {
-            $this->unspecifiedTypes = array_map(
-                static fn (Element $el) => UnspecifiedType::create($el),
-                $this->elements
-            );
+            $this->unspecifiedTypes = array_map(UnspecifiedType::create(...), $this->elements);
         }
         return $this->unspecifiedTypes;
     }
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/Tagged/ImplicitlyTaggedType.php b/spomky-labs/pki-framework/src/ASN1/Type/Tagged/ImplicitlyTaggedType.php
index 359b6d1b4..38369aa1f 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/Tagged/ImplicitlyTaggedType.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/Tagged/ImplicitlyTaggedType.php
@@ -10,6 +10,7 @@
 use SpomkyLabs\Pki\ASN1\Feature\ElementBase;
 use SpomkyLabs\Pki\ASN1\Type\UnspecifiedType;
 use UnexpectedValueException;
+use function sprintf;
 
 /**
  * Implements implicit tagging mode.
diff --git a/spomky-labs/pki-framework/src/ASN1/Type/UnspecifiedType.php b/spomky-labs/pki-framework/src/ASN1/Type/UnspecifiedType.php
index 9d7aa18df..3fd310c8d 100644
--- a/spomky-labs/pki-framework/src/ASN1/Type/UnspecifiedType.php
+++ b/spomky-labs/pki-framework/src/ASN1/Type/UnspecifiedType.php
@@ -37,6 +37,7 @@
 use SpomkyLabs\Pki\ASN1\Type\Tagged\ApplicationType;
 use SpomkyLabs\Pki\ASN1\Type\Tagged\PrivateType;
 use UnexpectedValueException;
+use function sprintf;
 
 /**
  * Decorator class to wrap an element without already knowing the specific underlying type.
diff --git a/spomky-labs/pki-framework/src/CryptoBridge/Crypto/OpenSSLCrypto.php b/spomky-labs/pki-framework/src/CryptoBridge/Crypto/OpenSSLCrypto.php
index fe47b8f6a..65a5e872d 100644
--- a/spomky-labs/pki-framework/src/CryptoBridge/Crypto/OpenSSLCrypto.php
+++ b/spomky-labs/pki-framework/src/CryptoBridge/Crypto/OpenSSLCrypto.php
@@ -17,6 +17,7 @@
 use UnexpectedValueException;
 use function array_key_exists;
 use function mb_strlen;
+use function sprintf;
 use const OPENSSL_ALGO_MD4;
 use const OPENSSL_ALGO_MD5;
 use const OPENSSL_ALGO_SHA1;
diff --git a/spomky-labs/pki-framework/src/CryptoEncoding/PEM.php b/spomky-labs/pki-framework/src/CryptoEncoding/PEM.php
index 3618a01c2..30ff39274 100644
--- a/spomky-labs/pki-framework/src/CryptoEncoding/PEM.php
+++ b/spomky-labs/pki-framework/src/CryptoEncoding/PEM.php
@@ -47,15 +47,15 @@ final class PEM implements Stringable
      * @var string
      */
     final public const PEM_REGEX = '/' .
-    /* line start */
-    '(?:^|[\r\n])' .
-    /* header */
-    '-----BEGIN (.+?)-----[\r\n]+' .
-    /* payload */
-    '(.+?)' .
-    /* trailer */
-    '[\r\n]+-----END \\1-----' .
-    '/ms';
+        /* line start */
+        '(?:^|[\r\n])' .
+        /* header */
+        '-----BEGIN (.+?)-----[\r\n]+' .
+        /* payload */
+        '(.+?)' .
+        /* trailer */
+        '[\r\n]+-----END \\1-----' .
+        '/ms';
 
     /**
      * @param string $type Content type
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/ECPublicKeyAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/ECPublicKeyAlgorithmIdentifier.php
index 5571f6110..13ae1e3eb 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/ECPublicKeyAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/ECPublicKeyAlgorithmIdentifier.php
@@ -12,16 +12,14 @@
 use UnexpectedValueException;
 
 /*
-From RFC 5480 - 2.1.1.  Unrestricted Algorithm Identifier and Parameters:
-
-The parameter for id-ecPublicKey is as follows and MUST always be
-present:
-
-ECParameters ::= CHOICE {
-    namedCurve         OBJECT IDENTIFIER
-    -- implicitCurve   NULL
-    -- specifiedCurve  SpecifiedECDomain
-}
+ * From RFC 5480 - 2.1.1.  Unrestricted Algorithm Identifier and Parameters:
+ * The parameter for id-ecPublicKey is as follows and MUST always be
+ * present:
+ * ECParameters ::= CHOICE {
+ * namedCurve         OBJECT IDENTIFIER
+ * -- implicitCurve   NULL
+ * -- specifiedCurve  SpecifiedECDomain
+ * }
  */
 
 /**
@@ -284,7 +282,7 @@ public function namedCurve(): string
     /**
      * @return ObjectIdentifier
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         return ObjectIdentifier::create($this->namedCurve);
     }
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410EdAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410EdAlgorithmIdentifier.php
index 133f6b99d..3821feab5 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410EdAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410EdAlgorithmIdentifier.php
@@ -10,16 +10,14 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 8410:
-
-    For all of the OIDs, the parameters MUST be absent.
-
-    It is possible to find systems that require the parameters to be
-    present.  This can be due to either a defect in the original 1997
-    syntax or a programming error where developers never got input where
-    this was not true.  The optimal solution is to fix these systems;
-    where this is not possible, the problem needs to be restricted to
-    that subsystem and not propagated to the Internet.
+ * From RFC 8410:
+ * For all of the OIDs, the parameters MUST be absent.
+ * It is possible to find systems that require the parameters to be
+ * present.  This can be due to either a defect in the original 1997
+ * syntax or a programming error where developers never got input where
+ * this was not true.  The optimal solution is to fix these systems;
+ * where this is not possible, the problem needs to be restricted to
+ * that subsystem and not propagated to the Internet.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410XAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410XAlgorithmIdentifier.php
index f41bb4583..a3f2a8406 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410XAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RFC8410XAlgorithmIdentifier.php
@@ -9,16 +9,14 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 8410:
-
-    For all of the OIDs, the parameters MUST be absent.
-
-    It is possible to find systems that require the parameters to be
-    present.  This can be due to either a defect in the original 1997
-    syntax or a programming error where developers never got input where
-    this was not true.  The optimal solution is to fix these systems;
-    where this is not possible, the problem needs to be restricted to
-    that subsystem and not propagated to the Internet.
+ * From RFC 8410:
+ * For all of the OIDs, the parameters MUST be absent.
+ * It is possible to find systems that require the parameters to be
+ * present.  This can be due to either a defect in the original 1997
+ * syntax or a programming error where developers never got input where
+ * this was not true.  The optimal solution is to fix these systems;
+ * where this is not possible, the problem needs to be restricted to
+ * that subsystem and not propagated to the Internet.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAEncryptionAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAEncryptionAlgorithmIdentifier.php
index 3e87e889c..9b5eb0fd3 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAEncryptionAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAEncryptionAlgorithmIdentifier.php
@@ -12,10 +12,9 @@
 use UnexpectedValueException;
 
 /*
-From RFC 3447:
-
-    When rsaEncryption is used in an AlgorithmIdentifier the
-    parameters MUST be present and MUST be NULL.
+ * From RFC 3447:
+ * When rsaEncryption is used in an AlgorithmIdentifier the
+ * parameters MUST be present and MUST be NULL.
  */
 
 /**
@@ -56,7 +55,7 @@ public static function fromASN1Params(?UnspecifiedType $params = null): Specific
     /**
      * @return NullType
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         return NullType::create();
     }
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAPSSSSAEncryptionAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAPSSSSAEncryptionAlgorithmIdentifier.php
index 34aebd080..11794dd5b 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAPSSSSAEncryptionAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Asymmetric/RSAPSSSSAEncryptionAlgorithmIdentifier.php
@@ -12,10 +12,9 @@
 use UnexpectedValueException;
 
 /*
-From RFC 3447:
-
-    When rsaEncryption is used in an AlgorithmIdentifier the
-    parameters MUST be present and MUST be NULL.
+ * From RFC 3447:
+ * When rsaEncryption is used in an AlgorithmIdentifier the
+ * parameters MUST be present and MUST be NULL.
  */
 
 /**
@@ -56,7 +55,7 @@ public static function fromASN1Params(?UnspecifiedType $params = null): Specific
     /**
      * @return NullType
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         return NullType::create();
     }
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/AESCBCAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/AESCBCAlgorithmIdentifier.php
index f1e9f5ad3..b14322d14 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/AESCBCAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/AESCBCAlgorithmIdentifier.php
@@ -8,11 +8,9 @@
 use SpomkyLabs\Pki\ASN1\Type\Primitive\OctetString;
 
 /*
-From RFC 3565 - 4.1. AES Algorithm Identifiers and Parameters:
-
-The AlgorithmIdentifier parameters field MUST be present, and the parameter field MUST contain a AES-IV:
-
-    AES-IV ::= OCTET STRING (SIZE(16))
+ * From RFC 3565 - 4.1. AES Algorithm Identifiers and Parameters:
+ * The AlgorithmIdentifier parameters field MUST be present, and the parameter field MUST contain a AES-IV:
+ * AES-IV ::= OCTET STRING (SIZE(16))
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESCBCAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESCBCAlgorithmIdentifier.php
index efd7fbfe1..8dff7fe96 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESCBCAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESCBCAlgorithmIdentifier.php
@@ -12,9 +12,8 @@
 use UnexpectedValueException;
 
 /*
-RFC 2898 defines parameters as follows:
-
-{OCTET STRING (SIZE(8)) IDENTIFIED BY desCBC}
+ * RFC 2898 defines parameters as follows:
+ * {OCTET STRING (SIZE(8)) IDENTIFIED BY desCBC}
  */
 
 /**
@@ -76,7 +75,7 @@ public function ivSize(): int
     /**
      * @return OctetString
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         if (! isset($this->initializationVector)) {
             throw new LogicException('IV not set.');
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESEDE3CBCAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESEDE3CBCAlgorithmIdentifier.php
index 705475d7c..ddcb4adfa 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESEDE3CBCAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/DESEDE3CBCAlgorithmIdentifier.php
@@ -12,9 +12,8 @@
 use UnexpectedValueException;
 
 /*
-RFC 2898 defines parameters as follows:
-
-{OCTET STRING (SIZE(8)) IDENTIFIED BY des-EDE3-CBC}
+ * RFC 2898 defines parameters as follows:
+ * {OCTET STRING (SIZE(8)) IDENTIFIED BY des-EDE3-CBC}
  */
 
 /**
@@ -77,7 +76,7 @@ public function ivSize(): int
     /**
      * @return OctetString
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         if (! isset($this->initializationVector)) {
             throw new LogicException('IV not set.');
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/RC2CBCAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/RC2CBCAlgorithmIdentifier.php
index d8d1043de..da79cc66f 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/RC2CBCAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Cipher/RC2CBCAlgorithmIdentifier.php
@@ -14,28 +14,25 @@
 use UnexpectedValueException;
 
 /*
-Parameters may be seen in various forms. This implementation attemts
-to take them all into consideration.
-
-# RFC 2268 - A Description of the RC2(r) Encryption Algorithm
-RC2-CBCParameter ::= CHOICE {
-    iv IV,
-    params SEQUENCE {
-        version RC2Version,
-        iv IV
-    }
-}
-
-# RFC 2898 - PKCS #5: Password-Based Cryptography Specification Version 2.0
-RC2-CBC-Parameter ::= SEQUENCE {
-    rc2ParameterVersion INTEGER OPTIONAL,
-    iv OCTET STRING (SIZE(8))
-}
-
-# RFC 3370 - Cryptographic Message Syntax (CMS) Algorithms
-RC2CBCParameter ::= SEQUENCE {
-    rc2ParameterVersion INTEGER,
-    iv OCTET STRING  }  -- exactly 8 octets
+ * Parameters may be seen in various forms. This implementation attemts
+ * to take them all into consideration.
+ * # RFC 2268 - A Description of the RC2(r) Encryption Algorithm
+ * RC2-CBCParameter ::= CHOICE {
+ * iv IV,
+ * params SEQUENCE {
+ * version RC2Version,
+ * iv IV
+ * }
+ * }
+ * # RFC 2898 - PKCS #5: Password-Based Cryptography Specification Version 2.0
+ * RC2-CBC-Parameter ::= SEQUENCE {
+ * rc2ParameterVersion INTEGER OPTIONAL,
+ * iv OCTET STRING (SIZE(8))
+ * }
+ * # RFC 3370 - Cryptographic Message Syntax (CMS) Algorithms
+ * RC2CBCParameter ::= SEQUENCE {
+ * rc2ParameterVersion INTEGER,
+ * iv OCTET STRING  }  -- exactly 8 octets
  */
 
 /**
@@ -170,7 +167,7 @@ public function ivSize(): int
     /**
      * @return Sequence
      */
-    protected function paramsASN1(): ?Element
+    protected function paramsASN1(): Element
     {
         if ($this->effectiveKeyBits >= 256) {
             $version = $this->effectiveKeyBits;
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/HMACWithSHA1AlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/HMACWithSHA1AlgorithmIdentifier.php
index 4abf7901f..74a28a022 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/HMACWithSHA1AlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/HMACWithSHA1AlgorithmIdentifier.php
@@ -12,10 +12,9 @@
 use UnexpectedValueException;
 
 /*
-Per RFC 2898 this algorithm identifier has no parameters:
-
-algid-hmacWithSHA1 AlgorithmIdentifier {{PBKDF2-PRFs}} ::=
-    {algorithm id-hmacWithSHA1, parameters NULL : NULL}
+ * Per RFC 2898 this algorithm identifier has no parameters:
+ * algid-hmacWithSHA1 AlgorithmIdentifier {{PBKDF2-PRFs}} ::=
+ * {algorithm id-hmacWithSHA1, parameters NULL : NULL}
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/MD5AlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/MD5AlgorithmIdentifier.php
index 94345cf5b..4fae45dd7 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/MD5AlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/MD5AlgorithmIdentifier.php
@@ -11,17 +11,14 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 1321 - 1. Executive Summary
-
-    In the X.509 type AlgorithmIdentifier, the parameters for MD5
-    should have type NULL.
-
-From RFC 3370 - 2.2 MD5
-
-    The AlgorithmIdentifier parameters field MUST be present, and the
-    parameters field MUST contain NULL.  Implementations MAY accept the
-    MD5 AlgorithmIdentifiers with absent parameters as well as NULL
-    parameters.
+ * From RFC 1321 - 1. Executive Summary
+ * In the X.509 type AlgorithmIdentifier, the parameters for MD5
+ * should have type NULL.
+ * From RFC 3370 - 2.2 MD5
+ * The AlgorithmIdentifier parameters field MUST be present, and the
+ * parameters field MUST contain NULL.  Implementations MAY accept the
+ * MD5 AlgorithmIdentifiers with absent parameters as well as NULL
+ * parameters.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA1AlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA1AlgorithmIdentifier.php
index 2eec340fc..a079f34a2 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA1AlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA1AlgorithmIdentifier.php
@@ -11,14 +11,13 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 3370 - 2.1 SHA-1
-
-    The AlgorithmIdentifier parameters field is OPTIONAL.  If present,
-    the parameters field MUST contain a NULL.  Implementations MUST
-    accept SHA-1 AlgorithmIdentifiers with absent parameters.
-    Implementations MUST accept SHA-1 AlgorithmIdentifiers with NULL
-    parameters.  Implementations SHOULD generate SHA-1
-    AlgorithmIdentifiers with absent parameters.
+ * From RFC 3370 - 2.1 SHA-1
+ * The AlgorithmIdentifier parameters field is OPTIONAL.  If present,
+ * the parameters field MUST contain a NULL.  Implementations MUST
+ * accept SHA-1 AlgorithmIdentifiers with absent parameters.
+ * Implementations MUST accept SHA-1 AlgorithmIdentifiers with NULL
+ * parameters.  Implementations SHOULD generate SHA-1
+ * AlgorithmIdentifiers with absent parameters.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA2AlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA2AlgorithmIdentifier.php
index 97921416b..679cefb74 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA2AlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Hash/SHA2AlgorithmIdentifier.php
@@ -10,13 +10,12 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 5754 - 2. Message Digest Algorithms
-
-    The AlgorithmIdentifier parameters field is OPTIONAL.
-    Implementations MUST accept SHA2 AlgorithmIdentifiers with absent
-    parameters.  Implementations MUST accept SHA2 AlgorithmIdentifiers
-    with NULL parameters.  Implementations MUST generate SHA2
-    AlgorithmIdentifiers with absent parameters.
+ * From RFC 5754 - 2. Message Digest Algorithms
+ * The AlgorithmIdentifier parameters field is OPTIONAL.
+ * Implementations MUST accept SHA2 AlgorithmIdentifiers with absent
+ * parameters.  Implementations MUST accept SHA2 AlgorithmIdentifiers
+ * with NULL parameters.  Implementations MUST generate SHA2
+ * AlgorithmIdentifiers with absent parameters.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/ECSignatureAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/ECSignatureAlgorithmIdentifier.php
index da2ca03c3..6ffe33b46 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/ECSignatureAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/ECSignatureAlgorithmIdentifier.php
@@ -10,12 +10,11 @@
 use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\SpecificAlgorithmIdentifier;
 
 /*
-From RFC 5758 - 3.2.  ECDSA Signature Algorithm
-
-    When the ecdsa-with-SHA224, ecdsa-with-SHA256, ecdsa-with-SHA384, or
-    ecdsa-with-SHA512 algorithm identifier appears in the algorithm field
-    as an AlgorithmIdentifier, the encoding MUST omit the parameters
-    field.
+ * From RFC 5758 - 3.2.  ECDSA Signature Algorithm
+ * When the ecdsa-with-SHA224, ecdsa-with-SHA256, ecdsa-with-SHA384, or
+ * ecdsa-with-SHA512 algorithm identifier appears in the algorithm field
+ * as an AlgorithmIdentifier, the encoding MUST omit the parameters
+ * field.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC3279RSASignatureAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC3279RSASignatureAlgorithmIdentifier.php
index 9200889a4..d717d8c8f 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC3279RSASignatureAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC3279RSASignatureAlgorithmIdentifier.php
@@ -8,11 +8,10 @@
 use SpomkyLabs\Pki\ASN1\Type\Primitive\NullType;
 
 /*
-From RFC 3279 - 2.2.1  RSA Signature Algorithm:
-
-    When any of these three OIDs appears within the ASN.1 type
-    AlgorithmIdentifier, the parameters component of that type SHALL be
-    the ASN.1 type NULL.
+ * From RFC 3279 - 2.2.1  RSA Signature Algorithm:
+ * When any of these three OIDs appears within the ASN.1 type
+ * AlgorithmIdentifier, the parameters component of that type SHALL be
+ * the ASN.1 type NULL.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC4055RSASignatureAlgorithmIdentifier.php b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC4055RSASignatureAlgorithmIdentifier.php
index e9ae13bdc..de8abaf7f 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC4055RSASignatureAlgorithmIdentifier.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/AlgorithmIdentifier/Signature/RFC4055RSASignatureAlgorithmIdentifier.php
@@ -7,11 +7,10 @@
 use SpomkyLabs\Pki\ASN1\Element;
 
 /*
-From RFC 4055 - 5.  PKCS #1 Version 1.5 Signature Algorithm
-
-    When any of these four object identifiers appears within an
-    AlgorithmIdentifier, the parameters MUST be NULL.  Implementations
-    MUST accept the parameters being absent as well as present.
+ * From RFC 4055 - 5.  PKCS #1 Version 1.5 Signature Algorithm
+ * When any of these four object identifiers appears within an
+ * AlgorithmIdentifier, the parameters MUST be NULL.  Implementations
+ * MUST accept the parameters being absent as well as present.
  */
 
 /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/Asymmetric/EC/ECPublicKey.php b/spomky-labs/pki-framework/src/CryptoTypes/Asymmetric/EC/ECPublicKey.php
index 5ff88773b..e1e4c569a 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/Asymmetric/EC/ECPublicKey.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/Asymmetric/EC/ECPublicKey.php
@@ -116,7 +116,7 @@ public function ECPoint(): string
      */
     public function curvePoint(): array
     {
-        return array_map(static fn ($str) => ECConversion::octetsToNumber($str), $this->curvePointOctets());
+        return array_map(ECConversion::octetsToNumber(...), $this->curvePointOctets());
     }
 
     /**
diff --git a/spomky-labs/pki-framework/src/CryptoTypes/Signature/RSASignature.php b/spomky-labs/pki-framework/src/CryptoTypes/Signature/RSASignature.php
index 61c08c596..dc186df28 100644
--- a/spomky-labs/pki-framework/src/CryptoTypes/Signature/RSASignature.php
+++ b/spomky-labs/pki-framework/src/CryptoTypes/Signature/RSASignature.php
@@ -21,10 +21,6 @@ final class RSASignature extends Signature
      */
     private ?string $_signature = null;
 
-    protected function __construct()
-    {
-    }
-
     /**
      * Initialize from RSA signature *S*.
      *
diff --git a/spomky-labs/pki-framework/src/X501/ASN1/Attribute.php b/spomky-labs/pki-framework/src/X501/ASN1/Attribute.php
index 093d43b1b..8e27b754a 100644
--- a/spomky-labs/pki-framework/src/X501/ASN1/Attribute.php
+++ b/spomky-labs/pki-framework/src/X501/ASN1/Attribute.php
@@ -13,6 +13,7 @@
 use SpomkyLabs\Pki\ASN1\Type\UnspecifiedType;
 use SpomkyLabs\Pki\X501\ASN1\AttributeValue\AttributeValue;
 use function count;
+use function sprintf;
 
 /**
  * Implements *Attribute* ASN.1 type.
diff --git a/spomky-labs/pki-framework/src/X501/ASN1/AttributeType.php b/spomky-labs/pki-framework/src/X501/ASN1/AttributeType.php
index adde42782..2e53fe877 100644
--- a/spomky-labs/pki-framework/src/X501/ASN1/AttributeType.php
+++ b/spomky-labs/pki-framework/src/X501/ASN1/AttributeType.php
@@ -412,7 +412,7 @@ final class AttributeType
      * @param string $_oid OID in dotted format
      */
     private function __construct(
-        protected string $_oid
+        private readonly string $_oid
     ) {
     }
 
diff --git a/spomky-labs/pki-framework/src/X501/ASN1/AttributeValue/Feature/DirectoryString.php b/spomky-labs/pki-framework/src/X501/ASN1/AttributeValue/Feature/DirectoryString.php
index d07891b12..c7b8bf3ad 100644
--- a/spomky-labs/pki-framework/src/X501/ASN1/AttributeValue/Feature/DirectoryString.php
+++ b/spomky-labs/pki-framework/src/X501/ASN1/AttributeValue/Feature/DirectoryString.php
@@ -18,6 +18,7 @@
 use SpomkyLabs\Pki\X501\StringPrep\TranscodeStep;
 use UnexpectedValueException;
 use function array_key_exists;
+use function sprintf;
 
 /**
  * Base class for attribute values having *(Unbounded)DirectoryString* as a syntax.
diff --git a/spomky-labs/pki-framework/src/X501/DN/DNParser.php b/spomky-labs/pki-framework/src/X501/DN/DNParser.php
index 1e464125e..d57f4528e 100644
--- a/spomky-labs/pki-framework/src/X501/DN/DNParser.php
+++ b/spomky-labs/pki-framework/src/X501/DN/DNParser.php
@@ -9,6 +9,7 @@
 use SpomkyLabs\Pki\ASN1\Feature\ElementBase;
 use UnexpectedValueException;
 use function mb_strlen;
+use function sprintf;
 
 /**
  * Distinguished Name parsing conforming to RFC 2253 and RFC 1779.
diff --git a/spomky-labs/pki-framework/src/X501/MatchingRule/BinaryMatch.php b/spomky-labs/pki-framework/src/X501/MatchingRule/BinaryMatch.php
index 0bb6ab31d..71d8956af 100644
--- a/spomky-labs/pki-framework/src/X501/MatchingRule/BinaryMatch.php
+++ b/spomky-labs/pki-framework/src/X501/MatchingRule/BinaryMatch.php
@@ -11,7 +11,7 @@
  */
 final class BinaryMatch extends MatchingRule
 {
-    public function compare(string $assertion, string $value): ?bool
+    public function compare(string $assertion, string $value): bool
     {
         return strcmp($assertion, $value) === 0;
     }
diff --git a/spomky-labs/pki-framework/src/X501/StringPrep/MapStep.php b/spomky-labs/pki-framework/src/X501/StringPrep/MapStep.php
index 6855d9e26..c5160abd8 100644
--- a/spomky-labs/pki-framework/src/X501/StringPrep/MapStep.php
+++ b/spomky-labs/pki-framework/src/X501/StringPrep/MapStep.php
@@ -17,7 +17,7 @@ final class MapStep implements PrepareStep
      * @param bool $fold Whether to apply case folding
      */
     private function __construct(
-        protected bool $fold
+        private readonly bool $fold
     ) {
     }
 
diff --git a/spomky-labs/pki-framework/src/X501/StringPrep/StringPreparer.php b/spomky-labs/pki-framework/src/X501/StringPrep/StringPreparer.php
index 9d7b0623f..497bedd36 100644
--- a/spomky-labs/pki-framework/src/X501/StringPrep/StringPreparer.php
+++ b/spomky-labs/pki-framework/src/X501/StringPrep/StringPreparer.php
@@ -30,7 +30,7 @@ private function __construct(
         /**
          * Preparation steps.
          */
-        protected array $_steps
+        private array $_steps
     ) {
     }
 
diff --git a/spomky-labs/pki-framework/src/X501/StringPrep/TranscodeStep.php b/spomky-labs/pki-framework/src/X501/StringPrep/TranscodeStep.php
index ff58611bc..0a744641a 100644
--- a/spomky-labs/pki-framework/src/X501/StringPrep/TranscodeStep.php
+++ b/spomky-labs/pki-framework/src/X501/StringPrep/TranscodeStep.php
@@ -8,6 +8,7 @@
 use SpomkyLabs\Pki\ASN1\Element;
 use SpomkyLabs\Pki\ASN1\Type\Primitive\T61String;
 use function in_array;
+use function sprintf;
 
 /**
  * Implements 'Transcode' step of the Internationalized String Preparation as specified by RFC 4518.
diff --git a/spomky-labs/pki-framework/src/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php b/spomky-labs/pki-framework/src/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php
index 559fed4cb..5a0720c65 100644
--- a/spomky-labs/pki-framework/src/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php
+++ b/spomky-labs/pki-framework/src/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php
@@ -62,12 +62,7 @@ public static function fromASN1(UnspecifiedType $el): AttributeValue
             );
             ++$idx;
         }
-        $values = array_map(
-            static fn (UnspecifiedType $el) => IetfAttrValue::fromASN1($el),
-            $seq->at($idx)
-                ->asSequence()
-                ->elements()
-        );
+        $values = array_map(IetfAttrValue::fromASN1(...), $seq->at($idx) ->asSequence() ->elements());
         $obj = static::create(...$values);
         $obj->_policyAuthority = $authority;
         return $obj;
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/CertificateBundle.php b/spomky-labs/pki-framework/src/X509/Certificate/CertificateBundle.php
index 9429cdc59..c007bc37e 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/CertificateBundle.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/CertificateBundle.php
@@ -58,7 +58,7 @@ public static function create(Certificate ...$certs): self
      */
     public static function fromPEMs(PEM ...$pems): self
     {
-        $certs = array_map(static fn ($pem) => Certificate::fromPEM($pem), $pems);
+        $certs = array_map(Certificate::fromPEM(...), $pems);
         return self::create(...$certs);
     }
 
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/CertificateChain.php b/spomky-labs/pki-framework/src/X509/Certificate/CertificateChain.php
index d4ef84cef..ffb596306 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/CertificateChain.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/CertificateChain.php
@@ -43,7 +43,7 @@ public static function create(Certificate ...$certs): self
      */
     public static function fromPEMs(PEM ...$pems): self
     {
-        $certs = array_map(static fn (PEM $pem) => Certificate::fromPEM($pem), $pems);
+        $certs = array_map(Certificate::fromPEM(...), $pems);
         return self::create(...$certs);
     }
 
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/Extension/AAControlsExtension.php b/spomky-labs/pki-framework/src/X509/Certificate/Extension/AAControlsExtension.php
index d576e4ec5..c09a284a1 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/Extension/AAControlsExtension.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/Extension/AAControlsExtension.php
@@ -169,11 +169,11 @@ protected function valueASN1(): Element
             $elements[] = Integer::create($this->pathLenConstraint);
         }
         if (isset($this->permittedAttrs)) {
-            $oids = array_map(static fn ($oid) => ObjectIdentifier::create($oid), $this->permittedAttrs);
+            $oids = array_map(ObjectIdentifier::create(...), $this->permittedAttrs);
             $elements[] = ImplicitlyTaggedType::create(0, Sequence::create(...$oids));
         }
         if (isset($this->excludedAttrs)) {
-            $oids = array_map(static fn ($oid) => ObjectIdentifier::create($oid), $this->excludedAttrs);
+            $oids = array_map(ObjectIdentifier::create(...), $this->excludedAttrs);
             $elements[] = ImplicitlyTaggedType::create(1, Sequence::create(...$oids));
         }
         if ($this->permitUnSpecified !== true) {
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/Extension/CertificatePolicy/NoticeReference.php b/spomky-labs/pki-framework/src/X509/Certificate/Extension/CertificatePolicy/NoticeReference.php
index 1a58962c2..c51d84c71 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/Extension/CertificatePolicy/NoticeReference.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/Extension/CertificatePolicy/NoticeReference.php
@@ -74,7 +74,7 @@ public function numbers(): array
     public function toASN1(): Sequence
     {
         $org = $this->organization->toASN1();
-        $nums = array_map(static fn ($number) => Integer::create($number), $this->numbers);
+        $nums = array_map(Integer::create(...), $this->numbers);
         return Sequence::create($org, Sequence::create(...$nums));
     }
 }
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/Extension/ExtendedKeyUsageExtension.php b/spomky-labs/pki-framework/src/X509/Certificate/Extension/ExtendedKeyUsageExtension.php
index f77cd0695..fdffbb7d4 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/Extension/ExtendedKeyUsageExtension.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/Extension/ExtendedKeyUsageExtension.php
@@ -154,7 +154,7 @@ protected static function fromDER(string $data, bool $critical): static
 
     protected function valueASN1(): Element
     {
-        $elements = array_map(static fn ($oid) => ObjectIdentifier::create($oid), $this->purposes);
+        $elements = array_map(ObjectIdentifier::create(...), $this->purposes);
         return Sequence::create(...$elements);
     }
 }
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/Extension/NameConstraints/GeneralSubtree.php b/spomky-labs/pki-framework/src/X509/Certificate/Extension/NameConstraints/GeneralSubtree.php
index e0117a48b..1cd1ba1d6 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/Extension/NameConstraints/GeneralSubtree.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/Extension/NameConstraints/GeneralSubtree.php
@@ -57,7 +57,8 @@ public static function fromASN1(Sequence $seq): self
         // or rfc822Name [1]. As minimum and maximum are also implicitly tagged,
         // we have to iterate the remaining elements instead of just checking
         // for tagged types.
-        for ($i = 1; $i < count($seq); ++$i) {
+        $count = count($seq);
+        for ($i = 1; $i < $count; ++$i) {
             $el = $seq->at($i)
                 ->expectTagged();
             switch ($el->tag()) {
@@ -87,7 +88,7 @@ public function base(): GeneralName
     public function toASN1(): Sequence
     {
         $elements = [$this->base->toASN1()];
-        if (isset($this->min) && $this->min !== 0) {
+        if ($this->min !== 0) {
             $elements[] = ImplicitlyTaggedType::create(0, Integer::create($this->min));
         }
         if (isset($this->max)) {
diff --git a/spomky-labs/pki-framework/src/X509/Certificate/Time.php b/spomky-labs/pki-framework/src/X509/Certificate/Time.php
index cd6d0eef6..8e2ec909c 100644
--- a/spomky-labs/pki-framework/src/X509/Certificate/Time.php
+++ b/spomky-labs/pki-framework/src/X509/Certificate/Time.php
@@ -33,9 +33,9 @@ private function __construct(
         $this->type = $type ?? self::determineType($dt);
     }
 
-    public static function create(DateTimeImmutable $dt): self
+    public static function create(DateTimeImmutable $dt, ?int $time = null): self
     {
-        return new self($dt, null);
+        return new self($dt, $time);
     }
 
     /**
@@ -43,7 +43,15 @@ public static function create(DateTimeImmutable $dt): self
      */
     public static function fromASN1(TimeType $el): self
     {
-        return self::create($el->dateTime());
+        // Pass the type of the original ASN.1 primitive
+        if ($el instanceof UTCTime) {
+            return self::create($el->dateTime(), Element::TYPE_UTC_TIME);
+        }
+        if ($el instanceof GeneralizedTime) {
+            return self::create($el->dateTime(), Element::TYPE_GENERALIZED_TIME);
+        }
+
+        return self::create($el->dateTime());  // TODO: should never happen?
     }
 
     /**
diff --git a/spomky-labs/pki-framework/src/X509/CertificationPath/PathValidation/PathValidator.php b/spomky-labs/pki-framework/src/X509/CertificationPath/PathValidation/PathValidator.php
index 8a64596c2..946220ae5 100644
--- a/spomky-labs/pki-framework/src/X509/CertificationPath/PathValidation/PathValidator.php
+++ b/spomky-labs/pki-framework/src/X509/CertificationPath/PathValidation/PathValidator.php
@@ -40,8 +40,8 @@ final class PathValidator
      * the end-entity certificate
      */
     private function __construct(
-        protected Crypto $crypto,
-        protected PathValidationConfig $config,
+        private readonly Crypto $crypto,
+        private readonly PathValidationConfig $config,
         Certificate ...$certificates
     ) {
         if (count($certificates) === 0) {
diff --git a/spomky-labs/pki-framework/src/X509/GeneralName/IPv6Address.php b/spomky-labs/pki-framework/src/X509/GeneralName/IPv6Address.php
index a79983a72..74194e22e 100644
--- a/spomky-labs/pki-framework/src/X509/GeneralName/IPv6Address.php
+++ b/spomky-labs/pki-framework/src/X509/GeneralName/IPv6Address.php
@@ -7,6 +7,7 @@
 use UnexpectedValueException;
 use function array_slice;
 use function count;
+use function sprintf;
 
 final class IPv6Address extends IPAddress
 {
diff --git a/symfony/clock/Clock.php b/symfony/clock/Clock.php
new file mode 100644
index 000000000..311e8fc07
--- /dev/null
+++ b/symfony/clock/Clock.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+use Psr\Clock\ClockInterface as PsrClockInterface;
+
+/**
+ * A global clock.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class Clock implements ClockInterface
+{
+    private static ClockInterface $globalClock;
+
+    public function __construct(
+        private readonly ?PsrClockInterface $clock = null,
+        private ?\DateTimeZone $timezone = null,
+    ) {
+    }
+
+    /**
+     * Returns the current global clock.
+     *
+     * Note that you should prefer injecting a ClockInterface or using
+     * ClockAwareTrait when possible instead of using this method.
+     */
+    public static function get(): ClockInterface
+    {
+        return self::$globalClock ??= new NativeClock();
+    }
+
+    public static function set(PsrClockInterface $clock): void
+    {
+        self::$globalClock = $clock instanceof ClockInterface ? $clock : new self($clock);
+    }
+
+    public function now(): DatePoint
+    {
+        $now = ($this->clock ?? self::get())->now();
+
+        if (!$now instanceof DatePoint) {
+            $now = DatePoint::createFromInterface($now);
+        }
+
+        return isset($this->timezone) ? $now->setTimezone($this->timezone) : $now;
+    }
+
+    public function sleep(float|int $seconds): void
+    {
+        $clock = $this->clock ?? self::get();
+
+        if ($clock instanceof ClockInterface) {
+            $clock->sleep($seconds);
+        } else {
+            (new NativeClock())->sleep($seconds);
+        }
+    }
+
+    /**
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function withTimeZone(\DateTimeZone|string $timezone): static
+    {
+        if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
+            $timezone = new \DateTimeZone($timezone);
+        } elseif (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \DateInvalidTimeZoneException($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        $clone = clone $this;
+        $clone->timezone = $timezone;
+
+        return $clone;
+    }
+}
diff --git a/symfony/clock/ClockAwareTrait.php b/symfony/clock/ClockAwareTrait.php
new file mode 100644
index 000000000..e723d7f86
--- /dev/null
+++ b/symfony/clock/ClockAwareTrait.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Contracts\Service\Attribute\Required;
+
+/**
+ * A trait to help write time-sensitive classes.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait ClockAwareTrait
+{
+    private readonly ClockInterface $clock;
+
+    #[Required]
+    public function setClock(ClockInterface $clock): void
+    {
+        $this->clock = $clock;
+    }
+
+    protected function now(): DatePoint
+    {
+        $now = ($this->clock ??= new Clock())->now();
+
+        return $now instanceof DatePoint ? $now : DatePoint::createFromInterface($now);
+    }
+}
diff --git a/symfony/clock/ClockInterface.php b/symfony/clock/ClockInterface.php
new file mode 100644
index 000000000..435775a8f
--- /dev/null
+++ b/symfony/clock/ClockInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+use Psr\Clock\ClockInterface as PsrClockInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface ClockInterface extends PsrClockInterface
+{
+    public function sleep(float|int $seconds): void;
+
+    public function withTimeZone(\DateTimeZone|string $timezone): static;
+}
diff --git a/symfony/clock/DatePoint.php b/symfony/clock/DatePoint.php
new file mode 100644
index 000000000..4df35fe03
--- /dev/null
+++ b/symfony/clock/DatePoint.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+/**
+ * An immmutable DateTime with stricter error handling and return types than the native one.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class DatePoint extends \DateTimeImmutable
+{
+    /**
+     * @throws \DateMalformedStringException When $datetime is invalid
+     */
+    public function __construct(string $datetime = 'now', ?\DateTimeZone $timezone = null, ?parent $reference = null)
+    {
+        $now = $reference ?? Clock::get()->now();
+
+        if ('now' !== $datetime) {
+            if (!$now instanceof static) {
+                $now = static::createFromInterface($now);
+            }
+
+            if (\PHP_VERSION_ID < 80300) {
+                try {
+                    $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                    $timezone = $builtInDate->getTimezone();
+                } catch (\Exception $e) {
+                    throw new \DateMalformedStringException($e->getMessage(), $e->getCode(), $e);
+                }
+            } else {
+                $builtInDate = new parent($datetime, $timezone ?? $now->getTimezone());
+                $timezone = $builtInDate->getTimezone();
+            }
+
+            $now = $now->setTimezone($timezone)->modify($datetime);
+
+            if ('00:00:00.000000' === $builtInDate->format('H:i:s.u')) {
+                $now = $now->setTime(0, 0);
+            }
+        } elseif (null !== $timezone) {
+            $now = $now->setTimezone($timezone);
+        }
+
+        $this->__unserialize((array) $now);
+    }
+
+    /**
+     * @throws \DateMalformedStringException When $format or $datetime are invalid
+     */
+    public static function createFromFormat(string $format, string $datetime, ?\DateTimeZone $timezone = null): static
+    {
+        return parent::createFromFormat($format, $datetime, $timezone) ?: throw new \DateMalformedStringException(static::getLastErrors()['errors'][0] ?? 'Invalid date string or format.');
+    }
+
+    public static function createFromInterface(\DateTimeInterface $object): static
+    {
+        return parent::createFromInterface($object);
+    }
+
+    public static function createFromMutable(\DateTime $object): static
+    {
+        return parent::createFromMutable($object);
+    }
+
+    public static function createFromTimestamp(int|float $timestamp): static
+    {
+        if (\PHP_VERSION_ID >= 80400) {
+            return parent::createFromTimestamp($timestamp);
+        }
+
+        if (\is_int($timestamp) || !$ms = (int) $timestamp - $timestamp) {
+            return static::createFromFormat('U', (string) $timestamp);
+        }
+
+        if (!is_finite($timestamp) || \PHP_INT_MAX + 1.0 <= $timestamp || \PHP_INT_MIN > $timestamp) {
+            throw new \DateRangeError(\sprintf('DateTimeImmutable::createFromTimestamp(): Argument #1 ($timestamp) must be a finite number between %s and %s.999999, %s given', \PHP_INT_MIN, \PHP_INT_MAX, $timestamp));
+        }
+
+        if ($timestamp < 0) {
+            $timestamp = (int) $timestamp - 2.0 + $ms;
+        }
+
+        return static::createFromFormat('U.u', \sprintf('%.6F', $timestamp));
+    }
+
+    public function add(\DateInterval $interval): static
+    {
+        return parent::add($interval);
+    }
+
+    public function sub(\DateInterval $interval): static
+    {
+        return parent::sub($interval);
+    }
+
+    /**
+     * @throws \DateMalformedStringException When $modifier is invalid
+     */
+    public function modify(string $modifier): static
+    {
+        if (\PHP_VERSION_ID < 80300) {
+            return @parent::modify($modifier) ?: throw new \DateMalformedStringException(error_get_last()['message'] ?? \sprintf('Invalid modifier: "%s".', $modifier));
+        }
+
+        return parent::modify($modifier);
+    }
+
+    public function setTimestamp(int $value): static
+    {
+        return parent::setTimestamp($value);
+    }
+
+    public function setDate(int $year, int $month, int $day): static
+    {
+        return parent::setDate($year, $month, $day);
+    }
+
+    public function setISODate(int $year, int $week, int $day = 1): static
+    {
+        return parent::setISODate($year, $week, $day);
+    }
+
+    public function setTime(int $hour, int $minute, int $second = 0, int $microsecond = 0): static
+    {
+        return parent::setTime($hour, $minute, $second, $microsecond);
+    }
+
+    public function setTimezone(\DateTimeZone $timezone): static
+    {
+        return parent::setTimezone($timezone);
+    }
+
+    public function getTimezone(): \DateTimeZone
+    {
+        return parent::getTimezone() ?: throw new \DateInvalidTimeZoneException('The DatePoint object has no timezone.');
+    }
+
+    public function setMicrosecond(int $microsecond): static
+    {
+        if ($microsecond < 0 || $microsecond > 999999) {
+            throw new \DateRangeError('DatePoint::setMicrosecond(): Argument #1 ($microsecond) must be between 0 and 999999, '.$microsecond.' given');
+        }
+
+        if (\PHP_VERSION_ID < 80400) {
+            return $this->setTime(...explode('.', $this->format('H.i.s.'.$microsecond)));
+        }
+
+        return parent::setMicrosecond($microsecond);
+    }
+
+    public function getMicrosecond(): int
+    {
+        if (\PHP_VERSION_ID >= 80400) {
+            return parent::getMicrosecond();
+        }
+
+        return $this->format('u');
+    }
+}
diff --git a/symfony/clock/LICENSE b/symfony/clock/LICENSE
new file mode 100644
index 000000000..733c826eb
--- /dev/null
+++ b/symfony/clock/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/symfony/clock/MockClock.php b/symfony/clock/MockClock.php
new file mode 100644
index 000000000..64424aba8
--- /dev/null
+++ b/symfony/clock/MockClock.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+/**
+ * A clock that always returns the same date, suitable for testing time-sensitive logic.
+ *
+ * Consider using ClockSensitiveTrait in your test cases instead of using this class directly.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class MockClock implements ClockInterface
+{
+    private DatePoint $now;
+
+    /**
+     * @throws \DateMalformedStringException When $now is invalid
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function __construct(\DateTimeImmutable|string $now = 'now', \DateTimeZone|string|null $timezone = null)
+    {
+        if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
+            $timezone = new \DateTimeZone($timezone);
+        } elseif (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \DateInvalidTimeZoneException($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        if (\is_string($now)) {
+            $now = new DatePoint($now, $timezone ?? new \DateTimeZone('UTC'));
+        } elseif (!$now instanceof DatePoint) {
+            $now = DatePoint::createFromInterface($now);
+        }
+
+        $this->now = null !== $timezone ? $now->setTimezone($timezone) : $now;
+    }
+
+    public function now(): DatePoint
+    {
+        return clone $this->now;
+    }
+
+    public function sleep(float|int $seconds): void
+    {
+        if (0 >= $seconds) {
+            return;
+        }
+
+        $now = (float) $this->now->format('Uu') + $seconds * 1e6;
+        $now = substr_replace(\sprintf('@%07.0F', $now), '.', -6, 0);
+        $timezone = $this->now->getTimezone();
+
+        $this->now = DatePoint::createFromInterface(new \DateTimeImmutable($now, $timezone))->setTimezone($timezone);
+    }
+
+    /**
+     * @throws \DateMalformedStringException When $modifier is invalid
+     */
+    public function modify(string $modifier): void
+    {
+        if (\PHP_VERSION_ID < 80300) {
+            $this->now = @$this->now->modify($modifier) ?: throw new \DateMalformedStringException(error_get_last()['message'] ?? \sprintf('Invalid modifier: "%s". Could not modify MockClock.', $modifier));
+
+            return;
+        }
+
+        $this->now = $this->now->modify($modifier);
+    }
+
+    /**
+     * @throws \DateInvalidTimeZoneException When the timezone name is invalid
+     */
+    public function withTimeZone(\DateTimeZone|string $timezone): static
+    {
+        if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
+            $timezone = new \DateTimeZone($timezone);
+        } elseif (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \DateInvalidTimeZoneException($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        $clone = clone $this;
+        $clone->now = $clone->now->setTimezone($timezone);
+
+        return $clone;
+    }
+}
diff --git a/symfony/clock/MonotonicClock.php b/symfony/clock/MonotonicClock.php
new file mode 100644
index 000000000..d27bf9c31
--- /dev/null
+++ b/symfony/clock/MonotonicClock.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+/**
+ * A monotonic clock suitable for performance profiling.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class MonotonicClock implements ClockInterface
+{
+    private int $sOffset;
+    private int $usOffset;
+    private \DateTimeZone $timezone;
+
+    /**
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function __construct(\DateTimeZone|string|null $timezone = null)
+    {
+        if (false === $offset = hrtime()) {
+            throw new \RuntimeException('hrtime() returned false: the runtime environment does not provide access to a monotonic timer.');
+        }
+
+        $time = explode(' ', microtime(), 2);
+        $this->sOffset = $time[1] - $offset[0];
+        $this->usOffset = (int) ($time[0] * 1000000) - (int) ($offset[1] / 1000);
+
+        $this->timezone = \is_string($timezone ??= date_default_timezone_get()) ? $this->withTimeZone($timezone)->timezone : $timezone;
+    }
+
+    public function now(): DatePoint
+    {
+        [$s, $us] = hrtime();
+
+        if (1000000 <= $us = (int) ($us / 1000) + $this->usOffset) {
+            ++$s;
+            $us -= 1000000;
+        } elseif (0 > $us) {
+            --$s;
+            $us += 1000000;
+        }
+
+        if (6 !== \strlen($now = (string) $us)) {
+            $now = str_pad($now, 6, '0', \STR_PAD_LEFT);
+        }
+
+        $now = '@'.($s + $this->sOffset).'.'.$now;
+
+        return DatePoint::createFromInterface(new \DateTimeImmutable($now, $this->timezone))->setTimezone($this->timezone);
+    }
+
+    public function sleep(float|int $seconds): void
+    {
+        if (0 < $s = (int) $seconds) {
+            sleep($s);
+        }
+
+        if (0 < $us = $seconds - $s) {
+            usleep((int) ($us * 1E6));
+        }
+    }
+
+    /**
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function withTimeZone(\DateTimeZone|string $timezone): static
+    {
+        if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
+            $timezone = new \DateTimeZone($timezone);
+        } elseif (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \DateInvalidTimeZoneException($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        $clone = clone $this;
+        $clone->timezone = $timezone;
+
+        return $clone;
+    }
+}
diff --git a/symfony/clock/NativeClock.php b/symfony/clock/NativeClock.php
new file mode 100644
index 000000000..b580a886c
--- /dev/null
+++ b/symfony/clock/NativeClock.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+/**
+ * A clock that relies the system time.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class NativeClock implements ClockInterface
+{
+    private \DateTimeZone $timezone;
+
+    /**
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function __construct(\DateTimeZone|string|null $timezone = null)
+    {
+        $this->timezone = \is_string($timezone ??= date_default_timezone_get()) ? $this->withTimeZone($timezone)->timezone : $timezone;
+    }
+
+    public function now(): DatePoint
+    {
+        return DatePoint::createFromInterface(new \DateTimeImmutable('now', $this->timezone));
+    }
+
+    public function sleep(float|int $seconds): void
+    {
+        if (0 < $s = (int) $seconds) {
+            sleep($s);
+        }
+
+        if (0 < $us = $seconds - $s) {
+            usleep((int) ($us * 1E6));
+        }
+    }
+
+    /**
+     * @throws \DateInvalidTimeZoneException When $timezone is invalid
+     */
+    public function withTimeZone(\DateTimeZone|string $timezone): static
+    {
+        if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
+            $timezone = new \DateTimeZone($timezone);
+        } elseif (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \DateInvalidTimeZoneException($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        $clone = clone $this;
+        $clone->timezone = $timezone;
+
+        return $clone;
+    }
+}
diff --git a/symfony/clock/Resources/now.php b/symfony/clock/Resources/now.php
new file mode 100644
index 000000000..47d086c67
--- /dev/null
+++ b/symfony/clock/Resources/now.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+if (!\function_exists(now::class)) {
+    /**
+     * @throws \DateMalformedStringException When the modifier is invalid
+     */
+    function now(string $modifier = 'now'): DatePoint
+    {
+        if ('now' !== $modifier) {
+            return new DatePoint($modifier);
+        }
+
+        $now = Clock::get()->now();
+
+        return $now instanceof DatePoint ? $now : DatePoint::createFromInterface($now);
+    }
+}
diff --git a/symfony/polyfill-intl-grapheme/Grapheme.php b/symfony/polyfill-intl-grapheme/Grapheme.php
index 5373f1685..f9e9e5741 100644
--- a/symfony/polyfill-intl-grapheme/Grapheme.php
+++ b/symfony/polyfill-intl-grapheme/Grapheme.php
@@ -26,6 +26,7 @@
  * - grapheme_strrpos  - Find position (in grapheme units) of last occurrence of a string
  * - grapheme_strstr   - Returns part of haystack string from the first occurrence of needle to the end of haystack
  * - grapheme_substr   - Return part of a string
+ * - grapheme_str_split - Splits a string into an array of individual or chunks of graphemes
  *
  * @author Nicolas Grekas <p@tchwork.com>
  *
@@ -191,6 +192,37 @@ public static function grapheme_strstr($s, $needle, $beforeNeedle = false)
         return mb_strstr($s, $needle, $beforeNeedle, 'UTF-8');
     }
 
+    public static function grapheme_str_split($s, $len = 1)
+    {
+        if (0 > $len || 1073741823 < $len) {
+            if (80000 > \PHP_VERSION_ID) {
+                return false;
+            }
+
+            throw new \ValueError('grapheme_str_split(): Argument #2 ($length) must be greater than 0 and less than or equal to 1073741823.');
+        }
+
+        if ('' === $s) {
+            return [];
+        }
+
+        if (!preg_match_all('/('.SYMFONY_GRAPHEME_CLUSTER_RX.')/u', $s, $matches)) {
+            return false;
+        }
+
+        if (1 === $len) {
+            return $matches[0];
+        }
+
+        $chunks = array_chunk($matches[0], $len);
+
+        foreach ($chunks as &$chunk) {
+            $chunk = implode('', $chunk);
+        }
+
+        return $chunks;
+    }
+
     private static function grapheme_position($s, $needle, $offset, $mode)
     {
         $needle = (string) $needle;
diff --git a/symfony/polyfill-intl-grapheme/bootstrap.php b/symfony/polyfill-intl-grapheme/bootstrap.php
index a9ea03c7e..374dbd3a7 100644
--- a/symfony/polyfill-intl-grapheme/bootstrap.php
+++ b/symfony/polyfill-intl-grapheme/bootstrap.php
@@ -11,10 +11,6 @@
 
 use Symfony\Polyfill\Intl\Grapheme as p;
 
-if (extension_loaded('intl')) {
-    return;
-}
-
 if (\PHP_VERSION_ID >= 80000) {
     return require __DIR__.'/bootstrap80.php';
 }
@@ -56,3 +52,6 @@ function grapheme_strstr($haystack, $needle, $beforeNeedle = false) { return p\G
 if (!function_exists('grapheme_substr')) {
     function grapheme_substr($string, $offset, $length = null) { return p\Grapheme::grapheme_substr($string, $offset, $length); }
 }
+if (!function_exists('grapheme_str_split')) {
+    function grapheme_str_split($string, $length = 1) { return p\Grapheme::grapheme_str_split($string, $length); }
+}
diff --git a/symfony/polyfill-intl-grapheme/bootstrap80.php b/symfony/polyfill-intl-grapheme/bootstrap80.php
index b8c078677..d71175530 100644
--- a/symfony/polyfill-intl-grapheme/bootstrap80.php
+++ b/symfony/polyfill-intl-grapheme/bootstrap80.php
@@ -11,6 +11,14 @@
 
 use Symfony\Polyfill\Intl\Grapheme as p;
 
+if (!function_exists('grapheme_str_split')) {
+    function grapheme_str_split(string $string, int $length = 1): array|false { return p\Grapheme::grapheme_str_split($string, $length); }
+}
+
+if (extension_loaded('intl')) {
+    return;
+}
+
 if (!defined('GRAPHEME_EXTR_COUNT')) {
     define('GRAPHEME_EXTR_COUNT', 0);
 }
diff --git a/symfony/property-access/Exception/AccessException.php b/symfony/property-access/Exception/AccessException.php
new file mode 100644
index 000000000..b3a854646
--- /dev/null
+++ b/symfony/property-access/Exception/AccessException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a property path is not available.
+ *
+ * @author Stéphane Escandell <stephane.escandell@gmail.com>
+ */
+class AccessException extends RuntimeException
+{
+}
diff --git a/symfony/property-access/Exception/ExceptionInterface.php b/symfony/property-access/Exception/ExceptionInterface.php
new file mode 100644
index 000000000..fabf9a080
--- /dev/null
+++ b/symfony/property-access/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Marker interface for the PropertyAccess component.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/symfony/property-access/Exception/InvalidArgumentException.php b/symfony/property-access/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..47bc7e150
--- /dev/null
+++ b/symfony/property-access/Exception/InvalidArgumentException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Base InvalidArgumentException for the PropertyAccess component.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/symfony/property-access/Exception/InvalidPropertyPathException.php b/symfony/property-access/Exception/InvalidPropertyPathException.php
new file mode 100644
index 000000000..69de31cee
--- /dev/null
+++ b/symfony/property-access/Exception/InvalidPropertyPathException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a property path is malformed.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class InvalidPropertyPathException extends RuntimeException
+{
+}
diff --git a/symfony/property-access/Exception/InvalidTypeException.php b/symfony/property-access/Exception/InvalidTypeException.php
new file mode 100644
index 000000000..c22ad5ad9
--- /dev/null
+++ b/symfony/property-access/Exception/InvalidTypeException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a type of given value does not match an expected type.
+ *
+ * @author Farhad Safarov <farhad.safarov@gmail.com>
+ */
+class InvalidTypeException extends InvalidArgumentException
+{
+    public function __construct(
+        public readonly string $expectedType,
+        public readonly string $actualType,
+        public readonly string $propertyPath,
+        ?\Throwable $previous = null,
+    ) {
+        parent::__construct(
+            \sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath),
+            previous: $previous,
+        );
+    }
+}
diff --git a/symfony/property-access/Exception/NoSuchIndexException.php b/symfony/property-access/Exception/NoSuchIndexException.php
new file mode 100644
index 000000000..597b9904a
--- /dev/null
+++ b/symfony/property-access/Exception/NoSuchIndexException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when an index cannot be found.
+ *
+ * @author Stéphane Escandell <stephane.escandell@gmail.com>
+ */
+class NoSuchIndexException extends AccessException
+{
+}
diff --git a/symfony/property-access/Exception/NoSuchPropertyException.php b/symfony/property-access/Exception/NoSuchPropertyException.php
new file mode 100644
index 000000000..1c7eda5f8
--- /dev/null
+++ b/symfony/property-access/Exception/NoSuchPropertyException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a property cannot be found.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class NoSuchPropertyException extends AccessException
+{
+}
diff --git a/symfony/property-access/Exception/OutOfBoundsException.php b/symfony/property-access/Exception/OutOfBoundsException.php
new file mode 100644
index 000000000..a3c45597d
--- /dev/null
+++ b/symfony/property-access/Exception/OutOfBoundsException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Base OutOfBoundsException for the PropertyAccess component.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/symfony/property-access/Exception/RuntimeException.php b/symfony/property-access/Exception/RuntimeException.php
new file mode 100644
index 000000000..9fe843e30
--- /dev/null
+++ b/symfony/property-access/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Base RuntimeException for the PropertyAccess component.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/symfony/property-access/Exception/UnexpectedTypeException.php b/symfony/property-access/Exception/UnexpectedTypeException.php
new file mode 100644
index 000000000..ed1308e0b
--- /dev/null
+++ b/symfony/property-access/Exception/UnexpectedTypeException.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+use Symfony\Component\PropertyAccess\PropertyPathInterface;
+
+/**
+ * Thrown when a value does not match an expected type.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class UnexpectedTypeException extends RuntimeException
+{
+    /**
+     * @param mixed $value     The unexpected value found while traversing property path
+     * @param int   $pathIndex The property path index when the unexpected value was found
+     */
+    public function __construct(mixed $value, PropertyPathInterface $path, int $pathIndex)
+    {
+        $message = \sprintf(
+            'PropertyAccessor requires a graph of objects or arrays to operate on, '.
+            'but it found type "%s" while trying to traverse path "%s" at property "%s".',
+            \gettype($value),
+            (string) $path,
+            $path->getElement($pathIndex)
+        );
+
+        parent::__construct($message);
+    }
+}
diff --git a/symfony/property-access/Exception/UninitializedPropertyException.php b/symfony/property-access/Exception/UninitializedPropertyException.php
new file mode 100644
index 000000000..c0d69735d
--- /dev/null
+++ b/symfony/property-access/Exception/UninitializedPropertyException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Exception;
+
+/**
+ * Thrown when a property is not initialized.
+ *
+ * @author Jules Pietri <jules@heahprod.com>
+ */
+class UninitializedPropertyException extends AccessException
+{
+}
diff --git a/symfony/property-access/LICENSE b/symfony/property-access/LICENSE
new file mode 100644
index 000000000..0138f8f07
--- /dev/null
+++ b/symfony/property-access/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/symfony/property-access/PropertyAccess.php b/symfony/property-access/PropertyAccess.php
new file mode 100644
index 000000000..1953ac096
--- /dev/null
+++ b/symfony/property-access/PropertyAccess.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+/**
+ * Entry point of the PropertyAccess component.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+final class PropertyAccess
+{
+    /**
+     * Creates a property accessor with the default configuration.
+     */
+    public static function createPropertyAccessor(): PropertyAccessor
+    {
+        return self::createPropertyAccessorBuilder()->getPropertyAccessor();
+    }
+
+    public static function createPropertyAccessorBuilder(): PropertyAccessorBuilder
+    {
+        return new PropertyAccessorBuilder();
+    }
+
+    /**
+     * This class cannot be instantiated.
+     */
+    private function __construct()
+    {
+    }
+}
diff --git a/symfony/property-access/PropertyAccessor.php b/symfony/property-access/PropertyAccessor.php
new file mode 100644
index 000000000..7066e1545
--- /dev/null
+++ b/symfony/property-access/PropertyAccessor.php
@@ -0,0 +1,704 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\PropertyAccess\Exception\AccessException;
+use Symfony\Component\PropertyAccess\Exception\InvalidTypeException;
+use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
+use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
+use Symfony\Component\PropertyInfo\PropertyReadInfo;
+use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfo;
+use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
+
+/**
+ * Default implementation of {@link PropertyAccessorInterface}.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PropertyAccessor implements PropertyAccessorInterface
+{
+    /** @var int Allow none of the magic methods */
+    public const DISALLOW_MAGIC_METHODS = ReflectionExtractor::DISALLOW_MAGIC_METHODS;
+    /** @var int Allow magic __get methods */
+    public const MAGIC_GET = ReflectionExtractor::ALLOW_MAGIC_GET;
+    /** @var int Allow magic __set methods */
+    public const MAGIC_SET = ReflectionExtractor::ALLOW_MAGIC_SET;
+    /** @var int Allow magic __call methods */
+    public const MAGIC_CALL = ReflectionExtractor::ALLOW_MAGIC_CALL;
+
+    public const DO_NOT_THROW = 0;
+    public const THROW_ON_INVALID_INDEX = 1;
+    public const THROW_ON_INVALID_PROPERTY_PATH = 2;
+
+    private const VALUE = 0;
+    private const REF = 1;
+    private const IS_REF_CHAINED = 2;
+    private const CACHE_PREFIX_READ = 'r';
+    private const CACHE_PREFIX_WRITE = 'w';
+    private const CACHE_PREFIX_PROPERTY_PATH = 'p';
+    private const RESULT_PROTO = [self::VALUE => null];
+
+    private bool $ignoreInvalidIndices;
+    private bool $ignoreInvalidProperty;
+    private ?CacheItemPoolInterface $cacheItemPool;
+    private array $propertyPathCache = [];
+    private PropertyReadInfoExtractorInterface $readInfoExtractor;
+    private PropertyWriteInfoExtractorInterface $writeInfoExtractor;
+    private array $readPropertyCache = [];
+    private array $writePropertyCache = [];
+
+    /**
+     * Should not be used by application code. Use
+     * {@link PropertyAccess::createPropertyAccessor()} instead.
+     *
+     * @param int $magicMethodsFlags A bitwise combination of the MAGIC_* constants
+     *                               to specify the allowed magic methods (__get, __set, __call)
+     *                               or self::DISALLOW_MAGIC_METHODS for none
+     * @param int $throw             A bitwise combination of the THROW_* constants
+     *                               to specify when exceptions should be thrown
+     */
+    public function __construct(
+        private int $magicMethodsFlags = self::MAGIC_GET | self::MAGIC_SET,
+        int $throw = self::THROW_ON_INVALID_PROPERTY_PATH,
+        ?CacheItemPoolInterface $cacheItemPool = null,
+        ?PropertyReadInfoExtractorInterface $readInfoExtractor = null,
+        ?PropertyWriteInfoExtractorInterface $writeInfoExtractor = null,
+    ) {
+        $this->ignoreInvalidIndices = 0 === ($throw & self::THROW_ON_INVALID_INDEX);
+        $this->cacheItemPool = $cacheItemPool instanceof NullAdapter ? null : $cacheItemPool; // Replace the NullAdapter by the null value
+        $this->ignoreInvalidProperty = 0 === ($throw & self::THROW_ON_INVALID_PROPERTY_PATH);
+        $this->readInfoExtractor = $readInfoExtractor ?? new ReflectionExtractor([], null, null, false);
+        $this->writeInfoExtractor = $writeInfoExtractor ?? new ReflectionExtractor(['set'], null, null, false);
+    }
+
+    public function getValue(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): mixed
+    {
+        $zval = [
+            self::VALUE => $objectOrArray,
+        ];
+
+        if (\is_object($objectOrArray) && (false === strpbrk((string) $propertyPath, '.[?') || $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {
+            return $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty)[self::VALUE];
+        }
+
+        $propertyPath = $this->getPropertyPath($propertyPath);
+
+        $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength(), $this->ignoreInvalidIndices);
+
+        return $propertyValues[\count($propertyValues) - 1][self::VALUE];
+    }
+
+    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void
+    {
+        if (\is_object($objectOrArray) && (false === strpbrk((string) $propertyPath, '.[') || $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {
+            $zval = [
+                self::VALUE => $objectOrArray,
+            ];
+
+            try {
+                $this->writeProperty($zval, $propertyPath, $value);
+
+                return;
+            } catch (\TypeError $e) {
+                self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0, $propertyPath, $e);
+                // It wasn't thrown in this class so rethrow it
+                throw $e;
+            }
+        }
+
+        $propertyPath = $this->getPropertyPath($propertyPath);
+
+        $zval = [
+            self::VALUE => $objectOrArray,
+            self::REF => &$objectOrArray,
+        ];
+        $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength() - 1);
+        $overwrite = true;
+
+        try {
+            for ($i = \count($propertyValues) - 1; 0 <= $i; --$i) {
+                $zval = $propertyValues[$i];
+                unset($propertyValues[$i]);
+
+                // You only need set value for current element if:
+                // 1. it's the parent of the last index element
+                // OR
+                // 2. its child is not passed by reference
+                //
+                // This may avoid unnecessary value setting process for array elements.
+                // For example:
+                // '[a][b][c]' => 'old-value'
+                // If you want to change its value to 'new-value',
+                // you only need set value for '[a][b][c]' and it's safe to ignore '[a][b]' and '[a]'
+                if ($overwrite) {
+                    $property = $propertyPath->getElement($i);
+
+                    if ($propertyPath->isIndex($i)) {
+                        if ($overwrite = !isset($zval[self::REF])) {
+                            $ref = &$zval[self::REF];
+                            $ref = $zval[self::VALUE];
+                        }
+                        $this->writeIndex($zval, $property, $value);
+                        if ($overwrite) {
+                            $zval[self::VALUE] = $zval[self::REF];
+                        }
+                    } else {
+                        $this->writeProperty($zval, $property, $value);
+                    }
+
+                    // if current element is an object
+                    // OR
+                    // if current element's reference chain is not broken - current element
+                    // as well as all its ancients in the property path are all passed by reference,
+                    // then there is no need to continue the value setting process
+                    if (\is_object($zval[self::VALUE]) || isset($zval[self::IS_REF_CHAINED])) {
+                        break;
+                    }
+                }
+
+                $value = $zval[self::VALUE];
+            }
+        } catch (\TypeError $e) {
+            self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0, $propertyPath, $e);
+
+            // It wasn't thrown in this class so rethrow it
+            throw $e;
+        }
+    }
+
+    private static function throwInvalidArgumentException(string $message, array $trace, int $i, string $propertyPath, ?\Throwable $previous = null): void
+    {
+        if (!isset($trace[$i]['file']) || __FILE__ !== $trace[$i]['file']) {
+            return;
+        }
+        if (preg_match('/^\S+::\S+\(\): Argument #\d+ \(\$\S+\) must be of type (\S+), (\S+) given/', $message, $matches)) {
+            [, $expectedType, $actualType] = $matches;
+
+            throw new InvalidTypeException($expectedType, $actualType, $propertyPath, $previous);
+        }
+        if (preg_match('/^Cannot assign (\S+) to property \S+::\$\S+ of type (\S+)$/', $message, $matches)) {
+            [, $actualType, $expectedType] = $matches;
+
+            throw new InvalidTypeException($expectedType, $actualType, $propertyPath, $previous);
+        }
+    }
+
+    public function isReadable(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): bool
+    {
+        if (!$propertyPath instanceof PropertyPathInterface) {
+            $propertyPath = new PropertyPath($propertyPath);
+        }
+
+        try {
+            $zval = [
+                self::VALUE => $objectOrArray,
+            ];
+
+            // handle stdClass with properties with a dot in the name
+            if ($objectOrArray instanceof \stdClass && str_contains($propertyPath, '.') && property_exists($objectOrArray, $propertyPath)) {
+                $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty);
+            } else {
+                $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength(), $this->ignoreInvalidIndices);
+            }
+
+            return true;
+        } catch (AccessException|UnexpectedTypeException) {
+            return false;
+        }
+    }
+
+    public function isWritable(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): bool
+    {
+        $propertyPath = $this->getPropertyPath($propertyPath);
+
+        try {
+            $zval = [
+                self::VALUE => $objectOrArray,
+            ];
+
+            // handle stdClass with properties with a dot in the name
+            if ($objectOrArray instanceof \stdClass && str_contains($propertyPath, '.') && property_exists($objectOrArray, $propertyPath)) {
+                $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty);
+
+                return true;
+            }
+
+            $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength() - 1);
+
+            for ($i = \count($propertyValues) - 1; 0 <= $i; --$i) {
+                $zval = $propertyValues[$i];
+                unset($propertyValues[$i]);
+
+                if ($propertyPath->isIndex($i)) {
+                    if (!$zval[self::VALUE] instanceof \ArrayAccess && !\is_array($zval[self::VALUE])) {
+                        return false;
+                    }
+                } elseif (!\is_object($zval[self::VALUE]) || !$this->isPropertyWritable($zval[self::VALUE], $propertyPath->getElement($i))) {
+                    return false;
+                }
+
+                if (\is_object($zval[self::VALUE])) {
+                    return true;
+                }
+            }
+
+            return true;
+        } catch (AccessException|UnexpectedTypeException) {
+            return false;
+        }
+    }
+
+    /**
+     * Reads the path from an object up to a given path index.
+     *
+     * @throws UnexpectedTypeException if a value within the path is neither object nor array
+     * @throws NoSuchIndexException    If a non-existing index is accessed
+     */
+    private function readPropertiesUntil(array $zval, PropertyPathInterface $propertyPath, int $lastIndex, bool $ignoreInvalidIndices = true): array
+    {
+        if (!\is_object($zval[self::VALUE]) && !\is_array($zval[self::VALUE])) {
+            throw new UnexpectedTypeException($zval[self::VALUE], $propertyPath, 0);
+        }
+
+        // Add the root object to the list
+        $propertyValues = [$zval];
+
+        for ($i = 0; $i < $lastIndex; ++$i) {
+            $property = $propertyPath->getElement($i);
+            $isIndex = $propertyPath->isIndex($i);
+            $isNullSafe = $propertyPath->isNullSafe($i);
+
+            if ($isIndex) {
+                // Create missing nested arrays on demand
+                if (($zval[self::VALUE] instanceof \ArrayAccess && !$zval[self::VALUE]->offsetExists($property))
+                    || (\is_array($zval[self::VALUE]) && !isset($zval[self::VALUE][$property]) && !\array_key_exists($property, $zval[self::VALUE]))
+                ) {
+                    if (!$ignoreInvalidIndices && !$isNullSafe) {
+                        if (!\is_array($zval[self::VALUE])) {
+                            if (!$zval[self::VALUE] instanceof \Traversable) {
+                                throw new NoSuchIndexException(\sprintf('Cannot read index "%s" while trying to traverse path "%s".', $property, (string) $propertyPath));
+                            }
+
+                            $zval[self::VALUE] = iterator_to_array($zval[self::VALUE]);
+                        }
+
+                        throw new NoSuchIndexException(\sprintf('Cannot read index "%s" while trying to traverse path "%s". Available indices are "%s".', $property, (string) $propertyPath, print_r(array_keys($zval[self::VALUE]), true)));
+                    }
+
+                    if ($i + 1 < $propertyPath->getLength()) {
+                        if (isset($zval[self::REF])) {
+                            $zval[self::VALUE][$property] = [];
+                            $zval[self::REF] = $zval[self::VALUE];
+                        } else {
+                            $zval[self::VALUE] = [$property => []];
+                        }
+                    }
+                }
+
+                $zval = $this->readIndex($zval, $property);
+            } elseif ($isNullSafe && !\is_object($zval[self::VALUE])) {
+                $zval[self::VALUE] = null;
+            } else {
+                $zval = $this->readProperty($zval, $property, $this->ignoreInvalidProperty, $isNullSafe);
+            }
+
+            // the final value of the path must not be validated
+            if ($i + 1 < $propertyPath->getLength() && !\is_object($zval[self::VALUE]) && !\is_array($zval[self::VALUE]) && !$isNullSafe) {
+                throw new UnexpectedTypeException($zval[self::VALUE], $propertyPath, $i + 1);
+            }
+
+            if (isset($zval[self::REF]) && (0 === $i || isset($propertyValues[$i - 1][self::IS_REF_CHAINED]))) {
+                // Set the IS_REF_CHAINED flag to true if:
+                // current property is passed by reference and
+                // it is the first element in the property path or
+                // the IS_REF_CHAINED flag of its parent element is true
+                // Basically, this flag is true only when the reference chain from the top element to current element is not broken
+                $zval[self::IS_REF_CHAINED] = true;
+            }
+
+            $propertyValues[] = $zval;
+
+            if ($isNullSafe && null === $zval[self::VALUE]) {
+                break;
+            }
+        }
+
+        return $propertyValues;
+    }
+
+    /**
+     * Reads a key from an array-like structure.
+     *
+     * @throws NoSuchIndexException If the array does not implement \ArrayAccess or it is not an array
+     */
+    private function readIndex(array $zval, string|int $index): array
+    {
+        if (!$zval[self::VALUE] instanceof \ArrayAccess && !\is_array($zval[self::VALUE])) {
+            throw new NoSuchIndexException(\sprintf('Cannot read index "%s" from object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_debug_type($zval[self::VALUE])));
+        }
+
+        $result = self::RESULT_PROTO;
+
+        if (isset($zval[self::VALUE][$index])) {
+            $result[self::VALUE] = $zval[self::VALUE][$index];
+
+            if (!isset($zval[self::REF])) {
+                // Save creating references when doing read-only lookups
+            } elseif (\is_array($zval[self::VALUE])) {
+                $result[self::REF] = &$zval[self::REF][$index];
+            } elseif (\is_object($result[self::VALUE])) {
+                $result[self::REF] = $result[self::VALUE];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Reads the value of a property from an object.
+     *
+     * @throws NoSuchPropertyException If $ignoreInvalidProperty is false and the property does not exist or is not public
+     */
+    private function readProperty(array $zval, string $property, bool $ignoreInvalidProperty = false, bool $isNullSafe = false): array
+    {
+        if (!\is_object($zval[self::VALUE])) {
+            throw new NoSuchPropertyException(\sprintf('Cannot read property "%s" from an array. Maybe you intended to write the property path as "[%1$s]" instead.', $property));
+        }
+
+        $result = self::RESULT_PROTO;
+        $object = $zval[self::VALUE];
+        $class = $object::class;
+        $access = $this->getReadInfo($class, $property);
+
+        if (null !== $access) {
+            $name = $access->getName();
+            $type = $access->getType();
+
+            try {
+                if (PropertyReadInfo::TYPE_METHOD === $type) {
+                    try {
+                        $result[self::VALUE] = $object->$name();
+                    } catch (\TypeError $e) {
+                        [$trace] = $e->getTrace();
+
+                        // handle uninitialized properties in PHP >= 7
+                        if (__FILE__ === ($trace['file'] ?? null)
+                            && $name === $trace['function']
+                            && $object instanceof $trace['class']
+                            && preg_match('/Return value (?:of .*::\w+\(\) )?must be of (?:the )?type (\w+), null returned$/', $e->getMessage(), $matches)
+                        ) {
+                            throw new UninitializedPropertyException(\sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Did you forget to initialize a property or to make the return type nullable using "?%3$s"?', get_debug_type($object), $name, $matches[1]), 0, $e);
+                        }
+
+                        throw $e;
+                    }
+                } elseif (PropertyReadInfo::TYPE_PROPERTY === $type) {
+                    if (!isset($object->$name) && !\array_key_exists($name, (array) $object)) {
+                        try {
+                            $r = new \ReflectionProperty($class, $name);
+
+                            if ($r->isPublic() && !$r->hasType()) {
+                                throw new UninitializedPropertyException(\sprintf('The property "%s::$%s" is not initialized.', $class, $name));
+                            }
+                        } catch (\ReflectionException $e) {
+                            if (!$ignoreInvalidProperty) {
+                                throw new NoSuchPropertyException(\sprintf('Can\'t get a way to read the property "%s" in class "%s".', $property, $class));
+                            }
+                        }
+                    }
+
+                    $result[self::VALUE] = $object->$name;
+
+                    if (isset($zval[self::REF]) && $access->canBeReference()) {
+                        $result[self::REF] = &$object->$name;
+                    }
+                }
+            } catch (\Error $e) {
+                // handle uninitialized properties in PHP >= 7.4
+                if (preg_match('/^Typed property ([\w\\\\@]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches) || preg_match('/^Cannot access uninitialized non-nullable property ([\w\\\\@]+)::\$(\w+) by reference$/', $e->getMessage(), $matches)) {
+                    $r = new \ReflectionProperty(str_contains($matches[1], '@anonymous') ? $class : $matches[1], $matches[2]);
+                    $type = ($type = $r->getType()) instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
+
+                    throw new UninitializedPropertyException(\sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $matches[1], $r->getName(), $type), 0, $e);
+                }
+
+                throw $e;
+            }
+        } elseif (property_exists($object, $property) && \array_key_exists($property, (array) $object)) {
+            $result[self::VALUE] = $object->$property;
+            if (isset($zval[self::REF])) {
+                $result[self::REF] = &$object->$property;
+            }
+        } elseif ($isNullSafe) {
+            $result[self::VALUE] = null;
+        } elseif (!$ignoreInvalidProperty) {
+            throw new NoSuchPropertyException(\sprintf('Can\'t get a way to read the property "%s" in class "%s".', $property, $class));
+        }
+
+        // Objects are always passed around by reference
+        if (isset($zval[self::REF]) && \is_object($result[self::VALUE])) {
+            $result[self::REF] = $result[self::VALUE];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Guesses how to read the property value.
+     */
+    private function getReadInfo(string $class, string $property): ?PropertyReadInfo
+    {
+        $key = str_replace('\\', '.', $class).'..'.$property;
+
+        if (isset($this->readPropertyCache[$key])) {
+            return $this->readPropertyCache[$key];
+        }
+
+        if ($this->cacheItemPool) {
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_READ.rawurlencode($key));
+            if ($item->isHit()) {
+                return $this->readPropertyCache[$key] = $item->get();
+            }
+        }
+
+        $accessor = $this->readInfoExtractor->getReadInfo($class, $property, [
+            'enable_getter_setter_extraction' => true,
+            'enable_magic_methods_extraction' => $this->magicMethodsFlags,
+            'enable_constructor_extraction' => false,
+        ]);
+
+        if (isset($item)) {
+            $this->cacheItemPool->save($item->set($accessor));
+        }
+
+        return $this->readPropertyCache[$key] = $accessor;
+    }
+
+    /**
+     * Sets the value of an index in a given array-accessible value.
+     *
+     * @throws NoSuchIndexException If the array does not implement \ArrayAccess or it is not an array
+     */
+    private function writeIndex(array $zval, string|int $index, mixed $value): void
+    {
+        if (!$zval[self::VALUE] instanceof \ArrayAccess && !\is_array($zval[self::VALUE])) {
+            throw new NoSuchIndexException(\sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_debug_type($zval[self::VALUE])));
+        }
+
+        $zval[self::REF][$index] = $value;
+    }
+
+    /**
+     * Sets the value of a property in the given object.
+     *
+     * @throws NoSuchPropertyException if the property does not exist or is not public
+     */
+    private function writeProperty(array $zval, string $property, mixed $value, bool $recursive = false): void
+    {
+        if (!\is_object($zval[self::VALUE])) {
+            throw new NoSuchPropertyException(\sprintf('Cannot write property "%s" to an array. Maybe you should write the property path as "[%1$s]" instead?', $property));
+        }
+
+        $object = $zval[self::VALUE];
+        $class = $object::class;
+        $mutator = $this->getWriteInfo($class, $property, $value);
+
+        try {
+            if (PropertyWriteInfo::TYPE_NONE !== $mutator->getType()) {
+                $type = $mutator->getType();
+
+                if (PropertyWriteInfo::TYPE_METHOD === $type) {
+                    $object->{$mutator->getName()}($value);
+                } elseif (PropertyWriteInfo::TYPE_PROPERTY === $type) {
+                    $object->{$mutator->getName()} = $value;
+                } elseif (PropertyWriteInfo::TYPE_ADDER_AND_REMOVER === $type) {
+                    $this->writeCollection($zval, $property, $value, $mutator->getAdderInfo(), $mutator->getRemoverInfo());
+                }
+            } elseif ($object instanceof \stdClass && property_exists($object, $property)) {
+                $object->$property = $value;
+            } elseif (!$this->ignoreInvalidProperty) {
+                if ($mutator->hasErrors()) {
+                    throw new NoSuchPropertyException(implode('. ', $mutator->getErrors()).'.');
+                }
+
+                throw new NoSuchPropertyException(\sprintf('Could not determine access type for property "%s" in class "%s".', $property, get_debug_type($object)));
+            }
+        } catch (\TypeError $e) {
+            if ($recursive || !$value instanceof \DateTimeInterface || !\in_array($value::class, ['DateTime', 'DateTimeImmutable'], true) || __FILE__ !== ($e->getTrace()[0]['file'] ?? null)) {
+                throw $e;
+            }
+
+            $value = $value instanceof \DateTimeImmutable ? \DateTime::createFromImmutable($value) : \DateTimeImmutable::createFromMutable($value);
+            try {
+                $this->writeProperty($zval, $property, $value, true);
+            } catch (\TypeError) {
+                throw $e; // throw the previous error
+            }
+        }
+    }
+
+    /**
+     * Adjusts a collection-valued property by calling add*() and remove*() methods.
+     */
+    private function writeCollection(array $zval, string $property, iterable $collection, PropertyWriteInfo $addMethod, PropertyWriteInfo $removeMethod): void
+    {
+        // At this point the add and remove methods have been found
+        $previousValue = $this->readProperty($zval, $property);
+        $previousValue = $previousValue[self::VALUE];
+
+        $removeMethodName = $removeMethod->getName();
+        $addMethodName = $addMethod->getName();
+
+        if ($previousValue instanceof \Traversable) {
+            $previousValue = iterator_to_array($previousValue);
+        }
+        if ($previousValue && \is_array($previousValue)) {
+            if (\is_object($collection)) {
+                $collection = iterator_to_array($collection);
+            }
+            foreach ($previousValue as $key => $item) {
+                if (!\in_array($item, $collection, true)) {
+                    unset($previousValue[$key]);
+                    $zval[self::VALUE]->$removeMethodName($item);
+                }
+            }
+        } else {
+            $previousValue = false;
+        }
+
+        foreach ($collection as $item) {
+            if (!$previousValue || !\in_array($item, $previousValue, true)) {
+                $zval[self::VALUE]->$addMethodName($item);
+            }
+        }
+    }
+
+    private function getWriteInfo(string $class, string $property, mixed $value): PropertyWriteInfo
+    {
+        $useAdderAndRemover = is_iterable($value);
+        $key = str_replace('\\', '.', $class).'..'.$property.'..'.(int) $useAdderAndRemover;
+
+        if (isset($this->writePropertyCache[$key])) {
+            return $this->writePropertyCache[$key];
+        }
+
+        if ($this->cacheItemPool) {
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_WRITE.rawurlencode($key));
+            if ($item->isHit()) {
+                return $this->writePropertyCache[$key] = $item->get();
+            }
+        }
+
+        $mutator = $this->writeInfoExtractor->getWriteInfo($class, $property, [
+            'enable_getter_setter_extraction' => true,
+            'enable_magic_methods_extraction' => $this->magicMethodsFlags,
+            'enable_constructor_extraction' => false,
+            'enable_adder_remover_extraction' => $useAdderAndRemover,
+        ]);
+
+        if (isset($item)) {
+            $this->cacheItemPool->save($item->set($mutator));
+        }
+
+        return $this->writePropertyCache[$key] = $mutator;
+    }
+
+    /**
+     * Returns whether a property is writable in the given object.
+     */
+    private function isPropertyWritable(object $object, string $property): bool
+    {
+        if ($object instanceof \stdClass && property_exists($object, $property)) {
+            return true;
+        }
+
+        $mutatorForArray = $this->getWriteInfo($object::class, $property, []);
+        if (PropertyWriteInfo::TYPE_PROPERTY === $mutatorForArray->getType()) {
+            return 'public' === $mutatorForArray->getVisibility();
+        }
+
+        if (PropertyWriteInfo::TYPE_NONE !== $mutatorForArray->getType()) {
+            return true;
+        }
+
+        $mutator = $this->getWriteInfo($object::class, $property, '');
+
+        return PropertyWriteInfo::TYPE_NONE !== $mutator->getType();
+    }
+
+    /**
+     * Gets a PropertyPath instance and caches it.
+     */
+    private function getPropertyPath(string|PropertyPath $propertyPath): PropertyPath
+    {
+        if ($propertyPath instanceof PropertyPathInterface) {
+            // Don't call the copy constructor has it is not needed here
+            return $propertyPath;
+        }
+
+        if (isset($this->propertyPathCache[$propertyPath])) {
+            return $this->propertyPathCache[$propertyPath];
+        }
+
+        if ($this->cacheItemPool) {
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.rawurlencode($propertyPath));
+            if ($item->isHit()) {
+                return $this->propertyPathCache[$propertyPath] = $item->get();
+            }
+        }
+
+        $propertyPathInstance = new PropertyPath($propertyPath);
+        if (isset($item)) {
+            $item->set($propertyPathInstance);
+            $this->cacheItemPool->save($item);
+        }
+
+        return $this->propertyPathCache[$propertyPath] = $propertyPathInstance;
+    }
+
+    /**
+     * Creates the APCu adapter if applicable.
+     *
+     * @throws \LogicException When the Cache Component isn't available
+     */
+    public static function createCache(string $namespace, int $defaultLifetime, string $version, ?LoggerInterface $logger = null): AdapterInterface
+    {
+        if (!class_exists(ApcuAdapter::class)) {
+            throw new \LogicException(\sprintf('The Symfony Cache component must be installed to use "%s()".', __METHOD__));
+        }
+
+        if (!ApcuAdapter::isSupported()) {
+            return new NullAdapter();
+        }
+
+        $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
+        if ('cli' === \PHP_SAPI && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOL)) {
+            $apcu->setLogger(new NullLogger());
+        } elseif (null !== $logger) {
+            $apcu->setLogger($logger);
+        }
+
+        return $apcu;
+    }
+}
diff --git a/symfony/property-access/PropertyAccessorBuilder.php b/symfony/property-access/PropertyAccessorBuilder.php
new file mode 100644
index 000000000..30e3ab812
--- /dev/null
+++ b/symfony/property-access/PropertyAccessorBuilder.php
@@ -0,0 +1,291 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
+
+/**
+ * A configurable builder to create a PropertyAccessor.
+ *
+ * @author Jérémie Augustin <jeremie.augustin@pixel-cookers.com>
+ */
+class PropertyAccessorBuilder
+{
+    private int $magicMethods = PropertyAccessor::MAGIC_GET | PropertyAccessor::MAGIC_SET;
+    private bool $throwExceptionOnInvalidIndex = false;
+    private bool $throwExceptionOnInvalidPropertyPath = true;
+    private ?CacheItemPoolInterface $cacheItemPool = null;
+    private ?PropertyReadInfoExtractorInterface $readInfoExtractor = null;
+    private ?PropertyWriteInfoExtractorInterface $writeInfoExtractor = null;
+
+    /**
+     * Enables the use of all magic methods by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function enableMagicMethods(): static
+    {
+        $this->magicMethods = PropertyAccessor::MAGIC_GET | PropertyAccessor::MAGIC_SET | PropertyAccessor::MAGIC_CALL;
+
+        return $this;
+    }
+
+    /**
+     * Disable the use of all magic methods by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function disableMagicMethods(): static
+    {
+        $this->magicMethods = PropertyAccessor::DISALLOW_MAGIC_METHODS;
+
+        return $this;
+    }
+
+    /**
+     * Enables the use of "__call" by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function enableMagicCall(): static
+    {
+        $this->magicMethods |= PropertyAccessor::MAGIC_CALL;
+
+        return $this;
+    }
+
+    /**
+     * Enables the use of "__get" by the PropertyAccessor.
+     */
+    public function enableMagicGet(): self
+    {
+        $this->magicMethods |= PropertyAccessor::MAGIC_GET;
+
+        return $this;
+    }
+
+    /**
+     * Enables the use of "__set" by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function enableMagicSet(): static
+    {
+        $this->magicMethods |= PropertyAccessor::MAGIC_SET;
+
+        return $this;
+    }
+
+    /**
+     * Disables the use of "__call" by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function disableMagicCall(): static
+    {
+        $this->magicMethods &= ~PropertyAccessor::MAGIC_CALL;
+
+        return $this;
+    }
+
+    /**
+     * Disables the use of "__get" by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function disableMagicGet(): static
+    {
+        $this->magicMethods &= ~PropertyAccessor::MAGIC_GET;
+
+        return $this;
+    }
+
+    /**
+     * Disables the use of "__set" by the PropertyAccessor.
+     *
+     * @return $this
+     */
+    public function disableMagicSet(): static
+    {
+        $this->magicMethods &= ~PropertyAccessor::MAGIC_SET;
+
+        return $this;
+    }
+
+    /**
+     * @return bool whether the use of "__call" by the PropertyAccessor is enabled
+     */
+    public function isMagicCallEnabled(): bool
+    {
+        return $this->magicMethods & PropertyAccessor::MAGIC_CALL;
+    }
+
+    /**
+     * @return bool whether the use of "__get" by the PropertyAccessor is enabled
+     */
+    public function isMagicGetEnabled(): bool
+    {
+        return $this->magicMethods & PropertyAccessor::MAGIC_GET;
+    }
+
+    /**
+     * @return bool whether the use of "__set" by the PropertyAccessor is enabled
+     */
+    public function isMagicSetEnabled(): bool
+    {
+        return $this->magicMethods & PropertyAccessor::MAGIC_SET;
+    }
+
+    /**
+     * Enables exceptions when reading a non-existing index.
+     *
+     * This has no influence on writing non-existing indices with PropertyAccessorInterface::setValue()
+     * which are always created on-the-fly.
+     *
+     * @return $this
+     */
+    public function enableExceptionOnInvalidIndex(): static
+    {
+        $this->throwExceptionOnInvalidIndex = true;
+
+        return $this;
+    }
+
+    /**
+     * Disables exceptions when reading a non-existing index.
+     *
+     * Instead, null is returned when calling PropertyAccessorInterface::getValue() on a non-existing index.
+     *
+     * @return $this
+     */
+    public function disableExceptionOnInvalidIndex(): static
+    {
+        $this->throwExceptionOnInvalidIndex = false;
+
+        return $this;
+    }
+
+    /**
+     * @return bool whether an exception is thrown or null is returned when reading a non-existing index
+     */
+    public function isExceptionOnInvalidIndexEnabled(): bool
+    {
+        return $this->throwExceptionOnInvalidIndex;
+    }
+
+    /**
+     * Enables exceptions when reading a non-existing property.
+     *
+     * This has no influence on writing non-existing indices with PropertyAccessorInterface::setValue()
+     * which are always created on-the-fly.
+     *
+     * @return $this
+     */
+    public function enableExceptionOnInvalidPropertyPath(): static
+    {
+        $this->throwExceptionOnInvalidPropertyPath = true;
+
+        return $this;
+    }
+
+    /**
+     * Disables exceptions when reading a non-existing index.
+     *
+     * Instead, null is returned when calling PropertyAccessorInterface::getValue() on a non-existing index.
+     *
+     * @return $this
+     */
+    public function disableExceptionOnInvalidPropertyPath(): static
+    {
+        $this->throwExceptionOnInvalidPropertyPath = false;
+
+        return $this;
+    }
+
+    /**
+     * @return bool whether an exception is thrown or null is returned when reading a non-existing property
+     */
+    public function isExceptionOnInvalidPropertyPath(): bool
+    {
+        return $this->throwExceptionOnInvalidPropertyPath;
+    }
+
+    /**
+     * Sets a cache system.
+     *
+     * @return $this
+     */
+    public function setCacheItemPool(?CacheItemPoolInterface $cacheItemPool): static
+    {
+        $this->cacheItemPool = $cacheItemPool;
+
+        return $this;
+    }
+
+    /**
+     * Gets the used cache system.
+     */
+    public function getCacheItemPool(): ?CacheItemPoolInterface
+    {
+        return $this->cacheItemPool;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setReadInfoExtractor(?PropertyReadInfoExtractorInterface $readInfoExtractor): static
+    {
+        $this->readInfoExtractor = $readInfoExtractor;
+
+        return $this;
+    }
+
+    public function getReadInfoExtractor(): ?PropertyReadInfoExtractorInterface
+    {
+        return $this->readInfoExtractor;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setWriteInfoExtractor(?PropertyWriteInfoExtractorInterface $writeInfoExtractor): static
+    {
+        $this->writeInfoExtractor = $writeInfoExtractor;
+
+        return $this;
+    }
+
+    public function getWriteInfoExtractor(): ?PropertyWriteInfoExtractorInterface
+    {
+        return $this->writeInfoExtractor;
+    }
+
+    /**
+     * Builds and returns a new PropertyAccessor object.
+     */
+    public function getPropertyAccessor(): PropertyAccessorInterface
+    {
+        $throw = PropertyAccessor::DO_NOT_THROW;
+
+        if ($this->throwExceptionOnInvalidIndex) {
+            $throw |= PropertyAccessor::THROW_ON_INVALID_INDEX;
+        }
+
+        if ($this->throwExceptionOnInvalidPropertyPath) {
+            $throw |= PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH;
+        }
+
+        return new PropertyAccessor($this->magicMethods, $throw, $this->cacheItemPool, $this->readInfoExtractor, $this->writeInfoExtractor);
+    }
+}
diff --git a/symfony/property-access/PropertyAccessorInterface.php b/symfony/property-access/PropertyAccessorInterface.php
new file mode 100644
index 000000000..ccbaf8b3c
--- /dev/null
+++ b/symfony/property-access/PropertyAccessorInterface.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+/**
+ * Writes and reads values to/from an object/array graph.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+interface PropertyAccessorInterface
+{
+    /**
+     * Sets the value at the end of the property path of the object graph.
+     *
+     * Example:
+     *
+     *     use Symfony\Component\PropertyAccess\PropertyAccess;
+     *
+     *     $propertyAccessor = PropertyAccess::createPropertyAccessor();
+     *
+     *     echo $propertyAccessor->setValue($object, 'child.name', 'Fabien');
+     *     // equals echo $object->getChild()->setName('Fabien');
+     *
+     * This method first tries to find a public setter for each property in the
+     * path. The name of the setter must be the camel-cased property name
+     * prefixed with "set".
+     *
+     * If the setter does not exist, this method tries to find a public
+     * property. The value of the property is then changed.
+     *
+     * If neither is found, an exception is thrown.
+     *
+     * @template T of object|array
+     *
+     * @param T $objectOrArray
+     *
+     * @param-out ($objectOrArray is array ? array : T) $objectOrArray
+     *
+     * @throws Exception\InvalidArgumentException If the property path is invalid
+     * @throws Exception\AccessException          If a property/index does not exist or is not public
+     * @throws Exception\UnexpectedTypeException  If a value within the path is neither object nor array
+     */
+    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void;
+
+    /**
+     * Returns the value at the end of the property path of the object graph.
+     *
+     * Example:
+     *
+     *     use Symfony\Component\PropertyAccess\PropertyAccess;
+     *
+     *     $propertyAccessor = PropertyAccess::createPropertyAccessor();
+     *
+     *     echo $propertyAccessor->getValue($object, 'child.name');
+     *     // equals echo $object->getChild()->getName();
+     *
+     * This method first tries to find a public getter for each property in the
+     * path. The name of the getter must be the camel-cased property name
+     * prefixed with "get", "is", or "has".
+     *
+     * If the getter does not exist, this method tries to find a public
+     * property. The value of the property is then returned.
+     *
+     * If none of them are found, an exception is thrown.
+     *
+     * @throws Exception\InvalidArgumentException If the property path is invalid
+     * @throws Exception\AccessException          If a property/index does not exist or is not public
+     * @throws Exception\UnexpectedTypeException  If a value within the path is neither object
+     *                                            nor array
+     */
+    public function getValue(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): mixed;
+
+    /**
+     * Returns whether a value can be written at a given property path.
+     *
+     * Whenever this method returns true, {@link setValue()} is guaranteed not
+     * to throw an exception when called with the same arguments.
+     *
+     * @throws Exception\InvalidArgumentException If the property path is invalid
+     */
+    public function isWritable(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): bool;
+
+    /**
+     * Returns whether a property path can be read from an object graph.
+     *
+     * Whenever this method returns true, {@link getValue()} is guaranteed not
+     * to throw an exception when called with the same arguments.
+     *
+     * @throws Exception\InvalidArgumentException If the property path is invalid
+     */
+    public function isReadable(object|array $objectOrArray, string|PropertyPathInterface $propertyPath): bool;
+}
diff --git a/symfony/property-access/PropertyPath.php b/symfony/property-access/PropertyPath.php
new file mode 100644
index 000000000..5cb437661
--- /dev/null
+++ b/symfony/property-access/PropertyPath.php
@@ -0,0 +1,205 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
+use Symfony\Component\PropertyAccess\Exception\OutOfBoundsException;
+
+/**
+ * Default implementation of {@link PropertyPathInterface}.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @implements \IteratorAggregate<int, string>
+ */
+class PropertyPath implements \IteratorAggregate, PropertyPathInterface
+{
+    /**
+     * Character used for separating between plural and singular of an element.
+     */
+    public const SINGULAR_SEPARATOR = '|';
+
+    /**
+     * The elements of the property path.
+     *
+     * @var list<string>
+     */
+    private array $elements = [];
+
+    /**
+     * The number of elements in the property path.
+     */
+    private int $length;
+
+    /**
+     * Contains a Boolean for each property in $elements denoting whether this
+     * element is an index. It is a property otherwise.
+     *
+     * @var array<bool>
+     */
+    private array $isIndex = [];
+
+    /**
+     * Contains a Boolean for each property in $elements denoting whether this
+     * element is optional or not.
+     *
+     * @var array<bool>
+     */
+    private array $isNullSafe = [];
+
+    /**
+     * String representation of the path.
+     */
+    private string $pathAsString;
+
+    /**
+     * Constructs a property path from a string.
+     *
+     * @throws InvalidArgumentException     If the given path is not a string
+     * @throws InvalidPropertyPathException If the syntax of the property path is not valid
+     */
+    public function __construct(self|string $propertyPath)
+    {
+        // Can be used as copy constructor
+        if ($propertyPath instanceof self) {
+            $this->elements = $propertyPath->elements;
+            $this->length = $propertyPath->length;
+            $this->isIndex = $propertyPath->isIndex;
+            $this->isNullSafe = $propertyPath->isNullSafe;
+            $this->pathAsString = $propertyPath->pathAsString;
+
+            return;
+        }
+
+        if ('' === $propertyPath) {
+            throw new InvalidPropertyPathException('The property path should not be empty.');
+        }
+
+        $this->pathAsString = $propertyPath;
+        $position = 0;
+        $remaining = $propertyPath;
+
+        // first element is evaluated differently - no leading dot for properties
+        $pattern = '/^(((?:[^\\\\.\[]|\\\\.)++)|\[([^\]]++)\])(.*)/';
+
+        while (preg_match($pattern, $remaining, $matches)) {
+            if ('' !== $matches[2]) {
+                $element = $matches[2];
+                $this->isIndex[] = false;
+            } else {
+                $element = $matches[3];
+                $this->isIndex[] = true;
+            }
+
+            // Mark as optional when last character is "?".
+            if (str_ends_with($element, '?')) {
+                $this->isNullSafe[] = true;
+                $element = substr($element, 0, -1);
+            } else {
+                $this->isNullSafe[] = false;
+            }
+
+            $element = preg_replace('/\\\([.[])/', '$1', $element);
+            if (str_ends_with($element, '\\\\')) {
+                $element = substr($element, 0, -1);
+            }
+            $this->elements[] = $element;
+
+            $position += \strlen($matches[1]);
+            $remaining = $matches[4];
+            $pattern = '/^(\.((?:[^\\\\.\[]|\\\\.)++)|\[([^\]]++)\])(.*)/';
+        }
+
+        if ('' !== $remaining) {
+            throw new InvalidPropertyPathException(\sprintf('Could not parse property path "%s". Unexpected token "%s" at position %d.', $propertyPath, $remaining[0], $position));
+        }
+
+        $this->length = \count($this->elements);
+    }
+
+    public function __toString(): string
+    {
+        return $this->pathAsString;
+    }
+
+    public function getLength(): int
+    {
+        return $this->length;
+    }
+
+    public function getParent(): ?PropertyPathInterface
+    {
+        if ($this->length <= 1) {
+            return null;
+        }
+
+        $parent = clone $this;
+
+        --$parent->length;
+        $parent->pathAsString = substr($parent->pathAsString, 0, max(strrpos($parent->pathAsString, '.'), strrpos($parent->pathAsString, '[')));
+        array_pop($parent->elements);
+        array_pop($parent->isIndex);
+        array_pop($parent->isNullSafe);
+
+        return $parent;
+    }
+
+    /**
+     * Returns a new iterator for this path.
+     */
+    public function getIterator(): PropertyPathIteratorInterface
+    {
+        return new PropertyPathIterator($this);
+    }
+
+    public function getElements(): array
+    {
+        return $this->elements;
+    }
+
+    public function getElement(int $index): string
+    {
+        if (!isset($this->elements[$index])) {
+            throw new OutOfBoundsException(\sprintf('The index "%s" is not within the property path.', $index));
+        }
+
+        return $this->elements[$index];
+    }
+
+    public function isProperty(int $index): bool
+    {
+        if (!isset($this->isIndex[$index])) {
+            throw new OutOfBoundsException(\sprintf('The index "%s" is not within the property path.', $index));
+        }
+
+        return !$this->isIndex[$index];
+    }
+
+    public function isIndex(int $index): bool
+    {
+        if (!isset($this->isIndex[$index])) {
+            throw new OutOfBoundsException(\sprintf('The index "%s" is not within the property path.', $index));
+        }
+
+        return $this->isIndex[$index];
+    }
+
+    public function isNullSafe(int $index): bool
+    {
+        if (!isset($this->isNullSafe[$index])) {
+            throw new OutOfBoundsException(\sprintf('The index "%s" is not within the property path.', $index));
+        }
+
+        return $this->isNullSafe[$index];
+    }
+}
diff --git a/symfony/property-access/PropertyPathBuilder.php b/symfony/property-access/PropertyPathBuilder.php
new file mode 100644
index 000000000..4c40c689a
--- /dev/null
+++ b/symfony/property-access/PropertyPathBuilder.php
@@ -0,0 +1,261 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+use Symfony\Component\PropertyAccess\Exception\OutOfBoundsException;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class PropertyPathBuilder
+{
+    private array $elements = [];
+    private array $isIndex = [];
+
+    public function __construct(PropertyPathInterface|string|null $path = null)
+    {
+        if (null !== $path) {
+            $this->append($path);
+        }
+    }
+
+    /**
+     * Appends a (sub-) path to the current path.
+     *
+     * @param int $offset The offset where the appended piece starts in $path
+     * @param int $length The length of the appended piece; if 0, the full path is appended
+     */
+    public function append(PropertyPathInterface|string $path, int $offset = 0, int $length = 0): void
+    {
+        if (\is_string($path)) {
+            $path = new PropertyPath($path);
+        }
+
+        if (0 === $length) {
+            $end = $path->getLength();
+        } else {
+            $end = $offset + $length;
+        }
+
+        for (; $offset < $end; ++$offset) {
+            $this->elements[] = $path->getElement($offset);
+            $this->isIndex[] = $path->isIndex($offset);
+        }
+    }
+
+    /**
+     * Appends an index element to the current path.
+     */
+    public function appendIndex(string $name): void
+    {
+        $this->elements[] = $name;
+        $this->isIndex[] = true;
+    }
+
+    /**
+     * Appends a property element to the current path.
+     */
+    public function appendProperty(string $name): void
+    {
+        $this->elements[] = $name;
+        $this->isIndex[] = false;
+    }
+
+    /**
+     * Removes elements from the current path.
+     *
+     * @throws OutOfBoundsException if offset is invalid
+     */
+    public function remove(int $offset, int $length = 1): void
+    {
+        if (!isset($this->elements[$offset])) {
+            throw new OutOfBoundsException(\sprintf('The offset "%s" is not within the property path.', $offset));
+        }
+
+        $this->resize($offset, $length, 0);
+    }
+
+    /**
+     * Replaces a sub-path by a different (sub-) path.
+     *
+     * @param int $pathOffset The offset where the inserted piece starts in $path
+     * @param int $pathLength The length of the inserted piece; if 0, the full path is inserted
+     *
+     * @throws OutOfBoundsException If the offset is invalid
+     */
+    public function replace(int $offset, int $length, PropertyPathInterface|string $path, int $pathOffset = 0, int $pathLength = 0): void
+    {
+        if (\is_string($path)) {
+            $path = new PropertyPath($path);
+        }
+
+        if ($offset < 0 && abs($offset) <= $this->getLength()) {
+            $offset = $this->getLength() + $offset;
+        } elseif (!isset($this->elements[$offset])) {
+            throw new OutOfBoundsException('The offset '.$offset.' is not within the property path');
+        }
+
+        if (0 === $pathLength) {
+            $pathLength = $path->getLength() - $pathOffset;
+        }
+
+        $this->resize($offset, $length, $pathLength);
+
+        for ($i = 0; $i < $pathLength; ++$i) {
+            $this->elements[$offset + $i] = $path->getElement($pathOffset + $i);
+            $this->isIndex[$offset + $i] = $path->isIndex($pathOffset + $i);
+        }
+        ksort($this->elements);
+    }
+
+    /**
+     * Replaces a property element by an index element.
+     *
+     * @throws OutOfBoundsException If the offset is invalid
+     */
+    public function replaceByIndex(int $offset, ?string $name = null): void
+    {
+        if (!isset($this->elements[$offset])) {
+            throw new OutOfBoundsException(\sprintf('The offset "%s" is not within the property path.', $offset));
+        }
+
+        if (null !== $name) {
+            $this->elements[$offset] = $name;
+        }
+
+        $this->isIndex[$offset] = true;
+    }
+
+    /**
+     * Replaces an index element by a property element.
+     *
+     * @throws OutOfBoundsException If the offset is invalid
+     */
+    public function replaceByProperty(int $offset, ?string $name = null): void
+    {
+        if (!isset($this->elements[$offset])) {
+            throw new OutOfBoundsException(\sprintf('The offset "%s" is not within the property path.', $offset));
+        }
+
+        if (null !== $name) {
+            $this->elements[$offset] = $name;
+        }
+
+        $this->isIndex[$offset] = false;
+    }
+
+    /**
+     * Returns the length of the current path.
+     */
+    public function getLength(): int
+    {
+        return \count($this->elements);
+    }
+
+    /**
+     * Returns the current property path.
+     */
+    public function getPropertyPath(): ?PropertyPathInterface
+    {
+        $pathAsString = $this->__toString();
+
+        return '' !== $pathAsString ? new PropertyPath($pathAsString) : null;
+    }
+
+    /**
+     * Returns the current property path as string.
+     */
+    public function __toString(): string
+    {
+        $string = '';
+
+        foreach ($this->elements as $offset => $element) {
+            if ($this->isIndex[$offset]) {
+                $element = '['.$element.']';
+            } elseif ('' !== $string) {
+                $string .= '.';
+            }
+
+            $string .= $element;
+        }
+
+        return $string;
+    }
+
+    /**
+     * Resizes the path so that a chunk of length $cutLength is
+     * removed at $offset and another chunk of length $insertionLength
+     * can be inserted.
+     */
+    private function resize(int $offset, int $cutLength, int $insertionLength): void
+    {
+        // Nothing else to do in this case
+        if ($insertionLength === $cutLength) {
+            return;
+        }
+
+        $length = \count($this->elements);
+
+        if ($cutLength > $insertionLength) {
+            // More elements should be removed than inserted
+            $diff = $cutLength - $insertionLength;
+            $newLength = $length - $diff;
+
+            // Shift elements to the left (left-to-right until the new end)
+            // Max allowed offset to be shifted is such that
+            // $offset + $diff < $length (otherwise invalid index access)
+            // i.e. $offset < $length - $diff = $newLength
+            for ($i = $offset; $i < $newLength; ++$i) {
+                $this->elements[$i] = $this->elements[$i + $diff];
+                $this->isIndex[$i] = $this->isIndex[$i + $diff];
+            }
+
+            // All remaining elements should be removed
+            $this->elements = \array_slice($this->elements, 0, $i);
+            $this->isIndex = \array_slice($this->isIndex, 0, $i);
+        } else {
+            $diff = $insertionLength - $cutLength;
+
+            $newLength = $length + $diff;
+            $indexAfterInsertion = $offset + $insertionLength;
+
+            // $diff <= $insertionLength
+            // $indexAfterInsertion >= $insertionLength
+            // => $diff <= $indexAfterInsertion
+
+            // In each of the following loops, $i >= $diff must hold,
+            // otherwise ($i - $diff) becomes negative.
+
+            // Shift old elements to the right to make up space for the
+            // inserted elements. This needs to be done left-to-right in
+            // order to preserve an ascending array index order
+            // Since $i = max($length, $indexAfterInsertion) and $indexAfterInsertion >= $diff,
+            // $i >= $diff is guaranteed.
+            for ($i = max($length, $indexAfterInsertion); $i < $newLength; ++$i) {
+                $this->elements[$i] = $this->elements[$i - $diff];
+                $this->isIndex[$i] = $this->isIndex[$i - $diff];
+            }
+
+            // Shift remaining elements to the right. Do this right-to-left
+            // so we don't overwrite elements before copying them
+            // The last written index is the immediate index after the inserted
+            // string, because the indices before that will be overwritten
+            // anyway.
+            // Since $i >= $indexAfterInsertion and $indexAfterInsertion >= $diff,
+            // $i >= $diff is guaranteed.
+            for ($i = $length - 1; $i >= $indexAfterInsertion; --$i) {
+                $this->elements[$i] = $this->elements[$i - $diff];
+                $this->isIndex[$i] = $this->isIndex[$i - $diff];
+            }
+        }
+    }
+}
diff --git a/symfony/property-access/PropertyPathInterface.php b/symfony/property-access/PropertyPathInterface.php
new file mode 100644
index 000000000..729a1c801
--- /dev/null
+++ b/symfony/property-access/PropertyPathInterface.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+/**
+ * A sequence of property names or array indices.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @extends \Traversable<int, string>
+ */
+interface PropertyPathInterface extends \Traversable, \Stringable
+{
+    /**
+     * Returns the string representation of the property path.
+     */
+    public function __toString(): string;
+
+    /**
+     * Returns the length of the property path, i.e. the number of elements.
+     */
+    public function getLength(): int;
+
+    /**
+     * Returns the parent property path.
+     *
+     * The parent property path is the one that contains the same items as
+     * this one except for the last one.
+     *
+     * If this property path only contains one item, null is returned.
+     */
+    public function getParent(): ?self;
+
+    /**
+     * Returns the elements of the property path as array.
+     *
+     * @return list<string>
+     */
+    public function getElements(): array;
+
+    /**
+     * Returns the element at the given index in the property path.
+     *
+     * @param int $index The index key
+     *
+     * @throws Exception\OutOfBoundsException If the offset is invalid
+     */
+    public function getElement(int $index): string;
+
+    /**
+     * Returns whether the element at the given index is a property.
+     *
+     * @param int $index The index in the property path
+     *
+     * @throws Exception\OutOfBoundsException If the offset is invalid
+     */
+    public function isProperty(int $index): bool;
+
+    /**
+     * Returns whether the element at the given index is an array index.
+     *
+     * @param int $index The index in the property path
+     *
+     * @throws Exception\OutOfBoundsException If the offset is invalid
+     */
+    public function isIndex(int $index): bool;
+
+    /**
+     * Returns whether the element at the given index is null safe.
+     */
+    public function isNullSafe(int $index): bool;
+}
diff --git a/symfony/property-access/PropertyPathIterator.php b/symfony/property-access/PropertyPathIterator.php
new file mode 100644
index 000000000..f5ebd786e
--- /dev/null
+++ b/symfony/property-access/PropertyPathIterator.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+/**
+ * Traverses a property path and provides additional methods to find out
+ * information about the current element.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @extends \ArrayIterator<int, string>
+ */
+class PropertyPathIterator extends \ArrayIterator implements PropertyPathIteratorInterface
+{
+    public function __construct(
+        protected PropertyPathInterface $path,
+    ) {
+        parent::__construct($path->getElements());
+    }
+
+    public function isIndex(): bool
+    {
+        return $this->path->isIndex($this->key());
+    }
+
+    public function isProperty(): bool
+    {
+        return $this->path->isProperty($this->key());
+    }
+}
diff --git a/symfony/property-access/PropertyPathIteratorInterface.php b/symfony/property-access/PropertyPathIteratorInterface.php
new file mode 100644
index 000000000..4704b36ab
--- /dev/null
+++ b/symfony/property-access/PropertyPathIteratorInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @extends \SeekableIterator<int, string>
+ */
+interface PropertyPathIteratorInterface extends \SeekableIterator
+{
+    /**
+     * Returns whether the current element in the property path is an array
+     * index.
+     */
+    public function isIndex(): bool;
+
+    /**
+     * Returns whether the current element in the property path is a property
+     * name.
+     */
+    public function isProperty(): bool;
+}
diff --git a/symfony/property-info/DependencyInjection/PropertyInfoConstructorPass.php b/symfony/property-info/DependencyInjection/PropertyInfoConstructorPass.php
new file mode 100644
index 000000000..6c775384d
--- /dev/null
+++ b/symfony/property-info/DependencyInjection/PropertyInfoConstructorPass.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Adds extractors to the property_info.constructor_extractor service.
+ *
+ * @author Dmitrii Poddubnyi <dpoddubny@gmail.com>
+ */
+final class PropertyInfoConstructorPass implements CompilerPassInterface
+{
+    use PriorityTaggedServiceTrait;
+
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->hasDefinition('property_info.constructor_extractor')) {
+            return;
+        }
+        $definition = $container->getDefinition('property_info.constructor_extractor');
+
+        $listExtractors = $this->findAndSortTaggedServices('property_info.constructor_extractor', $container);
+        $definition->replaceArgument(0, new IteratorArgument($listExtractors));
+    }
+}
diff --git a/symfony/property-info/DependencyInjection/PropertyInfoPass.php b/symfony/property-info/DependencyInjection/PropertyInfoPass.php
new file mode 100644
index 000000000..de2a374ec
--- /dev/null
+++ b/symfony/property-info/DependencyInjection/PropertyInfoPass.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Adds extractors to the property_info service.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class PropertyInfoPass implements CompilerPassInterface
+{
+    use PriorityTaggedServiceTrait;
+
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->hasDefinition('property_info')) {
+            return;
+        }
+
+        $definition = $container->getDefinition('property_info');
+
+        $listExtractors = $this->findAndSortTaggedServices('property_info.list_extractor', $container);
+        $definition->replaceArgument(0, new IteratorArgument($listExtractors));
+
+        $typeExtractors = $this->findAndSortTaggedServices('property_info.type_extractor', $container);
+        $definition->replaceArgument(1, new IteratorArgument($typeExtractors));
+
+        $descriptionExtractors = $this->findAndSortTaggedServices('property_info.description_extractor', $container);
+        $definition->replaceArgument(2, new IteratorArgument($descriptionExtractors));
+
+        $accessExtractors = $this->findAndSortTaggedServices('property_info.access_extractor', $container);
+        $definition->replaceArgument(3, new IteratorArgument($accessExtractors));
+
+        $initializableExtractors = $this->findAndSortTaggedServices('property_info.initializable_extractor', $container);
+        $definition->setArgument(4, new IteratorArgument($initializableExtractors));
+    }
+}
diff --git a/symfony/property-info/Extractor/ConstructorArgumentTypeExtractorInterface.php b/symfony/property-info/Extractor/ConstructorArgumentTypeExtractorInterface.php
new file mode 100644
index 000000000..57695d831
--- /dev/null
+++ b/symfony/property-info/Extractor/ConstructorArgumentTypeExtractorInterface.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Infers the constructor argument type.
+ *
+ * @author Dmitrii Poddubnyi <dpoddubny@gmail.com>
+ */
+interface ConstructorArgumentTypeExtractorInterface
+{
+    /**
+     * Gets types of an argument from constructor.
+     *
+     * @deprecated since Symfony 7.3, use "getTypeFromConstructor" instead
+     *
+     * @return LegacyType[]|null
+     */
+    public function getTypesFromConstructor(string $class, string $property): ?array;
+
+    /**
+     * Gets type of an argument from constructor.
+     *
+     * @param class-string $class
+     */
+    public function getTypeFromConstructor(string $class, string $property): ?Type;
+}
diff --git a/symfony/property-info/Extractor/ConstructorExtractor.php b/symfony/property-info/Extractor/ConstructorExtractor.php
new file mode 100644
index 000000000..106158bee
--- /dev/null
+++ b/symfony/property-info/Extractor/ConstructorExtractor.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Extracts the constructor argument type using ConstructorArgumentTypeExtractorInterface implementations.
+ *
+ * @author Dmitrii Poddubnyi <dpoddubny@gmail.com>
+ */
+final class ConstructorExtractor implements PropertyTypeExtractorInterface
+{
+    /**
+     * @param iterable<int, ConstructorArgumentTypeExtractorInterface> $extractors
+     */
+    public function __construct(
+        private readonly iterable $extractors = [],
+    ) {
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        foreach ($this->extractors as $extractor) {
+            if (null !== $value = $extractor->getTypeFromConstructor($class, $property)) {
+                return $value;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        foreach ($this->extractors as $extractor) {
+            $value = $extractor->getTypesFromConstructor($class, $property);
+            if (null !== $value) {
+                return $value;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/symfony/property-info/Extractor/PhpDocExtractor.php b/symfony/property-info/Extractor/PhpDocExtractor.php
new file mode 100644
index 000000000..15512e0f4
--- /dev/null
+++ b/symfony/property-info/Extractor/PhpDocExtractor.php
@@ -0,0 +1,447 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
+use phpDocumentor\Reflection\DocBlockFactory;
+use phpDocumentor\Reflection\DocBlockFactoryInterface;
+use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\ContextFactory;
+use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyDocBlockExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\PropertyInfo\Util\PhpDocTypeHelper;
+use Symfony\Component\TypeInfo\Exception\LogicException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Extracts data using a PHPDoc parser.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final
+ */
+class PhpDocExtractor implements PropertyDescriptionExtractorInterface, PropertyTypeExtractorInterface, ConstructorArgumentTypeExtractorInterface, PropertyDocBlockExtractorInterface
+{
+    public const PROPERTY = 0;
+    public const ACCESSOR = 1;
+    public const MUTATOR = 2;
+
+    /**
+     * @var array<string, array{DocBlock|null, int|null, string|null}>
+     */
+    private array $docBlocks = [];
+
+    /**
+     * @var Context[]
+     */
+    private array $contexts = [];
+
+    private DocBlockFactoryInterface $docBlockFactory;
+    private ContextFactory $contextFactory;
+    private TypeContextFactory $typeContextFactory;
+    private PhpDocTypeHelper $phpDocTypeHelper;
+    private array $mutatorPrefixes;
+    private array $accessorPrefixes;
+    private array $arrayMutatorPrefixes;
+
+    /**
+     * @param string[]|null $mutatorPrefixes
+     * @param string[]|null $accessorPrefixes
+     * @param string[]|null $arrayMutatorPrefixes
+     */
+    public function __construct(?DocBlockFactoryInterface $docBlockFactory = null, ?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null)
+    {
+        if (!class_exists(DocBlockFactory::class)) {
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', __CLASS__));
+        }
+
+        $this->docBlockFactory = $docBlockFactory ?: DocBlockFactory::createInstance();
+        $this->contextFactory = new ContextFactory();
+        $this->typeContextFactory = new TypeContextFactory();
+        $this->phpDocTypeHelper = new PhpDocTypeHelper();
+        $this->mutatorPrefixes = $mutatorPrefixes ?? ReflectionExtractor::$defaultMutatorPrefixes;
+        $this->accessorPrefixes = $accessorPrefixes ?? ReflectionExtractor::$defaultAccessorPrefixes;
+        $this->arrayMutatorPrefixes = $arrayMutatorPrefixes ?? ReflectionExtractor::$defaultArrayMutatorPrefixes;
+    }
+
+    public function getShortDescription(string $class, string $property, array $context = []): ?string
+    {
+        [$docBlock] = $this->findDocBlock($class, $property);
+        if (!$docBlock) {
+            return null;
+        }
+
+        $shortDescription = $docBlock->getSummary();
+
+        if ($shortDescription) {
+            return $shortDescription;
+        }
+
+        foreach ($docBlock->getTagsByName('var') as $var) {
+            if ($var && !$var instanceof InvalidTag) {
+                $varDescription = $var->getDescription()->render();
+
+                if ($varDescription) {
+                    return $varDescription;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public function getLongDescription(string $class, string $property, array $context = []): ?string
+    {
+        [$docBlock] = $this->findDocBlock($class, $property);
+        if (!$docBlock) {
+            return null;
+        }
+
+        $contents = $docBlock->getDescription()->render();
+
+        return '' === $contents ? null : $contents;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        [$docBlock, $source, $prefix] = $this->findDocBlock($class, $property);
+        if (!$docBlock) {
+            return null;
+        }
+
+        $tag = match ($source) {
+            self::PROPERTY => 'var',
+            self::ACCESSOR => 'return',
+            self::MUTATOR => 'param',
+        };
+
+        $parentClass = null;
+        $types = [];
+        /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
+        foreach ($docBlock->getTagsByName($tag) as $tag) {
+            if ($tag && !$tag instanceof InvalidTag && null !== $tag->getType()) {
+                foreach ($this->phpDocTypeHelper->getTypes($tag->getType()) as $type) {
+                    switch ($type->getClassName()) {
+                        case 'self':
+                        case 'static':
+                            $resolvedClass = $class;
+                            break;
+
+                        case 'parent':
+                            if (false !== $resolvedClass = $parentClass ??= get_parent_class($class)) {
+                                break;
+                            }
+                            // no break
+
+                        default:
+                            $types[] = $type;
+                            continue 2;
+                    }
+
+                    $types[] = new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $type->isNullable(), $resolvedClass, $type->isCollection(), $type->getCollectionKeyTypes(), $type->getCollectionValueTypes());
+                }
+            }
+        }
+
+        if (!isset($types[0])) {
+            return null;
+        }
+
+        if (!\in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+            return $types;
+        }
+
+        return [new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, false, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $types[0])];
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getTypeFromConstructor" instead
+     */
+    public function getTypesFromConstructor(string $class, string $property): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getTypeFromConstructor()" instead.', __METHOD__, self::class);
+
+        $docBlock = $this->getDocBlockFromConstructor($class, $property);
+
+        if (!$docBlock) {
+            return null;
+        }
+
+        $types = [];
+        /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
+        foreach ($docBlock->getTagsByName('param') as $tag) {
+            if ($tag && null !== $tag->getType()) {
+                $types[] = $this->phpDocTypeHelper->getTypes($tag->getType());
+            }
+        }
+
+        if (!isset($types[0]) || [] === $types[0]) {
+            return null;
+        }
+
+        return array_merge([], ...$types);
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        /** @var DocBlock $docBlock */
+        [$docBlock, $source, $prefix] = $this->findDocBlock($class, $property);
+        if (!$docBlock) {
+            return null;
+        }
+
+        $tag = match ($source) {
+            self::PROPERTY => 'var',
+            self::ACCESSOR => 'return',
+            self::MUTATOR => 'param',
+        };
+
+        $types = [];
+        $typeContext = $this->typeContextFactory->createFromClassName($class);
+
+        /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
+        foreach ($docBlock->getTagsByName($tag) as $tag) {
+            if ($tag instanceof InvalidTag || !$tagType = $tag->getType()) {
+                continue;
+            }
+
+            $type = $this->phpDocTypeHelper->getType($tagType);
+
+            if (!$type instanceof ObjectType) {
+                $types[] = $type;
+
+                continue;
+            }
+
+            $normalizedClassName = match ($type->getClassName()) {
+                'self' => $typeContext->getDeclaringClass(),
+                'static' => $typeContext->getCalledClass(),
+                default => $type->getClassName(),
+            };
+
+            if ('parent' === $normalizedClassName) {
+                try {
+                    $normalizedClassName = $typeContext->getParentClass();
+                } catch (LogicException) {
+                    // if there is no parent for the current class, we keep the "parent" raw string
+                }
+            }
+
+            $types[] = $type->isNullable() ? Type::nullable(Type::object($normalizedClassName)) : Type::object($normalizedClassName);
+        }
+
+        if (null === $type = $types[0] ?? null) {
+            return null;
+        }
+
+        if (!\in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+            return $type;
+        }
+
+        return Type::list($type);
+    }
+
+    public function getTypeFromConstructor(string $class, string $property): ?Type
+    {
+        if (!$docBlock = $this->getDocBlockFromConstructor($class, $property)) {
+            return null;
+        }
+
+        $types = [];
+        /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
+        foreach ($docBlock->getTagsByName('param') as $tag) {
+            if ($tag instanceof InvalidTag || !$tagType = $tag->getType()) {
+                continue;
+            }
+
+            $types[] = $this->phpDocTypeHelper->getType($tagType);
+        }
+
+        return $types[0] ?? null;
+    }
+
+    public function getDocBlock(string $class, string $property): ?DocBlock
+    {
+        $output = $this->findDocBlock($class, $property);
+
+        return $output[0];
+    }
+
+    private function getDocBlockFromConstructor(string $class, string $property): ?DocBlock
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+        $reflectionConstructor = $reflectionClass->getConstructor();
+        if (!$reflectionConstructor) {
+            return null;
+        }
+
+        try {
+            $docBlock = $this->docBlockFactory->create($reflectionConstructor, $this->contextFactory->createFromReflector($reflectionConstructor));
+
+            return $this->filterDocBlockParams($docBlock, $property);
+        } catch (\InvalidArgumentException) {
+            return null;
+        }
+    }
+
+    private function filterDocBlockParams(DocBlock $docBlock, string $allowedParam): DocBlock
+    {
+        $tags = array_values(array_filter($docBlock->getTagsByName('param'), fn ($tag) => $tag instanceof DocBlock\Tags\Param && $allowedParam === $tag->getVariableName()));
+
+        return new DocBlock($docBlock->getSummary(), $docBlock->getDescription(), $tags, $docBlock->getContext(),
+            $docBlock->getLocation(), $docBlock->isTemplateStart(), $docBlock->isTemplateEnd());
+    }
+
+    /**
+     * @return array{DocBlock|null, int|null, string|null}
+     */
+    private function findDocBlock(string $class, string $property): array
+    {
+        $propertyHash = \sprintf('%s::%s', $class, $property);
+
+        if (isset($this->docBlocks[$propertyHash])) {
+            return $this->docBlocks[$propertyHash];
+        }
+
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+        } catch (\ReflectionException) {
+            $reflectionProperty = null;
+        }
+
+        $ucFirstProperty = ucfirst($property);
+
+        switch (true) {
+            case $reflectionProperty?->isPromoted() && $docBlock = $this->getDocBlockFromConstructor($class, $property):
+                $data = [$docBlock, self::MUTATOR, null];
+                break;
+
+            case $docBlock = $this->getDocBlockFromProperty($class, $property):
+                $data = [$docBlock, self::PROPERTY, null];
+                break;
+
+            case [$docBlock] = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::ACCESSOR):
+                $data = [$docBlock, self::ACCESSOR, null];
+                break;
+
+            case [$docBlock, $prefix] = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::MUTATOR):
+                $data = [$docBlock, self::MUTATOR, $prefix];
+                break;
+
+            default:
+                $data = [null, null, null];
+        }
+
+        return $this->docBlocks[$propertyHash] = $data;
+    }
+
+    private function getDocBlockFromProperty(string $class, string $property): ?DocBlock
+    {
+        // Use a ReflectionProperty instead of $class to get the parent class if applicable
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $reflector = $reflectionProperty->getDeclaringClass();
+
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return $this->getDocBlockFromProperty($trait->getName(), $property);
+            }
+        }
+
+        try {
+            return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflector));
+        } catch (\InvalidArgumentException|\RuntimeException) {
+            return null;
+        }
+    }
+
+    /**
+     * @return array{DocBlock, string}|null
+     */
+    private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array
+    {
+        $prefixes = self::ACCESSOR === $type ? $this->accessorPrefixes : $this->mutatorPrefixes;
+        $prefix = null;
+
+        foreach ($prefixes as $prefix) {
+            $methodName = $prefix.$ucFirstProperty;
+
+            try {
+                $reflectionMethod = new \ReflectionMethod($class, $methodName);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
+
+                if (
+                    (self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters())
+                    || (self::MUTATOR === $type && $reflectionMethod->getNumberOfParameters() >= 1)
+                ) {
+                    break;
+                }
+            } catch (\ReflectionException) {
+                // Try the next prefix if the method doesn't exist
+            }
+        }
+
+        if (!isset($reflectionMethod)) {
+            return null;
+        }
+
+        $reflector = $reflectionMethod->getDeclaringClass();
+
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasMethod($methodName)) {
+                return $this->getDocBlockFromMethod($trait->getName(), $ucFirstProperty, $type);
+            }
+        }
+
+        try {
+            return [$this->docBlockFactory->create($reflectionMethod, $this->createFromReflector($reflector)), $prefix];
+        } catch (\InvalidArgumentException|\RuntimeException) {
+            return null;
+        }
+    }
+
+    /**
+     * Prevents a lot of redundant calls to ContextFactory::createForNamespace().
+     */
+    private function createFromReflector(\ReflectionClass $reflector): Context
+    {
+        $cacheKey = $reflector->getNamespaceName().':'.$reflector->getFileName();
+
+        if (isset($this->contexts[$cacheKey])) {
+            return $this->contexts[$cacheKey];
+        }
+
+        $this->contexts[$cacheKey] = $this->contextFactory->createFromReflector($reflector);
+
+        return $this->contexts[$cacheKey];
+    }
+}
diff --git a/symfony/property-info/Extractor/PhpStanExtractor.php b/symfony/property-info/Extractor/PhpStanExtractor.php
new file mode 100644
index 000000000..01e2bb77e
--- /dev/null
+++ b/symfony/property-info/Extractor/PhpStanExtractor.php
@@ -0,0 +1,543 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use phpDocumentor\Reflection\Types\ContextFactory;
+use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\PropertyInfo\Util\PhpStanTypeHelper;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+use Symfony\Component\TypeInfo\TypeResolver\StringTypeResolver;
+
+/**
+ * Extracts data using PHPStan parser.
+ *
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class PhpStanExtractor implements PropertyDescriptionExtractorInterface, PropertyTypeExtractorInterface, ConstructorArgumentTypeExtractorInterface
+{
+    private const PROPERTY = 0;
+    private const ACCESSOR = 1;
+    private const MUTATOR = 2;
+
+    private PhpDocParser $phpDocParser;
+    private Lexer $lexer;
+
+    private StringTypeResolver $stringTypeResolver;
+    private TypeContextFactory $typeContextFactory;
+
+    /** @var array<string, array{PhpDocNode|null, int|null, string|null, string|null}> */
+    private array $docBlocks = [];
+    private PhpStanTypeHelper $phpStanTypeHelper;
+    private array $mutatorPrefixes;
+    private array $accessorPrefixes;
+    private array $arrayMutatorPrefixes;
+
+    /** @var array<string, TypeContext> */
+    private array $contexts = [];
+
+    /**
+     * @param list<string>|null $mutatorPrefixes
+     * @param list<string>|null $accessorPrefixes
+     * @param list<string>|null $arrayMutatorPrefixes
+     */
+    public function __construct(?array $mutatorPrefixes = null, ?array $accessorPrefixes = null, ?array $arrayMutatorPrefixes = null, private bool $allowPrivateAccess = true)
+    {
+        if (!class_exists(ContextFactory::class)) {
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpdocumentor/type-resolver" package is not installed. Try running composer require "phpdocumentor/type-resolver".', __CLASS__));
+        }
+
+        if (!class_exists(PhpDocParser::class)) {
+            throw new \LogicException(\sprintf('Unable to use the "%s" class as the "phpstan/phpdoc-parser" package is not installed. Try running composer require "phpstan/phpdoc-parser".', __CLASS__));
+        }
+
+        $this->phpStanTypeHelper = new PhpStanTypeHelper();
+        $this->mutatorPrefixes = $mutatorPrefixes ?? ReflectionExtractor::$defaultMutatorPrefixes;
+        $this->accessorPrefixes = $accessorPrefixes ?? ReflectionExtractor::$defaultAccessorPrefixes;
+        $this->arrayMutatorPrefixes = $arrayMutatorPrefixes ?? ReflectionExtractor::$defaultArrayMutatorPrefixes;
+
+        if (class_exists(ParserConfig::class)) {
+            $parserConfig = new ParserConfig([]);
+            $this->phpDocParser = new PhpDocParser($parserConfig, new TypeParser($parserConfig, new ConstExprParser($parserConfig)), new ConstExprParser($parserConfig));
+            $this->lexer = new Lexer($parserConfig);
+        } else {
+            $this->phpDocParser = new PhpDocParser(new TypeParser(new ConstExprParser()), new ConstExprParser());
+            $this->lexer = new Lexer();
+        }
+        $this->stringTypeResolver = new StringTypeResolver();
+        $this->typeContextFactory = new TypeContextFactory($this->stringTypeResolver);
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        /** @var PhpDocNode|null $docNode */
+        [$docNode, $source, $prefix, $declaringClass] = $this->getDocBlock($class, $property);
+        if (null === $docNode) {
+            return null;
+        }
+
+        switch ($source) {
+            case self::PROPERTY:
+                $tag = '@var';
+                break;
+
+            case self::ACCESSOR:
+                $tag = '@return';
+                break;
+
+            case self::MUTATOR:
+                $tag = '@param';
+                break;
+        }
+
+        $parentClass = null;
+        $types = [];
+        foreach ($docNode->getTagsByName($tag) as $tagDocNode) {
+            if ($tagDocNode->value instanceof InvalidTagValueNode) {
+                continue;
+            }
+
+            if (
+                $tagDocNode->value instanceof ParamTagValueNode
+                && null === $prefix
+                && $tagDocNode->value->parameterName !== '$'.$property
+            ) {
+                continue;
+            }
+
+            $typeContext = $this->contexts[$class.'/'.$declaringClass] ??= $this->typeContextFactory->createFromClassName($class, $declaringClass);
+
+            foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $typeContext) as $type) {
+                switch ($type->getClassName()) {
+                    case 'self':
+                    case 'static':
+                        $resolvedClass = $class;
+                        break;
+
+                    case 'parent':
+                        if (false !== $resolvedClass = $parentClass ??= get_parent_class($class)) {
+                            break;
+                        }
+                        // no break
+
+                    default:
+                        $types[] = $type;
+                        continue 2;
+                }
+
+                $types[] = new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $type->isNullable(), $resolvedClass, $type->isCollection(), $type->getCollectionKeyTypes(), $type->getCollectionValueTypes());
+            }
+        }
+
+        if (!isset($types[0])) {
+            return null;
+        }
+
+        if (!\in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+            return $types;
+        }
+
+        return [new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, false, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $types[0])];
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getTypeFromConstructor" instead
+     *
+     * @return LegacyType[]|null
+     */
+    public function getTypesFromConstructor(string $class, string $property): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getTypeFromConstructor()" instead.', __METHOD__, self::class);
+
+        if (null === $tagDocNode = $this->getDocBlockFromConstructor($class, $property)) {
+            return null;
+        }
+
+        $types = [];
+        foreach ($this->phpStanTypeHelper->getTypes($tagDocNode, $this->typeContextFactory->createFromClassName($class)) as $type) {
+            $types[] = $type;
+        }
+
+        if (!isset($types[0])) {
+            return null;
+        }
+
+        return $types;
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        /** @var PhpDocNode|null $docNode */
+        [$docNode, $source, $prefix, $declaringClass] = $this->getDocBlock($class, $property);
+
+        if (null === $docNode) {
+            return null;
+        }
+
+        $typeContext = $this->typeContextFactory->createFromClassName($class, $declaringClass);
+
+        $tag = match ($source) {
+            self::PROPERTY => '@var',
+            self::ACCESSOR => '@return',
+            self::MUTATOR => '@param',
+            default => 'invalid',
+        };
+
+        $types = [];
+
+        foreach ($docNode->getTagsByName($tag) as $tagDocNode) {
+            if (!$tagDocNode->value instanceof ParamTagValueNode && !$tagDocNode->value instanceof ReturnTagValueNode && !$tagDocNode->value instanceof VarTagValueNode) {
+                continue;
+            }
+
+            if ($tagDocNode->value instanceof ParamTagValueNode && null === $prefix && $tagDocNode->value->parameterName !== '$'.$property) {
+                continue;
+            }
+
+            try {
+                $types[] = $this->stringTypeResolver->resolve((string) $tagDocNode->value->type, $typeContext);
+            } catch (UnsupportedException) {
+            }
+        }
+
+        if (!$type = $types[0] ?? null) {
+            return null;
+        }
+
+        if (!\in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+            return $type;
+        }
+
+        return Type::list($type);
+    }
+
+    public function getTypeFromConstructor(string $class, string $property): ?Type
+    {
+        $declaringClass = $class;
+        if (!$tagDocNode = $this->getDocBlockFromConstructor($declaringClass, $property)) {
+            return null;
+        }
+
+        $typeContext = $this->typeContextFactory->createFromClassName($class, $declaringClass);
+
+        return $this->stringTypeResolver->resolve((string) $tagDocNode->type, $typeContext);
+    }
+
+    public function getShortDescription(string $class, string $property, array $context = []): ?string
+    {
+        /** @var PhpDocNode|null $docNode */
+        [$docNode] = $this->getDocBlockFromProperty($class, $property);
+        if (null === $docNode) {
+            return null;
+        }
+
+        if ($shortDescription = $this->getDescriptionsFromDocNode($docNode)[0]) {
+            return $shortDescription;
+        }
+
+        foreach ($docNode->getVarTagValues() as $var) {
+            if ($var->description) {
+                return $var->description;
+            }
+        }
+
+        return null;
+    }
+
+    public function getLongDescription(string $class, string $property, array $context = []): ?string
+    {
+        /** @var PhpDocNode|null $docNode */
+        [$docNode] = $this->getDocBlockFromProperty($class, $property);
+        if (null === $docNode) {
+            return null;
+        }
+
+        return $this->getDescriptionsFromDocNode($docNode)[1];
+    }
+
+    /**
+     * A docblock is split into a template marker, a short description, an optional long description and a tags section.
+     *
+     * - The template marker is either empty, #@+ or #@-.
+     * - The short description is started from a non-tag character, and until one or multiple newlines.
+     * - The long description (optional) is started from a non-tag character, and until a new line is encountered followed by a tag.
+     * - Tags, and the remaining characters
+     *
+     * This method returns the short and the long descriptions.
+     *
+     * @return array{0: ?string, 1: ?string}
+     */
+    private function getDescriptionsFromDocNode(PhpDocNode $docNode): array
+    {
+        $isTemplateMarker = static fn (PhpDocChildNode $node): bool => $node instanceof PhpDocTextNode && ('#@+' === $node->text || '#@-' === $node->text);
+
+        $shortDescription = '';
+        $longDescription = '';
+        $shortDescriptionCompleted = false;
+
+        // BC layer for phpstan/phpdoc-parser < 2.0
+        if (!class_exists(ParserConfig::class)) {
+            $isNewLine = static fn (PhpDocChildNode $node): bool => $node instanceof PhpDocTextNode && '' === $node->text;
+
+            foreach ($docNode->children as $child) {
+                if (!$child instanceof PhpDocTextNode) {
+                    break;
+                }
+
+                if ($isTemplateMarker($child)) {
+                    continue;
+                }
+
+                if ($isNewLine($child) && !$shortDescriptionCompleted) {
+                    if ($shortDescription) {
+                        $shortDescriptionCompleted = true;
+                    }
+
+                    continue;
+                }
+
+                if (!$shortDescriptionCompleted) {
+                    $shortDescription = \sprintf("%s\n%s", $shortDescription, $child->text);
+
+                    continue;
+                }
+
+                $longDescription = \sprintf("%s\n%s", $longDescription, $child->text);
+            }
+        } else {
+            foreach ($docNode->children as $child) {
+                if (!$child instanceof PhpDocTextNode) {
+                    break;
+                }
+
+                if ($isTemplateMarker($child)) {
+                    continue;
+                }
+
+                foreach (explode("\n", $child->text) as $line) {
+                    if ('' === $line && !$shortDescriptionCompleted) {
+                        if ($shortDescription) {
+                            $shortDescriptionCompleted = true;
+                        }
+
+                        continue;
+                    }
+
+                    if (!$shortDescriptionCompleted) {
+                        $shortDescription = \sprintf("%s\n%s", $shortDescription, $line);
+
+                        continue;
+                    }
+
+                    $longDescription = \sprintf("%s\n%s", $longDescription, $line);
+                }
+            }
+        }
+
+        $shortDescription = trim(preg_replace('/^#@[+-]{1}/m', '', $shortDescription), "\n");
+        $longDescription = trim($longDescription, "\n");
+
+        return [
+            $shortDescription ?: null,
+            $longDescription ?: null,
+        ];
+    }
+
+    private function getDocBlockFromConstructor(string &$class, string $property): ?ParamTagValueNode
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        if (null === $reflectionConstructor = $reflectionClass->getConstructor()) {
+            return null;
+        }
+
+        if (!$rawDocNode = $reflectionConstructor->getDocComment()) {
+            return null;
+        }
+        $class = $reflectionConstructor->class;
+
+        $phpDocNode = $this->getPhpDocNode($rawDocNode);
+
+        return $this->filterDocBlockParams($phpDocNode, $property);
+    }
+
+    private function filterDocBlockParams(PhpDocNode $docNode, string $allowedParam): ?ParamTagValueNode
+    {
+        $tags = array_values(array_filter($docNode->getTagsByName('@param'), fn ($tagNode) => $tagNode instanceof PhpDocTagNode && ('$'.$allowedParam) === $tagNode->value->parameterName));
+
+        if (!$tags) {
+            return null;
+        }
+
+        return $tags[0]->value;
+    }
+
+    /**
+     * @return array{PhpDocNode|null, int|null, string|null, string|null}
+     */
+    private function getDocBlock(string $class, string $property): array
+    {
+        $propertyHash = $class.'::'.$property;
+
+        if (isset($this->docBlocks[$propertyHash])) {
+            return $this->docBlocks[$propertyHash];
+        }
+
+        $ucFirstProperty = ucfirst($property);
+
+        if ([$docBlock, $constructorDocBlock, $source, $declaringClass] = $this->getDocBlockFromProperty($class, $property)) {
+            if (!$docBlock?->getTagsByName('@var') && $constructorDocBlock) {
+                $docBlock = $constructorDocBlock;
+            }
+
+            $data = [$docBlock, $source, null, $declaringClass];
+        } elseif ([$docBlock, $_, $declaringClass] = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::ACCESSOR)) {
+            $data = [$docBlock, self::ACCESSOR, null, $declaringClass];
+        } elseif ([$docBlock, $prefix, $declaringClass] = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::MUTATOR)) {
+            $data = [$docBlock, self::MUTATOR, $prefix, $declaringClass];
+        } else {
+            $data = [null, null, null, null];
+        }
+
+        return $this->docBlocks[$propertyHash] = $data;
+    }
+
+    /**
+     * @return array{?PhpDocNode, ?PhpDocNode, int, string}|null
+     */
+    private function getDocBlockFromProperty(string $class, string $property): ?array
+    {
+        // Use a ReflectionProperty instead of $class to get the parent class if applicable
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        if (!$this->canAccessMemberBasedOnItsVisibility($reflectionProperty)) {
+            return null;
+        }
+
+        $reflector = $reflectionProperty->getDeclaringClass();
+
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return $this->getDocBlockFromProperty($trait->getName(), $property);
+            }
+        }
+
+        $rawDocNode = $reflectionProperty->getDocComment();
+        $phpDocNode = $rawDocNode ? $this->getPhpDocNode($rawDocNode) : null;
+
+        $constructorPhpDocNode = null;
+        if ($reflectionProperty->isPromoted()) {
+            $constructorRawDocNode = (new \ReflectionMethod($class, '__construct'))->getDocComment();
+            $constructorPhpDocNode = $constructorRawDocNode ? $this->getPhpDocNode($constructorRawDocNode) : null;
+        }
+
+        $source = self::PROPERTY;
+        if (!$phpDocNode?->getTagsByName('@var') && $constructorPhpDocNode) {
+            $source = self::MUTATOR;
+        }
+
+        if (!$phpDocNode && !$constructorPhpDocNode) {
+            return null;
+        }
+
+        return [$phpDocNode, $constructorPhpDocNode, $source, $reflectionProperty->class];
+    }
+
+    /**
+     * @return array{PhpDocNode, string, string}|null
+     */
+    private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array
+    {
+        $prefixes = self::ACCESSOR === $type ? $this->accessorPrefixes : $this->mutatorPrefixes;
+        $prefix = null;
+
+        foreach ($prefixes as $prefix) {
+            $methodName = $prefix.$ucFirstProperty;
+
+            try {
+                $reflectionMethod = new \ReflectionMethod($class, $methodName);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
+
+                if (
+                    (
+                        (self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters())
+                        || (self::MUTATOR === $type && $reflectionMethod->getNumberOfParameters() >= 1)
+                    )
+                    && $this->canAccessMemberBasedOnItsVisibility($reflectionMethod)
+                ) {
+                    break;
+                }
+            } catch (\ReflectionException) {
+                // Try the next prefix if the method doesn't exist
+            }
+        }
+
+        if (!isset($reflectionMethod)) {
+            return null;
+        }
+
+        if (null === $rawDocNode = $reflectionMethod->getDocComment() ?: null) {
+            return null;
+        }
+
+        $phpDocNode = $this->getPhpDocNode($rawDocNode);
+
+        return [$phpDocNode, $prefix, $reflectionMethod->class];
+    }
+
+    private function getPhpDocNode(string $rawDocNode): PhpDocNode
+    {
+        $tokens = new TokenIterator($this->lexer->tokenize($rawDocNode));
+        $phpDocNode = $this->phpDocParser->parse($tokens);
+        $tokens->consumeTokenType(Lexer::TOKEN_END);
+
+        return $phpDocNode;
+    }
+
+    private function canAccessMemberBasedOnItsVisibility(\ReflectionProperty|\ReflectionMethod $member): bool
+    {
+        return $this->allowPrivateAccess || $member->isPublic();
+    }
+}
diff --git a/symfony/property-info/Extractor/ReflectionExtractor.php b/symfony/property-info/Extractor/ReflectionExtractor.php
new file mode 100644
index 000000000..a1e70c505
--- /dev/null
+++ b/symfony/property-info/Extractor/ReflectionExtractor.php
@@ -0,0 +1,1018 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyReadInfo;
+use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfo;
+use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\String\Inflector\EnglishInflector;
+use Symfony\Component\String\Inflector\InflectorInterface;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionParameterTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionPropertyTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionReturnTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\TypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\TypeResolverInterface;
+
+/**
+ * Extracts data using the reflection API.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final
+ */
+class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTypeExtractorInterface, PropertyAccessExtractorInterface, PropertyInitializableExtractorInterface, PropertyReadInfoExtractorInterface, PropertyWriteInfoExtractorInterface, ConstructorArgumentTypeExtractorInterface
+{
+    /**
+     * @internal
+     */
+    public static array $defaultMutatorPrefixes = ['add', 'remove', 'set'];
+
+    /**
+     * @internal
+     */
+    public static array $defaultAccessorPrefixes = ['get', 'is', 'has', 'can'];
+
+    /**
+     * @internal
+     */
+    public static array $defaultArrayMutatorPrefixes = ['add', 'remove'];
+
+    public const ALLOW_PRIVATE = 1;
+    public const ALLOW_PROTECTED = 2;
+    public const ALLOW_PUBLIC = 4;
+
+    /** @var int Allow none of the magic methods */
+    public const DISALLOW_MAGIC_METHODS = 0;
+    /** @var int Allow magic __get methods */
+    public const ALLOW_MAGIC_GET = 1 << 0;
+    /** @var int Allow magic __set methods */
+    public const ALLOW_MAGIC_SET = 1 << 1;
+    /** @var int Allow magic __call methods */
+    public const ALLOW_MAGIC_CALL = 1 << 2;
+
+    private const MAP_TYPES = [
+        'integer' => TypeIdentifier::INT->value,
+        'boolean' => TypeIdentifier::BOOL->value,
+        'double' => TypeIdentifier::FLOAT->value,
+    ];
+
+    private array $mutatorPrefixes;
+    private array $accessorPrefixes;
+    private array $arrayMutatorPrefixes;
+    private int $methodReflectionFlags;
+    private int $propertyReflectionFlags;
+    private InflectorInterface $inflector;
+    private array $arrayMutatorPrefixesFirst;
+    private array $arrayMutatorPrefixesLast;
+    private TypeResolverInterface $typeResolver;
+
+    /**
+     * @param string[]|null $mutatorPrefixes
+     * @param string[]|null $accessorPrefixes
+     * @param string[]|null $arrayMutatorPrefixes
+     */
+    public function __construct(
+        ?array $mutatorPrefixes = null,
+        ?array $accessorPrefixes = null,
+        ?array $arrayMutatorPrefixes = null,
+        private bool $enableConstructorExtraction = true,
+        int $accessFlags = self::ALLOW_PUBLIC,
+        ?InflectorInterface $inflector = null,
+        private int $magicMethodsFlags = self::ALLOW_MAGIC_GET | self::ALLOW_MAGIC_SET,
+    ) {
+        $this->mutatorPrefixes = $mutatorPrefixes ?? self::$defaultMutatorPrefixes;
+        $this->accessorPrefixes = $accessorPrefixes ?? self::$defaultAccessorPrefixes;
+        $this->arrayMutatorPrefixes = $arrayMutatorPrefixes ?? self::$defaultArrayMutatorPrefixes;
+        $this->methodReflectionFlags = $this->getMethodsFlags($accessFlags);
+        $this->propertyReflectionFlags = $this->getPropertyFlags($accessFlags);
+        $this->inflector = $inflector ?? new EnglishInflector();
+
+        $typeContextFactory = new TypeContextFactory();
+        $this->typeResolver = TypeResolver::create([
+            \ReflectionType::class => $reflectionTypeResolver = new ReflectionTypeResolver(),
+            \ReflectionParameter::class => new ReflectionParameterTypeResolver($reflectionTypeResolver, $typeContextFactory),
+            \ReflectionProperty::class => new ReflectionPropertyTypeResolver($reflectionTypeResolver, $typeContextFactory),
+            \ReflectionFunctionAbstract::class => new ReflectionReturnTypeResolver($reflectionTypeResolver, $typeContextFactory),
+        ]);
+
+        $this->arrayMutatorPrefixesFirst = array_merge($this->arrayMutatorPrefixes, array_diff($this->mutatorPrefixes, $this->arrayMutatorPrefixes));
+        $this->arrayMutatorPrefixesLast = array_reverse($this->arrayMutatorPrefixesFirst);
+    }
+
+    public function getProperties(string $class, array $context = []): ?array
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $reflectionProperties = $reflectionClass->getProperties();
+
+        $properties = [];
+        foreach ($reflectionProperties as $reflectionProperty) {
+            if ($reflectionProperty->getModifiers() & $this->propertyReflectionFlags) {
+                $properties[$reflectionProperty->name] = $reflectionProperty->name;
+            }
+        }
+
+        foreach ($reflectionClass->getMethods($this->methodReflectionFlags) as $reflectionMethod) {
+            if ($reflectionMethod->isStatic()) {
+                continue;
+            }
+
+            $propertyName = $this->getPropertyName($reflectionMethod->name, $reflectionProperties);
+            if (!$propertyName || isset($properties[$propertyName])) {
+                continue;
+            }
+            if ($reflectionClass->hasProperty($lowerCasedPropertyName = lcfirst($propertyName)) || (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName))) {
+                $propertyName = $lowerCasedPropertyName;
+            }
+            $properties[$propertyName] = $propertyName;
+        }
+
+        return $properties ? array_values($properties) : null;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        if ($fromMutator = $this->extractFromMutator($class, $property)) {
+            return $fromMutator;
+        }
+
+        if ($fromAccessor = $this->extractFromAccessor($class, $property)) {
+            return $fromAccessor;
+        }
+
+        if (
+            ($context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction)
+            && $fromConstructor = $this->extractFromConstructor($class, $property)
+        ) {
+            return $fromConstructor;
+        }
+
+        if ($fromPropertyDeclaration = $this->extractFromPropertyDeclaration($class, $property)) {
+            return $fromPropertyDeclaration;
+        }
+
+        return null;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getTypeFromConstructor" instead
+     *
+     * @return LegacyType[]|null
+     */
+    public function getTypesFromConstructor(string $class, string $property): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getTypeFromConstructor()" instead.', __METHOD__, self::class);
+
+        try {
+            $reflection = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+        if (!$reflectionConstructor = $reflection->getConstructor()) {
+            return null;
+        }
+        if (!$reflectionParameter = $this->getReflectionParameterFromConstructor($property, $reflectionConstructor)) {
+            return null;
+        }
+        if (!$reflectionType = $reflectionParameter->getType()) {
+            return null;
+        }
+        if (!$types = $this->extractFromReflectionType($reflectionType, $reflectionConstructor->getDeclaringClass())) {
+            return null;
+        }
+
+        return $types;
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        [$mutatorReflection, $prefix] = $this->getMutatorMethod($class, $property);
+
+        if ($mutatorReflection) {
+            try {
+                $type = $this->typeResolver->resolve($mutatorReflection->getParameters()[0]);
+
+                if (!$type instanceof CollectionType && \in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+                    $type = $this->isNullableProperty($class, $property) ? Type::nullable(Type::list($type)) : Type::list($type);
+                }
+
+                return $type;
+            } catch (UnsupportedException) {
+            }
+        }
+
+        [$accessorReflection, $prefix] = $this->getAccessorMethod($class, $property);
+        if ($accessorReflection) {
+            try {
+                return $this->typeResolver->resolve($accessorReflection);
+            } catch (UnsupportedException) {
+            }
+        }
+
+        if ($context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction) {
+            try {
+                $reflectionClass = new \ReflectionClass($class);
+                if ($type = $this->extractTypeFromConstructor($reflectionClass, $property)) {
+                    return $type;
+                }
+            } catch (\ReflectionException) {
+            }
+        }
+
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+            $reflectionProperty = $reflectionClass->getProperty($property);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        try {
+            return $this->typeResolver->resolve($reflectionProperty);
+        } catch (UnsupportedException) {
+        }
+
+        if (null === $defaultValue = ($reflectionClass->getDefaultProperties()[$property] ?? null)) {
+            return null;
+        }
+
+        $typeIdentifier = TypeIdentifier::from(static::MAP_TYPES[\gettype($defaultValue)] ?? \gettype($defaultValue));
+        $type = 'array' === $typeIdentifier->value ? Type::array() : Type::builtin($typeIdentifier);
+
+        if ($this->isNullableProperty($class, $property)) {
+            $type = Type::nullable($type);
+        }
+
+        return $type;
+    }
+
+    public function getTypeFromConstructor(string $class, string $property): ?Type
+    {
+        try {
+            $reflection = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        if (!$reflectionConstructor = $reflection->getConstructor()) {
+            return null;
+        }
+        if (!$reflectionParameter = $this->getReflectionParameterFromConstructor($property, $reflectionConstructor)) {
+            return null;
+        }
+
+        try {
+            return $this->typeResolver->resolve($reflectionParameter);
+        } catch (UnsupportedException) {
+            return null;
+        }
+    }
+
+    private function getReflectionParameterFromConstructor(string $property, \ReflectionMethod $reflectionConstructor): ?\ReflectionParameter
+    {
+        foreach ($reflectionConstructor->getParameters() as $reflectionParameter) {
+            if ($reflectionParameter->getName() === $property) {
+                return $reflectionParameter;
+            }
+        }
+
+        return null;
+    }
+
+    public function isReadable(string $class, string $property, array $context = []): ?bool
+    {
+        if ($this->isAllowedProperty($class, $property)) {
+            return true;
+        }
+
+        return null !== $this->getReadInfo($class, $property, $context);
+    }
+
+    public function isWritable(string $class, string $property, array $context = []): ?bool
+    {
+        if ($this->isAllowedProperty($class, $property, true)) {
+            return true;
+        }
+
+        // First test with the camelized property name
+        [$reflectionMethod] = $this->getMutatorMethod($class, $this->camelize($property));
+        if (null !== $reflectionMethod) {
+            return true;
+        }
+
+        // Otherwise check for the old way
+        [$reflectionMethod] = $this->getMutatorMethod($class, $property);
+
+        return null !== $reflectionMethod;
+    }
+
+    public function isInitializable(string $class, string $property, array $context = []): ?bool
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        if (!$reflectionClass->isInstantiable()) {
+            return false;
+        }
+
+        if ($constructor = $reflectionClass->getConstructor()) {
+            foreach ($constructor->getParameters() as $parameter) {
+                if ($property === $parameter->name) {
+                    return true;
+                }
+            }
+        } elseif ($parentClass = $reflectionClass->getParentClass()) {
+            return $this->isInitializable($parentClass->getName(), $property);
+        }
+
+        return false;
+    }
+
+    public function getReadInfo(string $class, string $property, array $context = []): ?PropertyReadInfo
+    {
+        try {
+            $reflClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $allowGetterSetter = $context['enable_getter_setter_extraction'] ?? false;
+        $magicMethods = $context['enable_magic_methods_extraction'] ?? $this->magicMethodsFlags;
+        $allowMagicCall = (bool) ($magicMethods & self::ALLOW_MAGIC_CALL);
+        $allowMagicGet = (bool) ($magicMethods & self::ALLOW_MAGIC_GET);
+        $hasProperty = $reflClass->hasProperty($property);
+        $camelProp = $this->camelize($property);
+        $getsetter = lcfirst($camelProp); // jQuery style, e.g. read: last(), write: last($item)
+
+        foreach ($this->accessorPrefixes as $prefix) {
+            $methodName = $prefix.$camelProp;
+
+            if ($reflClass->hasMethod($methodName) && $reflClass->getMethod($methodName)->getModifiers() & $this->methodReflectionFlags && !$reflClass->getMethod($methodName)->getNumberOfRequiredParameters()) {
+                $method = $reflClass->getMethod($methodName);
+
+                return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $methodName, $this->getReadVisibilityForMethod($method), $method->isStatic(), false);
+            }
+        }
+
+        if ($allowGetterSetter && $reflClass->hasMethod($getsetter) && ($reflClass->getMethod($getsetter)->getModifiers() & $this->methodReflectionFlags)) {
+            $method = $reflClass->getMethod($getsetter);
+
+            return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $getsetter, $this->getReadVisibilityForMethod($method), $method->isStatic(), false);
+        }
+
+        if ($allowMagicGet && $reflClass->hasMethod('__get') && (($r = $reflClass->getMethod('__get'))->getModifiers() & $this->methodReflectionFlags)) {
+            return new PropertyReadInfo(PropertyReadInfo::TYPE_PROPERTY, $property, PropertyReadInfo::VISIBILITY_PUBLIC, false, $r->returnsReference());
+        }
+
+        if ($hasProperty && (($r = $reflClass->getProperty($property))->getModifiers() & $this->propertyReflectionFlags)) {
+            return new PropertyReadInfo(PropertyReadInfo::TYPE_PROPERTY, $property, $this->getReadVisibilityForProperty($r), $r->isStatic(), true);
+        }
+
+        if ($allowMagicCall && $reflClass->hasMethod('__call') && ($reflClass->getMethod('__call')->getModifiers() & $this->methodReflectionFlags)) {
+            return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, 'get'.$camelProp, PropertyReadInfo::VISIBILITY_PUBLIC, false, false);
+        }
+
+        return null;
+    }
+
+    public function getWriteInfo(string $class, string $property, array $context = []): ?PropertyWriteInfo
+    {
+        try {
+            $reflClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $allowGetterSetter = $context['enable_getter_setter_extraction'] ?? false;
+        $magicMethods = $context['enable_magic_methods_extraction'] ?? $this->magicMethodsFlags;
+        $allowMagicCall = (bool) ($magicMethods & self::ALLOW_MAGIC_CALL);
+        $allowMagicSet = (bool) ($magicMethods & self::ALLOW_MAGIC_SET);
+        $allowConstruct = $context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction;
+        $allowAdderRemover = $context['enable_adder_remover_extraction'] ?? true;
+
+        $camelized = $this->camelize($property);
+        $constructor = $reflClass->getConstructor();
+        $singulars = $this->inflector->singularize($camelized);
+        $errors = [];
+
+        if (null !== $constructor && $allowConstruct) {
+            foreach ($constructor->getParameters() as $parameter) {
+                if ($parameter->getName() === $property) {
+                    return new PropertyWriteInfo(PropertyWriteInfo::TYPE_CONSTRUCTOR, $property);
+                }
+            }
+        }
+
+        [$adderAccessName, $removerAccessName, $adderAndRemoverErrors] = $this->findAdderAndRemover($reflClass, $singulars);
+        if ($allowAdderRemover && null !== $adderAccessName && null !== $removerAccessName) {
+            $adderMethod = $reflClass->getMethod($adderAccessName);
+            $removerMethod = $reflClass->getMethod($removerAccessName);
+
+            $mutator = new PropertyWriteInfo(PropertyWriteInfo::TYPE_ADDER_AND_REMOVER);
+            $mutator->setAdderInfo(new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $adderAccessName, $this->getWriteVisibilityForMethod($adderMethod), $adderMethod->isStatic()));
+            $mutator->setRemoverInfo(new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $removerAccessName, $this->getWriteVisibilityForMethod($removerMethod), $removerMethod->isStatic()));
+
+            return $mutator;
+        }
+
+        $errors[] = $adderAndRemoverErrors;
+
+        foreach ($this->mutatorPrefixes as $mutatorPrefix) {
+            $methodName = $mutatorPrefix.$camelized;
+
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, $methodName, 1);
+            if (!$accessible) {
+                $errors[] = $methodAccessibleErrors;
+                continue;
+            }
+
+            $method = $reflClass->getMethod($methodName);
+
+            if (!\in_array($mutatorPrefix, $this->arrayMutatorPrefixes, true)) {
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $methodName, $this->getWriteVisibilityForMethod($method), $method->isStatic());
+            }
+        }
+
+        $getsetter = lcfirst($camelized);
+
+        if ($allowGetterSetter) {
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, $getsetter, 1);
+            if ($accessible) {
+                $method = $reflClass->getMethod($getsetter);
+
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $getsetter, $this->getWriteVisibilityForMethod($method), $method->isStatic());
+            }
+
+            $errors[] = $methodAccessibleErrors;
+        }
+
+        if ($reflClass->hasProperty($property) && ($reflClass->getProperty($property)->getModifiers() & $this->propertyReflectionFlags)) {
+            $reflProperty = $reflClass->getProperty($property);
+            if (!$reflProperty->isReadOnly()) {
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_PROPERTY, $property, $this->getWriteVisibilityForProperty($reflProperty), $reflProperty->isStatic());
+            }
+
+            $errors[] = [\sprintf('The property "%s" in class "%s" is a promoted readonly property.', $property, $reflClass->getName())];
+            $allowMagicSet = $allowMagicCall = false;
+        }
+
+        if ($allowMagicSet) {
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, '__set', 2);
+            if ($accessible) {
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_PROPERTY, $property, PropertyWriteInfo::VISIBILITY_PUBLIC, false);
+            }
+
+            $errors[] = $methodAccessibleErrors;
+        }
+
+        if ($allowMagicCall) {
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, '__call', 2);
+            if ($accessible) {
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, 'set'.$camelized, PropertyWriteInfo::VISIBILITY_PUBLIC, false);
+            }
+
+            $errors[] = $methodAccessibleErrors;
+        }
+
+        if (!$allowAdderRemover && null !== $adderAccessName && null !== $removerAccessName) {
+            $errors[] = [\sprintf(
+                'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
+                'the new value must be an array or an instance of \Traversable',
+                $property,
+                $reflClass->getName(),
+                implode('()", "', [$adderAccessName, $removerAccessName])
+            )];
+        }
+
+        $noneProperty = new PropertyWriteInfo();
+        $noneProperty->setErrors(array_merge([], ...$errors));
+
+        return $noneProperty;
+    }
+
+    /**
+     * @return LegacyType[]|null
+     */
+    private function extractFromMutator(string $class, string $property): ?array
+    {
+        [$reflectionMethod, $prefix] = $this->getMutatorMethod($class, $property);
+        if (null === $reflectionMethod) {
+            return null;
+        }
+
+        $reflectionParameters = $reflectionMethod->getParameters();
+        $reflectionParameter = $reflectionParameters[0];
+
+        if (!$reflectionType = $reflectionParameter->getType()) {
+            return null;
+        }
+        $type = $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());
+
+        if (1 === \count($type) && \in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+            $type = [new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $this->isNullableProperty($class, $property), null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $type[0])];
+        }
+
+        return $type;
+    }
+
+    /**
+     * Tries to extract type information from accessors.
+     *
+     * @return LegacyType[]|null
+     */
+    private function extractFromAccessor(string $class, string $property): ?array
+    {
+        [$reflectionMethod, $prefix] = $this->getAccessorMethod($class, $property);
+        if (null === $reflectionMethod) {
+            return null;
+        }
+
+        if ($reflectionType = $reflectionMethod->getReturnType()) {
+            return $this->extractFromReflectionType($reflectionType, $reflectionMethod->getDeclaringClass());
+        }
+
+        if (\in_array($prefix, ['is', 'can', 'has'], true)) {
+            return [new LegacyType(LegacyType::BUILTIN_TYPE_BOOL)];
+        }
+
+        return null;
+    }
+
+    /**
+     * Tries to extract type information from constructor.
+     *
+     * @return LegacyType[]|null
+     */
+    private function extractFromConstructor(string $class, string $property): ?array
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $constructor = $reflectionClass->getConstructor();
+
+        if (!$constructor) {
+            return null;
+        }
+
+        foreach ($constructor->getParameters() as $parameter) {
+            if ($property !== $parameter->name) {
+                continue;
+            }
+            $reflectionType = $parameter->getType();
+
+            return $reflectionType ? $this->extractFromReflectionType($reflectionType, $constructor->getDeclaringClass()) : null;
+        }
+
+        if ($parentClass = $reflectionClass->getParentClass()) {
+            return $this->extractFromConstructor($parentClass->getName(), $property);
+        }
+
+        return null;
+    }
+
+    private function extractFromPropertyDeclaration(string $class, string $property): ?array
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($class);
+
+            $reflectionProperty = $reflectionClass->getProperty($property);
+            $reflectionPropertyType = $reflectionProperty->getType();
+
+            if (null !== $reflectionPropertyType && $types = $this->extractFromReflectionType($reflectionPropertyType, $reflectionProperty->getDeclaringClass())) {
+                return $types;
+            }
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        $defaultValue = $reflectionClass->getDefaultProperties()[$property] ?? null;
+
+        if (null === $defaultValue) {
+            return null;
+        }
+
+        $type = \gettype($defaultValue);
+        $type = static::MAP_TYPES[$type] ?? $type;
+
+        return [new LegacyType($type, $this->isNullableProperty($class, $property), null, LegacyType::BUILTIN_TYPE_ARRAY === $type)];
+    }
+
+    private function extractTypeFromConstructor(\ReflectionClass $reflectionClass, string $property): ?Type
+    {
+        if (!$constructor = $reflectionClass->getConstructor()) {
+            return null;
+        }
+
+        foreach ($constructor->getParameters() as $parameter) {
+            if ($property !== $parameter->name) {
+                continue;
+            }
+
+            try {
+                return $this->typeResolver->resolve($parameter);
+            } catch (UnsupportedException) {
+            }
+        }
+
+        if ($parentClass = $reflectionClass->getParentClass()) {
+            return $this->extractTypeFromConstructor($parentClass, $property);
+        }
+
+        return null;
+    }
+
+    private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array
+    {
+        $types = [];
+        $nullable = $reflectionType->allowsNull();
+
+        foreach (($reflectionType instanceof \ReflectionUnionType || $reflectionType instanceof \ReflectionIntersectionType) ? $reflectionType->getTypes() : [$reflectionType] as $type) {
+            if (!$type instanceof \ReflectionNamedType) {
+                // Nested composite types are not supported yet.
+                return [];
+            }
+
+            $phpTypeOrClass = $type->getName();
+            if ('null' === $phpTypeOrClass || 'mixed' === $phpTypeOrClass || 'never' === $phpTypeOrClass) {
+                continue;
+            }
+
+            if (LegacyType::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
+                $types[] = new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $nullable, null, true);
+            } elseif ('void' === $phpTypeOrClass) {
+                $types[] = new LegacyType(LegacyType::BUILTIN_TYPE_NULL, $nullable);
+            } elseif ($type->isBuiltin()) {
+                $types[] = new LegacyType($phpTypeOrClass, $nullable);
+            } else {
+                $types[] = new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $declaringClass));
+            }
+        }
+
+        return $types;
+    }
+
+    private function resolveTypeName(string $name, \ReflectionClass $declaringClass): string
+    {
+        if ('self' === $lcName = strtolower($name)) {
+            return $declaringClass->name;
+        }
+        if ('parent' === $lcName && $parent = $declaringClass->getParentClass()) {
+            return $parent->name;
+        }
+
+        return $name;
+    }
+
+    private function isNullableProperty(string $class, string $property): bool
+    {
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+
+            $reflectionPropertyType = $reflectionProperty->getType();
+
+            return null !== $reflectionPropertyType && $reflectionPropertyType->allowsNull();
+        } catch (\ReflectionException) {
+            // Return false if the property doesn't exist
+        }
+
+        return false;
+    }
+
+    private function isAllowedProperty(string $class, string $property, bool $writeAccessRequired = false): bool
+    {
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+
+            if ($writeAccessRequired) {
+                if ($reflectionProperty->isReadOnly()) {
+                    return false;
+                }
+
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isProtectedSet()) {
+                    return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PROTECTED);
+                }
+
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isPrivateSet()) {
+                    return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PRIVATE);
+                }
+
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
+                    return false;
+                }
+            }
+
+            return (bool) ($reflectionProperty->getModifiers() & $this->propertyReflectionFlags);
+        } catch (\ReflectionException) {
+            // Return false if the property doesn't exist
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the accessor method.
+     *
+     * Returns an array with an instance of \ReflectionMethod as the first key
+     * and the prefix of the method as the second, or null if not found.
+     */
+    private function getAccessorMethod(string $class, string $property): ?array
+    {
+        $ucProperty = ucfirst($property);
+
+        foreach ($this->accessorPrefixes as $prefix) {
+            try {
+                $reflectionMethod = new \ReflectionMethod($class, $prefix.$ucProperty);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
+
+                if (0 === $reflectionMethod->getNumberOfRequiredParameters()) {
+                    return [$reflectionMethod, $prefix];
+                }
+            } catch (\ReflectionException) {
+                // Return null if the property doesn't exist
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns an array with an instance of \ReflectionMethod as the first key
+     * and the prefix of the method as the second, or null if not found.
+     */
+    private function getMutatorMethod(string $class, string $property): ?array
+    {
+        $ucProperty = ucfirst($property);
+        $ucSingulars = $this->inflector->singularize($ucProperty);
+
+        $mutatorPrefixes = \in_array($ucProperty, $ucSingulars, true) ? $this->arrayMutatorPrefixesLast : $this->arrayMutatorPrefixesFirst;
+
+        foreach ($mutatorPrefixes as $prefix) {
+            $names = [$ucProperty];
+            if (\in_array($prefix, $this->arrayMutatorPrefixes, true)) {
+                $names = array_merge($names, $ucSingulars);
+            }
+
+            foreach ($names as $name) {
+                try {
+                    $reflectionMethod = new \ReflectionMethod($class, $prefix.$name);
+                    if ($reflectionMethod->isStatic()) {
+                        continue;
+                    }
+
+                    // Parameter can be optional to allow things like: method(?array $foo = null)
+                    if ($reflectionMethod->getNumberOfParameters() >= 1) {
+                        return [$reflectionMethod, $prefix];
+                    }
+                } catch (\ReflectionException) {
+                    // Try the next prefix if the method doesn't exist
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private function getPropertyName(string $methodName, array $reflectionProperties): ?string
+    {
+        $pattern = implode('|', array_merge($this->accessorPrefixes, $this->mutatorPrefixes));
+
+        if ('' !== $pattern && preg_match('/^('.$pattern.')(.+)$/i', $methodName, $matches)) {
+            if (!\in_array($matches[1], $this->arrayMutatorPrefixes, true)) {
+                return $matches[2];
+            }
+
+            foreach ($reflectionProperties as $reflectionProperty) {
+                foreach ($this->inflector->singularize($reflectionProperty->name) as $name) {
+                    if (strtolower($name) === strtolower($matches[2])) {
+                        return $reflectionProperty->name;
+                    }
+                }
+            }
+
+            return $matches[2];
+        }
+
+        return null;
+    }
+
+    /**
+     * Searches for add and remove methods.
+     *
+     * @param \ReflectionClass $reflClass The reflection class for the given object
+     * @param array            $singulars The singular form of the property name or null
+     *
+     * @return array An array containing the adder and remover when found and errors
+     */
+    private function findAdderAndRemover(\ReflectionClass $reflClass, array $singulars): array
+    {
+        if (2 !== \count($this->arrayMutatorPrefixes)) {
+            return [null, null, []];
+        }
+
+        [$addPrefix, $removePrefix] = $this->arrayMutatorPrefixes;
+        $errors = [];
+
+        foreach ($singulars as $singular) {
+            $addMethod = $addPrefix.$singular;
+            $removeMethod = $removePrefix.$singular;
+
+            [$addMethodFound, $addMethodAccessibleErrors] = $this->isMethodAccessible($reflClass, $addMethod, 1);
+            [$removeMethodFound, $removeMethodAccessibleErrors] = $this->isMethodAccessible($reflClass, $removeMethod, 1);
+            $errors[] = $addMethodAccessibleErrors;
+            $errors[] = $removeMethodAccessibleErrors;
+
+            if ($addMethodFound && $removeMethodFound) {
+                return [$addMethod, $removeMethod, []];
+            }
+
+            if ($addMethodFound && !$removeMethodFound) {
+                $errors[] = [\sprintf('The add method "%s" in class "%s" was found, but the corresponding remove method "%s" was not found', $addMethod, $reflClass->getName(), $removeMethod)];
+            } elseif (!$addMethodFound && $removeMethodFound) {
+                $errors[] = [\sprintf('The remove method "%s" in class "%s" was found, but the corresponding add method "%s" was not found', $removeMethod, $reflClass->getName(), $addMethod)];
+            }
+        }
+
+        return [null, null, array_merge([], ...$errors)];
+    }
+
+    /**
+     * Returns whether a method is public and has the number of required parameters and errors.
+     */
+    private function isMethodAccessible(\ReflectionClass $class, string $methodName, int $parameters): array
+    {
+        $errors = [];
+
+        if ($class->hasMethod($methodName)) {
+            $method = $class->getMethod($methodName);
+
+            if (\ReflectionMethod::IS_PUBLIC === $this->methodReflectionFlags && !$method->isPublic()) {
+                $errors[] = \sprintf('The method "%s" in class "%s" was found but does not have public access.', $methodName, $class->getName());
+            } elseif ($method->getNumberOfRequiredParameters() > $parameters || $method->getNumberOfParameters() < $parameters) {
+                $errors[] = \sprintf('The method "%s" in class "%s" requires %d arguments, but should accept only %d.', $methodName, $class->getName(), $method->getNumberOfRequiredParameters(), $parameters);
+            } else {
+                return [true, $errors];
+            }
+        }
+
+        return [false, $errors];
+    }
+
+    /**
+     * Camelizes a given string.
+     */
+    private function camelize(string $string): string
+    {
+        if ('' === ltrim($string, '_')) {
+            return $string;
+        }
+
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
+    }
+
+    /**
+     * Return allowed reflection method flags.
+     */
+    private function getMethodsFlags(int $accessFlags): int
+    {
+        $methodFlags = 0;
+
+        if ($accessFlags & self::ALLOW_PUBLIC) {
+            $methodFlags |= \ReflectionMethod::IS_PUBLIC;
+        }
+
+        if ($accessFlags & self::ALLOW_PRIVATE) {
+            $methodFlags |= \ReflectionMethod::IS_PRIVATE;
+        }
+
+        if ($accessFlags & self::ALLOW_PROTECTED) {
+            $methodFlags |= \ReflectionMethod::IS_PROTECTED;
+        }
+
+        return $methodFlags;
+    }
+
+    /**
+     * Return allowed reflection property flags.
+     */
+    private function getPropertyFlags(int $accessFlags): int
+    {
+        $propertyFlags = 0;
+
+        if ($accessFlags & self::ALLOW_PUBLIC) {
+            $propertyFlags |= \ReflectionProperty::IS_PUBLIC;
+        }
+
+        if ($accessFlags & self::ALLOW_PRIVATE) {
+            $propertyFlags |= \ReflectionProperty::IS_PRIVATE;
+        }
+
+        if ($accessFlags & self::ALLOW_PROTECTED) {
+            $propertyFlags |= \ReflectionProperty::IS_PROTECTED;
+        }
+
+        return $propertyFlags;
+    }
+
+    private function getReadVisibilityForProperty(\ReflectionProperty $reflectionProperty): string
+    {
+        if ($reflectionProperty->isPrivate()) {
+            return PropertyReadInfo::VISIBILITY_PRIVATE;
+        }
+
+        if ($reflectionProperty->isProtected()) {
+            return PropertyReadInfo::VISIBILITY_PROTECTED;
+        }
+
+        return PropertyReadInfo::VISIBILITY_PUBLIC;
+    }
+
+    private function getReadVisibilityForMethod(\ReflectionMethod $reflectionMethod): string
+    {
+        if ($reflectionMethod->isPrivate()) {
+            return PropertyReadInfo::VISIBILITY_PRIVATE;
+        }
+
+        if ($reflectionMethod->isProtected()) {
+            return PropertyReadInfo::VISIBILITY_PROTECTED;
+        }
+
+        return PropertyReadInfo::VISIBILITY_PUBLIC;
+    }
+
+    private function getWriteVisibilityForProperty(\ReflectionProperty $reflectionProperty): string
+    {
+        if (\PHP_VERSION_ID >= 80400) {
+            if ($reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
+                return PropertyWriteInfo::VISIBILITY_PRIVATE;
+            }
+
+            if ($reflectionProperty->isPrivateSet()) {
+                return PropertyWriteInfo::VISIBILITY_PRIVATE;
+            }
+
+            if ($reflectionProperty->isProtectedSet()) {
+                return PropertyWriteInfo::VISIBILITY_PROTECTED;
+            }
+        }
+
+        if ($reflectionProperty->isPrivate()) {
+            return PropertyWriteInfo::VISIBILITY_PRIVATE;
+        }
+
+        if ($reflectionProperty->isProtected()) {
+            return PropertyWriteInfo::VISIBILITY_PROTECTED;
+        }
+
+        return PropertyWriteInfo::VISIBILITY_PUBLIC;
+    }
+
+    private function getWriteVisibilityForMethod(\ReflectionMethod $reflectionMethod): string
+    {
+        if ($reflectionMethod->isPrivate()) {
+            return PropertyWriteInfo::VISIBILITY_PRIVATE;
+        }
+
+        if ($reflectionMethod->isProtected()) {
+            return PropertyWriteInfo::VISIBILITY_PROTECTED;
+        }
+
+        return PropertyWriteInfo::VISIBILITY_PUBLIC;
+    }
+}
diff --git a/symfony/property-info/Extractor/SerializerExtractor.php b/symfony/property-info/Extractor/SerializerExtractor.php
new file mode 100644
index 000000000..1f7a742e0
--- /dev/null
+++ b/symfony/property-info/Extractor/SerializerExtractor.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Extractor;
+
+use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+
+/**
+ * Lists available properties using Symfony Serializer Component metadata.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final
+ */
+class SerializerExtractor implements PropertyListExtractorInterface
+{
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+    ) {
+    }
+
+    public function getProperties(string $class, array $context = []): ?array
+    {
+        if (!\array_key_exists('serializer_groups', $context) || (null !== $context['serializer_groups'] && !\is_array($context['serializer_groups']))) {
+            return null;
+        }
+
+        if (!$this->classMetadataFactory->hasMetadataFor($class)) {
+            return null;
+        }
+
+        $properties = [];
+        $serializerClassMetadata = $this->classMetadataFactory->getMetadataFor($class);
+
+        foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {
+            if (!$serializerAttributeMetadata->isIgnored() && (null === $context['serializer_groups'] || \in_array('*', $context['serializer_groups'], true) || array_intersect($serializerAttributeMetadata->getGroups(), $context['serializer_groups']))) {
+                $properties[] = $serializerAttributeMetadata->getName();
+            }
+        }
+
+        return $properties;
+    }
+}
diff --git a/symfony/property-info/LICENSE b/symfony/property-info/LICENSE
new file mode 100644
index 000000000..6e3afce69
--- /dev/null
+++ b/symfony/property-info/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/symfony/property-info/PropertyAccessExtractorInterface.php b/symfony/property-info/PropertyAccessExtractorInterface.php
new file mode 100644
index 000000000..290d81c94
--- /dev/null
+++ b/symfony/property-info/PropertyAccessExtractorInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Guesses if the property can be accessed or mutated.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface PropertyAccessExtractorInterface
+{
+    /**
+     * Is the property readable?
+     */
+    public function isReadable(string $class, string $property, array $context = []): ?bool;
+
+    /**
+     * Is the property writable?
+     */
+    public function isWritable(string $class, string $property, array $context = []): ?bool;
+}
diff --git a/symfony/property-info/PropertyDescriptionExtractorInterface.php b/symfony/property-info/PropertyDescriptionExtractorInterface.php
new file mode 100644
index 000000000..a779d159c
--- /dev/null
+++ b/symfony/property-info/PropertyDescriptionExtractorInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Guesses the property's human readable description.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface PropertyDescriptionExtractorInterface
+{
+    /**
+     * Gets the short description of the property.
+     */
+    public function getShortDescription(string $class, string $property, array $context = []): ?string;
+
+    /**
+     * Gets the long description of the property.
+     */
+    public function getLongDescription(string $class, string $property, array $context = []): ?string;
+}
diff --git a/symfony/property-info/PropertyDocBlockExtractorInterface.php b/symfony/property-info/PropertyDocBlockExtractorInterface.php
new file mode 100644
index 000000000..6d09d7813
--- /dev/null
+++ b/symfony/property-info/PropertyDocBlockExtractorInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+use phpDocumentor\Reflection\DocBlock;
+
+/**
+ * Extract a property's doc block.
+ *
+ * A property's doc block may be located on a constructor promoted argument, on
+ * the property or on a mutator for that property.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+interface PropertyDocBlockExtractorInterface
+{
+    /**
+     * Gets the first available doc block for a property. It finds the doc block
+     * by the following priority:
+     *  - constructor promoted argument,
+     *  - the class property,
+     *  - a mutator method for that property.
+     *
+     * If no doc block is found, it will return null.
+     */
+    public function getDocBlock(string $class, string $property): ?DocBlock;
+}
diff --git a/symfony/property-info/PropertyInfoCacheExtractor.php b/symfony/property-info/PropertyInfoCacheExtractor.php
new file mode 100644
index 000000000..866c38e99
--- /dev/null
+++ b/symfony/property-info/PropertyInfoCacheExtractor.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\PropertyInfo\Util\LegacyTypeConverter;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Adds a PSR-6 cache layer on top of an extractor.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final
+ */
+class PropertyInfoCacheExtractor implements PropertyInfoExtractorInterface, PropertyInitializableExtractorInterface
+{
+    private array $arrayCache = [];
+
+    public function __construct(
+        private readonly PropertyInfoExtractorInterface $propertyInfoExtractor,
+        private readonly CacheItemPoolInterface $cacheItemPool,
+    ) {
+    }
+
+    public function isReadable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract('isReadable', [$class, $property, $context]);
+    }
+
+    public function isWritable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract('isWritable', [$class, $property, $context]);
+    }
+
+    public function getShortDescription(string $class, string $property, array $context = []): ?string
+    {
+        return $this->extract('getShortDescription', [$class, $property, $context]);
+    }
+
+    public function getLongDescription(string $class, string $property, array $context = []): ?string
+    {
+        return $this->extract('getLongDescription', [$class, $property, $context]);
+    }
+
+    public function getProperties(string $class, array $context = []): ?array
+    {
+        return $this->extract('getProperties', [$class, $context]);
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        try {
+            $serializedArguments = serialize([$class, $property, $context]);
+        } catch (\Exception) {
+            // If arguments are not serializable, skip the cache
+            if (method_exists($this->propertyInfoExtractor, 'getType')) {
+                return $this->propertyInfoExtractor->getType($class, $property, $context);
+            }
+
+            return LegacyTypeConverter::toTypeInfoType($this->propertyInfoExtractor->getTypes($class, $property, $context));
+        }
+
+        // Calling rawurlencode escapes special characters not allowed in PSR-6's keys
+        $key = rawurlencode('getType.'.$serializedArguments);
+
+        if (\array_key_exists($key, $this->arrayCache)) {
+            return $this->arrayCache[$key];
+        }
+
+        $item = $this->cacheItemPool->getItem($key);
+
+        if ($item->isHit()) {
+            return $this->arrayCache[$key] = $item->get();
+        }
+
+        if (method_exists($this->propertyInfoExtractor, 'getType')) {
+            $value = $this->propertyInfoExtractor->getType($class, $property, $context);
+        } else {
+            $value = LegacyTypeConverter::toTypeInfoType($this->propertyInfoExtractor->getTypes($class, $property, $context));
+        }
+
+        $item->set($value);
+        $this->cacheItemPool->save($item);
+
+        return $this->arrayCache[$key] = $value;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        return $this->extract('getTypes', [$class, $property, $context]);
+    }
+
+    public function isInitializable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract('isInitializable', [$class, $property, $context]);
+    }
+
+    /**
+     * Retrieves the cached data if applicable or delegates to the decorated extractor.
+     */
+    private function extract(string $method, array $arguments): mixed
+    {
+        try {
+            $serializedArguments = serialize($arguments);
+        } catch (\Exception) {
+            // If arguments are not serializable, skip the cache
+            return $this->propertyInfoExtractor->{$method}(...$arguments);
+        }
+
+        // Calling rawurlencode escapes special characters not allowed in PSR-6's keys
+        $key = rawurlencode($method.'.'.$serializedArguments);
+
+        if (\array_key_exists($key, $this->arrayCache)) {
+            return $this->arrayCache[$key];
+        }
+
+        $item = $this->cacheItemPool->getItem($key);
+
+        if ($item->isHit()) {
+            return $this->arrayCache[$key] = $item->get();
+        }
+
+        $value = $this->propertyInfoExtractor->{$method}(...$arguments);
+        $item->set($value);
+        $this->cacheItemPool->save($item);
+
+        return $this->arrayCache[$key] = $value;
+    }
+}
diff --git a/symfony/property-info/PropertyInfoExtractor.php b/symfony/property-info/PropertyInfoExtractor.php
new file mode 100644
index 000000000..5a54854bf
--- /dev/null
+++ b/symfony/property-info/PropertyInfoExtractor.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+use Symfony\Component\PropertyInfo\Util\LegacyTypeConverter;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Default {@see PropertyInfoExtractorInterface} implementation.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final
+ */
+class PropertyInfoExtractor implements PropertyInfoExtractorInterface, PropertyInitializableExtractorInterface
+{
+    /**
+     * @param iterable<mixed, PropertyListExtractorInterface>          $listExtractors
+     * @param iterable<mixed, PropertyTypeExtractorInterface>          $typeExtractors
+     * @param iterable<mixed, PropertyDescriptionExtractorInterface>   $descriptionExtractors
+     * @param iterable<mixed, PropertyAccessExtractorInterface>        $accessExtractors
+     * @param iterable<mixed, PropertyInitializableExtractorInterface> $initializableExtractors
+     */
+    public function __construct(
+        private readonly iterable $listExtractors = [],
+        private readonly iterable $typeExtractors = [],
+        private readonly iterable $descriptionExtractors = [],
+        private readonly iterable $accessExtractors = [],
+        private readonly iterable $initializableExtractors = [],
+    ) {
+    }
+
+    public function getProperties(string $class, array $context = []): ?array
+    {
+        return $this->extract($this->listExtractors, 'getProperties', [$class, $context]);
+    }
+
+    public function getShortDescription(string $class, string $property, array $context = []): ?string
+    {
+        return $this->extract($this->descriptionExtractors, 'getShortDescription', [$class, $property, $context]);
+    }
+
+    public function getLongDescription(string $class, string $property, array $context = []): ?string
+    {
+        return $this->extract($this->descriptionExtractors, 'getLongDescription', [$class, $property, $context]);
+    }
+
+    public function getType(string $class, string $property, array $context = []): ?Type
+    {
+        foreach ($this->typeExtractors as $extractor) {
+            if (!method_exists($extractor, 'getType')) {
+                $legacyTypes = $extractor->getTypes($class, $property, $context);
+
+                if (null !== $legacyTypes) {
+                    return LegacyTypeConverter::toTypeInfoType($legacyTypes);
+                }
+
+                continue;
+            }
+
+            if (null !== $value = $extractor->getType($class, $property, $context)) {
+                return $value;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @deprecated since Symfony 7.3, use "getType" instead
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        return $this->extract($this->typeExtractors, 'getTypes', [$class, $property, $context]);
+    }
+
+    public function isReadable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract($this->accessExtractors, 'isReadable', [$class, $property, $context]);
+    }
+
+    public function isWritable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract($this->accessExtractors, 'isWritable', [$class, $property, $context]);
+    }
+
+    public function isInitializable(string $class, string $property, array $context = []): ?bool
+    {
+        return $this->extract($this->initializableExtractors, 'isInitializable', [$class, $property, $context]);
+    }
+
+    /**
+     * Iterates over registered extractors and return the first value found.
+     *
+     * @param iterable<mixed, object> $extractors
+     * @param list<mixed>             $arguments
+     */
+    private function extract(iterable $extractors, string $method, array $arguments): mixed
+    {
+        foreach ($extractors as $extractor) {
+            if (null !== $value = $extractor->{$method}(...$arguments)) {
+                return $value;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/symfony/property-info/PropertyInfoExtractorInterface.php b/symfony/property-info/PropertyInfoExtractorInterface.php
new file mode 100644
index 000000000..889301865
--- /dev/null
+++ b/symfony/property-info/PropertyInfoExtractorInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Gets info about PHP class properties.
+ *
+ * A convenient interface inheriting all specific info interfaces.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface PropertyInfoExtractorInterface extends PropertyTypeExtractorInterface, PropertyDescriptionExtractorInterface, PropertyAccessExtractorInterface, PropertyListExtractorInterface
+{
+}
diff --git a/symfony/property-info/PropertyInitializableExtractorInterface.php b/symfony/property-info/PropertyInitializableExtractorInterface.php
new file mode 100644
index 000000000..13248fc19
--- /dev/null
+++ b/symfony/property-info/PropertyInitializableExtractorInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Guesses if the property can be initialized through the constructor.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface PropertyInitializableExtractorInterface
+{
+    /**
+     * Is the property initializable? Returns true if a constructor's parameter matches the given property name.
+     */
+    public function isInitializable(string $class, string $property, array $context = []): ?bool;
+}
diff --git a/symfony/property-info/PropertyListExtractorInterface.php b/symfony/property-info/PropertyListExtractorInterface.php
new file mode 100644
index 000000000..ae7c6b612
--- /dev/null
+++ b/symfony/property-info/PropertyListExtractorInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Extracts the list of properties available for the given class.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface PropertyListExtractorInterface
+{
+    /**
+     * Gets the list of properties available for the given class.
+     *
+     * @return string[]|null
+     */
+    public function getProperties(string $class, array $context = []): ?array;
+}
diff --git a/symfony/property-info/PropertyReadInfo.php b/symfony/property-info/PropertyReadInfo.php
new file mode 100644
index 000000000..d006e3248
--- /dev/null
+++ b/symfony/property-info/PropertyReadInfo.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * The property read info tells how a property can be read.
+ *
+ * @author Joel Wurtz <jwurtz@jolicode.com>
+ */
+final class PropertyReadInfo
+{
+    public const TYPE_METHOD = 'method';
+    public const TYPE_PROPERTY = 'property';
+
+    public const VISIBILITY_PUBLIC = 'public';
+    public const VISIBILITY_PROTECTED = 'protected';
+    public const VISIBILITY_PRIVATE = 'private';
+
+    public function __construct(
+        private readonly string $type,
+        private readonly string $name,
+        private readonly string $visibility,
+        private readonly bool $static,
+        private readonly bool $byRef,
+    ) {
+    }
+
+    /**
+     * Get type of access.
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Get name of the access, which can be a method name or a property name, depending on the type.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getVisibility(): string
+    {
+        return $this->visibility;
+    }
+
+    public function isStatic(): bool
+    {
+        return $this->static;
+    }
+
+    /**
+     * Whether this accessor can be accessed by reference.
+     */
+    public function canBeReference(): bool
+    {
+        return $this->byRef;
+    }
+}
diff --git a/symfony/property-info/PropertyReadInfoExtractorInterface.php b/symfony/property-info/PropertyReadInfoExtractorInterface.php
new file mode 100644
index 000000000..816b2825d
--- /dev/null
+++ b/symfony/property-info/PropertyReadInfoExtractorInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Extract read information for the property of a class.
+ *
+ * @author Joel Wurtz <jwurtz@jolicode.com>
+ */
+interface PropertyReadInfoExtractorInterface
+{
+    /**
+     * Get read information object for a given property of a class.
+     */
+    public function getReadInfo(string $class, string $property, array $context = []): ?PropertyReadInfo;
+}
diff --git a/symfony/property-info/PropertyTypeExtractorInterface.php b/symfony/property-info/PropertyTypeExtractorInterface.php
new file mode 100644
index 000000000..358c08dd6
--- /dev/null
+++ b/symfony/property-info/PropertyTypeExtractorInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Type Extractor Interface.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @method Type|null getType(string $class, string $property, array $context = [])
+ */
+interface PropertyTypeExtractorInterface
+{
+    /**
+     * Gets types of a property.
+     *
+     * @deprecated since Symfony 7.3, use "getType" instead
+     *
+     * @return LegacyType[]|null
+     */
+    public function getTypes(string $class, string $property, array $context = []): ?array;
+}
diff --git a/symfony/property-info/PropertyWriteInfo.php b/symfony/property-info/PropertyWriteInfo.php
new file mode 100644
index 000000000..81ce7eda6
--- /dev/null
+++ b/symfony/property-info/PropertyWriteInfo.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * The write mutator defines how a property can be written.
+ *
+ * @author Joel Wurtz <jwurtz@jolicode.com>
+ */
+final class PropertyWriteInfo
+{
+    public const TYPE_NONE = 'none';
+    public const TYPE_METHOD = 'method';
+    public const TYPE_PROPERTY = 'property';
+    public const TYPE_ADDER_AND_REMOVER = 'adder_and_remover';
+    public const TYPE_CONSTRUCTOR = 'constructor';
+
+    public const VISIBILITY_PUBLIC = 'public';
+    public const VISIBILITY_PROTECTED = 'protected';
+    public const VISIBILITY_PRIVATE = 'private';
+
+    private ?self $adderInfo = null;
+    private ?self $removerInfo = null;
+    private array $errors = [];
+
+    public function __construct(
+        private readonly string $type = self::TYPE_NONE,
+        private readonly ?string $name = null,
+        private readonly ?string $visibility = null,
+        private readonly ?bool $static = null,
+    ) {
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getName(): string
+    {
+        if (null === $this->name) {
+            throw new \LogicException("Calling getName() when having a mutator of type {$this->type} is not tolerated.");
+        }
+
+        return $this->name;
+    }
+
+    public function setAdderInfo(self $adderInfo): void
+    {
+        $this->adderInfo = $adderInfo;
+    }
+
+    public function getAdderInfo(): self
+    {
+        if (null === $this->adderInfo) {
+            throw new \LogicException("Calling getAdderInfo() when having a mutator of type {$this->type} is not tolerated.");
+        }
+
+        return $this->adderInfo;
+    }
+
+    public function setRemoverInfo(self $removerInfo): void
+    {
+        $this->removerInfo = $removerInfo;
+    }
+
+    public function getRemoverInfo(): self
+    {
+        if (null === $this->removerInfo) {
+            throw new \LogicException("Calling getRemoverInfo() when having a mutator of type {$this->type} is not tolerated.");
+        }
+
+        return $this->removerInfo;
+    }
+
+    public function getVisibility(): string
+    {
+        if (null === $this->visibility) {
+            throw new \LogicException("Calling getVisibility() when having a mutator of type {$this->type} is not tolerated.");
+        }
+
+        return $this->visibility;
+    }
+
+    public function isStatic(): bool
+    {
+        if (null === $this->static) {
+            throw new \LogicException("Calling isStatic() when having a mutator of type {$this->type} is not tolerated.");
+        }
+
+        return $this->static;
+    }
+
+    public function setErrors(array $errors): void
+    {
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+
+    public function hasErrors(): bool
+    {
+        return (bool) \count($this->errors);
+    }
+}
diff --git a/symfony/property-info/PropertyWriteInfoExtractorInterface.php b/symfony/property-info/PropertyWriteInfoExtractorInterface.php
new file mode 100644
index 000000000..f11346381
--- /dev/null
+++ b/symfony/property-info/PropertyWriteInfoExtractorInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+/**
+ * Extract write information for the property of a class.
+ *
+ * @author Joel Wurtz <jwurtz@jolicode.com>
+ */
+interface PropertyWriteInfoExtractorInterface
+{
+    /**
+     * Get write information object for a given property of a class.
+     */
+    public function getWriteInfo(string $class, string $property, array $context = []): ?PropertyWriteInfo;
+}
diff --git a/symfony/property-info/Type.php b/symfony/property-info/Type.php
new file mode 100644
index 000000000..2bed49234
--- /dev/null
+++ b/symfony/property-info/Type.php
@@ -0,0 +1,167 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo;
+
+trigger_deprecation('symfony/property-info', '7.3', 'The "%s" class is deprecated. Use "%s" class from "symfony/type-info" instead.', Type::class, \Symfony\Component\TypeInfo\Type::class);
+
+/**
+ * Type value object (immutable).
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @deprecated since Symfony 7.3, use "Symfony\Component\TypeInfo\Type" class from "symfony/type-info" instead
+ *
+ * @final
+ */
+class Type
+{
+    public const BUILTIN_TYPE_INT = 'int';
+    public const BUILTIN_TYPE_FLOAT = 'float';
+    public const BUILTIN_TYPE_STRING = 'string';
+    public const BUILTIN_TYPE_BOOL = 'bool';
+    public const BUILTIN_TYPE_RESOURCE = 'resource';
+    public const BUILTIN_TYPE_OBJECT = 'object';
+    public const BUILTIN_TYPE_ARRAY = 'array';
+    public const BUILTIN_TYPE_NULL = 'null';
+    public const BUILTIN_TYPE_FALSE = 'false';
+    public const BUILTIN_TYPE_TRUE = 'true';
+    public const BUILTIN_TYPE_CALLABLE = 'callable';
+    public const BUILTIN_TYPE_ITERABLE = 'iterable';
+
+    /**
+     * List of PHP builtin types.
+     *
+     * @var string[]
+     */
+    public static array $builtinTypes = [
+        self::BUILTIN_TYPE_INT,
+        self::BUILTIN_TYPE_FLOAT,
+        self::BUILTIN_TYPE_STRING,
+        self::BUILTIN_TYPE_BOOL,
+        self::BUILTIN_TYPE_RESOURCE,
+        self::BUILTIN_TYPE_OBJECT,
+        self::BUILTIN_TYPE_ARRAY,
+        self::BUILTIN_TYPE_CALLABLE,
+        self::BUILTIN_TYPE_FALSE,
+        self::BUILTIN_TYPE_TRUE,
+        self::BUILTIN_TYPE_NULL,
+        self::BUILTIN_TYPE_ITERABLE,
+    ];
+
+    /**
+     * List of PHP builtin collection types.
+     *
+     * @var string[]
+     */
+    public static array $builtinCollectionTypes = [
+        self::BUILTIN_TYPE_ARRAY,
+        self::BUILTIN_TYPE_ITERABLE,
+    ];
+
+    private array $collectionKeyType;
+    private array $collectionValueType;
+
+    /**
+     * @param Type[]|Type|null $collectionKeyType
+     * @param Type[]|Type|null $collectionValueType
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(
+        private string $builtinType,
+        private bool $nullable = false,
+        private ?string $class = null,
+        private bool $collection = false,
+        array|self|null $collectionKeyType = null,
+        array|self|null $collectionValueType = null,
+    ) {
+        if (!\in_array($builtinType, self::$builtinTypes, true)) {
+            throw new \InvalidArgumentException(\sprintf('"%s" is not a valid PHP type.', $builtinType));
+        }
+
+        $this->collectionKeyType = $this->validateCollectionArgument($collectionKeyType, 5, '$collectionKeyType') ?? [];
+        $this->collectionValueType = $this->validateCollectionArgument($collectionValueType, 6, '$collectionValueType') ?? [];
+    }
+
+    private function validateCollectionArgument(array|self|null $collectionArgument, int $argumentIndex, string $argumentName): ?array
+    {
+        if (null === $collectionArgument) {
+            return null;
+        }
+
+        if (\is_array($collectionArgument)) {
+            foreach ($collectionArgument as $type) {
+                if (!$type instanceof self) {
+                    throw new \TypeError(\sprintf('"%s()": Argument #%d (%s) must be of type "%s[]", "%s" or "null", array value "%s" given.', __METHOD__, $argumentIndex, $argumentName, self::class, self::class, get_debug_type($collectionArgument)));
+                }
+            }
+
+            return $collectionArgument;
+        }
+
+        return [$collectionArgument];
+    }
+
+    /**
+     * Gets built-in type.
+     *
+     * Can be bool, int, float, string, array, object, resource, null, callback or iterable.
+     */
+    public function getBuiltinType(): string
+    {
+        return $this->builtinType;
+    }
+
+    public function isNullable(): bool
+    {
+        return $this->nullable;
+    }
+
+    /**
+     * Gets the class name.
+     *
+     * Only applicable if the built-in type is object.
+     */
+    public function getClassName(): ?string
+    {
+        return $this->class;
+    }
+
+    public function isCollection(): bool
+    {
+        return $this->collection;
+    }
+
+    /**
+     * Gets collection key types.
+     *
+     * Only applicable for a collection type.
+     *
+     * @return Type[]
+     */
+    public function getCollectionKeyTypes(): array
+    {
+        return $this->collectionKeyType;
+    }
+
+    /**
+     * Gets collection value types.
+     *
+     * Only applicable for a collection type.
+     *
+     * @return Type[]
+     */
+    public function getCollectionValueTypes(): array
+    {
+        return $this->collectionValueType;
+    }
+}
diff --git a/symfony/property-info/Util/LegacyTypeConverter.php b/symfony/property-info/Util/LegacyTypeConverter.php
new file mode 100644
index 000000000..24cae602a
--- /dev/null
+++ b/symfony/property-info/Util/LegacyTypeConverter.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Util;
+
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * @internal
+ */
+class LegacyTypeConverter
+{
+    /**
+     * @param LegacyType[]|null $legacyTypes
+     */
+    public static function toTypeInfoType(?array $legacyTypes): ?Type
+    {
+        if (null === $legacyTypes || [] === $legacyTypes) {
+            return null;
+        }
+
+        $nullable = false;
+        $types = [];
+
+        foreach ($legacyTypes as $legacyType) {
+            switch ($legacyType->getBuiltinType()) {
+                case LegacyType::BUILTIN_TYPE_ARRAY:
+                    $typeInfoType = Type::array(self::toTypeInfoType($legacyType->getCollectionValueTypes()), self::toTypeInfoType($legacyType->getCollectionKeyTypes()));
+                    break;
+                case LegacyType::BUILTIN_TYPE_BOOL:
+                    $typeInfoType = Type::bool();
+                    break;
+                case LegacyType::BUILTIN_TYPE_CALLABLE:
+                    $typeInfoType = Type::callable();
+                    break;
+                case LegacyType::BUILTIN_TYPE_FALSE:
+                    $typeInfoType = Type::false();
+                    break;
+                case LegacyType::BUILTIN_TYPE_FLOAT:
+                    $typeInfoType = Type::float();
+                    break;
+                case LegacyType::BUILTIN_TYPE_INT:
+                    $typeInfoType = Type::int();
+                    break;
+                case LegacyType::BUILTIN_TYPE_ITERABLE:
+                    $typeInfoType = Type::iterable(self::toTypeInfoType($legacyType->getCollectionValueTypes()), self::toTypeInfoType($legacyType->getCollectionKeyTypes()));
+                    break;
+                case LegacyType::BUILTIN_TYPE_OBJECT:
+                    if ($legacyType->isCollection()) {
+                        $typeInfoType = Type::collection(Type::object($legacyType->getClassName()), self::toTypeInfoType($legacyType->getCollectionValueTypes()), self::toTypeInfoType($legacyType->getCollectionKeyTypes()));
+                    } else {
+                        $typeInfoType = Type::object($legacyType->getClassName());
+                    }
+
+                    break;
+                case LegacyType::BUILTIN_TYPE_RESOURCE:
+                    $typeInfoType = Type::resource();
+                    break;
+                case LegacyType::BUILTIN_TYPE_STRING:
+                    $typeInfoType = Type::string();
+                    break;
+                case LegacyType::BUILTIN_TYPE_TRUE:
+                    $typeInfoType = Type::true();
+                    break;
+                default:
+                    $typeInfoType = null;
+                    break;
+            }
+
+            if (LegacyType::BUILTIN_TYPE_NULL === $legacyType->getBuiltinType() || $legacyType->isNullable()) {
+                $nullable = true;
+            }
+
+            if (null !== $typeInfoType) {
+                $types[] = $typeInfoType;
+            }
+        }
+
+        if (1 === \count($types)) {
+            return $nullable ? Type::nullable($types[0]) : $types[0];
+        }
+
+        return $nullable ? Type::nullable(Type::union(...$types)) : Type::union(...$types);
+    }
+}
diff --git a/symfony/property-info/Util/PhpDocTypeHelper.php b/symfony/property-info/Util/PhpDocTypeHelper.php
new file mode 100644
index 000000000..519e5b60e
--- /dev/null
+++ b/symfony/property-info/Util/PhpDocTypeHelper.php
@@ -0,0 +1,355 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Util;
+
+use phpDocumentor\Reflection\PseudoType;
+use phpDocumentor\Reflection\PseudoTypes\ConstExpression;
+use phpDocumentor\Reflection\PseudoTypes\List_;
+use phpDocumentor\Reflection\Type as DocType;
+use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\Collection;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\Null_;
+use phpDocumentor\Reflection\Types\Nullable;
+use phpDocumentor\Reflection\Types\String_;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+// Workaround for phpdocumentor/type-resolver < 1.6
+// We trigger the autoloader here, so we don't need to trigger it inside the loop later.
+class_exists(List_::class);
+
+/**
+ * Transforms a php doc type to a {@link Type} instance.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Guilhem N. <egetick@gmail.com>
+ */
+final class PhpDocTypeHelper
+{
+    /**
+     * Creates a {@see LegacyType} from a PHPDoc type.
+     *
+     * @deprecated since Symfony 7.3, use "getType" instead
+     *
+     * @return LegacyType[]
+     */
+    public function getTypes(DocType $varType): array
+    {
+        trigger_deprecation('symfony/property-info', '7.3', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
+
+        if ($varType instanceof ConstExpression) {
+            // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+            return [];
+        }
+
+        $types = [];
+        $nullable = false;
+
+        if ($varType instanceof Nullable) {
+            $nullable = true;
+            $varType = $varType->getActualType();
+        }
+
+        if (!$varType instanceof Compound) {
+            if ($varType instanceof Null_) {
+                $nullable = true;
+            }
+
+            $type = $this->createLegacyType($varType, $nullable);
+            if (null !== $type) {
+                $types[] = $type;
+            }
+
+            return $types;
+        }
+
+        $varTypes = [];
+        for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
+            $type = $varType->get($typeIndex);
+
+            if ($type instanceof ConstExpression) {
+                // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+                return [];
+            }
+
+            // If null is present, all types are nullable
+            if ($type instanceof Null_) {
+                $nullable = true;
+                continue;
+            }
+
+            if ($type instanceof Nullable) {
+                $nullable = true;
+                $type = $type->getActualType();
+            }
+
+            $varTypes[] = $type;
+        }
+
+        foreach ($varTypes as $varType) {
+            $type = $this->createLegacyType($varType, $nullable);
+            if (null !== $type) {
+                $types[] = $type;
+            }
+        }
+
+        return $types;
+    }
+
+    /**
+     * Creates a {@see Type} from a PHPDoc type.
+     */
+    public function getType(DocType $varType): ?Type
+    {
+        if ($varType instanceof ConstExpression) {
+            // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+            return null;
+        }
+
+        $nullable = false;
+
+        if ($varType instanceof Nullable) {
+            $nullable = true;
+            $varType = $varType->getActualType();
+        }
+
+        if (!$varType instanceof Compound) {
+            if ($varType instanceof Null_) {
+                $nullable = true;
+            }
+
+            $type = $this->createType($varType);
+
+            return $nullable ? Type::nullable($type) : $type;
+        }
+
+        $varTypes = [];
+        for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
+            $type = $varType->get($typeIndex);
+
+            if ($type instanceof ConstExpression) {
+                // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+                return null;
+            }
+
+            // If null is present, all types are nullable
+            if ($type instanceof Null_) {
+                $nullable = true;
+                continue;
+            }
+
+            if ($type instanceof Nullable) {
+                $nullable = true;
+                $type = $type->getActualType();
+            }
+
+            $varTypes[] = $type;
+        }
+
+        $unionTypes = [];
+        foreach ($varTypes as $varType) {
+            if (null !== $t = $this->createType($varType)) {
+                $unionTypes[] = $t;
+            }
+        }
+
+        $type = 1 === \count($unionTypes) ? $unionTypes[0] : Type::union(...$unionTypes);
+
+        return $nullable ? Type::nullable($type) : $type;
+    }
+
+    /**
+     * Creates a {@see LegacyType} from a PHPDoc type.
+     */
+    private function createLegacyType(DocType $type, bool $nullable): ?LegacyType
+    {
+        $docType = (string) $type;
+
+        if ('mixed[]' === $docType) {
+            $docType = 'array';
+        }
+
+        if ($type instanceof Collection) {
+            $fqsen = $type->getFqsen();
+            if ($fqsen && 'list' === $fqsen->getName() && !class_exists(List_::class, false) && !class_exists((string) $fqsen)) {
+                // Workaround for phpdocumentor/type-resolver < 1.6
+                return new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $nullable, null, true, new LegacyType(LegacyType::BUILTIN_TYPE_INT), $this->getTypes($type->getValueType()));
+            }
+
+            [$phpType, $class] = $this->getPhpTypeAndClass((string) $fqsen);
+
+            $collection = is_a($class, \Traversable::class, true) || is_a($class, \ArrayAccess::class, true);
+
+            // it's safer to fall back to other extractors if the generic type is too abstract
+            if (!$collection && !class_exists($class)) {
+                return null;
+            }
+
+            $keys = $this->getTypes($type->getKeyType());
+            $values = $this->getTypes($type->getValueType());
+
+            return new LegacyType($phpType, $nullable, $class, $collection, $keys, $values);
+        }
+
+        // Cannot guess
+        if (!$docType || 'mixed' === $docType) {
+            return null;
+        }
+
+        if (str_ends_with($docType, '[]') && $type instanceof Array_) {
+            $collectionKeyTypes = new LegacyType(LegacyType::BUILTIN_TYPE_INT);
+            $collectionValueTypes = $this->getTypes($type->getValueType());
+
+            return new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyTypes, $collectionValueTypes);
+        }
+
+        if ((str_starts_with($docType, 'list<') || str_starts_with($docType, 'array<')) && $type instanceof Array_) {
+            // array<value> is converted to x[] which is handled above
+            // so it's only necessary to handle array<key, value> here
+            $collectionKeyTypes = $this->getTypes($type->getKeyType());
+            $collectionValueTypes = $this->getTypes($type->getValueType());
+
+            return new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyTypes, $collectionValueTypes);
+        }
+
+        if ($type instanceof PseudoType) {
+            if ($type->underlyingType() instanceof Integer) {
+                return new LegacyType(LegacyType::BUILTIN_TYPE_INT, $nullable, null);
+            } elseif ($type->underlyingType() instanceof String_) {
+                return new LegacyType(LegacyType::BUILTIN_TYPE_STRING, $nullable, null);
+            }
+        }
+
+        $docType = $this->normalizeType($docType);
+        [$phpType, $class] = $this->getPhpTypeAndClass($docType);
+
+        if ('array' === $docType) {
+            return new LegacyType(LegacyType::BUILTIN_TYPE_ARRAY, $nullable, null, true, null, null);
+        }
+
+        return new LegacyType($phpType, $nullable, $class);
+    }
+
+    /**
+     * Creates a {@see Type} from a PHPDoc type.
+     */
+    private function createType(DocType $docType): ?Type
+    {
+        $docTypeString = (string) $docType;
+
+        if ('mixed[]' === $docTypeString) {
+            $docTypeString = 'array';
+        }
+
+        if ($docType instanceof Collection) {
+            $fqsen = $docType->getFqsen();
+            if ($fqsen && 'list' === $fqsen->getName() && !class_exists(List_::class, false) && !class_exists((string) $fqsen)) {
+                // Workaround for phpdocumentor/type-resolver < 1.6
+                return Type::list($this->getType($docType->getValueType()));
+            }
+
+            [$phpType, $class] = $this->getPhpTypeAndClass((string) $fqsen);
+
+            $variableTypes = [];
+
+            if (null !== $valueType = $this->getType($docType->getValueType())) {
+                $variableTypes[] = $valueType;
+            }
+
+            if (null !== $keyType = $this->getType($docType->getKeyType())) {
+                $variableTypes[] = $keyType;
+            }
+
+            $type = null !== $class ? Type::object($class) : Type::builtin($phpType);
+
+            return Type::collection($type, ...$variableTypes);
+        }
+
+        if (!$docTypeString) {
+            return null;
+        }
+
+        if (str_ends_with($docTypeString, '[]') && $docType instanceof Array_) {
+            return Type::list($this->getType($docType->getValueType()));
+        }
+
+        if (str_starts_with($docTypeString, 'list<') && $docType instanceof Array_) {
+            $collectionValueType = $this->getType($docType->getValueType());
+
+            return Type::list($collectionValueType);
+        }
+
+        if (str_starts_with($docTypeString, 'array<') && $docType instanceof Array_) {
+            // array<value> is converted to x[] which is handled above
+            // so it's only necessary to handle array<key, value> here
+            $collectionKeyType = $this->getType($docType->getKeyType());
+            $collectionValueType = $this->getType($docType->getValueType());
+
+            return Type::array($collectionValueType, $collectionKeyType);
+        }
+
+        if ($docType instanceof PseudoType) {
+            if ($docType->underlyingType() instanceof Integer) {
+                return Type::int();
+            } elseif ($docType->underlyingType() instanceof String_) {
+                return Type::string();
+            }
+        }
+
+        $docTypeString = match ($docTypeString) {
+            'integer' => 'int',
+            'boolean' => 'bool',
+            // real is not part of the PHPDoc standard, so we ignore it
+            'double' => 'float',
+            'callback' => 'callable',
+            'void' => 'null',
+            default => $docTypeString,
+        };
+
+        [$phpType, $class] = $this->getPhpTypeAndClass($docTypeString);
+
+        if ('array' === $docTypeString) {
+            return Type::array();
+        }
+
+        return null !== $class ? Type::object($class) : Type::builtin($phpType);
+    }
+
+    private function normalizeType(string $docType): string
+    {
+        return match ($docType) {
+            'integer' => 'int',
+            'boolean' => 'bool',
+            // real is not part of the PHPDoc standard, so we ignore it
+            'double' => 'float',
+            'callback' => 'callable',
+            'void' => 'null',
+            default => $docType,
+        };
+    }
+
+    private function getPhpTypeAndClass(string $docType): array
+    {
+        if (\in_array($docType, TypeIdentifier::values(), true)) {
+            return [$docType, null];
+        }
+
+        if (\in_array($docType, ['parent', 'self', 'static'], true)) {
+            return ['object', $docType];
+        }
+
+        return ['object', ltrim($docType, '\\')];
+    }
+}
diff --git a/symfony/property-info/Util/PhpStanTypeHelper.php b/symfony/property-info/Util/PhpStanTypeHelper.php
new file mode 100644
index 000000000..89e40e593
--- /dev/null
+++ b/symfony/property-info/Util/PhpStanTypeHelper.php
@@ -0,0 +1,214 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Util;
+
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use Symfony\Component\PropertyInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+
+/**
+ * Transforms a php doc tag value to a {@link Type} instance.
+ *
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @internal
+ */
+final class PhpStanTypeHelper
+{
+    /**
+     * Creates a {@see Type} from a PhpDocTagValueNode type.
+     *
+     * @return Type[]
+     */
+    public function getTypes(PhpDocTagValueNode $node, TypeContext $typeContext): array
+    {
+        if ($node instanceof ParamTagValueNode || $node instanceof ReturnTagValueNode || $node instanceof VarTagValueNode) {
+            return $this->compressNullableType($this->extractTypes($node->type, $typeContext));
+        }
+
+        return [];
+    }
+
+    /**
+     * Because PhpStan extract null as a separated type when Symfony / PHP compress it in the first available type we
+     * need this method to mimic how Symfony want null types.
+     *
+     * @param Type[] $types
+     *
+     * @return Type[]
+     */
+    private function compressNullableType(array $types): array
+    {
+        $firstTypeIndex = null;
+        $nullableTypeIndex = null;
+
+        foreach ($types as $k => $type) {
+            if (null === $firstTypeIndex && Type::BUILTIN_TYPE_NULL !== $type->getBuiltinType() && !$type->isNullable()) {
+                $firstTypeIndex = $k;
+            }
+
+            if (null === $nullableTypeIndex && Type::BUILTIN_TYPE_NULL === $type->getBuiltinType()) {
+                $nullableTypeIndex = $k;
+            }
+
+            if (null !== $firstTypeIndex && null !== $nullableTypeIndex) {
+                break;
+            }
+        }
+
+        if (null !== $firstTypeIndex && null !== $nullableTypeIndex) {
+            $firstType = $types[$firstTypeIndex];
+            $types[$firstTypeIndex] = new Type(
+                $firstType->getBuiltinType(),
+                true,
+                $firstType->getClassName(),
+                $firstType->isCollection(),
+                $firstType->getCollectionKeyTypes(),
+                $firstType->getCollectionValueTypes()
+            );
+            unset($types[$nullableTypeIndex]);
+        }
+
+        return array_values($types);
+    }
+
+    /**
+     * @return Type[]
+     */
+    private function extractTypes(TypeNode $node, TypeContext $typeContext): array
+    {
+        if ($node instanceof UnionTypeNode) {
+            $types = [];
+            foreach ($node->types as $type) {
+                if ($type instanceof ConstTypeNode) {
+                    // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+                    return [];
+                }
+                foreach ($this->extractTypes($type, $typeContext) as $subType) {
+                    $types[] = $subType;
+                }
+            }
+
+            return $this->compressNullableType($types);
+        }
+        if ($node instanceof GenericTypeNode) {
+            if ('class-string' === $node->type->name) {
+                return [new Type(Type::BUILTIN_TYPE_STRING)];
+            }
+
+            [$mainType] = $this->extractTypes($node->type, $typeContext);
+
+            if (Type::BUILTIN_TYPE_INT === $mainType->getBuiltinType()) {
+                return [$mainType];
+            }
+
+            $collection = $mainType->isCollection() || is_a($mainType->getClassName(), \Traversable::class, true) || is_a($mainType->getClassName(), \ArrayAccess::class, true);
+
+            // it's safer to fall back to other extractors if the generic type is too abstract
+            if (!$collection && !class_exists($mainType->getClassName()) && !interface_exists($mainType->getClassName(), false)) {
+                return [];
+            }
+
+            $collectionKeyTypes = $mainType->getCollectionKeyTypes();
+            $collectionKeyValues = [];
+            if (1 === \count($node->genericTypes)) {
+                foreach ($this->extractTypes($node->genericTypes[0], $typeContext) as $subType) {
+                    $collectionKeyValues[] = $subType;
+                }
+            } elseif (2 === \count($node->genericTypes)) {
+                foreach ($this->extractTypes($node->genericTypes[0], $typeContext) as $keySubType) {
+                    $collectionKeyTypes[] = $keySubType;
+                }
+                foreach ($this->extractTypes($node->genericTypes[1], $typeContext) as $valueSubType) {
+                    $collectionKeyValues[] = $valueSubType;
+                }
+            }
+
+            return [new Type($mainType->getBuiltinType(), $mainType->isNullable(), $mainType->getClassName(), $collection, $collectionKeyTypes, $collectionKeyValues)];
+        }
+        if ($node instanceof ArrayShapeNode) {
+            return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)];
+        }
+        if ($node instanceof ArrayTypeNode) {
+            return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], $this->extractTypes($node->type, $typeContext))];
+        }
+        if ($node instanceof CallableTypeNode || $node instanceof CallableTypeParameterNode) {
+            return [new Type(Type::BUILTIN_TYPE_CALLABLE)];
+        }
+        if ($node instanceof NullableTypeNode) {
+            $subTypes = $this->extractTypes($node->type, $typeContext);
+            if (\count($subTypes) > 1) {
+                $subTypes[] = new Type(Type::BUILTIN_TYPE_NULL);
+
+                return $subTypes;
+            }
+
+            return [new Type($subTypes[0]->getBuiltinType(), true, $subTypes[0]->getClassName(), $subTypes[0]->isCollection(), $subTypes[0]->getCollectionKeyTypes(), $subTypes[0]->getCollectionValueTypes())];
+        }
+        if ($node instanceof ThisTypeNode) {
+            return [new Type(Type::BUILTIN_TYPE_OBJECT, false, $typeContext->getCalledClass())];
+        }
+        if ($node instanceof IdentifierTypeNode) {
+            if (\in_array($node->name, Type::$builtinTypes, true)) {
+                return [new Type($node->name, false, null, \in_array($node->name, Type::$builtinCollectionTypes, true))];
+            }
+
+            return match ($node->name) {
+                'integer',
+                'positive-int',
+                'negative-int',
+                'non-positive-int',
+                'non-negative-int',
+                'non-zero-int' => [new Type(Type::BUILTIN_TYPE_INT)],
+                'double' => [new Type(Type::BUILTIN_TYPE_FLOAT)],
+                'list',
+                'non-empty-list' => [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT))],
+                'non-empty-array' => [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)],
+                'mixed' => [], // mixed seems to be ignored in all other extractors
+                'parent' => [new Type(Type::BUILTIN_TYPE_OBJECT, false, $node->name)],
+                'static',
+                'self' => [new Type(Type::BUILTIN_TYPE_OBJECT, false, $typeContext->getCalledClass())],
+                'class-string',
+                'html-escaped-string',
+                'lowercase-string',
+                'non-empty-lowercase-string',
+                'non-empty-string',
+                'numeric-string',
+                'trait-string',
+                'interface-string',
+                'literal-string' => [new Type(Type::BUILTIN_TYPE_STRING)],
+                'void' => [new Type(Type::BUILTIN_TYPE_NULL)],
+                'scalar' => [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_FLOAT), new Type(Type::BUILTIN_TYPE_STRING), new Type(Type::BUILTIN_TYPE_BOOL)],
+                'number' => [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_FLOAT)],
+                'numeric' => [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_FLOAT), new Type(Type::BUILTIN_TYPE_STRING)],
+                'array-key' => [new Type(Type::BUILTIN_TYPE_STRING), new Type(Type::BUILTIN_TYPE_INT)],
+                default => [new Type(Type::BUILTIN_TYPE_OBJECT, false, $typeContext->normalize($node->name))],
+            };
+        }
+
+        return [];
+    }
+}
diff --git a/symfony/serializer/Annotation/Context.php b/symfony/serializer/Annotation/Context.php
new file mode 100644
index 000000000..d5c110d2e
--- /dev/null
+++ b/symfony/serializer/Annotation/Context.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+// do not deprecate in 6.4/7.0, to make it easier for the ecosystem to support 6.4, 7.4 and 8.0 simultaneously
+
+class_exists(\Symfony\Component\Serializer\Attribute\Context::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\Context} instead
+     */
+    #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+    class Context extends \Symfony\Component\Serializer\Attribute\Context
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/DiscriminatorMap.php b/symfony/serializer/Annotation/DiscriminatorMap.php
new file mode 100644
index 000000000..08849f77a
--- /dev/null
+++ b/symfony/serializer/Annotation/DiscriminatorMap.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\DiscriminatorMap::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\DiscriminatorMap} instead
+     */
+    #[\Attribute(\Attribute::TARGET_CLASS)]
+    class DiscriminatorMap extends \Symfony\Component\Serializer\Attribute\DiscriminatorMap
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/Groups.php b/symfony/serializer/Annotation/Groups.php
new file mode 100644
index 000000000..bca28df10
--- /dev/null
+++ b/symfony/serializer/Annotation/Groups.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\Groups::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\Groups} instead
+     */
+    #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
+    class Groups extends \Symfony\Component\Serializer\Attribute\Groups
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/Ignore.php b/symfony/serializer/Annotation/Ignore.php
new file mode 100644
index 000000000..32c0a985c
--- /dev/null
+++ b/symfony/serializer/Annotation/Ignore.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\Ignore::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\Ignore} instead
+     */
+    #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+    class Ignore extends \Symfony\Component\Serializer\Attribute\Ignore
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/MaxDepth.php b/symfony/serializer/Annotation/MaxDepth.php
new file mode 100644
index 000000000..55b764e49
--- /dev/null
+++ b/symfony/serializer/Annotation/MaxDepth.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\MaxDepth::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\MaxDepth} instead
+     */
+    #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+    class MaxDepth extends \Symfony\Component\Serializer\Attribute\MaxDepth
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/SerializedName.php b/symfony/serializer/Annotation/SerializedName.php
new file mode 100644
index 000000000..9f897961f
--- /dev/null
+++ b/symfony/serializer/Annotation/SerializedName.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\SerializedName::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\SerializedName} instead
+     */
+    #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+    class SerializedName extends \Symfony\Component\Serializer\Attribute\SerializedName
+    {
+    }
+}
diff --git a/symfony/serializer/Annotation/SerializedPath.php b/symfony/serializer/Annotation/SerializedPath.php
new file mode 100644
index 000000000..37fffe1cc
--- /dev/null
+++ b/symfony/serializer/Annotation/SerializedPath.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Annotation;
+
+class_exists(\Symfony\Component\Serializer\Attribute\SerializedPath::class);
+
+if (false) {
+    /**
+     * @deprecated since Symfony 7.4, use {@see \Symfony\Component\Serializer\Attribute\SerializedPath} instead
+     */
+    #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+    class SerializedPath extends \Symfony\Component\Serializer\Attribute\SerializedPath
+    {
+    }
+}
diff --git a/symfony/serializer/Attribute/Context.php b/symfony/serializer/Attribute/Context.php
new file mode 100644
index 000000000..25c7011b3
--- /dev/null
+++ b/symfony/serializer/Attribute/Context.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+class Context
+{
+    public readonly array $groups;
+
+    /**
+     * @param array<string, mixed> $context                The common context to use when serializing or deserializing
+     * @param array<string, mixed> $normalizationContext   The context to use when serializing
+     * @param array<string, mixed> $denormalizationContext The context to use when deserializing
+     * @param string|string[]      $groups                 The groups to use when serializing or deserializing
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(
+        public readonly array $context = [],
+        public readonly array $normalizationContext = [],
+        public readonly array $denormalizationContext = [],
+        string|array $groups = [],
+    ) {
+        if (!$context && !$normalizationContext && !$denormalizationContext) {
+            throw new InvalidArgumentException(\sprintf('At least one of the "context", "normalizationContext", or "denormalizationContext" options must be provided as a non-empty array to "%s".', static::class));
+        }
+
+        $this->groups = (array) $groups;
+
+        foreach ($this->groups as $group) {
+            if (!\is_string($group)) {
+                throw new InvalidArgumentException(\sprintf('Parameter "groups" given to "%s" must be a string or an array of strings, "%s" given.', static::class, get_debug_type($group)));
+            }
+        }
+    }
+
+    #[\Deprecated('Use the "context" property instead', 'symfony/serializer:7.4')]
+    public function getContext(): array
+    {
+        return $this->context;
+    }
+
+    #[\Deprecated('Use the "normalizationContext" property instead', 'symfony/serializer:7.4')]
+    public function getNormalizationContext(): array
+    {
+        return $this->normalizationContext;
+    }
+
+    #[\Deprecated('Use the "denormalizationContext" property instead', 'symfony/serializer:7.4')]
+    public function getDenormalizationContext(): array
+    {
+        return $this->denormalizationContext;
+    }
+
+    #[\Deprecated('Use the "groups" property instead', 'symfony/serializer:7.4')]
+    public function getGroups(): array
+    {
+        return $this->groups;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\Context::class, false)) {
+    class_alias(Context::class, \Symfony\Component\Serializer\Annotation\Context::class);
+}
diff --git a/symfony/serializer/Attribute/DiscriminatorMap.php b/symfony/serializer/Attribute/DiscriminatorMap.php
new file mode 100644
index 000000000..2dd10df36
--- /dev/null
+++ b/symfony/serializer/Attribute/DiscriminatorMap.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Samuel Roze <samuel.roze@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class DiscriminatorMap
+{
+    /**
+     * @param string                      $typeProperty The property holding the type discriminator
+     * @param array<string, class-string> $mapping      The mapping between types and classes (i.e. ['admin_user' => AdminUser::class])
+     * @param ?string                     $defaultType  The fallback value if nothing specified by $typeProperty
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(
+        public readonly string $typeProperty,
+        public readonly array $mapping,
+        public readonly ?string $defaultType = null,
+    ) {
+        if (!$typeProperty) {
+            throw new InvalidArgumentException(\sprintf('Parameter "typeProperty" given to "%s" cannot be empty.', static::class));
+        }
+
+        if (!$mapping) {
+            throw new InvalidArgumentException(\sprintf('Parameter "mapping" given to "%s" cannot be empty.', static::class));
+        }
+
+        if (null !== $this->defaultType && !\array_key_exists($this->defaultType, $this->mapping)) {
+            throw new InvalidArgumentException(\sprintf('Default type "%s" given to "%s" must be present in "mapping" types.', $this->defaultType, static::class));
+        }
+    }
+
+    #[\Deprecated('Use the "typeProperty" property instead', 'symfony/serializer:7.4')]
+    public function getTypeProperty(): string
+    {
+        return $this->typeProperty;
+    }
+
+    #[\Deprecated('Use the "mapping" property instead', 'symfony/serializer:7.4')]
+    public function getMapping(): array
+    {
+        return $this->mapping;
+    }
+
+    #[\Deprecated('Use the "defaultType" property instead', 'symfony/serializer:7.4')]
+    public function getDefaultType(): ?string
+    {
+        return $this->defaultType;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\DiscriminatorMap::class, false)) {
+    class_alias(DiscriminatorMap::class, \Symfony\Component\Serializer\Annotation\DiscriminatorMap::class);
+}
diff --git a/symfony/serializer/Attribute/ExtendsSerializationFor.php b/symfony/serializer/Attribute/ExtendsSerializationFor.php
new file mode 100644
index 000000000..d8aa88e05
--- /dev/null
+++ b/symfony/serializer/Attribute/ExtendsSerializationFor.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+/**
+ * Declares that serialization attributes listed on the current class should be added to the given class.
+ *
+ * Classes that use this attribute should contain only properties and methods that
+ * exist on the target class (not necessarily all of them).
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class ExtendsSerializationFor
+{
+    /**
+     * @param class-string $class
+     */
+    public function __construct(
+        public string $class,
+    ) {
+    }
+}
diff --git a/symfony/serializer/Attribute/Groups.php b/symfony/serializer/Attribute/Groups.php
new file mode 100644
index 000000000..4e10f11ef
--- /dev/null
+++ b/symfony/serializer/Attribute/Groups.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
+class Groups
+{
+    /**
+     * @var string[]
+     */
+    public readonly array $groups;
+
+    /**
+     * @param string|string[] $groups The groups to define on the attribute target
+     */
+    public function __construct(string|array $groups)
+    {
+        $this->groups = (array) $groups;
+
+        if (!$this->groups) {
+            throw new InvalidArgumentException(\sprintf('Parameter given to "%s" cannot be empty.', static::class));
+        }
+
+        foreach ($this->groups as $group) {
+            if (!\is_string($group) || '' === $group) {
+                throw new InvalidArgumentException(\sprintf('Parameter given to "%s" must be a string or an array of non-empty strings.', static::class));
+            }
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    #[\Deprecated('Use the "groups" property instead', 'symfony/serializer:7.4')]
+    public function getGroups(): array
+    {
+        return $this->groups;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\Groups::class, false)) {
+    class_alias(Groups::class, \Symfony\Component\Serializer\Annotation\Groups::class);
+}
diff --git a/symfony/serializer/Attribute/Ignore.php b/symfony/serializer/Attribute/Ignore.php
new file mode 100644
index 000000000..bfc48b71e
--- /dev/null
+++ b/symfony/serializer/Attribute/Ignore.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+class Ignore
+{
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\Ignore::class, false)) {
+    class_alias(Ignore::class, \Symfony\Component\Serializer\Annotation\Ignore::class);
+}
diff --git a/symfony/serializer/Attribute/MaxDepth.php b/symfony/serializer/Attribute/MaxDepth.php
new file mode 100644
index 000000000..9b2dbf157
--- /dev/null
+++ b/symfony/serializer/Attribute/MaxDepth.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+class MaxDepth
+{
+    /**
+     * @param int $maxDepth The maximum serialization depth
+     */
+    public function __construct(
+        public readonly int $maxDepth,
+    ) {
+        if ($maxDepth <= 0) {
+            throw new InvalidArgumentException(\sprintf('Parameter given to "%s" must be a positive integer.', static::class));
+        }
+    }
+
+    #[\Deprecated('Use the "maxdepth" property instead', 'symfony/serializer:7.4')]
+    public function getMaxDepth(): int
+    {
+        return $this->maxDepth;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\MaxDepth::class, false)) {
+    class_alias(MaxDepth::class, \Symfony\Component\Serializer\Annotation\MaxDepth::class);
+}
diff --git a/symfony/serializer/Attribute/SerializedName.php b/symfony/serializer/Attribute/SerializedName.php
new file mode 100644
index 000000000..4a4362f32
--- /dev/null
+++ b/symfony/serializer/Attribute/SerializedName.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+class SerializedName
+{
+    /**
+     * @param string $serializedName The name of the property as it will be serialized
+     */
+    public function __construct(
+        public readonly string $serializedName,
+    ) {
+        if ('' === $serializedName) {
+            throw new InvalidArgumentException(\sprintf('Parameter given to "%s" must be a non-empty string.', self::class));
+        }
+    }
+
+    #[\Deprecated('Use the "serializedName" property instead', 'symfony/serializer:7.4')]
+    public function getSerializedName(): string
+    {
+        return $this->serializedName;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\SerializedName::class, false)) {
+    class_alias(SerializedName::class, \Symfony\Component\Serializer\Annotation\SerializedName::class);
+}
diff --git a/symfony/serializer/Attribute/SerializedPath.php b/symfony/serializer/Attribute/SerializedPath.php
new file mode 100644
index 000000000..1ab412910
--- /dev/null
+++ b/symfony/serializer/Attribute/SerializedPath.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Attribute;
+
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
+use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * @author Tobias Bönner <tobi@boenner.family>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+class SerializedPath
+{
+    public readonly PropertyPath $serializedPath;
+
+    /**
+     * @param string $serializedPath A path using a valid PropertyAccess syntax where the value is stored in a normalized representation
+     */
+    public function __construct(string $serializedPath)
+    {
+        try {
+            $this->serializedPath = new PropertyPath($serializedPath);
+        } catch (InvalidPropertyPathException) {
+            throw new InvalidArgumentException(\sprintf('Parameter given to "%s" must be a valid property path.', self::class));
+        }
+    }
+
+    #[\Deprecated('Use the "serializedPath" property instead', 'symfony/serializer:7.4')]
+    public function getSerializedPath(): PropertyPath
+    {
+        return $this->serializedPath;
+    }
+}
+
+if (!class_exists(\Symfony\Component\Serializer\Annotation\SerializedPath::class, false)) {
+    class_alias(SerializedPath::class, \Symfony\Component\Serializer\Annotation\SerializedPath::class);
+}
diff --git a/symfony/serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php b/symfony/serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php
new file mode 100644
index 000000000..1bd085024
--- /dev/null
+++ b/symfony/serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\CacheWarmer;
+
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryCompiler;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+
+trigger_deprecation('symfony/serializer', '7.3', 'The "%s" class is deprecated.', CompiledClassMetadataCacheWarmer::class);
+
+/**
+ * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ *
+ * @deprecated since Symfony 7.3
+ */
+final class CompiledClassMetadataCacheWarmer implements CacheWarmerInterface
+{
+    public function __construct(
+        private readonly array $classesToCompile,
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+        private readonly ClassMetadataFactoryCompiler $classMetadataFactoryCompiler,
+        private readonly Filesystem $filesystem,
+    ) {
+    }
+
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
+    {
+        $metadatas = [];
+
+        foreach ($this->classesToCompile as $classToCompile) {
+            $metadatas[] = $this->classMetadataFactory->getMetadataFor($classToCompile);
+        }
+
+        $code = $this->classMetadataFactoryCompiler->compile($metadatas);
+
+        $this->filesystem->dumpFile("{$cacheDir}/serializer.class.metadata.php", $code);
+
+        return [];
+    }
+
+    public function isOptional(): bool
+    {
+        return true;
+    }
+}
diff --git a/symfony/serializer/Command/DebugCommand.php b/symfony/serializer/Command/DebugCommand.php
new file mode 100644
index 000000000..c49b20f95
--- /dev/null
+++ b/symfony/serializer/Command/DebugCommand.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Command;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Dumper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+
+/**
+ * A console command to debug Serializer information.
+ *
+ * @author Loïc Frémont <lc.fremont@gmail.com>
+ */
+#[AsCommand(name: 'debug:serializer', description: 'Display serialization information for classes')]
+class DebugCommand extends Command
+{
+    public function __construct(private readonly ClassMetadataFactoryInterface $serializer)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addArgument('class', InputArgument::REQUIRED, 'A fully qualified class name')
+            ->setHelp("The <info>%command.name% 'App\Entity\Dummy'</info> command dumps the serializer groups for the dummy class.")
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $class = $input->getArgument('class');
+
+        if (!class_exists($class)) {
+            $io = new SymfonyStyle($input, $output);
+            $io->error(\sprintf('Class "%s" was not found.', $class));
+
+            return Command::FAILURE;
+        }
+
+        $this->dumpSerializerDataForClass($input, $output, $class);
+
+        return Command::SUCCESS;
+    }
+
+    private function dumpSerializerDataForClass(InputInterface $input, OutputInterface $output, string $class): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $title = \sprintf('<info>%s</info>', $class);
+        $rows = [];
+        $dump = new Dumper($output);
+
+        $classMetadata = $this->serializer->getMetadataFor($class);
+
+        foreach ($this->getAttributesData($classMetadata) as $propertyName => $data) {
+            $rows[] = [
+                $propertyName,
+                $dump($data),
+            ];
+        }
+
+        $io->section($title);
+
+        if (!$rows) {
+            $io->text('No Serializer data were found for this class.');
+
+            return;
+        }
+
+        $table = new Table($output);
+        $table->setHeaders(['Property', 'Options']);
+        $table->setRows($rows);
+        $table->render();
+    }
+
+    /**
+     * @return array<string, array<string, mixed>>
+     */
+    private function getAttributesData(ClassMetadataInterface $classMetadata): array
+    {
+        $data = [];
+
+        $mapping = $classMetadata->getClassDiscriminatorMapping();
+        $typeProperty = $mapping?->getTypeProperty();
+
+        foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
+            $data[$attributeMetadata->getName()] = [
+                'groups' => $attributeMetadata->getGroups(),
+                'maxDepth' => $attributeMetadata->getMaxDepth(),
+                'serializedName' => $attributeMetadata->getSerializedName(),
+                'serializedPath' => $attributeMetadata->getSerializedPath() ? (string) $attributeMetadata->getSerializedPath() : null,
+                'ignore' => $attributeMetadata->isIgnored(),
+                'normalizationContexts' => $attributeMetadata->getNormalizationContexts(),
+                'denormalizationContexts' => $attributeMetadata->getDenormalizationContexts(),
+            ];
+
+            if ($mapping && $typeProperty === $attributeMetadata->getName()) {
+                $data[$attributeMetadata->getName()]['discriminatorMap'] = $mapping->getTypesMapping();
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/symfony/serializer/Context/ContextBuilderInterface.php b/symfony/serializer/Context/ContextBuilderInterface.php
new file mode 100644
index 000000000..4366d07bc
--- /dev/null
+++ b/symfony/serializer/Context/ContextBuilderInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context;
+
+/**
+ * Common interface for context builders.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+interface ContextBuilderInterface
+{
+    /**
+     * @param self|array<string, mixed> $context
+     */
+    public function withContext(self|array $context): static;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(): array;
+}
diff --git a/symfony/serializer/Context/ContextBuilderTrait.php b/symfony/serializer/Context/ContextBuilderTrait.php
new file mode 100644
index 000000000..d7ce5becf
--- /dev/null
+++ b/symfony/serializer/Context/ContextBuilderTrait.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+trait ContextBuilderTrait
+{
+    /**
+     * @var array<string, mixed>
+     */
+    private array $context = [];
+
+    protected function with(string $key, mixed $value): static
+    {
+        $instance = new static();
+        $instance->context = array_merge($this->context, [$key => $value]);
+
+        return $instance;
+    }
+
+    /**
+     * @param ContextBuilderInterface|array<string, mixed> $context
+     */
+    public function withContext(ContextBuilderInterface|array $context): static
+    {
+        if ($context instanceof ContextBuilderInterface) {
+            $context = $context->toArray();
+        }
+
+        $instance = new static();
+        $instance->context = array_merge($this->context, $context);
+
+        return $instance;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(): array
+    {
+        return $this->context;
+    }
+}
diff --git a/symfony/serializer/Context/Encoder/CsvEncoderContextBuilder.php b/symfony/serializer/Context/Encoder/CsvEncoderContextBuilder.php
new file mode 100644
index 000000000..9f0d6da6f
--- /dev/null
+++ b/symfony/serializer/Context/Encoder/CsvEncoderContextBuilder.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Encoder;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Encoder\CsvEncoder;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * A helper providing autocompletion for available CsvEncoder options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class CsvEncoderContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the column delimiter character.
+     *
+     * Must be a single character.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withDelimiter(?string $delimiter): static
+    {
+        if (null !== $delimiter && 1 !== \strlen($delimiter)) {
+            throw new InvalidArgumentException(\sprintf('The "%s" delimiter must be a single character.', $delimiter));
+        }
+
+        return $this->with(CsvEncoder::DELIMITER_KEY, $delimiter);
+    }
+
+    /**
+     * Configures the field enclosure character.
+     *
+     * Must be a single character.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withEnclosure(?string $enclosure): static
+    {
+        if (null !== $enclosure && 1 !== \strlen($enclosure)) {
+            throw new InvalidArgumentException(\sprintf('The "%s" enclosure must be a single character.', $enclosure));
+        }
+
+        return $this->with(CsvEncoder::ENCLOSURE_KEY, $enclosure);
+    }
+
+    /**
+     * Configures the escape character.
+     *
+     * Must be empty or a single character.
+     *
+     * @deprecated since Symfony 7.2, to be removed in 8.0
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withEscapeChar(?string $escapeChar): static
+    {
+        trigger_deprecation('symfony/serializer', '7.2', 'The "%s" method is deprecated. It will be removed in 8.0.', __METHOD__);
+
+        if (null !== $escapeChar && \strlen($escapeChar) > 1) {
+            throw new InvalidArgumentException(\sprintf('The "%s" escape character must be empty or a single character.', $escapeChar));
+        }
+
+        return $this->with(CsvEncoder::ESCAPE_CHAR_KEY, $escapeChar);
+    }
+
+    /**
+     * Configures the key separator when (un)flattening arrays.
+     */
+    public function withKeySeparator(?string $keySeparator): static
+    {
+        return $this->with(CsvEncoder::KEY_SEPARATOR_KEY, $keySeparator);
+    }
+
+    /**
+     * Configures the headers.
+     *
+     * @param list<mixed>|null $headers
+     */
+    public function withHeaders(?array $headers): static
+    {
+        return $this->with(CsvEncoder::HEADERS_KEY, $headers);
+    }
+
+    /**
+     * Configures whether formulas should be escaped.
+     */
+    public function withEscapedFormulas(?bool $escapedFormulas): static
+    {
+        return $this->with(CsvEncoder::ESCAPE_FORMULAS_KEY, $escapedFormulas);
+    }
+
+    /**
+     * Configures whether the decoded result should be considered as a collection
+     * or as a single element.
+     */
+    public function withAsCollection(?bool $asCollection): static
+    {
+        return $this->with(CsvEncoder::AS_COLLECTION_KEY, $asCollection);
+    }
+
+    /**
+     * Configures whether the input (or output) is containing (or will contain) headers.
+     */
+    public function withNoHeaders(?bool $noHeaders): static
+    {
+        return $this->with(CsvEncoder::NO_HEADERS_KEY, $noHeaders);
+    }
+
+    /**
+     * Configures the end of line characters.
+     */
+    public function withEndOfLine(?string $endOfLine): static
+    {
+        return $this->with(CsvEncoder::END_OF_LINE, $endOfLine);
+    }
+
+    /**
+     * Configures whether to add the UTF-8 Byte Order Mark (BOM)
+     * at the beginning of the encoded result or not.
+     */
+    public function withOutputUtf8Bom(?bool $outputUtf8Bom): static
+    {
+        return $this->with(CsvEncoder::OUTPUT_UTF8_BOM_KEY, $outputUtf8Bom);
+    }
+}
diff --git a/symfony/serializer/Context/Encoder/JsonEncoderContextBuilder.php b/symfony/serializer/Context/Encoder/JsonEncoderContextBuilder.php
new file mode 100644
index 000000000..8920dddb3
--- /dev/null
+++ b/symfony/serializer/Context/Encoder/JsonEncoderContextBuilder.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Encoder;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Encoder\JsonDecode;
+use Symfony\Component\Serializer\Encoder\JsonEncode;
+
+/**
+ * A helper providing autocompletion for available JsonEncoder options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class JsonEncoderContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the json_encode flags bitmask.
+     *
+     * @see https://php.net/json.constants
+     *
+     * @param positive-int|null $options
+     */
+    public function withEncodeOptions(?int $options): static
+    {
+        return $this->with(JsonEncode::OPTIONS, $options);
+    }
+
+    /**
+     * Configures the json_decode flags bitmask.
+     *
+     * @see https://php.net/json.constants
+     *
+     * @param positive-int|null $options
+     */
+    public function withDecodeOptions(?int $options): static
+    {
+        return $this->with(JsonDecode::OPTIONS, $options);
+    }
+
+    /**
+     * Configures whether decoded objects will be given as
+     * associative arrays or as nested stdClass.
+     */
+    public function withAssociative(?bool $associative): static
+    {
+        return $this->with(JsonDecode::ASSOCIATIVE, $associative);
+    }
+
+    /**
+     * Configures the maximum recursion depth.
+     *
+     * Must be strictly positive.
+     *
+     * @param positive-int|null $recursionDepth
+     */
+    public function withRecursionDepth(?int $recursionDepth): static
+    {
+        return $this->with(JsonDecode::RECURSION_DEPTH, $recursionDepth);
+    }
+}
diff --git a/symfony/serializer/Context/Encoder/XmlEncoderContextBuilder.php b/symfony/serializer/Context/Encoder/XmlEncoderContextBuilder.php
new file mode 100644
index 000000000..ece1c6514
--- /dev/null
+++ b/symfony/serializer/Context/Encoder/XmlEncoderContextBuilder.php
@@ -0,0 +1,179 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Encoder;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
+
+/**
+ * A helper providing autocompletion for available XmlEncoder options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class XmlEncoderContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures whether the decoded result should be considered as a collection
+     * or as a single element.
+     */
+    public function withAsCollection(?bool $asCollection): static
+    {
+        return $this->with(XmlEncoder::AS_COLLECTION, $asCollection);
+    }
+
+    /**
+     * Configures node types to ignore while decoding.
+     *
+     * @see https://php.net/dom.constants
+     *
+     * @param list<int>|null $decoderIgnoredNodeTypes
+     */
+    public function withDecoderIgnoredNodeTypes(?array $decoderIgnoredNodeTypes): static
+    {
+        return $this->with(XmlEncoder::DECODER_IGNORED_NODE_TYPES, $decoderIgnoredNodeTypes);
+    }
+
+    /**
+     * Configures node types to ignore while encoding.
+     *
+     * @see https://php.net/dom.constants
+     *
+     * @param list<int>|null $encoderIgnoredNodeTypes
+     */
+    public function withEncoderIgnoredNodeTypes(?array $encoderIgnoredNodeTypes): static
+    {
+        return $this->with(XmlEncoder::ENCODER_IGNORED_NODE_TYPES, $encoderIgnoredNodeTypes);
+    }
+
+    /**
+     * Configures the DOMDocument encoding.
+     *
+     * @see https://php.net/class.domdocument#domdocument.props.encoding
+     */
+    public function withEncoding(?string $encoding): static
+    {
+        return $this->with(XmlEncoder::ENCODING, $encoding);
+    }
+
+    /**
+     * Configures whether to encode with indentation and extra space.
+     *
+     * @see https://php.net/class.domdocument#domdocument.props.formatoutput
+     */
+    public function withFormatOutput(?bool $formatOutput): static
+    {
+        return $this->with(XmlEncoder::FORMAT_OUTPUT, $formatOutput);
+    }
+
+    /**
+     * Configures the DOMDocument::loadXml options bitmask.
+     *
+     * @see https://php.net/libxml.constants
+     *
+     * @param positive-int|null $loadOptions
+     */
+    public function withLoadOptions(?int $loadOptions): static
+    {
+        return $this->with(XmlEncoder::LOAD_OPTIONS, $loadOptions);
+    }
+
+    /**
+     * Configures the DOMDocument::saveXml options bitmask.
+     *
+     * @see https://php.net/libxml.constants
+     *
+     * @param positive-int|null $saveOptions
+     */
+    public function withSaveOptions(?int $saveOptions): static
+    {
+        return $this->with(XmlEncoder::SAVE_OPTIONS, $saveOptions);
+    }
+
+    /**
+     * Configures whether to keep empty nodes.
+     */
+    public function withRemoveEmptyTags(?bool $removeEmptyTags): static
+    {
+        return $this->with(XmlEncoder::REMOVE_EMPTY_TAGS, $removeEmptyTags);
+    }
+
+    /**
+     * Configures name of the root node.
+     */
+    public function withRootNodeName(?string $rootNodeName): static
+    {
+        return $this->with(XmlEncoder::ROOT_NODE_NAME, $rootNodeName);
+    }
+
+    /**
+     * Configures whether the document will be standalone.
+     *
+     * @see https://php.net/class.domdocument#domdocument.props.xmlstandalone
+     */
+    public function withStandalone(?bool $standalone): static
+    {
+        return $this->with(XmlEncoder::STANDALONE, $standalone);
+    }
+
+    /**
+     * Configures whether casting numeric string attributes to integers or floats.
+     */
+    public function withTypeCastAttributes(?bool $typeCastAttributes): static
+    {
+        return $this->with(XmlEncoder::TYPE_CAST_ATTRIBUTES, $typeCastAttributes);
+    }
+
+    /**
+     * Configures the version number of the document.
+     *
+     * @see https://php.net/class.domdocument#domdocument.props.xmlversion
+     */
+    public function withVersion(?string $version): static
+    {
+        return $this->with(XmlEncoder::VERSION, $version);
+    }
+
+    /**
+     * Configures whether to wrap strings within CDATA sections.
+     */
+    public function withCdataWrapping(?bool $cdataWrapping): static
+    {
+        return $this->with(XmlEncoder::CDATA_WRAPPING, $cdataWrapping);
+    }
+
+    /**
+     * Configures the pattern used to evaluate if a CDATA section should be added.
+     */
+    public function withCdataWrappingPattern(?string $cdataWrappingPattern): static
+    {
+        return $this->with(XmlEncoder::CDATA_WRAPPING_PATTERN, $cdataWrappingPattern);
+    }
+
+    /**
+     * Configures whether to ignore empty attributes.
+     */
+    public function withIgnoreEmptyAttributes(?bool $ignoreEmptyAttributes): static
+    {
+        return $this->with(XmlEncoder::IGNORE_EMPTY_ATTRIBUTES, $ignoreEmptyAttributes);
+    }
+
+    /**
+     * Configures whether to preserve numeric keys in array.
+     */
+    public function withPreserveNumericKeys(?bool $preserveNumericKeys): static
+    {
+        return $this->with(XmlEncoder::PRESERVE_NUMERIC_KEYS, $preserveNumericKeys);
+    }
+}
diff --git a/symfony/serializer/Context/Encoder/YamlEncoderContextBuilder.php b/symfony/serializer/Context/Encoder/YamlEncoderContextBuilder.php
new file mode 100644
index 000000000..cc28fe9f3
--- /dev/null
+++ b/symfony/serializer/Context/Encoder/YamlEncoderContextBuilder.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Encoder;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Encoder\YamlEncoder;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * A helper providing autocompletion for available YamlEncoder options.
+ *
+ * Note that the "indentation" setting is not offered in this builder because
+ * it can only be set during the construction of the YamlEncoder, but not per
+ * call.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class YamlEncoderContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the threshold to switch to inline YAML.
+     */
+    public function withInlineThreshold(?int $inlineThreshold): static
+    {
+        return $this->with(YamlEncoder::YAML_INLINE, $inlineThreshold);
+    }
+
+    /**
+     * Configures the indentation level.
+     *
+     * Must be positive.
+     *
+     * @param int<0, max>|null $indentLevel
+     */
+    public function withIndentLevel(?int $indentLevel): static
+    {
+        return $this->with(YamlEncoder::YAML_INDENT, $indentLevel);
+    }
+
+    /**
+     * Configures \Symfony\Component\Yaml\Dumper::dump flags bitmask.
+     *
+     * @see Yaml
+     */
+    public function withFlags(?int $flags): static
+    {
+        return $this->with(YamlEncoder::YAML_FLAGS, $flags);
+    }
+
+    /**
+     * Configures whether to preserve empty objects "{}" or to convert them to null.
+     */
+    public function withPreservedEmptyObjects(?bool $preserveEmptyObjects): static
+    {
+        return $this->with(YamlEncoder::PRESERVE_EMPTY_OBJECTS, $preserveEmptyObjects);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/AbstractNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/AbstractNormalizerContextBuilder.php
new file mode 100644
index 000000000..a63e1a507
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/AbstractNormalizerContextBuilder.php
@@ -0,0 +1,188 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+
+/**
+ * A helper providing autocompletion for available AbstractNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+abstract class AbstractNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures how many loops of circular reference to allow while normalizing.
+     *
+     * The value 1 means that when we encounter the same object a
+     * second time, we consider that a circular reference.
+     *
+     * You can raise this value for special cases, e.g. in combination with the
+     * max depth setting of the object normalizer.
+     *
+     * Must be strictly positive.
+     *
+     * @param positive-int|null $circularReferenceLimit
+     */
+    public function withCircularReferenceLimit(?int $circularReferenceLimit): static
+    {
+        return $this->with(AbstractNormalizer::CIRCULAR_REFERENCE_LIMIT, $circularReferenceLimit);
+    }
+
+    /**
+     * Configures an object to be updated instead of creating a new instance.
+     *
+     * If you have a nested structure, child objects will be overwritten with
+     * new instances unless you set AbstractObjectNormalizer::DEEP_OBJECT_TO_POPULATE to true.
+     */
+    public function withObjectToPopulate(?object $objectToPopulate): static
+    {
+        return $this->with(AbstractNormalizer::OBJECT_TO_POPULATE, $objectToPopulate);
+    }
+
+    /**
+     * Configures groups containing attributes to (de)normalize.
+     *
+     * Eg: ['group1', 'group2']
+     *
+     * @param list<string>|string|null $groups
+     */
+    public function withGroups(array|string|null $groups): static
+    {
+        if (null === $groups) {
+            return $this->with(AbstractNormalizer::GROUPS, null);
+        }
+
+        return $this->with(AbstractNormalizer::GROUPS, (array) $groups);
+    }
+
+    /**
+     * Configures attributes to (de)normalize.
+     *
+     * For nested structures, this list needs to reflect the object tree.
+     *
+     * Eg: ['foo', 'bar', 'object' => ['baz']]
+     *
+     * @param array<string|array>|null $attributes
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withAttributes(?array $attributes): static
+    {
+        $it = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($attributes ?? []), \RecursiveIteratorIterator::LEAVES_ONLY);
+
+        foreach ($it as $attribute) {
+            if (!\is_string($attribute)) {
+                throw new InvalidArgumentException(\sprintf('Each attribute must be a string, "%s" given.', get_debug_type($attribute)));
+            }
+        }
+
+        return $this->with(AbstractNormalizer::ATTRIBUTES, $attributes);
+    }
+
+    /**
+     * If AbstractNormalizer::ATTRIBUTES are specified, and the source has fields that are not part of that list,
+     * configures whether to ignore those attributes or throw an ExtraAttributesException.
+     */
+    public function withAllowExtraAttributes(?bool $allowExtraAttributes): static
+    {
+        return $this->with(AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES, $allowExtraAttributes);
+    }
+
+    /**
+     * @deprecated since Symfony 7.1, use withDefaultConstructorArguments(?array $defaultConstructorArguments)" instead
+     *
+     * @param array<class-string, array<string, mixed>>|null $defaultContructorArguments
+     */
+    public function withDefaultContructorArguments(?array $defaultContructorArguments): static
+    {
+        trigger_deprecation('symfony/serializer', '7.1', 'The "%s()" method is deprecated, use "withDefaultConstructorArguments(?array $defaultConstructorArguments)" instead.', __METHOD__);
+
+        return self::withDefaultConstructorArguments($defaultContructorArguments);
+    }
+
+    /**
+     * Configures a hashmap of classes containing hashmaps of constructor argument => default value.
+     *
+     * The names need to match the parameter names in the constructor arguments.
+     *
+     * Eg: [Foo::class => ['foo' => true, 'bar' => 0]]
+     *
+     * @param array<class-string, array<string, mixed>>|null $defaultConstructorArguments
+     */
+    public function withDefaultConstructorArguments(?array $defaultConstructorArguments): static
+    {
+        return $this->with(AbstractNormalizer::DEFAULT_CONSTRUCTOR_ARGUMENTS, $defaultConstructorArguments);
+    }
+
+    /**
+     * Configures an hashmap of field name => callable to normalize this field.
+     *
+     * The callable is called if the field is encountered with the arguments:
+     *
+     * - mixed                 $attributeValue value of this field
+     * - object                $object         the whole object being normalized
+     * - string                $attributeName  name of the attribute being normalized
+     * - string                $format         the requested format
+     * - array<string, mixed>  $context        the serialization context
+     *
+     * @param array<string, callable>|null $callbacks
+     */
+    public function withCallbacks(?array $callbacks): static
+    {
+        return $this->with(AbstractNormalizer::CALLBACKS, $callbacks);
+    }
+
+    /**
+     * Configures an handler to call when a circular reference has been detected.
+     *
+     * If no handler is specified, a CircularReferenceException is thrown.
+     *
+     * The method will be called with ($object, $format, $context) and its
+     * return value is returned as the result of the normalize call.
+     */
+    public function withCircularReferenceHandler(?callable $circularReferenceHandler): static
+    {
+        return $this->with(AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER, $circularReferenceHandler);
+    }
+
+    /**
+     * Configures attributes to be skipped when normalizing an object tree.
+     *
+     * This list is applied to each element of nested structures.
+     *
+     * Eg: ['foo', 'bar']
+     *
+     * Note: The behaviour for nested structures is different from ATTRIBUTES
+     * for historical reason. Aligning the behaviour would be a BC break.
+     *
+     * @param list<string>|null $ignoredAttributes
+     */
+    public function withIgnoredAttributes(?array $ignoredAttributes): static
+    {
+        return $this->with(AbstractNormalizer::IGNORED_ATTRIBUTES, $ignoredAttributes);
+    }
+
+    /**
+     * Configures requiring all properties to be listed in the input instead
+     * of falling back to null for nullable ones.
+     */
+    public function withRequireAllProperties(?bool $requireAllProperties = true): static
+    {
+        return $this->with(AbstractNormalizer::REQUIRE_ALL_PROPERTIES, $requireAllProperties);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/AbstractObjectNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/AbstractObjectNormalizerContextBuilder.php
new file mode 100644
index 000000000..45b47bc1b
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/AbstractObjectNormalizerContextBuilder.php
@@ -0,0 +1,131 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+
+/**
+ * A helper providing autocompletion for available AbstractObjectNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+abstract class AbstractObjectNormalizerContextBuilder extends AbstractNormalizerContextBuilder
+{
+    /**
+     * Configures whether to respect the max depth metadata on fields.
+     */
+    public function withEnableMaxDepth(?bool $enableMaxDepth): static
+    {
+        return $this->with(AbstractObjectNormalizer::ENABLE_MAX_DEPTH, $enableMaxDepth);
+    }
+
+    /**
+     * Configures a pattern to keep track of the current depth.
+     *
+     * Must contain exactly two string placeholders.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withDepthKeyPattern(?string $depthKeyPattern): static
+    {
+        if (null === $depthKeyPattern) {
+            return $this->with(AbstractObjectNormalizer::DEPTH_KEY_PATTERN, null);
+        }
+
+        // This will match every occurrences of sprintf specifiers
+        $matches = [];
+        preg_match_all('/(?<!%)(?:%{2})*%(?<specifier>[a-z])/', $depthKeyPattern, $matches);
+
+        if (2 !== \count($matches['specifier']) || 's' !== $matches['specifier'][0] || 's' !== $matches['specifier'][1]) {
+            throw new InvalidArgumentException(\sprintf('The depth key pattern "%s" is not valid. You must set exactly two string placeholders.', $depthKeyPattern));
+        }
+
+        return $this->with(AbstractObjectNormalizer::DEPTH_KEY_PATTERN, $depthKeyPattern);
+    }
+
+    /**
+     * Configures whether verifying types match during denormalization.
+     */
+    public function withDisableTypeEnforcement(?bool $disableTypeEnforcement): static
+    {
+        return $this->with(AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT, $disableTypeEnforcement);
+    }
+
+    /**
+     * Configures whether fields with the value `null` should be output during normalization.
+     */
+    public function withSkipNullValues(?bool $skipNullValues): static
+    {
+        return $this->with(AbstractObjectNormalizer::SKIP_NULL_VALUES, $skipNullValues);
+    }
+
+    /**
+     * Configures whether uninitialized typed class properties should be excluded during normalization.
+     */
+    public function withSkipUninitializedValues(?bool $skipUninitializedValues): static
+    {
+        return $this->with(AbstractObjectNormalizer::SKIP_UNINITIALIZED_VALUES, $skipUninitializedValues);
+    }
+
+    /**
+     * Configures a callback to allow to set a value for an attribute when the max depth has
+     * been reached.
+     *
+     * If no callback is given, the attribute is skipped. If a callable is
+     * given, its return value is used (even if null).
+     *
+     * The arguments are:
+     *
+     * - mixed                 $attributeValue value of this field
+     * - object                $object         the whole object being normalized
+     * - string                $attributeName  name of the attribute being normalized
+     * - string                $format         the requested format
+     * - array<string, mixed>  $context        the serialization context
+     */
+    public function withMaxDepthHandler(?callable $maxDepthHandler): static
+    {
+        return $this->with(AbstractObjectNormalizer::MAX_DEPTH_HANDLER, $maxDepthHandler);
+    }
+
+    /**
+     * Configures which context key are not relevant to determine which attributes
+     * of an object to (de)normalize.
+     *
+     * @param list<string>|null $excludeFromCacheKeys
+     */
+    public function withExcludeFromCacheKeys(?array $excludeFromCacheKeys): static
+    {
+        return $this->with(AbstractObjectNormalizer::EXCLUDE_FROM_CACHE_KEY, $excludeFromCacheKeys);
+    }
+
+    /**
+     * Configures whether to tell the denormalizer to also populate existing objects on
+     * attributes of the main object.
+     *
+     * Setting this to true is only useful if you also specify the root object
+     * in AbstractNormalizer::OBJECT_TO_POPULATE.
+     */
+    public function withDeepObjectToPopulate(?bool $deepObjectToPopulate): static
+    {
+        return $this->with(AbstractObjectNormalizer::DEEP_OBJECT_TO_POPULATE, $deepObjectToPopulate);
+    }
+
+    /**
+     * Configures whether an empty object should be kept as an object (in
+     * JSON: {}) or converted to a list (in JSON: []).
+     */
+    public function withPreserveEmptyObjects(?bool $preserveEmptyObjects): static
+    {
+        return $this->with(AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS, $preserveEmptyObjects);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php
new file mode 100644
index 000000000..ca1a4f50a
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
+
+/**
+ * A helper providing autocompletion for available BackedEnumNormalizer options.
+ *
+ * @author Nicolas PHILIPPE <nikophil@gmail.com>
+ */
+final class BackedEnumNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures if invalid values are allowed in denormalization.
+     * They will be denormalized into `null` values.
+     */
+    public function withAllowInvalidValues(bool $allowInvalidValues): static
+    {
+        return $this->with(BackedEnumNormalizer::ALLOW_INVALID_VALUES, $allowInvalidValues);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/ConstraintViolationListNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/ConstraintViolationListNormalizerContextBuilder.php
new file mode 100644
index 000000000..fd1d7c4f5
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/ConstraintViolationListNormalizerContextBuilder.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
+
+/**
+ * A helper providing autocompletion for available ConstraintViolationList options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class ConstraintViolationListNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configure the instance field of normalized data.
+     */
+    public function withInstance(mixed $instance): static
+    {
+        return $this->with(ConstraintViolationListNormalizer::INSTANCE, $instance);
+    }
+
+    /**
+     * Configure the status field of normalized data.
+     */
+    public function withStatus(?int $status): static
+    {
+        return $this->with(ConstraintViolationListNormalizer::STATUS, $status);
+    }
+
+    /**
+     * Configure the title field of normalized data.
+     */
+    public function withTitle(?string $title): static
+    {
+        return $this->with(ConstraintViolationListNormalizer::TITLE, $title);
+    }
+
+    /**
+     * Configure the type field of normalized data.
+     */
+    public function withType(?string $type): static
+    {
+        return $this->with(ConstraintViolationListNormalizer::TYPE, $type);
+    }
+
+    /**
+     * Configures the payload fields which will act as an allowlist
+     * for the payload field of normalized data.
+     *
+     * Eg: ['foo', 'bar']
+     *
+     * @param list<string>|null $payloadFields
+     */
+    public function withPayloadFields(?array $payloadFields): static
+    {
+        return $this->with(ConstraintViolationListNormalizer::PAYLOAD_FIELDS, $payloadFields);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/DateIntervalNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/DateIntervalNormalizerContextBuilder.php
new file mode 100644
index 000000000..98636577a
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/DateIntervalNormalizerContextBuilder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
+
+/**
+ * A helper providing autocompletion for available DateIntervalNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class DateIntervalNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the format of the interval.
+     *
+     * @see https://php.net/manual/en/dateinterval.format.php
+     */
+    public function withFormat(?string $format): static
+    {
+        return $this->with(DateIntervalNormalizer::FORMAT_KEY, $format);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/DateTimeNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/DateTimeNormalizerContextBuilder.php
new file mode 100644
index 000000000..2a763f549
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/DateTimeNormalizerContextBuilder.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
+
+/**
+ * A helper providing autocompletion for available DateTimeNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class DateTimeNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the format of the date.
+     *
+     * @see https://secure.php.net/manual/en/datetime.format.php
+     */
+    public function withFormat(?string $format): static
+    {
+        return $this->with(DateTimeNormalizer::FORMAT_KEY, $format);
+    }
+
+    /**
+     * Configures the timezone of the date.
+     *
+     * It could be either a \DateTimeZone or a string
+     * that will be used to construct the \DateTimeZone
+     *
+     * @see https://secure.php.net/manual/en/class.datetimezone.php
+     *
+     * @param ?bool $force Whether to enforce the timezone during denormalization
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withTimezone(\DateTimeZone|string|null $timezone, ?bool $force = null): static
+    {
+        if (null === $timezone) {
+            return $this->with(DateTimeNormalizer::TIMEZONE_KEY, null)->with(DateTimeNormalizer::FORCE_TIMEZONE_KEY, $force);
+        }
+
+        if (\is_string($timezone)) {
+            try {
+                $timezone = new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new InvalidArgumentException(\sprintf('The "%s" timezone is invalid.', $timezone), previous: $e);
+            }
+        }
+
+        return $this->with(DateTimeNormalizer::TIMEZONE_KEY, $timezone)->with(DateTimeNormalizer::FORCE_TIMEZONE_KEY, $force);
+    }
+
+    /**
+     * @param 'int'|'float'|null $cast
+     */
+    public function withCast(?string $cast): static
+    {
+        return $this->with(DateTimeNormalizer::CAST_KEY, $cast);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/FormErrorNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/FormErrorNormalizerContextBuilder.php
new file mode 100644
index 000000000..4cd2ddb88
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/FormErrorNormalizerContextBuilder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\FormErrorNormalizer;
+
+/**
+ * A helper providing autocompletion for available FormErrorNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class FormErrorNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the title of the normalized data.
+     */
+    public function withTitle(?string $title): static
+    {
+        return $this->with(FormErrorNormalizer::TITLE, $title);
+    }
+
+    /**
+     * Configures the type of the normalized data.
+     */
+    public function withType(?string $type): static
+    {
+        return $this->with(FormErrorNormalizer::TYPE, $type);
+    }
+
+    /**
+     * Configures the code of the normalized data.
+     */
+    public function withStatusCode(?int $statusCode): static
+    {
+        return $this->with(FormErrorNormalizer::CODE, $statusCode);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/GetSetMethodNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/GetSetMethodNormalizerContextBuilder.php
new file mode 100644
index 000000000..a7d2f8244
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/GetSetMethodNormalizerContextBuilder.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+/**
+ * A helper providing autocompletion for available GetSetMethodNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class GetSetMethodNormalizerContextBuilder extends AbstractObjectNormalizerContextBuilder
+{
+}
diff --git a/symfony/serializer/Context/Normalizer/JsonSerializableNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/JsonSerializableNormalizerContextBuilder.php
new file mode 100644
index 000000000..249e74ff0
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/JsonSerializableNormalizerContextBuilder.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+/**
+ * A helper providing autocompletion for available JsonSerializableNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class JsonSerializableNormalizerContextBuilder extends AbstractNormalizerContextBuilder
+{
+}
diff --git a/symfony/serializer/Context/Normalizer/ObjectNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/ObjectNormalizerContextBuilder.php
new file mode 100644
index 000000000..eb8d15710
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/ObjectNormalizerContextBuilder.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+/**
+ * A helper providing autocompletion for available ObjectNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class ObjectNormalizerContextBuilder extends AbstractObjectNormalizerContextBuilder
+{
+}
diff --git a/symfony/serializer/Context/Normalizer/ProblemNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/ProblemNormalizerContextBuilder.php
new file mode 100644
index 000000000..b525a91ad
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/ProblemNormalizerContextBuilder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
+
+/**
+ * A helper providing autocompletion for available ProblemNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class ProblemNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configure the title field of normalized data.
+     */
+    public function withTitle(?string $title): static
+    {
+        return $this->with(ProblemNormalizer::TITLE, $title);
+    }
+
+    /**
+     * Configure the type field of normalized data.
+     */
+    public function withType(?string $type): static
+    {
+        return $this->with(ProblemNormalizer::TYPE, $type);
+    }
+
+    /**
+     * Configure the status field of normalized data.
+     */
+    public function withStatusCode(int|string|null $statusCode): static
+    {
+        return $this->with(ProblemNormalizer::STATUS, $statusCode);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/PropertyNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/PropertyNormalizerContextBuilder.php
new file mode 100644
index 000000000..71d5ed045
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/PropertyNormalizerContextBuilder.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
+
+/**
+ * A helper providing autocompletion for available PropertyNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class PropertyNormalizerContextBuilder extends AbstractObjectNormalizerContextBuilder
+{
+    /**
+     * Configures whether fields should be output based on visibility.
+     */
+    public function withNormalizeVisibility(int $normalizeVisibility): static
+    {
+        return $this->with(PropertyNormalizer::NORMALIZE_VISIBILITY, $normalizeVisibility);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/UidNormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/UidNormalizerContextBuilder.php
new file mode 100644
index 000000000..b809fe3eb
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/UidNormalizerContextBuilder.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\UidNormalizer;
+
+/**
+ * A helper providing autocompletion for available UidNormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class UidNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the uuid format for normalization.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withNormalizationFormat(?string $normalizationFormat): static
+    {
+        if (null !== $normalizationFormat && !\in_array($normalizationFormat, UidNormalizer::NORMALIZATION_FORMATS, true)) {
+            throw new InvalidArgumentException(\sprintf('The "%s" normalization format is not valid.', $normalizationFormat));
+        }
+
+        return $this->with(UidNormalizer::NORMALIZATION_FORMAT_KEY, $normalizationFormat);
+    }
+}
diff --git a/symfony/serializer/Context/Normalizer/UnwrappingDenormalizerContextBuilder.php b/symfony/serializer/Context/Normalizer/UnwrappingDenormalizerContextBuilder.php
new file mode 100644
index 000000000..2945cb961
--- /dev/null
+++ b/symfony/serializer/Context/Normalizer/UnwrappingDenormalizerContextBuilder.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
+use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\UnwrappingDenormalizer;
+
+/**
+ * A helper providing autocompletion for available UnwrappingDenormalizer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class UnwrappingDenormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures the path of wrapped data during denormalization.
+     *
+     * Eg: [foo].bar[bar]
+     *
+     * @see https://symfony.com/doc/current/components/property_access.html
+     *
+     * @throws InvalidArgumentException
+     */
+    public function withUnwrapPath(?string $unwrapPath): static
+    {
+        if (null === $unwrapPath) {
+            return $this->with(UnwrappingDenormalizer::UNWRAP_PATH, null);
+        }
+
+        try {
+            new PropertyPath($unwrapPath);
+        } catch (InvalidPropertyPathException $e) {
+            throw new InvalidArgumentException(\sprintf('The "%s" property path is not valid.', $unwrapPath), previous: $e);
+        }
+
+        return $this->with(UnwrappingDenormalizer::UNWRAP_PATH, $unwrapPath);
+    }
+}
diff --git a/symfony/serializer/Context/SerializerContextBuilder.php b/symfony/serializer/Context/SerializerContextBuilder.php
new file mode 100644
index 000000000..a6359be98
--- /dev/null
+++ b/symfony/serializer/Context/SerializerContextBuilder.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Serializer;
+
+/**
+ * A helper providing autocompletion for available Serializer options.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class SerializerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures whether an empty array should be transformed to an
+     * object (in JSON: {}) or to a list (in JSON: []).
+     */
+    public function withEmptyArrayAsObject(?bool $emptyArrayAsObject): static
+    {
+        return $this->with(Serializer::EMPTY_ARRAY_AS_OBJECT, $emptyArrayAsObject);
+    }
+
+    public function withCollectDenormalizationErrors(?bool $collectDenormalizationErrors): static
+    {
+        return $this->with(DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS, $collectDenormalizationErrors);
+    }
+}
diff --git a/symfony/serializer/DataCollector/SerializerDataCollector.php b/symfony/serializer/DataCollector/SerializerDataCollector.php
new file mode 100644
index 000000000..e87c51ca1
--- /dev/null
+++ b/symfony/serializer/DataCollector/SerializerDataCollector.php
@@ -0,0 +1,259 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\DataCollector;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
+use Symfony\Component\Serializer\Debug\TraceableSerializer;
+use Symfony\Component\VarDumper\Cloner\Data;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @final
+ */
+class SerializerDataCollector extends DataCollector implements LateDataCollectorInterface
+{
+    private const DATA_TEMPLATE = [
+        'serialize' => [],
+        'deserialize' => [],
+        'normalize' => [],
+        'denormalize' => [],
+        'encode' => [],
+        'decode' => [],
+    ];
+
+    private array $dataGroupedByName;
+    private array $collected = [];
+
+    public function reset(): void
+    {
+        $this->data = [];
+        unset($this->dataGroupedByName);
+        $this->collected = [];
+    }
+
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
+    {
+        // Everything is collected during the request, and formatted on kernel terminate.
+    }
+
+    public function getName(): string
+    {
+        return 'serializer';
+    }
+
+    public function getData(?string $name = null): Data|array
+    {
+        return null === $name ? $this->data : $this->getDataGroupedByName()[$name];
+    }
+
+    public function getHandledCount(?string $name = null): int
+    {
+        return array_sum(array_map('count', $this->getData($name)));
+    }
+
+    public function getTotalTime(): float
+    {
+        $totalTime = 0;
+
+        foreach ($this->data as $handled) {
+            $totalTime += array_sum(array_map(fn (array $el): float => $el['time'], $handled));
+        }
+
+        return $totalTime;
+    }
+
+    public function getSerializerNames(): array
+    {
+        return array_keys($this->getDataGroupedByName());
+    }
+
+    public function collectSerialize(string $traceId, mixed $data, string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'context', 'time', 'caller', 'name'),
+            ['method' => 'serialize'],
+        );
+    }
+
+    public function collectDeserialize(string $traceId, mixed $data, string $type, string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'type', 'context', 'time', 'caller', 'name'),
+            ['method' => 'deserialize'],
+        );
+    }
+
+    public function collectNormalize(string $traceId, mixed $data, ?string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'context', 'time', 'caller', 'name'),
+            ['method' => 'normalize'],
+        );
+    }
+
+    public function collectDenormalize(string $traceId, mixed $data, string $type, ?string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'type', 'context', 'time', 'caller', 'name'),
+            ['method' => 'denormalize'],
+        );
+    }
+
+    public function collectEncode(string $traceId, mixed $data, ?string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'context', 'time', 'caller', 'name'),
+            ['method' => 'encode'],
+        );
+    }
+
+    public function collectDecode(string $traceId, mixed $data, ?string $format, array $context, float $time, array $caller, string $name): void
+    {
+        unset($context[TraceableSerializer::DEBUG_TRACE_ID]);
+
+        $this->collected[$traceId] = array_merge(
+            $this->collected[$traceId] ?? [],
+            compact('data', 'format', 'context', 'time', 'caller', 'name'),
+            ['method' => 'decode'],
+        );
+    }
+
+    public function collectNormalization(string $traceId, string $normalizer, float $time, string $name): void
+    {
+        $method = 'normalize';
+
+        $this->collected[$traceId]['normalization'][] = compact('normalizer', 'method', 'time', 'name');
+    }
+
+    public function collectDenormalization(string $traceId, string $normalizer, float $time, string $name): void
+    {
+        $method = 'denormalize';
+
+        $this->collected[$traceId]['normalization'][] = compact('normalizer', 'method', 'time', 'name');
+    }
+
+    public function collectEncoding(string $traceId, string $encoder, float $time, string $name): void
+    {
+        $method = 'encode';
+
+        $this->collected[$traceId]['encoding'][] = compact('encoder', 'method', 'time', 'name');
+    }
+
+    public function collectDecoding(string $traceId, string $encoder, float $time, string $name): void
+    {
+        $method = 'decode';
+
+        $this->collected[$traceId]['encoding'][] = compact('encoder', 'method', 'time', 'name');
+    }
+
+    public function lateCollect(): void
+    {
+        $this->data = self::DATA_TEMPLATE;
+
+        foreach ($this->collected as $collected) {
+            if (!isset($collected['data'])) {
+                continue;
+            }
+
+            $data = [
+                'data' => $this->cloneVar($collected['data']),
+                'dataType' => get_debug_type($collected['data']),
+                'type' => $collected['type'] ?? null,
+                'format' => $collected['format'],
+                'time' => $collected['time'],
+                'context' => $this->cloneVar($collected['context']),
+                'normalization' => [],
+                'encoding' => [],
+                'caller' => $collected['caller'] ?? null,
+                'name' => $collected['name'],
+            ];
+
+            if (isset($collected['normalization'])) {
+                $mainNormalization = array_pop($collected['normalization']);
+
+                $data['normalizer'] = ['time' => $mainNormalization['time']] + $this->getMethodLocation($mainNormalization['normalizer'], $mainNormalization['method']);
+
+                foreach ($collected['normalization'] as $normalization) {
+                    if (!isset($data['normalization'][$normalization['normalizer']])) {
+                        $data['normalization'][$normalization['normalizer']] = ['time' => 0, 'calls' => 0] + $this->getMethodLocation($normalization['normalizer'], $normalization['method']);
+                    }
+
+                    ++$data['normalization'][$normalization['normalizer']]['calls'];
+                    $data['normalization'][$normalization['normalizer']]['time'] += $normalization['time'];
+                }
+            }
+
+            if (isset($collected['encoding'])) {
+                $mainEncoding = array_pop($collected['encoding']);
+
+                $data['encoder'] = ['time' => $mainEncoding['time']] + $this->getMethodLocation($mainEncoding['encoder'], $mainEncoding['method']);
+
+                foreach ($collected['encoding'] as $encoding) {
+                    if (!isset($data['encoding'][$encoding['encoder']])) {
+                        $data['encoding'][$encoding['encoder']] = ['time' => 0, 'calls' => 0] + $this->getMethodLocation($encoding['encoder'], $encoding['method']);
+                    }
+
+                    ++$data['encoding'][$encoding['encoder']]['calls'];
+                    $data['encoding'][$encoding['encoder']]['time'] += $encoding['time'];
+                }
+            }
+
+            $this->data[$collected['method']][] = $data;
+        }
+    }
+
+    private function getDataGroupedByName(): array
+    {
+        if (!isset($this->dataGroupedByName)) {
+            $this->dataGroupedByName = [];
+
+            foreach ($this->data as $method => $items) {
+                foreach ($items as $item) {
+                    $this->dataGroupedByName[$item['name']] ??= self::DATA_TEMPLATE;
+                    $this->dataGroupedByName[$item['name']][$method][] = $item;
+                }
+            }
+        }
+
+        return $this->dataGroupedByName;
+    }
+
+    private function getMethodLocation(string $class, string $method): array
+    {
+        $reflection = new \ReflectionClass($class);
+
+        return [
+            'class' => $reflection->getShortName(),
+            'file' => $reflection->getFileName(),
+            'line' => $reflection->getMethod($method)->getStartLine(),
+        ];
+    }
+}
diff --git a/symfony/serializer/Debug/TraceableEncoder.php b/symfony/serializer/Debug/TraceableEncoder.php
new file mode 100644
index 000000000..39e75e34f
--- /dev/null
+++ b/symfony/serializer/Debug/TraceableEncoder.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Debug;
+
+use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
+use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Collects some data about encoding.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @final
+ */
+class TraceableEncoder implements EncoderInterface, DecoderInterface, SerializerAwareInterface
+{
+    public function __construct(
+        private EncoderInterface|DecoderInterface $encoder,
+        private SerializerDataCollector $dataCollector,
+        private readonly string $serializerName = 'default',
+    ) {
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        if (!$this->encoder instanceof EncoderInterface) {
+            throw new \BadMethodCallException(\sprintf('The "%s()" method cannot be called as nested encoder doesn\'t implements "%s".', __METHOD__, EncoderInterface::class));
+        }
+
+        $startTime = microtime(true);
+        $encoded = $this->encoder->encode($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
+            $this->dataCollector->collectEncoding($traceId, $this->encoder::class, $time, $this->serializerName);
+        }
+
+        return $encoded;
+    }
+
+    public function supportsEncoding(string $format, array $context = []): bool
+    {
+        if (!$this->encoder instanceof EncoderInterface) {
+            return false;
+        }
+
+        return $this->encoder->supportsEncoding($format, $context);
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        if (!$this->encoder instanceof DecoderInterface) {
+            throw new \BadMethodCallException(\sprintf('The "%s()" method cannot be called as nested encoder doesn\'t implements "%s".', __METHOD__, DecoderInterface::class));
+        }
+
+        $startTime = microtime(true);
+        $encoded = $this->encoder->decode($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
+            $this->dataCollector->collectDecoding($traceId, $this->encoder::class, $time, $this->serializerName);
+        }
+
+        return $encoded;
+    }
+
+    public function supportsDecoding(string $format, array $context = []): bool
+    {
+        if (!$this->encoder instanceof DecoderInterface) {
+            return false;
+        }
+
+        return $this->encoder->supportsDecoding($format, $context);
+    }
+
+    public function setSerializer(SerializerInterface $serializer): void
+    {
+        if (!$this->encoder instanceof SerializerAwareInterface) {
+            return;
+        }
+
+        $this->encoder->setSerializer($serializer);
+    }
+
+    public function needsNormalization(): bool
+    {
+        return !$this->encoder instanceof NormalizationAwareInterface;
+    }
+
+    /**
+     * Proxies all method calls to the original encoder.
+     */
+    public function __call(string $method, array $arguments): mixed
+    {
+        return $this->encoder->{$method}(...$arguments);
+    }
+}
diff --git a/symfony/serializer/Debug/TraceableNormalizer.php b/symfony/serializer/Debug/TraceableNormalizer.php
new file mode 100644
index 000000000..d737f5b36
--- /dev/null
+++ b/symfony/serializer/Debug/TraceableNormalizer.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Debug;
+
+use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Collects some data about normalization.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @final
+ */
+class TraceableNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, NormalizerAwareInterface, DenormalizerAwareInterface
+{
+    public function __construct(
+        private NormalizerInterface|DenormalizerInterface $normalizer,
+        private SerializerDataCollector $dataCollector,
+        private readonly string $serializerName = 'default',
+    ) {
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return $this->normalizer->getSupportedTypes($format);
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        if (!$this->normalizer instanceof NormalizerInterface) {
+            throw new \BadMethodCallException(\sprintf('The "%s()" method cannot be called as nested normalizer doesn\'t implements "%s".', __METHOD__, NormalizerInterface::class));
+        }
+
+        $startTime = microtime(true);
+        $normalized = $this->normalizer->normalize($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
+            $this->dataCollector->collectNormalization($traceId, $this->normalizer::class, $time, $this->serializerName);
+        }
+
+        return $normalized;
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        if (!$this->normalizer instanceof NormalizerInterface) {
+            return false;
+        }
+
+        return $this->normalizer->supportsNormalization($data, $format, $context);
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        if (!$this->normalizer instanceof DenormalizerInterface) {
+            throw new \BadMethodCallException(\sprintf('The "%s()" method cannot be called as nested normalizer doesn\'t implements "%s".', __METHOD__, DenormalizerInterface::class));
+        }
+
+        $startTime = microtime(true);
+        $denormalized = $this->normalizer->denormalize($data, $type, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
+            $this->dataCollector->collectDenormalization($traceId, $this->normalizer::class, $time, $this->serializerName);
+        }
+
+        return $denormalized;
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        if (!$this->normalizer instanceof DenormalizerInterface) {
+            return false;
+        }
+
+        return $this->normalizer->supportsDenormalization($data, $type, $format, $context);
+    }
+
+    public function setSerializer(SerializerInterface $serializer): void
+    {
+        if (!$this->normalizer instanceof SerializerAwareInterface) {
+            return;
+        }
+
+        $this->normalizer->setSerializer($serializer);
+    }
+
+    public function setNormalizer(NormalizerInterface $normalizer): void
+    {
+        if (!$this->normalizer instanceof NormalizerAwareInterface) {
+            return;
+        }
+
+        $this->normalizer->setNormalizer($normalizer);
+    }
+
+    public function setDenormalizer(DenormalizerInterface $denormalizer): void
+    {
+        if (!$this->normalizer instanceof DenormalizerAwareInterface) {
+            return;
+        }
+
+        $this->normalizer->setDenormalizer($denormalizer);
+    }
+
+    /**
+     * Proxies all method calls to the original normalizer.
+     */
+    public function __call(string $method, array $arguments): mixed
+    {
+        return $this->normalizer->{$method}(...$arguments);
+    }
+}
diff --git a/symfony/serializer/Debug/TraceableSerializer.php b/symfony/serializer/Debug/TraceableSerializer.php
new file mode 100644
index 000000000..60cb2ec49
--- /dev/null
+++ b/symfony/serializer/Debug/TraceableSerializer.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Debug;
+
+use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
+use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Collects some data about serialization.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @final
+ */
+class TraceableSerializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, EncoderInterface, DecoderInterface
+{
+    public const DEBUG_TRACE_ID = 'debug_trace_id';
+
+    public function __construct(
+        private SerializerInterface&NormalizerInterface&DenormalizerInterface&EncoderInterface&DecoderInterface $serializer,
+        private SerializerDataCollector $dataCollector,
+        private readonly string $serializerName = 'default',
+    ) {
+    }
+
+    public function serialize(mixed $data, string $format, array $context = []): string
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->serialize($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, SerializerInterface::class);
+
+        $this->dataCollector->collectSerialize($traceId, $data, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->deserialize($data, $type, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, SerializerInterface::class);
+
+        $this->dataCollector->collectDeserialize($traceId, $data, $type, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->normalize($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, NormalizerInterface::class);
+
+        $this->dataCollector->collectNormalize($traceId, $data, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->denormalize($data, $type, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, DenormalizerInterface::class);
+
+        $this->dataCollector->collectDenormalize($traceId, $data, $type, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->encode($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, EncoderInterface::class);
+
+        $this->dataCollector->collectEncode($traceId, $data, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        $context[self::DEBUG_TRACE_ID] = $traceId = bin2hex(random_bytes(4));
+
+        $startTime = microtime(true);
+        $result = $this->serializer->decode($data, $format, $context);
+        $time = microtime(true) - $startTime;
+
+        $caller = $this->getCaller(__FUNCTION__, DecoderInterface::class);
+
+        $this->dataCollector->collectDecode($traceId, $data, $format, $context, $time, $caller, $this->serializerName);
+
+        return $result;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return $this->serializer->getSupportedTypes($format);
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $this->serializer->supportsNormalization($data, $format, $context);
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return $this->serializer->supportsDenormalization($data, $type, $format, $context);
+    }
+
+    public function supportsEncoding(string $format, array $context = []): bool
+    {
+        return $this->serializer->supportsEncoding($format, $context);
+    }
+
+    public function supportsDecoding(string $format, array $context = []): bool
+    {
+        return $this->serializer->supportsDecoding($format, $context);
+    }
+
+    /**
+     * Proxies all method calls to the original serializer.
+     */
+    public function __call(string $method, array $arguments): mixed
+    {
+        return $this->serializer->{$method}(...$arguments);
+    }
+
+    private function getCaller(string $method, string $interface): array
+    {
+        $trace = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 8);
+
+        $file = $trace[0]['file'];
+        $line = $trace[0]['line'];
+
+        for ($i = 1; $i < 8; ++$i) {
+            if (isset($trace[$i]['class'], $trace[$i]['function'])
+                && $method === $trace[$i]['function']
+                && is_a($trace[$i]['class'], $interface, true)
+            ) {
+                $file = $trace[$i]['file'] ?? $trace[$i + 1]['file'];
+                $line = $trace[$i]['line'] ?? $trace[$i + 1]['line'];
+
+                break;
+            }
+        }
+
+        $name = str_replace('\\', '/', $file);
+        $name = substr($name, strrpos($name, '/') + 1);
+
+        return compact('name', 'file', 'line');
+    }
+}
diff --git a/symfony/serializer/DependencyInjection/AttributeMetadataPass.php b/symfony/serializer/DependencyInjection/AttributeMetadataPass.php
new file mode 100644
index 000000000..545ce8cff
--- /dev/null
+++ b/symfony/serializer/DependencyInjection/AttributeMetadataPass.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Serializer\Exception\MappingException;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class AttributeMetadataPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->hasDefinition('serializer.mapping.attribute_loader')) {
+            return;
+        }
+
+        $resolve = $container->getParameterBag()->resolveValue(...);
+        $taggedClasses = [];
+        foreach ($container->getDefinitions() as $id => $definition) {
+            if (!$definition->hasTag('serializer.attribute_metadata')) {
+                continue;
+            }
+            $class = $resolve($definition->getClass());
+            foreach ($definition->getTag('serializer.attribute_metadata') as $attributes) {
+                if ($class !== $for = $attributes['for'] ?? $class) {
+                    $this->checkSourceMapsToTarget($container, $class, $for);
+                }
+
+                $taggedClasses[$for][$class] = true;
+            }
+        }
+
+        if (!$taggedClasses) {
+            return;
+        }
+
+        ksort($taggedClasses);
+
+        $container->getDefinition('serializer.mapping.attribute_loader')
+            ->replaceArgument(1, array_map('array_keys', $taggedClasses));
+    }
+
+    private function checkSourceMapsToTarget(ContainerBuilder $container, string $source, string $target): void
+    {
+        $source = $container->getReflectionClass($source);
+        $target = $container->getReflectionClass($target);
+
+        foreach ($source->getProperties() as $p) {
+            if ($p->class === $source->name && !($target->hasProperty($p->name) && $target->getProperty($p->name)->class === $target->name)) {
+                throw new MappingException(\sprintf('The property "%s" on "%s" is not present on "%s".', $p->name, $source->name, $target->name));
+            }
+        }
+
+        foreach ($source->getMethods() as $m) {
+            if ($m->class === $source->name && !($target->hasMethod($m->name) && $target->getMethod($m->name)->class === $target->name)) {
+                throw new MappingException(\sprintf('The method "%s" on "%s" is not present on "%s".', $m->name, $source->name, $target->name));
+            }
+        }
+    }
+}
diff --git a/symfony/serializer/DependencyInjection/SerializerPass.php b/symfony/serializer/DependencyInjection/SerializerPass.php
new file mode 100644
index 000000000..3f2a4ec72
--- /dev/null
+++ b/symfony/serializer/DependencyInjection/SerializerPass.php
@@ -0,0 +1,244 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Serializer\Debug\TraceableEncoder;
+use Symfony\Component\Serializer\Debug\TraceableNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Adds all services with the tags "serializer.encoder" and "serializer.normalizer" as
+ * encoders and normalizers to the "serializer" service.
+ *
+ * @author Javier Lopez <f12loalf@gmail.com>
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class SerializerPass implements CompilerPassInterface
+{
+    use PriorityTaggedServiceTrait;
+
+    private const NAME_CONVERTER_METADATA_AWARE_ID = 'serializer.name_converter.metadata_aware';
+
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->hasDefinition('serializer')) {
+            return;
+        }
+
+        $namedSerializers = $container->hasParameter('.serializer.named_serializers')
+            ? $container->getParameter('.serializer.named_serializers') : [];
+
+        $this->createNamedSerializerTags($container, 'serializer.normalizer', 'include_built_in_normalizers', $namedSerializers);
+        $this->createNamedSerializerTags($container, 'serializer.encoder', 'include_built_in_encoders', $namedSerializers);
+
+        if (!$normalizers = $this->findAndSortTaggedServices('serializer.normalizer.default', $container)) {
+            throw new RuntimeException('You must tag at least one service as "serializer.normalizer" to use the "serializer" service.');
+        }
+
+        if (!$encoders = $this->findAndSortTaggedServices('serializer.encoder.default', $container)) {
+            throw new RuntimeException('You must tag at least one service as "serializer.encoder" to use the "serializer" service.');
+        }
+
+        $defaultContext = [];
+        if ($container->hasParameter('serializer.default_context')) {
+            $defaultContext = $container->getParameter('serializer.default_context');
+            $container->getParameterBag()->remove('serializer.default_context');
+            $container->getDefinition('serializer')->setArgument('$defaultContext', $defaultContext);
+        }
+
+        /** @var ?string $circularReferenceHandler */
+        $circularReferenceHandler = $container->hasParameter('.serializer.circular_reference_handler')
+            ? $container->getParameter('.serializer.circular_reference_handler') : null;
+
+        /** @var ?string $maxDepthHandler */
+        $maxDepthHandler = $container->hasParameter('.serializer.max_depth_handler')
+            ? $container->getParameter('.serializer.max_depth_handler') : null;
+
+        $this->bindDefaultContext($container, array_merge($normalizers, $encoders), $defaultContext, $circularReferenceHandler, $maxDepthHandler);
+
+        $this->configureSerializer($container, 'serializer', $normalizers, $encoders, 'default');
+
+        if ($namedSerializers) {
+            $this->configureNamedSerializers($container, $circularReferenceHandler, $maxDepthHandler);
+        }
+    }
+
+    private function createNamedSerializerTags(ContainerBuilder $container, string $tagName, string $configName, array $namedSerializers): void
+    {
+        $serializerNames = array_keys($namedSerializers);
+        $withBuiltIn = array_filter($serializerNames, fn (string $name) => $namedSerializers[$name][$configName] ?? false);
+
+        foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $tags) {
+            $definition = $container->getDefinition($serviceId);
+
+            if (array_any($tags, $closure = fn (array $tag) => (bool) $tag)) {
+                $tags = array_filter($tags, $closure);
+            }
+
+            foreach ($tags as $tag) {
+                $names = (array) ($tag['serializer'] ?? []);
+
+                if (!$names) {
+                    $names = ['default'];
+                } elseif (\in_array('*', $names, true)) {
+                    $names = array_unique(['default', ...$serializerNames]);
+                }
+
+                if ($tag['built_in'] ?? false) {
+                    $names = array_unique(['default', ...$names, ...$withBuiltIn]);
+                }
+
+                unset($tag['serializer'], $tag['built_in']);
+
+                foreach ($names as $name) {
+                    $definition->addTag($tagName.'.'.$name, $tag);
+                }
+            }
+        }
+    }
+
+    private function bindDefaultContext(ContainerBuilder $container, array $services, array $defaultContext, ?string $circularReferenceHandler, ?string $maxDepthHandler): void
+    {
+        foreach ($services as $id) {
+            $definition = $container->getDefinition((string) $id);
+
+            $context = $defaultContext;
+            if (is_a($definition->getClass(), ObjectNormalizer::class, true)) {
+                if (null !== $circularReferenceHandler) {
+                    $context += ['circular_reference_handler' => new Reference($circularReferenceHandler)];
+                }
+                if (null !== $maxDepthHandler) {
+                    $context += ['max_depth_handler' => new Reference($maxDepthHandler)];
+                }
+            }
+
+            $definition->setBindings(['array $defaultContext' => new BoundArgument($context, false)] + $definition->getBindings());
+        }
+    }
+
+    private function configureSerializer(ContainerBuilder $container, string $id, array $normalizers, array $encoders, string $serializerName): void
+    {
+        if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {
+            foreach ($normalizers as $i => $normalizer) {
+                $normalizers[$i] = $container->register('.debug.serializer.normalizer.'.$normalizer, TraceableNormalizer::class)
+                    ->setArguments([$normalizer, new Reference('serializer.data_collector'), $serializerName]);
+            }
+
+            foreach ($encoders as $i => $encoder) {
+                $encoders[$i] = $container->register('.debug.serializer.encoder.'.$encoder, TraceableEncoder::class)
+                    ->setArguments([$encoder, new Reference('serializer.data_collector'), $serializerName]);
+            }
+        }
+
+        $serializerDefinition = $container->getDefinition($id);
+        $serializerDefinition->replaceArgument(0, $normalizers);
+        $serializerDefinition->replaceArgument(1, $encoders);
+    }
+
+    private function configureNamedSerializers(ContainerBuilder $container, ?string $circularReferenceHandler, ?string $maxDepthHandler): void
+    {
+        $defaultSerializerNameConverter = $container->hasParameter('.serializer.name_converter')
+            ? $container->getParameter('.serializer.name_converter') : null;
+
+        foreach ($container->getParameter('.serializer.named_serializers') as $serializerName => $config) {
+            $config += ['default_context' => [], 'name_converter' => null];
+            $serializerId = 'serializer.'.$serializerName;
+
+            if (!$normalizers = $this->findAndSortTaggedServices('serializer.normalizer.'.$serializerName, $container)) {
+                throw new RuntimeException(\sprintf('The named serializer "%1$s" requires at least one registered normalizer. Tag the normalizers as "serializer.normalizer" with the "serializer" attribute set to "%1$s".', $serializerName));
+            }
+
+            if (!$encoders = $this->findAndSortTaggedServices('serializer.encoder.'.$serializerName, $container)) {
+                throw new RuntimeException(\sprintf('The named serializer "%1$s" requires at least one registered encoder. Tag the encoders as "serializer.encoder" with the "serializer" attribute set to "%1$s".', $serializerName));
+            }
+
+            $config['name_converter'] = $defaultSerializerNameConverter !== $config['name_converter']
+                ? $this->buildChildNameConverterDefinition($container, $config['name_converter'])
+                : self::NAME_CONVERTER_METADATA_AWARE_ID;
+
+            $normalizers = $this->buildChildDefinitions($container, $serializerName, $normalizers, $config);
+            $encoders = $this->buildChildDefinitions($container, $serializerName, $encoders, $config);
+
+            $this->bindDefaultContext($container, array_merge($normalizers, $encoders), $config['default_context'], $circularReferenceHandler, $maxDepthHandler);
+
+            $container->registerChild($serializerId, 'serializer')->setArgument('$defaultContext', $config['default_context']);
+            $container->registerAliasForArgument($serializerId, SerializerInterface::class, $serializerName.'.serializer');
+            $container->registerAliasForArgument($serializerId, SerializerInterface::class, $serializerName);
+            $container->registerAliasForArgument($serializerId, NormalizerInterface::class, $serializerName.'.normalizer');
+            $container->registerAliasForArgument($serializerId, NormalizerInterface::class, $serializerName);
+            $container->registerAliasForArgument($serializerId, DenormalizerInterface::class, $serializerName.'.denormalizer');
+            $container->registerAliasForArgument($serializerId, DenormalizerInterface::class, $serializerName);
+
+            $this->configureSerializer($container, $serializerId, $normalizers, $encoders, $serializerName);
+
+            if ($container->getParameter('kernel.debug') && $container->hasDefinition('debug.serializer')) {
+                $container->registerChild($debugId = 'debug.'.$serializerId, 'debug.serializer')
+                    ->setDecoratedService($serializerId)
+                    ->replaceArgument(0, new Reference($debugId.'.inner'))
+                    ->replaceArgument(2, $serializerName);
+            }
+        }
+    }
+
+    private function buildChildNameConverterDefinition(ContainerBuilder $container, ?string $nameConverter): ?string
+    {
+        $childId = self::NAME_CONVERTER_METADATA_AWARE_ID.'.'.ContainerBuilder::hash($nameConverter);
+
+        if (!$container->hasDefinition($childId)) {
+            $childDefinition = $container->registerChild($childId, self::NAME_CONVERTER_METADATA_AWARE_ID.'.abstract');
+            if (null !== $nameConverter) {
+                $childDefinition->addArgument(new Reference($nameConverter));
+            }
+        }
+
+        return $childId;
+    }
+
+    private function buildChildDefinitions(ContainerBuilder $container, string $serializerName, array $services, array $config): array
+    {
+        foreach ($services as &$id) {
+            $childId = $id.'.'.$serializerName;
+
+            $definition = $container->registerChild($childId, (string) $id)
+                ->setClass($container->getDefinition((string) $id)->getClass())
+            ;
+
+            if (null !== $nameConverterIndex = $this->findNameConverterIndex($container, (string) $id)) {
+                $definition->replaceArgument($nameConverterIndex, new Reference($config['name_converter']));
+            }
+
+            $id = new Reference($childId);
+        }
+
+        return $services;
+    }
+
+    private function findNameConverterIndex(ContainerBuilder $container, string $id): int|string|null
+    {
+        foreach ($container->getDefinition($id)->getArguments() as $index => $argument) {
+            if ($argument instanceof Reference && self::NAME_CONVERTER_METADATA_AWARE_ID === (string) $argument) {
+                return $index;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/symfony/serializer/Encoder/ChainDecoder.php b/symfony/serializer/Encoder/ChainDecoder.php
new file mode 100644
index 000000000..8df5cd8b8
--- /dev/null
+++ b/symfony/serializer/Encoder/ChainDecoder.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\RuntimeException;
+
+/**
+ * Decoder delegating the decoding to a chain of decoders.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ *
+ * @final
+ */
+class ChainDecoder implements ContextAwareDecoderInterface
+{
+    /**
+     * @var array<string, array-key>
+     */
+    private array $decoderByFormat = [];
+
+    /**
+     * @param array<DecoderInterface> $decoders
+     */
+    public function __construct(
+        private readonly array $decoders = [],
+    ) {
+    }
+
+    final public function decode(string $data, string $format, array $context = []): mixed
+    {
+        return $this->getDecoder($format, $context)->decode($data, $format, $context);
+    }
+
+    public function supportsDecoding(string $format, array $context = []): bool
+    {
+        try {
+            $this->getDecoder($format, $context);
+        } catch (RuntimeException) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Gets the decoder supporting the format.
+     *
+     * @throws RuntimeException if no decoder is found
+     */
+    private function getDecoder(string $format, array $context): DecoderInterface
+    {
+        if (isset($this->decoderByFormat[$format])
+            && isset($this->decoders[$this->decoderByFormat[$format]])
+        ) {
+            return $this->decoders[$this->decoderByFormat[$format]];
+        }
+
+        $cache = true;
+        foreach ($this->decoders as $i => $decoder) {
+            $cache = $cache && !$decoder instanceof ContextAwareDecoderInterface;
+            if ($decoder->supportsDecoding($format, $context)) {
+                if ($cache) {
+                    $this->decoderByFormat[$format] = $i;
+                }
+
+                return $decoder;
+            }
+        }
+
+        throw new RuntimeException(\sprintf('No decoder found for format "%s".', $format));
+    }
+}
diff --git a/symfony/serializer/Encoder/ChainEncoder.php b/symfony/serializer/Encoder/ChainEncoder.php
new file mode 100644
index 000000000..3621471b4
--- /dev/null
+++ b/symfony/serializer/Encoder/ChainEncoder.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Debug\TraceableEncoder;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+
+/**
+ * Encoder delegating the decoding to a chain of encoders.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ *
+ * @final
+ */
+class ChainEncoder implements ContextAwareEncoderInterface
+{
+    /**
+     * @var array<string, array-key>
+     */
+    private array $encoderByFormat = [];
+
+    /**
+     * @param array<EncoderInterface> $encoders
+     */
+    public function __construct(
+        private readonly array $encoders = [],
+    ) {
+    }
+
+    final public function encode(mixed $data, string $format, array $context = []): string
+    {
+        return $this->getEncoder($format, $context)->encode($data, $format, $context);
+    }
+
+    public function supportsEncoding(string $format, array $context = []): bool
+    {
+        try {
+            $this->getEncoder($format, $context);
+        } catch (RuntimeException) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks whether the normalization is needed for the given format.
+     */
+    public function needsNormalization(string $format, array $context = []): bool
+    {
+        $encoder = $this->getEncoder($format, $context);
+
+        if ($encoder instanceof TraceableEncoder) {
+            return $encoder->needsNormalization();
+        }
+
+        if (!$encoder instanceof NormalizationAwareInterface) {
+            return true;
+        }
+
+        if ($encoder instanceof self) {
+            return $encoder->needsNormalization($format, $context);
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the encoder supporting the format.
+     *
+     * @throws RuntimeException if no encoder is found
+     */
+    private function getEncoder(string $format, array $context): EncoderInterface
+    {
+        if (isset($this->encoderByFormat[$format])
+            && isset($this->encoders[$this->encoderByFormat[$format]])
+        ) {
+            return $this->encoders[$this->encoderByFormat[$format]];
+        }
+
+        $cache = true;
+        foreach ($this->encoders as $i => $encoder) {
+            $cache = $cache && !$encoder instanceof ContextAwareEncoderInterface;
+            if ($encoder->supportsEncoding($format, $context)) {
+                if ($cache) {
+                    $this->encoderByFormat[$format] = $i;
+                }
+
+                return $encoder;
+            }
+        }
+
+        throw new RuntimeException(\sprintf('No encoder found for format "%s".', $format));
+    }
+}
diff --git a/symfony/serializer/Encoder/ContextAwareDecoderInterface.php b/symfony/serializer/Encoder/ContextAwareDecoderInterface.php
new file mode 100644
index 000000000..4b63dbc03
--- /dev/null
+++ b/symfony/serializer/Encoder/ContextAwareDecoderInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+/**
+ * Adds the support of an extra $context parameter for the supportsDecoding method.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface ContextAwareDecoderInterface extends DecoderInterface
+{
+    /**
+     * @param array $context options that decoders have access to
+     */
+    public function supportsDecoding(string $format, array $context = []): bool;
+}
diff --git a/symfony/serializer/Encoder/ContextAwareEncoderInterface.php b/symfony/serializer/Encoder/ContextAwareEncoderInterface.php
new file mode 100644
index 000000000..027cf8393
--- /dev/null
+++ b/symfony/serializer/Encoder/ContextAwareEncoderInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+/**
+ * Adds the support of an extra $context parameter for the supportsEncoding method.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface ContextAwareEncoderInterface extends EncoderInterface
+{
+    /**
+     * @param array $context options that encoders have access to
+     */
+    public function supportsEncoding(string $format, array $context = []): bool;
+}
diff --git a/symfony/serializer/Encoder/CsvEncoder.php b/symfony/serializer/Encoder/CsvEncoder.php
new file mode 100644
index 000000000..188e699a3
--- /dev/null
+++ b/symfony/serializer/Encoder/CsvEncoder.php
@@ -0,0 +1,296 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * Encodes CSV data.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Oliver Hoff <oliver@hofff.com>
+ */
+class CsvEncoder implements EncoderInterface, DecoderInterface
+{
+    public const FORMAT = 'csv';
+    public const DELIMITER_KEY = 'csv_delimiter';
+    public const ENCLOSURE_KEY = 'csv_enclosure';
+    /**
+     * @deprecated since Symfony 7.2, to be removed in 8.0
+     */
+    public const ESCAPE_CHAR_KEY = 'csv_escape_char';
+    public const KEY_SEPARATOR_KEY = 'csv_key_separator';
+    public const HEADERS_KEY = 'csv_headers';
+    public const ESCAPE_FORMULAS_KEY = 'csv_escape_formulas';
+    public const AS_COLLECTION_KEY = 'as_collection';
+    public const NO_HEADERS_KEY = 'no_headers';
+    public const END_OF_LINE = 'csv_end_of_line';
+    public const OUTPUT_UTF8_BOM_KEY = 'output_utf8_bom';
+
+    private const UTF8_BOM = "\xEF\xBB\xBF";
+
+    private const FORMULAS_START_CHARACTERS = ['=', '-', '+', '@', "\t", "\r", "\n"];
+
+    private array $defaultContext = [
+        self::DELIMITER_KEY => ',',
+        self::ENCLOSURE_KEY => '"',
+        self::ESCAPE_CHAR_KEY => '',
+        self::END_OF_LINE => "\n",
+        self::ESCAPE_FORMULAS_KEY => false,
+        self::HEADERS_KEY => [],
+        self::KEY_SEPARATOR_KEY => '.',
+        self::NO_HEADERS_KEY => false,
+        self::AS_COLLECTION_KEY => true,
+        self::OUTPUT_UTF8_BOM_KEY => false,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        if (\array_key_exists(self::ESCAPE_CHAR_KEY, $defaultContext)) {
+            trigger_deprecation('symfony/serializer', '7.2', 'Setting the "csv_escape_char" option is deprecated. The option will be removed in 8.0.');
+        }
+
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $handle = fopen('php://temp,', 'w+');
+
+        if (!is_iterable($data)) {
+            $data = [[$data]];
+        } elseif (!$data) {
+            $data = [[]];
+        } else {
+            if ($data instanceof \Traversable) {
+                // Generators can only be iterated once — convert to array to allow multiple traversals
+                $data = iterator_to_array($data);
+            }
+            // Sequential arrays of arrays are considered as collections
+            $i = 0;
+            foreach ($data as $key => $value) {
+                if ($i !== $key || !\is_array($value)) {
+                    $data = [$data];
+                    break;
+                }
+
+                ++$i;
+            }
+        }
+
+        [$delimiter, $enclosure, $escapeChar, $keySeparator, $headers, $escapeFormulas, $outputBom] = $this->getCsvOptions($context);
+
+        foreach ($data as &$value) {
+            $flattened = [];
+            $this->flatten($value, $flattened, $keySeparator, '', $escapeFormulas);
+            $value = $flattened;
+        }
+        unset($value);
+
+        $headers = array_merge(array_values($headers), array_diff($this->extractHeaders($data), $headers));
+        $endOfLine = $context[self::END_OF_LINE] ?? $this->defaultContext[self::END_OF_LINE];
+
+        if (!($context[self::NO_HEADERS_KEY] ?? $this->defaultContext[self::NO_HEADERS_KEY])) {
+            fputcsv($handle, $headers, $delimiter, $enclosure, $escapeChar);
+            if ("\n" !== $endOfLine && 0 === fseek($handle, -1, \SEEK_CUR)) {
+                fwrite($handle, $endOfLine);
+            }
+        }
+
+        $headers = array_fill_keys($headers, '');
+        foreach ($data as $row) {
+            fputcsv($handle, array_replace($headers, $row), $delimiter, $enclosure, $escapeChar);
+            if ("\n" !== $endOfLine && 0 === fseek($handle, -1, \SEEK_CUR)) {
+                fwrite($handle, $endOfLine);
+            }
+        }
+
+        rewind($handle);
+        $value = stream_get_contents($handle);
+        fclose($handle);
+
+        if ($outputBom) {
+            if (!preg_match('//u', $value)) {
+                throw new UnexpectedValueException('You are trying to add a UTF-8 BOM to a non UTF-8 text.');
+            }
+
+            $value = self::UTF8_BOM.$value;
+        }
+
+        return $value;
+    }
+
+    public function supportsEncoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        $handle = fopen('php://temp', 'r+');
+        fwrite($handle, $data);
+        rewind($handle);
+
+        if (str_starts_with($data, self::UTF8_BOM)) {
+            fseek($handle, \strlen(self::UTF8_BOM));
+        }
+
+        $headers = null;
+        $nbHeaders = 0;
+        $headerCount = [];
+        $result = [];
+
+        [$delimiter, $enclosure, $escapeChar, $keySeparator, , , , $asCollection] = $this->getCsvOptions($context);
+
+        while (false !== ($cols = fgetcsv($handle, 0, $delimiter, $enclosure, $escapeChar))) {
+            $nbCols = \count($cols);
+
+            if (null === $headers) {
+                $nbHeaders = $nbCols;
+
+                if ($context[self::NO_HEADERS_KEY] ?? $this->defaultContext[self::NO_HEADERS_KEY]) {
+                    for ($i = 0; $i < $nbCols; ++$i) {
+                        $headers[] = [$i];
+                    }
+                    $headerCount = array_fill(0, $nbCols, 1);
+                } else {
+                    foreach ($cols as $col) {
+                        $header = explode($keySeparator, $col ?? '');
+                        $headers[] = $header;
+                        $headerCount[] = \count($header);
+                    }
+
+                    continue;
+                }
+            }
+
+            $item = [];
+            for ($i = 0; ($i < $nbCols) && ($i < $nbHeaders); ++$i) {
+                $depth = $headerCount[$i];
+                $arr = &$item;
+                for ($j = 0; $j < $depth; ++$j) {
+                    $headerName = $headers[$i][$j];
+
+                    if ('' === $headerName) {
+                        $headerName = $i;
+                    }
+
+                    // Handle nested arrays
+                    if ($j === ($depth - 1)) {
+                        $arr[$headerName] = $cols[$i];
+
+                        continue;
+                    }
+
+                    if (!isset($arr[$headerName])) {
+                        $arr[$headerName] = [];
+                    }
+
+                    $arr = &$arr[$headerName];
+                }
+            }
+
+            $result[] = $item;
+        }
+        fclose($handle);
+
+        if ($asCollection) {
+            return $result;
+        }
+
+        if (!$result || isset($result[1])) {
+            return $result;
+        }
+
+        // If there is only one data line in the document, return it (the line), the result is not considered as a collection
+        return $result[0];
+    }
+
+    public function supportsDecoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+
+    /**
+     * Flattens an array and generates keys including the path.
+     */
+    private function flatten(iterable $array, array &$result, string $keySeparator, string $parentKey = '', bool $escapeFormulas = false): void
+    {
+        foreach ($array as $key => $value) {
+            if (is_iterable($value)) {
+                $this->flatten($value, $result, $keySeparator, $parentKey.$key.$keySeparator, $escapeFormulas);
+            } else {
+                if ($escapeFormulas && \in_array(substr((string) $value, 0, 1), self::FORMULAS_START_CHARACTERS, true)) {
+                    $result[$parentKey.$key] = "'".$value;
+                } else {
+                    // Ensures an actual value is used when dealing with true and false
+                    $result[$parentKey.$key] = false === $value ? 0 : (true === $value ? 1 : $value);
+                }
+            }
+        }
+    }
+
+    private function getCsvOptions(array $context): array
+    {
+        $delimiter = $context[self::DELIMITER_KEY] ?? $this->defaultContext[self::DELIMITER_KEY];
+        $enclosure = $context[self::ENCLOSURE_KEY] ?? $this->defaultContext[self::ENCLOSURE_KEY];
+        $escapeChar = $context[self::ESCAPE_CHAR_KEY] ?? $this->defaultContext[self::ESCAPE_CHAR_KEY];
+        $keySeparator = $context[self::KEY_SEPARATOR_KEY] ?? $this->defaultContext[self::KEY_SEPARATOR_KEY];
+        $headers = $context[self::HEADERS_KEY] ?? $this->defaultContext[self::HEADERS_KEY];
+        $escapeFormulas = $context[self::ESCAPE_FORMULAS_KEY] ?? $this->defaultContext[self::ESCAPE_FORMULAS_KEY];
+        $outputBom = $context[self::OUTPUT_UTF8_BOM_KEY] ?? $this->defaultContext[self::OUTPUT_UTF8_BOM_KEY];
+        $asCollection = $context[self::AS_COLLECTION_KEY] ?? $this->defaultContext[self::AS_COLLECTION_KEY];
+
+        if (!\is_array($headers)) {
+            throw new InvalidArgumentException(\sprintf('The "%s" context variable must be an array or null, given "%s".', self::HEADERS_KEY, get_debug_type($headers)));
+        }
+
+        return [$delimiter, $enclosure, $escapeChar, $keySeparator, $headers, $escapeFormulas, $outputBom, $asCollection];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function extractHeaders(iterable $data): array
+    {
+        $headers = [];
+        $flippedHeaders = [];
+
+        foreach ($data as $row) {
+            $previousHeader = null;
+
+            foreach ($row as $header => $_) {
+                if (isset($flippedHeaders[$header])) {
+                    $previousHeader = $header;
+                    continue;
+                }
+
+                if (null === $previousHeader) {
+                    $n = \count($headers);
+                } else {
+                    $n = $flippedHeaders[$previousHeader] + 1;
+
+                    for ($j = \count($headers); $j > $n; --$j) {
+                        ++$flippedHeaders[$headers[$j] = $headers[$j - 1]];
+                    }
+                }
+
+                $headers[$n] = $header;
+                $flippedHeaders[$header] = $n;
+                $previousHeader = $header;
+            }
+        }
+
+        return $headers;
+    }
+}
diff --git a/symfony/serializer/Encoder/DecoderInterface.php b/symfony/serializer/Encoder/DecoderInterface.php
new file mode 100644
index 000000000..09ec9434d
--- /dev/null
+++ b/symfony/serializer/Encoder/DecoderInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface DecoderInterface
+{
+    /**
+     * Decodes a string into PHP data.
+     *
+     * @param string $data    Data to decode
+     * @param string $format  Format name
+     * @param array  $context Options that decoders have access to
+     *
+     * The format parameter specifies which format the data is in; valid values
+     * depend on the specific implementation. Authors implementing this interface
+     * are encouraged to document which formats they support in a non-inherited
+     * phpdoc comment.
+     *
+     * @throws UnexpectedValueException
+     */
+    public function decode(string $data, string $format, array $context = []): mixed;
+
+    /**
+     * Checks whether the deserializer can decode from given format.
+     *
+     * @param string $format Format name
+     */
+    public function supportsDecoding(string $format): bool;
+}
diff --git a/symfony/serializer/Encoder/EncoderInterface.php b/symfony/serializer/Encoder/EncoderInterface.php
new file mode 100644
index 000000000..e0f303b1e
--- /dev/null
+++ b/symfony/serializer/Encoder/EncoderInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface EncoderInterface
+{
+    /**
+     * Encodes data into the given format.
+     *
+     * @param mixed  $data    Data to encode
+     * @param string $format  Format name
+     * @param array  $context Options that normalizers/encoders have access to
+     *
+     * @throws UnexpectedValueException
+     */
+    public function encode(mixed $data, string $format, array $context = []): string;
+
+    /**
+     * Checks whether the serializer can encode to given format.
+     *
+     * @param string $format Format name
+     */
+    public function supportsEncoding(string $format): bool;
+}
diff --git a/symfony/serializer/Encoder/JsonDecode.php b/symfony/serializer/Encoder/JsonDecode.php
new file mode 100644
index 000000000..b50538175
--- /dev/null
+++ b/symfony/serializer/Encoder/JsonDecode.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Seld\JsonLint\JsonParser;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+use Symfony\Component\Serializer\Exception\UnsupportedException;
+
+/**
+ * Decodes JSON data.
+ *
+ * @author Sander Coolen <sander@jibber.nl>
+ */
+class JsonDecode implements DecoderInterface
+{
+    /**
+     * True to return the result as an associative array, false for a nested stdClass hierarchy.
+     */
+    public const ASSOCIATIVE = 'json_decode_associative';
+
+    /**
+     * True to enable seld/jsonlint as a source for more specific error messages when json_decode fails.
+     */
+    public const DETAILED_ERROR_MESSAGES = 'json_decode_detailed_errors';
+
+    public const OPTIONS = 'json_decode_options';
+
+    /**
+     * Specifies the recursion depth.
+     */
+    public const RECURSION_DEPTH = 'json_decode_recursion_depth';
+
+    private array $defaultContext = [
+        self::ASSOCIATIVE => false,
+        self::DETAILED_ERROR_MESSAGES => false,
+        self::OPTIONS => 0,
+        self::RECURSION_DEPTH => 512,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    /**
+     * Decodes data.
+     *
+     * @param string $data    The encoded JSON string to decode
+     * @param string $format  Must be set to JsonEncoder::FORMAT
+     * @param array  $context An optional set of options for the JSON decoder; see below
+     *
+     * The $context array is a simple key=>value array, with the following supported keys:
+     *
+     * json_decode_associative: boolean
+     *      If true, returns the object as an associative array.
+     *      If false, returns the object as nested stdClass
+     *      If not specified, this method will use the default set in JsonDecode::__construct
+     *
+     * json_decode_recursion_depth: integer
+     *      Specifies the maximum recursion depth
+     *      If not specified, this method will use the default set in JsonDecode::__construct
+     *
+     * json_decode_options: integer
+     *      Specifies additional options as per documentation for json_decode
+     *
+     * json_decode_detailed_errors: bool
+     *      If true, enables seld/jsonlint as a source for more specific error messages when json_decode fails.
+     *      If false or not specified, this method will use default error messages from PHP's json_decode
+     *
+     * @throws NotEncodableValueException
+     *
+     * @see https://php.net/json_decode
+     */
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        $associative = $context[self::ASSOCIATIVE] ?? $this->defaultContext[self::ASSOCIATIVE];
+        $recursionDepth = $context[self::RECURSION_DEPTH] ?? $this->defaultContext[self::RECURSION_DEPTH];
+        $options = $context[self::OPTIONS] ?? $this->defaultContext[self::OPTIONS];
+
+        try {
+            $decodedData = json_decode($data, $associative, $recursionDepth, $options);
+        } catch (\JsonException $e) {
+            throw new NotEncodableValueException($e->getMessage(), 0, $e);
+        }
+
+        if (\JSON_THROW_ON_ERROR & $options) {
+            return $decodedData;
+        }
+
+        if (\JSON_ERROR_NONE === json_last_error()) {
+            return $decodedData;
+        }
+        $errorMessage = json_last_error_msg();
+
+        if (!($context[self::DETAILED_ERROR_MESSAGES] ?? $this->defaultContext[self::DETAILED_ERROR_MESSAGES])) {
+            throw new NotEncodableValueException($errorMessage);
+        }
+
+        if (!class_exists(JsonParser::class)) {
+            throw new UnsupportedException(\sprintf('Enabling "%s" serializer option requires seld/jsonlint. Try running "composer require seld/jsonlint".', self::DETAILED_ERROR_MESSAGES));
+        }
+
+        throw new NotEncodableValueException((new JsonParser())->lint($data)?->getMessage() ?: $errorMessage);
+    }
+
+    public function supportsDecoding(string $format): bool
+    {
+        return JsonEncoder::FORMAT === $format;
+    }
+}
diff --git a/symfony/serializer/Encoder/JsonEncode.php b/symfony/serializer/Encoder/JsonEncode.php
new file mode 100644
index 000000000..3e0ddced3
--- /dev/null
+++ b/symfony/serializer/Encoder/JsonEncode.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+
+/**
+ * Encodes JSON data.
+ *
+ * @author Sander Coolen <sander@jibber.nl>
+ */
+class JsonEncode implements EncoderInterface
+{
+    /**
+     * Configure the JSON flags bitmask.
+     */
+    public const OPTIONS = 'json_encode_options';
+
+    private array $defaultContext = [
+        self::OPTIONS => \JSON_PRESERVE_ZERO_FRACTION,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $options = $context[self::OPTIONS] ?? $this->defaultContext[self::OPTIONS];
+
+        try {
+            $encodedJson = json_encode($data, $options);
+        } catch (\JsonException $e) {
+            throw new NotEncodableValueException($e->getMessage(), 0, $e);
+        }
+
+        if (\JSON_THROW_ON_ERROR & $options) {
+            return $encodedJson;
+        }
+
+        if (\JSON_ERROR_NONE !== json_last_error() && (false === $encodedJson || !($options & \JSON_PARTIAL_OUTPUT_ON_ERROR))) {
+            throw new NotEncodableValueException(json_last_error_msg());
+        }
+
+        return $encodedJson;
+    }
+
+    public function supportsEncoding(string $format): bool
+    {
+        return JsonEncoder::FORMAT === $format;
+    }
+}
diff --git a/symfony/serializer/Encoder/JsonEncoder.php b/symfony/serializer/Encoder/JsonEncoder.php
new file mode 100644
index 000000000..5727e7be0
--- /dev/null
+++ b/symfony/serializer/Encoder/JsonEncoder.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+/**
+ * Encodes JSON data.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class JsonEncoder implements EncoderInterface, DecoderInterface
+{
+    public const FORMAT = 'json';
+
+    protected JsonEncode $encodingImpl;
+    protected JsonDecode $decodingImpl;
+
+    private array $defaultContext = [
+        JsonDecode::ASSOCIATIVE => true,
+    ];
+
+    public function __construct(?JsonEncode $encodingImpl = null, ?JsonDecode $decodingImpl = null, array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+        $this->encodingImpl = $encodingImpl ?? new JsonEncode($this->defaultContext);
+        $this->decodingImpl = $decodingImpl ?? new JsonDecode($this->defaultContext);
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $context = array_merge($this->defaultContext, $context);
+
+        return $this->encodingImpl->encode($data, self::FORMAT, $context);
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        $context = array_merge($this->defaultContext, $context);
+
+        return $this->decodingImpl->decode($data, self::FORMAT, $context);
+    }
+
+    public function supportsEncoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+
+    public function supportsDecoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+}
diff --git a/symfony/serializer/Encoder/NormalizationAwareInterface.php b/symfony/serializer/Encoder/NormalizationAwareInterface.php
new file mode 100644
index 000000000..c066bd7cd
--- /dev/null
+++ b/symfony/serializer/Encoder/NormalizationAwareInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+/**
+ * Defines the interface of encoders that will normalize data themselves.
+ *
+ * Implementing this interface essentially just tells the Serializer that the
+ * data should not be pre-normalized before being passed to this Encoder.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface NormalizationAwareInterface
+{
+}
diff --git a/symfony/serializer/Encoder/XmlEncoder.php b/symfony/serializer/Encoder/XmlEncoder.php
new file mode 100644
index 000000000..0b2fb02fb
--- /dev/null
+++ b/symfony/serializer/Encoder/XmlEncoder.php
@@ -0,0 +1,540 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\BadMethodCallException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author John Wards <jwards@whiteoctober.co.uk>
+ * @author Fabian Vogler <fabian@equivalence.ch>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Dany Maillard <danymaillard93b@gmail.com>
+ */
+class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwareInterface, SerializerAwareInterface
+{
+    use SerializerAwareTrait;
+
+    public const FORMAT = 'xml';
+
+    public const AS_COLLECTION = 'as_collection';
+
+    /**
+     * An array of ignored XML node types while decoding, each one of the DOM Predefined XML_* constants.
+     */
+    public const DECODER_IGNORED_NODE_TYPES = 'decoder_ignored_node_types';
+
+    /**
+     * An array of ignored XML node types while encoding, each one of the DOM Predefined XML_* constants.
+     */
+    public const ENCODER_IGNORED_NODE_TYPES = 'encoder_ignored_node_types';
+    public const ENCODING = 'xml_encoding';
+    public const FORMAT_OUTPUT = 'xml_format_output';
+
+    /**
+     * A bit field of LIBXML_* constants for loading XML documents.
+     */
+    public const LOAD_OPTIONS = 'load_options';
+
+    /**
+     * A bit field of LIBXML_* constants for saving XML documents.
+     */
+    public const SAVE_OPTIONS = 'save_options';
+
+    public const REMOVE_EMPTY_TAGS = 'remove_empty_tags';
+    public const ROOT_NODE_NAME = 'xml_root_node_name';
+    public const STANDALONE = 'xml_standalone';
+    public const TYPE_CAST_ATTRIBUTES = 'xml_type_cast_attributes';
+    public const VERSION = 'xml_version';
+    public const CDATA_WRAPPING = 'cdata_wrapping';
+    public const CDATA_WRAPPING_NAME_PATTERN = 'cdata_wrapping_name_pattern';
+    public const CDATA_WRAPPING_PATTERN = 'cdata_wrapping_pattern';
+    public const IGNORE_EMPTY_ATTRIBUTES = 'ignore_empty_attributes';
+    public const PRESERVE_NUMERIC_KEYS = 'preserve_numeric_keys';
+
+    private array $defaultContext = [
+        self::AS_COLLECTION => false,
+        self::DECODER_IGNORED_NODE_TYPES => [\XML_PI_NODE, \XML_COMMENT_NODE],
+        self::ENCODER_IGNORED_NODE_TYPES => [],
+        self::LOAD_OPTIONS => \LIBXML_NONET | \LIBXML_NOBLANKS,
+        self::SAVE_OPTIONS => 0,
+        self::REMOVE_EMPTY_TAGS => false,
+        self::ROOT_NODE_NAME => 'response',
+        self::TYPE_CAST_ATTRIBUTES => true,
+        self::CDATA_WRAPPING => true,
+        self::CDATA_WRAPPING_NAME_PATTERN => false,
+        self::CDATA_WRAPPING_PATTERN => '/[<>&]/',
+        self::IGNORE_EMPTY_ATTRIBUTES => false,
+        self::PRESERVE_NUMERIC_KEYS => false,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $encoderIgnoredNodeTypes = $context[self::ENCODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::ENCODER_IGNORED_NODE_TYPES];
+        $ignorePiNode = \in_array(\XML_PI_NODE, $encoderIgnoredNodeTypes, true);
+        if ($data instanceof \DOMDocument) {
+            return $this->saveXml($data, $ignorePiNode ? $data->documentElement : null);
+        }
+
+        $xmlRootNodeName = $context[self::ROOT_NODE_NAME] ?? $this->defaultContext[self::ROOT_NODE_NAME];
+
+        $dom = $this->createDomDocument($context);
+
+        if (null !== $data && !\is_scalar($data)) {
+            $root = $dom->createElement($xmlRootNodeName);
+            $dom->appendChild($root);
+            $this->buildXml($root, $data, $format, $context, $xmlRootNodeName);
+        } else {
+            $this->appendNode($dom, $data, $format, $context, $xmlRootNodeName);
+        }
+
+        return $this->saveXml($dom, $ignorePiNode ? $dom->documentElement : null, $context[self::SAVE_OPTIONS] ?? $this->defaultContext[self::SAVE_OPTIONS]);
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        if ('' === trim($data)) {
+            throw new NotEncodableValueException('Invalid XML data, it cannot be empty.');
+        }
+
+        $internalErrors = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+
+        $dom = new \DOMDocument();
+        $dom->loadXML($data, $context[self::LOAD_OPTIONS] ?? $this->defaultContext[self::LOAD_OPTIONS]);
+
+        libxml_use_internal_errors($internalErrors);
+
+        if ($error = libxml_get_last_error()) {
+            libxml_clear_errors();
+
+            throw new NotEncodableValueException($error->message);
+        }
+
+        $rootNode = null;
+        $decoderIgnoredNodeTypes = $context[self::DECODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::DECODER_IGNORED_NODE_TYPES];
+        foreach ($dom->childNodes as $child) {
+            if (\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {
+                continue;
+            }
+            if (\XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
+                throw new NotEncodableValueException('Document types are not allowed.');
+            }
+            if (!$rootNode) {
+                $rootNode = $child;
+            }
+        }
+
+        // todo: throw an exception if the root node name is not correctly configured (bc)
+
+        if ($rootNode->hasChildNodes()) {
+            $data = $this->parseXml($rootNode, $context);
+            if (\is_array($data)) {
+                $data = $this->addXmlNamespaces($data, $rootNode, $dom);
+            }
+
+            return $data;
+        }
+
+        if (!$rootNode->hasAttributes()) {
+            return $rootNode->nodeValue;
+        }
+
+        $data = array_merge($this->parseXmlAttributes($rootNode, $context), ['#' => $rootNode->nodeValue]);
+
+        return $this->addXmlNamespaces($data, $rootNode, $dom);
+    }
+
+    public function supportsEncoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+
+    public function supportsDecoding(string $format): bool
+    {
+        return self::FORMAT === $format;
+    }
+
+    final protected function appendXMLString(\DOMNode $node, string $val): bool
+    {
+        if ('' !== $val) {
+            $frag = $node->ownerDocument->createDocumentFragment();
+            $frag->appendXML($val);
+            $node->appendChild($frag);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    final protected function appendText(\DOMNode $node, string $val): bool
+    {
+        $nodeText = $node->ownerDocument->createTextNode($val);
+        $node->appendChild($nodeText);
+
+        return true;
+    }
+
+    final protected function appendCData(\DOMNode $node, string $val): bool
+    {
+        $nodeText = $node->ownerDocument->createCDATASection($val);
+        $node->appendChild($nodeText);
+
+        return true;
+    }
+
+    final protected function appendDocumentFragment(\DOMNode $node, \DOMDocumentFragment $fragment): bool
+    {
+        $node->appendChild($fragment);
+
+        return true;
+    }
+
+    final protected function appendComment(\DOMNode $node, string $data): bool
+    {
+        $node->appendChild($node->ownerDocument->createComment($data));
+
+        return true;
+    }
+
+    /**
+     * Checks the name is a valid xml element name.
+     */
+    final protected function isElementNameValid(string $name): bool
+    {
+        return $name
+            && !str_contains($name, ' ')
+            && preg_match('#^[\pL_][\pL0-9._:-]*$#ui', $name);
+    }
+
+    /**
+     * Parse the input DOMNode into an array or a string.
+     */
+    private function parseXml(\DOMNode $node, array $context = []): array|string
+    {
+        $data = $this->parseXmlAttributes($node, $context);
+
+        $value = $this->parseXmlValue($node, $context);
+
+        if (!\count($data)) {
+            return $value;
+        }
+
+        if (!\is_array($value)) {
+            $data['#'] = $value;
+
+            return $data;
+        }
+
+        if (1 === \count($value) && key($value)) {
+            $data[key($value)] = current($value);
+
+            return $data;
+        }
+
+        foreach ($value as $key => $val) {
+            $data[$key] = $val;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Parse the input DOMNode attributes into an array.
+     */
+    private function parseXmlAttributes(\DOMNode $node, array $context = []): array
+    {
+        if (!$node->hasAttributes()) {
+            return [];
+        }
+
+        $data = [];
+        $typeCastAttributes = (bool) ($context[self::TYPE_CAST_ATTRIBUTES] ?? $this->defaultContext[self::TYPE_CAST_ATTRIBUTES]);
+
+        foreach ($node->attributes as $attr) {
+            if (!is_numeric($attr->nodeValue) || !$typeCastAttributes || (isset($attr->nodeValue[1]) && '0' === $attr->nodeValue[0] && '.' !== $attr->nodeValue[1])) {
+                $data['@'.$attr->nodeName] = $attr->nodeValue;
+
+                continue;
+            }
+
+            if (false !== $val = filter_var($attr->nodeValue, \FILTER_VALIDATE_INT)) {
+                $data['@'.$attr->nodeName] = $val;
+
+                continue;
+            }
+
+            $data['@'.$attr->nodeName] = (float) $attr->nodeValue;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Parse the input DOMNode value (content and children) into an array or a string.
+     */
+    private function parseXmlValue(\DOMNode $node, array $context = []): array|string
+    {
+        if (!$node->hasChildNodes()) {
+            return $node->nodeValue;
+        }
+
+        if (1 === $node->childNodes->length && \in_array($node->firstChild->nodeType, [\XML_TEXT_NODE, \XML_CDATA_SECTION_NODE], true)) {
+            return $node->firstChild->nodeValue;
+        }
+
+        $value = [];
+        $decoderIgnoredNodeTypes = $context[self::DECODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::DECODER_IGNORED_NODE_TYPES];
+        foreach ($node->childNodes as $subnode) {
+            if (\in_array($subnode->nodeType, $decoderIgnoredNodeTypes, true)) {
+                continue;
+            }
+
+            $val = $this->parseXml($subnode, $context);
+
+            if ('item' === $subnode->nodeName && isset($val['@key'])) {
+                $value[$val['@key']] = $val['#'] ?? $val;
+            } else {
+                $value[$subnode->nodeName][] = $val;
+            }
+        }
+
+        $asCollection = $context[self::AS_COLLECTION] ?? $this->defaultContext[self::AS_COLLECTION];
+        foreach ($value as $key => $val) {
+            if (!$asCollection && \is_array($val) && 1 === \count($val)) {
+                $value[$key] = current($val);
+            }
+        }
+
+        return $value;
+    }
+
+    private function addXmlNamespaces(array $data, \DOMNode $node, \DOMDocument $document): array
+    {
+        $xpath = new \DOMXPath($document);
+
+        foreach ($xpath->query('namespace::*', $node) as $nsNode) {
+            $data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
+        }
+
+        unset($data['@xmlns:xml']);
+
+        return $data;
+    }
+
+    /**
+     * Parse the data and convert it to DOMElements.
+     *
+     * @throws NotEncodableValueException
+     */
+    private function buildXml(\DOMNode $parentNode, mixed $data, string $format, array $context, ?string $xmlRootNodeName = null): bool
+    {
+        $append = true;
+        $removeEmptyTags = $context[self::REMOVE_EMPTY_TAGS] ?? $this->defaultContext[self::REMOVE_EMPTY_TAGS] ?? false;
+        $preserveNumericKeys = $context[self::PRESERVE_NUMERIC_KEYS] ?? $this->defaultContext[self::PRESERVE_NUMERIC_KEYS] ?? false;
+        $encoderIgnoredNodeTypes = $context[self::ENCODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::ENCODER_IGNORED_NODE_TYPES];
+
+        if (\is_array($data) || ($data instanceof \Traversable && (null === $this->serializer || !$this->serializer->supportsNormalization($data, $format)))) {
+            foreach ($data as $key => $data) {
+                // Ah this is the magic @ attribute types.
+                if (str_starts_with($key, '@') && $this->isElementNameValid($attributeName = substr($key, 1))) {
+                    if (!\is_scalar($data)) {
+                        $data = $this->serializer->normalize($data, $format, $context);
+                    }
+                    if (\is_bool($data)) {
+                        $data = (int) $data;
+                    }
+
+                    if ($context[self::IGNORE_EMPTY_ATTRIBUTES] ?? $this->defaultContext[self::IGNORE_EMPTY_ATTRIBUTES]) {
+                        if (null === $data || '' === $data) {
+                            continue;
+                        }
+                    }
+
+                    $parentNode->setAttribute($attributeName, $data);
+                } elseif ('#' === $key) {
+                    $append = $this->selectNodeType($parentNode, $data, $format, $context);
+                } elseif ('#comment' === $key) {
+                    if (!\in_array(\XML_COMMENT_NODE, $encoderIgnoredNodeTypes, true)) {
+                        $append = $this->appendComment($parentNode, $data);
+                    }
+                } elseif (\is_array($data) && !is_numeric($key)) {
+                    // Is this array fully numeric keys?
+                    if (!$preserveNumericKeys && $data && null === array_find_key($data, static fn ($v, $k) => \is_string($k))) {
+                        /*
+                         * Create nodes to append to $parentNode based on the $key of this array
+                         * Produces <xml><item>0</item><item>1</item></xml>
+                         * From ["item" => [0,1]];.
+                         */
+                        foreach ($data as $subData) {
+                            $append = $this->appendNode($parentNode, $subData, $format, $context, $key);
+                        }
+                    } else {
+                        $append = $this->appendNode($parentNode, $data, $format, $context, $key);
+                    }
+                } elseif (is_numeric($key) || !$this->isElementNameValid($key)) {
+                    $append = $this->appendNode($parentNode, $data, $format, $context, 'item', $key);
+                } elseif (null !== $data || !$removeEmptyTags) {
+                    $append = $this->appendNode($parentNode, $data, $format, $context, $key);
+                }
+            }
+
+            return $append;
+        }
+
+        if (\is_object($data)) {
+            if (null === $this->serializer) {
+                throw new BadMethodCallException(\sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
+            }
+
+            $data = $this->serializer->normalize($data, $format, $context);
+            if (null !== $data && !\is_scalar($data)) {
+                return $this->buildXml($parentNode, $data, $format, $context, $xmlRootNodeName);
+            }
+
+            // top level data object was normalized into a scalar
+            if (!$parentNode->parentNode->parentNode) {
+                $root = $parentNode->parentNode;
+                $root->removeChild($parentNode);
+
+                return $this->appendNode($root, $data, $format, $context, $xmlRootNodeName);
+            }
+
+            return $this->appendNode($parentNode, $data, $format, $context, 'data');
+        }
+
+        throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : \sprintf('%s resource', get_resource_type($data))));
+    }
+
+    /**
+     * Selects the type of node to create and appends it to the parent.
+     */
+    private function appendNode(\DOMNode $parentNode, mixed $data, string $format, array $context, string $nodeName, ?string $key = null): bool
+    {
+        $dom = $parentNode instanceof \DOMDocument ? $parentNode : $parentNode->ownerDocument;
+        $node = $dom->createElement($nodeName);
+        if (null !== $key) {
+            $node->setAttribute('key', $key);
+        }
+        $appendNode = $this->selectNodeType($node, $data, $format, $context);
+        // we may have decided not to append this node, either in error or if its $nodeName is not valid
+        if ($appendNode) {
+            $parentNode->appendChild($node);
+        }
+
+        return $appendNode;
+    }
+
+    /**
+     * Checks if a value contains any characters which would require CDATA wrapping.
+     *
+     * @param array<string, mixed> $context
+     */
+    private function needsCdataWrapping(string $name, string $val, array $context): bool
+    {
+        return ($context[self::CDATA_WRAPPING] ?? $this->defaultContext[self::CDATA_WRAPPING])
+                && (preg_match($context[self::CDATA_WRAPPING_PATTERN] ?? $this->defaultContext[self::CDATA_WRAPPING_PATTERN], $val)
+                || (($context[self::CDATA_WRAPPING_NAME_PATTERN] ?? $this->defaultContext[self::CDATA_WRAPPING_NAME_PATTERN]) && preg_match($context[self::CDATA_WRAPPING_NAME_PATTERN] ?? $this->defaultContext[self::CDATA_WRAPPING_NAME_PATTERN], $name))
+                );
+    }
+
+    /**
+     * Tests the value being passed and decide what sort of element to create.
+     *
+     * @throws NotEncodableValueException
+     */
+    private function selectNodeType(\DOMNode $node, mixed $val, string $format, array $context): bool
+    {
+        if (\is_array($val)) {
+            return $this->buildXml($node, $val, $format, $context);
+        } elseif ($val instanceof \SimpleXMLElement) {
+            $child = $node->ownerDocument->importNode(dom_import_simplexml($val), true);
+            $node->appendChild($child);
+        } elseif ($val instanceof \Traversable) {
+            $this->buildXml($node, $val, $format, $context);
+        } elseif ($val instanceof \DOMNode) {
+            $child = $node->ownerDocument->importNode($val, true);
+            $node->appendChild($child);
+        } elseif (\is_object($val)) {
+            if (null === $this->serializer) {
+                throw new BadMethodCallException(\sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
+            }
+
+            return $this->selectNodeType($node, $this->serializer->normalize($val, $format, $context), $format, $context);
+        } elseif (is_numeric($val)) {
+            return $this->appendText($node, (string) $val);
+        } elseif (\is_string($val) && $this->needsCdataWrapping($node->nodeName, $val, $context)) {
+            return $this->appendCData($node, $val);
+        } elseif (\is_string($val)) {
+            return $this->appendText($node, $val);
+        } elseif (\is_bool($val)) {
+            return $this->appendText($node, (int) $val);
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a DOM document, taking serializer options into account.
+     */
+    private function createDomDocument(array $context): \DOMDocument
+    {
+        $document = new \DOMDocument();
+
+        // Set an attribute on the DOM document specifying, as part of the XML declaration,
+        $xmlOptions = [
+            // nicely formats output with indentation and extra space
+            self::FORMAT_OUTPUT => 'formatOutput',
+            // the version number of the document
+            self::VERSION => 'xmlVersion',
+            // the encoding of the document
+            self::ENCODING => 'encoding',
+            // whether the document is standalone
+            self::STANDALONE => 'xmlStandalone',
+        ];
+        foreach ($xmlOptions as $xmlOption => $documentProperty) {
+            if ($contextOption = $context[$xmlOption] ?? $this->defaultContext[$xmlOption] ?? false) {
+                $document->$documentProperty = $contextOption;
+            }
+        }
+
+        return $document;
+    }
+
+    /**
+     * @throws NotEncodableValueException
+     */
+    private function saveXml(\DOMDocument $document, ?\DOMNode $node = null, ?int $options = null): string
+    {
+        $prevErrorHandler = set_error_handler(static function ($type, $message, $file, $line, $context = []) use (&$prevErrorHandler) {
+            if (\E_ERROR === $type || \E_WARNING === $type) {
+                throw new NotEncodableValueException($message);
+            }
+
+            return $prevErrorHandler ? $prevErrorHandler($type, $message, $file, $line, $context) : false;
+        });
+        try {
+            return $document->saveXML($node, $options);
+        } finally {
+            restore_error_handler();
+        }
+    }
+}
diff --git a/symfony/serializer/Encoder/YamlEncoder.php b/symfony/serializer/Encoder/YamlEncoder.php
new file mode 100644
index 000000000..1013129db
--- /dev/null
+++ b/symfony/serializer/Encoder/YamlEncoder.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+use Symfony\Component\Yaml\Dumper;
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Encodes YAML data.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class YamlEncoder implements EncoderInterface, DecoderInterface
+{
+    public const FORMAT = 'yaml';
+    private const ALTERNATIVE_FORMAT = 'yml';
+
+    public const PRESERVE_EMPTY_OBJECTS = 'preserve_empty_objects';
+
+    /**
+     * Override the amount of spaces to use for indentation of nested nodes.
+     *
+     * This option only works in the constructor, not in calls to `encode`.
+     */
+    public const YAML_INDENTATION = 'yaml_indentation';
+
+    public const YAML_INLINE = 'yaml_inline';
+    /**
+     * Initial indentation for root element.
+     */
+    public const YAML_INDENT = 'yaml_indent';
+    public const YAML_FLAGS = 'yaml_flags';
+
+    private readonly Dumper $dumper;
+    private readonly Parser $parser;
+    private array $defaultContext = [
+        self::YAML_INLINE => 0,
+        self::YAML_INDENT => 0,
+        self::YAML_FLAGS => 0,
+    ];
+
+    public function __construct(?Dumper $dumper = null, ?Parser $parser = null, array $defaultContext = [])
+    {
+        if (!class_exists(Dumper::class)) {
+            throw new RuntimeException('The YamlEncoder class requires the "Yaml" component. Try running "composer require symfony/yaml".');
+        }
+
+        if (!$dumper) {
+            $dumper = \array_key_exists(self::YAML_INDENTATION, $defaultContext) ? new Dumper($defaultContext[self::YAML_INDENTATION]) : new Dumper();
+        }
+        $this->dumper = $dumper;
+        $this->parser = $parser ?? new Parser();
+        unset($defaultContext[self::YAML_INDENTATION]);
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function encode(mixed $data, string $format, array $context = []): string
+    {
+        $context = array_merge($this->defaultContext, $context);
+
+        if ($context[self::PRESERVE_EMPTY_OBJECTS] ?? false) {
+            $context[self::YAML_FLAGS] |= Yaml::DUMP_OBJECT_AS_MAP;
+        }
+
+        return $this->dumper->dump($data, $context[self::YAML_INLINE], $context[self::YAML_INDENT], $context[self::YAML_FLAGS]);
+    }
+
+    public function supportsEncoding(string $format): bool
+    {
+        return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
+    }
+
+    public function decode(string $data, string $format, array $context = []): mixed
+    {
+        $context = array_merge($this->defaultContext, $context);
+
+        try {
+            return $this->parser->parse($data, $context[self::YAML_FLAGS]);
+        } catch (ParseException $e) {
+            throw new NotEncodableValueException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function supportsDecoding(string $format): bool
+    {
+        return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
+    }
+}
diff --git a/symfony/serializer/Exception/BadMethodCallException.php b/symfony/serializer/Exception/BadMethodCallException.php
new file mode 100644
index 000000000..b2f3d61a8
--- /dev/null
+++ b/symfony/serializer/Exception/BadMethodCallException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/symfony/serializer/Exception/CircularReferenceException.php b/symfony/serializer/Exception/CircularReferenceException.php
new file mode 100644
index 000000000..dc84183fc
--- /dev/null
+++ b/symfony/serializer/Exception/CircularReferenceException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * CircularReferenceException.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class CircularReferenceException extends RuntimeException
+{
+}
diff --git a/symfony/serializer/Exception/ExceptionInterface.php b/symfony/serializer/Exception/ExceptionInterface.php
new file mode 100644
index 000000000..859dcb461
--- /dev/null
+++ b/symfony/serializer/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * Base exception interface.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/symfony/serializer/Exception/ExtraAttributesException.php b/symfony/serializer/Exception/ExtraAttributesException.php
new file mode 100644
index 000000000..639808b10
--- /dev/null
+++ b/symfony/serializer/Exception/ExtraAttributesException.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * ExtraAttributesException.
+ *
+ * @author Julien DIDIER <julien@didier.io>
+ */
+class ExtraAttributesException extends RuntimeException
+{
+    public function __construct(
+        private readonly array $extraAttributes,
+        ?\Throwable $previous = null,
+    ) {
+        $msg = \sprintf('Extra attributes are not allowed ("%s" %s unknown).', implode('", "', $extraAttributes), \count($extraAttributes) > 1 ? 'are' : 'is');
+
+        parent::__construct($msg, 0, $previous);
+    }
+
+    /**
+     * Get the extra attributes that are not allowed.
+     */
+    public function getExtraAttributes(): array
+    {
+        return $this->extraAttributes;
+    }
+}
diff --git a/symfony/serializer/Exception/InvalidArgumentException.php b/symfony/serializer/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..f4e645c44
--- /dev/null
+++ b/symfony/serializer/Exception/InvalidArgumentException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * InvalidArgumentException.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/symfony/serializer/Exception/LogicException.php b/symfony/serializer/Exception/LogicException.php
new file mode 100644
index 000000000..08c53e0ff
--- /dev/null
+++ b/symfony/serializer/Exception/LogicException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * LogicException.
+ *
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ */
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/symfony/serializer/Exception/MappingException.php b/symfony/serializer/Exception/MappingException.php
new file mode 100644
index 000000000..4df4eec39
--- /dev/null
+++ b/symfony/serializer/Exception/MappingException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * MappingException.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class MappingException extends RuntimeException
+{
+}
diff --git a/symfony/serializer/Exception/MissingConstructorArgumentsException.php b/symfony/serializer/Exception/MissingConstructorArgumentsException.php
new file mode 100644
index 000000000..ad3f5c82b
--- /dev/null
+++ b/symfony/serializer/Exception/MissingConstructorArgumentsException.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Maxime VEBER <maxime.veber@nekland.fr>
+ */
+class MissingConstructorArgumentsException extends RuntimeException
+{
+    /**
+     * @param string[]          $missingArguments
+     * @param class-string|null $class
+     */
+    public function __construct(
+        string $message,
+        int $code = 0,
+        ?\Throwable $previous = null,
+        private array $missingArguments = [],
+        private ?string $class = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getMissingConstructorArguments(): array
+    {
+        return $this->missingArguments;
+    }
+
+    /**
+     * @return class-string|null
+     */
+    public function getClass(): ?string
+    {
+        return $this->class;
+    }
+}
diff --git a/symfony/serializer/Exception/NotEncodableValueException.php b/symfony/serializer/Exception/NotEncodableValueException.php
new file mode 100644
index 000000000..e1709fb1e
--- /dev/null
+++ b/symfony/serializer/Exception/NotEncodableValueException.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Christian Flothmann <christian.flothmann@sensiolabs.de>
+ */
+class NotEncodableValueException extends UnexpectedValueException
+{
+}
diff --git a/symfony/serializer/Exception/NotNormalizableValueException.php b/symfony/serializer/Exception/NotNormalizableValueException.php
new file mode 100644
index 000000000..1e0bde157
--- /dev/null
+++ b/symfony/serializer/Exception/NotNormalizableValueException.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Christian Flothmann <christian.flothmann@sensiolabs.de>
+ */
+class NotNormalizableValueException extends UnexpectedValueException
+{
+    private ?string $currentType = null;
+    private ?array $expectedTypes = null;
+    private ?string $path = null;
+    private bool $useMessageForUser = false;
+
+    /**
+     * @param list<string|\Stringable>|null $expectedTypes
+     */
+    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, ?string $currentType = null, ?array $expectedTypes = null, ?string $path = null, bool $useMessageForUser = false)
+    {
+        parent::__construct($message, $code, $previous);
+
+        $this->currentType = $currentType;
+        $this->expectedTypes = $expectedTypes ? array_map(strval(...), $expectedTypes) : $expectedTypes;
+        $this->path = $path;
+        $this->useMessageForUser = $useMessageForUser;
+    }
+
+    /**
+     * @param list<string|\Stringable> $expectedTypes
+     * @param bool                     $useMessageForUser If the message passed to this exception is something that can be shown
+     *                                                    safely to your user. In other words, avoid catching other exceptions and
+     *                                                    passing their message directly to this class.
+     */
+    public static function createForUnexpectedDataType(string $message, mixed $data, array $expectedTypes, ?string $path = null, bool $useMessageForUser = false, int $code = 0, ?\Throwable $previous = null): self
+    {
+        return new self($message, $code, $previous, get_debug_type($data), $expectedTypes, $path, $useMessageForUser);
+    }
+
+    public function getCurrentType(): ?string
+    {
+        return $this->currentType;
+    }
+
+    /**
+     * @return string[]|null
+     */
+    public function getExpectedTypes(): ?array
+    {
+        return $this->expectedTypes;
+    }
+
+    public function getPath(): ?string
+    {
+        return $this->path;
+    }
+
+    public function canUseMessageForUser(): ?bool
+    {
+        return $this->useMessageForUser;
+    }
+}
diff --git a/symfony/serializer/Exception/PartialDenormalizationException.php b/symfony/serializer/Exception/PartialDenormalizationException.php
new file mode 100644
index 000000000..5edc146cf
--- /dev/null
+++ b/symfony/serializer/Exception/PartialDenormalizationException.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class PartialDenormalizationException extends UnexpectedValueException
+{
+    /**
+     * @param NotNormalizableValueException[] $errors
+     */
+    public function __construct(
+        private mixed $data,
+        private array $errors,
+    ) {
+    }
+
+    public function getData(): mixed
+    {
+        return $this->data;
+    }
+
+    /**
+     * @return NotNormalizableValueException[]
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}
diff --git a/symfony/serializer/Exception/RuntimeException.php b/symfony/serializer/Exception/RuntimeException.php
new file mode 100644
index 000000000..a287d97ad
--- /dev/null
+++ b/symfony/serializer/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * RuntimeException.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/symfony/serializer/Exception/UnexpectedPropertyException.php b/symfony/serializer/Exception/UnexpectedPropertyException.php
new file mode 100644
index 000000000..03e42fca5
--- /dev/null
+++ b/symfony/serializer/Exception/UnexpectedPropertyException.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * UnexpectedPropertyException.
+ *
+ * @author Aurélien Pillevesse <aurelienpillevesse@hotmail.fr>
+ */
+class UnexpectedPropertyException extends \UnexpectedValueException implements ExceptionInterface
+{
+    public function __construct(
+        public readonly string $property,
+        ?\Throwable $previous = null,
+    ) {
+        $msg = \sprintf('Property is not allowed ("%s" is unknown).', $this->property);
+
+        parent::__construct($msg, 0, $previous);
+    }
+}
diff --git a/symfony/serializer/Exception/UnexpectedValueException.php b/symfony/serializer/Exception/UnexpectedValueException.php
new file mode 100644
index 000000000..2a63c5bd3
--- /dev/null
+++ b/symfony/serializer/Exception/UnexpectedValueException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * UnexpectedValueException.
+ *
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/symfony/serializer/Exception/UnsupportedException.php b/symfony/serializer/Exception/UnsupportedException.php
new file mode 100644
index 000000000..7dc44ee0e
--- /dev/null
+++ b/symfony/serializer/Exception/UnsupportedException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * UnsupportedException.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class UnsupportedException extends InvalidArgumentException
+{
+}
diff --git a/symfony/serializer/Exception/UnsupportedFormatException.php b/symfony/serializer/Exception/UnsupportedFormatException.php
new file mode 100644
index 000000000..9b87bcc5b
--- /dev/null
+++ b/symfony/serializer/Exception/UnsupportedFormatException.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+class UnsupportedFormatException extends NotEncodableValueException
+{
+}
diff --git a/symfony/serializer/Extractor/ObjectPropertyListExtractor.php b/symfony/serializer/Extractor/ObjectPropertyListExtractor.php
new file mode 100644
index 000000000..42a546805
--- /dev/null
+++ b/symfony/serializer/Extractor/ObjectPropertyListExtractor.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Extractor;
+
+use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
+
+/**
+ * @author David Maicher <mail@dmaicher.de>
+ */
+final class ObjectPropertyListExtractor implements ObjectPropertyListExtractorInterface
+{
+    private \Closure $objectClassResolver;
+
+    public function __construct(
+        private PropertyListExtractorInterface $propertyListExtractor,
+        ?callable $objectClassResolver = null,
+    ) {
+        $this->objectClassResolver = ($objectClassResolver ?? 'get_class')(...);
+    }
+
+    public function getProperties(object $object, array $context = []): ?array
+    {
+        $class = ($this->objectClassResolver)($object);
+
+        return $this->propertyListExtractor->getProperties($class, $context);
+    }
+}
diff --git a/symfony/serializer/Extractor/ObjectPropertyListExtractorInterface.php b/symfony/serializer/Extractor/ObjectPropertyListExtractorInterface.php
new file mode 100644
index 000000000..5b2ae5837
--- /dev/null
+++ b/symfony/serializer/Extractor/ObjectPropertyListExtractorInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Extractor;
+
+/**
+ * @author David Maicher <mail@dmaicher.de>
+ */
+interface ObjectPropertyListExtractorInterface
+{
+    /**
+     * Gets the list of properties available for the given object.
+     *
+     * @return string[]|null
+     */
+    public function getProperties(object $object, array $context = []): ?array;
+}
diff --git a/symfony/serializer/LICENSE b/symfony/serializer/LICENSE
new file mode 100644
index 000000000..0138f8f07
--- /dev/null
+++ b/symfony/serializer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/symfony/serializer/Mapping/AttributeMetadata.php b/symfony/serializer/Mapping/AttributeMetadata.php
new file mode 100644
index 000000000..8abd6a837
--- /dev/null
+++ b/symfony/serializer/Mapping/AttributeMetadata.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+use Symfony\Component\PropertyAccess\PropertyPath;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 7.4
+ */
+class AttributeMetadata implements AttributeMetadataInterface
+{
+    private string $name;
+    private array $groups = [];
+    private ?int $maxDepth = null;
+    private ?string $serializedName = null;
+    private ?PropertyPath $serializedPath = null;
+    private bool $ignore = false;
+
+    /**
+     * @var array[] Normalization contexts per group name ("*" applies to all groups)
+     */
+    private array $normalizationContexts = [];
+
+    /**
+     * @var array[] Denormalization contexts per group name ("*" applies to all groups)
+     */
+    private array $denormalizationContexts = [];
+
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function addGroup(string $group): void
+    {
+        if (!\in_array($group, $this->groups, true)) {
+            $this->groups[] = $group;
+        }
+    }
+
+    public function getGroups(): array
+    {
+        return $this->groups;
+    }
+
+    public function setMaxDepth(?int $maxDepth): void
+    {
+        $this->maxDepth = $maxDepth;
+    }
+
+    public function getMaxDepth(): ?int
+    {
+        return $this->maxDepth;
+    }
+
+    public function setSerializedName(?string $serializedName): void
+    {
+        $this->serializedName = $serializedName;
+    }
+
+    public function getSerializedName(): ?string
+    {
+        return $this->serializedName;
+    }
+
+    public function setSerializedPath(?PropertyPath $serializedPath = null): void
+    {
+        $this->serializedPath = $serializedPath;
+    }
+
+    public function getSerializedPath(): ?PropertyPath
+    {
+        return $this->serializedPath;
+    }
+
+    public function setIgnore(bool $ignore): void
+    {
+        $this->ignore = $ignore;
+    }
+
+    public function isIgnored(): bool
+    {
+        return $this->ignore;
+    }
+
+    public function getNormalizationContexts(): array
+    {
+        return $this->normalizationContexts;
+    }
+
+    public function getNormalizationContextForGroups(array $groups): array
+    {
+        $contexts = [];
+        foreach ($groups as $group) {
+            $contexts[] = $this->normalizationContexts[$group] ?? [];
+        }
+
+        return array_merge($this->normalizationContexts['*'] ?? [], ...$contexts);
+    }
+
+    public function setNormalizationContextForGroups(array $context, array $groups = []): void
+    {
+        if (!$groups) {
+            $this->normalizationContexts['*'] = $context;
+        }
+
+        foreach ($groups as $group) {
+            $this->normalizationContexts[$group] = $context;
+        }
+    }
+
+    public function getDenormalizationContexts(): array
+    {
+        return $this->denormalizationContexts;
+    }
+
+    public function getDenormalizationContextForGroups(array $groups): array
+    {
+        $contexts = [];
+        foreach ($groups as $group) {
+            $contexts[] = $this->denormalizationContexts[$group] ?? [];
+        }
+
+        return array_merge($this->denormalizationContexts['*'] ?? [], ...$contexts);
+    }
+
+    public function setDenormalizationContextForGroups(array $context, array $groups = []): void
+    {
+        if (!$groups) {
+            $this->denormalizationContexts['*'] = $context;
+        }
+
+        foreach ($groups as $group) {
+            $this->denormalizationContexts[$group] = $context;
+        }
+    }
+
+    public function merge(AttributeMetadataInterface $attributeMetadata): void
+    {
+        foreach ($attributeMetadata->getGroups() as $group) {
+            $this->addGroup($group);
+        }
+
+        // Overwrite only if not defined
+        $this->maxDepth ??= $attributeMetadata->getMaxDepth();
+        $this->serializedName ??= $attributeMetadata->getSerializedName();
+        $this->serializedPath ??= $attributeMetadata->getSerializedPath();
+
+        // Overwrite only if both contexts are empty
+        if (!$this->normalizationContexts && !$this->denormalizationContexts) {
+            $this->normalizationContexts = $attributeMetadata->getNormalizationContexts();
+            $this->denormalizationContexts = $attributeMetadata->getDenormalizationContexts();
+        }
+
+        if ($ignore = $attributeMetadata->isIgnored()) {
+            $this->ignore = $ignore;
+        }
+    }
+
+    /**
+     * @internal since Symfony 7.4, will be replaced by `__serialize()` in 8.0
+     *
+     * @final since Symfony 7.4, will be replaced by `__serialize()` in 8.0
+     */
+    public function __sleep(): array
+    {
+        return ['name', 'groups', 'maxDepth', 'serializedName', 'serializedPath', 'ignore', 'normalizationContexts', 'denormalizationContexts'];
+    }
+}
diff --git a/symfony/serializer/Mapping/AttributeMetadataInterface.php b/symfony/serializer/Mapping/AttributeMetadataInterface.php
new file mode 100644
index 000000000..9d430602c
--- /dev/null
+++ b/symfony/serializer/Mapping/AttributeMetadataInterface.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+use Symfony\Component\PropertyAccess\PropertyPath;
+
+/**
+ * Stores metadata needed for serializing and deserializing attributes.
+ *
+ * Primarily, the metadata stores serialization groups.
+ *
+ * @internal
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface AttributeMetadataInterface
+{
+    /**
+     * Gets the attribute name.
+     */
+    public function getName(): string;
+
+    /**
+     * Adds this attribute to the given group.
+     */
+    public function addGroup(string $group): void;
+
+    /**
+     * Gets groups of this attribute.
+     *
+     * @return string[]
+     */
+    public function getGroups(): array;
+
+    /**
+     * Sets the serialization max depth for this attribute.
+     */
+    public function setMaxDepth(?int $maxDepth): void;
+
+    /**
+     * Gets the serialization max depth for this attribute.
+     */
+    public function getMaxDepth(): ?int;
+
+    /**
+     * Sets the serialization name for this attribute.
+     */
+    public function setSerializedName(?string $serializedName): void;
+
+    /**
+     * Gets the serialization name for this attribute.
+     */
+    public function getSerializedName(): ?string;
+
+    public function setSerializedPath(?PropertyPath $serializedPath): void;
+
+    public function getSerializedPath(): ?PropertyPath;
+
+    /**
+     * Sets if this attribute must be ignored or not.
+     */
+    public function setIgnore(bool $ignore): void;
+
+    /**
+     * Gets if this attribute is ignored or not.
+     */
+    public function isIgnored(): bool;
+
+    /**
+     * Merges an {@see AttributeMetadataInterface} with in the current one.
+     */
+    public function merge(self $attributeMetadata): void;
+
+    /**
+     * Gets all the normalization contexts per group ("*" being the base context applied to all groups).
+     */
+    public function getNormalizationContexts(): array;
+
+    /**
+     * Gets the computed normalization contexts for given groups.
+     */
+    public function getNormalizationContextForGroups(array $groups): array;
+
+    /**
+     * Sets the normalization context for given groups.
+     */
+    public function setNormalizationContextForGroups(array $context, array $groups = []): void;
+
+    /**
+     * Gets all the denormalization contexts per group ("*" being the base context applied to all groups).
+     */
+    public function getDenormalizationContexts(): array;
+
+    /**
+     * Gets the computed denormalization contexts for given groups.
+     */
+    public function getDenormalizationContextForGroups(array $groups): array;
+
+    /**
+     * Sets the denormalization context for given groups.
+     */
+    public function setDenormalizationContextForGroups(array $context, array $groups = []): void;
+}
diff --git a/symfony/serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/symfony/serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
new file mode 100644
index 000000000..4677e19d5
--- /dev/null
+++ b/symfony/serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+
+/**
+ * @author Samuel Roze <samuel.roze@gmail.com>
+ */
+class ClassDiscriminatorFromClassMetadata implements ClassDiscriminatorResolverInterface
+{
+    private array $mappingForMappedObjectCache = [];
+
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+    ) {
+    }
+
+    public function getMappingForClass(string $class): ?ClassDiscriminatorMapping
+    {
+        if ($this->classMetadataFactory->hasMetadataFor($class)) {
+            return $this->classMetadataFactory->getMetadataFor($class)->getClassDiscriminatorMapping();
+        }
+
+        return null;
+    }
+
+    public function getMappingForMappedObject(object|string $object): ?ClassDiscriminatorMapping
+    {
+        if ($this->classMetadataFactory->hasMetadataFor($object)) {
+            $metadata = $this->classMetadataFactory->getMetadataFor($object);
+
+            if (null !== $metadata->getClassDiscriminatorMapping()) {
+                return $metadata->getClassDiscriminatorMapping();
+            }
+        }
+
+        $cacheKey = \is_object($object) ? $object::class : $object;
+        if (!\array_key_exists($cacheKey, $this->mappingForMappedObjectCache)) {
+            $this->mappingForMappedObjectCache[$cacheKey] = $this->resolveMappingForMappedObject($object);
+        }
+
+        return $this->mappingForMappedObjectCache[$cacheKey];
+    }
+
+    public function getTypeForMappedObject(object|string $object): ?string
+    {
+        if (null === $mapping = $this->getMappingForMappedObject($object)) {
+            return null;
+        }
+
+        return $mapping->getMappedObjectType($object);
+    }
+
+    private function resolveMappingForMappedObject(object|string $object): ?ClassDiscriminatorMapping
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        if ($parentClass = $reflectionClass->getParentClass()) {
+            if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {
+                return $parentMapping;
+            }
+        }
+
+        foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {
+            if (null !== ($interfaceMapping = $this->getMappingForMappedObject($interfaceName))) {
+                return $interfaceMapping;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/symfony/serializer/Mapping/ClassDiscriminatorMapping.php b/symfony/serializer/Mapping/ClassDiscriminatorMapping.php
new file mode 100644
index 000000000..985ea1ce5
--- /dev/null
+++ b/symfony/serializer/Mapping/ClassDiscriminatorMapping.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+/**
+ * @author Samuel Roze <samuel.roze@gmail.com>
+ */
+class ClassDiscriminatorMapping
+{
+    /**
+     * @param array<string, string> $typesMapping
+     */
+    public function __construct(
+        private readonly string $typeProperty,
+        private array $typesMapping = [],
+        private readonly ?string $defaultType = null,
+    ) {
+        uasort($this->typesMapping, static function (string $a, string $b): int {
+            if (is_a($a, $b, true)) {
+                return -1;
+            }
+
+            if (is_a($b, $a, true)) {
+                return 1;
+            }
+
+            return 0;
+        });
+    }
+
+    public function getTypeProperty(): string
+    {
+        return $this->typeProperty;
+    }
+
+    public function getClassForType(string $type): ?string
+    {
+        return $this->typesMapping[$type] ?? null;
+    }
+
+    public function getMappedObjectType(object|string $object): ?string
+    {
+        foreach ($this->typesMapping as $type => $typeClass) {
+            if (is_a($object, $typeClass, true)) {
+                return $type;
+            }
+        }
+
+        return null;
+    }
+
+    public function getTypesMapping(): array
+    {
+        return $this->typesMapping;
+    }
+
+    public function getDefaultType(): ?string
+    {
+        return $this->defaultType;
+    }
+}
diff --git a/symfony/serializer/Mapping/ClassDiscriminatorResolverInterface.php b/symfony/serializer/Mapping/ClassDiscriminatorResolverInterface.php
new file mode 100644
index 000000000..83a12d845
--- /dev/null
+++ b/symfony/serializer/Mapping/ClassDiscriminatorResolverInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+/**
+ * Knows how to get the class discriminator mapping for classes and objects.
+ *
+ * @author Samuel Roze <samuel.roze@gmail.com>
+ */
+interface ClassDiscriminatorResolverInterface
+{
+    public function getMappingForClass(string $class): ?ClassDiscriminatorMapping;
+
+    public function getMappingForMappedObject(object|string $object): ?ClassDiscriminatorMapping;
+
+    public function getTypeForMappedObject(object|string $object): ?string;
+}
diff --git a/symfony/serializer/Mapping/ClassMetadata.php b/symfony/serializer/Mapping/ClassMetadata.php
new file mode 100644
index 000000000..0bba66614
--- /dev/null
+++ b/symfony/serializer/Mapping/ClassMetadata.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 7.4
+ */
+class ClassMetadata implements ClassMetadataInterface
+{
+    private string $name;
+
+    /**
+     * @var AttributeMetadataInterface[]
+     */
+    private array $attributesMetadata = [];
+
+    private ?\ReflectionClass $reflClass = null;
+    private ?ClassDiscriminatorMapping $classDiscriminatorMapping = null;
+
+    public function __construct(string $class, ?ClassDiscriminatorMapping $classDiscriminatorMapping = null)
+    {
+        $this->name = $class;
+        $this->classDiscriminatorMapping = $classDiscriminatorMapping;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void
+    {
+        $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
+    }
+
+    public function getAttributesMetadata(): array
+    {
+        return $this->attributesMetadata;
+    }
+
+    public function merge(ClassMetadataInterface $classMetadata): void
+    {
+        foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
+            if (isset($this->attributesMetadata[$attributeMetadata->getName()])) {
+                $this->attributesMetadata[$attributeMetadata->getName()]->merge($attributeMetadata);
+            } else {
+                $this->addAttributeMetadata($attributeMetadata);
+            }
+        }
+    }
+
+    public function getReflectionClass(): \ReflectionClass
+    {
+        return $this->reflClass ??= new \ReflectionClass($this->getName());
+    }
+
+    public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping
+    {
+        return $this->classDiscriminatorMapping;
+    }
+
+    public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping): void
+    {
+        $this->classDiscriminatorMapping = $mapping;
+    }
+
+    /**
+     * @internal since Symfony 7.4, will be replaced by `__serialize()` in 8.0
+     *
+     * @final since Symfony 7.4, will be replaced by `__serialize()` in 8.0
+     */
+    public function __sleep(): array
+    {
+        return [
+            'name',
+            'attributesMetadata',
+            'classDiscriminatorMapping',
+        ];
+    }
+}
diff --git a/symfony/serializer/Mapping/ClassMetadataInterface.php b/symfony/serializer/Mapping/ClassMetadataInterface.php
new file mode 100644
index 000000000..3f380d2ff
--- /dev/null
+++ b/symfony/serializer/Mapping/ClassMetadataInterface.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping;
+
+/**
+ * Stores metadata needed for serializing and deserializing objects of specific class.
+ *
+ * Primarily, the metadata stores the set of attributes to serialize or deserialize.
+ *
+ * There may only exist one metadata for each attribute according to its name.
+ *
+ * @internal
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface ClassMetadataInterface
+{
+    /**
+     * Returns the name of the backing PHP class.
+     */
+    public function getName(): string;
+
+    /**
+     * Adds an {@link AttributeMetadataInterface}.
+     */
+    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void;
+
+    /**
+     * Gets the list of {@link AttributeMetadataInterface}.
+     *
+     * @return array<string, AttributeMetadataInterface>
+     */
+    public function getAttributesMetadata(): array;
+
+    /**
+     * Merges a {@link ClassMetadataInterface} in the current one.
+     */
+    public function merge(self $classMetadata): void;
+
+    /**
+     * Returns a {@link \ReflectionClass} instance for this class.
+     */
+    public function getReflectionClass(): \ReflectionClass;
+
+    public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping;
+
+    public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping): void;
+}
diff --git a/symfony/serializer/Mapping/Factory/CacheClassMetadataFactory.php b/symfony/serializer/Mapping/Factory/CacheClassMetadataFactory.php
new file mode 100644
index 000000000..61c2fb606
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/CacheClassMetadataFactory.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Caches metadata using a PSR-6 implementation.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class CacheClassMetadataFactory implements ClassMetadataFactoryInterface
+{
+    use ClassResolverTrait;
+
+    /**
+     * @var array<string, ClassMetadataInterface>
+     */
+    private array $loadedClasses = [];
+
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $decorated,
+        private readonly CacheItemPoolInterface $cacheItemPool,
+    ) {
+    }
+
+    public function getMetadataFor(string|object $value): ClassMetadataInterface
+    {
+        $class = $this->getClass($value);
+
+        if (isset($this->loadedClasses[$class])) {
+            return $this->loadedClasses[$class];
+        }
+
+        $key = rawurlencode(strtr($class, '\\', '_'));
+
+        $item = $this->cacheItemPool->getItem($key);
+        if ($item->isHit()) {
+            return $this->loadedClasses[$class] = $item->get();
+        }
+
+        $metadata = $this->decorated->getMetadataFor($value);
+        $this->cacheItemPool->save($item->set($metadata));
+
+        return $this->loadedClasses[$class] = $metadata;
+    }
+
+    public function hasMetadataFor(mixed $value): bool
+    {
+        return $this->decorated->hasMetadataFor($value);
+    }
+}
diff --git a/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php b/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php
new file mode 100644
index 000000000..fc5b2e71e
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Symfony\Component\Serializer\Mapping\ClassMetadata;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
+
+/**
+ * Returns a {@link ClassMetadata}.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class ClassMetadataFactory implements ClassMetadataFactoryInterface
+{
+    use ClassResolverTrait;
+
+    /**
+     * @var array<string, ClassMetadataInterface>
+     */
+    private array $loadedClasses;
+
+    public function __construct(
+        private readonly LoaderInterface $loader,
+    ) {
+    }
+
+    public function getMetadataFor(string|object $value): ClassMetadataInterface
+    {
+        $class = $this->getClass($value);
+
+        if (isset($this->loadedClasses[$class])) {
+            return $this->loadedClasses[$class];
+        }
+
+        $classMetadata = new ClassMetadata($class);
+        $this->loader->loadClassMetadata($classMetadata);
+
+        $reflectionClass = $classMetadata->getReflectionClass();
+
+        // Include metadata from the parent class
+        if ($parent = $reflectionClass->getParentClass()) {
+            $classMetadata->merge($this->getMetadataFor($parent->name));
+        }
+
+        // Include metadata from all implemented interfaces
+        foreach ($reflectionClass->getInterfaces() as $interface) {
+            $classMetadata->merge($this->getMetadataFor($interface->name));
+        }
+
+        return $this->loadedClasses[$class] = $classMetadata;
+    }
+
+    public function hasMetadataFor(mixed $value): bool
+    {
+        return \is_object($value) || (\is_string($value) && (class_exists($value) || interface_exists($value, false)));
+    }
+}
diff --git a/symfony/serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php b/symfony/serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php
new file mode 100644
index 000000000..575019c54
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\VarExporter\VarExporter;
+
+trigger_deprecation('symfony/serializer', '7.4', 'The "%s" class is deprecated.', ClassMetadataFactoryCompiler::class);
+
+/**
+ * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ *
+ * @deprecated since Symfony 7.4
+ */
+final class ClassMetadataFactoryCompiler
+{
+    /**
+     * @param ClassMetadataInterface[] $classMetadatas
+     */
+    public function compile(array $classMetadatas): string
+    {
+        return <<<EOF
+            <?php
+
+            // This file has been auto-generated by the Symfony Serializer Component.
+
+            return [{$this->generateDeclaredClassMetadata($classMetadatas)}
+            ];
+            EOF;
+    }
+
+    /**
+     * @param ClassMetadataInterface[] $classMetadatas
+     */
+    private function generateDeclaredClassMetadata(array $classMetadatas): string
+    {
+        $compiled = '';
+
+        foreach ($classMetadatas as $classMetadata) {
+            $attributesMetadata = [];
+            foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
+                $attributesMetadata[$attributeMetadata->getName()] = [
+                    $attributeMetadata->getGroups(),
+                    $attributeMetadata->getMaxDepth(),
+                    $attributeMetadata->getSerializedName(),
+                    $attributeMetadata->getSerializedPath(),
+                ];
+            }
+
+            $classDiscriminatorMapping = $classMetadata->getClassDiscriminatorMapping() ? [
+                $classMetadata->getClassDiscriminatorMapping()->getTypeProperty(),
+                $classMetadata->getClassDiscriminatorMapping()->getTypesMapping(),
+                $classMetadata->getClassDiscriminatorMapping()->getDefaultType(),
+            ] : null;
+
+            $compiled .= \sprintf("\n'%s' => %s,", $classMetadata->getName(), VarExporter::export([
+                $attributesMetadata,
+                $classDiscriminatorMapping,
+            ]));
+        }
+
+        return $compiled;
+    }
+}
diff --git a/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php b/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php
new file mode 100644
index 000000000..169db634f
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Returns a {@see ClassMetadataInterface}.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface ClassMetadataFactoryInterface
+{
+    /**
+     * If the method was called with the same class name (or an object of that
+     * class) before, the same metadata instance is returned.
+     *
+     * If the factory was configured with a cache, this method will first look
+     * for an existing metadata instance in the cache. If an existing instance
+     * is found, it will be returned without further ado.
+     *
+     * Otherwise, a new metadata instance is created. If the factory was
+     * configured with a loader, the metadata is passed to the
+     * {@link \Symfony\Component\Serializer\Mapping\Loader\LoaderInterface::loadClassMetadata()} method for further
+     * configuration. At last, the new object is returned.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function getMetadataFor(string|object $value): ClassMetadataInterface;
+
+    /**
+     * Checks if class has metadata.
+     */
+    public function hasMetadataFor(mixed $value): bool;
+}
diff --git a/symfony/serializer/Mapping/Factory/ClassResolverTrait.php b/symfony/serializer/Mapping/Factory/ClassResolverTrait.php
new file mode 100644
index 000000000..d7037f894
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/ClassResolverTrait.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * Resolves a class name.
+ *
+ * @internal
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+trait ClassResolverTrait
+{
+    /**
+     * Gets a class name for a given class or instance.
+     *
+     * @throws InvalidArgumentException If the class does not exist
+     */
+    private function getClass(object|string $value): string
+    {
+        if (\is_string($value)) {
+            if (!class_exists($value) && !interface_exists($value, false)) {
+                throw new InvalidArgumentException(\sprintf('The class or interface "%s" does not exist.', $value));
+            }
+
+            return ltrim($value, '\\');
+        }
+
+        return $value::class;
+    }
+}
diff --git a/symfony/serializer/Mapping/Factory/CompiledClassMetadataFactory.php b/symfony/serializer/Mapping/Factory/CompiledClassMetadataFactory.php
new file mode 100644
index 000000000..71e590005
--- /dev/null
+++ b/symfony/serializer/Mapping/Factory/CompiledClassMetadataFactory.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Factory;
+
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
+use Symfony\Component\Serializer\Mapping\ClassMetadata;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+trigger_deprecation('symfony/serializer', '7.3', 'The "%s" class is deprecated.', CompiledClassMetadataFactory::class);
+
+/**
+ * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ *
+ * @deprecated since Symfony 7.3
+ */
+final class CompiledClassMetadataFactory implements ClassMetadataFactoryInterface
+{
+    private array $compiledClassMetadata = [];
+
+    private array $loadedClasses = [];
+
+    public function __construct(
+        string $compiledClassMetadataFile,
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+    ) {
+        if (!file_exists($compiledClassMetadataFile)) {
+            throw new \RuntimeException("File \"{$compiledClassMetadataFile}\" could not be found.");
+        }
+
+        $compiledClassMetadata = require $compiledClassMetadataFile;
+        if (!\is_array($compiledClassMetadata)) {
+            throw new \RuntimeException(\sprintf('Compiled metadata must be of the type array, %s given.', \gettype($compiledClassMetadata)));
+        }
+
+        $this->compiledClassMetadata = $compiledClassMetadata;
+    }
+
+    public function getMetadataFor(string|object $value): ClassMetadataInterface
+    {
+        $className = \is_object($value) ? $value::class : $value;
+
+        if (!isset($this->compiledClassMetadata[$className])) {
+            return $this->classMetadataFactory->getMetadataFor($value);
+        }
+
+        if (!isset($this->loadedClasses[$className])) {
+            $classMetadata = new ClassMetadata($className);
+            foreach ($this->compiledClassMetadata[$className][0] as $name => $compiledAttributesMetadata) {
+                $classMetadata->addAttributeMetadata($attributeMetadata = new AttributeMetadata($name));
+                foreach ($compiledAttributesMetadata[0] as $group) {
+                    $attributeMetadata->addGroup($group);
+                }
+                $attributeMetadata->setMaxDepth($compiledAttributesMetadata[1]);
+                $attributeMetadata->setSerializedName($compiledAttributesMetadata[2]);
+            }
+            $classMetadata->setClassDiscriminatorMapping($this->compiledClassMetadata[$className][1]
+                ? new ClassDiscriminatorMapping(...$this->compiledClassMetadata[$className][1])
+                : null
+            );
+
+            $this->loadedClasses[$className] = $classMetadata;
+        }
+
+        return $this->loadedClasses[$className];
+    }
+
+    public function hasMetadataFor(mixed $value): bool
+    {
+        $className = \is_object($value) ? $value::class : $value;
+
+        return isset($this->compiledClassMetadata[$className]) || $this->classMetadataFactory->hasMetadataFor($value);
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/AttributeLoader.php b/symfony/serializer/Mapping/Loader/AttributeLoader.php
new file mode 100644
index 000000000..593d308fd
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/AttributeLoader.php
@@ -0,0 +1,253 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\Serializer\Attribute\Context;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\Ignore;
+use Symfony\Component\Serializer\Attribute\MaxDepth;
+use Symfony\Component\Serializer\Attribute\SerializedName;
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+use Symfony\Component\Serializer\Exception\MappingException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Loader for PHP attributes.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Alexander M. Turek <me@derrabus.de>
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ */
+class AttributeLoader implements LoaderInterface
+{
+    private const KNOWN_ATTRIBUTES = [
+        DiscriminatorMap::class,
+        Groups::class,
+        Ignore::class,
+        MaxDepth::class,
+        SerializedName::class,
+        SerializedPath::class,
+        Context::class,
+    ];
+
+    /**
+     * @param bool|null                           $allowAnyClass Null is allowed for BC with Symfony <= 6
+     * @param array<class-string, class-string[]> $mappedClasses
+     */
+    public function __construct(
+        private ?bool $allowAnyClass = true,
+        private array $mappedClasses = [],
+    ) {
+        $this->allowAnyClass ??= true;
+    }
+
+    /**
+     * @return class-string[]
+     */
+    public function getMappedClasses(): array
+    {
+        return array_keys($this->mappedClasses);
+    }
+
+    public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
+    {
+        if (!$sourceClasses = $this->mappedClasses[$classMetadata->getName()] ??= $this->allowAnyClass ? [$classMetadata->getName()] : []) {
+            return false;
+        }
+
+        $success = false;
+        foreach ($sourceClasses as $sourceClass) {
+            $reflectionClass = $classMetadata->getName() === $sourceClass ? $classMetadata->getReflectionClass() : new \ReflectionClass($sourceClass);
+            $success = $this->doLoadClassMetadata($reflectionClass, $classMetadata) || $success;
+        }
+
+        return $success;
+    }
+
+    private function doLoadClassMetadata(\ReflectionClass $reflectionClass, ClassMetadataInterface $classMetadata): bool
+    {
+        $className = $reflectionClass->name;
+        $loaded = false;
+        $classGroups = [];
+        $classContextAttribute = null;
+
+        $attributesMetadata = $classMetadata->getAttributesMetadata();
+
+        foreach ($this->loadAttributes($reflectionClass) as $attribute) {
+            match (true) {
+                $attribute instanceof DiscriminatorMap => $classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping($attribute->typeProperty, $attribute->mapping, $attribute->defaultType)),
+                $attribute instanceof Groups => $classGroups = $attribute->groups,
+                $attribute instanceof Context => $classContextAttribute = $attribute,
+                default => null,
+            };
+        }
+
+        foreach ($reflectionClass->getProperties() as $property) {
+            if (!isset($attributesMetadata[$property->name])) {
+                $attributesMetadata[$property->name] = new AttributeMetadata($property->name);
+                $classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
+            }
+
+            $attributeMetadata = $attributesMetadata[$property->name];
+            if ($property->getDeclaringClass()->name === $className) {
+                if ($classContextAttribute) {
+                    $this->setAttributeContextsForGroups($classContextAttribute, $attributeMetadata);
+                }
+
+                foreach ($classGroups as $group) {
+                    $attributeMetadata->addGroup($group);
+                }
+
+                foreach ($this->loadAttributes($property) as $attribute) {
+                    $loaded = true;
+
+                    if ($attribute instanceof Groups) {
+                        foreach ($attribute->groups as $group) {
+                            $attributeMetadata->addGroup($group);
+                        }
+
+                        continue;
+                    }
+
+                    match (true) {
+                        $attribute instanceof MaxDepth => $attributeMetadata->setMaxDepth($attribute->maxDepth),
+                        $attribute instanceof SerializedName => $attributeMetadata->setSerializedName($attribute->serializedName),
+                        $attribute instanceof SerializedPath => $attributeMetadata->setSerializedPath($attribute->serializedPath),
+                        $attribute instanceof Ignore => $attributeMetadata->setIgnore(true),
+                        $attribute instanceof Context => $this->setAttributeContextsForGroups($attribute, $attributeMetadata),
+                        default => null,
+                    };
+                }
+            }
+        }
+
+        foreach ($reflectionClass->getMethods() as $method) {
+            if ($method->getDeclaringClass()->name !== $className) {
+                continue;
+            }
+
+            if (0 === stripos($method->name, 'get') && $method->getNumberOfRequiredParameters()) {
+                continue; /*  matches the BC behavior in `Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes` */
+            }
+
+            $accessorOrMutator = preg_match('/^(get|is|has|set|can)(.+)$/i', $method->name, $matches);
+            if ($accessorOrMutator && !ctype_lower($matches[2][0])) {
+                $attributeName = lcfirst($matches[2]);
+
+                if (isset($attributesMetadata[$attributeName])) {
+                    $attributeMetadata = $attributesMetadata[$attributeName];
+                } else {
+                    $attributesMetadata[$attributeName] = $attributeMetadata = new AttributeMetadata($attributeName);
+                    $classMetadata->addAttributeMetadata($attributeMetadata);
+                }
+            }
+
+            foreach ($this->loadAttributes($method) as $attribute) {
+                if ($attribute instanceof Groups) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(\sprintf('Groups on "%s::%s()" cannot be added. Groups can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
+                    foreach ($attribute->groups as $group) {
+                        $attributeMetadata->addGroup($group);
+                    }
+                } elseif ($attribute instanceof MaxDepth) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(\sprintf('MaxDepth on "%s::%s()" cannot be added. MaxDepth can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
+                    $attributeMetadata->setMaxDepth($attribute->maxDepth);
+                } elseif ($attribute instanceof SerializedName) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(\sprintf('SerializedName on "%s::%s()" cannot be added. SerializedName can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
+                    $attributeMetadata->setSerializedName($attribute->serializedName);
+                } elseif ($attribute instanceof SerializedPath) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(\sprintf('SerializedPath on "%s::%s()" cannot be added. SerializedPath can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
+                    $attributeMetadata->setSerializedPath($attribute->serializedPath);
+                } elseif ($attribute instanceof Ignore) {
+                    if ($accessorOrMutator) {
+                        $attributeMetadata->setIgnore(true);
+                    }
+                } elseif ($attribute instanceof Context) {
+                    if (!$accessorOrMutator) {
+                        throw new MappingException(\sprintf('Context on "%s::%s()" cannot be added. Context can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
+                    }
+
+                    $this->setAttributeContextsForGroups($attribute, $attributeMetadata);
+                }
+
+                $loaded = true;
+            }
+        }
+
+        return $loaded;
+    }
+
+    private function loadAttributes(\ReflectionMethod|\ReflectionClass|\ReflectionProperty $reflector): iterable
+    {
+        foreach ($reflector->getAttributes() as $attribute) {
+            if ($this->isKnownAttribute($attribute->getName())) {
+                try {
+                    yield $attribute->newInstance();
+                } catch (\Error $e) {
+                    if (\Error::class !== $e::class) {
+                        throw $e;
+                    }
+                    $on = match (true) {
+                        $reflector instanceof \ReflectionClass => ' on class '.$reflector->name,
+                        $reflector instanceof \ReflectionMethod => \sprintf(' on "%s::%s()"', $reflector->getDeclaringClass()->name, $reflector->name),
+                        $reflector instanceof \ReflectionProperty => \sprintf(' on "%s::$%s"', $reflector->getDeclaringClass()->name, $reflector->name),
+                        default => '',
+                    };
+
+                    throw new MappingException(\sprintf('Could not instantiate attribute "%s"%s.', $attribute->getName(), $on), 0, $e);
+                }
+            }
+        }
+    }
+
+    private function setAttributeContextsForGroups(Context $attribute, AttributeMetadataInterface $attributeMetadata): void
+    {
+        $context = $attribute->context;
+        $groups = $attribute->groups;
+        $normalizationContext = $attribute->normalizationContext;
+        $denormalizationContext = $attribute->denormalizationContext;
+
+        if ($normalizationContext || $context) {
+            $attributeMetadata->setNormalizationContextForGroups($normalizationContext ?: $context, $groups);
+        }
+
+        if ($denormalizationContext || $context) {
+            $attributeMetadata->setDenormalizationContextForGroups($denormalizationContext ?: $context, $groups);
+        }
+    }
+
+    private function isKnownAttribute(string $attributeName): bool
+    {
+        foreach (self::KNOWN_ATTRIBUTES as $knownAttribute) {
+            if (is_a($attributeName, $knownAttribute, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/FileLoader.php b/symfony/serializer/Mapping/Loader/FileLoader.php
new file mode 100644
index 000000000..ac68d21e8
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/FileLoader.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\Serializer\Exception\MappingException;
+
+/**
+ * Base class for all file based loaders.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+abstract class FileLoader implements LoaderInterface
+{
+    /**
+     * @param string $file The mapping file to load
+     *
+     * @throws MappingException if the mapping file does not exist or is not readable
+     */
+    public function __construct(
+        protected string $file,
+    ) {
+        if (!is_file($file)) {
+            throw new MappingException(\sprintf('The mapping file "%s" does not exist.', $file));
+        }
+
+        if (!is_readable($file)) {
+            throw new MappingException(\sprintf('The mapping file "%s" is not readable.', $file));
+        }
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/LoaderChain.php b/symfony/serializer/Mapping/Loader/LoaderChain.php
new file mode 100644
index 000000000..41abf8cec
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/LoaderChain.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\Serializer\Exception\MappingException;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Calls multiple {@link LoaderInterface} instances in a chain.
+ *
+ * This class accepts multiple instances of LoaderInterface to be passed to the
+ * constructor. When {@link loadClassMetadata()} is called, the same method is called
+ * in <em>all</em> of these loaders, regardless of whether any of them was
+ * successful or not.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class LoaderChain implements LoaderInterface
+{
+    /**
+     * Accepts a list of LoaderInterface instances.
+     *
+     * @param LoaderInterface[] $loaders An array of LoaderInterface instances
+     *
+     * @throws MappingException If any of the loaders does not implement LoaderInterface
+     */
+    public function __construct(private readonly array $loaders)
+    {
+        foreach ($loaders as $loader) {
+            if (!$loader instanceof LoaderInterface) {
+                throw new MappingException(\sprintf('Class "%s" is expected to implement LoaderInterface.', get_debug_type($loader)));
+            }
+        }
+    }
+
+    public function loadClassMetadata(ClassMetadataInterface $metadata): bool
+    {
+        $success = false;
+
+        foreach ($this->loaders as $loader) {
+            $success = $loader->loadClassMetadata($metadata) || $success;
+        }
+
+        return $success;
+    }
+
+    /**
+     * @return LoaderInterface[]
+     */
+    public function getLoaders(): array
+    {
+        return $this->loaders;
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/LoaderInterface.php b/symfony/serializer/Mapping/Loader/LoaderInterface.php
new file mode 100644
index 000000000..4801e4764
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/LoaderInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Loads {@link ClassMetadataInterface}.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface LoaderInterface
+{
+    public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool;
+}
diff --git a/symfony/serializer/Mapping/Loader/XmlFileLoader.php b/symfony/serializer/Mapping/Loader/XmlFileLoader.php
new file mode 100644
index 000000000..fb64bb98c
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/XmlFileLoader.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
+use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\Serializer\Exception\MappingException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+
+/**
+ * Loads XML mapping files.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class XmlFileLoader extends FileLoader
+{
+    /**
+     * An array of {@class \SimpleXMLElement} instances.
+     *
+     * @var array<class-string, \SimpleXMLElement>|null
+     */
+    private ?array $classes = null;
+
+    public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
+    {
+        if (!$this->classes ??= $this->getClassesFromXml()) {
+            return false;
+        }
+
+        $attributesMetadata = $classMetadata->getAttributesMetadata();
+
+        if (isset($this->classes[$classMetadata->getName()])) {
+            $xml = $this->classes[$classMetadata->getName()];
+
+            foreach ($xml->attribute as $attribute) {
+                $attributeName = (string) $attribute['name'];
+
+                if (isset($attributesMetadata[$attributeName])) {
+                    $attributeMetadata = $attributesMetadata[$attributeName];
+                } else {
+                    $attributeMetadata = new AttributeMetadata($attributeName);
+                    $classMetadata->addAttributeMetadata($attributeMetadata);
+                }
+
+                foreach ($attribute->group as $group) {
+                    $attributeMetadata->addGroup((string) $group);
+                }
+
+                if (isset($attribute['max-depth'])) {
+                    $attributeMetadata->setMaxDepth((int) $attribute['max-depth']);
+                }
+
+                if (isset($attribute['serialized-name'])) {
+                    $attributeMetadata->setSerializedName((string) $attribute['serialized-name']);
+                }
+
+                if (isset($attribute['serialized-path'])) {
+                    try {
+                        $attributeMetadata->setSerializedPath(new PropertyPath((string) $attribute['serialized-path']));
+                    } catch (InvalidPropertyPathException) {
+                        throw new MappingException(\sprintf('The "serialized-path" value must be a valid property path for the attribute "%s" of the class "%s".', $attributeName, $classMetadata->getName()));
+                    }
+                }
+
+                if (isset($attribute['ignore'])) {
+                    $attributeMetadata->setIgnore(XmlUtils::phpize($attribute['ignore']));
+                }
+
+                foreach ($attribute->context as $node) {
+                    $groups = (array) $node->group;
+                    $context = $this->parseContext($node->entry);
+                    $attributeMetadata->setNormalizationContextForGroups($context, $groups);
+                    $attributeMetadata->setDenormalizationContextForGroups($context, $groups);
+                }
+
+                foreach ($attribute->normalization_context as $node) {
+                    $groups = (array) $node->group;
+                    $context = $this->parseContext($node->entry);
+                    $attributeMetadata->setNormalizationContextForGroups($context, $groups);
+                }
+
+                foreach ($attribute->denormalization_context as $node) {
+                    $groups = (array) $node->group;
+                    $context = $this->parseContext($node->entry);
+                    $attributeMetadata->setDenormalizationContextForGroups($context, $groups);
+                }
+            }
+
+            if (isset($xml->{'discriminator-map'})) {
+                $mapping = [];
+                foreach ($xml->{'discriminator-map'}->mapping as $element) {
+                    $elementAttributes = $element->attributes();
+                    $mapping[(string) $elementAttributes->type] = (string) $elementAttributes->class;
+                }
+
+                $classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(
+                    (string) $xml->{'discriminator-map'}->attributes()->{'type-property'},
+                    $mapping,
+                    $xml->{'discriminator-map'}->attributes()->{'default-type'} ?? null
+                ));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the names of the classes mapped in this file.
+     *
+     * @return class-string[]
+     */
+    public function getMappedClasses(): array
+    {
+        return array_keys($this->classes ??= $this->getClassesFromXml());
+    }
+
+    /**
+     * Parses an XML File.
+     *
+     * @throws MappingException
+     */
+    private function parseFile(string $file): \SimpleXMLElement
+    {
+        try {
+            $dom = XmlUtils::loadFile($file, __DIR__.'/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd');
+        } catch (\Exception $e) {
+            throw new MappingException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        return simplexml_import_dom($dom);
+    }
+
+    /**
+     * @return array<class-string, \SimpleXMLElement>
+     */
+    private function getClassesFromXml(): array
+    {
+        $xml = $this->parseFile($this->file);
+        $classes = [];
+
+        foreach ($xml->class as $class) {
+            $classes[(string) $class['name']] = $class;
+        }
+
+        return $classes;
+    }
+
+    private function parseContext(\SimpleXMLElement $nodes): array
+    {
+        $context = [];
+
+        foreach ($nodes as $node) {
+            if (\count($node) > 0) {
+                if (\count($node->entry) > 0) {
+                    $value = $this->parseContext($node->entry);
+                } else {
+                    $value = [];
+                }
+            } else {
+                $value = XmlUtils::phpize($node);
+            }
+
+            if (isset($node['name'])) {
+                $context[(string) $node['name']] = $value;
+            } else {
+                $context[] = $value;
+            }
+        }
+
+        return $context;
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/YamlFileLoader.php b/symfony/serializer/Mapping/Loader/YamlFileLoader.php
new file mode 100644
index 000000000..648de0db7
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/YamlFileLoader.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Mapping\Loader;
+
+use Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException;
+use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\Serializer\Exception\MappingException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * YAML File Loader.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class YamlFileLoader extends FileLoader
+{
+    private ?Parser $yamlParser = null;
+
+    /**
+     * @var array<class-string, array>
+     */
+    private ?array $classes = null;
+
+    public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
+    {
+        if (!$this->classes ??= $this->getClassesFromYaml()) {
+            return false;
+        }
+
+        if (!isset($this->classes[$classMetadata->getName()])) {
+            return false;
+        }
+
+        $yaml = $this->classes[$classMetadata->getName()];
+
+        if (isset($yaml['attributes']) && \is_array($yaml['attributes'])) {
+            $attributesMetadata = $classMetadata->getAttributesMetadata();
+
+            foreach ($yaml['attributes'] as $attribute => $data) {
+                if (isset($attributesMetadata[$attribute])) {
+                    $attributeMetadata = $attributesMetadata[$attribute];
+                } else {
+                    $attributeMetadata = new AttributeMetadata($attribute);
+                    $classMetadata->addAttributeMetadata($attributeMetadata);
+                }
+
+                if (isset($data['groups'])) {
+                    if (!\is_array($data['groups'])) {
+                        throw new MappingException(\sprintf('The "groups" key must be an array of strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+
+                    foreach ($data['groups'] as $group) {
+                        if (!\is_string($group)) {
+                            throw new MappingException(\sprintf('Group names must be strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                        }
+
+                        $attributeMetadata->addGroup($group);
+                    }
+                }
+
+                if (isset($data['max_depth'])) {
+                    if (!\is_int($data['max_depth'])) {
+                        throw new MappingException(\sprintf('The "max_depth" value must be an integer in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+
+                    $attributeMetadata->setMaxDepth($data['max_depth']);
+                }
+
+                if (isset($data['serialized_name'])) {
+                    if (!\is_string($data['serialized_name']) || '' === $data['serialized_name']) {
+                        throw new MappingException(\sprintf('The "serialized_name" value must be a non-empty string in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+
+                    $attributeMetadata->setSerializedName($data['serialized_name']);
+                }
+
+                if (isset($data['serialized_path'])) {
+                    try {
+                        $attributeMetadata->setSerializedPath(new PropertyPath((string) $data['serialized_path']));
+                    } catch (InvalidPropertyPathException) {
+                        throw new MappingException(\sprintf('The "serialized_path" value must be a valid property path in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+                }
+
+                if (isset($data['ignore'])) {
+                    if (!\is_bool($data['ignore'])) {
+                        throw new MappingException(\sprintf('The "ignore" value must be a boolean in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+
+                    $attributeMetadata->setIgnore($data['ignore']);
+                }
+
+                foreach ($data['contexts'] ?? [] as $line) {
+                    $groups = $line['groups'] ?? [];
+
+                    if ($context = $line['context'] ?? false) {
+                        $attributeMetadata->setNormalizationContextForGroups($context, $groups);
+                        $attributeMetadata->setDenormalizationContextForGroups($context, $groups);
+                    }
+
+                    if ($context = $line['normalization_context'] ?? false) {
+                        $attributeMetadata->setNormalizationContextForGroups($context, $groups);
+                    }
+
+                    if ($context = $line['denormalization_context'] ?? false) {
+                        $attributeMetadata->setDenormalizationContextForGroups($context, $groups);
+                    }
+                }
+            }
+        }
+
+        if (isset($yaml['discriminator_map'])) {
+            if (!isset($yaml['discriminator_map']['type_property'])) {
+                throw new MappingException(\sprintf('The "type_property" key must be set for the discriminator map of the class "%s" in "%s".', $classMetadata->getName(), $this->file));
+            }
+
+            if (!isset($yaml['discriminator_map']['mapping'])) {
+                throw new MappingException(\sprintf('The "mapping" key must be set for the discriminator map of the class "%s" in "%s".', $classMetadata->getName(), $this->file));
+            }
+
+            $classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(
+                $yaml['discriminator_map']['type_property'],
+                $yaml['discriminator_map']['mapping'],
+                $yaml['discriminator_map']['default_type'] ?? null
+            ));
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the names of the classes mapped in this file.
+     *
+     * @return class-string[]
+     */
+    public function getMappedClasses(): array
+    {
+        return array_keys($this->classes ??= $this->getClassesFromYaml());
+    }
+
+    /**
+     * @return array<class-string, array>
+     */
+    private function getClassesFromYaml(): array
+    {
+        if (!stream_is_local($this->file)) {
+            throw new MappingException(\sprintf('This is not a local file "%s".', $this->file));
+        }
+
+        $this->yamlParser ??= new Parser();
+
+        $classes = $this->yamlParser->parseFile($this->file, Yaml::PARSE_CONSTANT);
+
+        if (!$classes) {
+            return [];
+        }
+
+        if (!\is_array($classes)) {
+            throw new MappingException(\sprintf('The file "%s" must contain a YAML array.', $this->file));
+        }
+
+        return $classes;
+    }
+}
diff --git a/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd b/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd
new file mode 100644
index 000000000..06c6ddfb1
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" ?>
+
+<xsd:schema xmlns="http://symfony.com/schema/dic/serializer-mapping"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://symfony.com/schema/dic/serializer-mapping"
+            elementFormDefault="qualified">
+
+    <xsd:annotation>
+        <xsd:documentation><![CDATA[
+      Symfony Serializer Mapping Schema, version 1.0
+      Authors: Kévin Dunglas, Samuel Roze
+
+      A serializer mapping connects attributes with serialization groups.
+    ]]></xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:element name="serializer" type="serializer" />
+
+    <xsd:complexType name="serializer">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[
+        The root element of the serializer mapping definition.
+      ]]></xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="class" type="class" />
+        </xsd:choice>
+    </xsd:complexType>
+
+    <xsd:complexType name="class">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[
+        Contains serialization groups for a single class.
+
+        Nested elements may be class property and/or getter definitions.
+      ]]></xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="discriminator-map" type="discriminator-map" />
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+    </xsd:complexType>
+
+    <xsd:complexType name="discriminator-map">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="mapping" type="discriminator-map-mapping" maxOccurs="unbounded" />
+        </xsd:choice>
+        <xsd:attribute name="type-property" type="xsd:string" use="required" />
+        <xsd:attribute name="default-type" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="discriminator-map-mapping">
+        <xsd:attribute name="type" type="xsd:string" use="required" />
+        <xsd:attribute name="class" type="xsd:string" use="required" />
+    </xsd:complexType>
+
+    <xsd:complexType name="attribute">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[
+        Contains serialization groups and max depth for attributes. The name of the attribute should be given in the "name" option.
+      ]]></xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="group" type="xsd:string" maxOccurs="unbounded" />
+            <xsd:element name="context" type="context" maxOccurs="unbounded" />
+            <xsd:element name="normalization_context" type="context" maxOccurs="unbounded" />
+            <xsd:element name="denormalization_context" type="context" maxOccurs="unbounded" />
+        </xsd:choice>
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="max-depth">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:integer">
+                    <xsd:minInclusive value="0" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="serialized-name">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:minLength value="1" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="serialized-path">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:minLength value="1" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="ignore" type="xsd:boolean" />
+    </xsd:complexType>
+
+    <xsd:complexType name="context">
+        <xsd:choice maxOccurs="unbounded">
+            <xsd:element name="group" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="entry" type="context-root-entry" maxOccurs="unbounded" />
+        </xsd:choice>
+    </xsd:complexType>
+
+    <xsd:complexType name="context-root-entry" mixed="true">
+        <xsd:sequence minOccurs="0">
+            <xsd:element name="entry" type="context-entry" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute type="xsd:string" name="name" use="required" />
+    </xsd:complexType>
+
+    <xsd:complexType name="context-entry" mixed="true">
+        <xsd:sequence minOccurs="0">
+            <xsd:element name="entry" type="context-entry" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute type="xsd:string" name="name" />
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/symfony/serializer/Mapping/Loader/schema/serialization.schema.json b/symfony/serializer/Mapping/Loader/schema/serialization.schema.json
new file mode 100644
index 000000000..8344ed52f
--- /dev/null
+++ b/symfony/serializer/Mapping/Loader/schema/serialization.schema.json
@@ -0,0 +1,418 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Symfony Serializer Mapping Schema",
+  "description": "JSON schema for Symfony's serialization mapping",
+  "type": "object",
+  "additionalProperties": false,
+  "patternProperties": {
+    "^[A-Za-z0-9\\\\_]+$": {
+      "type": "object",
+      "description": "Class metadata configuration",
+      "additionalProperties": false,
+      "properties": {
+        "attributes": {
+          "type": "object",
+          "description": "Attribute metadata configurations",
+          "additionalProperties": {
+            "oneOf": [
+              {
+                "type": "object",
+                "description": "Attribute metadata configuration",
+                "additionalProperties": false,
+                "properties": {
+                  "groups": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "Serialization groups for this attribute"
+                  },
+                  "max_depth": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "description": "Maximum serialization depth for this attribute"
+                  },
+                  "serialized_name": {
+                    "type": "string",
+                    "minLength": 1,
+                    "description": "Custom name for serialization"
+                  },
+                  "serialized_path": {
+                    "type": "string",
+                    "description": "Property path for serialization (e.g., '[one][two]')"
+                  },
+                  "ignore": {
+                    "type": "boolean",
+                    "description": "Whether to ignore this attribute during serialization"
+                  },
+                  "contexts": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "description": "Context entry with optional groups",
+                      "additionalProperties": false,
+                      "properties": {
+                        "context": {
+                          "$ref": "#/definitions/contextObject"
+                        },
+                        "normalization_context": {
+                          "$ref": "#/definitions/contextObject"
+                        },
+                        "denormalization_context": {
+                          "$ref": "#/definitions/contextObject"
+                        },
+                        "groups": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          },
+                          "description": "Groups this context applies to"
+                        }
+                      },
+                      "anyOf": [
+                        {
+                          "required": ["context"]
+                        },
+                        {
+                          "required": ["normalization_context"]
+                        },
+                        {
+                          "required": ["denormalization_context"]
+                        }
+                      ]
+                    },
+                    "description": "Context configurations for this attribute"
+                  }
+                }
+              },
+              {
+                "type": "null",
+                "description": "Empty attribute metadata"
+              }
+            ]
+          }
+        },
+        "discriminator_map": {
+          "type": "object",
+          "description": "Class discriminator mapping configuration",
+          "additionalProperties": false,
+          "required": ["type_property", "mapping"],
+          "properties": {
+            "type_property": {
+              "type": "string",
+              "description": "Property name used to determine the class type"
+            },
+            "mapping": {
+              "type": "object",
+              "description": "Mapping from type values to class names",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            "default_type": {
+              "type": "string",
+              "description": "Default type when no mapping is found"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "contextObject": {
+      "type": "object",
+      "description": "Context object with key-value pairs",
+      "properties": {
+        "circular_reference_limit": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "How many loops of circular reference to allow while normalizing"
+        },
+        "object_to_populate": {
+          "type": "object",
+          "description": "Object to be updated instead of creating a new instance"
+        },
+        "groups": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "description": "Groups containing attributes to (de)normalize"
+        },
+        "attributes": {
+          "type": "object",
+          "description": "Attributes to (de)normalize"
+        },
+        "allow_extra_attributes": {
+          "type": "boolean",
+          "description": "Whether to ignore extra attributes or throw an exception"
+        },
+        "default_constructor_arguments": {
+          "type": "object",
+          "description": "Hashmap of classes containing hashmaps of constructor argument => default value"
+        },
+        "callbacks": {
+          "type": "object",
+          "description": "Hashmap of field name => callable to normalize this field"
+        },
+        "circular_reference_handler": {
+          "type": "object",
+          "description": "Handler to call when a circular reference has been detected"
+        },
+        "ignored_attributes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Attributes to be skipped when normalizing an object tree"
+        },
+        "require_all_properties": {
+          "type": "boolean",
+          "description": "Whether to require all properties to be listed in the input"
+        },
+        "enable_max_depth": {
+          "type": "boolean",
+          "description": "Whether to respect the max depth metadata on fields"
+        },
+        "depth_key_pattern": {
+          "type": "string",
+          "description": "Pattern to keep track of the current depth (must contain exactly two string placeholders)"
+        },
+        "disable_type_enforcement": {
+          "type": "boolean",
+          "description": "Whether verifying types match during denormalization"
+        },
+        "skip_null_values": {
+          "type": "boolean",
+          "description": "Whether fields with the value null should be output during normalization"
+        },
+        "skip_uninitialized_values": {
+          "type": "boolean",
+          "description": "Whether uninitialized typed class properties should be excluded during normalization"
+        },
+        "max_depth_handler": {
+          "type": "object",
+          "description": "Callback to allow to set a value for an attribute when the max depth has been reached"
+        },
+        "exclude_from_cache_keys": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Context keys not relevant to determine which attributes to (de)normalize"
+        },
+        "deep_object_to_populate": {
+          "type": "boolean",
+          "description": "Whether to tell the denormalizer to also populate existing objects on attributes"
+        },
+        "preserve_empty_objects": {
+          "type": "boolean",
+          "description": "Whether an empty object should be kept as an object or converted to a list"
+        },
+        "normalize_visibility": {
+          "type": "integer",
+          "description": "Whether fields should be output based on visibility (PropertyNormalizer)"
+        },
+        "format": {
+          "type": "string",
+          "description": "Format of the date (DateTimeNormalizer)"
+        },
+        "timezone": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object"
+            }
+          ],
+          "description": "Timezone of the date (DateTimeNormalizer)"
+        },
+        "forceTimezone": {
+          "type": "boolean",
+          "description": "Whether to enforce the timezone during denormalization (DateTimeNormalizer)"
+        },
+        "cast": {
+          "enum": ["int", "float"],
+          "description": "Cast type for DateTime (DateTimeNormalizer)"
+        },
+        "encode_options": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "json_encode flags bitmask (JsonEncoder)"
+        },
+        "decode_options": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "json_decode flags bitmask (JsonEncoder)"
+        },
+        "associative": {
+          "type": "boolean",
+          "description": "Whether decoded objects will be given as associative arrays (JsonEncoder)"
+        },
+        "recursion_depth": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "Maximum recursion depth (JsonEncoder)"
+        },
+        "as_collection": {
+          "type": "boolean",
+          "description": "Whether the decoded result should be considered as a collection (XmlEncoder/CsvEncoder)"
+        },
+        "decoder_ignored_node_types": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          },
+          "description": "Node types to ignore while decoding (XmlEncoder)"
+        },
+        "encoder_ignored_node_types": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          },
+          "description": "Node types to ignore while encoding (XmlEncoder)"
+        },
+        "encoding": {
+          "type": "string",
+          "description": "DOMDocument encoding (XmlEncoder)"
+        },
+        "format_output": {
+          "type": "boolean",
+          "description": "Whether to encode with indentation and extra space (XmlEncoder)"
+        },
+        "load_options": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "DOMDocument::loadXml options bitmask (XmlEncoder)"
+        },
+        "save_options": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "DOMDocument::saveXml options bitmask (XmlEncoder)"
+        },
+        "remove_empty_tags": {
+          "type": "boolean",
+          "description": "Whether to keep empty nodes (XmlEncoder)"
+        },
+        "root_node_name": {
+          "type": "string",
+          "description": "Name of the root node (XmlEncoder)"
+        },
+        "standalone": {
+          "type": "boolean",
+          "description": "Whether the document will be standalone (XmlEncoder)"
+        },
+        "type_cast_attributes": {
+          "type": "boolean",
+          "description": "Whether casting numeric string attributes to integers or floats (XmlEncoder)"
+        },
+        "version": {
+          "type": "string",
+          "description": "Version number of the document (XmlEncoder)"
+        },
+        "cdata_wrapping": {
+          "type": "boolean",
+          "description": "Whether to wrap strings within CDATA sections (XmlEncoder)"
+        },
+        "cdata_wrapping_pattern": {
+          "type": "string",
+          "description": "Pattern used to evaluate if a CDATA section should be added (XmlEncoder)"
+        },
+        "ignore_empty_attributes": {
+          "type": "boolean",
+          "description": "Whether to ignore empty attributes (XmlEncoder)"
+        },
+        "preserve_numeric_keys": {
+          "type": "boolean",
+          "description": "Whether to preserve numeric keys in array (XmlEncoder)"
+        },
+        "inline_threshold": {
+          "type": "integer",
+          "description": "Threshold to switch to inline YAML (YamlEncoder)"
+        },
+        "indent_level": {
+          "type": "integer",
+          "minimum": 0,
+          "description": "Indentation level (YamlEncoder)"
+        },
+        "flags": {
+          "type": "integer",
+          "description": "Yaml::dump flags bitmask (YamlEncoder)"
+        },
+        "preserved_empty_objects": {
+          "type": "boolean",
+          "description": "Whether to preserve empty objects or convert them to null (YamlEncoder)"
+        },
+        "delimiter": {
+          "type": "string",
+          "maxLength": 1,
+          "description": "Column delimiter character (CsvEncoder)"
+        },
+        "enclosure": {
+          "type": "string",
+          "maxLength": 1,
+          "description": "Field enclosure character (CsvEncoder)"
+        },
+        "escape_char": {
+          "type": "string",
+          "maxLength": 1,
+          "description": "Escape character (CsvEncoder, deprecated)"
+        },
+        "key_separator": {
+          "type": "string",
+          "description": "Key separator when (un)flattening arrays (CsvEncoder)"
+        },
+        "headers": {
+          "type": "array",
+          "description": "Headers (CsvEncoder)"
+        },
+        "escaped_formulas": {
+          "type": "boolean",
+          "description": "Whether formulas should be escaped (CsvEncoder)"
+        },
+        "no_headers": {
+          "type": "boolean",
+          "description": "Whether the input/output is containing headers (CsvEncoder)"
+        },
+        "end_of_line": {
+          "type": "string",
+          "description": "End of line characters (CsvEncoder)"
+        },
+        "output_utf8_bom": {
+          "type": "boolean",
+          "description": "Whether to add the UTF-8 Byte Order Mark (CsvEncoder)"
+        }
+      },
+      "additionalProperties": {
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "number"
+          },
+          {
+            "type": "boolean"
+          },
+          {
+            "type": "null"
+          },
+          {
+            "type": "array"
+          },
+          {
+            "type": "object"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/symfony/serializer/NameConverter/AdvancedNameConverterInterface.php b/symfony/serializer/NameConverter/AdvancedNameConverterInterface.php
new file mode 100644
index 000000000..975d28fd3
--- /dev/null
+++ b/symfony/serializer/NameConverter/AdvancedNameConverterInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\NameConverter;
+
+/**
+ * Gives access to the class, the format and the context in the property name converters.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @deprecated since Symfony 7.2, use NameConverterInterface instead
+ */
+interface AdvancedNameConverterInterface extends NameConverterInterface
+{
+    public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string;
+
+    public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string;
+}
diff --git a/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
new file mode 100644
index 000000000..033ec94b7
--- /dev/null
+++ b/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\NameConverter;
+
+use Symfony\Component\Serializer\Exception\UnexpectedPropertyException;
+
+/**
+ * CamelCase to Underscore name converter.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Aurélien Pillevesse <aurelienpillevesse@hotmail.fr>
+ */
+class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
+{
+    /**
+     * Require all properties to be written in snake_case.
+     */
+    public const REQUIRE_SNAKE_CASE_PROPERTIES = 'require_snake_case_properties';
+
+    /**
+     * @param string[]|null $attributes     The list of attributes to rename or null for all attributes
+     * @param bool          $lowerCamelCase Use lowerCamelCase style
+     */
+    public function __construct(
+        private ?array $attributes = null,
+        private bool $lowerCamelCase = true,
+    ) {
+    }
+
+    /**
+     * @param class-string|null    $class
+     * @param string|null          $format
+     * @param array<string, mixed> $context
+     */
+    public function normalize(string $propertyName/* , ?string $class = null, ?string $format = null, array $context = [] */): string
+    {
+        if (null === $this->attributes || \in_array($propertyName, $this->attributes, true)) {
+            return strtolower(preg_replace('/[A-Z]/', '_\\0', lcfirst($propertyName)));
+        }
+
+        return $propertyName;
+    }
+
+    /**
+     * @param class-string|null    $class
+     * @param string|null          $format
+     * @param array<string, mixed> $context
+     */
+    public function denormalize(string $propertyName/* , ?string $class = null, ?string $format = null, array $context = [] */): string
+    {
+        $class = 1 < \func_num_args() ? func_get_arg(1) : null;
+        $format = 2 < \func_num_args() ? func_get_arg(2) : null;
+        $context = 3 < \func_num_args() ? func_get_arg(3) : [];
+
+        if (($context[self::REQUIRE_SNAKE_CASE_PROPERTIES] ?? false) && $propertyName !== $this->normalize($propertyName, $class, $format, $context)) {
+            throw new UnexpectedPropertyException($propertyName);
+        }
+
+        $camelCasedName = preg_replace_callback('/(^|_|\.)+(.)/', fn ($match) => ('.' === $match[1] ? '_' : '').strtoupper($match[2]), $propertyName);
+
+        if ($this->lowerCamelCase) {
+            $camelCasedName = lcfirst($camelCasedName);
+        }
+
+        if (null === $this->attributes || \in_array($camelCasedName, $this->attributes, true)) {
+            return $camelCasedName;
+        }
+
+        return $propertyName;
+    }
+}
diff --git a/symfony/serializer/NameConverter/MetadataAwareNameConverter.php b/symfony/serializer/NameConverter/MetadataAwareNameConverter.php
new file mode 100644
index 000000000..c72f148eb
--- /dev/null
+++ b/symfony/serializer/NameConverter/MetadataAwareNameConverter.php
@@ -0,0 +1,155 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\NameConverter;
+
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+
+/**
+ * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ */
+final class MetadataAwareNameConverter implements AdvancedNameConverterInterface
+{
+    /**
+     * @var array<string, array<string, string|null>>
+     */
+    private static array $normalizeCache = [];
+
+    /**
+     * @var array<string, array<string, string|null>>
+     */
+    private static array $denormalizeCache = [];
+
+    /**
+     * @var array<string, array<string, string>>
+     */
+    private static array $attributesMetadataCache = [];
+
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $metadataFactory,
+        private readonly ?NameConverterInterface $fallbackNameConverter = null,
+    ) {
+    }
+
+    public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        if (null === $class) {
+            return $this->normalizeFallback($propertyName, $class, $format, $context);
+        }
+
+        if (!\array_key_exists($class, self::$normalizeCache) || !\array_key_exists($propertyName, self::$normalizeCache[$class])) {
+            self::$normalizeCache[$class][$propertyName] = $this->getCacheValueForNormalization($propertyName, $class);
+        }
+
+        return self::$normalizeCache[$class][$propertyName] ?? $this->normalizeFallback($propertyName, $class, $format, $context);
+    }
+
+    public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        if (null === $class) {
+            return $this->denormalizeFallback($propertyName, $class, $format, $context);
+        }
+
+        $cacheKey = $this->getCacheKey($class, $context);
+        if (!\array_key_exists($cacheKey, self::$denormalizeCache) || !\array_key_exists($propertyName, self::$denormalizeCache[$cacheKey])) {
+            self::$denormalizeCache[$cacheKey][$propertyName] = $this->getCacheValueForDenormalization($propertyName, $class, $context);
+        }
+
+        return self::$denormalizeCache[$cacheKey][$propertyName] ?? $this->denormalizeFallback($propertyName, $class, $format, $context);
+    }
+
+    private function getCacheValueForNormalization(string $propertyName, string $class): ?string
+    {
+        if (!$this->metadataFactory->hasMetadataFor($class)) {
+            return null;
+        }
+
+        $attributesMetadata = $this->metadataFactory->getMetadataFor($class)->getAttributesMetadata();
+        if (!\array_key_exists($propertyName, $attributesMetadata)) {
+            return null;
+        }
+
+        if (null !== $attributesMetadata[$propertyName]->getSerializedName() && null !== $attributesMetadata[$propertyName]->getSerializedPath()) {
+            throw new LogicException(\sprintf('Found SerializedName and SerializedPath attributes on property "%s" of class "%s".', $propertyName, $class));
+        }
+
+        return $attributesMetadata[$propertyName]->getSerializedName() ?? null;
+    }
+
+    private function normalizeFallback(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        return $this->fallbackNameConverter ? $this->fallbackNameConverter->normalize($propertyName, $class, $format, $context) : $propertyName;
+    }
+
+    private function getCacheValueForDenormalization(string $propertyName, string $class, array $context): ?string
+    {
+        $cacheKey = $this->getCacheKey($class, $context);
+        if (!\array_key_exists($cacheKey, self::$attributesMetadataCache)) {
+            self::$attributesMetadataCache[$cacheKey] = $this->getCacheValueForAttributesMetadata($class, $context);
+        }
+
+        return self::$attributesMetadataCache[$cacheKey][$propertyName] ?? null;
+    }
+
+    private function denormalizeFallback(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        return $this->fallbackNameConverter ? $this->fallbackNameConverter->denormalize($propertyName, $class, $format, $context) : $propertyName;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function getCacheValueForAttributesMetadata(string $class, array $context): array
+    {
+        if (!$this->metadataFactory->hasMetadataFor($class)) {
+            return [];
+        }
+
+        $classMetadata = $this->metadataFactory->getMetadataFor($class);
+
+        $cache = [];
+        foreach ($classMetadata->getAttributesMetadata() as $name => $metadata) {
+            if (null === $metadata->getSerializedName()) {
+                continue;
+            }
+
+            if (null !== $metadata->getSerializedName() && null !== $metadata->getSerializedPath()) {
+                throw new LogicException(\sprintf('Found SerializedName and SerializedPath attributes on property "%s" of class "%s".', $name, $class));
+            }
+
+            $metadataGroups = $metadata->getGroups();
+            $contextGroups = (array) ($context[AbstractNormalizer::GROUPS] ?? []);
+
+            if ($contextGroups && !$metadataGroups) {
+                continue;
+            }
+
+            if ($metadataGroups && !array_intersect($metadataGroups, $contextGroups) && !\in_array('*', $contextGroups, true)) {
+                continue;
+            }
+
+            $cache[$metadata->getSerializedName()] = $name;
+        }
+
+        return $cache;
+    }
+
+    private function getCacheKey(string $class, array $context): string
+    {
+        if (isset($context['cache_key'])) {
+            return $class.'-'.$context['cache_key'];
+        }
+
+        return $class.hash('xxh128', serialize($context[AbstractNormalizer::GROUPS] ?? []));
+    }
+}
diff --git a/symfony/serializer/NameConverter/NameConverterInterface.php b/symfony/serializer/NameConverter/NameConverterInterface.php
new file mode 100644
index 000000000..d6bfeceb4
--- /dev/null
+++ b/symfony/serializer/NameConverter/NameConverterInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\NameConverter;
+
+/**
+ * Defines the interface for property name converters.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface NameConverterInterface
+{
+    /**
+     * Converts a property name to its normalized value.
+     *
+     * @param class-string|null    $class
+     * @param string|null          $format
+     * @param array<string, mixed> $context
+     */
+    public function normalize(string $propertyName/* , ?string $class = null, ?string $format = null, array $context = [] */): string;
+
+    /**
+     * Converts a property name to its denormalized value.
+     *
+     * @param class-string|null    $class
+     * @param string|null          $format
+     * @param array<string, mixed> $context
+     */
+    public function denormalize(string $propertyName/* , ?string $class = null, ?string $format = null, array $context = [] */): string;
+}
diff --git a/symfony/serializer/NameConverter/SnakeCaseToCamelCaseNameConverter.php b/symfony/serializer/NameConverter/SnakeCaseToCamelCaseNameConverter.php
new file mode 100644
index 000000000..ab8a06351
--- /dev/null
+++ b/symfony/serializer/NameConverter/SnakeCaseToCamelCaseNameConverter.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\NameConverter;
+
+use Symfony\Component\Serializer\Exception\UnexpectedPropertyException;
+
+/**
+ * Underscore to camelCase name converter.
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+final class SnakeCaseToCamelCaseNameConverter implements NameConverterInterface
+{
+    /**
+     * Require all properties to be written in camelCase.
+     */
+    public const REQUIRE_CAMEL_CASE_PROPERTIES = 'require_camel_case_properties';
+
+    /**
+     * @param string[]|null $attributes     The list of attributes to rename or null for all attributes
+     * @param bool          $lowerCamelCase Use lowerCamelCase style
+     */
+    public function __construct(
+        private readonly ?array $attributes = null,
+        private readonly bool $lowerCamelCase = true,
+    ) {
+    }
+
+    /**
+     * @param class-string|null    $class
+     * @param array<string, mixed> $context
+     */
+    public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        if (null !== $this->attributes && !\in_array($propertyName, $this->attributes, true)) {
+            return $propertyName;
+        }
+
+        $camelCasedName = preg_replace_callback(
+            '/(^|_|\.)+(.)/',
+            fn ($match) => ('.' === $match[1] ? '_' : '').strtoupper($match[2]),
+            $propertyName
+        );
+
+        if ($this->lowerCamelCase) {
+            $camelCasedName = lcfirst($camelCasedName);
+        }
+
+        return $camelCasedName;
+    }
+
+    /**
+     * @param class-string|null    $class
+     * @param array<string, mixed> $context
+     */
+    public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        if (($context[self::REQUIRE_CAMEL_CASE_PROPERTIES] ?? false) && $propertyName !== $this->normalize($propertyName, $class, $format, $context)) {
+            throw new UnexpectedPropertyException($propertyName);
+        }
+
+        $snakeCased = strtolower(preg_replace('/[A-Z]/', '_\\0', lcfirst($propertyName)));
+        if (null === $this->attributes || \in_array($snakeCased, $this->attributes, true)) {
+            return $snakeCased;
+        }
+
+        return $propertyName;
+    }
+}
diff --git a/symfony/serializer/Normalizer/AbstractNormalizer.php b/symfony/serializer/Normalizer/AbstractNormalizer.php
new file mode 100644
index 000000000..677696b8e
--- /dev/null
+++ b/symfony/serializer/Normalizer/AbstractNormalizer.php
@@ -0,0 +1,597 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\CircularReferenceException;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+
+/**
+ * Normalizer implementation.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+{
+    use ObjectToPopulateTrait;
+    use SerializerAwareTrait;
+
+    /* constants to configure the context */
+
+    /**
+     * How many loops of circular reference to allow while normalizing.
+     *
+     * The default value of 1 means that when we encounter the same object a
+     * second time, we consider that a circular reference.
+     *
+     * You can raise this value for special cases, e.g. in combination with the
+     * max depth setting of the object normalizer.
+     */
+    public const CIRCULAR_REFERENCE_LIMIT = 'circular_reference_limit';
+
+    /**
+     * Instead of creating a new instance of an object, update the specified object.
+     *
+     * If you have a nested structure, child objects will be overwritten with
+     * new instances unless you set DEEP_OBJECT_TO_POPULATE to true.
+     */
+    public const OBJECT_TO_POPULATE = 'object_to_populate';
+
+    /**
+     * Only (de)normalize attributes that are in the specified groups.
+     */
+    public const GROUPS = 'groups';
+
+    /**
+     * Limit (de)normalize to the specified names.
+     *
+     * For nested structures, this list needs to reflect the object tree.
+     */
+    public const ATTRIBUTES = 'attributes';
+
+    /**
+     * If ATTRIBUTES are specified, and the source has fields that are not part of that list,
+     * either ignore those attributes (true) or throw an ExtraAttributesException (false).
+     */
+    public const ALLOW_EXTRA_ATTRIBUTES = 'allow_extra_attributes';
+
+    /**
+     * Hashmap of default values for constructor arguments.
+     *
+     * The names need to match the parameter names in the constructor arguments.
+     */
+    public const DEFAULT_CONSTRUCTOR_ARGUMENTS = 'default_constructor_arguments';
+
+    /**
+     * Hashmap of field name => callable to (de)normalize this field.
+     *
+     * The callable is called if the field is encountered with the arguments:
+     *
+     * - mixed         $attributeValue value of this field
+     * - object|string $object         the whole object being normalized or the object's class being denormalized
+     * - string        $attributeName  name of the attribute being (de)normalized
+     * - string        $format         the requested format
+     * - array         $context        the serialization context
+     */
+    public const CALLBACKS = 'callbacks';
+
+    /**
+     * Handler to call when a circular reference has been detected.
+     *
+     * If you specify no handler, a CircularReferenceException is thrown.
+     *
+     * The method will be called with ($object, $format, $context) and its
+     * return value is returned as the result of the normalize call.
+     */
+    public const CIRCULAR_REFERENCE_HANDLER = 'circular_reference_handler';
+
+    /**
+     * Skip the specified attributes when normalizing an object tree.
+     *
+     * This list is applied to each element of nested structures.
+     *
+     * Note: The behaviour for nested structures is different from ATTRIBUTES
+     * for historical reason. Aligning the behaviour would be a BC break.
+     */
+    public const IGNORED_ATTRIBUTES = 'ignored_attributes';
+
+    /**
+     * Require all properties to be listed in the input instead of falling
+     * back to null for nullable ones.
+     */
+    public const REQUIRE_ALL_PROPERTIES = 'require_all_properties';
+
+    /**
+     * Flag to control whether a non-boolean value should be filtered using the
+     * filter_var function with the {@see https://www.php.net/manual/fr/filter.filters.validate.php}
+     * \FILTER_VALIDATE_BOOL filter before casting it to a boolean.
+     *
+     * "0", "false", "off", "no" and "" will be cast to false.
+     * "1", "true", "on" and "yes" will be cast to true.
+     */
+    public const FILTER_BOOL = 'filter_bool';
+
+    /**
+     * @internal
+     */
+    protected const CIRCULAR_REFERENCE_LIMIT_COUNTERS = 'circular_reference_limit_counters';
+
+    protected array $defaultContext = [
+        self::ALLOW_EXTRA_ATTRIBUTES => true,
+        self::CIRCULAR_REFERENCE_HANDLER => null,
+        self::CIRCULAR_REFERENCE_LIMIT => 1,
+        self::IGNORED_ATTRIBUTES => [],
+    ];
+
+    /**
+     * Sets the {@link ClassMetadataFactoryInterface} to use.
+     */
+    public function __construct(
+        protected ?ClassMetadataFactoryInterface $classMetadataFactory = null,
+        protected ?NameConverterInterface $nameConverter = null,
+        array $defaultContext = [],
+    ) {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+
+        $this->validateCallbackContext($this->defaultContext, 'default');
+
+        if (isset($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]) && !\is_callable($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER])) {
+            throw new InvalidArgumentException(\sprintf('Invalid callback found in the "%s" default context option.', self::CIRCULAR_REFERENCE_HANDLER));
+        }
+    }
+
+    /**
+     * Detects if the configured circular reference limit is reached.
+     *
+     * @throws CircularReferenceException
+     */
+    protected function isCircularReference(object $object, array &$context): bool
+    {
+        $objectId = spl_object_id($object);
+
+        $circularReferenceLimit = $context[self::CIRCULAR_REFERENCE_LIMIT] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_LIMIT];
+        if (isset($context[self::CIRCULAR_REFERENCE_LIMIT_COUNTERS][$objectId])) {
+            if ($context[self::CIRCULAR_REFERENCE_LIMIT_COUNTERS][$objectId] >= $circularReferenceLimit) {
+                unset($context[self::CIRCULAR_REFERENCE_LIMIT_COUNTERS][$objectId]);
+
+                return true;
+            }
+
+            ++$context[self::CIRCULAR_REFERENCE_LIMIT_COUNTERS][$objectId];
+        } else {
+            $context[self::CIRCULAR_REFERENCE_LIMIT_COUNTERS][$objectId] = 1;
+        }
+
+        return false;
+    }
+
+    /**
+     * Handles a circular reference.
+     *
+     * If a circular reference handler is set, it will be called. Otherwise, a
+     * {@class CircularReferenceException} will be thrown.
+     *
+     * @final
+     *
+     * @throws CircularReferenceException
+     */
+    protected function handleCircularReference(object $object, ?string $format = null, array $context = []): mixed
+    {
+        $circularReferenceHandler = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER];
+        if ($circularReferenceHandler) {
+            return $circularReferenceHandler($object, $format, $context);
+        }
+
+        throw new CircularReferenceException(\sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d).', get_debug_type($object), $context[self::CIRCULAR_REFERENCE_LIMIT] ?? $this->defaultContext[self::CIRCULAR_REFERENCE_LIMIT]));
+    }
+
+    /**
+     * Gets attributes to normalize using groups.
+     *
+     * @param bool $attributesAsString If false, return an array of {@link AttributeMetadataInterface}
+     *
+     * @return string[]|AttributeMetadataInterface[]|bool
+     *
+     * @throws LogicException if the 'allow_extra_attributes' context variable is false and no class metadata factory is provided
+     */
+    protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool
+    {
+        $allowExtraAttributes = $context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES];
+        if (!$this->classMetadataFactory) {
+            if (!$allowExtraAttributes) {
+                throw new LogicException(\sprintf('A class metadata factory must be provided in the constructor when setting "%s" to false.', self::ALLOW_EXTRA_ATTRIBUTES));
+            }
+
+            return false;
+        }
+
+        $groups = $this->getGroups($context);
+
+        $allowedAttributes = [];
+        $ignoreUsed = false;
+
+        foreach ($this->classMetadataFactory->getMetadataFor($classOrObject)->getAttributesMetadata() as $attributeMetadata) {
+            if ($ignore = $attributeMetadata->isIgnored()) {
+                $ignoreUsed = true;
+            }
+
+            // If you update this check, update accordingly the one in Symfony\Component\PropertyInfo\Extractor\SerializerExtractor::getProperties()
+            if (
+                !$ignore
+                && ([] === $groups || \in_array('*', $groups, true) || array_intersect($attributeMetadata->getGroups(), $groups))
+                && $this->isAllowedAttribute($classOrObject, $name = $attributeMetadata->getName(), null, $context)
+            ) {
+                $allowedAttributes[] = $attributesAsString ? $name : $attributeMetadata;
+            }
+        }
+
+        if (!$ignoreUsed && [] === $groups && $allowExtraAttributes) {
+            // Backward Compatibility with the code using this method written before the introduction of @Ignore
+            return false;
+        }
+
+        return $allowedAttributes;
+    }
+
+    protected function getGroups(array $context): array
+    {
+        $groups = $context[self::GROUPS] ?? $this->defaultContext[self::GROUPS] ?? [];
+
+        return \is_scalar($groups) ? (array) $groups : $groups;
+    }
+
+    /**
+     * Is this attribute allowed?
+     */
+    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    {
+        $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES];
+        if (\in_array($attribute, $ignoredAttributes, true)) {
+            return false;
+        }
+
+        $attributes = $context[self::ATTRIBUTES] ?? $this->defaultContext[self::ATTRIBUTES] ?? null;
+        if (isset($attributes[$attribute])) {
+            // Nested attributes
+            return true;
+        }
+
+        if (\is_array($attributes)) {
+            return \in_array($attribute, $attributes, true);
+        }
+
+        return true;
+    }
+
+    /**
+     * Normalizes the given data to an array. It's particularly useful during
+     * the denormalization process.
+     */
+    protected function prepareForDenormalization(mixed $data): array
+    {
+        return (array) $data;
+    }
+
+    /**
+     * Returns the method to use to construct an object. This method must be either
+     * the object constructor or static.
+     */
+    protected function getConstructor(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes): ?\ReflectionMethod
+    {
+        return $reflectionClass->getConstructor();
+    }
+
+    /**
+     * Instantiates an object using constructor parameters when needed.
+     *
+     * This method also allows to denormalize data into an existing object if
+     * it is present in the context with the object_to_populate. This object
+     * is removed from the context before being returned to avoid side effects
+     * when recursively normalizing an object graph.
+     *
+     * @throws RuntimeException
+     * @throws MissingConstructorArgumentsException
+     */
+    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, ?string $format = null): object
+    {
+        if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
+            unset($context[self::OBJECT_TO_POPULATE]);
+
+            return $object;
+        }
+        // clean up even if no match
+        unset($context[static::OBJECT_TO_POPULATE]);
+
+        $constructor = $this->getConstructor($data, $class, $context, $reflectionClass, $allowedAttributes);
+        if ($constructor) {
+            $context['has_constructor'] = true;
+            if (true !== $constructor->isPublic()) {
+                return $reflectionClass->newInstanceWithoutConstructor();
+            }
+
+            $constructorParameters = $constructor->getParameters();
+            $missingConstructorArguments = [];
+            $params = [];
+            $unsetKeys = [];
+
+            foreach ($constructorParameters as $constructorParameter) {
+                $paramName = $constructorParameter->name;
+                $attributeContext = $this->getAttributeDenormalizationContext($class, $paramName, $context);
+                $key = $this->nameConverter ? $this->nameConverter->normalize($paramName, $class, $format, $context) : $paramName;
+
+                $allowed = false === $allowedAttributes || \in_array($paramName, $allowedAttributes, true);
+                $ignored = !$this->isAllowedAttribute($class, $paramName, $format, $context);
+                if ($constructorParameter->isVariadic()) {
+                    if ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) {
+                        if (!\is_array($data[$key])) {
+                            throw new RuntimeException(\sprintf('Cannot create an instance of "%s" from serialized data because the variadic parameter "%s" can only accept an array.', $class, $constructorParameter->name));
+                        }
+
+                        $variadicParameters = [];
+                        foreach ($data[$key] as $parameterKey => $parameterData) {
+                            try {
+                                $variadicParameters[$parameterKey] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $attributeContext, $format);
+                            } catch (NotNormalizableValueException $exception) {
+                                if (!isset($context['not_normalizable_value_exceptions'])) {
+                                    throw $exception;
+                                }
+
+                                $context['not_normalizable_value_exceptions'][] = $exception;
+                                $params[$paramName] = $parameterData;
+                            }
+                        }
+
+                        $params = array_merge(array_values($params), $variadicParameters);
+                        $unsetKeys[] = $key;
+                    }
+                } elseif ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) {
+                    $parameterData = $data[$key];
+                    if (null === $parameterData && $constructorParameter->allowsNull()) {
+                        $params[$paramName] = null;
+                        $unsetKeys[] = $key;
+
+                        continue;
+                    }
+
+                    try {
+                        $params[$paramName] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $attributeContext, $format);
+                    } catch (NotNormalizableValueException $exception) {
+                        if (!isset($context['not_normalizable_value_exceptions'])) {
+                            throw $exception;
+                        }
+
+                        $context['not_normalizable_value_exceptions'][] = $exception;
+                        $params[$paramName] = $parameterData;
+                    }
+
+                    $unsetKeys[] = $key;
+                } elseif (\array_key_exists($key, $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
+                    $params[$paramName] = $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
+                } elseif (\array_key_exists($key, $this->defaultContext[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
+                    $params[$paramName] = $this->defaultContext[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
+                } elseif ($constructorParameter->isDefaultValueAvailable()) {
+                    $params[$paramName] = $constructorParameter->getDefaultValue();
+                } elseif (!($context[self::REQUIRE_ALL_PROPERTIES] ?? $this->defaultContext[self::REQUIRE_ALL_PROPERTIES] ?? false) && $constructorParameter->hasType() && $constructorParameter->getType()->allowsNull()) {
+                    $params[$paramName] = null;
+                } else {
+                    if (!isset($context['not_normalizable_value_exceptions'])) {
+                        $missingConstructorArguments[] = $constructorParameter->name;
+                        continue;
+                    }
+
+                    $constructorParameterTypes = [];
+                    $reflectionType = $constructorParameter->getType();
+                    if ($reflectionType instanceof \ReflectionUnionType) {
+                        foreach ($reflectionType->getTypes() as $reflectionType) {
+                            $constructorParameterTypes[] = (string) $reflectionType;
+                        }
+                    } elseif ($reflectionType instanceof \ReflectionType) {
+                        $constructorParameterTypes[] = (string) $reflectionType;
+                    } else {
+                        $constructorParameterTypes[] = 'unknown';
+                    }
+
+                    $exception = NotNormalizableValueException::createForUnexpectedDataType(
+                        \sprintf('Failed to create object because the class misses the "%s" property.', $constructorParameter->name),
+                        null,
+                        $constructorParameterTypes,
+                        $attributeContext['deserialization_path'] ?? null,
+                        true
+                    );
+                    $context['not_normalizable_value_exceptions'][] = $exception;
+                }
+            }
+
+            if ($missingConstructorArguments) {
+                throw new MissingConstructorArgumentsException(\sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires the following parameters to be present : "$%s".', $class, implode('", "$', $missingConstructorArguments)), 0, null, $missingConstructorArguments, $class);
+            }
+
+            if (!$constructor->isConstructor()) {
+                $instance = $constructor->invokeArgs(null, $params);
+
+                // do not set a parameter that has been set in the constructor
+                foreach ($unsetKeys as $key) {
+                    unset($data[$key]);
+                }
+
+                return $instance;
+            }
+
+            try {
+                $instance = $reflectionClass->newInstanceArgs($params);
+
+                // do not set a parameter that has been set in the constructor
+                foreach ($unsetKeys as $key) {
+                    unset($data[$key]);
+                }
+
+                return $instance;
+            } catch (\TypeError $e) {
+                if (!isset($context['not_normalizable_value_exceptions'])) {
+                    throw $e;
+                }
+
+                return $reflectionClass->newInstanceWithoutConstructor();
+            }
+        }
+
+        unset($context['has_constructor']);
+
+        if (!$reflectionClass->isInstantiable()) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Failed to create object because the class "%s" is not instantiable.', $class), $data, ['unknown'], $context['deserialization_path'] ?? null);
+        }
+
+        return new $class();
+    }
+
+    /**
+     * @internal
+     */
+    protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, mixed $parameterData, array $context, ?string $format = null): mixed
+    {
+        try {
+            if (($parameterType = $parameter->getType()) instanceof \ReflectionNamedType && !$parameterType->isBuiltin()) {
+                $parameterClass = $parameterType->getName();
+                new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist
+
+                if (!$this->serializer instanceof DenormalizerInterface) {
+                    throw new LogicException(\sprintf('Cannot create an instance of "%s" from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameterClass, static::class));
+                }
+
+                $parameterData = $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $parameterName, $format));
+            }
+        } catch (\ReflectionException $e) {
+            throw new RuntimeException(\sprintf('Could not determine the class of the parameter "%s".', $parameterName), 0, $e);
+        } catch (MissingConstructorArgumentsException $e) {
+            if (!$parameter->getType()->allowsNull()) {
+                throw $e;
+            }
+
+            return null;
+        }
+
+        $parameterData = $this->applyCallbacks($parameterData, $class->getName(), $parameterName, $format, $context);
+
+        return $this->applyFilterBool($parameter, $parameterData, $context);
+    }
+
+    /**
+     * @internal
+     */
+    protected function createChildContext(array $parentContext, string $attribute, ?string $format): array
+    {
+        if (isset($parentContext[self::ATTRIBUTES][$attribute])) {
+            $parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute];
+        } else {
+            unset($parentContext[self::ATTRIBUTES]);
+        }
+
+        return $parentContext;
+    }
+
+    /**
+     * Validate callbacks set in context.
+     *
+     * @param string $contextType Used to specify which context is invalid in exceptions
+     *
+     * @throws InvalidArgumentException
+     */
+    final protected function validateCallbackContext(array $context, string $contextType = ''): void
+    {
+        if (!isset($context[self::CALLBACKS])) {
+            return;
+        }
+
+        if (!\is_array($context[self::CALLBACKS])) {
+            throw new InvalidArgumentException(\sprintf('The "%s"%s context option must be an array of callables.', self::CALLBACKS, '' !== $contextType ? " $contextType" : ''));
+        }
+
+        foreach ($context[self::CALLBACKS] as $attribute => $callback) {
+            if (!\is_callable($callback)) {
+                throw new InvalidArgumentException(\sprintf('Invalid callback found for attribute "%s" in the "%s"%s context option.', $attribute, self::CALLBACKS, '' !== $contextType ? " $contextType" : ''));
+            }
+        }
+    }
+
+    final protected function applyCallbacks(mixed $value, object|string $object, string $attribute, ?string $format, array $context): mixed
+    {
+        /**
+         * @var callable|null
+         */
+        $callback = $context[self::CALLBACKS][$attribute] ?? $this->defaultContext[self::CALLBACKS][$attribute] ?? null;
+
+        return $callback ? $callback($value, $object, $attribute, $format, $context) : $value;
+    }
+
+    final protected function applyFilterBool(\ReflectionParameter $parameter, mixed $value, array $context): mixed
+    {
+        if (!($context[self::FILTER_BOOL] ?? false)) {
+            return $value;
+        }
+
+        if (!($parameterType = $parameter->getType()) instanceof \ReflectionNamedType || 'bool' !== $parameterType->getName()) {
+            return $value;
+        }
+
+        return filter_var($value, \FILTER_VALIDATE_BOOL, \FILTER_NULL_ON_FAILURE) ?? $value;
+    }
+
+    /**
+     * Computes the normalization context merged with current one. Metadata always wins over global context, as more specific.
+     *
+     * @internal
+     */
+    protected function getAttributeNormalizationContext(object $object, string $attribute, array $context): array
+    {
+        if (null === $metadata = $this->getAttributeMetadata($object, $attribute)) {
+            return $context;
+        }
+
+        return array_merge($context, $metadata->getNormalizationContextForGroups($this->getGroups($context)));
+    }
+
+    /**
+     * Computes the denormalization context merged with current one. Metadata always wins over global context, as more specific.
+     *
+     * @internal
+     */
+    protected function getAttributeDenormalizationContext(string $class, string $attribute, array $context): array
+    {
+        $context['deserialization_path'] = ($context['deserialization_path'] ?? false) ? $context['deserialization_path'].'.'.$attribute : $attribute;
+
+        if (null === $metadata = $this->getAttributeMetadata($class, $attribute)) {
+            return $context;
+        }
+
+        return array_merge($context, $metadata->getDenormalizationContextForGroups($this->getGroups($context)));
+    }
+
+    /**
+     * @internal
+     */
+    protected function getAttributeMetadata(object|string $objectOrClass, string $attribute): ?AttributeMetadataInterface
+    {
+        if (!$this->classMetadataFactory) {
+            return null;
+        }
+
+        return $this->classMetadataFactory->getMetadataFor($objectOrClass)->getAttributesMetadata()[$attribute] ?? null;
+    }
+}
diff --git a/symfony/serializer/Normalizer/AbstractObjectNormalizer.php b/symfony/serializer/Normalizer/AbstractObjectNormalizer.php
new file mode 100644
index 000000000..21197540b
--- /dev/null
+++ b/symfony/serializer/Normalizer/AbstractObjectNormalizer.php
@@ -0,0 +1,1224 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException as PropertyAccessInvalidArgumentException;
+use Symfony\Component\PropertyAccess\Exception\InvalidTypeException;
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\Serializer\Encoder\CsvEncoder;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Exception\ExtraAttributesException;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+use Symfony\Component\TypeInfo\Exception\LogicException as TypeInfoLogicException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\IntersectionType;
+use Symfony\Component\TypeInfo\Type\NullableType;
+use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\Type\UnionType;
+use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Base class for a normalizer dealing with objects.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+abstract class AbstractObjectNormalizer extends AbstractNormalizer
+{
+    /**
+     * Set to true to respect the max depth metadata on fields.
+     */
+    public const ENABLE_MAX_DEPTH = 'enable_max_depth';
+
+    /**
+     * How to track the current depth in the context.
+     */
+    public const DEPTH_KEY_PATTERN = 'depth_%s::%s';
+
+    /**
+     * While denormalizing, we can verify that type matches.
+     *
+     * You can disable this by setting this flag to true.
+     */
+    public const DISABLE_TYPE_ENFORCEMENT = 'disable_type_enforcement';
+
+    /**
+     * Flag to control whether fields with the value `null` should be output
+     * when normalizing or omitted.
+     */
+    public const SKIP_NULL_VALUES = 'skip_null_values';
+
+    /**
+     * Flag to control whether uninitialized PHP>=7.4 typed class properties
+     * should be excluded when normalizing.
+     */
+    public const SKIP_UNINITIALIZED_VALUES = 'skip_uninitialized_values';
+
+    /**
+     * Callback to allow to set a value for an attribute when the max depth has
+     * been reached.
+     *
+     * If no callback is given, the attribute is skipped. If a callable is
+     * given, its return value is used (even if null).
+     *
+     * The arguments are:
+     *
+     * - mixed  $attributeValue value of this field
+     * - object $object         the whole object being normalized
+     * - string $attributeName  name of the attribute being normalized
+     * - string $format         the requested format
+     * - array  $context        the serialization context
+     */
+    public const MAX_DEPTH_HANDLER = 'max_depth_handler';
+
+    /**
+     * Specify which context key are not relevant to determine which attributes
+     * of an object to (de)normalize.
+     */
+    public const EXCLUDE_FROM_CACHE_KEY = 'exclude_from_cache_key';
+
+    /**
+     * Flag to tell the denormalizer to also populate existing objects on
+     * attributes of the main object.
+     *
+     * Setting this to true is only useful if you also specify the root object
+     * in OBJECT_TO_POPULATE.
+     */
+    public const DEEP_OBJECT_TO_POPULATE = 'deep_object_to_populate';
+
+    /**
+     * Flag to control whether an empty object should be kept as an object (in
+     * JSON: {}) or converted to a list (in JSON: []).
+     */
+    public const PRESERVE_EMPTY_OBJECTS = 'preserve_empty_objects';
+
+    protected ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver;
+
+    /**
+     * @var array<string, Type|list<LegacyType>|false>
+     */
+    private array $typeCache = [];
+    private array $attributesCache = [];
+    private readonly \Closure $objectClassResolver;
+
+    public function __construct(
+        ?ClassMetadataFactoryInterface $classMetadataFactory = null,
+        ?NameConverterInterface $nameConverter = null,
+        private ?PropertyTypeExtractorInterface $propertyTypeExtractor = null,
+        ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null,
+        ?callable $objectClassResolver = null,
+        array $defaultContext = [],
+    ) {
+        parent::__construct($classMetadataFactory, $nameConverter, $defaultContext);
+
+        if (isset($this->defaultContext[self::MAX_DEPTH_HANDLER]) && !\is_callable($this->defaultContext[self::MAX_DEPTH_HANDLER])) {
+            throw new InvalidArgumentException(\sprintf('The "%s" given in the default context is not callable.', self::MAX_DEPTH_HANDLER));
+        }
+
+        $this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] = array_merge($this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] ?? [], [self::CIRCULAR_REFERENCE_LIMIT_COUNTERS]);
+
+        if ($classMetadataFactory) {
+            $classDiscriminatorResolver ??= new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
+        }
+        $this->classDiscriminatorResolver = $classDiscriminatorResolver;
+        $this->objectClassResolver = ($objectClassResolver ?? 'get_class')(...);
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return \is_object($data) && !$data instanceof \Traversable;
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        $context['_read_attributes'] = true;
+
+        if (!isset($context['cache_key'])) {
+            $context['cache_key'] = $this->getCacheKey($format, $context);
+        }
+
+        $this->validateCallbackContext($context);
+
+        if ($this->isCircularReference($data, $context)) {
+            return $this->handleCircularReference($data, $format, $context);
+        }
+
+        $normalizedData = [];
+        $stack = [];
+        $attributes = $this->getAttributes($data, $format, $context);
+        $class = ($this->objectClassResolver)($data);
+        $classMetadata = $this->classMetadataFactory?->getMetadataFor($class);
+        $attributesMetadata = $this->classMetadataFactory?->getMetadataFor($class)->getAttributesMetadata();
+        if (isset($context[self::MAX_DEPTH_HANDLER])) {
+            $maxDepthHandler = $context[self::MAX_DEPTH_HANDLER];
+            if (!\is_callable($maxDepthHandler)) {
+                throw new InvalidArgumentException(\sprintf('The "%s" given in the context is not callable.', self::MAX_DEPTH_HANDLER));
+            }
+        } else {
+            $maxDepthHandler = null;
+        }
+
+        foreach ($attributes as $attribute) {
+            $maxDepthReached = false;
+            if (null !== $attributesMetadata && ($maxDepthReached = $this->isMaxDepthReached($attributesMetadata, $class, $attribute, $context)) && !$maxDepthHandler) {
+                continue;
+            }
+
+            $attributeContext = $this->getAttributeNormalizationContext($data, $attribute, $context);
+
+            try {
+                $attributeValue = $attribute === $this->classDiscriminatorResolver?->getMappingForMappedObject($data)?->getTypeProperty()
+                    ? $this->classDiscriminatorResolver?->getTypeForMappedObject($data)
+                    : $this->getAttributeValue($data, $attribute, $format, $attributeContext);
+            } catch (UninitializedPropertyException|\Error $e) {
+                if (($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true) && $this->isUninitializedValueError($e)) {
+                    continue;
+                }
+                throw $e;
+            }
+
+            if ($maxDepthReached) {
+                $attributeValue = $maxDepthHandler($attributeValue, $data, $attribute, $format, $attributeContext);
+            }
+
+            $stack[$attribute] = $this->applyCallbacks($attributeValue, $data, $attribute, $format, $attributeContext);
+        }
+
+        foreach ($stack as $attribute => $attributeValue) {
+            $attributeContext = $this->getAttributeNormalizationContext($data, $attribute, $context);
+
+            if (!$this->serializer instanceof NormalizerInterface) {
+                if (null === $attributeValue || \is_scalar($attributeValue)) {
+                    $normalizedData = $this->updateData($normalizedData, $attribute, $attributeValue, $class, $format, $attributeContext, $attributesMetadata, $classMetadata);
+                    continue;
+                }
+                throw new LogicException(\sprintf('Cannot normalize attribute "%s" because the injected serializer is not a normalizer.', $attribute));
+            }
+
+            $childContext = $this->createChildContext($attributeContext, $attribute, $format);
+
+            $normalizedData = $this->updateData($normalizedData, $attribute, $this->serializer->normalize($attributeValue, $format, $childContext), $class, $format, $attributeContext, $attributesMetadata, $classMetadata);
+        }
+
+        $preserveEmptyObjects = $context[self::PRESERVE_EMPTY_OBJECTS] ?? $this->defaultContext[self::PRESERVE_EMPTY_OBJECTS] ?? false;
+        if ($preserveEmptyObjects && !$normalizedData) {
+            return new \ArrayObject();
+        }
+
+        return $normalizedData;
+    }
+
+    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, ?string $format = null): object
+    {
+        if ($class !== $mappedClass = $this->getMappedClass($data, $class, $context)) {
+            return $this->instantiateObject($data, $mappedClass, $context, new \ReflectionClass($mappedClass), $allowedAttributes, $format);
+        }
+
+        return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes, $format);
+    }
+
+    /**
+     * Gets and caches attributes for the given object, format and context.
+     *
+     * @return string[]
+     */
+    protected function getAttributes(object $object, ?string $format, array $context): array
+    {
+        $class = ($this->objectClassResolver)($object);
+        $key = $class.'-'.$context['cache_key'];
+
+        if (isset($this->attributesCache[$key])) {
+            return $this->attributesCache[$key];
+        }
+
+        $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
+
+        if (false !== $allowedAttributes) {
+            if ($context['cache_key']) {
+                $this->attributesCache[$key] = $allowedAttributes;
+            }
+
+            return $allowedAttributes;
+        }
+
+        $attributes = $this->extractAttributes($object, $format, $context);
+
+        if ($mapping = $this->classDiscriminatorResolver?->getMappingForMappedObject($object)) {
+            array_unshift($attributes, $mapping->getTypeProperty());
+        }
+
+        if ($context['cache_key'] && \stdClass::class !== $class) {
+            $this->attributesCache[$key] = $attributes;
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Extracts attributes to normalize from the class of the given object, format and context.
+     *
+     * @return string[]
+     */
+    abstract protected function extractAttributes(object $object, ?string $format = null, array $context = []): array;
+
+    /**
+     * Gets the attribute value.
+     */
+    abstract protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed;
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return class_exists($type) || (interface_exists($type, false) && null !== $this->classDiscriminatorResolver?->getMappingForClass($type));
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        $context['_read_attributes'] = false;
+
+        if (!isset($context['cache_key'])) {
+            $context['cache_key'] = $this->getCacheKey($format, $context);
+        }
+
+        $this->validateCallbackContext($context);
+
+        if (null === $data && isset($context['value_type']) && ($context['value_type'] instanceof Type || $context['value_type'] instanceof LegacyType) && $context['value_type']->isNullable()) {
+            return null;
+        }
+
+        if (XmlEncoder::FORMAT === $format && !\is_array($data)) {
+            $data = ['#' => $data];
+        }
+
+        $allowedAttributes = $this->getAllowedAttributes($type, $context, true);
+        $normalizedData = $this->prepareForDenormalization($data);
+        $extraAttributes = [];
+
+        $mappedClass = $this->getMappedClass($normalizedData, $type, $context);
+
+        $nestedAttributes = $this->getNestedAttributes($mappedClass);
+        $nestedData = $originalNestedData = [];
+        $propertyAccessor = PropertyAccess::createPropertyAccessor();
+        foreach ($nestedAttributes as $property => $serializedPath) {
+            if (null === $value = $propertyAccessor->getValue($normalizedData, $serializedPath)) {
+                continue;
+            }
+            $convertedProperty = $this->nameConverter ? $this->nameConverter->normalize($property, $mappedClass, $format, $context) : $property;
+            $nestedData[$convertedProperty] = $value;
+            $originalNestedData[$property] = $value;
+            $normalizedData = $this->removeNestedValue($serializedPath->getElements(), $normalizedData);
+        }
+
+        $normalizedData = $nestedData + $normalizedData;
+
+        $object = $this->instantiateObject($normalizedData, $mappedClass, $context, new \ReflectionClass($mappedClass), $allowedAttributes, $format);
+        $resolvedClass = ($this->objectClassResolver)($object);
+
+        foreach ($normalizedData as $attribute => $value) {
+            if ($this->nameConverter) {
+                $notConverted = $attribute;
+                $attribute = $this->nameConverter->denormalize($attribute, $resolvedClass, $format, $context);
+                if (isset($nestedData[$notConverted]) && !isset($originalNestedData[$attribute])) {
+                    throw new LogicException(\sprintf('Duplicate values for key "%s" found. One value is set via the SerializedPath attribute: "%s", the other one is set via the SerializedName attribute: "%s".', $notConverted, implode('->', $nestedAttributes[$notConverted]->getElements()), $attribute));
+                }
+            }
+
+            $attributeContext = $this->getAttributeDenormalizationContext($resolvedClass, $attribute, $context);
+
+            if ((false !== $allowedAttributes && !\in_array($attribute, $allowedAttributes, true)) || !$this->isAllowedAttribute($resolvedClass, $attribute, $format, $context)) {
+                if (!($context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES])) {
+                    $extraAttributes[] = $attribute;
+                }
+
+                continue;
+            }
+
+            if ($attributeContext[self::DEEP_OBJECT_TO_POPULATE] ?? $this->defaultContext[self::DEEP_OBJECT_TO_POPULATE] ?? false) {
+                $discriminatorMapping = $this->classDiscriminatorResolver?->getMappingForMappedObject($object);
+
+                try {
+                    $attributeContext[self::OBJECT_TO_POPULATE] = $attribute === $discriminatorMapping?->getTypeProperty()
+                        ? $discriminatorMapping
+                        : $this->getAttributeValue($object, $attribute, $format, $attributeContext);
+                } catch (NoSuchPropertyException) {
+                } catch (UninitializedPropertyException|\Error $e) {
+                    if (!(($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true) && $this->isUninitializedValueError($e))) {
+                        throw $e;
+                    }
+                }
+            }
+
+            if (null !== $type = $this->getType($resolvedClass, $attribute)) {
+                try {
+                    // BC layer for PropertyTypeExtractorInterface::getTypes().
+                    // Can be removed as soon as PropertyTypeExtractorInterface::getTypes() is removed (8.0).
+                    if (\is_array($type)) {
+                        $value = $this->validateAndDenormalizeLegacy($type, $resolvedClass, $attribute, $value, $format, $attributeContext);
+                    } else {
+                        $value = $this->validateAndDenormalize($type, $resolvedClass, $attribute, $value, $format, $attributeContext);
+                    }
+                } catch (NotNormalizableValueException $exception) {
+                    if (isset($context['not_normalizable_value_exceptions'])) {
+                        $context['not_normalizable_value_exceptions'][] = $exception;
+                        continue;
+                    }
+                    throw $exception;
+                }
+            }
+
+            $value = $this->applyCallbacks($value, $resolvedClass, $attribute, $format, $attributeContext);
+
+            try {
+                $this->setAttributeValue($object, $attribute, $value, $format, $attributeContext);
+            } catch (PropertyAccessInvalidArgumentException $e) {
+                $exception = NotNormalizableValueException::createForUnexpectedDataType(
+                    \sprintf('Failed to denormalize attribute "%s" value for class "%s": '.$e->getMessage(), $attribute, $resolvedClass),
+                    $data,
+                    $e instanceof InvalidTypeException ? [$e->expectedType] : ['unknown'],
+                    $attributeContext['deserialization_path'] ?? null,
+                    false,
+                    $e->getCode(),
+                    $e
+                );
+                if (isset($context['not_normalizable_value_exceptions'])) {
+                    $context['not_normalizable_value_exceptions'][] = $exception;
+                    continue;
+                }
+                throw $exception;
+            }
+        }
+
+        if ($extraAttributes) {
+            throw new ExtraAttributesException($extraAttributes);
+        }
+
+        return $object;
+    }
+
+    abstract protected function setAttributeValue(object $object, string $attribute, mixed $value, ?string $format = null, array $context = []): void;
+
+    /**
+     * Validates the submitted data and denormalizes it.
+     *
+     * BC layer for PropertyTypeExtractorInterface::getTypes().
+     * Can be removed as soon as PropertyTypeExtractorInterface::getTypes() is removed (8.0).
+     *
+     * @param LegacyType[] $types
+     *
+     * @throws NotNormalizableValueException
+     * @throws ExtraAttributesException
+     * @throws MissingConstructorArgumentsException
+     * @throws LogicException
+     */
+    private function validateAndDenormalizeLegacy(array $types, string $currentClass, string $attribute, mixed $data, ?string $format, array $context): mixed
+    {
+        $expectedTypes = [];
+        $isUnionType = \count($types) > 1;
+        $e = null;
+        $extraAttributesException = null;
+        $missingConstructorArgumentsException = null;
+        $isNullable = false;
+        foreach ($types as $type) {
+            if (null === $data && $type->isNullable()) {
+                return null;
+            }
+
+            $collectionValueType = $type->isCollection() ? $type->getCollectionValueTypes()[0] ?? null : null;
+
+            // Fix a collection that contains the only one element
+            // This is special to xml format only
+            if ('xml' === $format && null !== $collectionValueType && (!\is_array($data) || !\is_int(key($data)))) {
+                $data = [$data];
+            }
+
+            // This try-catch should cover all NotNormalizableValueException (and all return branches after the first
+            // exception) so we could try denormalizing all types of an union type. If the target type is not an union
+            // type, we will just re-throw the caught exception.
+            // In the case of no denormalization succeeds with an union type, it will fall back to the default exception
+            // with the acceptable types list.
+            try {
+                // In XML and CSV all basic datatypes are represented as strings, it is e.g. not possible to determine,
+                // if a value is meant to be a string, float, int or a boolean value from the serialized representation.
+                // That's why we have to transform the values, if one of these non-string basic datatypes is expected.
+                $builtinType = $type->getBuiltinType();
+                if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+                    if ('' === $data) {
+                        if (LegacyType::BUILTIN_TYPE_ARRAY === $builtinType) {
+                            return [];
+                        }
+
+                        if (LegacyType::BUILTIN_TYPE_STRING === $builtinType) {
+                            return '';
+                        }
+
+                        // Don't return null yet because Object-types that come first may accept empty-string too
+                        $isNullable = $isNullable ?: $type->isNullable();
+                    }
+
+                    switch ($builtinType) {
+                        case LegacyType::BUILTIN_TYPE_BOOL:
+                            // according to https://www.w3.org/TR/xmlschema-2/#boolean, valid representations are "false", "true", "0" and "1"
+                            if ('false' === $data || '0' === $data) {
+                                $data = false;
+                            } elseif ('true' === $data || '1' === $data) {
+                                $data = true;
+                            } else {
+                                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be bool ("%s" given).', $attribute, $currentClass, $data), $data, [LegacyType::BUILTIN_TYPE_BOOL], $context['deserialization_path'] ?? null);
+                            }
+                            break;
+                        case LegacyType::BUILTIN_TYPE_INT:
+                            if (ctype_digit(isset($data[0]) && '-' === $data[0] ? substr($data, 1) : $data)) {
+                                $data = (int) $data;
+                            } else {
+                                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be int ("%s" given).', $attribute, $currentClass, $data), $data, [LegacyType::BUILTIN_TYPE_INT], $context['deserialization_path'] ?? null);
+                            }
+                            break;
+                        case LegacyType::BUILTIN_TYPE_FLOAT:
+                            if (is_numeric($data)) {
+                                return (float) $data;
+                            }
+
+                            return match ($data) {
+                                'NaN' => \NAN,
+                                'INF' => \INF,
+                                '-INF' => -\INF,
+                                default => throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be float ("%s" given).', $attribute, $currentClass, $data), $data, [LegacyType::BUILTIN_TYPE_FLOAT], $context['deserialization_path'] ?? null),
+                            };
+                    }
+                }
+
+                if (is_numeric($data) && XmlEncoder::FORMAT === $format) {
+                    // encoder parsed them wrong, so they might need to be transformed back
+                    switch ($builtinType) {
+                        case LegacyType::BUILTIN_TYPE_STRING:
+                            return (string) $data;
+                        case LegacyType::BUILTIN_TYPE_FLOAT:
+                            return (float) $data;
+                        case LegacyType::BUILTIN_TYPE_INT:
+                            return (int) $data;
+                    }
+                }
+
+                if (null !== $collectionValueType && LegacyType::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) {
+                    $builtinType = LegacyType::BUILTIN_TYPE_OBJECT;
+                    $class = $collectionValueType->getClassName().'[]';
+
+                    if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {
+                        $context['key_type'] = \count($collectionKeyType) > 1 ? $collectionKeyType : $collectionKeyType[0];
+                    }
+
+                    $context['value_type'] = $collectionValueType;
+                } elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && LegacyType::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {
+                    // get inner type for any nested array
+                    [$innerType] = $collectionValueType;
+
+                    // note that it will break for any other builtinType
+                    $dimensions = '[]';
+                    while (\count($innerType->getCollectionValueTypes()) > 0 && LegacyType::BUILTIN_TYPE_ARRAY === $innerType->getBuiltinType()) {
+                        $dimensions .= '[]';
+                        [$innerType] = $innerType->getCollectionValueTypes();
+                    }
+
+                    if (null !== $innerType->getClassName()) {
+                        // the builtinType is the inner one and the class is the class followed by []...[]
+                        $builtinType = $innerType->getBuiltinType();
+                        $class = $innerType->getClassName().$dimensions;
+                    } else {
+                        // default fallback (keep it as array)
+                        $builtinType = $type->getBuiltinType();
+                        $class = $type->getClassName();
+                    }
+                } else {
+                    $builtinType = $type->getBuiltinType();
+                    $class = $type->getClassName();
+                }
+
+                $expectedTypes[LegacyType::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
+
+                if (LegacyType::BUILTIN_TYPE_OBJECT === $builtinType && null !== $class) {
+                    if (!$this->serializer instanceof DenormalizerInterface) {
+                        throw new LogicException(\sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
+                    }
+
+                    $childContext = $this->createChildContext($context, $attribute, $format);
+                    if ($this->serializer->supportsDenormalization($data, $class, $format, $childContext)) {
+                        return $this->serializer->denormalize($data, $class, $format, $childContext);
+                    }
+                }
+
+                // JSON only has a Number type corresponding to both int and float PHP types.
+                // PHP's json_encode, JavaScript's JSON.stringify, Go's json.Marshal as well as most other JSON encoders convert
+                // floating-point numbers like 12.0 to 12 (the decimal part is dropped when possible).
+                // PHP's json_decode automatically converts Numbers without a decimal part to integers.
+                // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
+                // a float is expected.
+                if (LegacyType::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
+                    return (float) $data;
+                }
+
+                if (LegacyType::BUILTIN_TYPE_BOOL === $builtinType && (\is_string($data) || \is_int($data)) && ($context[self::FILTER_BOOL] ?? false)) {
+                    return filter_var($data, \FILTER_VALIDATE_BOOL, \FILTER_NULL_ON_FAILURE);
+                }
+
+                if ((LegacyType::BUILTIN_TYPE_FALSE === $builtinType && false === $data) || (LegacyType::BUILTIN_TYPE_TRUE === $builtinType && true === $data)) {
+                    return $data;
+                }
+
+                switch ($builtinType) {
+                    case LegacyType::BUILTIN_TYPE_ARRAY:
+                    case LegacyType::BUILTIN_TYPE_BOOL:
+                    case LegacyType::BUILTIN_TYPE_CALLABLE:
+                    case LegacyType::BUILTIN_TYPE_FLOAT:
+                    case LegacyType::BUILTIN_TYPE_INT:
+                    case LegacyType::BUILTIN_TYPE_ITERABLE:
+                    case LegacyType::BUILTIN_TYPE_NULL:
+                    case LegacyType::BUILTIN_TYPE_OBJECT:
+                    case LegacyType::BUILTIN_TYPE_RESOURCE:
+                    case LegacyType::BUILTIN_TYPE_STRING:
+                        if (('is_'.$builtinType)($data)) {
+                            return $data;
+                        }
+
+                        break;
+                }
+            } catch (NotNormalizableValueException|InvalidArgumentException $e) {
+                if (!$isUnionType && !$isNullable) {
+                    throw $e;
+                }
+
+                $expectedTypes[LegacyType::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
+            } catch (ExtraAttributesException $e) {
+                if (!$isUnionType && !$isNullable) {
+                    throw $e;
+                }
+
+                $extraAttributesException ??= $e;
+            } catch (MissingConstructorArgumentsException $e) {
+                if (!$isUnionType && !$isNullable) {
+                    throw $e;
+                }
+
+                $missingConstructorArgumentsException ??= $e;
+            }
+        }
+
+        if ($isNullable) {
+            return null;
+        }
+
+        if ($extraAttributesException) {
+            throw $extraAttributesException;
+        }
+
+        if ($missingConstructorArgumentsException) {
+            throw $missingConstructorArgumentsException;
+        }
+
+        if (!$isUnionType && $e) {
+            throw $e;
+        }
+
+        if ($context[self::DISABLE_TYPE_ENFORCEMENT] ?? $this->defaultContext[self::DISABLE_TYPE_ENFORCEMENT] ?? false) {
+            return $data;
+        }
+
+        throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be one of "%s" ("%s" given).', $attribute, $currentClass, implode('", "', array_keys($expectedTypes)), get_debug_type($data)), $data, array_keys($expectedTypes), $context['deserialization_path'] ?? $attribute);
+    }
+
+    /**
+     * Validates the submitted data and denormalizes it.
+     *
+     * @throws NotNormalizableValueException
+     * @throws ExtraAttributesException
+     * @throws MissingConstructorArgumentsException
+     * @throws LogicException
+     */
+    private function validateAndDenormalize(Type $type, string $currentClass, string $attribute, mixed $data, ?string $format, array $context): mixed
+    {
+        $expectedTypes = [];
+
+        // BC layer for type-info < 7.2
+        if (method_exists(Type::class, 'asNonNullable')) {
+            $isUnionType = $type->asNonNullable() instanceof UnionType;
+        } else {
+            $isUnionType = $type instanceof UnionType;
+        }
+
+        $e = null;
+        $extraAttributesException = null;
+        $missingConstructorArgumentsException = null;
+
+        $types = match (true) {
+            $type instanceof IntersectionType => throw new LogicException('Unable to handle intersection type.'),
+            $type instanceof UnionType => $type->getTypes(),
+            default => [$type],
+        };
+
+        foreach ($types as $t) {
+            if (null === $data && $type->isNullable()) {
+                return null;
+            }
+
+            $collectionKeyType = $collectionValueType = null;
+            if ($t instanceof CollectionType) {
+                $collectionKeyType = $t->getCollectionKeyType();
+                $collectionValueType = $t->getCollectionValueType();
+            }
+
+            // BC layer for type-info < 7.2
+            if (method_exists(Type::class, 'getBaseType')) {
+                $t = $t->getBaseType();
+            } else {
+                while ($t instanceof WrappingTypeInterface) {
+                    $t = $t->getWrappedType();
+                }
+            }
+
+            // Fix a collection that contains the only one element
+            // This is special to xml format only
+            if ('xml' === $format && $collectionValueType && (!\is_array($data) || !\is_int(key($data)))) {
+                // BC layer for type-info < 7.2
+                $isMixedType = method_exists(Type::class, 'isA') ? $collectionValueType->isA(TypeIdentifier::MIXED) : $collectionValueType->isIdentifiedBy(TypeIdentifier::MIXED);
+                if (!$isMixedType) {
+                    $data = [$data];
+                }
+            }
+
+            // This try-catch should cover all NotNormalizableValueException (and all return branches after the first
+            // exception) so we could try denormalizing all types of an union type. If the target type is not an union
+            // type, we will just re-throw the caught exception.
+            // In the case of no denormalization succeeds with an union type, it will fall back to the default exception
+            // with the acceptable types list.
+            try {
+                // In XML and CSV all basic datatypes are represented as strings, it is e.g. not possible to determine,
+                // if a value is meant to be a string, float, int or a boolean value from the serialized representation.
+                // That's why we have to transform the values, if one of these non-string basic datatypes is expected.
+                $typeIdentifier = $t->getTypeIdentifier();
+                if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+                    if ('' === $data) {
+                        if (TypeIdentifier::ARRAY === $typeIdentifier) {
+                            return [];
+                        }
+
+                        if (TypeIdentifier::STRING === $typeIdentifier) {
+                            return '';
+                        }
+                    }
+
+                    switch ($typeIdentifier) {
+                        case TypeIdentifier::BOOL:
+                            // according to https://www.w3.org/TR/xmlschema-2/#boolean, valid representations are "false", "true", "0" and "1"
+                            if ('false' === $data || '0' === $data) {
+                                $data = false;
+                            } elseif ('true' === $data || '1' === $data) {
+                                $data = true;
+                            } else {
+                                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be bool ("%s" given).', $attribute, $currentClass, $data), $data, [Type::bool()], $context['deserialization_path'] ?? null);
+                            }
+                            break;
+                        case TypeIdentifier::INT:
+                            if (ctype_digit(isset($data[0]) && '-' === $data[0] ? substr($data, 1) : $data)) {
+                                $data = (int) $data;
+                            } else {
+                                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be int ("%s" given).', $attribute, $currentClass, $data), $data, [Type::int()], $context['deserialization_path'] ?? null);
+                            }
+                            break;
+                        case TypeIdentifier::FLOAT:
+                            if (is_numeric($data)) {
+                                return (float) $data;
+                            }
+
+                            return match ($data) {
+                                'NaN' => \NAN,
+                                'INF' => \INF,
+                                '-INF' => -\INF,
+                                default => throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be float ("%s" given).', $attribute, $currentClass, $data), $data, [Type::float()], $context['deserialization_path'] ?? null),
+                            };
+                    }
+                }
+
+                if (is_numeric($data) && XmlEncoder::FORMAT === $format) {
+                    // encoder parsed them wrong, so they might need to be transformed back
+                    switch ($typeIdentifier) {
+                        case TypeIdentifier::STRING:
+                            return (string) $data;
+                        case TypeIdentifier::FLOAT:
+                            return (float) $data;
+                        case TypeIdentifier::INT:
+                            return (int) $data;
+                    }
+                }
+
+                if ($collectionValueType) {
+                    try {
+                        $collectionValueBaseType = $collectionValueType;
+
+                        // BC layer for type-info < 7.2
+                        if (!interface_exists(WrappingTypeInterface::class)) {
+                            $collectionValueBaseType = $collectionValueType->getBaseType();
+                        } else {
+                            while ($collectionValueBaseType instanceof WrappingTypeInterface) {
+                                $collectionValueBaseType = $collectionValueBaseType->getWrappedType();
+                            }
+                        }
+                    } catch (TypeInfoLogicException) {
+                        $collectionValueBaseType = Type::mixed();
+                    }
+
+                    if ($collectionValueBaseType instanceof ObjectType) {
+                        $typeIdentifier = TypeIdentifier::OBJECT;
+                        $class = $collectionValueBaseType->getClassName().'[]';
+                        $context['key_type'] = $collectionKeyType;
+                        $context['value_type'] = $collectionValueType;
+                    } elseif (
+                        // BC layer for type-info < 7.2
+                        !class_exists(NullableType::class) && TypeIdentifier::ARRAY === $collectionValueBaseType->getTypeIdentifier()
+                        || $collectionValueBaseType instanceof BuiltinType && TypeIdentifier::ARRAY === $collectionValueBaseType->getTypeIdentifier()
+                    ) {
+                        // get inner type for any nested array
+                        $innerType = $collectionValueType;
+                        if ($innerType instanceof NullableType) {
+                            $innerType = $innerType->getWrappedType();
+                        }
+
+                        // note that it will break for any other builtinType
+                        $dimensions = '[]';
+                        while ($innerType instanceof CollectionType) {
+                            $dimensions .= '[]';
+                            $innerType = $innerType->getCollectionValueType();
+                            if ($innerType instanceof NullableType) {
+                                $innerType = $innerType->getWrappedType();
+                            }
+                        }
+
+                        while ($innerType instanceof WrappingTypeInterface) {
+                            $innerType = $innerType->getWrappedType();
+                        }
+
+                        if ($innerType instanceof ObjectType) {
+                            // the builtinType is the inner one and the class is the class followed by []...[]
+                            $typeIdentifier = TypeIdentifier::OBJECT;
+                            $class = $innerType->getClassName().$dimensions;
+                        } else {
+                            // default fallback (keep it as array)
+                            if ($t instanceof ObjectType) {
+                                $typeIdentifier = TypeIdentifier::OBJECT;
+                                $class = $t->getClassName();
+                            } else {
+                                $typeIdentifier = $t->getTypeIdentifier();
+                                $class = null;
+                            }
+                        }
+                    } elseif ($t instanceof ObjectType) {
+                        $typeIdentifier = TypeIdentifier::OBJECT;
+                        $class = $t->getClassName();
+                    } else {
+                        $typeIdentifier = $t->getTypeIdentifier();
+                        $class = null;
+                    }
+                } else {
+                    if ($t instanceof ObjectType) {
+                        $typeIdentifier = TypeIdentifier::OBJECT;
+                        $class = $t->getClassName();
+                    } else {
+                        $typeIdentifier = $t->getTypeIdentifier();
+                        $class = null;
+                    }
+                }
+
+                $expectedTypes[TypeIdentifier::OBJECT === $typeIdentifier && $class ? $class : $typeIdentifier->value] = true;
+
+                if (TypeIdentifier::OBJECT === $typeIdentifier && null !== $class) {
+                    if (!$this->serializer instanceof DenormalizerInterface) {
+                        throw new LogicException(\sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
+                    }
+
+                    $childContext = $this->createChildContext($context, $attribute, $format);
+                    if ($this->serializer->supportsDenormalization($data, $class, $format, $childContext)) {
+                        return $this->serializer->denormalize($data, $class, $format, $childContext);
+                    }
+                }
+
+                // JSON only has a Number type corresponding to both int and float PHP types.
+                // PHP's json_encode, JavaScript's JSON.stringify, Go's json.Marshal as well as most other JSON encoders convert
+                // floating-point numbers like 12.0 to 12 (the decimal part is dropped when possible).
+                // PHP's json_decode automatically converts Numbers without a decimal part to integers.
+                // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
+                // a float is expected.
+                if (TypeIdentifier::FLOAT === $typeIdentifier && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
+                    return (float) $data;
+                }
+
+                if (TypeIdentifier::BOOL === $typeIdentifier && (\is_string($data) || \is_int($data)) && ($context[self::FILTER_BOOL] ?? false)) {
+                    return filter_var($data, \FILTER_VALIDATE_BOOL, \FILTER_NULL_ON_FAILURE);
+                }
+
+                $dataMatchesExpectedType = match ($typeIdentifier) {
+                    TypeIdentifier::ARRAY => \is_array($data),
+                    TypeIdentifier::BOOL => \is_bool($data),
+                    TypeIdentifier::CALLABLE => \is_callable($data),
+                    TypeIdentifier::FALSE => false === $data,
+                    TypeIdentifier::FLOAT => \is_float($data),
+                    TypeIdentifier::INT => \is_int($data),
+                    TypeIdentifier::ITERABLE => is_iterable($data),
+                    TypeIdentifier::MIXED => true,
+                    TypeIdentifier::NULL => null === $data,
+                    TypeIdentifier::OBJECT => \is_object($data),
+                    TypeIdentifier::RESOURCE => \is_resource($data),
+                    TypeIdentifier::STRING => \is_string($data),
+                    TypeIdentifier::TRUE => true === $data,
+                    default => false,
+                };
+
+                if ($dataMatchesExpectedType) {
+                    return $data;
+                }
+            } catch (NotNormalizableValueException|InvalidArgumentException $e) {
+                if (!$type instanceof UnionType) {
+                    throw $e;
+                }
+
+                $expectedTypes[TypeIdentifier::OBJECT === $typeIdentifier && $class ? $class : $typeIdentifier->value] = true;
+            } catch (ExtraAttributesException $e) {
+                if (!$type instanceof UnionType) {
+                    throw $e;
+                }
+
+                $extraAttributesException ??= $e;
+            } catch (MissingConstructorArgumentsException $e) {
+                if (!$type instanceof UnionType) {
+                    throw $e;
+                }
+
+                $missingConstructorArgumentsException ??= $e;
+            }
+        }
+
+        if ('' === $data && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format) && $type->isNullable()) {
+            return null;
+        }
+
+        if ($extraAttributesException) {
+            throw $extraAttributesException;
+        }
+
+        if ($missingConstructorArgumentsException) {
+            throw $missingConstructorArgumentsException;
+        }
+
+        // BC layer for type-info < 7.2
+        if (!class_exists(NullableType::class)) {
+            if (!$isUnionType && $e) {
+                throw $e;
+            }
+        } else {
+            if ($e && !($type instanceof UnionType && !$type instanceof NullableType)) {
+                throw $e;
+            }
+        }
+
+        if ($context[self::DISABLE_TYPE_ENFORCEMENT] ?? $this->defaultContext[self::DISABLE_TYPE_ENFORCEMENT] ?? false) {
+            return $data;
+        }
+
+        throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the "%s" attribute for class "%s" must be one of "%s" ("%s" given).', $attribute, $currentClass, implode('", "', array_keys($expectedTypes)), get_debug_type($data)), $data, array_keys($expectedTypes), $context['deserialization_path'] ?? $attribute);
+    }
+
+    /**
+     * @internal
+     */
+    protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, mixed $parameterData, array $context, ?string $format = null): mixed
+    {
+        if ($parameter->isVariadic() || null === $this->propertyTypeExtractor || null === $type = $this->getType($class->getName(), $parameterName)) {
+            return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);
+        }
+
+        // BC layer for PropertyTypeExtractorInterface::getTypes().
+        // Can be removed as soon as PropertyTypeExtractorInterface::getTypes() is removed (8.0).
+        if (\is_array($type)) {
+            $parameterData = $this->validateAndDenormalizeLegacy($type, $class->getName(), $parameterName, $parameterData, $format, $context);
+        } else {
+            $parameterData = $this->validateAndDenormalize($type, $class->getName(), $parameterName, $parameterData, $format, $context);
+        }
+
+        $parameterData = $this->applyCallbacks($parameterData, $class->getName(), $parameterName, $format, $context);
+
+        return $this->applyFilterBool($parameter, $parameterData, $context);
+    }
+
+    /**
+     * @return Type|list<LegacyType>|null
+     */
+    private function getType(string $currentClass, string $attribute): Type|array|null
+    {
+        if (null === $this->propertyTypeExtractor) {
+            return null;
+        }
+
+        $key = $currentClass.'::'.$attribute;
+        if (isset($this->typeCache[$key])) {
+            return false === $this->typeCache[$key] ? null : $this->typeCache[$key];
+        }
+
+        if (null !== $type = $this->getPropertyType($currentClass, $attribute)) {
+            return $this->typeCache[$key] = $type;
+        }
+
+        if ($discriminatorMapping = $this->classDiscriminatorResolver?->getMappingForClass($currentClass)) {
+            if ($discriminatorMapping->getTypeProperty() === $attribute) {
+                return $this->typeCache[$key] = Type::string();
+            }
+
+            foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {
+                if (null !== $type = $this->getPropertyType($mappedClass, $attribute)) {
+                    return $this->typeCache[$key] = $type;
+                }
+            }
+        }
+
+        $this->typeCache[$key] = false;
+
+        return null;
+    }
+
+    /**
+     * BC layer for PropertyTypeExtractorInterface::getTypes().
+     * Can be removed as soon as PropertyTypeExtractorInterface::getTypes() is removed (8.0).
+     *
+     * @return Type|list<LegacyType>|null
+     */
+    private function getPropertyType(string $className, string $property): Type|array|null
+    {
+        if (class_exists(Type::class) && method_exists($this->propertyTypeExtractor, 'getType')) {
+            return $this->propertyTypeExtractor->getType($className, $property);
+        }
+
+        return $this->propertyTypeExtractor->getTypes($className, $property);
+    }
+
+    /**
+     * Sets an attribute and apply the name converter if necessary.
+     */
+    private function updateData(array $data, string $attribute, mixed $attributeValue, string $class, ?string $format, array $context, ?array $attributesMetadata, ?ClassMetadataInterface $classMetadata): array
+    {
+        if (null === $attributeValue && ($context[self::SKIP_NULL_VALUES] ?? $this->defaultContext[self::SKIP_NULL_VALUES] ?? false)) {
+            return $data;
+        }
+
+        if (null !== $classMetadata && null !== $serializedPath = ($attributesMetadata[$attribute] ?? null)?->getSerializedPath()) {
+            $propertyAccessor = PropertyAccess::createPropertyAccessor();
+            if ($propertyAccessor->isReadable($data, $serializedPath) && null !== $propertyAccessor->getValue($data, $serializedPath)) {
+                throw new LogicException(\sprintf('The element you are trying to set is already populated: "%s".', (string) $serializedPath));
+            }
+            $propertyAccessor->setValue($data, $serializedPath, $attributeValue);
+
+            return $data;
+        }
+
+        if ($this->nameConverter) {
+            $attribute = $this->nameConverter->normalize($attribute, $class, $format, $context);
+        }
+
+        $data[$attribute] = $attributeValue;
+
+        return $data;
+    }
+
+    /**
+     * Is the max depth reached for the given attribute?
+     *
+     * @param AttributeMetadataInterface[] $attributesMetadata
+     */
+    private function isMaxDepthReached(array $attributesMetadata, string $class, string $attribute, array &$context): bool
+    {
+        if (!($context[self::ENABLE_MAX_DEPTH] ?? $this->defaultContext[self::ENABLE_MAX_DEPTH] ?? false)
+            || !isset($attributesMetadata[$attribute]) || null === $maxDepth = $attributesMetadata[$attribute]?->getMaxDepth()
+        ) {
+            return false;
+        }
+
+        $key = \sprintf(self::DEPTH_KEY_PATTERN, $class, $attribute);
+        if (!isset($context[$key])) {
+            $context[$key] = 1;
+
+            return false;
+        }
+
+        if ($context[$key] === $maxDepth) {
+            return true;
+        }
+
+        ++$context[$key];
+
+        return false;
+    }
+
+    /**
+     * Overwritten to update the cache key for the child.
+     *
+     * We must not mix up the attribute cache between parent and children.
+     *
+     * @internal
+     */
+    protected function createChildContext(array $parentContext, string $attribute, ?string $format): array
+    {
+        $context = parent::createChildContext($parentContext, $attribute, $format);
+        if ($context['cache_key'] ?? false) {
+            $context['cache_key'] .= '-'.$attribute;
+        } elseif (false !== ($context['cache_key'] ?? null)) {
+            $context['cache_key'] = $this->getCacheKey($format, $context);
+        }
+
+        return $context;
+    }
+
+    protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool
+    {
+        if (false === $allowedAttributes = parent::getAllowedAttributes($classOrObject, $context, $attributesAsString)) {
+            return false;
+        }
+
+        if (null !== $this->classDiscriminatorResolver) {
+            $class = \is_object($classOrObject) ? $classOrObject::class : $classOrObject;
+            if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForMappedObject($classOrObject)) {
+                $allowedAttributes[] = $attributesAsString ? $discriminatorMapping->getTypeProperty() : new AttributeMetadata($discriminatorMapping->getTypeProperty());
+            }
+
+            if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
+                $attributes = [];
+                foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {
+                    $attributes[] = parent::getAllowedAttributes($mappedClass, $context, $attributesAsString);
+                }
+                $allowedAttributes = array_merge($allowedAttributes, ...$attributes);
+            }
+        }
+
+        return $allowedAttributes;
+    }
+
+    /**
+     * Builds the cache key for the attributes cache.
+     *
+     * The key must be different for every option in the context that could change which attributes should be handled.
+     */
+    private function getCacheKey(?string $format, array $context): bool|string
+    {
+        foreach ($context[self::EXCLUDE_FROM_CACHE_KEY] ?? $this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] as $key) {
+            unset($context[$key]);
+        }
+        unset($context[self::EXCLUDE_FROM_CACHE_KEY]);
+        unset($context[self::OBJECT_TO_POPULATE]);
+        unset($context['cache_key']); // avoid artificially different keys
+
+        try {
+            return hash('xxh128', $format.serialize([
+                'context' => $context,
+                'ignored' => $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES],
+            ]));
+        } catch (\Exception) {
+            // The context cannot be serialized, skip the cache
+            return false;
+        }
+    }
+
+    /**
+     * This error may occur when specific object normalizer implementation gets attribute value
+     * by accessing a public uninitialized property or by calling a method accessing such property.
+     */
+    private function isUninitializedValueError(\Error|UninitializedPropertyException $e): bool
+    {
+        return $e instanceof UninitializedPropertyException
+            || str_starts_with($e->getMessage(), 'Typed property')
+            && str_ends_with($e->getMessage(), 'must not be accessed before initialization');
+    }
+
+    /**
+     * Returns all attributes with a SerializedPath attribute and the respective path.
+     */
+    private function getNestedAttributes(string $class): array
+    {
+        if (!$this->classMetadataFactory?->hasMetadataFor($class)) {
+            return [];
+        }
+
+        $properties = [];
+        $serializedPaths = [];
+        $classMetadata = $this->classMetadataFactory->getMetadataFor($class);
+        foreach ($classMetadata->getAttributesMetadata() as $name => $metadata) {
+            if (!$serializedPath = $metadata->getSerializedPath()) {
+                continue;
+            }
+            $pathIdentifier = implode(',', $serializedPath->getElements());
+            if (isset($serializedPaths[$pathIdentifier])) {
+                throw new LogicException(\sprintf('Duplicate serialized path: "%s" used for properties "%s" and "%s".', $pathIdentifier, $serializedPaths[$pathIdentifier], $name));
+            }
+            $serializedPaths[$pathIdentifier] = $name;
+            $properties[$name] = $serializedPath;
+        }
+
+        return $properties;
+    }
+
+    private function removeNestedValue(array $path, array $data): array
+    {
+        $element = array_shift($path);
+        if (!$path || !$data[$element] = $this->removeNestedValue($path, $data[$element])) {
+            unset($data[$element]);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return class-string
+     */
+    private function getMappedClass(array $data, string $class, array $context): string
+    {
+        if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
+            return $object::class;
+        }
+
+        if (!$mapping = $this->classDiscriminatorResolver?->getMappingForClass($class)) {
+            return $class;
+        }
+
+        if (null === $type = $data[$mapping->getTypeProperty()] ?? $mapping->getDefaultType()) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class), null, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty(), false);
+        }
+
+        if (!\is_string($type) && (!\is_object($type) || !method_exists($type, '__toString'))) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type property "%s" for the abstract object "%s" must be a string or a stringable object.', $mapping->getTypeProperty(), $class), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty(), false);
+        }
+
+        if (null === $mappedClass = $mapping->getClassForType($type)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type "%s" is not a valid value.', $type), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty(), true);
+        }
+
+        return $mappedClass;
+    }
+}
diff --git a/symfony/serializer/Normalizer/ArrayDenormalizer.php b/symfony/serializer/Normalizer/ArrayDenormalizer.php
new file mode 100644
index 000000000..96c4d259c
--- /dev/null
+++ b/symfony/serializer/Normalizer/ArrayDenormalizer.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\Serializer\Exception\BadMethodCallException;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\Type\UnionType;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Denormalizes arrays of objects.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @final
+ */
+class ArrayDenormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => null, '*' => false];
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): array
+    {
+        if (!isset($this->denormalizer)) {
+            throw new BadMethodCallException('Please set a denormalizer before calling denormalize()!');
+        }
+        if (!\is_array($data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Data expected to be "%s", "%s" given.', $type, get_debug_type($data)), $data, ['array'], $context['deserialization_path'] ?? null);
+        }
+        if (!str_ends_with($type, '[]')) {
+            throw new InvalidArgumentException('Unsupported class: '.$type);
+        }
+
+        $type = substr($type, 0, -2);
+
+        $typeIdentifiers = [];
+        if (null !== $keyType = ($context['key_type'] ?? null)) {
+            if ($keyType instanceof Type) {
+                // BC layer for type-info < 7.2
+                if (method_exists(Type::class, 'getBaseType')) {
+                    $typeIdentifiers = array_map(fn (Type $t): string => $t->getBaseType()->getTypeIdentifier()->value, $keyType instanceof UnionType ? $keyType->getTypes() : [$keyType]);
+                } else {
+                    /** @var list<BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>> */
+                    $keyTypes = $keyType instanceof UnionType ? $keyType->getTypes() : [$keyType];
+
+                    $typeIdentifiers = array_map(fn (BuiltinType $t): string => $t->getTypeIdentifier()->value, $keyTypes);
+                }
+            } else {
+                $typeIdentifiers = array_map(fn (LegacyType $t): string => $t->getBuiltinType(), \is_array($keyType) ? $keyType : [$keyType]);
+            }
+        }
+
+        foreach ($data as $key => $value) {
+            $subContext = $context;
+            $subContext['deserialization_path'] = ($context['deserialization_path'] ?? false) ? \sprintf('%s[%s]', $context['deserialization_path'], $key) : "[$key]";
+
+            $this->validateKeyType($typeIdentifiers, $key, $subContext['deserialization_path']);
+
+            $data[$key] = $this->denormalizer->denormalize($value, $type, $format, $subContext);
+        }
+
+        return $data;
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        if (!isset($this->denormalizer)) {
+            throw new BadMethodCallException(\sprintf('The nested denormalizer needs to be set to allow "%s()" to be used.', __METHOD__));
+        }
+
+        return str_ends_with($type, '[]')
+            && $this->denormalizer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
+    }
+
+    /**
+     * @param list<string> $typeIdentifiers
+     */
+    private function validateKeyType(array $typeIdentifiers, mixed $key, string $path): void
+    {
+        if (!$typeIdentifiers) {
+            return;
+        }
+
+        foreach ($typeIdentifiers as $typeIdentifier) {
+            if (('is_'.$typeIdentifier)($key)) {
+                return;
+            }
+        }
+
+        throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, implode('", "', $typeIdentifiers), get_debug_type($key)), $key, $typeIdentifiers, $path, true);
+    }
+}
diff --git a/symfony/serializer/Normalizer/BackedEnumNormalizer.php b/symfony/serializer/Normalizer/BackedEnumNormalizer.php
new file mode 100644
index 000000000..ff5a782c4
--- /dev/null
+++ b/symfony/serializer/Normalizer/BackedEnumNormalizer.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes a {@see \BackedEnum} enumeration to a string or an integer.
+ *
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ */
+final class BackedEnumNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    /**
+     * If true, will denormalize any invalid value into null.
+     */
+    public const ALLOW_INVALID_VALUES = 'allow_invalid_values';
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \BackedEnum::class => true,
+        ];
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): int|string
+    {
+        if (!$data instanceof \BackedEnum) {
+            throw new InvalidArgumentException('The data must belong to a backed enumeration.');
+        }
+
+        return $data->value;
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \BackedEnum;
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        if (!is_subclass_of($type, \BackedEnum::class)) {
+            throw new InvalidArgumentException('The data must belong to a backed enumeration.');
+        }
+
+        $allowInvalidValues = $context[self::ALLOW_INVALID_VALUES] ?? false;
+
+        if (null === $data || (!\is_int($data) && !\is_string($data))) {
+            if ($allowInvalidValues && !isset($context['not_normalizable_value_exceptions'])) {
+                return null;
+            }
+
+            throw NotNormalizableValueException::createForUnexpectedDataType('The data is neither an integer nor a string, you should pass an integer or a string that can be parsed as an enumeration case of type '.$type.'.', $data, ['int', 'string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        try {
+            return $type::from($data);
+        } catch (\ValueError|\TypeError $e) {
+            if (isset($context['has_constructor'])) {
+                throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type, 0, $e);
+            }
+
+            if ($allowInvalidValues && !isset($context['not_normalizable_value_exceptions'])) {
+                return null;
+            }
+
+            throw NotNormalizableValueException::createForUnexpectedDataType('The data must belong to a backed enumeration of type '.$type, $data, ['int', 'string'], $context['deserialization_path'] ?? null, true, 0, $e);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return is_subclass_of($type, \BackedEnum::class);
+    }
+}
diff --git a/symfony/serializer/Normalizer/ConstraintViolationListNormalizer.php b/symfony/serializer/Normalizer/ConstraintViolationListNormalizer.php
new file mode 100644
index 000000000..92e036384
--- /dev/null
+++ b/symfony/serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+
+/**
+ * A normalizer that normalizes a ConstraintViolationListInterface instance.
+ *
+ * This Normalizer implements RFC7807 {@link https://tools.ietf.org/html/rfc7807}.
+ *
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class ConstraintViolationListNormalizer implements NormalizerInterface
+{
+    public const INSTANCE = 'instance';
+    public const STATUS = 'status';
+    public const TITLE = 'title';
+    public const TYPE = 'type';
+    public const PAYLOAD_FIELDS = 'payload_fields';
+
+    public function __construct(
+        private readonly array $defaultContext = [],
+        private readonly ?NameConverterInterface $nameConverter = null,
+    ) {
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            ConstraintViolationListInterface::class => true,
+        ];
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array
+    {
+        if (\array_key_exists(self::PAYLOAD_FIELDS, $context)) {
+            $payloadFieldsToSerialize = $context[self::PAYLOAD_FIELDS];
+        } elseif (\array_key_exists(self::PAYLOAD_FIELDS, $this->defaultContext)) {
+            $payloadFieldsToSerialize = $this->defaultContext[self::PAYLOAD_FIELDS];
+        } else {
+            $payloadFieldsToSerialize = [];
+        }
+
+        if (\is_array($payloadFieldsToSerialize) && [] !== $payloadFieldsToSerialize) {
+            $payloadFieldsToSerialize = array_flip($payloadFieldsToSerialize);
+        }
+
+        $violations = [];
+        $messages = [];
+        foreach ($data as $violation) {
+            $propertyPath = $this->nameConverter ? $this->nameConverter->normalize($violation->getPropertyPath(), null, $format, $context) : $violation->getPropertyPath();
+
+            $violationEntry = [
+                'propertyPath' => $propertyPath,
+                'title' => $violation->getMessage(),
+                'template' => $violation->getMessageTemplate(),
+                'parameters' => $violation->getParameters(),
+            ];
+            if (null !== $code = $violation->getCode()) {
+                $violationEntry['type'] = \sprintf('urn:uuid:%s', $code);
+            }
+
+            $constraint = $violation->getConstraint();
+            if (
+                [] !== $payloadFieldsToSerialize
+                && $constraint
+                && $constraint->payload
+                // If some or all payload fields are whitelisted, add them
+                && $payloadFields = null === $payloadFieldsToSerialize || true === $payloadFieldsToSerialize ? $constraint->payload : array_intersect_key($constraint->payload, $payloadFieldsToSerialize)
+            ) {
+                $violationEntry['payload'] = $payloadFields;
+            }
+
+            $violations[] = $violationEntry;
+
+            $prefix = $propertyPath ? \sprintf('%s: ', $propertyPath) : '';
+            $messages[] = $prefix.$violation->getMessage();
+        }
+
+        $result = [
+            'type' => $context[self::TYPE] ?? $this->defaultContext[self::TYPE] ?? 'https://symfony.com/errors/validation',
+            'title' => $context[self::TITLE] ?? $this->defaultContext[self::TITLE] ?? 'Validation Failed',
+        ];
+        if (null !== $status = ($context[self::STATUS] ?? $this->defaultContext[self::STATUS] ?? null)) {
+            $result['status'] = $status;
+        }
+        if ($messages) {
+            $result['detail'] = implode("\n", $messages);
+        }
+        if (null !== $instance = ($context[self::INSTANCE] ?? $this->defaultContext[self::INSTANCE] ?? null)) {
+            $result['instance'] = $instance;
+        }
+
+        return $result + ['violations' => $violations];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof ConstraintViolationListInterface;
+    }
+}
diff --git a/symfony/serializer/Normalizer/CustomNormalizer.php b/symfony/serializer/Normalizer/CustomNormalizer.php
new file mode 100644
index 000000000..444c41354
--- /dev/null
+++ b/symfony/serializer/Normalizer/CustomNormalizer.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+final class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+{
+    use ObjectToPopulateTrait;
+    use SerializerAwareTrait;
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            NormalizableInterface::class => true,
+            DenormalizableInterface::class => true,
+        ];
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        return $data->normalize($this->serializer, $format, $context);
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        $object = $this->extractObjectToPopulate($type, $context) ?? new $type();
+        $object->denormalize($this->serializer, $data, $format, $context);
+
+        return $object;
+    }
+
+    /**
+     * Checks if the given class implements the NormalizableInterface.
+     *
+     * @param mixed       $data   Data to normalize
+     * @param string|null $format The format being (de-)serialized from or into
+     */
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof NormalizableInterface;
+    }
+
+    /**
+     * Checks if the given class implements the DenormalizableInterface.
+     *
+     * @param mixed       $data   Data to denormalize from
+     * @param string      $type   The class to which the data should be denormalized
+     * @param string|null $format The format being deserialized from
+     */
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return is_subclass_of($type, DenormalizableInterface::class);
+    }
+}
diff --git a/symfony/serializer/Normalizer/DataUriNormalizer.php b/symfony/serializer/Normalizer/DataUriNormalizer.php
new file mode 100644
index 000000000..57ad724c4
--- /dev/null
+++ b/symfony/serializer/Normalizer/DataUriNormalizer.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\Mime\MimeTypeGuesserInterface;
+use Symfony\Component\Mime\MimeTypes;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes an {@see \SplFileInfo} object to a data URI.
+ * Denormalizes a data URI to a {@see \SplFileObject} object.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    private const SUPPORTED_TYPES = [
+        \SplFileInfo::class => true,
+        \SplFileObject::class => true,
+        File::class => true,
+    ];
+
+    private readonly ?MimeTypeGuesserInterface $mimeTypeGuesser;
+
+    public function __construct(?MimeTypeGuesserInterface $mimeTypeGuesser = null)
+    {
+        if (!$mimeTypeGuesser && class_exists(MimeTypes::class)) {
+            $mimeTypeGuesser = MimeTypes::getDefault();
+        }
+
+        $this->mimeTypeGuesser = $mimeTypeGuesser;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return self::SUPPORTED_TYPES;
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): string
+    {
+        if (!$data instanceof \SplFileInfo) {
+            throw new InvalidArgumentException('The object must be an instance of "\SplFileInfo".');
+        }
+
+        $mimeType = $this->getMimeType($data);
+        $splFileObject = $this->extractSplFileObject($data);
+
+        $splFileData = '';
+
+        $splFileObject->rewind();
+        while (!$splFileObject->eof()) {
+            $splFileData .= $splFileObject->fgets();
+        }
+
+        if ('text' === explode('/', $mimeType, 2)[0]) {
+            return \sprintf('data:%s,%s', $mimeType, rawurlencode($splFileData));
+        }
+
+        return \sprintf('data:%s;base64,%s', $mimeType, base64_encode($splFileData));
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \SplFileInfo;
+    }
+
+    /**
+     * Regex adapted from Brian Grinstead code.
+     *
+     * @see https://gist.github.com/bgrins/6194623
+     *
+     * @throws InvalidArgumentException
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): \SplFileInfo
+    {
+        if (null === $data || !preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType('The provided "data:" URI is not valid.', $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        try {
+            switch ($type) {
+                case File::class:
+                    if (!class_exists(File::class)) {
+                        throw new InvalidArgumentException(\sprintf('Cannot denormalize to a "%s" without the HttpFoundation component installed. Try running "composer require symfony/http-foundation".', File::class));
+                    }
+
+                    return new File($data, false);
+
+                case 'SplFileObject':
+                case 'SplFileInfo':
+                    return new \SplFileObject($data);
+            }
+        } catch (\RuntimeException $exception) {
+            throw NotNormalizableValueException::createForUnexpectedDataType($exception->getMessage(), $data, ['string'], $context['deserialization_path'] ?? null, false, $exception->getCode(), $exception);
+        }
+
+        throw new InvalidArgumentException(\sprintf('The class parameter "%s" is not supported. It must be one of "SplFileInfo", "SplFileObject" or "Symfony\Component\HttpFoundation\File\File".', $type));
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return isset(self::SUPPORTED_TYPES[$type]);
+    }
+
+    /**
+     * Gets the mime type of the object. Defaults to application/octet-stream.
+     */
+    private function getMimeType(\SplFileInfo $object): string
+    {
+        if ($object instanceof File) {
+            return $object->getMimeType();
+        }
+
+        return $this->mimeTypeGuesser?->guessMimeType($object->getPathname()) ?: 'application/octet-stream';
+    }
+
+    /**
+     * Returns the \SplFileObject instance associated with the given \SplFileInfo instance.
+     */
+    private function extractSplFileObject(\SplFileInfo $object): \SplFileObject
+    {
+        if ($object instanceof \SplFileObject) {
+            return $object;
+        }
+
+        return $object->openFile();
+    }
+}
diff --git a/symfony/serializer/Normalizer/DateIntervalNormalizer.php b/symfony/serializer/Normalizer/DateIntervalNormalizer.php
new file mode 100644
index 000000000..1ad81ec61
--- /dev/null
+++ b/symfony/serializer/Normalizer/DateIntervalNormalizer.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes an instance of {@see \DateInterval} to an interval string.
+ * Denormalizes an interval string to an instance of {@see \DateInterval}.
+ *
+ * @author Jérôme Parmentier <jerome@prmntr.me>
+ */
+final class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    public const FORMAT_KEY = 'dateinterval_format';
+
+    private array $defaultContext = [
+        self::FORMAT_KEY => '%rP%yY%mM%dDT%hH%iM%sS',
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \DateInterval::class => true,
+        ];
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function normalize(mixed $data, ?string $format = null, array $context = []): string
+    {
+        if (!$data instanceof \DateInterval) {
+            throw new InvalidArgumentException('The object must be an instance of "\DateInterval".');
+        }
+
+        return $data->format($context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY]);
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \DateInterval;
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): \DateInterval
+    {
+        if (!\is_string($data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType('Data expected to be a string.', $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        if (!$this->isISO8601($data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType('Expected a valid ISO 8601 interval string.', $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        $dateIntervalFormat = $context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY];
+
+        $signPattern = '';
+        switch (substr($dateIntervalFormat, 0, 2)) {
+            case '%R':
+                $signPattern = '[-+]';
+                $dateIntervalFormat = substr($dateIntervalFormat, 2);
+                break;
+            case '%r':
+                $signPattern = '-?';
+                $dateIntervalFormat = substr($dateIntervalFormat, 2);
+                break;
+        }
+        $valuePattern = '/^'.$signPattern.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?:(?P<$1>\d+)$2)?', preg_replace('/(T.*)$/', '($1)?', $dateIntervalFormat)).'$/';
+        if (!preg_match($valuePattern, $data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat), $data, ['string'], $context['deserialization_path'] ?? null, false);
+        }
+
+        try {
+            if ('-' === $data[0]) {
+                $interval = new \DateInterval(substr($data, 1));
+                $interval->invert = 1;
+
+                return $interval;
+            }
+
+            if ('+' === $data[0]) {
+                return new \DateInterval(substr($data, 1));
+            }
+
+            return new \DateInterval($data);
+        } catch (\Exception $e) {
+            throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, ['string'], $context['deserialization_path'] ?? null, false, $e->getCode(), $e);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return \DateInterval::class === $type;
+    }
+
+    private function isISO8601(string $string): bool
+    {
+        return preg_match('/^[\-+]?P(?=\w*(?:\d|%\w))(?:\d+Y|%[yY]Y)?(?:\d+M|%[mM]M)?(?:\d+W|%[wW]W)?(?:\d+D|%[dD]D)?(?:T(?:\d+H|[hH]H)?(?:\d+M|[iI]M)?(?:\d+S|[sS]S)?)?$/', $string);
+    }
+}
diff --git a/symfony/serializer/Normalizer/DateTimeNormalizer.php b/symfony/serializer/Normalizer/DateTimeNormalizer.php
new file mode 100644
index 000000000..b75c65a04
--- /dev/null
+++ b/symfony/serializer/Normalizer/DateTimeNormalizer.php
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes an object implementing the {@see \DateTimeInterface} to a date string.
+ * Denormalizes a date string to an instance of {@see \DateTime} or {@see \DateTimeImmutable}.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    public const FORMAT_KEY = 'datetime_format';
+    public const TIMEZONE_KEY = 'datetime_timezone';
+    public const CAST_KEY = 'datetime_cast';
+    public const FORCE_TIMEZONE_KEY = 'datetime_force_timezone';
+
+    private array $defaultContext = [
+        self::FORMAT_KEY => \DateTimeInterface::RFC3339,
+        self::TIMEZONE_KEY => null,
+        self::CAST_KEY => null,
+        self::FORCE_TIMEZONE_KEY => false,
+    ];
+
+    private const SUPPORTED_TYPES = [
+        \DateTimeInterface::class => true,
+        \DateTimeImmutable::class => true,
+        \DateTime::class => true,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->setDefaultContext($defaultContext);
+    }
+
+    public function setDefaultContext(array $defaultContext): void
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return self::SUPPORTED_TYPES;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function normalize(mixed $data, ?string $format = null, array $context = []): int|float|string
+    {
+        if (!$data instanceof \DateTimeInterface) {
+            throw new InvalidArgumentException('The object must implement the "\DateTimeInterface".');
+        }
+
+        $dateTimeFormat = $context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY];
+        $timezone = $this->getTimezone($context);
+
+        if (null !== $timezone) {
+            $data = clone $data;
+            $data = $data->setTimezone($timezone);
+        }
+
+        return match ($context[self::CAST_KEY] ?? $this->defaultContext[self::CAST_KEY] ?? false) {
+            'int' => (int) $data->format($dateTimeFormat),
+            'float' => (float) $data->format($dateTimeFormat),
+            default => $data->format($dateTimeFormat),
+        };
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \DateTimeInterface;
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): \DateTimeInterface
+    {
+        if (\is_int($data) || \is_float($data)) {
+            switch ($context[self::FORMAT_KEY] ?? $this->defaultContext[self::FORMAT_KEY] ?? null) {
+                case 'U':
+                    $data = \sprintf('%d', $data);
+                    break;
+                case 'U.u':
+                    $data = \sprintf('%.6F', $data);
+                    break;
+            }
+        }
+
+        if (!\is_string($data) || '' === trim($data)) {
+            throw NotNormalizableValueException::createForUnexpectedDataType('The data is either not an string, an empty string, or null; you should pass a string that can be parsed with the passed format or a valid DateTime string.', $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        try {
+            if (\DateTimeInterface::class === $type) {
+                $type = \DateTimeImmutable::class;
+            }
+
+            $timezone = $this->getTimezone($context);
+            $dateTimeFormat = $context[self::FORMAT_KEY] ?? null;
+
+            if (null !== $dateTimeFormat) {
+                if (false !== $object = $type::createFromFormat($dateTimeFormat, $data, $timezone)) {
+                    return $this->enforceTimezone($object, $context);
+                }
+
+                $dateTimeErrors = $type::getLastErrors();
+
+                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Parsing datetime string "%s" using format "%s" resulted in %d errors: ', $data, $dateTimeFormat, $dateTimeErrors['error_count'])."\n".implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors'])), $data, ['string'], $context['deserialization_path'] ?? null, true);
+            }
+
+            $defaultDateTimeFormat = $this->defaultContext[self::FORMAT_KEY] ?? null;
+
+            if (null !== $defaultDateTimeFormat) {
+                if (false !== $object = $type::createFromFormat($defaultDateTimeFormat, $data, $timezone)) {
+                    return $this->enforceTimezone($object, $context);
+                }
+            }
+
+            return $this->enforceTimezone(new $type($data, $timezone), $context);
+        } catch (NotNormalizableValueException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, ['string'], $context['deserialization_path'] ?? null, false, $e->getCode(), $e);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return is_a($type, \DateTimeInterface::class, true);
+    }
+
+    /**
+     * Formats datetime errors.
+     *
+     * @return string[]
+     */
+    private function formatDateTimeErrors(array $errors): array
+    {
+        $formattedErrors = [];
+
+        foreach ($errors as $pos => $message) {
+            $formattedErrors[] = \sprintf('at position %d: %s', $pos, $message);
+        }
+
+        return $formattedErrors;
+    }
+
+    private function getTimezone(array $context): ?\DateTimeZone
+    {
+        $dateTimeZone = $context[self::TIMEZONE_KEY] ?? $this->defaultContext[self::TIMEZONE_KEY];
+
+        if (null === $dateTimeZone) {
+            return null;
+        }
+
+        return $dateTimeZone instanceof \DateTimeZone ? $dateTimeZone : new \DateTimeZone($dateTimeZone);
+    }
+
+    private function enforceTimezone(\DateTime|\DateTimeImmutable $object, array $context): \DateTimeInterface
+    {
+        $timezone = $this->getTimezone($context);
+        $forceTimezone = $context[self::FORCE_TIMEZONE_KEY] ?? $this->defaultContext[self::FORCE_TIMEZONE_KEY];
+
+        if (null === $timezone || !$forceTimezone) {
+            return $object;
+        }
+
+        return $object->setTimezone($timezone);
+    }
+}
diff --git a/symfony/serializer/Normalizer/DateTimeZoneNormalizer.php b/symfony/serializer/Normalizer/DateTimeZoneNormalizer.php
new file mode 100644
index 000000000..cdb6eb2f0
--- /dev/null
+++ b/symfony/serializer/Normalizer/DateTimeZoneNormalizer.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes a {@see \DateTimeZone} object to a timezone string.
+ *
+ * @author Jérôme Desjardins <jewome62@gmail.com>
+ */
+final class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \DateTimeZone::class => true,
+        ];
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function normalize(mixed $data, ?string $format = null, array $context = []): string
+    {
+        if (!$data instanceof \DateTimeZone) {
+            throw new InvalidArgumentException('The object must be an instance of "\DateTimeZone".');
+        }
+
+        return $data->getName();
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \DateTimeZone;
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): \DateTimeZone
+    {
+        if ('' === $data || null === $data) {
+            throw NotNormalizableValueException::createForUnexpectedDataType('The data is either an empty string or null, you should pass a string that can be parsed as a DateTimeZone.', $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+
+        try {
+            return new \DateTimeZone($data);
+        } catch (\Exception $e) {
+            throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, ['string'], $context['deserialization_path'] ?? null, true, $e->getCode(), $e);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return \DateTimeZone::class === $type;
+    }
+}
diff --git a/symfony/serializer/Normalizer/DenormalizableInterface.php b/symfony/serializer/Normalizer/DenormalizableInterface.php
new file mode 100644
index 000000000..4a9e8ac2c
--- /dev/null
+++ b/symfony/serializer/Normalizer/DenormalizableInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * Defines the most basic interface a class must implement to be denormalizable.
+ *
+ * If a denormalizer is registered for the class and it doesn't implement
+ * the Denormalizable interfaces, the normalizer will be used instead
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface DenormalizableInterface
+{
+    /**
+     * Denormalizes the object back from an array of scalars|arrays.
+     *
+     * It is important to understand that the denormalize() call should denormalize
+     * recursively all child objects of the implementer.
+     *
+     * @param DenormalizerInterface       $denormalizer The denormalizer is given so that you
+     *                                                  can use it to denormalize objects contained within this object
+     * @param array|string|int|float|bool $data         The data from which to re-create the object
+     * @param string|null                 $format       The format is optionally given to be able to denormalize
+     *                                                  differently based on different input formats
+     * @param array                       $context      Options for denormalizing
+     */
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, ?string $format = null, array $context = []): void;
+}
diff --git a/symfony/serializer/Normalizer/DenormalizerAwareInterface.php b/symfony/serializer/Normalizer/DenormalizerAwareInterface.php
new file mode 100644
index 000000000..84bf8d89d
--- /dev/null
+++ b/symfony/serializer/Normalizer/DenormalizerAwareInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
+ */
+interface DenormalizerAwareInterface
+{
+    /**
+     * Sets the owning Denormalizer object.
+     */
+    public function setDenormalizer(DenormalizerInterface $denormalizer): void;
+}
diff --git a/symfony/serializer/Normalizer/DenormalizerAwareTrait.php b/symfony/serializer/Normalizer/DenormalizerAwareTrait.php
new file mode 100644
index 000000000..f4620e1c0
--- /dev/null
+++ b/symfony/serializer/Normalizer/DenormalizerAwareTrait.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
+ */
+trait DenormalizerAwareTrait
+{
+    protected DenormalizerInterface $denormalizer;
+
+    public function setDenormalizer(DenormalizerInterface $denormalizer): void
+    {
+        $this->denormalizer = $denormalizer;
+    }
+}
diff --git a/symfony/serializer/Normalizer/DenormalizerInterface.php b/symfony/serializer/Normalizer/DenormalizerInterface.php
new file mode 100644
index 000000000..1a0ae26b3
--- /dev/null
+++ b/symfony/serializer/Normalizer/DenormalizerInterface.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\BadMethodCallException;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Exception\ExtraAttributesException;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface DenormalizerInterface
+{
+    public const COLLECT_DENORMALIZATION_ERRORS = 'collect_denormalization_errors';
+
+    /**
+     * Denormalizes data back into an object of the given class.
+     *
+     * @template TObject of object
+     *
+     * @param mixed                        $data    Data to restore
+     * @param class-string<TObject>|string $type    The expected class to instantiate
+     * @param string|null                  $format  Format the given data was extracted from
+     * @param array<string, mixed>         $context Options available to the denormalizer
+     *
+     * @return ($type is class-string<TObject> ? TObject : mixed)
+     *
+     * @throws BadMethodCallException   Occurs when the normalizer is not called in an expected context
+     * @throws InvalidArgumentException Occurs when the arguments are not coherent or not supported
+     * @throws UnexpectedValueException Occurs when the item cannot be hydrated with the given data
+     * @throws ExtraAttributesException Occurs when the item doesn't have attribute to receive given data
+     * @throws LogicException           Occurs when the normalizer is not supposed to denormalize
+     * @throws RuntimeException         Occurs if the class cannot be instantiated
+     * @throws ExceptionInterface       Occurs for all the other cases of errors
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed;
+
+    /**
+     * Checks whether the given class is supported for denormalization by this normalizer.
+     *
+     * @param mixed                $data    Data to denormalize from
+     * @param string               $type    The class to which the data should be denormalized
+     * @param string|null          $format  The format being deserialized from
+     * @param array<string, mixed> $context Options available to the denormalizer
+     */
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool;
+
+    /**
+     * Returns the types potentially supported by this denormalizer.
+     *
+     * For each supported formats (if applicable), the supported types should be
+     * returned as keys, and each type should be mapped to a boolean indicating
+     * if the result of supportsDenormalization() can be cached or not
+     * (a result cannot be cached when it depends on the context or on the data.)
+     * A null value means that the denormalizer does not support the corresponding
+     * type.
+     *
+     * Use type "object" to match any classes or interfaces,
+     * and type "*" to match any types.
+     *
+     * @return array<class-string|'*'|'object'|string, bool|null>
+     */
+    public function getSupportedTypes(?string $format): array;
+}
diff --git a/symfony/serializer/Normalizer/FormErrorNormalizer.php b/symfony/serializer/Normalizer/FormErrorNormalizer.php
new file mode 100644
index 000000000..c91d7d528
--- /dev/null
+++ b/symfony/serializer/Normalizer/FormErrorNormalizer.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Form\FormInterface;
+
+/**
+ * Normalizes invalid Form instances.
+ */
+final class FormErrorNormalizer implements NormalizerInterface
+{
+    public const TITLE = 'title';
+    public const TYPE = 'type';
+    public const CODE = 'status_code';
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array
+    {
+        $error = [
+            'title' => $context[self::TITLE] ?? 'Validation Failed',
+            'type' => $context[self::TYPE] ?? 'https://symfony.com/errors/form',
+            'code' => $context[self::CODE] ?? null,
+            'errors' => $this->convertFormErrorsToArray($data),
+        ];
+
+        if (0 !== \count($data->all())) {
+            $error['children'] = $this->convertFormChildrenToArray($data);
+        }
+
+        return $error;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            FormInterface::class => false,
+        ];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof FormInterface && $data->isSubmitted() && !$data->isValid();
+    }
+
+    private function convertFormErrorsToArray(FormInterface $data): array
+    {
+        $errors = [];
+
+        foreach ($data->getErrors() as $error) {
+            $errors[] = [
+                'message' => $error->getMessage(),
+                'cause' => $error->getCause(),
+            ];
+        }
+
+        return $errors;
+    }
+
+    private function convertFormChildrenToArray(FormInterface $data): array
+    {
+        $children = [];
+
+        foreach ($data->all() as $child) {
+            $childData = [
+                'errors' => $this->convertFormErrorsToArray($child),
+            ];
+
+            if ($child->all()) {
+                $childData['children'] = $this->convertFormChildrenToArray($child);
+            }
+
+            $children[$child->getName()] = $childData;
+        }
+
+        return $children;
+    }
+}
diff --git a/symfony/serializer/Normalizer/GetSetMethodNormalizer.php b/symfony/serializer/Normalizer/GetSetMethodNormalizer.php
new file mode 100644
index 000000000..b0ca3b4bd
--- /dev/null
+++ b/symfony/serializer/Normalizer/GetSetMethodNormalizer.php
@@ -0,0 +1,211 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Annotation\Ignore as LegacyIgnore;
+use Symfony\Component\Serializer\Attribute\Ignore;
+
+/**
+ * Converts between objects with getter and setter methods and arrays.
+ *
+ * The normalization process looks at all public methods and calls the ones
+ * which have a name starting with get and take no parameters. The result is a
+ * map from property names (method name stripped of the get prefix and converted
+ * to lower case) to property values. Property values are normalized through the
+ * serializer.
+ *
+ * The denormalization first looks at the constructor of the given class to see
+ * if any of the parameters have the same name as one of the properties. The
+ * constructor is then called with all parameters or an exception is thrown if
+ * any required parameters were not present as properties. Then the denormalizer
+ * walks through the given map of property names to property values to see if a
+ * setter method exists for any of the properties. If a setter exists it is
+ * called with the property value. No automatic denormalization of the value
+ * takes place.
+ *
+ * @author Nils Adermann <naderman@naderman.de>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class GetSetMethodNormalizer extends AbstractObjectNormalizer
+{
+    private static $reflectionCache = [];
+    private static array $setterAccessibleCache = [];
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => true];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return parent::supportsNormalization($data, $format) && $this->supports($data::class, true);
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return parent::supportsDenormalization($data, $type, $format) && $this->supports($type, false);
+    }
+
+    /**
+     * Checks if the given class has any getter or setter method.
+     */
+    private function supports(string $class, bool $readAttributes): bool
+    {
+        if ($this->classDiscriminatorResolver?->getMappingForClass($class)) {
+            return true;
+        }
+
+        if (!isset(self::$reflectionCache[$class])) {
+            self::$reflectionCache[$class] = new \ReflectionClass($class);
+        }
+
+        $reflection = self::$reflectionCache[$class];
+
+        foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflectionMethod) {
+            if ($readAttributes ? $this->isGetMethod($reflectionMethod) : $this->isSetMethod($reflectionMethod)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if a method's name matches /^(get|is|has).+$/ and can be called non-statically without parameters.
+     */
+    private function isGetMethod(\ReflectionMethod $method): bool
+    {
+        return !$method->isStatic()
+            && !($method->getAttributes(Ignore::class) || $method->getAttributes(LegacyIgnore::class))
+            && !$method->getNumberOfRequiredParameters()
+            && ((2 < ($methodLength = \strlen($method->name)) && str_starts_with($method->name, 'is') && !ctype_lower($method->name[2]))
+                || (3 < $methodLength && (str_starts_with($method->name, 'has') || str_starts_with($method->name, 'get')) && !ctype_lower($method->name[3]))
+            );
+    }
+
+    /**
+     * Checks if a method's name matches /^set.+$/ and can be called non-statically with one parameter.
+     */
+    private function isSetMethod(\ReflectionMethod $method): bool
+    {
+        return !$method->isStatic()
+            && !$method->getAttributes(Ignore::class)
+            && 0 < $method->getNumberOfParameters()
+            && 3 < \strlen($method->name)
+            && str_starts_with($method->name, 'set')
+            && !ctype_lower($method->name[3])
+        ;
+    }
+
+    protected function extractAttributes(object $object, ?string $format = null, array $context = []): array
+    {
+        $reflectionObject = new \ReflectionObject($object);
+        $reflectionMethods = $reflectionObject->getMethods(\ReflectionMethod::IS_PUBLIC);
+
+        $attributes = [];
+        foreach ($reflectionMethods as $method) {
+            if (!$this->isGetMethod($method)) {
+                continue;
+            }
+
+            $attributeName = lcfirst(substr($method->name, str_starts_with($method->name, 'is') ? 2 : 3));
+
+            if ($this->isAllowedAttribute($object, $attributeName, $format, $context)) {
+                $attributes[] = $attributeName;
+            }
+        }
+
+        return $attributes;
+    }
+
+    protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
+    {
+        $getter = 'get'.$attribute;
+        if (method_exists($object, $getter) && \is_callable([$object, $getter])) {
+            return $object->$getter();
+        }
+
+        $isser = 'is'.$attribute;
+        if (method_exists($object, $isser) && \is_callable([$object, $isser])) {
+            return $object->$isser();
+        }
+
+        $haser = 'has'.$attribute;
+        if (method_exists($object, $haser) && \is_callable([$object, $haser])) {
+            return $object->$haser();
+        }
+
+        return null;
+    }
+
+    protected function setAttributeValue(object $object, string $attribute, mixed $value, ?string $format = null, array $context = []): void
+    {
+        $setter = 'set'.$attribute;
+        $key = $object::class.':'.$setter;
+
+        if (!isset(self::$setterAccessibleCache[$key])) {
+            self::$setterAccessibleCache[$key] = method_exists($object, $setter) && \is_callable([$object, $setter]) && !(new \ReflectionMethod($object, $setter))->isStatic();
+        }
+
+        if (self::$setterAccessibleCache[$key]) {
+            $object->$setter($value);
+        }
+    }
+
+    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    {
+        if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
+            return false;
+        }
+
+        $class = \is_object($classOrObject) ? $classOrObject::class : $classOrObject;
+
+        if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+            return true;
+        }
+
+        if (!isset(self::$reflectionCache[$class])) {
+            self::$reflectionCache[$class] = new \ReflectionClass($class);
+        }
+
+        $reflection = self::$reflectionCache[$class];
+
+        if ($context['_read_attributes'] ?? true) {
+            foreach (['get', 'is', 'has'] as $getterPrefix) {
+                $getter = $getterPrefix.$attribute;
+                $reflectionMethod = $reflection->hasMethod($getter) ? $reflection->getMethod($getter) : null;
+                if ($reflectionMethod && $this->isGetMethod($reflectionMethod)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        $setter = 'set'.$attribute;
+        if ($reflection->hasMethod($setter) && $this->isSetMethod($reflection->getMethod($setter))) {
+            return true;
+        }
+
+        $constructor = $reflection->getConstructor();
+
+        if ($constructor && $constructor->isPublic()) {
+            foreach ($constructor->getParameters() as $parameter) {
+                if ($parameter->getName() === $attribute) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/symfony/serializer/Normalizer/JsonSerializableNormalizer.php b/symfony/serializer/Normalizer/JsonSerializableNormalizer.php
new file mode 100644
index 000000000..3bc4f280e
--- /dev/null
+++ b/symfony/serializer/Normalizer/JsonSerializableNormalizer.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+
+/**
+ * A normalizer that uses an objects own JsonSerializable implementation.
+ *
+ * @author Fred Cox <mcfedr@gmail.com>
+ */
+final class JsonSerializableNormalizer extends AbstractNormalizer
+{
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        if ($this->isCircularReference($data, $context)) {
+            return $this->handleCircularReference($data, $format, $context);
+        }
+
+        if (!$data instanceof \JsonSerializable) {
+            throw new InvalidArgumentException(\sprintf('The object must implement "%s".', \JsonSerializable::class));
+        }
+
+        if (!$this->serializer instanceof NormalizerInterface) {
+            throw new LogicException('Cannot normalize object because injected serializer is not a normalizer.');
+        }
+
+        return $this->serializer->normalize($data->jsonSerialize(), $format, $context);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \JsonSerializable::class => true,
+        ];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof \JsonSerializable;
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return false;
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        throw new LogicException(\sprintf('Cannot denormalize with "%s".', \JsonSerializable::class));
+    }
+}
diff --git a/symfony/serializer/Normalizer/MimeMessageNormalizer.php b/symfony/serializer/Normalizer/MimeMessageNormalizer.php
new file mode 100644
index 000000000..5b1213389
--- /dev/null
+++ b/symfony/serializer/Normalizer/MimeMessageNormalizer.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Header\HeaderInterface;
+use Symfony\Component\Mime\Header\Headers;
+use Symfony\Component\Mime\Header\UnstructuredHeader;
+use Symfony\Component\Mime\Message;
+use Symfony\Component\Mime\Part\AbstractPart;
+use Symfony\Component\Mime\RawMessage;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Normalize Mime message classes.
+ *
+ * It forces the use of a PropertyNormalizer instance for normalization
+ * of all data objects composing a Message.
+ *
+ * Emails using resources for any parts are not serializable.
+ */
+final class MimeMessageNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+{
+    private NormalizerInterface&DenormalizerInterface $serializer;
+    private array $headerClassMap;
+    private \ReflectionProperty $headersProperty;
+
+    public function __construct(private readonly PropertyNormalizer $normalizer)
+    {
+        $this->headerClassMap = (new \ReflectionClassConstant(Headers::class, 'HEADER_CLASS_MAP'))->getValue();
+        $this->headersProperty = new \ReflectionProperty(Headers::class, 'headers');
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Message::class => true,
+            Headers::class => true,
+            HeaderInterface::class => true,
+            Address::class => true,
+            AbstractPart::class => true,
+        ];
+    }
+
+    public function setSerializer(SerializerInterface $serializer): void
+    {
+        if (!$serializer instanceof NormalizerInterface || !$serializer instanceof DenormalizerInterface) {
+            throw new LogicException(\sprintf('The passed serializer should implement both NormalizerInterface and DenormalizerInterface, "%s" given.', get_debug_type($serializer)));
+        }
+        $this->serializer = $serializer;
+        $this->normalizer->setSerializer($serializer);
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        if ($data instanceof Headers) {
+            $ret = [];
+            foreach ($this->headersProperty->getValue($data) as $name => $header) {
+                $ret[$name] = $this->serializer->normalize($header, $format, $context);
+            }
+
+            return $ret;
+        }
+
+        $ret = $this->normalizer->normalize($data, $format, $context);
+
+        if ($data instanceof AbstractPart) {
+            $ret['class'] = $data::class;
+            unset($ret['seekable'], $ret['cid'], $ret['handle']);
+        }
+
+        if ($data instanceof RawMessage && \array_key_exists('message', $ret) && null === $ret['message']) {
+            unset($ret['message']);
+        }
+
+        return $ret;
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        if (Headers::class === $type) {
+            $ret = [];
+            foreach ($data as $headers) {
+                foreach ($headers as $header) {
+                    $ret[] = $this->serializer->denormalize($header, $this->headerClassMap[strtolower($header['name'])] ?? UnstructuredHeader::class, $format, $context);
+                }
+            }
+
+            return new Headers(...$ret);
+        }
+
+        if (AbstractPart::class === $type) {
+            $type = $data['class'];
+            unset($data['class']);
+            $data['headers'] = $this->serializer->denormalize($data['headers'], Headers::class, $format, $context);
+        }
+
+        return $this->normalizer->denormalize($data, $type, $format, $context);
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof Message || $data instanceof Headers || $data instanceof HeaderInterface || $data instanceof Address || $data instanceof AbstractPart;
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return is_a($type, Message::class, true) || Headers::class === $type || AbstractPart::class === $type;
+    }
+}
diff --git a/symfony/serializer/Normalizer/NormalizableInterface.php b/symfony/serializer/Normalizer/NormalizableInterface.php
new file mode 100644
index 000000000..40461170f
--- /dev/null
+++ b/symfony/serializer/Normalizer/NormalizableInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * Defines the most basic interface a class must implement to be normalizable.
+ *
+ * If a normalizer is registered for the class and it doesn't implement
+ * the Normalizable interfaces, the normalizer will be used instead.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface NormalizableInterface
+{
+    /**
+     * Normalizes the object into an array of scalars|arrays.
+     *
+     * It is important to understand that the normalize() call should normalize
+     * recursively all child objects of the implementer.
+     *
+     * @param NormalizerInterface $normalizer The normalizer is given so that you
+     *                                        can use it to normalize objects contained within this object
+     * @param string|null         $format     The format is optionally given to be able to normalize differently
+     *                                        based on different output formats
+     * @param array               $context    Options for normalizing this object
+     */
+    public function normalize(NormalizerInterface $normalizer, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null;
+}
diff --git a/symfony/serializer/Normalizer/NormalizerAwareInterface.php b/symfony/serializer/Normalizer/NormalizerAwareInterface.php
new file mode 100644
index 000000000..1079ab6dd
--- /dev/null
+++ b/symfony/serializer/Normalizer/NormalizerAwareInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
+ */
+interface NormalizerAwareInterface
+{
+    /**
+     * Sets the owning Normalizer object.
+     */
+    public function setNormalizer(NormalizerInterface $normalizer): void;
+}
diff --git a/symfony/serializer/Normalizer/NormalizerAwareTrait.php b/symfony/serializer/Normalizer/NormalizerAwareTrait.php
new file mode 100644
index 000000000..e21c6c175
--- /dev/null
+++ b/symfony/serializer/Normalizer/NormalizerAwareTrait.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+/**
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
+ */
+trait NormalizerAwareTrait
+{
+    protected NormalizerInterface $normalizer;
+
+    public function setNormalizer(NormalizerInterface $normalizer): void
+    {
+        $this->normalizer = $normalizer;
+    }
+}
diff --git a/symfony/serializer/Normalizer/NormalizerInterface.php b/symfony/serializer/Normalizer/NormalizerInterface.php
new file mode 100644
index 000000000..9a16e7928
--- /dev/null
+++ b/symfony/serializer/Normalizer/NormalizerInterface.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\CircularReferenceException;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface NormalizerInterface
+{
+    /**
+     * Normalizes data into a set of arrays/scalars.
+     *
+     * @param mixed                $data    Data to normalize
+     * @param string|null          $format  Format the normalization result will be encoded as
+     * @param array<string, mixed> $context Context options for the normalizer
+     *
+     * @return array|string|int|float|bool|\ArrayObject|null \ArrayObject is used to make sure an empty object is encoded as an object not an array
+     *
+     * @throws InvalidArgumentException   Occurs when the object given is not a supported type for the normalizer
+     * @throws CircularReferenceException Occurs when the normalizer detects a circular reference when no circular
+     *                                    reference handler can fix it
+     * @throws LogicException             Occurs when the normalizer is not called in an expected context
+     * @throws ExceptionInterface         Occurs for all the other cases of errors
+     */
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null;
+
+    /**
+     * Checks whether the given class is supported for normalization by this normalizer.
+     *
+     * @param mixed                $data    Data to normalize
+     * @param string|null          $format  The format being (de-)serialized from or into
+     * @param array<string, mixed> $context Context options for the normalizer
+     */
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool;
+
+    /**
+     * Returns the types potentially supported by this normalizer.
+     *
+     * For each supported formats (if applicable), the supported types should be
+     * returned as keys, and each type should be mapped to a boolean indicating
+     * if the result of supportsNormalization() can be cached or not
+     * (a result cannot be cached when it depends on the context or on the data.)
+     * A null value means that the normalizer does not support the corresponding
+     * type.
+     *
+     * Use type "object" to match any classes or interfaces,
+     * and type "*" to match any types.
+     *
+     * @return array<class-string|'*'|'object'|string, bool|null>
+     */
+    public function getSupportedTypes(?string $format): array;
+}
diff --git a/symfony/serializer/Normalizer/NumberNormalizer.php b/symfony/serializer/Normalizer/NumberNormalizer.php
new file mode 100644
index 000000000..de68a406e
--- /dev/null
+++ b/symfony/serializer/Normalizer/NumberNormalizer.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use BcMath\Number;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+
+/**
+ * Normalizes {@see Number} and {@see \GMP} to a string.
+ */
+final class NumberNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Number::class => true,
+            \GMP::class => true,
+        ];
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): string
+    {
+        if (!$data instanceof Number && !$data instanceof \GMP) {
+            throw new InvalidArgumentException(\sprintf('The data must be an instance of "%s" or "%s".', Number::class, \GMP::class));
+        }
+
+        return (string) $data;
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof Number || $data instanceof \GMP;
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): Number|\GMP
+    {
+        if (!\is_string($data) && !\is_int($data)) {
+            throw $this->createNotNormalizableValueException($type, $data, $context);
+        }
+
+        try {
+            return match ($type) {
+                Number::class => new Number($data),
+                \GMP::class => new \GMP($data),
+                default => throw new InvalidArgumentException(\sprintf('Only "%s" and "%s" types are supported.', Number::class, \GMP::class)),
+            };
+        } catch (\ValueError $e) {
+            throw $this->createNotNormalizableValueException($type, $data, $context, $e);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return \in_array($type, [Number::class, \GMP::class], true) && null !== $data;
+    }
+
+    private function createNotNormalizableValueException(string $type, mixed $data, array $context, ?\Throwable $previous = null): NotNormalizableValueException
+    {
+        $message = match ($type) {
+            Number::class => 'The data must be a "string" representing a decimal number, or an "int".',
+            \GMP::class => 'The data must be a "string" representing an integer, or an "int".',
+        };
+
+        return NotNormalizableValueException::createForUnexpectedDataType($message, $data, ['string', 'int'], $context['deserialization_path'] ?? null, true, 0, $previous);
+    }
+}
diff --git a/symfony/serializer/Normalizer/ObjectNormalizer.php b/symfony/serializer/Normalizer/ObjectNormalizer.php
new file mode 100644
index 000000000..45ebcd3bd
--- /dev/null
+++ b/symfony/serializer/Normalizer/ObjectNormalizer.php
@@ -0,0 +1,204 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
+use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfo;
+use Symfony\Component\Serializer\Annotation\Ignore;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+
+/**
+ * Converts between objects and arrays using the PropertyAccess component.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class ObjectNormalizer extends AbstractObjectNormalizer
+{
+    private static $reflectionCache = [];
+    private static $isReadableCache = [];
+    private static $isWritableCache = [];
+
+    protected PropertyAccessorInterface $propertyAccessor;
+    protected $propertyInfoExtractor;
+    private $writeInfoExtractor;
+
+    private readonly \Closure $objectClassResolver;
+
+    public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory = null, ?NameConverterInterface $nameConverter = null, ?PropertyAccessorInterface $propertyAccessor = null, ?PropertyTypeExtractorInterface $propertyTypeExtractor = null, ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, ?callable $objectClassResolver = null, array $defaultContext = [], ?PropertyInfoExtractorInterface $propertyInfoExtractor = null)
+    {
+        if (!class_exists(PropertyAccess::class)) {
+            throw new LogicException('The ObjectNormalizer class requires the "PropertyAccess" component. Try running "composer require symfony/property-access".');
+        }
+
+        parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
+
+        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
+
+        $this->objectClassResolver = ($objectClassResolver ?? static fn ($class) => \is_object($class) ? $class::class : $class)(...);
+        $this->propertyInfoExtractor = $propertyInfoExtractor ?: new ReflectionExtractor();
+        $this->writeInfoExtractor = new ReflectionExtractor();
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => true];
+    }
+
+    protected function extractAttributes(object $object, ?string $format = null, array $context = []): array
+    {
+        if (\stdClass::class === $object::class) {
+            return array_keys((array) $object);
+        }
+
+        // If not using groups, detect manually
+        $attributes = [];
+
+        // methods
+        $class = ($this->objectClassResolver)($object);
+        $reflClass = new \ReflectionClass($class);
+
+        foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
+            if (
+                0 !== $reflMethod->getNumberOfRequiredParameters()
+                || $reflMethod->isStatic()
+                || $reflMethod->isConstructor()
+                || $reflMethod->isDestructor()
+            ) {
+                continue;
+            }
+
+            $name = $reflMethod->name;
+            $attributeName = null;
+
+            // ctype_lower check to find out if method looks like accessor but actually is not, e.g. hash, cancel
+            if (match ($name[0]) {
+                'g' => str_starts_with($name, 'get') && isset($name[$i = 3]),
+                'h' => str_starts_with($name, 'has') && isset($name[$i = 3]),
+                'c' => str_starts_with($name, 'can') && isset($name[$i = 3]),
+                'i' => str_starts_with($name, 'is') && isset($name[$i = 2]),
+                default => false,
+            } && !ctype_lower($name[$i])) {
+                if ($this->hasProperty($reflMethod, $name)) {
+                    $attributeName = $name;
+                } else {
+                    $attributeName = substr($name, $i);
+
+                    if (!$reflClass->hasProperty($attributeName)) {
+                        $attributeName = lcfirst($attributeName);
+                    }
+                }
+            }
+
+            if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName, $format, $context)) {
+                $attributes[$attributeName] = true;
+            }
+        }
+
+        // properties
+        foreach ($reflClass->getProperties() as $reflProperty) {
+            if (!$reflProperty->isPublic()) {
+                continue;
+            }
+
+            if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
+                continue;
+            }
+
+            $attributes[$reflProperty->name] = true;
+        }
+
+        return array_keys($attributes);
+    }
+
+    private function hasProperty(\ReflectionMethod $method, string $propName): bool
+    {
+        $class = $method->getDeclaringClass();
+
+        do {
+            if ($class->hasProperty($propName)) {
+                return true;
+            }
+        } while ($class = $class->getParentClass());
+
+        return false;
+    }
+
+    protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
+    {
+        $mapping = $this->classDiscriminatorResolver?->getMappingForMappedObject($object);
+
+        return $attribute === $mapping?->getTypeProperty()
+            ? $mapping
+            : $this->propertyAccessor->getValue($object, $attribute);
+    }
+
+    protected function setAttributeValue(object $object, string $attribute, mixed $value, ?string $format = null, array $context = []): void
+    {
+        try {
+            $this->propertyAccessor->setValue($object, $attribute, $value);
+        } catch (NoSuchPropertyException) {
+            // Properties not found are ignored
+        }
+    }
+
+    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    {
+        if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
+            return false;
+        }
+
+        $class = \is_object($classOrObject) ? $classOrObject::class : $classOrObject;
+
+        if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+            return true;
+        }
+
+        if ($context['_read_attributes'] ?? true) {
+            if (!isset(self::$isReadableCache[$class.$attribute])) {
+                self::$isReadableCache[$class.$attribute] = $this->propertyInfoExtractor->isReadable($class, $attribute) || $this->hasAttributeAccessorMethod($class, $attribute) || (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute));
+            }
+
+            return self::$isReadableCache[$class.$attribute];
+        }
+
+        return self::$isWritableCache[$class.$attribute] ??= str_contains($attribute, '.')
+            || $this->propertyInfoExtractor->isWritable($class, $attribute)
+            || !\in_array($this->writeInfoExtractor->getWriteInfo($class, $attribute)?->getType(), [null, PropertyWriteInfo::TYPE_NONE, PropertyWriteInfo::TYPE_PROPERTY], true);
+    }
+
+    private function hasAttributeAccessorMethod(string $class, string $attribute): bool
+    {
+        if (!isset(self::$reflectionCache[$class])) {
+            self::$reflectionCache[$class] = new \ReflectionClass($class);
+        }
+
+        $reflection = self::$reflectionCache[$class];
+
+        if (!$reflection->hasMethod($attribute)) {
+            return false;
+        }
+
+        $method = $reflection->getMethod($attribute);
+
+        return !$method->isStatic()
+            && !$method->getAttributes(Ignore::class)
+            && !$method->getNumberOfRequiredParameters();
+    }
+}
diff --git a/symfony/serializer/Normalizer/ObjectToPopulateTrait.php b/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
new file mode 100644
index 000000000..21ad5f7ad
--- /dev/null
+++ b/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+trait ObjectToPopulateTrait
+{
+    /**
+     * Extract the `object_to_populate` field from the context if it exists
+     * and is an instance of the provided $class.
+     *
+     * @param string      $class The class the object should be
+     * @param string|null $key   They in which to look for the object to populate.
+     *                           Keeps backwards compatibility with `AbstractNormalizer`.
+     */
+    protected function extractObjectToPopulate(string $class, array $context, ?string $key = null): ?object
+    {
+        $key ??= AbstractNormalizer::OBJECT_TO_POPULATE;
+
+        if (isset($context[$key]) && \is_object($context[$key]) && $context[$key] instanceof $class) {
+            return $context[$key];
+        }
+
+        return null;
+    }
+}
diff --git a/symfony/serializer/Normalizer/ProblemNormalizer.php b/symfony/serializer/Normalizer/ProblemNormalizer.php
new file mode 100644
index 000000000..8f255e6ce
--- /dev/null
+++ b/symfony/serializer/Normalizer/ProblemNormalizer.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\Messenger\Exception\ValidationFailedException as MessageValidationFailedException;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Normalizes errors according to the API Problem spec (RFC 7807).
+ *
+ * @see https://tools.ietf.org/html/rfc7807
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Yonel Ceruto <yonelceruto@gmail.com>
+ */
+class ProblemNormalizer implements NormalizerInterface, SerializerAwareInterface
+{
+    use SerializerAwareTrait;
+
+    public const TITLE = 'title';
+    public const TYPE = 'type';
+    public const STATUS = 'status';
+
+    public function __construct(
+        private bool $debug = false,
+        private array $defaultContext = [],
+        private ?TranslatorInterface $translator = null,
+    ) {
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            FlattenException::class => __CLASS__ === self::class,
+        ];
+    }
+
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
+    {
+        if (!$object instanceof FlattenException) {
+            throw new InvalidArgumentException(\sprintf('The object must implement "%s".', FlattenException::class));
+        }
+
+        $error = [];
+        $context += $this->defaultContext;
+        $debug = $this->debug && ($context['debug'] ?? true);
+        $exception = $context['exception'] ?? null;
+        if ($exception instanceof HttpExceptionInterface) {
+            $exception = $exception->getPrevious();
+
+            if ($exception instanceof PartialDenormalizationException) {
+                $trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);
+                $template = 'This value should be of type {{ type }}.';
+                $error = [
+                    self::TYPE => 'https://symfony.com/errors/validation',
+                    self::TITLE => 'Validation Failed',
+                    'violations' => array_map(
+                        fn ($e) => [
+                            'propertyPath' => $e->getPath(),
+                            'title' => $trans($template, [
+                                '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
+                            ], 'validators'),
+                            'template' => $template,
+                            'parameters' => [
+                                '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
+                            ],
+                        ] + ($debug || $e->canUseMessageForUser() ? ['hint' => $e->getMessage()] : []),
+                        $exception->getErrors()
+                    ),
+                ];
+                $error['detail'] = implode("\n", array_map(fn ($e) => $e['propertyPath'].': '.$e['title'], $error['violations']));
+            } elseif (($exception instanceof ValidationFailedException || $exception instanceof MessageValidationFailedException)
+                && $this->serializer instanceof NormalizerInterface
+                && $this->serializer->supportsNormalization($exception->getViolations(), $format, $context)
+            ) {
+                $error = $this->serializer->normalize($exception->getViolations(), $format, $context);
+            }
+        }
+
+        $error = [
+            self::TYPE => $error[self::TYPE] ?? $context[self::TYPE] ?? 'https://tools.ietf.org/html/rfc2616#section-10',
+            self::TITLE => $error[self::TITLE] ?? $context[self::TITLE] ?? 'An error occurred',
+            self::STATUS => $context[self::STATUS] ?? $object->getStatusCode(),
+            'detail' => $error['detail'] ?? ($debug ? $object->getMessage() : $object->getStatusText()),
+        ] + $error;
+        if ($debug) {
+            $error['class'] = $object->getClass();
+            $error['trace'] = $object->getTrace();
+        }
+
+        return $error;
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof FlattenException;
+    }
+}
diff --git a/symfony/serializer/Normalizer/PropertyNormalizer.php b/symfony/serializer/Normalizer/PropertyNormalizer.php
new file mode 100644
index 000000000..d200d972c
--- /dev/null
+++ b/symfony/serializer/Normalizer/PropertyNormalizer.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
+use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+
+/**
+ * Converts between objects and arrays by mapping properties.
+ *
+ * The normalization process looks for all the object's properties (public and private).
+ * The result is a map from property names to property values. Property values
+ * are normalized through the serializer.
+ *
+ * The denormalization first looks at the constructor of the given class to see
+ * if any of the parameters have the same name as one of the properties. The
+ * constructor is then called with all parameters or an exception is thrown if
+ * any required parameters were not present as properties. Then the denormalizer
+ * walks through the given map of property names to property values to see if a
+ * property with the corresponding name exists. If found, the property gets the value.
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+final class PropertyNormalizer extends AbstractObjectNormalizer
+{
+    public const NORMALIZE_PUBLIC = 1;
+    public const NORMALIZE_PROTECTED = 2;
+    public const NORMALIZE_PRIVATE = 4;
+
+    /**
+     * Flag to control whether fields should be output based on visibility.
+     */
+    public const NORMALIZE_VISIBILITY = 'normalize_visibility';
+
+    public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory = null, ?NameConverterInterface $nameConverter = null, ?PropertyTypeExtractorInterface $propertyTypeExtractor = null, ?ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, ?callable $objectClassResolver = null, array $defaultContext = [])
+    {
+        parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
+
+        if (!isset($this->defaultContext[self::NORMALIZE_VISIBILITY])) {
+            $this->defaultContext[self::NORMALIZE_VISIBILITY] = self::NORMALIZE_PUBLIC | self::NORMALIZE_PROTECTED | self::NORMALIZE_PRIVATE;
+        }
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => true];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return parent::supportsNormalization($data, $format) && $this->supports($data::class);
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
+    }
+
+    /**
+     * Checks if the given class has any non-static property.
+     */
+    private function supports(string $class): bool
+    {
+        if ($this->classDiscriminatorResolver?->getMappingForClass($class)) {
+            return true;
+        }
+
+        $class = new \ReflectionClass($class);
+
+        // We look for at least one non-static property
+        do {
+            foreach ($class->getProperties() as $property) {
+                if (!$property->isStatic()) {
+                    return true;
+                }
+            }
+        } while ($class = $class->getParentClass());
+
+        return false;
+    }
+
+    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, ?string $format = null, array $context = []): bool
+    {
+        if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
+            return false;
+        }
+
+        if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+            return true;
+        }
+
+        try {
+            $reflectionProperty = $this->getReflectionProperty($classOrObject, $attribute);
+        } catch (\ReflectionException) {
+            return false;
+        }
+
+        if ($reflectionProperty->isStatic()) {
+            return false;
+        }
+
+        $normalizeVisibility = $context[self::NORMALIZE_VISIBILITY] ?? $this->defaultContext[self::NORMALIZE_VISIBILITY];
+
+        if ((self::NORMALIZE_PUBLIC & $normalizeVisibility) && $reflectionProperty->isPublic()) {
+            return true;
+        }
+
+        if ((self::NORMALIZE_PROTECTED & $normalizeVisibility) && $reflectionProperty->isProtected()) {
+            return true;
+        }
+
+        if ((self::NORMALIZE_PRIVATE & $normalizeVisibility) && $reflectionProperty->isPrivate()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function extractAttributes(object $object, ?string $format = null, array $context = []): array
+    {
+        $reflectionObject = new \ReflectionObject($object);
+        $attributes = [];
+
+        do {
+            foreach ($reflectionObject->getProperties() as $property) {
+                if (!$this->isAllowedAttribute($reflectionObject->getName(), $property->name, $format, $context)) {
+                    continue;
+                }
+
+                $attributes[] = $property->name;
+            }
+        } while ($reflectionObject = $reflectionObject->getParentClass());
+
+        return array_unique($attributes);
+    }
+
+    protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
+    {
+        try {
+            $reflectionProperty = $this->getReflectionProperty($object, $attribute);
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        if ($reflectionProperty->hasType()) {
+            return $reflectionProperty->getValue($object);
+        }
+
+        if (!method_exists($object, '__get') && !isset($object->$attribute)) {
+            $propertyValues = (array) $object;
+
+            if (($reflectionProperty->isPublic() && !\array_key_exists($reflectionProperty->name, $propertyValues))
+                || ($reflectionProperty->isProtected() && !\array_key_exists("\0*\0{$reflectionProperty->name}", $propertyValues))
+                || ($reflectionProperty->isPrivate() && !\array_key_exists("\0{$reflectionProperty->class}\0{$reflectionProperty->name}", $propertyValues))
+            ) {
+                throw new UninitializedPropertyException(\sprintf('The property "%s::$%s" is not initialized.', $object::class, $reflectionProperty->name));
+            }
+        }
+
+        return $reflectionProperty->getValue($object);
+    }
+
+    protected function setAttributeValue(object $object, string $attribute, mixed $value, ?string $format = null, array $context = []): void
+    {
+        try {
+            $reflectionProperty = $this->getReflectionProperty($object, $attribute);
+        } catch (\ReflectionException) {
+            return;
+        }
+
+        if ($reflectionProperty->isStatic()) {
+            return;
+        }
+
+        if (!$reflectionProperty->isReadOnly()) {
+            $reflectionProperty->setValue($object, $value);
+
+            return;
+        }
+
+        if (!$reflectionProperty->isInitialized($object)) {
+            $declaringClass = $reflectionProperty->getDeclaringClass();
+            $declaringClass->getProperty($reflectionProperty->getName())->setValue($object, $value);
+
+            return;
+        }
+
+        if ($reflectionProperty->getValue($object) !== $value) {
+            throw new LogicException(\sprintf('Attempting to change readonly property "%s"::$%s.', $object::class, $reflectionProperty->getName()));
+        }
+    }
+
+    /**
+     * @throws \ReflectionException
+     */
+    private function getReflectionProperty(string|object $classOrObject, string $attribute): \ReflectionProperty
+    {
+        $reflectionClass = new \ReflectionClass($classOrObject);
+        while (true) {
+            try {
+                return $reflectionClass->getProperty($attribute);
+            } catch (\ReflectionException $e) {
+                if (!$reflectionClass = $reflectionClass->getParentClass()) {
+                    throw $e;
+                }
+            }
+        }
+    }
+}
diff --git a/symfony/serializer/Normalizer/TranslatableNormalizer.php b/symfony/serializer/Normalizer/TranslatableNormalizer.php
new file mode 100644
index 000000000..d365598b5
--- /dev/null
+++ b/symfony/serializer/Normalizer/TranslatableNormalizer.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Contracts\Translation\TranslatableInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class TranslatableNormalizer implements NormalizerInterface
+{
+    public const NORMALIZATION_LOCALE_KEY = 'translatable_normalization_locale';
+
+    private array $defaultContext = [
+        self::NORMALIZATION_LOCALE_KEY => null,
+    ];
+
+    public function __construct(
+        private readonly TranslatorInterface $translator,
+        array $defaultContext = [],
+    ) {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function normalize(mixed $data, ?string $format = null, array $context = []): string
+    {
+        if (!$data instanceof TranslatableInterface) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The object must implement the "%s".', TranslatableInterface::class), $data, [TranslatableInterface::class]);
+        }
+
+        return $data->trans($this->translator, $context[self::NORMALIZATION_LOCALE_KEY] ?? $this->defaultContext[self::NORMALIZATION_LOCALE_KEY]);
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof TranslatableInterface;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [TranslatableInterface::class => true];
+    }
+}
diff --git a/symfony/serializer/Normalizer/UidNormalizer.php b/symfony/serializer/Normalizer/UidNormalizer.php
new file mode 100644
index 000000000..eb624eed1
--- /dev/null
+++ b/symfony/serializer/Normalizer/UidNormalizer.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Uid\AbstractUid;
+
+final class UidNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    public const NORMALIZATION_FORMAT_KEY = 'uid_normalization_format';
+
+    public const NORMALIZATION_FORMAT_CANONICAL = 'canonical';
+    public const NORMALIZATION_FORMAT_BASE58 = 'base58';
+    public const NORMALIZATION_FORMAT_BASE32 = 'base32';
+    public const NORMALIZATION_FORMAT_RFC4122 = 'rfc4122';
+    public const NORMALIZATION_FORMAT_RFC9562 = self::NORMALIZATION_FORMAT_RFC4122; // RFC 9562 obsoleted RFC 4122 but the format is the same
+
+    public const NORMALIZATION_FORMATS = [
+        self::NORMALIZATION_FORMAT_CANONICAL,
+        self::NORMALIZATION_FORMAT_BASE58,
+        self::NORMALIZATION_FORMAT_BASE32,
+        self::NORMALIZATION_FORMAT_RFC4122,
+    ];
+
+    private array $defaultContext = [
+        self::NORMALIZATION_FORMAT_KEY => self::NORMALIZATION_FORMAT_CANONICAL,
+    ];
+
+    public function __construct(array $defaultContext = [])
+    {
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            AbstractUid::class => true,
+        ];
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        return match ($context[self::NORMALIZATION_FORMAT_KEY] ?? $this->defaultContext[self::NORMALIZATION_FORMAT_KEY]) {
+            self::NORMALIZATION_FORMAT_CANONICAL => (string) $data,
+            self::NORMALIZATION_FORMAT_BASE58 => $data->toBase58(),
+            self::NORMALIZATION_FORMAT_BASE32 => $data->toBase32(),
+            self::NORMALIZATION_FORMAT_RFC4122 => $data->toRfc4122(),
+            default => throw new LogicException(\sprintf('The "%s" format is not valid.', $context[self::NORMALIZATION_FORMAT_KEY] ?? $this->defaultContext[self::NORMALIZATION_FORMAT_KEY])),
+        };
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof AbstractUid;
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        try {
+            return $type::fromString($data);
+        } catch (\InvalidArgumentException|\TypeError) {
+            throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('The data is not a valid "%s" string representation.', $type), $data, ['string'], $context['deserialization_path'] ?? null, true);
+        }
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return is_subclass_of($type, AbstractUid::class, true);
+    }
+}
diff --git a/symfony/serializer/Normalizer/UnwrappingDenormalizer.php b/symfony/serializer/Normalizer/UnwrappingDenormalizer.php
new file mode 100644
index 000000000..9f01d2a71
--- /dev/null
+++ b/symfony/serializer/Normalizer/UnwrappingDenormalizer.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Normalizer;
+
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+
+/**
+ * @author Eduard Bulava <bulavaeduard@gmail.com>
+ */
+final class UnwrappingDenormalizer implements DenormalizerInterface, SerializerAwareInterface
+{
+    use SerializerAwareTrait;
+
+    public const UNWRAP_PATH = 'unwrap_path';
+
+    private readonly PropertyAccessorInterface $propertyAccessor;
+
+    public function __construct(?PropertyAccessorInterface $propertyAccessor = null)
+    {
+        $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['*' => false];
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        $propertyPath = $context[self::UNWRAP_PATH];
+        $context['unwrapped'] = true;
+
+        if ($propertyPath) {
+            if (!$this->propertyAccessor->isReadable($data, $propertyPath)) {
+                return null;
+            }
+
+            $data = $this->propertyAccessor->getValue($data, $propertyPath);
+        }
+
+        if (!$this->serializer instanceof DenormalizerInterface) {
+            throw new LogicException('Cannot unwrap path because the injected serializer is not a denormalizer.');
+        }
+
+        return $this->serializer->denormalize($data, $type, $format, $context);
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return \array_key_exists(self::UNWRAP_PATH, $context) && !isset($context['unwrapped']);
+    }
+}
diff --git a/symfony/serializer/Serializer.php b/symfony/serializer/Serializer.php
new file mode 100644
index 000000000..2e7420754
--- /dev/null
+++ b/symfony/serializer/Serializer.php
@@ -0,0 +1,400 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer;
+
+use Symfony\Component\Serializer\Encoder\ChainDecoder;
+use Symfony\Component\Serializer\Encoder\ChainEncoder;
+use Symfony\Component\Serializer\Encoder\ContextAwareDecoderInterface;
+use Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface;
+use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\Exception\UnsupportedFormatException;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * Serializer serializes and deserializes data.
+ *
+ * objects are turned into arrays by normalizers.
+ * arrays are turned into various output formats by encoders.
+ *
+ *     $serializer->serialize($obj, 'xml')
+ *     $serializer->decode($data, 'xml')
+ *     $serializer->denormalize($data, 'Class', 'xml')
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class Serializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, ContextAwareEncoderInterface, ContextAwareDecoderInterface
+{
+    /**
+     * Flag to control whether an empty array should be transformed to an
+     * object (in JSON: {}) or to a list (in JSON: []).
+     */
+    public const EMPTY_ARRAY_AS_OBJECT = 'empty_array_as_object';
+
+    private const SCALAR_TYPES = [
+        'int' => true,
+        'bool' => true,
+        'float' => true,
+        'string' => true,
+    ];
+
+    protected ChainEncoder $encoder;
+
+    protected ChainDecoder $decoder;
+
+    /**
+     * @var array<string, array<string, array<bool>>>
+     */
+    private array $denormalizerCache = [];
+
+    /**
+     * @var array<string, array<string, array<bool>>>
+     */
+    private array $normalizerCache = [];
+
+    /**
+     * @param array<NormalizerInterface|DenormalizerInterface> $normalizers
+     * @param array<EncoderInterface|DecoderInterface>         $encoders
+     * @param array<string, mixed>                             $defaultContext
+     */
+    public function __construct(
+        private array $normalizers = [],
+        array $encoders = [],
+        private array $defaultContext = [],
+    ) {
+        foreach ($normalizers as $normalizer) {
+            if ($normalizer instanceof SerializerAwareInterface) {
+                $normalizer->setSerializer($this);
+            }
+
+            if ($normalizer instanceof DenormalizerAwareInterface) {
+                $normalizer->setDenormalizer($this);
+            }
+
+            if ($normalizer instanceof NormalizerAwareInterface) {
+                $normalizer->setNormalizer($this);
+            }
+
+            if (!($normalizer instanceof NormalizerInterface || $normalizer instanceof DenormalizerInterface)) {
+                throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', get_debug_type($normalizer), NormalizerInterface::class, DenormalizerInterface::class));
+            }
+        }
+
+        $decoders = [];
+        $realEncoders = [];
+        foreach ($encoders as $encoder) {
+            if ($encoder instanceof SerializerAwareInterface) {
+                $encoder->setSerializer($this);
+            }
+            if ($encoder instanceof DecoderInterface) {
+                $decoders[] = $encoder;
+            }
+            if ($encoder instanceof EncoderInterface) {
+                $realEncoders[] = $encoder;
+            }
+
+            if (!($encoder instanceof EncoderInterface || $encoder instanceof DecoderInterface)) {
+                throw new InvalidArgumentException(\sprintf('The class "%s" neither implements "%s" nor "%s".', get_debug_type($encoder), EncoderInterface::class, DecoderInterface::class));
+            }
+        }
+        $this->encoder = new ChainEncoder($realEncoders);
+        $this->decoder = new ChainDecoder($decoders);
+    }
+
+    final public function serialize(mixed $data, string $format, array $context = []): string
+    {
+        if (!$this->supportsEncoding($format, $context)) {
+            throw new UnsupportedFormatException(\sprintf('Serialization for the format "%s" is not supported.', $format));
+        }
+
+        if ($this->encoder->needsNormalization($format, $context)) {
+            $data = $this->normalize($data, $format, $context);
+        }
+
+        return $this->encode($data, $format, $context);
+    }
+
+    final public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed
+    {
+        if (!$this->supportsDecoding($format, $context)) {
+            throw new UnsupportedFormatException(\sprintf('Deserialization for the format "%s" is not supported.', $format));
+        }
+
+        $data = $this->decode($data, $format, $context);
+
+        return $this->denormalize($data, $type, $format, $context);
+    }
+
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
+    {
+        // If a normalizer supports the given data, use it
+        if ($normalizer = $this->getNormalizer($data, $format, $context)) {
+            return $normalizer->normalize($data, $format, $context);
+        }
+
+        if (null === $data || \is_scalar($data)) {
+            return $data;
+        }
+
+        if (\is_array($data) && !$data && ($context[self::EMPTY_ARRAY_AS_OBJECT] ?? $this->defaultContext[self::EMPTY_ARRAY_AS_OBJECT] ?? false)) {
+            return new \ArrayObject();
+        }
+
+        if (is_iterable($data)) {
+            if ($data instanceof \Countable && ($context[AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS] ?? $this->defaultContext[AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS] ?? false) && !\count($data)) {
+                return new \ArrayObject();
+            }
+
+            $normalized = [];
+            foreach ($data as $key => $val) {
+                $normalized[$key] = $this->normalize($val, $format, $context);
+            }
+
+            return $normalized;
+        }
+
+        if (\is_object($data)) {
+            if (!$this->normalizers) {
+                throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
+            }
+
+            throw new NotNormalizableValueException(\sprintf('Could not normalize object of type "%s", no supporting normalizer found.', get_debug_type($data)));
+        }
+
+        throw new NotNormalizableValueException('An unexpected value could not be normalized: '.(!\is_resource($data) ? var_export($data, true) : \sprintf('"%s" resource', get_resource_type($data))));
+    }
+
+    /**
+     * @throws NotNormalizableValueException
+     * @throws PartialDenormalizationException Occurs when one or more properties of $type fails to denormalize
+     */
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
+    {
+        if (isset($context[DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS], $context['not_normalizable_value_exceptions'])) {
+            throw new LogicException('Passing a value for "not_normalizable_value_exceptions" context key is not allowed.');
+        }
+
+        $normalizer = $this->getDenormalizer($data, $type, $format, $context);
+
+        // Check for a denormalizer first, e.g. the data is wrapped
+        if (!$normalizer && isset(self::SCALAR_TYPES[$type])) {
+            if (!('is_'.$type)($data)) {
+                throw NotNormalizableValueException::createForUnexpectedDataType(\sprintf('Data expected to be of type "%s" ("%s" given).', $type, get_debug_type($data)), $data, [$type], $context['deserialization_path'] ?? null, true);
+            }
+
+            return $data;
+        }
+
+        if (!$this->normalizers) {
+            throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
+        }
+
+        if (!$normalizer) {
+            throw new NotNormalizableValueException(\sprintf('Could not denormalize object of type "%s", no supporting normalizer found.', $type));
+        }
+
+        if ((isset($context[DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS]) || isset($this->defaultContext[DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS])) && !isset($context['not_normalizable_value_exceptions'])) {
+            unset($context[DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS]);
+            $context['not_normalizable_value_exceptions'] = [];
+            $errors = &$context['not_normalizable_value_exceptions'];
+            $denormalized = $normalizer->denormalize($data, $type, $format, $context);
+
+            if ($errors) {
+                // merge errors so that one path has only one error
+                $uniqueErrors = [];
+                foreach ($errors as $error) {
+                    if (null === $error->getPath()) {
+                        $uniqueErrors[] = $error;
+                        continue;
+                    }
+
+                    $uniqueErrors[$error->getPath()] ??= $error;
+                }
+
+                throw new PartialDenormalizationException($denormalized, array_values($uniqueErrors));
+            }
+
+            return $denormalized;
+        }
+
+        return $normalizer->denormalize($data, $type, $format, $context);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['*' => false];
+    }
+
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
+    {
+        return null !== $this->getNormalizer($data, $format, $context);
+    }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return isset(self::SCALAR_TYPES[$type]) || null !== $this->getDenormalizer($data, $type, $format, $context);
+    }
+
+    /**
+     * Returns a matching normalizer.
+     *
+     * @param mixed       $data    Data to get the serializer for
+     * @param string|null $format  Format name, present to give the option to normalizers to act differently based on formats
+     * @param array       $context Options available to the normalizer
+     */
+    private function getNormalizer(mixed $data, ?string $format, array $context): ?NormalizerInterface
+    {
+        if (\is_object($data)) {
+            $type = $data::class;
+            $genericType = 'object';
+        } else {
+            $type = 'native-'.\gettype($data);
+            $genericType = '*';
+        }
+
+        if (!isset($this->normalizerCache[$format ?? ''][$type])) {
+            $this->normalizerCache[$format ?? ''][$type] = [];
+
+            foreach ($this->normalizers as $k => $normalizer) {
+                if (!$normalizer instanceof NormalizerInterface) {
+                    continue;
+                }
+
+                $supportedTypes = $normalizer->getSupportedTypes($format);
+
+                foreach ($supportedTypes as $supportedType => $isCacheable) {
+                    if (\in_array($supportedType, ['*', 'object'], true)
+                        || $type !== $supportedType && ('object' !== $genericType || !is_subclass_of($type, $supportedType))
+                    ) {
+                        continue;
+                    }
+
+                    if (null === $isCacheable) {
+                        unset($supportedTypes['*'], $supportedTypes['object']);
+                    } elseif ($this->normalizerCache[$format ?? ''][$type][$k] = $isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
+                        break 2;
+                    }
+
+                    break;
+                }
+
+                if (null === $isCacheable = $supportedTypes[\array_key_exists($genericType, $supportedTypes) ? $genericType : '*'] ?? null) {
+                    continue;
+                }
+
+                if ($this->normalizerCache[$format ?? ''][$type][$k] ??= $isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
+                    break;
+                }
+            }
+        }
+
+        foreach ($this->normalizerCache[$format ?? ''][$type] as $k => $cached) {
+            $normalizer = $this->normalizers[$k];
+            if ($cached || $normalizer->supportsNormalization($data, $format, $context)) {
+                return $normalizer;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a matching denormalizer.
+     *
+     * @param mixed       $data    Data to restore
+     * @param string      $class   The expected class to instantiate
+     * @param string|null $format  Format name, present to give the option to normalizers to act differently based on formats
+     * @param array       $context Options available to the denormalizer
+     */
+    private function getDenormalizer(mixed $data, string $class, ?string $format, array $context): ?DenormalizerInterface
+    {
+        if (!isset($this->denormalizerCache[$format ?? ''][$class])) {
+            $this->denormalizerCache[$format ?? ''][$class] = [];
+            $genericType = class_exists($class) || interface_exists($class, false) ? 'object' : '*';
+
+            foreach ($this->normalizers as $k => $normalizer) {
+                if (!$normalizer instanceof DenormalizerInterface) {
+                    continue;
+                }
+
+                $supportedTypes = $normalizer->getSupportedTypes($format);
+
+                $doesClassRepresentCollection = str_ends_with($class, '[]');
+
+                foreach ($supportedTypes as $supportedType => $isCacheable) {
+                    if (\in_array($supportedType, ['*', 'object'], true)
+                        || $class !== $supportedType && ('object' !== $genericType || !is_subclass_of($class, $supportedType))
+                        && !($doesClassRepresentCollection && str_ends_with($supportedType, '[]') && is_subclass_of(strstr($class, '[]', true), strstr($supportedType, '[]', true)))
+                    ) {
+                        continue;
+                    }
+
+                    if (null === $isCacheable) {
+                        unset($supportedTypes['*'], $supportedTypes['object']);
+                    } elseif ($this->denormalizerCache[$format ?? ''][$class][$k] = $isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                        break 2;
+                    }
+
+                    break;
+                }
+
+                if (null === $isCacheable = $supportedTypes[\array_key_exists($genericType, $supportedTypes) ? $genericType : '*'] ?? null) {
+                    continue;
+                }
+
+                if ($this->denormalizerCache[$format ?? ''][$class][$k] ??= $isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                    break;
+                }
+            }
+        }
+
+        foreach ($this->denormalizerCache[$format ?? ''][$class] as $k => $cached) {
+            $normalizer = $this->normalizers[$k];
+            if ($cached || $normalizer->supportsDenormalization($data, $class, $format, $context)) {
+                return $normalizer;
+            }
+        }
+
+        return null;
+    }
+
+    final public function encode(mixed $data, string $format, array $context = []): string
+    {
+        return $this->encoder->encode($data, $format, $context);
+    }
+
+    final public function decode(string $data, string $format, array $context = []): mixed
+    {
+        return $this->decoder->decode($data, $format, $context);
+    }
+
+    public function supportsEncoding(string $format, array $context = []): bool
+    {
+        return $this->encoder->supportsEncoding($format, $context);
+    }
+
+    public function supportsDecoding(string $format, array $context = []): bool
+    {
+        return $this->decoder->supportsDecoding($format, $context);
+    }
+}
diff --git a/symfony/serializer/SerializerAwareInterface.php b/symfony/serializer/SerializerAwareInterface.php
new file mode 100644
index 000000000..0b4db4c77
--- /dev/null
+++ b/symfony/serializer/SerializerAwareInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface SerializerAwareInterface
+{
+    /**
+     * Sets the owning Serializer object.
+     */
+    public function setSerializer(SerializerInterface $serializer): void;
+}
diff --git a/symfony/serializer/SerializerAwareTrait.php b/symfony/serializer/SerializerAwareTrait.php
new file mode 100644
index 000000000..495e5889c
--- /dev/null
+++ b/symfony/serializer/SerializerAwareTrait.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer;
+
+/**
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
+ */
+trait SerializerAwareTrait
+{
+    protected ?SerializerInterface $serializer = null;
+
+    public function setSerializer(SerializerInterface $serializer): void
+    {
+        $this->serializer = $serializer;
+    }
+}
diff --git a/symfony/serializer/SerializerInterface.php b/symfony/serializer/SerializerInterface.php
new file mode 100644
index 000000000..f9fff7f84
--- /dev/null
+++ b/symfony/serializer/SerializerInterface.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer;
+
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface SerializerInterface
+{
+    /**
+     * Serializes data in the appropriate format.
+     *
+     * @param array<string, mixed> $context Options normalizers/encoders have access to
+     *
+     * @throws NotNormalizableValueException Occurs when a value cannot be normalized
+     * @throws UnexpectedValueException      Occurs when a value cannot be encoded
+     * @throws ExceptionInterface            Occurs for all the other cases of serialization-related errors
+     */
+    public function serialize(mixed $data, string $format, array $context = []): string;
+
+    /**
+     * Deserializes data into the given type.
+     *
+     * @template TObject of object
+     * @template TType of string|class-string<TObject>
+     *
+     * @param TType                $type
+     * @param array<string, mixed> $context
+     *
+     * @phpstan-return ($type is class-string<TObject> ? TObject : mixed)
+     *
+     * @psalm-return (TType is class-string<TObject> ? TObject : mixed)
+     *
+     * @throws NotNormalizableValueException Occurs when a value cannot be denormalized
+     * @throws UnexpectedValueException      Occurs when a value cannot be decoded
+     * @throws ExceptionInterface            Occurs for all the other cases of serialization-related errors
+     */
+    public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed;
+}
diff --git a/symfony/string/AbstractString.php b/symfony/string/AbstractString.php
index f55c72161..402839c5a 100644
--- a/symfony/string/AbstractString.php
+++ b/symfony/string/AbstractString.php
@@ -39,8 +39,8 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     public const PREG_SPLIT_DELIM_CAPTURE = \PREG_SPLIT_DELIM_CAPTURE;
     public const PREG_SPLIT_OFFSET_CAPTURE = \PREG_SPLIT_OFFSET_CAPTURE;
 
-    protected $string = '';
-    protected $ignoreCase = false;
+    protected string $string = '';
+    protected ?bool $ignoreCase = false;
 
     abstract public function __construct(string $string = '');
 
@@ -263,7 +263,7 @@ public function containsAny(string|iterable $needle): bool
     public function endsWith(string|iterable $suffix): bool
     {
         if (\is_string($suffix)) {
-            throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
+            throw new \TypeError(\sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
         }
 
         foreach ($suffix as $s) {
@@ -312,7 +312,7 @@ public function ensureStart(string $prefix): static
     public function equalsTo(string|iterable $string): bool
     {
         if (\is_string($string)) {
-            throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
+            throw new \TypeError(\sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
         }
 
         foreach ($string as $s) {
@@ -340,7 +340,7 @@ public function ignoreCase(): static
     public function indexOf(string|iterable $needle, int $offset = 0): ?int
     {
         if (\is_string($needle)) {
-            throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
+            throw new \TypeError(\sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
         }
 
         $i = \PHP_INT_MAX;
@@ -362,7 +362,7 @@ public function indexOf(string|iterable $needle, int $offset = 0): ?int
     public function indexOfLast(string|iterable $needle, int $offset = 0): ?int
     {
         if (\is_string($needle)) {
-            throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
+            throw new \TypeError(\sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
         }
 
         $i = null;
@@ -414,7 +414,7 @@ abstract public function prepend(string ...$prefix): static;
     public function repeat(int $multiplier): static
     {
         if (0 > $multiplier) {
-            throw new InvalidArgumentException(sprintf('Multiplier must be positive, %d given.', $multiplier));
+            throw new InvalidArgumentException(\sprintf('Multiplier must be positive, %d given.', $multiplier));
         }
 
         $str = clone $this;
@@ -433,6 +433,16 @@ abstract public function slice(int $start = 0, ?int $length = null): static;
 
     abstract public function snake(): static;
 
+    public function kebab(): static
+    {
+        return $this->snake()->replace('_', '-');
+    }
+
+    public function pascal(): static
+    {
+        return $this->camel()->title();
+    }
+
     abstract public function splice(string $replacement, int $start = 0, ?int $length = null): static;
 
     /**
@@ -481,7 +491,7 @@ public function split(string $delimiter, ?int $limit = null, ?int $flags = null)
     public function startsWith(string|iterable $prefix): bool
     {
         if (\is_string($prefix)) {
-            throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
+            throw new \TypeError(\sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
         }
 
         foreach ($prefix as $prefix) {
@@ -605,7 +615,7 @@ public function trimSuffix($suffix): static
         return $str;
     }
 
-    public function truncate(int $length, string $ellipsis = '', bool $cut = true): static
+    public function truncate(int $length, string $ellipsis = '', bool|TruncateMode $cut = TruncateMode::Char): static
     {
         $stringLength = $this->length();
 
@@ -619,16 +629,27 @@ public function truncate(int $length, string $ellipsis = '', bool $cut = true):
             $ellipsisLength = 0;
         }
 
-        if (!$cut) {
+        $desiredLength = $length;
+        if (TruncateMode::WordAfter === $cut || !$cut) {
             if (null === $length = $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {
                 return clone $this;
             }
 
+            $length += $ellipsisLength;
+        } elseif (TruncateMode::WordBefore === $cut && null !== $this->indexOf([' ', "\r", "\n", "\t"], ($length ?: 1) - 1)) {
             $length += $ellipsisLength;
         }
 
         $str = $this->slice(0, $length - $ellipsisLength);
 
+        if (TruncateMode::WordBefore === $cut) {
+            if (0 === $ellipsisLength && $desiredLength === $this->indexOf([' ', "\r", "\n", "\t"], $length)) {
+                return $str;
+            }
+
+            $str = $str->beforeLast([' ', "\r", "\n", "\t"]);
+        }
+
         return $ellipsisLength ? $str->trimEnd()->append($ellipsis) : $str;
     }
 
@@ -685,8 +706,35 @@ public function wordwrap(int $width = 75, string $break = "\n", bool $cut = fals
         return $str;
     }
 
+    public function __serialize(): array
+    {
+        if (self::class === (new \ReflectionMethod($this, '__sleep'))->class || self::class !== (new \ReflectionMethod($this, '__serialize'))->class) {
+            return ['string' => $this->string];
+        }
+
+        trigger_deprecation('symfony/string', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
+
+        $data = [];
+        foreach ($this->__sleep() as $key) {
+            try {
+                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
+                    $data[$key] = $r->getValue($this);
+                }
+            } catch (\ReflectionException) {
+                $data[$key] = $this->$key;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
+     */
     public function __sleep(): array
     {
+        trigger_deprecation('symfony/string', '7.4', 'Calling "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
+
         return ['string'];
     }
 
diff --git a/symfony/string/AbstractUnicodeString.php b/symfony/string/AbstractUnicodeString.php
index 70598e409..2e7e20203 100644
--- a/symfony/string/AbstractUnicodeString.php
+++ b/symfony/string/AbstractUnicodeString.php
@@ -124,7 +124,7 @@ public function ascii(array $rules = []): self
                         }
 
                         if (null === $transliterator) {
-                            throw new InvalidArgumentException(sprintf('Unknown transliteration rule "%s".', $rule));
+                            throw new InvalidArgumentException(\sprintf('Unknown transliteration rule "%s".', $rule));
                         }
 
                         self::$transliterators['any-latin/bgn'] = $transliterator;
@@ -135,15 +135,21 @@ public function ascii(array $rules = []): self
             } elseif (!\function_exists('iconv')) {
                 $s = preg_replace('/[^\x00-\x7F]/u', '?', $s);
             } else {
-                $s = @preg_replace_callback('/[^\x00-\x7F]/u', static function ($c) {
-                    $c = (string) iconv('UTF-8', 'ASCII//TRANSLIT', $c[0]);
-
-                    if ('' === $c && '' === iconv('UTF-8', 'ASCII//TRANSLIT', '²')) {
-                        throw new \LogicException(sprintf('"%s" requires a translit-able iconv implementation, try installing "gnu-libiconv" if you\'re using Alpine Linux.', static::class));
-                    }
+                $previousLocale = setlocale(\LC_CTYPE, 0);
+                try {
+                    setlocale(\LC_CTYPE, 'C');
+                    $s = @preg_replace_callback('/[^\x00-\x7F]/u', static function ($c) {
+                        $c = (string) iconv('UTF-8', 'ASCII//TRANSLIT', $c[0]);
+
+                        if ('' === $c && '' === iconv('UTF-8', 'ASCII//TRANSLIT', '²')) {
+                            throw new \LogicException(\sprintf('"%s" requires a translit-able iconv implementation, try installing "gnu-libiconv" if you\'re using Alpine Linux.', static::class));
+                        }
 
-                    return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : ('' !== $c ? $c : '?');
-                }, $s);
+                        return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : ('' !== $c ? $c : '?');
+                    }, $s);
+                } finally {
+                    setlocale(\LC_CTYPE, $previousLocale);
+                }
             }
         }
 
@@ -220,6 +226,21 @@ public function lower(): static
         return $str;
     }
 
+    /**
+     * @param string $locale In the format language_region (e.g. tr_TR)
+     */
+    public function localeLower(string $locale): static
+    {
+        if (null !== $transliterator = $this->getLocaleTransliterator($locale, 'Lower')) {
+            $str = clone $this;
+            $str->string = $transliterator->transliterate($str->string);
+
+            return $str;
+        }
+
+        return $this->lower();
+    }
+
     public function match(string $regexp, int $flags = 0, int $offset = 0): array
     {
         $match = ((\PREG_PATTERN_ORDER | \PREG_SET_ORDER) & $flags) ? 'preg_match_all' : 'preg_match';
@@ -243,7 +264,7 @@ public function match(string $regexp, int $flags = 0, int $offset = 0): array
 
     public function normalize(int $form = self::NFC): static
     {
-        if (!\in_array($form, [self::NFC, self::NFD, self::NFKC, self::NFKD])) {
+        if (!\in_array($form, [self::NFC, self::NFD, self::NFKC, self::NFKD], true)) {
             throw new InvalidArgumentException('Unsupported normalization form.');
         }
 
@@ -339,7 +360,7 @@ public function replaceMatches(string $fromRegexp, string|callable $to): static
     public function reverse(): static
     {
         $str = clone $this;
-        $str->string = implode('', array_reverse(preg_split('/(\X)/u', $str->string, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY)));
+        $str->string = implode('', array_reverse(grapheme_str_split($str->string)));
 
         return $str;
     }
@@ -363,6 +384,21 @@ public function title(bool $allWords = false): static
         return $str;
     }
 
+    /**
+     * @param string $locale In the format language_region (e.g. tr_TR)
+     */
+    public function localeTitle(string $locale): static
+    {
+        if (null !== $transliterator = $this->getLocaleTransliterator($locale, 'Title')) {
+            $str = clone $this;
+            $str->string = $transliterator->transliterate($str->string);
+
+            return $str;
+        }
+
+        return $this->title();
+    }
+
     public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static
     {
         if (" \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}" !== $chars && !preg_match('//u', $chars)) {
@@ -450,6 +486,21 @@ public function upper(): static
         return $str;
     }
 
+    /**
+     * @param string $locale In the format language_region (e.g. tr_TR)
+     */
+    public function localeUpper(string $locale): static
+    {
+        if (null !== $transliterator = $this->getLocaleTransliterator($locale, 'Upper')) {
+            $str = clone $this;
+            $str->string = $transliterator->transliterate($str->string);
+
+            return $str;
+        }
+
+        return $this->upper();
+    }
+
     public function width(bool $ignoreAnsiDecoration = true): int
     {
         $width = 0;
@@ -587,4 +638,33 @@ private function wcswidth(string $string): int
 
         return $width;
     }
+
+    private function getLocaleTransliterator(string $locale, string $id): ?\Transliterator
+    {
+        $rule = $locale.'-'.$id;
+        if (\array_key_exists($rule, self::$transliterators)) {
+            return self::$transliterators[$rule];
+        }
+
+        if (null !== $transliterator = self::$transliterators[$rule] = \Transliterator::create($rule)) {
+            return $transliterator;
+        }
+
+        // Try to find a parent locale (nl_BE -> nl)
+        if (false === $i = strpos($locale, '_')) {
+            return null;
+        }
+
+        $parentRule = substr_replace($locale, '-'.$id, $i);
+
+        // Parent locale was already cached, return and store as current locale
+        if (\array_key_exists($parentRule, self::$transliterators)) {
+            return self::$transliterators[$rule] = self::$transliterators[$parentRule];
+        }
+
+        // Create transliterator based on parent locale and cache the result on both initial and parent locale values
+        $transliterator = \Transliterator::create($parentRule);
+
+        return self::$transliterators[$rule] = self::$transliterators[$parentRule] = $transliterator;
+    }
 }
diff --git a/symfony/string/ByteString.php b/symfony/string/ByteString.php
index 3ebe43c10..5cbfd6de4 100644
--- a/symfony/string/ByteString.php
+++ b/symfony/string/ByteString.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\String;
 
+use Random\Randomizer;
 use Symfony\Component\String\Exception\ExceptionInterface;
 use Symfony\Component\String\Exception\InvalidArgumentException;
 use Symfony\Component\String\Exception\RuntimeException;
@@ -45,7 +46,7 @@ public function __construct(string $string = '')
     public static function fromRandom(int $length = 16, ?string $alphabet = null): self
     {
         if ($length <= 0) {
-            throw new InvalidArgumentException(sprintf('A strictly positive length is expected, "%d" given.', $length));
+            throw new InvalidArgumentException(\sprintf('A strictly positive length is expected, "%d" given.', $length));
         }
 
         $alphabet ??= self::ALPHABET_ALPHANUMERIC;
@@ -55,6 +56,10 @@ public static function fromRandom(int $length = 16, ?string $alphabet = null): s
             throw new InvalidArgumentException('The length of the alphabet must in the [2^1, 2^56] range.');
         }
 
+        if (\PHP_VERSION_ID >= 80300) {
+            return new static((new Randomizer())->getBytesFromString($alphabet, $length));
+        }
+
         $ret = '';
         while ($length > 0) {
             $urandomLength = (int) ceil(2 * $length * $bits / 8.0);
@@ -335,7 +340,7 @@ public function reverse(): static
     public function slice(int $start = 0, ?int $length = null): static
     {
         $str = clone $this;
-        $str->string = (string) substr($this->string, $start, $length ?? \PHP_INT_MAX);
+        $str->string = substr($this->string, $start, $length ?? \PHP_INT_MAX);
 
         return $str;
     }
@@ -436,7 +441,7 @@ public function toCodePointString(?string $fromEncoding = null): CodePointString
         }
 
         if (!$validEncoding) {
-            throw new InvalidArgumentException(sprintf('Invalid "%s" string.', $fromEncoding ?? 'Windows-1252'));
+            throw new InvalidArgumentException(\sprintf('Invalid "%s" string.', $fromEncoding ?? 'Windows-1252'));
         }
 
         $u->string = mb_convert_encoding($this->string, 'UTF-8', $fromEncoding ?? 'Windows-1252');
diff --git a/symfony/string/Inflector/EnglishInflector.php b/symfony/string/Inflector/EnglishInflector.php
index a5be28d66..558366996 100644
--- a/symfony/string/Inflector/EnglishInflector.php
+++ b/symfony/string/Inflector/EnglishInflector.php
@@ -25,9 +25,22 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: singular suffix, normal
 
+        // insignias (insigne), insignia (insigne)
+        ['saingisni', 9, true, true, 'insigne'],
+        ['aingisni', 8, true, true, 'insigne'],
+
+        // passersby (passerby)
+        ['ybsressap', 9, true, true, 'passerby'],
+
+        // nodes (node)
+        ['sedon', 5, true, true, 'node'],
+
         // bacteria (bacterium)
         ['airetcab', 8, true, true, 'bacterium'],
 
+        // issues (issue)
+        ['seussi', 6, true, true, 'issue'],
+
         // corpora (corpus)
         ['aroproc', 7, true, true, 'corpus'],
 
@@ -166,6 +179,9 @@ final class EnglishInflector implements InflectorInterface
         // edges (edge)
         ['segd', 4, true, true, 'dge'],
 
+        // outages (outage) - specific fix to avoid 'outag'
+        ['segatuo', 7, true, true, 'outage'],
+
         // roses (rose), garages (garage), cassettes (cassette),
         // waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
         // shoes (shoe)
@@ -196,6 +212,15 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: plural suffix, normal
 
+        // passerby (passersby)
+        ['ybressap', 8, true, true, 'passersby'],
+
+        // insigne (insignia, insignias)
+        ['engisni', 7, true, true, ['insignia', 'insignias']],
+
+        // nodes (node)
+        ['edon', 4, true, true, 'nodes'],
+
         // axes (axis)
         ['sixa', 4, false, false, 'axes'],
 
@@ -333,6 +358,9 @@ final class EnglishInflector implements InflectorInterface
         // conspectuses (conspectus), prospectuses (prospectus)
         ['sutcep', 6, true, true, 'pectuses'],
 
+        // nexuses (nexus)
+        ['suxen', 5, false, false, 'nexuses'],
+
         // fungi (fungus), alumni (alumnus), syllabi (syllabus), radii (radius)
         ['su', 2, true, true, 'i'],
 
diff --git a/symfony/string/Inflector/SpanishInflector.php b/symfony/string/Inflector/SpanishInflector.php
new file mode 100644
index 000000000..4b98cb627
--- /dev/null
+++ b/symfony/string/Inflector/SpanishInflector.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\String\Inflector;
+
+final class SpanishInflector implements InflectorInterface
+{
+    /**
+     * A list of all rules for pluralise.
+     *
+     * @see https://www.spanishdict.com/guide/spanish-plural-noun-forms
+     * @see https://www.rae.es/gram%C3%A1tica/morfolog%C3%ADa/la-formaci%C3%B3n-del-plural-plurales-en-s-y-plurales-en-es-reglas-generales
+     */
+    // First entry: regex
+    // Second entry: replacement
+    private const PLURALIZE_REGEXP = [
+        // Specials sí, no
+        ['/(sí|no)$/i', '\1es'],
+
+        // Words ending with vowel must use -s (RAE 3.2a, 3.2c)
+        ['/(a|e|i|o|u|á|é|í|ó|ú)$/i', '\1s'],
+
+        // Word ending in s or x and the previous letter is accented (RAE 3.2n)
+        ['/ás$/i', 'ases'],
+        ['/és$/i', 'eses'],
+        ['/ís$/i', 'ises'],
+        ['/ós$/i', 'oses'],
+        ['/ús$/i', 'uses'],
+
+        // Words ending in -ión must changed to -iones
+        ['/ión$/i', '\1iones'],
+
+        // Words ending in some consonants must use -es (RAE 3.2k)
+        ['/(l|r|n|d|j|s|x|ch|y)$/i', '\1es'],
+
+        // Word ending in z, must changed to ces
+        ['/(z)$/i', 'ces'],
+    ];
+
+    /**
+     * A list of all rules for singularize.
+     */
+    private const SINGULARIZE_REGEXP = [
+        // Specials sí, no
+        ['/(sí|no)es$/i', '\1'],
+
+        // Words ending in -ión must changed to -iones
+        ['/iones$/i', '\1ión'],
+
+        // Word ending in z, must changed to ces
+        ['/ces$/i', 'z'],
+
+        // Word ending in s or x and the previous letter is accented (RAE 3.2n)
+        ['/(\w)ases$/i', '\1ás'],
+        ['/eses$/i', 'és'],
+        ['/ises$/i', 'ís'],
+        ['/(\w{2,})oses$/i', '\1ós'],
+        ['/(\w)uses$/i', '\1ús'],
+
+        // Words ending in some consonants and -es, must be the consonants
+        ['/(l|r|n|d|j|s|x|ch|y)e?s$/i', '\1'],
+
+        // Words ended with vowel and s, must be vowel
+        ['/(a|e|i|o|u|á|é|ó|í|ú)s$/i', '\1'],
+    ];
+
+    private const UNINFLECTED_RULES = [
+        // Words ending with pies (RAE 3.2n)
+        '/.*(piés)$/i',
+    ];
+
+    private const UNINFLECTED = '/^(lunes|martes|miércoles|jueves|viernes|análisis|torax|yo|pies)$/i';
+
+    public function singularize(string $plural): array
+    {
+        if ($this->isInflectedWord($plural)) {
+            return [$plural];
+        }
+
+        foreach (self::SINGULARIZE_REGEXP as $rule) {
+            [$regexp, $replace] = $rule;
+
+            if (1 === preg_match($regexp, $plural)) {
+                return [preg_replace($regexp, $replace, $plural)];
+            }
+        }
+
+        return [$plural];
+    }
+
+    public function pluralize(string $singular): array
+    {
+        if ($this->isInflectedWord($singular)) {
+            return [$singular];
+        }
+
+        foreach (self::PLURALIZE_REGEXP as $rule) {
+            [$regexp, $replace] = $rule;
+
+            if (1 === preg_match($regexp, $singular)) {
+                return [preg_replace($regexp, $replace, $singular)];
+            }
+        }
+
+        return [$singular.'s'];
+    }
+
+    private function isInflectedWord(string $word): bool
+    {
+        foreach (self::UNINFLECTED_RULES as $rule) {
+            if (1 === preg_match($rule, $word)) {
+                return true;
+            }
+        }
+
+        return 1 === preg_match(self::UNINFLECTED, $word);
+    }
+}
diff --git a/symfony/string/LazyString.php b/symfony/string/LazyString.php
index 3d893ef9e..c7a354c09 100644
--- a/symfony/string/LazyString.php
+++ b/symfony/string/LazyString.php
@@ -26,7 +26,7 @@ class LazyString implements \Stringable, \JsonSerializable
     public static function fromCallable(callable|array $callback, mixed ...$arguments): static
     {
         if (\is_array($callback) && !\is_callable($callback) && !(($callback[0] ?? null) instanceof \Closure || 2 < \count($callback))) {
-            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a callable or a [Closure, method] lazy-callable, "%s" given.', __METHOD__, '['.implode(', ', array_map('get_debug_type', $callback)).']'));
+            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be a callable or a [Closure, method] lazy-callable, "%s" given.', __METHOD__, '['.implode(', ', array_map('get_debug_type', $callback)).']'));
         }
 
         $lazyString = new static();
@@ -94,15 +94,44 @@ public function __toString(): string
                 $r = new \ReflectionFunction($this->value);
                 $callback = $r->getStaticVariables()['callback'];
 
-                $e = new \TypeError(sprintf('Return value of %s() passed to %s::fromCallable() must be of the type string, %s returned.', $callback, static::class, $type));
+                $e = new \TypeError(\sprintf('Return value of %s() passed to %s::fromCallable() must be of the type string, %s returned.', $callback, static::class, $type));
             }
 
             throw $e;
         }
     }
 
+    public function __serialize(): array
+    {
+        if (self::class === (new \ReflectionMethod($this, '__sleep'))->class || self::class !== (new \ReflectionMethod($this, '__serialize'))->class) {
+            $this->__toString();
+
+            return ['value' => $this->value];
+        }
+
+        trigger_deprecation('symfony/string', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
+
+        $data = [];
+        foreach ($this->__sleep() as $key) {
+            try {
+                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
+                    $data[$key] = $r->getValue($this);
+                }
+            } catch (\ReflectionException) {
+                $data[$key] = $this->$key;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @deprecated since Symfony 7.4, will be replaced by `__serialize()` in 8.0
+     */
     public function __sleep(): array
     {
+        trigger_deprecation('symfony/string', '7.4', 'Calling "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
+
         $this->__toString();
 
         return ['value'];
@@ -129,7 +158,7 @@ private static function getPrettyName(callable $callback): string
         } elseif ($callback instanceof \Closure) {
             $r = new \ReflectionFunction($callback);
 
-            if (str_contains($r->name, '{closure') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            if ($r->isAnonymous() || !$class = $r->getClosureCalledClass()) {
                 return $r->name;
             }
 
diff --git a/symfony/string/Resources/data/wcswidth_table_wide.php b/symfony/string/Resources/data/wcswidth_table_wide.php
index 6a7509421..b2c94c36d 100644
--- a/symfony/string/Resources/data/wcswidth_table_wide.php
+++ b/symfony/string/Resources/data/wcswidth_table_wide.php
@@ -1,10 +1,17 @@
 <?php
 
 /*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
  * Unicode version: 16.0.0
  * Date: 2024-09-11T08:21:22+00:00
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 return [
diff --git a/symfony/string/Resources/data/wcswidth_table_zero.php b/symfony/string/Resources/data/wcswidth_table_zero.php
index fdd7f3c7e..287c36c64 100644
--- a/symfony/string/Resources/data/wcswidth_table_zero.php
+++ b/symfony/string/Resources/data/wcswidth_table_zero.php
@@ -1,10 +1,17 @@
 <?php
 
 /*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
  * Unicode version: 16.0.0
  * Date: 2024-09-11T08:21:22+00:00
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 return [
diff --git a/symfony/string/Slugger/AsciiSlugger.php b/symfony/string/Slugger/AsciiSlugger.php
index a9693d494..f5967e47c 100644
--- a/symfony/string/Slugger/AsciiSlugger.php
+++ b/symfony/string/Slugger/AsciiSlugger.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\String\Slugger;
 
-use Symfony\Component\Intl\Transliterator\EmojiTransliterator;
+use Symfony\Component\Emoji\EmojiTransliterator;
 use Symfony\Component\String\AbstractUnicodeString;
 use Symfony\Component\String\UnicodeString;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
@@ -55,7 +55,6 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
         'zh' => 'Han-Latin',
     ];
 
-    private ?string $defaultLocale;
     private \Closure|array $symbolsMap = [
         'en' => ['@' => 'at', '&' => 'and'],
     ];
@@ -68,16 +67,14 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
      */
     private array $transliterators = [];
 
-    public function __construct(?string $defaultLocale = null, array|\Closure|null $symbolsMap = null)
-    {
-        $this->defaultLocale = $defaultLocale;
+    public function __construct(
+        private ?string $defaultLocale = null,
+        array|\Closure|null $symbolsMap = null,
+    ) {
         $this->symbolsMap = $symbolsMap ?? $this->symbolsMap;
     }
 
-    /**
-     * @return void
-     */
-    public function setLocale(string $locale)
+    public function setLocale(string $locale): void
     {
         $this->defaultLocale = $locale;
     }
@@ -95,7 +92,7 @@ public function getLocale(): string
     public function withEmoji(bool|string $emoji = true): static
     {
         if (false !== $emoji && !class_exists(EmojiTransliterator::class)) {
-            throw new \LogicException(sprintf('You cannot use the "%s()" method as the "symfony/intl" package is not installed. Try running "composer require symfony/intl".', __METHOD__));
+            throw new \LogicException(\sprintf('You cannot use the "%s()" method as the "symfony/emoji" package is not installed. Try running "composer require symfony/emoji".', __METHOD__));
         }
 
         $new = clone $this;
@@ -131,8 +128,8 @@ public function slug(string $string, string $separator = '-', ?string $locale =
 
         if (\is_array($this->symbolsMap)) {
             $map = null;
-            if (isset($this->symbolsMap[$locale])) {
-                $map = $this->symbolsMap[$locale];
+            if (isset($this->symbolsMap[$locale ?? ''])) {
+                $map = $this->symbolsMap[$locale ?? ''];
             } else {
                 $parent = self::getParentLocale($locale);
                 if ($parent && isset($this->symbolsMap[$parent])) {
diff --git a/symfony/string/TruncateMode.php b/symfony/string/TruncateMode.php
new file mode 100644
index 000000000..12568cd5b
--- /dev/null
+++ b/symfony/string/TruncateMode.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\String;
+
+enum TruncateMode
+{
+    /**
+     * Will cut exactly at given length.
+     *
+     * Length: 14
+     * Source: Lorem ipsum dolor sit amet
+     * Output: Lorem ipsum do
+     */
+    case Char;
+
+    /**
+     * Returns the string up to the last complete word containing the specified length.
+     *
+     * Length: 14
+     * Source: Lorem ipsum dolor sit amet
+     * Output: Lorem ipsum
+     */
+    case WordBefore;
+
+    /**
+     * Returns the string up to the complete word after or at the given length.
+     *
+     * Length: 14
+     * Source: Lorem ipsum dolor sit amet
+     * Output: Lorem ipsum dolor
+     */
+    case WordAfter;
+}
diff --git a/symfony/string/UnicodeString.php b/symfony/string/UnicodeString.php
index 75af2da42..b13548cba 100644
--- a/symfony/string/UnicodeString.php
+++ b/symfony/string/UnicodeString.php
@@ -106,11 +106,13 @@ public function endsWith(string|iterable|AbstractString $suffix): bool
             return false;
         }
 
+        $grapheme = grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)) ?: '';
+
         if ($this->ignoreCase) {
-            return 0 === mb_stripos(grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)), $suffix, 0, 'UTF-8');
+            return 0 === mb_stripos($grapheme, $suffix, 0, 'UTF-8');
         }
 
-        return $suffix === grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix));
+        return $suffix === $grapheme;
     }
 
     public function equalsTo(string|iterable|AbstractString $string): bool
@@ -286,7 +288,7 @@ public function splice(string $replacement, int $start = 0, ?int $length = null)
         $str = clone $this;
 
         $start = $start ? \strlen(grapheme_substr($this->string, 0, $start)) : 0;
-        $length = $length ? \strlen(grapheme_substr($this->string, $start, $length ?? 2147483647)) : $length;
+        $length = $length ? \strlen(grapheme_substr($this->string, $start, $length)) : $length;
         $str->string = substr_replace($this->string, $replacement, $start, $length ?? 2147483647);
 
         if (normalizer_is_normalized($str->string)) {
@@ -355,18 +357,99 @@ public function startsWith(string|iterable|AbstractString $prefix): bool
             return false;
         }
 
+        $grapheme = grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES) ?: '';
+
         if ($this->ignoreCase) {
-            return 0 === mb_stripos(grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES), $prefix, 0, 'UTF-8');
+            return 0 === mb_stripos($grapheme, $prefix, 0, 'UTF-8');
+        }
+
+        return $prefix === $grapheme;
+    }
+
+    public function trimPrefix($prefix): static
+    {
+        if (\is_array($prefix) || $prefix instanceof \Traversable) {
+            return parent::trimPrefix($prefix);
+        }
+
+        if ($prefix instanceof AbstractString) {
+            $prefix = $prefix->string;
+        } else {
+            $prefix = (string) $prefix;
+        }
+
+        if (!normalizer_is_normalized($prefix, \Normalizer::NFC)) {
+            $prefix = normalizer_normalize($prefix, \Normalizer::NFC);
+        }
+
+        return parent::trimPrefix($prefix);
+    }
+
+    public function trimSuffix($suffix): static
+    {
+        if (\is_array($suffix) || $suffix instanceof \Traversable) {
+            return parent::trimSuffix($suffix);
+        }
+
+        if ($suffix instanceof AbstractString) {
+            $suffix = $suffix->string;
+        } else {
+            $suffix = (string) $suffix;
+        }
+
+        if (!normalizer_is_normalized($suffix, \Normalizer::NFC)) {
+            $suffix = normalizer_normalize($suffix, \Normalizer::NFC);
+        }
+
+        return parent::trimSuffix($suffix);
+    }
+
+    public function __unserialize(array $data): void
+    {
+        if ($wakeup = self::class !== (new \ReflectionMethod($this, '__wakeup'))->class && self::class === (new \ReflectionMethod($this, '__unserialize'))->class) {
+            trigger_deprecation('symfony/string', '7.4', 'Implementing "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
         }
 
-        return $prefix === grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES);
+        try {
+            if (\in_array(array_keys($data), [['string'], ["\0*\0string"]], true)) {
+                $this->string = $data['string'] ?? $data["\0*\0string"];
+
+                if ($wakeup) {
+                    $this->__wakeup();
+                }
+
+                return;
+            }
+
+            trigger_deprecation('symfony/string', '7.4', 'Passing more than just key "string" to "%s::__unserialize()" is deprecated, populate properties in "%s::__unserialize()" instead.', self::class, get_debug_type($this));
+
+            \Closure::bind(function ($data) use ($wakeup) {
+                foreach ($data as $key => $value) {
+                    $this->{("\0" === $key[0] ?? '') ? substr($key, 1 + strrpos($key, "\0")) : $key} = $value;
+                }
+
+                if ($wakeup) {
+                    $this->__wakeup();
+                }
+            }, $this, static::class)($data);
+        } finally {
+            if (!$wakeup) {
+                if (!\is_string($this->string)) {
+                    throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+                }
+
+                normalizer_is_normalized($this->string) ?: $this->string = normalizer_normalize($this->string);
+            }
+        }
     }
 
     /**
-     * @return void
+     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
      */
-    public function __wakeup()
+    public function __wakeup(): void
     {
+        trigger_deprecation('symfony/string', '7.4', 'Calling "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
+
         if (!\is_string($this->string)) {
             throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
         }
diff --git a/symfony/type-info/Exception/ExceptionInterface.php b/symfony/type-info/Exception/ExceptionInterface.php
new file mode 100644
index 000000000..fee0c3bd9
--- /dev/null
+++ b/symfony/type-info/Exception/ExceptionInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Exception;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/symfony/type-info/Exception/InvalidArgumentException.php b/symfony/type-info/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..8baae8291
--- /dev/null
+++ b/symfony/type-info/Exception/InvalidArgumentException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Exception;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/symfony/type-info/Exception/LogicException.php b/symfony/type-info/Exception/LogicException.php
new file mode 100644
index 000000000..06be3c9eb
--- /dev/null
+++ b/symfony/type-info/Exception/LogicException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Exception;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/symfony/type-info/Exception/RuntimeException.php b/symfony/type-info/Exception/RuntimeException.php
new file mode 100644
index 000000000..143e18ef4
--- /dev/null
+++ b/symfony/type-info/Exception/RuntimeException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Exception;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/symfony/type-info/Exception/UnsupportedException.php b/symfony/type-info/Exception/UnsupportedException.php
new file mode 100644
index 000000000..1b7e1ee93
--- /dev/null
+++ b/symfony/type-info/Exception/UnsupportedException.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Exception;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class UnsupportedException extends \LogicException implements ExceptionInterface
+{
+    public function __construct(
+        string $message,
+        public readonly mixed $subject,
+        int $code = 0,
+        ?\Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/symfony/type-info/LICENSE b/symfony/type-info/LICENSE
new file mode 100644
index 000000000..e374a5c83
--- /dev/null
+++ b/symfony/type-info/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2024-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/symfony/type-info/Type.php b/symfony/type-info/Type.php
new file mode 100644
index 000000000..43f1771cc
--- /dev/null
+++ b/symfony/type-info/Type.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo;
+
+use Symfony\Component\TypeInfo\Type\CompositeTypeInterface;
+use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+abstract class Type implements \Stringable
+{
+    use TypeFactoryTrait;
+
+    /**
+     * Tells if the type is satisfied by the $specification callable.
+     *
+     * @param callable(self): bool $specification
+     */
+    public function isSatisfiedBy(callable $specification): bool
+    {
+        if ($this instanceof WrappingTypeInterface && $this->wrappedTypeIsSatisfiedBy($specification)) {
+            return true;
+        }
+
+        if ($this instanceof CompositeTypeInterface && $this->composedTypesAreSatisfiedBy($specification)) {
+            return true;
+        }
+
+        return $specification($this);
+    }
+
+    /**
+     * Tells if the type (or one of its wrapped/composed parts) is identified by one of the $identifiers.
+     */
+    public function isIdentifiedBy(TypeIdentifier|string ...$identifiers): bool
+    {
+        $specification = static fn (Type $type): bool => $type->isIdentifiedBy(...$identifiers);
+
+        if ($this instanceof WrappingTypeInterface && $this->wrappedTypeIsSatisfiedBy($specification)) {
+            return true;
+        }
+
+        if ($this instanceof CompositeTypeInterface && $this->composedTypesAreSatisfiedBy($specification)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function isNullable(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Tells if the type (or one of its wrapped/composed parts) accepts the given $value.
+     */
+    public function accepts(mixed $value): bool
+    {
+        $specification = static function (Type $type) use (&$specification, $value): bool {
+            if ($type instanceof WrappingTypeInterface) {
+                return $type->wrappedTypeIsSatisfiedBy($specification);
+            }
+
+            if ($type instanceof CompositeTypeInterface) {
+                return $type->composedTypesAreSatisfiedBy($specification);
+            }
+
+            return $type->accepts($value);
+        };
+
+        return $this->isSatisfiedBy($specification);
+    }
+
+    /**
+     * Traverses the whole type tree.
+     *
+     * @return iterable<self>
+     */
+    public function traverse(bool $traverseComposite = true, bool $traverseWrapped = true): iterable
+    {
+        yield $this;
+
+        if ($this instanceof CompositeTypeInterface && $traverseComposite) {
+            foreach ($this->getTypes() as $type) {
+                yield $type;
+            }
+
+            // prevent yielding twice when having a type that is both composite and wrapped
+            return;
+        }
+
+        if ($this instanceof WrappingTypeInterface && $traverseWrapped) {
+            yield $this->getWrappedType();
+        }
+    }
+}
diff --git a/symfony/type-info/Type/ArrayShapeType.php b/symfony/type-info/Type/ArrayShapeType.php
new file mode 100644
index 000000000..3dfae4996
--- /dev/null
+++ b/symfony/type-info/Type/ArrayShapeType.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Represents the exact shape of an array.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @extends CollectionType<GenericType<BuiltinType<TypeIdentifier::ARRAY>>>
+ */
+final class ArrayShapeType extends CollectionType
+{
+    /**
+     * @var array<array{type: Type, optional: bool}>
+     */
+    private readonly array $shape;
+
+    /**
+     * @param array<array{type: Type, optional: bool}> $shape
+     */
+    public function __construct(
+        array $shape,
+        private readonly ?Type $extraKeyType = null,
+        private readonly ?Type $extraValueType = null,
+    ) {
+        $keyTypes = [];
+        $valueTypes = [];
+
+        foreach ($shape as $k => $v) {
+            $keyTypes[] = \is_int($k) ? Type::int() : Type::string();
+            $valueTypes[] = $v['type'];
+        }
+
+        if ($keyTypes) {
+            $keyTypes = array_values(array_unique($keyTypes));
+            $keyType = \count($keyTypes) > 1 ? self::union(...$keyTypes) : $keyTypes[0];
+        } else {
+            $keyType = Type::arrayKey();
+        }
+
+        $valueType = $valueTypes ? CollectionType::mergeCollectionValueTypes($valueTypes) : Type::mixed();
+
+        parent::__construct(self::generic(self::builtin(TypeIdentifier::ARRAY), $keyType, $valueType));
+
+        $sortedShape = $shape;
+        ksort($sortedShape);
+
+        $this->shape = $sortedShape;
+
+        if ($this->extraKeyType xor $this->extraValueType) {
+            throw new InvalidArgumentException(\sprintf('You must provide a value for "$%s" when "$%s" is provided.', $this->extraKeyType ? 'extraValueType' : 'extraKeyType', $this->extraKeyType ? 'extraKeyType' : 'extraValueType'));
+        }
+
+        if ($extraKeyType && !$extraKeyType->isIdentifiedBy(TypeIdentifier::INT, TypeIdentifier::STRING)) {
+            throw new InvalidArgumentException(\sprintf('"%s" is not a valid array key type.', (string) $extraKeyType));
+        }
+    }
+
+    /**
+     * @return array<array{type: Type, optional: bool}>
+     */
+    public function getShape(): array
+    {
+        return $this->shape;
+    }
+
+    public function isSealed(): bool
+    {
+        return null === $this->extraValueType;
+    }
+
+    public function getExtraKeyType(): ?Type
+    {
+        return $this->extraKeyType;
+    }
+
+    public function getExtraValueType(): ?Type
+    {
+        return $this->extraKeyType;
+    }
+
+    public function accepts(mixed $value): bool
+    {
+        if (!\is_array($value)) {
+            return false;
+        }
+
+        foreach ($this->shape as $key => $shapeValue) {
+            if (!($shapeValue['optional'] ?? false) && !\array_key_exists($key, $value)) {
+                return false;
+            }
+        }
+
+        foreach ($value as $key => $itemValue) {
+            $valueType = $this->shape[$key]['type'] ?? false;
+
+            if ($valueType && !$valueType->accepts($itemValue)) {
+                return false;
+            }
+
+            if (!$valueType && ($this->isSealed() || !$this->extraKeyType->accepts($key) || !$this->extraValueType->accepts($itemValue))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function __toString(): string
+    {
+        $items = [];
+
+        foreach ($this->shape as $key => $value) {
+            $itemKey = \is_int($key) ? (string) $key : \sprintf("'%s'", $key);
+            if ($value['optional'] ?? false) {
+                $itemKey = \sprintf('%s?', $itemKey);
+            }
+
+            $items[] = \sprintf('%s: %s', $itemKey, $value['type']);
+        }
+
+        if (!$this->isSealed()) {
+            $items[] = $this->extraKeyType->isIdentifiedBy(TypeIdentifier::INT) && $this->extraKeyType->isIdentifiedBy(TypeIdentifier::STRING) && $this->extraValueType->isIdentifiedBy(TypeIdentifier::MIXED)
+                ? '...'
+                : \sprintf('...<%s, %s>', $this->extraKeyType, $this->extraValueType);
+        }
+
+        return \sprintf('array{%s}', implode(', ', $items));
+    }
+}
diff --git a/symfony/type-info/Type/BackedEnumType.php b/symfony/type-info/Type/BackedEnumType.php
new file mode 100644
index 000000000..69f87aa11
--- /dev/null
+++ b/symfony/type-info/Type/BackedEnumType.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of class-string<\BackedEnum>
+ * @template U of BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>
+ *
+ * @extends EnumType<T>
+ */
+final class BackedEnumType extends EnumType
+{
+    /**
+     * @param T $className
+     * @param U $backingType
+     */
+    public function __construct(
+        string $className,
+        private readonly BuiltinType $backingType,
+    ) {
+        if (TypeIdentifier::INT !== $backingType->getTypeIdentifier() && TypeIdentifier::STRING !== $backingType->getTypeIdentifier()) {
+            throw new InvalidArgumentException(\sprintf('Cannot create "%s" with "%s" backing type.', self::class, $backingType));
+        }
+
+        parent::__construct($className);
+    }
+
+    /**
+     * @return U
+     */
+    public function getBackingType(): BuiltinType
+    {
+        return $this->backingType;
+    }
+}
diff --git a/symfony/type-info/Type/BuiltinType.php b/symfony/type-info/Type/BuiltinType.php
new file mode 100644
index 000000000..d4e77c29a
--- /dev/null
+++ b/symfony/type-info/Type/BuiltinType.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of TypeIdentifier
+ */
+final class BuiltinType extends Type
+{
+    /**
+     * @param T $typeIdentifier
+     */
+    public function __construct(
+        private readonly TypeIdentifier $typeIdentifier,
+    ) {
+    }
+
+    /**
+     * @return T
+     */
+    public function getTypeIdentifier(): TypeIdentifier
+    {
+        return $this->typeIdentifier;
+    }
+
+    public function isIdentifiedBy(TypeIdentifier|string ...$identifiers): bool
+    {
+        foreach ($identifiers as $identifier) {
+            if ($identifier === $this->typeIdentifier || $identifier === $this->typeIdentifier->value) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function isNullable(): bool
+    {
+        return \in_array($this->typeIdentifier, [TypeIdentifier::NULL, TypeIdentifier::MIXED], true);
+    }
+
+    public function accepts(mixed $value): bool
+    {
+        return match ($this->typeIdentifier) {
+            TypeIdentifier::ARRAY => \is_array($value),
+            TypeIdentifier::BOOL => \is_bool($value),
+            TypeIdentifier::CALLABLE => \is_callable($value),
+            TypeIdentifier::FALSE => false === $value,
+            TypeIdentifier::FLOAT => \is_float($value),
+            TypeIdentifier::INT => \is_int($value),
+            TypeIdentifier::ITERABLE => is_iterable($value),
+            TypeIdentifier::MIXED => true,
+            TypeIdentifier::NULL => null === $value,
+            TypeIdentifier::OBJECT => \is_object($value),
+            TypeIdentifier::RESOURCE => \is_resource($value),
+            TypeIdentifier::STRING => \is_string($value),
+            TypeIdentifier::TRUE => true === $value,
+            default => false,
+        };
+    }
+
+    public function __toString(): string
+    {
+        return $this->typeIdentifier->value;
+    }
+}
diff --git a/symfony/type-info/Type/CollectionType.php b/symfony/type-info/Type/CollectionType.php
new file mode 100644
index 000000000..035631569
--- /dev/null
+++ b/symfony/type-info/Type/CollectionType.php
@@ -0,0 +1,198 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Represents a key/value collection type.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of BuiltinType<TypeIdentifier::ARRAY>|BuiltinType<TypeIdentifier::ITERABLE>|ObjectType|GenericType
+ *
+ * @implements WrappingTypeInterface<T>
+ */
+class CollectionType extends Type implements WrappingTypeInterface
+{
+    /**
+     * @param T $type
+     */
+    public function __construct(
+        private readonly BuiltinType|ObjectType|GenericType $type,
+        private readonly bool $isList = false,
+    ) {
+        if ($type instanceof BuiltinType && TypeIdentifier::ARRAY !== $type->getTypeIdentifier() && TypeIdentifier::ITERABLE !== $type->getTypeIdentifier()) {
+            throw new InvalidArgumentException(\sprintf('Cannot create "%s" with "%s" type.', self::class, $type));
+        }
+
+        if ($this->isList()) {
+            if (!$type->isIdentifiedBy(TypeIdentifier::ARRAY)) {
+                trigger_deprecation('symfony/type-info', '7.3', 'Creating a "%s" that is a list and not an array is deprecated and will throw a "%s" in 8.0.', self::class, InvalidArgumentException::class);
+                // throw new InvalidArgumentException(\sprintf('Cannot create a "%s" as list when type is not "array".', self::class));
+            }
+
+            $keyType = $this->getCollectionKeyType();
+
+            if (!$keyType instanceof BuiltinType || TypeIdentifier::INT !== $keyType->getTypeIdentifier()) {
+                throw new InvalidArgumentException(\sprintf('"%s" is not a valid list key type.', (string) $keyType));
+            }
+        } elseif ($type instanceof GenericType && $type->getWrappedType() instanceof BuiltinType && TypeIdentifier::ARRAY === $type->getWrappedType()->getTypeIdentifier()) {
+            $keyType = $this->getCollectionKeyType();
+
+            $keyTypes = $keyType instanceof UnionType ? $keyType->getTypes() : [$keyType];
+
+            foreach ($keyTypes as $type) {
+                if (!$type instanceof BuiltinType || !\in_array($type->getTypeIdentifier(), [TypeIdentifier::INT, TypeIdentifier::STRING], true)) {
+                    throw new InvalidArgumentException(\sprintf('"%s" is not a valid array key type.', (string) $keyType));
+                }
+            }
+        }
+    }
+
+    /**
+     * @param array<Type> $types
+     */
+    public static function mergeCollectionValueTypes(array $types): Type
+    {
+        if (!$types) {
+            throw new InvalidArgumentException('The $types cannot be empty.');
+        }
+
+        $normalizedTypes = [];
+        $boolTypes = [];
+        $objectTypes = [];
+
+        foreach ($types as $type) {
+            foreach (($type instanceof UnionType ? $type->getTypes() : [$type]) as $t) {
+                // cannot create an union with a standalone type
+                if ($t->isIdentifiedBy(TypeIdentifier::MIXED)) {
+                    return Type::mixed();
+                }
+
+                if ($t->isIdentifiedBy(TypeIdentifier::TRUE, TypeIdentifier::FALSE, TypeIdentifier::BOOL)) {
+                    $boolTypes[] = $t;
+
+                    continue;
+                }
+
+                if ($t->isIdentifiedBy(TypeIdentifier::OBJECT)) {
+                    $objectTypes[] = $t;
+
+                    continue;
+                }
+
+                $normalizedTypes[] = $t;
+            }
+        }
+
+        $boolTypes = array_unique($boolTypes);
+        $objectTypes = array_unique($objectTypes);
+
+        // cannot create an union with either "true" and "false", "bool" must be used instead
+        if ($boolTypes) {
+            $normalizedTypes[] = \count($boolTypes) > 1 ? Type::bool() : $boolTypes[0];
+        }
+
+        // cannot create a union with either "object" and a class name, "object" must be used instead
+        if ($objectTypes) {
+            $hasBuiltinObjectType = array_filter($objectTypes, static fn (Type $t): bool => $t->isSatisfiedBy(static fn (Type $t): bool => $t instanceof BuiltinType));
+            $normalizedTypes = [...$normalizedTypes, ...($hasBuiltinObjectType ? [Type::object()] : $objectTypes)];
+        }
+
+        $normalizedTypes = array_values(array_unique($normalizedTypes));
+
+        return \count($normalizedTypes) > 1 ? self::union(...$normalizedTypes) : $normalizedTypes[0];
+    }
+
+    public function getWrappedType(): Type
+    {
+        return $this->type;
+    }
+
+    public function isList(): bool
+    {
+        return $this->isList;
+    }
+
+    public function getCollectionKeyType(): Type
+    {
+        $defaultCollectionKeyType = self::arrayKey();
+
+        if ($this->type instanceof GenericType) {
+            return match (\count($this->type->getVariableTypes())) {
+                2 => $this->type->getVariableTypes()[0],
+                1 => self::int(),
+                default => $defaultCollectionKeyType,
+            };
+        }
+
+        return $defaultCollectionKeyType;
+    }
+
+    public function getCollectionValueType(): Type
+    {
+        $defaultCollectionValueType = self::mixed();
+
+        if ($this->type instanceof GenericType) {
+            return match (\count($this->type->getVariableTypes())) {
+                2 => $this->type->getVariableTypes()[1],
+                1 => $this->type->getVariableTypes()[0],
+                default => $defaultCollectionValueType,
+            };
+        }
+
+        return $defaultCollectionValueType;
+    }
+
+    public function wrappedTypeIsSatisfiedBy(callable $specification): bool
+    {
+        return $this->getWrappedType()->isSatisfiedBy($specification);
+    }
+
+    public function accepts(mixed $value): bool
+    {
+        if (!parent::accepts($value)) {
+            return false;
+        }
+
+        if ($this->isList() && (!\is_array($value) || !array_is_list($value))) {
+            return false;
+        }
+
+        $keyType = $this->getCollectionKeyType();
+        $valueType = $this->getCollectionValueType();
+
+        if (is_iterable($value)) {
+            foreach ($value as $k => $v) {
+                // key or value do not match
+                if (!$keyType->accepts($k) || !$valueType->accepts($v)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->isList && $this->type->isIdentifiedBy(TypeIdentifier::ARRAY)) {
+            return 'list<'.$this->getCollectionValueType().'>';
+        }
+
+        return (string) $this->type;
+    }
+}
diff --git a/symfony/type-info/Type/CompositeTypeInterface.php b/symfony/type-info/Type/CompositeTypeInterface.php
new file mode 100644
index 000000000..8d6c2a3dc
--- /dev/null
+++ b/symfony/type-info/Type/CompositeTypeInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Represents a type composed of several other types.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @template T of Type
+ */
+interface CompositeTypeInterface
+{
+    /**
+     * @return list<T>
+     */
+    public function getTypes(): array;
+
+    /**
+     * @param callable(Type): bool $specification
+     */
+    public function composedTypesAreSatisfiedBy(callable $specification): bool;
+}
diff --git a/symfony/type-info/Type/EnumType.php b/symfony/type-info/Type/EnumType.php
new file mode 100644
index 000000000..95665921d
--- /dev/null
+++ b/symfony/type-info/Type/EnumType.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of class-string<\UnitEnum>
+ *
+ * @extends ObjectType<T>
+ */
+class EnumType extends ObjectType
+{
+}
diff --git a/symfony/type-info/Type/GenericType.php b/symfony/type-info/Type/GenericType.php
new file mode 100644
index 000000000..24ef5b528
--- /dev/null
+++ b/symfony/type-info/Type/GenericType.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Represents a generic type, which is a type that holds variable parts.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of BuiltinType<TypeIdentifier::ARRAY>|BuiltinType<TypeIdentifier::ITERABLE>|ObjectType
+ *
+ * @implements WrappingTypeInterface<T>
+ */
+final class GenericType extends Type implements WrappingTypeInterface
+{
+    /**
+     * @var list<Type>
+     */
+    private readonly array $variableTypes;
+
+    /**
+     * @param T $type
+     */
+    public function __construct(
+        private readonly BuiltinType|ObjectType $type,
+        Type ...$variableTypes,
+    ) {
+        if ($type instanceof BuiltinType && TypeIdentifier::ARRAY !== $type->getTypeIdentifier() && TypeIdentifier::ITERABLE !== $type->getTypeIdentifier()) {
+            throw new InvalidArgumentException(\sprintf('Cannot create "%s" with "%s" type.', self::class, $type));
+        }
+
+        $this->variableTypes = $variableTypes;
+    }
+
+    public function getWrappedType(): Type
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return list<Type>
+     */
+    public function getVariableTypes(): array
+    {
+        return $this->variableTypes;
+    }
+
+    public function wrappedTypeIsSatisfiedBy(callable $specification): bool
+    {
+        return $this->getWrappedType()->isSatisfiedBy($specification);
+    }
+
+    public function __toString(): string
+    {
+        $typeString = (string) $this->type;
+
+        $variableTypesString = '';
+        $glue = '';
+        foreach ($this->variableTypes as $t) {
+            $variableTypesString .= $glue.$t;
+            $glue = ', ';
+        }
+
+        return $typeString.'<'.$variableTypesString.'>';
+    }
+}
diff --git a/symfony/type-info/Type/IntersectionType.php b/symfony/type-info/Type/IntersectionType.php
new file mode 100644
index 000000000..584b72ed8
--- /dev/null
+++ b/symfony/type-info/Type/IntersectionType.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of ObjectType|GenericType<ObjectType>|CollectionType<GenericType<ObjectType>>
+ *
+ * @implements CompositeTypeInterface<T>
+ */
+final class IntersectionType extends Type implements CompositeTypeInterface
+{
+    /**
+     * @var list<T>
+     */
+    private readonly array $types;
+
+    /**
+     * @param list<T> $types
+     */
+    public function __construct(Type ...$types)
+    {
+        if (\count($types) < 2) {
+            throw new InvalidArgumentException(\sprintf('"%s" expects at least 2 types.', self::class));
+        }
+
+        foreach ($types as $type) {
+            if ($type instanceof CompositeTypeInterface || $type instanceof NullableType) {
+                throw new InvalidArgumentException(\sprintf('Cannot set "%s" as a "%s" part.', $type, self::class));
+            }
+
+            while ($type instanceof WrappingTypeInterface) {
+                $type = $type->getWrappedType();
+            }
+
+            if (!$type instanceof ObjectType) {
+                throw new InvalidArgumentException(\sprintf('Cannot set "%s" as a "%s" part.', $type, self::class));
+            }
+        }
+
+        usort($types, fn (Type $a, Type $b): int => (string) $a <=> (string) $b);
+        $this->types = array_values(array_unique($types));
+    }
+
+    /**
+     * @return list<T>
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    public function composedTypesAreSatisfiedBy(callable $specification): bool
+    {
+        foreach ($this->types as $type) {
+            if (!$type->isSatisfiedBy($specification)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function __toString(): string
+    {
+        $string = '';
+        $glue = '';
+
+        foreach ($this->types as $t) {
+            $string .= $glue.($t instanceof CompositeTypeInterface ? '('.$t.')' : $t);
+            $glue = '&';
+        }
+
+        return $string;
+    }
+}
diff --git a/symfony/type-info/Type/NullableType.php b/symfony/type-info/Type/NullableType.php
new file mode 100644
index 000000000..7ba197693
--- /dev/null
+++ b/symfony/type-info/Type/NullableType.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @template T of Type
+ *
+ * @extends UnionType<T|BuiltinType<TypeIdentifier::NULL>>
+ *
+ * @implements WrappingTypeInterface<T>
+ */
+final class NullableType extends UnionType implements WrappingTypeInterface
+{
+    /**
+     * @param T $type
+     */
+    public function __construct(
+        private readonly Type $type,
+    ) {
+        if ($type->isNullable()) {
+            throw new InvalidArgumentException(\sprintf('Cannot create a "%s" with "%s" because it is already nullable.', self::class, $type));
+        }
+
+        if ($type instanceof UnionType) {
+            parent::__construct(Type::null(), ...$type->getTypes());
+
+            return;
+        }
+
+        parent::__construct(Type::null(), $type);
+    }
+
+    public function getWrappedType(): Type
+    {
+        return $this->type;
+    }
+
+    public function wrappedTypeIsSatisfiedBy(callable $specification): bool
+    {
+        return $this->getWrappedType()->isSatisfiedBy($specification);
+    }
+
+    public function isNullable(): bool
+    {
+        return true;
+    }
+
+    public function accepts(mixed $value): bool
+    {
+        return null === $value || parent::accepts($value);
+    }
+}
diff --git a/symfony/type-info/Type/ObjectType.php b/symfony/type-info/Type/ObjectType.php
new file mode 100644
index 000000000..4d2c5c3b5
--- /dev/null
+++ b/symfony/type-info/Type/ObjectType.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of class-string
+ */
+class ObjectType extends Type
+{
+    /**
+     * @param T $className
+     */
+    public function __construct(
+        private readonly string $className,
+    ) {
+    }
+
+    public function getTypeIdentifier(): TypeIdentifier
+    {
+        return TypeIdentifier::OBJECT;
+    }
+
+    /**
+     * @return T
+     */
+    public function getClassName(): string
+    {
+        return $this->className;
+    }
+
+    public function isIdentifiedBy(TypeIdentifier|string ...$identifiers): bool
+    {
+        foreach ($identifiers as $identifier) {
+            if ($identifier instanceof TypeIdentifier) {
+                if (TypeIdentifier::OBJECT === $identifier) {
+                    return true;
+                }
+
+                continue;
+            }
+
+            if (TypeIdentifier::OBJECT->value === $identifier) {
+                return true;
+            }
+
+            if (is_a($this->className, $identifier, allow_string: true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function accepts(mixed $value): bool
+    {
+        return $value instanceof $this->className;
+    }
+
+    public function __toString(): string
+    {
+        return $this->className;
+    }
+}
diff --git a/symfony/type-info/Type/TemplateType.php b/symfony/type-info/Type/TemplateType.php
new file mode 100644
index 000000000..e5f8d5924
--- /dev/null
+++ b/symfony/type-info/Type/TemplateType.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Represents a template placeholder, such as "T" in "Collection<T>".
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of Type
+ *
+ * @implements WrappingTypeInterface<T>
+ */
+final class TemplateType extends Type implements WrappingTypeInterface
+{
+    /**
+     * @param T $bound
+     */
+    public function __construct(
+        private readonly string $name,
+        private readonly Type $bound,
+    ) {
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return T
+     */
+    public function getBound(): Type
+    {
+        return $this->bound;
+    }
+
+    public function getWrappedType(): Type
+    {
+        return $this->bound;
+    }
+
+    public function wrappedTypeIsSatisfiedBy(callable $specification): bool
+    {
+        return $this->getWrappedType()->isSatisfiedBy($specification);
+    }
+
+    public function __toString(): string
+    {
+        return $this->name;
+    }
+}
diff --git a/symfony/type-info/Type/UnionType.php b/symfony/type-info/Type/UnionType.php
new file mode 100644
index 000000000..91597e208
--- /dev/null
+++ b/symfony/type-info/Type/UnionType.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ *
+ * @template T of Type
+ *
+ * @implements CompositeTypeInterface<T>
+ */
+class UnionType extends Type implements CompositeTypeInterface
+{
+    /**
+     * @var list<T>
+     */
+    private readonly array $types;
+
+    /**
+     * @param list<T> $types
+     */
+    public function __construct(Type ...$types)
+    {
+        if (\count($types) < 2) {
+            throw new InvalidArgumentException(\sprintf('"%s" expects at least 2 types.', self::class));
+        }
+
+        foreach ($types as $type) {
+            if ($type instanceof self) {
+                throw new InvalidArgumentException(\sprintf('Cannot set "%s" as a "%1$s" part.', self::class));
+            }
+
+            if ($type instanceof BuiltinType) {
+                if (TypeIdentifier::NULL === $type->getTypeIdentifier() && !is_a(static::class, NullableType::class, allow_string: true)) {
+                    throw new InvalidArgumentException(\sprintf('Cannot create union with "null", please use "%s" instead.', NullableType::class));
+                }
+
+                if ($type->getTypeIdentifier()->isStandalone()) {
+                    throw new InvalidArgumentException(\sprintf('Cannot create union with "%s" standalone type.', $type));
+                }
+            }
+        }
+
+        usort($types, fn (Type $a, Type $b): int => (string) $a <=> (string) $b);
+        $this->types = array_values(array_unique($types));
+
+        $builtinTypesIdentifiers = array_map(
+            fn (BuiltinType $t): TypeIdentifier => $t->getTypeIdentifier(),
+            array_filter($this->types, fn (Type $t): bool => $t instanceof BuiltinType),
+        );
+
+        if ((\in_array(TypeIdentifier::TRUE, $builtinTypesIdentifiers, true) || \in_array(TypeIdentifier::FALSE, $builtinTypesIdentifiers, true)) && \in_array(TypeIdentifier::BOOL, $builtinTypesIdentifiers, true)) {
+            throw new InvalidArgumentException('Cannot create union with redundant boolean type.');
+        }
+
+        if (\in_array(TypeIdentifier::TRUE, $builtinTypesIdentifiers, true) && \in_array(TypeIdentifier::FALSE, $builtinTypesIdentifiers, true)) {
+            throw new InvalidArgumentException('Cannot create union with both "true" and "false", "bool" should be used instead.');
+        }
+
+        if (\in_array(TypeIdentifier::OBJECT, $builtinTypesIdentifiers, true) && \count(array_filter($this->types, fn (Type $t): bool => $t instanceof ObjectType))) {
+            throw new InvalidArgumentException('Cannot create union with both "object" and class type.');
+        }
+    }
+
+    /**
+     * @return list<T>
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    public function composedTypesAreSatisfiedBy(callable $specification): bool
+    {
+        foreach ($this->types as $type) {
+            if ($type->isSatisfiedBy($specification)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function __toString(): string
+    {
+        $string = '';
+        $glue = '';
+
+        foreach ($this->types as $t) {
+            $string .= $glue.($t instanceof CompositeTypeInterface ? '('.$t.')' : $t);
+            $glue = '|';
+        }
+
+        return $string;
+    }
+}
diff --git a/symfony/type-info/Type/WrappingTypeInterface.php b/symfony/type-info/Type/WrappingTypeInterface.php
new file mode 100644
index 000000000..d79e416cb
--- /dev/null
+++ b/symfony/type-info/Type/WrappingTypeInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\Type;
+
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Represents a type wrapping another type.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ *
+ * @template T of Type
+ */
+interface WrappingTypeInterface
+{
+    /**
+     * @return T
+     */
+    public function getWrappedType(): Type;
+
+    /**
+     * @param callable(Type): bool $specification
+     */
+    public function wrappedTypeIsSatisfiedBy(callable $specification): bool;
+}
diff --git a/symfony/type-info/TypeContext/TypeContext.php b/symfony/type-info/TypeContext/TypeContext.php
new file mode 100644
index 000000000..8175fd80f
--- /dev/null
+++ b/symfony/type-info/TypeContext/TypeContext.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeContext;
+
+use Symfony\Component\TypeInfo\Exception\LogicException;
+use Symfony\Component\TypeInfo\Type;
+
+/**
+ * Type resolving context.
+ *
+ * Helps to retrieve declaring class, called class, parent class, templates
+ * and normalize classes according to the current namespace and uses.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class TypeContext
+{
+    /**
+     * @var array<string, bool>
+     */
+    private static array $classExistCache = [];
+
+    /**
+     * @param array<string, string> $uses
+     * @param array<string, Type>   $templates
+     * @param array<string, Type>   $typeAliases
+     */
+    public function __construct(
+        public readonly string $calledClassName,
+        public readonly string $declaringClassName,
+        public readonly ?string $namespace = null,
+        public readonly array $uses = [],
+        public readonly array $templates = [],
+        public readonly array $typeAliases = [],
+    ) {
+    }
+
+    /**
+     * Normalize class name according to current namespace and uses.
+     */
+    public function normalize(string $name): string
+    {
+        if (str_starts_with($name, '\\')) {
+            return ltrim($name, '\\');
+        }
+
+        $nameParts = explode('\\', $name);
+        $firstNamePart = $nameParts[0];
+        if (isset($this->uses[$firstNamePart])) {
+            if (1 === \count($nameParts)) {
+                return $this->uses[$firstNamePart];
+            }
+            array_shift($nameParts);
+
+            return \sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));
+        }
+
+        if (null !== $this->namespace) {
+            return \sprintf('%s\\%s', $this->namespace, $name);
+        }
+
+        return $name;
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getDeclaringClass(): string
+    {
+        return $this->normalize($this->declaringClassName);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getCalledClass(): string
+    {
+        return $this->normalize($this->calledClassName);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getParentClass(): string
+    {
+        $declaringClassName = $this->getDeclaringClass();
+
+        if (false === $parentClass = get_parent_class($declaringClassName)) {
+            throw new LogicException(\sprintf('"%s" do not extend any class.', $declaringClassName));
+        }
+
+        if (!isset(self::$classExistCache[$parentClass])) {
+            self::$classExistCache[$parentClass] = false;
+
+            if (class_exists($parentClass)) {
+                self::$classExistCache[$parentClass] = true;
+            } else {
+                try {
+                    new \ReflectionClass($parentClass);
+                    self::$classExistCache[$parentClass] = true;
+                } catch (\Throwable) {
+                }
+            }
+        }
+
+        return self::$classExistCache[$parentClass] ? $parentClass : $this->normalize(str_replace($this->namespace.'\\', '', $parentClass));
+    }
+}
diff --git a/symfony/type-info/TypeContext/TypeContextFactory.php b/symfony/type-info/TypeContext/TypeContextFactory.php
new file mode 100644
index 000000000..5b4c76825
--- /dev/null
+++ b/symfony/type-info/TypeContext/TypeContextFactory.php
@@ -0,0 +1,334 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeContext;
+
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasImportTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasTagValueNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use Symfony\Component\TypeInfo\Exception\LogicException;
+use Symfony\Component\TypeInfo\Exception\RuntimeException;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\TypeResolver\StringTypeResolver;
+
+/**
+ * Creates a type resolving context.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ * @author Pierre-Yves Landuré <landure@gmail.com>
+ */
+final class TypeContextFactory
+{
+    /**
+     * @var array<class-string, \ReflectionClass>
+     */
+    private static array $reflectionClassCache = [];
+
+    /**
+     * @var array<string,array<string,TypeContext>>
+     */
+    private array $intermediateTypeContextCache = [];
+
+    /**
+     * @var array<string,array<string,TypeContext>>
+     */
+    private array $typeContextCache = [];
+
+    private ?Lexer $phpstanLexer = null;
+    private ?PhpDocParser $phpstanParser = null;
+
+    /**
+     * @param array<string, string> $extraTypeAliases
+     */
+    public function __construct(
+        private readonly ?StringTypeResolver $stringTypeResolver = null,
+        private readonly array $extraTypeAliases = [],
+    ) {
+    }
+
+    public function createFromClassName(string $calledClassName, ?string $declaringClassName = null): TypeContext
+    {
+        $declaringClassName ??= $calledClassName;
+
+        return $this->typeContextCache[$declaringClassName][$calledClassName] ??= $this->createNewInstanceFromClassName($calledClassName, $declaringClassName);
+    }
+
+    public function createFromReflection(\Reflector $reflection): ?TypeContext
+    {
+        $declaringClassReflection = match (true) {
+            $reflection instanceof \ReflectionClass => $reflection,
+            $reflection instanceof \ReflectionMethod => $reflection->getDeclaringClass(),
+            $reflection instanceof \ReflectionProperty => $reflection->getDeclaringClass(),
+            $reflection instanceof \ReflectionParameter => $reflection->getDeclaringClass(),
+            $reflection instanceof \ReflectionFunctionAbstract => $reflection->getClosureScopeClass(),
+            default => null,
+        };
+
+        if (null === $declaringClassReflection) {
+            return null;
+        }
+
+        $typeContext = $this->createIntermediateTypeContext($declaringClassReflection->getShortName(), $declaringClassReflection);
+
+        $templates = match (true) {
+            $reflection instanceof \ReflectionFunctionAbstract => $this->collectTemplates($reflection, $typeContext) + $this->collectTemplates($declaringClassReflection, $typeContext),
+            $reflection instanceof \ReflectionParameter => $this->collectTemplates($reflection->getDeclaringFunction(), $typeContext) + $this->collectTemplates($declaringClassReflection, $typeContext),
+            default => $this->collectTemplates($declaringClassReflection, $typeContext),
+        };
+
+        $typeContext = new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $templates,
+        );
+
+        return new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $typeContext->templates,
+            $this->collectTypeAliases($declaringClassReflection, $typeContext),
+        );
+    }
+
+    private function createNewInstanceFromClassName(string $calledClassName, string $declaringClassName): TypeContext
+    {
+        $calledClassNameReflection = self::$reflectionClassCache[$calledClassName] ??= new \ReflectionClass($calledClassName);
+        $declaringClassReflection = self::$reflectionClassCache[$declaringClassName] ??= new \ReflectionClass($declaringClassName);
+
+        $calledClassTypeContext = $this->createIntermediateTypeContext($calledClassNameReflection->getShortName(), $calledClassNameReflection);
+        $typeContext = $this->createIntermediateTypeContext($calledClassNameReflection->getShortName(), $declaringClassReflection);
+
+        $typeContext = new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $this->collectTemplates($calledClassNameReflection, $calledClassTypeContext) + $this->collectTemplates($declaringClassReflection, $typeContext),
+        );
+
+        return new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $typeContext->templates,
+            $this->collectTypeAliases($declaringClassReflection, $typeContext),
+        );
+    }
+
+    private function createIntermediateTypeContext(string $calledClassShortName, \ReflectionClass $declaringClassReflection): TypeContext
+    {
+        $declaringClassName = $declaringClassReflection->getName();
+
+        return $this->intermediateTypeContextCache[$declaringClassName][$calledClassShortName] ??= new TypeContext(
+            $calledClassShortName,
+            $declaringClassReflection->getShortName(),
+            trim($declaringClassReflection->getNamespaceName(), '\\'),
+            $this->collectUses($declaringClassReflection),
+        );
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function collectUses(\ReflectionClass $reflection): array
+    {
+        $fileName = $reflection->getFileName();
+        if (!\is_string($fileName) || !is_file($fileName)) {
+            return [];
+        }
+
+        if (false === $lines = @file($fileName, \FILE_IGNORE_NEW_LINES | \FILE_SKIP_EMPTY_LINES)) {
+            throw new RuntimeException(\sprintf('Unable to read file "%s".', $fileName));
+        }
+
+        $uses = [];
+        $inUseSection = false;
+
+        foreach ($lines as $line) {
+            if (str_starts_with($line, 'use ')) {
+                $inUseSection = true;
+                $use = explode(' as ', substr($line, 4, -1), 2);
+
+                $alias = 1 === \count($use) ? substr($use[0], false !== ($p = strrpos($use[0], '\\')) ? 1 + $p : 0) : $use[1];
+                $uses[$alias] = $use[0];
+            } elseif ($inUseSection) {
+                break;
+            }
+        }
+
+        $traitUses = [];
+        foreach ($reflection->getTraits() as $traitReflection) {
+            $traitUses[] = $this->collectUses($traitReflection);
+        }
+
+        return array_merge($uses, ...$traitUses);
+    }
+
+    /**
+     * @return array<string, Type>
+     */
+    private function collectTemplates(\ReflectionClass|\ReflectionFunctionAbstract $reflection, TypeContext $typeContext): array
+    {
+        if (!$this->stringTypeResolver || !class_exists(PhpDocParser::class)) {
+            return [];
+        }
+
+        if (!$rawDocNode = $reflection->getDocComment()) {
+            return [];
+        }
+
+        $templates = [];
+        foreach ($this->getPhpDocNode($rawDocNode)->getTagsByName('@template') as $tag) {
+            if (!$tag->value instanceof TemplateTagValueNode) {
+                continue;
+            }
+
+            $type = Type::mixed();
+            $typeString = ((string) $tag->value->bound) ?: null;
+
+            try {
+                if (null !== $typeString) {
+                    $type = $this->stringTypeResolver->resolve($typeString, $typeContext);
+                }
+            } catch (UnsupportedException) {
+            }
+
+            $templates[$tag->value->name] = $type;
+        }
+
+        return $templates;
+    }
+
+    /**
+     * @return array<string, Type>
+     */
+    private function collectTypeAliases(\ReflectionClass $reflection, TypeContext $typeContext): array
+    {
+        if (!$this->stringTypeResolver || !class_exists(PhpDocParser::class)) {
+            return [];
+        }
+
+        $extraAliases = array_map($this->stringTypeResolver->resolve(...), $this->extraTypeAliases);
+
+        if (!$rawDocNode = $reflection->getDocComment()) {
+            return $extraAliases;
+        }
+
+        $aliases = [];
+        $resolvedAliases = [];
+
+        foreach ($this->getPhpDocNode($rawDocNode)->getTagsByName('@psalm-import-type') + $this->getPhpDocNode($rawDocNode)->getTagsByName('@phpstan-import-type') as $tag) {
+            if (!$tag->value instanceof TypeAliasImportTagValueNode) {
+                continue;
+            }
+
+            $importedFromType = $this->stringTypeResolver->resolve((string) $tag->value->importedFrom, $typeContext);
+            if (!$importedFromType instanceof ObjectType) {
+                throw new LogicException(\sprintf('Type alias "%s" is not imported from a valid class name.', $tag->value->importedAlias));
+            }
+
+            $importedFromContext = $this->createFromClassName($importedFromType->getClassName());
+
+            $typeAlias = $importedFromContext->typeAliases[$tag->value->importedAlias] ?? null;
+            if (!$typeAlias) {
+                throw new LogicException(\sprintf('Cannot find any "%s" type alias in "%s".', $tag->value->importedAlias, $importedFromType->getClassName()));
+            }
+
+            $resolvedAliases[$tag->value->importedAs ?? $tag->value->importedAlias] = $typeAlias;
+        }
+
+        foreach ($this->getPhpDocNode($rawDocNode)->getTagsByName('@psalm-type') + $this->getPhpDocNode($rawDocNode)->getTagsByName('@phpstan-type') as $tag) {
+            if (!$tag->value instanceof TypeAliasTagValueNode) {
+                continue;
+            }
+
+            $aliases[$tag->value->alias] = (string) $tag->value->type;
+        }
+
+        return $this->resolveTypeAliases($aliases, $resolvedAliases, $typeContext) + $extraAliases;
+    }
+
+    /**
+     * @param array<string, string> $toResolve
+     * @param array<string, Type>   $resolved
+     *
+     * @return array<string, Type>
+     */
+    private function resolveTypeAliases(array $toResolve, array $resolved, TypeContext $typeContext): array
+    {
+        if (!$toResolve) {
+            return $resolved;
+        }
+
+        $typeContext = new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $typeContext->templates,
+            $typeContext->typeAliases + $resolved,
+        );
+
+        $succeeded = false;
+        $lastFailure = null;
+        $lastFailingAlias = null;
+
+        foreach ($toResolve as $alias => $type) {
+            try {
+                $resolved[$alias] = $this->stringTypeResolver->resolve($type, $typeContext);
+                unset($toResolve[$alias]);
+                $succeeded = true;
+            } catch (UnsupportedException $lastFailure) {
+                $lastFailingAlias = $alias;
+            }
+        }
+
+        // nothing has succeeded, the result won't be different from the
+        // previous one, we can stop here.
+        if (!$succeeded) {
+            throw new LogicException(\sprintf('Cannot resolve "%s" type alias.', $lastFailingAlias), 0, $lastFailure);
+        }
+
+        if ($toResolve) {
+            return $this->resolveTypeAliases($toResolve, $resolved, $typeContext);
+        }
+
+        return $resolved;
+    }
+
+    private function getPhpDocNode(string $rawDocNode): PhpDocNode
+    {
+        if (class_exists(ParserConfig::class)) {
+            $this->phpstanLexer ??= new Lexer($config = new ParserConfig([]));
+            $this->phpstanParser ??= new PhpDocParser($config, new TypeParser($config, new ConstExprParser($config)), new ConstExprParser($config));
+        } else {
+            $this->phpstanLexer ??= new Lexer();
+            $this->phpstanParser ??= new PhpDocParser(new TypeParser(new ConstExprParser()), new ConstExprParser());
+        }
+
+        return $this->phpstanParser->parse(new TokenIterator($this->phpstanLexer->tokenize($rawDocNode)));
+    }
+}
diff --git a/symfony/type-info/TypeFactoryTrait.php b/symfony/type-info/TypeFactoryTrait.php
new file mode 100644
index 000000000..ddf4708dd
--- /dev/null
+++ b/symfony/type-info/TypeFactoryTrait.php
@@ -0,0 +1,453 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo;
+
+use Symfony\Component\TypeInfo\Type\ArrayShapeType;
+use Symfony\Component\TypeInfo\Type\BackedEnumType;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\EnumType;
+use Symfony\Component\TypeInfo\Type\GenericType;
+use Symfony\Component\TypeInfo\Type\IntersectionType;
+use Symfony\Component\TypeInfo\Type\NullableType;
+use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\Type\TemplateType;
+use Symfony\Component\TypeInfo\Type\UnionType;
+
+/**
+ * Helper trait to create any type easily.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+trait TypeFactoryTrait
+{
+    /**
+     * @template T of TypeIdentifier
+     * @template U value-of<T>
+     *
+     * @param T|U $identifier
+     *
+     * @return BuiltinType<T>
+     */
+    public static function builtin(TypeIdentifier|string $identifier): BuiltinType
+    {
+        /** @var T $identifier */
+        $identifier = \is_string($identifier) ? TypeIdentifier::from($identifier) : $identifier;
+
+        return new BuiltinType($identifier);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::INT>
+     */
+    public static function int(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::INT);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::FLOAT>
+     */
+    public static function float(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::FLOAT);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::STRING>
+     */
+    public static function string(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::STRING);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::BOOL>
+     */
+    public static function bool(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::BOOL);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::RESOURCE>
+     */
+    public static function resource(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::RESOURCE);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::FALSE>
+     */
+    public static function false(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::FALSE);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::TRUE>
+     */
+    public static function true(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::TRUE);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::CALLABLE>
+     */
+    public static function callable(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::CALLABLE);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::MIXED>
+     */
+    public static function mixed(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::MIXED);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::NULL>
+     */
+    public static function null(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::NULL);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::VOID>
+     */
+    public static function void(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::VOID);
+    }
+
+    /**
+     * @return BuiltinType<TypeIdentifier::NEVER>
+     */
+    public static function never(): BuiltinType
+    {
+        return self::builtin(TypeIdentifier::NEVER);
+    }
+
+    /**
+     * @template T of BuiltinType<TypeIdentifier::ARRAY>|BuiltinType<TypeIdentifier::ITERABLE>|ObjectType|GenericType
+     *
+     * @param T $type
+     *
+     * @return CollectionType<T>
+     */
+    public static function collection(BuiltinType|ObjectType|GenericType $type, ?Type $value = null, ?Type $key = null, bool $asList = false): CollectionType
+    {
+        if (!$type instanceof GenericType && (null !== $value || null !== $key)) {
+            $type = self::generic($type, $key ?? self::arrayKey(), $value ?? self::mixed());
+        }
+
+        return new CollectionType($type, $asList);
+    }
+
+    /**
+     * @return CollectionType<BuiltinType<TypeIdentifier::ARRAY>>
+     */
+    public static function array(?Type $value = null, ?Type $key = null, bool $asList = false): CollectionType
+    {
+        return self::collection(self::builtin(TypeIdentifier::ARRAY), $value, $key, $asList);
+    }
+
+    /**
+     * @return CollectionType<BuiltinType<TypeIdentifier::ITERABLE>>
+     */
+    public static function iterable(?Type $value = null, ?Type $key = null, bool $asList = false): CollectionType
+    {
+        if ($asList) {
+            trigger_deprecation('symfony/type-info', '7.3', 'The third argument of "%s()" is deprecated. Use the "%s::list()" method to create a list instead.', __METHOD__, self::class);
+        }
+
+        return self::collection(self::builtin(TypeIdentifier::ITERABLE), $value, $key, $asList);
+    }
+
+    /**
+     * @return CollectionType<BuiltinType<TypeIdentifier::ARRAY>>
+     */
+    public static function list(?Type $value = null): CollectionType
+    {
+        return self::array($value, self::int(), asList: true);
+    }
+
+    /**
+     * @return CollectionType<BuiltinType<TypeIdentifier::ARRAY>>
+     */
+    public static function dict(?Type $value = null): CollectionType
+    {
+        return self::array($value, self::string());
+    }
+
+    /**
+     * @param array<array{type: Type, optional?: bool}|Type> $shape
+     */
+    public static function arrayShape(array $shape, bool $sealed = true, ?Type $extraKeyType = null, ?Type $extraValueType = null): ArrayShapeType
+    {
+        $shape = array_map(static function (array|Type $item): array {
+            return $item instanceof Type
+                ? ['type' => $item, 'optional' => false]
+                : ['type' => $item['type'], 'optional' => $item['optional'] ?? false];
+        }, $shape);
+
+        if ($extraKeyType || $extraValueType) {
+            $sealed = false;
+        }
+
+        $extraKeyType ??= !$sealed ? Type::arrayKey() : null;
+        $extraValueType ??= !$sealed ? Type::mixed() : null;
+
+        return new ArrayShapeType($shape, $extraKeyType, $extraValueType);
+    }
+
+    public static function arrayKey(): UnionType
+    {
+        return self::union(self::int(), self::string());
+    }
+
+    /**
+     * @template T of class-string
+     *
+     * @param T|null $className
+     *
+     * @return ($className is class-string ? ObjectType<T> : BuiltinType<TypeIdentifier::OBJECT>)
+     */
+    public static function object(?string $className = null): BuiltinType|ObjectType
+    {
+        return null !== $className ? new ObjectType($className) : new BuiltinType(TypeIdentifier::OBJECT);
+    }
+
+    /**
+     * @template T of class-string<\UnitEnum>|class-string<\BackedEnum>
+     * @template U of BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>
+     *
+     * @param T      $className
+     * @param U|null $backingType
+     *
+     * @return ($className is class-string<\BackedEnum> ? ($backingType is U ? BackedEnumType<T, U> : BackedEnumType<T, BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>>) : EnumType<T>))
+     */
+    public static function enum(string $className, ?BuiltinType $backingType = null): EnumType
+    {
+        if (is_subclass_of($className, \BackedEnum::class)) {
+            if (null === $backingType) {
+                $reflectionBackingType = (new \ReflectionEnum($className))->getBackingType();
+                $typeIdentifier = TypeIdentifier::INT->value === (string) $reflectionBackingType ? TypeIdentifier::INT : TypeIdentifier::STRING;
+                $backingType = new BuiltinType($typeIdentifier);
+            }
+
+            return new BackedEnumType($className, $backingType);
+        }
+
+        return new EnumType($className);
+    }
+
+    /**
+     * @template T of BuiltinType<TypeIdentifier::ARRAY>|BuiltinType<TypeIdentifier::ITERABLE>|ObjectType
+     *
+     * @param T $mainType
+     *
+     * @return GenericType<T>
+     */
+    public static function generic(BuiltinType|ObjectType $mainType, Type ...$variableTypes): GenericType
+    {
+        return new GenericType($mainType, ...$variableTypes);
+    }
+
+    /**
+     * @template T of Type
+     *
+     * @param T|null $bound
+     *
+     * @return ($bound is null ? TemplateType<BuiltinType<TypeIdentifier::MIXED>> : TemplateType<T>)
+     */
+    public static function template(string $name, ?Type $bound = null): TemplateType
+    {
+        return new TemplateType($name, $bound ?? Type::mixed());
+    }
+
+    /**
+     * @template T of Type
+     *
+     * @param list<T> $types
+     *
+     * @return UnionType<T>|NullableType<T>
+     */
+    public static function union(Type ...$types): UnionType
+    {
+        /** @var list<T> $unionTypes */
+        $unionTypes = [];
+
+        $nullableUnion = false;
+        $isNullable = fn (Type $type): bool => $type instanceof BuiltinType && TypeIdentifier::NULL === $type->getTypeIdentifier();
+
+        foreach ($types as $type) {
+            if ($type instanceof NullableType) {
+                $nullableUnion = true;
+                $type = $type->getWrappedType();
+            }
+
+            if ($type instanceof UnionType) {
+                foreach ($type->getTypes() as $unionType) {
+                    if ($isNullable($type)) {
+                        $nullableUnion = true;
+
+                        continue;
+                    }
+
+                    $unionTypes[] = $unionType;
+                }
+
+                continue;
+            }
+
+            if ($isNullable($type)) {
+                $nullableUnion = true;
+
+                continue;
+            }
+
+            $unionTypes[] = $type;
+        }
+
+        if (1 === \count($unionTypes)) {
+            return self::nullable($unionTypes[0]);
+        }
+
+        $unionType = new UnionType(...$unionTypes);
+
+        return $nullableUnion ? self::nullable($unionType) : $unionType;
+    }
+
+    /**
+     * @template T of ObjectType|GenericType<ObjectType>|CollectionType<GenericType<ObjectType>>
+     *
+     * @param list<T|IntersectionType<T>> $types
+     *
+     * @return IntersectionType<T>
+     */
+    public static function intersection(Type ...$types): IntersectionType
+    {
+        /** @var list<T> $intersectionTypes */
+        $intersectionTypes = [];
+
+        foreach ($types as $type) {
+            if (!$type instanceof IntersectionType) {
+                $intersectionTypes[] = $type;
+
+                continue;
+            }
+
+            foreach ($type->getTypes() as $intersectionType) {
+                $intersectionTypes[] = $intersectionType;
+            }
+        }
+
+        return new IntersectionType(...$intersectionTypes);
+    }
+
+    /**
+     * @template T of Type
+     *
+     * @param T $type
+     *
+     * @return T|NullableType<T>
+     */
+    public static function nullable(Type $type): Type
+    {
+        if ($type->isNullable()) {
+            return $type;
+        }
+
+        return new NullableType($type);
+    }
+
+    public static function fromValue(mixed $value): Type
+    {
+        $type = match ($value) {
+            null => self::null(),
+            true => self::true(),
+            false => self::false(),
+            default => null,
+        };
+
+        if (null !== $type) {
+            return $type;
+        }
+
+        if (\is_callable($value)) {
+            return Type::callable();
+        }
+
+        if (\is_resource($value)) {
+            return Type::resource();
+        }
+
+        $type = match (get_debug_type($value)) {
+            TypeIdentifier::INT->value => self::int(),
+            TypeIdentifier::FLOAT->value => self::float(),
+            TypeIdentifier::STRING->value => self::string(),
+            default => null,
+        };
+
+        if (null !== $type) {
+            return $type;
+        }
+
+        $type = match (true) {
+            $value instanceof \UnitEnum => Type::enum($value::class),
+            \is_object($value) => \stdClass::class === $value::class ? self::object() : self::object($value::class),
+            \is_array($value) => self::builtin(TypeIdentifier::ARRAY),
+            default => null,
+        };
+
+        if (null === $type) {
+            return Type::mixed();
+        }
+
+        if (is_iterable($value)) {
+            /** @var list<BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>> $keyTypes */
+            $keyTypes = [];
+
+            /** @var list<Type> $valueTypes */
+            $valueTypes = [];
+
+            foreach ($value as $k => $v) {
+                $keyTypes[] = self::fromValue($k);
+                $valueTypes[] = self::fromValue($v);
+            }
+
+            if ($keyTypes) {
+                $keyTypes = array_values(array_unique($keyTypes));
+                $keyType = \count($keyTypes) > 1 ? self::union(...$keyTypes) : $keyTypes[0];
+            } else {
+                $keyType = Type::arrayKey();
+            }
+
+            $valueType = $valueTypes ? CollectionType::mergeCollectionValueTypes($valueTypes) : Type::mixed();
+
+            return self::collection($type, $valueType, $keyType, \is_array($value) && [] !== $value && array_is_list($value));
+        }
+
+        if ($value instanceof \ArrayAccess) {
+            return self::collection($type);
+        }
+
+        return $type;
+    }
+}
diff --git a/symfony/type-info/TypeIdentifier.php b/symfony/type-info/TypeIdentifier.php
new file mode 100644
index 000000000..7c7a0984a
--- /dev/null
+++ b/symfony/type-info/TypeIdentifier.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo;
+
+/**
+ * Identifier of a PHP native type.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+enum TypeIdentifier: string
+{
+    case ARRAY = 'array';
+    case BOOL = 'bool';
+    case CALLABLE = 'callable';
+    case FALSE = 'false';
+    case FLOAT = 'float';
+    case INT = 'int';
+    case ITERABLE = 'iterable';
+    case MIXED = 'mixed';
+    case NULL = 'null';
+    case OBJECT = 'object';
+    case RESOURCE = 'resource';
+    case STRING = 'string';
+    case TRUE = 'true';
+    case NEVER = 'never';
+    case VOID = 'void';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+
+    public function isStandalone(): bool
+    {
+        return \in_array($this, [self::MIXED, self::NEVER, self::VOID], true);
+    }
+
+    public function isScalar(): bool
+    {
+        return \in_array($this, [self::STRING, self::FLOAT, self::INT, self::BOOL, self::FALSE, self::TRUE], true);
+    }
+
+    public function isBool(): bool
+    {
+        return \in_array($this, [self::BOOL, self::FALSE, self::TRUE], true);
+    }
+}
diff --git a/symfony/type-info/TypeResolver/PhpDocAwareReflectionTypeResolver.php b/symfony/type-info/TypeResolver/PhpDocAwareReflectionTypeResolver.php
new file mode 100644
index 000000000..7d6562ea9
--- /dev/null
+++ b/symfony/type-info/TypeResolver/PhpDocAwareReflectionTypeResolver.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Resolves type on reflection prioriziting PHP documentation.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ */
+final class PhpDocAwareReflectionTypeResolver implements TypeResolverInterface
+{
+    private readonly PhpDocParser $phpDocParser;
+    private readonly Lexer $lexer;
+
+    public function __construct(
+        private readonly TypeResolverInterface $reflectionTypeResolver,
+        private readonly TypeResolverInterface $stringTypeResolver,
+        private readonly TypeContextFactory $typeContextFactory,
+        ?PhpDocParser $phpDocParser = null,
+        ?Lexer $lexer = null,
+    ) {
+        if (class_exists(ParserConfig::class)) {
+            $this->lexer = $lexer ?? new Lexer(new ParserConfig([]));
+            $this->phpDocParser = $phpDocParser ?? new PhpDocParser(
+                $config = new ParserConfig([]),
+                new TypeParser($config, $constExprParser = new ConstExprParser($config)),
+                $constExprParser,
+            );
+        } else {
+            $this->lexer = $lexer ?? new Lexer();
+            $this->phpDocParser = $phpDocParser ?? new PhpDocParser(
+                new TypeParser($constExprParser = new ConstExprParser()),
+                $constExprParser,
+            );
+        }
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if (!$subject instanceof \ReflectionProperty && !$subject instanceof \ReflectionParameter && !$subject instanceof \ReflectionFunctionAbstract) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionProperty", a "ReflectionParameter" or a "ReflectionFunctionAbstract", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        $docComments = match (true) {
+            $subject instanceof \ReflectionProperty => $subject->isPromoted()
+                ? ['@var' => $subject->getDocComment(), '@param' => $subject->getDeclaringClass()?->getConstructor()?->getDocComment()]
+                : ['@var' => $subject->getDocComment()],
+            $subject instanceof \ReflectionParameter => ['@param' => $subject->getDeclaringFunction()->getDocComment()],
+            $subject instanceof \ReflectionFunctionAbstract => ['@return' => $subject->getDocComment()],
+        };
+
+        foreach ($docComments as $tagName => $docComment) {
+            if (!$docComment) {
+                continue;
+            }
+
+            $tokens = new TokenIterator($this->lexer->tokenize($docComment));
+            $docNode = $this->phpDocParser->parse($tokens);
+
+            foreach ($docNode->getTagsByName($tagName) as $tag) {
+                $tagValue = $tag->value;
+
+                if ('@var' === $tagName && $tagValue instanceof VarTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
+
+                if ('@param' === $tagName && $tagValue instanceof ParamTagValueNode && '$'.$subject->getName() === $tagValue->parameterName) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
+
+                if ('@return' === $tagName && $tagValue instanceof ReturnTagValueNode) {
+                    return $this->stringTypeResolver->resolve((string) $tagValue, $typeContext);
+                }
+            }
+        }
+
+        return $this->reflectionTypeResolver->resolve($subject);
+    }
+}
diff --git a/symfony/type-info/TypeResolver/ReflectionParameterTypeResolver.php b/symfony/type-info/TypeResolver/ReflectionParameterTypeResolver.php
new file mode 100644
index 000000000..b0d4e6b39
--- /dev/null
+++ b/symfony/type-info/TypeResolver/ReflectionParameterTypeResolver.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Resolves type for a given parameter reflection.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class ReflectionParameterTypeResolver implements TypeResolverInterface
+{
+    public function __construct(
+        private readonly ReflectionTypeResolver $reflectionTypeResolver,
+        private readonly TypeContextFactory $typeContextFactory,
+    ) {
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if (!$subject instanceof \ReflectionParameter) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionParameter", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        try {
+            return $this->reflectionTypeResolver->resolve($subject->getType(), $typeContext);
+        } catch (UnsupportedException $e) {
+            $path = null !== $typeContext
+                ? \sprintf('%s::%s($%s)', $typeContext->calledClassName, $subject->getDeclaringFunction()->getName(), $subject->getName())
+                : \sprintf('%s($%s)', $subject->getDeclaringFunction()->getName(), $subject->getName());
+
+            throw new UnsupportedException(\sprintf('Cannot resolve type for "%s".', $path), $subject, previous: $e);
+        }
+    }
+}
diff --git a/symfony/type-info/TypeResolver/ReflectionPropertyTypeResolver.php b/symfony/type-info/TypeResolver/ReflectionPropertyTypeResolver.php
new file mode 100644
index 000000000..53fd18bc4
--- /dev/null
+++ b/symfony/type-info/TypeResolver/ReflectionPropertyTypeResolver.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Resolves type for a given property reflection.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class ReflectionPropertyTypeResolver implements TypeResolverInterface
+{
+    public function __construct(
+        private readonly ReflectionTypeResolver $reflectionTypeResolver,
+        private readonly TypeContextFactory $typeContextFactory,
+    ) {
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if (!$subject instanceof \ReflectionProperty) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionProperty", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        try {
+            return $this->reflectionTypeResolver->resolve($subject->getType(), $typeContext);
+        } catch (UnsupportedException $e) {
+            $path = \sprintf('%s::$%s', $subject->getDeclaringClass()->getName(), $subject->getName());
+
+            throw new UnsupportedException(\sprintf('Cannot resolve type for "%s".', $path), $subject, previous: $e);
+        }
+    }
+}
diff --git a/symfony/type-info/TypeResolver/ReflectionReturnTypeResolver.php b/symfony/type-info/TypeResolver/ReflectionReturnTypeResolver.php
new file mode 100644
index 000000000..7d82d54fc
--- /dev/null
+++ b/symfony/type-info/TypeResolver/ReflectionReturnTypeResolver.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Resolves return type for a given function reflection.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class ReflectionReturnTypeResolver implements TypeResolverInterface
+{
+    public function __construct(
+        private readonly ReflectionTypeResolver $reflectionTypeResolver,
+        private readonly TypeContextFactory $typeContextFactory,
+    ) {
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if (!$subject instanceof \ReflectionFunctionAbstract) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionFunctionAbstract", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        $typeContext ??= $this->typeContextFactory->createFromReflection($subject);
+
+        try {
+            return $this->reflectionTypeResolver->resolve($subject->getReturnType(), $typeContext);
+        } catch (UnsupportedException $e) {
+            $path = null !== $typeContext
+                ? \sprintf('%s::%s()', $typeContext->calledClassName, $subject->getName())
+                : \sprintf('%s()', $subject->getName());
+
+            throw new UnsupportedException(\sprintf('Cannot resolve type for "%s".', $path), $subject, previous: $e);
+        }
+    }
+}
diff --git a/symfony/type-info/TypeResolver/ReflectionTypeResolver.php b/symfony/type-info/TypeResolver/ReflectionTypeResolver.php
new file mode 100644
index 000000000..61ffc3495
--- /dev/null
+++ b/symfony/type-info/TypeResolver/ReflectionTypeResolver.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Resolves type for a given type reflection.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class ReflectionTypeResolver implements TypeResolverInterface
+{
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if ($subject instanceof \ReflectionUnionType) {
+            return Type::union(...array_map(fn (mixed $t): Type => $this->resolve($t, $typeContext), $subject->getTypes()));
+        }
+
+        if ($subject instanceof \ReflectionIntersectionType) {
+            return Type::intersection(...array_map(fn (mixed $t): Type => $this->resolve($t, $typeContext), $subject->getTypes()));
+        }
+
+        if (!$subject instanceof \ReflectionNamedType) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "ReflectionNamedType", a "ReflectionUnionType" or a "ReflectionIntersectionType", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        $identifier = $subject->getName();
+        $nullable = $subject->allowsNull();
+
+        if (TypeIdentifier::ARRAY->value === $identifier) {
+            $type = Type::array();
+
+            return $nullable ? Type::nullable($type) : $type;
+        }
+
+        if (TypeIdentifier::ITERABLE->value === $identifier) {
+            $type = Type::iterable();
+
+            return $nullable ? Type::nullable($type) : $type;
+        }
+
+        if (TypeIdentifier::NULL->value === $identifier || TypeIdentifier::MIXED->value === $identifier) {
+            return Type::builtin($identifier);
+        }
+
+        if ($subject->isBuiltin()) {
+            $type = Type::builtin(TypeIdentifier::from($identifier));
+
+            return $nullable ? Type::nullable($type) : $type;
+        }
+
+        if (\in_array(strtolower($identifier), ['self', 'static', 'parent'], true) && !$typeContext) {
+            throw new InvalidArgumentException(\sprintf('A "%s" must be provided to resolve "%s".', TypeContext::class, strtolower($identifier)));
+        }
+
+        /** @var class-string $className */
+        $className = match (true) {
+            'self' === strtolower($identifier) => $typeContext->getDeclaringClass(),
+            'static' === strtolower($identifier) => $typeContext->getCalledClass(),
+            'parent' === strtolower($identifier) => $typeContext->getParentClass(),
+            default => $identifier,
+        };
+
+        if (is_subclass_of($className, \UnitEnum::class) && !interface_exists($className)) {
+            $type = Type::enum($className);
+        } else {
+            $type = Type::object($className);
+        }
+
+        return $nullable ? Type::nullable($type) : $type;
+    }
+}
diff --git a/symfony/type-info/TypeResolver/StringTypeResolver.php b/symfony/type-info/TypeResolver/StringTypeResolver.php
new file mode 100644
index 000000000..6f95f1423
--- /dev/null
+++ b/symfony/type-info/TypeResolver/StringTypeResolver.php
@@ -0,0 +1,358 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFloatNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNullNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
+use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\ConstExprParser;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
+use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\BackedEnumType;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\GenericType;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeIdentifier;
+
+/**
+ * Resolves type for a given string.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class StringTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @var array<string, bool>
+     */
+    private static array $classExistCache = [];
+
+    private readonly Lexer $lexer;
+    private readonly TypeParser $parser;
+
+    /**
+     * @param array<string, string> $extraTypeAliases
+     */
+    public function __construct(
+        ?Lexer $lexer = null,
+        ?TypeParser $parser = null,
+        private readonly array $extraTypeAliases = [],
+    ) {
+        if (class_exists(ParserConfig::class)) {
+            $this->lexer = $lexer ?? new Lexer(new ParserConfig([]));
+            $this->parser = $parser ?? new TypeParser($config = new ParserConfig([]), new ConstExprParser($config));
+        } else {
+            $this->lexer = $lexer ?? new Lexer();
+            $this->parser = $parser ?? new TypeParser(new ConstExprParser());
+        }
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        if ($subject instanceof \Stringable) {
+            $subject = (string) $subject;
+        } elseif (!\is_string($subject)) {
+            throw new UnsupportedException(\sprintf('Expected subject to be a "string", "%s" given.', get_debug_type($subject)), $subject);
+        }
+
+        try {
+            $tokens = new TokenIterator($this->lexer->tokenize($subject));
+            $node = $this->parser->parse($tokens);
+
+            return $this->getTypeFromNode($node, $typeContext);
+        } catch (\DomainException $e) {
+            throw new UnsupportedException(\sprintf('Cannot resolve "%s".', $subject), $subject, previous: $e);
+        }
+    }
+
+    private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Type
+    {
+        $typeIsCollectionObject = fn (Type $type): bool => $type->isIdentifiedBy(\Traversable::class) || $type->isIdentifiedBy(\ArrayAccess::class);
+
+        if ($node instanceof CallableTypeNode) {
+            return Type::callable();
+        }
+
+        if ($node instanceof ArrayTypeNode) {
+            return Type::array($this->getTypeFromNode($node->type, $typeContext));
+        }
+
+        if ($node instanceof ArrayShapeNode) {
+            $shape = [];
+            foreach ($node->items as $item) {
+                $shape[(string) $item->keyName] = [
+                    'type' => $this->getTypeFromNode($item->valueType, $typeContext),
+                    'optional' => $item->optional,
+                ];
+            }
+
+            return Type::arrayShape(
+                $shape,
+                $node->sealed,
+                $node->unsealedType?->keyType ? $this->getTypeFromNode($node->unsealedType->keyType, $typeContext) : null,
+                $node->unsealedType?->valueType ? $this->getTypeFromNode($node->unsealedType->valueType, $typeContext) : null,
+            );
+        }
+
+        if ($node instanceof ObjectShapeNode) {
+            return Type::object();
+        }
+
+        if ($node instanceof ThisTypeNode) {
+            if (null === $typeContext) {
+                throw new InvalidArgumentException(\sprintf('A "%s" must be provided to resolve "$this".', TypeContext::class));
+            }
+
+            return Type::object($typeContext->getCalledClass());
+        }
+
+        if ($node instanceof ConstTypeNode) {
+            if ($node->constExpr instanceof ConstFetchNode) {
+                $className = match (strtolower($node->constExpr->className)) {
+                    'self' => $typeContext->getDeclaringClass(),
+                    'static' => $typeContext->getCalledClass(),
+                    'parent' => $typeContext->getParentClass(),
+                    default => $node->constExpr->className,
+                };
+
+                if (!class_exists($className)) {
+                    return Type::mixed();
+                }
+
+                $types = [];
+
+                foreach ((new \ReflectionClass($className))->getReflectionConstants() as $const) {
+                    if (preg_match('/^'.str_replace('\*', '.*', preg_quote($node->constExpr->name, '/')).'$/', $const->getName())) {
+                        $types[] = Type::fromValue($const->getValue());
+                    }
+                }
+
+                return CollectionType::mergeCollectionValueTypes($types);
+            }
+
+            return match ($node->constExpr::class) {
+                ConstExprArrayNode::class => Type::array(),
+                ConstExprFalseNode::class => Type::false(),
+                ConstExprFloatNode::class => Type::float(),
+                ConstExprIntegerNode::class => Type::int(),
+                ConstExprNullNode::class => Type::null(),
+                ConstExprStringNode::class => Type::string(),
+                ConstExprTrueNode::class => Type::true(),
+                default => throw new \DomainException(\sprintf('Unhandled "%s" constant expression.', $node->constExpr::class)),
+            };
+        }
+
+        if ($node instanceof IdentifierTypeNode) {
+            $type = match ($node->name) {
+                'bool', 'boolean' => Type::bool(),
+                'true' => Type::true(),
+                'false' => Type::false(),
+                'int', 'integer', 'positive-int', 'negative-int', 'non-positive-int', 'non-negative-int', 'non-zero-int' => Type::int(),
+                'float', 'double' => Type::float(),
+                'string',
+                'class-string',
+                'trait-string',
+                'interface-string',
+                'callable-string',
+                'numeric-string',
+                'lowercase-string',
+                'non-empty-lowercase-string',
+                'non-empty-string',
+                'non-falsy-string',
+                'truthy-string',
+                'literal-string',
+                'html-escaped-string' => Type::string(),
+                'resource' => Type::resource(),
+                'object' => Type::object(),
+                'callable' => Type::callable(),
+                'array', 'non-empty-array' => Type::array(),
+                'list', 'non-empty-list' => Type::list(),
+                'iterable' => Type::iterable(),
+                'mixed' => Type::mixed(),
+                'null' => Type::null(),
+                'array-key' => Type::arrayKey(),
+                'scalar' => Type::union(Type::int(), Type::float(), Type::string(), Type::bool()),
+                'number' => Type::union(Type::int(), Type::float()),
+                'numeric' => Type::union(Type::int(), Type::float(), Type::string()),
+                'self' => $typeContext ? Type::object($typeContext->getDeclaringClass()) : throw new InvalidArgumentException(\sprintf('A "%s" must be provided to resolve "self".', TypeContext::class)),
+                'static' => $typeContext ? Type::object($typeContext->getCalledClass()) : throw new InvalidArgumentException(\sprintf('A "%s" must be provided to resolve "static".', TypeContext::class)),
+                'parent' => $typeContext ? Type::object($typeContext->getParentClass()) : throw new InvalidArgumentException(\sprintf('A "%s" must be provided to resolve "parent".', TypeContext::class)),
+                'void' => Type::void(),
+                'never', 'never-return', 'never-returns', 'no-return' => Type::never(),
+                default => $this->resolveCustomIdentifier($node->name, $typeContext),
+            };
+
+            if ($typeIsCollectionObject($type)) {
+                return Type::collection($type);
+            }
+
+            return $type;
+        }
+
+        if ($node instanceof NullableTypeNode) {
+            return Type::nullable($this->getTypeFromNode($node->type, $typeContext));
+        }
+
+        if ($node instanceof GenericTypeNode) {
+            if ($node->type instanceof IdentifierTypeNode && 'value-of' === $node->type->name) {
+                $type = $this->getTypeFromNode($node->genericTypes[0], $typeContext);
+                if ($type instanceof BackedEnumType) {
+                    return $type->getBackingType();
+                }
+
+                if ($type instanceof CollectionType) {
+                    return $type->getCollectionValueType();
+                }
+
+                throw new \DomainException(\sprintf('"%s" is not a valid type for "value-of".', $node->genericTypes[0]));
+            }
+
+            if ($node->type instanceof IdentifierTypeNode && 'key-of' === $node->type->name) {
+                $type = $this->getTypeFromNode($node->genericTypes[0], $typeContext);
+                if ($type instanceof CollectionType) {
+                    return $type->getCollectionKeyType();
+                }
+
+                throw new \DomainException(\sprintf('"%s" is not a valid type for "key-of".', $node->genericTypes[0]));
+            }
+
+            $type = $this->getTypeFromNode($node->type, $typeContext);
+
+            // handle integer ranges as simple integers
+            if ($type->isIdentifiedBy(TypeIdentifier::INT)) {
+                return $type;
+            }
+
+            $variableTypes = array_map(fn (TypeNode $t): Type => $this->getTypeFromNode($t, $typeContext), $node->genericTypes);
+
+            if ($type instanceof CollectionType) {
+                $asList = $type->isList();
+                $keyType = $type->getCollectionKeyType();
+                $type = $type->getWrappedType();
+
+                if ($type instanceof GenericType) {
+                    $type = $type->getWrappedType();
+                }
+
+                if (1 === \count($variableTypes)) {
+                    return new CollectionType(Type::generic($type, $keyType, $variableTypes[0]), $asList);
+                } elseif (2 === \count($variableTypes)) {
+                    if ($asList) {
+                        throw new \DomainException(\sprintf('"%s" type cannot have a key type defined.', $node->type));
+                    }
+
+                    return Type::collection($type, $variableTypes[1], $variableTypes[0], $asList);
+                }
+            }
+
+            if ($typeIsCollectionObject($type)) {
+                return match (\count($variableTypes)) {
+                    1 => Type::collection($type, $variableTypes[0]),
+                    2 => Type::collection($type, $variableTypes[1], $variableTypes[0]),
+                    default => Type::collection($type),
+                };
+            }
+
+            if ($type instanceof BuiltinType && TypeIdentifier::ARRAY !== $type->getTypeIdentifier() && TypeIdentifier::ITERABLE !== $type->getTypeIdentifier()) {
+                return $type;
+            }
+
+            return Type::generic($type, ...$variableTypes);
+        }
+
+        if ($node instanceof UnionTypeNode) {
+            $types = [];
+
+            foreach ($node->types as $nodeType) {
+                $type = $this->getTypeFromNode($nodeType, $typeContext);
+
+                if ($type instanceof BuiltinType && TypeIdentifier::MIXED === $type->getTypeIdentifier()) {
+                    return Type::mixed();
+                }
+
+                $types[] = $type;
+            }
+
+            return Type::union(...$types);
+        }
+
+        if ($node instanceof IntersectionTypeNode) {
+            return Type::intersection(...array_map(fn (TypeNode $t): Type => $this->getTypeFromNode($t, $typeContext), $node->types));
+        }
+
+        throw new \DomainException(\sprintf('Unhandled "%s" node.', $node::class));
+    }
+
+    private function resolveCustomIdentifier(string $identifier, ?TypeContext $typeContext): Type
+    {
+        $className = $typeContext ? $typeContext->normalize($identifier) : $identifier;
+
+        if (!isset(self::$classExistCache[$className])) {
+            self::$classExistCache[$className] = false;
+
+            if (class_exists($className) || interface_exists($className)) {
+                self::$classExistCache[$className] = true;
+            } else {
+                try {
+                    new \ReflectionClass($className);
+                    self::$classExistCache[$className] = true;
+                } catch (\Throwable) {
+                }
+            }
+        }
+
+        if (self::$classExistCache[$className]) {
+            if (is_subclass_of($className, \UnitEnum::class)) {
+                return Type::enum($className);
+            }
+
+            return Type::object($className);
+        }
+
+        if (isset($typeContext?->templates[$identifier])) {
+            return Type::template($identifier, $typeContext->templates[$identifier]);
+        }
+
+        if (isset($typeContext?->typeAliases[$identifier])) {
+            return $typeContext->typeAliases[$identifier];
+        }
+
+        if (isset($this->extraTypeAliases[$identifier])) {
+            return $this->resolve($this->extraTypeAliases[$identifier]);
+        }
+
+        throw new \DomainException(\sprintf('Unhandled "%s" identifier.', $identifier));
+    }
+}
diff --git a/symfony/type-info/TypeResolver/TypeResolver.php b/symfony/type-info/TypeResolver/TypeResolver.php
new file mode 100644
index 000000000..c59b5967d
--- /dev/null
+++ b/symfony/type-info/TypeResolver/TypeResolver.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+
+/**
+ * Resolves type for a given subject by delegating resolving to nested type resolvers.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+final class TypeResolver implements TypeResolverInterface
+{
+    /**
+     * @param ContainerInterface $resolvers Locator of type resolvers, keyed by supported subject type
+     */
+    public function __construct(
+        private readonly ContainerInterface $resolvers,
+    ) {
+    }
+
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type
+    {
+        $subjectType = match (\is_object($subject)) {
+            true => match (true) {
+                is_subclass_of($subject::class, \ReflectionType::class) => \ReflectionType::class,
+                is_subclass_of($subject::class, \ReflectionFunctionAbstract::class) => \ReflectionFunctionAbstract::class,
+                default => $subject::class,
+            },
+            false => get_debug_type($subject),
+        };
+
+        if (!$this->resolvers->has($subjectType)) {
+            if ('string' === $subjectType) {
+                throw new UnsupportedException('Cannot find any resolver for "string" type. Try running "composer require phpstan/phpdoc-parser".', $subject);
+            }
+
+            throw new UnsupportedException(\sprintf('Cannot find any resolver for "%s" type.', $subjectType), $subject);
+        }
+
+        /** @param TypeResolverInterface $resolver */
+        $resolver = $this->resolvers->get($subjectType);
+
+        return $resolver->resolve($subject, $typeContext);
+    }
+
+    /**
+     * @param array<string, TypeResolverInterface>|null $resolvers
+     */
+    public static function create(?array $resolvers = null): self
+    {
+        if (null === $resolvers) {
+            $stringTypeResolver = class_exists(PhpDocParser::class) ? new StringTypeResolver() : null;
+            $typeContextFactory = new TypeContextFactory($stringTypeResolver);
+            $reflectionTypeResolver = new ReflectionTypeResolver();
+
+            $resolvers = [
+                \ReflectionType::class => $reflectionTypeResolver,
+                \ReflectionParameter::class => new ReflectionParameterTypeResolver($reflectionTypeResolver, $typeContextFactory),
+                \ReflectionProperty::class => new ReflectionPropertyTypeResolver($reflectionTypeResolver, $typeContextFactory),
+                \ReflectionFunctionAbstract::class => new ReflectionReturnTypeResolver($reflectionTypeResolver, $typeContextFactory),
+            ];
+
+            if (null !== $stringTypeResolver) {
+                $resolvers['string'] = $stringTypeResolver;
+                $resolvers[\ReflectionParameter::class] = new PhpDocAwareReflectionTypeResolver($resolvers[\ReflectionParameter::class], $stringTypeResolver, $typeContextFactory);
+                $resolvers[\ReflectionProperty::class] = new PhpDocAwareReflectionTypeResolver($resolvers[\ReflectionProperty::class], $stringTypeResolver, $typeContextFactory);
+                $resolvers[\ReflectionFunctionAbstract::class] = new PhpDocAwareReflectionTypeResolver($resolvers[\ReflectionFunctionAbstract::class], $stringTypeResolver, $typeContextFactory);
+            }
+        }
+
+        $resolversContainer = new class($resolvers) implements ContainerInterface {
+            public function __construct(
+                private readonly array $resolvers,
+            ) {
+            }
+
+            public function has(string $id): bool
+            {
+                return isset($this->resolvers[$id]);
+            }
+
+            public function get(string $id): TypeResolverInterface
+            {
+                return $this->resolvers[$id];
+            }
+        };
+
+        return new self($resolversContainer);
+    }
+}
diff --git a/symfony/type-info/TypeResolver/TypeResolverInterface.php b/symfony/type-info/TypeResolver/TypeResolverInterface.php
new file mode 100644
index 000000000..ce259a993
--- /dev/null
+++ b/symfony/type-info/TypeResolver/TypeResolverInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\TypeInfo\TypeResolver;
+
+use Symfony\Component\TypeInfo\Exception\UnsupportedException;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeContext\TypeContext;
+
+/**
+ * Resolves type for a given subject.
+ *
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+interface TypeResolverInterface
+{
+    /**
+     * Try to resolve a {@see Type} on a $subject.
+     * If the resolver cannot resolve the type, it will throw a {@see UnsupportedException}.
+     *
+     * @throws UnsupportedException
+     */
+    public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type;
+}
diff --git a/symfony/uid/AbstractUid.php b/symfony/uid/AbstractUid.php
index c67e67e85..fa35031ea 100644
--- a/symfony/uid/AbstractUid.php
+++ b/symfony/uid/AbstractUid.php
@@ -11,15 +11,17 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-abstract class AbstractUid implements \JsonSerializable, \Stringable
+abstract class AbstractUid implements \JsonSerializable, \Stringable, HashableInterface
 {
     /**
      * The identifier in its canonic representation.
      */
-    protected $uid;
+    protected string $uid;
 
     /**
      * Whether the passed value is valid for the constructor of the current class.
@@ -29,53 +31,55 @@ abstract public static function isValid(string $uid): bool;
     /**
      * Creates an AbstractUid from an identifier represented in any of the supported formats.
      *
-     * @throws \InvalidArgumentException When the passed value is not valid
+     * @throws InvalidArgumentException When the passed value is not valid
      */
     abstract public static function fromString(string $uid): static;
 
     /**
-     * @throws \InvalidArgumentException When the passed value is not valid
+     * @throws InvalidArgumentException When the passed value is not valid
      */
     public static function fromBinary(string $uid): static
     {
         if (16 !== \strlen($uid)) {
-            throw new \InvalidArgumentException('Invalid binary uid provided.');
+            throw new InvalidArgumentException('Invalid binary uid provided.');
         }
 
         return static::fromString($uid);
     }
 
     /**
-     * @throws \InvalidArgumentException When the passed value is not valid
+     * @throws InvalidArgumentException When the passed value is not valid
      */
     public static function fromBase58(string $uid): static
     {
         if (22 !== \strlen($uid)) {
-            throw new \InvalidArgumentException('Invalid base-58 uid provided.');
+            throw new InvalidArgumentException('Invalid base-58 uid provided.');
         }
 
         return static::fromString($uid);
     }
 
     /**
-     * @throws \InvalidArgumentException When the passed value is not valid
+     * @throws InvalidArgumentException When the passed value is not valid
      */
     public static function fromBase32(string $uid): static
     {
         if (26 !== \strlen($uid)) {
-            throw new \InvalidArgumentException('Invalid base-32 uid provided.');
+            throw new InvalidArgumentException('Invalid base-32 uid provided.');
         }
 
         return static::fromString($uid);
     }
 
     /**
-     * @throws \InvalidArgumentException When the passed value is not valid
+     * @param string $uid A valid RFC 9562/4122 uid
+     *
+     * @throws InvalidArgumentException When the passed value is not valid
      */
     public static function fromRfc4122(string $uid): static
     {
         if (36 !== \strlen($uid)) {
-            throw new \InvalidArgumentException('Invalid RFC4122 uid provided.');
+            throw new InvalidArgumentException('Invalid RFC4122 uid provided.');
         }
 
         return static::fromString($uid);
@@ -83,30 +87,36 @@ public static function fromRfc4122(string $uid): static
 
     /**
      * Returns the identifier as a raw binary string.
+     *
+     * @return non-empty-string
      */
     abstract public function toBinary(): string;
 
     /**
-     * Returns the identifier as a base58 case sensitive string.
+     * Returns the identifier as a base58 case-sensitive string.
      *
      * @example 2AifFTC3zXgZzK5fPrrprL (len=22)
+     *
+     * @return non-empty-string
      */
     public function toBase58(): string
     {
-        return strtr(sprintf('%022s', BinaryUtil::toBase($this->toBinary(), BinaryUtil::BASE58)), '0', '1');
+        return strtr(\sprintf('%022s', BinaryUtil::toBase($this->toBinary(), BinaryUtil::BASE58)), '0', '1');
     }
 
     /**
-     * Returns the identifier as a base32 case insensitive string.
+     * Returns the identifier as a base32 case-insensitive string.
      *
      * @see https://tools.ietf.org/html/rfc4648#section-6
      *
      * @example 09EJ0S614A9FXVG9C5537Q9ZE1 (len=26)
+     *
+     * @return non-empty-string
      */
     public function toBase32(): string
     {
         $uid = bin2hex($this->toBinary());
-        $uid = sprintf('%02s%04s%04s%04s%04s%04s%04s',
+        $uid = \sprintf('%02s%04s%04s%04s%04s%04s%04s',
             base_convert(substr($uid, 0, 2), 16, 32),
             base_convert(substr($uid, 2, 5), 16, 32),
             base_convert(substr($uid, 7, 5), 16, 32),
@@ -120,11 +130,13 @@ public function toBase32(): string
     }
 
     /**
-     * Returns the identifier as a RFC4122 case insensitive string.
+     * Returns the identifier as a RFC 9562/4122 case-insensitive string.
      *
-     * @see https://tools.ietf.org/html/rfc4122#section-3
+     * @see https://datatracker.ietf.org/doc/html/rfc9562/#section-4
      *
      * @example 09748193-048a-4bfb-b825-8528cf74fdc1 (len=36)
+     *
+     * @return non-empty-string
      */
     public function toRfc4122(): string
     {
@@ -141,6 +153,8 @@ public function toRfc4122(): string
      * Returns the identifier as a prefixed hexadecimal case insensitive string.
      *
      * @example 0x09748193048a4bfbb8258528cf74fdc1 (len=34)
+     *
+     * @return non-empty-string
      */
     public function toHex(): string
     {
@@ -159,16 +173,38 @@ public function equals(mixed $other): bool
         return $this->uid === $other->uid;
     }
 
+    /**
+     * @return non-empty-string
+     */
+    public function hash(): string
+    {
+        return $this->uid;
+    }
+
     public function compare(self $other): int
     {
         return (\strlen($this->uid) - \strlen($other->uid)) ?: ($this->uid <=> $other->uid);
     }
 
+    /**
+     * @return non-empty-string
+     */
+    final public function toString(): string
+    {
+        return $this->__toString();
+    }
+
+    /**
+     * @return non-empty-string
+     */
     public function __toString(): string
     {
         return $this->uid;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function jsonSerialize(): string
     {
         return $this->uid;
diff --git a/symfony/uid/BinaryUtil.php b/symfony/uid/BinaryUtil.php
index 8fd19d867..7d1e524e5 100644
--- a/symfony/uid/BinaryUtil.php
+++ b/symfony/uid/BinaryUtil.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
  * @internal
  *
@@ -36,7 +38,7 @@ class BinaryUtil
         'u' => 52, 'v' => 53, 'w' => 54, 'x' => 55, 'y' => 56, 'z' => 57,
     ];
 
-    // https://tools.ietf.org/html/rfc4122#section-4.1.4
+    // https://datatracker.ietf.org/doc/html/rfc9562#section-5.1
     // 0x01b21dd213814000 is the number of 100-ns intervals between the
     // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
     private const TIME_OFFSET_INT = 0x01B21DD213814000;
@@ -118,8 +120,10 @@ public static function add(string $a, string $b): string
 
     /**
      * @param string $time Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 in hexadecimal
+     *
+     * @return string Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 as a numeric string
      */
-    public static function hexToDateTime(string $time): \DateTimeImmutable
+    public static function hexToNumericString(string $time): string
     {
         if (\PHP_INT_SIZE >= 8) {
             $time = (string) (hexdec($time) - self::TIME_OFFSET_INT);
@@ -140,7 +144,17 @@ public static function hexToDateTime(string $time): \DateTimeImmutable
             $time = '-' === $time[0] ? '-'.str_pad(substr($time, 1), 8, '0', \STR_PAD_LEFT) : str_pad($time, 8, '0', \STR_PAD_LEFT);
         }
 
-        return \DateTimeImmutable::createFromFormat('U.u?', substr_replace($time, '.', -7, 0));
+        return $time;
+    }
+
+    /**
+     * Sub-microseconds are lost since they are not handled by \DateTimeImmutable.
+     *
+     * @param string $time Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 in hexadecimal
+     */
+    public static function hexToDateTime(string $time): \DateTimeImmutable
+    {
+        return \DateTimeImmutable::createFromFormat('U.u?', substr_replace(self::hexToNumericString($time), '.', -7, 0));
     }
 
     /**
@@ -150,7 +164,7 @@ public static function dateTimeToHex(\DateTimeInterface $time): string
     {
         if (\PHP_INT_SIZE >= 8) {
             if (-self::TIME_OFFSET_INT > $time = (int) $time->format('Uu0')) {
-                throw new \InvalidArgumentException('The given UUID date cannot be earlier than 1582-10-15.');
+                throw new InvalidArgumentException('The given UUID date cannot be earlier than 1582-10-15.');
             }
 
             return str_pad(dechex(self::TIME_OFFSET_INT + $time), 16, '0', \STR_PAD_LEFT);
@@ -159,7 +173,7 @@ public static function dateTimeToHex(\DateTimeInterface $time): string
         $time = $time->format('Uu0');
         $negative = '-' === $time[0];
         if ($negative && self::TIME_OFFSET_INT < $time = substr($time, 1)) {
-            throw new \InvalidArgumentException('The given UUID date cannot be earlier than 1582-10-15.');
+            throw new InvalidArgumentException('The given UUID date cannot be earlier than 1582-10-15.');
         }
         $time = self::fromBase($time, self::BASE10);
         $time = str_pad($time, 8, "\0", \STR_PAD_LEFT);
diff --git a/symfony/uid/Command/GenerateUlidCommand.php b/symfony/uid/Command/GenerateUlidCommand.php
index 6c8d16387..485e8be86 100644
--- a/symfony/uid/Command/GenerateUlidCommand.php
+++ b/symfony/uid/Command/GenerateUlidCommand.php
@@ -25,12 +25,9 @@
 #[AsCommand(name: 'ulid:generate', description: 'Generate a ULID')]
 class GenerateUlidCommand extends Command
 {
-    private UlidFactory $factory;
-
-    public function __construct(?UlidFactory $factory = null)
-    {
-        $this->factory = $factory ?? new UlidFactory();
-
+    public function __construct(
+        private UlidFactory $factory = new UlidFactory(),
+    ) {
         parent::__construct();
     }
 
@@ -40,25 +37,25 @@ protected function configure(): void
             ->setDefinition([
                 new InputOption('time', null, InputOption::VALUE_REQUIRED, 'The ULID timestamp: a parsable date/time string'),
                 new InputOption('count', 'c', InputOption::VALUE_REQUIRED, 'The number of ULID to generate', 1),
-                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, sprintf('The ULID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'base32'),
+                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, \sprintf('The ULID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'base32'),
             ])
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command generates a ULID.
+                The <info>%command.name%</info> command generates a ULID.
 
-    <info>php %command.full_name%</info>
+                    <info>php %command.full_name%</info>
 
-To specify the timestamp:
+                To specify the timestamp:
 
-    <info>php %command.full_name% --time="2021-02-16 14:09:08"</info>
+                    <info>php %command.full_name% --time="2021-02-16 14:09:08"</info>
 
-To generate several ULIDs:
+                To generate several ULIDs:
 
-    <info>php %command.full_name% --count=10</info>
+                    <info>php %command.full_name% --count=10</info>
 
-To output a specific format:
+                To output a specific format:
 
-    <info>php %command.full_name% --format=rfc4122</info>
-EOF
+                    <info>php %command.full_name% --format=rfc4122</info>
+                EOF
             )
         ;
     }
@@ -71,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             try {
                 $time = new \DateTimeImmutable($time);
             } catch (\Exception $e) {
-                $io->error(sprintf('Invalid timestamp "%s": %s', $time, str_replace('DateTimeImmutable::__construct(): ', '', $e->getMessage())));
+                $io->error(\sprintf('Invalid timestamp "%s": %s', $time, str_replace('DateTimeImmutable::__construct(): ', '', $e->getMessage())));
 
                 return 1;
             }
@@ -79,10 +76,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $formatOption = $input->getOption('format');
 
-        if (\in_array($formatOption, $this->getAvailableFormatOptions())) {
+        if (\in_array($formatOption, $this->getAvailableFormatOptions(), true)) {
             $format = 'to'.ucfirst($formatOption);
         } else {
-            $io->error(sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
+            $io->error(\sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
 
             return 1;
         }
@@ -108,6 +105,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return [
diff --git a/symfony/uid/Command/GenerateUuidCommand.php b/symfony/uid/Command/GenerateUuidCommand.php
index 6dad923c4..18e2f8191 100644
--- a/symfony/uid/Command/GenerateUuidCommand.php
+++ b/symfony/uid/Command/GenerateUuidCommand.php
@@ -20,18 +20,16 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Uid\Exception\LogicException;
 use Symfony\Component\Uid\Factory\UuidFactory;
 use Symfony\Component\Uid\Uuid;
 
 #[AsCommand(name: 'uuid:generate', description: 'Generate a UUID')]
 class GenerateUuidCommand extends Command
 {
-    private UuidFactory $factory;
-
-    public function __construct(?UuidFactory $factory = null)
-    {
-        $this->factory = $factory ?? new UuidFactory();
-
+    public function __construct(
+        private UuidFactory $factory = new UuidFactory(),
+    ) {
         parent::__construct();
     }
 
@@ -45,41 +43,41 @@ protected function configure(): void
                 new InputOption('namespace', null, InputOption::VALUE_REQUIRED, 'The UUID to use at the namespace for named-based UUIDs, predefined namespaces keywords "dns", "url", "oid" and "x500" are accepted'),
                 new InputOption('random-based', null, InputOption::VALUE_NONE, 'To generate a random-based UUID'),
                 new InputOption('count', 'c', InputOption::VALUE_REQUIRED, 'The number of UUID to generate', 1),
-                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, sprintf('The UUID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'rfc4122'),
+                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, \sprintf('The UUID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'rfc4122'),
             ])
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> generates a UUID.
+                The <info>%command.name%</info> generates a UUID.
 
-    <info>php %command.full_name%</info>
+                    <info>php %command.full_name%</info>
 
-To generate a time-based UUID:
+                To generate a time-based UUID:
 
-    <info>php %command.full_name% --time-based=now</info>
+                    <info>php %command.full_name% --time-based=now</info>
 
-To specify a time-based UUID's node:
+                To specify a time-based UUID's node:
 
-    <info>php %command.full_name% --time-based=@1613480254 --node=fb3502dc-137e-4849-8886-ac90d07f64a7</info>
+                    <info>php %command.full_name% --time-based=@1613480254 --node=fb3502dc-137e-4849-8886-ac90d07f64a7</info>
 
-To generate a name-based UUID:
+                To generate a name-based UUID:
 
-    <info>php %command.full_name% --name-based=foo</info>
+                    <info>php %command.full_name% --name-based=foo</info>
 
-To specify a name-based UUID's namespace:
+                To specify a name-based UUID's namespace:
 
-    <info>php %command.full_name% --name-based=bar --namespace=fb3502dc-137e-4849-8886-ac90d07f64a7</info>
+                    <info>php %command.full_name% --name-based=bar --namespace=fb3502dc-137e-4849-8886-ac90d07f64a7</info>
 
-To generate a random-based UUID:
+                To generate a random-based UUID:
 
-    <info>php %command.full_name% --random-based</info>
+                    <info>php %command.full_name% --random-based</info>
 
-To generate several UUIDs:
+                To generate several UUIDs:
 
-    <info>php %command.full_name% --count=10</info>
+                    <info>php %command.full_name% --count=10</info>
 
-To output a specific format:
+                To output a specific format:
 
-    <info>php %command.full_name% --format=base58</info>
-EOF
+                    <info>php %command.full_name% --format=base58</info>
+                EOF
             )
         ;
     }
@@ -118,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     try {
                         $node = Uuid::fromString($node);
                     } catch (\InvalidArgumentException $e) {
-                        $io->error(sprintf('Invalid node "%s": %s', $node, $e->getMessage()));
+                        $io->error(\sprintf('Invalid node "%s": %s', $node, $e->getMessage()));
 
                         return 1;
                     }
@@ -127,7 +125,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 try {
                     new \DateTimeImmutable($time);
                 } catch (\Exception $e) {
-                    $io->error(sprintf('Invalid timestamp "%s": %s', $time, str_replace('DateTimeImmutable::__construct(): ', '', $e->getMessage())));
+                    $io->error(\sprintf('Invalid timestamp "%s": %s', $time, str_replace('DateTimeImmutable::__construct(): ', '', $e->getMessage())));
 
                     return 1;
                 }
@@ -140,7 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     try {
                         $namespace = Uuid::fromString($namespace);
                     } catch (\InvalidArgumentException $e) {
-                        $io->error(sprintf('Invalid namespace "%s": %s', $namespace, $e->getMessage()));
+                        $io->error(\sprintf('Invalid namespace "%s": %s', $namespace, $e->getMessage()));
 
                         return 1;
                     }
@@ -149,7 +147,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $create = function () use ($namespace, $name): Uuid {
                     try {
                         $factory = $this->factory->nameBased($namespace);
-                    } catch (\LogicException) {
+                    } catch (LogicException) {
                         throw new \InvalidArgumentException('Missing namespace: use the "--namespace" option or configure a default namespace in the underlying factory.');
                     }
 
@@ -168,10 +166,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $formatOption = $input->getOption('format');
 
-        if (\in_array($formatOption, $this->getAvailableFormatOptions())) {
+        if (\in_array($formatOption, $this->getAvailableFormatOptions(), true)) {
             $format = 'to'.ucfirst($formatOption);
         } else {
-            $io->error(sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
+            $io->error(\sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
 
             return 1;
         }
@@ -197,6 +195,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return [
diff --git a/symfony/uid/Command/InspectUlidCommand.php b/symfony/uid/Command/InspectUlidCommand.php
index b3a1b024a..63d99ca02 100644
--- a/symfony/uid/Command/InspectUlidCommand.php
+++ b/symfony/uid/Command/InspectUlidCommand.php
@@ -31,12 +31,12 @@ protected function configure(): void
                 new InputArgument('ulid', InputArgument::REQUIRED, 'The ULID to inspect'),
             ])
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> displays information about a ULID.
+                The <info>%command.name%</info> displays information about a ULID.
 
-    <info>php %command.full_name% 01EWAKBCMWQ2C94EXNN60ZBS0Q</info>
-    <info>php %command.full_name% 1BVdfLn3ERmbjYBLCdaaLW</info>
-    <info>php %command.full_name% 01771535-b29c-b898-923b-b5a981f5e417</info>
-EOF
+                    <info>php %command.full_name% 01EWAKBCMWQ2C94EXNN60ZBS0Q</info>
+                    <info>php %command.full_name% 1BVdfLn3ERmbjYBLCdaaLW</info>
+                    <info>php %command.full_name% 01771535-b29c-b898-923b-b5a981f5e417</info>
+                EOF
             )
         ;
     }
diff --git a/symfony/uid/Command/InspectUuidCommand.php b/symfony/uid/Command/InspectUuidCommand.php
index cc830bc35..a88eae23c 100644
--- a/symfony/uid/Command/InspectUuidCommand.php
+++ b/symfony/uid/Command/InspectUuidCommand.php
@@ -34,12 +34,12 @@ protected function configure(): void
                 new InputArgument('uuid', InputArgument::REQUIRED, 'The UUID to inspect'),
             ])
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> displays information about a UUID.
+                The <info>%command.name%</info> displays information about a UUID.
 
-    <info>php %command.full_name% a7613e0a-5986-11eb-a861-2bf05af69e52</info>
-    <info>php %command.full_name% MfnmaUvvQ1h8B14vTwt6dX</info>
-    <info>php %command.full_name% 57C4Z0MPC627NTGR9BY1DFD7JJ</info>
-EOF
+                    <info>php %command.full_name% a7613e0a-5986-11eb-a861-2bf05af69e52</info>
+                    <info>php %command.full_name% MfnmaUvvQ1h8B14vTwt6dX</info>
+                    <info>php %command.full_name% 57C4Z0MPC627NTGR9BY1DFD7JJ</info>
+                EOF
             )
         ;
     }
@@ -49,7 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 
         try {
-            /** @var Uuid $uuid */
             $uuid = Uuid::fromString($input->getArgument('uuid'));
         } catch (\InvalidArgumentException $e) {
             $io->error($e->getMessage());
@@ -62,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         } elseif (new MaxUuid() == $uuid) {
             $version = 'max';
         } else {
-            $version = uuid_type($uuid);
+            $version = hexdec($uuid->toRfc4122()[14]);
         }
 
         $rows = [
diff --git a/symfony/uid/Exception/InvalidArgumentException.php b/symfony/uid/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..c28737bea
--- /dev/null
+++ b/symfony/uid/Exception/InvalidArgumentException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/symfony/uid/Exception/LogicException.php b/symfony/uid/Exception/LogicException.php
new file mode 100644
index 000000000..2f0f6927c
--- /dev/null
+++ b/symfony/uid/Exception/LogicException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid\Exception;
+
+class LogicException extends \LogicException
+{
+}
diff --git a/symfony/uid/Factory/MockUuidFactory.php b/symfony/uid/Factory/MockUuidFactory.php
new file mode 100644
index 000000000..73ba79d8f
--- /dev/null
+++ b/symfony/uid/Factory/MockUuidFactory.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid\Factory;
+
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+use Symfony\Component\Uid\Exception\LogicException;
+use Symfony\Component\Uid\TimeBasedUidInterface;
+use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\UuidV1;
+use Symfony\Component\Uid\UuidV3;
+use Symfony\Component\Uid\UuidV4;
+use Symfony\Component\Uid\UuidV5;
+use Symfony\Component\Uid\UuidV6;
+
+class MockUuidFactory extends UuidFactory
+{
+    private \Iterator $sequence;
+
+    /**
+     * @param iterable<string|Uuid> $uuids
+     */
+    public function __construct(
+        iterable $uuids,
+        private Uuid|string|null $timeBasedNode = null,
+        private Uuid|string|null $nameBasedNamespace = null,
+    ) {
+        $this->sequence = match (true) {
+            \is_array($uuids) => new \ArrayIterator($uuids),
+            $uuids instanceof \Iterator => $uuids,
+            $uuids instanceof \Traversable => new \IteratorIterator($uuids),
+        };
+    }
+
+    public function create(): Uuid
+    {
+        if (!$this->sequence->valid()) {
+            throw new LogicException('No more UUIDs in sequence.');
+        }
+        $uuid = $this->sequence->current();
+        $this->sequence->next();
+
+        return match (true) {
+            $uuid instanceof Uuid => $uuid,
+            \is_string($uuid) => Uuid::fromString($uuid),
+            default => throw new InvalidArgumentException(\sprintf('Next UUID in sequence is not a valid UUID string or object: "%s" given.', get_debug_type($uuid))),
+        };
+    }
+
+    public function randomBased(): RandomBasedUuidFactory
+    {
+        return new class($this->create(...)) extends RandomBasedUuidFactory {
+            public function __construct(
+                private \Closure $create,
+            ) {
+            }
+
+            public function create(): UuidV4
+            {
+                if (!($uuid = ($this->create)()) instanceof UuidV4) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence is not a UuidV4: "%s" given.', get_debug_type($uuid)));
+                }
+
+                return $uuid;
+            }
+        };
+    }
+
+    public function timeBased(Uuid|string|null $node = null): TimeBasedUuidFactory
+    {
+        if (\is_string($node ??= $this->timeBasedNode)) {
+            $node = Uuid::fromString($node);
+        }
+
+        return new class($this->create(...), $node) extends TimeBasedUuidFactory {
+            public function __construct(
+                private \Closure $create,
+                private ?Uuid $node = null,
+            ) {
+            }
+
+            public function create(?\DateTimeInterface $time = null): Uuid&TimeBasedUidInterface
+            {
+                $uuid = ($this->create)();
+
+                if (!($uuid instanceof Uuid && $uuid instanceof TimeBasedUidInterface)) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence is not a Uuid and TimeBasedUidInterface: "%s" given.', get_debug_type($uuid)));
+                }
+
+                if (null !== $time && $uuid->getDateTime() !== $time) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence does not match the expected time: "%s" != "%s".', $uuid->getDateTime()->format('@U.uT'), $time->format('@U.uT')));
+                }
+
+                if (null !== $this->node && ($uuid instanceof UuidV1 || $uuid instanceof UuidV6) && $uuid->getNode() !== substr($this->node->toRfc4122(), -12)) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence does not match the expected node: "%s" != "%s".', $uuid->getNode(), substr($this->node->toRfc4122(), -12)));
+                }
+
+                return $uuid;
+            }
+        };
+    }
+
+    public function nameBased(Uuid|string|null $namespace = null): NameBasedUuidFactory
+    {
+        if (null === $namespace ??= $this->nameBasedNamespace) {
+            throw new LogicException(\sprintf('A namespace should be defined when using "%s()".', __METHOD__));
+        }
+
+        return new class($this->create(...), $namespace) extends NameBasedUuidFactory {
+            public function __construct(
+                private \Closure $create,
+                private Uuid|string $namespace,
+            ) {
+            }
+
+            public function create(string $name): UuidV5|UuidV3
+            {
+                if (!($uuid = ($this->create)()) instanceof UuidV5 && !$uuid instanceof UuidV3) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence is not a UuidV5 or UuidV3: "%s".', get_debug_type($uuid)));
+                }
+
+                $factory = new UuidFactory(nameBasedClass: $uuid::class, nameBasedNamespace: $this->namespace);
+
+                if ($uuid->toRfc4122() !== $expectedUuid = $factory->nameBased()->create($name)->toRfc4122()) {
+                    throw new InvalidArgumentException(\sprintf('Next UUID in sequence does not match the expected named UUID: "%s" != "%s".', $uuid->toRfc4122(), $expectedUuid));
+                }
+
+                return $uuid;
+            }
+        };
+    }
+}
diff --git a/symfony/uid/Factory/NameBasedUuidFactory.php b/symfony/uid/Factory/NameBasedUuidFactory.php
index c8cf36663..f9f80da1d 100644
--- a/symfony/uid/Factory/NameBasedUuidFactory.php
+++ b/symfony/uid/Factory/NameBasedUuidFactory.php
@@ -17,13 +17,10 @@
 
 class NameBasedUuidFactory
 {
-    private string $class;
-    private Uuid $namespace;
-
-    public function __construct(string $class, Uuid $namespace)
-    {
-        $this->class = $class;
-        $this->namespace = $namespace;
+    public function __construct(
+        private string $class,
+        private Uuid $namespace,
+    ) {
     }
 
     public function create(string $name): UuidV5|UuidV3
diff --git a/symfony/uid/Factory/RandomBasedUuidFactory.php b/symfony/uid/Factory/RandomBasedUuidFactory.php
index 67b147609..3e94fc8b9 100644
--- a/symfony/uid/Factory/RandomBasedUuidFactory.php
+++ b/symfony/uid/Factory/RandomBasedUuidFactory.php
@@ -15,11 +15,12 @@
 
 class RandomBasedUuidFactory
 {
-    private string $class;
-
-    public function __construct(string $class)
-    {
-        $this->class = $class;
+    /**
+     * @param class-string $class
+     */
+    public function __construct(
+        private string $class,
+    ) {
     }
 
     public function create(): UuidV4
diff --git a/symfony/uid/Factory/TimeBasedUuidFactory.php b/symfony/uid/Factory/TimeBasedUuidFactory.php
index 9c545ffc4..a24f24723 100644
--- a/symfony/uid/Factory/TimeBasedUuidFactory.php
+++ b/symfony/uid/Factory/TimeBasedUuidFactory.php
@@ -16,19 +16,13 @@
 
 class TimeBasedUuidFactory
 {
-    /**
-     * @var class-string<Uuid&TimeBasedUidInterface>
-     */
-    private string $class;
-    private ?Uuid $node;
-
     /**
      * @param class-string<Uuid&TimeBasedUidInterface> $class
      */
-    public function __construct(string $class, ?Uuid $node = null)
-    {
-        $this->class = $class;
-        $this->node = $node;
+    public function __construct(
+        private string $class,
+        private ?Uuid $node = null,
+    ) {
     }
 
     public function create(?\DateTimeInterface $time = null): Uuid&TimeBasedUidInterface
diff --git a/symfony/uid/Factory/UuidFactory.php b/symfony/uid/Factory/UuidFactory.php
index d1935c4ba..ab4afdcf3 100644
--- a/symfony/uid/Factory/UuidFactory.php
+++ b/symfony/uid/Factory/UuidFactory.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Uid\Factory;
 
+use Symfony\Component\Uid\Exception\LogicException;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV1;
 use Symfony\Component\Uid\UuidV4;
 use Symfony\Component\Uid\UuidV5;
-use Symfony\Component\Uid\UuidV6;
+use Symfony\Component\Uid\UuidV7;
 
 class UuidFactory
 {
@@ -26,7 +27,7 @@ class UuidFactory
     private ?Uuid $timeBasedNode;
     private ?Uuid $nameBasedNamespace;
 
-    public function __construct(string|int $defaultClass = UuidV6::class, string|int $timeBasedClass = UuidV6::class, string|int $nameBasedClass = UuidV5::class, string|int $randomBasedClass = UuidV4::class, Uuid|string|null $timeBasedNode = null, Uuid|string|null $nameBasedNamespace = null)
+    public function __construct(string|int $defaultClass = UuidV7::class, string|int $timeBasedClass = UuidV7::class, string|int $nameBasedClass = UuidV5::class, string|int $randomBasedClass = UuidV4::class, Uuid|string|null $timeBasedNode = null, Uuid|string|null $nameBasedNamespace = null)
     {
         if (null !== $timeBasedNode && !$timeBasedNode instanceof Uuid) {
             $timeBasedNode = Uuid::fromString($timeBasedNode);
@@ -67,12 +68,15 @@ public function timeBased(Uuid|string|null $node = null): TimeBasedUuidFactory
         return new TimeBasedUuidFactory($this->timeBasedClass, $node);
     }
 
+    /**
+     * @throws LogicException When no namespace is defined
+     */
     public function nameBased(Uuid|string|null $namespace = null): NameBasedUuidFactory
     {
         $namespace ??= $this->nameBasedNamespace;
 
         if (null === $namespace) {
-            throw new \LogicException(sprintf('A namespace should be defined when using "%s()".', __METHOD__));
+            throw new LogicException(\sprintf('A namespace should be defined when using "%s()".', __METHOD__));
         }
 
         return new NameBasedUuidFactory($this->nameBasedClass, $this->getNamespace($namespace));
diff --git a/symfony/uid/HashableInterface.php b/symfony/uid/HashableInterface.php
new file mode 100644
index 000000000..8a2787fb9
--- /dev/null
+++ b/symfony/uid/HashableInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid;
+
+if (interface_exists(\Ds\Hashable::class)) {
+    /**
+     * @internal
+     */
+    interface HashableInterface extends \Ds\Hashable
+    {
+        public function hash(): string;
+    }
+} else {
+    /**
+     * @internal
+     */
+    interface HashableInterface
+    {
+        public function equals(mixed $other): bool;
+
+        public function hash(): string;
+    }
+}
diff --git a/symfony/uid/Ulid.php b/symfony/uid/Ulid.php
index 5359067af..3d8b3ee7d 100644
--- a/symfony/uid/Ulid.php
+++ b/symfony/uid/Ulid.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
  * A ULID is lexicographically sortable and contains a 48-bit timestamp and 80-bit of crypto-random entropy.
  *
@@ -31,15 +33,15 @@ public function __construct(?string $ulid = null)
         if (null === $ulid) {
             $this->uid = static::generate();
         } elseif (self::NIL === $ulid) {
-            $this->uid = $ulid;
-        } elseif (self::MAX === strtr($ulid, 'z', 'Z')) {
-            $this->uid = $ulid;
+            $this->uid = self::NIL;
         } else {
-            if (!self::isValid($ulid)) {
-                throw new \InvalidArgumentException(sprintf('Invalid ULID: "%s".', $ulid));
-            }
-
             $this->uid = strtoupper($ulid);
+
+            if (self::MAX === $this->uid) {
+                $this->uid = self::MAX;
+            } elseif (!self::isValid($ulid)) {
+                throw new InvalidArgumentException(\sprintf('Invalid ULID: "%s".', $ulid));
+            }
         }
     }
 
@@ -59,7 +61,7 @@ public static function isValid(string $ulid): bool
     public static function fromString(string $ulid): static
     {
         if (36 === \strlen($ulid) && preg_match('{^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$}Di', $ulid)) {
-            $ulid = uuid_parse($ulid);
+            $ulid = hex2bin(str_replace('-', '', $ulid));
         } elseif (22 === \strlen($ulid) && 22 === strspn($ulid, BinaryUtil::BASE58[''])) {
             $ulid = str_pad(BinaryUtil::fromBase($ulid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
         }
@@ -73,7 +75,7 @@ public static function fromString(string $ulid): static
         }
 
         $ulid = bin2hex($ulid);
-        $ulid = sprintf('%02s%04s%04s%04s%04s%04s%04s',
+        $ulid = \sprintf('%02s%04s%04s%04s%04s%04s%04s',
             base_convert(substr($ulid, 0, 2), 16, 32),
             base_convert(substr($ulid, 2, 5), 16, 32),
             base_convert(substr($ulid, 7, 5), 16, 32),
@@ -101,7 +103,7 @@ public function toBinary(): string
     {
         $ulid = strtr($this->uid, 'ABCDEFGHJKMNPQRSTVWXYZ', 'abcdefghijklmnopqrstuv');
 
-        $ulid = sprintf('%02s%05s%05s%05s%05s%05s%05s',
+        $ulid = \sprintf('%02s%05s%05s%05s%05s%05s%05s',
             base_convert(substr($ulid, 0, 2), 32, 16),
             base_convert(substr($ulid, 2, 4), 32, 16),
             base_convert(substr($ulid, 6, 4), 32, 16),
@@ -133,7 +135,7 @@ public function getDateTime(): \DateTimeImmutable
         if (\PHP_INT_SIZE >= 8) {
             $time = (string) hexdec(base_convert($time, 32, 16));
         } else {
-            $time = sprintf('%02s%05s%05s',
+            $time = \sprintf('%02s%05s%05s',
                 base_convert(substr($time, 0, 2), 32, 16),
                 base_convert(substr($time, 2, 4), 32, 16),
                 base_convert(substr($time, 6, 4), 32, 16)
@@ -154,7 +156,7 @@ public static function generate(?\DateTimeInterface $time = null): string
             $time = microtime(false);
             $time = substr($time, 11).substr($time, 2, 3);
         } elseif (0 > $time = $time->format('Uv')) {
-            throw new \InvalidArgumentException('The timestamp must be positive.');
+            throw new InvalidArgumentException('The timestamp must be positive.');
         }
 
         if ($time > self::$time || (null !== $mtime && $time !== self::$time)) {
@@ -190,14 +192,14 @@ public static function generate(?\DateTimeInterface $time = null): string
             $time = base_convert($time, 10, 32);
         } else {
             $time = str_pad(bin2hex(BinaryUtil::fromBase($time, BinaryUtil::BASE10)), 12, '0', \STR_PAD_LEFT);
-            $time = sprintf('%s%04s%04s',
+            $time = \sprintf('%s%04s%04s',
                 base_convert(substr($time, 0, 2), 16, 32),
                 base_convert(substr($time, 2, 5), 16, 32),
                 base_convert(substr($time, 7, 5), 16, 32)
             );
         }
 
-        return strtr(sprintf('%010s%04s%04s%04s%04s',
+        return strtr(\sprintf('%010s%04s%04s%04s%04s',
             $time,
             base_convert(self::$rand[1], 10, 32),
             base_convert(self::$rand[2], 10, 32),
diff --git a/symfony/uid/Uuid.php b/symfony/uid/Uuid.php
index 85d366c18..e1c9735ee 100644
--- a/symfony/uid/Uuid.php
+++ b/symfony/uid/Uuid.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  *
- * @see https://tools.ietf.org/html/rfc4122#appendix-C for details about namespaces
+ * @see https://datatracker.ietf.org/doc/html/rfc9562/#section-6.6 for details about namespaces
  */
 class Uuid extends AbstractUid
 {
@@ -23,6 +25,13 @@ class Uuid extends AbstractUid
     public const NAMESPACE_OID = '6ba7b812-9dad-11d1-80b4-00c04fd430c8';
     public const NAMESPACE_X500 = '6ba7b814-9dad-11d1-80b4-00c04fd430c8';
 
+    public const FORMAT_BINARY = 1;
+    public const FORMAT_BASE_32 = 1 << 1;
+    public const FORMAT_BASE_58 = 1 << 2;
+    public const FORMAT_RFC_4122 = 1 << 3;
+    public const FORMAT_RFC_9562 = self::FORMAT_RFC_4122;
+    public const FORMAT_ALL = -1;
+
     protected const TYPE = 0;
     protected const NIL = '00000000-0000-0000-0000-000000000000';
     protected const MAX = 'ffffffff-ffff-ffff-ffff-ffffffffffff';
@@ -32,34 +41,19 @@ public function __construct(string $uuid, bool $checkVariant = false)
         $type = preg_match('{^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$}Di', $uuid) ? (int) $uuid[14] : false;
 
         if (false === $type || (static::TYPE ?: $type) !== $type) {
-            throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
+            throw new InvalidArgumentException(\sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
         }
 
         $this->uid = strtolower($uuid);
 
         if ($checkVariant && !\in_array($this->uid[19], ['8', '9', 'a', 'b'], true)) {
-            throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
+            throw new InvalidArgumentException(\sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
         }
     }
 
     public static function fromString(string $uuid): static
     {
-        if (22 === \strlen($uuid) && 22 === strspn($uuid, BinaryUtil::BASE58[''])) {
-            $uuid = str_pad(BinaryUtil::fromBase($uuid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
-        }
-
-        if (16 === \strlen($uuid)) {
-            // don't use uuid_unparse(), it's slower
-            $uuid = bin2hex($uuid);
-            $uuid = substr_replace($uuid, '-', 8, 0);
-            $uuid = substr_replace($uuid, '-', 13, 0);
-            $uuid = substr_replace($uuid, '-', 18, 0);
-            $uuid = substr_replace($uuid, '-', 23, 0);
-        } elseif (26 === \strlen($uuid) && Ulid::isValid($uuid)) {
-            $ulid = new NilUlid();
-            $ulid->uid = strtoupper($uuid);
-            $uuid = $ulid->toRfc4122();
-        }
+        $uuid = self::transformToRfc9562($uuid, self::FORMAT_ALL);
 
         if (__CLASS__ !== static::class || 36 !== \strlen($uuid)) {
             return new static($uuid);
@@ -130,8 +124,21 @@ final public static function v8(string $uuid): UuidV8
         return new UuidV8($uuid);
     }
 
-    public static function isValid(string $uuid): bool
+    /**
+     * @param int-mask-of<Uuid::FORMAT_*> $format
+     */
+    public static function isValid(string $uuid /* , int $format = self::FORMAT_RFC_9562 */): bool
     {
+        $format = 1 < \func_num_args() ? func_get_arg(1) : self::FORMAT_RFC_9562;
+
+        if (36 === \strlen($uuid) && !($format & self::FORMAT_RFC_9562)) {
+            return false;
+        }
+
+        if (false === $uuid = self::transformToRfc9562($uuid, $format)) {
+            return false;
+        }
+
         if (self::NIL === $uuid && \in_array(static::class, [__CLASS__, NilUuid::class], true)) {
             return true;
         }
@@ -149,13 +156,13 @@ public static function isValid(string $uuid): bool
 
     public function toBinary(): string
     {
-        return uuid_parse($this->uid);
+        return hex2bin(str_replace('-', '', $this->uid));
     }
 
     /**
-     * Returns the identifier as a RFC4122 case insensitive string.
+     * Returns the identifier as a RFC 9562/4122 case insensitive string.
      *
-     * @see https://tools.ietf.org/html/rfc4122#section-3
+     * @see https://datatracker.ietf.org/doc/html/rfc9562/#section-4
      *
      * @example 09748193-048a-4bfb-b825-8528cf74fdc1 (len=36)
      */
@@ -182,4 +189,42 @@ private static function format(string $uuid, string $version): string
 
         return substr_replace($uuid, '-', 23, 0);
     }
+
+    /**
+     * Transforms a binary string, a base-32 string or a base-58 string to a RFC9562 string.
+     *
+     * @param int-mask-of<Uuid::FORMAT_*> $format
+     *
+     * @return string|false The RFC9562 string or false if the format doesn't match the input
+     */
+    private static function transformToRfc9562(string $uuid, int $format): string|false
+    {
+        $inputUuid = $uuid;
+        $fromBase58 = false;
+        if (22 === \strlen($uuid) && 22 === strspn($uuid, BinaryUtil::BASE58['']) && $format & self::FORMAT_BASE_58) {
+            $uuid = str_pad(BinaryUtil::fromBase($uuid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
+            $fromBase58 = true;
+        }
+
+        // base-58 are always transformed to binary string, but they must only be valid when the format is FORMAT_BASE_58
+        if (16 === \strlen($uuid) && $format & self::FORMAT_BINARY || $fromBase58 && $format & self::FORMAT_BASE_58) {
+            // don't use uuid_unparse(), it's slower
+            $uuid = bin2hex($uuid);
+            $uuid = substr_replace($uuid, '-', 8, 0);
+            $uuid = substr_replace($uuid, '-', 13, 0);
+            $uuid = substr_replace($uuid, '-', 18, 0);
+            $uuid = substr_replace($uuid, '-', 23, 0);
+        } elseif (26 === \strlen($uuid) && Ulid::isValid($uuid) && $format & self::FORMAT_BASE_32) {
+            $ulid = new NilUlid();
+            $ulid->uid = strtoupper($uuid);
+            $uuid = $ulid->toRfc4122();
+        }
+
+        if ($inputUuid === $uuid && !($format & self::FORMAT_RFC_9562)) {
+            // input format doesn't match the input string
+            return false;
+        }
+
+        return $uuid;
+    }
 }
diff --git a/symfony/uid/UuidV1.php b/symfony/uid/UuidV1.php
index 1ec004168..983f559e4 100644
--- a/symfony/uid/UuidV1.php
+++ b/symfony/uid/UuidV1.php
@@ -25,7 +25,7 @@ class UuidV1 extends Uuid implements TimeBasedUidInterface
     public function __construct(?string $uuid = null)
     {
         if (null === $uuid) {
-            $this->uid = uuid_create(static::TYPE);
+            $this->uid = strtolower(uuid_create(static::TYPE));
         } else {
             parent::__construct($uuid, true);
         }
@@ -38,7 +38,19 @@ public function getDateTime(): \DateTimeImmutable
 
     public function getNode(): string
     {
-        return uuid_mac($this->uid);
+        return substr($this->uid, -12);
+    }
+
+    public function toV6(): UuidV6
+    {
+        $uuid = $this->uid;
+
+        return new UuidV6(substr($uuid, 15, 3).substr($uuid, 9, 4).$uuid[0].'-'.substr($uuid, 1, 4).'-6'.substr($uuid, 5, 3).substr($uuid, 18, 6).substr($uuid, 24));
+    }
+
+    public function toV7(): UuidV7
+    {
+        return $this->toV6()->toV7();
     }
 
     public static function generate(?\DateTimeInterface $time = null, ?Uuid $node = null): string
@@ -54,7 +66,7 @@ public static function generate(?\DateTimeInterface $time = null, ?Uuid $node =
                 $seq = substr($uuid, 19, 4);
 
                 do {
-                    self::$clockSeq = sprintf('%04x', random_int(0, 0x3FFF) | 0x8000);
+                    self::$clockSeq = \sprintf('%04x', random_int(0, 0x3FFF) | 0x8000);
                 } while ($seq === self::$clockSeq);
 
                 $seq = self::$clockSeq;
diff --git a/symfony/uid/UuidV4.php b/symfony/uid/UuidV4.php
index 9b96ef345..c23b05078 100644
--- a/symfony/uid/UuidV4.php
+++ b/symfony/uid/UuidV4.php
@@ -23,12 +23,19 @@ class UuidV4 extends Uuid
     public function __construct(?string $uuid = null)
     {
         if (null === $uuid) {
-            $uuid = random_bytes(16);
-            $uuid[6] = $uuid[6] & "\x0F" | "\x40";
-            $uuid[8] = $uuid[8] & "\x3F" | "\x80";
-            $uuid = bin2hex($uuid);
-
-            $this->uid = substr($uuid, 0, 8).'-'.substr($uuid, 8, 4).'-'.substr($uuid, 12, 4).'-'.substr($uuid, 16, 4).'-'.substr($uuid, 20, 12);
+            // Generate 36 random hex characters (144 bits)
+            // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            $uuid = bin2hex(random_bytes(18));
+            // Insert dashes to match the UUID format
+            // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+            $uuid[8] = $uuid[13] = $uuid[18] = $uuid[23] = '-';
+            // Set the UUID version to 4
+            // xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx
+            $uuid[14] = '4';
+            // Set the UUID variant: the 19th char must be in [8, 9, a, b]
+            // xxxxxxxx-xxxx-4xxx-?xxx-xxxxxxxxxxxx
+            $uuid[19] = ['8', '9', 'a', 'b', '8', '9', 'a', 'b', 'c' => '8', 'd' => '9', 'e' => 'a', 'f' => 'b'][$uuid[19]] ?? $uuid[19];
+            $this->uid = $uuid;
         } else {
             parent::__construct($uuid, true);
         }
diff --git a/symfony/uid/UuidV6.php b/symfony/uid/UuidV6.php
index b3492083c..ea65ae412 100644
--- a/symfony/uid/UuidV6.php
+++ b/symfony/uid/UuidV6.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
  * A v6 UUID is lexicographically sortable and contains a 60-bit timestamp and 62 extra unique bits.
  *
@@ -43,6 +45,33 @@ public function getNode(): string
         return substr($this->uid, 24);
     }
 
+    public function toV7(): UuidV7
+    {
+        $uuid = $this->uid;
+        $time = BinaryUtil::hexToNumericString('0'.substr($uuid, 0, 8).substr($uuid, 9, 4).substr($uuid, 15, 3));
+        if ('-' === $time[0]) {
+            throw new InvalidArgumentException('Cannot convert UUID to v7: its timestamp is before the Unix epoch.');
+        }
+
+        $ms = \strlen($time) > 4 ? substr($time, 0, -4) : '0';
+        $time = dechex(10000 * hexdec(substr($uuid, 20, 3)) + substr($time, -4));
+
+        if (\strlen($time) > 6) {
+            $uuid[29] = dechex(hexdec($uuid[29]) ^ hexdec($time[0]));
+            $time = substr($time, 1);
+        }
+
+        return new UuidV7(substr_replace(\sprintf(
+            '%012s-7%s-%s%s-%s%06s',
+            \PHP_INT_SIZE >= 8 ? dechex($ms) : bin2hex(BinaryUtil::fromBase($ms, BinaryUtil::BASE10)),
+            substr($uuid, -6, 3),
+            $uuid[19],
+            substr($uuid, -3),
+            substr($uuid, -12, 6),
+            $time
+        ), '-', 8, 0));
+    }
+
     public static function generate(?\DateTimeInterface $time = null, ?Uuid $node = null): string
     {
         $uuidV1 = UuidV1::generate($time, $node);
@@ -58,7 +87,7 @@ public static function generate(?\DateTimeInterface $time = null, ?Uuid $node =
         if (!isset(self::$node)) {
             $seed = [random_int(0, 0xFFFFFF), random_int(0, 0xFFFFFF)];
             $node = unpack('N2', hex2bin('00'.substr($uuidV1, 24, 6)).hex2bin('00'.substr($uuidV1, 30)));
-            self::$node = sprintf('%06x%06x', ($seed[0] ^ $node[1]) | 0x010000, $seed[1] ^ $node[2]);
+            self::$node = \sprintf('%06x%06x', ($seed[0] ^ $node[1]) | 0x010000, $seed[1] ^ $node[2]);
         }
 
         return $uuid.self::$node;
diff --git a/symfony/uid/UuidV7.php b/symfony/uid/UuidV7.php
index 43740b67e..febcfa713 100644
--- a/symfony/uid/UuidV7.php
+++ b/symfony/uid/UuidV7.php
@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\Uid;
 
+use Symfony\Component\Uid\Exception\InvalidArgumentException;
+
 /**
- * A v7 UUID is lexicographically sortable and contains a 48-bit timestamp and 74 extra unique bits.
+ * A v7 UUID is lexicographically sortable and contains a 58-bit timestamp and 64 extra unique bits.
  *
- * Within the same millisecond, monotonicity is ensured by incrementing the random part by a random increment.
+ * Within the same millisecond, the unique bits are incremented by a 24-bit random number.
+ * This method provides microsecond precision for the timestamp, and minimizes both the
+ * risk of collisions and the consumption of the OS' entropy pool.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
@@ -23,6 +27,7 @@ class UuidV7 extends Uuid implements TimeBasedUidInterface
     protected const TYPE = 7;
 
     private static string $time = '';
+    private static int $subMs = 0;
     private static array $rand = [];
     private static string $seed;
     private static array $seedParts;
@@ -45,23 +50,27 @@ public function getDateTime(): \DateTimeImmutable
         if (4 > \strlen($time)) {
             $time = '000'.$time;
         }
+        $time .= substr(1000 + (hexdec(substr($this->uid, 14, 4)) >> 2 & 0x3FF), -3);
 
-        return \DateTimeImmutable::createFromFormat('U.v', substr_replace($time, '.', -3, 0));
+        return \DateTimeImmutable::createFromFormat('U.u', substr_replace($time, '.', -6, 0));
     }
 
     public static function generate(?\DateTimeInterface $time = null): string
     {
         if (null === $mtime = $time) {
             $time = microtime(false);
+            $subMs = (int) substr($time, 5, 3);
             $time = substr($time, 11).substr($time, 2, 3);
-        } elseif (0 > $time = $time->format('Uv')) {
-            throw new \InvalidArgumentException('The timestamp must be positive.');
+        } elseif (0 > $time = $time->format('Uu')) {
+            throw new InvalidArgumentException('The timestamp must be positive.');
+        } else {
+            $subMs = (int) substr($time, -3);
+            $time = substr($time, 0, -3);
         }
 
         if ($time > self::$time || (null !== $mtime && $time !== self::$time)) {
             randomize:
-            self::$rand = unpack('n*', isset(self::$seed) ? random_bytes(10) : self::$seed = random_bytes(16));
-            self::$rand[1] &= 0x03FF;
+            self::$rand = unpack(\PHP_INT_SIZE >= 8 ? 'L*' : 'S*', isset(self::$seed) ? random_bytes(8) : self::$seed = random_bytes(16));
             self::$time = $time;
         } else {
             // Within the same ms, we increment the rand part by a random 24-bit number.
@@ -71,12 +80,12 @@ public static function generate(?\DateTimeInterface $time = null): string
             // them into 16 x 32-bit numbers; we take the first byte of each of these
             // numbers to get 5 extra 24-bit numbers. Then, we consume those numbers
             // one-by-one and run this logic every 21 iterations.
-            // self::$rand holds the random part of the UUID, split into 5 x 16-bit
-            // numbers for x86 portability. We increment this random part by the next
+            // self::$rand holds the random part of the UUID, split into 2 x 32-bit numbers
+            // or 4 x 16-bit for x86 portability. We increment this random part by the next
             // 24-bit number in the self::$seedParts list and decrement self::$seedIndex.
 
             if (!self::$seedIndex) {
-                $s = unpack('l*', self::$seed = hash('sha512', self::$seed, true));
+                $s = unpack(\PHP_INT_SIZE >= 8 ? 'L*' : 'l*', self::$seed = hash('sha512', self::$seed, true));
                 $s[] = ($s[1] >> 8 & 0xFF0000) | ($s[2] >> 16 & 0xFF00) | ($s[3] >> 24 & 0xFF);
                 $s[] = ($s[4] >> 8 & 0xFF0000) | ($s[5] >> 16 & 0xFF00) | ($s[6] >> 24 & 0xFF);
                 $s[] = ($s[7] >> 8 & 0xFF0000) | ($s[8] >> 16 & 0xFF00) | ($s[9] >> 24 & 0xFF);
@@ -86,40 +95,55 @@ public static function generate(?\DateTimeInterface $time = null): string
                 self::$seedIndex = 21;
             }
 
-            self::$rand[5] = 0xFFFF & $carry = self::$rand[5] + 1 + (self::$seedParts[self::$seedIndex--] & 0xFFFFFF);
-            self::$rand[4] = 0xFFFF & $carry = self::$rand[4] + ($carry >> 16);
-            self::$rand[3] = 0xFFFF & $carry = self::$rand[3] + ($carry >> 16);
-            self::$rand[2] = 0xFFFF & $carry = self::$rand[2] + ($carry >> 16);
-            self::$rand[1] += $carry >> 16;
-
-            if (0xFC00 & self::$rand[1]) {
-                if (\PHP_INT_SIZE >= 8 || 10 > \strlen($time = self::$time)) {
-                    $time = (string) (1 + $time);
-                } elseif ('999999999' === $mtime = substr($time, -9)) {
-                    $time = (1 + substr($time, 0, -9)).'000000000';
-                } else {
-                    $time = substr_replace($time, str_pad(++$mtime, 9, '0', \STR_PAD_LEFT), -9);
-                }
+            if (\PHP_INT_SIZE >= 8) {
+                self::$rand[2] = 0xFFFFFFFF & $carry = self::$rand[2] + 1 + (self::$seedParts[self::$seedIndex--] & 0xFFFFFF);
+                self::$rand[1] = 0xFFFFFFFF & $carry = self::$rand[1] + ($carry >> 32);
+                $carry >>= 32;
+            } else {
+                self::$rand[4] = 0xFFFF & $carry = self::$rand[4] + 1 + (self::$seedParts[self::$seedIndex--] & 0xFFFFFF);
+                self::$rand[3] = 0xFFFF & $carry = self::$rand[3] + ($carry >> 16);
+                self::$rand[2] = 0xFFFF & $carry = self::$rand[2] + ($carry >> 16);
+                self::$rand[1] = 0xFFFF & $carry = self::$rand[1] + ($carry >> 16);
+                $carry >>= 16;
+            }
 
-                goto randomize;
+            if ($carry && $subMs <= self::$subMs) {
+                usleep(1);
+
+                if (1024 <= ++$subMs) {
+                    if (\PHP_INT_SIZE >= 8 || 10 > \strlen($time = self::$time)) {
+                        $time = (string) (1 + $time);
+                    } elseif ('999999999' === $mtime = substr($time, -9)) {
+                        $time = (1 + substr($time, 0, -9)).'000000000';
+                    } else {
+                        $time = substr_replace($time, str_pad(++$mtime, 9, '0', \STR_PAD_LEFT), -9);
+                    }
+
+                    goto randomize;
+                }
             }
 
             $time = self::$time;
         }
+        self::$subMs = $subMs;
 
         if (\PHP_INT_SIZE >= 8) {
-            $time = dechex($time);
-        } else {
-            $time = bin2hex(BinaryUtil::fromBase($time, BinaryUtil::BASE10));
+            return substr_replace(\sprintf('%012x-%04x-%04x-%04x%08x',
+                $time,
+                0x7000 | ($subMs << 2) | (self::$rand[1] >> 30),
+                0x8000 | (self::$rand[1] >> 16 & 0x3FFF),
+                self::$rand[1] & 0xFFFF,
+                self::$rand[2],
+            ), '-', 8, 0);
         }
 
-        return substr_replace(sprintf('%012s-%04x-%04x-%04x%04x%04x',
-            $time,
-            0x7000 | (self::$rand[1] << 2) | (self::$rand[2] >> 14),
-            0x8000 | (self::$rand[2] & 0x3FFF),
+        return substr_replace(\sprintf('%012s-%04x-%04x-%04x%04x%04x',
+            bin2hex(BinaryUtil::fromBase($time, BinaryUtil::BASE10)),
+            0x7000 | ($subMs << 2) | (self::$rand[1] >> 14),
+            0x8000 | (self::$rand[1] & 0x3FFF),
+            self::$rand[2],
             self::$rand[3],
             self::$rand[4],
-            self::$rand[5],
         ), '-', 8, 0);
     }
 }
diff --git a/web-auth/cose-lib/src/Algorithm/Mac/Hmac.php b/web-auth/cose-lib/src/Algorithm/Mac/Hmac.php
index 7ad80808e..54ef46076 100644
--- a/web-auth/cose-lib/src/Algorithm/Mac/Hmac.php
+++ b/web-auth/cose-lib/src/Algorithm/Mac/Hmac.php
@@ -18,7 +18,7 @@ public function hash(string $data, Key $key): string
         $this->checKey($key);
         $signature = hash_hmac($this->getHashAlgorithm(), $data, (string) $key->get(SymmetricKey::DATA_K), true);
 
-        return mb_substr($signature, 0, intdiv($this->getSignatureLength(), 8), '8bit');
+        return substr($signature, 0, intdiv($this->getSignatureLength(), 8));
     }
 
     public function verify(string $data, Key $key, string $signature): bool
diff --git a/web-auth/cose-lib/src/Algorithm/ManagerFactory.php b/web-auth/cose-lib/src/Algorithm/ManagerFactory.php
index 548e0a72d..380d1e0c7 100644
--- a/web-auth/cose-lib/src/Algorithm/ManagerFactory.php
+++ b/web-auth/cose-lib/src/Algorithm/ManagerFactory.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use function array_key_exists;
+use function sprintf;
 
 final class ManagerFactory
 {
diff --git a/web-auth/cose-lib/src/Algorithm/Signature/ECDSA/ECSignature.php b/web-auth/cose-lib/src/Algorithm/Signature/ECDSA/ECSignature.php
index 43547001c..5995131a1 100644
--- a/web-auth/cose-lib/src/Algorithm/Signature/ECDSA/ECSignature.php
+++ b/web-auth/cose-lib/src/Algorithm/Signature/ECDSA/ECSignature.php
@@ -9,9 +9,9 @@
 use function dechex;
 use function hex2bin;
 use function hexdec;
-use function mb_strlen;
-use function mb_substr;
 use function str_pad;
+use function strlen;
+use function substr;
 use const STR_PAD_LEFT;
 
 /**
@@ -41,8 +41,8 @@ public static function toAsn1(string $signature, int $length): string
             throw new InvalidArgumentException('Invalid signature length.');
         }
 
-        $pointR = self::preparePositiveInteger(mb_substr($signature, 0, $length, '8bit'));
-        $pointS = self::preparePositiveInteger(mb_substr($signature, $length, null, '8bit'));
+        $pointR = self::preparePositiveInteger(substr($signature, 0, $length));
+        $pointS = self::preparePositiveInteger(substr($signature, $length, null));
 
         $lengthR = self::octetLength($pointR);
         $lengthS = self::octetLength($pointS);
@@ -80,20 +80,20 @@ public static function fromAsn1(string $signature, int $length): string
 
     private static function octetLength(string $data): int
     {
-        return intdiv(mb_strlen($data, '8bit'), self::BYTE_SIZE);
+        return intdiv(strlen($data), self::BYTE_SIZE);
     }
 
     private static function preparePositiveInteger(string $data): string
     {
-        if (mb_substr($data, 0, self::BYTE_SIZE, '8bit') > self::ASN1_BIG_INTEGER_LIMIT) {
+        if (substr($data, 0, self::BYTE_SIZE) > self::ASN1_BIG_INTEGER_LIMIT) {
             return self::ASN1_NEGATIVE_INTEGER . $data;
         }
 
         while (
-            mb_strpos($data, self::ASN1_NEGATIVE_INTEGER, 0, '8bit') === 0
-            && mb_substr($data, 2, self::BYTE_SIZE, '8bit') <= self::ASN1_BIG_INTEGER_LIMIT
+            str_starts_with($data, self::ASN1_NEGATIVE_INTEGER)
+            && substr($data, 2, self::BYTE_SIZE) <= self::ASN1_BIG_INTEGER_LIMIT
         ) {
-            $data = mb_substr($data, 2, null, '8bit');
+            $data = substr($data, 2, null);
         }
 
         return $data;
@@ -101,7 +101,7 @@ private static function preparePositiveInteger(string $data): string
 
     private static function readAsn1Content(string $message, int &$position, int $length): string
     {
-        $content = mb_substr($message, $position, $length, '8bit');
+        $content = substr($message, $position, $length);
         $position += $length;
 
         return $content;
@@ -121,10 +121,10 @@ private static function readAsn1Integer(string $message, int &$position): string
     private static function retrievePositiveInteger(string $data): string
     {
         while (
-            mb_strpos($data, self::ASN1_NEGATIVE_INTEGER, 0, '8bit') === 0
-            && mb_substr($data, 2, self::BYTE_SIZE, '8bit') > self::ASN1_BIG_INTEGER_LIMIT
+            str_starts_with($data, self::ASN1_NEGATIVE_INTEGER)
+            && substr($data, 2, self::BYTE_SIZE) > self::ASN1_BIG_INTEGER_LIMIT
         ) {
-            $data = mb_substr($data, 2, null, '8bit');
+            $data = substr($data, 2, null);
         }
 
         return $data;
diff --git a/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/EdDSA.php b/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/EdDSA.php
index 7a0278b3e..37426e9fd 100644
--- a/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/EdDSA.php
+++ b/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/EdDSA.php
@@ -43,12 +43,10 @@ public function verify(string $data, Key $key, string $signature): bool
             throw new InvalidArgumentException('Unsupported curve');
         }
         try {
-            sodium_crypto_sign_verify_detached($signature, $data, $key->x());
+            return sodium_crypto_sign_verify_detached($signature, $data, $key->x());
         } catch (Throwable) {
             return false;
         }
-
-        return true;
     }
 
     public static function identifier(): int
diff --git a/web-auth/cose-lib/src/Algorithm/Signature/RSA/PSSRSA.php b/web-auth/cose-lib/src/Algorithm/Signature/RSA/PSSRSA.php
index e2fa31963..d383dce62 100644
--- a/web-auth/cose-lib/src/Algorithm/Signature/RSA/PSSRSA.php
+++ b/web-auth/cose-lib/src/Algorithm/Signature/RSA/PSSRSA.php
@@ -14,13 +14,12 @@
 use function ceil;
 use function chr;
 use function hash_equals;
-use function mb_strlen;
-use function mb_substr;
 use function ord;
 use function pack;
 use function random_bytes;
 use function str_pad;
 use function str_repeat;
+use function strlen;
 use const STR_PAD_LEFT;
 
 /**
@@ -31,7 +30,7 @@ abstract class PSSRSA implements Signature
     public function sign(string $data, Key $key): string
     {
         $key = $this->handleKey($key);
-        $modulusLength = mb_strlen($key->n(), '8bit');
+        $modulusLength = strlen($key->n());
 
         $em = $this->encodeEMSAPSS($data, 8 * $modulusLength - 1, $this->getHashAlgorithm());
         $message = BigInteger::createFromBinaryString($em);
@@ -43,8 +42,8 @@ public function sign(string $data, Key $key): string
     public function verify(string $data, Key $key, string $signature): bool
     {
         $key = $this->handleKey($key);
-        $modulusLength = mb_strlen($key->n(), '8bit');
-        if (mb_strlen($signature, '8bit') !== $modulusLength) {
+        $modulusLength = strlen($key->n());
+        if (strlen($signature) !== $modulusLength) {
             throw new InvalidArgumentException('Invalid modulus length');
         }
         $s2 = BigInteger::createFromBinaryString($signature);
@@ -99,7 +98,7 @@ private function handleKey(Key $key): RsaKey
     private function convertIntegerToOctetString(BigInteger $x, int $xLen): string
     {
         $xB = $x->toBytes();
-        if (mb_strlen($xB, '8bit') > $xLen) {
+        if (strlen($xB) > $xLen) {
             throw new RuntimeException('Unable to convert the integer');
         }
 
@@ -118,7 +117,7 @@ private function getMGF1(string $mgfSeed, int $maskLen, Hash $mgfHash): string
             $t .= $mgfHash->hash($mgfSeed . $c);
         }
 
-        return mb_substr($t, 0, $maskLen, '8bit');
+        return substr($t, 0, $maskLen);
     }
 
     /**
@@ -155,11 +154,11 @@ private function verifyEMSAPSS(string $m, string $em, int $emBits, Hash $hash):
         if ($emLen < $hash->getLength() + $sLen + 2) {
             throw new InvalidArgumentException();
         }
-        if ($em[mb_strlen($em, '8bit') - 1] !== chr(0xBC)) {
+        if ($em[strlen($em) - 1] !== chr(0xBC)) {
             throw new InvalidArgumentException();
         }
-        $maskedDB = mb_substr($em, 0, -$hash->getLength() - 1, '8bit');
-        $h = mb_substr($em, -$hash->getLength() - 1, $hash->getLength(), '8bit');
+        $maskedDB = substr($em, 0, -$hash->getLength() - 1);
+        $h = substr($em, -$hash->getLength() - 1, $hash->getLength());
         $temp = chr(0xFF << ($emBits & 7));
         if ((~$maskedDB[0] & $temp) !== $temp) {
             throw new InvalidArgumentException();
@@ -168,13 +167,13 @@ private function verifyEMSAPSS(string $m, string $em, int $emBits, Hash $hash):
         $db = $maskedDB ^ $dbMask;
         $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
         $temp = $emLen - $hash->getLength() - $sLen - 2;
-        if (mb_strpos($db, str_repeat(chr(0), $temp), 0, '8bit') !== 0) {
+        if (! str_starts_with($db, str_repeat(chr(0), $temp))) {
             throw new InvalidArgumentException();
         }
         if (ord($db[$temp]) !== 1) {
             throw new InvalidArgumentException();
         }
-        $salt = mb_substr($db, $temp + 1, null, '8bit'); // should be $sLen long
+        $salt = substr($db, $temp + 1, null); // should be $sLen long
         $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
         $h2 = $hash->hash($m2);
 
diff --git a/web-auth/cose-lib/src/BigInteger.php b/web-auth/cose-lib/src/BigInteger.php
index e0ef082fa..d45fd39b6 100644
--- a/web-auth/cose-lib/src/BigInteger.php
+++ b/web-auth/cose-lib/src/BigInteger.php
@@ -7,6 +7,7 @@
 use Brick\Math\BigInteger as BrickBigInteger;
 use function chr;
 use function hex2bin;
+use function strlen;
 use function unpack;
 
 /**
@@ -42,7 +43,7 @@ public function toBytes(): string
         }
 
         $temp = $this->value->toBase(16);
-        $temp = 0 !== (mb_strlen($temp, '8bit') & 1) ? '0' . $temp : $temp;
+        $temp = 0 !== (strlen($temp) & 1) ? '0' . $temp : $temp;
         $temp = hex2bin($temp);
 
         return ltrim($temp, chr(0));
diff --git a/web-auth/cose-lib/src/Key/Ec2Key.php b/web-auth/cose-lib/src/Key/Ec2Key.php
index e0fa7e19f..38b916d29 100644
--- a/web-auth/cose-lib/src/Key/Ec2Key.php
+++ b/web-auth/cose-lib/src/Key/Ec2Key.php
@@ -14,6 +14,8 @@
 use function array_key_exists;
 use function in_array;
 use function is_int;
+use function sprintf;
+use function strlen;
 
 /**
  * @final
@@ -93,10 +95,10 @@ public function __construct(array $data)
         if (! isset($data[self::DATA_CURVE], $data[self::DATA_X], $data[self::DATA_Y])) {
             throw new InvalidArgumentException('Invalid EC2 key. The curve or the "x/y" coordinates are missing');
         }
-        if (mb_strlen((string) $data[self::DATA_X], '8bit') !== self::CURVE_KEY_LENGTH[$data[self::DATA_CURVE]]) {
+        if (strlen((string) $data[self::DATA_X]) !== self::CURVE_KEY_LENGTH[$data[self::DATA_CURVE]]) {
             throw new InvalidArgumentException('Invalid length for x coordinate');
         }
-        if (mb_strlen((string) $data[self::DATA_Y], '8bit') !== self::CURVE_KEY_LENGTH[$data[self::DATA_CURVE]]) {
+        if (strlen((string) $data[self::DATA_Y]) !== self::CURVE_KEY_LENGTH[$data[self::DATA_CURVE]]) {
             throw new InvalidArgumentException('Invalid length for y coordinate');
         }
         if (is_int($data[self::DATA_CURVE])) {
@@ -188,8 +190,8 @@ private function getCurveOid(): string
 
     private function pem(string $type, string $der): string
     {
-        return sprintf("-----BEGIN %s-----\n", mb_strtoupper($type)) .
+        return sprintf("-----BEGIN %s-----\n", strtoupper($type)) .
             chunk_split(base64_encode($der), 64, "\n") .
-            sprintf("-----END %s-----\n", mb_strtoupper($type));
+            sprintf("-----END %s-----\n", strtoupper($type));
     }
 }
diff --git a/web-auth/cose-lib/src/Key/Key.php b/web-auth/cose-lib/src/Key/Key.php
index 7b28f7b91..b35010ceb 100644
--- a/web-auth/cose-lib/src/Key/Key.php
+++ b/web-auth/cose-lib/src/Key/Key.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use function array_key_exists;
+use function sprintf;
 
 class Key
 {
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php b/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php
index eb54b7b40..002423545 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php
@@ -29,6 +29,7 @@
 use function is_array;
 use function openssl_pkey_get_public;
 use function openssl_verify;
+use function sprintf;
 
 final class AndroidKeyAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents
 {
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php b/web-auth/webauthn-lib/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php
deleted file mode 100644
index cd87757c3..000000000
--- a/web-auth/webauthn-lib/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\AttestationStatement;
-
-use Jose\Component\Core\Algorithm as AlgorithmInterface;
-use Jose\Component\Core\AlgorithmManager;
-use Jose\Component\KeyManagement\JWKFactory;
-use Jose\Component\Signature\Algorithm\EdDSA;
-use Jose\Component\Signature\Algorithm\ES256;
-use Jose\Component\Signature\Algorithm\ES384;
-use Jose\Component\Signature\Algorithm\ES512;
-use Jose\Component\Signature\Algorithm\PS256;
-use Jose\Component\Signature\Algorithm\PS384;
-use Jose\Component\Signature\Algorithm\PS512;
-use Jose\Component\Signature\Algorithm\RS256;
-use Jose\Component\Signature\Algorithm\RS384;
-use Jose\Component\Signature\Algorithm\RS512;
-use Jose\Component\Signature\JWS;
-use Jose\Component\Signature\JWSVerifier;
-use Jose\Component\Signature\Serializer\CompactSerializer;
-use Psr\Clock\ClockInterface;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Webauthn\AuthenticatorData;
-use Webauthn\Event\AttestationStatementLoaded;
-use Webauthn\Event\CanDispatchEvents;
-use Webauthn\Event\NullEventDispatcher;
-use Webauthn\Exception\AttestationStatementLoadingException;
-use Webauthn\Exception\AttestationStatementVerificationException;
-use Webauthn\Exception\InvalidAttestationStatementException;
-use Webauthn\Exception\UnsupportedFeatureException;
-use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\TrustPath\CertificateTrustPath;
-use function array_key_exists;
-use function count;
-use function is_array;
-use function is_int;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Android SafetyNet is now deprecated.
- */
-final class AndroidSafetyNetAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents
-{
-    private ?string $apiKey = null;
-
-    private null|ClientInterface|HttpClientInterface $client = null;
-
-    private readonly CompactSerializer $jwsSerializer;
-
-    private ?JWSVerifier $jwsVerifier = null;
-
-    private ?RequestFactoryInterface $requestFactory = null;
-
-    private int $leeway = 0;
-
-    private int $maxAge = 60000;
-
-    private EventDispatcherInterface $dispatcher;
-
-    public function __construct(
-        private readonly null|ClockInterface $clock = null
-    ) {
-        if ($this->clock === null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$clock" will be required in 5.0.0. Please set a clock instance.'
-            );
-        }
-        if (! class_exists(RS256::class) || ! class_exists(JWKFactory::class)) {
-            throw UnsupportedFeatureException::create(
-                'The algorithm RS256 is missing. Did you forget to install the package web-token/jwt-library?'
-            );
-        }
-        $this->jwsSerializer = new CompactSerializer();
-        $this->initJwsVerifier();
-        $this->dispatcher = new NullEventDispatcher();
-    }
-
-    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): void
-    {
-        $this->dispatcher = $eventDispatcher;
-    }
-
-    public static function create(null|ClockInterface $clock = null): self
-    {
-        return new self($clock);
-    }
-
-    public function enableApiVerification(
-        ClientInterface|HttpClientInterface $client,
-        string $apiKey,
-        ?RequestFactoryInterface $requestFactory = null
-    ): self {
-        $this->apiKey = $apiKey;
-        $this->client = $client;
-        $this->requestFactory = $requestFactory;
-        if ($requestFactory !== null && ! $client instanceof HttpClientInterface) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.7.0',
-                'The parameter "$requestFactory" will be removed in 5.0.0. Please set it to null and set an Symfony\Contracts\HttpClient\HttpClientInterface as "$client" argument.'
-            );
-        }
-
-        return $this;
-    }
-
-    public function setMaxAge(int $maxAge): self
-    {
-        $this->maxAge = $maxAge;
-
-        return $this;
-    }
-
-    public function setLeeway(int $leeway): self
-    {
-        $this->leeway = $leeway;
-
-        return $this;
-    }
-
-    public function name(): string
-    {
-        return 'android-safetynet';
-    }
-
-    /**
-     * @param array<string, mixed> $attestation
-     */
-    public function load(array $attestation): AttestationStatement
-    {
-        array_key_exists('attStmt', $attestation) || throw AttestationStatementLoadingException::create(
-            $attestation
-        );
-        foreach (['ver', 'response'] as $key) {
-            array_key_exists($key, $attestation['attStmt']) || throw AttestationStatementLoadingException::create(
-                $attestation,
-                sprintf('The attestation statement value "%s" is missing.', $key)
-            );
-            $attestation['attStmt'][$key] !== '' || throw AttestationStatementLoadingException::create(
-                $attestation,
-                sprintf('The attestation statement value "%s" is empty.', $key)
-            );
-        }
-        $jws = $this->jwsSerializer->unserialize($attestation['attStmt']['response']);
-        $jwsHeader = $jws->getSignature(0)
-            ->getProtectedHeader();
-        array_key_exists('x5c', $jwsHeader) || throw AttestationStatementLoadingException::create(
-            $attestation,
-            'The response in the attestation statement must contain a "x5c" header.'
-        );
-        (is_countable($jwsHeader['x5c']) ? count(
-            $jwsHeader['x5c']
-        ) : 0) > 0 || throw AttestationStatementLoadingException::create(
-            $attestation,
-            'The "x5c" parameter in the attestation statement response must contain at least one certificate.'
-        );
-        $certificates = $this->convertCertificatesToPem($jwsHeader['x5c']);
-        $attestation['attStmt']['jws'] = $jws;
-
-        $attestationStatement = AttestationStatement::createBasic(
-            $this->name(),
-            $attestation['attStmt'],
-            CertificateTrustPath::create($certificates)
-        );
-        $this->dispatcher->dispatch(AttestationStatementLoaded::create($attestationStatement));
-
-        return $attestationStatement;
-    }
-
-    public function isValid(
-        string $clientDataJSONHash,
-        AttestationStatement $attestationStatement,
-        AuthenticatorData $authenticatorData
-    ): bool {
-        $trustPath = $attestationStatement->trustPath;
-        $trustPath instanceof CertificateTrustPath || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'Invalid trust path'
-        );
-        $certificates = $trustPath->certificates;
-        $firstCertificate = current($certificates);
-        is_string($firstCertificate) || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'No certificate'
-        );
-
-        $parsedCertificate = openssl_x509_parse($firstCertificate);
-        is_array($parsedCertificate) || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'Invalid attestation object'
-        );
-        array_key_exists('subject', $parsedCertificate) || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'Invalid attestation object'
-        );
-        array_key_exists('CN', $parsedCertificate['subject']) || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'Invalid attestation object'
-        );
-        $parsedCertificate['subject']['CN'] === 'attest.android.com' || throw InvalidAttestationStatementException::create(
-            $attestationStatement,
-            'Invalid attestation object'
-        );
-
-        /** @var JWS $jws */
-        $jws = $attestationStatement->get('jws');
-        $payload = $jws->getPayload();
-        $this->validatePayload($payload, $clientDataJSONHash, $authenticatorData);
-
-        //Check the signature
-        $this->validateSignature($jws, $trustPath);
-
-        //Check against Google service
-        $this->validateUsingGoogleApi($attestationStatement);
-
-        return true;
-    }
-
-    private function validatePayload(
-        ?string $payload,
-        string $clientDataJSONHash,
-        AuthenticatorData $authenticatorData
-    ): void {
-        $payload !== null || throw AttestationStatementVerificationException::create('Invalid attestation object');
-        $payload = json_decode($payload, true, flags: JSON_THROW_ON_ERROR);
-        array_key_exists('nonce', $payload) || throw AttestationStatementVerificationException::create(
-            'Invalid attestation object. "nonce" is missing.'
-        );
-        $payload['nonce'] === base64_encode(
-            hash('sha256', $authenticatorData->authData . $clientDataJSONHash, true)
-        ) || throw AttestationStatementVerificationException::create('Invalid attestation object. Invalid nonce');
-        array_key_exists('ctsProfileMatch', $payload) || throw AttestationStatementVerificationException::create(
-            'Invalid attestation object. "ctsProfileMatch" is missing.'
-        );
-        $payload['ctsProfileMatch'] || throw AttestationStatementVerificationException::create(
-            'Invalid attestation object. "ctsProfileMatch" value is false.'
-        );
-        array_key_exists('timestampMs', $payload) || throw AttestationStatementVerificationException::create(
-            'Invalid attestation object. Timestamp is missing.'
-        );
-        is_int($payload['timestampMs']) || throw AttestationStatementVerificationException::create(
-            'Invalid attestation object. Timestamp shall be an integer.'
-        );
-
-        $currentTime = ($this->clock?->now()->getTimestamp() ?? time()) * 1000;
-        $payload['timestampMs'] <= $currentTime + $this->leeway || throw AttestationStatementVerificationException::create(
-            sprintf(
-                'Invalid attestation object. Issued in the future. Current time: %d. Response time: %d',
-                $currentTime,
-                $payload['timestampMs']
-            )
-        );
-        $currentTime - $payload['timestampMs'] <= $this->maxAge || throw AttestationStatementVerificationException::create(
-            sprintf(
-                'Invalid attestation object. Too old. Current time: %d. Response time: %d',
-                $currentTime,
-                $payload['timestampMs']
-            )
-        );
-    }
-
-    private function validateSignature(JWS $jws, CertificateTrustPath $trustPath): void
-    {
-        $jwk = JWKFactory::createFromCertificate($trustPath->certificates[0]);
-        $isValid = $this->jwsVerifier?->verifyWithKey($jws, $jwk, 0);
-        $isValid === true || throw AttestationStatementVerificationException::create('Invalid response signature');
-    }
-
-    private function validateUsingGoogleApi(AttestationStatement $attestationStatement): void
-    {
-        if ($this->client === null || $this->apiKey === null) {
-            return;
-        }
-        $uri = sprintf(
-            'https://www.googleapis.com/androidcheck/v1/attestations/verify?key=%s',
-            urlencode($this->apiKey)
-        );
-        $requestBody = sprintf('{"signedAttestation":"%s"}', $attestationStatement->get('response'));
-        if ($this->client instanceof HttpClientInterface) {
-            $responseBody = $this->validateUsingGoogleApiWithSymfonyClient($requestBody, $uri);
-        } else {
-            $responseBody = $this->validateUsingGoogleApiWithPsrClient($requestBody, $uri);
-        }
-        $responseBodyJson = json_decode($responseBody, true, flags: JSON_THROW_ON_ERROR);
-        array_key_exists(
-            'isValidSignature',
-            $responseBodyJson
-        ) || throw AttestationStatementVerificationException::create('Invalid response.');
-        $responseBodyJson['isValidSignature'] === true || throw AttestationStatementVerificationException::create(
-            'Invalid response.'
-        );
-    }
-
-    private function getResponseBody(ResponseInterface $response): string
-    {
-        $responseBody = '';
-        $response->getBody()
-            ->rewind();
-        do {
-            $tmp = $response->getBody()
-                ->read(1024);
-            if ($tmp === '') {
-                break;
-            }
-            $responseBody .= $tmp;
-        } while (true);
-
-        return $responseBody;
-    }
-
-    /**
-     * @param string[] $certificates
-     *
-     * @return string[]
-     */
-    private function convertCertificatesToPem(array $certificates): array
-    {
-        foreach ($certificates as $k => $v) {
-            $certificates[$k] = CertificateToolbox::fixPEMStructure($v);
-        }
-
-        return $certificates;
-    }
-
-    private function initJwsVerifier(): void
-    {
-        $algorithmClasses = [
-            RS256::class, RS384::class, RS512::class,
-            PS256::class, PS384::class, PS512::class,
-            ES256::class, ES384::class, ES512::class,
-            EdDSA::class,
-        ];
-        /** @var AlgorithmInterface[] $algorithms */
-        $algorithms = [];
-        foreach ($algorithmClasses as $algorithm) {
-            if (class_exists($algorithm)) {
-                $algorithms[] = new $algorithm();
-            }
-        }
-        $algorithmManager = new AlgorithmManager($algorithms);
-        $this->jwsVerifier = new JWSVerifier($algorithmManager);
-    }
-
-    private function validateUsingGoogleApiWithSymfonyClient(string $requestBody, string $uri): string
-    {
-        $response = $this->client->request('POST', $uri, [
-            'headers' => [
-                'content-type' => 'application/json',
-            ],
-            'body' => $requestBody,
-        ]);
-        $response->getStatusCode() === 200 || throw AttestationStatementVerificationException::create(
-            'Request did not succeeded'
-        );
-
-        return $response->getContent();
-    }
-
-    private function validateUsingGoogleApiWithPsrClient(string $requestBody, string $uri): string
-    {
-        $request = $this->requestFactory->createRequest('POST', $uri);
-        $request = $request->withHeader('content-type', 'application/json');
-        $request->getBody()
-            ->write($requestBody);
-
-        $response = $this->client->sendRequest($request);
-        $response->getStatusCode() === 200 || throw AttestationStatementVerificationException::create(
-            'Request did not succeeded'
-        );
-
-        return $this->getResponseBody($response);
-    }
-}
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php b/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php
index a89cccac6..5ad36ab71 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/AttestationObject.php
@@ -25,60 +25,4 @@ public static function create(
     ): self {
         return new self($rawAttestationObject, $attStmt, $authData);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRawAttestationObject(): string
-    {
-        return $this->rawAttestationObject;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttStmt(): AttestationStatement
-    {
-        return $this->attStmt;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setAttStmt(AttestationStatement $attStmt): void
-    {
-        $this->attStmt = $attStmt;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthData(): AuthenticatorData
-    {
-        return $this->authData;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMetadataStatement(): ?MetadataStatement
-    {
-        return $this->metadataStatement;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setMetadataStatement(MetadataStatement $metadataStatement): self
-    {
-        $this->metadataStatement = $metadataStatement;
-
-        return $this;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatement.php b/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatement.php
index 5285de2eb..2f365bb91 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatement.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatement.php
@@ -4,13 +4,12 @@
 
 namespace Webauthn\AttestationStatement;
 
-use JsonSerializable;
 use Webauthn\Exception\InvalidDataException;
 use Webauthn\TrustPath\TrustPath;
-use Webauthn\TrustPath\TrustPathLoader;
 use function array_key_exists;
+use function sprintf;
 
-class AttestationStatement implements JsonSerializable
+class AttestationStatement
 {
     final public const TYPE_NONE = 'none';
 
@@ -20,12 +19,6 @@ class AttestationStatement implements JsonSerializable
 
     final public const TYPE_ATTCA = 'attca';
 
-    /**
-     * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
-     * @infection-ignore-all
-     */
-    final public const TYPE_ECDAA = 'ecdaa';
-
     final public const TYPE_ANONCA = 'anonca';
 
     /**
@@ -76,17 +69,6 @@ public static function createAttCA(string $fmt, array $attStmt, TrustPath $trust
         return self::create($fmt, $attStmt, self::TYPE_ATTCA, $trustPath);
     }
 
-    /**
-     * @param array<string, mixed> $attStmt
-     *
-     * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
-     * @infection-ignore-all
-     */
-    public static function createEcdaa(string $fmt, array $attStmt, TrustPath $trustPath): self
-    {
-        return self::create($fmt, $attStmt, self::TYPE_ECDAA, $trustPath);
-    }
-
     /**
      * @param array<string, mixed> $attStmt
      */
@@ -95,25 +77,6 @@ public static function createAnonymizationCA(string $fmt, array $attStmt, TrustP
         return self::create($fmt, $attStmt, self::TYPE_ANONCA, $trustPath);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getFmt(): string
-    {
-        return $this->fmt;
-    }
-
-    /**
-     * @return mixed[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttStmt(): array
-    {
-        return $this->attStmt;
-    }
-
     public function has(string $key): bool
     {
         return array_key_exists($key, $this->attStmt);
@@ -128,63 +91,4 @@ public function get(string $key): mixed
 
         return $this->attStmt[$key];
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTrustPath(): TrustPath
-    {
-        return $this->trustPath;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param mixed[] $data
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        foreach (['fmt', 'attStmt', 'trustPath', 'type'] as $key) {
-            array_key_exists($key, $data) || throw InvalidDataException::create($data, sprintf(
-                'The key "%s" is missing',
-                $key
-            ));
-        }
-
-        return self::create(
-            $data['fmt'],
-            $data['attStmt'],
-            $data['type'],
-            TrustPathLoader::loadTrustPath($data['trustPath'])
-        );
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'fmt' => $this->fmt,
-            'attStmt' => $this->attStmt,
-            'trustPath' => $this->trustPath,
-            'type' => $this->type,
-        ];
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatementSupportManager.php b/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatementSupportManager.php
index 089028810..7687d8d35 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatementSupportManager.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/AttestationStatementSupportManager.php
@@ -6,6 +6,7 @@
 
 use Webauthn\Exception\InvalidDataException;
 use function array_key_exists;
+use function sprintf;
 
 class AttestationStatementSupportManager
 {
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/FidoU2FAttestationStatementSupport.php b/web-auth/webauthn-lib/src/AttestationStatement/FidoU2FAttestationStatementSupport.php
index db4bf3a12..c0d812b2f 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/FidoU2FAttestationStatementSupport.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/FidoU2FAttestationStatementSupport.php
@@ -24,6 +24,7 @@
 use function is_array;
 use function openssl_pkey_get_public;
 use function openssl_verify;
+use function sprintf;
 use const OPENSSL_ALGO_SHA256;
 
 final class FidoU2FAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php b/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php
index 7af35f589..ec967e0c6 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/PackedAttestationStatementSupport.php
@@ -19,11 +19,9 @@
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
 use Webauthn\Exception\InvalidDataException;
-use Webauthn\Exception\UnsupportedFeatureException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
-use Webauthn\TrustPath\EcdaaKeyIdTrustPath;
 use Webauthn\TrustPath\EmptyTrustPath;
 use Webauthn\Util\CoseSignatureFixer;
 use function array_key_exists;
@@ -81,7 +79,6 @@ public function load(array $attestation): AttestationStatement
 
         return match (true) {
             array_key_exists('x5c', $attestation['attStmt']) => $this->loadBasicType($attestation),
-            array_key_exists('ecdaaKeyId', $attestation['attStmt']) => $this->loadEcdaaType($attestation['attStmt']),
             default => $this->loadEmptyType($attestation),
         };
     }
@@ -100,7 +97,6 @@ public function isValid(
                 $authenticatorData,
                 $trustPath
             ),
-            $trustPath instanceof EcdaaKeyIdTrustPath => $this->processWithECDAA(),
             $trustPath instanceof EmptyTrustPath => $this->processWithSelfAttestation(
                 $clientDataJSONHash,
                 $attestationStatement,
@@ -137,26 +133,6 @@ private function loadBasicType(array $attestation): AttestationStatement
         return $attestationStatement;
     }
 
-    /**
-     * @param array<string, mixed> $attestation
-     */
-    private function loadEcdaaType(array $attestation): AttestationStatement
-    {
-        $ecdaaKeyId = $attestation['attStmt']['ecdaaKeyId'];
-        is_string($ecdaaKeyId) || throw AttestationStatementVerificationException::create(
-            'The attestation statement value "ecdaaKeyId" is invalid.'
-        );
-
-        $attestationStatement = AttestationStatement::createEcdaa(
-            $attestation['fmt'],
-            $attestation['attStmt'],
-            new EcdaaKeyIdTrustPath($attestation['ecdaaKeyId'])
-        );
-        $this->dispatcher->dispatch(AttestationStatementLoaded::create($attestationStatement));
-
-        return $attestationStatement;
-    }
-
     /**
      * @param mixed[] $attestation
      */
@@ -256,11 +232,6 @@ private function processWithCertificate(
         return $result === 1;
     }
 
-    private function processWithECDAA(): never
-    {
-        throw UnsupportedFeatureException::create('ECDAA not supported');
-    }
-
     private function processWithSelfAttestation(
         string $clientDataJSONHash,
         AttestationStatement $attestationStatement,
diff --git a/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php b/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php
index 71a60ca61..4c7f08c47 100644
--- a/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php
+++ b/web-auth/webauthn-lib/src/AttestationStatement/TPMAttestationStatementSupport.php
@@ -12,12 +12,10 @@
 use Cose\Key\OkpKey;
 use Cose\Key\RsaKey;
 use DateTimeImmutable;
-use DateTimeZone;
-use Lcobucci\Clock\Clock;
-use Lcobucci\Clock\SystemClock;
 use ParagonIE\ConstantTime\Base64UrlSafe;
 use Psr\Clock\ClockInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Clock\NativeClock;
 use Webauthn\AuthenticatorData;
 use Webauthn\Event\AttestationStatementLoaded;
 use Webauthn\Event\CanDispatchEvents;
@@ -25,36 +23,28 @@
 use Webauthn\Exception\AttestationStatementLoadingException;
 use Webauthn\Exception\AttestationStatementVerificationException;
 use Webauthn\Exception\InvalidAttestationStatementException;
-use Webauthn\Exception\UnsupportedFeatureException;
 use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
 use Webauthn\StringStream;
 use Webauthn\TrustPath\CertificateTrustPath;
-use Webauthn\TrustPath\EcdaaKeyIdTrustPath;
 use function array_key_exists;
 use function count;
 use function in_array;
 use function is_array;
 use function is_int;
 use function openssl_verify;
+use function sprintf;
 use function unpack;
 
 final class TPMAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents
 {
-    private readonly Clock|ClockInterface $clock;
-
     private EventDispatcherInterface $dispatcher;
 
-    public function __construct(null|Clock|ClockInterface $clock = null)
-    {
-        if ($clock === null) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.5.0',
-                'The parameter "$clock" will become mandatory in 5.0.0. Please set a valid PSR Clock implementation instead of "null".'
-            );
-            $clock = new SystemClock(new DateTimeZone('UTC'));
-        }
-        $this->clock = $clock;
+    private readonly ClockInterface $clock;
+
+    public function __construct(
+        null|ClockInterface $clock = null
+    ) {
+        $this->clock = $clock ?? new NativeClock();
         $this->dispatcher = new NullEventDispatcher();
     }
 
@@ -63,7 +53,7 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): v
         $this->dispatcher = $eventDispatcher;
     }
 
-    public static function create(null|Clock|ClockInterface $clock = null): self
+    public static function create(null|ClockInterface $clock = null): self
     {
         return new self($clock);
     }
@@ -82,10 +72,6 @@ public function load(array $attestation): AttestationStatement
             $attestation,
             'Invalid attestation object'
         );
-        ! array_key_exists(
-            'ecdaaKeyId',
-            $attestation['attStmt']
-        ) || throw AttestationStatementLoadingException::create($attestation, 'ECDAA not supported');
         foreach (['ver', 'ver', 'sig', 'alg', 'certInfo', 'pubArea'] as $key) {
             array_key_exists($key, $attestation['attStmt']) || throw AttestationStatementLoadingException::create(
                 $attestation,
@@ -104,7 +90,7 @@ public function load(array $attestation): AttestationStatement
         );
 
         $pubArea = $this->checkPubArea($attestation['attStmt']['pubArea']);
-        $pubAreaAttestedNameAlg = mb_substr((string) $certInfo['attestedName'], 0, 2, '8bit');
+        $pubAreaAttestedNameAlg = substr((string) $certInfo['attestedName'], 0, 2);
         $pubAreaHash = hash(
             $this->getTPMHash($pubAreaAttestedNameAlg),
             (string) $attestation['attStmt']['pubArea'],
@@ -164,7 +150,6 @@ public function isValid(
                 $attestationStatement,
                 $authenticatorData
             ),
-            $attestationStatement->trustPath instanceof EcdaaKeyIdTrustPath => $this->processWithECDAA(),
             default => throw InvalidAttestationStatementException::create(
                 $attestationStatement,
                 'Unsupported attestation statement'
@@ -393,7 +378,7 @@ private function checkCertificate(string $attestnCert, AuthenticatorData $authen
         is_int($parsed['validFrom_time_t']) || throw AttestationStatementVerificationException::create(
             'Invalid certificate start date.'
         );
-        $startDate = (new DateTimeImmutable())->setTimestamp($parsed['validFrom_time_t']);
+        $startDate = (new DateTimeImmutable('now'))->setTimestamp($parsed['validFrom_time_t']);
         $startDate < $this->clock->now() || throw AttestationStatementVerificationException::create(
             'Invalid certificate start date.'
         );
@@ -404,7 +389,7 @@ private function checkCertificate(string $attestnCert, AuthenticatorData $authen
         is_int($parsed['validTo_time_t']) || throw AttestationStatementVerificationException::create(
             'Invalid certificate end date.'
         );
-        $endDate = (new DateTimeImmutable())->setTimestamp($parsed['validTo_time_t']);
+        $endDate = (new DateTimeImmutable('now'))->setTimestamp($parsed['validTo_time_t']);
         $endDate > $this->clock->now() || throw AttestationStatementVerificationException::create(
             'Invalid certificate end date.'
         );
@@ -437,9 +422,4 @@ private function checkCertificate(string $attestnCert, AuthenticatorData $authen
             'The value of the "aaguid" does not match with the certificate'
         );
     }
-
-    private function processWithECDAA(): never
-    {
-        throw UnsupportedFeatureException::create('ECDAA not supported');
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AttestedCredentialData.php b/web-auth/webauthn-lib/src/AttestedCredentialData.php
index a97f3fa49..a44650709 100644
--- a/web-auth/webauthn-lib/src/AttestedCredentialData.php
+++ b/web-auth/webauthn-lib/src/AttestedCredentialData.php
@@ -4,17 +4,12 @@
 
 namespace Webauthn;
 
-use JsonSerializable;
-use ParagonIE\ConstantTime\Base64;
 use Symfony\Component\Uid\Uuid;
-use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-use function is_string;
 
 /**
  * @see https://www.w3.org/TR/webauthn/#sec-attested-credential-data
  */
-class AttestedCredentialData implements JsonSerializable
+class AttestedCredentialData
 {
     public function __construct(
         public Uuid $aaguid,
@@ -27,102 +22,4 @@ public static function create(Uuid $aaguid, string $credentialId, ?string $crede
     {
         return new self($aaguid, $credentialId, $credentialPublicKey);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaguid(): Uuid
-    {
-        return $this->aaguid;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setAaguid(Uuid $aaguid): void
-    {
-        $this->aaguid = $aaguid;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCredentialId(): string
-    {
-        return $this->credentialId;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCredentialPublicKey(): ?string
-    {
-        return $this->credentialPublicKey;
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.9.0 and will be removed in 5.0.0. Please use the serializer instead.
-     */
-    public static function createFromArray(array $json): self
-    {
-        array_key_exists('aaguid', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "aaguid" is missing.'
-        );
-        $aaguid = $json['aaguid'];
-        is_string($aaguid) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "aaguid" shall be a string of 36 characters'
-        );
-        mb_strlen($aaguid, '8bit') === 36 || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "aaguid" shall be a string of 36 characters'
-        );
-        $uuid = Uuid::fromString($aaguid);
-
-        array_key_exists('credentialId', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "credentialId" is missing.'
-        );
-        $credentialId = $json['credentialId'];
-        is_string($credentialId) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "credentialId" shall be a string'
-        );
-        $credentialId = Base64::decode($credentialId, true);
-
-        $credentialPublicKey = null;
-        if (isset($json['credentialPublicKey'])) {
-            $credentialPublicKey = Base64::decode($json['credentialPublicKey'], true);
-        }
-
-        return self::create($uuid, $credentialId, $credentialPublicKey);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $result = [
-            'aaguid' => $this->aaguid->__toString(),
-            'credentialId' => base64_encode($this->credentialId),
-        ];
-        if ($this->credentialPublicKey !== null) {
-            $result['credentialPublicKey'] = base64_encode($this->credentialPublicKey);
-        }
-
-        return $result;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdExcludeInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdExcludeInputExtension.php
new file mode 100644
index 000000000..10354a889
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdExcludeInputExtension.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+final class AppIdExcludeInputExtension extends AuthenticationExtension
+{
+    public static function enable(string $value): AuthenticationExtension
+    {
+        return self::create('appidExclude', $value);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdInputExtension.php
new file mode 100644
index 000000000..0207f6916
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/AppIdInputExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+final class AppIdInputExtension extends AuthenticationExtension
+{
+    public static function enable(): AuthenticationExtension
+    {
+        return self::create('appid', true);
+    }
+
+    public static function disable(): AuthenticationExtension
+    {
+        return self::create('appid', false);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php
index 384476a1e..725948c0f 100644
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtension.php
@@ -4,9 +4,7 @@
 
 namespace Webauthn\AuthenticationExtensions;
 
-use JsonSerializable;
-
-class AuthenticationExtension implements JsonSerializable
+class AuthenticationExtension
 {
     public function __construct(
         public readonly string $name,
@@ -18,33 +16,4 @@ public static function create(string $name, mixed $value): self
     {
         return new self($name, $value);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function value(): mixed
-    {
-        return $this->value;
-    }
-
-    public function jsonSerialize(): mixed
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->value;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionLoader.php
similarity index 83%
rename from web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php
rename to web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionLoader.php
index ddf5e49f6..0fc6bbec7 100644
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputsLoader.php
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionLoader.php
@@ -8,13 +8,13 @@
 use CBOR\MapObject;
 use Webauthn\Exception\AuthenticationExtensionException;
 
-abstract class AuthenticationExtensionsClientOutputsLoader
+abstract class AuthenticationExtensionLoader
 {
     public static function load(CBORObject $object): AuthenticationExtensions
     {
         $object instanceof MapObject || throw AuthenticationExtensionException::create('Invalid extension object');
         $data = $object->normalize();
-        return AuthenticationExtensionsClientOutputs::create(
+        return AuthenticationExtensions::create(
             array_map(
                 fn (mixed $value, string $key) => AuthenticationExtension::create($key, $value),
                 $data,
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php
index 2ef2bc65e..077f1f314 100644
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensions.php
@@ -9,18 +9,17 @@
 use Countable;
 use Iterator;
 use IteratorAggregate;
-use JsonSerializable;
 use Webauthn\Exception\AuthenticationExtensionException;
 use function array_key_exists;
 use function count;
 use function is_string;
+use function sprintf;
 use const COUNT_NORMAL;
 
 /**
  * @implements IteratorAggregate<AuthenticationExtension>
- * @final
  */
-class AuthenticationExtensions implements JsonSerializable, Countable, IteratorAggregate, ArrayAccess
+final class AuthenticationExtensions implements Countable, IteratorAggregate, ArrayAccess
 {
     /**
      * @var array<string, AuthenticationExtension>
@@ -57,38 +56,6 @@ public static function create(array $extensions = []): static
         return new static($extensions);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function add(AuthenticationExtension ...$extensions): static
-    {
-        foreach ($extensions as $extension) {
-            $this->extensions[$extension->name] = $extension;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param array<string, mixed> $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): static
-    {
-        return static::create(
-            array_map(
-                static fn (string $key, mixed $value): AuthenticationExtension => AuthenticationExtension::create(
-                    $key,
-                    $value
-                ),
-                array_keys($json),
-                $json
-            )
-        );
-    }
-
     public function has(string $key): bool
     {
         return array_key_exists($key, $this->extensions);
@@ -104,20 +71,6 @@ public function get(string $key): AuthenticationExtension
         return $this->extensions[$key];
     }
 
-    /**
-     * @return array<string, AuthenticationExtension>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->extensions;
-    }
-
     /**
      * @return Iterator<string, AuthenticationExtension>
      */
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php
deleted file mode 100644
index 5e0548405..000000000
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientInputs.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\AuthenticationExtensions;
-
-/**
- * @deprecated since 4.8.0. Use {Webauthn\AuthenticationExtensions\AuthenticationExtensions} instead.
- */
-class AuthenticationExtensionsClientInputs extends AuthenticationExtensions
-{
-}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php
deleted file mode 100644
index fdfe12994..000000000
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/AuthenticationExtensionsClientOutputs.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\AuthenticationExtensions;
-
-/**
- * @deprecated since 4.8.0. Use {Webauthn\AuthenticationExtensions\AuthenticationExtensions} instead.
- */
-class AuthenticationExtensionsClientOutputs extends AuthenticationExtensions
-{
-}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/CredentialPropertiesInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/CredentialPropertiesInputExtension.php
new file mode 100644
index 000000000..0e26218a0
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/CredentialPropertiesInputExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+final class CredentialPropertiesInputExtension extends AuthenticationExtension
+{
+    public static function enable(): AuthenticationExtension
+    {
+        return self::create('credProps', true);
+    }
+
+    public static function disable(): AuthenticationExtension
+    {
+        return self::create('credProps', false);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php
index 9adcc706f..f731e12f0 100644
--- a/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/ExtensionOutputError.php
@@ -13,17 +13,8 @@ public function __construct(
         public readonly AuthenticationExtension $authenticationExtension,
         string $message = '',
         int $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticationExtension(): AuthenticationExtension
-    {
-        return $this->authenticationExtension;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/LargeBlobInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/LargeBlobInputExtension.php
new file mode 100644
index 000000000..4fb495291
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/LargeBlobInputExtension.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+use function assert;
+use function in_array;
+
+final class LargeBlobInputExtension extends AuthenticationExtension
+{
+    public const REQUIRED = 'required';
+
+    public const PREFERRED = 'preferred';
+
+    public static function support(string $support): AuthenticationExtension
+    {
+        assert(in_array($support, [self::REQUIRED, self::PREFERRED], true), 'Invalid support value.');
+
+        return self::create('largeBlob', [
+            'support' => $support,
+        ]);
+    }
+
+    public static function read(): AuthenticationExtension
+    {
+        return self::create('largeBlob', [
+            'read' => true,
+        ]);
+    }
+
+    public static function write(string $value): AuthenticationExtension
+    {
+        return self::create('largeBlob', [
+            'write' => $value,
+        ]);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtension.php
new file mode 100644
index 000000000..8f308ede4
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtension.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+final class PseudoRandomFunctionInputExtension extends AuthenticationExtension
+{
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtensionBuilder.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtensionBuilder.php
new file mode 100644
index 000000000..0a969b3bc
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/PseudoRandomFunctionInputExtensionBuilder.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+use ParagonIE\ConstantTime\Base64UrlSafe;
+use function array_key_exists;
+
+final class PseudoRandomFunctionInputExtensionBuilder
+{
+    /**
+     * @var array{eval?: array{first: string, second?: string}, evalByCredential?: array<string, array{first: string, second?: string}>
+     */
+    private array $values = [];
+
+    private function __construct()
+    {
+    }
+
+    public static function create(): self
+    {
+        return new self();
+    }
+
+    public function withInputs(string $first, null|string $second = null): self
+    {
+        $eval = [
+            'first' => Base64UrlSafe::encodeUnpadded($first),
+        ];
+        if ($second !== null) {
+            $eval['second'] = Base64UrlSafe::encodeUnpadded($second);
+        }
+        $this->values['eval'] = $eval;
+
+        return $this;
+    }
+
+    public function withCredentialInputs(string $credentialId, string $first, null|string $second = null): self
+    {
+        $eval = [
+            'first' => Base64UrlSafe::encodeUnpadded($first),
+        ];
+        if ($second !== null) {
+            $eval['second'] = Base64UrlSafe::encodeUnpadded($second);
+        }
+        if (! array_key_exists('evalByCredential', $this->values)) {
+            $this->values['evalByCredential'] = [];
+        }
+        $this->values['evalByCredential'][$credentialId] = $eval;
+
+        return $this;
+    }
+
+    public function build(): PseudoRandomFunctionInputExtension
+    {
+        return new PseudoRandomFunctionInputExtension('prf', $this->values);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticationExtensions/UvmInputExtension.php b/web-auth/webauthn-lib/src/AuthenticationExtensions/UvmInputExtension.php
new file mode 100644
index 000000000..d61f388ba
--- /dev/null
+++ b/web-auth/webauthn-lib/src/AuthenticationExtensions/UvmInputExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\AuthenticationExtensions;
+
+final class UvmInputExtension extends AuthenticationExtension
+{
+    public static function enable(): AuthenticationExtension
+    {
+        return self::create('uvm', true);
+    }
+
+    public static function disable(): AuthenticationExtension
+    {
+        return self::create('uvm', false);
+    }
+}
diff --git a/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php b/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php
index 8b105a429..d41498f79 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorAssertionResponse.php
@@ -30,22 +30,4 @@ public static function create(
     ): self {
         return new self($clientDataJSON, $authenticatorData, $signature, $userHandle, $attestationObject);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getSignature(): string
-    {
-        return $this->signature;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserHandle(): ?string
-    {
-        return $this->userHandle;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php b/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php
index fa433b211..9ec1279b4 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorAssertionResponseValidator.php
@@ -4,182 +4,48 @@
 
 namespace Webauthn;
 
-use Cose\Algorithm\Manager;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Throwable;
-use Webauthn\AuthenticationExtensions\ExtensionOutputCheckerHandler;
 use Webauthn\CeremonyStep\CeremonyStepManager;
-use Webauthn\CeremonyStep\CeremonyStepManagerFactory;
-use Webauthn\Counter\CounterChecker;
 use Webauthn\Event\AuthenticatorAssertionResponseValidationFailedEvent;
 use Webauthn\Event\AuthenticatorAssertionResponseValidationSucceededEvent;
 use Webauthn\Event\CanDispatchEvents;
 use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\MetadataService\CanLogData;
-use Webauthn\TokenBinding\TokenBindingHandler;
-use function is_string;
 
 class AuthenticatorAssertionResponseValidator implements CanLogData, CanDispatchEvents
 {
     private LoggerInterface $logger;
 
-    private readonly CeremonyStepManagerFactory $ceremonyStepManagerFactory;
-
     private EventDispatcherInterface $eventDispatcher;
 
     public function __construct(
-        private readonly null|PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository = null,
-        private readonly null|TokenBindingHandler $tokenBindingHandler = null,
-        null|ExtensionOutputCheckerHandler $extensionOutputCheckerHandler = null,
-        null|Manager $algorithmManager = null,
-        null|EventDispatcherInterface $eventDispatcher = null,
-        private null|CeremonyStepManager $ceremonyStepManager = null
+        private readonly CeremonyStepManager $ceremonyStepManager
     ) {
-        if ($this->publicKeyCredentialSourceRepository !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.6.0',
-                'The parameter "$publicKeyCredentialSourceRepository" is deprecated since 4.6.0 and will be removed in 5.0.0. Please set "null" instead.'
-            );
-        }
-        if ($this->tokenBindingHandler !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.3.0',
-                'The parameter "$tokenBindingHandler" is deprecated since 4.3.0 and will be removed in 5.0.0. Please set "null" instead.'
-            );
-        }
-        if ($extensionOutputCheckerHandler !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$extensionOutputCheckerHandler" is deprecated since 4.8.0 and will be removed in 5.0.0. Please set "null" instead and inject a CheckExtensions object into the CeremonyStepManager.'
-            );
-        }
-        if ($algorithmManager !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$algorithmManager" is deprecated since 4.8.0 and will be removed in 5.0.0. Please set "null" instead and inject a CheckSignature object into the CeremonyStepManager.'
-            );
-        }
-        $this->eventDispatcher = $eventDispatcher ?? new NullEventDispatcher();
-        if ($eventDispatcher !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                'The parameter "$eventDispatcher" is deprecated since 4.5.0 will be removed in 5.0.0. Please use `setEventDispatcher` instead.'
-            );
-        }
-        if ($this->ceremonyStepManager === null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$ceremonyStepManager" will mandatory in 5.0.0. Please set a CeremonyStepManager object instead and set null for $algorithmManager and $extensionOutputCheckerHandler.'
-            );
-        }
+        $this->eventDispatcher = new NullEventDispatcher();
         $this->logger = new NullLogger();
-
-        $this->ceremonyStepManagerFactory = new CeremonyStepManagerFactory();
-        if ($extensionOutputCheckerHandler !== null) {
-            $this->ceremonyStepManagerFactory->setExtensionOutputCheckerHandler($extensionOutputCheckerHandler);
-        }
-        if ($algorithmManager !== null) {
-            $this->ceremonyStepManagerFactory->setAlgorithmManager($algorithmManager);
-        }
     }
 
-    public static function create(
-        null|PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository = null,
-        null|TokenBindingHandler $tokenBindingHandler = null,
-        null|ExtensionOutputCheckerHandler $extensionOutputCheckerHandler = null,
-        null|Manager $algorithmManager = null,
-        null|EventDispatcherInterface $eventDispatcher = null,
-        null|CeremonyStepManager $ceremonyStepManager = null
-    ): self {
-        return new self(
-            $publicKeyCredentialSourceRepository,
-            $tokenBindingHandler,
-            $extensionOutputCheckerHandler,
-            $algorithmManager,
-            $eventDispatcher,
-            $ceremonyStepManager
-        );
+    public static function create(CeremonyStepManager $ceremonyStepManager): self
+    {
+        return new self($ceremonyStepManager);
     }
 
     /**
-     * @param string[] $securedRelyingPartyId
-     *
      * @see https://www.w3.org/TR/webauthn/#verifying-assertion
      */
     public function check(
-        string|PublicKeyCredentialSource $credentialId,
+        PublicKeyCredentialSource $publicKeyCredentialSource,
         AuthenticatorAssertionResponse $authenticatorAssertionResponse,
         PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
-        ServerRequestInterface|string $request,
+        string $host,
         ?string $userHandle,
-        null|array $securedRelyingPartyId = null
     ): PublicKeyCredentialSource {
-        if ($request instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `check` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-        if (is_string($credentialId)) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.6.0',
-                sprintf(
-                    'Passing a string as first to the method `check` of the class "%s" is deprecated since 4.6.0. Please inject a %s object instead.',
-                    self::class,
-                    PublicKeyCredentialSource::class
-                )
-            );
-        }
-        if ($securedRelyingPartyId !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                sprintf(
-                    'Passing a list or secured relying party IDs to the method `check` of the class "%s" is deprecated since 4.8.0 and will be removed in 5.0.0. Please inject a CheckOrigin into the CeremonyStepManager instead.',
-                    self::class
-                )
-            );
-        }
-
-        if ($credentialId instanceof PublicKeyCredentialSource) {
-            $publicKeyCredentialSource = $credentialId;
-        } else {
-            $this->publicKeyCredentialSourceRepository instanceof PublicKeyCredentialSourceRepository || throw AuthenticatorResponseVerificationException::create(
-                'Please pass the Public Key Credential Source to the method "check".'
-            );
-            $publicKeyCredentialSource = $this->publicKeyCredentialSourceRepository->findOneByCredentialId(
-                $credentialId
-            );
-        }
-        $publicKeyCredentialSource !== null || throw AuthenticatorResponseVerificationException::create(
-            'The credential ID is invalid.'
-        );
-        $host = is_string($request) ? $request : $request->getUri()
-            ->getHost();
-
-        if ($this->ceremonyStepManager === null) {
-            $this->ceremonyStepManager = $this->ceremonyStepManagerFactory->requestCeremony($securedRelyingPartyId);
-        }
-
         try {
             $this->logger->info('Checking the authenticator assertion response', [
-                'credentialId' => $credentialId,
                 'publicKeyCredentialSource' => $publicKeyCredentialSource,
                 'authenticatorAssertionResponse' => $authenticatorAssertionResponse,
                 'publicKeyCredentialRequestOptions' => $publicKeyCredentialRequestOptions,
@@ -206,11 +72,6 @@ public function check(
              * OPTIONALLY, if response.attestationObject is present, update credentialRecord.attestationObject to the value of response.attestationObject and update credentialRecord.attestationClientDataJSON to the value of response.clientDataJSON.
              */
 
-            if (is_string(
-                $credentialId
-            ) && ($this->publicKeyCredentialSourceRepository instanceof PublicKeyCredentialSourceRepository)) {
-                $this->publicKeyCredentialSourceRepository->saveCredentialSource($publicKeyCredentialSource);
-            }
             //All good. We can continue.
             $this->logger->info('The assertion is valid');
             $this->logger->debug('Public Key Credential Source', [
@@ -218,7 +79,6 @@ public function check(
             ]);
             $this->eventDispatcher->dispatch(
                 $this->createAuthenticatorAssertionResponseValidationSucceededEvent(
-                    null,
                     $authenticatorAssertionResponse,
                     $publicKeyCredentialRequestOptions,
                     $host,
@@ -256,36 +116,14 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): v
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    /**
-     * @deprecated since 4.8.0 and will be removed in 5.0.0. Please inject a CheckCounter object into a CeremonyStepManager instead.
-     */
-    public function setCounterChecker(CounterChecker $counterChecker): self
-    {
-        $this->ceremonyStepManagerFactory->setCounterChecker($counterChecker);
-        return $this;
-    }
-
     protected function createAuthenticatorAssertionResponseValidationSucceededEvent(
-        null|string $credentialId,
         AuthenticatorAssertionResponse $authenticatorAssertionResponse,
         PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
-        ServerRequestInterface|string $host,
+        string $host,
         ?string $userHandle,
         PublicKeyCredentialSource $publicKeyCredentialSource
     ): AuthenticatorAssertionResponseValidationSucceededEvent {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `createAuthenticatorAssertionResponseValidationSucceededEvent` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
         return new AuthenticatorAssertionResponseValidationSucceededEvent(
-            $credentialId,
             $authenticatorAssertionResponse,
             $publicKeyCredentialRequestOptions,
             $host,
@@ -295,24 +133,13 @@ protected function createAuthenticatorAssertionResponseValidationSucceededEvent(
     }
 
     protected function createAuthenticatorAssertionResponseValidationFailedEvent(
-        string|PublicKeyCredentialSource $publicKeyCredentialSource,
+        PublicKeyCredentialSource $publicKeyCredentialSource,
         AuthenticatorAssertionResponse $authenticatorAssertionResponse,
         PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
-        ServerRequestInterface|string $host,
+        string $host,
         ?string $userHandle,
         Throwable $throwable
     ): AuthenticatorAssertionResponseValidationFailedEvent {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `createAuthenticatorAssertionResponseValidationFailedEvent` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
         return new AuthenticatorAssertionResponseValidationFailedEvent(
             $publicKeyCredentialSource,
             $authenticatorAssertionResponse,
diff --git a/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php b/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php
index 875bc5257..2c96be7ab 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorAttestationResponse.php
@@ -32,24 +32,4 @@ public static function create(
     ): self {
         return new self($clientDataJSON, $attestationObject, $transports);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationObject(): AttestationObject
-    {
-        return $this->attestationObject;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     *
-     * @return string[]
-     */
-    public function getTransports(): array
-    {
-        return $this->transports;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticatorAttestationResponseValidator.php b/web-auth/webauthn-lib/src/AuthenticatorAttestationResponseValidator.php
index 97d43402e..a032b5c31 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorAttestationResponseValidator.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorAttestationResponseValidator.php
@@ -5,25 +5,16 @@
 namespace Webauthn;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Throwable;
-use Webauthn\AttestationStatement\AttestationStatementSupportManager;
-use Webauthn\AuthenticationExtensions\ExtensionOutputCheckerHandler;
 use Webauthn\CeremonyStep\CeremonyStepManager;
-use Webauthn\CeremonyStep\CeremonyStepManagerFactory;
 use Webauthn\Event\AuthenticatorAttestationResponseValidationFailedEvent;
 use Webauthn\Event\AuthenticatorAttestationResponseValidationSucceededEvent;
 use Webauthn\Event\CanDispatchEvents;
 use Webauthn\Event\NullEventDispatcher;
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\MetadataService\CanLogData;
-use Webauthn\MetadataService\CertificateChain\CertificateChainValidator;
-use Webauthn\MetadataService\MetadataStatementRepository;
-use Webauthn\MetadataService\StatusReportRepository;
-use Webauthn\TokenBinding\TokenBindingHandler;
-use function is_string;
 
 class AuthenticatorAttestationResponseValidator implements CanLogData, CanDispatchEvents
 {
@@ -31,88 +22,16 @@ class AuthenticatorAttestationResponseValidator implements CanLogData, CanDispat
 
     private EventDispatcherInterface $eventDispatcher;
 
-    private readonly CeremonyStepManagerFactory $ceremonyStepManagerFactory;
-
     public function __construct(
-        null|AttestationStatementSupportManager $attestationStatementSupportManager = null,
-        private readonly null|PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository = null,
-        private readonly null|TokenBindingHandler $tokenBindingHandler = null,
-        null|ExtensionOutputCheckerHandler $extensionOutputCheckerHandler = null,
-        null|EventDispatcherInterface $eventDispatcher = null,
-        private null|CeremonyStepManager $ceremonyStepManager = null
+        private readonly CeremonyStepManager $ceremonyStepManager
     ) {
-        if ($this->publicKeyCredentialSourceRepository !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.6.0',
-                'The parameter "$publicKeyCredentialSourceRepository" is deprecated since 4.6.0 and will be removed in 5.0.0. Please set "null" instead.'
-            );
-        }
-        if ($this->tokenBindingHandler !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.3.0',
-                'The parameter "$tokenBindingHandler" is deprecated since 4.3.0 and will be removed in 5.0.0. Please set "null" instead.'
-            );
-        }
-        if ($extensionOutputCheckerHandler !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$extensionOutputCheckerHandler" is deprecated since 4.8.0 and will be removed in 5.0.0. Please set "null" instead and inject a CheckExtensions object into the CeremonyStepManager.'
-            );
-        }
-        $this->eventDispatcher = $eventDispatcher ?? new NullEventDispatcher();
-        if ($eventDispatcher !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                'The parameter "$eventDispatcher" is deprecated since 4.5.0 will be removed in 5.0.0. Please use `setEventDispatcher` instead.'
-            );
-        }
-        if ($this->ceremonyStepManager === null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$ceremonyStepManager" will mandatory in 5.0.0. Please set a CeremonyStepManager object instead and set null for $attestationStatementSupportManager and $extensionOutputCheckerHandler.'
-            );
-        }
+        $this->eventDispatcher = new NullEventDispatcher();
         $this->logger = new NullLogger();
-        $this->ceremonyStepManagerFactory = new CeremonyStepManagerFactory();
-        if ($attestationStatementSupportManager !== null) {
-            $this->ceremonyStepManagerFactory->setAttestationStatementSupportManager(
-                $attestationStatementSupportManager
-            );
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$attestationStatementSupportManager" is deprecated since 4.8.0 will be removed in 5.0.0. Please set a CheckAttestationFormatIsKnownAndValid object into CeremonyStepManager object instead.'
-            );
-        }
-        if ($extensionOutputCheckerHandler !== null) {
-            $this->ceremonyStepManagerFactory->setExtensionOutputCheckerHandler($extensionOutputCheckerHandler);
-        }
     }
 
-    /**
-     * @private Will become private in 5.0.0
-     */
-    public static function create(
-        null|AttestationStatementSupportManager $attestationStatementSupportManager = null,
-        null|PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository = null,
-        null|TokenBindingHandler $tokenBindingHandler = null,
-        null|ExtensionOutputCheckerHandler $extensionOutputCheckerHandler = null,
-        null|EventDispatcherInterface $eventDispatcher = null,
-        null|CeremonyStepManager $ceremonyStepManager = null,
-    ): self {
-        return new self(
-            $attestationStatementSupportManager,
-            $publicKeyCredentialSourceRepository,
-            $tokenBindingHandler,
-            $extensionOutputCheckerHandler,
-            $eventDispatcher,
-            $ceremonyStepManager
-        );
+    public static function create(CeremonyStepManager $ceremonyStepManager): self
+    {
+        return new self($ceremonyStepManager);
     }
 
     public function setLogger(LoggerInterface $logger): void
@@ -126,75 +45,19 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): v
     }
 
     /**
-     * @deprecated since 4.8.0 and will be removed in 5.0.0. Please use the CheckMetadataStatement object from the CeremonyStepManager instead.
-     */
-    public function setCertificateChainValidator(CertificateChainValidator $certificateChainValidator): self
-    {
-        $this->ceremonyStepManagerFactory->enableCertificateChainValidator($certificateChainValidator);
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.8.0 and will be removed in 5.0.0. Please use the CheckMetadataStatement object from the CeremonyStepManager instead.
-     */
-    public function enableMetadataStatementSupport(
-        MetadataStatementRepository $metadataStatementRepository,
-        StatusReportRepository $statusReportRepository,
-        CertificateChainValidator $certificateChainValidator
-    ): self {
-        $this->ceremonyStepManagerFactory->enableMetadataStatementSupport(
-            $metadataStatementRepository,
-            $statusReportRepository,
-            $certificateChainValidator
-        );
-        return $this;
-    }
-
-    /**
-     * @param string[] $securedRelyingPartyId
-     *
      * @see https://www.w3.org/TR/webauthn/#registering-a-new-credential
      */
     public function check(
         AuthenticatorAttestationResponse $authenticatorAttestationResponse,
         PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
-        ServerRequestInterface|string $request,
-        null|array $securedRelyingPartyId = null,
+        string $host,
     ): PublicKeyCredentialSource {
-        if ($request instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `check` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-        if ($securedRelyingPartyId !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                sprintf(
-                    'Passing a list or secured relying party IDs to the method `check` of the class "%s" is deprecated since 4.8.0 and will be removed in 5.0.0. Please inject the list instead.',
-                    self::class
-                )
-            );
-        }
-        $host = is_string($request) ? $request : $request->getUri()
-            ->getHost();
         try {
             $this->logger->info('Checking the authenticator attestation response', [
                 'authenticatorAttestationResponse' => $authenticatorAttestationResponse,
                 'publicKeyCredentialCreationOptions' => $publicKeyCredentialCreationOptions,
                 'host' => $host,
             ]);
-            if ($this->ceremonyStepManager === null) {
-                $this->ceremonyStepManager = $this->ceremonyStepManagerFactory->creationCeremony(
-                    $securedRelyingPartyId
-                );
-            }
 
             $publicKeyCredentialSource = $this->createPublicKeyCredentialSource(
                 $authenticatorAttestationResponse,
@@ -246,20 +109,9 @@ public function check(
     protected function createAuthenticatorAttestationResponseValidationSucceededEvent(
         AuthenticatorAttestationResponse $authenticatorAttestationResponse,
         PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
-        ServerRequestInterface|string $host,
+        string $host,
         PublicKeyCredentialSource $publicKeyCredentialSource
     ): AuthenticatorAttestationResponseValidationSucceededEvent {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `createAuthenticatorAttestationResponseValidationSucceededEvent` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
         return new AuthenticatorAttestationResponseValidationSucceededEvent(
             $authenticatorAttestationResponse,
             $publicKeyCredentialCreationOptions,
@@ -271,20 +123,9 @@ protected function createAuthenticatorAttestationResponseValidationSucceededEven
     protected function createAuthenticatorAttestationResponseValidationFailedEvent(
         AuthenticatorAttestationResponse $authenticatorAttestationResponse,
         PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
-        ServerRequestInterface|string $host,
+        string $host,
         Throwable $throwable
     ): AuthenticatorAttestationResponseValidationFailedEvent {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the method `createAuthenticatorAttestationResponseValidationFailedEvent` of the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
         return new AuthenticatorAttestationResponseValidationFailedEvent(
             $authenticatorAttestationResponse,
             $publicKeyCredentialCreationOptions,
diff --git a/web-auth/webauthn-lib/src/AuthenticatorData.php b/web-auth/webauthn-lib/src/AuthenticatorData.php
index f21ff0629..0c2475650 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorData.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorData.php
@@ -53,24 +53,6 @@ public static function create(
         return new self($authData, $rpIdHash, $flags, $signCount, $attestedCredentialData, $extensions);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthData(): string
-    {
-        return $this->authData;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRpIdHash(): string
-    {
-        return $this->rpIdHash;
-    }
-
     public function isUserPresent(): bool
     {
         return 0 !== (ord($this->flags) & self::FLAG_UP);
@@ -110,31 +92,4 @@ public function getReservedForFutureUse2(): int
     {
         return ord($this->flags) & self::FLAG_RFU2;
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getSignCount(): int
-    {
-        return $this->signCount;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestedCredentialData(): ?AttestedCredentialData
-    {
-        return $this->attestedCredentialData;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getExtensions(): ?AuthenticationExtensions
-    {
-        return $this->extensions !== null && $this->hasExtensions() ? $this->extensions : null;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticatorDataLoader.php b/web-auth/webauthn-lib/src/AuthenticatorDataLoader.php
index e09e64373..6b850d989 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorDataLoader.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorDataLoader.php
@@ -12,14 +12,14 @@
 use CBOR\TextStringObject;
 use CBOR\UnsignedIntegerObject;
 use Symfony\Component\Uid\Uuid;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientOutputsLoader;
+use Webauthn\AuthenticationExtensions\AuthenticationExtensionLoader;
 use Webauthn\Exception\InvalidDataException;
 use function chr;
 use function ord;
 
-final class AuthenticatorDataLoader
+final readonly class AuthenticatorDataLoader
 {
-    private readonly Decoder $decoder;
+    private Decoder $decoder;
 
     private function __construct()
     {
@@ -61,7 +61,7 @@ public function load(string $authData): AuthenticatorData
         $extension = null;
         if (0 !== (ord($flags) & AuthenticatorData::FLAG_ED)) {
             $extension = $this->decoder->decode($authDataStream);
-            $extension = AuthenticationExtensionsClientOutputsLoader::load($extension);
+            $extension = AuthenticationExtensionLoader::load($extension);
         }
         $authDataStream->isEOF() || throw InvalidDataException::create(
             $authData,
@@ -83,13 +83,13 @@ private function fixIncorrectEdDSAKey(string $data): string
     {
         $needle = hex2bin('a301634f4b500327206745643235353139');
         $correct = hex2bin('a401634f4b500327206745643235353139');
-        $position = mb_strpos($data, $needle, 0, '8bit');
+        $position = strpos($data, (string) $needle);
         if ($position === false) {
             return $data;
         }
 
-        $begin = mb_substr($data, 0, $position, '8bit');
-        $end = mb_substr($data, $position, null, '8bit');
+        $begin = substr($data, 0, $position);
+        $end = substr($data, $position);
         $end = str_replace($needle, $correct, $end);
         $cbor = new StringStream($end);
         $badKey = $this->decoder->decode($cbor);
diff --git a/web-auth/webauthn-lib/src/AuthenticatorResponse.php b/web-auth/webauthn-lib/src/AuthenticatorResponse.php
index 162c24db6..5e8cb43fa 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorResponse.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorResponse.php
@@ -13,13 +13,4 @@ public function __construct(
         public readonly CollectedClientData $clientDataJSON
     ) {
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getClientDataJSON(): CollectedClientData
-    {
-        return $this->clientDataJSON;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/AuthenticatorSelectionCriteria.php b/web-auth/webauthn-lib/src/AuthenticatorSelectionCriteria.php
index ac794688c..8ef98cde9 100644
--- a/web-auth/webauthn-lib/src/AuthenticatorSelectionCriteria.php
+++ b/web-auth/webauthn-lib/src/AuthenticatorSelectionCriteria.php
@@ -5,14 +5,9 @@
 namespace Webauthn;
 
 use InvalidArgumentException;
-use JsonSerializable;
-use Webauthn\Exception\InvalidDataException;
 use function in_array;
-use function is_bool;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
 
-class AuthenticatorSelectionCriteria implements JsonSerializable
+class AuthenticatorSelectionCriteria
 {
     final public const AUTHENTICATOR_ATTACHMENT_NO_PREFERENCE = null;
 
@@ -40,12 +35,6 @@ class AuthenticatorSelectionCriteria implements JsonSerializable
 
     final public const RESIDENT_KEY_REQUIREMENT_NO_PREFERENCE = null;
 
-    /**
-     * @deprecated Please use AuthenticatorSelectionCriteria::RESIDENT_KEY_REQUIREMENT_NO_PREFERENCE instead
-     * @infection-ignore-all
-     */
-    final public const RESIDENT_KEY_REQUIREMENT_NONE = null;
-
     final public const RESIDENT_KEY_REQUIREMENT_REQUIRED = 'required';
 
     final public const RESIDENT_KEY_REQUIREMENT_PREFERRED = 'preferred';
@@ -63,8 +52,6 @@ public function __construct(
         public null|string $authenticatorAttachment = null,
         public string $userVerification = self::USER_VERIFICATION_REQUIREMENT_PREFERRED,
         public null|string $residentKey = self::RESIDENT_KEY_REQUIREMENT_NO_PREFERENCE,
-        /** @deprecated Will be removed in 5.0. Please use residentKey instead**/
-        public null|bool $requireResidentKey = null,
     ) {
         in_array($authenticatorAttachment, self::AUTHENTICATOR_ATTACHMENTS, true) || throw new InvalidArgumentException(
             'Invalid authenticator attachment'
@@ -75,178 +62,13 @@ public function __construct(
         in_array($residentKey, self::RESIDENT_KEY_REQUIREMENTS, true) || throw new InvalidArgumentException(
             'Invalid resident key'
         );
-        if ($requireResidentKey === true && $residentKey !== null && $residentKey !== self::RESIDENT_KEY_REQUIREMENT_REQUIRED) {
-            throw new InvalidArgumentException(
-                'Invalid resident key requirement. Resident key is required but requireResidentKey is false'
-            );
-        }
-        if ($this->residentKey === null && $this->requireResidentKey === true) {
-            $this->residentKey = self::RESIDENT_KEY_REQUIREMENT_REQUIRED;
-        }
-        $this->requireResidentKey = $requireResidentKey ?? ($residentKey === null ? null : $residentKey === self::RESIDENT_KEY_REQUIREMENT_REQUIRED);
     }
 
     public static function create(
         ?string $authenticatorAttachment = null,
         string $userVerification = self::USER_VERIFICATION_REQUIREMENT_PREFERRED,
         null|string $residentKey = self::RESIDENT_KEY_REQUIREMENT_NO_PREFERENCE,
-        null|bool $requireResidentKey = null
     ): self {
-        return new self($authenticatorAttachment, $userVerification, $residentKey, $requireResidentKey);
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setAuthenticatorAttachment(?string $authenticatorAttachment): self
-    {
-        $this->authenticatorAttachment = $authenticatorAttachment;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since v4.1. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setRequireResidentKey(bool $requireResidentKey): self
-    {
-        $this->requireResidentKey = $requireResidentKey;
-        if ($requireResidentKey === true) {
-            $this->residentKey = self::RESIDENT_KEY_REQUIREMENT_REQUIRED;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setUserVerification(string $userVerification): self
-    {
-        $this->userVerification = $userVerification;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setResidentKey(null|string $residentKey): self
-    {
-        $this->residentKey = $residentKey;
-        $this->requireResidentKey = $residentKey === self::RESIDENT_KEY_REQUIREMENT_REQUIRED;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticatorAttachment(): ?string
-    {
-        return $this->authenticatorAttachment;
-    }
-
-    /**
-     * @deprecated Will be removed in 5.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function isRequireResidentKey(): bool
-    {
-        return $this->requireResidentKey;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserVerification(): string
-    {
-        return $this->userVerification;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getResidentKey(): null|string
-    {
-        return $this->residentKey;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): self
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): self
-    {
-        $authenticatorAttachment = $json['authenticatorAttachment'] ?? null;
-        $requireResidentKey = $json['requireResidentKey'] ?? null;
-        $userVerification = $json['userVerification'] ?? self::USER_VERIFICATION_REQUIREMENT_PREFERRED;
-        $residentKey = $json['residentKey'] ?? null;
-
-        $authenticatorAttachment === null || is_string($authenticatorAttachment) || throw InvalidDataException::create(
-            $json,
-            'Invalid "authenticatorAttachment" value'
-        );
-        ($requireResidentKey === null || is_bool($requireResidentKey)) || throw InvalidDataException::create(
-            $json,
-            'Invalid "requireResidentKey" value'
-        );
-        is_string($userVerification) || throw InvalidDataException::create($json, 'Invalid "userVerification" value');
-        ($residentKey === null || is_string($residentKey)) || throw InvalidDataException::create(
-            $json,
-            'Invalid "residentKey" value'
-        );
-
-        return self::create(
-            $authenticatorAttachment ?? null,
-            $userVerification,
-            $residentKey,
-            $requireResidentKey,
-        );
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = [
-            'requireResidentKey' => $this->requireResidentKey,
-            'userVerification' => $this->userVerification,
-            'residentKey' => $this->residentKey,
-            'authenticatorAttachment' => $this->authenticatorAttachment,
-        ];
-        foreach ($json as $key => $value) {
-            if ($value === null) {
-                unset($json[$key]);
-            }
-        }
-
-        return $json;
+        return new self($authenticatorAttachment, $userVerification, $residentKey);
     }
 }
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManager.php b/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManager.php
index c24587cce..745c89b98 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManager.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManager.php
@@ -10,13 +10,13 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-final class CeremonyStepManager
+final readonly class CeremonyStepManager
 {
     /**
      * @param CeremonyStep[] $steps
      */
     public function __construct(
-        private readonly array $steps
+        private array $steps
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php b/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php
index cc58ae3bc..3dfacefd4 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CeremonyStepManagerFactory.php
@@ -35,6 +35,13 @@ final class CeremonyStepManagerFactory
      */
     private null|array $securedRelyingPartyId = null;
 
+    /**
+     * @var string[]
+     */
+    private null|array $allowedOrigins = null;
+
+    private bool $allowSubdomains = false;
+
     private AttestationStatementSupportManager $attestationStatementSupportManager;
 
     private ExtensionOutputCheckerHandler $extensionOutputCheckerHandler;
@@ -55,6 +62,7 @@ public function setCounterChecker(CounterChecker $counterChecker): void
     }
 
     /**
+     * @deprecated since 5.2.0 and will be removed in 6.0.0. Use setAllowedOrigins instead.
      * @param string[] $securedRelyingPartyId
      */
     public function setSecuredRelyingPartyId(array $securedRelyingPartyId): void
@@ -62,6 +70,15 @@ public function setSecuredRelyingPartyId(array $securedRelyingPartyId): void
         $this->securedRelyingPartyId = $securedRelyingPartyId;
     }
 
+    /**
+     * @param string[] $allowedOrigins
+     */
+    public function setAllowedOrigins(array $allowedOrigins, bool $allowSubdomains = false): void
+    {
+        $this->allowedOrigins = $allowedOrigins;
+        $this->allowSubdomains = $allowSubdomains;
+    }
+
     public function setExtensionOutputCheckerHandler(ExtensionOutputCheckerHandler $extensionOutputCheckerHandler): void
     {
         $this->extensionOutputCheckerHandler = $extensionOutputCheckerHandler;
@@ -98,10 +115,7 @@ public function enableTopOriginValidator(TopOriginValidator $topOriginValidator)
         $this->topOriginValidator = $topOriginValidator;
     }
 
-    /**
-     * @param null|string[] $securedRelyingPartyId
-     */
-    public function creationCeremony(null|array $securedRelyingPartyId = null): CeremonyStepManager
+    public function creationCeremony(): CeremonyStepManager
     {
         $metadataStatementChecker = new CheckMetadataStatement();
         if ($this->certificateChainValidator !== null) {
@@ -119,7 +133,9 @@ public function creationCeremony(null|array $securedRelyingPartyId = null): Cere
         return new CeremonyStepManager([
             new CheckClientDataCollectorType(),
             new CheckChallenge(),
-            new CheckOrigin($this->securedRelyingPartyId ?? $securedRelyingPartyId ?? []),
+            $this->allowedOrigins === null ? new CheckOrigin(
+                $this->securedRelyingPartyId ?? []
+            ) : new CheckAllowedOrigins($this->allowedOrigins, $this->allowSubdomains),
             new CheckTopOrigin($this->topOriginValidator),
             new CheckRelyingPartyIdIdHash(),
             new CheckUserWasPresent(),
@@ -134,10 +150,7 @@ public function creationCeremony(null|array $securedRelyingPartyId = null): Cere
         ]);
     }
 
-    /**
-     * @param null|string[] $securedRelyingPartyId
-     */
-    public function requestCeremony(null|array $securedRelyingPartyId = null): CeremonyStepManager
+    public function requestCeremony(): CeremonyStepManager
     {
         /* @see https://www.w3.org/TR/webauthn-3/#sctn-verifying-assertion */
         return new CeremonyStepManager([
@@ -145,7 +158,9 @@ public function requestCeremony(null|array $securedRelyingPartyId = null): Cerem
             new CheckUserHandle(),
             new CheckClientDataCollectorType(),
             new CheckChallenge(),
-            new CheckOrigin($this->securedRelyingPartyId ?? $securedRelyingPartyId ?? []),
+            $this->allowedOrigins === null ? new CheckOrigin(
+                $this->securedRelyingPartyId ?? []
+            ) : new CheckAllowedOrigins($this->allowedOrigins, $this->allowSubdomains),
             new CheckTopOrigin(null),
             new CheckRelyingPartyIdIdHash(),
             new CheckUserWasPresent(),
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php
index 9b5e39b22..74a221e14 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckAlgorithm.php
@@ -19,6 +19,7 @@
 use function count;
 use function in_array;
 use function is_array;
+use function sprintf;
 
 class CheckAlgorithm implements CeremonyStep
 {
@@ -33,7 +34,7 @@ public function process(
             return;
         }
         $credentialPublicKey = $publicKeyCredentialSource->getAttestedCredentialData()
-->credentialPublicKey;
+            ->credentialPublicKey;
         $credentialPublicKey !== null || throw AuthenticatorResponseVerificationException::create(
             'No public key available.'
         );
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedOrigins.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedOrigins.php
new file mode 100644
index 000000000..45c5f7eb4
--- /dev/null
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckAllowedOrigins.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webauthn\CeremonyStep;
+
+use InvalidArgumentException;
+use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
+use Webauthn\AuthenticatorAssertionResponse;
+use Webauthn\AuthenticatorAttestationResponse;
+use Webauthn\Exception\AuthenticatorResponseVerificationException;
+use Webauthn\PublicKeyCredentialCreationOptions;
+use Webauthn\PublicKeyCredentialRequestOptions;
+use Webauthn\PublicKeyCredentialSource;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
+use function sprintf;
+use function strlen;
+use function substr;
+
+final readonly class CheckAllowedOrigins implements CeremonyStep
+{
+    /**
+     * @var string[]
+     */
+    private array $allowedOrigins;
+
+    /**
+     * @param string[] $allowedOrigins
+     */
+    public function __construct(
+        array $allowedOrigins,
+        private bool $allowSubdomains = false
+    ) {
+        $origins = [];
+        foreach ($allowedOrigins as $allowedOrigin) {
+            $parsedAllowedOrigin = parse_url($allowedOrigin);
+            $parsedAllowedOrigin !== false || throw new InvalidArgumentException(sprintf(
+                'Invalid origin: %s',
+                $allowedOrigin
+            ));
+            $allowedOriginHost = $parsedAllowedOrigin['host'] ?? '';
+            if ($allowedOriginHost === '') {
+                $allowedOriginHost = $allowedOrigin;
+            }
+            $origins[] = $allowedOriginHost;
+        }
+
+        $this->allowedOrigins = array_unique($origins);
+    }
+
+    public function process(
+        PublicKeyCredentialSource $publicKeyCredentialSource,
+        AuthenticatorAssertionResponse|AuthenticatorAttestationResponse $authenticatorResponse,
+        PublicKeyCredentialRequestOptions|PublicKeyCredentialCreationOptions $publicKeyCredentialOptions,
+        ?string $userHandle,
+        string $host
+    ): void {
+        $authData = $authenticatorResponse instanceof AuthenticatorAssertionResponse ? $authenticatorResponse->authenticatorData : $authenticatorResponse->attestationObject->authData;
+        $C = $authenticatorResponse->clientDataJSON;
+
+        $parsedRelyingPartyId = parse_url($C->origin);
+        $clientDataRpId = $parsedRelyingPartyId['host'] ?? '';
+        if ($clientDataRpId === '') {
+            $clientDataRpId = $C->origin;
+        }
+        is_array($parsedRelyingPartyId) || throw AuthenticatorResponseVerificationException::create(
+            'Invalid origin. Unable to parse the origin.'
+        );
+        if (in_array($clientDataRpId, $this->allowedOrigins, true)) {
+            return;
+        }
+        $isSubDomain = $this->isSubdomain($this->allowedOrigins, $clientDataRpId);
+        if ($this->allowSubdomains && $isSubDomain) {
+            return;
+        }
+        if (! $this->allowSubdomains && $isSubDomain) {
+            throw AuthenticatorResponseVerificationException::create('Invalid origin. Subdomains are not allowed.');
+        }
+        if (count($this->allowedOrigins) !== 0) {
+            throw AuthenticatorResponseVerificationException::create(
+                'Invalid origin. Not in the list of allowed origins.'
+            );
+        }
+
+        $rpId = $publicKeyCredentialOptions->rpId ?? $publicKeyCredentialOptions->rp->id ?? $host;
+        $facetId = $this->getFacetId($rpId, $publicKeyCredentialOptions->extensions, $authData->extensions);
+        $facetId !== '' || throw AuthenticatorResponseVerificationException::create(
+            'Invalid origin. Unable to determine the facet ID.'
+        );
+        if ($clientDataRpId === $facetId) {
+            return;
+        }
+        $isSubDomains = $this->isSubdomainOf($clientDataRpId, $facetId);
+        if ($this->allowSubdomains && $isSubDomains) {
+            return;
+        }
+        if (! $this->allowSubdomains && $isSubDomains) {
+            throw AuthenticatorResponseVerificationException::create('Invalid origin. Subdomains are not allowed.');
+        }
+
+        $scheme = $parsedRelyingPartyId['scheme'] ?? '';
+        $scheme === 'https' || throw AuthenticatorResponseVerificationException::create(
+            'Invalid scheme. HTTPS required.'
+        );
+    }
+
+    private function isSubdomainOf(string $subdomain, string $domain): bool
+    {
+        return substr('.' . $subdomain, -strlen('.' . $domain)) === '.' . $domain;
+    }
+
+    private function getFacetId(
+        string $rpId,
+        AuthenticationExtensions $AuthenticationExtensions,
+        ?AuthenticationExtensions $authenticationExtensionsClientOutputs
+    ): string {
+        if ($authenticationExtensionsClientOutputs === null
+            || ! $AuthenticationExtensions->has('appid')
+            || ! $authenticationExtensionsClientOutputs->has('appid')) {
+            return $rpId;
+        }
+
+        $appId = $AuthenticationExtensions->get('appid')
+            ->value;
+        $wasUsed = $authenticationExtensionsClientOutputs->get('appid')
+            ->value;
+
+        return (is_string($appId) && $wasUsed === true) ? $appId : $rpId;
+    }
+
+    /**
+     * @param string[] $origins
+     */
+    private function isSubdomain(array $origins, string $domain): bool
+    {
+        foreach ($origins as $allowedOrigin) {
+            if ($this->isSubdomainOf($domain, $allowedOrigin)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php
index 147ffcee7..2c022938c 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckAttestationFormatIsKnownAndValid.php
@@ -12,10 +12,10 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-final class CheckAttestationFormatIsKnownAndValid implements CeremonyStep
+final readonly class CheckAttestationFormatIsKnownAndValid implements CeremonyStep
 {
     public function __construct(
-        private readonly AttestationStatementSupportManager $attestationStatementSupportManager,
+        private AttestationStatementSupportManager $attestationStatementSupportManager,
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckClientDataCollectorType.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckClientDataCollectorType.php
index 645cb904d..1dd256c49 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckClientDataCollectorType.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckClientDataCollectorType.php
@@ -12,9 +12,9 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-final class CheckClientDataCollectorType implements CeremonyStep
+final readonly class CheckClientDataCollectorType implements CeremonyStep
 {
-    private readonly ClientDataCollectorManager $clientDataCollectorManager;
+    private ClientDataCollectorManager $clientDataCollectorManager;
 
     public function __construct(
         null|ClientDataCollectorManager $clientDataCollectorManager = null,
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckCounter.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckCounter.php
index dcf84536c..788287458 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckCounter.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckCounter.php
@@ -11,10 +11,10 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-final class CheckCounter implements CeremonyStep
+final readonly class CheckCounter implements CeremonyStep
 {
     public function __construct(
-        private readonly CounterChecker $counterChecker
+        private CounterChecker $counterChecker
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckCredentialId.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckCredentialId.php
index aeb202054..5b58da887 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckCredentialId.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckCredentialId.php
@@ -10,6 +10,7 @@
 use Webauthn\PublicKeyCredentialCreationOptions;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
+use function strlen;
 
 class CheckCredentialId implements CeremonyStep
 {
@@ -21,7 +22,7 @@ public function process(
         string $host
     ): void {
         $credentialId = $publicKeyCredentialSource->publicKeyCredentialId;
-        mb_strlen($credentialId) <= 1023 || throw new AuthenticatorResponseVerificationException(
+        strlen($credentialId) <= 1023 || throw new AuthenticatorResponseVerificationException(
             'Credential ID too long.'
         );
     }
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckExtensions.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckExtensions.php
index b74aadea7..fd40fdf9e 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckExtensions.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckExtensions.php
@@ -11,10 +11,10 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-final class CheckExtensions implements CeremonyStep
+final readonly class CheckExtensions implements CeremonyStep
 {
     public function __construct(
-        private readonly ExtensionOutputCheckerHandler $extensionOutputCheckerHandler,
+        private ExtensionOutputCheckerHandler $extensionOutputCheckerHandler,
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckMetadataStatement.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckMetadataStatement.php
index ce482a4a7..356e1288d 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckMetadataStatement.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckMetadataStatement.php
@@ -22,6 +22,7 @@
 use Webauthn\TrustPath\CertificateTrustPath;
 use function count;
 use function in_array;
+use function sprintf;
 
 final class CheckMetadataStatement implements CeremonyStep, CanLogData
 {
@@ -148,7 +149,6 @@ private function getAttestationType(AttestationStatement $attestationStatement):
             AttestationStatement::TYPE_BASIC => MetadataStatement::ATTESTATION_BASIC_FULL,
             AttestationStatement::TYPE_SELF => MetadataStatement::ATTESTATION_BASIC_SURROGATE,
             AttestationStatement::TYPE_ATTCA => MetadataStatement::ATTESTATION_ATTCA,
-            AttestationStatement::TYPE_ECDAA => MetadataStatement::ATTESTATION_ECDAA,
             AttestationStatement::TYPE_ANONCA => MetadataStatement::ATTESTATION_ANONCA,
             default => throw AuthenticatorResponseVerificationException::create('Invalid attestation type'),
         };
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckOrigin.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckOrigin.php
index 950cf6f85..1453b3223 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckOrigin.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckOrigin.php
@@ -14,14 +14,18 @@
 use function in_array;
 use function is_array;
 use function is_string;
+use function strlen;
 
-final class CheckOrigin implements CeremonyStep
+/**
+ * @deprecated since 5.2.0 and will be removed in 6.0.0. Will be replaced by CheckAllowedOrigins
+ */
+final readonly class CheckOrigin implements CeremonyStep
 {
     /**
      * @param string[] $securedRelyingPartyId
      */
     public function __construct(
-        private readonly array $securedRelyingPartyId
+        private array $securedRelyingPartyId
     ) {
     }
 
@@ -48,9 +52,9 @@ public function process(
         }
         $clientDataRpId = $parsedRelyingPartyId['host'] ?? '';
         $clientDataRpId !== '' || throw AuthenticatorResponseVerificationException::create('Invalid origin rpId.');
-        $rpIdLength = mb_strlen($facetId);
+        $rpIdLength = strlen($facetId);
 
-        mb_substr(
+        substr(
             '.' . $clientDataRpId,
             -($rpIdLength + 1)
         ) === '.' . $facetId || throw AuthenticatorResponseVerificationException::create('rpId mismatch.');
@@ -58,15 +62,15 @@ public function process(
 
     private function getFacetId(
         string $rpId,
-        AuthenticationExtensions $authenticationExtensionsClientInputs,
+        AuthenticationExtensions $AuthenticationExtensions,
         null|AuthenticationExtensions $authenticationExtensionsClientOutputs
     ): string {
-        if ($authenticationExtensionsClientOutputs === null || ! $authenticationExtensionsClientInputs->has(
+        if ($authenticationExtensionsClientOutputs === null || ! $AuthenticationExtensions->has(
             'appid'
         ) || ! $authenticationExtensionsClientOutputs->has('appid')) {
             return $rpId;
         }
-        $appId = $authenticationExtensionsClientInputs->get('appid')
+        $appId = $AuthenticationExtensions->get('appid')
             ->value;
         $wasUsed = $authenticationExtensionsClientOutputs->get('appid')
             ->value;
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckRelyingPartyIdIdHash.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckRelyingPartyIdIdHash.php
index de45b27b0..8465a01d5 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckRelyingPartyIdIdHash.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckRelyingPartyIdIdHash.php
@@ -43,15 +43,15 @@ public function process(
 
     private function getFacetId(
         string $rpId,
-        AuthenticationExtensions $authenticationExtensionsClientInputs,
+        AuthenticationExtensions $AuthenticationExtensions,
         null|AuthenticationExtensions $authenticationExtensionsClientOutputs
     ): string {
-        if ($authenticationExtensionsClientOutputs === null || ! $authenticationExtensionsClientInputs->has(
+        if ($authenticationExtensionsClientOutputs === null || ! $AuthenticationExtensions->has(
             'appid'
         ) || ! $authenticationExtensionsClientOutputs->has('appid')) {
             return $rpId;
         }
-        $appId = $authenticationExtensionsClientInputs->get('appid')
+        $appId = $AuthenticationExtensions->get('appid')
             ->value;
         $wasUsed = $authenticationExtensionsClientOutputs->get('appid')
             ->value;
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/CheckSignature.php b/web-auth/webauthn-lib/src/CeremonyStep/CheckSignature.php
index a89fef324..0c51026e4 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/CheckSignature.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/CheckSignature.php
@@ -22,9 +22,9 @@
 use Webauthn\Util\CoseSignatureFixer;
 use function is_array;
 
-final class CheckSignature implements CeremonyStep
+final readonly class CheckSignature implements CeremonyStep
 {
-    private readonly Manager $algorithmManager;
+    private Manager $algorithmManager;
 
     public function __construct(
         null|Manager $algorithmManager = null,
@@ -43,7 +43,7 @@ public function process(
             return;
         }
         $credentialPublicKey = $publicKeyCredentialSource->getAttestedCredentialData()
-->credentialPublicKey;
+            ->credentialPublicKey;
         $credentialPublicKey !== null || throw AuthenticatorResponseVerificationException::create(
             'No public key available.'
         );
diff --git a/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php b/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php
index dfccbcccc..dc5707051 100644
--- a/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php
+++ b/web-auth/webauthn-lib/src/CeremonyStep/HostTopOriginValidator.php
@@ -6,10 +6,10 @@
 
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 
-final class HostTopOriginValidator implements TopOriginValidator
+final readonly class HostTopOriginValidator implements TopOriginValidator
 {
     public function __construct(
-        private readonly string $host
+        private string $host
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/CertificateChainChecker/CertificateChainChecker.php b/web-auth/webauthn-lib/src/CertificateChainChecker/CertificateChainChecker.php
deleted file mode 100644
index 60837ccd1..000000000
--- a/web-auth/webauthn-lib/src/CertificateChainChecker/CertificateChainChecker.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\CertificateChainChecker;
-
-use Webauthn\MetadataService\CertificateChain\CertificateChainValidator;
-
-/**
- * @deprecated since v4.1. Please use Webauthn\MetadataService\CertificateChainChecker\CertificateChainValidator instead
- * @infection-ignore-all
- */
-interface CertificateChainChecker extends CertificateChainValidator
-{
-}
diff --git a/web-auth/webauthn-lib/src/CertificateChainChecker/PhpCertificateChainChecker.php b/web-auth/webauthn-lib/src/CertificateChainChecker/PhpCertificateChainChecker.php
deleted file mode 100644
index 17e791e45..000000000
--- a/web-auth/webauthn-lib/src/CertificateChainChecker/PhpCertificateChainChecker.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\CertificateChainChecker;
-
-use Webauthn\MetadataService\CertificateChain\PhpCertificateChainValidator;
-
-/**
- * @deprecated since v4.1. Please use Webauthn\MetadataService\CertificateChainChecker\PhpCertificateChainValidator instead
- * @infection-ignore-all
- */
-final class PhpCertificateChainChecker extends PhpCertificateChainValidator
-{
-}
diff --git a/web-auth/webauthn-lib/src/CertificateToolbox.php b/web-auth/webauthn-lib/src/CertificateToolbox.php
deleted file mode 100644
index 18b07aa9d..000000000
--- a/web-auth/webauthn-lib/src/CertificateToolbox.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn;
-
-use Webauthn\MetadataService\CertificateChain\CertificateToolbox as BaseCertificateToolbox;
-
-/**
- * @deprecated since v4.1. Please use Webauthn\MetadataService\CertificateChainChecker\PhpCertificateChainValidator instead
- * @infection-ignore-all
- */
-class CertificateToolbox extends BaseCertificateToolbox
-{
-}
diff --git a/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php b/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php
index 5fbb6450e..7bd0a4f59 100644
--- a/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php
+++ b/web-auth/webauthn-lib/src/ClientDataCollector/ClientDataCollectorManager.php
@@ -10,13 +10,13 @@
 use Webauthn\PublicKeyCredentialOptions;
 use function in_array;
 
-final class ClientDataCollectorManager
+final readonly class ClientDataCollectorManager
 {
     /**
      * @param ClientDataCollector[] $clientDataCollectors
      */
     public function __construct(
-        private readonly iterable $clientDataCollectors,
+        private iterable $clientDataCollectors,
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php b/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php
index 1a316e258..ea97fdf1e 100644
--- a/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php
+++ b/web-auth/webauthn-lib/src/ClientDataCollector/WebauthnAuthenticationCollector.php
@@ -9,6 +9,7 @@
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\PublicKeyCredentialOptions;
 use function in_array;
+use function sprintf;
 
 final class WebauthnAuthenticationCollector implements ClientDataCollector
 {
diff --git a/web-auth/webauthn-lib/src/CollectedClientData.php b/web-auth/webauthn-lib/src/CollectedClientData.php
index 3731207bb..17709e40c 100644
--- a/web-auth/webauthn-lib/src/CollectedClientData.php
+++ b/web-auth/webauthn-lib/src/CollectedClientData.php
@@ -6,10 +6,10 @@
 
 use ParagonIE\ConstantTime\Base64UrlSafe;
 use Webauthn\Exception\InvalidDataException;
-use Webauthn\TokenBinding\TokenBinding;
 use function array_key_exists;
 use function is_array;
 use function is_string;
+use function sprintf;
 use const JSON_THROW_ON_ERROR;
 
 class CollectedClientData
@@ -29,13 +29,6 @@ class CollectedClientData
 
     public readonly bool $crossOrigin;
 
-    /**
-     * @var mixed[]|null
-     * @deprecated Since 4.3.0 and will be removed in 5.0.0
-     * @infection-ignore-all
-     */
-    public readonly ?array $tokenBinding;
-
     /**
      * @param mixed[] $data
      */
@@ -77,7 +70,6 @@ public function __construct(
             $data,
             'Invalid parameter "tokenBinding". Shall be an object or .'
         );
-        $this->tokenBinding = $tokenBinding;
 
         $this->data = $data;
     }
@@ -99,60 +91,6 @@ public static function createFormJson(string $data): self
         return self::create($rawData, $json);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getChallenge(): string
-    {
-        return $this->challenge;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getOrigin(): string
-    {
-        return $this->origin;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCrossOrigin(): bool
-    {
-        return $this->crossOrigin;
-    }
-
-    /**
-     * @deprecated Since 4.3.0 and will be removed in 5.0.0
-     * @infection-ignore-all
-     */
-    public function getTokenBinding(): ?TokenBinding
-    {
-        return $this->tokenBinding === null ? null : TokenBinding::createFormArray($this->tokenBinding);
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRawData(): string
-    {
-        return $this->rawData;
-    }
-
     /**
      * @return string[]
      */
diff --git a/web-auth/webauthn-lib/src/Credential.php b/web-auth/webauthn-lib/src/Credential.php
index 7b0e7b28b..5b05f2ebb 100644
--- a/web-auth/webauthn-lib/src/Credential.php
+++ b/web-auth/webauthn-lib/src/Credential.php
@@ -4,57 +4,14 @@
 
 namespace Webauthn;
 
-use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-
 /**
  * @see https://w3c.github.io/webappsec-credential-management/#credential
  */
 abstract class Credential
 {
-    /**
-     * @deprecated since 4.9.0. Please use the property rawId instead.
-     */
-    public readonly string $id;
-
-    public readonly string $rawId;
-
     public function __construct(
-        null|string $id,
         public readonly string $type,
-        null|string $rawId = null,
+        public readonly string $rawId,
     ) {
-        if ($id === null && $rawId === null) {
-            throw new InvalidArgumentException('You must provide a valid raw ID');
-        }
-        if ($id !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.9.0',
-                'The property "$id" is deprecated and will be removed in 5.0.0. Please set null use "rawId" instead.'
-            );
-        } else {
-            $id = Base64UrlSafe::encodeUnpadded($rawId);
-        }
-        $this->id = $id;
-        $this->rawId = $rawId ?? Base64UrlSafe::decodeNoPadding($id);
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
     }
 }
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AttestationObjectDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AttestationObjectDenormalizer.php
index dfd4519b7..eae463088 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AttestationObjectDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AttestationObjectDenormalizer.php
@@ -19,7 +19,7 @@ final class AttestationObjectDenormalizer implements DenormalizerInterface, Deno
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $stream = new StringStream($data);
         $parsed = Decoder::create()->decode($stream);
@@ -46,8 +46,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AttestationObject::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AttestationStatementDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AttestationStatementDenormalizer.php
index fea020bce..2830ee093 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AttestationStatementDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AttestationStatementDenormalizer.php
@@ -8,22 +8,26 @@
 use Webauthn\AttestationStatement\AttestationStatement;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 
-final class AttestationStatementDenormalizer implements DenormalizerInterface
+final readonly class AttestationStatementDenormalizer implements DenormalizerInterface
 {
     public function __construct(
-        private readonly AttestationStatementSupportManager $attestationStatementSupportManager
+        private AttestationStatementSupportManager $attestationStatementSupportManager
     ) {
     }
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $attestationStatementSupport = $this->attestationStatementSupportManager->get($data['fmt']);
 
         return $attestationStatementSupport->load($data);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AttestationStatement::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionNormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionNormalizer.php
index b34d29dea..39fc63a88 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionNormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionNormalizer.php
@@ -23,11 +23,11 @@ public function getSupportedTypes(?string $format): array
     /**
      * @return array<mixed>
      */
-    public function normalize(mixed $data, ?string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
-        assert($data instanceof AuthenticationExtension);
+        assert($object instanceof AuthenticationExtension);
 
-        return $data->value;
+        return $object->value;
     }
 
     public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionsDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionsDenormalizer.php
index e5bacefda..d6e71604c 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionsDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticationExtensionsDenormalizer.php
@@ -8,16 +8,13 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Webauthn\AuthenticationExtensions\AuthenticationExtension;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientOutputs;
 use function assert;
-use function in_array;
 use function is_array;
 use function is_string;
 
 final class AuthenticationExtensionsDenormalizer implements DenormalizerInterface, NormalizerInterface
 {
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if ($data instanceof AuthenticationExtensions) {
             return AuthenticationExtensions::create($data->extensions);
@@ -33,17 +30,13 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return AuthenticationExtensions::create($data);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
-        return in_array(
-            $type,
-            [
-                AuthenticationExtensions::class,
-                AuthenticationExtensionsClientOutputs::class,
-                AuthenticationExtensionsClientInputs::class,
-            ],
-            true
-        );
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
+        return $type === AuthenticationExtensions::class;
     }
 
     /**
@@ -53,8 +46,6 @@ public function getSupportedTypes(?string $format): array
     {
         return [
             AuthenticationExtensions::class => true,
-            AuthenticationExtensionsClientInputs::class => true,
-            AuthenticationExtensionsClientOutputs::class => true,
         ];
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAssertionResponseDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAssertionResponseDenormalizer.php
index 613331c7a..fd8927ff2 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAssertionResponseDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAssertionResponseDenormalizer.php
@@ -18,7 +18,7 @@ final class AuthenticatorAssertionResponseDenormalizer implements DenormalizerIn
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $data['authenticatorData'] = Base64::decode($data['authenticatorData']);
         $data['signature'] = Base64::decode($data['signature']);
@@ -42,8 +42,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AuthenticatorAssertionResponse::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAttestationResponseDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAttestationResponseDenormalizer.php
index 5f6569dc7..a634fb6a9 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAttestationResponseDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorAttestationResponseDenormalizer.php
@@ -17,7 +17,7 @@ final class AuthenticatorAttestationResponseDenormalizer implements Denormalizer
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $data['clientDataJSON'] = Base64UrlSafe::decodeNoPadding($data['clientDataJSON']);
         $data['attestationObject'] = Base64::decode($data['attestationObject']);
@@ -42,8 +42,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AuthenticatorAttestationResponse::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorDataDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorDataDenormalizer.php
index f13450d0d..9af4bcc72 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorDataDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorDataDenormalizer.php
@@ -16,8 +16,8 @@
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Uid\Uuid;
 use Webauthn\AttestedCredentialData;
+use Webauthn\AuthenticationExtensions\AuthenticationExtensionLoader;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientOutputsLoader;
 use Webauthn\AuthenticatorData;
 use Webauthn\Exception\InvalidDataException;
 use Webauthn\StringStream;
@@ -35,7 +35,7 @@ public function __construct()
         $this->decoder = Decoder::create();
     }
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $authData = $this->fixIncorrectEdDSAKey($data);
         $authDataStream = new StringStream($authData);
@@ -64,7 +64,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         $extension = null;
         if (0 !== (ord($flags) & AuthenticatorData::FLAG_ED)) {
             $extension = $this->decoder->decode($authDataStream);
-            $extension = AuthenticationExtensionsClientOutputsLoader::load($extension);
+            $extension = AuthenticationExtensionLoader::load($extension);
         }
         $authDataStream->isEOF() || throw InvalidDataException::create(
             $authData,
@@ -87,8 +87,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AuthenticatorData::class;
     }
 
@@ -106,13 +110,13 @@ private function fixIncorrectEdDSAKey(string $data): string
     {
         $needle = hex2bin('a301634f4b500327206745643235353139');
         $correct = hex2bin('a401634f4b500327206745643235353139');
-        $position = mb_strpos($data, $needle, 0, '8bit');
+        $position = strpos($data, (string) $needle);
         if ($position === false) {
             return $data;
         }
 
-        $begin = mb_substr($data, 0, $position, '8bit');
-        $end = mb_substr($data, $position, null, '8bit');
+        $begin = substr($data, 0, $position);
+        $end = substr($data, $position);
         $end = str_replace($needle, $correct, $end);
         $cbor = new StringStream($end);
         $badKey = $this->decoder->decode($cbor);
diff --git a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorResponseDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorResponseDenormalizer.php
index 6a47309d5..63d152def 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorResponseDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/AuthenticatorResponseDenormalizer.php
@@ -17,7 +17,7 @@ final class AuthenticatorResponseDenormalizer implements DenormalizerInterface,
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $realType = match (true) {
             array_key_exists('attestationObject', $data) => AuthenticatorAttestationResponse::class,
@@ -28,8 +28,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return $this->denormalizer->denormalize($data, $realType, $format, $context);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AuthenticatorResponse::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/CollectedClientDataDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/CollectedClientDataDenormalizer.php
index e9e5264cd..fec3a7481 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/CollectedClientDataDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/CollectedClientDataDenormalizer.php
@@ -14,13 +14,17 @@ final class CollectedClientDataDenormalizer implements DenormalizerInterface, De
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         return CollectedClientData::create($data, json_decode($data, true, flags: JSON_THROW_ON_ERROR));
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === CollectedClientData::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/ExtensionDescriptorDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/ExtensionDescriptorDenormalizer.php
index 4109ffb44..dac996abd 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/ExtensionDescriptorDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/ExtensionDescriptorDenormalizer.php
@@ -4,39 +4,28 @@
 
 namespace Webauthn\Denormalizer;
 
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Webauthn\MetadataService\Statement\ExtensionDescriptor;
 use function array_key_exists;
 
-/**
- * @final
- */
-class ExtensionDescriptorDenormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+final class ExtensionDescriptorDenormalizer implements DenormalizerInterface
 {
-    use DenormalizerAwareTrait;
-
-    private const ALREADY_CALLED = 'EXTENSION_DESCRIPTOR_PREPROCESS_ALREADY_CALLED';
-
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if (array_key_exists('fail_if_unknown', $data)) {
             $data['failIfUnknown'] = $data['fail_if_unknown'];
             unset($data['fail_if_unknown']);
         }
 
-        $context[self::ALREADY_CALLED] = true;
-
-        return $this->denormalizer->denormalize($data, $type, $format, $context);
+        return ExtensionDescriptor::create(...$data);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
-        if ($context[self::ALREADY_CALLED] ?? false) {
-            return false;
-        }
-
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === ExtensionDescriptor::class;
     }
 
@@ -46,7 +35,7 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
     public function getSupportedTypes(?string $format): array
     {
         return [
-            ExtensionDescriptor::class => false,
+            ExtensionDescriptor::class => true,
         ];
     }
 }
diff --git a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialDenormalizer.php
index 33899b707..c432b762a 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialDenormalizer.php
@@ -18,7 +18,7 @@ final class PublicKeyCredentialDenormalizer implements DenormalizerInterface, De
 {
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if (! array_key_exists('id', $data)) {
             return $data;
@@ -29,15 +29,18 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         $data['rawId'] = $rawId;
 
         return PublicKeyCredential::create(
-            null,
             $data['type'],
             $data['rawId'],
             $this->denormalizer->denormalize($data['response'], AuthenticatorResponse::class, $format, $context),
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === PublicKeyCredential::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialOptionsDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialOptionsDenormalizer.php
index 1b59091d5..4a9bfe706 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialOptionsDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialOptionsDenormalizer.php
@@ -29,7 +29,7 @@ final class PublicKeyCredentialOptionsDenormalizer implements DenormalizerInterf
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if (array_key_exists('challenge', $data)) {
             $data['challenge'] = Base64UrlSafe::decodeNoPadding($data['challenge']);
@@ -103,8 +103,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         throw new BadMethodCallException('Unsupported type');
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return in_array(
             $type,
             [PublicKeyCredentialCreationOptions::class, PublicKeyCredentialRequestOptions::class],
@@ -131,49 +135,49 @@ public function getSupportedTypes(?string $format): array
     /**
      * @return array<string, mixed>
      */
-    public function normalize(mixed $data, ?string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
         assert(
-            $data instanceof PublicKeyCredentialCreationOptions || $data instanceof PublicKeyCredentialRequestOptions
+            $object instanceof PublicKeyCredentialCreationOptions || $object instanceof PublicKeyCredentialRequestOptions
         );
         $json = [
-            'challenge' => Base64UrlSafe::encodeUnpadded($data->challenge),
-            'timeout' => $data->timeout,
-            'extensions' => $data->extensions->count() === 0 ? null : $this->normalizer->normalize(
-                $data->extensions,
+            'challenge' => Base64UrlSafe::encodeUnpadded($object->challenge),
+            'timeout' => $object->timeout,
+            'extensions' => $object->extensions->count() === 0 ? null : $this->normalizer->normalize(
+                $object->extensions,
                 $format,
                 $context
             ),
         ];
 
-        if ($data instanceof PublicKeyCredentialCreationOptions) {
+        if ($object instanceof PublicKeyCredentialCreationOptions) {
             $json = [
                 ...$json,
-                'rp' => $this->normalizer->normalize($data->rp, $format, $context),
-                'user' => $this->normalizer->normalize($data->user, $format, $context),
+                'rp' => $this->normalizer->normalize($object->rp, $format, $context),
+                'user' => $this->normalizer->normalize($object->user, $format, $context),
                 'pubKeyCredParams' => $this->normalizer->normalize(
-                    $data->pubKeyCredParams,
+                    $object->pubKeyCredParams,
                     PublicKeyCredentialParameters::class . '[]',
                     $context
                 ),
-                'authenticatorSelection' => $data->authenticatorSelection === null ? null : $this->normalizer->normalize(
-                    $data->authenticatorSelection,
+                'authenticatorSelection' => $object->authenticatorSelection === null ? null : $this->normalizer->normalize(
+                    $object->authenticatorSelection,
                     $format,
                     $context
                 ),
-                'attestation' => $data->attestation,
-                'excludeCredentials' => $this->normalizer->normalize($data->excludeCredentials, $format, $context),
+                'attestation' => $object->attestation,
+                'excludeCredentials' => $this->normalizer->normalize($object->excludeCredentials, $format, $context),
             ];
         }
-        if ($data instanceof PublicKeyCredentialRequestOptions) {
+        if ($object instanceof PublicKeyCredentialRequestOptions) {
             $json = [
                 ...$json,
-                'rpId' => $data->rpId,
-                'allowCredentials' => $this->normalizer->normalize($data->allowCredentials, $format, $context),
-                'userVerification' => $data->userVerification,
+                'rpId' => $object->rpId,
+                'allowCredentials' => $this->normalizer->normalize($object->allowCredentials, $format, $context),
+                'userVerification' => $object->userVerification,
             ];
         }
 
-        return array_filter($json, static fn ($value) => $value !== null && $value !== []);
+        return array_filter($json, static fn ($value): bool => $value !== null);
     }
 }
diff --git a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialParametersDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialParametersDenormalizer.php
index b5d640688..0114c3a6a 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialParametersDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialParametersDenormalizer.php
@@ -11,7 +11,7 @@
 
 final class PublicKeyCredentialParametersDenormalizer implements DenormalizerInterface
 {
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if (! array_key_exists('type', $data) || ! array_key_exists('alg', $data)) {
             throw new InvalidDataException($data, 'Missing type or alg');
@@ -20,8 +20,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return PublicKeyCredentialParameters::create($data['type'], $data['alg']);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === PublicKeyCredentialParameters::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialSourceDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialSourceDenormalizer.php
index bf8a5ae3d..3a963afa6 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialSourceDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialSourceDenormalizer.php
@@ -24,7 +24,7 @@ final class PublicKeyCredentialSourceDenormalizer implements DenormalizerInterfa
     use NormalizerAwareTrait;
     use DenormalizerAwareTrait;
 
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         $keys = ['publicKeyCredentialId', 'credentialPublicKey', 'userHandle'];
         foreach ($keys as $key) {
@@ -49,8 +49,12 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === PublicKeyCredentialSource::class;
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialUserEntityDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialUserEntityDenormalizer.php
index 275b2548a..d085331e9 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialUserEntityDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/PublicKeyCredentialUserEntityDenormalizer.php
@@ -14,23 +14,22 @@
 
 final class PublicKeyCredentialUserEntityDenormalizer implements DenormalizerInterface, NormalizerInterface
 {
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         if (! array_key_exists('id', $data)) {
             return $data;
         }
         $data['id'] = Base64::decode($data['id']);
 
-        return PublicKeyCredentialUserEntity::create(
-            $data['name'],
-            $data['id'],
-            $data['displayName'],
-            $data['icon'] ?? null
-        );
+        return PublicKeyCredentialUserEntity::create($data['name'], $data['id'], $data['displayName']);
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === PublicKeyCredentialUserEntity::class;
     }
 
@@ -47,17 +46,14 @@ public function getSupportedTypes(?string $format): array
     /**
      * @return array<string, mixed>
      */
-    public function normalize(mixed $data, ?string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
-        assert($data instanceof PublicKeyCredentialUserEntity);
-        $normalized = [
-            'id' => Base64UrlSafe::encodeUnpadded($data->id),
-            'name' => $data->name,
-            'displayName' => $data->displayName,
-            'icon' => $data->icon,
+        assert($object instanceof PublicKeyCredentialUserEntity);
+        return [
+            'id' => Base64UrlSafe::encodeUnpadded($object->id),
+            'name' => $object->name,
+            'displayName' => $object->displayName,
         ];
-
-        return array_filter($normalized, fn ($value) => $value !== null);
     }
 
     public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
diff --git a/web-auth/webauthn-lib/src/Denormalizer/TrustPathDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/TrustPathDenormalizer.php
index 741dbcd83..c79d54469 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/TrustPathDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/TrustPathDenormalizer.php
@@ -8,26 +8,29 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Webauthn\Exception\InvalidTrustPathException;
 use Webauthn\TrustPath\CertificateTrustPath;
-use Webauthn\TrustPath\EcdaaKeyIdTrustPath;
 use Webauthn\TrustPath\EmptyTrustPath;
 use Webauthn\TrustPath\TrustPath;
 use function array_key_exists;
 use function assert;
+use function is_array;
 
 final class TrustPathDenormalizer implements DenormalizerInterface, NormalizerInterface
 {
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         return match (true) {
-            array_key_exists('ecdaaKeyId', $data) => new EcdaaKeyIdTrustPath($data),
-            array_key_exists('x5c', $data) => CertificateTrustPath::create($data),
+            array_key_exists('x5c', $data) && is_array($data['x5c']) => CertificateTrustPath::create($data['x5c']),
             $data === [], isset($data['type']) && $data['type'] === EmptyTrustPath::class => EmptyTrustPath::create(),
             default => throw new InvalidTrustPathException('Unsupported trust path type'),
         };
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === TrustPath::class;
     }
 
@@ -48,9 +51,6 @@ public function normalize(mixed $data, ?string $format = null, array $context =
     {
         assert($data instanceof TrustPath);
         return match (true) {
-            $data instanceof EcdaaKeyIdTrustPath => [
-                'ecdaaKeyId' => $data->getEcdaaKeyId(),
-            ],
             $data instanceof CertificateTrustPath => [
                 'x5c' => $data->certificates,
             ],
diff --git a/web-auth/webauthn-lib/src/Denormalizer/VerificationMethodANDCombinationsDenormalizer.php b/web-auth/webauthn-lib/src/Denormalizer/VerificationMethodANDCombinationsDenormalizer.php
index 64f69439e..d82498f7c 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/VerificationMethodANDCombinationsDenormalizer.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/VerificationMethodANDCombinationsDenormalizer.php
@@ -28,13 +28,13 @@ public function getSupportedTypes(?string $format): array
     /**
      * @return array<VerificationMethodDescriptor>
      */
-    public function normalize(mixed $object, ?string $format = null, array $context = []): array
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
-        assert($object instanceof VerificationMethodANDCombinations);
+        assert($data instanceof VerificationMethodANDCombinations);
 
         return array_map(
             fn ($verificationMethod) => $this->normalizer->normalize($verificationMethod, $format, $context),
-            $object->verificationMethods
+            $data->verificationMethods
         );
     }
 
diff --git a/web-auth/webauthn-lib/src/Denormalizer/WebauthnSerializerFactory.php b/web-auth/webauthn-lib/src/Denormalizer/WebauthnSerializerFactory.php
index be9f7ce26..27302987d 100644
--- a/web-auth/webauthn-lib/src/Denormalizer/WebauthnSerializerFactory.php
+++ b/web-auth/webauthn-lib/src/Denormalizer/WebauthnSerializerFactory.php
@@ -15,8 +15,9 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
+use function sprintf;
 
-final class WebauthnSerializerFactory
+final readonly class WebauthnSerializerFactory
 {
     private const PACKAGE_SYMFONY_PROPERTY_INFO = 'symfony/property-info';
 
@@ -25,7 +26,7 @@ final class WebauthnSerializerFactory
     private const PACKAGE_PHPDOCUMENTOR_REFLECTION_DOCBLOCK = 'phpdocumentor/reflection-docblock';
 
     public function __construct(
-        private readonly AttestationStatementSupportManager $attestationStatementSupportManager
+        private AttestationStatementSupportManager $attestationStatementSupportManager
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationFailedEvent.php b/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationFailedEvent.php
index fb542c43a..371b6ad98 100644
--- a/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationFailedEvent.php
+++ b/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationFailedEvent.php
@@ -4,91 +4,20 @@
 
 namespace Webauthn\Event;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 use Webauthn\AuthenticatorAssertionResponse;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-class AuthenticatorAssertionResponseValidationFailedEvent
+readonly class AuthenticatorAssertionResponseValidationFailedEvent
 {
     public function __construct(
-        public readonly string|PublicKeyCredentialSource $credentialId,
-        public readonly AuthenticatorAssertionResponse $authenticatorAssertionResponse,
-        public readonly PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
-        public readonly ServerRequestInterface|string $host,
-        public readonly ?string $userHandle,
-        public readonly Throwable $throwable
+        public PublicKeyCredentialSource $credentialSource,
+        public AuthenticatorAssertionResponse $authenticatorAssertionResponse,
+        public PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
+        public string $host,
+        public ?string $userHandle,
+        public Throwable $throwable
     ) {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-        if (! $this->credentialId instanceof PublicKeyCredentialSource) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.6.0',
-                'Passing a string for the argument "$credentialId" is deprecated since 4.6.0. Please set the PublicKeyCredentialSource instead.'
-            );
-        }
-    }
-
-    /**
-     * @deprecated since 4.7.0 and will be removed in 5.0.0. Please use the `getCredential()` method instead
-     * @infection-ignore-all
-     */
-    public function getCredentialId(): string
-    {
-        return $this->credentialId instanceof PublicKeyCredentialSource ? $this->credentialId->publicKeyCredentialId : $this->credentialId;
-    }
-
-    public function getCredential(): ?PublicKeyCredentialSource
-    {
-        return $this->credentialId instanceof PublicKeyCredentialSource ? $this->credentialId : null;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getAuthenticatorAssertionResponse(): AuthenticatorAssertionResponse
-    {
-        return $this->authenticatorAssertionResponse;
-    }
-
-    public function getPublicKeyCredentialRequestOptions(): PublicKeyCredentialRequestOptions
-    {
-        return $this->publicKeyCredentialRequestOptions;
-    }
-
-    /**
-     * @deprecated since 4.5.0 and will be removed in 5.0.0. Please use the `host` property instead
-     * @infection-ignore-all
-     */
-    public function getRequest(): ServerRequestInterface|string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getUserHandle(): ?string
-    {
-        return $this->userHandle;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getThrowable(): Throwable
-    {
-        return $this->throwable;
     }
 }
diff --git a/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationSucceededEvent.php b/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationSucceededEvent.php
index 88442b171..d77972984 100644
--- a/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationSucceededEvent.php
+++ b/web-auth/webauthn-lib/src/Event/AuthenticatorAssertionResponseValidationSucceededEvent.php
@@ -4,7 +4,6 @@
 
 namespace Webauthn\Event;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Webauthn\AuthenticatorAssertionResponse;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
@@ -12,79 +11,11 @@
 class AuthenticatorAssertionResponseValidationSucceededEvent
 {
     public function __construct(
-        public readonly null|string $credentialId,
         public readonly AuthenticatorAssertionResponse $authenticatorAssertionResponse,
         public readonly PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions,
-        public readonly ServerRequestInterface|string $host,
+        public readonly string $host,
         public readonly ?string $userHandle,
         public readonly PublicKeyCredentialSource $publicKeyCredentialSource
     ) {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-        if ($this->credentialId !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.6.0',
-                'The argument "$credentialId" is deprecated since 4.6.0 and will be removed in 5.0.0. Please set null instead.'
-            );
-        }
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getCredentialId(): string
-    {
-        return $this->publicKeyCredentialSource->publicKeyCredentialId;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getAuthenticatorAssertionResponse(): AuthenticatorAssertionResponse
-    {
-        return $this->authenticatorAssertionResponse;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getPublicKeyCredentialRequestOptions(): PublicKeyCredentialRequestOptions
-    {
-        return $this->publicKeyCredentialRequestOptions;
-    }
-
-    /**
-     * @deprecated since 4.5.0 and will be removed in 5.0.0. Please use the `host` property instead
-     * @infection-ignore-all
-     */
-    public function getRequest(): ServerRequestInterface|string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getUserHandle(): ?string
-    {
-        return $this->userHandle;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getPublicKeyCredentialSource(): PublicKeyCredentialSource
-    {
-        return $this->publicKeyCredentialSource;
     }
 }
diff --git a/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationFailedEvent.php b/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationFailedEvent.php
index 59f7403b9..d91082c2f 100644
--- a/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationFailedEvent.php
+++ b/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationFailedEvent.php
@@ -4,62 +4,17 @@
 
 namespace Webauthn\Event;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 use Webauthn\AuthenticatorAttestationResponse;
 use Webauthn\PublicKeyCredentialCreationOptions;
 
-class AuthenticatorAttestationResponseValidationFailedEvent
+readonly class AuthenticatorAttestationResponseValidationFailedEvent
 {
     public function __construct(
-        public readonly AuthenticatorAttestationResponse $authenticatorAttestationResponse,
-        public readonly PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
-        public readonly ServerRequestInterface|string $host,
-        public readonly Throwable $throwable
+        public AuthenticatorAttestationResponse $authenticatorAttestationResponse,
+        public PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
+        public string $host,
+        public Throwable $throwable
     ) {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getAuthenticatorAttestationResponse(): AuthenticatorAttestationResponse
-    {
-        return $this->authenticatorAttestationResponse;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getPublicKeyCredentialCreationOptions(): PublicKeyCredentialCreationOptions
-    {
-        return $this->publicKeyCredentialCreationOptions;
-    }
-
-    /**
-     * @deprecated since 4.5.0 and will be removed in 5.0.0. Please use the `host` property instead
-     * @infection-ignore-all
-     */
-    public function getRequest(): ServerRequestInterface|string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getThrowable(): Throwable
-    {
-        return $this->throwable;
     }
 }
diff --git a/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationSucceededEvent.php b/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationSucceededEvent.php
index 59cca9516..be5604d52 100644
--- a/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationSucceededEvent.php
+++ b/web-auth/webauthn-lib/src/Event/AuthenticatorAttestationResponseValidationSucceededEvent.php
@@ -4,62 +4,17 @@
 
 namespace Webauthn\Event;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Webauthn\AuthenticatorAttestationResponse;
 use Webauthn\PublicKeyCredentialCreationOptions;
 use Webauthn\PublicKeyCredentialSource;
 
-class AuthenticatorAttestationResponseValidationSucceededEvent
+readonly class AuthenticatorAttestationResponseValidationSucceededEvent
 {
     public function __construct(
-        public readonly AuthenticatorAttestationResponse $authenticatorAttestationResponse,
-        public readonly PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
-        public readonly ServerRequestInterface|string $host,
-        public readonly PublicKeyCredentialSource $publicKeyCredentialSource
+        public AuthenticatorAttestationResponse $authenticatorAttestationResponse,
+        public PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions,
+        public string $host,
+        public PublicKeyCredentialSource $publicKeyCredentialSource
     ) {
-        if ($host instanceof ServerRequestInterface) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.5.0',
-                sprintf(
-                    'Passing a %s to the class "%s" is deprecated since 4.5.0 and will be removed in 5.0.0. Please inject the host as a string instead.',
-                    ServerRequestInterface::class,
-                    self::class
-                )
-            );
-        }
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getAuthenticatorAttestationResponse(): AuthenticatorAttestationResponse
-    {
-        return $this->authenticatorAttestationResponse;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getPublicKeyCredentialCreationOptions(): PublicKeyCredentialCreationOptions
-    {
-        return $this->publicKeyCredentialCreationOptions;
-    }
-
-    /**
-     * @deprecated since 4.5.0 and will be removed in 5.0.0. Please use the `host` property instead
-     * @infection-ignore-all
-     */
-    public function getRequest(): ServerRequestInterface|string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Will be removed in 5.0.0. Please use the property instead.
-     */
-    public function getPublicKeyCredentialSource(): PublicKeyCredentialSource
-    {
-        return $this->publicKeyCredentialSource;
     }
 }
diff --git a/web-auth/webauthn-lib/src/Event/BeforeCertificateChainValidation.php b/web-auth/webauthn-lib/src/Event/BeforeCertificateChainValidation.php
index f871ae039..3b391c307 100644
--- a/web-auth/webauthn-lib/src/Event/BeforeCertificateChainValidation.php
+++ b/web-auth/webauthn-lib/src/Event/BeforeCertificateChainValidation.php
@@ -4,17 +4,14 @@
 
 namespace Webauthn\Event;
 
-/**
- * @final
- */
-class BeforeCertificateChainValidation implements WebauthnEvent
+final readonly class BeforeCertificateChainValidation implements WebauthnEvent
 {
     /**
      * @param string[] $untrustedCertificates
      */
     public function __construct(
-        public readonly array $untrustedCertificates,
-        public readonly string $trustedCertificate
+        public array $untrustedCertificates,
+        public string $trustedCertificate
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/Event/CertificateChainValidationFailed.php b/web-auth/webauthn-lib/src/Event/CertificateChainValidationFailed.php
index 69b016b69..3d8d358a7 100644
--- a/web-auth/webauthn-lib/src/Event/CertificateChainValidationFailed.php
+++ b/web-auth/webauthn-lib/src/Event/CertificateChainValidationFailed.php
@@ -4,17 +4,14 @@
 
 namespace Webauthn\Event;
 
-/**
- * @final
- */
-class CertificateChainValidationFailed implements WebauthnEvent
+final readonly class CertificateChainValidationFailed implements WebauthnEvent
 {
     /**
      * @param string[] $untrustedCertificates
      */
     public function __construct(
-        public readonly array $untrustedCertificates,
-        public readonly string $trustedCertificate
+        public array $untrustedCertificates,
+        public string $trustedCertificate
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/Event/CertificateChainValidationSucceeded.php b/web-auth/webauthn-lib/src/Event/CertificateChainValidationSucceeded.php
index 2fce01694..a5c361ee8 100644
--- a/web-auth/webauthn-lib/src/Event/CertificateChainValidationSucceeded.php
+++ b/web-auth/webauthn-lib/src/Event/CertificateChainValidationSucceeded.php
@@ -4,17 +4,14 @@
 
 namespace Webauthn\Event;
 
-/**
- * @final
- */
-class CertificateChainValidationSucceeded implements WebauthnEvent
+final readonly class CertificateChainValidationSucceeded implements WebauthnEvent
 {
     /**
      * @param string[] $untrustedCertificates
      */
     public function __construct(
-        public readonly array $untrustedCertificates,
-        public readonly string $trustedCertificate
+        public array $untrustedCertificates,
+        public string $trustedCertificate
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/Event/MetadataStatementFound.php b/web-auth/webauthn-lib/src/Event/MetadataStatementFound.php
index b9b52e111..bdd6bf706 100644
--- a/web-auth/webauthn-lib/src/Event/MetadataStatementFound.php
+++ b/web-auth/webauthn-lib/src/Event/MetadataStatementFound.php
@@ -6,13 +6,10 @@
 
 use Webauthn\MetadataService\Statement\MetadataStatement;
 
-/**
- * @final
- */
-class MetadataStatementFound implements WebauthnEvent
+final readonly class MetadataStatementFound implements WebauthnEvent
 {
     public function __construct(
-        public readonly MetadataStatement $metadataStatement
+        public MetadataStatement $metadataStatement
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/Event/NullEventDispatcher.php b/web-auth/webauthn-lib/src/Event/NullEventDispatcher.php
index 76de5b214..ece023c51 100644
--- a/web-auth/webauthn-lib/src/Event/NullEventDispatcher.php
+++ b/web-auth/webauthn-lib/src/Event/NullEventDispatcher.php
@@ -6,10 +6,7 @@
 
 use Psr\EventDispatcher\EventDispatcherInterface;
 
-/**
- * @final
- */
-class NullEventDispatcher implements EventDispatcherInterface
+final class NullEventDispatcher implements EventDispatcherInterface
 {
     public function dispatch(object $event): object
     {
diff --git a/web-auth/webauthn-lib/src/Exception/CertificateRevocationListException.php b/web-auth/webauthn-lib/src/Exception/CertificateRevocationListException.php
index db8673629..19232e3b3 100644
--- a/web-auth/webauthn-lib/src/Exception/CertificateRevocationListException.php
+++ b/web-auth/webauthn-lib/src/Exception/CertificateRevocationListException.php
@@ -6,10 +6,7 @@
 
 use Throwable;
 
-/**
- * @final
- */
-class CertificateRevocationListException extends MetadataServiceException
+final class CertificateRevocationListException extends MetadataServiceException
 {
     public function __construct(
         public readonly string $url,
diff --git a/web-auth/webauthn-lib/src/Exception/ExpiredCertificateException.php b/web-auth/webauthn-lib/src/Exception/ExpiredCertificateException.php
index 743e18adc..ca7aedb85 100644
--- a/web-auth/webauthn-lib/src/Exception/ExpiredCertificateException.php
+++ b/web-auth/webauthn-lib/src/Exception/ExpiredCertificateException.php
@@ -6,10 +6,7 @@
 
 use Throwable;
 
-/**
- * @final
- */
-class ExpiredCertificateException extends CertificateException
+final class ExpiredCertificateException extends CertificateException
 {
     public static function create(
         string $certificate,
diff --git a/web-auth/webauthn-lib/src/Exception/InvalidCertificateException.php b/web-auth/webauthn-lib/src/Exception/InvalidCertificateException.php
index d9422c264..58fa34f57 100644
--- a/web-auth/webauthn-lib/src/Exception/InvalidCertificateException.php
+++ b/web-auth/webauthn-lib/src/Exception/InvalidCertificateException.php
@@ -6,10 +6,7 @@
 
 use Throwable;
 
-/**
- * @final
- */
-class InvalidCertificateException extends MetadataServiceException
+final class InvalidCertificateException extends MetadataServiceException
 {
     public function __construct(
         public readonly string $certificate,
diff --git a/web-auth/webauthn-lib/src/Exception/MetadataStatementLoadingException.php b/web-auth/webauthn-lib/src/Exception/MetadataStatementLoadingException.php
index 632e896df..ceb2f2b06 100644
--- a/web-auth/webauthn-lib/src/Exception/MetadataStatementLoadingException.php
+++ b/web-auth/webauthn-lib/src/Exception/MetadataStatementLoadingException.php
@@ -6,10 +6,7 @@
 
 use Throwable;
 
-/**
- * @final
- */
-class MetadataStatementLoadingException extends MetadataStatementException
+final class MetadataStatementLoadingException extends MetadataStatementException
 {
     public static function create(
         string $message = 'Unable to load the metadata statement',
diff --git a/web-auth/webauthn-lib/src/Exception/MissingMetadataStatementException.php b/web-auth/webauthn-lib/src/Exception/MissingMetadataStatementException.php
index 2552111d1..5474c8e11 100644
--- a/web-auth/webauthn-lib/src/Exception/MissingMetadataStatementException.php
+++ b/web-auth/webauthn-lib/src/Exception/MissingMetadataStatementException.php
@@ -6,10 +6,7 @@
 
 use Throwable;
 
-/**
- * @final
- */
-class MissingMetadataStatementException extends MetadataStatementException
+final class MissingMetadataStatementException extends MetadataStatementException
 {
     public function __construct(
         public readonly string $aaguid,
diff --git a/web-auth/webauthn-lib/src/Exception/RevokedCertificateException.php b/web-auth/webauthn-lib/src/Exception/RevokedCertificateException.php
index 93b439d57..b8aa752b3 100644
--- a/web-auth/webauthn-lib/src/Exception/RevokedCertificateException.php
+++ b/web-auth/webauthn-lib/src/Exception/RevokedCertificateException.php
@@ -4,9 +4,6 @@
 
 namespace Webauthn\Exception;
 
-/**
- * @final
- */
-class RevokedCertificateException extends CertificateException
+final class RevokedCertificateException extends CertificateException
 {
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php b/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php
index 47c4406f1..6cfb2d261 100644
--- a/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php
+++ b/web-auth/webauthn-lib/src/MetadataService/CertificateChain/CertificateToolbox.php
@@ -4,11 +4,9 @@
 
 namespace Webauthn\MetadataService\CertificateChain;
 
-use ParagonIE\ConstantTime\Base64;
-use function preg_replace;
 use const PHP_EOL;
 
-class CertificateToolbox
+final readonly class CertificateToolbox
 {
     private const PEM_HEADER = '-----BEGIN ';
 
@@ -35,21 +33,6 @@ public static function fixPEMStructure(string $data, string $type = 'CERTIFICATE
         return $pem . (self::PEM_FOOTER . $type . '-----' . PHP_EOL);
     }
 
-    /**
-     * @deprecated since 4.7.0 and will be removed in 5.0.0. No replacement as not used internally.
-     * @infection-ignore-all
-     */
-    public static function convertPEMToDER(string $data): string
-    {
-        if (! str_contains($data, self::PEM_HEADER)) {
-            return $data;
-        }
-        $data = preg_replace('/\-{5}.*\-{5}[\r\n]*/', '', $data);
-        $data = preg_replace("/[\r\n]*/", '', (string) $data);
-
-        return Base64::decode(trim((string) $data), true);
-    }
-
     public static function convertDERToPEM(string $data, string $type = 'CERTIFICATE'): string
     {
         if (str_contains($data, self::PEM_HEADER)) {
@@ -64,7 +47,7 @@ public static function convertDERToPEM(string $data, string $type = 'CERTIFICATE
      *
      * @return string[]
      */
-    public static function convertAllDERToPEM(iterable $data, string $type = 'CERTIFICATE'): array
+    public static function convertAllDERToPEM(array $data, string $type = 'CERTIFICATE'): array
     {
         return array_map(static fn ($d): string => self::convertDERToPEM($d, $type), $data);
     }
diff --git a/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php b/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php
index b7a676d1b..0560ab415 100644
--- a/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php
+++ b/web-auth/webauthn-lib/src/MetadataService/CertificateChain/PhpCertificateChainValidator.php
@@ -4,18 +4,14 @@
 
 namespace Webauthn\MetadataService\CertificateChain;
 
-use DateTimeZone;
-use Lcobucci\Clock\Clock;
-use Lcobucci\Clock\SystemClock;
 use Psr\Clock\ClockInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
 use SpomkyLabs\Pki\ASN1\Type\UnspecifiedType;
 use SpomkyLabs\Pki\CryptoEncoding\PEM;
 use SpomkyLabs\Pki\X509\Certificate\Certificate;
 use SpomkyLabs\Pki\X509\CertificationPath\CertificationPath;
 use SpomkyLabs\Pki\X509\CertificationPath\PathValidation\PathValidationConfig;
+use Symfony\Component\Clock\NativeClock;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
 use Webauthn\Event\BeforeCertificateChainValidation;
@@ -29,48 +25,33 @@
 use function count;
 use function in_array;
 use function parse_url;
+use function sprintf;
 use const PHP_EOL;
 use const PHP_URL_SCHEME;
 
-class PhpCertificateChainValidator implements CertificateChainValidator, CanDispatchEvents
+final class PhpCertificateChainValidator implements CertificateChainValidator, CanDispatchEvents
 {
     private const MAX_VALIDATION_LENGTH = 5;
 
-    private readonly Clock|ClockInterface $clock;
+    private readonly ClockInterface $clock;
 
     private EventDispatcherInterface $dispatcher;
 
     public function __construct(
-        private readonly ClientInterface|HttpClientInterface $client,
-        private readonly ?RequestFactoryInterface $requestFactory = null,
-        null|Clock|ClockInterface $clock = null,
+        private readonly HttpClientInterface $client,
+        null|ClockInterface $clock = null,
         private readonly bool $allowFailures = true
     ) {
-        if ($clock === null) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.5.0',
-                'The parameter "$clock" will become mandatory in 5.0.0. Please set a valid PSR Clock implementation instead of "null".'
-            );
-            $clock = new SystemClock(new DateTimeZone('UTC'));
-        }
-        if ($requestFactory !== null && ! $client instanceof HttpClientInterface) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.7.0',
-                'The parameter "$requestFactory" will be removed in 5.0.0. Please set it to null and set an Symfony\Contracts\HttpClient\HttpClientInterface as "$client" argument.'
-            );
-        }
-        $this->clock = $clock;
+        $this->clock = $clock ?? new NativeClock();
         $this->dispatcher = new NullEventDispatcher();
     }
 
     public static function create(
         HttpClientInterface $client,
-        null|Clock|ClockInterface $clock = null,
+        null|ClockInterface $clock = null,
         bool $allowFailures = true
     ): self {
-        return new self($client, null, $clock, $allowFailures);
+        return new self($client, $clock, $allowFailures);
     }
 
     public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): void
@@ -111,22 +92,22 @@ public function check(array $untrustedCertificates, array $trustedCertificates):
      */
     private function validateChain(array $untrustedCertificates, string $trustedCertificate): bool
     {
-        $untrustedCertificates = array_map(
+        $untrustedCertificateObjects = array_map(
             static fn (string $cert): Certificate => Certificate::fromPEM(PEM::fromString($cert)),
             array_reverse($untrustedCertificates)
         );
-        $trustedCertificate = Certificate::fromPEM(PEM::fromString($trustedCertificate));
+        $trustedCertificateObject = Certificate::fromPEM(PEM::fromString($trustedCertificate));
 
         // The trust path and the authenticator certificate are the same
         if (count(
-            $untrustedCertificates
-        ) === 1 && $untrustedCertificates[0]->toPEM()->string() === $trustedCertificate->toPEM()->string()) {
+            $untrustedCertificateObjects
+        ) === 1 && $untrustedCertificateObjects[0]->toPEM()->string() === $trustedCertificateObject->toPEM()->string()) {
             return true;
         }
         $uniqueCertificates = array_map(
             static fn (Certificate $cert): string => $cert->toPEM()
                 ->string(),
-            [...$untrustedCertificates, $trustedCertificate]
+            [...$untrustedCertificateObjects, $trustedCertificateObject]
         );
         count(array_unique($uniqueCertificates)) === count(
             $uniqueCertificates
@@ -136,11 +117,11 @@ private function validateChain(array $untrustedCertificates, string $trustedCert
             'Invalid certificate chain with duplicated certificates.'
         );
 
-        if (! $this->validateCertificates($trustedCertificate, ...$untrustedCertificates)) {
+        if (! $this->validateCertificates($trustedCertificateObject, ...$untrustedCertificateObjects)) {
             return false;
         }
 
-        $certificates = [$trustedCertificate, ...$untrustedCertificates];
+        $certificates = [$trustedCertificateObject, ...$untrustedCertificateObjects];
         $numCerts = count($certificates);
         for ($i = 1; $i < $numCerts; $i++) {
             if ($this->isRevoked($certificates[$i])) {
@@ -221,12 +202,8 @@ private function validateCertificates(Certificate ...$certificates): bool
     private function retrieveRevokedSerialNumbers(string $url): array
     {
         try {
-            if ($this->client instanceof HttpClientInterface) {
-                $crlData = $this->client->request('GET', $url)
-                    ->getContent();
-            } else {
-                $crlData = $this->sendPsrRequest($url);
-            }
+            $crlData = $this->client->request('GET', $url)
+                ->getContent();
             $crl = UnspecifiedType::fromDER($crlData)->asSequence();
             count($crl) === 3 || throw CertificateRevocationListException::create($url);
             $tbsCertList = $crl->at(0)
@@ -280,16 +257,4 @@ private function getCrlUrlList(Certificate $subject): array
             );
         }
     }
-
-    private function sendPsrRequest(string $url): string
-    {
-        $request = $this->requestFactory->createRequest('GET', $url);
-        $response = $this->client->sendRequest($request);
-        if ($response->getStatusCode() !== 200) {
-            throw CertificateRevocationListException::create($url, 'Failed to download the CRL');
-        }
-
-        return $response->getBody()
-            ->getContents();
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Denormalizer/ExtensionDescriptorDenormalizer.php b/web-auth/webauthn-lib/src/MetadataService/Denormalizer/ExtensionDescriptorDenormalizer.php
deleted file mode 100644
index b31eec3dd..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Denormalizer/ExtensionDescriptorDenormalizer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Denormalizer;
-
-use Webauthn\Denormalizer\ExtensionDescriptorDenormalizer as BaseExtensionDescriptorDenormalizer;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Denormalizer\ExtensionDescriptorDenormalizer instead
- */
-final class ExtensionDescriptorDenormalizer extends BaseExtensionDescriptorDenormalizer
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Denormalizer/MetadataStatementSerializerFactory.php b/web-auth/webauthn-lib/src/MetadataService/Denormalizer/MetadataStatementSerializerFactory.php
deleted file mode 100644
index d16554272..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Denormalizer/MetadataStatementSerializerFactory.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Denormalizer;
-
-use Symfony\Component\Serializer\SerializerInterface;
-use Webauthn\AttestationStatement\AttestationStatementSupportManager;
-use Webauthn\Denormalizer\WebauthnSerializerFactory;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Denormalizer\WebauthnSerializerFactory instead
- */
-final class MetadataStatementSerializerFactory
-{
-    public static function create(): SerializerInterface
-    {
-        $attestationStatementSupportManager = AttestationStatementSupportManager::create();
-        $factory = new WebauthnSerializerFactory($attestationStatementSupportManager);
-
-        return $factory->create();
-    }
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/BeforeCertificateChainValidation.php b/web-auth/webauthn-lib/src/MetadataService/Event/BeforeCertificateChainValidation.php
deleted file mode 100644
index bf6f5f910..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/BeforeCertificateChainValidation.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\BeforeCertificateChainValidation as BaseBeforeCertificateChainValidation;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\BeforeCertificateChainValidation instead
- */
-final class BeforeCertificateChainValidation extends BaseBeforeCertificateChainValidation
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/CanDispatchEvents.php b/web-auth/webauthn-lib/src/MetadataService/Event/CanDispatchEvents.php
deleted file mode 100644
index ef9fed36f..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/CanDispatchEvents.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\CanDispatchEvents as BaseCanDispatchEvents;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\CanDispatchEvents instead
- */
-interface CanDispatchEvents extends BaseCanDispatchEvents
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationFailed.php b/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationFailed.php
deleted file mode 100644
index da8e1a720..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationFailed.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\CertificateChainValidationFailed as BaseCertificateChainValidationFailed;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\CertificateChainValidationFailed instead
- */
-final class CertificateChainValidationFailed extends BaseCertificateChainValidationFailed
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationSucceeded.php b/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationSucceeded.php
deleted file mode 100644
index 1bcf16a6e..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/CertificateChainValidationSucceeded.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\CertificateChainValidationSucceeded as BaseCertificateChainValidationSucceeded;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\CertificateChainValidationSucceeded instead
- */
-final class CertificateChainValidationSucceeded extends BaseCertificateChainValidationSucceeded
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/MetadataStatementFound.php b/web-auth/webauthn-lib/src/MetadataService/Event/MetadataStatementFound.php
deleted file mode 100644
index fee0d85e0..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/MetadataStatementFound.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\MetadataStatementFound as BaseMetadataStatementFound;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\MetadataStatementFound instead
- */
-final class MetadataStatementFound extends BaseMetadataStatementFound
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/NullEventDispatcher.php b/web-auth/webauthn-lib/src/MetadataService/Event/NullEventDispatcher.php
deleted file mode 100644
index f74fec7a6..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/NullEventDispatcher.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\NullEventDispatcher as BaseNullEventDispatcher;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\NullEventDispatcher instead
- */
-final class NullEventDispatcher extends BaseNullEventDispatcher
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Event/WebauthnEvent.php b/web-auth/webauthn-lib/src/MetadataService/Event/WebauthnEvent.php
deleted file mode 100644
index 18439279c..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Event/WebauthnEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Event;
-
-use Webauthn\Event\WebauthnEvent as BaseWebauthnEvent;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Event\WebauthnEvent instead
- */
-interface WebauthnEvent extends BaseWebauthnEvent
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateChainException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateChainException.php
deleted file mode 100644
index 977dfb98f..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateChainException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\CertificateChainException as BaseCertificateChainException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\CertificateChainException instead
- */
-class CertificateChainException extends BaseCertificateChainException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateException.php
deleted file mode 100644
index 21097a84e..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\CertificateChainException as BaseCertificateException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\CertificateException instead
- */
-class CertificateException extends BaseCertificateException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateRevocationListException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateRevocationListException.php
deleted file mode 100644
index f1638aab5..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/CertificateRevocationListException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\CertificateRevocationListException as BaseCertificateRevocationListException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\CertificateRevocationListException instead
- */
-final class CertificateRevocationListException extends BaseCertificateRevocationListException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/ExpiredCertificateException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/ExpiredCertificateException.php
deleted file mode 100644
index 558f29149..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/ExpiredCertificateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\ExpiredCertificateException as BaseExpiredCertificateException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\ExpiredCertificateException instead
- */
-final class ExpiredCertificateException extends BaseExpiredCertificateException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/InvalidCertificateException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/InvalidCertificateException.php
deleted file mode 100644
index 23ec6caa0..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/InvalidCertificateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\InvalidCertificateException as BaseInvalidCertificateException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\InvalidCertificateException instead
- */
-final class InvalidCertificateException extends BaseInvalidCertificateException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataServiceException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataServiceException.php
deleted file mode 100644
index 01bfb7ca2..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataServiceException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\MetadataServiceException as BaseMetadataServiceException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\MetadataServiceException instead
- */
-class MetadataServiceException extends BaseMetadataServiceException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementException.php
deleted file mode 100644
index 0bd9ba120..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\MetadataStatementException as BaseMetadataStatementException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\MetadataStatementException instead
- */
-class MetadataStatementException extends BaseMetadataStatementException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementLoadingException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementLoadingException.php
deleted file mode 100644
index 2cc6b8cc9..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/MetadataStatementLoadingException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\MetadataStatementLoadingException as BaseMetadataStatementLoadingException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\MetadataStatementLoadingException instead
- */
-final class MetadataStatementLoadingException extends BaseMetadataStatementLoadingException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/MissingMetadataStatementException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/MissingMetadataStatementException.php
deleted file mode 100644
index d71a0abf3..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/MissingMetadataStatementException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\MissingMetadataStatementException as BaseMissingMetadataStatementException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\MissingMetadataStatementException instead
- */
-final class MissingMetadataStatementException extends BaseMissingMetadataStatementException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Exception/RevokedCertificateException.php b/web-auth/webauthn-lib/src/MetadataService/Exception/RevokedCertificateException.php
deleted file mode 100644
index 1013ffb1b..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Exception/RevokedCertificateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Exception;
-
-use Webauthn\Exception\RevokedCertificateException as BaseRevokedCertificateException;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use Webauthn\Exception\RevokedCertificateException instead
- */
-final class RevokedCertificateException extends BaseRevokedCertificateException
-{
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php b/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php
index 1f0b6f718..c296bb1f8 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Psr18HttpClient.php
@@ -54,7 +54,7 @@ public function request(string $method, string $url, array $options = []): Respo
     /**
      * @param ResponseInterface|iterable<array-key, ResponseInterface> $responses
      */
-    public function stream(iterable|ResponseInterface $responses, float $timeout = null): ResponseStreamInterface
+    public function stream(iterable|ResponseInterface $responses, ?float $timeout = null): ResponseStreamInterface
     {
         throw new LogicException('Not implemented');
     }
@@ -119,7 +119,7 @@ public function cancel(): void
                 // noop
             }
 
-            public function getInfo(string $type = null): mixed
+            public function getInfo(?string $type = null): mixed
             {
                 return null;
             }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/DistantResourceMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/DistantResourceMetadataService.php
index e81006940..adf2a6b94 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/DistantResourceMetadataService.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/DistantResourceMetadataService.php
@@ -6,8 +6,7 @@
 
 use ParagonIE\ConstantTime\Base64;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
@@ -26,26 +25,18 @@ final class DistantResourceMetadataService implements MetadataService, CanDispat
 
     private EventDispatcherInterface $dispatcher;
 
-    private readonly ?SerializerInterface $serializer;
+    private readonly SerializerInterface $serializer;
 
     /**
      * @param array<string, string> $additionalHeaderParameters
      */
     public function __construct(
-        private readonly ?RequestFactoryInterface $requestFactory,
-        private readonly ClientInterface|HttpClientInterface $httpClient,
+        private readonly HttpClientInterface $httpClient,
         private readonly string $uri,
         private readonly bool $isBase64Encoded = false,
         private readonly array $additionalHeaderParameters = [],
         ?SerializerInterface $serializer = null,
     ) {
-        if ($requestFactory !== null && ! $httpClient instanceof HttpClientInterface) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.7.0',
-                'The parameter "$requestFactory" will be removed in 5.0.0. Please set it to null and set an Symfony\Contracts\HttpClient\HttpClientInterface as "$httpClient" argument.'
-            );
-        }
         $this->serializer = $serializer ?? (new WebauthnSerializerFactory(
             AttestationStatementSupportManager::create()
         ))->create();
@@ -58,17 +49,16 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): v
     }
 
     /**
-     * @param array<string, mixed> $additionalHeaderParameters
+     * @param array<string, string> $additionalHeaderParameters
      */
     public static function create(
-        ?RequestFactoryInterface $requestFactory,
-        ClientInterface|HttpClientInterface $httpClient,
+        HttpClientInterface $httpClient,
         string $uri,
         bool $isBase64Encoded = false,
         array $additionalHeaderParameters = [],
         ?SerializerInterface $serializer = null
     ): self {
-        return new self($requestFactory, $httpClient, $uri, $isBase64Encoded, $additionalHeaderParameters, $serializer);
+        return new self($httpClient, $uri, $isBase64Encoded, $additionalHeaderParameters, $serializer);
     }
 
     public function list(): iterable
@@ -115,47 +105,10 @@ private function loadData(): void
         if ($this->isBase64Encoded) {
             $content = Base64::decode($content, true);
         }
-        if ($this->serializer !== null) {
-            $this->statement = $this->serializer->deserialize($content, MetadataStatement::class, 'json');
-            return;
-        }
-
-        $this->statement = MetadataStatement::createFromString($content);
+        $this->statement = $this->serializer->deserialize($content, MetadataStatement::class, JsonEncoder::FORMAT);
     }
 
     private function fetch(): string
-    {
-        if ($this->httpClient instanceof HttpClientInterface) {
-            $content = $this->sendSymfonyRequest();
-        } else {
-            $content = $this->sendPsrRequest();
-        }
-        $content !== '' || throw MetadataStatementLoadingException::create(
-            'Unable to contact the server. The response has no content'
-        );
-
-        return $content;
-    }
-
-    private function sendPsrRequest(): string
-    {
-        $request = $this->requestFactory->createRequest('GET', $this->uri);
-        foreach ($this->additionalHeaderParameters as $k => $v) {
-            $request = $request->withHeader($k, $v);
-        }
-        $response = $this->httpClient->sendRequest($request);
-        $response->getStatusCode() === 200 || throw MetadataStatementLoadingException::create(sprintf(
-            'Unable to contact the server. Response code is %d',
-            $response->getStatusCode()
-        ));
-        $response->getBody()
-            ->rewind();
-
-        return $response->getBody()
-            ->getContents();
-    }
-
-    private function sendSymfonyRequest(): string
     {
         $response = $this->httpClient->request('GET', $this->uri, [
             'headers' => $this->additionalHeaderParameters,
@@ -165,6 +118,11 @@ private function sendSymfonyRequest(): string
             $response->getStatusCode()
         ));
 
-        return $response->getContent();
+        $content = $response->getContent();
+        $content !== '' || throw MetadataStatementLoadingException::create(
+            'Unable to contact the server. The response has no content'
+        );
+
+        return $content;
     }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
index 5182a8109..e6f36538d 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
@@ -10,9 +10,9 @@
 use Jose\Component\Signature\Algorithm\RS256;
 use Jose\Component\Signature\JWSVerifier;
 use Jose\Component\Signature\Serializer\CompactSerializer;
+use LogicException;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
@@ -30,7 +30,6 @@
 use function array_key_exists;
 use function is_array;
 use function sprintf;
-use const JSON_THROW_ON_ERROR;
 
 final class FidoAllianceCompliantMetadataService implements MetadataService, CanDispatchEvents
 {
@@ -48,25 +47,22 @@ final class FidoAllianceCompliantMetadataService implements MetadataService, Can
 
     private EventDispatcherInterface $dispatcher;
 
-    private readonly ?SerializerInterface $serializer;
+    private readonly SerializerInterface $serializer;
 
     /**
      * @param array<string, mixed> $additionalHeaderParameters
      */
     public function __construct(
-        private readonly ?RequestFactoryInterface $requestFactory,
-        private readonly ClientInterface|HttpClientInterface $httpClient,
+        private readonly HttpClientInterface $httpClient,
         private readonly string $uri,
         private readonly array $additionalHeaderParameters = [],
         private readonly ?CertificateChainValidator $certificateChainValidator = null,
         private readonly ?string $rootCertificateUri = null,
         ?SerializerInterface $serializer = null,
     ) {
-        if ($requestFactory !== null && ! $httpClient instanceof HttpClientInterface) {
-            trigger_deprecation(
-                'web-auth/metadata-service',
-                '4.7.0',
-                'The parameter "$requestFactory" will be removed in 5.0.0. Please set it to null and set an Symfony\Contracts\HttpClient\HttpClientInterface as "$httpClient" argument.'
+        if (! class_exists(CompactSerializer::class)) {
+            throw new LogicException(
+                'The "web-token/jwt-library" package is required to use this service. Please run "composer require web-token/jwt-library".'
             );
         }
         $this->serializer = $serializer ?? (new WebauthnSerializerFactory(
@@ -84,8 +80,7 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): v
      * @param array<string, mixed> $additionalHeaderParameters
      */
     public static function create(
-        ?RequestFactoryInterface $requestFactory,
-        ClientInterface|HttpClientInterface $httpClient,
+        HttpClientInterface $httpClient,
         string $uri,
         array $additionalHeaderParameters = [],
         ?CertificateChainValidator $certificateChainValidator = null,
@@ -93,7 +88,6 @@ public static function create(
         ?SerializerInterface $serializer = null,
     ): self {
         return new self(
-            $requestFactory,
             $httpClient,
             $uri,
             $additionalHeaderParameters,
@@ -151,23 +145,8 @@ private function loadData(): void
         try {
             $payload = $this->getJwsPayload($content, $jwtCertificates);
             $this->validateCertificates(...$jwtCertificates);
-            if ($this->serializer !== null) {
-                $blob = $this->serializer->deserialize($payload, MetadataBLOBPayload::class, 'json');
-                foreach ($blob->entries as $entry) {
-                    $mds = $entry->metadataStatement;
-                    if ($mds !== null && $entry->aaguid !== null) {
-                        $this->statements[$entry->aaguid] = $mds;
-                        $this->statusReports[$entry->aaguid] = $entry->statusReports;
-                    }
-                }
-                $this->loaded = true;
-                return;
-            }
-            $data = json_decode($payload, true, flags: JSON_THROW_ON_ERROR);
-
-            foreach ($data['entries'] as $datum) {
-                $entry = MetadataBLOBPayloadEntry::createFromArray($datum);
-
+            $blob = $this->serializer->deserialize($payload, MetadataBLOBPayload::class, JsonEncoder::FORMAT);
+            foreach ($blob->entries as $entry) {
                 $mds = $entry->metadataStatement;
                 if ($mds !== null && $entry->aaguid !== null) {
                     $this->statements[$entry->aaguid] = $mds;
@@ -176,9 +155,9 @@ private function loadData(): void
             }
         } catch (Throwable) {
             // Nothing to do
+        } finally {
+            $this->loaded = true;
         }
-
-        $this->loaded = true;
     }
 
     /**
@@ -186,11 +165,15 @@ private function loadData(): void
      */
     private function fetch(string $uri, array $headerParameters): string
     {
-        if ($this->httpClient instanceof HttpClientInterface) {
-            $content = $this->sendSymfonyRequest($uri, $headerParameters);
-        } else {
-            $content = $this->sendPsrRequest($uri, $headerParameters);
-        }
+        $response = $this->httpClient->request('GET', $uri, [
+            'headers' => $headerParameters,
+        ]);
+        $response->getStatusCode() === 200 || throw MetadataStatementLoadingException::create(sprintf(
+            'Unable to contact the server. Response code is %d',
+            $response->getStatusCode()
+        ));
+
+        $content = $response->getContent();
         $content !== '' || throw MetadataStatementLoadingException::create(
             'Unable to contact the server. The response has no content'
         );
@@ -247,40 +230,4 @@ private function validateCertificates(string ...$untrustedCertificates): void
         $rootCertificate = CertificateToolbox::convertDERToPEM($this->fetch($this->rootCertificateUri, []));
         $this->certificateChainValidator->check($untrustedCertificates, [$rootCertificate]);
     }
-
-    /**
-     * @param array<string, string> $headerParameters
-     */
-    private function sendPsrRequest(string $uri, array $headerParameters): string
-    {
-        $request = $this->requestFactory->createRequest('GET', $uri);
-        foreach ($headerParameters as $k => $v) {
-            $request = $request->withHeader($k, $v);
-        }
-        $response = $this->httpClient->sendRequest($request);
-        $response->getStatusCode() === 200 || throw MetadataStatementLoadingException::create(sprintf(
-            'Unable to contact the server. Response code is %d',
-            $response->getStatusCode()
-        ));
-        $response->getBody()
-            ->rewind();
-        return $response->getBody()
-            ->getContents();
-    }
-
-    /**
-     * @param array<string, string> $headerParameters
-     */
-    private function sendSymfonyRequest(string $uri, array $headerParameters): string
-    {
-        $response = $this->httpClient->request('GET', $uri, [
-            'headers' => $headerParameters,
-        ]);
-        $response->getStatusCode() === 200 || throw MetadataStatementLoadingException::create(sprintf(
-            'Unable to contact the server. Response code is %d',
-            $response->getStatusCode()
-        ));
-
-        return $response->getContent();
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/FolderResourceMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/FolderResourceMetadataService.php
index e554ed9a9..7db10765b 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/FolderResourceMetadataService.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/FolderResourceMetadataService.php
@@ -5,11 +5,13 @@
 namespace Webauthn\MetadataService\Service;
 
 use InvalidArgumentException;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 use Webauthn\Denormalizer\WebauthnSerializerFactory;
 use Webauthn\Exception\MetadataStatementLoadingException;
 use Webauthn\MetadataService\Statement\MetadataStatement;
+use function assert;
 use function file_get_contents;
 use function is_array;
 use function sprintf;
@@ -17,7 +19,7 @@
 
 final class FolderResourceMetadataService implements MetadataService
 {
-    private readonly ?SerializerInterface $serializer;
+    private readonly SerializerInterface $serializer;
 
     public function __construct(
         private string $rootPath,
@@ -65,13 +67,10 @@ public function get(string $aaguid): MetadataStatement
             $aaguid
         ));
         $filename = $this->rootPath . DIRECTORY_SEPARATOR . $aaguid;
-        $data = trim(file_get_contents($filename));
-        if ($this->serializer !== null) {
-            $mds = $this->serializer->deserialize($data, MetadataStatement::class, 'json');
-        } else {
-            $mds = MetadataStatement::createFromString($data);
-        }
-
+        $content = file_get_contents($filename);
+        assert($content !== false, 'The file exists and is readable.');
+        $data = trim($content);
+        $mds = $this->serializer->deserialize($data, MetadataStatement::class, JsonEncoder::FORMAT);
         $mds->aaguid !== null || throw MetadataStatementLoadingException::create('Invalid Metadata Statement.');
 
         return $mds;
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/JsonMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/JsonMetadataService.php
index 62bb5df4d..36cc68d43 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/JsonMetadataService.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/JsonMetadataService.php
@@ -5,6 +5,7 @@
 namespace Webauthn\MetadataService\Service;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 use Webauthn\Denormalizer\WebauthnSerializerFactory;
@@ -24,7 +25,7 @@ final class JsonMetadataService implements MetadataService, CanDispatchEvents
 
     private EventDispatcherInterface $dispatcher;
 
-    private readonly ?SerializerInterface $serializer;
+    private readonly SerializerInterface $serializer;
 
     /**
      * @param string[] $statements
@@ -68,11 +69,7 @@ public function get(string $aaguid): MetadataStatement
 
     private function addStatement(string $statement): void
     {
-        if ($this->serializer === null) {
-            $mds = MetadataStatement::createFromString($statement);
-        } else {
-            $mds = $this->serializer->deserialize($statement, MetadataStatement::class, 'json');
-        }
+        $mds = $this->serializer->deserialize($statement, MetadataStatement::class, JsonEncoder::FORMAT);
         if ($mds->aaguid === null) {
             return;
         }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/LocalResourceMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/LocalResourceMetadataService.php
index c510d4fd4..e6f474063 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/LocalResourceMetadataService.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/LocalResourceMetadataService.php
@@ -6,6 +6,7 @@
 
 use ParagonIE\ConstantTime\Base64;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 use Webauthn\Denormalizer\WebauthnSerializerFactory;
@@ -15,6 +16,7 @@
 use Webauthn\Exception\MetadataStatementLoadingException;
 use Webauthn\Exception\MissingMetadataStatementException;
 use Webauthn\MetadataService\Statement\MetadataStatement;
+use function assert;
 use function file_get_contents;
 
 final class LocalResourceMetadataService implements MetadataService, CanDispatchEvents
@@ -23,7 +25,7 @@ final class LocalResourceMetadataService implements MetadataService, CanDispatch
 
     private EventDispatcherInterface $dispatcher;
 
-    private readonly ?SerializerInterface $serializer;
+    private readonly SerializerInterface $serializer;
 
     public function __construct(
         private readonly string $filename,
@@ -90,13 +92,10 @@ private function loadData(): void
         }
 
         $content = file_get_contents($this->filename);
+        assert($content !== false, 'The file could not be read');
         if ($this->isBase64Encoded) {
             $content = Base64::decode($content, true);
         }
-        if ($this->serializer !== null) {
-            $this->statement = $this->serializer->deserialize($content, MetadataStatement::class, 'json');
-        } else {
-            $this->statement = MetadataStatement::createFromString($content);
-        }
+        $this->statement = $this->serializer->deserialize($content, MetadataStatement::class, JsonEncoder::FORMAT);
     }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php b/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php
index 0bd5df806..b25ca3a15 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayload.php
@@ -4,23 +4,8 @@
 
 namespace Webauthn\MetadataService\Service;
 
-use JsonSerializable;
-use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-use function is_array;
-use function is_int;
-use function is_string;
-
-class MetadataBLOBPayload implements JsonSerializable
+class MetadataBLOBPayload
 {
-    use ValueFilter;
-
-    /**
-     * @var string[]
-     */
-    private array $rootCertificates = [];
-
     /**
      * @param MetadataBLOBPayloadEntry[] $entries
      */
@@ -31,132 +16,4 @@ public function __construct(
         public array $entries = [],
     ) {
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function addEntry(MetadataBLOBPayloadEntry $entry): self
-    {
-        $this->entries[] = $entry;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getLegalHeader(): ?string
-    {
-        return $this->legalHeader;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getNo(): int
-    {
-        return $this->no;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getNextUpdate(): string
-    {
-        return $this->nextUpdate;
-    }
-
-    /**
-     * @return MetadataBLOBPayloadEntry[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getEntries(): array
-    {
-        return $this->entries;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        foreach (['no', 'nextUpdate', 'entries'] as $key) {
-            array_key_exists($key, $data) || throw MetadataStatementLoadingException::create(sprintf(
-                'Invalid data. The parameter "%s" is missing',
-                $key
-            ));
-        }
-        is_int($data['no']) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "no" shall be an integer'
-        );
-        is_string($data['nextUpdate']) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "nextUpdate" shall be a string'
-        );
-        is_array($data['entries']) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "entries" shall be a n array of entries'
-        );
-        $object = new self($data['no'], $data['nextUpdate'], $data['legalHeader'] ?? null);
-        foreach ($data['entries'] as $entry) {
-            $object->entries[] = MetadataBLOBPayloadEntry::createFromArray($entry);
-        }
-
-        return $object;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'legalHeader' => $this->legalHeader,
-            'nextUpdate' => $this->nextUpdate,
-            'no' => $this->no,
-            'entries' => $this->entries,
-        ];
-
-        return self::filterNullValues($data);
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRootCertificates(): array
-    {
-        return $this->rootCertificates;
-    }
-
-    /**
-     * @param string[] $rootCertificates
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setRootCertificates(array $rootCertificates): self
-    {
-        $this->rootCertificates = $rootCertificates;
-
-        return $this;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php b/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php
index 3e06cfdeb..b646ecd44 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Service/MetadataBLOBPayloadEntry.php
@@ -4,21 +4,15 @@
 
 namespace Webauthn\MetadataService\Service;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
 use Webauthn\MetadataService\Statement\BiometricStatusReport;
 use Webauthn\MetadataService\Statement\MetadataStatement;
 use Webauthn\MetadataService\Statement\StatusReport;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
 use function count;
-use function is_array;
 use function is_string;
 
-class MetadataBLOBPayloadEntry implements JsonSerializable
+class MetadataBLOBPayloadEntry
 {
-    use ValueFilter;
-
     /**
      * @param StatusReport[] $statusReports
      * @param BiometricStatusReport[] $biometricStatusReports
@@ -55,177 +49,4 @@ public function __construct(
             );
         }
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaid(): ?string
-    {
-        return $this->aaid;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaguid(): ?string
-    {
-        return $this->aaguid;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationCertificateKeyIdentifiers(): array
-    {
-        return $this->attestationCertificateKeyIdentifiers;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMetadataStatement(): ?MetadataStatement
-    {
-        return $this->metadataStatement;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function addBiometricStatusReports(BiometricStatusReport ...$biometricStatusReports): self
-    {
-        foreach ($biometricStatusReports as $biometricStatusReport) {
-            $this->biometricStatusReports[] = $biometricStatusReport;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return BiometricStatusReport[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getBiometricStatusReports(): array
-    {
-        return $this->biometricStatusReports;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function addStatusReports(StatusReport ...$statusReports): self
-    {
-        foreach ($statusReports as $statusReport) {
-            $this->statusReports[] = $statusReport;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return StatusReport[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getStatusReports(): array
-    {
-        return $this->statusReports;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTimeOfLastStatusChange(): string
-    {
-        return $this->timeOfLastStatusChange;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRogueListURL(): string|null
-    {
-        return $this->rogueListURL;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRogueListHash(): string|null
-    {
-        return $this->rogueListHash;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        array_key_exists('timeOfLastStatusChange', $data) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "timeOfLastStatusChange" is missing'
-        );
-        array_key_exists('statusReports', $data) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "statusReports" is missing'
-        );
-        is_array($data['statusReports']) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "statusReports" shall be an array of StatusReport objects'
-        );
-
-        return new self(
-            $data['timeOfLastStatusChange'],
-            array_map(
-                static fn (array $statusReport) => StatusReport::createFromArray($statusReport),
-                $data['statusReports']
-            ),
-            $data['aaid'] ?? null,
-            $data['aaguid'] ?? null,
-            $data['attestationCertificateKeyIdentifiers'] ?? [],
-            isset($data['metadataStatement']) ? MetadataStatement::createFromArray($data['metadataStatement']) : null,
-            $data['rogueListURL'] ?? null,
-            $data['rogueListHash'] ?? null,
-            array_map(
-                static fn (array $biometricStatusReport) => BiometricStatusReport::createFromArray(
-                    $biometricStatusReport
-                ),
-                $data['biometricStatusReports'] ?? []
-            )
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'aaid' => $this->aaid,
-            'aaguid' => $this->aaguid,
-            'attestationCertificateKeyIdentifiers' => $this->attestationCertificateKeyIdentifiers,
-            'statusReports' => $this->statusReports,
-            'timeOfLastStatusChange' => $this->timeOfLastStatusChange,
-            'rogueListURL' => $this->rogueListURL,
-            'rogueListHash' => $this->rogueListHash,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Service/StringMetadataService.php b/web-auth/webauthn-lib/src/MetadataService/Service/StringMetadataService.php
deleted file mode 100644
index 2df755c40..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Service/StringMetadataService.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Service;
-
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Webauthn\Event\CanDispatchEvents;
-use Webauthn\Event\MetadataStatementFound;
-use Webauthn\Event\NullEventDispatcher;
-use Webauthn\Exception\MissingMetadataStatementException;
-use Webauthn\MetadataService\Statement\MetadataStatement;
-use function array_key_exists;
-
-/**
- * @deprecated since 4.8.0 and will be removed in 5.0.0. Please use Webauthn\MetadataService\Service\JsonMetadataService instead.
- * @infection-ignore-all
- */
-final class StringMetadataService implements MetadataService, CanDispatchEvents
-{
-    /**
-     * @var MetadataStatement[]
-     */
-    private array $statements = [];
-
-    private EventDispatcherInterface $dispatcher;
-
-    public function __construct(string ...$statements)
-    {
-        foreach ($statements as $statement) {
-            $this->addStatements(MetadataStatement::createFromString($statement));
-        }
-        $this->dispatcher = new NullEventDispatcher();
-    }
-
-    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher): void
-    {
-        $this->dispatcher = $eventDispatcher;
-    }
-
-    public static function create(string ...$statements): self
-    {
-        return new self(...$statements);
-    }
-
-    public function addStatements(MetadataStatement ...$statements): self
-    {
-        foreach ($statements as $statement) {
-            $aaguid = $statement->aaguid;
-            if ($aaguid === null) {
-                continue;
-            }
-            $this->statements[$aaguid] = $statement;
-        }
-
-        return $this;
-    }
-
-    public function list(): iterable
-    {
-        yield from array_keys($this->statements);
-    }
-
-    public function has(string $aaguid): bool
-    {
-        return array_key_exists($aaguid, $this->statements);
-    }
-
-    public function get(string $aaguid): MetadataStatement
-    {
-        array_key_exists($aaguid, $this->statements) || throw MissingMetadataStatementException::create($aaguid);
-        $mds = $this->statements[$aaguid];
-        $this->dispatcher->dispatch(MetadataStatementFound::create($mds));
-
-        return $mds;
-    }
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php
index 494cc0601..076dd7855 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/AbstractDescriptor.php
@@ -4,10 +4,9 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
 
-abstract class AbstractDescriptor implements JsonSerializable
+abstract class AbstractDescriptor
 {
     public function __construct(
         public readonly ?int $maxRetries = null,
@@ -20,22 +19,4 @@ public function __construct(
             'Invalid data. The value of "blockSlowdown" must be a positive integer'
         );
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMaxRetries(): ?int
-    {
-        return $this->maxRetries;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getBlockSlowdown(): ?int
-    {
-        return $this->blockSlowdown;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php b/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php
index 0baf0f2f4..ddcd9bc79 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/AlternativeDescriptions.php
@@ -4,9 +4,7 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-
-class AlternativeDescriptions implements JsonSerializable
+class AlternativeDescriptions
 {
     /**
      * @param array<string, string> $descriptions
@@ -23,39 +21,4 @@ public static function create(array $descriptions = []): self
     {
         return new self($descriptions);
     }
-
-    /**
-     * @return array<string, string>
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function all(): array
-    {
-        return $this->descriptions;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function add(string $locale, string $description): self
-    {
-        $this->descriptions[$locale] = $description;
-
-        return $this;
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->descriptions;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php b/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php
index c1360a61b..c74f5d2e1 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorGetInfo.php
@@ -4,12 +4,10 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-
-class AuthenticatorGetInfo implements JsonSerializable
+class AuthenticatorGetInfo
 {
     /**
-     * @param array<string|int, mixed> $info
+     * @param array<array-key, mixed> $info
      */
     public function __construct(
         public array $info = []
@@ -17,35 +15,10 @@ public function __construct(
     }
 
     /**
-     * @param array<string|int, mixed> $info
+     * @param array<array-key, mixed> $info
      */
     public static function create(array $info = []): self
     {
         return new self($info);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the constructor directly.
-     * @infection-ignore-all
-     */
-    public function add(string|int $key, mixed $value): self
-    {
-        $this->info[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->info;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorStatus.php b/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorStatus.php
index 03a008bee..c3b50d3f2 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorStatus.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/AuthenticatorStatus.php
@@ -59,14 +59,4 @@ final class AuthenticatorStatus
         self::FIDO_CERTIFIED_L4,
         self::FIDO_CERTIFIED_L5,
     ];
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the constant STATUSES instead.
-     * @infection-ignore-all
-     */
-    public static function list(): array
-    {
-        return self::STATUSES;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricAccuracyDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricAccuracyDescriptor.php
index 916398c82..88a697489 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricAccuracyDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricAccuracyDescriptor.php
@@ -4,12 +4,8 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use Webauthn\MetadataService\ValueFilter;
-
 class BiometricAccuracyDescriptor extends AbstractDescriptor
 {
-    use ValueFilter;
-
     public function __construct(
         public readonly ?float $selfAttestedFRR,
         public readonly ?float $selfAttestedFAR,
@@ -29,65 +25,4 @@ public static function create(
     ): self {
         return new self($selfAttestedFRR, $selfAttestedFAR, $maxTemplates, $maxRetries, $blockSlowdown);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     */
-    public function getSelfAttestedFRR(): ?float
-    {
-        return $this->selfAttestedFRR;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     */
-    public function getSelfAttestedFAR(): ?float
-    {
-        return $this->selfAttestedFAR;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     */
-    public function getMaxTemplates(): ?float
-    {
-        return $this->maxTemplates;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     */
-    public static function createFromArray(array $data): self
-    {
-        return self::create(
-            $data['selfAttestedFRR'] ?? null,
-            $data['selfAttestedFAR'] ?? null,
-            $data['maxTemplates'] ?? null,
-            $data['maxRetries'] ?? null,
-            $data['blockSlowdown'] ?? null
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'selfAttestedFRR' => $this->selfAttestedFRR,
-            'selfAttestedFAR' => $this->selfAttestedFAR,
-            'maxTemplates' => $this->maxTemplates,
-            'maxRetries' => $this->maxRetries,
-            'blockSlowdown' => $this->blockSlowdown,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php b/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php
index ab5472f82..0ff6c0272 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/BiometricStatusReport.php
@@ -4,18 +4,16 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-
-class BiometricStatusReport implements JsonSerializable
+readonly class BiometricStatusReport
 {
     private function __construct(
-        public readonly ?int $certLevel,
-        public readonly ?int $modality,
-        public readonly ?string $effectiveDate,
-        public readonly ?string $certificationDescriptor,
-        public readonly ?string $certificateNumber,
-        public readonly ?string $certificationPolicyVersion,
-        public readonly ?string $certificationRequirementsVersion,
+        public ?int $certLevel,
+        public ?int $modality,
+        public ?string $effectiveDate,
+        public ?string $certificationDescriptor,
+        public ?string $certificateNumber,
+        public ?string $certificationPolicyVersion,
+        public ?string $certificationRequirementsVersion,
     ) {
     }
 
@@ -38,109 +36,4 @@ public static function create(
             $certificationRequirementsVersion,
         );
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertLevel(): int|null
-    {
-        return $this->certLevel;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getModality(): int|null
-    {
-        return $this->modality;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getEffectiveDate(): ?string
-    {
-        return $this->effectiveDate;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationDescriptor(): ?string
-    {
-        return $this->certificationDescriptor;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificateNumber(): ?string
-    {
-        return $this->certificateNumber;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationPolicyVersion(): ?string
-    {
-        return $this->certificationPolicyVersion;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationRequirementsVersion(): ?string
-    {
-        return $this->certificationRequirementsVersion;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        return self::create(
-            $data['certLevel'] ?? null,
-            $data['modality'] ?? null,
-            $data['effectiveDate'] ?? null,
-            $data['certificationDescriptor'] ?? null,
-            $data['certificateNumber'] ?? null,
-            $data['certificationPolicyVersion'] ?? null,
-            $data['certificationRequirementsVersion'] ?? null,
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'certLevel' => $this->certLevel,
-            'modality' => $this->modality,
-            'effectiveDate' => $this->effectiveDate,
-            'certificationDescriptor' => $this->certificationDescriptor,
-            'certificateNumber' => $this->certificateNumber,
-            'certificationPolicyVersion' => $this->certificationPolicyVersion,
-            'certificationRequirementsVersion' => $this->certificationRequirementsVersion,
-        ];
-
-        return array_filter($data, static fn ($var): bool => $var !== null);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php
index aa7f8f0f6..2903893ad 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/CodeAccuracyDescriptor.php
@@ -5,13 +5,9 @@
 namespace Webauthn\MetadataService\Statement;
 
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
 
 class CodeAccuracyDescriptor extends AbstractDescriptor
 {
-    use ValueFilter;
-
     public function __construct(
         public readonly int $base,
         public readonly int $minLength,
@@ -31,65 +27,4 @@ public static function create(int $base, int $minLength, ?int $maxRetries = null
     {
         return new self($base, $minLength, $maxRetries, $blockSlowdown);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getBase(): int
-    {
-        return $this->base;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMinLength(): int
-    {
-        return $this->minLength;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        array_key_exists('base', $data) || throw MetadataStatementLoadingException::create(
-            'The parameter "base" is missing'
-        );
-        array_key_exists('minLength', $data) || throw MetadataStatementLoadingException::create(
-            'The parameter "minLength" is missing'
-        );
-
-        return self::create(
-            $data['base'],
-            $data['minLength'],
-            $data['maxRetries'] ?? null,
-            $data['blockSlowdown'] ?? null
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'base' => $this->base,
-            'minLength' => $this->minLength,
-            'maxRetries' => $this->maxRetries,
-            'blockSlowdown' => $this->blockSlowdown,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php
index f69703038..d0ceeb359 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/DisplayPNGCharacteristicsDescriptor.php
@@ -4,15 +4,10 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
 
-class DisplayPNGCharacteristicsDescriptor implements JsonSerializable
+class DisplayPNGCharacteristicsDescriptor
 {
-    use ValueFilter;
-
     /**
      * @param RgbPaletteEntry[] $plte
      */
@@ -57,150 +52,4 @@ public static function create(
     ): self {
         return new self($width, $height, $bitDepth, $colorType, $compression, $filter, $interlace, $plte);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use {self::create} directly.
-     * @infection-ignore-all
-     */
-    public function addPalettes(RgbPaletteEntry ...$rgbPaletteEntries): self
-    {
-        foreach ($rgbPaletteEntries as $rgbPaletteEntry) {
-            $this->plte[] = $rgbPaletteEntry;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getWidth(): int
-    {
-        return $this->width;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getHeight(): int
-    {
-        return $this->height;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getBitDepth(): int
-    {
-        return $this->bitDepth;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getColorType(): int
-    {
-        return $this->colorType;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCompression(): int
-    {
-        return $this->compression;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getFilter(): int
-    {
-        return $this->filter;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getInterlace(): int
-    {
-        return $this->interlace;
-    }
-
-    /**
-     * @return RgbPaletteEntry[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getPaletteEntries(): array
-    {
-        return $this->plte;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        foreach ([
-            'width',
-            'compression',
-            'height',
-            'bitDepth',
-            'colorType',
-            'compression',
-            'filter',
-            'interlace',
-        ] as $key) {
-            array_key_exists($key, $data) || throw MetadataStatementLoadingException::create(sprintf(
-                'Invalid data. The key "%s" is missing',
-                $key
-            ));
-        }
-        return self::create(
-            $data['width'],
-            $data['height'],
-            $data['bitDepth'],
-            $data['colorType'],
-            $data['compression'],
-            $data['filter'],
-            $data['interlace'],
-            array_map(static fn (array $item) => RgbPaletteEntry::createFromArray($item), $data['plte'] ?? [])
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'width' => $this->width,
-            'height' => $this->height,
-            'bitDepth' => $this->bitDepth,
-            'colorType' => $this->colorType,
-            'compression' => $this->compression,
-            'filter' => $this->filter,
-            'interlace' => $this->interlace,
-            'plte' => $this->plte,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/EcdaaTrustAnchor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/EcdaaTrustAnchor.php
deleted file mode 100644
index c55171b32..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/EcdaaTrustAnchor.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService\Statement;
-
-use JsonSerializable;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-
-/**
- * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
- * @infection-ignore-all
- */
-class EcdaaTrustAnchor implements JsonSerializable
-{
-    use ValueFilter;
-
-    public function __construct(
-        private readonly string $X,
-        private readonly string $Y,
-        private readonly string $c,
-        private readonly string $sx,
-        private readonly string $sy,
-        private readonly string $G1Curve
-    ) {
-    }
-
-    public function getX(): string
-    {
-        return $this->X;
-    }
-
-    public function getY(): string
-    {
-        return $this->Y;
-    }
-
-    public function getC(): string
-    {
-        return $this->c;
-    }
-
-    public function getSx(): string
-    {
-        return $this->sx;
-    }
-
-    public function getSy(): string
-    {
-        return $this->sy;
-    }
-
-    public function getG1Curve(): string
-    {
-        return $this->G1Curve;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        foreach (['X', 'Y', 'c', 'sx', 'sy', 'G1Curve'] as $key) {
-            array_key_exists($key, $data) || throw MetadataStatementLoadingException::create(sprintf(
-                'Invalid data. The key "%s" is missing',
-                $key
-            ));
-        }
-
-        return new self(
-            Base64UrlSafe::decode($data['X']),
-            Base64UrlSafe::decode($data['Y']),
-            Base64UrlSafe::decode($data['c']),
-            Base64UrlSafe::decode($data['sx']),
-            Base64UrlSafe::decode($data['sy']),
-            $data['G1Curve']
-        );
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'X' => Base64UrlSafe::encodeUnpadded($this->X),
-            'Y' => Base64UrlSafe::encodeUnpadded($this->Y),
-            'c' => Base64UrlSafe::encodeUnpadded($this->c),
-            'sx' => Base64UrlSafe::encodeUnpadded($this->sx),
-            'sy' => Base64UrlSafe::encodeUnpadded($this->sy),
-            'G1Curve' => $this->G1Curve,
-        ];
-
-        return self::filterNullValues($data);
-    }
-}
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php
index 9c6b0a76d..5eec30433 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/ExtensionDescriptor.php
@@ -4,20 +4,17 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
+use Symfony\Component\Serializer\Attribute\SerializedName;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
 
-class ExtensionDescriptor implements JsonSerializable
+readonly class ExtensionDescriptor
 {
-    use ValueFilter;
-
     public function __construct(
-        public readonly string $id,
-        public readonly ?int $tag,
-        public readonly ?string $data,
-        public readonly bool $failIfUnknown
+        public string $id,
+        public ?int $tag,
+        public ?string $data,
+        #[SerializedName('fail_if_unknown')]
+        public bool $failIfUnknown
     ) {
         if ($tag !== null) {
             $tag >= 0 || throw MetadataStatementLoadingException::create(
@@ -34,79 +31,4 @@ public static function create(
     ): self {
         return new self($id, $tag, $data, $failIfUnknown);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTag(): ?int
-    {
-        return $this->tag;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getData(): ?string
-    {
-        return $this->data;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function isFailIfUnknown(): bool
-    {
-        return $this->failIfUnknown;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        array_key_exists('id', $data) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "id" is missing'
-        );
-        array_key_exists('fail_if_unknown', $data) || throw MetadataStatementLoadingException::create(
-            'Invalid data. The parameter "fail_if_unknown" is missing'
-        );
-
-        return new self($data['id'], $data['tag'] ?? null, $data['data'] ?? null, $data['fail_if_unknown']);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $result = [
-            'id' => $this->id,
-            'tag' => $this->tag,
-            'data' => $this->data,
-            'fail_if_unknown' => $this->failIfUnknown,
-        ];
-
-        return self::filterNullValues($result);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php b/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php
index 899430eaf..f9ea4d4a3 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/MetadataStatement.php
@@ -4,19 +4,8 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\CertificateChain\CertificateToolbox;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-use function is_array;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
-
-class MetadataStatement implements JsonSerializable
+class MetadataStatement
 {
-    use ValueFilter;
-
     final public const KEY_PROTECTION_SOFTWARE = 'software';
 
     final public const KEY_PROTECTION_SOFTWARE_INT = 0x0001;
@@ -155,12 +144,6 @@ class MetadataStatement implements JsonSerializable
 
     final public const ATTESTATION_BASIC_SURROGATE = 'basic_surrogate';
 
-    /**
-     * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
-     * @infection-ignore-all
-     */
-    final public const ATTESTATION_ECDAA = 'ecdaa';
-
     final public const ATTESTATION_ATTCA = 'attca';
 
     final public const ATTESTATION_ANONCA = 'anonca';
@@ -179,8 +162,8 @@ class MetadataStatement implements JsonSerializable
      * @param string[] $attestationCertificateKeyIdentifiers
      * @param string[] $keyProtection
      * @param string[] $attachmentHint
-     * @param EcdaaTrustAnchor[] $ecdaaTrustAnchors
      * @param ExtensionDescriptor[] $supportedExtensions
+     * @param DisplayPNGCharacteristicsDescriptor[] $tcDisplayPNGCharacteristics
      */
     public function __construct(
         public readonly string $description,
@@ -207,7 +190,6 @@ public function __construct(
         public array $attachmentHint = [],
         public ?string $tcDisplayContentType = null,
         public array $tcDisplayPNGCharacteristics = [],
-        public array $ecdaaTrustAnchors = [],
         public ?string $icon = null,
         public array $supportedExtensions = [],
         ?AuthenticatorGetInfo $authenticatorGetInfo = null,
@@ -215,6 +197,22 @@ public function __construct(
         $this->authenticatorGetInfo = $authenticatorGetInfo ?? AuthenticatorGetInfo::create($attestationTypes);
     }
 
+    /**
+     * @param Version[] $upv
+     * @param string[] $authenticationAlgorithms
+     * @param string[] $publicKeyAlgAndEncodings
+     * @param string[] $attestationTypes
+     * @param VerificationMethodANDCombinations[] $userVerificationDetails
+     * @param string[] $matcherProtection
+     * @param string[] $tcDisplay
+     * @param string[] $attestationRootCertificates
+     * @param string[] $attestationCertificateKeyIdentifiers
+     * @param string[] $keyProtection
+     * @param string[] $attachmentHint
+     * @param ExtensionDescriptor[] $supportedExtensions
+     * @param DisplayPNGCharacteristicsDescriptor[] $tcDisplayPNGCharacteristics
+     * @param string[] $alternativeDescriptions
+     */
     public static function create(
         string $description,
         int $authenticatorVersion,
@@ -240,7 +238,6 @@ public static function create(
         array $attachmentHint = [],
         ?string $tcDisplayContentType = null,
         array $tcDisplayPNGCharacteristics = [],
-        array $ecdaaTrustAnchors = [],
         ?string $icon = null,
         array $supportedExtensions = [],
         ?AuthenticatorGetInfo $authenticatorGetInfo = null,
@@ -270,431 +267,9 @@ public static function create(
             $attachmentHint,
             $tcDisplayContentType,
             $tcDisplayPNGCharacteristics,
-            $ecdaaTrustAnchors,
             $icon,
             $supportedExtensions,
             $authenticatorGetInfo,
         );
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $statement): self
-    {
-        $data = json_decode($statement, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getLegalHeader(): ?string
-    {
-        return $this->legalHeader;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaid(): ?string
-    {
-        return $this->aaid;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaguid(): ?string
-    {
-        return $this->aaguid;
-    }
-
-    public function isKeyRestricted(): ?bool
-    {
-        return $this->isKeyRestricted;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function isFreshUserVerificationRequired(): ?bool
-    {
-        return $this->isFreshUserVerificationRequired;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticatorGetInfo(): AuthenticatorGetInfo|null
-    {
-        return $this->authenticatorGetInfo;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationCertificateKeyIdentifiers(): array
-    {
-        return $this->attestationCertificateKeyIdentifiers;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAlternativeDescriptions(): null|AlternativeDescriptions
-    {
-        return $this->alternativeDescriptions;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticatorVersion(): int
-    {
-        return $this->authenticatorVersion;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getProtocolFamily(): string
-    {
-        return $this->protocolFamily;
-    }
-
-    /**
-     * @return Version[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUpv(): array
-    {
-        return $this->upv;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getSchema(): ?int
-    {
-        return $this->schema;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticationAlgorithms(): array
-    {
-        return $this->authenticationAlgorithms;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getPublicKeyAlgAndEncodings(): array
-    {
-        return $this->publicKeyAlgAndEncodings;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationTypes(): array
-    {
-        return $this->attestationTypes;
-    }
-
-    /**
-     * @return VerificationMethodANDCombinations[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserVerificationDetails(): array
-    {
-        return $this->userVerificationDetails;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getKeyProtection(): array
-    {
-        return $this->keyProtection;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMatcherProtection(): array
-    {
-        return $this->matcherProtection;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCryptoStrength(): ?int
-    {
-        return $this->cryptoStrength;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttachmentHint(): array
-    {
-        return $this->attachmentHint;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTcDisplay(): array
-    {
-        return $this->tcDisplay;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTcDisplayContentType(): ?string
-    {
-        return $this->tcDisplayContentType;
-    }
-
-    /**
-     * @return DisplayPNGCharacteristicsDescriptor[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTcDisplayPNGCharacteristics(): array
-    {
-        return $this->tcDisplayPNGCharacteristics;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationRootCertificates(): array
-    {
-        return $this->attestationRootCertificates;
-    }
-
-    /**
-     * @return EcdaaTrustAnchor[]
-     *
-     * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
-     * @infection-ignore-all
-     */
-    public function getEcdaaTrustAnchors(): array
-    {
-        return $this->ecdaaTrustAnchors;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    /**
-     * @return ExtensionDescriptor[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getSupportedExtensions(): array
-    {
-        return $this->supportedExtensions;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $requiredKeys = [
-            'description',
-            'authenticatorVersion',
-            'protocolFamily',
-            'schema',
-            'upv',
-            'authenticationAlgorithms',
-            'publicKeyAlgAndEncodings',
-            'attestationTypes',
-            'userVerificationDetails',
-            'matcherProtection',
-            'tcDisplay',
-            'attestationRootCertificates',
-        ];
-        foreach ($requiredKeys as $key) {
-            array_key_exists($key, $data) || throw MetadataStatementLoadingException::create(sprintf(
-                'Invalid data. The key "%s" is missing',
-                $key
-            ));
-        }
-        $subObjects = [
-            'authenticationAlgorithms',
-            'publicKeyAlgAndEncodings',
-            'attestationTypes',
-            'matcherProtection',
-            'tcDisplay',
-            'attestationRootCertificates',
-        ];
-        foreach ($subObjects as $subObject) {
-            is_array($data[$subObject]) || throw MetadataStatementLoadingException::create(sprintf(
-                'Invalid Metadata Statement. The parameter "%s" shall be a list of strings.',
-                $subObject
-            ));
-            foreach ($data[$subObject] as $datum) {
-                is_string($datum) || throw MetadataStatementLoadingException::create(sprintf(
-                    'Invalid Metadata Statement. The parameter "%s" shall be a list of strings.',
-                    $subObject
-                ));
-            }
-        }
-
-        return self::create(
-            $data['description'],
-            $data['authenticatorVersion'],
-            $data['protocolFamily'],
-            $data['schema'],
-            array_map(static function ($upv): Version {
-                is_array($upv) || throw MetadataStatementLoadingException::create(
-                    'Invalid Metadata Statement. The parameter "upv" shall be a list of objects.'
-                );
-
-                return Version::createFromArray($upv);
-            }, $data['upv']),
-            $data['authenticationAlgorithms'],
-            $data['publicKeyAlgAndEncodings'],
-            $data['attestationTypes'],
-            array_map(static function ($userVerificationDetails): VerificationMethodANDCombinations {
-                is_array($userVerificationDetails) || throw MetadataStatementLoadingException::create(
-                    'Invalid Metadata Statement. The parameter "userVerificationDetails" shall be a list of objects.'
-                );
-
-                return VerificationMethodANDCombinations::createFromArray($userVerificationDetails);
-            }, $data['userVerificationDetails']),
-            $data['matcherProtection'],
-            $data['tcDisplay'],
-            CertificateToolbox::fixPEMStructures($data['attestationRootCertificates']),
-            $data['alternativeDescriptions'] ?? [],
-            $data['legalHeader'] ?? null,
-            $data['aaid'] ?? null,
-            $data['aaguid'] ?? null,
-            $data['attestationCertificateKeyIdentifiers'] ?? [],
-            $data['keyProtection'] ?? [],
-            $data['isKeyRestricted'] ?? null,
-            $data['isFreshUserVerificationRequired'] ?? null,
-            $data['cryptoStrength'] ?? null,
-            $data['attachmentHint'] ?? [],
-            $data['tcDisplayContentType'] ?? null,
-            array_map(
-                static fn (array $data): DisplayPNGCharacteristicsDescriptor => DisplayPNGCharacteristicsDescriptor::createFromArray(
-                    $data
-                ),
-                $data['tcDisplayPNGCharacteristics'] ?? []
-            ),
-            $data['ecdaaTrustAnchors'] ?? [],
-            $data['icon'] ?? null,
-            array_map(
-                static fn ($supportedExtension): ExtensionDescriptor => ExtensionDescriptor::createFromArray(
-                    $supportedExtension
-                ),
-                $data['supportedExtensions'] ?? []
-            ),
-            isset($data['authenticatorGetInfo']) ? AuthenticatorGetInfo::create($data['authenticatorGetInfo']) : null,
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'legalHeader' => $this->legalHeader,
-            'aaid' => $this->aaid,
-            'aaguid' => $this->aaguid,
-            'attestationCertificateKeyIdentifiers' => $this->attestationCertificateKeyIdentifiers,
-            'description' => $this->description,
-            'alternativeDescriptions' => $this->alternativeDescriptions,
-            'authenticatorVersion' => $this->authenticatorVersion,
-            'protocolFamily' => $this->protocolFamily,
-            'schema' => $this->schema,
-            'upv' => $this->upv,
-            'authenticationAlgorithms' => $this->authenticationAlgorithms,
-            'publicKeyAlgAndEncodings' => $this->publicKeyAlgAndEncodings,
-            'attestationTypes' => $this->attestationTypes,
-            'userVerificationDetails' => $this->userVerificationDetails,
-            'keyProtection' => $this->keyProtection,
-            'isKeyRestricted' => $this->isKeyRestricted,
-            'isFreshUserVerificationRequired' => $this->isFreshUserVerificationRequired,
-            'matcherProtection' => $this->matcherProtection,
-            'cryptoStrength' => $this->cryptoStrength,
-            'attachmentHint' => $this->attachmentHint,
-            'tcDisplay' => $this->tcDisplay,
-            'tcDisplayContentType' => $this->tcDisplayContentType,
-            'tcDisplayPNGCharacteristics' => $this->tcDisplayPNGCharacteristics,
-            'attestationRootCertificates' => CertificateToolbox::fixPEMStructures($this->attestationRootCertificates),
-            'ecdaaTrustAnchors' => $this->ecdaaTrustAnchors,
-            'icon' => $this->icon,
-            'authenticatorGetInfo' => $this->authenticatorGetInfo,
-            'supportedExtensions' => $this->supportedExtensions,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php
index f065bbeec..470c1f59f 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/PatternAccuracyDescriptor.php
@@ -5,14 +5,9 @@
 namespace Webauthn\MetadataService\Statement;
 
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-use function is_int;
 
 class PatternAccuracyDescriptor extends AbstractDescriptor
 {
-    use ValueFilter;
-
     public function __construct(
         public readonly int $minComplexity,
         ?int $maxRetries = null,
@@ -28,55 +23,4 @@ public static function create(int $minComplexity, ?int $maxRetries = null, ?int
     {
         return new self($minComplexity, $maxRetries, $blockSlowdown);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMinComplexity(): int
-    {
-        return $this->minComplexity;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        array_key_exists('minComplexity', $data) || throw MetadataStatementLoadingException::create(
-            'The key "minComplexity" is missing'
-        );
-        foreach (['minComplexity', 'maxRetries', 'blockSlowdown'] as $key) {
-            if (array_key_exists($key, $data)) {
-                is_int($data[$key]) || throw MetadataStatementLoadingException::create(
-                    sprintf('Invalid data. The value of "%s" must be a positive integer', $key)
-                );
-            }
-        }
-
-        return self::create($data['minComplexity'], $data['maxRetries'] ?? null, $data['blockSlowdown'] ?? null);
-    }
-
-    /**
-     * @return array<string, int|null>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'minComplexity' => $this->minComplexity,
-            'maxRetries' => $this->maxRetries,
-            'blockSlowdown' => $this->blockSlowdown,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/RgbPaletteEntry.php b/web-auth/webauthn-lib/src/MetadataService/Statement/RgbPaletteEntry.php
index ca850789a..7947bfd59 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/RgbPaletteEntry.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/RgbPaletteEntry.php
@@ -4,17 +4,14 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use function array_key_exists;
-use function is_int;
 
-class RgbPaletteEntry implements JsonSerializable
+readonly class RgbPaletteEntry
 {
     public function __construct(
-        public readonly int $r,
-        public readonly int $g,
-        public readonly int $b,
+        public int $r,
+        public int $g,
+        public int $b,
     ) {
         ($r >= 0 && $r <= 255) || throw MetadataStatementLoadingException::create('The key "r" is invalid');
         ($g >= 0 && $g <= 255) || throw MetadataStatementLoadingException::create('The key "g" is invalid');
@@ -25,69 +22,4 @@ public static function create(int $r, int $g, int $b): self
     {
         return new self($r, $g, $b);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getR(): int
-    {
-        return $this->r;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getG(): int
-    {
-        return $this->g;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getB(): int
-    {
-        return $this->b;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        foreach (['r', 'g', 'b'] as $key) {
-            array_key_exists($key, $data) || throw MetadataStatementLoadingException::create(sprintf(
-                'The key "%s" is missing',
-                $key
-            ));
-            is_int($data[$key]) || throw MetadataStatementLoadingException::create(
-                sprintf('The key "%s" is invalid', $key)
-            );
-        }
-
-        return self::create($data['r'], $data['g'], $data['b']);
-    }
-
-    /**
-     * @return array<string, int>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'r' => $this->r,
-            'g' => $this->g,
-            'b' => $this->b,
-        ];
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/RogueListEntry.php b/web-auth/webauthn-lib/src/MetadataService/Statement/RogueListEntry.php
index 4cf5f2928..a439aa5f2 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/RogueListEntry.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/RogueListEntry.php
@@ -4,16 +4,11 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-use Webauthn\Exception\MetadataStatementLoadingException;
-use function array_key_exists;
-use function is_string;
-
-class RogueListEntry implements JsonSerializable
+readonly class RogueListEntry
 {
     public function __construct(
-        public readonly string $sk,
-        public readonly string $date
+        public string $sk,
+        public string $date
     ) {
     }
 
@@ -21,56 +16,4 @@ public static function create(string $sk, string $date): self
     {
         return new self($sk, $date);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getSk(): string
-    {
-        return $this->sk;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getDate(): ?string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        array_key_exists('sk', $data) || throw MetadataStatementLoadingException::create('The key "sk" is missing');
-        is_string($data['sk']) || throw MetadataStatementLoadingException::create('The key "date" is invalid');
-        array_key_exists('date', $data) || throw MetadataStatementLoadingException::create(
-            'The key "date" is missing'
-        );
-        is_string($data['date']) || throw MetadataStatementLoadingException::create('The key "date" is invalid');
-
-        return self::create($data['sk'], $data['date']);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'sk' => $this->sk,
-            'date' => $this->date,
-        ];
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/StatusReport.php b/web-auth/webauthn-lib/src/MetadataService/Statement/StatusReport.php
index c1fba596d..e19b37daf 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/StatusReport.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/StatusReport.php
@@ -4,29 +4,23 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
 use function in_array;
-use function is_string;
 
-class StatusReport implements JsonSerializable
+readonly class StatusReport
 {
-    use ValueFilter;
-
     /**
      * @see AuthenticatorStatus
      */
     public function __construct(
-        public readonly string $status,
-        public readonly ?string $effectiveDate,
-        public readonly ?string $certificate,
-        public readonly ?string $url,
-        public readonly ?string $certificationDescriptor,
-        public readonly ?string $certificateNumber,
-        public readonly ?string $certificationPolicyVersion,
-        public readonly ?string $certificationRequirementsVersion
+        public string $status,
+        public ?string $effectiveDate,
+        public ?string $certificate,
+        public ?string $url,
+        public ?string $certificationDescriptor,
+        public ?string $certificateNumber,
+        public ?string $certificationPolicyVersion,
+        public ?string $certificationRequirementsVersion
     ) {
         in_array($status, AuthenticatorStatus::STATUSES, true) || throw MetadataStatementLoadingException::create(
             'The value of the key "status" is not acceptable'
@@ -64,142 +58,4 @@ public function isCompromised(): bool
             AuthenticatorStatus::USER_VERIFICATION_BYPASS,
         ], true);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getEffectiveDate(): ?string
-    {
-        return $this->effectiveDate;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificate(): ?string
-    {
-        return $this->certificate;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUrl(): ?string
-    {
-        return $this->url;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationDescriptor(): ?string
-    {
-        return $this->certificationDescriptor;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificateNumber(): ?string
-    {
-        return $this->certificateNumber;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationPolicyVersion(): ?string
-    {
-        return $this->certificationPolicyVersion;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificationRequirementsVersion(): ?string
-    {
-        return $this->certificationRequirementsVersion;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        array_key_exists('status', $data) || throw MetadataStatementLoadingException::create(
-            'The key "status" is missing'
-        );
-        foreach ([
-            'effectiveDate',
-            'certificate',
-            'url',
-            'certificationDescriptor',
-            'certificateNumber',
-            'certificationPolicyVersion',
-            'certificationRequirementsVersion',
-        ] as $key) {
-            if (isset($data[$key])) {
-                $value = $data[$key];
-                $value === null || is_string($value) || throw MetadataStatementLoadingException::create(sprintf(
-                    'The value of the key "%s" is invalid',
-                    $key
-                ));
-            }
-        }
-
-        return self::create(
-            $data['status'],
-            $data['effectiveDate'] ?? null,
-            $data['certificate'] ?? null,
-            $data['url'] ?? null,
-            $data['certificationDescriptor'] ?? null,
-            $data['certificateNumber'] ?? null,
-            $data['certificationPolicyVersion'] ?? null,
-            $data['certificationRequirementsVersion'] ?? null
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'status' => $this->status,
-            'effectiveDate' => $this->effectiveDate,
-            'certificate' => $this->certificate,
-            'url' => $this->url,
-            'certificationDescriptor' => $this->certificationDescriptor,
-            'certificateNumber' => $this->certificateNumber,
-            'certificationPolicyVersion' => $this->certificationPolicyVersion,
-            'certificationRequirementsVersion' => $this->certificationRequirementsVersion,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodANDCombinations.php b/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodANDCombinations.php
index 581d5f596..396e43800 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodANDCombinations.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodANDCombinations.php
@@ -4,9 +4,7 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
-
-class VerificationMethodANDCombinations implements JsonSerializable
+class VerificationMethodANDCombinations
 {
     /**
      * @param VerificationMethodDescriptor[] $verificationMethods
@@ -24,56 +22,4 @@ public static function create(array $verificationMethods): self
     {
         return new self($verificationMethods);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} directly.
-     * @infection-ignore-all
-     */
-    public function addVerificationMethodDescriptor(VerificationMethodDescriptor $verificationMethodDescriptor): self
-    {
-        $this->verificationMethods[] = $verificationMethodDescriptor;
-
-        return $this;
-    }
-
-    /**
-     * @return VerificationMethodDescriptor[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getVerificationMethods(): array
-    {
-        return $this->verificationMethods;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        return self::create(
-            array_map(
-                static fn (array $datum): VerificationMethodDescriptor => VerificationMethodDescriptor::createFromArray(
-                    $datum
-                ),
-                $data
-            )
-        );
-    }
-
-    /**
-     * @return array<VerificationMethodDescriptor>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->verificationMethods;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php b/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php
index fe700f833..a9a07153f 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/VerificationMethodDescriptor.php
@@ -4,16 +4,10 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-use function is_array;
 
-class VerificationMethodDescriptor implements JsonSerializable
+class VerificationMethodDescriptor
 {
-    use ValueFilter;
-
     final public const USER_VERIFY_PRESENCE_INTERNAL = 'presence_internal';
 
     final public const USER_VERIFY_PRESENCE_INTERNAL_INT = 0x00000001;
@@ -118,15 +112,6 @@ public static function create(
         return new self($userVerificationMethod, $caDesc, $baDesc, $paDesc);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserVerificationMethod(): string
-    {
-        return $this->userVerificationMethod;
-    }
-
     public function userPresence(): bool
     {
         return $this->userVerificationMethod === self::USER_VERIFY_PRESENCE_INTERNAL;
@@ -191,83 +176,4 @@ public function all(): bool
     {
         return $this->userVerificationMethod === self::USER_VERIFY_ALL;
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCaDesc(): ?CodeAccuracyDescriptor
-    {
-        return $this->caDesc;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getBaDesc(): ?BiometricAccuracyDescriptor
-    {
-        return $this->baDesc;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getPaDesc(): ?PatternAccuracyDescriptor
-    {
-        return $this->paDesc;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        if (isset($data['userVerification']) && ! isset($data['userVerificationMethod'])) {
-            $data['userVerificationMethod'] = $data['userVerification'];
-            unset($data['userVerification']);
-        }
-        array_key_exists('userVerificationMethod', $data) || throw MetadataStatementLoadingException::create(
-            'The parameters "userVerificationMethod" is missing'
-        );
-
-        foreach (['caDesc', 'baDesc', 'paDesc'] as $key) {
-            if (isset($data[$key])) {
-                is_array($data[$key]) || throw MetadataStatementLoadingException::create(
-                    sprintf('Invalid parameter "%s"', $key)
-                );
-            }
-        }
-
-        $caDesc = isset($data['caDesc']) ? CodeAccuracyDescriptor::createFromArray($data['caDesc']) : null;
-        $baDesc = isset($data['baDesc']) ? BiometricAccuracyDescriptor::createFromArray($data['baDesc']) : null;
-        $paDesc = isset($data['paDesc']) ? PatternAccuracyDescriptor::createFromArray($data['paDesc']) : null;
-
-        return self::create($data['userVerificationMethod'], $caDesc, $baDesc, $paDesc);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'userVerificationMethod' => $this->userVerificationMethod,
-            'caDesc' => $this->caDesc,
-            'baDesc' => $this->baDesc,
-            'paDesc' => $this->paDesc,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php b/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php
index 1a0f77153..cab6d362c 100644
--- a/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php
+++ b/web-auth/webauthn-lib/src/MetadataService/Statement/Version.php
@@ -4,19 +4,13 @@
 
 namespace Webauthn\MetadataService\Statement;
 
-use JsonSerializable;
 use Webauthn\Exception\MetadataStatementLoadingException;
-use Webauthn\MetadataService\ValueFilter;
-use function array_key_exists;
-use function is_int;
 
-class Version implements JsonSerializable
+readonly class Version
 {
-    use ValueFilter;
-
     public function __construct(
-        public readonly ?int $major,
-        public readonly ?int $minor
+        public ?int $major,
+        public ?int $minor
     ) {
         if ($major === null && $minor === null) {
             throw MetadataStatementLoadingException::create('Invalid data. Must contain at least one item');
@@ -29,60 +23,4 @@ public static function create(?int $major, ?int $minor): self
     {
         return new self($major, $minor);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMajor(): ?int
-    {
-        return $this->major;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getMinor(): ?int
-    {
-        return $this->minor;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.7.0. Please use the symfony/serializer for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $data = self::filterNullValues($data);
-        foreach (['major', 'minor'] as $key) {
-            if (array_key_exists($key, $data)) {
-                is_int($data[$key]) || throw MetadataStatementLoadingException::create(
-                    sprintf('Invalid value for key "%s"', $key)
-                );
-            }
-        }
-
-        return self::create($data['major'] ?? null, $data['minor'] ?? null);
-    }
-
-    /**
-     * @return array<string, int|null>
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $data = [
-            'major' => $this->major,
-            'minor' => $this->minor,
-        ];
-
-        return self::filterNullValues($data);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/MetadataService/ValueFilter.php b/web-auth/webauthn-lib/src/MetadataService/ValueFilter.php
deleted file mode 100644
index 23a9700c3..000000000
--- a/web-auth/webauthn-lib/src/MetadataService/ValueFilter.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\MetadataService;
-
-/**
- * @internal
- */
-trait ValueFilter
-{
-    /**
-     * @param array<mixed> $data
-     *
-     * @return array<mixed>
-     */
-    private static function filterNullValues(array $data): array
-    {
-        return array_filter($data, static fn ($var): bool => $var !== null);
-    }
-}
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredential.php b/web-auth/webauthn-lib/src/PublicKeyCredential.php
index 8e09ad656..1a50b5951 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredential.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredential.php
@@ -4,76 +4,27 @@
 
 namespace Webauthn;
 
-use Stringable;
-use const E_USER_DEPRECATED;
-use const JSON_THROW_ON_ERROR;
-
 /**
  * @see https://www.w3.org/TR/webauthn/#iface-pkcredential
  */
-class PublicKeyCredential extends Credential implements Stringable
+class PublicKeyCredential extends Credential
 {
     public function __construct(
-        null|string $id,
         string $type,
         string $rawId,
         public readonly AuthenticatorResponse $response
     ) {
-        parent::__construct($id, $type, $rawId);
-    }
-
-    /**
-     * @deprecated since 4.8.0.
-     * @infection-ignore-all
-     */
-    public function __toString(): string
-    {
-        return json_encode($this->getPublicKeyCredentialDescriptor(), JSON_THROW_ON_ERROR);
-    }
-
-    public static function create(null|string $id, string $type, string $rawId, AuthenticatorResponse $response): self
-    {
-        return new self($id, $type, $rawId, $response);
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRawId(): string
-    {
-        return $this->rawId;
+        parent::__construct($type, $rawId);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getResponse(): AuthenticatorResponse
+    public static function create(string $type, string $rawId, AuthenticatorResponse $response): self
     {
-        return $this->response;
+        return new self($type, $rawId, $response);
     }
 
-    /**
-     * @param string[] $transport
-     */
-    public function getPublicKeyCredentialDescriptor(null|array $transport = null): PublicKeyCredentialDescriptor
+    public function getPublicKeyCredentialDescriptor(): PublicKeyCredentialDescriptor
     {
-        if ($transport !== null) {
-            trigger_deprecation(
-                'web-auth/webauthn-lib',
-                '4.8.0',
-                'The parameter "$transport" is deprecated and will be removed in 5.0.0.'
-            );
-            @trigger_error(
-                sprintf(
-                    'The $transport argument of %s() is deprecated since 4.8.0 and will be removed in 5.0.0.',
-                    __METHOD__
-                ),
-                E_USER_DEPRECATED
-            );
-        }
-        $transport ??= $this->response instanceof AuthenticatorAttestationResponse ? $this->response->transports : [];
+        $transport = $this->response instanceof AuthenticatorAttestationResponse ? $this->response->transports : [];
 
         return PublicKeyCredentialDescriptor::create($this->type, $this->rawId, $transport);
     }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php b/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php
index 3e1377eb5..46d22203a 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialCreationOptions.php
@@ -5,16 +5,9 @@
 namespace Webauthn;
 
 use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\Exception\InvalidDataException;
-use Webauthn\Util\Base64;
-use function array_key_exists;
-use function count;
 use function in_array;
-use function is_array;
-use const JSON_THROW_ON_ERROR;
 
 final class PublicKeyCredentialCreationOptions extends PublicKeyCredentialOptions
 {
@@ -37,7 +30,6 @@ final class PublicKeyCredentialCreationOptions extends PublicKeyCredentialOption
     ];
 
     /**
-     * @private
      * @param PublicKeyCredentialParameters[] $pubKeyCredParams
      * @param PublicKeyCredentialDescriptor[] $excludeCredentials
      * @param null|positive-int $timeout
@@ -99,253 +91,4 @@ public static function create(
             $extensions
         );
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function addPubKeyCredParam(PublicKeyCredentialParameters $pubKeyCredParam): self
-    {
-        $this->pubKeyCredParams[] = $pubKeyCredParam;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. No replacement. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function addPubKeyCredParams(PublicKeyCredentialParameters ...$pubKeyCredParams): self
-    {
-        foreach ($pubKeyCredParams as $pubKeyCredParam) {
-            $this->pubKeyCredParams[] = $pubKeyCredParam;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function excludeCredential(PublicKeyCredentialDescriptor $excludeCredential): self
-    {
-        $this->excludeCredentials[] = $excludeCredential;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. No replacement. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function excludeCredentials(PublicKeyCredentialDescriptor ...$excludeCredentials): self
-    {
-        foreach ($excludeCredentials as $excludeCredential) {
-            $this->excludeCredentials[] = $excludeCredential;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setAuthenticatorSelection(?AuthenticatorSelectionCriteria $authenticatorSelection): self
-    {
-        $this->authenticatorSelection = $authenticatorSelection;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setAttestation(string $attestation): self
-    {
-        in_array($attestation, self::ATTESTATION_CONVEYANCE_PREFERENCES, true) || throw InvalidDataException::create(
-            $attestation,
-            'Invalid attestation conveyance mode'
-        );
-        $this->attestation = $attestation;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRp(): PublicKeyCredentialRpEntity
-    {
-        return $this->rp;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUser(): PublicKeyCredentialUserEntity
-    {
-        return $this->user;
-    }
-
-    /**
-     * @return PublicKeyCredentialParameters[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getPubKeyCredParams(): array
-    {
-        return $this->pubKeyCredParams;
-    }
-
-    /**
-     * @return PublicKeyCredentialDescriptor[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getExcludeCredentials(): array
-    {
-        return $this->excludeCredentials;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAuthenticatorSelection(): ?AuthenticatorSelectionCriteria
-    {
-        return $this->authenticatorSelection;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestation(): ?string
-    {
-        return $this->attestation;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): static
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): static
-    {
-        array_key_exists('rp', $json) || throw InvalidDataException::create($json, 'Invalid input. "rp" is missing.');
-        array_key_exists('pubKeyCredParams', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "pubKeyCredParams" is missing.'
-        );
-        is_array($json['pubKeyCredParams']) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "pubKeyCredParams" is not an array.'
-        );
-        array_key_exists('challenge', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "challenge" is missing.'
-        );
-        array_key_exists('attestation', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "attestation" is missing.'
-        );
-        array_key_exists('user', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "user" is missing.'
-        );
-
-        $pubKeyCredParams = [];
-        foreach ($json['pubKeyCredParams'] as $pubKeyCredParam) {
-            if (! is_array($pubKeyCredParam)) {
-                continue;
-            }
-            $pubKeyCredParams[] = PublicKeyCredentialParameters::createFromArray($pubKeyCredParam);
-        }
-        $excludeCredentials = [];
-        if (isset($json['excludeCredentials'])) {
-            foreach ($json['excludeCredentials'] as $excludeCredential) {
-                $excludeCredentials[] = PublicKeyCredentialDescriptor::createFromArray($excludeCredential);
-            }
-        }
-
-        $challenge = Base64::decode($json['challenge']);
-
-        $authenticatorSelection = isset($json['authenticatorSelection']) ? AuthenticatorSelectionCriteria::createFromArray(
-            $json['authenticatorSelection']
-        ) : null
-        ;
-        $extensions =
-            isset($json['extensions']) ? AuthenticationExtensionsClientInputs::createFromArray(
-                $json['extensions']
-            ) : AuthenticationExtensionsClientInputs::create()
-        ;
-        return self
-            ::create(
-                PublicKeyCredentialRpEntity::createFromArray($json['rp']),
-                PublicKeyCredentialUserEntity::createFromArray($json['user']),
-                $challenge,
-                $pubKeyCredParams,
-                $authenticatorSelection,
-                $json['attestation'] ?? null,
-                $excludeCredentials,
-                $json['timeout'] ?? null,
-                $extensions
-            );
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = [
-            'rp' => $this->rp,
-            'user' => $this->user,
-            'challenge' => Base64UrlSafe::encodeUnpadded($this->challenge),
-            'pubKeyCredParams' => $this->pubKeyCredParams,
-        ];
-
-        if ($this->timeout !== null) {
-            $json['timeout'] = $this->timeout;
-        }
-
-        if (count($this->excludeCredentials) !== 0) {
-            $json['excludeCredentials'] = $this->excludeCredentials;
-        }
-
-        if ($this->authenticatorSelection !== null) {
-            $json['authenticatorSelection'] = $this->authenticatorSelection;
-        }
-
-        if ($this->attestation !== null) {
-            $json['attestation'] = $this->attestation;
-        }
-
-        if ($this->extensions->count() !== 0) {
-            $json['extensions'] = $this->extensions;
-        }
-
-        return $json;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php b/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php
index 3a351be27..09fd620d3 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptor.php
@@ -4,14 +4,7 @@
 
 namespace Webauthn;
 
-use JsonSerializable;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-use function count;
-use const JSON_THROW_ON_ERROR;
-
-class PublicKeyCredentialDescriptor implements JsonSerializable
+class PublicKeyCredentialDescriptor
 {
     final public const CREDENTIAL_TYPE_PUBLIC_KEY = 'public-key';
 
@@ -50,81 +43,4 @@ public static function create(string $type, string $id, array $transports = []):
     {
         return new self($type, $id, $transports);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTransports(): array
-    {
-        return $this->transports;
-    }
-
-    /**
-     * @deprecated since 4.9.0 and will be removed in 5.0.0. Please use the serializer instead.
-     */
-    public static function createFromString(string $data): self
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.9.0 and will be removed in 5.0.0. Please use the serializer instead.
-     */
-    public static function createFromArray(array $json): self
-    {
-        array_key_exists('type', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "type" is missing.'
-        );
-        array_key_exists('id', $json) || throw InvalidDataException::create($json, 'Invalid input. "id" is missing.');
-
-        $id = Base64UrlSafe::decodeNoPadding($json['id']);
-
-        return self::create($json['type'], $id, $json['transports'] ?? []);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = [
-            'type' => $this->type,
-            'id' => Base64UrlSafe::encodeUnpadded($this->id),
-        ];
-        if (count($this->transports) !== 0) {
-            $json['transports'] = $this->transports;
-        }
-
-        return $json;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptorCollection.php b/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptorCollection.php
deleted file mode 100644
index d5f1481c9..000000000
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialDescriptorCollection.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn;
-
-use ArrayIterator;
-use Countable;
-use InvalidArgumentException;
-use Iterator;
-use IteratorAggregate;
-use JsonSerializable;
-use function array_key_exists;
-use function count;
-use const COUNT_NORMAL;
-use const JSON_THROW_ON_ERROR;
-
-/**
- * @implements IteratorAggregate<PublicKeyCredentialDescriptor>
- * @deprecated since 4.8.0 and will be removed in 5.0.0.
- * @infection-ignore-all
- */
-class PublicKeyCredentialDescriptorCollection implements JsonSerializable, Countable, IteratorAggregate
-{
-    /**
-     * @var array<string, PublicKeyCredentialDescriptor>
-     * @readonly
-     */
-    public array $publicKeyCredentialDescriptors;
-
-    /**
-     * @private
-     * @param PublicKeyCredentialDescriptor[] $pkCredentialDescriptors
-     */
-    public function __construct(
-        array $pkCredentialDescriptors = []
-    ) {
-        $this->publicKeyCredentialDescriptors = [];
-        foreach ($pkCredentialDescriptors as $pkCredentialDescriptor) {
-            $pkCredentialDescriptor instanceof PublicKeyCredentialDescriptor || throw new InvalidArgumentException(
-                'Expected only instances of ' . PublicKeyCredentialDescriptor::class
-            );
-            $this->publicKeyCredentialDescriptors[$pkCredentialDescriptor->id] = $pkCredentialDescriptor;
-        }
-    }
-
-    /**
-     * @param PublicKeyCredentialDescriptor[] $publicKeyCredentialDescriptors
-     */
-    public static function create(array $publicKeyCredentialDescriptors): self
-    {
-        return new self($publicKeyCredentialDescriptors);
-    }
-
-    /**
-     * @infection-ignore-all
-     */
-    public function add(PublicKeyCredentialDescriptor ...$publicKeyCredentialDescriptors): void
-    {
-        foreach ($publicKeyCredentialDescriptors as $publicKeyCredentialDescriptor) {
-            $this->publicKeyCredentialDescriptors[$publicKeyCredentialDescriptor->id] = $publicKeyCredentialDescriptor;
-        }
-    }
-
-    /**
-     * @infection-ignore-all
-     */
-    public function has(string $id): bool
-    {
-        return array_key_exists($id, $this->publicKeyCredentialDescriptors);
-    }
-
-    /**
-     * @infection-ignore-all
-     */
-    public function remove(string $id): void
-    {
-        if (! array_key_exists($id, $this->publicKeyCredentialDescriptors)) {
-            return;
-        }
-
-        unset($this->publicKeyCredentialDescriptors[$id]);
-    }
-
-    /**
-     * @return Iterator<string, PublicKeyCredentialDescriptor>
-     */
-    public function getIterator(): Iterator
-    {
-        return new ArrayIterator($this->publicKeyCredentialDescriptors);
-    }
-
-    public function count(int $mode = COUNT_NORMAL): int
-    {
-        return count($this->publicKeyCredentialDescriptors, $mode);
-    }
-
-    /**
-     * @return array<string, mixed>[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return $this->publicKeyCredentialDescriptors;
-    }
-
-    /**
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): self
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): self
-    {
-        return self::create(
-            array_map(
-                static fn (array $item): PublicKeyCredentialDescriptor => PublicKeyCredentialDescriptor::createFromArray(
-                    $item
-                ),
-                $json
-            )
-        );
-    }
-}
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php b/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php
index 844a078b7..e2c54e1e2 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialEntity.php
@@ -4,46 +4,23 @@
 
 namespace Webauthn;
 
-use JsonSerializable;
-
-abstract class PublicKeyCredentialEntity implements JsonSerializable
+abstract class PublicKeyCredentialEntity
 {
-    public function __construct(
-        public readonly string $name,
-        public readonly ?string $icon
-    ) {
-    }
-
     /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
+     * @deprecated since 5.1.0 and will be removed in 6.0.0. This value is always null.
      */
-    public function getName(): string
-    {
-        return $this->name;
-    }
+    public ?string $icon = null;
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        $json = [
-            'name' => $this->name,
-        ];
-        if ($this->icon !== null) {
-            $json['icon'] = $this->icon;
+    public function __construct(
+        public readonly string $name,
+        ?string $icon = null
+    ) {
+        if ($icon !== null) {
+            trigger_deprecation(
+                'web-auth/webauthn-lib',
+                '5.1.0',
+                'The parameter "$icon" is deprecated since 5.1.0 and will be removed in 6.0.0. This value has no effect. Please set "null" instead.'
+            );
         }
-
-        return $json;
     }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialLoader.php b/web-auth/webauthn-lib/src/PublicKeyCredentialLoader.php
deleted file mode 100644
index 88b2a9c17..000000000
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialLoader.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn;
-
-use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-use Symfony\Component\Serializer\SerializerInterface;
-use Throwable;
-use Webauthn\AttestationStatement\AttestationObjectLoader;
-use Webauthn\Exception\InvalidDataException;
-use Webauthn\MetadataService\CanLogData;
-use Webauthn\Util\Base64;
-use function array_key_exists;
-use function is_array;
-use function is_string;
-use const JSON_THROW_ON_ERROR;
-
-/**
- * @deprecated since 4.8.0 and will be removed in 5.0.0. Please use the Symfony serializer instead
- */
-class PublicKeyCredentialLoader implements CanLogData
-{
-    private LoggerInterface $logger;
-
-    public function __construct(
-        private readonly null|AttestationObjectLoader $attestationObjectLoader,
-        private readonly null|SerializerInterface $serializer = null,
-    ) {
-        if ($this->attestationObjectLoader === null && $this->serializer === null) {
-            throw new InvalidArgumentException('You must provide an attestation object loader or a serializer');
-        }
-        $this->logger = new NullLogger();
-    }
-
-    public static function create(
-        null|AttestationObjectLoader $attestationObjectLoader,
-        null|SerializerInterface $serializer = null
-    ): self {
-        return new self($attestationObjectLoader, $serializer);
-    }
-
-    public function setLogger(LoggerInterface $logger): void
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * @param mixed[] $json
-     * @infection-ignore-all
-     */
-    public function loadArray(array $json): PublicKeyCredential
-    {
-        $this->logger->info('Trying to load data from an array', [
-            'data' => $json,
-        ]);
-        try {
-            foreach (['id', 'rawId', 'type'] as $key) {
-                array_key_exists($key, $json) || throw InvalidDataException::create($json, sprintf(
-                    'The parameter "%s" is missing',
-                    $key
-                ));
-                is_string($json[$key]) || throw InvalidDataException::create($json, sprintf(
-                    'The parameter "%s" shall be a string',
-                    $key
-                ));
-            }
-            array_key_exists('response', $json) || throw InvalidDataException::create(
-                $json,
-                'The parameter "response" is missing'
-            );
-            is_array($json['response']) || throw InvalidDataException::create(
-                $json,
-                'The parameter "response" shall be an array'
-            );
-            $json['type'] === 'public-key' || throw InvalidDataException::create($json, sprintf(
-                'Unsupported type "%s"',
-                $json['type']
-            ));
-
-            $id = Base64UrlSafe::decodeNoPadding($json['id']);
-            $rawId = Base64::decode($json['rawId']);
-            hash_equals($id, $rawId) || throw InvalidDataException::create($json, 'Invalid ID');
-
-            $publicKeyCredential = PublicKeyCredential::create(
-                null,
-                $json['type'],
-                $rawId,
-                $this->createResponse($json['response'])
-            );
-            $this->logger->info('The data has been loaded');
-            $this->logger->debug('Public Key Credential', [
-                'publicKeyCredential' => $publicKeyCredential,
-            ]);
-
-            return $publicKeyCredential;
-        } catch (Throwable $throwable) {
-            $this->logger->error('An error occurred', [
-                'exception' => $throwable,
-            ]);
-            throw $throwable;
-        }
-    }
-
-    public function load(string $data): PublicKeyCredential
-    {
-        $this->logger->info('Trying to load data from a string', [
-            'data' => $data,
-        ]);
-        try {
-            if ($this->serializer !== null) {
-                return $this->serializer->deserialize($data, PublicKeyCredential::class, 'json');
-            }
-            $json = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-            return $this->loadArray($json);
-        } catch (Throwable $throwable) {
-            $this->logger->error('An error occurred', [
-                'exception' => $throwable,
-            ]);
-            throw InvalidDataException::create($data, 'Unable to load the data', $throwable);
-        }
-    }
-
-    /**
-     * @param mixed[] $response
-     */
-    private function createResponse(array $response): AuthenticatorResponse
-    {
-        array_key_exists('clientDataJSON', $response) || throw InvalidDataException::create(
-            $response,
-            'Invalid data. The parameter "clientDataJSON" is missing'
-        );
-        is_string($response['clientDataJSON']) || throw InvalidDataException::create(
-            $response,
-            'Invalid data. The parameter "clientDataJSON" is invalid'
-        );
-        $userHandle = $response['userHandle'] ?? null;
-        $userHandle === null || is_string($userHandle) || throw InvalidDataException::create(
-            $response,
-            'Invalid data. The parameter "userHandle" is invalid'
-        );
-        /** @var string[] $transports */
-        $transports = $response['transports'] ?? [];
-        is_array($transports) || throw InvalidDataException::create(
-            $response,
-            'Invalid data. The parameter "transports" is invalid'
-        );
-        if ($this->serializer !== null) {
-            return $this->serializer->deserialize($response, AuthenticatorResponse::class, 'json');
-        }
-        switch (true) {
-            case array_key_exists('attestationObject', $response):
-                $attestationObject = $this->attestationObjectLoader->load($response['attestationObject']);
-
-                return AuthenticatorAttestationResponse::create(CollectedClientData::createFormJson(
-                    $response['clientDataJSON']
-                ), $attestationObject, $transports);
-            case array_key_exists('signature', $response):
-                $authDataLoader = AuthenticatorDataLoader::create();
-                $authData = Base64UrlSafe::decodeNoPadding($response['authenticatorData'] ?? '');
-                $authenticatorData = $authDataLoader->load($authData);
-
-                try {
-                    $signature = Base64::decode($response['signature']);
-                } catch (Throwable $e) {
-                    throw InvalidDataException::create(
-                        $response['signature'],
-                        'The signature shall be Base64 Url Safe encoded',
-                        $e
-                    );
-                }
-                $userHandle = $response['userHandle'] ?? null;
-                if ($userHandle !== '' && $userHandle !== null) {
-                    $userHandle = Base64::decode($userHandle);
-                }
-
-                return AuthenticatorAssertionResponse::create(
-                    CollectedClientData::createFormJson($response['clientDataJSON']),
-                    $authenticatorData,
-                    $signature,
-                    $userHandle
-                );
-            default:
-                throw InvalidDataException::create($response, 'Unable to create the response object');
-        }
-    }
-}
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php b/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php
index 8e5ffbe42..6d054b426 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialOptions.php
@@ -5,119 +5,29 @@
 namespace Webauthn;
 
 use InvalidArgumentException;
-use JsonSerializable;
-use Webauthn\AuthenticationExtensions\AuthenticationExtension;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 
-abstract class PublicKeyCredentialOptions implements JsonSerializable
+abstract class PublicKeyCredentialOptions
 {
     public AuthenticationExtensions $extensions;
 
     /**
      * @param positive-int|null $timeout
-     * @param null|AuthenticationExtensions|array<string|int, mixed|AuthenticationExtensions> $extensions
+     * @param null|AuthenticationExtensions|array<array-key, AuthenticationExtensions> $extensions
      * @protected
      */
     public function __construct(
-        public readonly string $challenge,
+        public string $challenge,
         public null|int $timeout = null,
         null|array|AuthenticationExtensions $extensions = null,
     ) {
         ($this->timeout === null || $this->timeout > 0) || throw new InvalidArgumentException('Invalid timeout');
         if ($extensions === null) {
-            $this->extensions = AuthenticationExtensionsClientInputs::create();
+            $this->extensions = AuthenticationExtensions::create();
         } elseif ($extensions instanceof AuthenticationExtensions) {
             $this->extensions = $extensions;
         } else {
             $this->extensions = AuthenticationExtensions::create($extensions);
         }
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setTimeout(?int $timeout): static
-    {
-        $this->timeout = $timeout;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function addExtension(AuthenticationExtension $extension): static
-    {
-        $this->extensions[$extension->name] = $extension;
-
-        return $this;
-    }
-
-    /**
-     * @param AuthenticationExtension[] $extensions
-     * @deprecated since 4.7.0. No replacement. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function addExtensions(array $extensions): static
-    {
-        foreach ($extensions as $extension) {
-            $this->extensions[$extension->name] = $extension;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the {self::create} instead.
-     * @infection-ignore-all
-     */
-    public function setExtensions(AuthenticationExtensions $extensions): static
-    {
-        $this->extensions = $extensions;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getChallenge(): string
-    {
-        return $this->challenge;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTimeout(): ?int
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getExtensions(): AuthenticationExtensions
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    abstract public static function createFromString(string $data): static;
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    abstract public static function createFromArray(array $json): static;
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php b/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php
index 7ea3cea8f..7959951b2 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialParameters.php
@@ -4,19 +4,11 @@
 
 namespace Webauthn;
 
-use JsonSerializable;
-use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-use const JSON_THROW_ON_ERROR;
-
-class PublicKeyCredentialParameters implements JsonSerializable
+readonly class PublicKeyCredentialParameters
 {
-    /**
-     * @private
-     */
     public function __construct(
-        public readonly string $type,
-        public readonly int $alg
+        public string $type,
+        public int $alg
     ) {
     }
 
@@ -29,69 +21,4 @@ public static function createPk(int $alg): self
     {
         return self::create(PublicKeyCredentialDescriptor::CREDENTIAL_TYPE_PUBLIC_KEY, $alg);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAlg(): int
-    {
-        return $this->alg;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): self
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): self
-    {
-        array_key_exists('type', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "type" is missing.'
-        );
-        array_key_exists('alg', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "alg" is missing.'
-        );
-
-        return self::create($json['type'], $json['alg']);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'type' => $this->type,
-            'alg' => $this->alg,
-        ];
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php b/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php
index 46b6777d5..769599f00 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialRequestOptions.php
@@ -4,15 +4,9 @@
 
 namespace Webauthn;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensions;
-use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\Exception\InvalidDataException;
-use Webauthn\Util\Base64;
-use function array_key_exists;
-use function count;
 use function in_array;
-use const JSON_THROW_ON_ERROR;
 
 final class PublicKeyCredentialRequestOptions extends PublicKeyCredentialOptions
 {
@@ -32,9 +26,8 @@ final class PublicKeyCredentialRequestOptions extends PublicKeyCredentialOptions
     ];
 
     /**
-     * @private
      * @param PublicKeyCredentialDescriptor[] $allowCredentials
-     * @param null|AuthenticationExtensions|array<string|int, mixed|AuthenticationExtensions> $extensions
+     * @param null|AuthenticationExtensions|array<array-key, mixed|AuthenticationExtensions> $extensions
      */
     public function __construct(
         string $challenge,
@@ -58,7 +51,7 @@ public function __construct(
     /**
      * @param PublicKeyCredentialDescriptor[] $allowCredentials
      * @param positive-int $timeout
-     * @param null|AuthenticationExtensions|array<string|int, mixed|AuthenticationExtensions> $extensions
+     * @param null|AuthenticationExtensions|array<array-key, AuthenticationExtensions> $extensions
      */
     public static function create(
         string $challenge,
@@ -70,170 +63,4 @@ public static function create(
     ): self {
         return new self($challenge, $rpId, $allowCredentials, $userVerification, $timeout, $extensions);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setRpId(?string $rpId): self
-    {
-        $this->rpId = $rpId;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function allowCredential(PublicKeyCredentialDescriptor $allowCredential): self
-    {
-        $this->allowCredentials[] = $allowCredential;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. No replacement. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function allowCredentials(PublicKeyCredentialDescriptor ...$allowCredentials): self
-    {
-        foreach ($allowCredentials as $allowCredential) {
-            $this->allowCredentials[] = $allowCredential;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setUserVerification(?string $userVerification): self
-    {
-        if ($userVerification === null) {
-            $this->rpId = null;
-
-            return $this;
-        }
-        in_array($userVerification, [
-            self::USER_VERIFICATION_REQUIREMENT_REQUIRED,
-            self::USER_VERIFICATION_REQUIREMENT_PREFERRED,
-            self::USER_VERIFICATION_REQUIREMENT_DISCOURAGED,
-        ], true) || throw InvalidDataException::create($userVerification, 'Invalid user verification requirement');
-        $this->userVerification = $userVerification;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getRpId(): ?string
-    {
-        return $this->rpId;
-    }
-
-    /**
-     * @return PublicKeyCredentialDescriptor[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAllowCredentials(): array
-    {
-        return $this->allowCredentials;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserVerification(): ?string
-    {
-        return $this->userVerification;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): static
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): static
-    {
-        array_key_exists('challenge', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "challenge" is missing.'
-        );
-
-        $allowCredentials = [];
-        $allowCredentialList = $json['allowCredentials'] ?? [];
-        foreach ($allowCredentialList as $allowCredential) {
-            $allowCredentials[] = PublicKeyCredentialDescriptor::createFromArray($allowCredential);
-        }
-
-        $challenge = Base64::decode($json['challenge']);
-        $extensions = isset($json['extensions']) ? AuthenticationExtensionsClientInputs::createFromArray(
-            $json['extensions']
-        ) : AuthenticationExtensionsClientInputs::create();
-
-        return self::create(
-            $challenge,
-            $json['rpId'] ?? null,
-            $allowCredentials,
-            $json['userVerification'] ?? null,
-            $json['timeout'] ?? null,
-            $extensions
-        );
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = [
-            'challenge' => Base64UrlSafe::encodeUnpadded($this->challenge),
-        ];
-
-        if ($this->rpId !== null) {
-            $json['rpId'] = $this->rpId;
-        }
-
-        if ($this->userVerification !== null) {
-            $json['userVerification'] = $this->userVerification;
-        }
-
-        if (count($this->allowCredentials) !== 0) {
-            $json['allowCredentials'] = $this->allowCredentials;
-        }
-
-        if ($this->extensions->count() !== 0) {
-            $json['extensions'] = $this->extensions;
-        }
-
-        if ($this->timeout !== null) {
-            $json['timeout'] = $this->timeout;
-        }
-
-        return $json;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php b/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php
index 670daefae..da79df63b 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialRpEntity.php
@@ -4,9 +4,6 @@
 
 namespace Webauthn;
 
-use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-
 class PublicKeyCredentialRpEntity extends PublicKeyCredentialEntity
 {
     public function __construct(
@@ -21,47 +18,4 @@ public static function create(string $name, ?string $id = null, ?string $icon =
     {
         return new self($name, $id, $icon);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getId(): ?string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): self
-    {
-        array_key_exists('name', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "name" is missing.'
-        );
-
-        return self::create($json['name'], $json['id'] ?? null, $json['icon'] ?? null);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = parent::jsonSerialize();
-        if ($this->id !== null) {
-            $json['id'] = $this->id;
-        }
-
-        return $json;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php b/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php
index 2aef84ef0..bbf6a107b 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialSource.php
@@ -4,23 +4,15 @@
 
 namespace Webauthn;
 
-use JsonSerializable;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Symfony\Component\Uid\Uuid;
-use Throwable;
-use Webauthn\Exception\InvalidDataException;
 use Webauthn\TrustPath\TrustPath;
-use Webauthn\TrustPath\TrustPathLoader;
-use function array_key_exists;
-use function in_array;
 
 /**
  * @see https://www.w3.org/TR/webauthn/#iface-pkcredential
  */
-class PublicKeyCredentialSource implements JsonSerializable
+class PublicKeyCredentialSource
 {
     /**
-     * @private
      * @param string[] $transports
      * @param array<string, mixed>|null $otherUI
      */
@@ -77,199 +69,13 @@ public static function create(
         );
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getPublicKeyCredentialId(): string
-    {
-        return $this->publicKeyCredentialId;
-    }
-
     public function getPublicKeyCredentialDescriptor(): PublicKeyCredentialDescriptor
     {
         return PublicKeyCredentialDescriptor::create($this->type, $this->publicKeyCredentialId, $this->transports);
     }
 
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAttestationType(): string
-    {
-        return $this->attestationType;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTrustPath(): TrustPath
-    {
-        return $this->trustPath;
-    }
-
     public function getAttestedCredentialData(): AttestedCredentialData
     {
         return AttestedCredentialData::create($this->aaguid, $this->publicKeyCredentialId, $this->credentialPublicKey);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getTransports(): array
-    {
-        return $this->transports;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getAaguid(): Uuid
-    {
-        return $this->aaguid;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCredentialPublicKey(): string
-    {
-        return $this->credentialPublicKey;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getUserHandle(): string
-    {
-        return $this->userHandle;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCounter(): int
-    {
-        return $this->counter;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setCounter(int $counter): void
-    {
-        $this->counter = $counter;
-    }
-
-    /**
-     * @return array<string, mixed>|null
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getOtherUI(): ?array
-    {
-        return $this->otherUI;
-    }
-
-    /**
-     * @param array<string, mixed>|null $otherUI
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function setOtherUI(?array $otherUI): self
-    {
-        $this->otherUI = $otherUI;
-
-        return $this;
-    }
-
-    /**
-     * @param mixed[] $data
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): self
-    {
-        $keys = array_keys(get_class_vars(self::class));
-        foreach ($keys as $key) {
-            if (in_array($key, ['otherUI', 'backupEligible', 'backupStatus', 'uvInitialized'], true)) {
-                continue;
-            }
-            array_key_exists($key, $data) || throw InvalidDataException::create($data, sprintf(
-                'The parameter "%s" is missing',
-                $key
-            ));
-        }
-        mb_strlen((string) $data['aaguid'], '8bit') === 36 || throw InvalidDataException::create(
-            $data,
-            'Invalid AAGUID'
-        );
-        $uuid = Uuid::fromString($data['aaguid']);
-
-        try {
-            return self::create(
-                Base64UrlSafe::decodeNoPadding($data['publicKeyCredentialId']),
-                $data['type'],
-                $data['transports'],
-                $data['attestationType'],
-                TrustPathLoader::loadTrustPath($data['trustPath']),
-                $uuid,
-                Base64UrlSafe::decodeNoPadding($data['credentialPublicKey']),
-                Base64UrlSafe::decodeNoPadding($data['userHandle']),
-                $data['counter'],
-                $data['otherUI'] ?? null,
-                $data['backupEligible'] ?? null,
-                $data['backupStatus'] ?? null,
-            );
-        } catch (Throwable $throwable) {
-            throw InvalidDataException::create($data, 'Unable to load the data', $throwable);
-        }
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $result = [
-            'publicKeyCredentialId' => Base64UrlSafe::encodeUnpadded($this->publicKeyCredentialId),
-            'type' => $this->type,
-            'transports' => $this->transports,
-            'attestationType' => $this->attestationType,
-            'trustPath' => $this->trustPath,
-            'aaguid' => $this->aaguid->__toString(),
-            'credentialPublicKey' => Base64UrlSafe::encodeUnpadded($this->credentialPublicKey),
-            'userHandle' => Base64UrlSafe::encodeUnpadded($this->userHandle),
-            'counter' => $this->counter,
-            'otherUI' => $this->otherUI,
-            'backupEligible' => $this->backupEligible,
-            'backupStatus' => $this->backupStatus,
-            'uvInitialized' => $this->uvInitialized,
-        ];
-
-        return array_filter($result, static fn ($value): bool => $value !== null);
-    }
 }
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialSourceRepository.php b/web-auth/webauthn-lib/src/PublicKeyCredentialSourceRepository.php
deleted file mode 100644
index 5174a4181..000000000
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialSourceRepository.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn;
-
-/**
- * @deprecated
- * @infection-ignore-all
- */
-interface PublicKeyCredentialSourceRepository
-{
-    public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource;
-
-    /**
-     * @return PublicKeyCredentialSource[]
-     */
-    public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array;
-
-    public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource): void;
-}
diff --git a/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php b/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php
index 43cdca2eb..2b9e37e7c 100644
--- a/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php
+++ b/web-auth/webauthn-lib/src/PublicKeyCredentialUserEntity.php
@@ -4,12 +4,8 @@
 
 namespace Webauthn;
 
-use ParagonIE\ConstantTime\Base64;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-use function is_array;
-use const JSON_THROW_ON_ERROR;
+use function strlen;
 
 class PublicKeyCredentialUserEntity extends PublicKeyCredentialEntity
 {
@@ -22,7 +18,7 @@ public function __construct(
         ?string $icon = null
     ) {
         parent::__construct($name, $icon);
-        mb_strlen($id, '8bit') <= 64 || throw InvalidDataException::create($id, 'User ID max length is 64 bytes');
+        strlen($id) <= 64 || throw InvalidDataException::create($id, 'User ID max length is 64 bytes');
         $this->id = $id;
     }
 
@@ -30,73 +26,4 @@ public static function create(string $name, string $id, string $displayName, ?st
     {
         return new self($name, $id, $displayName, $icon);
     }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getDisplayName(): string
-    {
-        return $this->displayName;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromString(string $data): self
-    {
-        $data = json_decode($data, true, flags: JSON_THROW_ON_ERROR);
-        is_array($data) || throw InvalidDataException::create($data, 'Invalid data');
-
-        return self::createFromArray($data);
-    }
-
-    /**
-     * @param mixed[] $json
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $json): self
-    {
-        array_key_exists('name', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "name" is missing.'
-        );
-        array_key_exists('id', $json) || throw InvalidDataException::create($json, 'Invalid input. "id" is missing.');
-        array_key_exists('displayName', $json) || throw InvalidDataException::create(
-            $json,
-            'Invalid input. "displayName" is missing.'
-        );
-        $id = Base64::decode($json['id'], true);
-
-        return self::create($json['name'], $id, $json['displayName'], $json['icon'] ?? null);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        $json = parent::jsonSerialize();
-        $json['id'] = Base64UrlSafe::encodeUnpadded($this->id);
-        $json['displayName'] = $this->displayName;
-
-        return $json;
-    }
 }
diff --git a/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php b/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php
index a0c4fb90d..fed86ddd9 100644
--- a/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php
+++ b/web-auth/webauthn-lib/src/SimpleFakeCredentialGenerator.php
@@ -9,10 +9,10 @@
 use function count;
 use function is_int;
 
-final class SimpleFakeCredentialGenerator implements FakeCredentialGenerator
+final readonly class SimpleFakeCredentialGenerator implements FakeCredentialGenerator
 {
     public function __construct(
-        private readonly null|CacheItemPoolInterface $cache = null
+        private null|CacheItemPoolInterface $cache = null
     ) {
     }
 
diff --git a/web-auth/webauthn-lib/src/StringStream.php b/web-auth/webauthn-lib/src/StringStream.php
index 06784e7c8..bb2010810 100644
--- a/web-auth/webauthn-lib/src/StringStream.php
+++ b/web-auth/webauthn-lib/src/StringStream.php
@@ -6,11 +6,14 @@
 
 use CBOR\Stream;
 use Webauthn\Exception\InvalidDataException;
+use function assert;
 use function fclose;
 use function fopen;
 use function fread;
 use function fwrite;
 use function rewind;
+use function sprintf;
+use function strlen;
 
 final class StringStream implements Stream
 {
@@ -25,8 +28,9 @@ final class StringStream implements Stream
 
     public function __construct(string $data)
     {
-        $this->length = mb_strlen($data, '8bit');
+        $this->length = strlen($data);
         $resource = fopen('php://memory', 'rb+');
+        assert($resource !== false, 'The resource could not be opened.');
         fwrite($resource, $data);
         rewind($resource);
         $this->data = $resource;
@@ -38,8 +42,9 @@ public function read(int $length): string
             return '';
         }
         $read = fread($this->data, $length);
-        $bytesRead = mb_strlen($read, '8bit');
-        mb_strlen($read, '8bit') === $length || throw InvalidDataException::create(null, sprintf(
+        assert($read !== false, 'The data could not be read.');
+        $bytesRead = strlen($read);
+        strlen($read) === $length || throw InvalidDataException::create(null, sprintf(
             'Out of range. Expected: %d, read: %d.',
             $length,
             $bytesRead
diff --git a/web-auth/webauthn-lib/src/TokenBinding/IgnoreTokenBindingHandler.php b/web-auth/webauthn-lib/src/TokenBinding/IgnoreTokenBindingHandler.php
deleted file mode 100644
index 037fd8c7a..000000000
--- a/web-auth/webauthn-lib/src/TokenBinding/IgnoreTokenBindingHandler.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TokenBinding;
-
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @deprecated Since 4.3.0 and will be removed in 5.0.0
- * @infection-ignore-all
- */
-final class IgnoreTokenBindingHandler implements TokenBindingHandler
-{
-    public static function create(): self
-    {
-        return new self();
-    }
-
-    public function check(TokenBinding $tokenBinding, ServerRequestInterface $request): void
-    {
-        //Does nothing
-    }
-}
diff --git a/web-auth/webauthn-lib/src/TokenBinding/SecTokenBindingHandler.php b/web-auth/webauthn-lib/src/TokenBinding/SecTokenBindingHandler.php
deleted file mode 100644
index 54b6edc95..000000000
--- a/web-auth/webauthn-lib/src/TokenBinding/SecTokenBindingHandler.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TokenBinding;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Webauthn\Exception\InvalidDataException;
-use function count;
-
-/**
- * @deprecated Since 4.3.0 and will be removed in 5.0.0
- * @infection-ignore-all
- */
-final class SecTokenBindingHandler implements TokenBindingHandler
-{
-    public static function create(): self
-    {
-        return new self();
-    }
-
-    public function check(TokenBinding $tokenBinding, ServerRequestInterface $request): void
-    {
-        if ($tokenBinding->getStatus() !== TokenBinding::TOKEN_BINDING_STATUS_PRESENT) {
-            return;
-        }
-
-        $request->hasHeader('Sec-Token-Binding') || throw InvalidDataException::create(
-            $tokenBinding,
-            'The header parameter "Sec-Token-Binding" is missing.'
-        );
-        $tokenBindingIds = $request->getHeader('Sec-Token-Binding');
-        count($tokenBindingIds) === 1 || throw InvalidDataException::create(
-            $tokenBinding,
-            'The header parameter "Sec-Token-Binding" is invalid.'
-        );
-        $tokenBindingId = reset($tokenBindingIds);
-        $tokenBindingId === $tokenBinding->getId() || throw InvalidDataException::create(
-            $tokenBinding,
-            'The header parameter "Sec-Token-Binding" is invalid.'
-        );
-    }
-}
diff --git a/web-auth/webauthn-lib/src/TokenBinding/TokenBinding.php b/web-auth/webauthn-lib/src/TokenBinding/TokenBinding.php
deleted file mode 100644
index cffc6ded5..000000000
--- a/web-auth/webauthn-lib/src/TokenBinding/TokenBinding.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TokenBinding;
-
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use Webauthn\Exception\InvalidDataException;
-use function array_key_exists;
-use function in_array;
-
-/**
- * @deprecated Since 4.3.0 and will be removed in 5.0.0
- * @infection-ignore-all
- */
-class TokenBinding
-{
-    final public const TOKEN_BINDING_STATUS_PRESENT = 'present';
-
-    final public const TOKEN_BINDING_STATUS_SUPPORTED = 'supported';
-
-    final public const TOKEN_BINDING_STATUS_NOT_SUPPORTED = 'not-supported';
-
-    private readonly string $status;
-
-    private readonly ?string $id;
-
-    public function __construct(string $status, ?string $id)
-    {
-        $status === self::TOKEN_BINDING_STATUS_PRESENT && $id === null && throw InvalidDataException::create(
-            [$status, $id],
-            'The member "id" is required when status is "present"'
-        );
-        $this->status = $status;
-        $this->id = $id;
-    }
-
-    /**
-     * @param mixed[] $json
-     */
-    public static function createFormArray(array $json): self
-    {
-        array_key_exists('status', $json) || throw InvalidDataException::create(
-            $json,
-            'The member "status" is required'
-        );
-        $status = $json['status'];
-        in_array($status, self::getSupportedStatus(), true) || throw InvalidDataException::create($json, sprintf(
-            'The member "status" is invalid. Supported values are: %s',
-            implode(', ', self::getSupportedStatus())
-        ));
-        $id = array_key_exists('id', $json) ? Base64UrlSafe::decodeNoPadding($json['id']) : null;
-
-        return new self($status, $id);
-    }
-
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-    public function getId(): ?string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return string[]
-     */
-    private static function getSupportedStatus(): array
-    {
-        return [
-            self::TOKEN_BINDING_STATUS_PRESENT,
-            self::TOKEN_BINDING_STATUS_SUPPORTED,
-            self::TOKEN_BINDING_STATUS_NOT_SUPPORTED,
-        ];
-    }
-}
diff --git a/web-auth/webauthn-lib/src/TokenBinding/TokenBindingHandler.php b/web-auth/webauthn-lib/src/TokenBinding/TokenBindingHandler.php
deleted file mode 100644
index 8c907fdff..000000000
--- a/web-auth/webauthn-lib/src/TokenBinding/TokenBindingHandler.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TokenBinding;
-
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @deprecated Since 4.3.0 and will be removed in 5.0.0
- * @infection-ignore-all
- */
-interface TokenBindingHandler
-{
-    public function check(TokenBinding $tokenBinding, ServerRequestInterface $request): void;
-}
diff --git a/web-auth/webauthn-lib/src/TokenBinding/TokenBindingNotSupportedHandler.php b/web-auth/webauthn-lib/src/TokenBinding/TokenBindingNotSupportedHandler.php
deleted file mode 100644
index b2a2c2c11..000000000
--- a/web-auth/webauthn-lib/src/TokenBinding/TokenBindingNotSupportedHandler.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TokenBinding;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Webauthn\Exception\InvalidDataException;
-
-/**
- * @deprecated Since 4.3.0 and will be removed in 5.0.0
- * @infection-ignore-all
- */
-final class TokenBindingNotSupportedHandler implements TokenBindingHandler
-{
-    public static function create(): self
-    {
-        return new self();
-    }
-
-    public function check(TokenBinding $tokenBinding, ServerRequestInterface $request): void
-    {
-        $tokenBinding->getStatus() !== TokenBinding::TOKEN_BINDING_STATUS_PRESENT || throw InvalidDataException::create(
-            $tokenBinding,
-            'Token binding not supported.'
-        );
-    }
-}
diff --git a/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php b/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php
index 31d250c2e..456f8369d 100644
--- a/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php
+++ b/web-auth/webauthn-lib/src/TrustPath/CertificateTrustPath.php
@@ -4,17 +4,13 @@
 
 namespace Webauthn\TrustPath;
 
-use Webauthn\Exception\InvalidTrustPathException;
-use function array_key_exists;
-use function is_array;
-
-final class CertificateTrustPath implements TrustPath
+final readonly class CertificateTrustPath implements TrustPath
 {
     /**
      * @param string[] $certificates
      */
     public function __construct(
-        public readonly array $certificates
+        public array $certificates
     ) {
     }
 
@@ -25,46 +21,4 @@ public static function create(array $certificates): self
     {
         return new self($certificates);
     }
-
-    /**
-     * @return string[]
-     * @deprecated since 4.7.0. Please use the property directly.
-     * @infection-ignore-all
-     */
-    public function getCertificates(): array
-    {
-        return $this->certificates;
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): static
-    {
-        array_key_exists('x5c', $data) || throw InvalidTrustPathException::create('The trust path type is invalid');
-        $x5c = $data['x5c'];
-        is_array($x5c) || throw InvalidTrustPathException::create(
-            'The trust path type is invalid. The parameter "x5c" shall contain strings.'
-        );
-
-        return self::create($x5c);
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'type' => self::class,
-            'x5c' => $this->certificates,
-        ];
-    }
 }
diff --git a/web-auth/webauthn-lib/src/TrustPath/EcdaaKeyIdTrustPath.php b/web-auth/webauthn-lib/src/TrustPath/EcdaaKeyIdTrustPath.php
deleted file mode 100644
index d0aa7ffa1..000000000
--- a/web-auth/webauthn-lib/src/TrustPath/EcdaaKeyIdTrustPath.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TrustPath;
-
-use Webauthn\Exception\InvalidTrustPathException;
-use function array_key_exists;
-
-/**
- * @deprecated since 4.2.0 and will be removed in 5.0.0. The ECDAA Trust Anchor does no longer exist in Webauthn specification.
- * @infection-ignore-all
- */
-final class EcdaaKeyIdTrustPath implements TrustPath
-{
-    public function __construct(
-        private readonly string $ecdaaKeyId
-    ) {
-    }
-
-    public function getEcdaaKeyId(): string
-    {
-        return $this->ecdaaKeyId;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function jsonSerialize(): array
-    {
-        return [
-            'type' => self::class,
-            'ecdaaKeyId' => $this->ecdaaKeyId,
-        ];
-    }
-
-    public static function createFromArray(array $data): static
-    {
-        array_key_exists('ecdaaKeyId', $data) || throw InvalidTrustPathException::create(
-            'The trust path type is invalid'
-        );
-
-        return new self($data['ecdaaKeyId']);
-    }
-}
diff --git a/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php b/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php
index e1acb0aba..11f28dd48 100644
--- a/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php
+++ b/web-auth/webauthn-lib/src/TrustPath/EmptyTrustPath.php
@@ -4,35 +4,10 @@
 
 namespace Webauthn\TrustPath;
 
-final class EmptyTrustPath implements TrustPath
+final readonly class EmptyTrustPath implements TrustPath
 {
     public static function create(): self
     {
         return new self();
     }
-
-    /**
-     * @return string[]
-     */
-    public function jsonSerialize(): array
-    {
-        trigger_deprecation(
-            'web-auth/webauthn-bundle',
-            '4.9.0',
-            'The "%s" method is deprecated and will be removed in 5.0. Please use the serializer instead.',
-            __METHOD__
-        );
-        return [
-            'type' => self::class,
-        ];
-    }
-
-    /**
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): static
-    {
-        return self::create();
-    }
 }
diff --git a/web-auth/webauthn-lib/src/TrustPath/TrustPath.php b/web-auth/webauthn-lib/src/TrustPath/TrustPath.php
index f28097e0c..36e031782 100644
--- a/web-auth/webauthn-lib/src/TrustPath/TrustPath.php
+++ b/web-auth/webauthn-lib/src/TrustPath/TrustPath.php
@@ -4,14 +4,6 @@
 
 namespace Webauthn\TrustPath;
 
-use JsonSerializable;
-
-interface TrustPath extends JsonSerializable
+interface TrustPath
 {
-    /**
-     * @param array<string, mixed> $data
-     * @deprecated since 4.8.0. Please use {Webauthn\Denormalizer\WebauthnSerializerFactory} for converting the object.
-     * @infection-ignore-all
-     */
-    public static function createFromArray(array $data): static;
 }
diff --git a/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php b/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php
deleted file mode 100644
index 017f55252..000000000
--- a/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Webauthn\TrustPath;
-
-use Webauthn\Exception\InvalidTrustPathException;
-use function array_key_exists;
-use function is_array;
-use function is_string;
-
-/**
- * @deprecated since 4.9.0 and will be removed in 5.0.0. Use the serializer instead
- */
-final class TrustPathLoader
-{
-    /**
-     * @param mixed[] $data
-     */
-    public static function loadTrustPath(array $data): TrustPath
-    {
-        return match (true) {
-            $data === [] || $data === [
-                'type' => EmptyTrustPath::class,
-            ] => EmptyTrustPath::create(),
-            array_key_exists('x5c', $data) && is_array($data['x5c']) => CertificateTrustPath::create($data['x5c']),
-            array_key_exists('ecdaaKeyId', $data) && is_string($data['ecdaaKeyId']) => new EcdaaKeyIdTrustPath(
-                $data['ecdaaKeyId']
-            ),
-            default => throw InvalidTrustPathException::create('Unsupported trust path'),
-        };
-    }
-}
diff --git a/web-auth/webauthn-lib/src/U2FPublicKey.php b/web-auth/webauthn-lib/src/U2FPublicKey.php
index bbd85c2b8..45e6a5a35 100644
--- a/web-auth/webauthn-lib/src/U2FPublicKey.php
+++ b/web-auth/webauthn-lib/src/U2FPublicKey.php
@@ -11,11 +11,12 @@
 use CBOR\UnsignedIntegerObject;
 use Cose\Algorithms;
 use Cose\Key\Ec2Key;
+use function strlen;
 
 /**
  * @internal
  */
-final class U2FPublicKey
+final readonly class U2FPublicKey
 {
     private const U2F_KEY_PREFIX = "\x04";
 
@@ -25,7 +26,7 @@ final class U2FPublicKey
 
     public static function isU2FKey(string $publicKey): bool
     {
-        return $publicKey[0] === self::U2F_KEY_PREFIX && mb_strlen($publicKey, '8bit') === self::U2F_KEY_LENGTH;
+        return $publicKey[0] === self::U2F_KEY_PREFIX && strlen($publicKey) === self::U2F_KEY_LENGTH;
     }
 
     public static function convertToCoseKey(string $publicKey): string
@@ -45,11 +46,11 @@ public static function convertToCoseKey(string $publicKey): string
             ),
             MapItem::create(
                 NegativeIntegerObject::create(Ec2Key::DATA_X),
-                ByteStringObject::create(mb_substr($publicKey, 1, self::U2F_KEY_PART_SIZE, '8bit'))
+                ByteStringObject::create(substr($publicKey, 1, self::U2F_KEY_PART_SIZE))
             ),
             MapItem::create(
                 NegativeIntegerObject::create(Ec2Key::DATA_Y),
-                ByteStringObject::create(mb_substr($publicKey, 1 + self::U2F_KEY_PART_SIZE, null, '8bit'))
+                ByteStringObject::create(substr($publicKey, 1 + self::U2F_KEY_PART_SIZE))
             ),
         ])->__toString();
     }
diff --git a/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php b/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php
index e7ed1ebbd..21c3d2c7c 100644
--- a/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php
+++ b/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php
@@ -4,13 +4,13 @@
 
 namespace Webauthn\Util;
 
-use Cose\Algorithm\Signature\ECDSA;
 use Cose\Algorithm\Signature\ECDSA\ECSignature;
 use Cose\Algorithm\Signature\ECDSA\ES256;
 use Cose\Algorithm\Signature\ECDSA\ES256K;
 use Cose\Algorithm\Signature\ECDSA\ES384;
 use Cose\Algorithm\Signature\ECDSA\ES512;
 use Cose\Algorithm\Signature\Signature;
+use function strlen;
 
 /**
  * This class fixes the signature of the ECDSA based algorithms.
@@ -19,7 +19,7 @@
  *
  * @see https://www.w3.org/TR/webauthn/#signature-attestation-types
  */
-abstract class CoseSignatureFixer
+final readonly class CoseSignatureFixer
 {
     private const ES256_SIGNATURE_LENGTH = 64;
 
@@ -32,7 +32,7 @@ public static function fix(string $signature, Signature $algorithm): string
         switch ($algorithm::identifier()) {
             case ES256K::ID:
             case ES256::ID:
-                if (mb_strlen($signature, '8bit') === self::ES256_SIGNATURE_LENGTH) {
+                if (strlen($signature) === self::ES256_SIGNATURE_LENGTH) {
                     return $signature;
                 }
 
@@ -41,13 +41,13 @@ public static function fix(string $signature, Signature $algorithm): string
                     self::ES256_SIGNATURE_LENGTH
                 ); //TODO: fix this hardcoded value by adding a dedicated method for the algorithms
             case ES384::ID:
-                if (mb_strlen($signature, '8bit') === self::ES384_SIGNATURE_LENGTH) {
+                if (strlen($signature) === self::ES384_SIGNATURE_LENGTH) {
                     return $signature;
                 }
 
                 return ECSignature::fromAsn1($signature, self::ES384_SIGNATURE_LENGTH);
             case ES512::ID:
-                if (mb_strlen($signature, '8bit') === self::ES512_SIGNATURE_LENGTH) {
+                if (strlen($signature) === self::ES512_SIGNATURE_LENGTH) {
                     return $signature;
                 }
 
diff --git a/webmozart/assert/LICENSE b/webmozart/assert/LICENSE
new file mode 100644
index 000000000..9e2e3075e
--- /dev/null
+++ b/webmozart/assert/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Bernhard Schussek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/webmozart/assert/src/Assert.php b/webmozart/assert/src/Assert.php
new file mode 100644
index 000000000..5bf5cfa6e
--- /dev/null
+++ b/webmozart/assert/src/Assert.php
@@ -0,0 +1,2344 @@
+<?php
+
+/*
+ * This file is part of the webmozart/assert package.
+ *
+ * (c) Bernhard Schussek <bschussek@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Webmozart\Assert;
+
+use ArrayAccess;
+use BadMethodCallException;
+use Closure;
+use Countable;
+use DateTime;
+use DateTimeImmutable;
+use Exception;
+use ResourceBundle;
+use SimpleXMLElement;
+use Throwable;
+use Traversable;
+
+/**
+ * Efficient assertions to validate the input/output of your methods.
+ *
+ * @since  1.0
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class Assert
+{
+    use Mixin;
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert string $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function string($value, $message = '')
+    {
+        if (!\is_string($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a string. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert non-empty-string $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function stringNotEmpty($value, $message = '')
+    {
+        static::string($value, $message);
+        static::notEq($value, '', $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert int $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function integer($value, $message = '')
+    {
+        if (!\is_int($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an integer. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert numeric $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function integerish($value, $message = '')
+    {
+        if (!\is_numeric($value) || $value != (int) $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an integerish value. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert positive-int $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function positiveInteger($value, $message = '')
+    {
+        if (!(\is_int($value) && $value > 0)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a positive integer. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert float $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function float($value, $message = '')
+    {
+        if (!\is_float($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a float. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert numeric $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function numeric($value, $message = '')
+    {
+        if (!\is_numeric($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a numeric. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert positive-int|0 $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function natural($value, $message = '')
+    {
+        if (!\is_int($value) || $value < 0) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a non-negative integer. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert bool $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function boolean($value, $message = '')
+    {
+        if (!\is_bool($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a boolean. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert scalar $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function scalar($value, $message = '')
+    {
+        if (!\is_scalar($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a scalar. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert object $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function object($value, $message = '')
+    {
+        if (!\is_object($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an object. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert resource $value
+     *
+     * @param mixed       $value
+     * @param string|null $type    type of resource this should be. @see https://www.php.net/manual/en/function.get-resource-type.php
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function resource($value, $type = null, $message = '')
+    {
+        if (!\is_resource($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a resource. Got: %s',
+                static::typeToString($value),
+                $type // User supplied message might include the second placeholder.
+            ));
+        }
+
+        if ($type && $type !== \get_resource_type($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a resource of type %2$s. Got: %s',
+                static::typeToString($value),
+                $type
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert callable $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isCallable($value, $message = '')
+    {
+        if (!\is_callable($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a callable. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert array $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isArray($value, $message = '')
+    {
+        if (!\is_array($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable $value
+     *
+     * @deprecated use "isIterable" or "isInstanceOf" instead
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isTraversable($value, $message = '')
+    {
+        @\trigger_error(
+            \sprintf(
+                'The "%s" assertion is deprecated. You should stop using it, as it will soon be removed in 2.0 version. Use "isIterable" or "isInstanceOf" instead.',
+                __METHOD__
+            ),
+            \E_USER_DEPRECATED
+        );
+
+        if (!\is_array($value) && !($value instanceof Traversable)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a traversable. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert array|ArrayAccess $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isArrayAccessible($value, $message = '')
+    {
+        if (!\is_array($value) && !($value instanceof ArrayAccess)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array accessible. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert countable $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isCountable($value, $message = '')
+    {
+        if (
+            !\is_array($value)
+            && !($value instanceof Countable)
+            && !($value instanceof ResourceBundle)
+            && !($value instanceof SimpleXMLElement)
+        ) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a countable. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isIterable($value, $message = '')
+    {
+        if (!\is_array($value) && !($value instanceof Traversable)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an iterable. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     *
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @psalm-assert ExpectedType $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isInstanceOf($value, $class, $message = '')
+    {
+        if (!($value instanceof $class)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an instance of %2$s. Got: %s',
+                static::typeToString($value),
+                $class
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     *
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @psalm-assert !ExpectedType $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notInstanceOf($value, $class, $message = '')
+    {
+        if ($value instanceof $class) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an instance other than %2$s. Got: %s',
+                static::typeToString($value),
+                $class
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param mixed                $value
+     * @param array<object|string> $classes
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isInstanceOfAny($value, array $classes, $message = '')
+    {
+        foreach ($classes as $class) {
+            if ($value instanceof $class) {
+                return;
+            }
+        }
+
+        static::reportInvalidArgument(\sprintf(
+            $message ?: 'Expected an instance of any of %2$s. Got: %s',
+            static::typeToString($value),
+            \implode(', ', \array_map(array(static::class, 'valueToString'), $classes))
+        ));
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     *
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @psalm-assert ExpectedType|class-string<ExpectedType> $value
+     *
+     * @param object|string $value
+     * @param string        $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isAOf($value, $class, $message = '')
+    {
+        static::string($class, 'Expected class as a string. Got: %s');
+
+        if (!\is_a($value, $class, \is_string($value))) {
+            static::reportInvalidArgument(sprintf(
+                $message ?: 'Expected an instance of this class or to this class among its parents "%2$s". Got: %s',
+                static::valueToString($value),
+                $class
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template UnexpectedType of object
+     *
+     * @psalm-param class-string<UnexpectedType> $class
+     *
+     * @psalm-assert !UnexpectedType $value
+     * @psalm-assert !class-string<UnexpectedType> $value
+     *
+     * @param object|string $value
+     * @param string        $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isNotA($value, $class, $message = '')
+    {
+        static::string($class, 'Expected class as a string. Got: %s');
+
+        if (\is_a($value, $class, \is_string($value))) {
+            static::reportInvalidArgument(sprintf(
+                $message ?: 'Expected an instance of this class or to this class among its parents other than "%2$s". Got: %s',
+                static::valueToString($value),
+                $class
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param object|string $value
+     * @param string[]      $classes
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isAnyOf($value, array $classes, $message = '')
+    {
+        foreach ($classes as $class) {
+            static::string($class, 'Expected class as a string. Got: %s');
+
+            if (\is_a($value, $class, \is_string($value))) {
+                return;
+            }
+        }
+
+        static::reportInvalidArgument(sprintf(
+            $message ?: 'Expected an instance of any of this classes or any of those classes among their parents "%2$s". Got: %s',
+            static::valueToString($value),
+            \implode(', ', $classes)
+        ));
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert empty $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isEmpty($value, $message = '')
+    {
+        if (!empty($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an empty value. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert !empty $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notEmpty($value, $message = '')
+    {
+        if (empty($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a non-empty value. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function null($value, $message = '')
+    {
+        if (null !== $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected null. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert !null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notNull($value, $message = '')
+    {
+        if (null === $value) {
+            static::reportInvalidArgument(
+                $message ?: 'Expected a value other than null.'
+            );
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert true $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function true($value, $message = '')
+    {
+        if (true !== $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be true. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert false $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function false($value, $message = '')
+    {
+        if (false !== $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be false. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert !false $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notFalse($value, $message = '')
+    {
+        if (false === $value) {
+            static::reportInvalidArgument(
+                $message ?: 'Expected a value other than false.'
+            );
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function ip($value, $message = '')
+    {
+        if (false === \filter_var($value, \FILTER_VALIDATE_IP)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be an IP. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function ipv4($value, $message = '')
+    {
+        if (false === \filter_var($value, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be an IPv4. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function ipv6($value, $message = '')
+    {
+        if (false === \filter_var($value, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be an IPv6. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function email($value, $message = '')
+    {
+        if (false === \filter_var($value, FILTER_VALIDATE_EMAIL)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to be a valid e-mail address. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * Does non strict comparisons on the items, so ['3', 3] will not pass the assertion.
+     *
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function uniqueValues(array $values, $message = '')
+    {
+        $allValues = \count($values);
+        $uniqueValues = \count(\array_unique($values));
+
+        if ($allValues !== $uniqueValues) {
+            $difference = $allValues - $uniqueValues;
+
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array of unique values, but %s of them %s duplicated',
+                $difference,
+                1 === $difference ? 'is' : 'are'
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function eq($value, $expect, $message = '')
+    {
+        if ($expect != $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value equal to %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($expect)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notEq($value, $expect, $message = '')
+    {
+        if ($expect == $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a different value than %s.',
+                static::valueToString($expect)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function same($value, $expect, $message = '')
+    {
+        if ($expect !== $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value identical to %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($expect)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notSame($value, $expect, $message = '')
+    {
+        if ($expect === $value) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value not identical to %s.',
+                static::valueToString($expect)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function greaterThan($value, $limit, $message = '')
+    {
+        if ($value <= $limit) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value greater than %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($limit)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function greaterThanEq($value, $limit, $message = '')
+    {
+        if ($value < $limit) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value greater than or equal to %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($limit)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function lessThan($value, $limit, $message = '')
+    {
+        if ($value >= $limit) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value less than %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($limit)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function lessThanEq($value, $limit, $message = '')
+    {
+        if ($value > $limit) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value less than or equal to %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($limit)
+            ));
+        }
+    }
+
+    /**
+     * Inclusive range, so Assert::(3, 3, 5) passes.
+     *
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $min
+     * @param mixed  $max
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function range($value, $min, $max, $message = '')
+    {
+        if ($value < $min || $value > $max) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value between %2$s and %3$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($min),
+                static::valueToString($max)
+            ));
+        }
+    }
+
+    /**
+     * A more human-readable alias of Assert::inArray().
+     *
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function oneOf($value, array $values, $message = '')
+    {
+        static::inArray($value, $values, $message);
+    }
+
+    /**
+     * Does strict comparison, so Assert::inArray(3, ['3']) does not pass the assertion.
+     *
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function inArray($value, array $values, $message = '')
+    {
+        if (!\in_array($value, $values, true)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected one of: %2$s. Got: %s',
+                static::valueToString($value),
+                \implode(', ', \array_map(array(static::class, 'valueToString'), $values))
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $subString
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function contains($value, $subString, $message = '')
+    {
+        if (false === \strpos($value, $subString)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($subString)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $subString
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notContains($value, $subString, $message = '')
+    {
+        if (false !== \strpos($value, $subString)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: '%2$s was not expected to be contained in a value. Got: %s',
+                static::valueToString($value),
+                static::valueToString($subString)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notWhitespaceOnly($value, $message = '')
+    {
+        if (\preg_match('/^\s*$/', $value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a non-whitespace string. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $prefix
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function startsWith($value, $prefix, $message = '')
+    {
+        if (0 !== \strpos($value, $prefix)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to start with %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($prefix)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $prefix
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notStartsWith($value, $prefix, $message = '')
+    {
+        if (0 === \strpos($value, $prefix)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value not to start with %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($prefix)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function startsWithLetter($value, $message = '')
+    {
+        static::string($value);
+
+        $valid = isset($value[0]);
+
+        if ($valid) {
+            $locale = \setlocale(LC_CTYPE, 0);
+            \setlocale(LC_CTYPE, 'C');
+            $valid = \ctype_alpha($value[0]);
+            \setlocale(LC_CTYPE, $locale);
+        }
+
+        if (!$valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to start with a letter. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $suffix
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function endsWith($value, $suffix, $message = '')
+    {
+        if ($suffix !== \substr($value, -\strlen($suffix))) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to end with %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($suffix)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $suffix
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notEndsWith($value, $suffix, $message = '')
+    {
+        if ($suffix === \substr($value, -\strlen($suffix))) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value not to end with %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($suffix)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $pattern
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function regex($value, $pattern, $message = '')
+    {
+        if (!\preg_match($pattern, $value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The value %s does not match the expected pattern.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $pattern
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function notRegex($value, $pattern, $message = '')
+    {
+        if (\preg_match($pattern, $value, $matches, PREG_OFFSET_CAPTURE)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The value %s matches the pattern %s (at offset %d).',
+                static::valueToString($value),
+                static::valueToString($pattern),
+                $matches[0][1]
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function unicodeLetters($value, $message = '')
+    {
+        static::string($value);
+
+        if (!\preg_match('/^\p{L}+$/u', $value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain only Unicode letters. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function alpha($value, $message = '')
+    {
+        static::string($value);
+
+        $locale = \setlocale(LC_CTYPE, 0);
+        \setlocale(LC_CTYPE, 'C');
+        $valid = !\ctype_alpha($value);
+        \setlocale(LC_CTYPE, $locale);
+
+        if ($valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain only letters. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function digits($value, $message = '')
+    {
+        static::string($value);
+
+        $locale = \setlocale(LC_CTYPE, 0);
+        \setlocale(LC_CTYPE, 'C');
+        $valid = !\ctype_digit($value);
+        \setlocale(LC_CTYPE, $locale);
+
+        if ($valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain digits only. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function alnum($value, $message = '')
+    {
+        static::string($value);
+
+        $locale = \setlocale(LC_CTYPE, 0);
+        \setlocale(LC_CTYPE, 'C');
+        $valid = !\ctype_alnum($value);
+        \setlocale(LC_CTYPE, $locale);
+
+        if ($valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain letters and digits only. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert lowercase-string $value
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function lower($value, $message = '')
+    {
+        static::string($value);
+
+        $locale = \setlocale(LC_CTYPE, 0);
+        \setlocale(LC_CTYPE, 'C');
+        $valid = !\ctype_lower($value);
+        \setlocale(LC_CTYPE, $locale);
+
+        if ($valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain lowercase characters only. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert !lowercase-string $value
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function upper($value, $message = '')
+    {
+        static::string($value);
+
+        $locale = \setlocale(LC_CTYPE, 0);
+        \setlocale(LC_CTYPE, 'C');
+        $valid = !\ctype_upper($value);
+        \setlocale(LC_CTYPE, $locale);
+
+        if ($valid) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain uppercase characters only. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param int    $length
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function length($value, $length, $message = '')
+    {
+        if ($length !== static::strlen($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain %2$s characters. Got: %s',
+                static::valueToString($value),
+                $length
+            ));
+        }
+    }
+
+    /**
+     * Inclusive min.
+     *
+     * @psalm-pure
+     *
+     * @param string    $value
+     * @param int|float $min
+     * @param string    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function minLength($value, $min, $message = '')
+    {
+        if (static::strlen($value) < $min) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain at least %2$s characters. Got: %s',
+                static::valueToString($value),
+                $min
+            ));
+        }
+    }
+
+    /**
+     * Inclusive max.
+     *
+     * @psalm-pure
+     *
+     * @param string    $value
+     * @param int|float $max
+     * @param string    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function maxLength($value, $max, $message = '')
+    {
+        if (static::strlen($value) > $max) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain at most %2$s characters. Got: %s',
+                static::valueToString($value),
+                $max
+            ));
+        }
+    }
+
+    /**
+     * Inclusive , so Assert::lengthBetween('asd', 3, 5); passes the assertion.
+     *
+     * @psalm-pure
+     *
+     * @param string    $value
+     * @param int|float $min
+     * @param int|float $max
+     * @param string    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function lengthBetween($value, $min, $max, $message = '')
+    {
+        $length = static::strlen($value);
+
+        if ($length < $min || $length > $max) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a value to contain between %2$s and %3$s characters. Got: %s',
+                static::valueToString($value),
+                $min,
+                $max
+            ));
+        }
+    }
+
+    /**
+     * Will also pass if $value is a directory, use Assert::file() instead if you need to be sure it is a file.
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function fileExists($value, $message = '')
+    {
+        if (!\file_exists($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The path %s does not exist.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function file($value, $message = '')
+    {
+        if (!\is_file($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The path %s is not a file.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function directory($value, $message = '')
+    {
+        if (!\is_dir($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The path %s is not a directory.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function readable($value, $message = '')
+    {
+        if (!\is_readable($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The path %s is not readable.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function writable($value, $message = '')
+    {
+        if (!\is_writable($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'The path %s is not writable.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-assert class-string $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function classExists($value, $message = '')
+    {
+        if (!\class_exists($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an existing class name. Got: %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     *
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @psalm-assert class-string<ExpectedType>|ExpectedType $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function subclassOf($value, $class, $message = '')
+    {
+        if (!\is_subclass_of($value, $class)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected a sub-class of %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($class)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-assert class-string $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function interfaceExists($value, $message = '')
+    {
+        if (!\interface_exists($value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an existing interface name. got %s',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     *
+     * @psalm-param class-string<ExpectedType> $interface
+     *
+     * @psalm-assert class-string<ExpectedType>|ExpectedType $value
+     *
+     * @param mixed  $value
+     * @param mixed  $interface
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function implementsInterface($value, $interface, $message = '')
+    {
+        if (!\in_array($interface, \class_implements($value))) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an implementation of %2$s. Got: %s',
+                static::valueToString($value),
+                static::valueToString($interface)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object $classOrObject
+     *
+     * @param string|object $classOrObject
+     * @param mixed         $property
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function propertyExists($classOrObject, $property, $message = '')
+    {
+        if (!\property_exists($classOrObject, $property)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the property %s to exist.',
+                static::valueToString($property)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object $classOrObject
+     *
+     * @param string|object $classOrObject
+     * @param mixed         $property
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function propertyNotExists($classOrObject, $property, $message = '')
+    {
+        if (\property_exists($classOrObject, $property)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the property %s to not exist.',
+                static::valueToString($property)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object $classOrObject
+     *
+     * @param string|object $classOrObject
+     * @param mixed         $method
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function methodExists($classOrObject, $method, $message = '')
+    {
+        if (!(\is_string($classOrObject) || \is_object($classOrObject)) || !\method_exists($classOrObject, $method)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the method %s to exist.',
+                static::valueToString($method)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object $classOrObject
+     *
+     * @param string|object $classOrObject
+     * @param mixed         $method
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function methodNotExists($classOrObject, $method, $message = '')
+    {
+        if ((\is_string($classOrObject) || \is_object($classOrObject)) && \method_exists($classOrObject, $method)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the method %s to not exist.',
+                static::valueToString($method)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param array      $array
+     * @param string|int $key
+     * @param string     $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function keyExists($array, $key, $message = '')
+    {
+        if (!(isset($array[$key]) || \array_key_exists($key, $array))) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the key %s to exist.',
+                static::valueToString($key)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param array      $array
+     * @param string|int $key
+     * @param string     $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function keyNotExists($array, $key, $message = '')
+    {
+        if (isset($array[$key]) || \array_key_exists($key, $array)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected the key %s to not exist.',
+                static::valueToString($key)
+            ));
+        }
+    }
+
+    /**
+     * Checks if a value is a valid array key (int or string).
+     *
+     * @psalm-pure
+     *
+     * @psalm-assert array-key $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function validArrayKey($value, $message = '')
+    {
+        if (!(\is_int($value) || \is_string($value))) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected string or integer. Got: %s',
+                static::typeToString($value)
+            ));
+        }
+    }
+
+    /**
+     * Does not check if $array is countable, this can generate a warning on php versions after 7.2.
+     *
+     * @param Countable|array $array
+     * @param int             $number
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function count($array, $number, $message = '')
+    {
+        static::eq(
+            \count($array),
+            $number,
+            \sprintf(
+                $message ?: 'Expected an array to contain %d elements. Got: %d.',
+                $number,
+                \count($array)
+            )
+        );
+    }
+
+    /**
+     * Does not check if $array is countable, this can generate a warning on php versions after 7.2.
+     *
+     * @param Countable|array $array
+     * @param int|float       $min
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function minCount($array, $min, $message = '')
+    {
+        if (\count($array) < $min) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array to contain at least %2$d elements. Got: %d',
+                \count($array),
+                $min
+            ));
+        }
+    }
+
+    /**
+     * Does not check if $array is countable, this can generate a warning on php versions after 7.2.
+     *
+     * @param Countable|array $array
+     * @param int|float       $max
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function maxCount($array, $max, $message = '')
+    {
+        if (\count($array) > $max) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array to contain at most %2$d elements. Got: %d',
+                \count($array),
+                $max
+            ));
+        }
+    }
+
+    /**
+     * Does not check if $array is countable, this can generate a warning on php versions after 7.2.
+     *
+     * @param Countable|array $array
+     * @param int|float       $min
+     * @param int|float       $max
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function countBetween($array, $min, $max, $message = '')
+    {
+        $count = \count($array);
+
+        if ($count < $min || $count > $max) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Expected an array to contain between %2$d and %3$d elements. Got: %d',
+                $count,
+                $min,
+                $max
+            ));
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert list $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isList($array, $message = '')
+    {
+        if (!\is_array($array)) {
+            static::reportInvalidArgument(
+                $message ?: 'Expected list - non-associative array.'
+            );
+        }
+
+        if (\function_exists('array_is_list')) {
+            if (!\array_is_list($array)) {
+                static::reportInvalidArgument(
+                    $message ?: 'Expected list - non-associative array.'
+                );
+            }
+
+            return;
+        }
+
+        if (array() === $array) {
+            return;
+        }
+
+        $keys = array_keys($array);
+        if (array_keys($keys) !== $keys) {
+            static::reportInvalidArgument(
+                $message ?: 'Expected list - non-associative array.'
+            );
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert non-empty-list $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isNonEmptyList($array, $message = '')
+    {
+        static::isList($array, $message);
+        static::notEmpty($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     *
+     * @psalm-param mixed|array<T> $array
+     *
+     * @psalm-assert array<string, T> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isMap($array, $message = '')
+    {
+        if (
+            !\is_array($array)
+            || \array_keys($array) !== \array_filter(\array_keys($array), '\is_string')
+        ) {
+            static::reportInvalidArgument(
+                $message ?: 'Expected map - associative array with string keys.'
+            );
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     *
+     * @psalm-param mixed|array<T> $array
+     *
+     * @psalm-assert array<string, T> $array
+     * @psalm-assert !empty $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function isNonEmptyMap($array, $message = '')
+    {
+        static::isMap($array, $message);
+        static::notEmpty($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function uuid($value, $message = '')
+    {
+        $value = \str_replace(array('urn:', 'uuid:', '{', '}'), '', $value);
+
+        // The nil UUID is special form of UUID that is specified to have all
+        // 128 bits set to zero.
+        if ('00000000-0000-0000-0000-000000000000' === $value) {
+            return;
+        }
+
+        if (!\preg_match('/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/D', $value)) {
+            static::reportInvalidArgument(\sprintf(
+                $message ?: 'Value %s is not a valid UUID.',
+                static::valueToString($value)
+            ));
+        }
+    }
+
+    /**
+     * @psalm-param class-string<Throwable> $class
+     *
+     * @param Closure $expression
+     * @param string  $class
+     * @param string  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function throws(Closure $expression, $class = 'Exception', $message = '')
+    {
+        static::string($class);
+
+        $actual = 'none';
+
+        try {
+            $expression();
+        } catch (Exception $e) {
+            $actual = \get_class($e);
+            if ($e instanceof $class) {
+                return;
+            }
+        } catch (Throwable $e) {
+            $actual = \get_class($e);
+            if ($e instanceof $class) {
+                return;
+            }
+        }
+
+        static::reportInvalidArgument($message ?: \sprintf(
+            'Expected to throw "%s", got "%s"',
+            $class,
+            $actual
+        ));
+    }
+
+    /**
+     * @throws BadMethodCallException
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        if ('nullOr' === \substr($name, 0, 6)) {
+            if (null !== $arguments[0]) {
+                $method = \lcfirst(\substr($name, 6));
+                \call_user_func_array(array(static::class, $method), $arguments);
+            }
+
+            return;
+        }
+
+        if ('all' === \substr($name, 0, 3)) {
+            static::isIterable($arguments[0]);
+
+            $method = \lcfirst(\substr($name, 3));
+            $args = $arguments;
+
+            foreach ($arguments[0] as $entry) {
+                $args[0] = $entry;
+
+                \call_user_func_array(array(static::class, $method), $args);
+            }
+
+            return;
+        }
+
+        throw new BadMethodCallException('No such method: '.$name);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return string
+     */
+    protected static function valueToString($value)
+    {
+        if (null === $value) {
+            return 'null';
+        }
+
+        if (true === $value) {
+            return 'true';
+        }
+
+        if (false === $value) {
+            return 'false';
+        }
+
+        if (\is_array($value)) {
+            return 'array';
+        }
+
+        if (\is_object($value)) {
+            if (\method_exists($value, '__toString')) {
+                return \get_class($value).': '.self::valueToString($value->__toString());
+            }
+
+            if ($value instanceof DateTime || $value instanceof DateTimeImmutable) {
+                return \get_class($value).': '.self::valueToString($value->format('c'));
+            }
+
+            if (\function_exists('enum_exists') && \enum_exists(\get_class($value))) {
+                return \get_class($value).'::'.$value->name;
+            }
+
+            return \get_class($value);
+        }
+
+        if (\is_resource($value)) {
+            return 'resource';
+        }
+
+        if (\is_string($value)) {
+            return '"'.$value.'"';
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed $value
+     *
+     * @return string
+     */
+    protected static function typeToString($value)
+    {
+        return \is_object($value) ? \get_class($value) : \gettype($value);
+    }
+
+    protected static function strlen($value)
+    {
+        if (!\function_exists('mb_detect_encoding')) {
+            return \strlen($value);
+        }
+
+        if (false === $encoding = \mb_detect_encoding($value)) {
+            return \strlen($value);
+        }
+
+        return \mb_strlen($value, $encoding);
+    }
+
+    /**
+     * @param string $message
+     *
+     * @throws InvalidArgumentException
+     *
+     * @psalm-pure this method is not supposed to perform side-effects
+     *
+     * @psalm-return never
+     */
+    protected static function reportInvalidArgument($message)
+    {
+        throw new InvalidArgumentException($message);
+    }
+
+    private function __construct()
+    {
+    }
+}
diff --git a/webmozart/assert/src/InvalidArgumentException.php b/webmozart/assert/src/InvalidArgumentException.php
new file mode 100644
index 000000000..9d95a58c5
--- /dev/null
+++ b/webmozart/assert/src/InvalidArgumentException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the webmozart/assert package.
+ *
+ * (c) Bernhard Schussek <bschussek@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Webmozart\Assert;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/webmozart/assert/src/Mixin.php b/webmozart/assert/src/Mixin.php
new file mode 100644
index 000000000..fad0d4756
--- /dev/null
+++ b/webmozart/assert/src/Mixin.php
@@ -0,0 +1,5210 @@
+<?php
+
+namespace Webmozart\Assert;
+
+use ArrayAccess;
+use Closure;
+use Countable;
+use Throwable;
+
+/**
+ * This trait provides nullOr*, all* and allNullOr* variants of assertion base methods.
+ * Do not use this trait directly: it will change, and is not designed for reuse.
+ */
+trait Mixin
+{
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert string|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrString($value, $message = '')
+    {
+        null === $value || static::string($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<string> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allString($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::string($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<string|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrString($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::string($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert non-empty-string|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrStringNotEmpty($value, $message = '')
+    {
+        null === $value || static::stringNotEmpty($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<non-empty-string> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allStringNotEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::stringNotEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<non-empty-string|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrStringNotEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::stringNotEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert int|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrInteger($value, $message = '')
+    {
+        null === $value || static::integer($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<int> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allInteger($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::integer($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<int|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrInteger($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::integer($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert numeric|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIntegerish($value, $message = '')
+    {
+        null === $value || static::integerish($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<numeric> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIntegerish($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::integerish($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<numeric|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIntegerish($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::integerish($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert positive-int|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrPositiveInteger($value, $message = '')
+    {
+        null === $value || static::positiveInteger($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<positive-int> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allPositiveInteger($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::positiveInteger($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<positive-int|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrPositiveInteger($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::positiveInteger($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert float|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrFloat($value, $message = '')
+    {
+        null === $value || static::float($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<float> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allFloat($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::float($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<float|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrFloat($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::float($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert numeric|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNumeric($value, $message = '')
+    {
+        null === $value || static::numeric($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<numeric> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNumeric($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::numeric($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<numeric|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNumeric($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::numeric($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert positive-int|0|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNatural($value, $message = '')
+    {
+        null === $value || static::natural($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<positive-int|0> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNatural($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::natural($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<positive-int|0|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNatural($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::natural($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert bool|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrBoolean($value, $message = '')
+    {
+        null === $value || static::boolean($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<bool> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allBoolean($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::boolean($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<bool|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrBoolean($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::boolean($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert scalar|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrScalar($value, $message = '')
+    {
+        null === $value || static::scalar($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<scalar> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allScalar($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::scalar($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<scalar|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrScalar($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::scalar($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert object|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrObject($value, $message = '')
+    {
+        null === $value || static::object($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<object> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allObject($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::object($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<object|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrObject($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::object($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert resource|null $value
+     *
+     * @param mixed       $value
+     * @param string|null $type    type of resource this should be. @see https://www.php.net/manual/en/function.get-resource-type.php
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrResource($value, $type = null, $message = '')
+    {
+        null === $value || static::resource($value, $type, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<resource> $value
+     *
+     * @param mixed       $value
+     * @param string|null $type    type of resource this should be. @see https://www.php.net/manual/en/function.get-resource-type.php
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allResource($value, $type = null, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::resource($entry, $type, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<resource|null> $value
+     *
+     * @param mixed       $value
+     * @param string|null $type    type of resource this should be. @see https://www.php.net/manual/en/function.get-resource-type.php
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrResource($value, $type = null, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::resource($entry, $type, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert callable|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsCallable($value, $message = '')
+    {
+        null === $value || static::isCallable($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<callable> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsCallable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isCallable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<callable|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsCallable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isCallable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert array|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsArray($value, $message = '')
+    {
+        null === $value || static::isArray($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsArray($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isArray($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsArray($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isArray($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable|null $value
+     *
+     * @deprecated use "isIterable" or "isInstanceOf" instead
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsTraversable($value, $message = '')
+    {
+        null === $value || static::isTraversable($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<iterable> $value
+     *
+     * @deprecated use "isIterable" or "isInstanceOf" instead
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsTraversable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isTraversable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<iterable|null> $value
+     *
+     * @deprecated use "isIterable" or "isInstanceOf" instead
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsTraversable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isTraversable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert array|ArrayAccess|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsArrayAccessible($value, $message = '')
+    {
+        null === $value || static::isArrayAccessible($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array|ArrayAccess> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsArrayAccessible($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isArrayAccessible($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array|ArrayAccess|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsArrayAccessible($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isArrayAccessible($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert countable|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsCountable($value, $message = '')
+    {
+        null === $value || static::isCountable($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<countable> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsCountable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isCountable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<countable|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsCountable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isCountable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsIterable($value, $message = '')
+    {
+        null === $value || static::isIterable($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<iterable> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsIterable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isIterable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<iterable|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsIterable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isIterable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert ExpectedType|null $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsInstanceOf($value, $class, $message = '')
+    {
+        null === $value || static::isInstanceOf($value, $class, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<ExpectedType> $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsInstanceOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isInstanceOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<ExpectedType|null> $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsInstanceOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isInstanceOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotInstanceOf($value, $class, $message = '')
+    {
+        null === $value || static::notInstanceOf($value, $class, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotInstanceOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notInstanceOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<!ExpectedType|null> $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotInstanceOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notInstanceOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param mixed                $value
+     * @param array<object|string> $classes
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsInstanceOfAny($value, $classes, $message = '')
+    {
+        null === $value || static::isInstanceOfAny($value, $classes, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param mixed                $value
+     * @param array<object|string> $classes
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsInstanceOfAny($value, $classes, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isInstanceOfAny($entry, $classes, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param mixed                $value
+     * @param array<object|string> $classes
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsInstanceOfAny($value, $classes, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isInstanceOfAny($entry, $classes, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert ExpectedType|class-string<ExpectedType>|null $value
+     *
+     * @param object|string|null $value
+     * @param string             $class
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsAOf($value, $class, $message = '')
+    {
+        null === $value || static::isAOf($value, $class, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<ExpectedType|class-string<ExpectedType>> $value
+     *
+     * @param iterable<object|string> $value
+     * @param string                  $class
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsAOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isAOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<ExpectedType|class-string<ExpectedType>|null> $value
+     *
+     * @param iterable<object|string|null> $value
+     * @param string                       $class
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsAOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isAOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template UnexpectedType of object
+     * @psalm-param class-string<UnexpectedType> $class
+     *
+     * @param object|string|null $value
+     * @param string             $class
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsNotA($value, $class, $message = '')
+    {
+        null === $value || static::isNotA($value, $class, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template UnexpectedType of object
+     * @psalm-param class-string<UnexpectedType> $class
+     *
+     * @param iterable<object|string> $value
+     * @param string                  $class
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsNotA($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isNotA($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template UnexpectedType of object
+     * @psalm-param class-string<UnexpectedType> $class
+     * @psalm-assert iterable<!UnexpectedType|null> $value
+     * @psalm-assert iterable<!class-string<UnexpectedType>|null> $value
+     *
+     * @param iterable<object|string|null> $value
+     * @param string                       $class
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsNotA($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isNotA($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param object|string|null $value
+     * @param string[]           $classes
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsAnyOf($value, $classes, $message = '')
+    {
+        null === $value || static::isAnyOf($value, $classes, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param iterable<object|string> $value
+     * @param string[]                $classes
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsAnyOf($value, $classes, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isAnyOf($entry, $classes, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param array<class-string> $classes
+     *
+     * @param iterable<object|string|null> $value
+     * @param string[]                     $classes
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsAnyOf($value, $classes, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isAnyOf($entry, $classes, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert empty $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsEmpty($value, $message = '')
+    {
+        null === $value || static::isEmpty($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<empty> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::isEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<empty|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::isEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotEmpty($value, $message = '')
+    {
+        null === $value || static::notEmpty($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<!empty|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotEmpty($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notEmpty($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNull($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::null($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotNull($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notNull($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert true|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrTrue($value, $message = '')
+    {
+        null === $value || static::true($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<true> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allTrue($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::true($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<true|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrTrue($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::true($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert false|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrFalse($value, $message = '')
+    {
+        null === $value || static::false($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<false> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allFalse($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::false($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<false|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrFalse($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::false($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotFalse($value, $message = '')
+    {
+        null === $value || static::notFalse($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotFalse($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notFalse($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<!false|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotFalse($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notFalse($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIp($value, $message = '')
+    {
+        null === $value || static::ip($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIp($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::ip($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIp($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::ip($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIpv4($value, $message = '')
+    {
+        null === $value || static::ipv4($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIpv4($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::ipv4($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIpv4($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::ipv4($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIpv6($value, $message = '')
+    {
+        null === $value || static::ipv6($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIpv6($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::ipv6($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIpv6($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::ipv6($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrEmail($value, $message = '')
+    {
+        null === $value || static::email($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allEmail($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::email($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrEmail($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::email($entry, $message);
+        }
+    }
+
+    /**
+     * @param array|null $values
+     * @param string     $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrUniqueValues($values, $message = '')
+    {
+        null === $values || static::uniqueValues($values, $message);
+    }
+
+    /**
+     * @param iterable<array> $values
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allUniqueValues($values, $message = '')
+    {
+        static::isIterable($values);
+
+        foreach ($values as $entry) {
+            static::uniqueValues($entry, $message);
+        }
+    }
+
+    /**
+     * @param iterable<array|null> $values
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrUniqueValues($values, $message = '')
+    {
+        static::isIterable($values);
+
+        foreach ($values as $entry) {
+            null === $entry || static::uniqueValues($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrEq($value, $expect, $message = '')
+    {
+        null === $value || static::eq($value, $expect, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allEq($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::eq($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrEq($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::eq($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotEq($value, $expect, $message = '')
+    {
+        null === $value || static::notEq($value, $expect, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotEq($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notEq($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotEq($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notEq($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrSame($value, $expect, $message = '')
+    {
+        null === $value || static::same($value, $expect, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allSame($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::same($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrSame($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::same($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotSame($value, $expect, $message = '')
+    {
+        null === $value || static::notSame($value, $expect, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotSame($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notSame($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $expect
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotSame($value, $expect, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notSame($entry, $expect, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrGreaterThan($value, $limit, $message = '')
+    {
+        null === $value || static::greaterThan($value, $limit, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allGreaterThan($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::greaterThan($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrGreaterThan($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::greaterThan($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrGreaterThanEq($value, $limit, $message = '')
+    {
+        null === $value || static::greaterThanEq($value, $limit, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allGreaterThanEq($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::greaterThanEq($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrGreaterThanEq($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::greaterThanEq($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrLessThan($value, $limit, $message = '')
+    {
+        null === $value || static::lessThan($value, $limit, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allLessThan($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::lessThan($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrLessThan($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::lessThan($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrLessThanEq($value, $limit, $message = '')
+    {
+        null === $value || static::lessThanEq($value, $limit, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allLessThanEq($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::lessThanEq($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $limit
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrLessThanEq($value, $limit, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::lessThanEq($entry, $limit, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $min
+     * @param mixed  $max
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrRange($value, $min, $max, $message = '')
+    {
+        null === $value || static::range($value, $min, $max, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $min
+     * @param mixed  $max
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allRange($value, $min, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::range($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param mixed  $min
+     * @param mixed  $max
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrRange($value, $min, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::range($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrOneOf($value, $values, $message = '')
+    {
+        null === $value || static::oneOf($value, $values, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allOneOf($value, $values, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::oneOf($entry, $values, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrOneOf($value, $values, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::oneOf($entry, $values, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrInArray($value, $values, $message = '')
+    {
+        null === $value || static::inArray($value, $values, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allInArray($value, $values, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::inArray($entry, $values, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param array  $values
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrInArray($value, $values, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::inArray($entry, $values, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $subString
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrContains($value, $subString, $message = '')
+    {
+        null === $value || static::contains($value, $subString, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $subString
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allContains($value, $subString, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::contains($entry, $subString, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $subString
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrContains($value, $subString, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::contains($entry, $subString, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $subString
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotContains($value, $subString, $message = '')
+    {
+        null === $value || static::notContains($value, $subString, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $subString
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotContains($value, $subString, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notContains($entry, $subString, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $subString
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotContains($value, $subString, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notContains($entry, $subString, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotWhitespaceOnly($value, $message = '')
+    {
+        null === $value || static::notWhitespaceOnly($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotWhitespaceOnly($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notWhitespaceOnly($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotWhitespaceOnly($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notWhitespaceOnly($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $prefix
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrStartsWith($value, $prefix, $message = '')
+    {
+        null === $value || static::startsWith($value, $prefix, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $prefix
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allStartsWith($value, $prefix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::startsWith($entry, $prefix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $prefix
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrStartsWith($value, $prefix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::startsWith($entry, $prefix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $prefix
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotStartsWith($value, $prefix, $message = '')
+    {
+        null === $value || static::notStartsWith($value, $prefix, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $prefix
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotStartsWith($value, $prefix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notStartsWith($entry, $prefix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $prefix
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotStartsWith($value, $prefix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notStartsWith($entry, $prefix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrStartsWithLetter($value, $message = '')
+    {
+        null === $value || static::startsWithLetter($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allStartsWithLetter($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::startsWithLetter($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrStartsWithLetter($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::startsWithLetter($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $suffix
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrEndsWith($value, $suffix, $message = '')
+    {
+        null === $value || static::endsWith($value, $suffix, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $suffix
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allEndsWith($value, $suffix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::endsWith($entry, $suffix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $suffix
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrEndsWith($value, $suffix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::endsWith($entry, $suffix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $suffix
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotEndsWith($value, $suffix, $message = '')
+    {
+        null === $value || static::notEndsWith($value, $suffix, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $suffix
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotEndsWith($value, $suffix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notEndsWith($entry, $suffix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $suffix
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotEndsWith($value, $suffix, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notEndsWith($entry, $suffix, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $pattern
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrRegex($value, $pattern, $message = '')
+    {
+        null === $value || static::regex($value, $pattern, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $pattern
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allRegex($value, $pattern, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::regex($entry, $pattern, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $pattern
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrRegex($value, $pattern, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::regex($entry, $pattern, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $pattern
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrNotRegex($value, $pattern, $message = '')
+    {
+        null === $value || static::notRegex($value, $pattern, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $pattern
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNotRegex($value, $pattern, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::notRegex($entry, $pattern, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $pattern
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrNotRegex($value, $pattern, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::notRegex($entry, $pattern, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrUnicodeLetters($value, $message = '')
+    {
+        null === $value || static::unicodeLetters($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allUnicodeLetters($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::unicodeLetters($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrUnicodeLetters($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::unicodeLetters($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrAlpha($value, $message = '')
+    {
+        null === $value || static::alpha($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allAlpha($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::alpha($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrAlpha($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::alpha($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrDigits($value, $message = '')
+    {
+        null === $value || static::digits($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allDigits($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::digits($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrDigits($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::digits($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrAlnum($value, $message = '')
+    {
+        null === $value || static::alnum($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allAlnum($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::alnum($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrAlnum($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::alnum($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert lowercase-string|null $value
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrLower($value, $message = '')
+    {
+        null === $value || static::lower($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<lowercase-string> $value
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allLower($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::lower($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<lowercase-string|null> $value
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrLower($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::lower($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrUpper($value, $message = '')
+    {
+        null === $value || static::upper($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allUpper($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::upper($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<!lowercase-string|null> $value
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrUpper($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::upper($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param int         $length
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrLength($value, $length, $message = '')
+    {
+        null === $value || static::length($value, $length, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param int              $length
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allLength($value, $length, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::length($entry, $length, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param int                   $length
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrLength($value, $length, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::length($entry, $length, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param int|float   $min
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMinLength($value, $min, $message = '')
+    {
+        null === $value || static::minLength($value, $min, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param int|float        $min
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMinLength($value, $min, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::minLength($entry, $min, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param int|float             $min
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMinLength($value, $min, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::minLength($entry, $min, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param int|float   $max
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMaxLength($value, $max, $message = '')
+    {
+        null === $value || static::maxLength($value, $max, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param int|float        $max
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMaxLength($value, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::maxLength($entry, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param int|float             $max
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMaxLength($value, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::maxLength($entry, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param int|float   $min
+     * @param int|float   $max
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrLengthBetween($value, $min, $max, $message = '')
+    {
+        null === $value || static::lengthBetween($value, $min, $max, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param int|float        $min
+     * @param int|float        $max
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allLengthBetween($value, $min, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::lengthBetween($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param int|float             $min
+     * @param int|float             $max
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrLengthBetween($value, $min, $max, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::lengthBetween($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrFileExists($value, $message = '')
+    {
+        null === $value || static::fileExists($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allFileExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::fileExists($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrFileExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::fileExists($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrFile($value, $message = '')
+    {
+        null === $value || static::file($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allFile($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::file($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrFile($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::file($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrDirectory($value, $message = '')
+    {
+        null === $value || static::directory($value, $message);
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allDirectory($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::directory($entry, $message);
+        }
+    }
+
+    /**
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrDirectory($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::directory($entry, $message);
+        }
+    }
+
+    /**
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrReadable($value, $message = '')
+    {
+        null === $value || static::readable($value, $message);
+    }
+
+    /**
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allReadable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::readable($entry, $message);
+        }
+    }
+
+    /**
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrReadable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::readable($entry, $message);
+        }
+    }
+
+    /**
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrWritable($value, $message = '')
+    {
+        null === $value || static::writable($value, $message);
+    }
+
+    /**
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allWritable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::writable($entry, $message);
+        }
+    }
+
+    /**
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrWritable($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::writable($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-assert class-string|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrClassExists($value, $message = '')
+    {
+        null === $value || static::classExists($value, $message);
+    }
+
+    /**
+     * @psalm-assert iterable<class-string> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allClassExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::classExists($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-assert iterable<class-string|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrClassExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::classExists($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert class-string<ExpectedType>|ExpectedType|null $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrSubclassOf($value, $class, $message = '')
+    {
+        null === $value || static::subclassOf($value, $class, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType> $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allSubclassOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::subclassOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $class
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType|null> $value
+     *
+     * @param mixed         $value
+     * @param string|object $class
+     * @param string        $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrSubclassOf($value, $class, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::subclassOf($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-assert class-string|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrInterfaceExists($value, $message = '')
+    {
+        null === $value || static::interfaceExists($value, $message);
+    }
+
+    /**
+     * @psalm-assert iterable<class-string> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allInterfaceExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::interfaceExists($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-assert iterable<class-string|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrInterfaceExists($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::interfaceExists($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $interface
+     * @psalm-assert class-string<ExpectedType>|ExpectedType|null $value
+     *
+     * @param mixed  $value
+     * @param mixed  $interface
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrImplementsInterface($value, $interface, $message = '')
+    {
+        null === $value || static::implementsInterface($value, $interface, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $interface
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType> $value
+     *
+     * @param mixed  $value
+     * @param mixed  $interface
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allImplementsInterface($value, $interface, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::implementsInterface($entry, $interface, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template ExpectedType of object
+     * @psalm-param class-string<ExpectedType> $interface
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType|null> $value
+     *
+     * @param mixed  $value
+     * @param mixed  $interface
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrImplementsInterface($value, $interface, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::implementsInterface($entry, $interface, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object|null $classOrObject
+     *
+     * @param string|object|null $classOrObject
+     * @param mixed              $property
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrPropertyExists($classOrObject, $property, $message = '')
+    {
+        null === $classOrObject || static::propertyExists($classOrObject, $property, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object> $classOrObject
+     *
+     * @param iterable<string|object> $classOrObject
+     * @param mixed                   $property
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allPropertyExists($classOrObject, $property, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            static::propertyExists($entry, $property, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object|null> $classOrObject
+     *
+     * @param iterable<string|object|null> $classOrObject
+     * @param mixed                        $property
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrPropertyExists($classOrObject, $property, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            null === $entry || static::propertyExists($entry, $property, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object|null $classOrObject
+     *
+     * @param string|object|null $classOrObject
+     * @param mixed              $property
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrPropertyNotExists($classOrObject, $property, $message = '')
+    {
+        null === $classOrObject || static::propertyNotExists($classOrObject, $property, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object> $classOrObject
+     *
+     * @param iterable<string|object> $classOrObject
+     * @param mixed                   $property
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allPropertyNotExists($classOrObject, $property, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            static::propertyNotExists($entry, $property, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object|null> $classOrObject
+     *
+     * @param iterable<string|object|null> $classOrObject
+     * @param mixed                        $property
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrPropertyNotExists($classOrObject, $property, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            null === $entry || static::propertyNotExists($entry, $property, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object|null $classOrObject
+     *
+     * @param string|object|null $classOrObject
+     * @param mixed              $method
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMethodExists($classOrObject, $method, $message = '')
+    {
+        null === $classOrObject || static::methodExists($classOrObject, $method, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object> $classOrObject
+     *
+     * @param iterable<string|object> $classOrObject
+     * @param mixed                   $method
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMethodExists($classOrObject, $method, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            static::methodExists($entry, $method, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object|null> $classOrObject
+     *
+     * @param iterable<string|object|null> $classOrObject
+     * @param mixed                        $method
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMethodExists($classOrObject, $method, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            null === $entry || static::methodExists($entry, $method, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param class-string|object|null $classOrObject
+     *
+     * @param string|object|null $classOrObject
+     * @param mixed              $method
+     * @param string             $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMethodNotExists($classOrObject, $method, $message = '')
+    {
+        null === $classOrObject || static::methodNotExists($classOrObject, $method, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object> $classOrObject
+     *
+     * @param iterable<string|object> $classOrObject
+     * @param mixed                   $method
+     * @param string                  $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMethodNotExists($classOrObject, $method, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            static::methodNotExists($entry, $method, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-param iterable<class-string|object|null> $classOrObject
+     *
+     * @param iterable<string|object|null> $classOrObject
+     * @param mixed                        $method
+     * @param string                       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMethodNotExists($classOrObject, $method, $message = '')
+    {
+        static::isIterable($classOrObject);
+
+        foreach ($classOrObject as $entry) {
+            null === $entry || static::methodNotExists($entry, $method, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param array|null $array
+     * @param string|int $key
+     * @param string     $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrKeyExists($array, $key, $message = '')
+    {
+        null === $array || static::keyExists($array, $key, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<array> $array
+     * @param string|int      $key
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allKeyExists($array, $key, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::keyExists($entry, $key, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<array|null> $array
+     * @param string|int           $key
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrKeyExists($array, $key, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::keyExists($entry, $key, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param array|null $array
+     * @param string|int $key
+     * @param string     $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrKeyNotExists($array, $key, $message = '')
+    {
+        null === $array || static::keyNotExists($array, $key, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<array> $array
+     * @param string|int      $key
+     * @param string          $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allKeyNotExists($array, $key, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::keyNotExists($entry, $key, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<array|null> $array
+     * @param string|int           $key
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrKeyNotExists($array, $key, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::keyNotExists($entry, $key, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert array-key|null $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrValidArrayKey($value, $message = '')
+    {
+        null === $value || static::validArrayKey($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array-key> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allValidArrayKey($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::validArrayKey($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<array-key|null> $value
+     *
+     * @param mixed  $value
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrValidArrayKey($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::validArrayKey($entry, $message);
+        }
+    }
+
+    /**
+     * @param Countable|array|null $array
+     * @param int                  $number
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrCount($array, $number, $message = '')
+    {
+        null === $array || static::count($array, $number, $message);
+    }
+
+    /**
+     * @param iterable<Countable|array> $array
+     * @param int                       $number
+     * @param string                    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allCount($array, $number, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::count($entry, $number, $message);
+        }
+    }
+
+    /**
+     * @param iterable<Countable|array|null> $array
+     * @param int                            $number
+     * @param string                         $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrCount($array, $number, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::count($entry, $number, $message);
+        }
+    }
+
+    /**
+     * @param Countable|array|null $array
+     * @param int|float            $min
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMinCount($array, $min, $message = '')
+    {
+        null === $array || static::minCount($array, $min, $message);
+    }
+
+    /**
+     * @param iterable<Countable|array> $array
+     * @param int|float                 $min
+     * @param string                    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMinCount($array, $min, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::minCount($entry, $min, $message);
+        }
+    }
+
+    /**
+     * @param iterable<Countable|array|null> $array
+     * @param int|float                      $min
+     * @param string                         $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMinCount($array, $min, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::minCount($entry, $min, $message);
+        }
+    }
+
+    /**
+     * @param Countable|array|null $array
+     * @param int|float            $max
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrMaxCount($array, $max, $message = '')
+    {
+        null === $array || static::maxCount($array, $max, $message);
+    }
+
+    /**
+     * @param iterable<Countable|array> $array
+     * @param int|float                 $max
+     * @param string                    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allMaxCount($array, $max, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::maxCount($entry, $max, $message);
+        }
+    }
+
+    /**
+     * @param iterable<Countable|array|null> $array
+     * @param int|float                      $max
+     * @param string                         $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrMaxCount($array, $max, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::maxCount($entry, $max, $message);
+        }
+    }
+
+    /**
+     * @param Countable|array|null $array
+     * @param int|float            $min
+     * @param int|float            $max
+     * @param string               $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrCountBetween($array, $min, $max, $message = '')
+    {
+        null === $array || static::countBetween($array, $min, $max, $message);
+    }
+
+    /**
+     * @param iterable<Countable|array> $array
+     * @param int|float                 $min
+     * @param int|float                 $max
+     * @param string                    $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allCountBetween($array, $min, $max, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::countBetween($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @param iterable<Countable|array|null> $array
+     * @param int|float                      $min
+     * @param int|float                      $max
+     * @param string                         $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrCountBetween($array, $min, $max, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::countBetween($entry, $min, $max, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert list|null $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsList($array, $message = '')
+    {
+        null === $array || static::isList($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<list> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsList($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::isList($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<list|null> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsList($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::isList($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert non-empty-list|null $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsNonEmptyList($array, $message = '')
+    {
+        null === $array || static::isNonEmptyList($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<non-empty-list> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsNonEmptyList($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::isNonEmptyList($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-assert iterable<non-empty-list|null> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsNonEmptyList($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::isNonEmptyList($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param mixed|array<T>|null $array
+     * @psalm-assert array<string, T>|null $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsMap($array, $message = '')
+    {
+        null === $array || static::isMap($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param iterable<mixed|array<T>> $array
+     * @psalm-assert iterable<array<string, T>> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsMap($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::isMap($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param iterable<mixed|array<T>|null> $array
+     * @psalm-assert iterable<array<string, T>|null> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsMap($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::isMap($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param mixed|array<T>|null $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrIsNonEmptyMap($array, $message = '')
+    {
+        null === $array || static::isNonEmptyMap($array, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param iterable<mixed|array<T>> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allIsNonEmptyMap($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            static::isNonEmptyMap($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @psalm-template T
+     * @psalm-param iterable<mixed|array<T>|null> $array
+     * @psalm-assert iterable<array<string, T>|null> $array
+     * @psalm-assert iterable<!empty|null> $array
+     *
+     * @param mixed  $array
+     * @param string $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrIsNonEmptyMap($array, $message = '')
+    {
+        static::isIterable($array);
+
+        foreach ($array as $entry) {
+            null === $entry || static::isNonEmptyMap($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrUuid($value, $message = '')
+    {
+        null === $value || static::uuid($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allUuid($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::uuid($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrUuid($value, $message = '')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::uuid($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-param class-string<Throwable> $class
+     *
+     * @param Closure|null $expression
+     * @param string       $class
+     * @param string       $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrThrows($expression, $class = 'Exception', $message = '')
+    {
+        null === $expression || static::throws($expression, $class, $message);
+    }
+
+    /**
+     * @psalm-param class-string<Throwable> $class
+     *
+     * @param iterable<Closure> $expression
+     * @param string            $class
+     * @param string            $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allThrows($expression, $class = 'Exception', $message = '')
+    {
+        static::isIterable($expression);
+
+        foreach ($expression as $entry) {
+            static::throws($entry, $class, $message);
+        }
+    }
+
+    /**
+     * @psalm-param class-string<Throwable> $class
+     *
+     * @param iterable<Closure|null> $expression
+     * @param string                 $class
+     * @param string                 $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrThrows($expression, $class = 'Exception', $message = '')
+    {
+        static::isIterable($expression);
+
+        foreach ($expression as $entry) {
+            null === $entry || static::throws($entry, $class, $message);
+        }
+    }
+}