diff --git a/composer.json b/composer.json
index ec1d51244..f60f13c52 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=8.1.0 <8.4.0",
+    "php": ">=8.1.0 <8.5.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -12,8 +12,7 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "apereo/phpcas": "~1.6.0",
-    "firebase/php-jwt": "^6.4.0",
+    "apereo/phpcas": "dev-master",
     "guzzlehttp/guzzle": "^7.5.1",
     "league/oauth2-google": "^4.0.1",
     "nikic/php-parser": "^4.14.0",
@@ -40,6 +39,12 @@
     "symfony/stopwatch": "~6.4.0",
     "symfony/web-profiler-bundle": "~6.4.0"
   },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/EsupPortail/phpCAS"
+    }
+  ],
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
     "ext-openssl": "Can be used as a polyfill if libsodium is not installed",
diff --git a/composer.lock b/composer.lock
index cb66e47e4..e59227f3e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0da5da3b165955f386268e6dd8db2a8d",
+    "content-hash": "ceac38f6033afe07b7ab977fa39fe348",
     "packages": [
         {
             "name": "apereo/phpcas",
-            "version": "1.6.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/apereo/phpCAS.git",
-                "reference": "c129708154852656aabb13d8606cd5b12dbbabac"
+                "url": "https://github.com/EsupPortail/phpCAS.git",
+                "reference": "57a7744146a963d8fa80192e0ab351051b711ff6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/c129708154852656aabb13d8606cd5b12dbbabac",
-                "reference": "c129708154852656aabb13d8606cd5b12dbbabac",
+                "url": "https://api.github.com/repos/EsupPortail/phpCAS/zipball/57a7744146a963d8fa80192e0ab351051b711ff6",
+                "reference": "57a7744146a963d8fa80192e0ab351051b711ff6",
                 "shasum": ""
             },
             "require": {
@@ -31,6 +31,7 @@
                 "phpstan/phpstan": "^1.5",
                 "phpunit/phpunit": ">=7.5"
             },
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -45,15 +46,27 @@
                     "source/"
                 ]
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "PhpCas\\": "test/CAS/"
+                }
+            },
+            "scripts": {
+                "test": [
+                    "phpunit"
+                ],
+                "phpstan": [
+                    "phpstan"
+                ]
+            },
             "license": [
                 "Apache-2.0"
             ],
             "authors": [
                 {
                     "name": "Joachim Fritschi",
-                    "email": "jfritschi@freenet.de",
-                    "homepage": "https://github.com/jfritschi"
+                    "homepage": "https://github.com/jfritschi",
+                    "email": "jfritschi@freenet.de"
                 },
                 {
                     "name": "Adam Franco",
@@ -72,10 +85,10 @@
                 "jasig"
             ],
             "support": {
-                "issues": "https://github.com/apereo/phpCAS/issues",
-                "source": "https://github.com/apereo/phpCAS/tree/1.6.1"
+                "source": "https://github.com/EsupPortail/phpCAS/tree/master",
+                "issues": "https://github.com/EsupPortail/phpCAS/issues"
             },
-            "time": "2023-02-19T19:52:35+00:00"
+            "time": "2025-12-02T11:38:23+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -223,26 +236,26 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.0",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
+                "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65",
+                "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
+                "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "guzzlehttp/guzzle": "^7.4",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
+                "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0"
             },
@@ -280,28 +293,28 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v7.0.2"
             },
-            "time": "2023-12-01T16:26:39+00:00"
+            "time": "2025-12-16T22:17:28+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -312,9 +325,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -392,7 +405,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
             },
             "funding": [
                 {
@@ -408,20 +421,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2025-08-23T22:36:01+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
                 "shasum": ""
             },
             "require": {
@@ -429,7 +442,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "type": "library",
             "extra": {
@@ -475,7 +488,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
             },
             "funding": [
                 {
@@ -491,20 +504,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2025-08-22T14:34:08+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "21dc724a0583619cd1652f673303492272778051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+                "reference": "21dc724a0583619cd1652f673303492272778051",
                 "shasum": ""
             },
             "require": {
@@ -519,8 +532,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -591,7 +604,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
             },
             "funding": [
                 {
@@ -607,39 +620,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2025-08-23T21:21:41+00:00"
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.7.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8"
+                "reference": "26e8c5da4f3d78cede7021e09b1330a0fc093d5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/160d6274b03562ebeb55ed18399281d8118b76c8",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/26e8c5da4f3d78cede7021e09b1330a0fc093d5e",
+                "reference": "26e8c5da4f3d78cede7021e09b1330a0fc093d5e",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0",
-                "paragonie/random_compat": "^1 || ^2 || ^9.99",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+                "php": "^7.1 || >=8.0.0 <8.6.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.5",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
-                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "^3.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "League\\OAuth2\\Client\\": "src/"
@@ -675,22 +683,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.7.0"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.9.0"
             },
-            "time": "2023-04-16T18:19:15+00:00"
+            "time": "2025-11-25T22:17:17+00:00"
         },
         {
             "name": "league/oauth2-google",
-            "version": "4.0.1",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-google.git",
-                "reference": "1b01ba18ba31b29e88771e3e0979e5c91d4afe76"
+                "reference": "8b9bb43740ac6d994aca881a35f7bacbe98c0ffb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/1b01ba18ba31b29e88771e3e0979e5c91d4afe76",
-                "reference": "1b01ba18ba31b29e88771e3e0979e5c91d4afe76",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/8b9bb43740ac6d994aca881a35f7bacbe98c0ffb",
+                "reference": "8b9bb43740ac6d994aca881a35f7bacbe98c0ffb",
                 "shasum": ""
             },
             "require": {
@@ -730,41 +738,36 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-google/issues",
-                "source": "https://github.com/thephpleague/oauth2-google/tree/4.0.1"
+                "source": "https://github.com/thephpleague/oauth2-google/tree/4.1.0"
             },
-            "time": "2023-03-17T15:20:52+00:00"
+            "time": "2025-12-15T12:24:14+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
+            "version": "v4.19.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.9-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "PhpParser\\": "lib/PhpParser"
@@ -786,59 +789,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.5"
             },
-            "time": "2023-12-10T21:03:43+00:00"
-        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v9.99.100",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
-                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">= 7"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
-            ],
-            "support": {
-                "email": "info@paragonie.com",
-                "issues": "https://github.com/paragonie/random_compat/issues",
-                "source": "https://github.com/paragonie/random_compat"
-            },
-            "time": "2020-10-15T08:29:30+00:00"
+            "time": "2025-12-06T11:45:25+00:00"
         },
         {
             "name": "pear/archive_tar",
@@ -973,30 +926,31 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.11",
+            "version": "v1.10.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
+                "reference": "c7b55789d01de0ce090d289b73f1bbd6a2f113b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
-                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/c7b55789d01de0ce090d289b73f1bbd6a2f113b1",
+                "reference": "c7b55789d01de0ce090d289b73f1bbd6a2f113b1",
                 "shasum": ""
             },
             "require": {
                 "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
+                "pear/pear_exception": "~1.0",
+                "php": ">=5.4"
             },
             "replace": {
                 "rsky/pear-core-min": "self.version"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "include-path": [
@@ -1017,7 +971,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2021-08-10T22:31:03+00:00"
+            "time": "2025-12-14T20:37:07+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -1080,28 +1034,32 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3"
+                "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/727bdf7255b51798307f17dec52ff8a91f1c7de3",
-                "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
+                "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "sabberworm/php-css-parser": "^8.4.0",
+                "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+                "sabberworm/php-css-parser": "^8.7.0",
                 "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0"
             },
             "require-dev": {
-                "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpunit/phpunit": "9.6.11",
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpstan/extension-installer": "1.4.3",
+                "phpstan/phpstan": "1.12.7",
+                "phpstan/phpstan-phpunit": "1.4.0",
+                "phpstan/phpstan-strict-rules": "1.6.1",
+                "phpunit/phpunit": "9.6.21",
                 "rawr/cross-data-providers": "2.4.0"
             },
             "type": "library",
@@ -1134,7 +1092,7 @@
                 },
                 {
                     "name": "Jake Hotson",
-                    "email": "jake@qzdesign.co.uk"
+                    "email": "jake.github@qzdesign.co.uk"
                 },
                 {
                     "name": "Cameron Brooks"
@@ -1154,7 +1112,7 @@
                 "issues": "https://github.com/MyIntervals/emogrifier/issues",
                 "source": "https://github.com/MyIntervals/emogrifier"
             },
-            "time": "2023-12-06T02:00:20+00:00"
+            "time": "2024-10-28T16:12:26+00:00"
         },
         {
             "name": "psr/cache",
@@ -1362,20 +1320,20 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -1399,7 +1357,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -1411,9 +1369,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
@@ -1564,30 +1522,35 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.4.0",
+            "version": "v8.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+                "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=5.6.20"
+                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "codacy/coverage": "^1.4",
-                "phpunit/phpunit": "^4.8.36"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+                "rawr/cross-data-providers": "^2.0.0"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Sabberworm\\CSS\\": "src/"
@@ -1600,6 +1563,14 @@
             "authors": [
                 {
                     "name": "Raphael Schweikert"
+                },
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake.github@qzdesign.co.uk"
                 }
             ],
             "description": "Parser for CSS Files written in PHP",
@@ -1610,23 +1581,23 @@
                 "stylesheet"
             ],
             "support": {
-                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
-                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+                "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
             },
-            "time": "2021-12-11T13:40:54+00:00"
+            "time": "2025-07-11T13:20:48+00:00"
         },
         {
             "name": "scssphp/scssphp",
-            "version": "v1.12.1",
+            "version": "v1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb"
+                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/394ed1e960138710a60d035c1a85d43d0bf0faeb",
-                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/63d1157457e5554edf00b0c1fabab4c1511d2520",
+                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520",
                 "shasum": ""
             },
             "require": {
@@ -1655,8 +1626,8 @@
             "type": "library",
             "extra": {
                 "bamarni-bin": {
-                    "forward-command": false,
-                    "bin-links": false
+                    "bin-links": false,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -1691,9 +1662,9 @@
             ],
             "support": {
                 "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.12.1"
+                "source": "https://github.com/scssphp/scssphp/tree/v1.13.0"
             },
-            "time": "2024-01-13T12:36:40+00:00"
+            "time": "2024-08-17T21:02:11+00:00"
         },
         {
             "name": "soundasleep/html2text",
@@ -1752,16 +1723,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.12",
+            "version": "v6.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8"
+                "reference": "5b088fa41eb9568748dc255c45e4054c387ba73b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
-                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/5b088fa41eb9568748dc255c45e4054c387ba73b",
+                "reference": "5b088fa41eb9568748dc255c45e4054c387ba73b",
                 "shasum": ""
             },
             "require": {
@@ -1828,7 +1799,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.12"
+                "source": "https://github.com/symfony/cache/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -1839,12 +1810,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-16T16:01:33+00:00"
+            "time": "2026-01-27T15:05:20+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -1924,16 +1899,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v6.4.0",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e"
+                "reference": "d445badf0ad2c2a492e38c0378c39997a56ef97b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/5d33e0fb707d603330e0edfd4691803a1253572e",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/d445badf0ad2c2a492e38c0378c39997a56ef97b",
+                "reference": "d445badf0ad2c2a492e38c0378c39997a56ef97b",
                 "shasum": ""
             },
             "require": {
@@ -1979,7 +1954,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v6.4.0"
+                "source": "https://github.com/symfony/config/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -1990,25 +1965,29 @@
                     "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": "2023-11-09T08:28:32+00:00"
+            "time": "2026-01-13T08:40:30+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.2",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625"
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
                 "shasum": ""
             },
             "require": {
@@ -2073,7 +2052,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.2"
+                "source": "https://github.com/symfony/console/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2084,25 +2063,29 @@
                     "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": "2023-12-10T16:15:48+00:00"
+            "time": "2026-01-13T08:45:59+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.0",
+            "version": "v6.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4"
+                "reference": "9b784413143701aa3c94ac1869a159a9e53e8761"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4",
-                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/9b784413143701aa3c94ac1869a159a9e53e8761",
+                "reference": "9b784413143701aa3c94ac1869a159a9e53e8761",
                 "shasum": ""
             },
             "require": {
@@ -2138,7 +2121,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.0"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.24"
             },
             "funding": [
                 {
@@ -2149,25 +2132,29 @@
                     "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": "2023-10-31T08:40:20+00:00"
+            "time": "2025-07-10T08:14:14+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v6.4.2",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195"
+                "reference": "b17882e933c4c606620247b6708ab53aa3b88753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/226ea431b1eda6f0d9f5a4b278757171960bb195",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b17882e933c4c606620247b6708ab53aa3b88753",
+                "reference": "b17882e933c4c606620247b6708ab53aa3b88753",
                 "shasum": ""
             },
             "require": {
@@ -2175,7 +2162,7 @@
                 "psr/container": "^1.1|^2.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/service-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.2.10|^7.0"
+                "symfony/var-exporter": "^6.4.20|^7.2.5"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2",
@@ -2219,7 +2206,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.2"
+                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2230,12 +2217,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": "2023-12-28T19:16:56+00:00"
+            "time": "2026-01-23T10:54:33+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -2306,16 +2297,16 @@
         },
         {
             "name": "symfony/dotenv",
-            "version": "v6.4.2",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dotenv.git",
-                "reference": "835f8d2d1022934ac038519de40b88158798c96f"
+                "reference": "924edbc9631b75302def0258ed1697948b17baf6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dotenv/zipball/835f8d2d1022934ac038519de40b88158798c96f",
-                "reference": "835f8d2d1022934ac038519de40b88158798c96f",
+                "url": "https://api.github.com/repos/symfony/dotenv/zipball/924edbc9631b75302def0258ed1697948b17baf6",
+                "reference": "924edbc9631b75302def0258ed1697948b17baf6",
                 "shasum": ""
             },
             "require": {
@@ -2360,7 +2351,7 @@
                 "environment"
             ],
             "support": {
-                "source": "https://github.com/symfony/dotenv/tree/v6.4.2"
+                "source": "https://github.com/symfony/dotenv/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -2371,25 +2362,29 @@
                     "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": "2023-12-28T19:16:56+00:00"
+            "time": "2025-11-14T17:33:48+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.0",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788"
+                "reference": "8c18400784fcb014dc73c8d5601a9576af7f8ad4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788",
-                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/8c18400784fcb014dc73c8d5601a9576af7f8ad4",
+                "reference": "8c18400784fcb014dc73c8d5601a9576af7f8ad4",
                 "shasum": ""
             },
             "require": {
@@ -2435,7 +2430,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.0"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2446,25 +2441,29 @@
                     "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": "2023-10-18T09:43:34+00:00"
+            "time": "2026-01-19T19:28:19+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.25",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff"
+                "reference": "99d7e101826e6610606b9433248f80c1997cd20b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b0cf3162020603587363f0551cd3be43958611ff",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/99d7e101826e6610606b9433248f80c1997cd20b",
+                "reference": "99d7e101826e6610606b9433248f80c1997cd20b",
                 "shasum": ""
             },
             "require": {
@@ -2515,7 +2514,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.25"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2535,7 +2534,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T09:41:44+00:00"
+            "time": "2026-01-05T11:13:48+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -2615,16 +2614,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.0",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/441c6b69f7222aadae7cbf5df588496d5ee37789",
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789",
                 "shasum": ""
             },
             "require": {
@@ -2632,6 +2631,9 @@
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2658,7 +2660,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -2669,25 +2671,29 @@
                     "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": "2023-07-26T17:27:13+00:00"
+            "time": "2025-11-26T14:43:45+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.0",
+            "version": "v6.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/24965ca011dac87431729640feef8bcf7b5523e0",
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0",
                 "shasum": ""
             },
             "require": {
@@ -2722,7 +2728,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+                "source": "https://github.com/symfony/finder/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -2733,25 +2739,29 @@
                     "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": "2023-10-31T17:30:12+00:00"
+            "time": "2026-01-26T13:03:48+00:00"
         },
         {
             "name": "symfony/framework-bundle",
-            "version": "v6.4.2",
+            "version": "v6.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/framework-bundle.git",
-                "reference": "c26a221e0462027d1f9d4a802ed63f8ab07a43d0"
+                "reference": "9ef2d0b63b9e855ba351e770a603d89699115801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/c26a221e0462027d1f9d4a802ed63f8ab07a43d0",
-                "reference": "c26a221e0462027d1f9d4a802ed63f8ab07a43d0",
+                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/9ef2d0b63b9e855ba351e770a603d89699115801",
+                "reference": "9ef2d0b63b9e855ba351e770a603d89699115801",
                 "shasum": ""
             },
             "require": {
@@ -2760,7 +2770,7 @@
                 "php": ">=8.1",
                 "symfony/cache": "^5.4|^6.0|^7.0",
                 "symfony/config": "^6.1|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4.12|^7.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.1|^7.0",
                 "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
@@ -2790,7 +2800,8 @@
                 "symfony/mime": "<6.4",
                 "symfony/property-access": "<5.4",
                 "symfony/property-info": "<5.4",
-                "symfony/scheduler": "<6.4",
+                "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6",
+                "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
                 "symfony/security-core": "<5.4",
                 "symfony/security-csrf": "<5.4",
                 "symfony/serializer": "<6.4",
@@ -2829,7 +2840,7 @@
                 "symfony/process": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/rate-limiter": "^5.4|^6.0|^7.0",
-                "symfony/scheduler": "^6.4|^7.0",
+                "symfony/scheduler": "^6.4.4|^7.0.4",
                 "symfony/security-bundle": "^5.4|^6.0|^7.0",
                 "symfony/semaphore": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.4|^7.0",
@@ -2842,7 +2853,7 @@
                 "symfony/web-link": "^5.4|^6.0|^7.0",
                 "symfony/workflow": "^6.4|^7.0",
                 "symfony/yaml": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.10|^3.0"
+                "twig/twig": "^2.10|^3.0.4"
             },
             "type": "symfony-bundle",
             "autoload": {
@@ -2870,7 +2881,7 @@
             "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/framework-bundle/tree/v6.4.2"
+                "source": "https://github.com/symfony/framework-bundle/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -2881,25 +2892,29 @@
                     "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": "2023-12-29T15:34:34+00:00"
+            "time": "2026-01-26T14:46:41+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.29",
+            "version": "v6.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88"
+                "reference": "f1a490cc9d595ba7ebe684220e625d1e472ad278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88",
-                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f1a490cc9d595ba7ebe684220e625d1e472ad278",
+                "reference": "f1a490cc9d595ba7ebe684220e625d1e472ad278",
                 "shasum": ""
             },
             "require": {
@@ -2947,7 +2962,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.29"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -2967,20 +2982,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-08T16:40:12+00:00"
+            "time": "2026-01-27T15:04:55+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.2",
+            "version": "v6.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "13e8387320b5942d0dc408440c888e2d526efef4"
+                "reference": "73fa5c999d7f741ca544a97d3c791cc97890ae4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/13e8387320b5942d0dc408440c888e2d526efef4",
-                "reference": "13e8387320b5942d0dc408440c888e2d526efef4",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/73fa5c999d7f741ca544a97d3c791cc97890ae4d",
+                "reference": "73fa5c999d7f741ca544a97d3c791cc97890ae4d",
                 "shasum": ""
             },
             "require": {
@@ -3029,12 +3044,13 @@
                 "symfony/process": "^5.4|^6.0|^7.0",
                 "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
                 "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3|^7.0",
+                "symfony/serializer": "^6.4.4|^7.0.4",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0",
                 "symfony/translation": "^5.4|^6.0|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
                 "symfony/uid": "^5.4|^6.0|^7.0",
                 "symfony/validator": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.4|^7.0",
                 "symfony/var-exporter": "^6.2|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
@@ -3064,7 +3080,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -3075,25 +3091,29 @@
                     "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": "2023-12-30T15:31:44+00:00"
+            "time": "2026-01-28T10:02:13+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.25",
+            "version": "v6.4.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2"
+                "reference": "8835f93333474780fda1b987cae37e33c3e026ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/628b43b45a3e6b15c8a633fb22df547ed9b492a2",
-                "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/8835f93333474780fda1b987cae37e33c3e026ca",
+                "reference": "8835f93333474780fda1b987cae37e33c3e026ca",
                 "shasum": ""
             },
             "require": {
@@ -3144,7 +3164,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.25"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.31"
             },
             "funding": [
                 {
@@ -3164,20 +3184,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T09:41:44+00:00"
+            "time": "2025-12-12T07:33:25+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.24",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7"
+                "reference": "7409686879ca36c09fc970a5fa8ff6e93504dba4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/664d5e844a2de5e11c8255d0aef6bc15a9660ac7",
-                "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7409686879ca36c09fc970a5fa8ff6e93504dba4",
+                "reference": "7409686879ca36c09fc970a5fa8ff6e93504dba4",
                 "shasum": ""
             },
             "require": {
@@ -3233,7 +3253,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.24"
+                "source": "https://github.com/symfony/mime/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -3253,24 +3273,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T12:02:45+00:00"
+            "time": "2026-01-04T11:53:14+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -3280,12 +3300,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3319,7 +3336,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -3330,41 +3347,42 @@
                     "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": "2023-01-26T09:26:14+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3400,7 +3418,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -3411,12 +3429,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": "2023-01-26T09:26:14+00:00"
+            "time": "2025-06-27T09:58:17+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
@@ -3757,16 +3779,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.2",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "98eab13a07fddc85766f1756129c69f207ffbc21"
+                "reference": "0dc6253e864e71b486e8ba4970a56ab849106ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/98eab13a07fddc85766f1756129c69f207ffbc21",
-                "reference": "98eab13a07fddc85766f1756129c69f207ffbc21",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/0dc6253e864e71b486e8ba4970a56ab849106ebe",
+                "reference": "0dc6253e864e71b486e8ba4970a56ab849106ebe",
                 "shasum": ""
             },
             "require": {
@@ -3820,7 +3842,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.2"
+                "source": "https://github.com/symfony/routing/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -3831,25 +3853,29 @@
                     "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": "2023-12-29T15:34:34+00:00"
+            "time": "2026-01-12T08:31:19+00:00"
         },
         {
             "name": "symfony/runtime",
-            "version": "v6.4.24",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/runtime.git",
-                "reference": "c1cc6721646f546627236c57f835272806087337"
+                "reference": "fb3149ee85d3b639dd3e49ea9dda05656f0537e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/runtime/zipball/c1cc6721646f546627236c57f835272806087337",
-                "reference": "c1cc6721646f546627236c57f835272806087337",
+                "url": "https://api.github.com/repos/symfony/runtime/zipball/fb3149ee85d3b639dd3e49ea9dda05656f0537e3",
+                "reference": "fb3149ee85d3b639dd3e49ea9dda05656f0537e3",
                 "shasum": ""
             },
             "require": {
@@ -3899,7 +3925,7 @@
                 "runtime"
             ],
             "support": {
-                "source": "https://github.com/symfony/runtime/tree/v6.4.24"
+                "source": "https://github.com/symfony/runtime/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -3919,7 +3945,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:14:14+00:00"
+            "time": "2025-12-05T10:55:13+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -4010,16 +4036,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.2",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc"
+                "reference": "50590a057841fa6bf69d12eceffce3465b9e32cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/50590a057841fa6bf69d12eceffce3465b9e32cb",
+                "reference": "50590a057841fa6bf69d12eceffce3465b9e32cb",
                 "shasum": ""
             },
             "require": {
@@ -4033,7 +4059,6 @@
                 "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/translation-contracts": "^2.5|^3.0",
@@ -4076,7 +4101,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.2"
+                "source": "https://github.com/symfony/string/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -4087,25 +4112,29 @@
                     "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": "2023-12-10T16:15:48+00:00"
+            "time": "2025-11-21T18:03:05+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5"
+                "reference": "65a8bc82080447fae78373aa10f8d13b38338977"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5",
-                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977",
+                "reference": "65a8bc82080447fae78373aa10f8d13b38338977",
                 "shasum": ""
             },
             "require": {
@@ -4113,12 +4142,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -4154,7 +4183,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1"
             },
             "funding": [
                 {
@@ -4165,25 +4194,29 @@
                     "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": "2023-07-25T15:08:44+00:00"
+            "time": "2025-07-15T13:41:35+00:00"
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v6.4.0",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf"
+                "reference": "1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf",
-                "reference": "142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8",
+                "reference": "1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8",
                 "shasum": ""
             },
             "require": {
@@ -4196,7 +4229,7 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/console": "<5.4",
-                "symfony/form": "<6.3",
+                "symfony/form": "<6.4.32|>7,<7.3.10|>7.4,<7.4.4",
                 "symfony/http-foundation": "<5.4",
                 "symfony/http-kernel": "<6.4",
                 "symfony/mime": "<6.2",
@@ -4214,7 +4247,7 @@
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
                 "symfony/expression-language": "^5.4|^6.0|^7.0",
                 "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/form": "^6.4|^7.0",
+                "symfony/form": "^6.4.32|~7.3.10|^7.4.4",
                 "symfony/html-sanitizer": "^6.1|^7.0",
                 "symfony/http-foundation": "^5.4|^6.0|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
@@ -4227,7 +4260,7 @@
                 "symfony/security-core": "^5.4|^6.0|^7.0",
                 "symfony/security-csrf": "^5.4|^6.0|^7.0",
                 "symfony/security-http": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0",
                 "symfony/translation": "^6.1|^7.0",
                 "symfony/web-link": "^5.4|^6.0|^7.0",
@@ -4263,7 +4296,7 @@
             "description": "Provides integration for Twig with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bridge/tree/v6.4.0"
+                "source": "https://github.com/symfony/twig-bridge/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4274,25 +4307,29 @@
                     "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": "2023-11-25T08:25:13+00:00"
+            "time": "2026-01-03T23:03:08+00:00"
         },
         {
             "name": "symfony/twig-bundle",
-            "version": "v6.4.0",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bundle.git",
-                "reference": "35d84393e598dfb774e6a2bf49e5229a8a6dbe4c"
+                "reference": "a5c8dcc11a5bf9c96320da20070d2e158a4e0b30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/35d84393e598dfb774e6a2bf49e5229a8a6dbe4c",
-                "reference": "35d84393e598dfb774e6a2bf49e5229a8a6dbe4c",
+                "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/a5c8dcc11a5bf9c96320da20070d2e158a4e0b30",
+                "reference": "a5c8dcc11a5bf9c96320da20070d2e158a4e0b30",
                 "shasum": ""
             },
             "require": {
@@ -4347,7 +4384,7 @@
             "description": "Provides a tight integration of Twig into the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bundle/tree/v6.4.0"
+                "source": "https://github.com/symfony/twig-bundle/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4358,25 +4395,29 @@
                     "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": "2023-11-07T14:57:07+00:00"
+            "time": "2026-01-05T12:44:39+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.2",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f"
+                "reference": "131fc9915e0343052af5ed5040401b481ca192aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/68d6573ec98715ddcae5a0a85bee3c1c27a4c33f",
-                "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/131fc9915e0343052af5ed5040401b481ca192aa",
+                "reference": "131fc9915e0343052af5ed5040401b481ca192aa",
                 "shasum": ""
             },
             "require": {
@@ -4388,7 +4429,6 @@
                 "symfony/console": "<5.4"
             },
             "require-dev": {
-                "ext-iconv": "*",
                 "symfony/console": "^5.4|^6.0|^7.0",
                 "symfony/error-handler": "^6.3|^7.0",
                 "symfony/http-kernel": "^5.4|^6.0|^7.0",
@@ -4432,7 +4472,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.2"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4443,12 +4483,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": "2023-12-28T19:16:56+00:00"
+            "time": "2026-01-01T13:34:06+00:00"
         },
         {
             "name": "symfony/var-exporter",
@@ -4533,16 +4577,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.4.0",
+            "version": "v6.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587"
+                "reference": "8207ae83da19ee3748d6d4f567b4d9a7c656e331"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/8207ae83da19ee3748d6d4f567b4d9a7c656e331",
+                "reference": "8207ae83da19ee3748d6d4f567b4d9a7c656e331",
                 "shasum": ""
             },
             "require": {
@@ -4585,7 +4629,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.0"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -4596,25 +4640,29 @@
                     "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": "2023-11-06T11:00:25+00:00"
+            "time": "2025-12-02T11:50:18+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.10.0",
+            "version": "6.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "ca5b6de294512145db96bcbc94e61696599c391d"
+                "reference": "7a2701251e5d52fc3d508fd71704683eb54f5939"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/ca5b6de294512145db96bcbc94e61696599c391d",
-                "reference": "ca5b6de294512145db96bcbc94e61696599c391d",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/7a2701251e5d52fc3d508fd71704683eb54f5939",
+                "reference": "7a2701251e5d52fc3d508fd71704683eb54f5939",
                 "shasum": ""
             },
             "require": {
@@ -4664,7 +4712,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.10.0"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.10.1"
             },
             "funding": [
                 {
@@ -4672,26 +4720,26 @@
                     "type": "custom"
                 }
             ],
-            "time": "2025-05-27T18:02:28+00:00"
+            "time": "2025-11-21T10:58:21+00:00"
         },
         {
             "name": "thenetworg/oauth2-azure",
-            "version": "v2.2.2",
+            "version": "v2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TheNetworg/oauth2-azure.git",
-                "reference": "be204a5135f016470a9c33e82ab48785bbc11af2"
+                "reference": "a897d60b6b127daa2f27b1b4e62e7af40829d02f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TheNetworg/oauth2-azure/zipball/be204a5135f016470a9c33e82ab48785bbc11af2",
-                "reference": "be204a5135f016470a9c33e82ab48785bbc11af2",
+                "url": "https://api.github.com/repos/TheNetworg/oauth2-azure/zipball/a897d60b6b127daa2f27b1b4e62e7af40829d02f",
+                "reference": "a897d60b6b127daa2f27b1b4e62e7af40829d02f",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-openssl": "*",
-                "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0",
+                "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0||~7.0",
                 "league/oauth2-client": "~2.0",
                 "php": "^7.1|^8.0"
             },
@@ -4730,22 +4778,22 @@
             ],
             "support": {
                 "issues": "https://github.com/TheNetworg/oauth2-azure/issues",
-                "source": "https://github.com/TheNetworg/oauth2-azure/tree/v2.2.2"
+                "source": "https://github.com/TheNetworg/oauth2-azure/tree/v2.2.4"
             },
-            "time": "2023-12-19T12:10:48+00:00"
+            "time": "2026-01-29T12:43:59+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v3.21.1",
+            "version": "v3.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d"
+                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
+                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
                 "shasum": ""
             },
             "require": {
@@ -4799,7 +4847,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.21.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.23.0"
             },
             "funding": [
                 {
@@ -4811,22 +4859,22 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-03T07:21:55+00:00"
+            "time": "2026-01-23T21:00:41+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "symfony/debug-bundle",
-            "version": "v6.4.0",
+            "version": "v6.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug-bundle.git",
-                "reference": "1e07027423d1d37125b60a50997ada26a9d9d202"
+                "reference": "21a61c55192d558a6b81cdb12e8c010fc9474fe0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/1e07027423d1d37125b60a50997ada26a9d9d202",
-                "reference": "1e07027423d1d37125b60a50997ada26a9d9d202",
+                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/21a61c55192d558a6b81cdb12e8c010fc9474fe0",
+                "reference": "21a61c55192d558a6b81cdb12e8c010fc9474fe0",
                 "shasum": ""
             },
             "require": {
@@ -4871,7 +4919,7 @@
             "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/debug-bundle/tree/v6.4.0"
+                "source": "https://github.com/symfony/debug-bundle/tree/v6.4.27"
             },
             "funding": [
                 {
@@ -4882,25 +4930,29 @@
                     "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": "2023-11-01T12:07:38+00:00"
+            "time": "2025-10-11T17:35:31+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.4.0",
+            "version": "v6.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b67e94e06a05d9572c2fa354483b3e13e3cb1898",
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898",
                 "shasum": ""
             },
             "require": {
@@ -4933,7 +4985,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.4.24"
             },
             "funding": [
                 {
@@ -4944,25 +4996,29 @@
                     "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": "2023-02-16T10:14:28+00:00"
+            "time": "2025-07-10T08:14:14+00:00"
         },
         {
             "name": "symfony/web-profiler-bundle",
-            "version": "v6.4.2",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/web-profiler-bundle.git",
-                "reference": "38462d16856740ec0d1ba2cb902eebf09100dde2"
+                "reference": "011f59e3f3d20f60d11b4e78b8dc63504f56e145"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/38462d16856740ec0d1ba2cb902eebf09100dde2",
-                "reference": "38462d16856740ec0d1ba2cb902eebf09100dde2",
+                "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/011f59e3f3d20f60d11b4e78b8dc63504f56e145",
+                "reference": "011f59e3f3d20f60d11b4e78b8dc63504f56e145",
                 "shasum": ""
             },
             "require": {
@@ -5015,7 +5071,7 @@
                 "dev"
             ],
             "support": {
-                "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.2"
+                "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -5026,21 +5082,27 @@
                     "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": "2023-12-27T08:18:35+00:00"
+            "time": "2026-01-06T09:13:42+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": {
+        "apereo/phpcas": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=8.1.0 <8.4.0",
+        "php": ">=8.1.0 <8.5.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
diff --git a/lib/apereo/phpcas/README.md b/lib/apereo/phpcas/README.md
index d48128912..05f3c7d17 100644
--- a/lib/apereo/phpcas/README.md
+++ b/lib/apereo/phpcas/README.md
@@ -13,7 +13,7 @@ Api documentation can be found here:
 https://apereo.github.io/phpCAS/api/
 
 
-[![Test](https://github.com/apereo/phpCAS/actions/workflows/test.yml/badge.svg)](https://github.com/apereo/phpCAS/actions/workflows/test.yml)
+[![Test](https://github.com/EsupPortail/phpCAS/actions/workflows/test.yml/badge.svg)](https://github.com/EsupPortail/phpCAS/actions/workflows/test.yml)
 
 LICENSE
 -------
diff --git a/lib/apereo/phpcas/source/CAS.php b/lib/apereo/phpcas/source/CAS.php
index 71c04755a..bf75c551e 100644
--- a/lib/apereo/phpcas/source/CAS.php
+++ b/lib/apereo/phpcas/source/CAS.php
@@ -57,7 +57,7 @@ if (!isset($_SERVER['REQUEST_URI']) && isset($_SERVER['SCRIPT_NAME']) && isset($
 /**
  * phpCAS version. accessible for the user by phpCAS::getVersion().
  */
-define('PHPCAS_VERSION', '1.6.1');
+define('PHPCAS_VERSION', '1.6.1+');
 
 /**
  * @addtogroup public
@@ -303,7 +303,7 @@ class phpCAS
 
     /**
      * This variable is used to enable verbose mode
-     * This pevents debug info to be show to the user. Since it's a security
+     * This prevents debug info to be show to the user. Since it's a security
      * feature the default is false
      *
      * @hideinitializer
@@ -338,7 +338,7 @@ class phpCAS
      * @param bool                     $changeSessionID Allow phpCAS to change the session_id
      *                                                  (Single Sign Out/handleLogoutRequests
      *                                                  is based on that change)
-     * @param \SessionHandlerInterface $sessionHandler  the session handler
+     * @param \SessionHandlerInterface|null $sessionHandler  the session handler
      *
      * @return void a newly created CAS_Client object
      * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -347,7 +347,7 @@ class phpCAS
      */
     public static function client($server_version, $server_hostname,
         $server_port, $server_uri, $service_base_url,
-        $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
+        $changeSessionID = true, ?\SessionHandlerInterface $sessionHandler = null
     ) {
         phpCAS :: traceBegin();
         if (is_object(self::$_PHPCAS_CLIENT)) {
@@ -393,7 +393,7 @@ class phpCAS
      * @param bool                     $changeSessionID Allow phpCAS to change the session_id
      *                                                  (Single Sign Out/handleLogoutRequests
      *                                                  is based on that change)
-     * @param \SessionHandlerInterface $sessionHandler  the session handler
+     * @param \SessionHandlerInterface|null $sessionHandler  the session handler
      *
      * @return void a newly created CAS_Client object
      * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -402,14 +402,14 @@ class phpCAS
      */
     public static function proxy($server_version, $server_hostname,
         $server_port, $server_uri, $service_base_url,
-        $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
+        $changeSessionID = true, ?\SessionHandlerInterface $sessionHandler = null
     ) {
         phpCAS :: traceBegin();
         if (is_object(self::$_PHPCAS_CLIENT)) {
             phpCAS :: error(self::$_PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . self::$_PHPCAS_INIT_CALL['file'] . ':' . self::$_PHPCAS_INIT_CALL['line'] . ')');
         }
 
-        // store where the initialzer is called from
+        // store where the initializer is called from
         $dbg = debug_backtrace();
         self::$_PHPCAS_INIT_CALL = array (
             'done' => true,
@@ -560,7 +560,7 @@ class phpCAS
 
                 $indent_str .= '|    ';
             }
-            // allow for multiline output with proper identing. Usefull for
+            // allow for multiline output with proper identing. Useful for
             // dumping cas answers etc.
             $str2 = str_replace("\n", "\n" . self::$_PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str, $str);
             $str3 = self::$_PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str2;
@@ -568,7 +568,7 @@ class phpCAS
                 self::$_PHPCAS_DEBUG['logger']->info($str3);
             }
             if (!empty(self::$_PHPCAS_DEBUG['filename'])) {
-                // Check if file exists and modifiy file permissions to be only
+                // Check if file exists and modify file permissions to be only
                 // readable by the webserver
                 if (!file_exists(self::$_PHPCAS_DEBUG['filename'])) {
                     touch(self::$_PHPCAS_DEBUG['filename']);
@@ -1769,7 +1769,7 @@ class phpCAS
 
     /**
      * If you want your service to be proxied you have to enable it (default
-     * disabled) and define an accepable list of proxies that are allowed to
+     * disabled) and define an acceptable list of proxies that are allowed to
      * proxy your service.
      *
      * Add each allowed proxy definition object. For the normal CAS_ProxyChain
@@ -1790,7 +1790,7 @@ class phpCAS
      *				'http://client.example.com/'
      *			)));
      *
-     * For quick testing or in certain production screnarios you might want to
+     * For quick testing or in certain production scenarios you might want to
      * allow allow any other valid service to proxy your service. To do so, add
      * the "Any" chain:
      *		phpCAS::allowProxyChain(new CAS_ProxyChain_Any);
@@ -1897,7 +1897,7 @@ class phpCAS
     }
 
     /**
-     * Checks of a proxy client aready exists
+     * Checks of a proxy client already exists
      *
      * @throws CAS_OutOfSequenceBeforeProxyException
      *
diff --git a/lib/apereo/phpcas/source/CAS/Client.php b/lib/apereo/phpcas/source/CAS/Client.php
index 8ca9711f4..7f7c7d111 100644
--- a/lib/apereo/phpcas/source/CAS/Client.php
+++ b/lib/apereo/phpcas/source/CAS/Client.php
@@ -788,7 +788,7 @@ class CAS_Client
             'file' => $dbg[1]['file'],
             'line' => $dbg[1]['line'],
             'method' => $dbg[1]['class'] . '::' . $dbg[1]['function'],
-            'result' => (boolean)$auth
+            'result' => (bool)$auth
         );
     }
     private $_authentication_caller;
@@ -926,7 +926,7 @@ class CAS_Client
      *                                                  CAS_ServiceBaseUrl_Interface for custom
      *                                                  behavior. Added in 1.6.0. Similar to
      *                                                  serverName config in other CAS clients.
-     * @param \SessionHandlerInterface $sessionHandler  the session handler
+     * @param \SessionHandlerInterface|null $sessionHandler  the session handler
      *
      * @return self a newly created CAS_Client object
      */
@@ -938,7 +938,7 @@ class CAS_Client
         $server_uri,
         $service_base_url,
         $changeSessionID = true,
-        \SessionHandlerInterface $sessionHandler = null
+        ?\SessionHandlerInterface $sessionHandler = null
     ) {
         // Argument validation
         if (gettype($server_version) != 'string')
@@ -3166,7 +3166,7 @@ class CAS_Client
                 $proxiedService->setCasClient($this);
             }
             return $proxiedService;
-        case PHPCAS_PROXIED_SERVICE_IMAP;
+        case PHPCAS_PROXIED_SERVICE_IMAP:
             $proxiedService = new CAS_ProxiedService_Imap($this->_getUser());
             if ($proxiedService instanceof CAS_ProxiedService_Testable) {
                 $proxiedService->setCasClient($this);
diff --git a/lib/apereo/phpcas/source/CAS/PGTStorage/Db.php b/lib/apereo/phpcas/source/CAS/PGTStorage/Db.php
index 2efe5a3e8..9f8baf37f 100644
--- a/lib/apereo/phpcas/source/CAS/PGTStorage/Db.php
+++ b/lib/apereo/phpcas/source/CAS/PGTStorage/Db.php
@@ -316,7 +316,7 @@ class CAS_PGTStorage_Db extends CAS_PGTStorage_AbstractStorage
         try {
             $pdo->beginTransaction();
 
-            $query = $pdo->query($this->createTableSQL());
+            $query = $pdo->query($this->createTableSql());
             $query->closeCursor();
 
             $pdo->commit();
diff --git a/lib/apereo/phpcas/source/CAS/PGTStorage/File.php b/lib/apereo/phpcas/source/CAS/PGTStorage/File.php
index fbacd3b7d..213ab40b7 100644
--- a/lib/apereo/phpcas/source/CAS/PGTStorage/File.php
+++ b/lib/apereo/phpcas/source/CAS/PGTStorage/File.php
@@ -127,6 +127,12 @@ class CAS_PGTStorage_File extends CAS_PGTStorage_AbstractStorage
             if (!preg_match('`^[a-zA-Z]:`', $path)) {
                 phpCAS::error('an absolute path is needed for PGT storage to file');
             }
+            
+			// ensure that the directory separator on Windows is '/' for consistency with the rest of the phpcas code
+			$path = str_replace(DIRECTORY_SEPARATOR , '/', $path); 
+ 
+			// store the path (with a trailing '/') 
+			$path = preg_replace('|([^/])$|', '$1/', $path);            
 
         } else {
 
diff --git a/lib/apereo/phpcas/source/CAS/Request/CurlMultiRequest.php b/lib/apereo/phpcas/source/CAS/Request/CurlMultiRequest.php
index 850f6f0e4..18a810ef9 100644
--- a/lib/apereo/phpcas/source/CAS/Request/CurlMultiRequest.php
+++ b/lib/apereo/phpcas/source/CAS/Request/CurlMultiRequest.php
@@ -139,7 +139,12 @@ implements CAS_Request_MultiRequestInterface
             $buf = curl_multi_getcontent($handles[$i]);
             $request->_storeResponseBody($buf);
             curl_multi_remove_handle($multiHandle, $handles[$i]);
-            curl_close($handles[$i]);
+            if (PHP_VERSION_ID < 80000) {
+                curl_close($handles[$i]);
+            } else {
+                // unreference it => it will be closed
+                unset($handles[$i]);
+            }
         }
 
         curl_multi_close($multiHandle);
diff --git a/lib/apereo/phpcas/source/CAS/Request/CurlRequest.php b/lib/apereo/phpcas/source/CAS/Request/CurlRequest.php
index e30dd0d19..ac7f0ec95 100644
--- a/lib/apereo/phpcas/source/CAS/Request/CurlRequest.php
+++ b/lib/apereo/phpcas/source/CAS/Request/CurlRequest.php
@@ -86,7 +86,9 @@ implements CAS_Request_RequestInterface
 
         }
         // close the CURL session
-        curl_close($ch);
+        if (PHP_VERSION_ID < 80000) {
+            curl_close($ch);
+        }
 
         phpCAS::traceEnd($res);
         return $res;
diff --git a/lib/bin/patch-type-declarations b/lib/bin/patch-type-declarations
old mode 100644
new mode 100755
diff --git a/lib/bin/patch-type-declarations.bat b/lib/bin/patch-type-declarations.bat
deleted file mode 100644
index 2b0707968..000000000
--- a/lib/bin/patch-type-declarations.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/patch-type-declarations
-SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
-php "%BIN_TARGET%" %*
diff --git a/lib/bin/php-parse b/lib/bin/php-parse
old mode 100644
new mode 100755
diff --git a/lib/bin/php-parse.bat b/lib/bin/php-parse.bat
deleted file mode 100644
index 2c5096dc3..000000000
--- a/lib/bin/php-parse.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/php-parse
-SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
-php "%BIN_TARGET%" %*
diff --git a/lib/bin/pscss b/lib/bin/pscss
old mode 100644
new mode 100755
diff --git a/lib/bin/pscss.bat b/lib/bin/pscss.bat
deleted file mode 100644
index 6b83bf27c..000000000
--- a/lib/bin/pscss.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/pscss
-SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
-php "%BIN_TARGET%" %*
diff --git a/lib/bin/var-dump-server b/lib/bin/var-dump-server
old mode 100644
new mode 100755
diff --git a/lib/bin/var-dump-server.bat b/lib/bin/var-dump-server.bat
deleted file mode 100644
index 94333da54..000000000
--- a/lib/bin/var-dump-server.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/var-dump-server
-SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
-php "%BIN_TARGET%" %*
diff --git a/lib/bin/yaml-lint b/lib/bin/yaml-lint
old mode 100644
new mode 100755
diff --git a/lib/bin/yaml-lint.bat b/lib/bin/yaml-lint.bat
deleted file mode 100644
index fa7663748..000000000
--- a/lib/bin/yaml-lint.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/yaml-lint
-SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
-php "%BIN_TARGET%" %*
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 87e682e8f..f33a4ce8f 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -958,6 +958,7 @@ return array(
     'PDF417' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
     'PDFBulkExport' => $baseDir . '/core/pdfbulkexport.class.inc.php',
     'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
+    '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',
     'Pelago\\Emogrifier\\Caching\\SimpleStringCache' => $vendorDir . '/pelago/emogrifier/src/Caching/SimpleStringCache.php',
@@ -1645,22 +1646,43 @@ return array(
     'Symfony\\Component\\Cache\\Psr16Cache' => $vendorDir . '/symfony/cache/Psr16Cache.php',
     'Symfony\\Component\\Cache\\ResettableInterface' => $vendorDir . '/symfony/cache/ResettableInterface.php',
     'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => $vendorDir . '/symfony/cache/Traits/AbstractAdapterTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\CachedValueInterface' => $vendorDir . '/symfony/cache/Traits/CachedValueInterface.php',
     'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => $vendorDir . '/symfony/cache/Traits/ContractsTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemCommonTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => $vendorDir . '/symfony/cache/Traits/ProxyTrait.php',
     'Symfony\\Component\\Cache\\Traits\\Redis5Proxy' => $vendorDir . '/symfony/cache/Traits/Redis5Proxy.php',
+    'Symfony\\Component\\Cache\\Traits\\Redis61ProxyTrait' => $vendorDir . '/symfony/cache/Traits/Redis61ProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Redis62ProxyTrait' => $vendorDir . '/symfony/cache/Traits/Redis62ProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Redis63ProxyTrait' => $vendorDir . '/symfony/cache/Traits/Redis63ProxyTrait.php',
     'Symfony\\Component\\Cache\\Traits\\Redis6Proxy' => $vendorDir . '/symfony/cache/Traits/Redis6Proxy.php',
-    'Symfony\\Component\\Cache\\Traits\\Redis6ProxyTrait' => $vendorDir . '/symfony/cache/Traits/Redis6ProxyTrait.php',
     'Symfony\\Component\\Cache\\Traits\\RedisCluster5Proxy' => $vendorDir . '/symfony/cache/Traits/RedisCluster5Proxy.php',
+    'Symfony\\Component\\Cache\\Traits\\RedisCluster61ProxyTrait' => $vendorDir . '/symfony/cache/Traits/RedisCluster61ProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\RedisCluster62ProxyTrait' => $vendorDir . '/symfony/cache/Traits/RedisCluster62ProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\RedisCluster63ProxyTrait' => $vendorDir . '/symfony/cache/Traits/RedisCluster63ProxyTrait.php',
     'Symfony\\Component\\Cache\\Traits\\RedisCluster6Proxy' => $vendorDir . '/symfony/cache/Traits/RedisCluster6Proxy.php',
-    'Symfony\\Component\\Cache\\Traits\\RedisCluster6ProxyTrait' => $vendorDir . '/symfony/cache/Traits/RedisCluster6ProxyTrait.php',
     'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisProxy' => $vendorDir . '/symfony/cache/Traits/RedisProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisTrait' => $vendorDir . '/symfony/cache/Traits/RedisTrait.php',
     'Symfony\\Component\\Cache\\Traits\\RelayProxy' => $vendorDir . '/symfony/cache/Traits/RelayProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RelayProxyTrait' => $vendorDir . '/symfony/cache/Traits/RelayProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\BgsaveTrait' => $vendorDir . '/symfony/cache/Traits/Relay/BgsaveTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\CopyTrait' => $vendorDir . '/symfony/cache/Traits/Relay/CopyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\FtTrait' => $vendorDir . '/symfony/cache/Traits/Relay/FtTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\GeosearchTrait' => $vendorDir . '/symfony/cache/Traits/Relay/GeosearchTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\GetWithMetaTrait' => $vendorDir . '/symfony/cache/Traits/Relay/GetWithMetaTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\GetrangeTrait' => $vendorDir . '/symfony/cache/Traits/Relay/GetrangeTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\HsetTrait' => $vendorDir . '/symfony/cache/Traits/Relay/HsetTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\IsTrackedTrait' => $vendorDir . '/symfony/cache/Traits/Relay/IsTrackedTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\MoveTrait' => $vendorDir . '/symfony/cache/Traits/Relay/MoveTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\NullableReturnTrait' => $vendorDir . '/symfony/cache/Traits/Relay/NullableReturnTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\PfcountTrait' => $vendorDir . '/symfony/cache/Traits/Relay/PfcountTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\Relay11Trait' => $vendorDir . '/symfony/cache/Traits/Relay/Relay11Trait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\Relay121Trait' => $vendorDir . '/symfony/cache/Traits/Relay/Relay121Trait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\Relay12Trait' => $vendorDir . '/symfony/cache/Traits/Relay/Relay12Trait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\Relay20Trait' => $vendorDir . '/symfony/cache/Traits/Relay/Relay20Trait.php',
+    'Symfony\\Component\\Cache\\Traits\\Relay\\SwapdbTrait' => $vendorDir . '/symfony/cache/Traits/Relay/SwapdbTrait.php',
     'Symfony\\Component\\Config\\Builder\\ClassBuilder' => $vendorDir . '/symfony/config/Builder/ClassBuilder.php',
     'Symfony\\Component\\Config\\Builder\\ConfigBuilderGenerator' => $vendorDir . '/symfony/config/Builder/ConfigBuilderGenerator.php',
     'Symfony\\Component\\Config\\Builder\\ConfigBuilderGeneratorInterface' => $vendorDir . '/symfony/config/Builder/ConfigBuilderGeneratorInterface.php',
@@ -1825,6 +1847,7 @@ return array(
     'Symfony\\Component\\Console\\Helper\\TableRows' => $vendorDir . '/symfony/console/Helper/TableRows.php',
     'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
     'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
+    'Symfony\\Component\\Console\\Helper\\TerminalInputHelper' => $vendorDir . '/symfony/console/Helper/TerminalInputHelper.php',
     'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
     'Symfony\\Component\\Console\\Input\\ArrayInput' => $vendorDir . '/symfony/console/Input/ArrayInput.php',
     'Symfony\\Component\\Console\\Input\\Input' => $vendorDir . '/symfony/console/Input/Input.php',
@@ -2699,7 +2722,6 @@ return array(
     'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => $vendorDir . '/symfony/var-dumper/Cloner/Cursor.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Data' => $vendorDir . '/symfony/var-dumper/Cloner/Data.php',
     'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
-    'Symfony\\Component\\VarDumper\\Cloner\\Internal\\NoDefault' => $vendorDir . '/symfony/var-dumper/Cloner/Internal/NoDefault.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
     'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
     'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
@@ -2854,6 +2876,7 @@ return array(
     'Twig\\ExpressionParser\\InfixExpressionParserInterface' => $vendorDir . '/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php',
     'Twig\\ExpressionParser\\Infix\\ArgumentsTrait' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php',
     'Twig\\ExpressionParser\\Infix\\ArrowExpressionParser' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/ArrowExpressionParser.php',
+    'Twig\\ExpressionParser\\Infix\\AssignmentExpressionParser' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/AssignmentExpressionParser.php',
     'Twig\\ExpressionParser\\Infix\\BinaryOperatorExpressionParser' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/BinaryOperatorExpressionParser.php',
     'Twig\\ExpressionParser\\Infix\\ConditionalTernaryExpressionParser' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/ConditionalTernaryExpressionParser.php',
     'Twig\\ExpressionParser\\Infix\\DotExpressionParser' => $vendorDir . '/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php',
@@ -2939,10 +2962,15 @@ return array(
     'Twig\\Node\\Expression\\Binary\\MulBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/MulBinary.php',
     'Twig\\Node\\Expression\\Binary\\NotEqualBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php',
     'Twig\\Node\\Expression\\Binary\\NotInBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/NotInBinary.php',
+    'Twig\\Node\\Expression\\Binary\\NotSameAsBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/NotSameAsBinary.php',
     'Twig\\Node\\Expression\\Binary\\NullCoalesceBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/NullCoalesceBinary.php',
+    'Twig\\Node\\Expression\\Binary\\ObjectDestructuringSetBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/ObjectDestructuringSetBinary.php',
     'Twig\\Node\\Expression\\Binary\\OrBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/OrBinary.php',
     'Twig\\Node\\Expression\\Binary\\PowerBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/PowerBinary.php',
     'Twig\\Node\\Expression\\Binary\\RangeBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/RangeBinary.php',
+    'Twig\\Node\\Expression\\Binary\\SameAsBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/SameAsBinary.php',
+    'Twig\\Node\\Expression\\Binary\\SequenceDestructuringSetBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/SequenceDestructuringSetBinary.php',
+    'Twig\\Node\\Expression\\Binary\\SetBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/SetBinary.php',
     'Twig\\Node\\Expression\\Binary\\SpaceshipBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php',
     'Twig\\Node\\Expression\\Binary\\StartsWithBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php',
     'Twig\\Node\\Expression\\Binary\\SubBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/SubBinary.php',
@@ -2951,6 +2979,7 @@ return array(
     'Twig\\Node\\Expression\\CallExpression' => $vendorDir . '/twig/twig/src/Node/Expression/CallExpression.php',
     'Twig\\Node\\Expression\\ConditionalExpression' => $vendorDir . '/twig/twig/src/Node/Expression/ConditionalExpression.php',
     'Twig\\Node\\Expression\\ConstantExpression' => $vendorDir . '/twig/twig/src/Node/Expression/ConstantExpression.php',
+    'Twig\\Node\\Expression\\EmptyExpression' => $vendorDir . '/twig/twig/src/Node/Expression/EmptyExpression.php',
     'Twig\\Node\\Expression\\FilterExpression' => $vendorDir . '/twig/twig/src/Node/Expression/FilterExpression.php',
     'Twig\\Node\\Expression\\Filter\\DefaultFilter' => $vendorDir . '/twig/twig/src/Node/Expression/Filter/DefaultFilter.php',
     'Twig\\Node\\Expression\\Filter\\RawFilter' => $vendorDir . '/twig/twig/src/Node/Expression/Filter/RawFilter.php',
diff --git a/lib/composer/autoload_namespaces.php b/lib/composer/autoload_namespaces.php
index 6629b7e09..b29b4a97f 100644
--- a/lib/composer/autoload_namespaces.php
+++ b/lib/composer/autoload_namespaces.php
@@ -8,5 +8,4 @@ $baseDir = dirname($vendorDir);
 return array(
     'Console' => array($vendorDir . '/pear/console_getopt'),
     'Archive_Tar' => array($vendorDir . '/pear/archive_tar'),
-    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
 );
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index c157af745..6e18001be 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -360,10 +360,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         ),
     );
 
-    public static $fallbackDirsPsr0 = array (
-        0 => __DIR__ . '/..' . '/pear/pear-core-minimal/src',
-    );
-
     public static $classMap = array (
         'AbstractApplicationObjectExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'AbstractApplicationUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
@@ -1317,6 +1313,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
         'PDFBulkExport' => __DIR__ . '/../..' . '/core/pdfbulkexport.class.inc.php',
         'PEAR' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
+        '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',
         'Pelago\\Emogrifier\\Caching\\SimpleStringCache' => __DIR__ . '/..' . '/pelago/emogrifier/src/Caching/SimpleStringCache.php',
@@ -2004,22 +2001,43 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Symfony\\Component\\Cache\\Psr16Cache' => __DIR__ . '/..' . '/symfony/cache/Psr16Cache.php',
         'Symfony\\Component\\Cache\\ResettableInterface' => __DIR__ . '/..' . '/symfony/cache/ResettableInterface.php',
         'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractAdapterTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\CachedValueInterface' => __DIR__ . '/..' . '/symfony/cache/Traits/CachedValueInterface.php',
         'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ContractsTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemCommonTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ProxyTrait.php',
         'Symfony\\Component\\Cache\\Traits\\Redis5Proxy' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis5Proxy.php',
+        'Symfony\\Component\\Cache\\Traits\\Redis61ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis61ProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Redis62ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis62ProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Redis63ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis63ProxyTrait.php',
         'Symfony\\Component\\Cache\\Traits\\Redis6Proxy' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis6Proxy.php',
-        'Symfony\\Component\\Cache\\Traits\\Redis6ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Redis6ProxyTrait.php',
         'Symfony\\Component\\Cache\\Traits\\RedisCluster5Proxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster5Proxy.php',
+        'Symfony\\Component\\Cache\\Traits\\RedisCluster61ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster61ProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\RedisCluster62ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster62ProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\RedisCluster63ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster63ProxyTrait.php',
         'Symfony\\Component\\Cache\\Traits\\RedisCluster6Proxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster6Proxy.php',
-        'Symfony\\Component\\Cache\\Traits\\RedisCluster6ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisCluster6ProxyTrait.php',
         'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisTrait.php',
         'Symfony\\Component\\Cache\\Traits\\RelayProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RelayProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RelayProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RelayProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\BgsaveTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/BgsaveTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\CopyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/CopyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\FtTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/FtTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\GeosearchTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/GeosearchTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\GetWithMetaTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/GetWithMetaTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\GetrangeTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/GetrangeTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\HsetTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/HsetTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\IsTrackedTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/IsTrackedTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\MoveTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/MoveTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\NullableReturnTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/NullableReturnTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\PfcountTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/PfcountTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\Relay11Trait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/Relay11Trait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\Relay121Trait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/Relay121Trait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\Relay12Trait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/Relay12Trait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\Relay20Trait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/Relay20Trait.php',
+        'Symfony\\Component\\Cache\\Traits\\Relay\\SwapdbTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/Relay/SwapdbTrait.php',
         'Symfony\\Component\\Config\\Builder\\ClassBuilder' => __DIR__ . '/..' . '/symfony/config/Builder/ClassBuilder.php',
         'Symfony\\Component\\Config\\Builder\\ConfigBuilderGenerator' => __DIR__ . '/..' . '/symfony/config/Builder/ConfigBuilderGenerator.php',
         'Symfony\\Component\\Config\\Builder\\ConfigBuilderGeneratorInterface' => __DIR__ . '/..' . '/symfony/config/Builder/ConfigBuilderGeneratorInterface.php',
@@ -2184,6 +2202,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Symfony\\Component\\Console\\Helper\\TableRows' => __DIR__ . '/..' . '/symfony/console/Helper/TableRows.php',
         'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
         'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
+        'Symfony\\Component\\Console\\Helper\\TerminalInputHelper' => __DIR__ . '/..' . '/symfony/console/Helper/TerminalInputHelper.php',
         'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
         'Symfony\\Component\\Console\\Input\\ArrayInput' => __DIR__ . '/..' . '/symfony/console/Input/ArrayInput.php',
         'Symfony\\Component\\Console\\Input\\Input' => __DIR__ . '/..' . '/symfony/console/Input/Input.php',
@@ -3058,7 +3077,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Cursor.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Data' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Data.php',
         'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
-        'Symfony\\Component\\VarDumper\\Cloner\\Internal\\NoDefault' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Internal/NoDefault.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
         'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
         'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
@@ -3213,6 +3231,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Twig\\ExpressionParser\\InfixExpressionParserInterface' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php',
         'Twig\\ExpressionParser\\Infix\\ArgumentsTrait' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php',
         'Twig\\ExpressionParser\\Infix\\ArrowExpressionParser' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/ArrowExpressionParser.php',
+        'Twig\\ExpressionParser\\Infix\\AssignmentExpressionParser' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/AssignmentExpressionParser.php',
         'Twig\\ExpressionParser\\Infix\\BinaryOperatorExpressionParser' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/BinaryOperatorExpressionParser.php',
         'Twig\\ExpressionParser\\Infix\\ConditionalTernaryExpressionParser' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/ConditionalTernaryExpressionParser.php',
         'Twig\\ExpressionParser\\Infix\\DotExpressionParser' => __DIR__ . '/..' . '/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php',
@@ -3298,10 +3317,15 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Twig\\Node\\Expression\\Binary\\MulBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/MulBinary.php',
         'Twig\\Node\\Expression\\Binary\\NotEqualBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php',
         'Twig\\Node\\Expression\\Binary\\NotInBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/NotInBinary.php',
+        'Twig\\Node\\Expression\\Binary\\NotSameAsBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/NotSameAsBinary.php',
         'Twig\\Node\\Expression\\Binary\\NullCoalesceBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/NullCoalesceBinary.php',
+        'Twig\\Node\\Expression\\Binary\\ObjectDestructuringSetBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/ObjectDestructuringSetBinary.php',
         'Twig\\Node\\Expression\\Binary\\OrBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/OrBinary.php',
         'Twig\\Node\\Expression\\Binary\\PowerBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/PowerBinary.php',
         'Twig\\Node\\Expression\\Binary\\RangeBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/RangeBinary.php',
+        'Twig\\Node\\Expression\\Binary\\SameAsBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/SameAsBinary.php',
+        'Twig\\Node\\Expression\\Binary\\SequenceDestructuringSetBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/SequenceDestructuringSetBinary.php',
+        'Twig\\Node\\Expression\\Binary\\SetBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/SetBinary.php',
         'Twig\\Node\\Expression\\Binary\\SpaceshipBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php',
         'Twig\\Node\\Expression\\Binary\\StartsWithBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php',
         'Twig\\Node\\Expression\\Binary\\SubBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/SubBinary.php',
@@ -3310,6 +3334,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Twig\\Node\\Expression\\CallExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/CallExpression.php',
         'Twig\\Node\\Expression\\ConditionalExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/ConditionalExpression.php',
         'Twig\\Node\\Expression\\ConstantExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/ConstantExpression.php',
+        'Twig\\Node\\Expression\\EmptyExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/EmptyExpression.php',
         'Twig\\Node\\Expression\\FilterExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/FilterExpression.php',
         'Twig\\Node\\Expression\\Filter\\DefaultFilter' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Filter/DefaultFilter.php',
         'Twig\\Node\\Expression\\Filter\\RawFilter' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Filter/RawFilter.php',
@@ -3542,7 +3567,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
             $loader->prefixLengthsPsr4 = ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$fallbackDirsPsr0;
             $loader->classMap = ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index c59aaf010..2bacb38f9 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "apereo/phpcas",
-            "version": "1.6.1",
-            "version_normalized": "1.6.1.0",
+            "version": "dev-master",
+            "version_normalized": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/apereo/phpCAS.git",
-                "reference": "c129708154852656aabb13d8606cd5b12dbbabac"
+                "url": "https://github.com/EsupPortail/phpCAS.git",
+                "reference": "57a7744146a963d8fa80192e0ab351051b711ff6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/c129708154852656aabb13d8606cd5b12dbbabac",
-                "reference": "c129708154852656aabb13d8606cd5b12dbbabac",
+                "url": "https://api.github.com/repos/EsupPortail/phpCAS/zipball/57a7744146a963d8fa80192e0ab351051b711ff6",
+                "reference": "57a7744146a963d8fa80192e0ab351051b711ff6",
                 "shasum": ""
             },
             "require": {
@@ -26,7 +26,8 @@
                 "phpstan/phpstan": "^1.5",
                 "phpunit/phpunit": ">=7.5"
             },
-            "time": "2023-02-19T19:52:35+00:00",
+            "time": "2025-12-02T11:38:23+00:00",
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -42,15 +43,27 @@
                     "source/"
                 ]
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "PhpCas\\": "test/CAS/"
+                }
+            },
+            "scripts": {
+                "test": [
+                    "phpunit"
+                ],
+                "phpstan": [
+                    "phpstan"
+                ]
+            },
             "license": [
                 "Apache-2.0"
             ],
             "authors": [
                 {
                     "name": "Joachim Fritschi",
-                    "email": "jfritschi@freenet.de",
-                    "homepage": "https://github.com/jfritschi"
+                    "homepage": "https://github.com/jfritschi",
+                    "email": "jfritschi@freenet.de"
                 },
                 {
                     "name": "Adam Franco",
@@ -69,8 +82,8 @@
                 "jasig"
             ],
             "support": {
-                "issues": "https://github.com/apereo/phpCAS/issues",
-                "source": "https://github.com/apereo/phpCAS/tree/1.6.1"
+                "source": "https://github.com/EsupPortail/phpCAS/tree/master",
+                "issues": "https://github.com/EsupPortail/phpCAS/issues"
             },
             "install-path": "../apereo/phpcas"
         },
@@ -226,27 +239,27 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.0",
-            "version_normalized": "6.10.0.0",
+            "version": "v7.0.2",
+            "version_normalized": "7.0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
+                "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65",
+                "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
+                "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "guzzlehttp/guzzle": "^7.4",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
+                "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0"
             },
@@ -254,7 +267,7 @@
                 "ext-sodium": "Support EdDSA (Ed25519) signatures",
                 "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
             },
-            "time": "2023-12-01T16:26:39+00:00",
+            "time": "2025-12-16T22:17:28+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -286,29 +299,29 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v7.0.2"
             },
             "install-path": "../firebase/php-jwt"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
-            "version_normalized": "7.8.1.0",
+            "version": "7.10.0",
+            "version_normalized": "7.10.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -319,9 +332,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -329,7 +342,7 @@
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
-            "time": "2023-12-03T20:35:24+00:00",
+            "time": "2025-08-23T22:36:01+00:00",
             "type": "library",
             "extra": {
                 "bamarni-bin": {
@@ -401,7 +414,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
             },
             "funding": [
                 {
@@ -421,17 +434,17 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
-            "version_normalized": "2.0.2.0",
+            "version": "2.3.0",
+            "version_normalized": "2.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
                 "shasum": ""
             },
             "require": {
@@ -439,9 +452,9 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
-            "time": "2023-12-03T20:19:20+00:00",
+            "time": "2025-08-22T14:34:08+00:00",
             "type": "library",
             "extra": {
                 "bamarni-bin": {
@@ -487,7 +500,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
             },
             "funding": [
                 {
@@ -507,17 +520,17 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
-            "version_normalized": "2.6.2.0",
+            "version": "2.8.0",
+            "version_normalized": "2.8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "21dc724a0583619cd1652f673303492272778051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+                "reference": "21dc724a0583619cd1652f673303492272778051",
                 "shasum": ""
             },
             "require": {
@@ -532,13 +545,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
-            "time": "2023-12-03T20:05:35+00:00",
+            "time": "2025-08-23T21:21:41+00:00",
             "type": "library",
             "extra": {
                 "bamarni-bin": {
@@ -606,7 +619,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
             },
             "funding": [
                 {
@@ -626,37 +639,32 @@
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.7.0",
-            "version_normalized": "2.7.0.0",
+            "version": "2.9.0",
+            "version_normalized": "2.9.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8"
+                "reference": "26e8c5da4f3d78cede7021e09b1330a0fc093d5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/160d6274b03562ebeb55ed18399281d8118b76c8",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/26e8c5da4f3d78cede7021e09b1330a0fc093d5e",
+                "reference": "26e8c5da4f3d78cede7021e09b1330a0fc093d5e",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0",
-                "paragonie/random_compat": "^1 || ^2 || ^9.99",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+                "php": "^7.1 || >=8.0.0 <8.6.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.5",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
-                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "^3.11"
             },
-            "time": "2023-04-16T18:19:15+00:00",
+            "time": "2025-11-25T22:17:17+00:00",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.0.x-dev"
-                }
-            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
@@ -693,23 +701,23 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.7.0"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.9.0"
             },
             "install-path": "../league/oauth2-client"
         },
         {
             "name": "league/oauth2-google",
-            "version": "4.0.1",
-            "version_normalized": "4.0.1.0",
+            "version": "4.1.0",
+            "version_normalized": "4.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-google.git",
-                "reference": "1b01ba18ba31b29e88771e3e0979e5c91d4afe76"
+                "reference": "8b9bb43740ac6d994aca881a35f7bacbe98c0ffb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/1b01ba18ba31b29e88771e3e0979e5c91d4afe76",
-                "reference": "1b01ba18ba31b29e88771e3e0979e5c91d4afe76",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-google/zipball/8b9bb43740ac6d994aca881a35f7bacbe98c0ffb",
+                "reference": "8b9bb43740ac6d994aca881a35f7bacbe98c0ffb",
                 "shasum": ""
             },
             "require": {
@@ -721,7 +729,7 @@
                 "phpunit/phpunit": "^8.0 || ^9.0",
                 "squizlabs/php_codesniffer": "^3.0"
             },
-            "time": "2023-03-17T15:20:52+00:00",
+            "time": "2025-12-15T12:24:14+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -751,43 +759,38 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-google/issues",
-                "source": "https://github.com/thephpleague/oauth2-google/tree/4.0.1"
+                "source": "https://github.com/thephpleague/oauth2-google/tree/4.1.0"
             },
             "install-path": "../league/oauth2-google"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
-            "version_normalized": "4.18.0.0",
+            "version": "v4.19.5",
+            "version_normalized": "4.19.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
+                "reference": "51bd93cc741b7fc3d63d20b6bdcd99fdaa359837",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
-            "time": "2023-12-10T21:03:43+00:00",
+            "time": "2025-12-06T11:45:25+00:00",
             "bin": [
                 "bin/php-parse"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.9-dev"
-                }
-            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
@@ -810,63 +813,10 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.5"
             },
             "install-path": "../nikic/php-parser"
         },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v9.99.100",
-            "version_normalized": "9.99.100.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
-                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">= 7"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "time": "2020-10-15T08:29:30+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
-            ],
-            "support": {
-                "email": "info@paragonie.com",
-                "issues": "https://github.com/paragonie/random_compat/issues",
-                "source": "https://github.com/paragonie/random_compat"
-            },
-            "install-path": "../paragonie/random_compat"
-        },
         {
             "name": "pear/archive_tar",
             "version": "1.4.14",
@@ -1006,33 +956,34 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.11",
-            "version_normalized": "1.10.11.0",
+            "version": "v1.10.18",
+            "version_normalized": "1.10.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
+                "reference": "c7b55789d01de0ce090d289b73f1bbd6a2f113b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
-                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/c7b55789d01de0ce090d289b73f1bbd6a2f113b1",
+                "reference": "c7b55789d01de0ce090d289b73f1bbd6a2f113b1",
                 "shasum": ""
             },
             "require": {
                 "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
+                "pear/pear_exception": "~1.0",
+                "php": ">=5.4"
             },
             "replace": {
                 "rsky/pear-core-min": "self.version"
             },
-            "time": "2021-08-10T22:31:03+00:00",
+            "time": "2025-12-14T20:37:07+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "include-path": [
@@ -1119,32 +1070,36 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v7.2.0",
-            "version_normalized": "7.2.0.0",
+            "version": "v7.3.0",
+            "version_normalized": "7.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3"
+                "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/727bdf7255b51798307f17dec52ff8a91f1c7de3",
-                "reference": "727bdf7255b51798307f17dec52ff8a91f1c7de3",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
+                "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "sabberworm/php-css-parser": "^8.4.0",
+                "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+                "sabberworm/php-css-parser": "^8.7.0",
                 "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0"
             },
             "require-dev": {
-                "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpunit/phpunit": "9.6.11",
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpstan/extension-installer": "1.4.3",
+                "phpstan/phpstan": "1.12.7",
+                "phpstan/phpstan-phpunit": "1.4.0",
+                "phpstan/phpstan-strict-rules": "1.6.1",
+                "phpunit/phpunit": "9.6.21",
                 "rawr/cross-data-providers": "2.4.0"
             },
-            "time": "2023-12-06T02:00:20+00:00",
+            "time": "2024-10-28T16:12:26+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1176,7 +1131,7 @@
                 },
                 {
                     "name": "Jake Hotson",
-                    "email": "jake@qzdesign.co.uk"
+                    "email": "jake.github@qzdesign.co.uk"
                 },
                 {
                     "name": "Cameron Brooks"
@@ -1416,24 +1371,24 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
-            "version_normalized": "1.0.2.0",
+            "version": "1.1.0",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
-            "time": "2023-04-10T20:10:41+00:00",
+            "time": "2024-04-15T12:06:14+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1456,7 +1411,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -1468,7 +1423,7 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
             "install-path": "../psr/http-factory"
         },
@@ -1630,32 +1585,37 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.4.0",
-            "version_normalized": "8.4.0.0",
+            "version": "v8.9.0",
+            "version_normalized": "8.9.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+                "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=5.6.20"
+                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "codacy/coverage": "^1.4",
-                "phpunit/phpunit": "^4.8.36"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+                "rawr/cross-data-providers": "^2.0.0"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
             },
-            "time": "2021-12-11T13:40:54+00:00",
+            "time": "2025-07-11T13:20:48+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
@@ -1669,6 +1629,14 @@
             "authors": [
                 {
                     "name": "Raphael Schweikert"
+                },
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake.github@qzdesign.co.uk"
                 }
             ],
             "description": "Parser for CSS Files written in PHP",
@@ -1679,24 +1647,24 @@
                 "stylesheet"
             ],
             "support": {
-                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
-                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+                "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
             },
             "install-path": "../sabberworm/php-css-parser"
         },
         {
             "name": "scssphp/scssphp",
-            "version": "v1.12.1",
-            "version_normalized": "1.12.1.0",
+            "version": "v1.13.0",
+            "version_normalized": "1.13.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb"
+                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/394ed1e960138710a60d035c1a85d43d0bf0faeb",
-                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/63d1157457e5554edf00b0c1fabab4c1511d2520",
+                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520",
                 "shasum": ""
             },
             "require": {
@@ -1719,15 +1687,15 @@
                 "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
                 "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
             },
-            "time": "2024-01-13T12:36:40+00:00",
+            "time": "2024-08-17T21:02:11+00:00",
             "bin": [
                 "bin/pscss"
             ],
             "type": "library",
             "extra": {
                 "bamarni-bin": {
-                    "forward-command": false,
-                    "bin-links": false
+                    "bin-links": false,
+                    "forward-command": false
                 }
             },
             "installation-source": "dist",
@@ -1763,7 +1731,7 @@
             ],
             "support": {
                 "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.12.1"
+                "source": "https://github.com/scssphp/scssphp/tree/v1.13.0"
             },
             "install-path": "../scssphp/scssphp"
         },
@@ -1827,17 +1795,17 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.12",
-            "version_normalized": "6.4.12.0",
+            "version": "v6.4.33",
+            "version_normalized": "6.4.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8"
+                "reference": "5b088fa41eb9568748dc255c45e4054c387ba73b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
-                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/5b088fa41eb9568748dc255c45e4054c387ba73b",
+                "reference": "5b088fa41eb9568748dc255c45e4054c387ba73b",
                 "shasum": ""
             },
             "require": {
@@ -1871,7 +1839,7 @@
                 "symfony/messenger": "^5.4|^6.0|^7.0",
                 "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
-            "time": "2024-09-16T16:01:33+00:00",
+            "time": "2026-01-27T15:05:20+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1906,7 +1874,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.12"
+                "source": "https://github.com/symfony/cache/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -1917,6 +1885,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"
@@ -2005,17 +1977,17 @@
         },
         {
             "name": "symfony/config",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e"
+                "reference": "d445badf0ad2c2a492e38c0378c39997a56ef97b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/5d33e0fb707d603330e0edfd4691803a1253572e",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/d445badf0ad2c2a492e38c0378c39997a56ef97b",
+                "reference": "d445badf0ad2c2a492e38c0378c39997a56ef97b",
                 "shasum": ""
             },
             "require": {
@@ -2035,7 +2007,7 @@
                 "symfony/service-contracts": "^2.5|^3",
                 "symfony/yaml": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-11-09T08:28:32+00:00",
+            "time": "2026-01-13T08:40:30+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2063,7 +2035,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v6.4.0"
+                "source": "https://github.com/symfony/config/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2074,6 +2046,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"
@@ -2083,17 +2059,17 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625"
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
+                "reference": "0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3",
                 "shasum": ""
             },
             "require": {
@@ -2126,7 +2102,7 @@
                 "symfony/stopwatch": "^5.4|^6.0|^7.0",
                 "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-10T16:15:48+00:00",
+            "time": "2026-01-13T08:45:59+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2160,7 +2136,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.2"
+                "source": "https://github.com/symfony/console/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2171,6 +2147,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"
@@ -2180,23 +2160,23 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.24",
+            "version_normalized": "6.4.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4"
+                "reference": "9b784413143701aa3c94ac1869a159a9e53e8761"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4",
-                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/9b784413143701aa3c94ac1869a159a9e53e8761",
+                "reference": "9b784413143701aa3c94ac1869a159a9e53e8761",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1"
             },
-            "time": "2023-10-31T08:40:20+00:00",
+            "time": "2025-07-10T08:14:14+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2228,7 +2208,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.0"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.24"
             },
             "funding": [
                 {
@@ -2239,6 +2219,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"
@@ -2248,17 +2232,17 @@
         },
         {
             "name": "symfony/debug-bundle",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.27",
+            "version_normalized": "6.4.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug-bundle.git",
-                "reference": "1e07027423d1d37125b60a50997ada26a9d9d202"
+                "reference": "21a61c55192d558a6b81cdb12e8c010fc9474fe0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/1e07027423d1d37125b60a50997ada26a9d9d202",
-                "reference": "1e07027423d1d37125b60a50997ada26a9d9d202",
+                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/21a61c55192d558a6b81cdb12e8c010fc9474fe0",
+                "reference": "21a61c55192d558a6b81cdb12e8c010fc9474fe0",
                 "shasum": ""
             },
             "require": {
@@ -2277,7 +2261,7 @@
                 "symfony/config": "^5.4|^6.0|^7.0",
                 "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-11-01T12:07:38+00:00",
+            "time": "2025-10-11T17:35:31+00:00",
             "type": "symfony-bundle",
             "installation-source": "dist",
             "autoload": {
@@ -2305,7 +2289,7 @@
             "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/debug-bundle/tree/v6.4.0"
+                "source": "https://github.com/symfony/debug-bundle/tree/v6.4.27"
             },
             "funding": [
                 {
@@ -2316,6 +2300,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"
@@ -2325,17 +2313,17 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195"
+                "reference": "b17882e933c4c606620247b6708ab53aa3b88753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/226ea431b1eda6f0d9f5a4b278757171960bb195",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b17882e933c4c606620247b6708ab53aa3b88753",
+                "reference": "b17882e933c4c606620247b6708ab53aa3b88753",
                 "shasum": ""
             },
             "require": {
@@ -2343,7 +2331,7 @@
                 "psr/container": "^1.1|^2.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/service-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.2.10|^7.0"
+                "symfony/var-exporter": "^6.4.20|^7.2.5"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2",
@@ -2361,7 +2349,7 @@
                 "symfony/expression-language": "^5.4|^6.0|^7.0",
                 "symfony/yaml": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-28T19:16:56+00:00",
+            "time": "2026-01-23T10:54:33+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2389,7 +2377,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.2"
+                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2400,6 +2388,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"
@@ -2479,17 +2471,17 @@
         },
         {
             "name": "symfony/dotenv",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.30",
+            "version_normalized": "6.4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dotenv.git",
-                "reference": "835f8d2d1022934ac038519de40b88158798c96f"
+                "reference": "924edbc9631b75302def0258ed1697948b17baf6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dotenv/zipball/835f8d2d1022934ac038519de40b88158798c96f",
-                "reference": "835f8d2d1022934ac038519de40b88158798c96f",
+                "url": "https://api.github.com/repos/symfony/dotenv/zipball/924edbc9631b75302def0258ed1697948b17baf6",
+                "reference": "924edbc9631b75302def0258ed1697948b17baf6",
                 "shasum": ""
             },
             "require": {
@@ -2503,7 +2495,7 @@
                 "symfony/console": "^5.4|^6.0|^7.0",
                 "symfony/process": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-28T19:16:56+00:00",
+            "time": "2025-11-14T17:33:48+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2536,7 +2528,7 @@
                 "environment"
             ],
             "support": {
-                "source": "https://github.com/symfony/dotenv/tree/v6.4.2"
+                "source": "https://github.com/symfony/dotenv/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -2547,6 +2539,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"
@@ -2556,17 +2552,17 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788"
+                "reference": "8c18400784fcb014dc73c8d5601a9576af7f8ad4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788",
-                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/8c18400784fcb014dc73c8d5601a9576af7f8ad4",
+                "reference": "8c18400784fcb014dc73c8d5601a9576af7f8ad4",
                 "shasum": ""
             },
             "require": {
@@ -2583,7 +2579,7 @@
                 "symfony/http-kernel": "^6.4|^7.0",
                 "symfony/serializer": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-10-18T09:43:34+00:00",
+            "time": "2026-01-19T19:28:19+00:00",
             "bin": [
                 "Resources/bin/patch-type-declarations"
             ],
@@ -2614,7 +2610,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.0"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2625,6 +2621,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"
@@ -2634,17 +2634,17 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.25",
-            "version_normalized": "6.4.25.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff"
+                "reference": "99d7e101826e6610606b9433248f80c1997cd20b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b0cf3162020603587363f0551cd3be43958611ff",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/99d7e101826e6610606b9433248f80c1997cd20b",
+                "reference": "99d7e101826e6610606b9433248f80c1997cd20b",
                 "shasum": ""
             },
             "require": {
@@ -2669,7 +2669,7 @@
                 "symfony/service-contracts": "^2.5|^3",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
-            "time": "2025-08-13T09:41:44+00:00",
+            "time": "2026-01-05T11:13:48+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2697,7 +2697,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.25"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -2800,17 +2800,17 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.30",
+            "version_normalized": "6.4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/441c6b69f7222aadae7cbf5df588496d5ee37789",
+                "reference": "441c6b69f7222aadae7cbf5df588496d5ee37789",
                 "shasum": ""
             },
             "require": {
@@ -2818,7 +2818,10 @@
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
-            "time": "2023-07-26T17:27:13+00:00",
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4|^7.0"
+            },
+            "time": "2025-11-26T14:43:45+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2846,7 +2849,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -2857,6 +2860,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"
@@ -2866,17 +2873,17 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.33",
+            "version_normalized": "6.4.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/24965ca011dac87431729640feef8bcf7b5523e0",
+                "reference": "24965ca011dac87431729640feef8bcf7b5523e0",
                 "shasum": ""
             },
             "require": {
@@ -2885,7 +2892,7 @@
             "require-dev": {
                 "symfony/filesystem": "^6.0|^7.0"
             },
-            "time": "2023-10-31T17:30:12+00:00",
+            "time": "2026-01-26T13:03:48+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2913,7 +2920,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+                "source": "https://github.com/symfony/finder/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -2924,6 +2931,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"
@@ -2933,17 +2944,17 @@
         },
         {
             "name": "symfony/framework-bundle",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.33",
+            "version_normalized": "6.4.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/framework-bundle.git",
-                "reference": "c26a221e0462027d1f9d4a802ed63f8ab07a43d0"
+                "reference": "9ef2d0b63b9e855ba351e770a603d89699115801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/c26a221e0462027d1f9d4a802ed63f8ab07a43d0",
-                "reference": "c26a221e0462027d1f9d4a802ed63f8ab07a43d0",
+                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/9ef2d0b63b9e855ba351e770a603d89699115801",
+                "reference": "9ef2d0b63b9e855ba351e770a603d89699115801",
                 "shasum": ""
             },
             "require": {
@@ -2952,7 +2963,7 @@
                 "php": ">=8.1",
                 "symfony/cache": "^5.4|^6.0|^7.0",
                 "symfony/config": "^6.1|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4.12|^7.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.1|^7.0",
                 "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
@@ -2982,7 +2993,8 @@
                 "symfony/mime": "<6.4",
                 "symfony/property-access": "<5.4",
                 "symfony/property-info": "<5.4",
-                "symfony/scheduler": "<6.4",
+                "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6",
+                "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
                 "symfony/security-core": "<5.4",
                 "symfony/security-csrf": "<5.4",
                 "symfony/serializer": "<6.4",
@@ -3021,7 +3033,7 @@
                 "symfony/process": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/rate-limiter": "^5.4|^6.0|^7.0",
-                "symfony/scheduler": "^6.4|^7.0",
+                "symfony/scheduler": "^6.4.4|^7.0.4",
                 "symfony/security-bundle": "^5.4|^6.0|^7.0",
                 "symfony/semaphore": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.4|^7.0",
@@ -3034,9 +3046,9 @@
                 "symfony/web-link": "^5.4|^6.0|^7.0",
                 "symfony/workflow": "^6.4|^7.0",
                 "symfony/yaml": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.10|^3.0"
+                "twig/twig": "^2.10|^3.0.4"
             },
-            "time": "2023-12-29T15:34:34+00:00",
+            "time": "2026-01-26T14:46:41+00:00",
             "type": "symfony-bundle",
             "installation-source": "dist",
             "autoload": {
@@ -3064,7 +3076,7 @@
             "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/framework-bundle/tree/v6.4.2"
+                "source": "https://github.com/symfony/framework-bundle/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -3075,6 +3087,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"
@@ -3084,17 +3100,17 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.29",
-            "version_normalized": "6.4.29.0",
+            "version": "v6.4.33",
+            "version_normalized": "6.4.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88"
+                "reference": "f1a490cc9d595ba7ebe684220e625d1e472ad278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88",
-                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f1a490cc9d595ba7ebe684220e625d1e472ad278",
+                "reference": "f1a490cc9d595ba7ebe684220e625d1e472ad278",
                 "shasum": ""
             },
             "require": {
@@ -3116,7 +3132,7 @@
                 "symfony/mime": "^5.4|^6.0|^7.0",
                 "symfony/rate-limiter": "^5.4|^6.0|^7.0"
             },
-            "time": "2025-11-08T16:40:12+00:00",
+            "time": "2026-01-27T15:04:55+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3144,7 +3160,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.29"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -3168,17 +3184,17 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.33",
+            "version_normalized": "6.4.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "13e8387320b5942d0dc408440c888e2d526efef4"
+                "reference": "73fa5c999d7f741ca544a97d3c791cc97890ae4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/13e8387320b5942d0dc408440c888e2d526efef4",
-                "reference": "13e8387320b5942d0dc408440c888e2d526efef4",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/73fa5c999d7f741ca544a97d3c791cc97890ae4d",
+                "reference": "73fa5c999d7f741ca544a97d3c791cc97890ae4d",
                 "shasum": ""
             },
             "require": {
@@ -3227,16 +3243,17 @@
                 "symfony/process": "^5.4|^6.0|^7.0",
                 "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
                 "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3|^7.0",
+                "symfony/serializer": "^6.4.4|^7.0.4",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0",
                 "symfony/translation": "^5.4|^6.0|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
                 "symfony/uid": "^5.4|^6.0|^7.0",
                 "symfony/validator": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.4|^7.0",
                 "symfony/var-exporter": "^6.2|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "time": "2023-12-30T15:31:44+00:00",
+            "time": "2026-01-28T10:02:13+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3264,7 +3281,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.33"
             },
             "funding": [
                 {
@@ -3275,6 +3292,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"
@@ -3284,17 +3305,17 @@
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.25",
-            "version_normalized": "6.4.25.0",
+            "version": "v6.4.31",
+            "version_normalized": "6.4.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2"
+                "reference": "8835f93333474780fda1b987cae37e33c3e026ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/628b43b45a3e6b15c8a633fb22df547ed9b492a2",
-                "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/8835f93333474780fda1b987cae37e33c3e026ca",
+                "reference": "8835f93333474780fda1b987cae37e33c3e026ca",
                 "shasum": ""
             },
             "require": {
@@ -3319,7 +3340,7 @@
                 "symfony/messenger": "^6.2|^7.0",
                 "symfony/twig-bridge": "^6.2|^7.0"
             },
-            "time": "2025-08-13T09:41:44+00:00",
+            "time": "2025-12-12T07:33:25+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3347,7 +3368,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.25"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.31"
             },
             "funding": [
                 {
@@ -3371,17 +3392,17 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.24",
-            "version_normalized": "6.4.24.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7"
+                "reference": "7409686879ca36c09fc970a5fa8ff6e93504dba4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/664d5e844a2de5e11c8255d0aef6bc15a9660ac7",
-                "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7409686879ca36c09fc970a5fa8ff6e93504dba4",
+                "reference": "7409686879ca36c09fc970a5fa8ff6e93504dba4",
                 "shasum": ""
             },
             "require": {
@@ -3407,7 +3428,7 @@
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.4.3|^7.0.3"
             },
-            "time": "2025-07-15T12:02:45+00:00",
+            "time": "2026-01-04T11:53:14+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3439,7 +3460,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.24"
+                "source": "https://github.com/symfony/mime/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -3463,21 +3484,21 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.0.0",
+            "version": "v1.33.0",
+            "version_normalized": "1.33.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -3485,15 +3506,12 @@
             "suggest": {
                 "ext-ctype": "For best performance"
             },
-            "time": "2023-01-26T09:26:14+00:00",
+            "time": "2024-09-09T11:45:10+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "installation-source": "dist",
@@ -3528,7 +3546,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -3539,6 +3557,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"
@@ -3548,34 +3570,31 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.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": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2023-01-26T09:26:14+00:00",
+            "time": "2025-06-27T09:58:17+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "installation-source": "dist",
@@ -3612,7 +3631,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -3623,6 +3642,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"
@@ -3981,17 +4004,17 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "98eab13a07fddc85766f1756129c69f207ffbc21"
+                "reference": "0dc6253e864e71b486e8ba4970a56ab849106ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/98eab13a07fddc85766f1756129c69f207ffbc21",
-                "reference": "98eab13a07fddc85766f1756129c69f207ffbc21",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/0dc6253e864e71b486e8ba4970a56ab849106ebe",
+                "reference": "0dc6253e864e71b486e8ba4970a56ab849106ebe",
                 "shasum": ""
             },
             "require": {
@@ -4013,7 +4036,7 @@
                 "symfony/http-foundation": "^5.4|^6.0|^7.0",
                 "symfony/yaml": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-29T15:34:34+00:00",
+            "time": "2026-01-12T08:31:19+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4047,7 +4070,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.2"
+                "source": "https://github.com/symfony/routing/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4058,6 +4081,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"
@@ -4067,17 +4094,17 @@
         },
         {
             "name": "symfony/runtime",
-            "version": "v6.4.24",
-            "version_normalized": "6.4.24.0",
+            "version": "v6.4.30",
+            "version_normalized": "6.4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/runtime.git",
-                "reference": "c1cc6721646f546627236c57f835272806087337"
+                "reference": "fb3149ee85d3b639dd3e49ea9dda05656f0537e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/runtime/zipball/c1cc6721646f546627236c57f835272806087337",
-                "reference": "c1cc6721646f546627236c57f835272806087337",
+                "url": "https://api.github.com/repos/symfony/runtime/zipball/fb3149ee85d3b639dd3e49ea9dda05656f0537e3",
+                "reference": "fb3149ee85d3b639dd3e49ea9dda05656f0537e3",
                 "shasum": ""
             },
             "require": {
@@ -4094,7 +4121,7 @@
                 "symfony/http-foundation": "^5.4|^6.0|^7.0",
                 "symfony/http-kernel": "^5.4|^6.0|^7.0"
             },
-            "time": "2025-07-10T08:14:14+00:00",
+            "time": "2025-12-05T10:55:13+00:00",
             "type": "composer-plugin",
             "extra": {
                 "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin"
@@ -4129,7 +4156,7 @@
                 "runtime"
             ],
             "support": {
-                "source": "https://github.com/symfony/runtime/tree/v6.4.24"
+                "source": "https://github.com/symfony/runtime/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -4243,24 +4270,24 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.24",
+            "version_normalized": "6.4.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
-                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b67e94e06a05d9572c2fa354483b3e13e3cb1898",
+                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "symfony/service-contracts": "^2.5|^3"
             },
-            "time": "2023-02-16T10:14:28+00:00",
+            "time": "2025-07-10T08:14:14+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4288,7 +4315,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.4.24"
             },
             "funding": [
                 {
@@ -4299,6 +4326,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"
@@ -4308,17 +4339,17 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.30",
+            "version_normalized": "6.4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc"
+                "reference": "50590a057841fa6bf69d12eceffce3465b9e32cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/50590a057841fa6bf69d12eceffce3465b9e32cb",
+                "reference": "50590a057841fa6bf69d12eceffce3465b9e32cb",
                 "shasum": ""
             },
             "require": {
@@ -4332,13 +4363,12 @@
                 "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/translation-contracts": "^2.5|^3.0",
                 "symfony/var-exporter": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-10T16:15:48+00:00",
+            "time": "2025-11-21T18:03:05+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4377,7 +4407,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.2"
+                "source": "https://github.com/symfony/string/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -4388,6 +4418,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"
@@ -4397,31 +4431,31 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.0",
-            "version_normalized": "3.4.0.0",
+            "version": "v3.6.1",
+            "version_normalized": "3.6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5"
+                "reference": "65a8bc82080447fae78373aa10f8d13b38338977"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5",
-                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977",
+                "reference": "65a8bc82080447fae78373aa10f8d13b38338977",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1"
             },
-            "time": "2023-07-25T15:08:44+00:00",
+            "time": "2025-07-15T13:41:35+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "installation-source": "dist",
@@ -4458,7 +4492,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1"
             },
             "funding": [
                 {
@@ -4469,6 +4503,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"
@@ -4478,17 +4516,17 @@
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf"
+                "reference": "1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf",
-                "reference": "142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8",
+                "reference": "1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8",
                 "shasum": ""
             },
             "require": {
@@ -4501,7 +4539,7 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/console": "<5.4",
-                "symfony/form": "<6.3",
+                "symfony/form": "<6.4.32|>7,<7.3.10|>7.4,<7.4.4",
                 "symfony/http-foundation": "<5.4",
                 "symfony/http-kernel": "<6.4",
                 "symfony/mime": "<6.2",
@@ -4519,7 +4557,7 @@
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
                 "symfony/expression-language": "^5.4|^6.0|^7.0",
                 "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/form": "^6.4|^7.0",
+                "symfony/form": "^6.4.32|~7.3.10|^7.4.4",
                 "symfony/html-sanitizer": "^6.1|^7.0",
                 "symfony/http-foundation": "^5.4|^6.0|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
@@ -4532,7 +4570,7 @@
                 "symfony/security-core": "^5.4|^6.0|^7.0",
                 "symfony/security-csrf": "^5.4|^6.0|^7.0",
                 "symfony/security-http": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0",
                 "symfony/translation": "^6.1|^7.0",
                 "symfony/web-link": "^5.4|^6.0|^7.0",
@@ -4542,7 +4580,7 @@
                 "twig/inky-extra": "^2.12|^3",
                 "twig/markdown-extra": "^2.12|^3"
             },
-            "time": "2023-11-25T08:25:13+00:00",
+            "time": "2026-01-03T23:03:08+00:00",
             "type": "symfony-bridge",
             "installation-source": "dist",
             "autoload": {
@@ -4570,7 +4608,7 @@
             "description": "Provides integration for Twig with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bridge/tree/v6.4.0"
+                "source": "https://github.com/symfony/twig-bridge/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4581,6 +4619,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"
@@ -4590,17 +4632,17 @@
         },
         {
             "name": "symfony/twig-bundle",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bundle.git",
-                "reference": "35d84393e598dfb774e6a2bf49e5229a8a6dbe4c"
+                "reference": "a5c8dcc11a5bf9c96320da20070d2e158a4e0b30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/35d84393e598dfb774e6a2bf49e5229a8a6dbe4c",
-                "reference": "35d84393e598dfb774e6a2bf49e5229a8a6dbe4c",
+                "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/a5c8dcc11a5bf9c96320da20070d2e158a4e0b30",
+                "reference": "a5c8dcc11a5bf9c96320da20070d2e158a4e0b30",
                 "shasum": ""
             },
             "require": {
@@ -4629,7 +4671,7 @@
                 "symfony/web-link": "^5.4|^6.0|^7.0",
                 "symfony/yaml": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-11-07T14:57:07+00:00",
+            "time": "2026-01-05T12:44:39+00:00",
             "type": "symfony-bundle",
             "installation-source": "dist",
             "autoload": {
@@ -4657,7 +4699,7 @@
             "description": "Provides a tight integration of Twig into the Symfony full-stack framework",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/twig-bundle/tree/v6.4.0"
+                "source": "https://github.com/symfony/twig-bundle/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4668,6 +4710,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"
@@ -4677,17 +4723,17 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f"
+                "reference": "131fc9915e0343052af5ed5040401b481ca192aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/68d6573ec98715ddcae5a0a85bee3c1c27a4c33f",
-                "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/131fc9915e0343052af5ed5040401b481ca192aa",
+                "reference": "131fc9915e0343052af5ed5040401b481ca192aa",
                 "shasum": ""
             },
             "require": {
@@ -4699,7 +4745,6 @@
                 "symfony/console": "<5.4"
             },
             "require-dev": {
-                "ext-iconv": "*",
                 "symfony/console": "^5.4|^6.0|^7.0",
                 "symfony/error-handler": "^6.3|^7.0",
                 "symfony/http-kernel": "^5.4|^6.0|^7.0",
@@ -4707,7 +4752,7 @@
                 "symfony/uid": "^5.4|^6.0|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "time": "2023-12-28T19:16:56+00:00",
+            "time": "2026-01-01T13:34:06+00:00",
             "bin": [
                 "Resources/bin/var-dump-server"
             ],
@@ -4745,7 +4790,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.2"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4756,6 +4801,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"
@@ -4849,17 +4898,17 @@
         },
         {
             "name": "symfony/web-profiler-bundle",
-            "version": "v6.4.2",
-            "version_normalized": "6.4.2.0",
+            "version": "v6.4.32",
+            "version_normalized": "6.4.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/web-profiler-bundle.git",
-                "reference": "38462d16856740ec0d1ba2cb902eebf09100dde2"
+                "reference": "011f59e3f3d20f60d11b4e78b8dc63504f56e145"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/38462d16856740ec0d1ba2cb902eebf09100dde2",
-                "reference": "38462d16856740ec0d1ba2cb902eebf09100dde2",
+                "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/011f59e3f3d20f60d11b4e78b8dc63504f56e145",
+                "reference": "011f59e3f3d20f60d11b4e78b8dc63504f56e145",
                 "shasum": ""
             },
             "require": {
@@ -4883,7 +4932,7 @@
                 "symfony/css-selector": "^5.4|^6.0|^7.0",
                 "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-12-27T08:18:35+00:00",
+            "time": "2026-01-06T09:13:42+00:00",
             "type": "symfony-bundle",
             "installation-source": "dist",
             "autoload": {
@@ -4914,7 +4963,7 @@
                 "dev"
             ],
             "support": {
-                "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.2"
+                "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -4925,6 +4974,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"
@@ -4934,17 +4987,17 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.4.0",
-            "version_normalized": "6.4.0.0",
+            "version": "v6.4.30",
+            "version_normalized": "6.4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587"
+                "reference": "8207ae83da19ee3748d6d4f567b4d9a7c656e331"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587",
-                "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/8207ae83da19ee3748d6d4f567b4d9a7c656e331",
+                "reference": "8207ae83da19ee3748d6d4f567b4d9a7c656e331",
                 "shasum": ""
             },
             "require": {
@@ -4958,7 +5011,7 @@
             "require-dev": {
                 "symfony/console": "^5.4|^6.0|^7.0"
             },
-            "time": "2023-11-06T11:00:25+00:00",
+            "time": "2025-12-02T11:50:18+00:00",
             "bin": [
                 "Resources/bin/yaml-lint"
             ],
@@ -4989,7 +5042,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.0"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.30"
             },
             "funding": [
                 {
@@ -5000,6 +5053,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"
@@ -5009,24 +5066,24 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.10.0",
-            "version_normalized": "6.10.0.0",
+            "version": "6.10.1",
+            "version_normalized": "6.10.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "ca5b6de294512145db96bcbc94e61696599c391d"
+                "reference": "7a2701251e5d52fc3d508fd71704683eb54f5939"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/ca5b6de294512145db96bcbc94e61696599c391d",
-                "reference": "ca5b6de294512145db96bcbc94e61696599c391d",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/7a2701251e5d52fc3d508fd71704683eb54f5939",
+                "reference": "7a2701251e5d52fc3d508fd71704683eb54f5939",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "php": ">=7.1.0"
             },
-            "time": "2025-05-27T18:02:28+00:00",
+            "time": "2025-11-21T10:58:21+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5071,7 +5128,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.10.0"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.10.1"
             },
             "funding": [
                 {
@@ -5083,30 +5140,30 @@
         },
         {
             "name": "thenetworg/oauth2-azure",
-            "version": "v2.2.2",
-            "version_normalized": "2.2.2.0",
+            "version": "v2.2.4",
+            "version_normalized": "2.2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TheNetworg/oauth2-azure.git",
-                "reference": "be204a5135f016470a9c33e82ab48785bbc11af2"
+                "reference": "a897d60b6b127daa2f27b1b4e62e7af40829d02f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TheNetworg/oauth2-azure/zipball/be204a5135f016470a9c33e82ab48785bbc11af2",
-                "reference": "be204a5135f016470a9c33e82ab48785bbc11af2",
+                "url": "https://api.github.com/repos/TheNetworg/oauth2-azure/zipball/a897d60b6b127daa2f27b1b4e62e7af40829d02f",
+                "reference": "a897d60b6b127daa2f27b1b4e62e7af40829d02f",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-openssl": "*",
-                "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0",
+                "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0||~7.0",
                 "league/oauth2-client": "~2.0",
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.6"
             },
-            "time": "2023-12-19T12:10:48+00:00",
+            "time": "2026-01-29T12:43:59+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5140,23 +5197,23 @@
             ],
             "support": {
                 "issues": "https://github.com/TheNetworg/oauth2-azure/issues",
-                "source": "https://github.com/TheNetworg/oauth2-azure/tree/v2.2.2"
+                "source": "https://github.com/TheNetworg/oauth2-azure/tree/v2.2.4"
             },
             "install-path": "../thenetworg/oauth2-azure"
         },
         {
             "name": "twig/twig",
-            "version": "v3.21.1",
-            "version_normalized": "3.21.1.0",
+            "version": "v3.23.0",
+            "version_normalized": "3.23.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d"
+                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
+                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
                 "shasum": ""
             },
             "require": {
@@ -5170,7 +5227,7 @@
                 "psr/container": "^1.0|^2.0",
                 "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
             },
-            "time": "2025-05-03T07:21:55+00:00",
+            "time": "2026-01-23T21:00:41+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5212,7 +5269,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.21.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.23.0"
             },
             "funding": [
                 {
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index f7908990c..f8012b9a7 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => 'combodo/itop',
-        'pretty_version' => 'dev-develop',
-        'version' => 'dev-develop',
-        'reference' => 'd5706fcbef58868cb8bd6ee6f3af133ca4fdab3e',
+        'pretty_version' => '1.0.0+no-version-set',
+        'version' => '1.0.0.0',
+        'reference' => null,
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,18 +11,20 @@
     ),
     'versions' => array(
         'apereo/phpcas' => array(
-            'pretty_version' => '1.6.1',
-            'version' => '1.6.1.0',
-            'reference' => 'c129708154852656aabb13d8606cd5b12dbbabac',
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => '57a7744146a963d8fa80192e0ab351051b711ff6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../apereo/phpcas',
-            'aliases' => array(),
+            'aliases' => array(
+                0 => '1.3.x-dev',
+            ),
             'dev_requirement' => false,
         ),
         'combodo/itop' => array(
-            'pretty_version' => 'dev-develop',
-            'version' => 'dev-develop',
-            'reference' => 'd5706fcbef58868cb8bd6ee6f3af133ca4fdab3e',
+            'pretty_version' => '1.0.0+no-version-set',
+            'version' => '1.0.0.0',
+            'reference' => null,
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -47,77 +49,68 @@
             'dev_requirement' => false,
         ),
         'firebase/php-jwt' => array(
-            'pretty_version' => 'v6.10.0',
-            'version' => '6.10.0.0',
-            'reference' => 'a49db6f0a5033aef5143295342f1c95521b075ff',
+            'pretty_version' => 'v7.0.2',
+            'version' => '7.0.2.0',
+            'reference' => '5645b43af647b6947daac1d0f659dd1fbe8d3b65',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
-            'pretty_version' => '7.8.1',
-            'version' => '7.8.1.0',
-            'reference' => '41042bc7ab002487b876a0683fc8dce04ddce104',
+            'pretty_version' => '7.10.0',
+            'version' => '7.10.0.0',
+            'reference' => 'b51ac707cfa420b7bfd4e4d5e510ba8008e822b4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
-            'pretty_version' => '2.0.2',
-            'version' => '2.0.2.0',
-            'reference' => 'bbff78d96034045e58e13dedd6ad91b5d1253223',
+            'pretty_version' => '2.3.0',
+            'version' => '2.3.0.0',
+            'reference' => '481557b130ef3790cf82b713667b43030dc9c957',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
-            'pretty_version' => '2.6.2',
-            'version' => '2.6.2.0',
-            'reference' => '45b30f99ac27b5ca93cb4831afe16285f57b8221',
+            'pretty_version' => '2.8.0',
+            'version' => '2.8.0.0',
+            'reference' => '21dc724a0583619cd1652f673303492272778051',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'league/oauth2-client' => array(
-            'pretty_version' => '2.7.0',
-            'version' => '2.7.0.0',
-            'reference' => '160d6274b03562ebeb55ed18399281d8118b76c8',
+            'pretty_version' => '2.9.0',
+            'version' => '2.9.0.0',
+            'reference' => '26e8c5da4f3d78cede7021e09b1330a0fc093d5e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-client',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'league/oauth2-google' => array(
-            'pretty_version' => '4.0.1',
-            'version' => '4.0.1.0',
-            'reference' => '1b01ba18ba31b29e88771e3e0979e5c91d4afe76',
+            'pretty_version' => '4.1.0',
+            'version' => '4.1.0.0',
+            'reference' => '8b9bb43740ac6d994aca881a35f7bacbe98c0ffb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-google',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v4.18.0',
-            'version' => '4.18.0.0',
-            'reference' => '1bcbb2179f97633e98bbbc87044ee2611c7d7999',
+            'pretty_version' => 'v4.19.5',
+            'version' => '4.19.5.0',
+            'reference' => '51bd93cc741b7fc3d63d20b6bdcd99fdaa359837',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
-        'paragonie/random_compat' => array(
-            'pretty_version' => 'v9.99.100',
-            'version' => '9.99.100.0',
-            'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../paragonie/random_compat',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
         'pear/archive_tar' => array(
             'pretty_version' => '1.4.14',
             'version' => '1.4.14.0',
@@ -137,9 +130,9 @@
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
-            'pretty_version' => 'v1.10.11',
-            'version' => '1.10.11.0',
-            'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d',
+            'pretty_version' => 'v1.10.18',
+            'version' => '1.10.18.0',
+            'reference' => 'c7b55789d01de0ce090d289b73f1bbd6a2f113b1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
@@ -155,9 +148,9 @@
             'dev_requirement' => false,
         ),
         'pelago/emogrifier' => array(
-            'pretty_version' => 'v7.2.0',
-            'version' => '7.2.0.0',
-            'reference' => '727bdf7255b51798307f17dec52ff8a91f1c7de3',
+            'pretty_version' => 'v7.3.0',
+            'version' => '7.3.0.0',
+            'reference' => '6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pelago/emogrifier',
             'aliases' => array(),
@@ -224,9 +217,9 @@
             ),
         ),
         'psr/http-factory' => array(
-            'pretty_version' => '1.0.2',
-            'version' => '1.0.2.0',
-            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
+            'pretty_version' => '1.1.0',
+            'version' => '1.1.0.0',
+            'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-factory',
             'aliases' => array(),
@@ -286,22 +279,22 @@
         'rsky/pear-core-min' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => 'v1.10.11',
+                0 => 'v1.10.18',
             ),
         ),
         'sabberworm/php-css-parser' => array(
-            'pretty_version' => '8.4.0',
-            'version' => '8.4.0.0',
-            'reference' => 'e41d2140031d533348b2192a83f02d8dd8a71d30',
+            'pretty_version' => 'v8.9.0',
+            'version' => '8.9.0.0',
+            'reference' => 'd8e916507b88e389e26d4ab03c904a082aa66bb9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabberworm/php-css-parser',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'scssphp/scssphp' => array(
-            'pretty_version' => 'v1.12.1',
-            'version' => '1.12.1.0',
-            'reference' => '394ed1e960138710a60d035c1a85d43d0bf0faeb',
+            'pretty_version' => 'v1.13.0',
+            'version' => '1.13.0.0',
+            'reference' => '63d1157457e5554edf00b0c1fabab4c1511d2520',
             'type' => 'library',
             'install_path' => __DIR__ . '/../scssphp/scssphp',
             'aliases' => array(),
@@ -317,9 +310,9 @@
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
-            'pretty_version' => 'v6.4.12',
-            'version' => '6.4.12.0',
-            'reference' => 'a463451b7f6ac4a47b98dbfc78ec2d3560c759d8',
+            'pretty_version' => 'v6.4.33',
+            'version' => '6.4.33.0',
+            'reference' => '5b088fa41eb9568748dc255c45e4054c387ba73b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache',
             'aliases' => array(),
@@ -341,45 +334,45 @@
             ),
         ),
         'symfony/config' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '5d33e0fb707d603330e0edfd4691803a1253572e',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => 'd445badf0ad2c2a492e38c0378c39997a56ef97b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/config',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/console' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '0254811a143e6bc6c8deea08b589a7e68a37f625',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '0bc2199c6c1f05276b05956f1ddc63f6d7eb5fc3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/console',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/css-selector' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => 'd036c6c0d0b09e24a14a35f8292146a658f986e4',
+            'pretty_version' => 'v6.4.24',
+            'version' => '6.4.24.0',
+            'reference' => '9b784413143701aa3c94ac1869a159a9e53e8761',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/css-selector',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/debug-bundle' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '1e07027423d1d37125b60a50997ada26a9d9d202',
+            'pretty_version' => 'v6.4.27',
+            'version' => '6.4.27.0',
+            'reference' => '21a61c55192d558a6b81cdb12e8c010fc9474fe0',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/debug-bundle',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/dependency-injection' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '226ea431b1eda6f0d9f5a4b278757171960bb195',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => 'b17882e933c4c606620247b6708ab53aa3b88753',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dependency-injection',
             'aliases' => array(),
@@ -395,27 +388,27 @@
             'dev_requirement' => false,
         ),
         'symfony/dotenv' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '835f8d2d1022934ac038519de40b88158798c96f',
+            'pretty_version' => 'v6.4.30',
+            'version' => '6.4.30.0',
+            'reference' => '924edbc9631b75302def0258ed1697948b17baf6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dotenv',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/error-handler' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => 'c873490a1c97b3a0a4838afc36ff36c112d02788',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '8c18400784fcb014dc73c8d5601a9576af7f8ad4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/error-handler',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher' => array(
-            'pretty_version' => 'v6.4.25',
-            'version' => '6.4.25.0',
-            'reference' => 'b0cf3162020603587363f0551cd3be43958611ff',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '99d7e101826e6610606b9433248f80c1997cd20b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher',
             'aliases' => array(),
@@ -437,81 +430,81 @@
             ),
         ),
         'symfony/filesystem' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '952a8cb588c3bc6ce76f6023000fb932f16a6e59',
+            'pretty_version' => 'v6.4.30',
+            'version' => '6.4.30.0',
+            'reference' => '441c6b69f7222aadae7cbf5df588496d5ee37789',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/filesystem',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/finder' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '11d736e97f116ac375a81f96e662911a34cd50ce',
+            'pretty_version' => 'v6.4.33',
+            'version' => '6.4.33.0',
+            'reference' => '24965ca011dac87431729640feef8bcf7b5523e0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/finder',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/framework-bundle' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => 'c26a221e0462027d1f9d4a802ed63f8ab07a43d0',
+            'pretty_version' => 'v6.4.33',
+            'version' => '6.4.33.0',
+            'reference' => '9ef2d0b63b9e855ba351e770a603d89699115801',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/framework-bundle',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/http-foundation' => array(
-            'pretty_version' => 'v6.4.29',
-            'version' => '6.4.29.0',
-            'reference' => 'b03d11e015552a315714c127d8d1e0f9e970ec88',
+            'pretty_version' => 'v6.4.33',
+            'version' => '6.4.33.0',
+            'reference' => 'f1a490cc9d595ba7ebe684220e625d1e472ad278',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-foundation',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/http-kernel' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '13e8387320b5942d0dc408440c888e2d526efef4',
+            'pretty_version' => 'v6.4.33',
+            'version' => '6.4.33.0',
+            'reference' => '73fa5c999d7f741ca544a97d3c791cc97890ae4d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-kernel',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/mailer' => array(
-            'pretty_version' => 'v6.4.25',
-            'version' => '6.4.25.0',
-            'reference' => '628b43b45a3e6b15c8a633fb22df547ed9b492a2',
+            'pretty_version' => 'v6.4.31',
+            'version' => '6.4.31.0',
+            'reference' => '8835f93333474780fda1b987cae37e33c3e026ca',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/mailer',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/mime' => array(
-            'pretty_version' => 'v6.4.24',
-            'version' => '6.4.24.0',
-            'reference' => '664d5e844a2de5e11c8255d0aef6bc15a9660ac7',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '7409686879ca36c09fc970a5fa8ff6e93504dba4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/mime',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => 'ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb',
+            'pretty_version' => 'v1.33.0',
+            'version' => '1.33.0.0',
+            'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-grapheme' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => '875e90aeea2777b6f135677f618529449334a612',
+            'pretty_version' => 'v1.33.0',
+            'version' => '1.33.0.0',
+            'reference' => '380872130d3a5dd3ace2f4010d95125fde5d5c70',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme',
             'aliases' => array(),
@@ -554,18 +547,18 @@
             'dev_requirement' => false,
         ),
         'symfony/routing' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '98eab13a07fddc85766f1756129c69f207ffbc21',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '0dc6253e864e71b486e8ba4970a56ab849106ebe',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/routing',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/runtime' => array(
-            'pretty_version' => 'v6.4.24',
-            'version' => '6.4.24.0',
-            'reference' => 'c1cc6721646f546627236c57f835272806087337',
+            'pretty_version' => 'v6.4.30',
+            'version' => '6.4.30.0',
+            'reference' => 'fb3149ee85d3b639dd3e49ea9dda05656f0537e3',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../symfony/runtime',
             'aliases' => array(),
@@ -587,54 +580,54 @@
             ),
         ),
         'symfony/stopwatch' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => 'fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2',
+            'pretty_version' => 'v6.4.24',
+            'version' => '6.4.24.0',
+            'reference' => 'b67e94e06a05d9572c2fa354483b3e13e3cb1898',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/stopwatch',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/string' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '7cb80bc10bfcdf6b5492741c0b9357dac66940bc',
+            'pretty_version' => 'v6.4.30',
+            'version' => '6.4.30.0',
+            'reference' => '50590a057841fa6bf69d12eceffce3465b9e32cb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/string',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/translation-contracts' => array(
-            'pretty_version' => 'v3.4.0',
-            'version' => '3.4.0.0',
-            'reference' => 'dee0c6e5b4c07ce851b462530088e64b255ac9c5',
+            'pretty_version' => 'v3.6.1',
+            'version' => '3.6.1.0',
+            'reference' => '65a8bc82080447fae78373aa10f8d13b38338977',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/translation-contracts',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/twig-bridge' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '142bc3ad4a61d7eedf7cc21d8ef2bd8a8e7417bf',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '1dcf980dd4f79885b986befdeb1c1bc0d6aedfc8',
             'type' => 'symfony-bridge',
             'install_path' => __DIR__ . '/../symfony/twig-bridge',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/twig-bundle' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '35d84393e598dfb774e6a2bf49e5229a8a6dbe4c',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => 'a5c8dcc11a5bf9c96320da20070d2e158a4e0b30',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/twig-bundle',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/var-dumper' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '68d6573ec98715ddcae5a0a85bee3c1c27a4c33f',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '131fc9915e0343052af5ed5040401b481ca192aa',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/var-dumper',
             'aliases' => array(),
@@ -650,45 +643,45 @@
             'dev_requirement' => false,
         ),
         'symfony/web-profiler-bundle' => array(
-            'pretty_version' => 'v6.4.2',
-            'version' => '6.4.2.0',
-            'reference' => '38462d16856740ec0d1ba2cb902eebf09100dde2',
+            'pretty_version' => 'v6.4.32',
+            'version' => '6.4.32.0',
+            'reference' => '011f59e3f3d20f60d11b4e78b8dc63504f56e145',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/web-profiler-bundle',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/yaml' => array(
-            'pretty_version' => 'v6.4.0',
-            'version' => '6.4.0.0',
-            'reference' => '4f9237a1bb42455d609e6687d2613dde5b41a587',
+            'pretty_version' => 'v6.4.30',
+            'version' => '6.4.30.0',
+            'reference' => '8207ae83da19ee3748d6d4f567b4d9a7c656e331',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/yaml',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'tecnickcom/tcpdf' => array(
-            'pretty_version' => '6.10.0',
-            'version' => '6.10.0.0',
-            'reference' => 'ca5b6de294512145db96bcbc94e61696599c391d',
+            'pretty_version' => '6.10.1',
+            'version' => '6.10.1.0',
+            'reference' => '7a2701251e5d52fc3d508fd71704683eb54f5939',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tecnickcom/tcpdf',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'thenetworg/oauth2-azure' => array(
-            'pretty_version' => 'v2.2.2',
-            'version' => '2.2.2.0',
-            'reference' => 'be204a5135f016470a9c33e82ab48785bbc11af2',
+            'pretty_version' => 'v2.2.4',
+            'version' => '2.2.4.0',
+            'reference' => 'a897d60b6b127daa2f27b1b4e62e7af40829d02f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../thenetworg/oauth2-azure',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'twig/twig' => array(
-            'pretty_version' => 'v3.21.1',
-            'version' => '3.21.1.0',
-            'reference' => '285123877d4dd97dd7c11842ac5fb7e86e60d81d',
+            'pretty_version' => 'v3.23.0',
+            'version' => '3.23.0.0',
+            'reference' => 'a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../twig/twig',
             'aliases' => array(),
diff --git a/lib/firebase/php-jwt/CHANGELOG.md b/lib/firebase/php-jwt/CHANGELOG.md
index 644fa0bea..263760760 100644
--- a/lib/firebase/php-jwt/CHANGELOG.md
+++ b/lib/firebase/php-jwt/CHANGELOG.md
@@ -1,5 +1,64 @@
 # Changelog
 
+## [7.0.2](https://github.com/firebase/php-jwt/compare/v7.0.1...v7.0.2) (2025-12-16)
+
+
+### Bug Fixes
+
+* add key length validation for ec keys ([#615](https://github.com/firebase/php-jwt/issues/615)) ([7044f9a](https://github.com/firebase/php-jwt/commit/7044f9ae7e7d175d28cca71714feb236f1c0e252))
+
+## [7.0.0](https://github.com/firebase/php-jwt/compare/v6.11.1...v7.0.0) (2025-12-15)
+
+
+### ⚠️ ⚠️ ⚠️  Security Fixes ⚠️ ⚠️ ⚠️ 
+ * add key size validation ([#613](https://github.com/firebase/php-jwt/issues/613)) ([6b80341](https://github.com/firebase/php-jwt/commit/6b80341bf57838ea2d011487917337901cd71576))
+ **NOTE**: This fix will cause keys with a size below the minimally allowed size to break. 
+
+### Features
+
+* add SensitiveParameter attribute to security-critical parameters ([#603](https://github.com/firebase/php-jwt/issues/603)) ([4dbfac0](https://github.com/firebase/php-jwt/commit/4dbfac0260eeb0e9e643063c99998e3219cc539b))
+* store timestamp in `ExpiredException` ([#604](https://github.com/firebase/php-jwt/issues/604)) ([f174826](https://github.com/firebase/php-jwt/commit/f1748260d218a856b6a0c23715ac7fae1d7ca95b))
+
+
+### Bug Fixes
+
+* validate iat and nbf on payload ([#568](https://github.com/firebase/php-jwt/issues/568)) ([953b2c8](https://github.com/firebase/php-jwt/commit/953b2c88bb445b7e3bb82a5141928f13d7343afd))
+
+## [6.11.1](https://github.com/firebase/php-jwt/compare/v6.11.0...v6.11.1) (2025-04-09)
+
+
+### Bug Fixes
+
+* update error text for consistency ([#528](https://github.com/firebase/php-jwt/issues/528)) ([c11113a](https://github.com/firebase/php-jwt/commit/c11113afa13265e016a669e75494b9203b8a7775))
+
+## [6.11.0](https://github.com/firebase/php-jwt/compare/v6.10.2...v6.11.0) (2025-01-23)
+
+
+### Features
+
+* support octet typed JWK ([#587](https://github.com/firebase/php-jwt/issues/587)) ([7cb8a26](https://github.com/firebase/php-jwt/commit/7cb8a265fa81edf2fa6ef8098f5bc5ae573c33ad))
+
+
+### Bug Fixes
+
+* refactor constructor Key to use PHP 8.0 syntax ([#577](https://github.com/firebase/php-jwt/issues/577)) ([29fa2ce](https://github.com/firebase/php-jwt/commit/29fa2ce9e0582cd397711eec1e80c05ce20fabca))
+
+## [6.10.2](https://github.com/firebase/php-jwt/compare/v6.10.1...v6.10.2) (2024-11-24)
+
+
+### Bug Fixes
+
+* Mitigate PHP8.4 deprecation warnings ([#570](https://github.com/firebase/php-jwt/issues/570)) ([76808fa](https://github.com/firebase/php-jwt/commit/76808fa227f3811aa5cdb3bf81233714b799a5b5))
+* support php 8.4 ([#583](https://github.com/firebase/php-jwt/issues/583)) ([e3d68b0](https://github.com/firebase/php-jwt/commit/e3d68b044421339443c74199edd020e03fb1887e))
+
+## [6.10.1](https://github.com/firebase/php-jwt/compare/v6.10.0...v6.10.1) (2024-05-18)
+
+
+### Bug Fixes
+
+* ensure ratelimit expiry is set every time ([#556](https://github.com/firebase/php-jwt/issues/556)) ([09cb208](https://github.com/firebase/php-jwt/commit/09cb2081c2c3bc0f61e2f2a5fbea5741f7498648))
+* ratelimit cache expiration ([#550](https://github.com/firebase/php-jwt/issues/550)) ([dda7250](https://github.com/firebase/php-jwt/commit/dda725033585ece30ff8cae8937320d7e9f18bae))
+
 ## [6.10.0](https://github.com/firebase/php-jwt/compare/v6.9.0...v6.10.0) (2023-11-28)
 
 
diff --git a/lib/firebase/php-jwt/README.md b/lib/firebase/php-jwt/README.md
index 701de23a8..65b6c8609 100644
--- a/lib/firebase/php-jwt/README.md
+++ b/lib/firebase/php-jwt/README.md
@@ -17,7 +17,7 @@ composer require firebase/php-jwt
 ```
 
 Optionally, install the `paragonie/sodium_compat` package from composer if your
-php is < 7.2 or does not have libsodium installed:
+php env does not have libsodium installed:
 
 ```bash
 composer require paragonie/sodium_compat
@@ -48,7 +48,8 @@ $decoded = JWT::decode($jwt, new Key($key, 'HS256'));
 print_r($decoded);
 
 // Pass a stdClass in as the third parameter to get the decoded header values
-$decoded = JWT::decode($jwt, new Key($key, 'HS256'), $headers = new stdClass());
+$headers = new stdClass();
+$decoded = JWT::decode($jwt, new Key($key, 'HS256'), $headers);
 print_r($headers);
 
 /*
@@ -185,7 +186,7 @@ $passphrase = '[YOUR_PASSPHRASE]';
 // Can be generated with "ssh-keygen -t rsa -m pem"
 $privateKeyFile = '/path/to/key-with-passphrase.pem';
 
-// Create a private key of type "resource"
+/** @var OpenSSLAsymmetricKey $privateKey */
 $privateKey = openssl_pkey_get_private(
     file_get_contents($privateKeyFile),
     $passphrase
@@ -290,7 +291,7 @@ $jwks = ['keys' => []];
 
 // JWK::parseKeySet($jwks) returns an associative array of **kid** to Firebase\JWT\Key
 // objects. Pass this as the second parameter to JWT::decode.
-JWT::decode($payload, JWK::parseKeySet($jwks));
+JWT::decode($jwt, JWK::parseKeySet($jwks));
 ```
 
 Using Cached Key Sets
@@ -349,7 +350,7 @@ use InvalidArgumentException;
 use UnexpectedValueException;
 
 try {
-    $decoded = JWT::decode($payload, $keys);
+    $decoded = JWT::decode($jwt, $keys);
 } catch (InvalidArgumentException $e) {
     // provided key/key-array is empty or malformed.
 } catch (DomainException $e) {
@@ -379,7 +380,7 @@ like this:
 use Firebase\JWT\JWT;
 use UnexpectedValueException;
 try {
-    $decoded = JWT::decode($payload, $keys);
+    $decoded = JWT::decode($jwt, $keys);
 } catch (LogicException $e) {
     // errors having to do with environmental setup or malformed JWT Keys
 } catch (UnexpectedValueException $e) {
@@ -394,7 +395,7 @@ instead, you can do the following:
 
 ```php
 // return type is stdClass
-$decoded = JWT::decode($payload, $keys);
+$decoded = JWT::decode($jwt, $keys);
 
 // cast to array
 $decoded = json_decode(json_encode($decoded), true);
diff --git a/lib/firebase/php-jwt/composer.json b/lib/firebase/php-jwt/composer.json
index e23dfe378..816cfd0bd 100644
--- a/lib/firebase/php-jwt/composer.json
+++ b/lib/firebase/php-jwt/composer.json
@@ -20,7 +20,7 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4||^8.0"
+        "php": "^8.0"
     },
     "suggest": {
         "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present",
@@ -32,10 +32,10 @@
         }
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^6.5||^7.4",
+        "guzzlehttp/guzzle": "^7.4",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5",
-        "psr/cache": "^1.0||^2.0",
+        "psr/cache": "^2.0||^3.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0"
     }
diff --git a/lib/firebase/php-jwt/src/CachedKeySet.php b/lib/firebase/php-jwt/src/CachedKeySet.php
index ee529f9f5..8e8e8d68c 100644
--- a/lib/firebase/php-jwt/src/CachedKeySet.php
+++ b/lib/firebase/php-jwt/src/CachedKeySet.php
@@ -80,9 +80,9 @@ class CachedKeySet implements ArrayAccess
         ClientInterface $httpClient,
         RequestFactoryInterface $httpFactory,
         CacheItemPoolInterface $cache,
-        int $expiresAfter = null,
+        ?int $expiresAfter = null,
         bool $rateLimit = false,
-        string $defaultAlg = null
+        ?string $defaultAlg = null
     ) {
         $this->jwksUri = $jwksUri;
         $this->httpClient = $httpClient;
@@ -180,7 +180,7 @@ class CachedKeySet implements ArrayAccess
             $jwksResponse = $this->httpClient->sendRequest($request);
             if ($jwksResponse->getStatusCode() !== 200) {
                 throw new UnexpectedValueException(
-                    sprintf('HTTP Error: %d %s for URI "%s"',
+                    \sprintf('HTTP Error: %d %s for URI "%s"',
                         $jwksResponse->getStatusCode(),
                         $jwksResponse->getReasonPhrase(),
                         $this->jwksUri,
@@ -212,15 +212,21 @@ class CachedKeySet implements ArrayAccess
         }
 
         $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
-        if (!$cacheItem->isHit()) {
-            $cacheItem->expiresAfter(1); // # of calls are cached each minute
+
+        $cacheItemData = [];
+        if ($cacheItem->isHit() && \is_array($data = $cacheItem->get())) {
+            $cacheItemData = $data;
         }
 
-        $callsPerMinute = (int) $cacheItem->get();
+        $callsPerMinute = $cacheItemData['callsPerMinute'] ?? 0;
+        $expiry = $cacheItemData['expiry'] ?? new \DateTime('+60 seconds', new \DateTimeZone('UTC'));
+
         if (++$callsPerMinute > $this->maxCallsPerMinute) {
             return true;
         }
-        $cacheItem->set($callsPerMinute);
+
+        $cacheItem->set(['expiry' => $expiry, 'callsPerMinute' => $callsPerMinute]);
+        $cacheItem->expiresAt($expiry);
         $this->cache->save($cacheItem);
         return false;
     }
diff --git a/lib/firebase/php-jwt/src/ExpiredException.php b/lib/firebase/php-jwt/src/ExpiredException.php
index 12fef0944..25f445132 100644
--- a/lib/firebase/php-jwt/src/ExpiredException.php
+++ b/lib/firebase/php-jwt/src/ExpiredException.php
@@ -6,6 +6,8 @@ class ExpiredException extends \UnexpectedValueException implements JWTException
 {
     private object $payload;
 
+    private ?int $timestamp = null;
+
     public function setPayload(object $payload): void
     {
         $this->payload = $payload;
@@ -15,4 +17,14 @@ class ExpiredException extends \UnexpectedValueException implements JWTException
     {
         return $this->payload;
     }
+
+    public function setTimestamp(int $timestamp): void
+    {
+        $this->timestamp = $timestamp;
+    }
+
+    public function getTimestamp(): ?int
+    {
+        return $this->timestamp;
+    }
 }
diff --git a/lib/firebase/php-jwt/src/JWK.php b/lib/firebase/php-jwt/src/JWK.php
index 63fb2484b..d5175b217 100644
--- a/lib/firebase/php-jwt/src/JWK.php
+++ b/lib/firebase/php-jwt/src/JWK.php
@@ -52,7 +52,7 @@ class JWK
      *
      * @uses parseKey
      */
-    public static function parseKeySet(array $jwks, string $defaultAlg = null): array
+    public static function parseKeySet(#[\SensitiveParameter] array $jwks, ?string $defaultAlg = null): array
     {
         $keys = [];
 
@@ -93,7 +93,7 @@ class JWK
      *
      * @uses createPemFromModulusAndExponent
      */
-    public static function parseKey(array $jwk, string $defaultAlg = null): ?Key
+    public static function parseKey(#[\SensitiveParameter] array $jwk, ?string $defaultAlg = null): ?Key
     {
         if (empty($jwk)) {
             throw new InvalidArgumentException('JWK must not be empty');
@@ -172,6 +172,12 @@ class JWK
                 // This library works internally with EdDSA keys (Ed25519) encoded in standard base64.
                 $publicKey = JWT::convertBase64urlToBase64($jwk['x']);
                 return new Key($publicKey, $jwk['alg']);
+            case 'oct':
+                if (!isset($jwk['k'])) {
+                    throw new UnexpectedValueException('k not set');
+                }
+
+                return new Key(JWT::urlsafeB64Decode($jwk['k']), $jwk['alg']);
             default:
                 break;
         }
@@ -212,7 +218,7 @@ class JWK
                 )
             );
 
-        return sprintf(
+        return \sprintf(
             "-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n",
             wordwrap(base64_encode($pem), 64, "\n", true)
         );
diff --git a/lib/firebase/php-jwt/src/JWT.php b/lib/firebase/php-jwt/src/JWT.php
index 263492068..c18e4cc06 100644
--- a/lib/firebase/php-jwt/src/JWT.php
+++ b/lib/firebase/php-jwt/src/JWT.php
@@ -31,6 +31,8 @@ class JWT
     private const ASN1_SEQUENCE = 0x10;
     private const ASN1_BIT_STRING = 0x03;
 
+    private const RSA_KEY_MIN_LENGTH=2048;
+
     /**
      * When checking nbf, iat or expiration times,
      * we want to provide some extra leeway time to
@@ -95,8 +97,8 @@ class JWT
      */
     public static function decode(
         string $jwt,
-        $keyOrKeyArray,
-        stdClass &$headers = null
+        #[\SensitiveParameter] $keyOrKeyArray,
+        ?stdClass &$headers = null
     ): stdClass {
         // Validate JWT
         $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp;
@@ -127,6 +129,16 @@ class JWT
         if (!$payload instanceof stdClass) {
             throw new UnexpectedValueException('Payload must be a JSON object');
         }
+        if (isset($payload->iat) && !\is_numeric($payload->iat)) {
+            throw new UnexpectedValueException('Payload iat must be a number');
+        }
+        if (isset($payload->nbf) && !\is_numeric($payload->nbf)) {
+            throw new UnexpectedValueException('Payload nbf must be a number');
+        }
+        if (isset($payload->exp) && !\is_numeric($payload->exp)) {
+            throw new UnexpectedValueException('Payload exp must be a number');
+        }
+
         $sig = static::urlsafeB64Decode($cryptob64);
         if (empty($header->alg)) {
             throw new UnexpectedValueException('Empty algorithm');
@@ -154,7 +166,7 @@ class JWT
         // token can actually be used. If it's not yet that time, abort.
         if (isset($payload->nbf) && floor($payload->nbf) > ($timestamp + static::$leeway)) {
             $ex = new BeforeValidException(
-                'Cannot handle token with nbf prior to ' . \date(DateTime::ISO8601, (int) $payload->nbf)
+                'Cannot handle token with nbf prior to ' . \date(DateTime::ATOM, (int) floor($payload->nbf))
             );
             $ex->setPayload($payload);
             throw $ex;
@@ -165,7 +177,7 @@ class JWT
         // correctly used the nbf claim).
         if (!isset($payload->nbf) && isset($payload->iat) && floor($payload->iat) > ($timestamp + static::$leeway)) {
             $ex = new BeforeValidException(
-                'Cannot handle token with iat prior to ' . \date(DateTime::ISO8601, (int) $payload->iat)
+                'Cannot handle token with iat prior to ' . \date(DateTime::ATOM, (int) floor($payload->iat))
             );
             $ex->setPayload($payload);
             throw $ex;
@@ -175,6 +187,7 @@ class JWT
         if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
             $ex = new ExpiredException('Expired token');
             $ex->setPayload($payload);
+            $ex->setTimestamp($timestamp);
             throw $ex;
         }
 
@@ -185,7 +198,7 @@ class JWT
      * Converts and signs a PHP array into a JWT string.
      *
      * @param array<mixed>          $payload PHP array
-     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $key The secret key.
+     * @param string|OpenSSLAsymmetricKey|OpenSSLCertificate $key The secret key.
      * @param string                $alg     Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
      *                                       'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
      * @param string                $keyId
@@ -198,13 +211,13 @@ class JWT
      */
     public static function encode(
         array $payload,
-        $key,
+        #[\SensitiveParameter] $key,
         string $alg,
-        string $keyId = null,
-        array $head = null
+        ?string $keyId = null,
+        ?array $head = null
     ): string {
         $header = ['typ' => 'JWT'];
-        if (isset($head) && \is_array($head)) {
+        if (isset($head)) {
             $header = \array_merge($header, $head);
         }
         $header['alg'] = $alg;
@@ -226,7 +239,7 @@ class JWT
      * Sign a string with a given key and algorithm.
      *
      * @param string $msg  The message to sign
-     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
+     * @param string|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
      * @param string $alg  Supported algorithms are 'EdDSA', 'ES384', 'ES256', 'ES256K', 'HS256',
      *                    'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
      *
@@ -236,7 +249,7 @@ class JWT
      */
     public static function sign(
         string $msg,
-        $key,
+        #[\SensitiveParameter] $key,
         string $alg
     ): string {
         if (empty(static::$supported_algs[$alg])) {
@@ -248,10 +261,19 @@ class JWT
                 if (!\is_string($key)) {
                     throw new InvalidArgumentException('key must be a string when using hmac');
                 }
+                self::validateHmacKeyLength($key, $algorithm);
                 return \hash_hmac($algorithm, $msg, $key, true);
             case 'openssl':
                 $signature = '';
-                $success = \openssl_sign($msg, $signature, $key, $algorithm); // @phpstan-ignore-line
+                if (!$key = openssl_pkey_get_private($key)) {
+                    throw new DomainException('OpenSSL unable to validate key');
+                }
+                if (str_starts_with($alg, 'RS')) {
+                    self::validateRsaKeyLength($key);
+                } elseif (str_starts_with($alg, 'ES')) {
+                    self::validateEcKeyLength($key, $alg);
+                }
+                $success = \openssl_sign($msg, $signature, $key, $algorithm);
                 if (!$success) {
                     throw new DomainException('OpenSSL unable to sign data');
                 }
@@ -290,7 +312,7 @@ class JWT
      *
      * @param string $msg         The original message (header and body)
      * @param string $signature   The original signature
-     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For Ed*, ES*, HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
+     * @param string|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For Ed*, ES*, HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
      * @param string $alg         The algorithm
      *
      * @return bool
@@ -300,7 +322,7 @@ class JWT
     private static function verify(
         string $msg,
         string $signature,
-        $keyMaterial,
+        #[\SensitiveParameter] $keyMaterial,
         string $alg
     ): bool {
         if (empty(static::$supported_algs[$alg])) {
@@ -310,7 +332,15 @@ class JWT
         list($function, $algorithm) = static::$supported_algs[$alg];
         switch ($function) {
             case 'openssl':
-                $success = \openssl_verify($msg, $signature, $keyMaterial, $algorithm); // @phpstan-ignore-line
+                if (!$key = openssl_pkey_get_public($keyMaterial)) {
+                    throw new DomainException('OpenSSL unable to validate key');
+                }
+                if (str_starts_with($alg, 'RS')) {
+                    self::validateRsaKeyLength($key);
+                } elseif (str_starts_with($alg, 'ES')) {
+                    self::validateEcKeyLength($key, $alg);
+                }
+                $success = \openssl_verify($msg, $signature, $keyMaterial, $algorithm);
                 if ($success === 1) {
                     return true;
                 }
@@ -347,6 +377,7 @@ class JWT
                 if (!\is_string($keyMaterial)) {
                     throw new InvalidArgumentException('key must be a string when using hmac');
                 }
+                self::validateHmacKeyLength($keyMaterial, $algorithm);
                 $hash = \hash_hmac($algorithm, $msg, $keyMaterial, true);
                 return self::constantTimeEquals($hash, $signature);
         }
@@ -384,12 +415,7 @@ class JWT
      */
     public static function jsonEncode(array $input): string
     {
-        if (PHP_VERSION_ID >= 50400) {
-            $json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
-        } else {
-            // PHP 5.3 only
-            $json = \json_encode($input);
-        }
+        $json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
         if ($errno = \json_last_error()) {
             self::handleJsonError($errno);
         } elseif ($json === 'null') {
@@ -459,7 +485,7 @@ class JWT
      * @return Key
      */
     private static function getKey(
-        $keyOrKeyArray,
+        #[\SensitiveParameter] $keyOrKeyArray,
         ?string $kid
     ): Key {
         if ($keyOrKeyArray instanceof Key) {
@@ -666,4 +692,57 @@ class JWT
 
         return [$pos, $data];
     }
+
+    /**
+     * Validate HMAC key length
+     *
+     * @param string $key HMAC key material
+     * @param string $algorithm The algorithm
+     *
+     * @throws DomainException Provided key is too short
+     */
+    private static function validateHmacKeyLength(string $key, string $algorithm): void
+    {
+        $keyLength = \strlen($key) * 8;
+        $minKeyLength = (int) \str_replace('SHA', '', $algorithm);
+        if ($keyLength < $minKeyLength) {
+            throw new DomainException('Provided key is too short');
+        }
+    }
+
+    /**
+     * Validate RSA key length
+     *
+     * @param OpenSSLAsymmetricKey $key RSA key material
+     * @throws DomainException Provided key is too short
+     */
+    private static function validateRsaKeyLength(#[\SensitiveParameter] OpenSSLAsymmetricKey $key): void
+    {
+        if (!$keyDetails = openssl_pkey_get_details($key)) {
+            throw new DomainException('Unable to validate key');
+        }
+        if ($keyDetails['bits'] < self::RSA_KEY_MIN_LENGTH) {
+            throw new DomainException('Provided key is too short');
+        }
+    }
+
+    /**
+     * Validate RSA key length
+     *
+     * @param OpenSSLAsymmetricKey $key RSA key material
+     * @param string $algorithm The algorithm
+     * @throws DomainException Provided key is too short
+     */
+    private static function validateEcKeyLength(
+        #[\SensitiveParameter] OpenSSLAsymmetricKey $key,
+        string $algorithm
+    ): void {
+        if (!$keyDetails = openssl_pkey_get_details($key)) {
+            throw new DomainException('Unable to validate key');
+        }
+        $minKeyLength = (int) \str_replace('ES', '', $algorithm);
+        if ($keyDetails['bits'] < $minKeyLength) {
+            throw new DomainException('Provided key is too short');
+        }
+    }
 }
diff --git a/lib/firebase/php-jwt/src/Key.php b/lib/firebase/php-jwt/src/Key.php
index 00cf7f2ed..694d3b13b 100644
--- a/lib/firebase/php-jwt/src/Key.php
+++ b/lib/firebase/php-jwt/src/Key.php
@@ -9,26 +9,20 @@ use TypeError;
 
 class Key
 {
-    /** @var string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate */
-    private $keyMaterial;
-    /** @var string */
-    private $algorithm;
-
     /**
-     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $keyMaterial
+     * @param string|OpenSSLAsymmetricKey|OpenSSLCertificate $keyMaterial
      * @param string $algorithm
      */
     public function __construct(
-        $keyMaterial,
-        string $algorithm
+        #[\SensitiveParameter] private $keyMaterial,
+        private string $algorithm
     ) {
         if (
             !\is_string($keyMaterial)
             && !$keyMaterial instanceof OpenSSLAsymmetricKey
             && !$keyMaterial instanceof OpenSSLCertificate
-            && !\is_resource($keyMaterial)
         ) {
-            throw new TypeError('Key material must be a string, resource, or OpenSSLAsymmetricKey');
+            throw new TypeError('Key material must be a string, OpenSSLCertificate, or OpenSSLAsymmetricKey');
         }
 
         if (empty($keyMaterial)) {
@@ -38,10 +32,6 @@ class Key
         if (empty($algorithm)) {
             throw new InvalidArgumentException('Algorithm must not be empty');
         }
-
-        // TODO: Remove in PHP 8.0 in favor of class constructor property promotion
-        $this->keyMaterial = $keyMaterial;
-        $this->algorithm = $algorithm;
     }
 
     /**
@@ -55,7 +45,7 @@ class Key
     }
 
     /**
-     * @return string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate
+     * @return string|OpenSSLAsymmetricKey|OpenSSLCertificate
      */
     public function getKeyMaterial()
     {
diff --git a/lib/guzzlehttp/guzzle/CHANGELOG.md b/lib/guzzlehttp/guzzle/CHANGELOG.md
index 13709d1b8..5fe721e03 100644
--- a/lib/guzzlehttp/guzzle/CHANGELOG.md
+++ b/lib/guzzlehttp/guzzle/CHANGELOG.md
@@ -2,6 +2,56 @@
 
 Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
 
+## 7.10.0 - 2025-08-23
+
+### Added
+
+- Support for PHP 8.5
+
+### Changed
+
+- Adjusted `guzzlehttp/promises` version constraint to `^2.3`
+- Adjusted `guzzlehttp/psr7` version constraint to `^2.8`
+
+
+## 7.9.3 - 2025-03-27
+
+### Changed
+
+- Remove explicit content-length header for GET requests
+- Improve compatibility with bad servers for boolean cookie values
+
+
+## 7.9.2 - 2024-07-24
+
+### Fixed
+
+- Adjusted handler selection to use cURL if its version is 7.21.2 or higher, rather than 7.34.0
+
+
+## 7.9.1 - 2024-07-19
+
+### Fixed
+
+- Fix TLS 1.3 check for HTTP/2 requests
+
+
+## 7.9.0 - 2024-07-18
+
+### Changed
+
+- Improve protocol version checks to provide feedback around unsupported protocols
+- Only select the cURL handler by default if 7.34.0 or higher is linked
+- Improved `CurlMultiHandler` to avoid busy wait if possible
+- Dropped support for EOL `guzzlehttp/psr7` v1
+- Improved URI user info redaction in errors
+
+## 7.8.2 - 2024-07-18
+
+### Added
+
+- Support for PHP 8.4
+
 
 ## 7.8.1 - 2023-12-03
 
diff --git a/lib/guzzlehttp/guzzle/README.md b/lib/guzzlehttp/guzzle/README.md
index 6d78a9309..cdaebee3f 100644
--- a/lib/guzzlehttp/guzzle/README.md
+++ b/lib/guzzlehttp/guzzle/README.md
@@ -62,11 +62,11 @@ composer require guzzlehttp/guzzle
 
 | Version | Status              | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version  |
 |---------|---------------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
-| 3.x     | EOL                 | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >=5.3.3,<7.0 |
-| 4.x     | EOL                 | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >=5.4,<7.0   |
-| 5.x     | EOL                 | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >=5.4,<7.4   |
-| 6.x     | Security fixes only | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >=5.5,<8.0   |
-| 7.x     | Latest              | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.4 |
+| 3.x     | EOL (2016-10-31)    | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >=5.3.3,<7.0 |
+| 4.x     | EOL (2016-10-31)    | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >=5.4,<7.0   |
+| 5.x     | EOL (2019-10-31)    | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >=5.4,<7.4   |
+| 6.x     | EOL (2023-10-31)    | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >=5.5,<8.0   |
+| 7.x     | Latest              | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.5 |
 
 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
 [guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
diff --git a/lib/guzzlehttp/guzzle/composer.json b/lib/guzzlehttp/guzzle/composer.json
index 69583d7cc..0db75a950 100644
--- a/lib/guzzlehttp/guzzle/composer.json
+++ b/lib/guzzlehttp/guzzle/composer.json
@@ -50,11 +50,39 @@
             "homepage": "https://github.com/Tobion"
         }
     ],
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "guzzle/client-integration-tests",
+                "version": "v3.0.2",
+                "dist": {
+                    "url": "https://codeload.github.com/guzzle/client-integration-tests/zip/2c025848417c1135031fdf9c728ee53d0a7ceaee",
+                    "type": "zip"
+                },
+                "require": {
+                    "php": "^7.2.5 || ^8.0",
+                    "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.11",
+                    "php-http/message": "^1.0 || ^2.0",
+                    "guzzlehttp/psr7": "^1.7 || ^2.0",
+                    "th3n3rd/cartesian-product": "^0.3"
+                },
+                "autoload": {
+                    "psr-4": {
+                        "Http\\Client\\Tests\\": "src/"
+                    }
+                },
+                "bin": [
+                    "bin/http_test_server"
+                ]
+            }
+        }
+    ],
     "require": {
         "php": "^7.2.5 || ^8.0",
         "ext-json": "*",
-        "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-        "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+        "guzzlehttp/promises": "^2.3",
+        "guzzlehttp/psr7": "^2.8",
         "psr/http-client": "^1.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0"
     },
@@ -64,9 +92,9 @@
     "require-dev": {
         "ext-curl": "*",
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+        "guzzle/client-integration-tests": "3.0.2",
         "php-http/message-factory": "^1.1",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+        "phpunit/phpunit": "^8.5.39 || ^9.6.20",
         "psr/log": "^1.1 || ^2.0 || ^3.0"
     },
     "suggest": {
diff --git a/lib/guzzlehttp/guzzle/src/BodySummarizer.php b/lib/guzzlehttp/guzzle/src/BodySummarizer.php
index 6eca94ef9..761506dd0 100644
--- a/lib/guzzlehttp/guzzle/src/BodySummarizer.php
+++ b/lib/guzzlehttp/guzzle/src/BodySummarizer.php
@@ -11,7 +11,7 @@ final class BodySummarizer implements BodySummarizerInterface
      */
     private $truncateAt;
 
-    public function __construct(int $truncateAt = null)
+    public function __construct(?int $truncateAt = null)
     {
         $this->truncateAt = $truncateAt;
     }
@@ -22,7 +22,7 @@ final class BodySummarizer implements BodySummarizerInterface
     public function summarize(MessageInterface $message): ?string
     {
         return $this->truncateAt === null
-            ? \GuzzleHttp\Psr7\Message::bodySummary($message)
-            : \GuzzleHttp\Psr7\Message::bodySummary($message, $this->truncateAt);
+            ? Psr7\Message::bodySummary($message)
+            : Psr7\Message::bodySummary($message, $this->truncateAt);
     }
 }
diff --git a/lib/guzzlehttp/guzzle/src/Client.php b/lib/guzzlehttp/guzzle/src/Client.php
index bc6efc90f..c78919a4f 100644
--- a/lib/guzzlehttp/guzzle/src/Client.php
+++ b/lib/guzzlehttp/guzzle/src/Client.php
@@ -52,7 +52,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
      *
      * @param array $config Client configuration settings.
      *
-     * @see \GuzzleHttp\RequestOptions for a list of available request options.
+     * @see RequestOptions for a list of available request options.
      */
     public function __construct(array $config = [])
     {
@@ -202,7 +202,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
      *
      * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
      */
-    public function getConfig(string $option = null)
+    public function getConfig(?string $option = null)
     {
         return $option === null
             ? $this->config
diff --git a/lib/guzzlehttp/guzzle/src/ClientInterface.php b/lib/guzzlehttp/guzzle/src/ClientInterface.php
index 1788e16ab..6aaee61af 100644
--- a/lib/guzzlehttp/guzzle/src/ClientInterface.php
+++ b/lib/guzzlehttp/guzzle/src/ClientInterface.php
@@ -80,5 +80,5 @@ interface ClientInterface
      *
      * @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
      */
-    public function getConfig(string $option = null);
+    public function getConfig(?string $option = null);
 }
diff --git a/lib/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/lib/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index c29b4b7e9..b616cf2ed 100644
--- a/lib/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/lib/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -103,7 +103,7 @@ class CookieJar implements CookieJarInterface
         }, $this->getIterator()->getArrayCopy());
     }
 
-    public function clear(string $domain = null, string $path = null, string $name = null): void
+    public function clear(?string $domain = null, ?string $path = null, ?string $name = null): void
     {
         if (!$domain) {
             $this->cookies = [];
diff --git a/lib/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/lib/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
index 8c55cc6f7..93ada58d2 100644
--- a/lib/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ b/lib/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
@@ -62,7 +62,7 @@ interface CookieJarInterface extends \Countable, \IteratorAggregate
      * @param string|null $path   Clears cookies matching a domain and path
      * @param string|null $name   Clears cookies matching a domain, path, and name
      */
-    public function clear(string $domain = null, string $path = null, string $name = null): void;
+    public function clear(?string $domain = null, ?string $path = null, ?string $name = null): void;
 
     /**
      * Discard all sessions cookies.
diff --git a/lib/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/lib/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index c9806da88..47c4d10ae 100644
--- a/lib/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/lib/guzzlehttp/guzzle/src/Cookie/SetCookie.php
@@ -62,6 +62,10 @@ class SetCookie
                             if (is_numeric($value)) {
                                 $data[$search] = (int) $value;
                             }
+                        } elseif ($search === 'Secure' || $search === 'Discard' || $search === 'HttpOnly') {
+                            if ($value) {
+                                $data[$search] = true;
+                            }
                         } else {
                             $data[$search] = $value;
                         }
diff --git a/lib/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/lib/guzzlehttp/guzzle/src/Exception/BadResponseException.php
index a80956c9d..ba67ad498 100644
--- a/lib/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ b/lib/guzzlehttp/guzzle/src/Exception/BadResponseException.php
@@ -14,7 +14,7 @@ class BadResponseException extends RequestException
         string $message,
         RequestInterface $request,
         ResponseInterface $response,
-        \Throwable $previous = null,
+        ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         parent::__construct($message, $request, $response, $previous, $handlerContext);
diff --git a/lib/guzzlehttp/guzzle/src/Exception/ConnectException.php b/lib/guzzlehttp/guzzle/src/Exception/ConnectException.php
index e1a31519c..eab51ca17 100644
--- a/lib/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ b/lib/guzzlehttp/guzzle/src/Exception/ConnectException.php
@@ -25,7 +25,7 @@ class ConnectException extends TransferException implements NetworkExceptionInte
     public function __construct(
         string $message,
         RequestInterface $request,
-        \Throwable $previous = null,
+        ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         parent::__construct($message, 0, $previous);
diff --git a/lib/guzzlehttp/guzzle/src/Exception/RequestException.php b/lib/guzzlehttp/guzzle/src/Exception/RequestException.php
index c2d0a9ccc..b42c88abf 100644
--- a/lib/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/lib/guzzlehttp/guzzle/src/Exception/RequestException.php
@@ -7,7 +7,6 @@ use GuzzleHttp\BodySummarizerInterface;
 use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
 
 /**
  * HTTP Request exception
@@ -32,8 +31,8 @@ class RequestException extends TransferException implements RequestExceptionInte
     public function __construct(
         string $message,
         RequestInterface $request,
-        ResponseInterface $response = null,
-        \Throwable $previous = null,
+        ?ResponseInterface $response = null,
+        ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         // Set the code of the exception if the response is set and not future.
@@ -63,10 +62,10 @@ class RequestException extends TransferException implements RequestExceptionInte
      */
     public static function create(
         RequestInterface $request,
-        ResponseInterface $response = null,
-        \Throwable $previous = null,
+        ?ResponseInterface $response = null,
+        ?\Throwable $previous = null,
         array $handlerContext = [],
-        BodySummarizerInterface $bodySummarizer = null
+        ?BodySummarizerInterface $bodySummarizer = null
     ): self {
         if (!$response) {
             return new self(
@@ -90,8 +89,7 @@ class RequestException extends TransferException implements RequestExceptionInte
             $className = __CLASS__;
         }
 
-        $uri = $request->getUri();
-        $uri = static::obfuscateUri($uri);
+        $uri = \GuzzleHttp\Psr7\Utils::redactUserInfo($request->getUri());
 
         // Client Error: `GET /` resulted in a `404 Not Found` response:
         // <html> ... (truncated)
@@ -113,20 +111,6 @@ class RequestException extends TransferException implements RequestExceptionInte
         return new $className($message, $request, $response, $previous, $handlerContext);
     }
 
-    /**
-     * Obfuscates URI if there is a username and a password present
-     */
-    private static function obfuscateUri(UriInterface $uri): UriInterface
-    {
-        $userInfo = $uri->getUserInfo();
-
-        if (false !== ($pos = \strpos($userInfo, ':'))) {
-            return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***');
-        }
-
-        return $uri;
-    }
-
     /**
      * Get the request that caused the exception
      */
diff --git a/lib/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/lib/guzzlehttp/guzzle/src/Handler/CurlFactory.php
index 16a942232..3c1fa9c13 100644
--- a/lib/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/lib/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@@ -11,6 +11,7 @@ use GuzzleHttp\Psr7\LazyOpenStream;
 use GuzzleHttp\TransferStats;
 use GuzzleHttp\Utils;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Creates curl resources from a request
@@ -46,6 +47,16 @@ class CurlFactory implements CurlFactoryInterface
 
     public function create(RequestInterface $request, array $options): EasyHandle
     {
+        $protocolVersion = $request->getProtocolVersion();
+
+        if ('2' === $protocolVersion || '2.0' === $protocolVersion) {
+            if (!self::supportsHttp2()) {
+                throw new ConnectException('HTTP/2 is supported by the cURL handler, however libcurl is built without HTTP/2 support.', $request);
+            }
+        } elseif ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
+            throw new ConnectException(sprintf('HTTP/%s is not supported by the cURL handler.', $protocolVersion), $request);
+        }
+
         if (isset($options['curl']['body_as_string'])) {
             $options['_body_as_string'] = $options['curl']['body_as_string'];
             unset($options['curl']['body_as_string']);
@@ -72,13 +83,51 @@ class CurlFactory implements CurlFactoryInterface
         return $easy;
     }
 
+    private static function supportsHttp2(): bool
+    {
+        static $supportsHttp2 = null;
+
+        if (null === $supportsHttp2) {
+            $supportsHttp2 = self::supportsTls12()
+                && defined('CURL_VERSION_HTTP2')
+                && (\CURL_VERSION_HTTP2 & \curl_version()['features']);
+        }
+
+        return $supportsHttp2;
+    }
+
+    private static function supportsTls12(): bool
+    {
+        static $supportsTls12 = null;
+
+        if (null === $supportsTls12) {
+            $supportsTls12 = \CURL_SSLVERSION_TLSv1_2 & \curl_version()['features'];
+        }
+
+        return $supportsTls12;
+    }
+
+    private static function supportsTls13(): bool
+    {
+        static $supportsTls13 = null;
+
+        if (null === $supportsTls13) {
+            $supportsTls13 = defined('CURL_SSLVERSION_TLSv1_3')
+                && (\CURL_SSLVERSION_TLSv1_3 & \curl_version()['features']);
+        }
+
+        return $supportsTls13;
+    }
+
     public function release(EasyHandle $easy): void
     {
         $resource = $easy->handle;
         unset($easy->handle);
 
         if (\count($this->handles) >= $this->maxHandles) {
-            \curl_close($resource);
+            if (PHP_VERSION_ID < 80000) {
+                \curl_close($resource);
+            }
         } else {
             // Remove all callback functions as they can hold onto references
             // and are not cleaned up by curl_reset. Using curl_setopt_array
@@ -147,7 +196,7 @@ class CurlFactory implements CurlFactoryInterface
             'error' => \curl_error($easy->handle),
             'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME),
         ] + \curl_getinfo($easy->handle);
-        $ctx[self::CURL_VERSION_STR] = \curl_version()['version'];
+        $ctx[self::CURL_VERSION_STR] = self::getCurlVersion();
         $factory->release($easy);
 
         // Retry when nothing is present or when curl failed to rewind.
@@ -158,6 +207,17 @@ class CurlFactory implements CurlFactoryInterface
         return self::createRejection($easy, $ctx);
     }
 
+    private static function getCurlVersion(): string
+    {
+        static $curlVersion = null;
+
+        if (null === $curlVersion) {
+            $curlVersion = \curl_version()['version'];
+        }
+
+        return $curlVersion;
+    }
+
     private static function createRejection(EasyHandle $easy, array $ctx): PromiseInterface
     {
         static $connectionErrors = [
@@ -194,15 +254,22 @@ class CurlFactory implements CurlFactoryInterface
             );
         }
 
+        $uri = $easy->request->getUri();
+
+        $sanitizedError = self::sanitizeCurlError($ctx['error'] ?? '', $uri);
+
         $message = \sprintf(
             'cURL error %s: %s (%s)',
             $ctx['errno'],
-            $ctx['error'],
+            $sanitizedError,
             'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
         );
-        $uriString = (string) $easy->request->getUri();
-        if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) {
-            $message .= \sprintf(' for %s', $uriString);
+
+        if ('' !== $sanitizedError) {
+            $redactedUriString = \GuzzleHttp\Psr7\Utils::redactUserInfo($uri)->__toString();
+            if ($redactedUriString !== '' && false === \strpos($sanitizedError, $redactedUriString)) {
+                $message .= \sprintf(' for %s', $redactedUriString);
+            }
         }
 
         // Create a connection exception if it was a specific error code.
@@ -213,6 +280,24 @@ class CurlFactory implements CurlFactoryInterface
         return P\Create::rejectionFor($error);
     }
 
+    private static function sanitizeCurlError(string $error, UriInterface $uri): string
+    {
+        if ('' === $error) {
+            return $error;
+        }
+
+        $baseUri = $uri->withQuery('')->withFragment('');
+        $baseUriString = $baseUri->__toString();
+
+        if ('' === $baseUriString) {
+            return $error;
+        }
+
+        $redactedUriString = \GuzzleHttp\Psr7\Utils::redactUserInfo($baseUri)->__toString();
+
+        return str_replace($baseUriString, $redactedUriString, $error);
+    }
+
     /**
      * @return array<int|string, mixed>
      */
@@ -232,10 +317,11 @@ class CurlFactory implements CurlFactoryInterface
         }
 
         $version = $easy->request->getProtocolVersion();
-        if ($version == 1.1) {
-            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1;
-        } elseif ($version == 2.0) {
+
+        if ('2' === $version || '2.0' === $version) {
             $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2_0;
+        } elseif ('1.1' === $version) {
+            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1;
         } else {
             $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_0;
         }
@@ -390,8 +476,10 @@ class CurlFactory implements CurlFactoryInterface
                 // The empty string enables all available decoders and implicitly
                 // sets a matching 'Accept-Encoding' header.
                 $conf[\CURLOPT_ENCODING] = '';
-                // But as the user did not specify any acceptable encodings we need
-                // to overwrite this implicit header with an empty one.
+                // But as the user did not specify any encoding preference,
+                // let's leave it up to server by preventing curl from sending
+                // the header, which will be interpreted as 'Accept-Encoding: *'.
+                // https://www.rfc-editor.org/rfc/rfc9110#field.accept-encoding
                 $conf[\CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
             }
         }
@@ -455,23 +543,35 @@ class CurlFactory implements CurlFactoryInterface
         }
 
         if (isset($options['crypto_method'])) {
-            if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_0')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL');
+            $protocolVersion = $easy->request->getProtocolVersion();
+
+            // If HTTP/2, upgrade TLS 1.0 and 1.1 to 1.2
+            if ('2' === $protocolVersion || '2.0' === $protocolVersion) {
+                if (
+                    \STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']
+                    || \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']
+                    || \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']
+                ) {
+                    $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
+                } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
+                    if (!self::supportsTls13()) {
+                        throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
+                    }
+                    $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
+                } else {
+                    throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
                 }
+            } elseif (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_1')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL');
-                }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1;
             } elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_2')) {
+                if (!self::supportsTls12()) {
                     throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
             } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_3')) {
+                if (!self::supportsTls13()) {
                     throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
                 }
                 $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
@@ -631,7 +731,10 @@ class CurlFactory implements CurlFactoryInterface
     public function __destruct()
     {
         foreach ($this->handles as $id => $handle) {
-            \curl_close($handle);
+            if (PHP_VERSION_ID < 80000) {
+                \curl_close($handle);
+            }
+
             unset($this->handles[$id]);
         }
     }
diff --git a/lib/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/lib/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
index a64e1821a..21abbedf3 100644
--- a/lib/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ b/lib/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
@@ -2,6 +2,7 @@
 
 namespace GuzzleHttp\Handler;
 
+use Closure;
 use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
@@ -159,6 +160,9 @@ class CurlMultiHandler
             }
         }
 
+        // Run curl_multi_exec in the queue to enable other async tasks to run
+        P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
+
         // Step through the task queue which may add additional requests.
         P\Utils::queue()->run();
 
@@ -169,11 +173,24 @@ class CurlMultiHandler
         }
 
         while (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+            // Prevent busy looping for slow HTTP requests.
+            \curl_multi_select($this->_mh, $this->selectTimeout);
         }
 
         $this->processMessages();
     }
 
+    /**
+     * Runs \curl_multi_exec() inside the event loop, to prevent busy looping
+     */
+    private function tickInQueue(): void
+    {
+        if (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+            \curl_multi_select($this->_mh, 0);
+            P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
+        }
+    }
+
     /**
      * Runs until all outstanding connections have completed.
      */
@@ -223,7 +240,10 @@ class CurlMultiHandler
         $handle = $this->handles[$id]['easy']->handle;
         unset($this->delays[$id], $this->handles[$id]);
         \curl_multi_remove_handle($this->_mh, $handle);
-        \curl_close($handle);
+
+        if (PHP_VERSION_ID < 80000) {
+            \curl_close($handle);
+        }
 
         return true;
     }
diff --git a/lib/guzzlehttp/guzzle/src/Handler/MockHandler.php b/lib/guzzlehttp/guzzle/src/Handler/MockHandler.php
index 77ffed521..3ecd5964d 100644
--- a/lib/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ b/lib/guzzlehttp/guzzle/src/Handler/MockHandler.php
@@ -52,21 +52,21 @@ class MockHandler implements \Countable
      * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
      */
-    public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null): HandlerStack
+    public static function createWithMiddleware(?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null): HandlerStack
     {
         return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
     }
 
     /**
      * The passed in value must be an array of
-     * {@see \Psr\Http\Message\ResponseInterface} objects, Exceptions,
+     * {@see ResponseInterface} objects, Exceptions,
      * callables, or Promises.
      *
      * @param array<int, mixed>|null $queue       The parameters to be passed to the append function, as an indexed array.
      * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
      */
-    public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
+    public function __construct(?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null)
     {
         $this->onFulfilled = $onFulfilled;
         $this->onRejected = $onRejected;
@@ -200,7 +200,7 @@ class MockHandler implements \Countable
     private function invokeStats(
         RequestInterface $request,
         array $options,
-        ResponseInterface $response = null,
+        ?ResponseInterface $response = null,
         $reason = null
     ): void {
         if (isset($options['on_stats'])) {
diff --git a/lib/guzzlehttp/guzzle/src/Handler/Proxy.php b/lib/guzzlehttp/guzzle/src/Handler/Proxy.php
index f045b526c..9df70cf23 100644
--- a/lib/guzzlehttp/guzzle/src/Handler/Proxy.php
+++ b/lib/guzzlehttp/guzzle/src/Handler/Proxy.php
@@ -17,10 +17,10 @@ class Proxy
      * Sends synchronous requests to a specific handler while sending all other
      * requests to another handler.
      *
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default Handler used for normal responses
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $sync    Handler used for synchronous responses.
+     * @param callable(RequestInterface, array): PromiseInterface $default Handler used for normal responses
+     * @param callable(RequestInterface, array): PromiseInterface $sync    Handler used for synchronous responses.
      *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
+     * @return callable(RequestInterface, array): PromiseInterface Returns the composed handler.
      */
     public static function wrapSync(callable $default, callable $sync): callable
     {
@@ -37,10 +37,10 @@ class Proxy
      * performance benefits of curl while still supporting true streaming
      * through the StreamHandler.
      *
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default   Handler used for non-streaming responses
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $streaming Handler used for streaming responses
+     * @param callable(RequestInterface, array): PromiseInterface $default   Handler used for non-streaming responses
+     * @param callable(RequestInterface, array): PromiseInterface $streaming Handler used for streaming responses
      *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
+     * @return callable(RequestInterface, array): PromiseInterface Returns the composed handler.
      */
     public static function wrapStreaming(callable $default, callable $streaming): callable
     {
diff --git a/lib/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/lib/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index 61632f564..f24921f47 100644
--- a/lib/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/lib/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -40,6 +40,12 @@ class StreamHandler
             \usleep($options['delay'] * 1000);
         }
 
+        $protocolVersion = $request->getProtocolVersion();
+
+        if ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
+            throw new ConnectException(sprintf('HTTP/%s is not supported by the stream handler.', $protocolVersion), $request);
+        }
+
         $startTime = isset($options['on_stats']) ? Utils::currentTime() : null;
 
         try {
@@ -47,8 +53,14 @@ class StreamHandler
             $request = $request->withoutHeader('Expect');
 
             // Append a content-length header if body size is zero to match
-            // cURL's behavior.
-            if (0 === $request->getBody()->getSize()) {
+            // the behavior of `CurlHandler`
+            if (
+                (
+                    0 === \strcasecmp('PUT', $request->getMethod())
+                    || 0 === \strcasecmp('POST', $request->getMethod())
+                )
+                && 0 === $request->getBody()->getSize()
+            ) {
                 $request = $request->withHeader('Content-Length', '0');
             }
 
@@ -83,8 +95,8 @@ class StreamHandler
         array $options,
         RequestInterface $request,
         ?float $startTime,
-        ResponseInterface $response = null,
-        \Throwable $error = null
+        ?ResponseInterface $response = null,
+        ?\Throwable $error = null
     ): void {
         if (isset($options['on_stats'])) {
             $stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []);
@@ -273,7 +285,7 @@ class StreamHandler
 
         // HTTP/1.1 streams using the PHP stream wrapper require a
         // Connection: close header
-        if ($request->getProtocolVersion() == '1.1'
+        if ($request->getProtocolVersion() === '1.1'
             && !$request->hasHeader('Connection')
         ) {
             $request = $request->withHeader('Connection', 'close');
@@ -321,8 +333,15 @@ class StreamHandler
         );
 
         return $this->createResource(
-            function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
+            function () use ($uri, $contextResource, $context, $options, $request) {
                 $resource = @\fopen((string) $uri, 'r', false, $contextResource);
+
+                // See https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_http_response_header_predefined_variable
+                if (function_exists('http_get_last_response_headers')) {
+                    /** @var array|null */
+                    $http_response_header = \http_get_last_response_headers();
+                }
+
                 $this->lastHeaders = $http_response_header ?? [];
 
                 if (false === $resource) {
diff --git a/lib/guzzlehttp/guzzle/src/HandlerStack.php b/lib/guzzlehttp/guzzle/src/HandlerStack.php
index 6cb12f07a..03f9a18ff 100644
--- a/lib/guzzlehttp/guzzle/src/HandlerStack.php
+++ b/lib/guzzlehttp/guzzle/src/HandlerStack.php
@@ -44,7 +44,7 @@ class HandlerStack
      *                                                                            handler is provided, the best handler for your
      *                                                                            system will be utilized.
      */
-    public static function create(callable $handler = null): self
+    public static function create(?callable $handler = null): self
     {
         $stack = new self($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
@@ -58,7 +58,7 @@ class HandlerStack
     /**
      * @param (callable(RequestInterface, array): PromiseInterface)|null $handler Underlying HTTP handler.
      */
-    public function __construct(callable $handler = null)
+    public function __construct(?callable $handler = null)
     {
         $this->handler = $handler;
     }
@@ -131,7 +131,7 @@ class HandlerStack
      * @param callable(callable): callable $middleware Middleware function
      * @param string                       $name       Name to register for this middleware.
      */
-    public function unshift(callable $middleware, string $name = null): void
+    public function unshift(callable $middleware, ?string $name = null): void
     {
         \array_unshift($this->stack, [$middleware, $name]);
         $this->cached = null;
diff --git a/lib/guzzlehttp/guzzle/src/MessageFormatter.php b/lib/guzzlehttp/guzzle/src/MessageFormatter.php
index 04e9eb37a..9b77eee83 100644
--- a/lib/guzzlehttp/guzzle/src/MessageFormatter.php
+++ b/lib/guzzlehttp/guzzle/src/MessageFormatter.php
@@ -68,7 +68,7 @@ class MessageFormatter implements MessageFormatterInterface
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string
+    public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null): string
     {
         $cache = [];
 
diff --git a/lib/guzzlehttp/guzzle/src/MessageFormatterInterface.php b/lib/guzzlehttp/guzzle/src/MessageFormatterInterface.php
index 47934614a..a39ac248e 100644
--- a/lib/guzzlehttp/guzzle/src/MessageFormatterInterface.php
+++ b/lib/guzzlehttp/guzzle/src/MessageFormatterInterface.php
@@ -14,5 +14,5 @@ interface MessageFormatterInterface
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string;
+    public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null): string;
 }
diff --git a/lib/guzzlehttp/guzzle/src/Middleware.php b/lib/guzzlehttp/guzzle/src/Middleware.php
index 7e3eb6b3a..9901da44a 100644
--- a/lib/guzzlehttp/guzzle/src/Middleware.php
+++ b/lib/guzzlehttp/guzzle/src/Middleware.php
@@ -55,7 +55,7 @@ final class Middleware
      *
      * @return callable(callable): callable Returns a function that accepts the next handler.
      */
-    public static function httpErrors(BodySummarizerInterface $bodySummarizer = null): callable
+    public static function httpErrors(?BodySummarizerInterface $bodySummarizer = null): callable
     {
         return static function (callable $handler) use ($bodySummarizer): callable {
             return static function ($request, array $options) use ($handler, $bodySummarizer) {
@@ -132,7 +132,7 @@ final class Middleware
      *
      * @return callable Returns a function that accepts the next handler.
      */
-    public static function tap(callable $before = null, callable $after = null): callable
+    public static function tap(?callable $before = null, ?callable $after = null): callable
     {
         return static function (callable $handler) use ($before, $after): callable {
             return static function (RequestInterface $request, array $options) use ($handler, $before, $after) {
@@ -176,7 +176,7 @@ final class Middleware
      *
      * @return callable Returns a function that accepts the next handler.
      */
-    public static function retry(callable $decider, callable $delay = null): callable
+    public static function retry(callable $decider, ?callable $delay = null): callable
     {
         return static function (callable $handler) use ($decider, $delay): RetryMiddleware {
             return new RetryMiddleware($decider, $handler, $delay);
@@ -187,12 +187,12 @@ final class Middleware
      * Middleware that logs requests, responses, and errors using a message
      * formatter.
      *
-     * @phpstan-param \Psr\Log\LogLevel::* $logLevel  Level at which to log requests.
-     *
      * @param LoggerInterface                            $logger    Logs messages.
      * @param MessageFormatterInterface|MessageFormatter $formatter Formatter used to create message strings.
      * @param string                                     $logLevel  Level at which to log requests.
      *
+     * @phpstan-param \Psr\Log\LogLevel::* $logLevel Level at which to log requests.
+     *
      * @return callable Returns a function that accepts the next handler.
      */
     public static function log(LoggerInterface $logger, $formatter, string $logLevel = 'info'): callable
diff --git a/lib/guzzlehttp/guzzle/src/Pool.php b/lib/guzzlehttp/guzzle/src/Pool.php
index 6277c61fb..ddc304bb1 100644
--- a/lib/guzzlehttp/guzzle/src/Pool.php
+++ b/lib/guzzlehttp/guzzle/src/Pool.php
@@ -86,7 +86,7 @@ class Pool implements PromisorInterface
      * @param ClientInterface $client   Client used to send the requests
      * @param array|\Iterator $requests Requests to send concurrently.
      * @param array           $options  Passes through the options available in
-     *                                  {@see \GuzzleHttp\Pool::__construct}
+     *                                  {@see Pool::__construct}
      *
      * @return array Returns an array containing the response or an exception
      *               in the same order that the requests were sent.
diff --git a/lib/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/lib/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
index 0a8de8128..7dde6c5f4 100644
--- a/lib/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ b/lib/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
@@ -76,8 +76,8 @@ class PrepareBodyMiddleware
 
         $expect = $options['expect'] ?? null;
 
-        // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
-        if ($expect === false || $request->getProtocolVersion() < 1.1) {
+        // Return if disabled or using HTTP/1.0
+        if ($expect === false || $request->getProtocolVersion() === '1.0') {
             return;
         }
 
diff --git a/lib/guzzlehttp/guzzle/src/RequestOptions.php b/lib/guzzlehttp/guzzle/src/RequestOptions.php
index a38768c0c..84a3500e4 100644
--- a/lib/guzzlehttp/guzzle/src/RequestOptions.php
+++ b/lib/guzzlehttp/guzzle/src/RequestOptions.php
@@ -61,7 +61,7 @@ final class RequestOptions
      * Specifies whether or not cookies are used in a request or what cookie
      * jar to use or what cookies to send. This option only works if your
      * handler has the `cookie` middleware. Valid values are `false` and
-     * an instance of {@see \GuzzleHttp\Cookie\CookieJarInterface}.
+     * an instance of {@see Cookie\CookieJarInterface}.
      */
     public const COOKIES = 'cookies';
 
diff --git a/lib/guzzlehttp/guzzle/src/RetryMiddleware.php b/lib/guzzlehttp/guzzle/src/RetryMiddleware.php
index 8f4d93ac4..65f49cb75 100644
--- a/lib/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/lib/guzzlehttp/guzzle/src/RetryMiddleware.php
@@ -40,7 +40,7 @@ class RetryMiddleware
      *                                                                         and returns the number of
      *                                                                         milliseconds to delay.
      */
-    public function __construct(callable $decider, callable $nextHandler, callable $delay = null)
+    public function __construct(callable $decider, callable $nextHandler, ?callable $delay = null)
     {
         $this->decider = $decider;
         $this->nextHandler = $nextHandler;
@@ -110,7 +110,7 @@ class RetryMiddleware
         };
     }
 
-    private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null): PromiseInterface
+    private function doRetry(RequestInterface $request, array $options, ?ResponseInterface $response = null): PromiseInterface
     {
         $options['delay'] = ($this->delay)(++$options['retries'], $response, $request);
 
diff --git a/lib/guzzlehttp/guzzle/src/TransferStats.php b/lib/guzzlehttp/guzzle/src/TransferStats.php
index 2ce9e38f2..93fa334c8 100644
--- a/lib/guzzlehttp/guzzle/src/TransferStats.php
+++ b/lib/guzzlehttp/guzzle/src/TransferStats.php
@@ -46,8 +46,8 @@ final class TransferStats
      */
     public function __construct(
         RequestInterface $request,
-        ResponseInterface $response = null,
-        float $transferTime = null,
+        ?ResponseInterface $response = null,
+        ?float $transferTime = null,
         $handlerErrorData = null,
         array $handlerStats = []
     ) {
diff --git a/lib/guzzlehttp/guzzle/src/Utils.php b/lib/guzzlehttp/guzzle/src/Utils.php
index 93d6d39cd..c6a5893dd 100644
--- a/lib/guzzlehttp/guzzle/src/Utils.php
+++ b/lib/guzzlehttp/guzzle/src/Utils.php
@@ -71,7 +71,7 @@ final class Utils
             return \STDOUT;
         }
 
-        return \GuzzleHttp\Psr7\Utils::tryFopen('php://output', 'w');
+        return Psr7\Utils::tryFopen('php://output', 'w');
     }
 
     /**
@@ -79,7 +79,7 @@ final class Utils
      *
      * The returned handler is not wrapped by any default middlewares.
      *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the best handler for the given system.
+     * @return callable(\Psr\Http\Message\RequestInterface, array): Promise\PromiseInterface Returns the best handler for the given system.
      *
      * @throws \RuntimeException if no viable Handler is available.
      */
@@ -87,7 +87,7 @@ final class Utils
     {
         $handler = null;
 
-        if (\defined('CURLOPT_CUSTOMREQUEST')) {
+        if (\defined('CURLOPT_CUSTOMREQUEST') && \function_exists('curl_version') && version_compare(curl_version()['version'], '7.21.2') >= 0) {
             if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
                 $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
             } elseif (\function_exists('curl_exec')) {
diff --git a/lib/guzzlehttp/guzzle/src/functions.php b/lib/guzzlehttp/guzzle/src/functions.php
index 5edc66ab1..9ab4b9649 100644
--- a/lib/guzzlehttp/guzzle/src/functions.php
+++ b/lib/guzzlehttp/guzzle/src/functions.php
@@ -50,7 +50,7 @@ function debug_resource($value = null)
  *
  * The returned handler is not wrapped by any default middlewares.
  *
- * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the best handler for the given system.
+ * @return callable(\Psr\Http\Message\RequestInterface, array): Promise\PromiseInterface Returns the best handler for the given system.
  *
  * @throws \RuntimeException if no viable Handler is available.
  *
diff --git a/lib/guzzlehttp/promises/CHANGELOG.md b/lib/guzzlehttp/promises/CHANGELOG.md
index c73afb903..7df9c0ae6 100644
--- a/lib/guzzlehttp/promises/CHANGELOG.md
+++ b/lib/guzzlehttp/promises/CHANGELOG.md
@@ -1,6 +1,41 @@
 # CHANGELOG
 
 
+## 2.3.0 - 2025-08-22
+
+### Added
+
+- PHP 8.5 support
+
+
+## 2.2.0 - 2025-03-27
+
+### Fixed
+
+- Revert "Allow an empty EachPromise to be resolved by running the queue"
+
+
+## 2.1.0 - 2025-03-27
+
+### Added
+
+- Allow an empty EachPromise to be resolved by running the queue
+
+
+## 2.0.4 - 2024-10-17
+
+### Fixed
+
+- Once settled, don't allow further rejection of additional promises
+
+
+## 2.0.3 - 2024-07-18
+
+### Changed
+
+- PHP 8.4 support
+
+
 ## 2.0.2 - 2023-12-03
 
 ### Changed
diff --git a/lib/guzzlehttp/promises/README.md b/lib/guzzlehttp/promises/README.md
index a32d3d29c..493a9315b 100644
--- a/lib/guzzlehttp/promises/README.md
+++ b/lib/guzzlehttp/promises/README.md
@@ -38,10 +38,10 @@ composer require guzzlehttp/promises
 
 ## Version Guidance
 
-| Version | Status                 | PHP Version  |
-|---------|------------------------|--------------|
-| 1.x     | Bug and security fixes | >=5.5,<8.3   |
-| 2.x     | Latest                 | >=7.2.5,<8.4 |
+| Version | Status              | PHP Version  |
+|---------|---------------------|--------------|
+| 1.x     | Security fixes only | >=5.5,<8.3   |
+| 2.x     | Latest              | >=7.2.5,<8.6 |
 
 
 ## Quick Start
diff --git a/lib/guzzlehttp/promises/composer.json b/lib/guzzlehttp/promises/composer.json
index 6c5bdd662..9d6e85678 100644
--- a/lib/guzzlehttp/promises/composer.json
+++ b/lib/guzzlehttp/promises/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+        "phpunit/phpunit": "^8.5.44 || ^9.6.25"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/guzzlehttp/promises/src/Coroutine.php b/lib/guzzlehttp/promises/src/Coroutine.php
index 0b5b9c0a4..0da022834 100644
--- a/lib/guzzlehttp/promises/src/Coroutine.php
+++ b/lib/guzzlehttp/promises/src/Coroutine.php
@@ -84,8 +84,8 @@ final class Coroutine implements PromiseInterface
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         return $this->result->then($onFulfilled, $onRejected);
     }
diff --git a/lib/guzzlehttp/promises/src/Each.php b/lib/guzzlehttp/promises/src/Each.php
index c09d23c60..dd72c8310 100644
--- a/lib/guzzlehttp/promises/src/Each.php
+++ b/lib/guzzlehttp/promises/src/Each.php
@@ -23,8 +23,8 @@ final class Each
      */
     public static function of(
         $iterable,
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         return (new EachPromise($iterable, [
             'fulfilled' => $onFulfilled,
@@ -46,8 +46,8 @@ final class Each
     public static function ofLimit(
         $iterable,
         $concurrency,
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         return (new EachPromise($iterable, [
             'fulfilled' => $onFulfilled,
@@ -67,7 +67,7 @@ final class Each
     public static function ofLimitAll(
         $iterable,
         $concurrency,
-        callable $onFulfilled = null
+        ?callable $onFulfilled = null
     ): PromiseInterface {
         return self::ofLimit(
             $iterable,
diff --git a/lib/guzzlehttp/promises/src/FulfilledPromise.php b/lib/guzzlehttp/promises/src/FulfilledPromise.php
index ab7129659..727ec315c 100644
--- a/lib/guzzlehttp/promises/src/FulfilledPromise.php
+++ b/lib/guzzlehttp/promises/src/FulfilledPromise.php
@@ -31,8 +31,8 @@ class FulfilledPromise implements PromiseInterface
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         // Return itself if there is no onFulfilled function.
         if (!$onFulfilled) {
diff --git a/lib/guzzlehttp/promises/src/Promise.php b/lib/guzzlehttp/promises/src/Promise.php
index 1b07bdc9a..c0c5be2c0 100644
--- a/lib/guzzlehttp/promises/src/Promise.php
+++ b/lib/guzzlehttp/promises/src/Promise.php
@@ -25,16 +25,16 @@ class Promise implements PromiseInterface
      * @param callable $cancelFn Fn that when invoked cancels the promise.
      */
     public function __construct(
-        callable $waitFn = null,
-        callable $cancelFn = null
+        ?callable $waitFn = null,
+        ?callable $cancelFn = null
     ) {
         $this->waitFn = $waitFn;
         $this->cancelFn = $cancelFn;
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         if ($this->state === self::PENDING) {
             $p = new Promise(null, [$this, 'cancel']);
diff --git a/lib/guzzlehttp/promises/src/PromiseInterface.php b/lib/guzzlehttp/promises/src/PromiseInterface.php
index 2824802bb..c11721e4d 100644
--- a/lib/guzzlehttp/promises/src/PromiseInterface.php
+++ b/lib/guzzlehttp/promises/src/PromiseInterface.php
@@ -27,8 +27,8 @@ interface PromiseInterface
      * @param callable $onRejected  Invoked when the promise is rejected.
      */
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface;
 
     /**
diff --git a/lib/guzzlehttp/promises/src/RejectedPromise.php b/lib/guzzlehttp/promises/src/RejectedPromise.php
index d947da1f5..1ebf0b2a6 100644
--- a/lib/guzzlehttp/promises/src/RejectedPromise.php
+++ b/lib/guzzlehttp/promises/src/RejectedPromise.php
@@ -31,8 +31,8 @@ class RejectedPromise implements PromiseInterface
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        ?callable $onFulfilled = null,
+        ?callable $onRejected = null
     ): PromiseInterface {
         // If there's no onRejected callback then just return self.
         if (!$onRejected) {
diff --git a/lib/guzzlehttp/promises/src/RejectionException.php b/lib/guzzlehttp/promises/src/RejectionException.php
index 72a81ba20..47dca8624 100644
--- a/lib/guzzlehttp/promises/src/RejectionException.php
+++ b/lib/guzzlehttp/promises/src/RejectionException.php
@@ -18,7 +18,7 @@ class RejectionException extends \RuntimeException
      * @param mixed       $reason      Rejection reason.
      * @param string|null $description Optional description.
      */
-    public function __construct($reason, string $description = null)
+    public function __construct($reason, ?string $description = null)
     {
         $this->reason = $reason;
 
diff --git a/lib/guzzlehttp/promises/src/Utils.php b/lib/guzzlehttp/promises/src/Utils.php
index e1570d727..3193d2a12 100644
--- a/lib/guzzlehttp/promises/src/Utils.php
+++ b/lib/guzzlehttp/promises/src/Utils.php
@@ -21,7 +21,7 @@ final class Utils
      *
      * @param TaskQueueInterface|null $assign Optionally specify a new queue instance.
      */
-    public static function queue(TaskQueueInterface $assign = null): TaskQueueInterface
+    public static function queue(?TaskQueueInterface $assign = null): TaskQueueInterface
     {
         static $queue;
 
@@ -144,7 +144,9 @@ final class Utils
                 $results[$idx] = $value;
             },
             function ($reason, $idx, Promise $aggregate): void {
-                $aggregate->reject($reason);
+                if (Is::pending($aggregate)) {
+                    $aggregate->reject($reason);
+                }
             }
         )->then(function () use (&$results) {
             ksort($results);
diff --git a/lib/guzzlehttp/psr7/CHANGELOG.md b/lib/guzzlehttp/psr7/CHANGELOG.md
index fe3eda70a..4a2a12194 100644
--- a/lib/guzzlehttp/psr7/CHANGELOG.md
+++ b/lib/guzzlehttp/psr7/CHANGELOG.md
@@ -5,6 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.8.0 - 2025-08-23
+
+### Added
+
+- Allow empty lists as header values
+
+### Changed
+
+- PHP 8.5 support
+
+## 2.7.1 - 2025-03-27
+
+### Fixed
+
+- Fixed uppercase IPv6 addresses in URI
+
+### Changed
+
+- Improve uploaded file error message
+
+## 2.7.0 - 2024-07-18
+
+### Added
+
+- Add `Utils::redactUserInfo()` method
+- Add ability to encode bools as ints in `Query::build`
+
+## 2.6.3 - 2024-07-18
+
+### Fixed
+
+- Make `StreamWrapper::stream_stat()` return `false` if inner stream's size is `null` 
+
+### Changed
+
+- PHP 8.4 support
+
 ## 2.6.2 - 2023-12-03
 
 ### Fixed
diff --git a/lib/guzzlehttp/psr7/README.md b/lib/guzzlehttp/psr7/README.md
index 850fa9d70..24aad8605 100644
--- a/lib/guzzlehttp/psr7/README.md
+++ b/lib/guzzlehttp/psr7/README.md
@@ -24,8 +24,8 @@ composer require guzzlehttp/psr7
 
 | Version | Status              | PHP Version  |
 |---------|---------------------|--------------|
-| 1.x     | Security fixes only | >=5.4,<8.1   |
-| 2.x     | Latest              | >=7.2.5,<8.4 |
+| 1.x     | EOL (2024-06-30)    | >=5.4,<8.2   |
+| 2.x     | Latest              | >=7.2.5,<8.6 |
 
 
 ## AppendStream
@@ -436,7 +436,7 @@ will be parsed into `['foo[a]' => '1', 'foo[b]' => '2'])`.
 
 ## `GuzzleHttp\Psr7\Query::build`
 
-`public static function build(array $params, int|false $encoding = PHP_QUERY_RFC3986): string`
+`public static function build(array $params, int|false $encoding = PHP_QUERY_RFC3986, bool $treatBoolsAsInts = true): string`
 
 Build a query string from an array of key value pairs.
 
@@ -498,11 +498,18 @@ a message.
 
 ## `GuzzleHttp\Psr7\Utils::readLine`
 
-`public static function readLine(StreamInterface $stream, int $maxLength = null): string`
+`public static function readLine(StreamInterface $stream, ?int $maxLength = null): string`
 
 Read a line from the stream up to the maximum allowed buffer length.
 
 
+## `GuzzleHttp\Psr7\Utils::redactUserInfo`
+
+`public static function redactUserInfo(UriInterface $uri): UriInterface`
+
+Redact the password in the user info part of a URI.
+
+
 ## `GuzzleHttp\Psr7\Utils::streamFor`
 
 `public static function streamFor(resource|string|null|int|float|bool|StreamInterface|callable|\Iterator $resource = '', array $options = []): StreamInterface`
@@ -674,7 +681,7 @@ termed a relative-path reference.
 
 ### `GuzzleHttp\Psr7\Uri::isSameDocumentReference`
 
-`public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool`
+`public static function isSameDocumentReference(UriInterface $uri, ?UriInterface $base = null): bool`
 
 Whether the URI is a same-document reference. A same-document reference refers to a URI that is, aside from its
 fragment component, identical to the base URI. When no base URI is given, only an empty URI reference
diff --git a/lib/guzzlehttp/psr7/composer.json b/lib/guzzlehttp/psr7/composer.json
index 70293fc40..96098f536 100644
--- a/lib/guzzlehttp/psr7/composer.json
+++ b/lib/guzzlehttp/psr7/composer.json
@@ -61,8 +61,8 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "http-interop/http-factory-tests": "^0.9",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+        "http-interop/http-factory-tests": "0.9.0",
+        "phpunit/phpunit": "^8.5.44 || ^9.6.25"
     },
     "suggest": {
         "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
diff --git a/lib/guzzlehttp/psr7/src/CachingStream.php b/lib/guzzlehttp/psr7/src/CachingStream.php
index f34722cff..7e4554d5c 100644
--- a/lib/guzzlehttp/psr7/src/CachingStream.php
+++ b/lib/guzzlehttp/psr7/src/CachingStream.php
@@ -33,7 +33,7 @@ final class CachingStream implements StreamInterface
      */
     public function __construct(
         StreamInterface $stream,
-        StreamInterface $target = null
+        ?StreamInterface $target = null
     ) {
         $this->remoteStream = $stream;
         $this->stream = $target ?: new Stream(Utils::tryFopen('php://temp', 'r+'));
diff --git a/lib/guzzlehttp/psr7/src/HttpFactory.php b/lib/guzzlehttp/psr7/src/HttpFactory.php
index 73d17e337..3ef15103a 100644
--- a/lib/guzzlehttp/psr7/src/HttpFactory.php
+++ b/lib/guzzlehttp/psr7/src/HttpFactory.php
@@ -27,10 +27,10 @@ final class HttpFactory implements RequestFactoryInterface, ResponseFactoryInter
 {
     public function createUploadedFile(
         StreamInterface $stream,
-        int $size = null,
+        ?int $size = null,
         int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
     ): UploadedFileInterface {
         if ($size === null) {
             $size = $stream->getSize();
diff --git a/lib/guzzlehttp/psr7/src/MessageTrait.php b/lib/guzzlehttp/psr7/src/MessageTrait.php
index 65dbc4ba0..c15ee63fc 100644
--- a/lib/guzzlehttp/psr7/src/MessageTrait.php
+++ b/lib/guzzlehttp/psr7/src/MessageTrait.php
@@ -174,10 +174,6 @@ trait MessageTrait
             return $this->trimAndValidateHeaderValues([$value]);
         }
 
-        if (count($value) === 0) {
-            throw new \InvalidArgumentException('Header value can not be an empty array.');
-        }
-
         return $this->trimAndValidateHeaderValues($value);
     }
 
diff --git a/lib/guzzlehttp/psr7/src/MultipartStream.php b/lib/guzzlehttp/psr7/src/MultipartStream.php
index d23fba8a3..43d718f65 100644
--- a/lib/guzzlehttp/psr7/src/MultipartStream.php
+++ b/lib/guzzlehttp/psr7/src/MultipartStream.php
@@ -32,7 +32,7 @@ final class MultipartStream implements StreamInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(array $elements = [], string $boundary = null)
+    public function __construct(array $elements = [], ?string $boundary = null)
     {
         $this->boundary = $boundary ?: bin2hex(random_bytes(20));
         $this->stream = $this->createStream($elements);
diff --git a/lib/guzzlehttp/psr7/src/Query.php b/lib/guzzlehttp/psr7/src/Query.php
index 8b9492797..ccf867a0b 100644
--- a/lib/guzzlehttp/psr7/src/Query.php
+++ b/lib/guzzlehttp/psr7/src/Query.php
@@ -63,12 +63,15 @@ final class Query
      * string. This function does not modify the provided keys when an array is
      * encountered (like `http_build_query()` would).
      *
-     * @param array     $params   Query string parameters.
-     * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
-     *                            to encode using RFC3986, or PHP_QUERY_RFC1738
-     *                            to encode using RFC1738.
+     * @param array     $params           Query string parameters.
+     * @param int|false $encoding         Set to false to not encode,
+     *                                    PHP_QUERY_RFC3986 to encode using
+     *                                    RFC3986, or PHP_QUERY_RFC1738 to
+     *                                    encode using RFC1738.
+     * @param bool      $treatBoolsAsInts Set to true to encode as 0/1, and
+     *                                    false as false/true.
      */
-    public static function build(array $params, $encoding = PHP_QUERY_RFC3986): string
+    public static function build(array $params, $encoding = PHP_QUERY_RFC3986, bool $treatBoolsAsInts = true): string
     {
         if (!$params) {
             return '';
@@ -86,12 +89,14 @@ final class Query
             throw new \InvalidArgumentException('Invalid type');
         }
 
+        $castBool = $treatBoolsAsInts ? static function ($v) { return (int) $v; } : static function ($v) { return $v ? 'true' : 'false'; };
+
         $qs = '';
         foreach ($params as $k => $v) {
             $k = $encoder((string) $k);
             if (!is_array($v)) {
                 $qs .= $k;
-                $v = is_bool($v) ? (int) $v : $v;
+                $v = is_bool($v) ? $castBool($v) : $v;
                 if ($v !== null) {
                     $qs .= '='.$encoder((string) $v);
                 }
@@ -99,7 +104,7 @@ final class Query
             } else {
                 foreach ($v as $vv) {
                     $qs .= $k;
-                    $vv = is_bool($vv) ? (int) $vv : $vv;
+                    $vv = is_bool($vv) ? $castBool($vv) : $vv;
                     if ($vv !== null) {
                         $qs .= '='.$encoder((string) $vv);
                     }
diff --git a/lib/guzzlehttp/psr7/src/Response.php b/lib/guzzlehttp/psr7/src/Response.php
index 00f16e2d9..34e612fda 100644
--- a/lib/guzzlehttp/psr7/src/Response.php
+++ b/lib/guzzlehttp/psr7/src/Response.php
@@ -96,7 +96,7 @@ class Response implements ResponseInterface
         array $headers = [],
         $body = null,
         string $version = '1.1',
-        string $reason = null
+        ?string $reason = null
     ) {
         $this->assertStatusCodeRange($status);
 
diff --git a/lib/guzzlehttp/psr7/src/StreamWrapper.php b/lib/guzzlehttp/psr7/src/StreamWrapper.php
index ae8538814..77b04d747 100644
--- a/lib/guzzlehttp/psr7/src/StreamWrapper.php
+++ b/lib/guzzlehttp/psr7/src/StreamWrapper.php
@@ -69,7 +69,7 @@ final class StreamWrapper
         }
     }
 
-    public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool
+    public function stream_open(string $path, string $mode, int $options, ?string &$opened_path = null): bool
     {
         $options = stream_context_get_options($this->context);
 
@@ -136,10 +136,14 @@ final class StreamWrapper
      *   ctime: int,
      *   blksize: int,
      *   blocks: int
-     * }
+     * }|false
      */
-    public function stream_stat(): array
+    public function stream_stat()
     {
+        if ($this->stream->getSize() === null) {
+            return false;
+        }
+
         static $modeMap = [
             'r' => 33060,
             'rb' => 33060,
diff --git a/lib/guzzlehttp/psr7/src/UploadedFile.php b/lib/guzzlehttp/psr7/src/UploadedFile.php
index b26719937..d9b779f13 100644
--- a/lib/guzzlehttp/psr7/src/UploadedFile.php
+++ b/lib/guzzlehttp/psr7/src/UploadedFile.php
@@ -11,15 +11,15 @@ use RuntimeException;
 
 class UploadedFile implements UploadedFileInterface
 {
-    private const ERRORS = [
-        UPLOAD_ERR_OK,
-        UPLOAD_ERR_INI_SIZE,
-        UPLOAD_ERR_FORM_SIZE,
-        UPLOAD_ERR_PARTIAL,
-        UPLOAD_ERR_NO_FILE,
-        UPLOAD_ERR_NO_TMP_DIR,
-        UPLOAD_ERR_CANT_WRITE,
-        UPLOAD_ERR_EXTENSION,
+    private const ERROR_MAP = [
+        UPLOAD_ERR_OK => 'UPLOAD_ERR_OK',
+        UPLOAD_ERR_INI_SIZE => 'UPLOAD_ERR_INI_SIZE',
+        UPLOAD_ERR_FORM_SIZE => 'UPLOAD_ERR_FORM_SIZE',
+        UPLOAD_ERR_PARTIAL => 'UPLOAD_ERR_PARTIAL',
+        UPLOAD_ERR_NO_FILE => 'UPLOAD_ERR_NO_FILE',
+        UPLOAD_ERR_NO_TMP_DIR => 'UPLOAD_ERR_NO_TMP_DIR',
+        UPLOAD_ERR_CANT_WRITE => 'UPLOAD_ERR_CANT_WRITE',
+        UPLOAD_ERR_EXTENSION => 'UPLOAD_ERR_EXTENSION',
     ];
 
     /**
@@ -64,8 +64,8 @@ class UploadedFile implements UploadedFileInterface
         $streamOrFile,
         ?int $size,
         int $errorStatus,
-        string $clientFilename = null,
-        string $clientMediaType = null
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
     ) {
         $this->setError($errorStatus);
         $this->size = $size;
@@ -104,7 +104,7 @@ class UploadedFile implements UploadedFileInterface
      */
     private function setError(int $error): void
     {
-        if (false === in_array($error, UploadedFile::ERRORS, true)) {
+        if (!isset(UploadedFile::ERROR_MAP[$error])) {
             throw new InvalidArgumentException(
                 'Invalid error status for UploadedFile'
             );
@@ -137,7 +137,7 @@ class UploadedFile implements UploadedFileInterface
     private function validateActive(): void
     {
         if (false === $this->isOk()) {
-            throw new RuntimeException('Cannot retrieve stream due to upload error');
+            throw new RuntimeException(\sprintf('Cannot retrieve stream due to upload error (%s)', self::ERROR_MAP[$this->error]));
         }
 
         if ($this->isMoved()) {
diff --git a/lib/guzzlehttp/psr7/src/Uri.php b/lib/guzzlehttp/psr7/src/Uri.php
index f1feee871..a7cdfb003 100644
--- a/lib/guzzlehttp/psr7/src/Uri.php
+++ b/lib/guzzlehttp/psr7/src/Uri.php
@@ -107,7 +107,7 @@ class Uri implements UriInterface, \JsonSerializable
     {
         // If IPv6
         $prefix = '';
-        if (preg_match('%^(.*://\[[0-9:a-f]+\])(.*?)$%', $url, $matches)) {
+        if (preg_match('%^(.*://\[[0-9:a-fA-F]+\])(.*?)$%', $url, $matches)) {
             /** @var array{0:string, 1:string, 2:string} $matches */
             $prefix = $matches[1];
             $url = $matches[2];
@@ -279,7 +279,7 @@ class Uri implements UriInterface, \JsonSerializable
      *
      * @see https://datatracker.ietf.org/doc/html/rfc3986#section-4.4
      */
-    public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool
+    public static function isSameDocumentReference(UriInterface $uri, ?UriInterface $base = null): bool
     {
         if ($base !== null) {
             $uri = UriResolver::resolve($base, $uri);
diff --git a/lib/guzzlehttp/psr7/src/Utils.php b/lib/guzzlehttp/psr7/src/Utils.php
index bf5ea9dba..5451e3dcd 100644
--- a/lib/guzzlehttp/psr7/src/Utils.php
+++ b/lib/guzzlehttp/psr7/src/Utils.php
@@ -231,7 +231,7 @@ final class Utils
      * @param StreamInterface $stream    Stream to read from
      * @param int|null        $maxLength Maximum buffer length
      */
-    public static function readLine(StreamInterface $stream, int $maxLength = null): string
+    public static function readLine(StreamInterface $stream, ?int $maxLength = null): string
     {
         $buffer = '';
         $size = 0;
@@ -250,6 +250,20 @@ final class Utils
         return $buffer;
     }
 
+    /**
+     * Redact the password in the user info part of a URI.
+     */
+    public static function redactUserInfo(UriInterface $uri): UriInterface
+    {
+        $userInfo = $uri->getUserInfo();
+
+        if (false !== ($pos = \strpos($userInfo, ':'))) {
+            return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***');
+        }
+
+        return $uri;
+    }
+
     /**
      * Create a new stream based on the input type.
      *
@@ -383,7 +397,7 @@ final class Utils
         restore_error_handler();
 
         if ($ex) {
-            /** @var $ex \RuntimeException */
+            /** @var \RuntimeException $ex */
             throw $ex;
         }
 
@@ -430,7 +444,7 @@ final class Utils
         restore_error_handler();
 
         if ($ex) {
-            /** @var $ex \RuntimeException */
+            /** @var \RuntimeException $ex */
             throw $ex;
         }
 
diff --git a/lib/league/oauth2-client/LICENSE b/lib/league/oauth2-client/LICENSE
index 7dfa39b7c..9c8958afc 100644
--- a/lib/league/oauth2-client/LICENSE
+++ b/lib/league/oauth2-client/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Alex Bilbie <hello@alexbilbie.com>
+Copyright (c) 2013-2023 Alex Bilbie <hello@alexbilbie.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/league/oauth2-client/README.md b/lib/league/oauth2-client/README.md
index cbb449d48..05c8d457e 100644
--- a/lib/league/oauth2-client/README.md
+++ b/lib/league/oauth2-client/README.md
@@ -24,14 +24,16 @@ This package is compliant with [PSR-1][], [PSR-2][], [PSR-4][], and [PSR-7][]. I
 
 We support the following versions of PHP:
 
+* PHP 8.5
+* PHP 8.4
+* PHP 8.3
+* PHP 8.2
 * PHP 8.1
 * PHP 8.0
 * PHP 7.4
 * PHP 7.3
 * PHP 7.2
 * PHP 7.1
-* PHP 7.0
-* PHP 5.6
 
 ## Provider Clients
 
diff --git a/lib/league/oauth2-client/composer.json b/lib/league/oauth2-client/composer.json
index 59201f48f..5dcc58355 100644
--- a/lib/league/oauth2-client/composer.json
+++ b/lib/league/oauth2-client/composer.json
@@ -6,15 +6,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^5.6 || ^7.0 || ^8.0",
-        "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "paragonie/random_compat": "^1 || ^2 || ^9.99"
+        "php": "^7.1 || >=8.0.0 <8.6.0",
+        "ext-json": "*",
+        "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.5",
-        "php-parallel-lint/php-parallel-lint": "^1.3.1",
-        "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-        "squizlabs/php_codesniffer": "^2.3 || ^3.0"
+        "php-parallel-lint/php-parallel-lint": "^1.4",
+        "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+        "squizlabs/php_codesniffer": "^3.11"
     },
     "keywords": [
         "oauth",
@@ -49,10 +49,5 @@
         "psr-4": {
             "League\\OAuth2\\Client\\Test\\": "test/src/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-2.x": "2.0.x-dev"
-        }
     }
 }
diff --git a/lib/league/oauth2-client/src/Provider/AbstractProvider.php b/lib/league/oauth2-client/src/Provider/AbstractProvider.php
index 293a54d6e..eb6241764 100644
--- a/lib/league/oauth2-client/src/Provider/AbstractProvider.php
+++ b/lib/league/oauth2-client/src/Provider/AbstractProvider.php
@@ -17,6 +17,7 @@ namespace League\OAuth2\Client\Provider;
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\ClientInterface as HttpClientInterface;
 use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
 use League\OAuth2\Client\Grant\AbstractGrant;
 use League\OAuth2\Client\Grant\GrantFactory;
@@ -405,6 +406,7 @@ abstract class AbstractProvider
      *
      * @param  array $options
      * @return array Authorization parameters
+     * @throws InvalidArgumentException
      */
     protected function getAuthorizationParameters(array $options)
     {
@@ -476,6 +478,7 @@ abstract class AbstractProvider
      *
      * @param  array $options
      * @return string Authorization URL
+     * @throws InvalidArgumentException
      */
     public function getAuthorizationUrl(array $options = [])
     {
@@ -492,10 +495,11 @@ abstract class AbstractProvider
      * @param  array $options
      * @param  callable|null $redirectHandler
      * @return mixed
+     * @throws InvalidArgumentException
      */
     public function authorize(
         array $options = [],
-        callable $redirectHandler = null
+        ?callable $redirectHandler = null
     ) {
         $url = $this->getAuthorizationUrl($options);
         if ($redirectHandler) {
@@ -613,13 +617,20 @@ abstract class AbstractProvider
      *
      * @param  mixed                $grant
      * @param  array<string, mixed> $options
-     * @throws IdentityProviderException
      * @return AccessTokenInterface
+     * @throws IdentityProviderException
+     * @throws UnexpectedValueException
+     * @throws GuzzleException
      */
     public function getAccessToken($grant, array $options = [])
     {
         $grant = $this->verifyGrant($grant);
 
+        if (isset($options['scope']) && is_array($options['scope'])) {
+            $separator = $this->getScopeSeparator();
+            $options['scope'] = implode($separator, $options['scope']);
+        }
+
         $params = [
             'client_id'     => $this->clientId,
             'client_secret' => $this->clientSecret,
@@ -700,6 +711,7 @@ abstract class AbstractProvider
      *
      * @param  RequestInterface $request
      * @return ResponseInterface
+     * @throws GuzzleException
      */
     public function getResponse(RequestInterface $request)
     {
@@ -710,8 +722,10 @@ abstract class AbstractProvider
      * Sends a request and returns the parsed response.
      *
      * @param  RequestInterface $request
-     * @throws IdentityProviderException
      * @return mixed
+     * @throws IdentityProviderException
+     * @throws UnexpectedValueException
+     * @throws GuzzleException
      */
     public function getParsedResponse(RequestInterface $request)
     {
@@ -757,7 +771,7 @@ abstract class AbstractProvider
      */
     protected function getContentType(ResponseInterface $response)
     {
-        return join(';', (array) $response->getHeader('content-type'));
+        return implode(';', $response->getHeader('content-type'));
     }
 
     /**
@@ -815,7 +829,7 @@ abstract class AbstractProvider
      * Custom mapping of expiration, etc should be done here. Always call the
      * parent method when overloading this method.
      *
-     * @param  mixed $result
+     * @param  array<string, mixed> $result
      * @return array
      */
     protected function prepareAccessTokenResponse(array $result)
@@ -859,6 +873,9 @@ abstract class AbstractProvider
      *
      * @param  AccessToken $token
      * @return ResourceOwnerInterface
+     * @throws IdentityProviderException
+     * @throws UnexpectedValueException
+     * @throws GuzzleException
      */
     public function getResourceOwner(AccessToken $token)
     {
@@ -872,6 +889,9 @@ abstract class AbstractProvider
      *
      * @param  AccessToken $token
      * @return mixed
+     * @throws IdentityProviderException
+     * @throws UnexpectedValueException
+     * @throws GuzzleException
      */
     protected function fetchResourceOwnerDetails(AccessToken $token)
     {
diff --git a/lib/league/oauth2-client/src/Token/AccessToken.php b/lib/league/oauth2-client/src/Token/AccessToken.php
index 81533c307..331b0ace6 100644
--- a/lib/league/oauth2-client/src/Token/AccessToken.php
+++ b/lib/league/oauth2-client/src/Token/AccessToken.php
@@ -22,7 +22,7 @@ use RuntimeException;
  *
  * @link http://tools.ietf.org/html/rfc6749#section-1.4 Access Token (RFC 6749, §1.4)
  */
-class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInterface
+class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInterface, SettableRefreshTokenInterface
 {
     /**
      * @var string
@@ -118,7 +118,7 @@ class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInter
         } elseif (!empty($options['expires'])) {
             // Some providers supply the seconds until expiration rather than
             // the exact timestamp. Take a best guess at which we received.
-            $expires = $options['expires'];
+            $expires = (int) $options['expires'];
 
             if (!$this->isExpirationTimestamp($expires)) {
                 $expires += $this->getTimeNow();
@@ -169,6 +169,14 @@ class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInter
         return $this->refreshToken;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setRefreshToken($refreshToken)
+    {
+        $this->refreshToken = $refreshToken;
+    }
+
     /**
      * @inheritdoc
      */
@@ -196,7 +204,7 @@ class AccessToken implements AccessTokenInterface, ResourceOwnerAccessTokenInter
             throw new RuntimeException('"expires" is not set on the token');
         }
 
-        return $expires < time();
+        return $expires < $this->getTimeNow();
     }
 
     /**
diff --git a/lib/league/oauth2-google/CHANGELOG.md b/lib/league/oauth2-google/CHANGELOG.md
index d82a2ae17..d41761f51 100644
--- a/lib/league/oauth2-google/CHANGELOG.md
+++ b/lib/league/oauth2-google/CHANGELOG.md
@@ -1,5 +1,12 @@
 OAuth 2.0 Google Provider Changelog
 
+
+## 4.1.0 - 2025-12-15
+
+### Added
+
+- Added getEmailVerified(), isEmailTrustworthy() to user definition, #132 by @dt-thomas-durand
+
 ## 4.0.1 - 2022-03-17
 
 ### Changed
diff --git a/lib/league/oauth2-google/README.md b/lib/league/oauth2-google/README.md
index 38792d4af..e951f309b 100644
--- a/lib/league/oauth2-google/README.md
+++ b/lib/league/oauth2-google/README.md
@@ -1,6 +1,6 @@
 # Google Provider for OAuth 2.0 Client
 
-[![Build Status](https://img.shields.io/github/workflow/status/thephpleague/oauth2-google/test/main)](https://github.com/thephpleague/oauth2-google/actions/workflows/test.yaml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/thephpleague/oauth2-google/ci.yml?branch=main)](https://github.com/thephpleague/oauth2-google/actions/workflows/ci.yml)
 [![Code Coverage](https://img.shields.io/codecov/c/gh/thephpleague/oauth2-google)](https://app.codecov.io/gh/thephpleague/oauth2-google)
 [![License](https://img.shields.io/packagist/l/league/oauth2-google)](https://github.com/thephpleague/oauth2-google/blob/main/LICENSE)
 [![Latest Stable Version](https://img.shields.io/packagist/v/league/oauth2-google)](https://packagist.org/packages/league/oauth2-google)
@@ -22,6 +22,8 @@ The following versions of PHP are supported.
 * PHP 7.4
 * PHP 8.0
 * PHP 8.1
+* PHP 8.2
+* PHP 8.3
 
 This package uses [OpenID Connect][openid-connect] to authenticate users with
 Google accounts.
diff --git a/lib/league/oauth2-google/src/Provider/GoogleUser.php b/lib/league/oauth2-google/src/Provider/GoogleUser.php
index d004e3c6d..58f0538d2 100644
--- a/lib/league/oauth2-google/src/Provider/GoogleUser.php
+++ b/lib/league/oauth2-google/src/Provider/GoogleUser.php
@@ -72,6 +72,36 @@ class GoogleUser implements ResourceOwnerInterface
         return $this->getResponseValue('email');
     }
 
+    /**
+     * Get email_verified attribute.
+     *
+     * @return bool|null
+     */
+    public function getEmailVerified(): ?bool
+    {
+        return $this->getResponseValue('email_verified');
+    }
+
+    /**
+     * Returns whether the email is trustable enough to be used for authentication purpose.
+     *
+     * @see https://developers.google.com/identity/gsi/web/guides/verify-google-id-token
+     */
+    public function isEmailTrustworthy(): bool
+    {
+        $email = $this->getEmail();
+        if (! $email) {
+            return false;
+        }
+        if ('@gmail.com' === substr($email, -10)) {
+            return true;
+        }
+        if ($this->getHostedDomain() && $this->getEmailVerified()) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Get hosted domain.
      *
diff --git a/lib/nikic/php-parser/README.md b/lib/nikic/php-parser/README.md
index 36de23cde..3bca288b9 100644
--- a/lib/nikic/php-parser/README.md
+++ b/lib/nikic/php-parser/README.md
@@ -6,7 +6,7 @@ PHP Parser
 This is a PHP 5.2 to PHP 8.2 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.
 
-[**Documentation for version 4.x**][doc_4_x] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.2).
+[**Documentation for version 4.x**][doc_4_x] (stable; for running on PHP >= 7.1; for parsing PHP 5.2 to PHP 8.2).
 
 [Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
 
diff --git a/lib/nikic/php-parser/composer.json b/lib/nikic/php-parser/composer.json
index 2fd064a21..ef416d942 100644
--- a/lib/nikic/php-parser/composer.json
+++ b/lib/nikic/php-parser/composer.json
@@ -13,18 +13,13 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.1",
         "ext-tokenizer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
         "ircmaxell/php-yacc": "^0.0.7"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.9-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "PhpParser\\": "lib/PhpParser"
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php b/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
index a7fe129b0..7c1512d07 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
@@ -26,7 +26,7 @@ class ClassConst implements PhpParser\Builder
      * Creates a class constant builder
      *
      * @param string|Identifier                          $name  Name
-     * @param Node\Expr|bool|null|int|float|string|array $value Value
+     * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value
      */
     public function __construct($name, $value) {
         $this->constants = [new Const_($name, BuilderHelpers::normalizeValue($value))];
@@ -36,7 +36,7 @@ class ClassConst implements PhpParser\Builder
      * Add another constant to const group
      *
      * @param string|Identifier                          $name  Name
-     * @param Node\Expr|bool|null|int|float|string|array $value Value
+     * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value Value
      *
      * @return $this The builder instance (for fluid interface)
      */
diff --git a/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
index af010e028..0aae8738c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
+++ b/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
@@ -213,7 +213,7 @@ class BuilderFactory
     /**
      * Creates node a for a literal value.
      *
-     * @param Expr|bool|null|int|float|string|array $value $value
+     * @param Expr|bool|null|int|float|string|array|\UnitEnum $value $value
      *
      * @return Expr
      */
diff --git a/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php b/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
index af6ceb996..05e7868f4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
+++ b/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
@@ -6,6 +6,7 @@ use PhpParser\Node\ComplexType;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Stmt;
@@ -215,7 +216,7 @@ final class BuilderHelpers
      * Normalizes a value: Converts nulls, booleans, integers,
      * floats, strings and arrays into their respective nodes
      *
-     * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
+     * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value The value to normalize
      *
      * @return Expr The normalized value
      */
@@ -269,6 +270,10 @@ final class BuilderHelpers
             return new Expr\Array_($items);
         }
 
+        if ($value instanceof \UnitEnum) {
+            return new Expr\ClassConstFetch(new FullyQualified(\get_class($value)), new Identifier($value->name));
+        }
+
         throw new \LogicException('Invalid value');
     }
 
diff --git a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
index 7131c3d25..ceb3f11f3 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
@@ -37,7 +37,7 @@ class ConstExprEvaluator
      *
      * @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
      */
-    public function __construct(callable $fallbackEvaluator = null) {
+    public function __construct(?callable $fallbackEvaluator = null) {
         $this->fallbackEvaluator = $fallbackEvaluator ?? function(Expr $expr) {
             throw new ConstExprEvaluationException(
                 "Expression of type {$expr->getType()} cannot be evaluated"
diff --git a/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
index 676322701..fc276ecb9 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
@@ -31,7 +31,7 @@ class PrintableNewAnonClassNode extends Expr
     public $stmts;
 
     public function __construct(
-        array $attrGroups, int $flags, array $args, Node\Name $extends = null, array $implements,
+        array $attrGroups, int $flags, array $args, ?Node\Name $extends, array $implements,
         array $stmts, array $attributes
     ) {
         parent::__construct($attributes);
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer.php b/lib/nikic/php-parser/lib/PhpParser/Lexer.php
index e15dd0a5d..60b809b8b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Lexer.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer.php
@@ -69,7 +69,7 @@ class Lexer
      * @param ErrorHandler|null $errorHandler Error handler to use for lexing errors. Defaults to
      *                                        ErrorHandler\Throwing
      */
-    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
+    public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
         if (null === $errorHandler) {
             $errorHandler = new ErrorHandler\Throwing();
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
index b0929f3cc..a0e781d04 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
@@ -74,7 +74,7 @@ class Emulative extends Lexer
         }
     }
 
-    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
+    public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
         $emulators = array_filter($this->emulators, function($emulator) use($code) {
             return $emulator->isEmulationNeeded($code);
         });
diff --git a/lib/nikic/php-parser/lib/PhpParser/NameContext.php b/lib/nikic/php-parser/lib/PhpParser/NameContext.php
index 777a4afde..82c5acc2c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NameContext.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NameContext.php
@@ -36,7 +36,7 @@ class NameContext
      *
      * @param Name|null $namespace Null is the global namespace
      */
-    public function startNamespace(Name $namespace = null) {
+    public function startNamespace(?Name $namespace = null) {
         $this->namespace = $namespace;
         $this->origAliases = $this->aliases = [
             Stmt\Use_::TYPE_NORMAL   => [],
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php b/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
index bcf130e68..17e680260 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
@@ -27,7 +27,7 @@ class Arg extends NodeAbstract
      */
     public function __construct(
         Expr $value, bool $byRef = false, bool $unpack = false, array $attributes = [],
-        Identifier $name = null
+        ?Identifier $name = null
     ) {
         $this->attributes = $attributes;
         $this->name = $name;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
index 71694478e..46db975c4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
@@ -18,7 +18,7 @@ class ArrayDimFetch extends Expr
      * @param null|Expr $dim        Array index / dim
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $dim = null, array $attributes = []) {
+    public function __construct(Expr $var, ?Expr $dim = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->var = $var;
         $this->dim = $dim;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
index 1b078f821..5aaa9867e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
@@ -23,7 +23,7 @@ class ArrayItem extends Expr
      * @param bool      $byRef      Whether to assign by reference
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value, Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
+    public function __construct(Expr $value, ?Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
         $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
index b88a8f7e6..5469b8e4c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
@@ -19,7 +19,7 @@ class Exit_ extends Expr
      * @param null|Expr $expr       Expression
      * @param array                    $attributes Additional attributes
      */
-    public function __construct(Expr $expr = null, array $attributes = []) {
+    public function __construct(?Expr $expr = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->expr = $expr;
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
index aef8fc333..f15336ede 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
@@ -18,7 +18,7 @@ class Yield_ extends Expr
      * @param null|Expr $key        Key expression
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value = null, Expr $key = null, array $attributes = []) {
+    public function __construct(?Expr $value = null, ?Expr $key = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Name.php b/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
index f0a564ff0..0d6e4b1ff 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
@@ -162,7 +162,7 @@ class Name extends NodeAbstract
      *
      * @return static|null Sliced name
      */
-    public function slice(int $offset, int $length = null) {
+    public function slice(int $offset, ?int $length = null) {
         $numParts = count($this->parts);
 
         $realOffset = $offset < 0 ? $offset + $numParts : $offset;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Param.php b/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
index 1e90b7944..dfb77f629 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
@@ -34,7 +34,7 @@ class Param extends NodeAbstract
      * @param AttributeGroup[]                        $attrGroups PHP attribute groups
      */
     public function __construct(
-        $var, Expr $default = null, $type = null,
+        $var, ?Expr $default = null, $type = null,
         bool $byRef = false, bool $variadic = false,
         array $attributes = [],
         int $flags = 0,
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
index 6690a16bf..df2f6c1b6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
@@ -120,7 +120,7 @@ class String_ extends Scalar
                 } elseif ('u' === $str[0]) {
                     return self::codePointToUtf8(hexdec($matches[2]));
                 } else {
-                    return chr(octdec($str));
+                    return chr(octdec($str) & 255);
                 }
             },
             $str
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
index 6adc5a6c6..d9464a1ae 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
@@ -15,7 +15,7 @@ class Break_ extends Node\Stmt
      * @param null|Node\Expr $num        Number of loops to break
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $num = null, array $attributes = []) {
+    public function __construct(?Node\Expr $num = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->num = $num;
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
index 9b9c09478..5d7b5c016 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
@@ -23,7 +23,7 @@ class Catch_ extends Node\Stmt
      * @param array                 $attributes Additional attributes
      */
     public function __construct(
-        array $types, Expr\Variable $var = null, array $stmts = [], array $attributes = []
+        array $types, ?Expr\Variable $var = null, array $stmts = [], array $attributes = []
     ) {
         $this->attributes = $attributes;
         $this->types = $types;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
index 24882683b..f2b30d79f 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
@@ -15,7 +15,7 @@ class Continue_ extends Node\Stmt
      * @param null|Node\Expr $num        Number of loops to continue
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $num = null, array $attributes = []) {
+    public function __construct(?Node\Expr $num = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->num = $num;
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
index f46ff0baf..a3a5bfaa5 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
@@ -18,7 +18,7 @@ class Declare_ extends Node\Stmt
      * @param Node\Stmt[]|null $stmts      Statements
      * @param array            $attributes Additional attributes
      */
-    public function __construct(array $declares, array $stmts = null, array $attributes = []) {
+    public function __construct(array $declares, ?array $stmts = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->declares = $declares;
         $this->stmts = $stmts;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
index 5beff8b39..4b1079bcd 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
@@ -20,7 +20,7 @@ class EnumCase extends Node\Stmt
      * @param AttributeGroup[]          $attrGroups PHP attribute groups
      * @param array                     $attributes Additional attributes
      */
-    public function __construct($name, Node\Expr $expr = null, array $attrGroups = [], array $attributes = []) {
+    public function __construct($name, ?Node\Expr $expr = null, array $attrGroups = [], array $attributes = []) {
         parent::__construct($attributes);
         $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
         $this->expr = $expr;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
index c63204577..fc249161a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
@@ -22,7 +22,7 @@ class Namespace_ extends Node\Stmt
      * @param null|Node\Stmt[] $stmts      Statements
      * @param array            $attributes Additional attributes
      */
-    public function __construct(Node\Name $name = null, $stmts = [], array $attributes = []) {
+    public function __construct(?Node\Name $name = null, $stmts = [], array $attributes = []) {
         $this->attributes = $attributes;
         $this->name = $name;
         $this->stmts = $stmts;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
index 205731e20..286b42961 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
@@ -18,7 +18,7 @@ class PropertyProperty extends Node\Stmt
      * @param null|Node\Expr                $default    Default value
      * @param array                         $attributes Additional attributes
      */
-    public function __construct($name, Node\Expr $default = null, array $attributes = []) {
+    public function __construct($name, ?Node\Expr $default = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->name = \is_string($name) ? new Node\VarLikeIdentifier($name) : $name;
         $this->default = $default;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
index efc578c58..53731254c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
@@ -15,7 +15,7 @@ class Return_ extends Node\Stmt
      * @param null|Node\Expr $expr       Expression
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $expr = null, array $attributes = []) {
+    public function __construct(?Node\Expr $expr = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->expr = $expr;
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
index 29584560d..0cc47b412 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
@@ -20,7 +20,7 @@ class StaticVar extends Node\Stmt
      * @param array          $attributes Additional attributes
      */
     public function __construct(
-        Expr\Variable $var, Node\Expr $default = null, array $attributes = []
+        Expr\Variable $var, ?Node\Expr $default = null, array $attributes = []
     ) {
         $this->attributes = $attributes;
         $this->var = $var;
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
index 7fc158c57..74e004380 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
@@ -21,7 +21,7 @@ class TryCatch extends Node\Stmt
      * @param null|Finally_ $finally    Optional finally node
      * @param array         $attributes Additional attributes
      */
-    public function __construct(array $stmts, array $catches, Finally_ $finally = null, array $attributes = []) {
+    public function __construct(array $stmts, array $catches, ?Finally_ $finally = null, array $attributes = []) {
         $this->attributes = $attributes;
         $this->stmts = $stmts;
         $this->catches = $catches;
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php b/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
index ba622efd1..e0c7f783a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
@@ -39,7 +39,7 @@ class NodeDumper
      *
      * @return string Dumped value
      */
-    public function dump($node, string $code = null) : string {
+    public function dump($node, ?string $code = null) : string {
         $this->code = $code;
         return $this->dumpRecursive($node);
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
index 83f3ea831..dd2e9ca76 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
@@ -35,7 +35,7 @@ class NameResolver extends NodeVisitorAbstract
      * @param ErrorHandler|null $errorHandler Error handler
      * @param array $options Options
      */
-    public function __construct(ErrorHandler $errorHandler = null, array $options = []) {
+    public function __construct(?ErrorHandler $errorHandler = null, array $options = []) {
         $this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
         $this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
         $this->replaceNodes = $options['replaceNodes'] ?? true;
@@ -164,7 +164,7 @@ class NameResolver extends NodeVisitorAbstract
         return null;
     }
 
-    private function addAlias(Stmt\UseUse $use, int $type, Name $prefix = null) {
+    private function addAlias(Stmt\UseUse $use, int $type, ?Name $prefix = null) {
         // Add prefix for group uses
         $name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
         // Type is determined either by individual element or whole use declaration
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser.php b/lib/nikic/php-parser/lib/PhpParser/Parser.php
index 8956c7671..7236c68e2 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser.php
@@ -14,5 +14,5 @@ interface Parser
      * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
      *                          the parser was unable to recover from an error).
      */
-    public function parse(string $code, ErrorHandler $errorHandler = null);
+    public function parse(string $code, ?ErrorHandler $errorHandler = null);
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
index 77fd1f3fb..083ff465d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
@@ -24,7 +24,7 @@ class Multiple implements Parser
         $this->parsers = $parsers;
     }
 
-    public function parse(string $code, ErrorHandler $errorHandler = null) {
+    public function parse(string $code, ?ErrorHandler $errorHandler = null) {
         if (null === $errorHandler) {
             $errorHandler = new ErrorHandler\Throwing;
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
index 59bd1e8cf..80ebdfb37 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
@@ -27,7 +27,7 @@ class Php5 extends \PhpParser\ParserAbstract
     protected $unexpectedTokenRule = 32767;
 
     protected $YY2TBLSTATE = 415;
-    protected $numNonLeafStates = 663;
+    protected $numNonLeafStates = 664;
 
     protected $symbolToName = array(
         "EOF",
@@ -244,116 +244,116 @@ class Php5 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          700,  670,  671,  672,  673,  674,  286,  675,  676,  677,
-          713,  714,  223,  224,  225,  226,  227,  228,  229,  230,
+          701,  671,  672,  673,  674,  675,  286,  676,  677,  678,
+          714,  715,  223,  224,  225,  226,  227,  228,  229,  230,
           231,  232,    0,  233,  234,  235,  236,  237,  238,  239,
           240,  241,  242,  243,  244,-32766,-32766,-32766,-32766,-32766,
         -32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,  245,  246,
-          242,  243,  244,-32766,-32766,  678,-32766,-32766,-32766,-32766,
-        -32766,-32766,-32766,-32766,-32766, 1229,  245,  246, 1230,  679,
-          680,  681,  682,  683,  684,  685,  899,  900,  747,-32766,
-        -32766,-32766,-32766,-32766,-32766,  686,  687,  688,  689,  690,
-          691,  692,  693,  694,  695,  696,  716,  739,  717,  718,
-          719,  720,  708,  709,  710,  738,  711,  712,  697,  698,
-          699,  701,  702,  703,  741,  742,  743,  744,  745,  746,
-          875,  704,  705,  706,  707,  737,  728,  726,  727,  723,
-          724, 1046,  715,  721,  722,  729,  730,  732,  731,  733,
-          734,   55,   56,  425,   57,   58,  725,  736,  735,  755,
+          242,  243,  244,-32766,-32766,  679,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766, 1230,  245,  246, 1231,  680,
+          681,  682,  683,  684,  685,  686,  900,  901,  748,-32766,
+        -32766,-32766,-32766,-32766,-32766,  687,  688,  689,  690,  691,
+          692,  693,  694,  695,  696,  697,  717,  740,  718,  719,
+          720,  721,  709,  710,  711,  739,  712,  713,  698,  699,
+          700,  702,  703,  704,  742,  743,  744,  745,  746,  747,
+          876,  705,  706,  707,  708,  738,  729,  727,  728,  724,
+          725, 1047,  716,  722,  723,  730,  731,  733,  732,  734,
+          735,   55,   56,  425,   57,   58,  726,  737,  736,  756,
            59,   60, -226,   61,-32766,-32766,-32766,-32766,-32766,-32766,
         -32766,-32766,-32766,-32766,  337,-32767,-32767,-32767,-32767,   29,
           107,  108,  109,  110,  111,  112,  113,  114,  115,  116,
-          117,  118,  119,  620,-32766,-32766,-32766,-32766,   62,   63,
-         1046,-32766,-32766,-32766,   64,  419,   65,  294,  295,   66,
-           67,   68,   69,   70,   71,   72,   73,  823,   25,  302,
-           74,  418,  984,  986,  669,  668, 1100, 1101, 1078,  755,
-          755,  767, 1220,  768,  470,-32766,-32766,-32766,  341,  749,
-          824,   54,-32767,-32767,-32767,-32767,   98,   99,  100,  101,
-          102,  220,  221,  222,  362,  876,-32766,   27,-32766,-32766,
-        -32766,-32766,-32766, 1046,  493,  126, 1080, 1079, 1081,  370,
-         1068,  930,  207,  478,  479,  952,  953,  954,  951,  950,
-          949,  128,  480,  481,  803, 1106, 1107, 1108, 1109, 1103,
-         1104,  319,   32,  297,   10,  211, -515, 1110, 1105,  669,
-          668, 1080, 1079, 1081,  220,  221,  222,   41,  364,  341,
-          334,  421,  336,  426, -128, -128, -128,  313, 1046,  469,
-           -4,  824,   54,  812,  770,  207,   40,   21,  427, -128,
-          471, -128,  472, -128,  473, -128, 1046,  428,  220,  221,
+          117,  118,  119,  621,-32766,-32766,-32766,-32766,   62,   63,
+         1047,-32766,-32766,-32766,   64,  419,   65,  294,  295,   66,
+           67,   68,   69,   70,   71,   72,   73,  824,   25,  302,
+           74,  418,  985,  987,  670,  669, 1101, 1102, 1079,  756,
+          756,  768, 1221,  769,  470,-32766,-32766,-32766,  341,  750,
+          825,   54,-32767,-32767,-32767,-32767,   98,   99,  100,  101,
+          102,  220,  221,  222,  362,  877,-32766,   27,-32766,-32766,
+        -32766,-32766,-32766, 1047,  492,  126, 1081, 1080, 1082,  370,
+         1069,  931,  207,  478,  479,  953,  954,  955,  952,  951,
+          950,  128,  480,  481,  804, 1107, 1108, 1109, 1110, 1104,
+         1105,  319,   32,  297,   10,  211, -515, 1111, 1106,  670,
+          669, 1081, 1080, 1082,  220,  221,  222,   41,  364,  341,
+          334,  421,  336,  426, -128, -128, -128,  313, 1047,  469,
+           -4,  825,   54,  813,  597,  207,   40,   21,  427, -128,
+          471, -128,  472, -128,  473, -128, 1047,  428,  220,  221,
           222,-32766,   33,   34,  429,  361,  327,   52,   35,  474,
         -32766,-32766,-32766,  342,  357,  358,  475,  476,   48,  207,
-          249,  669,  668,  477,  443,  300,  795,  846,  430,  431,
-           28,-32766,  814,-32766,-32766,-32766,-32766,-32766,-32766,-32766,
-        -32767,-32767,-32767,-32767,-32767,  952,  953,  954,  951,  950,
-          949,  422,  755,  424,  426,  826,  634, -128,-32766,-32766,
-          469,  824,   54,  288,  812, 1151,  755,   40,   21,  427,
-          317,  471,  345,  472,  129,  473,    9, 1186,  428,  769,
-          360,  324,  905,   33,   34,  429,  361, 1046,  415,   35,
-          474,  944, 1068,  315,  125,  357,  358,  475,  476,-32766,
-        -32766,-32766,  926,  302,  477,  121, 1068,  759,  846,  430,
-          431,  669,  668,  423,  755, 1152,  809, 1046,  480,  766,
-        -32766,  805,-32766,-32766,-32766,-32766, -261,  127,  347,  436,
-          841,  341, 1078, 1200,  426,  446,  826,  634,   -4,  807,
-          469,  824,   54,  436,  812,  341,  755,   40,   21,  427,
-          444,  471,  130,  472, 1068,  473,  346,  767,  428,  768,
-         -211, -211, -211,   33,   34,  429,  361,  308, 1076,   35,
-          474,-32766,-32766,-32766, 1046,  357,  358,  475,  476,-32766,
-        -32766,-32766,  906,  120,  477,  539, 1068,  795,  846,  430,
-          431,  436,-32766,  341,-32766,-32766,-32766, 1046,  480,  810,
-        -32766,  925,-32766,-32766,  754, 1080, 1079, 1081,   49,-32766,
-        -32766,-32766,  749,  751,  426, 1201,  826,  634, -211,   30,
-          469,  669,  668,  436,  812,  341,   75,   40,   21,  427,
-        -32766,  471, 1064,  472,  124,  473,  669,  668,  428,  212,
-         -210, -210, -210,   33,   34,  429,  361,   51, 1186,   35,
-          474,  755,-32766,-32766,-32766,  357,  358,  475,  476,  213,
-          824,   54,  221,  222,  477,   20,  581,  795,  846,  430,
-          431,  220,  221,  222,  755,  222,  247,   78,   79,   80,
-           81,  341,  207,  517,  103,  104,  105,  752,  307,  131,
-          637, 1068,  207,  341,  207,  122,  826,  634, -210,   36,
+          249,  670,  669,  477,  443,  300,  796,  847,  430,  431,
+           28,-32766,  815,-32766,-32766,-32766,-32766,-32766,-32766,-32766,
+        -32767,-32767,-32767,-32767,-32767,  953,  954,  955,  952,  951,
+          950,  422,  756,  424,  426,  827,  635, -128,-32766,-32766,
+          469,  825,   54,  288,  813, 1152,  756,   40,   21,  427,
+          317,  471,  345,  472,  129,  473,    9, 1187,  428,  612,
+          360,  324,  906,   33,   34,  429,  361, 1047,  415,   35,
+          474,  945, 1069,  315,  125,  357,  358,  475,  476,-32766,
+        -32766,-32766,  927,  302,  477,  121, 1069,  760,  847,  430,
+          431,  670,  669,  423,  756, 1153,  810, 1047,  480,  767,
+        -32766,  806,-32766,-32766,-32766,-32766, -261,  127,  347,  436,
+          842,  341, 1079, 1201,  426,  446,  827,  635,   -4,  808,
+          469,  825,   54,  436,  813,  341,  756,   40,   21,  427,
+          444,  471,  130,  472, 1069,  473,  346,  768,  428,  769,
+         -211, -211, -211,   33,   34,  429,  361,  308, 1077,   35,
+          474,-32766,-32766,-32766, 1047,  357,  358,  475,  476,-32766,
+        -32766,-32766,  907,  120,  477,  538, 1069,  796,  847,  430,
+          431,  436,-32766,  341,-32766,-32766,-32766, 1047,  480,  811,
+        -32766,  926,-32766,-32766,  755, 1081, 1080, 1082,   49,-32766,
+        -32766,-32766,  750,  752,  426, 1202,  827,  635, -211,   30,
+          469,  670,  669,  436,  813,  341,   75,   40,   21,  427,
+        -32766,  471, 1065,  472,  124,  473,  670,  669,  428,  212,
+         -210, -210, -210,   33,   34,  429,  361,   51, 1187,   35,
+          474,  756,-32766,-32766,-32766,  357,  358,  475,  476,  213,
+          825,   54,  221,  222,  477,   20,  580,  796,  847,  430,
+          431,  220,  221,  222,  756,  222,  247,   78,   79,   80,
+           81,  341,  207,  516,  103,  104,  105,  753,  307,  131,
+          638, 1069,  207,  341,  207,  122,  827,  635, -210,   36,
           106,   82,   83,   84,   85,   86,   87,   88,   89,   90,
            91,   92,   93,   94,   95,   96,   97,   98,   99,  100,
-          101,  102,  103,  104,  105, 1112,  307,  346,  436,  214,
-          341,  824,   54,  426,  123,  250,  129,  134,  106,  469,
-        -32766,  572, 1112,  812,  245,  246,   40,   21,  427,  251,
-          471,  252,  472,  341,  473,  453,   22,  428,  207,  899,
-          900,  638,   33,   34,  429,  824,   54,  -86,   35,  474,
+          101,  102,  103,  104,  105, 1113,  307,  346,  436,  214,
+          341,  825,   54,  426,  123,  250,  129,  134,  106,  469,
+        -32766,  571, 1113,  813,  245,  246,   40,   21,  427,  251,
+          471,  252,  472,  341,  473,  453,   22,  428,  207,  900,
+          901,  639,   33,   34,  429,  825,   54,  -86,   35,  474,
           220,  221,  222,  314,  357,  358,  100,  101,  102,  239,
-          240,  241,  645,  477, -230,  458,  589,  135,  374,  596,
-          597,  207,  760,  640,  648,  642,  941,  654,  929,  662,
-          822,  133,  307,  837,  426,-32766,  106,  749,   43,   44,
-          469,   45,  442,   46,  812,  826,  634,   40,   21,  427,
+          240,  241,  646,  477, -230,  458,  588,  135,  374,  595,
+          596,  207,  761,  641,  649,  643,  942,  655,  930,  663,
+          823,  133,  307,  838,  426,-32766,  106,  750,   43,   44,
+          469,   45,  442,   46,  813,  827,  635,   40,   21,  427,
            47,  471,   50,  472,   53,  473,  132,  608,  428,  302,
-          604, -280,-32766,   33,   34,  429,  824,   54,  426,   35,
-          474,  755,  957,  -84,  469,  357,  358,  521,  812,  628,
-          363,   40,   21,  427,  477,  471,  575,  472, -515,  473,
-          847,  616,  428, -423,-32766,   11,  646,   33,   34,  429,
-          824,   54,  445,   35,  474,  462,  285,  578, 1111,  357,
-          358,  593,  369,  848,  594,  290,  826,  634,  477,    0,
-            0,  532,    0,    0,  325,    0,    0,    0,    0,    0,
-          651,    0,    0,    0,  322,  326,    0,    0,    0,  426,
-            0,    0,    0,    0,  323,  469,  316,  318, -516,  812,
-          862,  634,   40,   21,  427,    0,  471,    0,  472,    0,
-          473, 1158,    0,  428,    0, -414,    6,    7,   33,   34,
-          429,  824,   54,  426,   35,  474,   12,   14,  373,  469,
-          357,  358, -424,  812,  563,  754,   40,   21,  427,  477,
-          471,  248,  472,  839,  473,   38,   39,  428,  657,  658,
-          765,  813,   33,   34,  429,  821,  800,  815,   35,  474,
-          215,  216,  878,  869,  357,  358,  217,  870,  218,  798,
-          863,  826,  634,  477,  860,  858,  936,  937,  934,  820,
-          209,  804,  806,  808,  811,  933,  763,  764, 1100, 1101,
-          935,  659,   78,  335,  426,  359, 1102,  635,  639,  641,
-          469,  643,  644,  647,  812,  826,  634,   40,   21,  427,
-          649,  471,  650,  472,  652,  473,  653,  636,  428,  796,
-         1226, 1228,  762,   33,   34,  429,  215,  216,  845,   35,
-          474,  761,  217,  844,  218,  357,  358, 1227,  843, 1060,
-          831, 1048,  842, 1049,  477,  559,  209, 1106, 1107, 1108,
-         1109, 1103, 1104,  398, 1100, 1101,  829,  942,  867, 1110,
-         1105,  868, 1102,  457, 1225, 1194, 1192, 1177, 1157,  219,
-         1190, 1091,  917, 1198, 1188,    0,  826,  634,   24, -433,
-           26,   31,   37,   42,   76,   77,  210,  287,  292,  293,
+          604, -280,-32766,   33,   34,  429,  825,   54,  426,   35,
+          474,  756,  958,  -84,  469,  357,  358,  520,  813,  629,
+          363,   40,   21,  427,  477,  471,  574,  472, -515,  473,
+          848,  617,  428, -423,-32766,   11,  647,   33,   34,  429,
+          825,   54,  445,   35,  474,  462,  285,  577, 1112,  357,
+          358,  592,  369,  849,  593,  290,  827,  635,  477,    0,
+            0,  531,    0,    0,  325,    0,    0,    0,    0,    0,
+          652,    0,    0,    0,  322,  326,    0,    0,    0,  426,
+            0,    0,    0,    0,  323,  469,  316,  318, -516,  813,
+          863,  635,   40,   21,  427,    0,  471,    0,  472,    0,
+          473, 1159,    0,  428,    0, -414,    6,    7,   33,   34,
+          429,  825,   54,  426,   35,  474,   12,   14,  373,  469,
+          357,  358, -424,  813,  562,  755,   40,   21,  427,  477,
+          471,  248,  472,  840,  473,   38,   39,  428,  658,  659,
+          814,  822,   33,   34,  429,  801,  816,  879,   35,  474,
+          215,  216,  870,  871,  357,  358,  217,  771,  218,  799,
+          864,  827,  635,  477,  770,  861,  859,  937,  938,  935,
+          209,  821,  805,  807,  809,  812,  934,  764, 1101, 1102,
+          765,  936,   24,   78,  426,  335, 1103,  359,  636,  640,
+          469,  642,  644,  645,  813,  827,  635,   40,   21,  427,
+          648,  471,  650,  472,  651,  473,  653,  654,  428,  637,
+           26,  660,  797,   33,   34,  429,  215,  216, 1227,   35,
+          474, 1229,  217,  763,  218,  357,  358,  846,  762,  845,
+         1228,  844, 1061,  832,  477,  558,  209, 1107, 1108, 1109,
+         1110, 1104, 1105,  398, 1101, 1102, 1049,  843, 1050, 1111,
+         1106,  830, 1103,  943,  868,  869,  457, 1226, 1158,  219,
+         1195, 1193, 1178, 1191, 1092,  918,  827,  635,   31, 1199,
+         1189, 1056,   37,   42,   76,   77,  210,  287,  292,  293,
           308,  309,  310,  311,  339,  356,  416,    0, -227, -226,
-           16,   17,   18,  393,  454,  461,  463,  467,  553,  625,
-         1051,  559, 1054, 1106, 1107, 1108, 1109, 1103, 1104,  398,
-          907, 1116, 1050, 1026,  564, 1110, 1105, 1025, 1093, 1055,
-            0, 1044,    0, 1057, 1056,  219, 1059, 1058, 1075,    0,
-         1191, 1176, 1172, 1189, 1090, 1223, 1117, 1171,  600
+           16,   17,   18,  393,  454,  461,  463,  467,  552,  626,
+         1052,  558, 1055, 1107, 1108, 1109, 1110, 1104, 1105,  398,
+          908, 1117, 1051, 1027,  563, 1111, 1106, 1026, 1094, 1058,
+            0, -433, 1045,    0, 1057,  219, 1060, 1059, 1076,    0,
+         1192, 1177, 1173, 1190, 1091, 1224, 1118, 1172,  600
     );
 
     protected $actionCheck = array(
@@ -451,26 +451,26 @@ class Php5 extends \PhpParser\ParserAbstract
            50,   51,  156,  156,  115,  116,   56,  156,   58,  156,
           156,  156,  157,  124,  156,  156,  156,  156,  156,  156,
            70,  156,  156,  156,  156,  156,  156,  156,   78,   79,
-          156,  158,  157,  157,   74,  157,   86,  157,  157,  157,
+          156,  156,  159,  157,   74,  157,   86,  157,  157,  157,
            80,  157,  157,  157,   84,  156,  157,   87,   88,   89,
-          157,   91,  157,   93,  157,   95,  157,  157,   98,  158,
-          158,  158,  158,  103,  104,  105,   50,   51,  158,  109,
+          157,   91,  157,   93,  157,   95,  157,  157,   98,  157,
+          159,  158,  158,  103,  104,  105,   50,   51,  158,  109,
           110,  158,   56,  158,   58,  115,  116,  158,  158,  158,
           158,  158,  158,  158,  124,  135,   70,  137,  138,  139,
           140,  141,  142,  143,   78,   79,  158,  158,  158,  149,
           150,  158,   86,  158,  158,  158,  158,  158,  164,  159,
-          158,  158,  158,  158,  158,   -1,  156,  157,  159,  162,
-          159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+          158,  158,  158,  158,  158,  158,  156,  157,  159,  158,
+          158,  163,  159,  159,  159,  159,  159,  159,  159,  159,
           159,  159,  159,  159,  159,  159,  159,   -1,  160,  160,
           160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
           160,  135,  160,  137,  138,  139,  140,  141,  142,  143,
           160,  160,  160,  160,  160,  149,  150,  160,  160,  163,
-           -1,  162,   -1,  163,  163,  159,  163,  163,  163,   -1,
+           -1,  162,  162,   -1,  163,  159,  163,  163,  163,   -1,
           163,  163,  163,  163,  163,  163,  163,  163,  163
     );
 
     protected $actionBase = array(
-            0,  229,  310,  390,  470,  103,  325,  325,  784,   -2,
+            0,  229,  310,  390,  470,  103,  325,  325,  785,   -2,
            -2,  149,   -2,   -2,   -2,  660,  765,  799,  765,  589,
           694,  870,  870,  870,  252,  404,  404,  404,  514,  177,
           177,  918,  434,  118,  295,  313,  240,  491,  491,  491,
@@ -483,9 +483,9 @@ class Php5 extends \PhpParser\ParserAbstract
           491,  491,  491,  491,  491,  491,  491,  491,  491,  491,
           491,  491,  491,  491,  491,  491,  491,  491,  491,  491,
           491,  491,  491,  491,  491,  491,  491,  491,  491,  491,
-          491,  491,  491,  491,  491,  491,   89,  206,  773,  550,
-          535,  775,  776,  777,  912,  709,  913,  856,  857,  700,
-          858,  859,  862,  863,  864,  855,  865,  935,  866,  599,
+          491,  491,  491,  491,  491,  491,   89,  206,  775,  550,
+          535,  776,  777,  778,  912,  709,  913,  859,  862,  700,
+          863,  864,  865,  866,  867,  858,  871,  935,  872,  599,
           599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
           599,  322,  592,  285,  319,  232,   44,  691,  691,  691,
           691,  691,  691,  691,  182,  182,  182,  182,  182,  182,
@@ -504,43 +504,44 @@ class Php5 extends \PhpParser\ParserAbstract
           554,  554,  679,  -59,  -59,  381,  462,  462,  462,  528,
           717,  854,  382,  382,  382,  382,  382,  382,  561,  561,
           561,   -3,   -3,   -3,  692,  115,  137,  115,  137,  678,
-          732,  450,  732,  338,  677,  -15,  510,  810,  468,  707,
-          850,  711,  853,  572,  735,  267,  529,  654,  674,  463,
+          732,  450,  732,  338,  677,  -15,  510,  812,  468,  707,
+          856,  711,  857,  572,  735,  267,  529,  654,  674,  463,
           529,  529,  529,  529,  654,  610,  640,  608,  463,  529,
-          463,  718,  323,  496,   89,  570,  507,  675,  778,  293,
-          670,  780,  290,  373,  332,  566,  278,  435,  733,  781,
+          463,  718,  323,  496,   89,  570,  507,  675,  779,  293,
+          670,  781,  290,  373,  332,  566,  278,  435,  733,  784,
           914,  917,  385,  715,  675,  675,  675,  352,  511,  278,
            -8,  605,  605,  605,  605,  156,  605,  605,  605,  605,
-          251,  276,  375,  402,  779,  657,  657,  690,  872,  869,
-          869,  657,  689,  657,  690,  874,  874,  874,  874,  657,
-          657,  657,  657,  869,  869,  869,  688,  869,  239,  703,
-          704,  704,  874,  742,  743,  657,  657,  712,  869,  869,
-          869,  712,  695,  874,  701,  741,  277,  869,  874,  672,
+          251,  276,  375,  402,  780,  657,  657,  690,  869,  783,
+          783,  657,  689,  657,  690,  874,  874,  874,  874,  657,
+          657,  657,  657,  783,  783,  783,  688,  783,  239,  703,
+          704,  704,  874,  742,  743,  657,  657,  712,  783,  783,
+          783,  712,  695,  874,  701,  741,  277,  783,  874,  672,
           689,  672,  657,  701,  672,  689,  689,  672,   22,  666,
-          668,  873,  875,  887,  790,  662,  685,  879,  880,  876,
-          878,  871,  699,  744,  745,  497,  669,  671,  673,  680,
-          719,  682,  713,  674,  667,  667,  667,  655,  720,  655,
-          667,  667,  667,  667,  667,  667,  667,  667,  916,  646,
-          731,  714,  653,  749,  553,  573,  791,  664,  811,  900,
-          893,  867,  919,  881,  898,  655,  920,  739,  247,  643,
-          882,  783,  786,  655,  883,  655,  792,  655,  902,  812,
-          686,  813,  814,  667,  910,  921,  923,  924,  925,  927,
-          928,  929,  930,  684,  931,  750,  696,  894,  299,  877,
-          718,  729,  705,  788,  751,  820,  328,  932,  823,  655,
-          655,  794,  785,  655,  795,  756,  740,  890,  757,  895,
-          933,  664,  708,  896,  655,  706,  825,  934,  328,  681,
-          683,  888,  661,  761,  886,  911,  885,  796,  649,  663,
-          829,  830,  831,  693,  763,  891,  892,  889,  764,  803,
-          665,  805,  697,  832,  807,  884,  768,  833,  834,  899,
-          676,  730,  710,  698,  687,  809,  835,  897,  769,  770,
-          771,  848,  772,  849,    0,    0,    0,    0,    0,    0,
+          668,  873,  875,  887,  791,  662,  685,  879,  880,  876,
+          878,  811,  699,  744,  497,  669,  671,  673,  680,  719,
+          682,  713,  674,  667,  667,  667,  655,  720,  655,  667,
+          667,  667,  667,  667,  667,  667,  667,  868,  646,  731,
+          714,  653,  745,  553,  573,  792,  664,  814,  900,  893,
+          919,  920,  881,  898,  655,  916,  739,  247,  643,  882,
+          813,  788,  655,  883,  655,  794,  655,  902,  820,  686,
+          823,  825,  667,  910,  921,  923,  924,  925,  927,  928,
+          929,  930,  684,  931,  749,  696,  894,  299,  877,  718,
+          729,  705,  790,  750,  829,  328,  932,  830,  655,  655,
+          795,  786,  655,  796,  751,  740,  890,  756,  895,  933,
+          664,  708,  896,  655,  706,  831,  934,  328,  681,  683,
+          888,  661,  757,  886,  911,  885,  803,  761,  649,  663,
+          832,  833,  834,  693,  763,  891,  892,  889,  764,  805,
+          665,  807,  768,  697,  835,  809,  884,  769,  848,  849,
+          899,  676,  730,  710,  698,  687,  810,  850,  897,  770,
+          771,  772,  853,  773,  855,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  138,  138,  138,  138,   -2,   -2,
-           -2,   -2,    0,    0,   -2,    0,    0,    0,  138,  138,
+            0,    0,    0,    0,    0,  138,  138,  138,  138,   -2,
+           -2,   -2,   -2,    0,    0,   -2,    0,    0,    0,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-          138,  138,  138,  138,    0,    0,  138,  138,  138,  138,
+          138,  138,  138,  138,  138,    0,    0,  138,  138,  138,
+          138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
@@ -549,35 +550,34 @@ class Php5 extends \PhpParser\ParserAbstract
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
           138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-          138,  138,  138,  138,  138,  138,  138,  138,  138,  599,
           599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
           599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
-          599,  599,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  599,  -21,  -21,  -21,  -21,  599,
-          -21,  -21,  -21,  -21,  -21,  -21,  -21,  599,  599,  599,
+          599,  599,  599,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,  599,  -21,  -21,  -21,  -21,
+          599,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  599,  599,
           599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
-          599,  599,  599,  599,  599,  -21,  599,  599,  599,  -21,
-          382,  -21,  382,  382,  382,  382,  382,  382,  382,  382,
+          599,  599,  599,  599,  599,  599,  -21,  599,  599,  599,
+          -21,  382,  -21,  382,  382,  382,  382,  382,  382,  382,
           382,  382,  382,  382,  382,  382,  382,  382,  382,  382,
           382,  382,  382,  382,  382,  382,  382,  382,  382,  382,
           382,  382,  382,  382,  382,  382,  382,  382,  382,  382,
-          382,  382,  382,  382,  382,  382,  599,    0,    0,  599,
-          -21,  599,  -21,  599,  -21,  -21,  599,  599,  599,  599,
-          599,  599,  599,  -21,  -21,  -21,  -21,  -21,  -21,    0,
-          561,  561,  561,  561,  -21,  -21,  -21,  -21,  382,  382,
-          382,  382,  382,  382,  259,  382,  382,  382,  382,  382,
-          382,  382,  382,  382,  382,  382,  561,  561,   -3,   -3,
-          382,  382,  382,  382,  382,  259,  382,  382,  463,  689,
-          689,  689,  137,  137,  137,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,  137,  463,    0,
-          463,    0,  382,  463,  689,  463,  657,  137,  689,  689,
-          463,  869,  616,  616,  616,  616,  328,  278,    0,    0,
-          689,  689,    0,    0,    0,    0,    0,  689,    0,    0,
-            0,    0,    0,    0,  869,    0,    0,    0,    0,    0,
-          667,  247,    0,  705,  335,    0,    0,    0,    0,    0,
-            0,  705,  335,  347,  347,    0,  684,  667,  667,  667,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,  328
+          382,  382,  382,  382,  382,  382,  382,  599,    0,    0,
+          599,  -21,  599,  -21,  599,  -21,  -21,  599,  599,  599,
+          599,  599,  599,  599,  -21,  -21,  -21,  -21,  -21,  -21,
+            0,  561,  561,  561,  561,  -21,  -21,  -21,  -21,  382,
+          382,  382,  382,  382,  382,  259,  382,  382,  382,  382,
+          382,  382,  382,  382,  382,  382,  382,  561,  561,   -3,
+           -3,  382,  382,  382,  382,  382,  259,  382,  382,  463,
+          689,  689,  689,  137,  137,  137,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,  137,  463,
+            0,  463,    0,  382,  463,  689,  463,  657,  137,  689,
+          689,  463,  783,  616,  616,  616,  616,  328,  278,    0,
+            0,  689,  689,    0,    0,    0,    0,    0,  689,    0,
+            0,    0,    0,    0,    0,  783,    0,    0,    0,    0,
+            0,  667,  247,    0,  705,  335,    0,    0,    0,    0,
+            0,    0,  705,  335,  347,  347,    0,  684,  667,  667,
+          667,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,  328
     );
 
     protected $actionDefault = array(
@@ -629,90 +629,90 @@ class Php5 extends \PhpParser\ParserAbstract
         32767,  190,  173,32767,  400,  175,  498,32767,32767,  240,
         32767,  240,32767,  400,  240,32767,32767,  240,32767,  415,
           439,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  379,  380,  493,  506,
-        32767,  507,32767,  413,  343,  344,  346,  322,32767,  324,
-          369,  370,  371,  372,  373,  374,  375,  377,32767,  419,
-        32767,  422,32767,32767,32767,  257,32767,  557,32767,32767,
-          306,  557,32767,32767,32767,  551,32767,32767,  300,32767,
-        32767,32767,32767,  253,32767,  169,32767,  541,32767,  558,
-        32767,  515,32767,  342,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,  516,32767,32767,32767,32767,  229,32767,
-          452,32767,  116,32767,32767,32767,  189,32767,32767,  304,
-          248,32767,32767,  550,32767,32767,32767,32767,32767,32767,
-        32767,32767,  114,32767,  170,32767,32767,32767,  191,32767,
-        32767,  515,32767,32767,32767,32767,32767,32767,32767,  295,
+        32767,32767,32767,32767,32767,  379,  380,  493,  506,32767,
+          507,32767,  413,  343,  344,  346,  322,32767,  324,  369,
+          370,  371,  372,  373,  374,  375,  377,32767,  419,32767,
+          422,32767,32767,32767,  257,32767,  557,32767,32767,  306,
+          557,32767,32767,32767,  551,32767,32767,  300,32767,32767,
+        32767,32767,  253,32767,  169,32767,  541,32767,  558,32767,
+          515,32767,  342,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  516,32767,32767,32767,32767,  229,32767,  452,
+        32767,  116,32767,32767,32767,  189,32767,32767,  304,  248,
+        32767,32767,  550,32767,32767,32767,32767,32767,32767,32767,
+        32767,  114,32767,  170,32767,32767,32767,  191,32767,32767,
+          515,32767,32767,32767,32767,32767,32767,32767,32767,  295,
         32767,32767,32767,32767,32767,32767,32767,  515,32767,32767,
           233,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          415,32767,  276,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  127,  127,    3,  127,  127,  260,
-            3,  260,  127,  260,  260,  127,  127,  127,  127,  127,
-          127,  127,  127,  127,  127,  216,  219,  208,  208,  164,
-          127,  127,  268
+        32767,  415,32767,  276,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,  127,  127,    3,  127,  127,
+          260,    3,  260,  127,  260,  260,  127,  127,  127,  127,
+          127,  127,  127,  127,  127,  127,  216,  219,  208,  208,
+          164,  127,  127,  268
     );
 
     protected $goto = array(
           166,  140,  140,  140,  166,  187,  168,  144,  147,  141,
           142,  143,  149,  163,  163,  163,  163,  144,  144,  165,
           165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-          138,  159,  160,  161,  162,  184,  139,  185,  494,  495,
-          377,  496,  500,  501,  502,  503,  504,  505,  506,  507,
-          970,  164,  145,  146,  148,  171,  176,  186,  203,  253,
+          138,  159,  160,  161,  162,  184,  139,  185,  493,  494,
+          377,  495,  499,  500,  501,  502,  503,  504,  505,  506,
+          971,  164,  145,  146,  148,  171,  176,  186,  203,  253,
           256,  258,  260,  263,  264,  265,  266,  267,  268,  269,
           277,  278,  279,  280,  303,  304,  328,  329,  330,  394,
-          395,  396,  543,  188,  189,  190,  191,  192,  193,  194,
+          395,  396,  542,  188,  189,  190,  191,  192,  193,  194,
           195,  196,  197,  198,  199,  200,  201,  150,  151,  152,
           167,  153,  169,  154,  204,  170,  155,  156,  157,  205,
-          158,  136,  621,  561,  757,  561,  561,  561,  561,  561,
-          561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-          561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-          561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-          561,  561,  561,  561,  561,  561,  561,  561,  561, 1113,
-          629, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
-         1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
-         1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
-         1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113,
-         1113, 1113, 1113, 1113, 1113,  758,  520,  531,  509,  656,
-          556, 1183,  750,  509,  592,  786, 1183,  888,  612,  613,
-          884,  617,  618,  624,  626,  631,  633,  817,  855,  855,
-          855,  855,  850,  856,  174,  891,  891, 1205, 1205,  177,
+          158,  136,  622,  560,  758,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560, 1114,
+          630, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114,
+         1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114,
+         1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114,
+         1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114,
+         1114, 1114, 1114, 1114, 1114,  759,  519,  530,  508,  657,
+          555, 1184,  350,  508,  591,  787, 1184,  889,  613,  614,
+          885,  618,  619,  625,  627,  632,  634,  751,  856,  856,
+          856,  856,  851,  857,  174,  892,  892, 1206, 1206,  177,
           178,  179,  401,  402,  403,  404,  173,  202,  206,  208,
           257,  259,  261,  262,  270,  271,  272,  273,  274,  275,
           281,  282,  283,  284,  305,  306,  331,  332,  333,  406,
           407,  408,  409,  175,  180,  254,  255,  181,  182,  183,
-          498,  498,  498,  498,  498,  498,  861,  498,  498,  498,
-          498,  498,  498,  498,  498,  498,  498,  510,  586,  538,
-          601,  602,  510,  545,  546,  547,  548,  549,  550,  551,
-          552,  554,  587, 1209,  560,  350,  560,  560,  560,  560,
-          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
-          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
-          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
-          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
-          400,  607,  537,  537,  569,  533,  909,  535,  535,  497,
-          499,  525,  541,  570,  573,  584,  591,  298,  296,  296,
-          296,  298,  289,  299,  611,  378,  511,  614,  595,  947,
-          375,  511,  437,  437,  437,  437,  437,  437, 1163,  437,
-          437,  437,  437,  437,  437,  437,  437,  437,  437, 1077,
-          948,  338, 1175,  321, 1077,  898,  898,  898,  898,  606,
-          898,  898, 1217, 1217, 1202,  753,  576,  605,  756, 1077,
-         1077, 1077, 1077, 1077, 1077, 1069,  384,  384,  384,  391,
-         1217,  877,  859,  857,  859,  655,  466,  512,  886,  881,
-          753,  384,  753,  384,  968,  384,  895,  385,  588,  353,
-          414,  384, 1231, 1019,  542, 1197, 1197, 1197,  568, 1094,
-          386,  386,  386,  904,  915,  515, 1029,   19,   15,  372,
-          389,  915,  940,  448,  450,  632,  340, 1216, 1216, 1114,
-          615,  938,  840,  555,  775,  386,  913, 1070, 1073, 1074,
-          399, 1069, 1182,  660,   23, 1216,  773, 1182,  544,  603,
-         1066, 1219, 1071, 1174, 1071,  519, 1199, 1199, 1199, 1089,
-         1088, 1072,  343,  523,  534,  519,  519,  772,  351,  352,
-           13,  579,  583,  627, 1061,  388,  782,  562,  771,  515,
-          783, 1181,    3,    4,  918,  956,  865,  451,  574, 1160,
+          497,  497,  497,  497,  497,  497,  818,  497,  497,  497,
+          497,  497,  497,  497,  497,  497,  497,  509,  585,  862,
+          601,  602,  509,  544,  545,  546,  547,  548,  549,  550,
+          551,  553,  586,  338,  559,  321,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          400,  607,  536,  536,  568,  532,  537,  534,  534,  496,
+          498,  524,  540,  569,  572,  583,  590,  298,  296,  296,
+          296,  298,  289,  299,  611, 1210,  510,  615,  910,  948,
+          375,  510,  437,  437,  437,  437,  437,  437,  594,  437,
+          437,  437,  437,  437,  437,  437,  437,  437,  437, 1078,
+          949,  388, 1176,  561, 1078,  899,  899,  899,  899,  378,
+          899,  899, 1218, 1218, 1164,  754,  351,  352,  757, 1078,
+         1078, 1078, 1078, 1078, 1078, 1070,  384,  384,  384,  606,
+         1218,  878,  860,  858,  860,  656,  466,  511,  887,  882,
+          754,  384,  754,  384,  969,  384,  391,  385,  587,  353,
+          414,  384, 1232, 1203,  541, 1198, 1198, 1198,  567, 1095,
+          386,  386,  386, 1020,  916,  514, 1030,   19,   15,  372,
+          776,  916,  941,  448,  450,  633,  896, 1217, 1217, 1115,
+          616,  939,  841,  554,  905,  386,  340, 1071, 1074, 1075,
+          399, 1070, 1183,  914,   23, 1217,  774, 1183,  543,  603,
+          389, 1220, 1072, 1175, 1072,  518, 1200, 1200, 1200,  575,
+          605, 1073,  343,  522,  533,  518,  518,  773, 1090, 1089,
+           13,  578,  582,  628,    3,    4,  783, 1067,  772,  514,
+         1062, 1182,  784,  661,  919,  451,  866,  573,  957, 1161,
           464,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  514,  529,    0,    0,    0,    0,
-          514,    0,  529,    0,    0,    0,    0,  610,  513,  516,
-          439,  440, 1067,  619,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  780, 1224,    0,    0,    0,    0,
-            0,  524,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  778,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,  513,  528,    0,    0,    0,    0,
+          513,    0,  528,    0,    0,    0,    0,  610,  512,  515,
+          439,  440, 1068,  620,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,  781, 1225,    0,    0,    0,    0,
+            0,  523,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,  779,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,  301,  301
     );
@@ -739,40 +739,40 @@ class Php5 extends \PhpParser\ParserAbstract
           128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
           128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
           128,  128,  128,  128,  128,   16,  102,   32,   69,   32,
-           32,  120,    6,   69,   32,   29,  120,   32,   32,   32,
-           32,   32,   32,   32,   32,   32,   32,   50,   69,   69,
+           32,  120,   72,   69,   32,   29,  120,   32,   32,   32,
+           32,   32,   32,   32,   32,   32,   32,    6,   69,   69,
            69,   69,   69,   69,   27,   77,   77,   77,   77,   27,
            27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
            27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
            27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
            27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
-          119,  119,  119,  119,  119,  119,   33,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,   67,  110,
+          119,  119,  119,  119,  119,  119,   50,  119,  119,  119,
+          119,  119,  119,  119,  119,  119,  119,  119,   67,   33,
            67,   67,  119,  111,  111,  111,  111,  111,  111,  111,
-          111,  111,  111,  142,   57,   72,   57,   57,   57,   57,
+          111,  111,  111,  127,   57,  127,   57,   57,   57,   57,
            57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
            57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
            57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
            57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-           51,   51,   51,   51,   51,   51,   84,   51,   51,   51,
+           51,   51,   51,   51,   51,   51,  110,   51,   51,   51,
            51,   51,   51,   51,   51,   51,   51,    5,    5,    5,
-            5,    5,    5,    5,   63,   46,  124,   63,  129,   98,
-           63,  124,   57,   57,   57,   57,   57,   57,  133,   57,
+            5,    5,    5,    5,   63,  142,  124,   63,   84,   98,
+           63,  124,   57,   57,   57,   57,   57,   57,  129,   57,
            57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-           98,  127,   82,  127,   57,   57,   57,   57,   57,   49,
-           57,   57,  144,  144,  140,   11,   40,   40,   14,   57,
-           57,   57,   57,   57,   57,   82,   13,   13,   13,   48,
+           98,   12,   82,   12,   57,   57,   57,   57,   57,   46,
+           57,   57,  144,  144,  133,   11,   72,   72,   14,   57,
+           57,   57,   57,   57,   57,   82,   13,   13,   13,   49,
           144,   14,   14,   14,   14,   14,   57,   14,   14,   14,
-           11,   13,   11,   13,  102,   13,   79,   11,   70,   70,
-           70,   13,   13,  103,    2,    9,    9,    9,    2,   34,
-          125,  125,  125,   81,   13,   13,   34,   34,   34,   34,
-           17,   13,    8,    8,    8,    8,   18,  143,  143,    8,
-            8,    8,    9,   34,   25,  125,   85,   82,   82,   82,
-          125,   82,  121,   74,   34,  143,   24,  121,   47,   34,
-          116,  143,   82,   82,   82,   47,  121,  121,  121,  126,
-          126,   82,   58,   58,   58,   47,   47,   23,   72,   72,
-           58,   62,   62,   62,  114,   12,   23,   12,   23,   13,
-           26,  121,   30,   30,   86,  100,   71,   65,   66,  132,
+           11,   13,   11,   13,  102,   13,   48,   11,   70,   70,
+           70,   13,   13,  140,    2,    9,    9,    9,    2,   34,
+          125,  125,  125,  103,   13,   13,   34,   34,   34,   34,
+           25,   13,    8,    8,    8,    8,   79,  143,  143,    8,
+            8,    8,    9,   34,   81,  125,   18,   82,   82,   82,
+          125,   82,  121,   85,   34,  143,   24,  121,   47,   34,
+           17,  143,   82,   82,   82,   47,  121,  121,  121,   40,
+           40,   82,   58,   58,   58,   47,   47,   23,  126,  126,
+           58,   62,   62,   62,   30,   30,   23,  116,   23,   13,
+          114,  121,   26,   74,   86,   65,   71,   66,  100,  132,
           109,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,    9,    9,   -1,   -1,   -1,   -1,
             9,   -1,    9,   -1,   -1,   -1,   -1,   13,    9,    9,
@@ -785,39 +785,39 @@ class Php5 extends \PhpParser\ParserAbstract
     );
 
     protected $gotoBase = array(
-            0,    0, -172,    0,    0,  353,  201,    0,  477,  149,
-            0,  110,  195,  117,  426,  112,  203,  140,  171,    0,
-            0,    0,    0,  168,  164,  157,  119,   27,    0,  205,
-         -118,    0, -428,  266,   51,    0,    0,    0,    0,    0,
-          388,    0,    0,  -24,    0,    0,  345,  484,  146,  133,
-          209,   75,    0,    0,    0,    0,    0,  107,  161,    0,
-            0,    0,  222,  -77,    0,  106,   97, -343,    0,  -94,
-          135,  123, -129,    0,  129,    0,    0,  -50,    0,  143,
-            0,  159,   64,    0,  338,  132,  122,    0,    0,    0,
+            0,    0, -173,    0,    0,  353,  216,    0,  477,  149,
+            0,  110,   71,  117,  426,  112,  203,  170,  181,    0,
+            0,    0,    0,  168,  164,  143,  121,   27,    0,  205,
+         -127,    0, -429,  279,   51,    0,    0,    0,    0,    0,
+          481,    0,    0,  -24,    0,    0,  379,  484,  163,  153,
+          268,   75,    0,    0,    0,    0,    0,  107,  161,    0,
+            0,    0,  222,  -77,    0,  104,   96, -344,    0,  -94,
+          135,  123, -232,    0,  169,    0,    0,  -50,    0,  173,
+            0,  180,   64,    0,  360,  139,  122,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,   98,    0,
-          121,    0,  165,  156,    0,    0,    0,    0,    0,   87,
-          273,  259,    0,    0,  114,    0,  150,    0,    0,   -5,
-          -91,  200,    0,    0,   84,  154,  202,   77,  -48,  178,
-            0,    0,   93,  187,    0,    0,    0,    0,    0,    0,
-          136,    0,  286,  167,  102,    0,    0
+          124,    0,  165,  166,    0,    0,    0,    0,    0,   87,
+          340,  259,    0,    0,  120,    0,  177,    0,    0,   -5,
+          -91,  200,    0,    0,   84,  154,  211,  -21,  -48,  188,
+            0,    0,   93,  213,    0,    0,    0,    0,    0,    0,
+          175,    0,  358,  167,  102,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  468,  664,    2,  665,  835,  740,  748,  598,  482,
-          630,  582,  380, 1193,  792,  793,  794,  381,  368,  483,
-          379,  410,  405,  781,  774,  776,  784,  172,  411,  787,
-            1,  789,  518,  825, 1020,  365,  797,  366,  590,  799,
-          527,  801,  802,  137,  382,  383,  528,  484,  390,  577,
-          816,  276,  387,  818,  367,  819,  828,  371,  465,  455,
-          460,  530,  557,  609,  432,  447,  571,  565,  536, 1086,
-          566,  864,  349,  872,  661,  880,  883,  485,  558,  894,
-          452,  902, 1099,  397,  908,  914,  919,  291,  922,  417,
-          412,  585,  927,  928,    5,  932,  622,  623,    8,  312,
-          955,  599,  969,  420, 1039, 1041,  486,  487,  522,  459,
-          508,  526,  488, 1062,  441,  413, 1065,  433,  489,  490,
-          434,  435, 1083,  355, 1168,  354,  449,  320, 1155,  580,
-         1118,  456, 1208, 1164,  348,  491,  492,  376, 1187,  392,
-         1203,  438, 1210, 1218,  344,  540,  567
+        -32768,  468,  665,    2,  666,  836,  741,  749,  598,  482,
+          631,  581,  380, 1194,  793,  794,  795,  381,  368,  766,
+          379,  410,  405,  782,  775,  777,  785,  172,  411,  788,
+            1,  790,  517,  826, 1021,  365,  798,  366,  589,  800,
+          526,  802,  803,  137,  382,  383,  527,  483,  390,  576,
+          817,  276,  387,  819,  367,  820,  829,  371,  465,  455,
+          460,  529,  556,  609,  432,  447,  570,  564,  535, 1087,
+          565,  865,  349,  873,  662,  881,  884,  484,  557,  895,
+          452,  903, 1100,  397,  909,  915,  920,  291,  923,  417,
+          412,  584,  928,  929,    5,  933,  623,  624,    8,  312,
+          956,  599,  970,  420, 1040, 1042,  485,  486,  521,  459,
+          507,  525,  487, 1063,  441,  413, 1066,  433,  488,  489,
+          434,  435, 1084,  355, 1169,  354,  449,  320, 1156,  579,
+         1119,  456, 1209, 1165,  348,  490,  491,  376, 1188,  392,
+         1204,  438, 1211, 1219,  344,  539,  566
     );
 
     protected $ruleToNonTerminal = array(
@@ -891,7 +891,7 @@ class Php5 extends \PhpParser\ParserAbstract
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    3,    5,    4,
-            3,    4,    2,    3,    1,    1,    7,    6,    3,    1,
+            3,    4,    1,    3,    1,    1,    8,    7,    3,    1,
             3,    1,    3,    1,    1,    3,    1,    3,    1,    2,
             3,    1,    3,    3,    1,    3,    2,    0,    1,    1,
             1,    1,    1,    3,    5,    8,    3,    5,    9,    3,
@@ -1256,7 +1256,7 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             102 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             103 => function ($stackPos) {
                  $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
@@ -1268,10 +1268,10 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = Stmt\Use_::TYPE_CONSTANT;
             },
             106 => function ($stackPos) {
-                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-6)], $this->semStack[$stackPos-(8-2)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
             107 => function ($stackPos) {
-                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-2)], $this->semStack[$stackPos-(7-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
             108 => function ($stackPos) {
                  $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
index 6d2b4b0f9..d41bb8369 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
@@ -26,8 +26,8 @@ class Php7 extends \PhpParser\ParserAbstract
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE = 434;
-    protected $numNonLeafStates = 736;
+    protected $YY2TBLSTATE = 435;
+    protected $numNonLeafStates = 737;
 
     protected $symbolToName = array(
         "EOF",
@@ -244,130 +244,130 @@ class Php7 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          133,  134,  135,  579,  136,  137,    0,  748,  749,  750,
+          133,  134,  135,  580,  136,  137,    0,  749,  750,  751,
           138,   38,  327,-32766,-32766,-32766,-32766,-32766,-32766,-32767,
-        -32767,-32767,-32767,  102,  103,  104,  105,  106, 1109, 1110,
-         1111, 1108, 1107, 1106, 1112,  742,  741,-32766, 1232,-32766,
+        -32767,-32767,-32767,  102,  103,  104,  105,  106, 1110, 1111,
+         1112, 1109, 1108, 1107, 1113,  743,  742,-32766, 1233,-32766,
         -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,
-        -32767,    2,  107,  108,  109,  751,  274,  381,  380,-32766,
-        -32766,-32766,-32766,  104,  105,  106, 1024,  422,  110,  265,
-          139,  403,  755,  756,  757,  758,  466,  467,  428,  938,
-          291,-32766,  287,-32766,-32766,  759,  760,  761,  762,  763,
-          764,  765,  766,  767,  768,  769,  789,  580,  790,  791,
-          792,  793,  781,  782,  344,  345,  784,  785,  770,  771,
-          772,  774,  775,  776,  355,  816,  817,  818,  819,  820,
-          581,  777,  778,  582,  583,  810,  801,  799,  800,  813,
-          796,  797,  687, -545,  584,  585,  795,  586,  587,  588,
-          589,  590,  591, -328, -593, -367, 1234, -367,  798,  592,
-          593, -593,  140,-32766,-32766,-32766,  133,  134,  135,  579,
-          136,  137, 1057,  748,  749,  750,  138,   38,  688, 1020,
-         1019, 1018, 1021,  390,-32766,    7,-32766,-32766,-32766,-32766,
-        -32766,-32766,-32766,-32766,-32766,-32766,  379,  380, 1033,  689,
-          690,  742,  741,-32766,-32766,-32766,  422, -545, -545, -590,
-        -32766,-32766,-32766, 1032,-32766,  127, -590, 1236, 1235, 1237,
-         1318,  751, -545,  290,-32766,  283,-32766,-32766,-32766,-32766,
-        -32766, 1236, 1235, 1237, -545,  265,  139,  403,  755,  756,
-          757,  758,   16,  481,  428,  458,  459,  460,  298,  722,
-           35,  759,  760,  761,  762,  763,  764,  765,  766,  767,
-          768,  769,  789,  580,  790,  791,  792,  793,  781,  782,
-          344,  345,  784,  785,  770,  771,  772,  774,  775,  776,
-          355,  816,  817,  818,  819,  820,  581,  777,  778,  582,
-          583,  810,  801,  799,  800,  813,  796,  797,  129,  824,
-          584,  585,  795,  586,  587,  588,  589,  590,  591, -328,
-           83,   84,   85, -593,  798,  592,  593, -593,  149,  773,
-          743,  744,  745,  746,  747,  824,  748,  749,  750,  786,
-          787,   37,  145,   86,   87,   88,   89,   90,   91,   92,
+        -32767,    2,  107,  108,  109,  752,  274,  381,  380,-32766,
+        -32766,-32766,-32766,  104,  105,  106, 1025,  423,  110,  265,
+          139,  402,  756,  757,  758,  759,  467,  468,  429,  939,
+          291,-32766,  287,-32766,-32766,  760,  761,  762,  763,  764,
+          765,  766,  767,  768,  769,  770,  790,  581,  791,  792,
+          793,  794,  782,  783,  344,  345,  785,  786,  771,  772,
+          773,  775,  776,  777,  355,  817,  818,  819,  820,  821,
+          582,  778,  779,  583,  584,  811,  802,  800,  801,  814,
+          797,  798,  688, -545,  585,  586,  796,  587,  588,  589,
+          590,  591,  592, -328, -593, -367, 1235, -367,  799,  593,
+          594, -593,  140,-32766,-32766,-32766,  133,  134,  135,  580,
+          136,  137, 1058,  749,  750,  751,  138,   38,  689, 1021,
+         1020, 1019, 1022,  390,-32766,    7,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,  379,  380, 1034,  690,
+          691,  743,  742,-32766,-32766,-32766,  423, -545, -545, -590,
+        -32766,-32766,-32766, 1033,-32766,  127, -590, 1237, 1236, 1238,
+         1319,  752, -545,  290,-32766,  283,-32766,-32766,-32766,-32766,
+        -32766, 1237, 1236, 1238, -545,  265,  139,  402,  756,  757,
+          758,  759,   16,  482,  429,  459,  460,  461,  298,  723,
+           35,  760,  761,  762,  763,  764,  765,  766,  767,  768,
+          769,  770,  790,  581,  791,  792,  793,  794,  782,  783,
+          344,  345,  785,  786,  771,  772,  773,  775,  776,  777,
+          355,  817,  818,  819,  820,  821,  582,  778,  779,  583,
+          584,  811,  802,  800,  801,  814,  797,  798,  129,  825,
+          585,  586,  796,  587,  588,  589,  590,  591,  592, -328,
+           83,   84,   85, -593,  799,  593,  594, -593,  149,  774,
+          744,  745,  746,  747,  748,  825,  749,  750,  751,  787,
+          788,   37,  145,   86,   87,   88,   89,   90,   91,   92,
            93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
-          103,  104,  105,  106,  107,  108,  109,  291,  274,  835,
-          254, 1109, 1110, 1111, 1108, 1107, 1106, 1112, -590,  860,
-          110,  861, -590,  482,  751,-32766,-32766,-32766,-32766,-32766,
-          142,  603, 1085,  742,  741, 1262,  326,  987,  752,  753,
-          754,  755,  756,  757,  758,  309,-32766,  822,-32766,-32766,
-        -32766,-32766,  242,  553,  759,  760,  761,  762,  763,  764,
-          765,  766,  767,  768,  769,  789,  812,  790,  791,  792,
-          793,  781,  782,  783,  811,  784,  785,  770,  771,  772,
-          774,  775,  776,  815,  816,  817,  818,  819,  820,  821,
-          777,  778,  779,  780,  810,  801,  799,  800,  813,  796,
-          797,  311,  940,  788,  794,  795,  802,  803,  805,  804,
-          806,  807,  323,  609, 1274, 1033,  833,  798,  809,  808,
-           50,   51,   52,  512,   53,   54,  860,  241,  861,  918,
-           55,   56, -111,   57,-32766,-32766,-32766, -111,  826, -111,
-          290, 1302, 1347,  356,  305, 1348,  339, -111, -111, -111,
+          103,  104,  105,  106,  107,  108,  109,  291,  274,  836,
+          254, 1110, 1111, 1112, 1109, 1108, 1107, 1113, -590,  861,
+          110,  862, -590,  483,  752,-32766,-32766,-32766,-32766,-32766,
+          142,  604, 1086,  743,  742, 1263,  326,  988,  753,  754,
+          755,  756,  757,  758,  759,  309,-32766,  823,-32766,-32766,
+        -32766,-32766,  242,  554,  760,  761,  762,  763,  764,  765,
+          766,  767,  768,  769,  770,  790,  813,  791,  792,  793,
+          794,  782,  783,  784,  812,  785,  786,  771,  772,  773,
+          775,  776,  777,  816,  817,  818,  819,  820,  821,  822,
+          778,  779,  780,  781,  811,  802,  800,  801,  814,  797,
+          798,  311,  941,  789,  795,  796,  803,  804,  806,  805,
+          807,  808,  323,  610, 1275, 1034,  834,  799,  810,  809,
+           50,   51,   52,  513,   53,   54,  861,  241,  862,  919,
+           55,   56, -111,   57,-32766,-32766,-32766, -111,  827, -111,
+          290, 1303, 1348,  356,  305, 1349,  339, -111, -111, -111,
          -111, -111, -111, -111, -111,-32766, -194,-32766,-32766,-32766,
-         -193,  956,  957,  829,  -86,  988,  958,  834,   58,   59,
-          340,  428,  952, -544,   60,  832,   61,  247,  248,   62,
-           63,   64,   65,   66,   67,   68,   69, 1241,   28,  267,
-           70,  444,  513, -342,-32766,  141, 1268, 1269,  514,  918,
-          833,  326, -272,  918, 1266,   42,   25,  515,  940,  516,
-           14,  517,  908,  518,  828,  369,  519,  520,  373,  709,
-         1033,   44,   45,  445,  376,  375,  388,   46,  521,  712,
-          -86,  440, 1101,  367,  338, -543,  441, -544, -544,  830,
-         1227,  442,  523,  524,  525,  290, 1236, 1235, 1237,  361,
-         1030,  443, -544, 1087,  526,  527,  839, 1255, 1256, 1257,
-         1258, 1252, 1253,  297, -544,  151, -550, -584,  833, 1259,
-         1254, -584, 1033, 1236, 1235, 1237,  298, -154, -154, -154,
-          152,   71,  908,  321,  322,  326,  908,  920, 1030,  707,
-          833,  154, -154, 1337, -154,  155, -154,  283, -154, -543,
-         -543,   82, 1232, 1086, 1322,  734,  156,  326,  374,  158,
-         1033, 1321, -194,  -79, -543,  -88, -193,  742,  741,  956,
-          957,  653,   26,-32766,  522,  -51, -543,   33, -549,  894,
-          952, -111, -111, -111,   32,  111,  112,  113,  114,  115,
+         -193,  957,  958,  830,  -86,  989,  959,  835,   58,   59,
+          340,  429,  953, -544,   60,  833,   61,  247,  248,   62,
+           63,   64,   65,   66,   67,   68,   69, 1242,   28,  267,
+           70,  445,  514, -342,-32766,  141, 1269, 1270,  515,  919,
+          834,  326, -272,  919, 1267,   42,   25,  516,  941,  517,
+           14,  518,  909,  519,  829,  369,  520,  521,  373,  710,
+         1034,   44,   45,  446,  376,  375,  388,   46,  522,  713,
+          -86,  441, 1102,  367,  338, -543,  442, -544, -544,  831,
+         1228,  443,  524,  525,  526,  290, 1237, 1236, 1238,  361,
+         1031,  444, -544, 1088,  527,  528,  840, 1256, 1257, 1258,
+         1259, 1253, 1254,  297, -544,  151, -550, -584,  834, 1260,
+         1255, -584, 1034, 1237, 1236, 1238,  298, -154, -154, -154,
+          152,   71,  909,  321,  322,  326,  909,  921, 1031,  708,
+          834,  154, -154, 1338, -154,  155, -154,  283, -154, -543,
+         -543,   82, 1233, 1087, 1323,  735,  156,  326,  374,  158,
+         1034, 1322, -194,  -79, -543,  -88, -193,  743,  742,  957,
+          958,  654,   26,-32766,  523,  -51, -543,   33, -549,  895,
+          953, -111, -111, -111,   32,  111,  112,  113,  114,  115,
           116,  117,  118,  119,  120,  121,  122,  123,  -59,   75,
-           28,  672,  673,  326,  -58,   36,  250,  920,  124,  707,
-          125,  920,  833,  707, -154,  130, 1266,  131,-32766, -547,
-          144, -542,  150,  406, 1234,  377,  378, 1146, 1148,  382,
-          383,-32766,-32766,-32766,  -85,-32766, 1056,-32766, -542,-32766,
-          644,  645,-32766,  159,  160,  161, 1232,-32766,-32766,-32766,
-          162,  -79, 1227,-32766,-32766,  742,  741,  163, -302,-32766,
-          419,  -75,   -4,  918,  -73,  287,  526,  527,-32766, 1255,
-         1256, 1257, 1258, 1252, 1253,  -72,  -71,  -70,  -69,  -68,
-          -67, 1259, 1254, -547, -547, -542, -542,  742,  741,  -66,
-          -47,  -18,-32766,   73,  148,  918,  322,  326, 1234,  273,
-         -542,  284, -542, -542,  723,-32766,-32766,-32766,  726,-32766,
-         -547,-32766, -542,-32766,  917,  147,-32766, -542,  288,  289,
-         -298,-32766,-32766,-32766,-32766,  713,  279,-32766,-32766, -542,
-         1234,  280,  285,-32766,  419,   48,  286,-32766,-32766,-32766,
-          332,-32766,-32766,-32766,  292,-32766,  908,  293,-32766,  934,
-          274, 1030,  918,-32766,-32766,-32766,  110,  682,  132,-32766,
-        -32766,  833,  146,-32766,  559,-32766,  419,  659,  374,  824,
-          435, 1349,   74, 1033,-32766,  296,  654, 1116,  908,  956,
-          957,  306,  714,  698,  522,  555,  303,   13,  310,  852,
-          952, -111, -111, -111,  700,  463,  492,  953,  283,  299,
-          300,-32766,   49,  675,  918,  304,  660, 1234,  676,  936,
-         1273,-32766,   10, 1263,-32766,-32766,-32766,  642,-32766,  918,
-        -32766,  920,-32766,  707,   -4,-32766,  126,   34,  918,  565,
-        -32766,-32766,-32766,-32766,    0,  908,-32766,-32766,    0, 1234,
-          918,    0,-32766,  419,    0,    0,-32766,-32766,-32766,  717,
-        -32766,-32766,-32766,  920,-32766,  707, 1033,-32766,  724, 1275,
-            0,  487,-32766,-32766,-32766,-32766,  301,  302,-32766,-32766,
-         -507, 1234,  571, -497,-32766,  419,  607,    8,-32766,-32766,
-        -32766,  372,-32766,-32766,-32766,   17,-32766,  908,  371,-32766,
-          832,  298,  320,  128,-32766,-32766,-32766,   40,  370,   41,
-        -32766,-32766,  908, -250, -250, -250,-32766,  419,  731,  374,
-          973,  908,  707,  732,  899,-32766,  997,  974,  728,  981,
-          956,  957,  971,  908,  982,  522,  897,  969, 1090, 1093,
-          894,  952, -111, -111, -111,   28, 1094, 1091, 1092, -249,
-         -249, -249, 1241, 1098,  708,  374,  844,  833, 1288, 1306,
-         1340, 1266,  647, 1267,  711,  715,  956,  957,  716, 1241,
-          718,  522,  920,  719,  707, -250,  894,  952, -111, -111,
-         -111,  720,  -16,  721,  725,  710, -511,  920,  895,  707,
-         -578, 1232, 1344, 1346,  855,  854,  920, 1227,  707, -577,
-          863,  946,  989,  862, 1345,  945,  943,  944,  920,  947,
-          707, -249,  527, 1218, 1255, 1256, 1257, 1258, 1252, 1253,
-          927,  937,  925,  979,  980,  631, 1259, 1254, 1343, 1300,
-        -32766, 1289, 1307,  833, 1316, -275, 1234, -576,   73, -550,
+           28,  673,  674,  326,  -58,   36,  250,  921,  124,  708,
+          125,  921,  834,  708, -154,  130, 1267,  131,-32766, -547,
+          144, -542,  150,  406, 1235,  377,  378, 1147, 1149,  382,
+          383,-32766,-32766,-32766,  -85,-32766, 1057,-32766, -542,-32766,
+          645,  646,-32766,  159,  160,  161, 1233,-32766,-32766,-32766,
+          162,  -79, 1228,-32766,-32766,  743,  742,  163, -302,-32766,
+          420,  -75,   -4,  919,  -73,  287,  527,  528,-32766, 1256,
+         1257, 1258, 1259, 1253, 1254,  -72,  -71,  -70,  -69,  -68,
+          -67, 1260, 1255, -547, -547, -542, -542,  743,  742,  -66,
+          -47,  -18,-32766,   73,  148,  919,  322,  326, 1235,  273,
+         -542,  284, -542, -542,  724,-32766,-32766,-32766,  727,-32766,
+         -547,-32766, -542,-32766,  918,  147,-32766, -542,  288,  289,
+         -298,-32766,-32766,-32766,-32766,  714,  279,-32766,-32766, -542,
+         1235,  280,  285,-32766,  420,   48,  286,-32766,-32766,-32766,
+          332,-32766,-32766,-32766,  292,-32766,  909,  293,-32766,  935,
+          274, 1031,  919,-32766,-32766,-32766,  110,  683,  132,-32766,
+        -32766,  834,  146,-32766,  560,-32766,  420,  660,  374,  825,
+          436, 1350,   74, 1034,-32766,  296,  655, 1117,  909,  957,
+          958,  306,  715,  699,  523,  556,  303,   13,  310,  853,
+          953, -111, -111, -111,  701,  464,  493,  954,  283,  299,
+          300,-32766,   49,  676,  919,  304,  661, 1235,  677,  937,
+         1274,-32766,   10, 1264,-32766,-32766,-32766,  643,-32766,  919,
+        -32766,  921,-32766,  708,   -4,-32766,  126,   34,  919,  566,
+        -32766,-32766,-32766,-32766,    0,  909,-32766,-32766,    0, 1235,
+          919,    0,-32766,  420,    0,    0,-32766,-32766,-32766,  718,
+        -32766,-32766,-32766,  921,-32766,  708, 1034,-32766,  725, 1276,
+            0,  488,-32766,-32766,-32766,-32766,  301,  302,-32766,-32766,
+         -507, 1235,  572, -497,-32766,  420,  608,    8,-32766,-32766,
+        -32766,  372,-32766,-32766,-32766,   17,-32766,  909,  371,-32766,
+          833,  298,  320,  128,-32766,-32766,-32766,   40,  370,   41,
+        -32766,-32766,  909, -250, -250, -250,-32766,  420,  732,  374,
+          974,  909,  708,  733,  900,-32766,  998,  975,  405,  982,
+          957,  958,  972,  909,  983,  523,  898,  970, 1091, 1094,
+          895,  953, -111, -111, -111,   28, 1095, 1092, 1093, -249,
+         -249, -249, 1242, 1099,  709,  374,  845,  834, 1289, 1307,
+         1341, 1267,  648, 1268,  712,  716,  957,  958,  717, 1242,
+          719,  523,  921,  720,  708, -250,  895,  953, -111, -111,
+         -111,  721,  -16,  722,  726,  711, -511,  921,  409,  708,
+         -578, 1233,  729,  896, 1345, 1347,  921, 1228,  708, -577,
+          856,  855,  947,  990, 1346,  946,  944,  945,  921,  948,
+          708, -249,  528, 1219, 1256, 1257, 1258, 1259, 1253, 1254,
+          928,  938,  926,  980,  981,  632, 1260, 1255, 1344, 1301,
+        -32766, 1290, 1308,  834, 1317, -275, 1235, -576,   73, -550,
          -549,  322,  326,-32766,-32766,-32766, -548,-32766, -491,-32766,
-          833,-32766,    1,   29,-32766,   30,   39,   43,   47,-32766,
-        -32766,-32766,   72,   76,   77,-32766,-32766, 1232, -111, -111,
-           78,-32766,  419, -111,   79,   80,   81,  143,  153, -111,
-        -32766,  157,  246,  328, 1232, -111, -111,  356,-32766,  357,
+          834,-32766,    1,   29,-32766,   30,   39,   43,   47,-32766,
+        -32766,-32766,   72,   76,   77,-32766,-32766, 1233, -111, -111,
+           78,-32766,  420, -111,   79,   80,   81,  143,  153, -111,
+        -32766,  157,  246,  328, 1233, -111, -111,  356,-32766,  357,
          -111,  358,  359,  360,  361,  362, -111,  363,  364,  365,
-          366,  368,  436,    0, -273,-32766, -272,   19,   20,  298,
-           21,   22,   24,  405,   75, 1203,  483,  484,  326,  491,
-            0,  494,  495,  496,  497,  501,  298,  502,  503,  510,
-          693,   75,    0, 1245, 1186,  326, 1264, 1059, 1058, 1039,
-         1222, 1035, -277, -103,   18,   23,   27,  295,  404,  600,
-          604,  633,  699, 1190, 1240, 1187, 1319,    0,    0,    0,
+          366,  368,  437,    0, -273,-32766, -272,   19,   20,  298,
+           21,   22,   24,  404,   75, 1204,  484,  485,  326,  492,
+            0,  495,  496,  497,  498,  502,  298,  503,  504,  511,
+          694,   75,    0, 1246, 1187,  326, 1265, 1060, 1059, 1040,
+         1223, 1036, -277, -103,   18,   23,   27,  295,  403,  601,
+          605,  634,  700, 1191, 1241, 1188, 1320,    0,    0,    0,
           326
     );
 
@@ -539,43 +539,43 @@ class Php7 extends \PhpParser\ParserAbstract
          1058, 1058, 1058, 1058, 1058, 1058, 1058, 1073,  336, 1059,
           423, 1073, 1073, 1073,  336,  336,  336,  336,  336,  336,
           336,  336,  336,  336,  619,  423,  586,  616,  423,  795,
-          336,  348,  814,  348,  348,  348,  348,  348,  348,  348,
-          348,  348,  348,  750,  202,  348,  346,   78,   78,  484,
-           65,   78,   78,   78,   78,  348,  348,  348,  348,  609,
-          783,  766,  613,  813,  492,  783,  783,  783,  473,  135,
-          378,  488,  713,  775,   67,  779,  779,  785,  969,  969,
-          779,  769,  779,  785,  975,  779,  779,  969,  969,  823,
-          280,  563,  478,  550,  568,  969,  377,  779,  779,  779,
-          779,  746,  573,  779,  342,  314,  779,  779,  746,  744,
-          760,   43,  762,  969,  969,  969,  746,  547,  762,  762,
-          762,  839,  844,  794,  758,  444,  433,  588,  232,  801,
-          758,  758,  779,  558,  794,  758,  794,  758,  745,  758,
-          758,  758,  794,  758,  769,  502,  758,  717,  583,  224,
-          758,    6,  979,  980,  624,  981,  973,  987, 1019,  991,
-          992,  873,  965,  999,  974,  993,  972,  970,  773,  682,
-          684,  818,  811,  963,  777,  777,  777,  956,  777,  777,
-          777,  777,  777,  777,  777,  777,  682,  743,  829,  765,
-         1006,  689,  691,  754,  906,  901, 1030, 1004, 1049,  994,
-          828,  694, 1028, 1008,  846,  821, 1009, 1010, 1029, 1050,
-         1052,  910,  782,  911,  912,  876, 1012,  883,  777,  979,
-          992,  693,  974,  993,  972,  970,  748,  739,  737,  738,
-          736,  735,  723,  734,  753, 1053,  954,  907,  878, 1011,
-          957,  682,  879, 1023,  756, 1032, 1033,  827,  788,  778,
-          880,  913, 1014, 1015, 1016,  884, 1054,  887,  830, 1024,
-          951, 1035,  789,  918, 1037, 1038, 1039, 1040,  889,  919,
-          892,  916,  900,  845,  776, 1020,  761,  920,  591,  787,
-          791,  800, 1018,  606, 1000,  902,  921,  922, 1041, 1043,
-         1044,  923,  924,  995,  847, 1026,  799, 1027, 1022,  848,
-          850,  617,  797, 1055,  781,  786,  772,  621,  632,  925,
-          927,  931,  998,  763,  770,  853,  855, 1056,  771, 1057,
-          938,  635,  857,  718,  939, 1046,  719,  724,  637,  678,
-          672,  731,  792,  903,  826,  757,  780, 1017,  724,  767,
-          858,  940,  859,  860,  867, 1045,  868,    0,    0,    0,
+          336,  814,  348,  348,  348,  348,  348,  348,  348,  348,
+          348,  348,  750,  202,  348,  348,  346,   78,   78,  348,
+          484,   65,   78,   78,   78,   78,  348,  348,  348,  348,
+          609,  783,  766,  613,  813,  492,  783,  783,  783,  473,
+          135,  378,  488,  713,  775,   67,  779,  779,  785,  969,
+          969,  779,  769,  779,  785,  975,  779,  779,  969,  969,
+          823,  280,  563,  478,  550,  568,  969,  377,  779,  779,
+          779,  779,  746,  573,  779,  342,  314,  779,  779,  746,
+          744,  760,   43,  762,  969,  969,  969,  746,  547,  762,
+          762,  762,  839,  844,  794,  758,  444,  433,  588,  232,
+          801,  758,  758,  779,  558,  794,  758,  794,  758,  745,
+          758,  758,  758,  794,  758,  769,  502,  758,  717,  583,
+          224,  758,    6,  979,  980,  624,  981,  973,  987, 1019,
+          991,  992,  873,  965,  999,  974,  993,  972,  970,  773,
+          682,  684,  818,  811,  963,  777,  777,  777,  956,  777,
+          777,  777,  777,  777,  777,  777,  777,  682,  743,  829,
+          765, 1006,  689,  691,  754,  911,  901, 1030, 1004, 1049,
+          994,  828,  694, 1028, 1008,  910,  821, 1009, 1010, 1029,
+         1050, 1052,  912,  782,  913,  918,  876, 1012,  883,  777,
+          979,  992,  693,  974,  993,  972,  970,  748,  739,  737,
+          738,  736,  735,  723,  734,  753, 1053,  954,  907,  878,
+         1011,  957,  682,  879, 1023,  756, 1032, 1033,  827,  788,
+          778,  880,  919, 1014, 1015, 1016,  884, 1054,  887,  830,
+         1024,  951, 1035,  789,  846, 1037, 1038, 1039, 1040,  889,
+          920,  892,  916,  900,  845,  776, 1020,  761,  921,  591,
+          787,  791,  800, 1018,  606, 1000,  902,  906,  922, 1041,
+         1043, 1044,  923,  924,  995,  847, 1026,  799, 1027, 1022,
+          848,  850,  617,  797, 1055,  781,  786,  772,  621,  632,
+          925,  927,  931,  998,  763,  770,  853,  855, 1056,  771,
+         1057,  938,  635,  857,  718,  939, 1046,  719,  724,  637,
+          678,  672,  731,  792,  903,  826,  757,  780, 1017,  724,
+          767,  858,  940,  859,  860,  867, 1045,  868,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,  458,  458,  458,
-          458,  458,  458,  307,  307,  307,  307,  307,  307,  307,
-            0,    0,  307,    0,  458,  458,  458,  458,  458,  458,
+            0,    0,    0,    0,    0,    0,    0,    0,  458,  458,
+          458,  458,  458,  458,  307,  307,  307,  307,  307,  307,
+          307,    0,    0,  307,    0,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
@@ -590,33 +590,34 @@ class Php7 extends \PhpParser\ParserAbstract
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  291,  291,  291,  291,  291,  291,  291,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  291,  291,    0,    0,    0,    0,    0,    0,
+          291,  291,  291,  291,  291,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+            0,    0,  291,  291,  291,  291,  291,  291,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  291,  291,  291,  291,  291,   66,   66,  291,
-          291,  291,   66,   66,   66,   66,   66,   66,   66,   66,
-           66,   66,    0,  291,  291,  291,  291,  291,  291,  291,
-          291,   66,  823,   66,   -1,   -1,   -1,   -1,   66,   66,
-           66,  -88,  -88,   66,  384,   66,   66,   -1,   -1,   66,
+          291,  291,  291,  291,  291,  291,  291,  291,   66,   66,
+          291,  291,  291,   66,   66,   66,   66,   66,   66,   66,
+           66,   66,   66,    0,  291,  291,  291,  291,  291,  291,
+          291,  291,   66,  823,   66,   -1,   -1,   -1,   -1,   66,
+           66,   66,  -88,  -88,   66,  384,   66,   66,   -1,   -1,
            66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-            0,    0,  423,  548,   66,  769,  769,  769,  769,   66,
-           66,   66,   66,  548,  548,   66,   66,   66,    0,    0,
-            0,    0,    0,    0,    0,    0,  423,  548,    0,  423,
-            0,    0,  769,  769,   66,  384,  823,  643,   66,    0,
-            0,    0,    0,  423,  769,  423,  336,  779,  548,  779,
-          336,  336,   78,  348,  643,  611,  611,  611,  611,    0,
-            0,  609,  823,  823,  823,  823,  823,  823,  823,  823,
-          823,  823,  823,  769,    0,  823,    0,  769,  769,  769,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,  769,    0,    0,  969,    0,
+           66,    0,    0,  423,  548,   66,  769,  769,  769,  769,
+           66,   66,   66,   66,  548,  548,   66,   66,   66,    0,
+            0,    0,    0,    0,    0,    0,    0,  423,  548,    0,
+          423,    0,    0,  769,  769,   66,  384,  823,  643,   66,
+            0,    0,    0,    0,  423,  769,  423,  336,  779,  548,
+          779,  336,  336,   78,  348,  643,  611,  611,  611,  611,
+            0,    0,  609,  823,  823,  823,  823,  823,  823,  823,
+          823,  823,  823,  823,  769,    0,  823,    0,  769,  769,
+          769,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,  769,    0,  969,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,  975,
-            0,    0,    0,    0,    0,    0,  769,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,  777,  788,    0,  788,
-            0,  777,  777,  777,    0,    0,    0,    0,  797,  771
+            0,    0,    0,    0,    0,    0,    0,    0,  769,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,  777,  788,
+            0,  788,    0,  777,  777,  777,    0,    0,    0,    0,
+          797,  771
     );
 
     protected $actionDefault = array(
@@ -659,102 +660,102 @@ class Php7 extends \PhpParser\ParserAbstract
           111,  111,  111,  111,  111,  111,  111,32767,  195,  111,
         32767,32767,32767,  101,  195,  195,  195,  195,  195,  195,
           195,  195,  195,  195,  190,32767,  268,  270,  103,  557,
-          195,32767,  515,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,  508,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  496,
-          434,  139,32767,  139,  542,  426,  427,  428,  498,  542,
-          542,  542,  312,  289,32767,32767,32767,32767,  513,  513,
-          101,  101,  101,  101,  508,32767,32767,32767,32767,  112,
-          100,  100,  100,  100,  100,  104,  102,32767,32767,32767,
-        32767,  223,  100,32767,  102,  102,32767,32767,  223,  225,
-          212,  102,  227,32767,  561,  562,  223,  102,  227,  227,
-          227,  247,  247,  485,  318,  102,  100,  102,  102,  197,
-          318,  318,32767,  102,  485,  318,  485,  318,  199,  318,
-          318,  318,  485,  318,32767,  102,  318,  214,  100,  100,
-          318,32767,32767,32767,  498,32767,32767,32767,32767,32767,
-        32767,32767,  222,32767,32767,32767,32767,32767,32767,32767,
-          529,32767,  546,  559,  432,  433,  435,  544,  457,  458,
-          459,  460,  461,  462,  463,  465,  591,32767,  502,32767,
-        32767,32767,  338,  601,32767,  601,32767,32767,32767,32767,
+          195,  515,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  508,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  602,32767,  542,32767,32767,32767,32767,  431,    9,
-           76,  491,   43,   44,   52,   58,  519,  520,  521,  522,
-          516,  517,  523,  518,32767,32767,  524,  567,32767,32767,
-          543,  594,32767,32767,32767,32767,32767,32767,  139,32767,
+          496,  434,  139,32767,  139,  542,  426,  427,  428,  498,
+          542,  542,  542,  312,  289,32767,32767,32767,32767,  513,
+          513,  101,  101,  101,  101,  508,32767,32767,32767,32767,
+          112,  100,  100,  100,  100,  100,  104,  102,32767,32767,
+        32767,32767,  223,  100,32767,  102,  102,32767,32767,  223,
+          225,  212,  102,  227,32767,  561,  562,  223,  102,  227,
+          227,  227,  247,  247,  485,  318,  102,  100,  102,  102,
+          197,  318,  318,32767,  102,  485,  318,  485,  318,  199,
+          318,  318,  318,  485,  318,32767,  102,  318,  214,  100,
+          100,  318,32767,32767,32767,  498,32767,32767,32767,32767,
+        32767,32767,32767,  222,32767,32767,32767,32767,32767,32767,
+        32767,  529,32767,  546,  559,  432,  433,  435,  544,  457,
+          458,  459,  460,  461,  462,  463,  465,  591,32767,  502,
+        32767,32767,32767,  338,  601,32767,  601,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          529,32767,  137,32767,32767,32767,32767,32767,32767,32767,
-        32767,  525,32767,32767,32767,  542,32767,32767,32767,32767,
-          314,  311,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,  542,32767,
-        32767,32767,32767,32767,  291,32767,  308,32767,32767,32767,
+        32767,32767,  602,32767,  542,32767,32767,32767,32767,  431,
+            9,   76,  491,   43,   44,   52,   58,  519,  520,  521,
+          522,  516,  517,  523,  518,32767,32767,  524,  567,32767,
+        32767,  543,  594,32767,32767,32767,32767,32767,32767,  139,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,  286,32767,32767,  381,  498,  294,  296,
-          297,32767,32767,32767,32767,  360,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  153,  153,    3,
-            3,  341,  153,  153,  153,  341,  341,  153,  341,  341,
-          341,  153,  153,  153,  153,  153,  153,  280,  185,  262,
-          265,  247,  247,  153,  352,  153
+        32767,  529,32767,  137,32767,32767,32767,32767,32767,32767,
+        32767,32767,  525,32767,32767,32767,  542,32767,32767,32767,
+        32767,  314,  311,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  542,
+        32767,32767,32767,32767,32767,  291,32767,  308,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,  286,32767,32767,  381,  498,  294,
+          296,  297,32767,32767,32767,32767,  360,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  153,  153,
+            3,    3,  341,  153,  153,  153,  341,  341,  153,  341,
+          341,  341,  153,  153,  153,  153,  153,  153,  280,  185,
+          262,  265,  247,  247,  153,  352,  153
     );
 
     protected $goto = array(
-          196,  196, 1031,  703,  694,  430,  658, 1062, 1334, 1334,
-          424,  313,  314,  335,  573,  319,  429,  336,  431,  635,
-          651,  652,  850,  669,  670,  671, 1334,  167,  167,  167,
+          196,  196, 1032,  704,  695,  431,  659, 1063, 1335, 1335,
+          425,  313,  314,  335,  574,  319,  430,  336,  432,  636,
+          652,  653,  851,  670,  671,  672, 1335,  167,  167,  167,
           167,  221,  197,  193,  193,  177,  179,  216,  193,  193,
           193,  193,  193,  194,  194,  194,  194,  194,  194,  188,
-          189,  190,  191,  192,  218,  216,  219,  534,  535,  420,
-          536,  538,  539,  540,  541,  542,  543,  544,  545, 1132,
+          189,  190,  191,  192,  218,  216,  219,  535,  536,  421,
+          537,  539,  540,  541,  542,  543,  544,  545,  546, 1133,
           168,  169,  170,  195,  171,  172,  173,  166,  174,  175,
           176,  178,  215,  217,  220,  238,  243,  244,  245,  257,
           258,  259,  260,  261,  262,  263,  264,  268,  269,  270,
-          271,  281,  282,  316,  317,  318,  425,  426,  427,  578,
+          271,  281,  282,  316,  317,  318,  426,  427,  428,  579,
           222,  223,  224,  225,  226,  227,  228,  229,  230,  231,
           232,  233,  234,  235,  236,  180,  237,  181,  198,  199,
-          200,  239,  188,  189,  190,  191,  192,  218, 1132,  201,
+          200,  239,  188,  189,  190,  191,  192,  218, 1133,  201,
           182,  183,  184,  202,  198,  185,  240,  203,  201,  165,
           204,  205,  186,  206,  207,  208,  187,  209,  210,  211,
-          212,  213,  214,  853,  851,  278,  278,  278,  278,  418,
-          620,  620,  350,  570,  597, 1265, 1265, 1265, 1265, 1265,
-         1265, 1265, 1265, 1265, 1265, 1283, 1283,  831,  618,  655,
-         1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283,
-          353,  353,  353,  353,  866,  557,  550,  858,  825,  907,
-          902,  903,  916,  859,  904,  856,  905,  906,  857,  878,
-          457,  910,  865,  884,  546,  546,  546,  546,  831,  601,
-          831, 1084, 1079, 1080, 1081,  341,  550,  557,  566,  567,
-          343,  576,  599,  613,  614,  407,  408,  972,  465,  465,
-          667,   15,  668, 1323,  411,  412,  413,  465,  681,  348,
-         1233,  414, 1233,  478,  569,  346,  439, 1031, 1031, 1233,
-          993,  480, 1031,  393, 1031, 1031, 1104, 1105, 1031, 1031,
-         1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1315,
-         1315, 1315, 1315, 1233,  657, 1333, 1333, 1055, 1233, 1233,
-         1233, 1233, 1037, 1036, 1233, 1233, 1233, 1034, 1034, 1181,
-          354,  678,  949, 1333,  437, 1026, 1042, 1043,  337,  691,
-          354,  354,  827,  923,  691, 1040, 1041,  924,  691,  663,
-         1336,  939,  871,  939,  354,  354, 1281, 1281,  354,  679,
-         1350, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281,
-         1281,  552,  537,  537,  911,  354,  912,  537,  537,  537,
-          537,  537,  537,  537,  537,  537,  537,  548,  564,  548,
-          574,  611,  730,  634,  636,  849,  548,  656,  475, 1308,
-         1309,  680,  684, 1007,  692,  701, 1003,  252,  252,  996,
-          970,  970,  968,  970,  729,  843,  549, 1005, 1000,  423,
-          455,  608, 1294,  846,  955,  966,  966,  966,  966,  325,
-          308,  455,  960,  967,  249,  249,  249,  249,  251,  253,
-          402,  351,  352,  683,  868,  551,  561,  449,  449,  449,
-          551, 1305,  561, 1305,  612,  396,  461, 1010, 1010, 1224,
-         1305,  395,  398,  558,  598,  602, 1015,  468,  577,  469,
-          470, 1310, 1311,  876,  552,  846, 1341, 1342,  964,  409,
-          702,  733,  324,  275,  324, 1317, 1317, 1317, 1317,  606,
-          621,  624,  625,  626,  627,  648,  649,  650,  705, 1068,
-          596, 1097,  874,  706,  476, 1228,  507,  697,  880, 1095,
-         1115,  432, 1301,  628,  630,  632,  432,  879,  867, 1067,
-         1071,    5, 1072,    6, 1038, 1038,  977,    0,  975,  662,
-         1049, 1045, 1046,    0,    0,    0,    0, 1226,  449,  449,
-          449,  449,  449,  449,  449,  449,  449,  449,  449,  928,
-         1120,  449,  965, 1070,    0,    0,  616, 1303, 1303, 1070,
-         1229, 1230, 1012,  499,    0,  500,    0,    0,  841,    0,
-          870,  506,  661,  991, 1113,  883, 1212,  941,  864,    0,
-         1213, 1216,  942, 1217,    0,    0, 1231, 1291, 1292,    0,
-         1223,    0,    0,    0,  846,    0,    0,    0,    0,    0,
+          212,  213,  214,  854,  619,  656,  278,  278,  278,  278,
+          852,  621,  621,  350,  419,  598, 1266, 1266, 1266, 1266,
+         1266, 1266, 1266, 1266, 1266, 1266, 1284, 1284,  832, 1105,
+         1106, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284,
+         1284,  353,  353,  353,  353,  826,  558,  551,  908,  903,
+          904,  917,  860,  905,  857,  906,  907,  858, 1035, 1035,
+          911,  864,  679,  950,  458,  863, 1027, 1043, 1044,  832,
+          885,  832, 1085, 1080, 1081, 1082,  341,  551,  558,  567,
+          568,  343,  577,  600,  614,  615,  547,  547,  547,  547,
+          973,  602,   15,  394,  397,  559,  599,  603, 1213,  942,
+         1234,  571, 1234, 1214, 1217,  943, 1218, 1032, 1032, 1234,
+          440,  912, 1032,  913, 1032, 1032, 1038, 1037, 1032, 1032,
+         1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1032, 1316,
+         1316, 1316, 1316, 1234,  476, 1309, 1310,  348, 1234, 1234,
+         1234, 1234,  407,  408, 1234, 1234, 1234,  668, 1324,  669,
+          354,  412,  413,  414,  867,  682,  466,  466,  415,  994,
+          354,  354,  346,  924,  424,  466,  609,  925,    5,  879,
+            6,  940,  866,  940,  354,  354, 1282, 1282,  354,  392,
+         1351, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282,
+         1282,  553,  538,  538,  570,  354,  658,  538,  538,  538,
+          538,  538,  538,  538,  538,  538,  538,  549,  565,  549,
+         1041, 1042,  731,  635,  637,  850,  549,  657,  965,  410,
+          703,  681,  685, 1008,  693,  702, 1004,  252,  252,  997,
+          971,  971,  969,  971,  730, 1056,  550, 1006, 1001, 1182,
+          456,  847, 1295, 1334, 1334,  967,  967,  967,  967,  325,
+          308,  456,  961,  968,  249,  249,  249,  249,  251,  253,
+          438, 1334,  351,  352,  684,  680,  552,  562,  450,  450,
+          450,  552, 1306,  562, 1306,  479,  395,  462, 1337, 1311,
+         1312, 1306,  664,  481,  500,  337,  501,  844,  469,  578,
+          470,  471,  507,  847,  877,  553,  872, 1342, 1343, 1011,
+         1011,  575,  612,  324,  275,  324, 1318, 1318, 1318, 1318,
+          607,  622,  625,  626,  627,  628,  649,  650,  651,  706,
+          956,  401,  692,  875, 1229,  828,  869,  692,  629,  631,
+          633,  692,  433, 1302, 1225,  734,  613,  433,  880,  868,
+         1068, 1072, 1069, 1016,  477, 1039, 1039,  881,    0,  976,
+          663, 1050, 1046, 1047, 1073, 1116,  978,    0, 1227,  450,
+          450,  450,  450,  450,  450,  450,  450,  450,  450,  450,
+          929, 1121,  450,  966, 1071,    0,    0,  617, 1304, 1304,
+         1071, 1230, 1231, 1013,    0,    0,    0,    0,    0,  842,
+            0,  871,    0,  662,  992, 1114,  884,  597, 1098,  865,
+          707,    0,    0,  508,  698,    0, 1096, 1232, 1292, 1293,
+            0, 1224,    0,  847,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -779,48 +780,48 @@ class Php7 extends \PhpParser\ParserAbstract
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-           42,   42,   42,   15,   27,   23,   23,   23,   23,   43,
-          107,  107,   96,  170,  129,  107,  107,  107,  107,  107,
-          107,  107,  107,  107,  107,  168,  168,   12,   55,   55,
-          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
-           24,   24,   24,   24,   35,   75,   75,   15,    6,   15,
-           15,   15,   15,   15,   15,   15,   15,   15,   15,   35,
-           82,   15,   35,   45,  106,  106,  106,  106,   12,  106,
-           12,   15,   15,   15,   15,   75,   75,   75,   75,   75,
-           75,   75,   75,   75,   75,   81,   81,   49,  148,  148,
-           81,   75,   81,  179,   81,   81,   81,  148,   81,  177,
-           72,   81,   72,   83,  103,   81,   82,   72,   72,   72,
-          102,   83,   72,   61,   72,   72,  143,  143,   72,   72,
+           42,   42,   42,   15,   55,   55,   23,   23,   23,   23,
+           27,  107,  107,   96,   43,  129,  107,  107,  107,  107,
+          107,  107,  107,  107,  107,  107,  168,  168,   12,  143,
+          143,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,   24,   24,   24,   24,    6,   75,   75,   15,   15,
+           15,   15,   15,   15,   15,   15,   15,   15,   88,   88,
+           15,   15,   88,   88,   82,   15,   88,   88,   88,   12,
+           45,   12,   15,   15,   15,   15,   75,   75,   75,   75,
+           75,   75,   75,   75,   75,   75,  106,  106,  106,  106,
+           49,  106,   75,   58,   58,   58,   58,   58,   78,   78,
+           72,  170,   72,   78,   78,   78,   78,   72,   72,   72,
+           82,   64,   72,   64,   72,   72,  117,  117,   72,   72,
            72,   72,   72,   72,   72,   72,   72,   72,   72,    9,
-            9,    9,    9,   72,   63,  180,  180,  113,   72,   72,
-           72,   72,  117,  117,   72,   72,   72,   88,   88,  150,
-           14,   88,   88,  180,  112,   88,   88,   88,   29,    7,
-           14,   14,    7,   72,    7,  118,  118,   72,    7,  119,
-          180,    9,   39,    9,   14,   14,  169,  169,   14,  115,
+            9,    9,    9,   72,  174,  174,  174,  177,   72,   72,
+           72,   72,   81,   81,   72,   72,   72,   81,  179,   81,
+           14,   81,   81,   81,   35,   81,  148,  148,   81,  102,
+           14,   14,   81,   72,   13,  148,   13,   72,   46,   35,
+           46,    9,   35,    9,   14,   14,  169,  169,   14,   61,
            14,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-          169,   14,  171,  171,   64,   14,   64,  171,  171,  171,
+          169,   14,  171,  171,  103,   14,   63,  171,  171,  171,
           171,  171,  171,  171,  171,  171,  171,   19,   48,   19,
-            2,    2,   48,   48,   48,   25,   19,   48,  174,  174,
-          174,   48,   48,   48,   48,   48,   48,    5,    5,   25,
-           25,   25,   25,   25,   25,   18,   25,   25,   25,   13,
-           19,   13,   14,   22,   91,   19,   19,   19,   19,  167,
+          118,  118,   48,   48,   48,   25,   19,   48,   92,   92,
+           92,   48,   48,   48,   48,   48,   48,    5,    5,   25,
+           25,   25,   25,   25,   25,  113,   25,   25,   25,  150,
+           19,   22,   14,  180,  180,   19,   19,   19,   19,  167,
           167,   19,   19,   19,    5,    5,    5,    5,    5,    5,
-           28,   96,   96,   14,   37,    9,    9,   23,   23,   23,
-            9,  129,    9,  129,   79,    9,    9,  106,  106,  159,
-          129,   58,   58,   58,   58,   58,  109,    9,    9,    9,
-            9,  176,  176,    9,   14,   22,    9,    9,   92,   92,
-           92,   98,   24,   24,   24,  129,  129,  129,  129,   80,
-           80,   80,   80,   80,   80,   80,   80,   80,   80,  128,
-            8,    8,    9,    8,  156,   20,    8,    8,   41,    8,
-          146,  116,  129,   84,   84,   84,  116,   16,   16,   16,
-           16,   46,  131,   46,  116,  116,   95,   -1,   16,  116,
-          116,  116,  116,   -1,   -1,   -1,   -1,   14,   23,   23,
-           23,   23,   23,   23,   23,   23,   23,   23,   23,   17,
-           17,   23,   16,  129,   -1,   -1,   17,  129,  129,  129,
-           20,   20,   17,  154,   -1,  154,   -1,   -1,   20,   -1,
-           17,  154,   17,   17,   16,   16,   78,   78,   17,   -1,
-           78,   78,   78,   78,   -1,   -1,   20,   20,   20,   -1,
-           17,   -1,   -1,   -1,   22,   -1,   -1,   -1,   -1,   -1,
+          112,  180,   96,   96,   14,  115,    9,    9,   23,   23,
+           23,    9,  129,    9,  129,   83,    9,    9,  180,  176,
+          176,  129,  119,   83,  154,   29,  154,   18,    9,    9,
+            9,    9,  154,   22,    9,   14,   39,    9,    9,  106,
+          106,    2,    2,   24,   24,   24,  129,  129,  129,  129,
+           80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+           91,   28,    7,    9,   20,    7,   37,    7,   84,   84,
+           84,    7,  116,  129,  159,   98,   79,  116,   16,   16,
+           16,   16,  128,  109,  156,  116,  116,   41,   -1,   16,
+          116,  116,  116,  116,  131,  146,   95,   -1,   14,   23,
+           23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
+           17,   17,   23,   16,  129,   -1,   -1,   17,  129,  129,
+          129,   20,   20,   17,   -1,   -1,   -1,   -1,   -1,   20,
+           -1,   17,   -1,   17,   17,   16,   16,    8,    8,   17,
+            8,   -1,   -1,    8,    8,   -1,    8,   20,   20,   20,
+           -1,   17,   -1,   22,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
@@ -829,47 +830,47 @@ class Php7 extends \PhpParser\ParserAbstract
     );
 
     protected $gotoBase = array(
-            0,    0, -339,    0,    0,  386,  195,  312,  472,  -10,
-            0,    0, -109,   62,   13, -184,   46,   65,   86,  102,
-           93,    0,  125,  162,  197,  371,   18,  160,   83,   22,
-            0,    0,    0,    0,    0, -166,    0,   85,    0,    9,
-            0,   48,   -1,  157,    0,  207, -232,    0, -340,  223,
-            0,    0,    0,    0,    0,  148,    0,    0,  396,    0,
-            0,  231,    0,   52,  334, -236,    0,    0,    0,    0,
-            0,    0,   -5,    0,    0, -139,    0,    0,  149,   91,
-          112, -245,  -58, -205,   15, -695,    0,    0,   28,    0,
-            0,   75,  154,    0,    0,   64, -310,    0,   55,    0,
-            0,    0,  235,  221,    0,    0,  196,  -71,    0,   77,
-            0,    0,   37,   24,    0,   56,  219,   23,   40,   39,
-            0,    0,    0,    0,    0,    0,    5,    0,  106,  166,
-            0,   61,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    1,    0,    0,   47,    0,  214,    0,
-           35,    0,    0,    0,   49,    0,   45,    0,    0,   71,
-            0,    0,    0,    0,    0,    0,    0,   88,  -56,   95,
-          144,  111,    0,    0,   78,    0,   80,  229,    0,  222,
-          -12, -299,    0,    0
+            0,    0, -249,    0,    0,  386,  192,  475,  549,  -10,
+            0,    0, -108,  -13,   13, -184,   46,   65,  138,  102,
+           93,    0,  123,  163,  198,  371,   18,  166,  144,  149,
+            0,    0,    0,    0,    0,  -56,    0,  147,    0,  133,
+            0,   66,   -1,  162,    0,  214, -406,    0, -341,  226,
+            0,    0,    0,    0,    0,  124,    0,    0,  208,    0,
+            0,  297,    0,  114,  251, -236,    0,    0,    0,    0,
+            0,    0,   -5,    0,    0, -138,    0,    0, -149,  153,
+          113, -189,  -54,  -34,    9, -696,    0,    0,  -61,    0,
+            0,  151,   74,    0,    0,   73, -310,    0,   89,    0,
+            0,    0,  284,  311,    0,    0,  218,  -70,    0,  134,
+            0,    0,  143,  122,    0,  142,  220,   -3,   85,  152,
+            0,    0,    0,    0,    0,    0,    5,    0,  129,  167,
+            0,   72,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,  -86,    0,    0,   71,    0,  282,    0,
+          125,    0,    0,    0,  -51,    0,   64,    0,    0,  126,
+            0,    0,    0,    0,    0,    0,    0,   88,  -55,   95,
+          232,  111,    0,    0,   -6,    0,   68,  267,    0,  277,
+           96, -299,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  511,  737,    4,  738,  932,  814,  823,  594,  528,
-          704,  347,  622,  421, 1299,  909, 1119,  575,  842, 1242,
-         1250,  456,  845,  330,  727,  891,  892,  893,  399,  385,
-          391,  397,  646,  623,  493,  877,  452,  869,  485,  872,
-          451,  881,  164,  417,  509,  885,    3,  888,  554,  919,
-          386,  896,  387,  674,  898,  560,  900,  901,  394,  400,
-          401, 1124,  568,  619,  913,  256,  562,  914,  384,  915,
-          922,  389,  392,  685,  464,  504,  498,  410, 1099,  563,
-          605,  643,  446,  472,  617,  629,  615,  479,  433,  415,
-          329,  954,  962,  486,  462,  976,  349,  984,  735, 1131,
-          637,  488,  992,  638,  999, 1002,  529,  530,  477, 1014,
-          272, 1017,  489,   12,  664, 1028, 1029,  665,  639, 1051,
-          640,  666,  641, 1053,  471,  595, 1061,  453, 1069, 1287,
-          454, 1073,  266, 1076,  277,  416,  434, 1082, 1083,    9,
-         1089,  695,  696,   11,  276,  508, 1114,  686,  450, 1130,
-          438, 1200, 1202,  556,  490, 1220, 1219,  677,  505, 1225,
-          447, 1290,  448,  531,  473,  315,  532,  307,  333,  312,
-          547,  294,  334,  533,  474, 1296, 1304,  331,   31, 1324,
-         1335,  342,  572,  610
+        -32768,  512,  738,    4,  739,  933,  815,  824,  595,  529,
+          705,  347,  623,  422, 1300,  910, 1120,  576,  843, 1243,
+         1251,  457,  846,  330,  728,  892,  893,  894,  398,  385,
+          859,  396,  647,  624,  494,  878,  453,  870,  486,  873,
+          452,  882,  164,  418,  510,  886,    3,  889,  555,  920,
+          386,  897,  387,  675,  899,  561,  901,  902,  393,  399,
+          400, 1125,  569,  620,  914,  256,  563,  915,  384,  916,
+          923,  389,  391,  686,  465,  505,  499,  411, 1100,  564,
+          606,  644,  447,  473,  618,  630,  616,  480,  434,  416,
+          329,  955,  963,  487,  463,  977,  349,  985,  736, 1132,
+          638,  489,  993,  639, 1000, 1003,  530,  531,  478, 1015,
+          272, 1018,  490,   12,  665, 1029, 1030,  666,  640, 1052,
+          641,  667,  642, 1054,  472,  596, 1062,  454, 1070, 1288,
+          455, 1074,  266, 1077,  277,  417,  435, 1083, 1084,    9,
+         1090,  696,  697,   11,  276,  509, 1115,  687,  451, 1131,
+          439, 1201, 1203,  557,  491, 1221, 1220,  678,  506, 1226,
+          448, 1291,  449,  532,  474,  315,  533,  307,  333,  312,
+          548,  294,  334,  534,  475, 1297, 1305,  331,   31, 1325,
+         1336,  342,  573,  611
     );
 
     protected $ruleToNonTerminal = array(
@@ -950,7 +951,7 @@ class Php7 extends \PhpParser\ParserAbstract
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             0,    1,    0,    1,    1,    2,    1,    3,    4,    1,
             2,    0,    1,    1,    1,    1,    1,    3,    5,    4,
-            3,    4,    2,    3,    1,    1,    7,    6,    2,    3,
+            3,    4,    1,    3,    1,    1,    8,    7,    2,    3,
             1,    2,    3,    1,    2,    3,    1,    1,    3,    1,
             3,    1,    2,    2,    3,    1,    3,    2,    3,    1,
             3,    3,    2,    0,    1,    1,    1,    1,    1,    3,
@@ -1378,7 +1379,7 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             122 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             123 => function ($stackPos) {
                  $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
@@ -1390,10 +1391,10 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = Stmt\Use_::TYPE_CONSTANT;
             },
             126 => function ($stackPos) {
-                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-6)], $this->semStack[$stackPos-(8-2)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
             127 => function ($stackPos) {
-                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-2)], $this->semStack[$stackPos-(7-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
             128 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(2-1)];
diff --git a/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php b/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
index 9f9d00c76..567e09a97 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
@@ -155,7 +155,7 @@ abstract class ParserAbstract implements Parser
      * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
      *                          the parser was unable to recover from an error).
      */
-    public function parse(string $code, ErrorHandler $errorHandler = null) {
+    public function parse(string $code, ?ErrorHandler $errorHandler = null) {
         $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing;
 
         $this->lexer->startLexing($code, $this->errorHandler);
diff --git a/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php b/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
index baba23bdb..98b0aee34 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
@@ -21,7 +21,7 @@ class ParserFactory
      *
      * @return Parser The parser instance
      */
-    public function create(int $kind, Lexer $lexer = null, array $parserOptions = []) : Parser {
+    public function create(int $kind, ?Lexer $lexer = null, array $parserOptions = []) : Parser {
         if (null === $lexer) {
             $lexer = new Lexer\Emulative();
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
index 7c32e5a3c..b8115d00a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
+++ b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
@@ -223,7 +223,7 @@ class Standard extends PrettyPrinterAbstract
 
         // Try to find a short full-precision representation
         $stringValue = sprintf('%.16G', $node->value);
-        if ($node->value !== (double) $stringValue) {
+        if ($node->value !== (float) $stringValue) {
             $stringValue = sprintf('%.17G', $node->value);
         }
 
diff --git a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
index 770d50092..5d87e5ce8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
@@ -658,7 +658,7 @@ abstract class PrettyPrinterAbstract
                 $result .= $extraLeft;
 
                 $origIndentLevel = $this->indentLevel;
-                $this->setIndentLevel($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment);
+                $this->setIndentLevel(max($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment, 0));
 
                 // If it's the same node that was previously in this position, it certainly doesn't
                 // need fixup. It's important to check this here, because our fixup checks are more
@@ -761,7 +761,7 @@ abstract class PrettyPrinterAbstract
                 \assert($itemStartPos >= 0 && $itemEndPos >= 0 && $itemStartPos >= $pos);
 
                 $origIndentLevel = $this->indentLevel;
-                $lastElemIndentLevel = $this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment;
+                $lastElemIndentLevel = max($this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment, 0);
                 $this->setIndentLevel($lastElemIndentLevel);
 
                 $comments = $arrItem->getComments();
diff --git a/lib/paragonie/random_compat/LICENSE b/lib/paragonie/random_compat/LICENSE
deleted file mode 100644
index 45c7017df..000000000
--- a/lib/paragonie/random_compat/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Paragon Initiative Enterprises
-
-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/lib/paragonie/random_compat/build-phar.sh b/lib/paragonie/random_compat/build-phar.sh
deleted file mode 100644
index b4a5ba31c..000000000
--- a/lib/paragonie/random_compat/build-phar.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) )
-
-php -dphar.readonly=0 "$basedir/other/build_phar.php" $*
\ No newline at end of file
diff --git a/lib/paragonie/random_compat/composer.json b/lib/paragonie/random_compat/composer.json
deleted file mode 100644
index f2b9c4e51..000000000
--- a/lib/paragonie/random_compat/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name":         "paragonie/random_compat",
-  "description":  "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-  "keywords": [
-    "csprng",
-    "random",
-    "polyfill",
-    "pseudorandom"
-  ],
-  "license":      "MIT",
-  "type":         "library",
-  "authors": [
-    {
-      "name":     "Paragon Initiative Enterprises",
-      "email":    "security@paragonie.com",
-      "homepage": "https://paragonie.com"
-    }
-  ],
-  "support": {
-    "issues":     "https://github.com/paragonie/random_compat/issues",
-    "email":      "info@paragonie.com",
-    "source":     "https://github.com/paragonie/random_compat"
-  },
-  "require": {
-    "php": ">= 7"
-  },
-  "require-dev": {
-    "vimeo/psalm": "^1",
-    "phpunit/phpunit": "4.*|5.*"
-  },
-  "suggest": {
-    "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-  }
-}
diff --git a/lib/paragonie/random_compat/dist/random_compat.phar.pubkey b/lib/paragonie/random_compat/dist/random_compat.phar.pubkey
deleted file mode 100644
index eb50ebfcd..000000000
--- a/lib/paragonie/random_compat/dist/random_compat.phar.pubkey
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm
-pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p
-+h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc
------END PUBLIC KEY-----
diff --git a/lib/paragonie/random_compat/dist/random_compat.phar.pubkey.asc b/lib/paragonie/random_compat/dist/random_compat.phar.pubkey.asc
deleted file mode 100644
index 6a1d7f300..000000000
--- a/lib/paragonie/random_compat/dist/random_compat.phar.pubkey.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (MingW32)
-
-iQEcBAABAgAGBQJWtW1hAAoJEGuXocKCZATaJf0H+wbZGgskK1dcRTsuVJl9IWip
-QwGw/qIKI280SD6/ckoUMxKDCJiFuPR14zmqnS36k7N5UNPnpdTJTS8T11jttSpg
-1LCmgpbEIpgaTah+cELDqFCav99fS+bEiAL5lWDAHBTE/XPjGVCqeehyPYref4IW
-NDBIEsvnHPHPLsn6X5jq4+Yj5oUixgxaMPiR+bcO4Sh+RzOVB6i2D0upWfRXBFXA
-NNnsg9/zjvoC7ZW73y9uSH+dPJTt/Vgfeiv52/v41XliyzbUyLalf02GNPY+9goV
-JHG1ulEEBJOCiUD9cE1PUIJwHA/HqyhHIvV350YoEFiHl8iSwm7SiZu5kPjaq74=
-=B6+8
------END PGP SIGNATURE-----
diff --git a/lib/paragonie/random_compat/lib/random.php b/lib/paragonie/random_compat/lib/random.php
deleted file mode 100644
index c7731a56f..000000000
--- a/lib/paragonie/random_compat/lib/random.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * @version 2.99.99
- * @released 2018-06-06
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * 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.
- */
-
-// NOP
diff --git a/lib/paragonie/random_compat/other/build_phar.php b/lib/paragonie/random_compat/other/build_phar.php
deleted file mode 100644
index 70ef4b2ed..000000000
--- a/lib/paragonie/random_compat/other/build_phar.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-$dist = dirname(__DIR__).'/dist';
-if (!is_dir($dist)) {
-    mkdir($dist, 0755);
-}
-if (file_exists($dist.'/random_compat.phar')) {
-    unlink($dist.'/random_compat.phar');
-}
-$phar = new Phar(
-    $dist.'/random_compat.phar',
-    FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::KEY_AS_FILENAME,
-    'random_compat.phar'
-);
-rename(
-    dirname(__DIR__).'/lib/random.php', 
-    dirname(__DIR__).'/lib/index.php'
-);
-$phar->buildFromDirectory(dirname(__DIR__).'/lib');
-rename(
-    dirname(__DIR__).'/lib/index.php', 
-    dirname(__DIR__).'/lib/random.php'
-);
-
-/**
- * If we pass an (optional) path to a private key as a second argument, we will
- * sign the Phar with OpenSSL.
- * 
- * If you leave this out, it will produce an unsigned .phar!
- */
-if ($argc > 1) {
-    if (!@is_readable($argv[1])) {
-        echo 'Could not read the private key file:', $argv[1], "\n";
-        exit(255);
-    }
-    $pkeyFile = file_get_contents($argv[1]);
-    
-    $private = openssl_get_privatekey($pkeyFile);
-    if ($private !== false) {
-        $pkey = '';
-        openssl_pkey_export($private, $pkey);
-        $phar->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
-        
-        /**
-         * Save the corresponding public key to the file
-         */
-        if (!@is_readable($dist.'/random_compat.phar.pubkey')) {
-            $details = openssl_pkey_get_details($private);
-            file_put_contents(
-                $dist.'/random_compat.phar.pubkey',
-                $details['key']
-            );
-        }
-    } else {
-        echo 'An error occurred reading the private key from OpenSSL.', "\n";
-        exit(255);
-    }
-}
diff --git a/lib/paragonie/random_compat/psalm-autoload.php b/lib/paragonie/random_compat/psalm-autoload.php
deleted file mode 100644
index d71d1b818..000000000
--- a/lib/paragonie/random_compat/psalm-autoload.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require_once 'lib/byte_safe_strings.php';
-require_once 'lib/cast_to_int.php';
-require_once 'lib/error_polyfill.php';
-require_once 'other/ide_stubs/libsodium.php';
-require_once 'lib/random.php';
-
-$int = random_int(0, 65536);
diff --git a/lib/paragonie/random_compat/psalm.xml b/lib/paragonie/random_compat/psalm.xml
deleted file mode 100644
index 596d99dd6..000000000
--- a/lib/paragonie/random_compat/psalm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    autoloader="psalm-autoload.php"
-    stopOnFirstError="false"
-    useDocblockTypes="true"
->
-    <projectFiles>
-        <directory name="lib" />
-    </projectFiles>
-    <issueHandlers>
-        <RedundantConditionGivenDocblockType errorLevel="info" />
-        <UnresolvableInclude errorLevel="info" />
-        <DuplicateClass errorLevel="info" />
-        <InvalidOperand errorLevel="info" />
-        <UndefinedConstant errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <InvalidReturnType errorLevel="info" />
-    </issueHandlers>
-</psalm>
diff --git a/lib/pear/pear-core-minimal/README.rst b/lib/pear/pear-core-minimal/README.rst
index 9e412fbd1..1804e16fa 100644
--- a/lib/pear/pear-core-minimal/README.rst
+++ b/lib/pear/pear-core-minimal/README.rst
@@ -17,10 +17,5 @@ Included files
 ==============
 - ``OS/Guess.php``
 - ``PEAR.php``
-- ``PEAR/Error.php``
 - ``PEAR/ErrorStack.php``
 - ``System.php``
-
-
-``PEAR/Error.php`` is a dummy file that only includes ``PEAR.php``,
-to make autoloaders work without problems.
diff --git a/lib/pear/pear-core-minimal/composer.json b/lib/pear/pear-core-minimal/composer.json
index d805f56ae..523305603 100644
--- a/lib/pear/pear-core-minimal/composer.json
+++ b/lib/pear/pear-core-minimal/composer.json
@@ -10,9 +10,9 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "": "src/"
-        }
+        "classmap": [
+            "src/"
+        ]
     },
     "include-path": [
         "src/"
@@ -23,6 +23,7 @@
     },
     "type": "library",
     "require": {
+        "php": ">=5.4",
         "pear/console_getopt": "~1.4",
         "pear/pear_exception": "~1.0"
     },
diff --git a/lib/pear/pear-core-minimal/src/OS/Guess.php b/lib/pear/pear-core-minimal/src/OS/Guess.php
index 88cd65910..0e37a0956 100644
--- a/lib/pear/pear-core-minimal/src/OS/Guess.php
+++ b/lib/pear/pear-core-minimal/src/OS/Guess.php
@@ -245,7 +245,7 @@ class OS_Guess
             return array();
         }
         if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) {
-            return $this-_parseFeaturesHeaderFile($features_header_file);
+            return $this->_parseFeaturesHeaderFile($features_header_file);
         } // no cpp
 
         return $this->_fromGlibCTest();
diff --git a/lib/pear/pear-core-minimal/src/PEAR.php b/lib/pear/pear-core-minimal/src/PEAR.php
index fee6638f4..0c9ab5694 100644
--- a/lib/pear/pear-core-minimal/src/PEAR.php
+++ b/lib/pear/pear-core-minimal/src/PEAR.php
@@ -49,7 +49,9 @@ $GLOBALS['_PEAR_destructor_object_list'] = array();
 $GLOBALS['_PEAR_shutdown_funcs']         = array();
 $GLOBALS['_PEAR_error_handler_stack']    = array();
 
-@ini_set('track_errors', true);
+if(function_exists('ini_set')) {
+    @ini_set('track_errors', true);
+}
 
 /**
  * Base class for other PEAR classes.  Provides rudimentary
@@ -214,12 +216,16 @@ class PEAR
     public function __call($method, $arguments)
     {
         if (!isset(self::$bivalentMethods[$method])) {
-            trigger_error(
-                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
-            );
+           if (PHP_VERSION_ID < 70000) {
+                trigger_error(
+                    'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+                );
+            } else {
+                throw new Error('Call to undefined method PEAR::' . $method . '()');
+            }
         }
         return call_user_func_array(
-            array(get_class(), '_' . $method),
+            array(__CLASS__, '_' . $method),
             array_merge(array($this), $arguments)
         );
     }
@@ -227,12 +233,16 @@ class PEAR
     public static function __callStatic($method, $arguments)
     {
         if (!isset(self::$bivalentMethods[$method])) {
-            trigger_error(
-                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
-            );
+            if (PHP_VERSION_ID < 70000) {
+                trigger_error(
+                    'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+                );
+            } else {
+                throw new Error('Call to undefined method PEAR::' . $method . '()');
+            }
         }
         return call_user_func_array(
-            array(get_class(), '_' . $method),
+            array(__CLASS__, '_' . $method),
             array_merge(array(null), $arguments)
         );
     }
@@ -859,6 +869,7 @@ class PEAR_Error
     var $message              = '';
     var $userinfo             = '';
     var $backtrace            = null;
+    var $callback             = null;
 
     /**
      * PEAR_Error constructor
diff --git a/lib/pear/pear-core-minimal/src/PEAR/Error.php b/lib/pear/pear-core-minimal/src/PEAR/Error.php
deleted file mode 100644
index 96efff75d..000000000
--- a/lib/pear/pear-core-minimal/src/PEAR/Error.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Dummy file to make autoloaders work
- *
- * PHP version 5
- *
- * @category PEAR
- * @package  PEAR
- * @author   Christian Weiske <cweiske@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @link     http://pear.php.net/package/PEAR
- */
-require_once __DIR__ . '/../PEAR.php';
-?>
\ No newline at end of file
diff --git a/lib/pelago/emogrifier/CHANGELOG.md b/lib/pelago/emogrifier/CHANGELOG.md
index f6145abac..62ff649c0 100644
--- a/lib/pelago/emogrifier/CHANGELOG.md
+++ b/lib/pelago/emogrifier/CHANGELOG.md
@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+Please also have a look at our
+[API and deprecation policy](docs/API-and-deprecation-policy.md).
+
 ## x.y.z
 
 ### Added
@@ -15,84 +18,123 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+## 7.3.0: Add support for PHP 8.4 and CSS custom properties
+
+### Added
+
+- Add support for PHP 8.4 (#1278)
+- Support CSS custom properties (variables) (#1336)
+- Support `:root` pseudo-class (#1306)
+- Add CSS selectors exclusion feature (#1236)
+
+### Changed
+
+- Require `sabberworm/php-css-parser:^8.7.0` (#1355)
+
+### Fixed
+
+- Preserve case of CSS custom property (variable) names (#1332)
+
+### Documentation
+
+- Add an API and deprecation policy (#1323)
+
 ## 7.2.0: Add support for Symfony 7
 
 ### Added
+
 - Add support for Symfony 7 (#1243)
 
 ## 7.1.0: Add support for PHP 8.3
 
 ### Added
+
 - Add support for PHP 8.3 (#1218)
 
 ### Changed
+
 - Disable HTML formatting by default (#1214)
 
 ## 7.0.0
 
 ### Added
+
 - Add support for PHP 8.2 (#1155)
 
 ### Changed
+
 - Throw exception with invalid CSS in debug mode (#1142)
 - Only support up to 69 atomic expressions in a selector (#1113)
 - Require `sabberworm/php-css-parser:^8.4.0` (#1134)
 - Upgrade to PHPUnit 9 (#1112)
 
 ### Deprecated
+
 - Support for PHP 7.3 will be removed in Emogrifier 8.0.
 
 ### Removed
+
 - Drop support for Symfony 3.x and 5.3 (#1120, #1162)
 - Drop support for PHP 7.2 (#1111)
 
 ### Fixed
+
 - Bump the minimum Symfony 4.4 version to avoid PHP deprecation warnings (#1187)
 
 ## 6.0.0
 
 ### Added
+
 - Test with Symfony 6-dev (#1109)
 - Add support for PHP 8.1 (#1103)
 - Add a dedicated class for caching (#1097)
 - Allow installation together with Symfony 6 (#1065)
 - Support more file types in the `.editorconfig` (#1035)
-- Set `align` attribute of `<th>` elements with `CssToAttributeConverter` (#1008)
+- Set `align` attribute of `<th>` elements with `CssToAttributeConverter`
+  (#1008)
 
 ### Changed
+
 - Use `sabberworm/php-css-parser` to parse the CSS (#1015)
 - Also check the unit test code with Psalm (#1003)
 
 ### Deprecated
+
 - Support for PHP 7.2 will be removed in Emogrifier 7.0.
 
 ### Removed
+
 - Remove a redundant CSS data cache (#1018)
 - Drop support for Symfony 5.1 and 5.2 (#972, #1104)
 - Drop support for PHP 7.1 (#967)
 
 ### Fixed
+
 - Allow `@import` after ignored invalid `@charset` (@1081)
 - Allow line feeds within `<html>` tag (#987)
 
 ## 5.0.1
 
 ### Changed
+
 - Switch the default branch from `master` to `main` (#951)
 
 ### Fixed
+
 - Ignore `http-equiv` `Content-Type` in `<body>` (#961)
 - Allow "Content-Type" in content (#959)
 
 ## 5.0.0
 
 ### Added
+
 - Add an `.editorconfig` file (#940)
 - Support PHP 8.0 (#926)
 - Run the CI build once a week (#933)
 - Move more development tools to PHIVE (#894, #907)
 
 ### Changed
+
 - Automatically add a backslash for global functions (#909)
 - Update the development tools (#898, #895)
 - Upgrade to PHPUnit 7.5 (#888)
@@ -101,14 +143,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Make use of PHP 7.1 language features (#883)
 
 ### Deprecated
+
 - Support for PHP 7.1 will be removed in Emogrifier 6.0.
 
 ### Removed
+
 - Drop support for Symfony 4.3 and 5.0 (#936)
 - Stop checking `tests/` with Psalm (#885)
 - Drop support for PHP 7.0 (#880)
 
 ### Fixed
+
 - Fix a nonsensical code example in the README (#920, #935)
 - Remove `!important` from `style` attributes also when uppercase, mixed case or
   having whitespace after `!` (#911)
@@ -122,35 +167,43 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 4.0.0
 
 ### Added
+
 - Extract and inject `@font-face` rules into head (#870)
 - Test tag omission in conformant supplied HTML (#868)
 - Check for missing return type hint annotations in the code sniffs (#860)
 - Support `:only-of-type` (with a type) (#849, #856)
-- Configuration setting methods now all return `$this` to allow chaining (#824, #854)
+- Configuration setting methods now all return `$this` to allow chaining
+  (#824, #854)
 - Disable php-cs-fixer Yoda conditions (#791, #794)
 - Check the code with psalm (#537, #779)
 - Composer script to run tests with `--stop-on-failure` (#782)
 - Test universal selector with combinators (#776)
 
 ### Changed
-- Normalize DOCTYPE declaration according to polyglot markup recommendation (#866)
+
+- Normalize DOCTYPE declaration according to polyglot markup recommendation
+  (#866)
 - Upgrade to V2 of the PHP setup GitHub action (#861)
 - Move the development tools to PHIVE (#850, #851)
 - Switch the parallel linting to a maintained fork (#842)
-- Move continuous integration from Travis CI to GitHub actions (#832, #834, #838, #839, #840, #841, #843, #846, #849)
+- Move continuous integration from Travis CI to GitHub actions
+  (#832, #834, #838, #839, #840, #841, #843, #846, #849)
 - Clean up the folder structure and autoloading configuration (#529, #785)
 - Use `self` as the return type for `fromHtml` (#784)
 - Make use of PHP 7.0 language features (#777)
 
 ### Deprecated
+
 - Support for PHP 7.0 will be removed in Emogrifier 5.0.
 
 ### Removed
+
 - Drop support for Symfony versions that have reached their end of life (#847)
 - Drop the `Emogrifier` class (#774)
 - Drop support for PHP 5.6 (#773)
 
 ### Fixed
+
 - Allow `:last-of-type` etc. without type, without causing exception (#875)
 - Make sure to use the Composer-installed development tools (#862, #865)
 - Add missing `<head>` element when there's a `<header>` element (#844, #853)
@@ -161,22 +214,28 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 3.1.0
 
 ### Added
+
 - Add support for PHP 7.4 (#821, #829)
 
 ### Changed
+
 - Upgrade to Symfony 5.0 (#820)
 
 ## 3.0.0
 
 ### Added
-- Test and document excluding entire subtree with `addExcludedSelector()` (#347, #768)
+
+- Test and document excluding entire subtree with `addExcludedSelector()`
+  (#347, #768)
 - Test that rules with `:optional` or `:required` are copied to the `<style>`
   element (#748, #765)
-- Test that rules with `:only-of-type` are copied to the `<style>` element (#748, #760)
+- Test that rules with `:only-of-type` are copied to the `<style>` element
+  (#748, #760)
 - Support `:last-of-type` (#748, #758)
 - Support `:first-of-type` (#748, #757)
 - Support `:empty` (#748, #756)
-- Test that rules with `:any-link` are copied to the `<style>` element (#748, #755)
+- Test that rules with `:any-link` are copied to the `<style>` element
+  (#748, #755)
 - Support and test `:only-child` (#747, #754)
 - Support and test `:nth-last-of-type` (#747, #751)
 - Support and test `:nth-last-child` (#747, #750)
@@ -195,6 +254,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Add tests for `:nth-child` and `:nth-of-type` (#71, #698)
 
 ### Changed
+
 - Relax the dependency on `symfony/css-selector` (#762)
 - Rename `HtmlPruner::removeInvisibleNodes` to
   `HtmlPruner::removeElementsWithDisplayNone` (#717, #718)
@@ -204,14 +264,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Update the development dependencies (#691)
 
 ### Deprecated
+
 - Support for PHP 5.6 will be removed in Emogrifier 4.0.
 - Deprecate the `Emogrifier` class (#701)
 
 ### Removed
+
 - Drop `enableCssToHtmlMapping` and `disableInvisibleNodeRemoval` (#692)
 - Drop support for PHP 5.5 (#690)
 
 ### Fixed
+
 - Fix PhpStorm code inspection warnings (#729, #770)
 - Uppercase type combined with class or ID in selector (#590, #769)
 - Dynamic pseudo-class combined with static one (rules copied to `<style>`
@@ -226,22 +289,27 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 2.2.0
 
 ### Added
+
 - Add a `HtmlPruner` class (#679)
 - Add `AbstractHtmlProcessor::fromDomDocument` (#676)
 - Add `AbstractHtmlProcessor::fromHtml` (#675)
 
 ### Changed
+
 - Make the closures static (#674)
 - Keep `<wbr>` elements by default with `CssInliner` (#665)
 - Make the `CssInliner` inherit `AbstractHtmlProcessor` (#660)
 - Separate `CssInliner::inlineCss` and the rendering (#654)
 
 ### Removed
+
 - Drop the removal of unprocessable tags from `CssInliner` (#685)
 - Drop the removal of invisible nodes from `CssInliner` (#684)
 
 ### Fixed
-- Remove opening `<body>` tag from `body` content when element has attribute(s) (#677, #683)
+
+- Remove opening `<body>` tag from `body` content when element has attribute(s)
+  (#677, #683)
 - Keep development files out of the Composer packages (#678)
 - Call all static methods statically in `CssConcatenator` (#670)
 - Support all HTML5 self-closing tags, including `<embed>`, `<source>`,
@@ -252,17 +320,20 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 2.1.1
 
 ### Changed
+
 - Add a test that a missing document type gets added (#641)
 
 ### Fixed
+
 - Keep the `style` element the `head` (#642)
 
 ## 2.1.0
 
 ### Added
+
 - PHP 7.3 support (#638)
-  - Allow PHP 7.3 in `composer.json`
-  - Test in Travis for PHP 7.3
+    - Allow PHP 7.3 in `composer.json`
+    - Test in Travis for PHP 7.3
 - Add a `renderBodyContent()` method (#633)
 - Add a `getDomDocument()` method (#630)
 - Add a Composer script for PHP CS Fixer (#607)
@@ -276,17 +347,20 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Validate the composer.json on Travis (#476)
 
 ### Changed
+
 - Mark the work-in-progress classes as `@internal` (#640)
 - Remove the unprocessable tags from the DOM, not from the raw HTML (#627)
 - Reject empty HTML in `setHtml()` (#622)
 - Stop passing the DOM document around (#618)
-- Improve performance by using explicit namespaces for PHP functions (#573, #576)
+- Improve performance by using explicit namespaces for PHP functions
+  (#573, #576)
 - Add type hint checking to the code sniffs (#566)
 - Check the code with PHPMD (#561)
 - Add the cyclomatic complexity to the checked code sniffs (#558)
 - Use the Symfony CSS selector component (#540)
 
 ### Deprecated
+
 - Support for PHP 5.5 will be removed in Emogrifier 3.0.
 - Support for PHP 5.6 will be removed in Emogrifier 4.0.
 - The removal of invisible nodes will be removed in Emogrifier 3.0. (#473)
@@ -300,16 +374,19 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   version 3.0 and removed for version 4.0.
 
 ### Removed
+
 - Drop the `@version` PHPDoc annotations (#637)
 - Drop the destructors (#619)
 
 ### Fixed
+
 - Add required XML PHP extension to `composer.json` (#614)
 - Add required DOM PHP extension to `composer.json` (#595)
 - Escape hyphens in regular expressions (#588)
 - Fix Travis for PHP 5.x (#589)
 - Allow CSS between empty `@media` rule and another `@media` rule (#534)
-- Allow additional whitespace in media-query-list of disallowed `@media` rules (#532)
+- Allow additional whitespace in media-query-list of disallowed `@media` rules (
+  #532)
 - Allow multiple minified `@import` rules in the CSS without error (note:
   `@import`s are currently ignored, #527)
 - Style property ordering when multiple mixed individual and shorthand
@@ -325,28 +402,34 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 2.0.0
 
 ### Added
+
 - Support for CSS :not() selector (#431)
-- Automatically remove !important annotations from final inline style declarations (#420)
+- Automatically remove !important annotations from final inline style
+  declarations (#420)
 - Automatically move `<style>` block from `<head>` to `<body>` (#396)
 - PHP 7.2 support (#398)
-  - Allow PHP 7.2 in `composer.json`, cleaner PHP version constraint
-  - Test in Travis for PHP 7.2
+    - Allow PHP 7.2 in `composer.json`, cleaner PHP version constraint
+    - Test in Travis for PHP 7.2
 - Debug mode. Throw debug exceptions only if debug is active. (#392)
 
 ### Changed
+
 - Test with latest and oldest dependencies on Travis (#463)
 - Always enable the debug mode in the tests (#448)
 - Optimize the string operations (#430)
 
 ### Deprecated
+
 - Support for PHP 5.5 will be removed in Emogrifier 3.0.
 - Support for PHP 5.6 will be removed in Emogrifier 4.0.
 
 ### Removed
+
 - Drop support for PHP 5.4 (#422)
 - Drop support for HHVM (#386)
 
 ### Fixed
+
 - Handle invalid/unrecognized selectors in media query blocks (#442)
 - Throw (the correct) exception for invalid excluded selectors (#437)
 - emogrifyBody must not encode umlaut entities (#414)
@@ -359,19 +442,23 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 1.2.0 (2017-03-02)
 
 ### Added
+
 - Handling invalid xPath expression warnings (#361)
 
 ### Deprecated
+
 - Support for PHP 5.5 will be removed in Emogrifier 3.0.
 - Support for PHP 5.4 will be removed in Emogrifier 2.0.
 
 ### Fixed
+
 - Allow colon (`:`) and semi-colon (`;`) when using the `*=` selector (#371)
 - Ignore "auto" width and height (#365)
 
 ## 1.1.0 (2016-09-18)
 
 ### Added
+
 - Add support for PHP 7.1 (#342)
 - Support the attr|=value selector (#337)
 - Support the attr*=value selector (#330)
@@ -381,13 +468,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Add CSS to HTML attribute mapper (#288)
 
 ### Changed
-- Remove composer dependency from PHP mbstring extension (Actual code dependency were removed a lot of time ago) (#295)
+
+- Remove composer dependency from PHP mbstring extension (Actual code dependency
+  were removed a lot of time ago) (#295)
 
 ### Deprecated
+
 - Support for PHP 5.5 will be removed in Emogrifier 3.0.
 - Support for PHP 5.4 will be removed in Emogrifier 2.0.
 
 ### Fixed
+
 - Method emogrifyBodyContent() doesn't keeps utf8 umlauts (#349)
 - Ignore value with words more than one in the attribute selector (#327)
 - Ignore spaces around the > in the direct child selector (#322)
@@ -399,6 +490,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## 1.0.0 (2015-10-15)
 
 ### Added
+
 - Add branch alias (#231)
 - Remove media queries which do not impact the document (#217)
 - Allow elements to be excluded from emogrification (#215)
@@ -415,19 +507,23 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   and nth-of-type)
 
 ### Changed
+
 - Make HTML5 the default document type (#245)
 - Make copyCssWithMediaToStyleNode private (#218)
 - Stop encoding umlauts and dollar signs (#170)
 - Convert the classes to namespaces (#41)
 
 ### Deprecated
+
 - Support for PHP 5.4 will be removed in Emogrifier 2.0.
 
 ### Removed
+
 - Drop support for PHP 5.3 (#114)
 - Support for character sets other than UTF-8 was removed.
 
 ### Fixed
+
 - Fix failing tests on Windows due to line endings (#263)
 - Parsing CSS declaration blocks (#261)
 - Fix first-child and last-child selectors (#257)
diff --git a/lib/pelago/emogrifier/README.md b/lib/pelago/emogrifier/README.md
index be4c60e21..f715050b7 100644
--- a/lib/pelago/emogrifier/README.md
+++ b/lib/pelago/emogrifier/README.md
@@ -1,9 +1,10 @@
 # Emogrifier
 
-[![Build Status](https://github.com/MyIntervals/emogrifier/workflows/CI/badge.svg?branch=main)](https://github.com/MyIntervals/emogrifier/actions/)
+[![Build Status](https://github.com/MyIntervals/emogrifier/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/MyIntervals/emogrifier/actions/)
 [![Latest Stable Version](https://poser.pugx.org/pelago/emogrifier/v/stable.svg)](https://packagist.org/packages/pelago/emogrifier)
 [![Total Downloads](https://poser.pugx.org/pelago/emogrifier/downloads.svg)](https://packagist.org/packages/pelago/emogrifier)
 [![License](https://poser.pugx.org/pelago/emogrifier/license.svg)](https://packagist.org/packages/pelago/emogrifier)
+[![Coverage Status](https://coveralls.io/repos/github/MyIntervals/emogrifier/badge.svg?branch=main)](https://coveralls.io/github/MyIntervals/emogrifier?branch=main)
 
 _n. e•mog•ri•fi•er [\ē-'mä-grƏ-,fī-Ər\] - a utility for changing completely the
 nature or appearance of HTML email, esp. in a particularly fantastic or bizarre
@@ -31,6 +32,7 @@ into inline style attributes in your HTML code.
 - [Usage](#usage)
 - [Supported CSS selectors](#supported-css-selectors)
 - [Caveats](#caveats)
+- [Contributing](#contributing)
 - [Steps to release a new version](#steps-to-release-a-new-version)
 - [Maintainers](#maintainers)
 
@@ -157,6 +159,58 @@ $visualHtml = CssToAttributeConverter::fromDomDocument($domDocument)
   ->convertCssToVisualAttributes()->render();
 ```
 
+### Evaluating CSS custom properties (variables)
+
+The `CssVariableEvaluator` class can be used to apply the values of CSS
+variables defined in inline style attributes to inline style properties which
+use them.
+
+For example, the following CSS defines and uses a custom property:
+
+```css
+:root {
+    --text-color: green;
+}
+
+p {
+    color: var(--text-color);
+}
+```
+
+After `CssInliner` has inlined that CSS on the (contrived) HTML
+`<html><body><p></p></body></html>`, it will look like this:
+
+```html
+
+<html style="--text-color: green;">
+    <body>
+        <p style="color: var(--text-color);">
+        <p>
+    </body>
+</html>
+```
+
+The `CssVariableEvaluator` method `evaluateVariables` will apply the value of
+`--text-color` so that the paragraph `style` attribute becomes `color: green;`.
+
+It can be used like this:
+
+```php
+use Pelago\Emogrifier\HtmlProcessor\CssVariableEvaluator;
+
+…
+
+$evaluatedHtml = CssVariableEvaluator::fromHtml($html)
+  ->evaluateVariables()->render();
+```
+
+You can also have the ` CssVariableEvaluator ` work on a `DOMDocument`:
+
+```php
+$evaluatedHtml = CssVariableEvaluator::fromDomDocument($domDocument)
+  ->evaluateVariables()->render();
+```
+
 ### Removing redundant content and attributes from the HTML
 
 The `HtmlPruner` class can reduce the size of the HTML by removing elements with
@@ -174,11 +228,11 @@ $prunedHtml = HtmlPruner::fromHtml($html)->removeElementsWithDisplayNone()
   ->removeRedundantClasses($classesToKeep)->render();
 ```
 
-The `removeRedundantClasses` method accepts a whitelist of names of classes that
-should be retained.  If this is a post-processing step after inlining CSS, you
-can alternatively use `removeRedundantClassesAfterCssInlined`, passing it the
-`CssInliner` instance that has inlined the CSS (and having the `HtmlPruner` work
-on the `DOMDocument`).  This will use information from the `CssInliner` to
+The `removeRedundantClasses` method accepts an allowlist of names of classes
+that should be retained. If this is a post-processing step after inlining CSS,
+you can alternatively use `removeRedundantClassesAfterCssInlined`, passing it
+the `CssInliner` instance that has inlined the CSS (and having the `HtmlPruner`
+work on the `DOMDocument`). This will use information from the `CssInliner` to
 determine which classes are still required (namely, those used in uninlinable
 rules that have been copied to a `<style>` element):
 
@@ -189,16 +243,16 @@ $prunedHtml = HtmlPruner::fromDomDocument($cssInliner->getDomDocument())
 ```
 
 The `removeElementsWithDisplayNone` method will not remove any elements which
-have the class `-emogrifier-keep`.  So if, for example, there are elements which
+have the class `-emogrifier-keep`. So if, for example, there are elements which
 by default have `display: none` but are revealed by an `@media` rule, or which
-are intended as a preheader, you can add that class to those elements.  The
+are intended as a preheader, you can add that class to those elements. The
 paragraph in this HTML snippet will not be removed even though it has
 `display: none` (which has presumably been applied by `CssInliner::inlineCss()`
 from a CSS rule `.preheader { display: none; }`):
 
 ```html
 <p class="preheader -emogrifier-keep" style="display: none;">
-  Hello World!
+    Hello World!
 </p>
 ```
 
@@ -229,15 +283,32 @@ calling the `inlineCss` method:
 * `->removeAllowedMediaType(string $mediaName)` - You can use this
   method to remove media types that Emogrifier keeps.
 * `->addExcludedSelector(string $selector)` - Keeps elements from
-  being affected by CSS inlining.  Note that only elements matching the supplied
+  being affected by CSS inlining. Note that only elements matching the supplied
   selector(s) will be excluded from CSS inlining, not necessarily their
-  descendants.  If you wish to exclude an entire subtree, you should provide
+  descendants. If you wish to exclude an entire subtree, you should provide
   selector(s) which will match all elements in the subtree, for example by using
   the universal selector:
   ```php
   $cssInliner->addExcludedSelector('.message-preview');
   $cssInliner->addExcludedSelector('.message-preview *');
   ```
+* `->addExcludedCssSelector(string $selector)` - Contrary to
+  `addExcludedSelector`, which excludes HTML nodes, this method excludes CSS
+  selectors from being inlined. This is for example useful if you don't want
+  your CSS reset rules to be inlined on each HTML node (e.g.
+  `* { margin: 0; padding: 0; font-size: 100% }`).
+  Note that these selectors must precisely match the selectors you wish to
+  exclude.
+  Meaning that excluding `.example` will not exclude `p .example`.
+  ```php
+  $cssInliner->addExcludedCssSelector('*');
+  $cssInliner->addExcludedCssSelector('form');
+  ```
+* `->removeExcludedCssSelector(string $selector)` - Removes previously added
+  excluded selectors, if any.
+  ```php
+  $cssInliner->removeExcludedCssSelector('form');
+  ```
 
 ### Migrating from the dropped `Emogrifier` class to the `CssInliner` class
 
@@ -286,11 +357,11 @@ $html = CssToAttributeConverter::fromDomDocument($domDocument)
 Emogrifier currently supports the following
 [CSS selectors](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors):
 
- * [type](https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
- * [class](https://developer.mozilla.org/en-US/docs/Web/CSS/Class_selectors)
- * [ID](https://developer.mozilla.org/en-US/docs/Web/CSS/ID_selectors)
- * [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors)
- * [attribute](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors):
+* [type](https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
+* [class](https://developer.mozilla.org/en-US/docs/Web/CSS/Class_selectors)
+* [ID](https://developer.mozilla.org/en-US/docs/Web/CSS/ID_selectors)
+* [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors)
+* [attribute](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors):
     * presence
     * exact value match
     * value with `~` (one word within a whitespace-separated list of words)
@@ -298,68 +369,71 @@ Emogrifier currently supports the following
     * value with `^` (prefix match)
     * value with `$` (suffix match)
     * value with `*` (substring match)
- * [adjacent](https://developer.mozilla.org/en-US/docs/Web/CSS/Adjacent_sibling_selectors)
- * [general sibling](https://developer.mozilla.org/en-US/docs/Web/CSS/General_sibling_combinator)
- * [child](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_selectors)
- * [descendant](https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_selectors)
- * [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes):
-   * [empty](https://developer.mozilla.org/en-US/docs/Web/CSS/:empty)
-   * [first-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-child)
-   * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
-     (with a type, e.g. `p:first-of-type` but not `*:first-of-type`)
-   * [last-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-child)
-   * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
-     (with a type)
-   * [not()](https://developer.mozilla.org/en-US/docs/Web/CSS/:not)
-   * [nth-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-child)
-   * [nth-last-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-child)
-   * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
-     (with a type)
-   * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
-     (with a type)
-   * [only-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-child)
-   * [only-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)
-     (with a type)
+* [adjacent](https://developer.mozilla.org/en-US/docs/Web/CSS/Adjacent_sibling_selectors)
+* [general sibling](https://developer.mozilla.org/en-US/docs/Web/CSS/General_sibling_combinator)
+* [child](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_selectors)
+* [descendant](https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_selectors)
+* [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes):
+    * [empty](https://developer.mozilla.org/en-US/docs/Web/CSS/:empty)
+    * [first-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-child)
+    * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
+      (with a type, e.g. `p:first-of-type` but not `*:first-of-type`)
+    * [last-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-child)
+    * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
+      (with a type)
+    * [not()](https://developer.mozilla.org/en-US/docs/Web/CSS/:not)
+    * [nth-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-child)
+    * [nth-last-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-child)
+    * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
+      (with a type)
+    * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
+      (with a type)
+    * [only-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-child)
+    * [only-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)
+      (with a type)
+    * [root](https://developer.mozilla.org/en-US/docs/Web/CSS/:root)
 
 The following selectors are not implemented yet:
 
- * [case-insensitive attribute value](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors#case-insensitive)
- * static [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
-   not listed above as supported – rules involving them will nonetheless be
-   preserved and copied to a `<style>` element in the HTML – including (but not
-   necessarily limited to) the following:
-   * [any-link](https://developer.mozilla.org/en-US/docs/Web/CSS/:any-link)
-   * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
-     without a type
-   * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
-     without a type
-   * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
-     without a type
-   * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
-     without a type
-   * [only-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)
-     without a type
-   * [optional](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional)
-   * [required](https://developer.mozilla.org/en-US/docs/Web/CSS/:required)
+* [case-insensitive attribute value](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors#case-insensitive)
+* static
+  [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
+  not listed above as supported – rules involving them will nonetheless be
+  preserved and copied to a `<style>` element in the HTML – including (but not
+  necessarily limited to) the following:
+    * [any-link](https://developer.mozilla.org/en-US/docs/Web/CSS/:any-link)
+    * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
+      without a type
+    * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
+      without a type
+    * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
+      without a type
+    * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
+      without a type
+    * [only-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)
+      without a type
+    * [optional](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional)
+    * [required](https://developer.mozilla.org/en-US/docs/Web/CSS/:required)
 
 Rules involving the following selectors cannot be applied as inline styles.
 They will, however, be preserved and copied to a `<style>` element in the HTML:
 
- * dynamic [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
-   (such as `:hover`)
- * [pseudo-elements](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements)
-   (such as `::after`)
+* dynamic
+  [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
+  (such as `:hover`)
+* [pseudo-elements](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements)
+  (such as `::after`)
 
 ## Caveats
 
 * Emogrifier requires the HTML and the CSS to be UTF-8. Encodings like
   ISO8859-1 or ISO8859-15 are not supported.
-* Emogrifier preserves all valuable `@media` rules.  Media queries can be very
-  useful in responsive email design.  See
+* Emogrifier preserves all applicable `@media` rules. Media queries can be very
+  useful in responsive email design. See
   [media query support](https://litmus.com/help/email-clients/media-query-support/).
   However, in order for them to be effective, you may need to add `!important`
   to some of the declarations within them so that they will override CSS styles
-  that have been inlined.  For example, with the following CSS, the `font-size`
+  that have been inlined. For example, with the following CSS, the `font-size`
   declaration in the `@media` rule would not override the font size for `p`
   elements from the preceding rule after that has been inlined as
   `<p style="font-size: 16px;">` in the HTML, without the `!important` directive
@@ -374,11 +448,15 @@ They will, however, be preserved and copied to a `<style>` element in the HTML:
     }
   }
   ```
+  Any CSS custom properties (variables) defined in `@media` rules cannot be
+  applied to CSS property values that have been inlined and evaluated. However,
+  `@media` rules using custom properties (with `var()`) would still be able to
+  obtain their values (from the inlined definitions or `@media` rules) in email
+  clients that support custom properties.
 * Emogrifier cannot inline CSS rules involving selectors with pseudo-elements
   (such as `::after`) or dynamic pseudo-classes (such as `:hover`) – it is
-  impossible.  However, such rules will be preserved and copied to a `<style>`
-  element, as for `@media` rules.  The same caveat about the possible need for
-  the `!important` directive also applies with pseudo-classes.
+  impossible. However, such rules will be preserved and copied to a `<style>`
+  element, as for `@media` rules, with the same caveats applying.
 * Emogrifier will grab existing inline style attributes _and_ will
   grab `<style>` blocks from your HTML, but it will not grab CSS files
   referenced in `<link>` elements or `@import` rules (though it will leave them
@@ -402,20 +480,32 @@ They will, however, be preserved and copied to a `<style>` element in the HTML:
   self-closing tags will lose their slash. To keep your HTML valid, it is
   recommended to use HTML5 instead of one of the XHTML variants.
 
+## API and deprecation policy
+
+Please have a look at our
+[API and deprecation policy](docs/API-and-deprecation-policy.md).
+
+## Contributing
+
+Contributions in the form of bug reports, feature requests, or pull requests are
+more than welcome. :pray: Please have a look at our
+[contribution guidelines](CONTRIBUTING.md) to learn more about how to
+contribute to Emogrifier.
+
 ## Steps to release a new version
 
 1. In the [composer.json](composer.json), update the `branch-alias` entry to
    point to the release _after_ the upcoming release.
-2. In the [CHANGELOG.md](CHANGELOG.md), create a new section with subheadings
+1. In the [CHANGELOG.md](CHANGELOG.md), create a new section with subheadings
    for changes _after_ the upcoming release, set the version number for the
    upcoming release, and remove any empty sections.
-3. Create a pull request "Prepare release of version x.y.z" with those
-   changes.
-4. Have the pull request reviewed and merged.
-5. Tag the new release.
-6. In the [Releases tab](https://github.com/MyIntervals/emogrifier/releases),
+1. Update the target milestone in the Dependabot configuration.
+1. Create a pull request "Prepare release of version x.y.z" with those changes.
+1. Have the pull request reviewed and merged.
+1. Tag the new release.
+1. In the [Releases tab](https://github.com/MyIntervals/emogrifier/releases),
    create a new release and copy the change log entries to the new release.
-7. Post about the new release on social media.
+1. Post about the new release on social media.
 
 ## Maintainers
 
diff --git a/lib/pelago/emogrifier/composer.json b/lib/pelago/emogrifier/composer.json
index 40c1f0a73..93a114971 100644
--- a/lib/pelago/emogrifier/composer.json
+++ b/lib/pelago/emogrifier/composer.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "Jake Hotson",
-            "email": "jake@qzdesign.co.uk"
+            "email": "jake.github@qzdesign.co.uk"
         },
         {
             "name": "Cameron Brooks"
@@ -37,15 +37,19 @@
         "source": "https://github.com/MyIntervals/emogrifier"
     },
     "require": {
-        "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
         "ext-libxml": "*",
-        "sabberworm/php-css-parser": "^8.4.0",
+        "sabberworm/php-css-parser": "^8.7.0",
         "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0"
     },
     "require-dev": {
-        "php-parallel-lint/php-parallel-lint": "1.3.2",
-        "phpunit/phpunit": "9.6.11",
+        "php-parallel-lint/php-parallel-lint": "1.4.0",
+        "phpstan/extension-installer": "1.4.3",
+        "phpstan/phpstan": "1.12.7",
+        "phpstan/phpstan-phpunit": "1.4.0",
+        "phpstan/phpstan-strict-rules": "1.6.1",
+        "phpunit/phpunit": "9.6.21",
         "rawr/cross-data-providers": "2.4.0"
     },
     "prefer-stable": true,
@@ -60,6 +64,9 @@
         }
     },
     "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        },
         "preferred-install": {
             "*": "dist"
         },
@@ -80,28 +87,26 @@
             "@ci:tests"
         ],
         "ci:php:fixer": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots config/ src/ tests/",
-        "ci:php:lint": "\"./vendor/bin/parallel-lint\" config src tests",
+        "ci:php:lint": "parallel-lint config src tests",
         "ci:php:md": "\"./.phive/phpmd\" src text config/phpmd.xml",
-        "ci:php:psalm": "\"./.phive/psalm\" --show-info=false",
-        "ci:php:sniff": "\"./.phive/phpcs\" config src tests",
+        "ci:php:stan": "phpstan --no-progress  --error-format=github",
         "ci:static": [
             "@ci:composer:normalize",
             "@ci:php:lint",
-            "@ci:php:sniff",
             "@ci:php:fixer",
             "@ci:php:md",
-            "@ci:php:psalm"
+            "@ci:php:stan"
         ],
         "ci:tests": [
             "@ci:tests:unit"
         ],
-        "ci:tests:sof": "@php \"./vendor/bin/phpunit\" --stop-on-failure --do-not-cache-result",
-        "ci:tests:unit": "@php \"./vendor/bin/phpunit\" --do-not-cache-result",
+        "ci:tests:coverage": "phpunit --do-not-cache-result --coverage-clover=coverage.xml",
+        "ci:tests:sof": "phpunit --stop-on-failure --do-not-cache-result",
+        "ci:tests:unit": "phpunit --do-not-cache-result",
         "composer:normalize": "\"./.phive/composer-normalize\" --no-check-lock",
         "php:fix": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix config/ src/ tests/",
         "php:version": "@php -v | grep -Po 'PHP\\s++\\K(?:\\d++\\.)*+\\d++(?:-\\w++)?+'",
-        "psalm:baseline": "\"./.phive/psalm\" --set-baseline=psalm.baseline.xml",
-        "psalm:cc": "\"./.phive/psalm\" --clear-cache"
+        "phpstan:baseline": "phpstan --generate-baseline --allow-empty-baseline"
     },
     "scripts-descriptions": {
         "ci": "Runs all dynamic and static code checks.",
@@ -110,16 +115,15 @@
         "ci:php:fixer": "Checks the code style with PHP CS Fixer.",
         "ci:php:lint": "Lints the PHP files for syntax errors.",
         "ci:php:md": "Checks the code complexity with PHPMD.",
-        "ci:php:psalm": "Checks the types with Psalm.",
-        "ci:php:sniff": "Checks the code style with PHP_CodeSniffer.",
+        "ci:php:stan": "Checks the PHP types using PHPStan.",
         "ci:static": "Runs all static code analysis checks for the code and the composer.json.",
         "ci:tests": "Runs all dynamic tests (i.e., currently, the unit tests).",
+        "ci:tests:coverage": "Runs the unit tests with code coverage.",
         "ci:tests:sof": "Runs the unit tests and stops at the first failure.",
         "ci:tests:unit": "Runs all unit tests.",
         "composer:normalize": "Reformats and sorts the composer.json file.",
         "php:fix": "Reformats the code with php-cs-fixer.",
         "php:version": "Outputs the installed PHP version.",
-        "psalm:baseline": "Updates the Psalm baseline file to match the code.",
-        "psalm:cc": "Clears the Psalm cache."
+        "phpstan:baseline": "Updates the PHPStan baseline file to match the code."
     }
 }
diff --git a/lib/pelago/emogrifier/src/Caching/SimpleStringCache.php b/lib/pelago/emogrifier/src/Caching/SimpleStringCache.php
index aa7c462fa..3175f0bde 100644
--- a/lib/pelago/emogrifier/src/Caching/SimpleStringCache.php
+++ b/lib/pelago/emogrifier/src/Caching/SimpleStringCache.php
@@ -20,7 +20,7 @@ namespace Pelago\Emogrifier\Caching;
  *
  * @internal
  */
-class SimpleStringCache
+final class SimpleStringCache
 {
     /**
      * @var array<string, string>
diff --git a/lib/pelago/emogrifier/src/Css/CssDocument.php b/lib/pelago/emogrifier/src/Css/CssDocument.php
index 665da4771..a0d7628ed 100644
--- a/lib/pelago/emogrifier/src/Css/CssDocument.php
+++ b/lib/pelago/emogrifier/src/Css/CssDocument.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Pelago\Emogrifier\Css;
 
+use Pelago\Emogrifier\Utilities\Preg;
 use Sabberworm\CSS\CSSList\AtRuleBlockList as CssAtRuleBlockList;
 use Sabberworm\CSS\CSSList\Document as SabberwormCssDocument;
 use Sabberworm\CSS\Parser as CssParser;
@@ -21,7 +22,7 @@ use Sabberworm\CSS\Settings as ParserSettings;
  *
  * @internal
  */
-class CssDocument
+final class CssDocument
 {
     /**
      * @var SabberwormCssDocument
@@ -61,7 +62,8 @@ class CssDocument
      */
     private function hasNestedAtRule(string $css): bool
     {
-        return \preg_match('/@(?:media|supports|(?:-webkit-|-moz-|-ms-|-o-)?+(keyframes|document))\\b/', $css) === 1;
+        return (new Preg())
+            ->match('/@(?:media|supports|(?:-webkit-|-moz-|-ms-|-o-)?+(keyframes|document))\\b/', $css) !== 0;
     }
 
     /**
@@ -140,7 +142,8 @@ class CssDocument
                     $allowedMediaTypes
                 );
                 $mediaTypesMatcher = \implode('|', $escapedAllowedMediaTypes);
-                $isAllowed = \preg_match('/^\\s*+(?:only\\s++)?+(?:' . $mediaTypesMatcher . ')/i', $mediaType) > 0;
+                $isAllowed
+                    = (new Preg())->match('/^\\s*+(?:only\\s++)?+(?:' . $mediaTypesMatcher . ')/i', $mediaType) !== 0;
             } else {
                 $isAllowed = true;
             }
diff --git a/lib/pelago/emogrifier/src/Css/StyleRule.php b/lib/pelago/emogrifier/src/Css/StyleRule.php
index f2a20f86e..506e5b43d 100644
--- a/lib/pelago/emogrifier/src/Css/StyleRule.php
+++ b/lib/pelago/emogrifier/src/Css/StyleRule.php
@@ -12,7 +12,7 @@ use Sabberworm\CSS\RuleSet\DeclarationBlock;
  *
  * @internal
  */
-class StyleRule
+final class StyleRule
 {
     /**
      * @var DeclarationBlock
@@ -43,7 +43,7 @@ class StyleRule
         $selectors = $this->declarationBlock->getSelectors();
         return \array_map(
             static function (Selector $selector): string {
-                return (string)$selector;
+                return (string) $selector;
             },
             $selectors
         );
diff --git a/lib/pelago/emogrifier/src/CssInliner.php b/lib/pelago/emogrifier/src/CssInliner.php
index 9f14edbba..19347b500 100644
--- a/lib/pelago/emogrifier/src/CssInliner.php
+++ b/lib/pelago/emogrifier/src/CssInliner.php
@@ -7,13 +7,15 @@ namespace Pelago\Emogrifier;
 use Pelago\Emogrifier\Css\CssDocument;
 use Pelago\Emogrifier\HtmlProcessor\AbstractHtmlProcessor;
 use Pelago\Emogrifier\Utilities\CssConcatenator;
+use Pelago\Emogrifier\Utilities\DeclarationBlockParser;
+use Pelago\Emogrifier\Utilities\Preg;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\CssSelector\Exception\ParseException;
 
 /**
  * This class provides functions for converting CSS styles into inline style attributes in your HTML code.
  */
-class CssInliner extends AbstractHtmlProcessor
+final class CssInliner extends AbstractHtmlProcessor
 {
     /**
      * @var int
@@ -23,12 +25,7 @@ class CssInliner extends AbstractHtmlProcessor
     /**
      * @var int
      */
-    private const CACHE_KEY_CSS_DECLARATIONS_BLOCK = 1;
-
-    /**
-     * @var int
-     */
-    private const CACHE_KEY_COMBINED_STYLES = 2;
+    private const CACHE_KEY_COMBINED_STYLES = 1;
 
     /**
      * Regular expression component matching a static pseudo class in a selector, without the preceding ":",
@@ -39,7 +36,7 @@ class CssInliner extends AbstractHtmlProcessor
      * @var string
      */
     private const PSEUDO_CLASS_MATCHER
-        = 'empty|(?:first|last|nth(?:-last)?+|only)-(?:child|of-type)|not\\([[:ascii:]]*\\)';
+        = 'empty|(?:first|last|nth(?:-last)?+|only)-(?:child|of-type)|not\\([[:ascii:]]*\\)|root';
 
     /**
      * This regular expression componenet matches an `...of-type` pseudo class name, without the preceding ":".  These
@@ -56,11 +53,23 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private const COMBINATOR_MATCHER = '(?:\\s++|\\s*+[>+~]\\s*+)(?=[[:alpha:]_\\-.#*:\\[])';
 
+    /**
+     * options array key for `querySelectorAll`
+     *
+     * @var string
+     */
+    private const QSA_ALWAYS_THROW_PARSE_EXCEPTION = 'alwaysThrowParseException';
+
     /**
      * @var array<string, bool>
      */
     private $excludedSelectors = [];
 
+    /**
+     * @var array<non-empty-string, bool>
+     */
+    private $excludedCssSelectors = [];
+
     /**
      * @var array<string, bool>
      */
@@ -69,13 +78,11 @@ class CssInliner extends AbstractHtmlProcessor
     /**
      * @var array{
      *         0: array<string, int>,
-     *         1: array<string, array<string, string>>,
-     *         2: array<string, string>
+     *         1: array<string, string>
      *      }
      */
     private $caches = [
         self::CACHE_KEY_SELECTOR => [],
-        self::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
         self::CACHE_KEY_COMBINED_STYLES => [],
     ];
 
@@ -164,7 +171,11 @@ class CssInliner extends AbstractHtmlProcessor
      * @return $this
      *
      * @throws ParseException in debug mode, if an invalid selector is encountered
-     * @throws \RuntimeException in debug mode, if an internal PCRE error occurs
+     * @throws \RuntimeException
+     *         in debug mode, if an internal PCRE error occurs
+     *         or `CssSelectorConverter::toXPath` returns an invalid XPath expression
+     * @throws \UnexpectedValueException
+     *         if a selector query result includes a node which is not a `DOMElement`
      */
     public function inlineCss(string $css = ''): self
     {
@@ -183,23 +194,12 @@ class CssInliner extends AbstractHtmlProcessor
 
         $excludedNodes = $this->getNodesToExclude();
         $cssRules = $this->collateCssRules($parsedCss);
-        $cssSelectorConverter = $this->getCssSelectorConverter();
         foreach ($cssRules['inlinable'] as $cssRule) {
-            try {
-                $nodesMatchingCssSelectors = $this->getXPath()
-                    ->query($cssSelectorConverter->toXPath($cssRule['selector']));
-
-                /** @var \DOMElement $node */
-                foreach ($nodesMatchingCssSelectors as $node) {
-                    if (\in_array($node, $excludedNodes, true)) {
-                        continue;
-                    }
-                    $this->copyInlinableCssToStyleAttribute($node, $cssRule);
-                }
-            } catch (ParseException $e) {
-                if ($this->debug) {
-                    throw $e;
+            foreach ($this->querySelectorAll($cssRule['selector']) as $node) {
+                if (\in_array($node, $excludedNodes, true)) {
+                    continue;
                 }
+                $this->copyInlinableCssToStyleAttribute($this->ensureNodeIsElement($node), $cssRule);
             }
         }
 
@@ -301,6 +301,36 @@ class CssInliner extends AbstractHtmlProcessor
         return $this;
     }
 
+    /**
+     * Adds a selector to exclude CSS selector from emogrification.
+     *
+     * @param non-empty-string $selector the selector to exclude, e.g., `.editor`
+     *
+     * @return $this
+     */
+    public function addExcludedCssSelector(string $selector): self
+    {
+        $this->excludedCssSelectors[$selector] = true;
+
+        return $this;
+    }
+
+    /**
+     * No longer excludes the CSS selector from emogrification.
+     *
+     * @param non-empty-string $selector the selector to no longer exclude, e.g., `.editor`
+     *
+     * @return $this
+     */
+    public function removeExcludedCssSelector(string $selector): self
+    {
+        if (isset($this->excludedCssSelectors[$selector])) {
+            unset($this->excludedCssSelectors[$selector]);
+        }
+
+        return $this;
+    }
+
     /**
      * Sets the debug mode.
      *
@@ -357,7 +387,6 @@ class CssInliner extends AbstractHtmlProcessor
     {
         $this->caches = [
             self::CACHE_KEY_SELECTOR => [],
-            self::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
             self::CACHE_KEY_COMBINED_STYLES => [],
         ];
     }
@@ -417,11 +446,13 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function normalizeStyleAttributes(\DOMElement $node): void
     {
-        $normalizedOriginalStyle = \preg_replace_callback(
-            '/-?+[_a-zA-Z][\\w\\-]*+(?=:)/S',
+        $declarationBlockParser = new DeclarationBlockParser();
+
+        $normalizedOriginalStyle = (new Preg())->throwExceptions($this->debug)->replaceCallback(
+            '/-{0,2}+[_a-zA-Z][\\w\\-]*+(?=:)/S',
             /** @param array<array-key, string> $propertyNameMatches */
-            static function (array $propertyNameMatches): string {
-                return \strtolower($propertyNameMatches[0]);
+            static function (array $propertyNameMatches) use ($declarationBlockParser): string {
+                return $declarationBlockParser->normalizePropertyName($propertyNameMatches[0]);
             },
             $node->getAttribute('style')
         );
@@ -429,55 +460,13 @@ class CssInliner extends AbstractHtmlProcessor
         // In order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles.
         $nodePath = $node->getNodePath();
         if (\is_string($nodePath) && !isset($this->styleAttributesForNodes[$nodePath])) {
-            $this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationsBlock($normalizedOriginalStyle);
+            $this->styleAttributesForNodes[$nodePath] = $declarationBlockParser->parse($normalizedOriginalStyle);
             $this->visitedNodes[$nodePath] = $node;
         }
 
         $node->setAttribute('style', $normalizedOriginalStyle);
     }
 
-    /**
-     * Parses a CSS declaration block into property name/value pairs.
-     *
-     * Example:
-     *
-     * The declaration block
-     *
-     *   "color: #000; font-weight: bold;"
-     *
-     * will be parsed into the following array:
-     *
-     *   "color" => "#000"
-     *   "font-weight" => "bold"
-     *
-     * @param string $cssDeclarationsBlock the CSS declarations block without the curly braces, may be empty
-     *
-     * @return array<string, string>
-     *         the CSS declarations with the property names as array keys and the property values as array values
-     */
-    private function parseCssDeclarationsBlock(string $cssDeclarationsBlock): array
-    {
-        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
-            return $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
-        }
-
-        $properties = [];
-        foreach (\preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock) as $declaration) {
-            /** @var list<string> $matches */
-            $matches = [];
-            if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
-                continue;
-            }
-
-            $propertyName = \strtolower($matches[1]);
-            $propertyValue = $matches[2];
-            $properties[$propertyName] = $propertyValue;
-        }
-        $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
-
-        return $properties;
-    }
-
     /**
      * Returns CSS content.
      *
@@ -509,34 +498,74 @@ class CssInliner extends AbstractHtmlProcessor
      *
      * @return list<\DOMElement>
      *
-     * @throws ParseException
-     * @throws \UnexpectedValueException
+     * @throws ParseException in debug mode, if an invalid selector is encountered
+     * @throws \RuntimeException in debug mode, if `CssSelectorConverter::toXPath` returns an invalid XPath expression
+     * @throws \UnexpectedValueException if the selector query result includes a node which is not a `DOMElement`
      */
     private function getNodesToExclude(): array
     {
         $excludedNodes = [];
         foreach (\array_keys($this->excludedSelectors) as $selectorToExclude) {
-            try {
-                $matchingNodes = $this->getXPath()
-                    ->query($this->getCssSelectorConverter()->toXPath($selectorToExclude));
-
-                foreach ($matchingNodes as $node) {
-                    if (!$node instanceof \DOMElement) {
-                        $path = $node->getNodePath() ?? '$node';
-                        throw new \UnexpectedValueException($path . ' is not a DOMElement.', 1617975914);
-                    }
-                    $excludedNodes[] = $node;
-                }
-            } catch (ParseException $e) {
-                if ($this->debug) {
-                    throw $e;
-                }
+            foreach ($this->querySelectorAll($selectorToExclude) as $node) {
+                $excludedNodes[] = $this->ensureNodeIsElement($node);
             }
         }
 
         return $excludedNodes;
     }
 
+    /**
+     * @param array{}|array{alwaysThrowParseException: bool} $options
+     *        This is an array of option values to control behaviour:
+     *        - `QSA_ALWAYS_THROW_PARSE_EXCEPTION` - `bool` - throw any `ParseException` regardless of debug setting.
+     *
+     * @return \DOMNodeList<\DOMNode> the HTML elements that match the provided CSS `$selectors`
+     *
+     * @throws ParseException
+     *         in debug mode (or with `QSA_ALWAYS_THROW_PARSE_EXCEPTION` option), if an invalid selector is encountered
+     * @throws \RuntimeException in debug mode, if `CssSelectorConverter::toXPath` returns an invalid XPath expression
+     */
+    private function querySelectorAll(string $selectors, array $options = []): \DOMNodeList
+    {
+        try {
+            $result = $this->getXPath()->query($this->getCssSelectorConverter()->toXPath($selectors));
+
+            if ($result === false) {
+                throw new \RuntimeException('query failed with selector \'' . $selectors . '\'', 1726533051);
+            }
+
+            return $result;
+        } catch (ParseException $exception) {
+            $alwaysThrowParseException = $options[self::QSA_ALWAYS_THROW_PARSE_EXCEPTION] ?? false;
+            if ($this->debug || $alwaysThrowParseException) {
+                throw $exception;
+            }
+            return new \DOMNodeList();
+        } catch (\RuntimeException $exception) {
+            if (
+                $this->debug
+            ) {
+                throw $exception;
+            }
+            // `RuntimeException` indicates a bug in CssSelector so pass the message to the error handler.
+            \trigger_error($exception->getMessage());
+            return new \DOMNodeList();
+        }
+    }
+
+    /**
+     * @throws \UnexpectedValueException if `$node` is not a `DOMElement`
+     */
+    private function ensureNodeIsElement(\DOMNode $node): \DOMElement
+    {
+        if (!$node instanceof \DOMElement) {
+            $path = $node->getNodePath() ?? '$node';
+            throw new \UnexpectedValueException($path . ' is not a DOMElement.', 1617975914);
+        }
+
+        return $node;
+    }
+
     /**
      * @return CssSelectorConverter
      */
@@ -577,6 +606,7 @@ class CssInliner extends AbstractHtmlProcessor
     {
         $matches = $parsedCss->getStyleRulesData(\array_keys($this->allowedMediaTypes));
 
+        $preg = (new Preg())->throwExceptions($this->debug);
         $cssRules = [
             'inlinable' => [],
             'uninlinable' => [],
@@ -588,7 +618,21 @@ class CssInliner extends AbstractHtmlProcessor
 
             $mediaQuery = $cssRule->getContainingAtRule();
             $declarationsBlock = $cssRule->getDeclarationAsText();
-            foreach ($cssRule->getSelectors() as $selector) {
+            $selectors = $cssRule->getSelectors();
+
+            // Maybe exclude CSS selectors
+            if (\count($this->excludedCssSelectors) > 0) {
+                // Normalize spaces, line breaks & tabs
+                $selectorsNormalized = \array_map(static function (string $selector) use ($preg): string {
+                    return $preg->replace('@\\s++@u', ' ', $selector);
+                }, $selectors);
+
+                $selectors = \array_filter($selectorsNormalized, function (string $selector): bool {
+                    return !isset($this->excludedCssSelectors[$selector]);
+                });
+            }
+
+            foreach ($selectors as $selector) {
                 // don't process pseudo-elements and behavioral (dynamic) pseudo-classes;
                 // only allow structural pseudo-classes
                 $hasPseudoElement = \strpos($selector, '::') !== false;
@@ -634,15 +678,17 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function hasUnsupportedPseudoClass(string $selector): bool
     {
-        if (\preg_match('/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i', $selector)) {
+        $preg = (new Preg())->throwExceptions($this->debug);
+
+        if ($preg->match('/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i', $selector) !== 0) {
             return true;
         }
 
-        if (!\preg_match('/:(?:' . self::OF_TYPE_PSEUDO_CLASS_MATCHER . ')/i', $selector)) {
+        if ($preg->match('/:(?:' . self::OF_TYPE_PSEUDO_CLASS_MATCHER . ')/i', $selector) === 0) {
             return false;
         }
 
-        foreach (\preg_split('/' . self::COMBINATOR_MATCHER . '/', $selector) as $selectorPart) {
+        foreach ($preg->split('/' . self::COMBINATOR_MATCHER . '/', $selector) as $selectorPart) {
             if ($this->selectorPartHasUnsupportedOfTypePseudoClass($selectorPart)) {
                 return true;
             }
@@ -661,11 +707,13 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function selectorPartHasUnsupportedOfTypePseudoClass(string $selectorPart): bool
     {
-        if (\preg_match('/^[\\w\\-]/', $selectorPart)) {
+        $preg = (new Preg())->throwExceptions($this->debug);
+
+        if ($preg->match('/^[\\w\\-]/', $selectorPart) !== 0) {
             return false;
         }
 
-        return (bool)\preg_match('/:(?:' . self::OF_TYPE_PSEUDO_CLASS_MATCHER . ')/i', $selectorPart);
+        return $preg->match('/:(?:' . self::OF_TYPE_PSEUDO_CLASS_MATCHER . ')/i', $selectorPart) !== 0;
     }
 
     /**
@@ -693,19 +741,20 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function getCssSelectorPrecedence(string $selector): int
     {
-        $selectorKey = \md5($selector);
+        $selectorKey = $selector;
         if (isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
             return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
         }
 
+        $preg = (new Preg())->throwExceptions($this->debug);
         $precedence = 0;
         foreach ($this->selectorPrecedenceMatchers as $matcher => $value) {
             if (\trim($selector) === '') {
                 break;
             }
-            $number = 0;
-            $selector = \preg_replace('/' . $matcher . '\\w+/', '', $selector, -1, $number);
-            $precedence += ($value * (int)$number);
+            $count = 0;
+            $selector = $preg->replace('/' . $matcher . '\\w+/', '', $selector, -1, $count);
+            $precedence += ($value * $count);
         }
         $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
 
@@ -729,7 +778,8 @@ class CssInliner extends AbstractHtmlProcessor
     private function copyInlinableCssToStyleAttribute(\DOMElement $node, array $cssRule): void
     {
         $declarationsBlock = $cssRule['declarationsBlock'];
-        $newStyleDeclarations = $this->parseCssDeclarationsBlock($declarationsBlock);
+        $declarationBlockParser = new DeclarationBlockParser();
+        $newStyleDeclarations = $declarationBlockParser->parse($declarationsBlock);
         if ($newStyleDeclarations === []) {
             return;
         }
@@ -737,7 +787,7 @@ class CssInliner extends AbstractHtmlProcessor
         // if it has a style attribute, get it, process it, and append (overwrite) new stuff
         if ($node->hasAttribute('style')) {
             // break it up into an associative array
-            $oldStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+            $oldStyleDeclarations = $declarationBlockParser->parse($node->getAttribute('style'));
         } else {
             $oldStyleDeclarations = [];
         }
@@ -757,6 +807,8 @@ class CssInliner extends AbstractHtmlProcessor
      * @param array<string, string> $newStyles
      *
      * @return string
+     *
+     * @throws \UnexpectedValueException if an empty property name is encountered (which should not happen)
      */
     private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles): string
     {
@@ -784,9 +836,16 @@ class CssInliner extends AbstractHtmlProcessor
 
         $combinedStyles = \array_merge($oldStyles, $newStyles);
 
+        $declarationBlockParser = new DeclarationBlockParser();
         $style = '';
         foreach ($combinedStyles as $attributeName => $attributeValue) {
-            $style .= \strtolower(\trim($attributeName)) . ': ' . \trim($attributeValue) . '; ';
+            $trimmedAttributeName = \trim($attributeName);
+            if ($trimmedAttributeName === '') {
+                throw new \UnexpectedValueException('An empty property name was encountered.', 1727046078);
+            }
+            $propertyName = $declarationBlockParser->normalizePropertyName($trimmedAttributeName);
+            $propertyValue = \trim($attributeValue);
+            $style .= $propertyName . ': ' . $propertyValue . '; ';
         }
         $trimmedStyle = \rtrim($style);
 
@@ -804,7 +863,7 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function attributeValueIsImportant(string $attributeValue): bool
     {
-        return (bool)\preg_match('/!\\s*+important$/i', $attributeValue);
+        return (new Preg())->throwExceptions($this->debug)->match('/!\\s*+important$/i', $attributeValue) !== 0;
     }
 
     /**
@@ -812,9 +871,10 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function fillStyleAttributesWithMergedStyles(): void
     {
+        $declarationBlockParser = new DeclarationBlockParser();
         foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
             $node = $this->visitedNodes[$nodePath];
-            $currentStyleAttributes = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+            $currentStyleAttributes = $declarationBlockParser->parse($node->getAttribute('style'));
             $node->setAttribute(
                 'style',
                 $this->generateStyleStringFromDeclarationsArrays(
@@ -853,14 +913,16 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function removeImportantAnnotationFromNodeInlineStyle(\DOMElement $node): void
     {
-        $inlineStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+        $style = $node->getAttribute('style');
+        $inlineStyleDeclarations = (new DeclarationBlockParser())->parse((bool) $style ? $style : '');
         /** @var array<string, string> $regularStyleDeclarations */
         $regularStyleDeclarations = [];
         /** @var array<string, string> $importantStyleDeclarations */
         $importantStyleDeclarations = [];
         foreach ($inlineStyleDeclarations as $property => $value) {
             if ($this->attributeValueIsImportant($value)) {
-                $importantStyleDeclarations[$property] = $this->pregReplace('/\\s*+!\\s*+important$/i', '', $value);
+                $importantStyleDeclarations[$property]
+                    = (new Preg())->throwExceptions($this->debug)->replace('/\\s*+!\\s*+important$/i', '', $value);
             } else {
                 $regularStyleDeclarations[$property] = $value;
             }
@@ -944,12 +1006,14 @@ class CssInliner extends AbstractHtmlProcessor
      *
      * @return bool
      *
-     * @throws ParseException
+     * @throws ParseException in debug mode, if an invalid selector is encountered
+     * @throws \RuntimeException in debug mode, if `CssSelectorConverter::toXPath` returns an invalid XPath expression
      */
     private function existsMatchForCssSelector(string $cssSelector): bool
     {
         try {
-            $nodesMatchingSelector = $this->getXPath()->query($this->getCssSelectorConverter()->toXPath($cssSelector));
+            $nodesMatchingSelector
+                = $this->querySelectorAll($cssSelector, [self::QSA_ALWAYS_THROW_PARSE_EXCEPTION => true]);
         } catch (ParseException $e) {
             if ($this->debug) {
                 throw $e;
@@ -957,7 +1021,7 @@ class CssInliner extends AbstractHtmlProcessor
             return true;
         }
 
-        return $nodesMatchingSelector !== false && $nodesMatchingSelector->length !== 0;
+        return $nodesMatchingSelector->length !== 0;
     }
 
     /**
@@ -972,9 +1036,11 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function removeUnmatchablePseudoComponents(string $selector): string
     {
+        $preg = (new Preg())->throwExceptions($this->debug);
+
         // The regex allows nested brackets via `(?2)`.
         // A space is temporarily prepended because the callback can't determine if the match was at the very start.
-        $selectorWithoutNots = \ltrim(\preg_replace_callback(
+        $selectorWithoutNots = \ltrim((new Preg())->throwExceptions($this->debug)->replaceCallback(
             '/([\\s>+~]?+):not(\\([^()]*+(?:(?2)[^()]*+)*+\\))/i',
             /** @param array<array-key, string> $matches */
             function (array $matches): string {
@@ -989,10 +1055,11 @@ class CssInliner extends AbstractHtmlProcessor
         );
 
         if (
-            !\preg_match(
+            $preg->match(
                 '/:(?:' . self::OF_TYPE_PSEUDO_CLASS_MATCHER . ')/i',
                 $selectorWithoutUnmatchablePseudoComponents
             )
+            === 0
         ) {
             return $selectorWithoutUnmatchablePseudoComponents;
         }
@@ -1000,7 +1067,7 @@ class CssInliner extends AbstractHtmlProcessor
             function (string $selectorPart): string {
                 return $this->removeUnsupportedOfTypePseudoClasses($selectorPart);
             },
-            \preg_split(
+            $preg->split(
                 '/(' . self::COMBINATOR_MATCHER . ')/',
                 $selectorWithoutUnmatchablePseudoComponents,
                 -1,
@@ -1041,7 +1108,7 @@ class CssInliner extends AbstractHtmlProcessor
      */
     private function removeSelectorComponents(string $matcher, string $selector): string
     {
-        return \preg_replace(
+        return (new Preg())->throwExceptions($this->debug)->replace(
             ['/([\\s>+~]|^)' . $matcher . '/i', '/' . $matcher . '/i'],
             ['$1*', ''],
             $selector
@@ -1141,58 +1208,4 @@ class CssInliner extends AbstractHtmlProcessor
 
         return $node;
     }
-
-    /**
-     * Wraps `preg_replace`.  If an error occurs (which is highly unlikely), either it is logged and the original
-     * `$subject` is returned, or in debug mode an exception is thrown.
-     *
-     * This method only supports strings, not arrays of strings.
-     *
-     * @param non-empty-string $pattern
-     * @param string $replacement
-     * @param string $subject
-     *
-     * @return string
-     *
-     * @throws \RuntimeException
-     */
-    private function pregReplace(string $pattern, string $replacement, string $subject): string
-    {
-        $result = \preg_replace($pattern, $replacement, $subject);
-
-        if (!\is_string($result)) {
-            $this->logOrThrowPregLastError();
-            $result = $subject;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Obtains the name of the error constant for `preg_last_error` (based on code posted at
-     * {@see https://www.php.net/manual/en/function.preg-last-error.php#124124}) and puts it into an error message
-     * which is either passed to `trigger_error` (in non-debug mode) or an exception which is thrown (in debug mode).
-     *
-     * @throws \RuntimeException
-     */
-    private function logOrThrowPregLastError(): void
-    {
-        $pcreConstants = \get_defined_constants(true)['pcre'];
-        $pcreErrorConstantNames = \array_flip(\array_filter(
-            $pcreConstants,
-            static function (string $key): bool {
-                return \substr($key, -6) === '_ERROR';
-            },
-            ARRAY_FILTER_USE_KEY
-        ));
-
-        $pregLastError = \preg_last_error();
-        $message = 'PCRE regex execution error `' . (string)($pcreErrorConstantNames[$pregLastError] ?? $pregLastError)
-            . '`';
-
-        if ($this->debug) {
-            throw new \RuntimeException($message, 1592870147);
-        }
-        \trigger_error($message);
-    }
 }
diff --git a/lib/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php b/lib/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php
index c63f7c5e7..9c6eb6f93 100644
--- a/lib/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php
+++ b/lib/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace Pelago\Emogrifier\HtmlProcessor;
 
+use Pelago\Emogrifier\Utilities\Preg;
+
 /**
  * Base class for HTML processor that e.g., can remove, add or modify nodes or attributes.
  *
  * The "vanilla" subclass is the HtmlNormalizer.
- *
- * @psalm-consistent-constructor
  */
 abstract class AbstractHtmlProcessor
 {
@@ -71,9 +71,7 @@ abstract class AbstractHtmlProcessor
      *
      * Please use `::fromHtml` or `::fromDomDocument` instead.
      */
-    private function __construct()
-    {
-    }
+    private function __construct() {}
 
     /**
      * Builds a new instance from the given HTML.
@@ -184,7 +182,7 @@ abstract class AbstractHtmlProcessor
         $htmlWithPossibleErroneousClosingTags = $this->getDomDocument()->saveHTML($this->getBodyElement());
         $bodyNodeHtml = $this->removeSelfClosingTagsClosingTags($htmlWithPossibleErroneousClosingTags);
 
-        return \preg_replace('%</?+body(?:\\s[^>]*+)?+>%', '', $bodyNodeHtml);
+        return (new Preg())->replace('%</?+body(?:\\s[^>]*+)?+>%', '', $bodyNodeHtml);
     }
 
     /**
@@ -196,7 +194,24 @@ abstract class AbstractHtmlProcessor
      */
     private function removeSelfClosingTagsClosingTags(string $html): string
     {
-        return \preg_replace('%</' . self::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '>%', '', $html);
+        return (new Preg())->replace('%</' . self::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '>%', '', $html);
+    }
+
+    /**
+     * Returns the HTML element.
+     *
+     * This method assumes that there always is an HTML element, throwing an exception otherwise.
+     *
+     * @throws \UnexpectedValueException
+     */
+    protected function getHtmlElement(): \DOMElement
+    {
+        $htmlElement = $this->getDomDocument()->getElementsByTagName('html')->item(0);
+        if (!$htmlElement instanceof \DOMElement) {
+            throw new \UnexpectedValueException('There is no HTML element although there should be one.', 1569930853);
+        }
+
+        return $htmlElement;
     }
 
     /**
@@ -292,7 +307,7 @@ abstract class AbstractHtmlProcessor
     private function normalizeDocumentType(string $html): string
     {
         // Limit to replacing the first occurrence: as an optimization; and in case an example exists as unescaped text.
-        return \preg_replace(
+        return (new Preg())->replace(
             '/<!DOCTYPE\\s++html(?=[\\s>])/i',
             '<!DOCTYPE html',
             $html,
@@ -317,17 +332,17 @@ abstract class AbstractHtmlProcessor
 
         // We are trying to insert the meta tag to the right spot in the DOM.
         // If we just prepended it to the HTML, we would lose attributes set to the HTML tag.
-        $hasHeadTag = \preg_match('/<head[\\s>]/i', $html);
+        $hasHeadTag = (new Preg())->match('/<head[\\s>]/i', $html) !== 0;
         $hasHtmlTag = \stripos($html, '<html') !== false;
 
         if ($hasHeadTag) {
-            $reworkedHtml = \preg_replace(
+            $reworkedHtml = (new Preg())->replace(
                 '/<head(?=[\\s>])([^>]*+)>/i',
                 '<head$1>' . self::CONTENT_TYPE_META_TAG,
                 $html
             );
         } elseif ($hasHtmlTag) {
-            $reworkedHtml = \preg_replace(
+            $reworkedHtml = (new Preg())->replace(
                 '/<html(.*?)>/is',
                 '<html$1><head>' . self::CONTENT_TYPE_META_TAG . '</head>',
                 $html
@@ -350,7 +365,11 @@ abstract class AbstractHtmlProcessor
      */
     private function hasContentTypeMetaTagInHead(string $html): bool
     {
-        \preg_match('%^.*?(?=<meta(?=\\s)[^>]*\\shttp-equiv=(["\']?+)Content-Type\\g{-1}[\\s/>])%is', $html, $matches);
+        (new Preg())->match(
+            '%^.*?(?=<meta(?=\\s)[^>]*\\shttp-equiv=(["\']?+)Content-Type\\g{-1}[\\s/>])%is',
+            $html,
+            $matches
+        );
         if (isset($matches[0])) {
             $htmlBefore = $matches[0];
             try {
@@ -380,9 +399,10 @@ abstract class AbstractHtmlProcessor
      */
     private function hasEndOfHeadElement(string $html): bool
     {
-        $headEndTagMatchCount
-            = \preg_match('%<(?!' . self::TAGNAME_ALLOWED_BEFORE_BODY_MATCHER . '[\\s/>])\\w|</head>%i', $html);
-        if (\is_int($headEndTagMatchCount) && $headEndTagMatchCount > 0) {
+        if (
+            (new Preg())->match('%<(?!' . self::TAGNAME_ALLOWED_BEFORE_BODY_MATCHER . '[\\s/>])\\w|</head>%i', $html)
+            !== 0
+        ) {
             // An exception to the implicit end of the `<head>` is any content within a `<template>` element, as well in
             // comments.  As an optimization, this is only checked for if a potential `<head>` end tag is found.
             $htmlWithoutCommentsOrTemplates = $this->removeHtmlTemplateElements($this->removeHtmlComments($html));
@@ -407,12 +427,7 @@ abstract class AbstractHtmlProcessor
      */
     private function removeHtmlComments(string $html): string
     {
-        $result = \preg_replace(self::HTML_COMMENT_PATTERN, '', $html);
-        if (!\is_string($result)) {
-            throw new \RuntimeException('Internal PCRE error', 1616521475);
-        }
-
-        return $result;
+        return (new Preg())->throwExceptions(true)->replace(self::HTML_COMMENT_PATTERN, '', $html);
     }
 
     /**
@@ -427,12 +442,7 @@ abstract class AbstractHtmlProcessor
      */
     private function removeHtmlTemplateElements(string $html): string
     {
-        $result = \preg_replace(self::HTML_TEMPLATE_ELEMENT_PATTERN, '', $html);
-        if (!\is_string($result)) {
-            throw new \RuntimeException('Internal PCRE error', 1616519652);
-        }
-
-        return $result;
+        return (new Preg())->throwExceptions(true)->replace(self::HTML_TEMPLATE_ELEMENT_PATTERN, '', $html);
     }
 
     /**
@@ -445,7 +455,7 @@ abstract class AbstractHtmlProcessor
      */
     private function ensurePhpUnrecognizedSelfClosingTagsAreXml(string $html): string
     {
-        return \preg_replace(
+        return (new Preg())->replace(
             '%<' . self::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '\\b[^>]*+(?<!/)(?=>)%',
             '$0/',
             $html
@@ -463,10 +473,6 @@ abstract class AbstractHtmlProcessor
             return;
         }
 
-        $htmlElement = $this->getDomDocument()->getElementsByTagName('html')->item(0);
-        if (!$htmlElement instanceof \DOMElement) {
-            throw new \UnexpectedValueException('There is no HTML element although there should be one.', 1569930853);
-        }
-        $htmlElement->appendChild($this->getDomDocument()->createElement('body'));
+        $this->getHtmlElement()->appendChild($this->getDomDocument()->createElement('body'));
     }
 }
diff --git a/lib/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php b/lib/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php
index ca8e7cf54..32a06b3ae 100644
--- a/lib/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php
+++ b/lib/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php
@@ -4,6 +4,9 @@ declare(strict_types=1);
 
 namespace Pelago\Emogrifier\HtmlProcessor;
 
+use Pelago\Emogrifier\Utilities\DeclarationBlockParser;
+use Pelago\Emogrifier\Utilities\Preg;
+
 /**
  * This HtmlProcessor can convert style HTML attributes to the corresponding other visual HTML attributes,
  * e.g. it converts style="width: 100px" to width="100".
@@ -12,12 +15,12 @@ namespace Pelago\Emogrifier\HtmlProcessor;
  *
  * To trigger the conversion, call the convertCssToVisualAttributes method.
  */
-class CssToAttributeConverter extends AbstractHtmlProcessor
+final class CssToAttributeConverter extends AbstractHtmlProcessor
 {
     /**
      * This multi-level array contains simple mappings of CSS properties to
      * HTML attributes. If a mapping only applies to certain HTML nodes or
-     * only for certain values, the mapping is an object with a whitelist
+     * only for certain values, the mapping is an object with an allowlist
      * of nodes and values.
      *
      * @var array<string, array{attribute: string, nodes?: array<int, string>, values?: array<int, string>}>
@@ -42,11 +45,6 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
         ],
     ];
 
-    /**
-     * @var array<string, array<string, string>>
-     */
-    private static $parsedCssCache = [];
-
     /**
      * Maps the CSS from the style nodes to visual HTML attributes.
      *
@@ -54,9 +52,10 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
      */
     public function convertCssToVisualAttributes(): self
     {
+        $declarationBlockParser = new DeclarationBlockParser();
         /** @var \DOMElement $node */
         foreach ($this->getAllNodesWithStyleAttribute() as $node) {
-            $inlineStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+            $inlineStyleDeclarations = $declarationBlockParser->parse($node->getAttribute('style'));
             $this->mapCssToHtmlAttributes($inlineStyleDeclarations, $node);
         }
 
@@ -73,48 +72,6 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
         return $this->getXPath()->query('//*[@style]');
     }
 
-    /**
-     * Parses a CSS declaration block into property name/value pairs.
-     *
-     * Example:
-     *
-     * The declaration block
-     *
-     *   "color: #000; font-weight: bold;"
-     *
-     * will be parsed into the following array:
-     *
-     *   "color" => "#000"
-     *   "font-weight" => "bold"
-     *
-     * @param string $cssDeclarationsBlock the CSS declarations block without the curly braces, may be empty
-     *
-     * @return array<string, string>
-     *         the CSS declarations with the property names as array keys and the property values as array values
-     */
-    private function parseCssDeclarationsBlock(string $cssDeclarationsBlock): array
-    {
-        if (isset(self::$parsedCssCache[$cssDeclarationsBlock])) {
-            return self::$parsedCssCache[$cssDeclarationsBlock];
-        }
-
-        $properties = [];
-        foreach (\preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock) as $declaration) {
-            /** @var array<int, string> $matches */
-            $matches = [];
-            if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
-                continue;
-            }
-
-            $propertyName = \strtolower($matches[1]);
-            $propertyValue = $matches[2];
-            $properties[$propertyName] = $propertyValue;
-        }
-        self::$parsedCssCache[$cssDeclarationsBlock] = $properties;
-
-        return $properties;
-    }
-
     /**
      * Applies $styles to $node.
      *
@@ -228,12 +185,14 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
      */
     private function mapWidthOrHeightProperty(\DOMElement $node, string $value, string $property): void
     {
+        $preg = new Preg();
+
         // only parse values in px and %, but not values like "auto"
-        if (!\preg_match('/^(\\d+)(\\.(\\d+))?(px|%)$/', $value)) {
+        if ($preg->match('/^(\\d+)(\\.(\\d+))?(px|%)$/', $value) === 0) {
             return;
         }
 
-        $number = \preg_replace('/[^0-9.%]/', '', $value);
+        $number = $preg->replace('/[^0-9.%]/', '', $value);
         $node->setAttribute($property, $number);
     }
 
@@ -289,8 +248,7 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
      */
     private function parseCssShorthandValue(string $value): array
     {
-        /** @var array<int, string> $values */
-        $values = \preg_split('/\\s+/', $value);
+        $values = (new Preg())->split('/\\s+/', $value);
 
         $css = [];
         $css['top'] = $values[0];
diff --git a/lib/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php b/lib/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php
index 8572e7b38..4cbab3381 100644
--- a/lib/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php
+++ b/lib/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php
@@ -11,6 +11,4 @@ namespace Pelago\Emogrifier\HtmlProcessor;
  * - add HEAD and BODY elements (if they are missing)
  * - reformat the HTML
  */
-class HtmlNormalizer extends AbstractHtmlProcessor
-{
-}
+final class HtmlNormalizer extends AbstractHtmlProcessor {}
diff --git a/lib/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php b/lib/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php
index 9087773b2..8fa18e9ad 100644
--- a/lib/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php
+++ b/lib/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php
@@ -6,11 +6,12 @@ namespace Pelago\Emogrifier\HtmlProcessor;
 
 use Pelago\Emogrifier\CssInliner;
 use Pelago\Emogrifier\Utilities\ArrayIntersector;
+use Pelago\Emogrifier\Utilities\Preg;
 
 /**
  * This class can remove things from HTML.
  */
-class HtmlPruner extends AbstractHtmlProcessor
+final class HtmlPruner extends AbstractHtmlProcessor
 {
     /**
      * We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only
@@ -84,9 +85,10 @@ class HtmlPruner extends AbstractHtmlProcessor
     {
         $classesToKeepIntersector = new ArrayIntersector($classesToKeep);
 
+        $preg = new Preg();
         /** @var \DOMElement $element */
         foreach ($elements as $element) {
-            $elementClasses = \preg_split('/\\s++/', \trim($element->getAttribute('class')));
+            $elementClasses = $preg->split('/\\s++/', \trim($element->getAttribute('class')));
             $elementClassesToKeep = $classesToKeepIntersector->intersectWith($elementClasses);
             if ($elementClassesToKeep !== []) {
                 $element->setAttribute('class', \implode(' ', $elementClassesToKeep));
@@ -124,9 +126,11 @@ class HtmlPruner extends AbstractHtmlProcessor
      */
     public function removeRedundantClassesAfterCssInlined(CssInliner $cssInliner): self
     {
+        $preg = new Preg();
+
         $classesToKeepAsKeys = [];
         foreach ($cssInliner->getMatchingUninlinableSelectors() as $selector) {
-            \preg_match_all('/\\.(-?+[_a-zA-Z][\\w\\-]*+)/', $selector, $matches);
+            $preg->matchAll('/\\.(-?+[_a-zA-Z][\\w\\-]*+)/', $selector, $matches);
             $classesToKeepAsKeys += \array_fill_keys($matches[1], true);
         }
 
diff --git a/lib/pelago/emogrifier/src/Utilities/ArrayIntersector.php b/lib/pelago/emogrifier/src/Utilities/ArrayIntersector.php
index 72d38ef0c..291267b1f 100644
--- a/lib/pelago/emogrifier/src/Utilities/ArrayIntersector.php
+++ b/lib/pelago/emogrifier/src/Utilities/ArrayIntersector.php
@@ -17,7 +17,7 @@ namespace Pelago\Emogrifier\Utilities;
  *
  * @internal
  */
-class ArrayIntersector
+final class ArrayIntersector
 {
     /**
      * the array with which the object was constructed, with all its keys exchanged with their associated values
diff --git a/lib/pelago/emogrifier/src/Utilities/CssConcatenator.php b/lib/pelago/emogrifier/src/Utilities/CssConcatenator.php
index 81b55cd50..889cb8cb7 100644
--- a/lib/pelago/emogrifier/src/Utilities/CssConcatenator.php
+++ b/lib/pelago/emogrifier/src/Utilities/CssConcatenator.php
@@ -37,7 +37,7 @@ namespace Pelago\Emogrifier\Utilities;
  *
  * @internal
  */
-class CssConcatenator
+final class CssConcatenator
 {
     /**
      * Array of media rules in order.  Each element is an object with the following properties:
@@ -89,7 +89,7 @@ class CssConcatenator
                 $lastDeclarationsBlockWithoutSemicolon = \rtrim(\rtrim($lastRuleBlock->declarationsBlock), ';');
                 $lastRuleBlock->declarationsBlock = $lastDeclarationsBlockWithoutSemicolon . ';' . $declarationsBlock;
             } else {
-                $mediaRule->ruleBlocks[] = (object)\compact('selectorsAsKeys', 'declarationsBlock');
+                $mediaRule->ruleBlocks[] = (object) \compact('selectorsAsKeys', 'declarationsBlock');
             }
         }
     }
@@ -121,7 +121,7 @@ class CssConcatenator
             return $lastMediaRule;
         }
 
-        $newMediaRule = (object)[
+        $newMediaRule = (object) [
             'media' => $media,
             'ruleBlocks' => [],
         ];
diff --git a/lib/psr/http-factory/composer.json b/lib/psr/http-factory/composer.json
index d1bbddeea..82a1d3266 100644
--- a/lib/psr/http-factory/composer.json
+++ b/lib/psr/http-factory/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "psr/http-factory",
-    "description": "Common interfaces for PSR-7 HTTP message factories",
+    "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
     "keywords": [
         "psr",
         "psr-7",
@@ -18,8 +18,11 @@
             "homepage": "https://www.php-fig.org/"
         }
     ],
+    "support": {
+        "source": "https://github.com/php-fig/http-factory"
+    },
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1",
         "psr/http-message": "^1.0 || ^2.0"
     },
     "autoload": {
diff --git a/lib/psr/http-factory/src/UploadedFileFactoryInterface.php b/lib/psr/http-factory/src/UploadedFileFactoryInterface.php
index 7db4e30af..d7adbf0e2 100644
--- a/lib/psr/http-factory/src/UploadedFileFactoryInterface.php
+++ b/lib/psr/http-factory/src/UploadedFileFactoryInterface.php
@@ -15,10 +15,10 @@ interface UploadedFileFactoryInterface
      *
      * @param StreamInterface $stream Underlying stream representing the
      *     uploaded file content.
-     * @param int $size in bytes
+     * @param int|null $size in bytes
      * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
+     * @param string|null $clientFilename Filename as provided by the client, if any.
+     * @param string|null $clientMediaType Media type as provided by the client, if any.
      *
      * @return UploadedFileInterface
      *
@@ -26,9 +26,9 @@ interface UploadedFileFactoryInterface
      */
     public function createUploadedFile(
         StreamInterface $stream,
-        int $size = null,
+        ?int $size = null,
         int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
     ): UploadedFileInterface;
 }
diff --git a/lib/sabberworm/php-css-parser/CHANGELOG.md b/lib/sabberworm/php-css-parser/CHANGELOG.md
index a23fd0e68..1fe4843fb 100644
--- a/lib/sabberworm/php-css-parser/CHANGELOG.md
+++ b/lib/sabberworm/php-css-parser/CHANGELOG.md
@@ -1,4 +1,175 @@
-# Revision History
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/).
+
+## x.y.z
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+## 8.9.0: New features, bug fixes and deprecations
+
+### Added
+
+- `RuleSet::removeMatchingRules()` method
+  (for the implementing classes `AtRuleSet` and `DeclarationBlock`) (#1249)
+- `RuleSet::removeAllRules()` method
+  (for the implementing classes `AtRuleSet` and `DeclarationBlock`) (#1249)
+- Add Interface `CSSElement` (#1231)
+- Methods `getLineNumber` and `getColumnNumber` which return a nullable `int`
+  for the following classes:
+  `Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
+  `Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1225, #1263)
+- `Positionable` interface for CSS items that may have a position
+  (line and perhaps column number) in the parsed CSS (#1221)
+
+### Changed
+
+- Parameters for `getAllValues()` are deconflated, so it now takes three (all
+  optional), allowing `$element` and `$ruleSearchPattern` to be specified
+  separately (#1241)
+- Implement `Positionable` in the following CSS item classes:
+  `Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
+  `Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1225)
+
+### Deprecated
+
+- Support for PHP < 7.2 is deprecated; version 9.0 will require PHP 7.2 or later
+  (#1264)
+- Passing a `string` or `null` to `RuleSet::removeRule()` is deprecated
+  (implementing classes are `AtRuleSet` and `DeclarationBlock`);
+  use `removeMatchingRules()` or `removeAllRules()` instead (#1249)
+- Passing a `Rule` to `RuleSet::getRules()` or `getRulesAssoc()` is deprecated,
+  affecting the implementing classes `AtRuleSet` and `DeclarationBlock`
+  (call e.g. `getRules($rule->getRule())` instead) (#1248)
+- Passing a string as the first argument to `getAllValues()` is deprecated;
+  the search pattern should now be passed as the second argument (#1241)
+- Passing a Boolean as the second argument to `getAllValues()` is deprecated;
+  the flag for searching in function arguments should now be passed as the third
+  argument (#1241)
+- `getLineNo()` is deprecated in these classes (use `getLineNumber()` instead):
+  `Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
+  `Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1225, #1233)
+- `Rule::getColNo()` is deprecated (use `getColumnNumber()` instead)
+  (#1225, #1233)
+- Providing zero as the line number argument to `Rule::setPosition()` is
+  deprecated (pass `null` instead if there is no line number) (#1225, #1233)
+
+### Fixed
+
+- Set line number when `RuleSet::addRule()` called with only column number set
+  (#1265)
+- Ensure first rule added with `RuleSet::addRule()` has valid position (#1262)
+
+## 8.8.0: Bug fixes and deprecations
+
+### Added
+
+- `OutputFormat` properties for space around specific list separators (#880)
+
+### Changed
+
+- Mark the `OutputFormat` constructor as `@internal` (#1131)
+- Mark `OutputFormatter` as `@internal` (#896)
+- Mark `Selector::isValid()` as `@internal` (#1037)
+- Mark parsing-related methods of most CSS elements as `@internal` (#908)
+- Mark `OutputFormat::nextLevel()` as `@internal` (#901)
+- Make all non-private properties `@internal` (#886)
+
+### Deprecated
+
+- Deprecate extending `OutputFormat` (#1131)
+- Deprecate `OutputFormat::get()` and `::set()` (#1107)
+- Deprecate support for `-webkit-calc` and `-moz-calc` (#1086)
+- Deprecate magic method forwarding from `OutputFormat` to `OutputFormatter`
+  (#894)
+- Deprecate `__toString()` (#1006)
+- Deprecate greedy calculation of selector specificity (#1018)
+- Deprecate the IE hack in `Rule` (#993, #1003)
+- `OutputFormat` properties for space around list separators as an array (#880)
+- Deprecate `OutputFormat::level()` (#870)
+
+### Fixed
+
+- Include comments for all rules in declaration block (#1169)
+- Render rules in line and column number order (#1059)
+- Create `Size` with correct types in `expandBackgroundShorthand` (#814)
+- Parse `@font-face` `src` property as comma-delimited list (#794)
+
+## 8.7.0: Add support for PHP 8.4
+
+### Added
+
+- Add support for PHP 8.4 (#675, #701, #746, #751)
+
+### Changed
+
+- Mark parsing-internal classes and methods as `@internal` (#711)
+- Block installations on unsupported higher PHP versions (#691)
+
+### Deprecated
+
+- Deprecate the expansion of shorthand properties (#719)
+- Deprecate `Parser::setCharset()` and `Parser::getCharset()` (#703)
+
+### Fixed
+
+- Fix type errors in PHP strict mode (#695)
+
+## 8.6.0
+
+### Added
+
+- Support arithmetic operators in CSS function arguments (#607)
+- Add support for inserting an item in a CSS list (#545)
+- Add support for the `dvh`, `lvh` and `svh` length units (#415)
+
+### Changed
+
+- Improve performance of Value::parseValue with many delimiters by refactoring
+  to remove `array_search()` (#413)
+
+## 8.5.2
+
+### Changed
+
+- Mark all class constants as `@internal` (#500)
+
+### Fixed
+
+- Fix undefined local variable in `CalcFunction::parse()` (#593)
+
+## 8.5.1
+
+### Fixed
+
+- Fix PHP notice caused by parsing invalid color values having less than
+  6 characters (#485)
+- Fix (regression) failure to parse at-rules with strict parsing (#456)
+
+## 8.5.0
+
+### Added
+
+- Add a method to get an import's media queries (#384)
+- Add more unit tests (#381, #382)
+
+### Fixed
+
+- Retain CSSList and Rule comments when rendering CSS (#351)
+- Replace invalid `turns` unit with `turn` (#350)
+- Also allow string values for rules (#348)
+- Fix invalid calc parsing (#169)
+- Handle scientific notation when parsing sizes (#179)
+- Fix PHP 8.1 compatibility in `ParserState::strsplit()` (#344)
 
 ## 8.4.0
 
@@ -6,7 +177,8 @@
 
 * Support for PHP 8.x
 * PHPDoc annotations
-* Allow usage of CSS variables inside color functions (by parsing them as regular functions)
+* Allow usage of CSS variables inside color functions (by parsing them as
+  regular functions)
 * Use PSR-12 code style
 * *No deprecations*
 
@@ -21,7 +193,10 @@
 * Allow a file to end after an `@import`
 * Preserve case of CSS variables as specced
 * Allow identifiers to use escapes the same way as strings
-* No longer use `eval` for the comparison in `getSelectorsBySpecificity`, in case it gets passed untrusted input (CVE-2020-13756). Also fixed in 8.3.1, 8.2.1, 8.1.1, 8.0.1, 7.0.4, 6.0.2, 5.2.1, 5.1.3, 5.0.9, 4.0.1, 3.0.1, 2.0.1, 1.0.1.
+* No longer use `eval` for the comparison in `getSelectorsBySpecificity`, in
+  case it gets passed untrusted input (CVE-2020-13756). Also fixed in 8.3.1,
+  8.2.1, 8.1.1, 8.0.1, 7.0.4, 6.0.2, 5.2.1, 5.1.3, 5.0.9, 4.0.1, 3.0.1, 2.0.1,
+  1.0.1.
 * Prevent an infinite loop when parsing invalid grid line names
 * Remove invalid unit `vm`
 * Retain rule order after expanding shorthands
@@ -33,11 +208,16 @@
 
 ## 8.3.0 (2019-02-22)
 
-* Refactor parsing logic to mostly reside in the class files whose data structure is to be parsed (this should eventually allow us to unit-test specific parts of the parsing logic individually).
-* Fix error in parsing `calc` expessions when the first operand is a negative number, thanks to @raxbg.
-* Support parsing CSS4 colors in hex notation with alpha values, thanks to @raxbg.
+* Refactor parsing logic to mostly reside in the class files whose data
+  structure is to be parsed (this should eventually allow us to unit-test
+  specific parts of the parsing logic individually).
+* Fix error in parsing `calc` expessions when the first operand is a negative
+  number, thanks to @raxbg.
+* Support parsing CSS4 colors in hex notation with alpha values, thanks to
+  @raxbg.
 * Swallow more errors in lenient mode, thanks to @raxbg.
-* Allow specifying arbitrary strings to output before and after declaration blocks, thanks to @westonruter.
+* Allow specifying arbitrary strings to output before and after declaration
+  blocks, thanks to @westonruter.
 * *No backwards-incompatible changes*
 * *No deprecations*
 
@@ -45,16 +225,20 @@
 
 * Support parsing `calc()`, thanks to @raxbg.
 * Support parsing grid-lines, again thanks to @raxbg.
-* Support parsing legacy IE filters (`progid:`) in lenient mode, thanks to @FMCorz
+* Support parsing legacy IE filters (`progid:`) in lenient mode, thanks to
+  @FMCorz
 * Performance improvements parsing large files, again thanks to @FMCorz
 * *No backwards-incompatible changes*
 * *No deprecations*
 
 ## 8.1.0 (2016-07-19)
 
-* Comments are no longer silently ignored but stored with the object with which they appear (no render support, though). Thanks to @FMCorz.
-* The IE hacks using `\0` and `\9` can now be parsed (and rendered) in lenient mode. Thanks (again) to @FMCorz.
-* Media queries with or without spaces before the query are parsed. Still no *real* parsing support, though. Sorry…
+* Comments are no longer silently ignored but stored with the object with which
+  they appear (no render support, though). Thanks to @FMCorz.
+* The IE hacks using `\0` and `\9` can now be parsed (and rendered) in lenient
+  mode. Thanks (again) to @FMCorz.
+* Media queries with or without spaces before the query are parsed. Still no
+  *real* parsing support, though. Sorry…
 * PHPUnit is now listed as a dev-dependency in composer.json.
 * *No backwards-incompatible changes*
 * *No deprecations*
@@ -66,7 +250,8 @@
 
 ### Backwards-incompatible changes
 
-* Unrecoverable parser errors throw an exception of type `Sabberworm\CSS\Parsing\SourceException` instead of `\Exception`.
+* Unrecoverable parser errors throw an exception of type
+  `Sabberworm\CSS\Parsing\SourceException` instead of `\Exception`.
 
 ## 7.0.3 (2016-04-27)
 
@@ -76,7 +261,8 @@
 
 ## 7.0.2 (2016-02-11)
 
-* 150 time performance boost thanks to @[ossinkine](https://github.com/ossinkine)
+* 150 time performance boost thanks
+  to @[ossinkine](https://github.com/ossinkine)
 * *No backwards-incompatible changes*
 * *No deprecations*
 
@@ -93,7 +279,8 @@
 
 ### Backwards-incompatible changes
 
-* The `Sabberworm\CSS\Value\String` class has been renamed to `Sabberworm\CSS\Value\CSSString`.
+* The `Sabberworm\CSS\Value\String` class has been renamed to
+  `Sabberworm\CSS\Value\CSSString`.
 
 ## 6.0.1 (2015-08-24)
 
@@ -107,22 +294,27 @@
 
 ### Deprecations
 
-* The parse() method replaces __toString with an optional argument (instance of the OutputFormat class)
+* The parse() method replaces __toString with an optional argument (instance of
+  the OutputFormat class)
 
 ## 5.2.0 (2014-06-30)
 
-* Support removing a selector from a declaration block using `$oBlock->removeSelector($mSelector)`
-* Introduce a specialized exception (Sabberworm\CSS\Parsing\OuputException) for exceptions during output rendering
+* Support removing a selector from a declaration block using
+  `$oBlock->removeSelector($mSelector)`
+* Introduce a specialized exception (Sabberworm\CSS\Parsing\OuputException) for
+  exceptions during output rendering
 
 * *No deprecations*
 
 #### Backwards-incompatible changes
 
-* Outputting a declaration block that has no selectors throws an OuputException instead of outputting an invalid ` {…}` into the CSS document.
+* Outputting a declaration block that has no selectors throws an OuputException
+  instead of outputting an invalid ` {…}` into the CSS document.
 
 ## 5.1.2 (2013-10-30)
 
-* Remove the use of consumeUntil in comment parsing. This makes it possible to parse comments such as `/** Perfectly valid **/`
+* Remove the use of consumeUntil in comment parsing. This makes it possible to
+  parse comments such as `/** Perfectly valid **/`
 * Add fr relative size unit
 * Fix some issues with HHVM
 * *No backwards-incompatible changes*
@@ -137,13 +329,15 @@
 ## 5.1.0 (2013-10-24)
 
 * Performance enhancements by Michael M Slusarz
-* More rescue entry points for lenient parsing (unexpected tokens between declaration blocks and unclosed comments)
+* More rescue entry points for lenient parsing (unexpected tokens between
+  declaration blocks and unclosed comments)
 * *No backwards-incompatible changes*
 * *No deprecations*
 
 ## 5.0.8 (2013-08-15)
 
-* Make default settings’ multibyte parsing option dependent on whether or not the mbstring extension is actually installed.
+* Make default settings’ multibyte parsing option dependent on whether or not
+  the mbstring extension is actually installed.
 * *No backwards-incompatible changes*
 * *No deprecations*
 
@@ -161,7 +355,9 @@
 
 ## 5.0.5 (2013-04-17)
 
-* Initial support for lenient parsing (setting this parser option will catch some exceptions internally and recover the parser’s state as neatly as possible).
+* Initial support for lenient parsing (setting this parser option will catch
+  some exceptions internally and recover the parser’s state as neatly as
+  possible).
 * *No backwards-incompatible changes*
 * *No deprecations*
 
@@ -198,18 +394,22 @@
 
 ### Backwards-incompatible changes
 
-* `Sabberworm\CSS\Value\Color`’s `__toString` method overrides `CSSList`’s to maybe return something other than `type(value, …)` (see above).
+* `Sabberworm\CSS\Value\Color`’s `__toString` method overrides `CSSList`’s to
+  maybe return something other than `type(value, …)` (see above).
 
 ## 4.0.0 (2013-03-19)
 
 * Support for more @-rules
-* Generic interface `Sabberworm\CSS\Property\AtRule`, implemented by all @-rule classes
+* Generic interface `Sabberworm\CSS\Property\AtRule`, implemented by all @-rule
+  classes
 * *No deprecations*
 
 ### Backwards-incompatible changes
 
 * `Sabberworm\CSS\RuleSet\AtRule` renamed to `Sabberworm\CSS\RuleSet\AtRuleSet`
-* `Sabberworm\CSS\CSSList\MediaQuery` renamed to `Sabberworm\CSS\RuleSet\CSSList\AtRuleBlockList` with differing semantics and API (which also works for other block-list-based @-rules like `@supports`).
+* `Sabberworm\CSS\CSSList\MediaQuery` renamed to
+  `Sabberworm\CSS\RuleSet\CSSList\AtRuleBlockList` with differing semantics and
+  API (which also works for other block-list-based @-rules like `@supports`).
 
 ## 3.0.0 (2013-03-06)
 
@@ -218,10 +418,18 @@
 
 ### Backwards-incompatible changes
 
-* All properties (like whether or not to use `mb_`-functions, which default charset to use and – new – whether or not to be forgiving when parsing) are now encapsulated in an instance of `Sabberworm\CSS\Settings` which can be passed as the second argument to `Sabberworm\CSS\Parser->__construct()`.
-* Specifying a charset as the second argument to `Sabberworm\CSS\Parser->__construct()` is no longer supported. Use `Sabberworm\CSS\Settings::create()->withDefaultCharset('some-charset')` instead.
-* Setting `Sabberworm\CSS\Parser->bUseMbFunctions` has no effect. Use `Sabberworm\CSS\Settings::create()->withMultibyteSupport(true/false)` instead.
-* `Sabberworm\CSS\Parser->parse()` may throw a `Sabberworm\CSS\Parsing\UnexpectedTokenException` when in strict parsing mode.
+* All properties (like whether or not to use `mb_`-functions, which default
+  charset to use and – new – whether or not to be forgiving when parsing) are
+  now encapsulated in an instance of `Sabberworm\CSS\Settings` which can be
+  passed as the second argument to `Sabberworm\CSS\Parser->__construct()`.
+* Specifying a charset as the second argument to
+  `Sabberworm\CSS\Parser->__construct()` is no longer supported. Use
+  `Sabberworm\CSS\Settings::create()->withDefaultCharset('some-charset')`
+  instead.
+* Setting `Sabberworm\CSS\Parser->bUseMbFunctions` has no effect. Use
+  `Sabberworm\CSS\Settings::create()->withMultibyteSupport(true/false)` instead.
+* `Sabberworm\CSS\Parser->parse()` may throw a
+  `Sabberworm\CSS\Parsing\UnexpectedTokenException` when in strict parsing mode.
 
 ## 2.0.0 (2013-01-29)
 
@@ -229,8 +437,13 @@
 
 ### Backwards-incompatible changes
 
-* `Sabberworm\CSS\RuleSet->getRules()` returns an index-based array instead of an associative array. Use `Sabberworm\CSS\RuleSet->getRulesAssoc()` (which eliminates duplicate rules and lets the later rule of the same name win).
-* `Sabberworm\CSS\RuleSet->removeRule()` works as it did before except when passed an instance of `Sabberworm\CSS\Rule\Rule`, in which case it would only remove the exact rule given instead of all the rules of the same type. To get the old behaviour, use `Sabberworm\CSS\RuleSet->removeRule($oRule->getRule()`;
+* `Sabberworm\CSS\RuleSet->getRules()` returns an index-based array instead of
+  an associative array. Use `Sabberworm\CSS\RuleSet->getRulesAssoc()` (which
+  eliminates duplicate rules and lets the later rule of the same name win).
+* `Sabberworm\CSS\RuleSet->removeRule()` works as it did before except when
+  passed an instance of `Sabberworm\CSS\Rule\Rule`, in which case it would only
+  remove the exact rule given instead of all the rules of the same type. To get
+  the old behaviour, use `Sabberworm\CSS\RuleSet->removeRule($oRule->getRule()`;
 
 ## 1.0
 
diff --git a/lib/sabberworm/php-css-parser/README.md b/lib/sabberworm/php-css-parser/README.md
index 66fb1c655..90428cbf8 100644
--- a/lib/sabberworm/php-css-parser/README.md
+++ b/lib/sabberworm/php-css-parser/README.md
@@ -33,7 +33,7 @@ The resulting CSS document structure can be manipulated prior to being output.
 
 #### Charset
 
-The charset option is used only if no `@charset` declaration is found in the CSS file. UTF-8 is the default, so you won’t have to create a settings object at all if you don’t intend to change that.
+The charset option will only be used if the CSS file does not contain an `@charset` declaration. UTF-8 is the default, so you won’t have to create a settings object at all if you don’t intend to change that.
 
 ```php
 $settings = \Sabberworm\CSS\Settings::create()
@@ -43,7 +43,7 @@ $parser = new \Sabberworm\CSS\Parser($css, $settings);
 
 #### Strict parsing
 
-To have the parser choke on invalid rules, supply a thusly configured `\Sabberworm\CSS\Settings` object:
+To have the parser throw an exception when encountering invalid/unknown constructs (as opposed to trying to ignore them and carry on parsing), supply a thusly configured `\Sabberworm\CSS\Settings` object:
 
 ```php
 $parser = new \Sabberworm\CSS\Parser(
@@ -52,6 +52,8 @@ $parser = new \Sabberworm\CSS\Parser(
 );
 ```
 
+Note that this will also disable a workaround for parsing the unquoted variant of the legacy IE-specific `filter` rule.
+
 #### Disable multibyte functions
 
 To achieve faster parsing, you can choose to have PHP-CSS-Parser use regular string functions instead of `mb_*` functions. This should work fine in most cases, even for UTF-8 files, as all the multibyte characters are in string literals. Still it’s not recommended using this with input you have no control over as it’s not thoroughly covered by test cases.
@@ -67,12 +69,9 @@ The resulting data structure consists mainly of five basic types: `CSSList`, `Ru
 
 #### CSSList
 
-`CSSList` represents a generic CSS container, most likely containing declaration blocks (rule sets with a selector), but it may also contain at-rules, charset declarations, etc. `CSSList` has the following concrete subtypes:
+`CSSList` represents a generic CSS container, most likely containing declaration blocks (rule sets with a selector), but it may also contain at-rules, charset declarations, etc.
 
-* `Document` – representing the root of a CSS file.
-* `MediaQuery` – represents a subsection of a `CSSList` that only applies to an output device matching the contained media query.
-
-To access the items stored in a `CSSList` – like the document you got back when calling `$parser->parse()` –, use `getContents()`, then iterate over that collection and use instanceof to check whether you’re dealing with another `CSSList`, a `RuleSet`, a `Import` or a `Charset`.
+To access the items stored in a `CSSList` – like the document you got back when calling `$parser->parse()` –, use `getContents()`, then iterate over that collection and use `instanceof` to check whether you’re dealing with another `CSSList`, a `RuleSet`, a `Import` or a `Charset`.
 
 To append a new item (selector, media query, etc.) to an existing `CSSList`, construct it using the constructor for this class and use the `append($oItem)` method.
 
@@ -80,16 +79,16 @@ To append a new item (selector, media query, etc.) to an existing `CSSList`, con
 
 `RuleSet` is a container for individual rules. The most common form of a rule set is one constrained by a selector. The following concrete subtypes exist:
 
-* `AtRuleSet` – for generic at-rules which do not match the ones specifically mentioned like `@import`, `@charset` or `@media`. A common example for this is `@font-face`.
+* `AtRuleSet` – for generic at-rules for generic at-rules which are not covered by specific classes, i.e., not `@import`, `@charset` or `@media`. A common example for this is `@font-face`.
 * `DeclarationBlock` – a `RuleSet` constrained by a `Selector`; contains an array of selector objects (comma-separated in the CSS) as well as the rules to be applied to the matching elements.
 
 Note: A `CSSList` can contain other `CSSList`s (and `Import`s as well as a `Charset`), while a `RuleSet` can only contain `Rule`s.
 
-If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)` (which accepts either a `Rule` instance or a rule name; optionally suffixed by a dash to remove all related rules).
+If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)` (which accepts either a `Rule` or a rule name; optionally suffixed by a dash to remove all related rules).
 
 #### Rule
 
-`Rule`s just have a key (the rule) and a value. These values are all instances of a `Value`.
+`Rule`s just have a string key (the rule) and a `Value`.
 
 #### Value
 
@@ -98,19 +97,21 @@ If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `g
 * `Size` – consists of a numeric `size` value and a unit.
 * `Color` – colors can be input in the form #rrggbb, #rgb or schema(val1, val2, …) but are always stored as an array of ('s' => val1, 'c' => val2, 'h' => val3, …) and output in the second form.
 * `CSSString` – this is just a wrapper for quoted strings to distinguish them from keywords; always output with double quotes.
-* `URL` – URLs in CSS; always output in URL("") notation.
+* `URL` – URLs in CSS; always output in `URL("")` notation.
 
-There is another abstract subclass of `Value`, `ValueList`. A `ValueList` represents a lists of `Value`s, separated by some separation character (mostly `,`, whitespace, or `/`). There are two types of `ValueList`s:
+There is another abstract subclass of `Value`, `ValueList`: A `ValueList` represents a lists of `Value`s, separated by some separation character (mostly `,`, whitespace, or `/`).
 
-* `RuleValueList` – The default type, used to represent all multi-valued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;` (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list and a comma-separated list).
+There are two types of `ValueList`s:
+
+* `RuleValueList` – The default type, used to represent all multivalued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;` (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list and a comma-separated list).
 * `CSSFunction` – A special kind of value that also contains a function name and where the values are the function’s arguments. Also handles equals-sign-separated argument lists like `filter: alpha(opacity=90);`.
 
 #### Convenience methods
 
-There are a few convenience methods on Document to ease finding, manipulating and deleting rules:
+There are a few convenience methods on `Document` to ease finding, manipulating and deleting rules:
 
-* `getAllDeclarationBlocks()` – does what it says; no matter how deeply nested your selectors are. Aliased as `getAllSelectors()`.
-* `getAllRuleSets()` – does what it says; no matter how deeply nested your rule sets are.
+* `getAllDeclarationBlocks()` – does what it says; no matter how deeply nested the selectors are. Aliased as `getAllSelectors()`.
+* `getAllRuleSets()` – does what it says; no matter how deeply nested the rule sets are.
 * `getAllValues()` – finds all `Value` objects inside `Rule`s.
 
 ## To-Do
@@ -156,7 +157,7 @@ $cssDocument = $parser->parse();
 foreach($cssDocument->getAllRuleSets() as $oRuleSet) {
     // Note that the added dash will make this remove all rules starting with
     // `font-` (like `font-size`, `font-weight`, etc.) as well as a potential
-    // `font-rule`.
+    // `font` rule.
     $oRuleSet->removeRule('font-'); 
     $oRuleSet->removeRule('cursor');
 }
@@ -214,7 +215,8 @@ html, body {
 
 ```
 
-#### Structure (`var_dump()`)
+<details>
+  <summary><b>Structure (<code>var_dump()</code>)</b></summary>
 
 ```php
 class Sabberworm\CSS\CSSList\Document#4 (2) {
@@ -435,6 +437,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
 }
 
 ```
+</details>
 
 #### Output (`render()`)
 
@@ -458,7 +461,8 @@ html, body {font-size: 1.6em;}
 
 ```
 
-#### Structure (`var_dump()`)
+<details>
+  <summary><b>Structure (<code>var_dump()</code>)</b></summary>
 
 ```php
 class Sabberworm\CSS\CSSList\Document#4 (2) {
@@ -603,6 +607,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
 }
 
 ```
+</details>
 
 #### Output (`render()`)
 
diff --git a/lib/sabberworm/php-css-parser/composer.json b/lib/sabberworm/php-css-parser/composer.json
index e192dd56a..e3caf0cca 100644
--- a/lib/sabberworm/php-css-parser/composer.json
+++ b/lib/sabberworm/php-css-parser/composer.json
@@ -12,15 +12,23 @@
     "authors": [
         {
             "name": "Raphael Schweikert"
+        },
+        {
+            "name": "Oliver Klee",
+            "email": "github@oliverklee.de"
+        },
+        {
+            "name": "Jake Hotson",
+            "email": "jake.github@qzdesign.co.uk"
         }
     ],
     "require": {
-        "php": ">=5.6.20",
+        "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-iconv": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
-        "codacy/coverage": "^1.4"
+        "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+        "rawr/cross-data-providers": "^2.0.0"
     },
     "suggest": {
         "ext-mbstring": "for parsing UTF-8 CSS"
@@ -35,35 +43,9 @@
             "Sabberworm\\CSS\\Tests\\": "tests/"
         }
     },
-    "scripts": {
-        "ci": [
-            "@ci:static"
-        ],
-        "ci:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots bin src tests",
-        "ci:php:sniffer": "@php ./.phive/phpcs.phar --standard=config/phpcs.xml bin src tests",
-        "ci:php:stan": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon",
-        "ci:static": [
-            "@ci:php:fixer",
-            "@ci:php:sniffer",
-            "@ci:php:stan"
-        ],
-        "fix:php": [
-            "@fix:php:fixer",
-            "@fix:php:sniffer"
-        ],
-        "fix:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix bin src tests",
-        "fix:php:sniffer": "@php ./.phive/phpcbf.phar --standard=config/phpcs.xml bin src tests",
-        "phpstan:baseline": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon"
-    },
-    "scripts-descriptions": {
-        "ci": "Runs all dynamic and static code checks (i.e. currently, only the static checks).",
-        "ci:php:fixer": "Checks the code style with PHP CS Fixer.",
-        "ci:php:sniffer": "Checks the code style with PHP_CodeSniffer.",
-        "ci:php:stan": "Checks the types with PHPStan.",
-        "ci:static": "Runs all static code analysis checks for the code.",
-        "fix:php": "Autofixes all autofixable issues in the PHP code.",
-        "fix:php:fixer": "Fixes autofixable issues found by PHP CS Fixer.",
-        "fix:php:sniffer": "Fixes autofixable issues found by PHP_CodeSniffer.",
-        "phpstand:baseline": "Updates the PHPStan baseline file to match the code."
+    "extra": {
+        "branch-alias": {
+            "dev-main": "9.0.x-dev"
+        }
     }
 }
diff --git a/lib/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php b/lib/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
index 218adb9a1..a424adbe5 100644
--- a/lib/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
+++ b/lib/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
@@ -50,6 +50,8 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -57,17 +59,20 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
+        $sResult .= $oOutputFormat->sBeforeAtRuleBlock;
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult = $oOutputFormat->sBeforeAtRuleBlock;
         $sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= $this->renderListContents($oOutputFormat);
         $sResult .= '}';
         $sResult .= $oOutputFormat->sAfterAtRuleBlock;
         return $sResult;
diff --git a/lib/sabberworm/php-css-parser/src/CSSList/CSSBlockList.php b/lib/sabberworm/php-css-parser/src/CSSList/CSSBlockList.php
index fce7913eb..aa0c67fcd 100644
--- a/lib/sabberworm/php-css-parser/src/CSSList/CSSBlockList.php
+++ b/lib/sabberworm/php-css-parser/src/CSSList/CSSBlockList.php
@@ -2,6 +2,7 @@
 
 namespace Sabberworm\CSS\CSSList;
 
+use Sabberworm\CSS\CSSElement;
 use Sabberworm\CSS\Property\Selector;
 use Sabberworm\CSS\Rule\Rule;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
@@ -59,7 +60,53 @@ abstract class CSSBlockList extends CSSList
     }
 
     /**
-     * @param CSSList|Rule|RuleSet|Value $oElement
+     * Returns all `Value` objects found recursively in `Rule`s in the tree.
+     *
+     * @param CSSElement|string|null $element
+     *        This is the `CSSList` or `RuleSet` to start the search from (defaults to the whole document).
+     *        If a string is given, it is used as a rule name filter.
+     *        Passing a string for this parameter is deprecated in version 8.9.0, and will not work from v9.0;
+     *        use the following parameter to pass a rule name filter instead.
+     * @param string|bool|null $ruleSearchPatternOrSearchInFunctionArguments
+     *        This allows filtering rules by property name
+     *        (e.g. if "color" is passed, only `Value`s from `color` properties will be returned,
+     *        or if "font-" is provided, `Value`s from all font rules, like `font-size`, and including `font` itself,
+     *        will be returned).
+     *        If a Boolean is provided, it is treated as the `$searchInFunctionArguments` argument.
+     *        Passing a Boolean for this parameter is deprecated in version 8.9.0, and will not work from v9.0;
+     *        use the `$searchInFunctionArguments` parameter instead.
+     * @param bool $searchInFunctionArguments whether to also return Value objects used as Function arguments.
+     *
+     * @return array<int, Value>
+     *
+     * @see RuleSet->getRules()
+     */
+    public function getAllValues(
+        $element = null,
+        $ruleSearchPatternOrSearchInFunctionArguments = null,
+        $searchInFunctionArguments = false
+    ) {
+        if (\is_bool($ruleSearchPatternOrSearchInFunctionArguments)) {
+            $searchInFunctionArguments = $ruleSearchPatternOrSearchInFunctionArguments;
+            $searchString = null;
+        } else {
+            $searchString = $ruleSearchPatternOrSearchInFunctionArguments;
+        }
+
+        if ($element === null) {
+            $element = $this;
+        } elseif (\is_string($element)) {
+            $searchString = $element;
+            $element = $this;
+        }
+
+        $result = [];
+        $this->allValues($element, $result, $searchString, $searchInFunctionArguments);
+        return $result;
+    }
+
+    /**
+     * @param CSSElement|string $oElement
      * @param array<int, Value> $aResult
      * @param string|null $sSearchString
      * @param bool $bSearchInFunctionArguments
diff --git a/lib/sabberworm/php-css-parser/src/CSSList/CSSList.php b/lib/sabberworm/php-css-parser/src/CSSList/CSSList.php
index 946740a49..18d926e15 100644
--- a/lib/sabberworm/php-css-parser/src/CSSList/CSSList.php
+++ b/lib/sabberworm/php-css-parser/src/CSSList/CSSList.php
@@ -4,11 +4,14 @@ namespace Sabberworm\CSS\CSSList;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Comment\Commentable;
+use Sabberworm\CSS\CSSElement;
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 use Sabberworm\CSS\Property\AtRule;
 use Sabberworm\CSS\Property\Charset;
 use Sabberworm\CSS\Property\CSSNamespace;
@@ -24,28 +27,29 @@ use Sabberworm\CSS\Value\URL;
 use Sabberworm\CSS\Value\Value;
 
 /**
- * A `CSSList` is the most generic container available. Its contents include `RuleSet` as well as other `CSSList`
- * objects.
+ * This is the most generic container available. It can contain `DeclarationBlock`s (rule sets with a selector),
+ * `RuleSet`s as well as other `CSSList` objects.
  *
- * Also, it may contain `Import` and `Charset` objects stemming from at-rules.
+ * It can also contain `Import` and `Charset` objects stemming from at-rules.
  */
-abstract class CSSList implements Renderable, Commentable
+abstract class CSSList implements Commentable, CSSElement, Positionable
 {
+    use Position;
+
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
     /**
      * @var array<int, RuleSet|CSSList|Import|Charset>
+     *
+     * @internal since 8.8.0
      */
     protected $aContents;
 
-    /**
-     * @var int
-     */
-    protected $iLineNo;
-
     /**
      * @param int $iLineNo
      */
@@ -53,7 +57,7 @@ abstract class CSSList implements Renderable, Commentable
     {
         $this->aComments = [];
         $this->aContents = [];
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
     }
 
     /**
@@ -61,6 +65,8 @@ abstract class CSSList implements Renderable, Commentable
      *
      * @throws UnexpectedTokenException
      * @throws SourceException
+     *
+     * @internal since V8.8.0
      */
     public static function parseList(ParserState $oParserState, CSSList $oList)
     {
@@ -69,8 +75,9 @@ abstract class CSSList implements Renderable, Commentable
             $oParserState = new ParserState($oParserState, Settings::create());
         }
         $bLenientParsing = $oParserState->getSettings()->bLenientParsing;
+        $aComments = [];
         while (!$oParserState->isEnd()) {
-            $comments = $oParserState->consumeWhiteSpace();
+            $aComments = array_merge($aComments, $oParserState->consumeWhiteSpace());
             $oListItem = null;
             if ($bLenientParsing) {
                 try {
@@ -86,11 +93,12 @@ abstract class CSSList implements Renderable, Commentable
                 return;
             }
             if ($oListItem) {
-                $oListItem->setComments($comments);
+                $oListItem->addComments($aComments);
                 $oList->append($oListItem);
             }
-            $oParserState->consumeWhiteSpace();
+            $aComments = $oParserState->consumeWhiteSpace();
         }
+        $oList->addComments($aComments);
         if (!$bIsRoot && !$bLenientParsing) {
             throw new SourceException("Unexpected end of document", $oParserState->currentLine());
         }
@@ -125,22 +133,19 @@ abstract class CSSList implements Renderable, Commentable
                         $oParserState->currentLine()
                     );
                 }
-                $oParserState->setCharset($oAtRule->getCharset()->getString());
+                $oParserState->setCharset($oAtRule->getCharset());
             }
             return $oAtRule;
         } elseif ($oParserState->comes('}')) {
-            if (!$oParserState->getSettings()->bLenientParsing) {
-                throw new UnexpectedTokenException('CSS selector', '}', 'identifier', $oParserState->currentLine());
-            } else {
-                if ($bIsRoot) {
-                    if ($oParserState->getSettings()->bLenientParsing) {
-                        return DeclarationBlock::parse($oParserState);
-                    } else {
-                        throw new SourceException("Unopened {", $oParserState->currentLine());
-                    }
+            if ($bIsRoot) {
+                if ($oParserState->getSettings()->bLenientParsing) {
+                    return DeclarationBlock::parse($oParserState);
                 } else {
-                    return null;
+                    throw new SourceException("Unopened {", $oParserState->currentLine());
                 }
+            } else {
+                // End of list
+                return null;
             }
         } else {
             return DeclarationBlock::parse($oParserState, $oList);
@@ -172,10 +177,10 @@ abstract class CSSList implements Renderable, Commentable
             $oParserState->consumeUntil([';', ParserState::EOF], true, true);
             return new Import($oLocation, $sMediaQuery ?: null, $iIdentifierLineNum);
         } elseif ($sIdentifier === 'charset') {
-            $sCharset = CSSString::parse($oParserState);
+            $oCharsetString = CSSString::parse($oParserState);
             $oParserState->consumeWhiteSpace();
             $oParserState->consumeUntil([';', ParserState::EOF], true, true);
-            return new Charset($sCharset, $iIdentifierLineNum);
+            return new Charset($oCharsetString, $iIdentifierLineNum);
         } elseif (self::identifierIs($sIdentifier, 'keyframes')) {
             $oResult = new KeyFrame($iIdentifierLineNum);
             $oResult->setVendorKeyFrame($sIdentifier);
@@ -251,14 +256,6 @@ abstract class CSSList implements Renderable, Commentable
             ?: preg_match("/^(-\\w+-)?$sMatch$/i", $sIdentifier) === 1;
     }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
     /**
      * Prepends an item to the list of contents.
      *
@@ -272,7 +269,7 @@ abstract class CSSList implements Renderable, Commentable
     }
 
     /**
-     * Appends an item to tje list of contents.
+     * Appends an item to the list of contents.
      *
      * @param RuleSet|CSSList|Import|Charset $oItem
      *
@@ -297,6 +294,22 @@ abstract class CSSList implements Renderable, Commentable
         array_splice($this->aContents, $iOffset, $iLength, $mReplacement);
     }
 
+    /**
+     * Inserts an item in the CSS list before its sibling. If the desired sibling cannot be found,
+     * the item is appended at the end.
+     *
+     * @param RuleSet|CSSList|Import|Charset $item
+     * @param RuleSet|CSSList|Import|Charset $sibling
+     */
+    public function insertBefore($item, $sibling)
+    {
+        if (in_array($sibling, $this->aContents, true)) {
+            $this->replace($sibling, [$item, $sibling]);
+        } else {
+            $this->append($item);
+        }
+    }
+
     /**
      * Removes an item from the CSS list.
      *
@@ -393,6 +406,8 @@ abstract class CSSList implements Renderable, Commentable
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -402,7 +417,7 @@ abstract class CSSList implements Renderable, Commentable
     /**
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    protected function renderListContents(OutputFormat $oOutputFormat)
     {
         $sResult = '';
         $bIsFirst = true;
@@ -442,6 +457,8 @@ abstract class CSSList implements Renderable, Commentable
     abstract public function isRootList();
 
     /**
+     * Returns the stored items.
+     *
      * @return array<int, RuleSet|Import|Charset|CSSList>
      */
     public function getContents()
diff --git a/lib/sabberworm/php-css-parser/src/CSSList/Document.php b/lib/sabberworm/php-css-parser/src/CSSList/Document.php
index 91ab2c6b2..ed4b09b38 100644
--- a/lib/sabberworm/php-css-parser/src/CSSList/Document.php
+++ b/lib/sabberworm/php-css-parser/src/CSSList/Document.php
@@ -8,11 +8,10 @@ use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Property\Selector;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
 use Sabberworm\CSS\RuleSet\RuleSet;
-use Sabberworm\CSS\Value\Value;
 
 /**
- * The root `CSSList` of a parsed file. Contains all top-level CSS contents, mostly declaration blocks,
- * but also any at-rules encountered.
+ * This class represents the root of a parsed CSS file. It contains all top-level CSS contents: mostly declaration
+ * blocks, but also any at-rules encountered (`Import` and `Charset`).
  */
 class Document extends CSSBlockList
 {
@@ -28,6 +27,8 @@ class Document extends CSSBlockList
      * @return Document
      *
      * @throws SourceException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState)
     {
@@ -37,7 +38,8 @@ class Document extends CSSBlockList
     }
 
     /**
-     * Gets all `DeclarationBlock` objects recursively.
+     * Gets all `DeclarationBlock` objects recursively, no matter how deeply nested the selectors are.
+     * Aliased as `getAllSelectors()`.
      *
      * @return array<int, DeclarationBlock>
      */
@@ -62,7 +64,7 @@ class Document extends CSSBlockList
     }
 
     /**
-     * Returns all `RuleSet` objects found recursively in the tree.
+     * Returns all `RuleSet` objects recursively found in the tree, no matter how deeply nested the rule sets are.
      *
      * @return array<int, RuleSet>
      */
@@ -75,34 +77,7 @@ class Document extends CSSBlockList
     }
 
     /**
-     * Returns all `Value` objects found recursively in the tree.
-     *
-     * @param CSSList|RuleSet|string $mElement
-     *        the `CSSList` or `RuleSet` to start the search from (defaults to the whole document).
-     *        If a string is given, it is used as rule name filter.
-     * @param bool $bSearchInFunctionArguments whether to also return Value objects used as Function arguments.
-     *
-     * @return array<int, Value>
-     *
-     * @see RuleSet->getRules()
-     */
-    public function getAllValues($mElement = null, $bSearchInFunctionArguments = false)
-    {
-        $sSearchString = null;
-        if ($mElement === null) {
-            $mElement = $this;
-        } elseif (is_string($mElement)) {
-            $sSearchString = $mElement;
-            $mElement = $this;
-        }
-        /** @var array<int, Value> $aResult */
-        $aResult = [];
-        $this->allValues($mElement, $aResult, $sSearchString, $bSearchInFunctionArguments);
-        return $aResult;
-    }
-
-    /**
-     * Returns all `Selector` objects found recursively in the tree.
+     * Returns all `Selector` objects with the requested specificity found recursively in the tree.
      *
      * Note that this does not yield the full `DeclarationBlock` that the selector belongs to
      * (and, currently, there is no way to get to that).
@@ -127,6 +102,8 @@ class Document extends CSSBlockList
      * Expands all shorthand properties to their long value.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandShorthands()
     {
@@ -139,6 +116,8 @@ class Document extends CSSBlockList
      * Create shorthands properties whenever possible.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createShorthands()
     {
@@ -154,12 +133,12 @@ class Document extends CSSBlockList
      *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat = null)
+    public function render($oOutputFormat = null)
     {
         if ($oOutputFormat === null) {
             $oOutputFormat = new OutputFormat();
         }
-        return parent::render($oOutputFormat);
+        return $oOutputFormat->comments($this) . $this->renderListContents($oOutputFormat);
     }
 
     /**
diff --git a/lib/sabberworm/php-css-parser/src/CSSList/KeyFrame.php b/lib/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
index d9420e9c0..618308a76 100644
--- a/lib/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
+++ b/lib/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
@@ -61,6 +61,8 @@ class KeyFrame extends CSSList implements AtRule
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -68,12 +70,15 @@ class KeyFrame extends CSSList implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
-        $sResult = "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult = $oOutputFormat->comments($this);
+        $sResult .= "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderListContents($oOutputFormat);
         $sResult .= '}';
         return $sResult;
     }
diff --git a/lib/sabberworm/php-css-parser/src/Comment/Comment.php b/lib/sabberworm/php-css-parser/src/Comment/Comment.php
index 6128d7498..fb571b403 100644
--- a/lib/sabberworm/php-css-parser/src/Comment/Comment.php
+++ b/lib/sabberworm/php-css-parser/src/Comment/Comment.php
@@ -4,16 +4,17 @@ namespace Sabberworm\CSS\Comment;
 
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Renderable;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 
-class Comment implements Renderable
+class Comment implements Positionable, Renderable
 {
-    /**
-     * @var int
-     */
-    protected $iLineNo;
+    use Position;
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0
      */
     protected $sComment;
 
@@ -24,7 +25,7 @@ class Comment implements Renderable
     public function __construct($sComment = '', $iLineNo = 0)
     {
         $this->sComment = $sComment;
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
     }
 
     /**
@@ -35,14 +36,6 @@ class Comment implements Renderable
         return $this->sComment;
     }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
     /**
      * @param string $sComment
      *
@@ -55,6 +48,8 @@ class Comment implements Renderable
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -62,9 +57,11 @@ class Comment implements Renderable
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return '/*' . $this->sComment . '*/';
     }
diff --git a/lib/sabberworm/php-css-parser/src/OutputFormat.php b/lib/sabberworm/php-css-parser/src/OutputFormat.php
index 595d30643..9778e2745 100644
--- a/lib/sabberworm/php-css-parser/src/OutputFormat.php
+++ b/lib/sabberworm/php-css-parser/src/OutputFormat.php
@@ -3,7 +3,7 @@
 namespace Sabberworm\CSS;
 
 /**
- * Class OutputFormat
+ * Extending this class is deprecated in version 8.8.0; it will be made `final` in version 9.0.0.
  *
  * @method OutputFormat setSemicolonAfterLastRule(bool $bSemicolonAfterLastRule) Set whether semicolons are added after
  *     last rule.
@@ -14,13 +14,17 @@ class OutputFormat
      * Value format: `"` means double-quote, `'` means single-quote
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sStringQuotingType = '"';
 
     /**
      * Output RGB colors in hash notation if possible
      *
-     * @var string
+     * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $bRGBHashNotation = true;
 
@@ -30,6 +34,8 @@ class OutputFormat
      * Semicolon after the last rule of a declaration block can be omitted. To do that, set this false.
      *
      * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $bSemicolonAfterLastRule = true;
 
@@ -38,36 +44,52 @@ class OutputFormat
      * Note that these strings are not sanity-checked: the value should only consist of whitespace
      * Any newline character will be indented according to the current level.
      * The triples (After, Before, Between) can be set using a wildcard (e.g. `$oFormat->set('Space*Rules', "\n");`)
+     *
+     * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceAfterRuleName = ' ';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBeforeRules = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceAfterRules = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBetweenRules = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBeforeBlocks = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceAfterBlocks = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBetweenBlocks = "\n";
 
@@ -75,11 +97,15 @@ class OutputFormat
      * Content injected in and around at-rule blocks.
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sBeforeAtRuleBlock = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sAfterAtRuleBlock = '';
 
@@ -87,28 +113,64 @@ class OutputFormat
      * This is what’s printed before and after the comma if a declaration block contains multiple selectors.
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBeforeSelectorSeparator = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceAfterSelectorSeparator = ' ';
 
     /**
-     * This is what’s printed after the comma of value lists
+     * This is what’s inserted before the separator in value lists, by default.
      *
-     * @var string
+     * `array` is deprecated in version 8.8.0, and will be removed in version 9.0.0.
+     * To set the spacing for specific separators, use {@see $aSpaceBeforeListArgumentSeparators} instead.
+     *
+     * @var string|array<non-empty-string, string>
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBeforeListArgumentSeparator = '';
 
     /**
-     * @var string
+     * Keys are separators (e.g. `,`).  Values are the space sequence to insert, or an empty string.
+     *
+     * @var array<non-empty-string, string>
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
+     */
+    public $aSpaceBeforeListArgumentSeparators = [];
+
+    /**
+     * This is what’s inserted after the separator in value lists, by default.
+     *
+     * `array` is deprecated in version 8.8.0, and will be removed in version 9.0.0.
+     * To set the spacing for specific separators, use {@see $aSpaceAfterListArgumentSeparators} instead.
+     *
+     * @var string|array<non-empty-string, string>
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceAfterListArgumentSeparator = '';
 
+    /**
+     * Keys are separators (e.g. `,`).  Values are the space sequence to insert, or an empty string.
+     *
+     * @var array<non-empty-string, string>
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
+     */
+    public $aSpaceAfterListArgumentSeparators = [];
+
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sSpaceBeforeOpeningBrace = ' ';
 
@@ -116,16 +178,22 @@ class OutputFormat
      * Content injected in and around declaration blocks.
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sBeforeDeclarationBlock = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sAfterDeclarationBlockSelectors = '';
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sAfterDeclarationBlock = '';
 
@@ -133,6 +201,8 @@ class OutputFormat
      * Indentation character(s) per level. Only applicable if newlines are used in any of the spacing settings.
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sIndentation = "\t";
 
@@ -140,9 +210,20 @@ class OutputFormat
      * Output exceptions.
      *
      * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $bIgnoreExceptions = false;
 
+    /**
+     * Render comments for lists and RuleSets
+     *
+     * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
+     */
+    public $bRenderComments = false;
+
     /**
      * @var OutputFormatter|null
      */
@@ -158,6 +239,9 @@ class OutputFormat
      */
     private $iIndentationLevel = 0;
 
+    /**
+     * @internal since V8.8.0. Use the factory methods `create()`, `createCompact()`, or `createPretty()` instead.
+     */
     public function __construct()
     {
     }
@@ -166,6 +250,8 @@ class OutputFormat
      * @param string $sName
      *
      * @return string|null
+     *
+     * @deprecated since 8.8.0, will be removed in 9.0.0. Use specific getters instead.
      */
     public function get($sName)
     {
@@ -184,6 +270,8 @@ class OutputFormat
      * @param mixed $mValue
      *
      * @return self|false
+     *
+     * @deprecated since 8.8.0, will be removed in 9.0.0. Use specific setters instead.
      */
     public function set($aNames, $mValue)
     {
@@ -230,6 +318,7 @@ class OutputFormat
         } elseif (strpos($sMethodName, 'get') === 0) {
             return $this->get(substr($sMethodName, 3));
         } elseif (method_exists(OutputFormatter::class, $sMethodName)) {
+            // @deprecated since 8.8.0, will be removed in 9.0.0. Call the method on the formatter directly instead.
             return call_user_func_array([$this->getFormatter(), $sMethodName], $aArguments);
         } else {
             throw new \Exception('Unknown OutputFormat method called: ' . $sMethodName);
@@ -258,6 +347,8 @@ class OutputFormat
 
     /**
      * @return OutputFormat
+     *
+     * @internal since V8.8.0
      */
     public function nextLevel()
     {
@@ -279,17 +370,22 @@ class OutputFormat
 
     /**
      * @return OutputFormatter
+     *
+     * @internal since 8.8.0
      */
     public function getFormatter()
     {
         if ($this->oFormatter === null) {
             $this->oFormatter = new OutputFormatter($this);
         }
+
         return $this->oFormatter;
     }
 
     /**
      * @return int
+     *
+     * @deprecated #869 since version V8.8.0, will be removed in V9.0.0. Use `getIndentationLevel()` instead.
      */
     public function level()
     {
@@ -314,8 +410,12 @@ class OutputFormat
     public static function createCompact()
     {
         $format = self::create();
-        $format->set('Space*Rules', "")->set('Space*Blocks', "")->setSpaceAfterRuleName('')
-            ->setSpaceBeforeOpeningBrace('')->setSpaceAfterSelectorSeparator('');
+        $format->set('Space*Rules', "")
+            ->set('Space*Blocks', "")
+            ->setSpaceAfterRuleName('')
+            ->setSpaceBeforeOpeningBrace('')
+            ->setSpaceAfterSelectorSeparator('')
+            ->setRenderComments(false);
         return $format;
     }
 
@@ -327,8 +427,11 @@ class OutputFormat
     public static function createPretty()
     {
         $format = self::create();
-        $format->set('Space*Rules', "\n")->set('Space*Blocks', "\n")
-            ->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', ['default' => '', ',' => ' ']);
+        $format->set('Space*Rules', "\n")
+            ->set('Space*Blocks', "\n")
+            ->setSpaceBetweenBlocks("\n\n")
+            ->set('SpaceAfterListArgumentSeparators', [',' => ' '])
+            ->setRenderComments(true);
         return $format;
     }
 }
diff --git a/lib/sabberworm/php-css-parser/src/OutputFormatter.php b/lib/sabberworm/php-css-parser/src/OutputFormatter.php
index 535feca7f..a436ee3bc 100644
--- a/lib/sabberworm/php-css-parser/src/OutputFormatter.php
+++ b/lib/sabberworm/php-css-parser/src/OutputFormatter.php
@@ -2,8 +2,12 @@
 
 namespace Sabberworm\CSS;
 
+use Sabberworm\CSS\Comment\Commentable;
 use Sabberworm\CSS\Parsing\OutputException;
 
+/**
+ * @internal since 8.8.0
+ */
 class OutputFormatter
 {
     /**
@@ -116,6 +120,11 @@ class OutputFormatter
      */
     public function spaceBeforeListArgumentSeparator($sSeparator)
     {
+        $spaceForSeparator = $this->oFormat->getSpaceBeforeListArgumentSeparators();
+        if (isset($spaceForSeparator[$sSeparator])) {
+            return $spaceForSeparator[$sSeparator];
+        }
+
         return $this->space('BeforeListArgumentSeparator', $sSeparator);
     }
 
@@ -126,6 +135,11 @@ class OutputFormatter
      */
     public function spaceAfterListArgumentSeparator($sSeparator)
     {
+        $spaceForSeparator = $this->oFormat->getSpaceAfterListArgumentSeparators();
+        if (isset($spaceForSeparator[$sSeparator])) {
+            return $spaceForSeparator[$sSeparator];
+        }
+
         return $this->space('AfterListArgumentSeparator', $sSeparator);
     }
 
@@ -211,6 +225,29 @@ class OutputFormatter
         return implode(';', $sString);
     }
 
+    /**
+     *
+     * @param array<Commentable> $aComments
+     *
+     * @return string
+     */
+    public function comments(Commentable $oCommentable)
+    {
+        if (!$this->oFormat->bRenderComments) {
+            return '';
+        }
+
+        $sResult = '';
+        $aComments = $oCommentable->getComments();
+        $iLastCommentIndex = count($aComments) - 1;
+
+        foreach ($aComments as $i => $oComment) {
+            $sResult .= $oComment->render($this->oFormat);
+            $sResult .= $i === $iLastCommentIndex ? $this->spaceAfterBlocks() : $this->spaceBetweenBlocks();
+        }
+        return $sResult;
+    }
+
     /**
      * @param string $sSpaceString
      *
@@ -226,6 +263,6 @@ class OutputFormatter
      */
     private function indent()
     {
-        return str_repeat($this->oFormat->sIndentation, $this->oFormat->level());
+        return str_repeat($this->oFormat->sIndentation, $this->oFormat->getIndentationLevel());
     }
 }
diff --git a/lib/sabberworm/php-css-parser/src/Parser.php b/lib/sabberworm/php-css-parser/src/Parser.php
index f3b0493a5..f60fc086b 100644
--- a/lib/sabberworm/php-css-parser/src/Parser.php
+++ b/lib/sabberworm/php-css-parser/src/Parser.php
@@ -17,11 +17,11 @@ class Parser
     private $oParserState;
 
     /**
-     * @param string $sText
+     * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param Settings|null $oParserSettings
      * @param int $iLineNo the line number (starting from 1, not from 0)
      */
-    public function __construct($sText, Settings $oParserSettings = null, $iLineNo = 1)
+    public function __construct($sText, $oParserSettings = null, $iLineNo = 1)
     {
         if ($oParserSettings === null) {
             $oParserSettings = Settings::create();
@@ -30,9 +30,13 @@ class Parser
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sCharset
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed in version 9.0.0 with #687
      */
     public function setCharset($sCharset)
     {
@@ -40,7 +44,11 @@ class Parser
     }
 
     /**
+     * Returns the charset that is used if the CSS does not contain an `@charset` declaration.
+     *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed in version 9.0.0 with #687
      */
     public function getCharset()
     {
@@ -49,6 +57,8 @@ class Parser
     }
 
     /**
+     * Parses the CSS provided to the constructor and creates a `Document` from it.
+     *
      * @return Document
      *
      * @throws SourceException
diff --git a/lib/sabberworm/php-css-parser/src/Parsing/ParserState.php b/lib/sabberworm/php-css-parser/src/Parsing/ParserState.php
index e7d85ee0f..574f60f3f 100644
--- a/lib/sabberworm/php-css-parser/src/Parsing/ParserState.php
+++ b/lib/sabberworm/php-css-parser/src/Parsing/ParserState.php
@@ -5,10 +5,15 @@ namespace Sabberworm\CSS\Parsing;
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Settings;
 
+/**
+ * @internal since 8.7.0
+ */
 class ParserState
 {
     /**
      * @var null
+     *
+     * @internal since 8.5.2
      */
     const EOF = null;
 
@@ -33,6 +38,8 @@ class ParserState
     private $iCurrentPosition;
 
     /**
+     * will only be used if the CSS does not contain an `@charset` declaration
+     *
      * @var string
      */
     private $sCharset;
@@ -48,7 +55,7 @@ class ParserState
     private $iLineNo;
 
     /**
-     * @param string $sText
+     * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param int $iLineNo
      */
     public function __construct($sText, Settings $oParserSettings, $iLineNo = 1)
@@ -61,6 +68,8 @@ class ParserState
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sCharset
      *
      * @return void
@@ -75,6 +84,8 @@ class ParserState
     }
 
     /**
+     * Returns the charset that is used if the CSS does not contain an `@charset` declaration.
+     *
      * @return string
      */
     public function getCharset()
@@ -106,21 +117,44 @@ class ParserState
         return $this->oParserSettings;
     }
 
+    /**
+     * @return \Sabberworm\CSS\Parsing\Anchor
+     */
+    public function anchor()
+    {
+        return new Anchor($this->iCurrentPosition, $this);
+    }
+
+    /**
+     * @param int $iPosition
+     *
+     * @return void
+     */
+    public function setPosition($iPosition)
+    {
+        $this->iCurrentPosition = $iPosition;
+    }
+
     /**
      * @param bool $bIgnoreCase
      *
      * @return string
      *
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public function parseIdentifier($bIgnoreCase = true)
     {
+        if ($this->isEnd()) {
+            throw new UnexpectedEOFException('', '', 'identifier', $this->iLineNo);
+        }
         $sResult = $this->parseCharacter(true);
         if ($sResult === null) {
             throw new UnexpectedTokenException($sResult, $this->peek(5), 'identifier', $this->iLineNo);
         }
         $sCharacter = null;
-        while (($sCharacter = $this->parseCharacter(true)) !== null) {
+        while (!$this->isEnd() && ($sCharacter = $this->parseCharacter(true)) !== null) {
             if (preg_match('/[a-zA-Z0-9\x{00A0}-\x{FFFF}_-]/Sux', $sCharacter)) {
                 $sResult .= $sCharacter;
             } else {
@@ -140,6 +174,8 @@ class ParserState
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public function parseCharacter($bIsForIdentifier)
     {
@@ -204,7 +240,7 @@ class ParserState
      */
     public function consumeWhiteSpace()
     {
-        $comments = [];
+        $aComments = [];
         do {
             while (preg_match('/\\s/isSu', $this->peek()) === 1) {
                 $this->consume(1);
@@ -214,16 +250,16 @@ class ParserState
                     $oComment = $this->consumeComment();
                 } catch (UnexpectedEOFException $e) {
                     $this->iCurrentPosition = $this->iLength;
-                    return;
+                    return $aComments;
                 }
             } else {
                 $oComment = $this->consumeComment();
             }
             if ($oComment !== false) {
-                $comments[] = $oComment;
+                $aComments[] = $oComment;
             }
         } while ($oComment !== false);
-        return $comments;
+        return $aComments;
     }
 
     /**
diff --git a/lib/sabberworm/php-css-parser/src/Parsing/SourceException.php b/lib/sabberworm/php-css-parser/src/Parsing/SourceException.php
index 1ca668a99..1aa27b437 100644
--- a/lib/sabberworm/php-css-parser/src/Parsing/SourceException.php
+++ b/lib/sabberworm/php-css-parser/src/Parsing/SourceException.php
@@ -2,12 +2,12 @@
 
 namespace Sabberworm\CSS\Parsing;
 
-class SourceException extends \Exception
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
+
+class SourceException extends \Exception implements Positionable
 {
-    /**
-     * @var int
-     */
-    private $iLineNo;
+    use Position;
 
     /**
      * @param string $sMessage
@@ -15,18 +15,10 @@ class SourceException extends \Exception
      */
     public function __construct($sMessage, $iLineNo = 0)
     {
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
         if (!empty($iLineNo)) {
             $sMessage .= " [line no: $iLineNo]";
         }
         parent::__construct($sMessage);
     }
-
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
 }
diff --git a/lib/sabberworm/php-css-parser/src/Property/AtRule.php b/lib/sabberworm/php-css-parser/src/Property/AtRule.php
index 9536ff5e9..d946a9046 100644
--- a/lib/sabberworm/php-css-parser/src/Property/AtRule.php
+++ b/lib/sabberworm/php-css-parser/src/Property/AtRule.php
@@ -12,6 +12,8 @@ interface AtRule extends Renderable, Commentable
      * we’re whitelisting the block rules and have anything else be treated as a set rule.
      *
      * @var string
+     *
+     * @internal since 8.5.2
      */
     const BLOCK_RULES = 'media/document/supports/region-style/font-feature-values';
 
@@ -19,6 +21,8 @@ interface AtRule extends Renderable, Commentable
      * … and more font-specific ones (to be used inside font-feature-values)
      *
      * @var string
+     *
+     * @internal since 8.5.2
      */
     const SET_RULES = 'font-face/counter-style/page/swash/styleset/annotation';
 
diff --git a/lib/sabberworm/php-css-parser/src/Property/CSSNamespace.php b/lib/sabberworm/php-css-parser/src/Property/CSSNamespace.php
index 0d7eb4969..188d3581f 100644
--- a/lib/sabberworm/php-css-parser/src/Property/CSSNamespace.php
+++ b/lib/sabberworm/php-css-parser/src/Property/CSSNamespace.php
@@ -4,12 +4,16 @@ namespace Sabberworm\CSS\Property;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 
 /**
  * `CSSNamespace` represents an `@namespace` rule.
  */
-class CSSNamespace implements AtRule
+class CSSNamespace implements AtRule, Positionable
 {
+    use Position;
+
     /**
      * @var string
      */
@@ -27,6 +31,8 @@ class CSSNamespace implements AtRule
 
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
@@ -39,20 +45,14 @@ class CSSNamespace implements AtRule
     {
         $this->mUrl = $mUrl;
         $this->sPrefix = $sPrefix;
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
         $this->aComments = [];
     }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -60,9 +60,11 @@ class CSSNamespace implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return '@namespace ' . ($this->sPrefix === null ? '' : $this->sPrefix . ' ')
             . $this->mUrl->render($oOutputFormat) . ';';
diff --git a/lib/sabberworm/php-css-parser/src/Property/Charset.php b/lib/sabberworm/php-css-parser/src/Property/Charset.php
index 3ee0c3d04..1ebff3f3a 100644
--- a/lib/sabberworm/php-css-parser/src/Property/Charset.php
+++ b/lib/sabberworm/php-css-parser/src/Property/Charset.php
@@ -4,6 +4,9 @@ namespace Sabberworm\CSS\Property;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
+use Sabberworm\CSS\Value\CSSString;
 
 /**
  * Class representing an `@charset` rule.
@@ -13,50 +16,49 @@ use Sabberworm\CSS\OutputFormat;
  * - May only appear at the very top of a Document’s contents.
  * - Must not appear more than once.
  */
-class Charset implements AtRule
+class Charset implements AtRule, Positionable
 {
+    use Position;
+
     /**
-     * @var string
+     * @var CSSString
      */
-    private $sCharset;
+    private $oCharset;
 
     /**
      * @var int
+     *
+     * @internal since 8.8.0
      */
     protected $iLineNo;
 
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
     /**
-     * @param string $sCharset
+     * @param CSSString $oCharset
      * @param int $iLineNo
      */
-    public function __construct($sCharset, $iLineNo = 0)
+    public function __construct(CSSString $oCharset, $iLineNo = 0)
     {
-        $this->sCharset = $sCharset;
-        $this->iLineNo = $iLineNo;
+        $this->oCharset = $oCharset;
+        $this->setPosition($iLineNo);
         $this->aComments = [];
     }
 
     /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
-    /**
-     * @param string $sCharset
+     * @param string|CSSString $oCharset
      *
      * @return void
      */
     public function setCharset($sCharset)
     {
-        $this->sCharset = $sCharset;
+        $sCharset = $sCharset instanceof CSSString ? $sCharset : new CSSString($sCharset);
+        $this->oCharset = $sCharset;
     }
 
     /**
@@ -64,11 +66,13 @@ class Charset implements AtRule
      */
     public function getCharset()
     {
-        return $this->sCharset;
+        return $this->oCharset->getString();
     }
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -76,11 +80,13 @@ class Charset implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
-        return "@charset {$this->sCharset->render($oOutputFormat)};";
+        return "{$oOutputFormat->comments($this)}@charset {$this->oCharset->render($oOutputFormat)};";
     }
 
     /**
@@ -96,7 +102,7 @@ class Charset implements AtRule
      */
     public function atRuleArgs()
     {
-        return $this->sCharset;
+        return $this->oCharset;
     }
 
     /**
diff --git a/lib/sabberworm/php-css-parser/src/Property/Import.php b/lib/sabberworm/php-css-parser/src/Property/Import.php
index a2253016b..5b4744939 100644
--- a/lib/sabberworm/php-css-parser/src/Property/Import.php
+++ b/lib/sabberworm/php-css-parser/src/Property/Import.php
@@ -4,13 +4,17 @@ namespace Sabberworm\CSS\Property;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 use Sabberworm\CSS\Value\URL;
 
 /**
  * Class representing an `@import` rule.
  */
-class Import implements AtRule
+class Import implements AtRule, Positionable
 {
+    use Position;
+
     /**
      * @var URL
      */
@@ -21,13 +25,10 @@ class Import implements AtRule
      */
     private $sMediaQuery;
 
-    /**
-     * @var int
-     */
-    protected $iLineNo;
-
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
@@ -40,18 +41,10 @@ class Import implements AtRule
     {
         $this->oLocation = $oLocation;
         $this->sMediaQuery = $sMediaQuery;
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
         $this->aComments = [];
     }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
     /**
      * @param URL $oLocation
      *
@@ -72,6 +65,8 @@ class Import implements AtRule
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -79,11 +74,13 @@ class Import implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
-        return "@import " . $this->oLocation->render($oOutputFormat)
+        return $oOutputFormat->comments($this) . "@import " . $this->oLocation->render($oOutputFormat)
             . ($this->sMediaQuery === null ? '' : ' ' . $this->sMediaQuery) . ';';
     }
 
@@ -134,4 +131,12 @@ class Import implements AtRule
     {
         $this->aComments = $aComments;
     }
+
+    /**
+     * @return string
+     */
+    public function getMediaQuery()
+    {
+        return $this->sMediaQuery;
+    }
 }
diff --git a/lib/sabberworm/php-css-parser/src/Property/KeyframeSelector.php b/lib/sabberworm/php-css-parser/src/Property/KeyframeSelector.php
index 14ea5ebb7..2aff8d247 100644
--- a/lib/sabberworm/php-css-parser/src/Property/KeyframeSelector.php
+++ b/lib/sabberworm/php-css-parser/src/Property/KeyframeSelector.php
@@ -8,6 +8,8 @@ class KeyframeSelector extends Selector
      * regexp for specificity calculations
      *
      * @var string
+     *
+     * @internal since 8.5.2
      */
     const SELECTOR_VALIDATION_RX = '/
     ^(
diff --git a/lib/sabberworm/php-css-parser/src/Property/Selector.php b/lib/sabberworm/php-css-parser/src/Property/Selector.php
index 70c9b2fd5..a06116889 100644
--- a/lib/sabberworm/php-css-parser/src/Property/Selector.php
+++ b/lib/sabberworm/php-css-parser/src/Property/Selector.php
@@ -12,6 +12,8 @@ class Selector
      * regexp for specificity calculations
      *
      * @var string
+     *
+     * @internal
      */
     const NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX = '/
         (\.[\w]+)                   # classes
@@ -36,6 +38,8 @@ class Selector
      * regexp for specificity calculations
      *
      * @var string
+     *
+     * @internal
      */
     const ELEMENTS_AND_PSEUDO_ELEMENTS_RX = '/
         ((^|[\s\+\>\~]+)[\w]+   # elements
@@ -49,6 +53,8 @@ class Selector
      * regexp for specificity calculations
      *
      * @var string
+     *
+     * @internal since 8.5.2
      */
     const SELECTOR_VALIDATION_RX = '/
         ^(
@@ -74,6 +80,8 @@ class Selector
      * @param string $sSelector
      *
      * @return bool
+     *
+     * @internal since V8.8.0
      */
     public static function isValid($sSelector)
     {
@@ -82,7 +90,7 @@ class Selector
 
     /**
      * @param string $sSelector
-     * @param bool $bCalculateSpecificity
+     * @param bool $bCalculateSpecificity @deprecated since V8.8.0, will be removed in V9.0.0
      */
     public function __construct($sSelector, $bCalculateSpecificity = false)
     {
@@ -113,6 +121,8 @@ class Selector
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
diff --git a/lib/sabberworm/php-css-parser/src/Renderable.php b/lib/sabberworm/php-css-parser/src/Renderable.php
index dc1bff3c1..1f1b475d6 100644
--- a/lib/sabberworm/php-css-parser/src/Renderable.php
+++ b/lib/sabberworm/php-css-parser/src/Renderable.php
@@ -6,13 +6,17 @@ interface Renderable
 {
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString();
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat);
+    public function render($oOutputFormat);
 
     /**
      * @return int
diff --git a/lib/sabberworm/php-css-parser/src/Rule/Rule.php b/lib/sabberworm/php-css-parser/src/Rule/Rule.php
index c1ea6df74..a34018a84 100644
--- a/lib/sabberworm/php-css-parser/src/Rule/Rule.php
+++ b/lib/sabberworm/php-css-parser/src/Rule/Rule.php
@@ -4,27 +4,32 @@ namespace Sabberworm\CSS\Rule;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Comment\Commentable;
+use Sabberworm\CSS\CSSElement;
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
-use Sabberworm\CSS\Renderable;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 use Sabberworm\CSS\Value\RuleValueList;
 use Sabberworm\CSS\Value\Value;
 
 /**
- * RuleSets contains Rule objects which always have a key and a value.
- * In CSS, Rules are expressed as follows: “key: value[0][0] value[0][1], value[1][0] value[1][1];”
+ * `Rule`s just have a string key (the rule) and a 'Value'.
+ *
+ * In CSS, `Rule`s are expressed as follows: “key: value[0][0] value[0][1], value[1][0] value[1][1];”
  */
-class Rule implements Renderable, Commentable
+class Rule implements Commentable, CSSElement, Positionable
 {
+    use Position;
+
     /**
      * @var string
      */
     private $sRule;
 
     /**
-     * @var RuleValueList|null
+     * @var RuleValueList|string|null
      */
     private $mValue;
 
@@ -38,18 +43,10 @@ class Rule implements Renderable, Commentable
      */
     private $aIeHack;
 
-    /**
-     * @var int
-     */
-    protected $iLineNo;
-
-    /**
-     * @var int
-     */
-    protected $iColNo;
-
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
@@ -64,20 +61,23 @@ class Rule implements Renderable, Commentable
         $this->mValue = null;
         $this->bIsImportant = false;
         $this->aIeHack = [];
-        $this->iLineNo = $iLineNo;
-        $this->iColNo = $iColNo;
+        $this->setPosition($iLineNo, $iColNo);
         $this->aComments = [];
     }
 
     /**
+     * @param array<int, Comment> $commentsBeforeRule
+     *
      * @return Rule
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $commentsBeforeRule = [])
     {
-        $aComments = $oParserState->consumeWhiteSpace();
+        $aComments = \array_merge($commentsBeforeRule, $oParserState->consumeWhiteSpace());
         $oRule = new Rule(
             $oParserState->parseIdentifier(!$oParserState->comes("--")),
             $oParserState->currentLine(),
@@ -106,50 +106,31 @@ class Rule implements Renderable, Commentable
         while ($oParserState->comes(';')) {
             $oParserState->consume(';');
         }
-        $oParserState->consumeWhiteSpace();
 
         return $oRule;
     }
 
     /**
+     * Returns a list of delimiters (or separators).
+     * The first item is the innermost separator (or, put another way, the highest-precedence operator).
+     * The sequence continues to the outermost separator (or lowest-precedence operator).
+     *
      * @param string $sRule
      *
-     * @return array<int, string>
+     * @return list<non-empty-string>
      */
     private static function listDelimiterForRule($sRule)
     {
         if (preg_match('/^font($|-)/', $sRule)) {
             return [',', '/', ' '];
         }
-        return [',', ' ', '/'];
-    }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
-    /**
-     * @return int
-     */
-    public function getColNo()
-    {
-        return $this->iColNo;
-    }
-
-    /**
-     * @param int $iLine
-     * @param int $iColumn
-     *
-     * @return void
-     */
-    public function setPosition($iLine, $iColumn)
-    {
-        $this->iColNo = $iColumn;
-        $this->iLineNo = $iLine;
+        switch ($sRule) {
+            case 'src':
+                return [' ', ','];
+            default:
+                return [',', ' ', '/'];
+        }
     }
 
     /**
@@ -171,7 +152,7 @@ class Rule implements Renderable, Commentable
     }
 
     /**
-     * @return RuleValueList|null
+     * @return RuleValueList|string|null
      */
     public function getValue()
     {
@@ -179,7 +160,7 @@ class Rule implements Renderable, Commentable
     }
 
     /**
-     * @param RuleValueList|null $mValue
+     * @param RuleValueList|string|null $mValue
      *
      * @return void
      */
@@ -277,7 +258,7 @@ class Rule implements Renderable, Commentable
         }
         if (!$this->mValue instanceof RuleValueList || $this->mValue->getListSeparator() !== $sType) {
             $mCurrentValue = $this->mValue;
-            $this->mValue = new RuleValueList($sType, $this->iLineNo);
+            $this->mValue = new RuleValueList($sType, $this->getLineNumber());
             if ($mCurrentValue) {
                 $this->mValue->addListComponent($mCurrentValue);
             }
@@ -291,6 +272,8 @@ class Rule implements Renderable, Commentable
      * @param int $iModifier
      *
      * @return void
+     *
+     * @deprecated since V8.8.0, will be removed in V9.0
      */
     public function addIeHack($iModifier)
     {
@@ -301,6 +284,8 @@ class Rule implements Renderable, Commentable
      * @param array<int, int> $aModifiers
      *
      * @return void
+     *
+     * @deprecated since V8.8.0, will be removed in V9.0
      */
     public function setIeHack(array $aModifiers)
     {
@@ -309,6 +294,8 @@ class Rule implements Renderable, Commentable
 
     /**
      * @return array<int, int>
+     *
+     * @deprecated since V8.8.0, will be removed in V9.0
      */
     public function getIeHack()
     {
@@ -335,6 +322,8 @@ class Rule implements Renderable, Commentable
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -342,12 +331,14 @@ class Rule implements Renderable, Commentable
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
-        $sResult = "{$this->sRule}:{$oOutputFormat->spaceAfterRuleName()}";
-        if ($this->mValue instanceof Value) { //Can also be a ValueList
+        $sResult = "{$oOutputFormat->comments($this)}{$this->sRule}:{$oOutputFormat->spaceAfterRuleName()}";
+        if ($this->mValue instanceof Value) { // Can also be a ValueList
             $sResult .= $this->mValue->render($oOutputFormat);
         } else {
             $sResult .= $this->mValue;
diff --git a/lib/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php b/lib/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
index 88bc5bd31..e687cb961 100644
--- a/lib/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
+++ b/lib/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
@@ -6,7 +6,10 @@ use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Property\AtRule;
 
 /**
- * A RuleSet constructed by an unknown at-rule. `@font-face` rules are rendered into AtRuleSet objects.
+ * This class represents rule sets for generic at-rules which are not covered by specific classes, i.e., not
+ * `@import`, `@charset` or `@media`.
+ *
+ * A common example for this is `@font-face`.
  */
 class AtRuleSet extends RuleSet implements AtRule
 {
@@ -50,6 +53,8 @@ class AtRuleSet extends RuleSet implements AtRule
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -57,16 +62,19 @@ class AtRuleSet extends RuleSet implements AtRule
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult = "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderRules($oOutputFormat);
         $sResult .= '}';
         return $sResult;
     }
diff --git a/lib/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php b/lib/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
index c27cdd4c8..9cc14ebf7 100644
--- a/lib/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
+++ b/lib/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
@@ -19,7 +19,10 @@ use Sabberworm\CSS\Value\URL;
 use Sabberworm\CSS\Value\Value;
 
 /**
- * Declaration blocks are the parts of a CSS file which denote the rules belonging to a selector.
+ * This class represents a `RuleSet` constrained by a `Selector`.
+ *
+ * It contains an array of selector objects (comma-separated in the CSS) as well as the rules to be applied to the
+ * matching elements.
  *
  * Declaration blocks usually appear directly inside a `Document` or another `CSSList` (mostly a `MediaQuery`).
  */
@@ -46,6 +49,8 @@ class DeclarationBlock extends RuleSet
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState, $oList = null)
     {
@@ -178,6 +183,8 @@ class DeclarationBlock extends RuleSet
      * Splits shorthand declarations (e.g. `margin` or `font`) into their constituent parts.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandShorthands()
     {
@@ -193,6 +200,8 @@ class DeclarationBlock extends RuleSet
      * Creates shorthand declarations (e.g. `margin` or `font`) whenever possible.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createShorthands()
     {
@@ -212,6 +221,8 @@ class DeclarationBlock extends RuleSet
      * Multiple borders are not yet supported as of 3.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandBorderShorthand()
     {
@@ -273,6 +284,8 @@ class DeclarationBlock extends RuleSet
      * Handles `margin`, `padding`, `border-color`, `border-style` and `border-width`.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandDimensionsShorthand()
     {
@@ -333,6 +346,8 @@ class DeclarationBlock extends RuleSet
      * into their constituent parts.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandFontShorthand()
     {
@@ -403,6 +418,8 @@ class DeclarationBlock extends RuleSet
      * @see http://www.w3.org/TR/21/colors.html#propdef-background
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandBackgroundShorthand()
     {
@@ -417,8 +434,8 @@ class DeclarationBlock extends RuleSet
             'background-repeat' => ['repeat'],
             'background-attachment' => ['scroll'],
             'background-position' => [
-                new Size(0, '%', null, false, $this->iLineNo),
-                new Size(0, '%', null, false, $this->iLineNo),
+                new Size(0, '%', false, $this->getLineNo()),
+                new Size(0, '%', false, $this->getLineNo()),
             ],
         ];
         $mRuleValue = $oRule->getValue();
@@ -475,6 +492,8 @@ class DeclarationBlock extends RuleSet
 
     /**
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function expandListStyleShorthand()
     {
@@ -558,10 +577,13 @@ class DeclarationBlock extends RuleSet
      * @param string $sShorthand
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createShorthandProperties(array $aProperties, $sShorthand)
     {
         $aRules = $this->getRulesAssoc();
+        $oRule = null;
         $aNewValues = [];
         foreach ($aProperties as $sProperty) {
             if (!isset($aRules[$sProperty])) {
@@ -582,7 +604,7 @@ class DeclarationBlock extends RuleSet
                 $this->removeRule($sProperty);
             }
         }
-        if (count($aNewValues)) {
+        if ($aNewValues !== [] && $oRule instanceof Rule) {
             $oNewRule = new Rule($sShorthand, $oRule->getLineNo(), $oRule->getColNo());
             foreach ($aNewValues as $mValue) {
                 $oNewRule->addValue($mValue);
@@ -593,6 +615,8 @@ class DeclarationBlock extends RuleSet
 
     /**
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createBackgroundShorthand()
     {
@@ -608,6 +632,8 @@ class DeclarationBlock extends RuleSet
 
     /**
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createListStyleShorthand()
     {
@@ -625,6 +651,8 @@ class DeclarationBlock extends RuleSet
      * Should be run after `create_dimensions_shorthand`!
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createBorderShorthand()
     {
@@ -642,6 +670,8 @@ class DeclarationBlock extends RuleSet
      * and converts them into shorthand CSS properties.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createDimensionsShorthand()
     {
@@ -716,6 +746,8 @@ class DeclarationBlock extends RuleSet
      * At least `font-size` AND `font-family` must be present in order to create a shorthand declaration.
      *
      * @return void
+     *
+     * @deprecated since 8.7.0, will be removed without substitution in version 9.0 in #511
      */
     public function createFontShorthand()
     {
@@ -769,7 +801,7 @@ class DeclarationBlock extends RuleSet
                 $aLHValues = $mRuleValue->getListComponents();
             }
             if ($aLHValues[0] !== 'normal') {
-                $val = new RuleValueList('/', $this->iLineNo);
+                $val = new RuleValueList('/', $this->getLineNo());
                 $val->addListComponent($aFSValues[0]);
                 $val->addListComponent($aLHValues[0]);
                 $oNewRule->addValue($val);
@@ -785,7 +817,7 @@ class DeclarationBlock extends RuleSet
         } else {
             $aFFValues = $mRuleValue->getListComponents();
         }
-        $oFFValue = new RuleValueList(',', $this->iLineNo);
+        $oFFValue = new RuleValueList(',', $this->getLineNo());
         $oFFValue->setListComponents($aFFValues);
         $oNewRule->addValue($oFFValue);
 
@@ -799,6 +831,8 @@ class DeclarationBlock extends RuleSet
      * @return string
      *
      * @throws OutputException
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -806,24 +840,30 @@ class DeclarationBlock extends RuleSet
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      *
      * @throws OutputException
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
         if (count($this->aSelectors) === 0) {
             // If all the selectors have been removed, this declaration block becomes invalid
-            throw new OutputException("Attempt to print declaration block with missing selector", $this->iLineNo);
+            throw new OutputException(
+                'Attempt to print declaration block with missing selector',
+                $this->getLineNumber()
+            );
         }
-        $sResult = $oOutputFormat->sBeforeDeclarationBlock;
+        $sResult .= $oOutputFormat->sBeforeDeclarationBlock;
         $sResult .= $oOutputFormat->implode(
             $oOutputFormat->spaceBeforeSelectorSeparator() . ',' . $oOutputFormat->spaceAfterSelectorSeparator(),
             $this->aSelectors
         );
         $sResult .= $oOutputFormat->sAfterDeclarationBlockSelectors;
         $sResult .= $oOutputFormat->spaceBeforeOpeningBrace() . '{';
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= $this->renderRules($oOutputFormat);
         $sResult .= '}';
         $sResult .= $oOutputFormat->sAfterDeclarationBlock;
         return $sResult;
diff --git a/lib/sabberworm/php-css-parser/src/RuleSet/RuleSet.php b/lib/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
index 9404bb0bd..0110f50e0 100644
--- a/lib/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
+++ b/lib/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
@@ -4,31 +4,41 @@ namespace Sabberworm\CSS\RuleSet;
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Comment\Commentable;
+use Sabberworm\CSS\CSSElement;
 use Sabberworm\CSS\OutputFormat;
 use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 use Sabberworm\CSS\Renderable;
 use Sabberworm\CSS\Rule\Rule;
 
 /**
- * RuleSet is a generic superclass denoting rules. The typical example for rule sets are declaration block.
- * However, unknown At-Rules (like `@font-face`) are also rule sets.
+ * This class is a container for individual 'Rule's.
+ *
+ * The most common form of a rule set is one constrained by a selector, i.e., a `DeclarationBlock`.
+ * However, unknown `AtRule`s (like `@font-face`) are rule sets as well.
+ *
+ * If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)`
+ * (which accepts either a `Rule` or a rule name; optionally suffixed by a dash to remove all related rules).
  */
-abstract class RuleSet implements Renderable, Commentable
+abstract class RuleSet implements CSSElement, Commentable, Positionable
 {
+    use Position;
+
     /**
-     * @var array<string, Rule>
+     * the rules in this rule set, using the property name as the key,
+     * with potentially multiple rules per property name.
+     *
+     * @var array<string, array<int<0, max>, Rule>>
      */
     private $aRules;
 
-    /**
-     * @var int
-     */
-    protected $iLineNo;
-
     /**
      * @var array<array-key, Comment>
+     *
+     * @internal since 8.8.0
      */
     protected $aComments;
 
@@ -38,7 +48,7 @@ abstract class RuleSet implements Renderable, Commentable
     public function __construct($iLineNo = 0)
     {
         $this->aRules = [];
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
         $this->aComments = [];
     }
 
@@ -47,17 +57,23 @@ abstract class RuleSet implements Renderable, Commentable
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
+     *
+     * @internal since V8.8.0
      */
     public static function parseRuleSet(ParserState $oParserState, RuleSet $oRuleSet)
     {
         while ($oParserState->comes(';')) {
             $oParserState->consume(';');
         }
-        while (!$oParserState->comes('}')) {
+        while (true) {
+            $commentsBeforeRule = $oParserState->consumeWhiteSpace();
+            if ($oParserState->comes('}')) {
+                break;
+            }
             $oRule = null;
             if ($oParserState->getSettings()->bLenientParsing) {
                 try {
-                    $oRule = Rule::parse($oParserState);
+                    $oRule = Rule::parse($oParserState, $commentsBeforeRule);
                 } catch (UnexpectedTokenException $e) {
                     try {
                         $sConsume = $oParserState->consumeUntil(["\n", ";", '}'], true);
@@ -75,7 +91,7 @@ abstract class RuleSet implements Renderable, Commentable
                     }
                 }
             } else {
-                $oRule = Rule::parse($oParserState);
+                $oRule = Rule::parse($oParserState, $commentsBeforeRule);
             }
             if ($oRule) {
                 $oRuleSet->addRule($oRule);
@@ -84,20 +100,12 @@ abstract class RuleSet implements Renderable, Commentable
         $oParserState->consume('}');
     }
 
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
-
     /**
      * @param Rule|null $oSibling
      *
      * @return void
      */
-    public function addRule(Rule $oRule, Rule $oSibling = null)
+    public function addRule(Rule $oRule, $oSibling = null)
     {
         $sRule = $oRule->getRule();
         if (!isset($this->aRules[$sRule])) {
@@ -113,14 +121,19 @@ abstract class RuleSet implements Renderable, Commentable
                 $oRule->setPosition($oSibling->getLineNo(), $oSibling->getColNo() - 1);
             }
         }
-        if ($oRule->getLineNo() === 0 && $oRule->getColNo() === 0) {
+        if ($oRule->getLineNumber() === null) {
             //this node is added manually, give it the next best line
+            $columnNumber = $oRule->getColNo();
             $rules = $this->getRules();
             $pos = count($rules);
             if ($pos > 0) {
                 $last = $rules[$pos - 1];
-                $oRule->setPosition($last->getLineNo() + 1, 0);
+                $oRule->setPosition($last->getLineNo() + 1, $columnNumber);
+            } else {
+                $oRule->setPosition(1, $columnNumber);
             }
+        } elseif ($oRule->getColumnNumber() === null) {
+            $oRule->setPosition($oRule->getLineNumber(), 0);
         }
 
         array_splice($this->aRules[$sRule], $iPosition, 0, [$oRule]);
@@ -138,7 +151,8 @@ abstract class RuleSet implements Renderable, Commentable
      *        Pattern to search for. If null, returns all rules.
      *        If the pattern ends with a dash, all rules starting with the pattern are returned
      *        as well as one matching the pattern with the dash excluded.
-     *        Passing a Rule behaves like calling `getRules($mRule->getRule())`.
+     *        Passing a `Rule` for this parameter is deprecated in version 8.9.0, and will not work from v9.0.
+     *        Call `getRules($rule->getRule())` instead.
      *
      * @return array<int, Rule>
      */
@@ -197,7 +211,9 @@ abstract class RuleSet implements Renderable, Commentable
      * @param Rule|string|null $mRule $mRule
      *        Pattern to search for. If null, returns all rules. If the pattern ends with a dash,
      *        all rules starting with the pattern are returned as well as one matching the pattern with the dash
-     *        excluded. Passing a Rule behaves like calling `getRules($mRule->getRule())`.
+     *        excluded.
+     *        Passing a `Rule` for this parameter is deprecated in version 8.9.0, and will not work from v9.0.
+     *        Call `getRulesAssoc($rule->getRule())` instead.
      *
      * @return array<string, Rule>
      */
@@ -212,20 +228,12 @@ abstract class RuleSet implements Renderable, Commentable
     }
 
     /**
-     * Removes a rule from this RuleSet. This accepts all the possible values that `getRules()` accepts.
-     *
-     * If given a Rule, it will only remove this particular rule (by identity).
-     * If given a name, it will remove all rules by that name.
-     *
-     * Note: this is different from pre-v.2.0 behaviour of PHP-CSS-Parser, where passing a Rule instance would
-     * remove all rules with the same name. To get the old behaviour, use `removeRule($oRule->getRule())`.
+     * Removes a `Rule` from this `RuleSet` by identity.
      *
      * @param Rule|string|null $mRule
-     *        pattern to remove. If $mRule is null, all rules are removed. If the pattern ends in a dash,
-     *        all rules starting with the pattern are removed as well as one matching the pattern with the dash
-     *        excluded. Passing a Rule behaves matches by identity.
-     *
-     * @return void
+     *        `Rule` to remove.
+     *        Passing a `string` or `null` is deprecated in version 8.9.0, and will no longer work from v9.0.
+     *        Use `removeMatchingRules()` or `removeAllRules()` instead.
      */
     public function removeRule($mRule)
     {
@@ -239,24 +247,48 @@ abstract class RuleSet implements Renderable, Commentable
                     unset($this->aRules[$sRule][$iKey]);
                 }
             }
+        } elseif ($mRule !== null) {
+            $this->removeMatchingRules($mRule);
         } else {
-            foreach ($this->aRules as $sName => $aRules) {
-                // Either no search rule is given or the search rule matches the found rule exactly
-                // or the search rule ends in “-” and the found rule starts with the search rule or equals it
-                // (without the trailing dash).
-                if (
-                    !$mRule || $sName === $mRule
-                    || (strrpos($mRule, '-') === strlen($mRule) - strlen('-')
-                        && (strpos($sName, $mRule) === 0 || $sName === substr($mRule, 0, -1)))
-                ) {
-                    unset($this->aRules[$sName]);
-                }
-            }
+            $this->removeAllRules();
         }
     }
 
+    /**
+     * Removes rules by property name or search pattern.
+     *
+     * @param string $searchPattern
+     *        pattern to remove.
+     *        If the pattern ends in a dash,
+     *        all rules starting with the pattern are removed as well as one matching the pattern with the dash
+     *        excluded.
+     */
+    public function removeMatchingRules($searchPattern)
+    {
+        foreach ($this->aRules as $propertyName => $rules) {
+            // Either the search rule matches the found rule exactly
+            // or the search rule ends in “-” and the found rule starts with the search rule or equals it
+            // (without the trailing dash).
+            if (
+                $propertyName === $searchPattern
+                || (\strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
+                    && (\strpos($propertyName, $searchPattern) === 0
+                        || $propertyName === \substr($searchPattern, 0, -1)))
+            ) {
+                unset($this->aRules[$propertyName]);
+            }
+        }
+    }
+
+    public function removeAllRules()
+    {
+        $this->aRules = [];
+    }
+
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -266,26 +298,25 @@ abstract class RuleSet implements Renderable, Commentable
     /**
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    protected function renderRules(OutputFormat $oOutputFormat)
     {
         $sResult = '';
         $bIsFirst = true;
-        foreach ($this->aRules as $aRules) {
-            foreach ($aRules as $oRule) {
-                $sRendered = $oOutputFormat->safely(function () use ($oRule, $oOutputFormat) {
-                    return $oRule->render($oOutputFormat->nextLevel());
-                });
-                if ($sRendered === null) {
-                    continue;
-                }
-                if ($bIsFirst) {
-                    $bIsFirst = false;
-                    $sResult .= $oOutputFormat->nextLevel()->spaceBeforeRules();
-                } else {
-                    $sResult .= $oOutputFormat->nextLevel()->spaceBetweenRules();
-                }
-                $sResult .= $sRendered;
+        $oNextLevel = $oOutputFormat->nextLevel();
+        foreach ($this->getRules() as $oRule) {
+            $sRendered = $oNextLevel->safely(function () use ($oRule, $oNextLevel) {
+                return $oRule->render($oNextLevel);
+            });
+            if ($sRendered === null) {
+                continue;
             }
+            if ($bIsFirst) {
+                $bIsFirst = false;
+                $sResult .= $oNextLevel->spaceBeforeRules();
+            } else {
+                $sResult .= $oNextLevel->spaceBetweenRules();
+            }
+            $sResult .= $sRendered;
         }
 
         if (!$bIsFirst) {
diff --git a/lib/sabberworm/php-css-parser/src/Settings.php b/lib/sabberworm/php-css-parser/src/Settings.php
index 7b8580962..8d4bd4686 100644
--- a/lib/sabberworm/php-css-parser/src/Settings.php
+++ b/lib/sabberworm/php-css-parser/src/Settings.php
@@ -11,25 +11,31 @@ class Settings
 {
     /**
      * Multi-byte string support.
-     * If true (mbstring extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
+     *
+     * If `true` (`mbstring` extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
      * and `mb_strpos` functions. Otherwise, the normal (ASCII-Only) functions will be used.
      *
      * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $bMultibyteSupport;
 
     /**
-     * The default charset for the CSS if no `@charset` rule is found. Defaults to utf-8.
+     * The default charset for the CSS if no `@charset` declaration is found. Defaults to utf-8.
      *
      * @var string
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $sDefaultCharset = 'utf-8';
 
     /**
-     * Lenient parsing. When used (which is true by default), the parser will not choke
-     * on unexpected tokens but simply ignore them.
+     * Whether the parser silently ignore invalid rules instead of choking on them.
      *
      * @var bool
+     *
+     * @internal since 8.8.0, will be made private in 9.0.0
      */
     public $bLenientParsing = true;
 
@@ -47,6 +53,11 @@ class Settings
     }
 
     /**
+     * Enables/disables multi-byte string support.
+     *
+     * If `true` (`mbstring` extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
+     * and `mb_strpos` functions. Otherwise, the normal (ASCII-Only) functions will be used.
+     *
      * @param bool $bMultibyteSupport
      *
      * @return self fluent interface
@@ -58,6 +69,8 @@ class Settings
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sDefaultCharset
      *
      * @return self fluent interface
@@ -69,6 +82,8 @@ class Settings
     }
 
     /**
+     * Configures whether the parser should silently ignore invalid rules.
+     *
      * @param bool $bLenientParsing
      *
      * @return self fluent interface
@@ -80,6 +95,8 @@ class Settings
     }
 
     /**
+     * Configures the parser to choke on invalid rules.
+     *
      * @return self fluent interface
      */
     public function beStrict()
diff --git a/lib/sabberworm/php-css-parser/src/Value/CSSFunction.php b/lib/sabberworm/php-css-parser/src/Value/CSSFunction.php
index e6b8c1189..703f66585 100644
--- a/lib/sabberworm/php-css-parser/src/Value/CSSFunction.php
+++ b/lib/sabberworm/php-css-parser/src/Value/CSSFunction.php
@@ -3,11 +3,21 @@
 namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parsing\ParserState;
+use Sabberworm\CSS\Parsing\SourceException;
+use Sabberworm\CSS\Parsing\UnexpectedEOFException;
+use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * A `CSSFunction` represents a special kind of value that also contains a function name and where the values are the
+ * function’s arguments. It also handles equals-sign-separated argument lists like `filter: alpha(opacity=90);`.
+ */
 class CSSFunction extends ValueList
 {
     /**
      * @var string
+     *
+     * @internal since 8.8.0
      */
     protected $sName;
 
@@ -24,10 +34,32 @@ class CSSFunction extends ValueList
             $aArguments = $aArguments->getListComponents();
         }
         $this->sName = $sName;
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo); // TODO: redundant?
         parent::__construct($aArguments, $sSeparator, $iLineNo);
     }
 
+    /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
+     * @return CSSFunction
+     *
+     * @throws SourceException
+     * @throws UnexpectedEOFException
+     * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
+     */
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
+    {
+        $mResult = $oParserState->parseIdentifier($bIgnoreCase);
+        $oParserState->consume('(');
+        $aArguments = Value::parseValue($oParserState, ['=', ' ', ',']);
+        $mResult = new CSSFunction($mResult, $aArguments, ',', $oParserState->currentLine());
+        $oParserState->consume(')');
+        return $mResult;
+    }
+
     /**
      * @return string
      */
@@ -56,6 +88,8 @@ class CSSFunction extends ValueList
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -63,9 +97,11 @@ class CSSFunction extends ValueList
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         $aArguments = parent::render($oOutputFormat);
         return "{$this->sName}({$aArguments})";
diff --git a/lib/sabberworm/php-css-parser/src/Value/CSSString.php b/lib/sabberworm/php-css-parser/src/Value/CSSString.php
index 9fafedd7a..a6a705b54 100644
--- a/lib/sabberworm/php-css-parser/src/Value/CSSString.php
+++ b/lib/sabberworm/php-css-parser/src/Value/CSSString.php
@@ -8,6 +8,11 @@ use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * This class is a wrapper for quoted strings to distinguish them from keywords.
+ *
+ * `CSSString`s always output with double quotes.
+ */
 class CSSString extends PrimitiveValue
 {
     /**
@@ -31,6 +36,8 @@ class CSSString extends PrimitiveValue
      * @throws SourceException
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState)
     {
@@ -87,6 +94,8 @@ class CSSString extends PrimitiveValue
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -94,9 +103,11 @@ class CSSString extends PrimitiveValue
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         $sString = addslashes($this->sString);
         $sString = str_replace("\n", '\A', $sString);
diff --git a/lib/sabberworm/php-css-parser/src/Value/CalcFunction.php b/lib/sabberworm/php-css-parser/src/Value/CalcFunction.php
index 5c92e0c08..c3ed0a08f 100644
--- a/lib/sabberworm/php-css-parser/src/Value/CalcFunction.php
+++ b/lib/sabberworm/php-css-parser/src/Value/CalcFunction.php
@@ -6,33 +6,57 @@ use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * Support for `-webkit-calc` and `-moz-calc` is deprecated in version 8.8.0, and will be removed in version 9.0.0.
+ */
 class CalcFunction extends CSSFunction
 {
     /**
      * @var int
+     *
+     * @internal
      */
     const T_OPERAND = 1;
 
     /**
      * @var int
+     *
+     * @internal
      */
     const T_OPERATOR = 2;
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return CalcFunction
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
+     *
+     * @internal since V8.8.0
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aOperators = ['+', '-', '*', '/'];
-        $sFunction = trim($oParserState->consumeUntil('(', false, true));
+        $sFunction = $oParserState->parseIdentifier();
+        if ($oParserState->peek() != '(') {
+            // Found ; or end of line before an opening bracket
+            throw new UnexpectedTokenException('(', $oParserState->peek(), 'literal', $oParserState->currentLine());
+        } elseif (!in_array($sFunction, ['calc', '-moz-calc', '-webkit-calc'])) {
+            // Found invalid calc definition. Example calc (...
+            throw new UnexpectedTokenException('calc', $sFunction, 'literal', $oParserState->currentLine());
+        }
+        $oParserState->consume('(');
         $oCalcList = new CalcRuleValueList($oParserState->currentLine());
         $oList = new RuleValueList(',', $oParserState->currentLine());
         $iNestingLevel = 0;
         $iLastComponentType = null;
         while (!$oParserState->comes(')') || $iNestingLevel > 0) {
+            if ($oParserState->isEnd() && $iNestingLevel === 0) {
+                break;
+            }
+
             $oParserState->consumeWhiteSpace();
             if ($oParserState->comes('(')) {
                 $iNestingLevel++;
@@ -72,7 +96,7 @@ class CalcFunction extends CSSFunction
                         sprintf(
                             'Next token was expected to be an operand of type %s. Instead "%s" was found.',
                             implode(', ', $aOperators),
-                            $oVal
+                            $oParserState->peek()
                         ),
                         '',
                         'custom',
@@ -83,7 +107,9 @@ class CalcFunction extends CSSFunction
             $oParserState->consumeWhiteSpace();
         }
         $oList->addListComponent($oCalcList);
-        $oParserState->consume(')');
+        if (!$oParserState->isEnd()) {
+            $oParserState->consume(')');
+        }
         return new CalcFunction($sFunction, $oList, ',', $oParserState->currentLine());
     }
 }
diff --git a/lib/sabberworm/php-css-parser/src/Value/CalcRuleValueList.php b/lib/sabberworm/php-css-parser/src/Value/CalcRuleValueList.php
index 7dbd26a1b..17fbe7cfa 100644
--- a/lib/sabberworm/php-css-parser/src/Value/CalcRuleValueList.php
+++ b/lib/sabberworm/php-css-parser/src/Value/CalcRuleValueList.php
@@ -15,9 +15,11 @@ class CalcRuleValueList extends RuleValueList
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return $oOutputFormat->implode(' ', $this->aComponents);
     }
diff --git a/lib/sabberworm/php-css-parser/src/Value/Color.php b/lib/sabberworm/php-css-parser/src/Value/Color.php
index 8dc52960c..d4b7caf0c 100644
--- a/lib/sabberworm/php-css-parser/src/Value/Color.php
+++ b/lib/sabberworm/php-css-parser/src/Value/Color.php
@@ -7,6 +7,10 @@ use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * `Color's can be input in the form #rrggbb, #rgb or schema(val1, val2, …) but are always stored as an array of
+ * ('s' => val1, 'c' => val2, 'h' => val3, …) and output in the second form.
+ */
 class Color extends CSSFunction
 {
     /**
@@ -19,12 +23,17 @@ class Color extends CSSFunction
     }
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return Color|CSSFunction
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aColor = [];
         if ($oParserState->comes('#')) {
@@ -49,12 +58,19 @@ class Color extends CSSFunction
                         $oParserState->currentLine()
                     ),
                 ];
-            } else {
+            } elseif ($oParserState->strlen($sValue) === 6) {
                 $aColor = [
                     'r' => new Size(intval($sValue[0] . $sValue[1], 16), null, true, $oParserState->currentLine()),
                     'g' => new Size(intval($sValue[2] . $sValue[3], 16), null, true, $oParserState->currentLine()),
                     'b' => new Size(intval($sValue[4] . $sValue[5], 16), null, true, $oParserState->currentLine()),
                 ];
+            } else {
+                throw new UnexpectedTokenException(
+                    'Invalid hex color value',
+                    $sValue,
+                    'custom',
+                    $oParserState->currentLine()
+                );
             }
         } else {
             $sColorMode = $oParserState->parseIdentifier(true);
@@ -139,6 +155,8 @@ class Color extends CSSFunction
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -146,9 +164,11 @@ class Color extends CSSFunction
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         // Shorthand RGB color values
         if ($oOutputFormat->getRGBHashNotation() && implode('', array_keys($this->aComponents)) === 'rgb') {
diff --git a/lib/sabberworm/php-css-parser/src/Value/LineName.php b/lib/sabberworm/php-css-parser/src/Value/LineName.php
index e231ce38f..effc827c5 100644
--- a/lib/sabberworm/php-css-parser/src/Value/LineName.php
+++ b/lib/sabberworm/php-css-parser/src/Value/LineName.php
@@ -23,6 +23,8 @@ class LineName extends ValueList
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState)
     {
@@ -49,6 +51,8 @@ class LineName extends ValueList
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -56,9 +60,11 @@ class LineName extends ValueList
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return '[' . parent::render(OutputFormat::createCompact()) . ']';
     }
diff --git a/lib/sabberworm/php-css-parser/src/Value/RuleValueList.php b/lib/sabberworm/php-css-parser/src/Value/RuleValueList.php
index 5d533a7cb..8fe88b610 100644
--- a/lib/sabberworm/php-css-parser/src/Value/RuleValueList.php
+++ b/lib/sabberworm/php-css-parser/src/Value/RuleValueList.php
@@ -2,6 +2,11 @@
 
 namespace Sabberworm\CSS\Value;
 
+/**
+ * This class is used to represent all multivalued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;`
+ * (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list
+ * and a comma-separated list).
+ */
 class RuleValueList extends ValueList
 {
     /**
diff --git a/lib/sabberworm/php-css-parser/src/Value/Size.php b/lib/sabberworm/php-css-parser/src/Value/Size.php
index b3801dc17..988769734 100644
--- a/lib/sabberworm/php-css-parser/src/Value/Size.php
+++ b/lib/sabberworm/php-css-parser/src/Value/Size.php
@@ -7,24 +7,49 @@ use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * A `Size` consists of a numeric `size` value and a unit.
+ */
 class Size extends PrimitiveValue
 {
     /**
      * vh/vw/vm(ax)/vmin/rem are absolute insofar as they don’t scale to the immediate parent (only the viewport)
      *
      * @var array<int, string>
+     *
+     * @internal
      */
-    const ABSOLUTE_SIZE_UNITS = ['px', 'cm', 'mm', 'mozmm', 'in', 'pt', 'pc', 'vh', 'vw', 'vmin', 'vmax', 'rem'];
+    const ABSOLUTE_SIZE_UNITS = [
+        'px',
+        'pt',
+        'pc',
+        'cm',
+        'mm',
+        'mozmm',
+        'in',
+        'vh',
+        'dvh',
+        'svh',
+        'lvh',
+        'vw',
+        'vmin',
+        'vmax',
+        'rem',
+    ];
 
     /**
      * @var array<int, string>
+     *
+     * @internal
      */
     const RELATIVE_SIZE_UNITS = ['%', 'em', 'ex', 'ch', 'fr'];
 
     /**
      * @var array<int, string>
+     *
+     * @internal
      */
-    const NON_SIZE_UNITS = ['deg', 'grad', 'rad', 's', 'ms', 'turns', 'Hz', 'kHz'];
+    const NON_SIZE_UNITS = ['deg', 'grad', 'rad', 's', 'ms', 'turn', 'Hz', 'kHz'];
 
     /**
      * @var array<int, array<string, string>>|null
@@ -67,6 +92,8 @@ class Size extends PrimitiveValue
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState, $bIsColorComponent = false)
     {
@@ -74,9 +101,16 @@ class Size extends PrimitiveValue
         if ($oParserState->comes('-')) {
             $sSize .= $oParserState->consume('-');
         }
-        while (is_numeric($oParserState->peek()) || $oParserState->comes('.')) {
+        while (is_numeric($oParserState->peek()) || $oParserState->comes('.') || $oParserState->comes('e', true)) {
             if ($oParserState->comes('.')) {
                 $sSize .= $oParserState->consume('.');
+            } elseif ($oParserState->comes('e', true)) {
+                $sLookahead = $oParserState->peek(1, 1);
+                if (is_numeric($sLookahead) || $sLookahead === '+' || $sLookahead === '-') {
+                    $sSize .= $oParserState->consume(2);
+                } else {
+                    break; // Reached the unit part of the number like "em" or "ex"
+                }
             } else {
                 $sSize .= $oParserState->consume(1);
             }
@@ -188,6 +222,8 @@ class Size extends PrimitiveValue
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -195,14 +231,16 @@ class Size extends PrimitiveValue
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         $l = localeconv();
         $sPoint = preg_quote($l['decimal_point'], '/');
         $sSize = preg_match("/[\d\.]+e[+-]?\d+/i", (string)$this->fSize)
-            ? preg_replace("/$sPoint?0+$/", "", sprintf("%f", $this->fSize)) : $this->fSize;
+            ? preg_replace("/$sPoint?0+$/", "", sprintf("%f", $this->fSize)) : (string)$this->fSize;
         return preg_replace(["/$sPoint/", "/^(-?)0\./"], ['.', '$1.'], $sSize)
             . ($this->sUnit === null ? '' : $this->sUnit);
     }
diff --git a/lib/sabberworm/php-css-parser/src/Value/URL.php b/lib/sabberworm/php-css-parser/src/Value/URL.php
index 1467d505c..1f2a0af73 100644
--- a/lib/sabberworm/php-css-parser/src/Value/URL.php
+++ b/lib/sabberworm/php-css-parser/src/Value/URL.php
@@ -8,6 +8,9 @@ use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * This class represents URLs in CSS. `URL`s always output in `URL("")` notation.
+ */
 class URL extends PrimitiveValue
 {
     /**
@@ -30,14 +33,26 @@ class URL extends PrimitiveValue
      * @throws SourceException
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public static function parse(ParserState $oParserState)
     {
-        $bUseUrl = $oParserState->comes('url', true);
+        $oAnchor = $oParserState->anchor();
+        $sIdentifier = '';
+        for ($i = 0; $i < 3; $i++) {
+            $sChar = $oParserState->parseCharacter(true);
+            if ($sChar === null) {
+                break;
+            }
+            $sIdentifier .= $sChar;
+        }
+        $bUseUrl = $oParserState->streql($sIdentifier, 'url');
         if ($bUseUrl) {
-            $oParserState->consume('url');
             $oParserState->consumeWhiteSpace();
             $oParserState->consume('(');
+        } else {
+            $oAnchor->backtrack();
         }
         $oParserState->consumeWhiteSpace();
         $oResult = new URL(CSSString::parse($oParserState), $oParserState->currentLine());
@@ -66,6 +81,8 @@ class URL extends PrimitiveValue
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -73,9 +90,11 @@ class URL extends PrimitiveValue
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return "url({$this->oURL->render($oOutputFormat)})";
     }
diff --git a/lib/sabberworm/php-css-parser/src/Value/Value.php b/lib/sabberworm/php-css-parser/src/Value/Value.php
index 66cb9fd47..3025566f0 100644
--- a/lib/sabberworm/php-css-parser/src/Value/Value.php
+++ b/lib/sabberworm/php-css-parser/src/Value/Value.php
@@ -2,25 +2,28 @@
 
 namespace Sabberworm\CSS\Value;
 
+use Sabberworm\CSS\CSSElement;
 use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
-use Sabberworm\CSS\Renderable;
+use Sabberworm\CSS\Position\Position;
+use Sabberworm\CSS\Position\Positionable;
 
-abstract class Value implements Renderable
+/**
+ * Abstract base class for specific classes of CSS values: `Size`, `Color`, `CSSString` and `URL`, and another
+ * abstract subclass `ValueList`.
+ */
+abstract class Value implements CSSElement, Positionable
 {
-    /**
-     * @var int
-     */
-    protected $iLineNo;
+    use Position;
 
     /**
      * @param int $iLineNo
      */
     public function __construct($iLineNo = 0)
     {
-        $this->iLineNo = $iLineNo;
+        $this->setPosition($iLineNo);
     }
 
     /**
@@ -30,6 +33,8 @@ abstract class Value implements Renderable
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
+     *
+     * @internal since V8.8.0
      */
     public static function parseValue(ParserState $oParserState, array $aListDelimiters = [])
     {
@@ -39,8 +44,9 @@ abstract class Value implements Renderable
         //Build a list of delimiters and parsed values
         while (
             !($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!')
-            || $oParserState->comes(')')
-            || $oParserState->comes('\\'))
+                || $oParserState->comes(')')
+                || $oParserState->comes('\\')
+                || $oParserState->isEnd())
         ) {
             if (count($aStack) > 0) {
                 $bFoundDelimiter = false;
@@ -62,23 +68,30 @@ abstract class Value implements Renderable
         }
         // Convert the list to list objects
         foreach ($aListDelimiters as $sDelimiter) {
-            if (count($aStack) === 1) {
+            $iStackLength = count($aStack);
+            if ($iStackLength === 1) {
                 return $aStack[0];
             }
-            $iStartPosition = null;
-            while (($iStartPosition = array_search($sDelimiter, $aStack, true)) !== false) {
+            $aNewStack = [];
+            for ($iStartPosition = 0; $iStartPosition < $iStackLength; ++$iStartPosition) {
+                if ($iStartPosition === ($iStackLength - 1) || $sDelimiter !== $aStack[$iStartPosition + 1]) {
+                    $aNewStack[] = $aStack[$iStartPosition];
+                    continue;
+                }
                 $iLength = 2; //Number of elements to be joined
-                for ($i = $iStartPosition + 2; $i < count($aStack); $i += 2, ++$iLength) {
+                for ($i = $iStartPosition + 3; $i < $iStackLength; $i += 2, ++$iLength) {
                     if ($sDelimiter !== $aStack[$i]) {
                         break;
                     }
                 }
                 $oList = new RuleValueList($sDelimiter, $oParserState->currentLine());
-                for ($i = $iStartPosition - 1; $i - $iStartPosition + 1 < $iLength * 2; $i += 2) {
+                for ($i = $iStartPosition; $i - $iStartPosition < $iLength * 2; $i += 2) {
                     $oList->addListComponent($aStack[$i]);
                 }
-                array_splice($aStack, $iStartPosition - 1, $iLength * 2 - 1, [$oList]);
+                $aNewStack[] = $oList;
+                $iStartPosition += $iLength * 2 - 2;
             }
+            $aStack = $aNewStack;
         }
         if (!isset($aStack[0])) {
             throw new UnexpectedTokenException(
@@ -98,19 +111,30 @@ abstract class Value implements Renderable
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
+     *
+     * @internal since V8.8.0
      */
     public static function parseIdentifierOrFunction(ParserState $oParserState, $bIgnoreCase = false)
     {
-        $sResult = $oParserState->parseIdentifier($bIgnoreCase);
+        $oAnchor = $oParserState->anchor();
+        $mResult = $oParserState->parseIdentifier($bIgnoreCase);
 
         if ($oParserState->comes('(')) {
-            $oParserState->consume('(');
-            $aArguments = Value::parseValue($oParserState, ['=', ' ', ',']);
-            $sResult = new CSSFunction($sResult, $aArguments, ',', $oParserState->currentLine());
-            $oParserState->consume(')');
+            $oAnchor->backtrack();
+            if ($oParserState->streql('url', $mResult)) {
+                $mResult = URL::parse($oParserState);
+            } elseif (
+                $oParserState->streql('calc', $mResult)
+                || $oParserState->streql('-webkit-calc', $mResult)
+                || $oParserState->streql('-moz-calc', $mResult)
+            ) {
+                $mResult = CalcFunction::parse($oParserState);
+            } else {
+                $mResult = CSSFunction::parse($oParserState, $bIgnoreCase);
+            }
         }
 
-        return $sResult;
+        return $mResult;
     }
 
     /**
@@ -119,6 +143,8 @@ abstract class Value implements Renderable
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
      * @throws SourceException
+     *
+     * @internal since V8.8.0
      */
     public static function parsePrimitiveValue(ParserState $oParserState)
     {
@@ -133,13 +159,6 @@ abstract class Value implements Renderable
             $oValue = Size::parse($oParserState);
         } elseif ($oParserState->comes('#') || $oParserState->comes('rgb', true) || $oParserState->comes('hsl', true)) {
             $oValue = Color::parse($oParserState);
-        } elseif ($oParserState->comes('url', true)) {
-            $oValue = URL::parse($oParserState);
-        } elseif (
-            $oParserState->comes('calc', true) || $oParserState->comes('-webkit-calc', true)
-            || $oParserState->comes('-moz-calc', true)
-        ) {
-            $oValue = CalcFunction::parse($oParserState);
         } elseif ($oParserState->comes("'") || $oParserState->comes('"')) {
             $oValue = CSSString::parse($oParserState);
         } elseif ($oParserState->comes("progid:") && $oParserState->getSettings()->bLenientParsing) {
@@ -149,7 +168,16 @@ abstract class Value implements Renderable
         } elseif ($oParserState->comes("U+")) {
             $oValue = self::parseUnicodeRangeValue($oParserState);
         } else {
-            $oValue = self::parseIdentifierOrFunction($oParserState);
+            $sNextChar = $oParserState->peek(1);
+            try {
+                $oValue = self::parseIdentifierOrFunction($oParserState);
+            } catch (UnexpectedTokenException $e) {
+                if (\in_array($sNextChar, ['+', '-', '*', '/'], true)) {
+                    $oValue = $oParserState->consume(1);
+                } else {
+                    throw $e;
+                }
+            }
         }
         $oParserState->consumeWhiteSpace();
         return $oValue;
@@ -187,12 +215,4 @@ abstract class Value implements Renderable
         } while (strlen($sRange) < $iCodepointMaxLength && preg_match("/[A-Fa-f0-9\?-]/", $oParserState->peek()));
         return "U+{$sRange}";
     }
-
-    /**
-     * @return int
-     */
-    public function getLineNo()
-    {
-        return $this->iLineNo;
-    }
 }
diff --git a/lib/sabberworm/php-css-parser/src/Value/ValueList.php b/lib/sabberworm/php-css-parser/src/Value/ValueList.php
index af5348b96..619622589 100644
--- a/lib/sabberworm/php-css-parser/src/Value/ValueList.php
+++ b/lib/sabberworm/php-css-parser/src/Value/ValueList.php
@@ -4,15 +4,25 @@ namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\OutputFormat;
 
+/**
+ * A `ValueList` represents a lists of `Value`s, separated by some separation character
+ * (mostly `,`, whitespace, or `/`).
+ *
+ * There are two types of `ValueList`s: `RuleValueList` and `CSSFunction`
+ */
 abstract class ValueList extends Value
 {
     /**
      * @var array<int, RuleValueList|CSSFunction|CSSString|LineName|Size|URL|string>
+     *
+     * @internal since 8.8.0
      */
     protected $aComponents;
 
     /**
      * @var string
+     *
+     * @internal since 8.8.0
      */
     protected $sSeparator;
 
@@ -80,6 +90,8 @@ abstract class ValueList extends Value
 
     /**
      * @return string
+     *
+     * @deprecated in V8.8.0, will be removed in V9.0.0. Use `render` instead.
      */
     public function __toString()
     {
@@ -87,9 +99,11 @@ abstract class ValueList extends Value
     }
 
     /**
+     * @param OutputFormat|null $oOutputFormat
+     *
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    public function render($oOutputFormat)
     {
         return $oOutputFormat->implode(
             $oOutputFormat->spaceBeforeListArgumentSeparator($this->sSeparator) . $this->sSeparator
diff --git a/lib/scssphp/scssphp/bin/pscss b/lib/scssphp/scssphp/bin/pscss
old mode 100644
new mode 100755
diff --git a/lib/scssphp/scssphp/src/Block/DirectiveBlock.php b/lib/scssphp/scssphp/src/Block/DirectiveBlock.php
index b1d3d1a81..22b346e9b 100644
--- a/lib/scssphp/scssphp/src/Block/DirectiveBlock.php
+++ b/lib/scssphp/scssphp/src/Block/DirectiveBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,7 +27,7 @@ class DirectiveBlock extends Block
     public $name;
 
     /**
-     * @var string|array|null
+     * @var array|Number|null
      */
     public $value;
 
diff --git a/lib/scssphp/scssphp/src/Block/EachBlock.php b/lib/scssphp/scssphp/src/Block/EachBlock.php
index b3289579d..1217994ea 100644
--- a/lib/scssphp/scssphp/src/Block/EachBlock.php
+++ b/lib/scssphp/scssphp/src/Block/EachBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,7 +27,7 @@ class EachBlock extends Block
     public $vars = [];
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $list;
 
diff --git a/lib/scssphp/scssphp/src/Block/ElseifBlock.php b/lib/scssphp/scssphp/src/Block/ElseifBlock.php
index 4622bca79..f732c2d70 100644
--- a/lib/scssphp/scssphp/src/Block/ElseifBlock.php
+++ b/lib/scssphp/scssphp/src/Block/ElseifBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@ use ScssPhp\ScssPhp\Type;
 class ElseifBlock extends Block
 {
     /**
-     * @var array
+     * @var array|Number
      */
     public $cond;
 
diff --git a/lib/scssphp/scssphp/src/Block/ForBlock.php b/lib/scssphp/scssphp/src/Block/ForBlock.php
index a9cf6733b..962944111 100644
--- a/lib/scssphp/scssphp/src/Block/ForBlock.php
+++ b/lib/scssphp/scssphp/src/Block/ForBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -26,12 +27,12 @@ class ForBlock extends Block
     public $var;
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $start;
 
     /**
-     * @var array
+     * @var array|Number
      */
     public $end;
 
diff --git a/lib/scssphp/scssphp/src/Block/IfBlock.php b/lib/scssphp/scssphp/src/Block/IfBlock.php
index 9f21bf88a..659c7c274 100644
--- a/lib/scssphp/scssphp/src/Block/IfBlock.php
+++ b/lib/scssphp/scssphp/src/Block/IfBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@ use ScssPhp\ScssPhp\Type;
 class IfBlock extends Block
 {
     /**
-     * @var array
+     * @var array|Number
      */
     public $cond;
 
diff --git a/lib/scssphp/scssphp/src/Block/MediaBlock.php b/lib/scssphp/scssphp/src/Block/MediaBlock.php
index c49ee1b2b..ab975c74e 100644
--- a/lib/scssphp/scssphp/src/Block/MediaBlock.php
+++ b/lib/scssphp/scssphp/src/Block/MediaBlock.php
@@ -13,6 +13,7 @@
 namespace ScssPhp\ScssPhp\Block;
 
 use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\Type;
 
 /**
@@ -21,7 +22,7 @@ use ScssPhp\ScssPhp\Type;
 class MediaBlock extends Block
 {
     /**
-     * @var string|array|null
+     * @var string|array|Number|null
      */
     public $value;
 
diff --git a/lib/scssphp/scssphp/src/Compiler.php b/lib/scssphp/scssphp/src/Compiler.php
index d4e7c6896..d654ee6eb 100644
--- a/lib/scssphp/scssphp/src/Compiler.php
+++ b/lib/scssphp/scssphp/src/Compiler.php
@@ -140,13 +140,28 @@ class Compiler
     /** @deprecated */
     public static $Infinity     = [Type::T_KEYWORD, 'Infinity'];
     public static $null         = [Type::T_NULL];
+    /**
+     * @internal
+     */
     public static $nullString   = [Type::T_STRING, '', []];
+    /**
+     * @internal
+     */
     public static $defaultValue = [Type::T_KEYWORD, ''];
+    /**
+     * @internal
+     */
     public static $selfSelector = [Type::T_SELF];
     public static $emptyList    = [Type::T_LIST, '', []];
     public static $emptyMap     = [Type::T_MAP, [], []];
     public static $emptyString  = [Type::T_STRING, '"', []];
+    /**
+     * @internal
+     */
     public static $with         = [Type::T_KEYWORD, 'with'];
+    /**
+     * @internal
+     */
     public static $without      = [Type::T_KEYWORD, 'without'];
     private static $emptyArgumentList = [Type::T_LIST, '', [], []];
 
@@ -1656,6 +1671,7 @@ class Compiler
                 $parser = $this->parserFactory(__METHOD__);
 
                 if ($parser->parseValue($buffer, $reParsedWith)) {
+                    \assert(\is_array($reParsedWith));
                     $withCondition = $reParsedWith;
                 }
             }
@@ -5702,9 +5718,35 @@ EOL;
             @trigger_error('Omitting the argument declaration when registering custom function is deprecated and won\'t be supported in ScssPhp 2.0 anymore.', E_USER_DEPRECATED);
         }
 
+        if ($this->reflectCallable($callback)->getNumberOfRequiredParameters() > 1) {
+            @trigger_error('The second argument passed to the callback of custom functions is deprecated and won\'t be supported in ScssPhp 2.0 anymore. Register a callback accepting only 1 parameter instead.', E_USER_DEPRECATED);
+        }
+
         $this->userFunctions[$this->normalizeName($name)] = [$callback, $argumentDeclaration];
     }
 
+    /**
+     * @return \ReflectionFunctionAbstract
+     */
+    private function reflectCallable(callable $c)
+    {
+        if (\is_object($c) && !$c instanceof \Closure) {
+            $c = [$c, '__invoke'];
+        }
+
+        if (\is_string($c) && false !== strpos($c, '::')) {
+            $c = explode('::', $c, 2);
+        }
+
+        if (\is_array($c)) {
+            return new \ReflectionMethod($c[0], $c[1]);
+        }
+
+        \assert(\is_string($c) || $c instanceof \Closure);
+
+        return new \ReflectionFunction($c);
+    }
+
     /**
      * Unregister function
      *
diff --git a/lib/scssphp/scssphp/src/Parser.php b/lib/scssphp/scssphp/src/Parser.php
index 2666a263c..e7cb2e8c1 100644
--- a/lib/scssphp/scssphp/src/Parser.php
+++ b/lib/scssphp/scssphp/src/Parser.php
@@ -310,8 +310,9 @@ class Parser
      *
      * @api
      *
-     * @param string       $buffer
-     * @param string|array $out
+     * @param string $buffer
+     * @param mixed  $out
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -345,9 +346,9 @@ class Parser
      *
      * @api
      *
-     * @param string       $buffer
-     * @param string|array $out
-     * @param bool         $shouldValidate
+     * @param string $buffer
+     * @param array  $out
+     * @param bool   $shouldValidate
      *
      * @return bool
      */
@@ -1255,10 +1256,10 @@ class Parser
     /**
      * Assert a parsed part is plain CSS Valid
      *
-     * @param array|false $parsed
+     * @param array|Number|false $parsed
      * @param int         $startPos
      *
-     * @return array
+     * @return array|Number
      *
      * @throws ParserException
      */
@@ -1288,10 +1289,10 @@ class Parser
     /**
      * Check a parsed element is plain CSS Valid
      *
-     * @param array $parsed
+     * @param array|Number|string $parsed
      * @param bool  $allowExpression
      *
-     * @return array|false
+     * @return ($parsed is string ? string : ($parsed is Number ? Number : array|false))
      */
     protected function isPlainCssValidElement($parsed, $allowExpression = false)
     {
@@ -1300,6 +1301,10 @@ class Parser
             return $parsed;
         }
 
+        if ($parsed instanceof Number) {
+            return $parsed;
+        }
+
         if (
             \in_array($parsed[0], [Type::T_FUNCTION, Type::T_FUNCTION_CALL]) &&
             !\in_array($parsed[1], [
@@ -2094,8 +2099,9 @@ class Parser
     /**
      * Parse directive value list that considers $vars as keyword
      *
-     * @param array        $out
+     * @param mixed        $out
      * @param string|false $endChar
+     * @param-out array|Number $out
      *
      * @return bool
      *
@@ -2158,7 +2164,8 @@ class Parser
     /**
      * Parse comma separated value list
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -2176,10 +2183,11 @@ class Parser
      * Parse a function call, where externals () are part of the call
      * and not of the value list
      *
-     * @param array       $out
+     * @param mixed       $out
      * @param bool        $mandatoryEnclos
      * @param null|string $charAfter
      * @param null|bool   $eatWhiteSp
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -2215,7 +2223,8 @@ class Parser
     /**
      * Parse space separated value list
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -2227,10 +2236,11 @@ class Parser
     /**
      * Parse generic list
      *
-     * @param array  $out
+     * @param mixed  $out
      * @param string $parseItem The name of the method used to parse items
      * @param string $delim
      * @param bool   $flatten
+     * @param-out ($flatten is false ? array : array|Number) $out
      *
      * @return bool
      */
@@ -2334,9 +2344,10 @@ class Parser
     /**
      * Parse expression
      *
-     * @param array $out
+     * @param mixed $out
      * @param bool  $listOnly
      * @param bool  $lookForExp
+     * @param-out array|Number $out
      *
      * @return bool
      *
@@ -2401,10 +2412,11 @@ class Parser
     /**
      * Parse expression specifically checking for lists in parenthesis or brackets
      *
-     * @param array    $out
+     * @param mixed    $out
      * @param int      $s
      * @param string   $closingParen
      * @param string[] $allowedTypes
+     * @param-out array|Number $out
      *
      * @return bool
      *
@@ -2463,10 +2475,10 @@ class Parser
     /**
      * Parse left-hand side of subexpression
      *
-     * @param array $lhs
-     * @param int   $minP
+     * @param array|Number $lhs
+     * @param int          $minP
      *
-     * @return array
+     * @return array|Number
      */
     protected function expHelper($lhs, $minP)
     {
@@ -2517,7 +2529,8 @@ class Parser
     /**
      * Parse value
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -2725,7 +2738,8 @@ class Parser
     /**
      * Parse parenthesized value
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array|Number $out
      *
      * @return bool
      */
@@ -2797,7 +2811,8 @@ class Parser
      * Parse function call
      *
      * @param string $name
-     * @param array  $func
+     * @param mixed  $func
+     * @param-out array $func
      *
      * @return bool
      */
@@ -2900,7 +2915,8 @@ class Parser
     /**
      * Parse mixin/function definition  argument list
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out list<array{string, array|Number|null, bool}> $out
      *
      * @return bool
      */
@@ -2962,7 +2978,8 @@ class Parser
     /**
      * Parse map
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array $out
      *
      * @return bool
      */
@@ -3004,7 +3021,8 @@ class Parser
     /**
      * Parse color
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array $out
      *
      * @return bool
      */
@@ -3030,7 +3048,8 @@ class Parser
     /**
      * Parse number with unit
      *
-     * @param array $unit
+     * @param mixed $unit
+     * @param-out Number $unit
      *
      * @return bool
      */
@@ -3236,11 +3255,12 @@ class Parser
      * Parse an unbounded string stopped by $end
      *
      * @param string $end
-     * @param array  $out
+     * @param mixed  $out
      * @param string $nestOpen
      * @param string $nestClose
      * @param bool   $rtrim
      * @param string $disallow
+     * @param-out array $out
      *
      * @return bool
      */
@@ -3317,8 +3337,9 @@ class Parser
     /**
      * Parser interpolation
      *
-     * @param string|array $out
-     * @param bool         $lookWhite save information about whitespace before and after
+     * @param mixed $out
+     * @param bool  $lookWhite save information about whitespace before and after
+     * @param-out array $out
      *
      * @return bool
      */
@@ -3852,7 +3873,8 @@ class Parser
     /**
      * Parse a variable
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array{Type::*, string} $out
      *
      * @return bool
      */
@@ -3881,9 +3903,10 @@ class Parser
     /**
      * Parse a keyword
      *
-     * @param string $word
-     * @param bool   $eatWhitespace
-     * @param bool   $inSelector
+     * @param mixed $word
+     * @param bool  $eatWhitespace
+     * @param bool  $inSelector
+     * @param-out string $word
      *
      * @return bool
      */
@@ -3999,7 +4022,8 @@ class Parser
     /**
      * Parse a url
      *
-     * @param array $out
+     * @param mixed $out
+     * @param-out array $out
      *
      * @return bool
      */
@@ -4009,10 +4033,10 @@ class Parser
             $s = $this->count;
 
             if (
-                ($this->string($out) || $this->spaceList($out)) &&
+                ($this->string($inner) || $this->spaceList($inner)) &&
                 $this->matchChar(')')
             ) {
-                $out = [Type::T_STRING, '', ['url(', $out, ')']];
+                $out = [Type::T_STRING, '', ['url(', $inner, ')']];
 
                 return true;
             }
@@ -4055,7 +4079,7 @@ class Parser
     /**
      * Strip assignment flag from the list
      *
-     * @param array $value
+     * @param array|Number $value
      *
      * @return string[]
      */
diff --git a/lib/scssphp/scssphp/src/Type.php b/lib/scssphp/scssphp/src/Type.php
index d43088785..2f8ab6506 100644
--- a/lib/scssphp/scssphp/src/Type.php
+++ b/lib/scssphp/scssphp/src/Type.php
@@ -95,6 +95,9 @@ class Type
      * @internal
      */
     const T_FOR = 'for';
+    /**
+     * @internal
+     */
     const T_FUNCTION = 'function';
     /**
      * @internal
diff --git a/lib/scssphp/scssphp/src/Version.php b/lib/scssphp/scssphp/src/Version.php
index 89bd59526..45fc9835c 100644
--- a/lib/scssphp/scssphp/src/Version.php
+++ b/lib/scssphp/scssphp/src/Version.php
@@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp;
  */
 class Version
 {
-    const VERSION = '1.12.1';
+    const VERSION = '1.13.0';
 }
diff --git a/lib/symfony/cache/Adapter/AbstractAdapter.php b/lib/symfony/cache/Adapter/AbstractAdapter.php
index 7525fe039..bf04ae08c 100644
--- a/lib/symfony/cache/Adapter/AbstractAdapter.php
+++ b/lib/symfony/cache/Adapter/AbstractAdapter.php
@@ -40,7 +40,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).static::NS_SEPARATOR;
         $this->defaultLifetime = $defaultLifetime;
         if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
+            throw new InvalidArgumentException(\sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
         }
         self::$createCacheItem ??= \Closure::bind(
             static function ($key, $value, $isHit) {
@@ -155,7 +155,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
                     $ok = false;
                     $v = $values[$id];
                     $type = get_debug_type($v);
-                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                    $message = \sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
                     CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null, 'cache-adapter' => get_debug_type($this)]);
                 }
             } else {
@@ -178,7 +178,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
                 }
                 $ok = false;
                 $type = get_debug_type($v);
-                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                $message = \sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
                 CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null, 'cache-adapter' => get_debug_type($this)]);
             }
         }
diff --git a/lib/symfony/cache/Adapter/AbstractTagAwareAdapter.php b/lib/symfony/cache/Adapter/AbstractTagAwareAdapter.php
index ef62b4fb2..a1af6141b 100644
--- a/lib/symfony/cache/Adapter/AbstractTagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/AbstractTagAwareAdapter.php
@@ -42,7 +42,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
         $this->defaultLifetime = $defaultLifetime;
         if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
+            throw new InvalidArgumentException(\sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
         }
         self::$createCacheItem ??= \Closure::bind(
             static function ($key, $value, $isHit) {
@@ -194,7 +194,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
                     $ok = false;
                     $v = $values[$id];
                     $type = get_debug_type($v);
-                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                    $message = \sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
                     CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null, 'cache-adapter' => get_debug_type($this)]);
                 }
             } else {
@@ -218,7 +218,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
                 }
                 $ok = false;
                 $type = get_debug_type($v);
-                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                $message = \sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
                 CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null, 'cache-adapter' => get_debug_type($this)]);
             }
         }
diff --git a/lib/symfony/cache/Adapter/ApcuAdapter.php b/lib/symfony/cache/Adapter/ApcuAdapter.php
index 2eddb49a7..50ce8448e 100644
--- a/lib/symfony/cache/Adapter/ApcuAdapter.php
+++ b/lib/symfony/cache/Adapter/ApcuAdapter.php
@@ -82,7 +82,7 @@ class ApcuAdapter extends AbstractAdapter
     protected function doClear(string $namespace): bool
     {
         return isset($namespace[0]) && class_exists(\APCUIterator::class, false) && ('cli' !== \PHP_SAPI || filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOL))
-            ? apcu_delete(new \APCUIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
+            ? apcu_delete(new \APCUIterator(\sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
             : apcu_clear_cache();
     }
 
@@ -101,19 +101,10 @@ class ApcuAdapter extends AbstractAdapter
             return $failed;
         }
 
-        try {
-            if (false === $failures = apcu_store($values, null, $lifetime)) {
-                $failures = $values;
-            }
-
-            return array_keys($failures);
-        } catch (\Throwable $e) {
-            if (1 === \count($values)) {
-                // Workaround https://github.com/krakjoe/apcu/issues/170
-                apcu_delete(array_key_first($values));
-            }
-
-            throw $e;
+        if (false === $failures = apcu_store($values, null, $lifetime)) {
+            $failures = $values;
         }
+
+        return array_keys($failures);
     }
 }
diff --git a/lib/symfony/cache/Adapter/ArrayAdapter.php b/lib/symfony/cache/Adapter/ArrayAdapter.php
index 660a52646..38e19cbdd 100644
--- a/lib/symfony/cache/Adapter/ArrayAdapter.php
+++ b/lib/symfony/cache/Adapter/ArrayAdapter.php
@@ -46,11 +46,11 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
     public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true, float $maxLifetime = 0, int $maxItems = 0)
     {
         if (0 > $maxLifetime) {
-            throw new InvalidArgumentException(sprintf('Argument $maxLifetime must be positive, %F passed.', $maxLifetime));
+            throw new InvalidArgumentException(\sprintf('Argument $maxLifetime must be positive, %F passed.', $maxLifetime));
         }
 
         if (0 > $maxItems) {
-            throw new InvalidArgumentException(sprintf('Argument $maxItems must be a positive integer, %d passed.', $maxItems));
+            throw new InvalidArgumentException(\sprintf('Argument $maxItems must be a positive integer, %d passed.', $maxItems));
         }
 
         $this->defaultLifetime = $defaultLifetime;
@@ -312,9 +312,11 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
             try {
                 $serialized = serialize($value);
             } catch (\Exception $e) {
-                unset($this->values[$key], $this->tags[$key]);
+                if (!isset($this->expiries[$key])) {
+                    unset($this->values[$key]);
+                }
                 $type = get_debug_type($value);
-                $message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
+                $message = \sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
                 CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e, 'cache-adapter' => get_debug_type($this)]);
 
                 return null;
diff --git a/lib/symfony/cache/Adapter/ChainAdapter.php b/lib/symfony/cache/Adapter/ChainAdapter.php
index 221b1fb5d..1d187f65c 100644
--- a/lib/symfony/cache/Adapter/ChainAdapter.php
+++ b/lib/symfony/cache/Adapter/ChainAdapter.php
@@ -51,7 +51,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
         foreach ($adapters as $adapter) {
             if (!$adapter instanceof CacheItemPoolInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', get_debug_type($adapter), CacheItemPoolInterface::class));
+                throw new InvalidArgumentException(\sprintf('The class "%s" does not implement the "%s" interface.', get_debug_type($adapter), CacheItemPoolInterface::class));
             }
             if ('cli' === \PHP_SAPI && $adapter instanceof ApcuAdapter && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOL)) {
                 continue; // skip putting APCu in the chain when the backend is disabled
@@ -76,7 +76,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
                 $item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
 
                 if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
-                    $item->expiresAt(\DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
+                    $item->expiresAt(\DateTimeImmutable::createFromFormat('U.u', \sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
                 } elseif (0 < $defaultLifetime) {
                     $item->expiresAfter($defaultLifetime);
                 }
@@ -106,7 +106,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
                 $callback = $wrap;
                 $beta = \INF === $beta ? \INF : 0;
             }
-            if ($adapter instanceof CacheInterface) {
+            if ($adapter instanceof CacheInterface && $i !== $this->adapterCount) {
                 $value = $adapter->get($key, $callback, $beta, $metadata);
             } else {
                 $value = $this->doGet($adapter, $key, $callback, $beta, $metadata);
diff --git a/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php b/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
index 9d02be3aa..1866083b4 100644
--- a/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
+++ b/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
@@ -62,7 +62,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface
     public function __construct(Connection|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null)
     {
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
-            throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
+            throw new InvalidArgumentException(\sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
         }
 
         if ($connOrDsn instanceof Connection) {
@@ -151,7 +151,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface
 
         if ('' !== $this->namespace) {
             $deleteSql .= " AND $this->idCol LIKE ?";
-            $params[] = sprintf('%s%%', $this->namespace);
+            $params[] = \sprintf('%s%%', $this->namespace);
             $paramTypes[] = ParameterType::STRING;
         }
 
diff --git a/lib/symfony/cache/Adapter/MemcachedAdapter.php b/lib/symfony/cache/Adapter/MemcachedAdapter.php
index 0efa152ee..9f983f0ad 100644
--- a/lib/symfony/cache/Adapter/MemcachedAdapter.php
+++ b/lib/symfony/cache/Adapter/MemcachedAdapter.php
@@ -25,7 +25,7 @@ class MemcachedAdapter extends AbstractAdapter
     /**
      * We are replacing characters that are illegal in Memcached keys with reserved characters from
      * {@see \Symfony\Contracts\Cache\ItemInterface::RESERVED_CHARACTERS} that are legal in Memcached.
-     * Note: don’t use {@see \Symfony\Component\Cache\Adapter\AbstractAdapter::NS_SEPARATOR}.
+     * Note: don’t use {@see AbstractAdapter::NS_SEPARATOR}.
      */
     private const RESERVED_MEMCACHED = " \n\r\t\v\f\0";
     private const RESERVED_PSR6 = '@()\{}/';
@@ -314,7 +314,7 @@ class MemcachedAdapter extends AbstractAdapter
             throw new CacheException('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         }
         if ('' !== $prefix = (string) $this->lazyClient->getOption(\Memcached::OPT_PREFIX_KEY)) {
-            throw new CacheException(sprintf('MemcachedAdapter: "prefix_key" option must be empty when using proxified connections, "%s" given.', $prefix));
+            throw new CacheException(\sprintf('MemcachedAdapter: "prefix_key" option must be empty when using proxified connections, "%s" given.', $prefix));
         }
 
         return $this->client = $this->lazyClient;
diff --git a/lib/symfony/cache/Adapter/ParameterNormalizer.php b/lib/symfony/cache/Adapter/ParameterNormalizer.php
index a6896402f..483df1c0b 100644
--- a/lib/symfony/cache/Adapter/ParameterNormalizer.php
+++ b/lib/symfony/cache/Adapter/ParameterNormalizer.php
@@ -29,7 +29,7 @@ final class ParameterNormalizer
         try {
             return \DateTimeImmutable::createFromFormat('U', 0)->add(new \DateInterval($duration))->getTimestamp();
         } catch (\Exception $e) {
-            throw new \InvalidArgumentException(sprintf('Cannot parse date interval "%s".', $duration), 0, $e);
+            throw new \InvalidArgumentException(\sprintf('Cannot parse date interval "%s".', $duration), 0, $e);
         }
     }
 }
diff --git a/lib/symfony/cache/Adapter/PdoAdapter.php b/lib/symfony/cache/Adapter/PdoAdapter.php
index c79b73959..f5865993d 100644
--- a/lib/symfony/cache/Adapter/PdoAdapter.php
+++ b/lib/symfony/cache/Adapter/PdoAdapter.php
@@ -57,16 +57,16 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
     public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], ?MarshallerInterface $marshaller = null)
     {
         if (\is_string($connOrDsn) && str_contains($connOrDsn, '://')) {
-            throw new InvalidArgumentException(sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead.', __CLASS__, DoctrineDbalAdapter::class));
+            throw new InvalidArgumentException(\sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead.', __CLASS__, DoctrineDbalAdapter::class));
         }
 
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
-            throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
+            throw new InvalidArgumentException(\sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
         }
 
         if ($connOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
-                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__));
+                throw new InvalidArgumentException(\sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__));
             }
 
             $this->conn = $connOrDsn;
@@ -108,12 +108,12 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
             // - trailing space removal
             // - case-insensitivity
             // - language processing like é == e
-            'mysql' => "CREATE TABLE $this->table ($this->idCol VARBINARY(255) NOT NULL PRIMARY KEY, $this->dataCol MEDIUMBLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8mb4_bin, ENGINE = InnoDB",
+            'mysql' => "CREATE TABLE $this->table ($this->idCol VARBINARY(255) NOT NULL PRIMARY KEY, $this->dataCol MEDIUMBLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED, $this->timeCol INTEGER UNSIGNED NOT NULL), ENGINE = InnoDB",
             'sqlite' => "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER, $this->timeCol INTEGER NOT NULL)",
             'pgsql' => "CREATE TABLE $this->table ($this->idCol VARCHAR(255) NOT NULL PRIMARY KEY, $this->dataCol BYTEA NOT NULL, $this->lifetimeCol INTEGER, $this->timeCol INTEGER NOT NULL)",
             'oci' => "CREATE TABLE $this->table ($this->idCol VARCHAR2(255) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER, $this->timeCol INTEGER NOT NULL)",
             'sqlsrv' => "CREATE TABLE $this->table ($this->idCol VARCHAR(255) NOT NULL PRIMARY KEY, $this->dataCol VARBINARY(MAX) NOT NULL, $this->lifetimeCol INTEGER, $this->timeCol INTEGER NOT NULL)",
-            default => throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $driver)),
+            default => throw new \DomainException(\sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $driver)),
         };
 
         $this->getConnection()->exec($sql);
@@ -137,7 +137,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
         $delete->bindValue(':time', time(), \PDO::PARAM_INT);
 
         if ('' !== $this->namespace) {
-            $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
+            $delete->bindValue(':namespace', \sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
         }
         try {
             return $delete->execute();
@@ -314,7 +314,17 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
             $insertStmt->bindValue(':time', $now, \PDO::PARAM_INT);
         }
 
+        if ('sqlsrv' === $driver) {
+            $dataStream = fopen('php://memory', 'r+');
+        }
         foreach ($values as $id => $data) {
+            if ('sqlsrv' === $driver) {
+                rewind($dataStream);
+                fwrite($dataStream, $data);
+                ftruncate($dataStream, \strlen($data));
+                rewind($dataStream);
+                $data = $dataStream;
+            }
             try {
                 $stmt->execute();
             } catch (\PDOException $e) {
diff --git a/lib/symfony/cache/Adapter/PhpArrayAdapter.php b/lib/symfony/cache/Adapter/PhpArrayAdapter.php
index 0cda1cce8..6c3d70724 100644
--- a/lib/symfony/cache/Adapter/PhpArrayAdapter.php
+++ b/lib/symfony/cache/Adapter/PhpArrayAdapter.php
@@ -17,6 +17,7 @@ use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\CachedValueInterface;
 use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
 use Symfony\Component\VarExporter\VarExporter;
@@ -96,22 +97,21 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
         if ('N;' === $value) {
             return null;
         }
+        if (!$value instanceof CachedValueInterface) {
+            return $value;
+        }
         try {
-            if ($value instanceof \Closure) {
-                return $value();
-            }
+            return $value->getValue();
         } catch (\Throwable) {
             unset($this->keys[$key]);
             goto get_from_pool;
         }
-
-        return $value;
     }
 
     public function getItem(mixed $key): CacheItem
     {
         if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+            throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
         }
         if (!isset($this->values)) {
             $this->initialize();
@@ -125,9 +125,9 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
 
         if ('N;' === $value) {
             $value = null;
-        } elseif ($value instanceof \Closure) {
+        } elseif ($value instanceof CachedValueInterface) {
             try {
-                $value = $value();
+                $value = $value->getValue();
             } catch (\Throwable) {
                 $value = null;
                 $isHit = false;
@@ -141,7 +141,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     {
         foreach ($keys as $key) {
             if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+                throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
             }
         }
         if (!isset($this->values)) {
@@ -154,7 +154,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     public function hasItem(mixed $key): bool
     {
         if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+            throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
         }
         if (!isset($this->values)) {
             $this->initialize();
@@ -166,7 +166,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     public function deleteItem(mixed $key): bool
     {
         if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+            throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
         }
         if (!isset($this->values)) {
             $this->initialize();
@@ -182,7 +182,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
 
         foreach ($keys as $key) {
             if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+                throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
             }
 
             if (isset($this->keys[$key])) {
@@ -250,21 +250,21 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     {
         if (file_exists($this->file)) {
             if (!is_file($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: "%s".', $this->file));
+                throw new InvalidArgumentException(\sprintf('Cache path exists and is not a file: "%s".', $this->file));
             }
 
             if (!is_writable($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache file is not writable: "%s".', $this->file));
+                throw new InvalidArgumentException(\sprintf('Cache file is not writable: "%s".', $this->file));
             }
         } else {
             $directory = \dirname($this->file);
 
             if (!is_dir($directory) && !@mkdir($directory, 0777, true)) {
-                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: "%s".', $directory));
+                throw new InvalidArgumentException(\sprintf('Cache directory does not exist and cannot be created: "%s".', $directory));
             }
 
             if (!is_writable($directory)) {
-                throw new InvalidArgumentException(sprintf('Cache directory is not writable: "%s".', $directory));
+                throw new InvalidArgumentException(\sprintf('Cache directory is not writable: "%s".', $directory));
             }
         }
 
@@ -291,7 +291,7 @@ EOF;
                 try {
                     $value = VarExporter::export($value, $isStaticValue, $preload);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)), 0, $e);
+                    throw new InvalidArgumentException(\sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)), 0, $e);
                 }
             } elseif (\is_string($value)) {
                 // Wrap "N;" in a closure to not confuse it with an encoded `null`
@@ -300,14 +300,13 @@ EOF;
                 }
                 $value = var_export($value, true);
             } elseif (!\is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)));
+                throw new InvalidArgumentException(\sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)));
             } else {
                 $value = var_export($value, true);
             }
 
             if (!$isStaticValue) {
-                $value = str_replace("\n", "\n    ", $value);
-                $value = "static function () {\n    return {$value};\n}";
+                $value = 'new class() implements \\'.CachedValueInterface::class." { public function getValue(): mixed { return {$value}; } }";
             }
             $hash = hash('xxh128', $value);
 
@@ -368,9 +367,9 @@ EOF;
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif ($value instanceof \Closure) {
+                } elseif ($value instanceof CachedValueInterface) {
                     try {
-                        yield $key => $f($key, $value(), true);
+                        yield $key => $f($key, $value->getValue(), true);
                     } catch (\Throwable) {
                         yield $key => $f($key, null, false);
                     }
diff --git a/lib/symfony/cache/Adapter/PhpFilesAdapter.php b/lib/symfony/cache/Adapter/PhpFilesAdapter.php
index e550276df..70d089445 100644
--- a/lib/symfony/cache/Adapter/PhpFilesAdapter.php
+++ b/lib/symfony/cache/Adapter/PhpFilesAdapter.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Cache\Adapter;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\Traits\CachedValueInterface;
 use Symfony\Component\Cache\Traits\FilesystemCommonTrait;
 use Symfony\Component\VarExporter\VarExporter;
 
@@ -114,8 +115,10 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
                 $values[$id] = null;
             } elseif (!\is_object($value)) {
                 $values[$id] = $value;
+            } elseif ($value instanceof CachedValueInterface) {
+                $values[$id] = $value->getValue();
             } elseif (!$value instanceof LazyValue) {
-                $values[$id] = $value();
+                $values[$id] = $value;
             } elseif (false === $values[$id] = include $value->file) {
                 unset($values[$id], $this->values[$id]);
                 $missingIds[] = $id;
@@ -152,7 +155,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
                     if ($now >= $expiresAt) {
                         unset($this->values[$id], $missingIds[$k], self::$valuesCache[$file]);
                     }
-                } catch (\ErrorException $e) {
+                } catch (\ErrorException) {
                     unset($missingIds[$k]);
                 }
             }
@@ -217,7 +220,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
                 try {
                     $value = VarExporter::export($value, $isStaticValue);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)), 0, $e);
+                    throw new InvalidArgumentException(\sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)), 0, $e);
                 }
             } elseif (\is_string($value)) {
                 // Wrap "N;" in a closure to not confuse it with an encoded `null`
@@ -226,7 +229,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
                 }
                 $value = var_export($value, true);
             } elseif (!\is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)));
+                throw new InvalidArgumentException(\sprintf('Cache key "%s" has non-serializable "%s" value.', $key, get_debug_type($value)));
             } else {
                 $value = var_export($value, true);
             }
@@ -236,7 +239,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
             if ($isStaticValue) {
                 $value = "return [{$expiry}, {$value}];";
             } elseif ($this->appendOnly) {
-                $value = "return [{$expiry}, static fn () => {$value}];";
+                $value = "return [{$expiry}, new class() implements \\".CachedValueInterface::class." { public function getValue(): mixed { return {$value}; } }];";
             } else {
                 // We cannot use a closure here because of https://bugs.php.net/76982
                 $value = str_replace('\Symfony\Component\VarExporter\Internal\\', '', $value);
@@ -255,7 +258,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
         }
 
         if (!$ok && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
+            throw new CacheException(\sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
         return $ok;
diff --git a/lib/symfony/cache/Adapter/ProxyAdapter.php b/lib/symfony/cache/Adapter/ProxyAdapter.php
index c022dd5fa..562122606 100644
--- a/lib/symfony/cache/Adapter/ProxyAdapter.php
+++ b/lib/symfony/cache/Adapter/ProxyAdapter.php
@@ -73,7 +73,7 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
         self::$setInnerItem ??= \Closure::bind(
             static function (CacheItemInterface $innerItem, CacheItem $item, $expiry = null) {
                 $innerItem->set($item->pack());
-                $innerItem->expiresAt(($expiry ?? $item->expiry) ? \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $expiry ?? $item->expiry)) : null);
+                $innerItem->expiresAt(($expiry ?? $item->expiry) ? \DateTimeImmutable::createFromFormat('U.u', \sprintf('%.6F', $expiry ?? $item->expiry)) : null);
             },
             null,
             CacheItem::class
diff --git a/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php b/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
index a44ef986d..9aa959add 100644
--- a/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Cache\Adapter;
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Connection\Replication\ReplicationInterface as Predis2ReplicationInterface;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Relay\Relay;
@@ -63,7 +64,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
     public function __construct(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
     {
         if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) {
-            throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, get_debug_type($redis->getConnection())));
+            throw new InvalidArgumentException(\sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, get_debug_type($redis->getConnection())));
         }
 
         $isRelay = $redis instanceof Relay;
@@ -72,7 +73,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
 
             foreach (\is_array($compression) ? $compression : [$compression] as $c) {
                 if ($isRelay ? Relay::COMPRESSION_NONE : \Redis::COMPRESSION_NONE !== $c) {
-                    throw new InvalidArgumentException(sprintf('redis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
+                    throw new InvalidArgumentException(\sprintf('redis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
                 }
             }
         }
@@ -85,7 +86,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
     {
         $eviction = $this->getRedisEvictionPolicy();
         if ('noeviction' !== $eviction && !str_starts_with($eviction, 'volatile-')) {
-            throw new LogicException(sprintf('Redis maxmemory-policy setting "%s" is *not* supported by RedisTagAwareAdapter, use "noeviction" or "volatile-*" eviction policies.', $eviction));
+            throw new LogicException(\sprintf('Redis maxmemory-policy setting "%s" is *not* supported by RedisTagAwareAdapter, use "noeviction" or "volatile-*" eviction policies.', $eviction));
         }
 
         // serialize values
@@ -286,9 +287,16 @@ EOLUA;
 
         $hosts = $this->getHosts();
         $host = reset($hosts);
-        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
+        if ($host instanceof \Predis\Client) {
+            $connection = $host->getConnection();
+
             // Predis supports info command only on the master in replication environments
-            $hosts = [$host->getClientFor('master')];
+            if ($connection instanceof ReplicationInterface) {
+                $hosts = [$host->getClientFor('master')];
+            } elseif ($connection instanceof Predis2ReplicationInterface) {
+                $connection->switchToMaster();
+                $hosts = [$host];
+            }
         }
 
         foreach ($hosts as $host) {
diff --git a/lib/symfony/cache/Adapter/TagAwareAdapter.php b/lib/symfony/cache/Adapter/TagAwareAdapter.php
index 539ef1697..a12e908ad 100644
--- a/lib/symfony/cache/Adapter/TagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/TagAwareAdapter.php
@@ -294,15 +294,12 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
         $this->tags instanceof ResettableInterface && $this->tags->reset();
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
@@ -366,7 +363,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
             (self::$saveTags)($this->tags, $newTags);
         }
 
-        while ($now > ($this->knownTagVersions[$tag = array_key_first($this->knownTagVersions)][0] ?? \INF)) {
+        while ($now > ($this->knownTagVersions[$tag = array_key_first($this->knownTagVersions) ?? ''][0] ?? \INF)) {
             unset($this->knownTagVersions[$tag]);
         }
 
diff --git a/lib/symfony/cache/Adapter/TraceableAdapter.php b/lib/symfony/cache/Adapter/TraceableAdapter.php
index 8569fa283..1e9929541 100644
--- a/lib/symfony/cache/Adapter/TraceableAdapter.php
+++ b/lib/symfony/cache/Adapter/TraceableAdapter.php
@@ -38,7 +38,7 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
     public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         if (!$this->pool instanceof CacheInterface) {
-            throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class));
+            throw new \BadMethodCallException(\sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class));
         }
 
         $isHit = true;
diff --git a/lib/symfony/cache/CacheItem.php b/lib/symfony/cache/CacheItem.php
index 1a81706da..1aa5bcdce 100644
--- a/lib/symfony/cache/CacheItem.php
+++ b/lib/symfony/cache/CacheItem.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache;
 
+use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Exception\LogicException;
@@ -30,7 +31,7 @@ final class CacheItem implements ItemInterface
     protected float|int|null $expiry = null;
     protected array $metadata = [];
     protected array $newMetadata = [];
-    protected ?ItemInterface $innerItem = null;
+    protected ?CacheItemInterface $innerItem = null;
     protected ?string $poolHash = null;
     protected bool $isTaggable = false;
 
@@ -81,7 +82,7 @@ final class CacheItem implements ItemInterface
         } elseif (\is_int($time)) {
             $this->expiry = $time + microtime(true);
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', get_debug_type($time)));
+            throw new InvalidArgumentException(\sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', get_debug_type($time)));
         }
 
         return $this;
@@ -90,14 +91,14 @@ final class CacheItem implements ItemInterface
     public function tag(mixed $tags): static
     {
         if (!$this->isTaggable) {
-            throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
+            throw new LogicException(\sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
         }
         if (!\is_array($tags) && !$tags instanceof \Traversable) { // don't use is_iterable(), it's slow
             $tags = [$tags];
         }
         foreach ($tags as $tag) {
             if (!\is_string($tag) && !$tag instanceof \Stringable) {
-                throw new InvalidArgumentException(sprintf('Cache tag must be string or object that implements __toString(), "%s" given.', get_debug_type($tag)));
+                throw new InvalidArgumentException(\sprintf('Cache tag must be string or object that implements __toString(), "%s" given.', get_debug_type($tag)));
             }
             $tag = (string) $tag;
             if (isset($this->newMetadata[self::METADATA_TAGS][$tag])) {
@@ -107,7 +108,7 @@ final class CacheItem implements ItemInterface
                 throw new InvalidArgumentException('Cache tag length must be greater than zero.');
             }
             if (false !== strpbrk($tag, self::RESERVED_CHARACTERS)) {
-                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters "%s".', $tag, self::RESERVED_CHARACTERS));
+                throw new InvalidArgumentException(\sprintf('Cache tag "%s" contains reserved characters "%s".', $tag, self::RESERVED_CHARACTERS));
             }
             $this->newMetadata[self::METADATA_TAGS][$tag] = $tag;
         }
@@ -130,13 +131,13 @@ final class CacheItem implements ItemInterface
     public static function validateKey($key): string
     {
         if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+            throw new InvalidArgumentException(\sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
         }
         if ('' === $key) {
             throw new InvalidArgumentException('Cache key length must be greater than zero.');
         }
         if (false !== strpbrk($key, self::RESERVED_CHARACTERS)) {
-            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters "%s".', $key, self::RESERVED_CHARACTERS));
+            throw new InvalidArgumentException(\sprintf('Cache key "%s" contains reserved characters "%s".', $key, self::RESERVED_CHARACTERS));
         }
 
         return $key;
@@ -196,3 +197,5 @@ final class CacheItem implements ItemInterface
         return true;
     }
 }
+
+// @php-cs-fixer-ignore protected_to_private Friend-level scope access relies on protected properties
diff --git a/lib/symfony/cache/DataCollector/CacheDataCollector.php b/lib/symfony/cache/DataCollector/CacheDataCollector.php
index b9bcdaf13..73886cb4d 100644
--- a/lib/symfony/cache/DataCollector/CacheDataCollector.php
+++ b/lib/symfony/cache/DataCollector/CacheDataCollector.php
@@ -38,15 +38,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
-        $empty = ['calls' => [], 'adapters' => [], 'config' => [], 'options' => [], 'statistics' => []];
-        $this->data = ['instances' => $empty, 'total' => $empty];
-        foreach ($this->instances as $name => $instance) {
-            $this->data['instances']['calls'][$name] = $instance->getCalls();
-            $this->data['instances']['adapters'][$name] = get_debug_type($instance->getPool());
-        }
-
-        $this->data['instances']['statistics'] = $this->calculateStatistics();
-        $this->data['total']['statistics'] = $this->calculateTotalStatistics();
+        $this->lateCollect();
     }
 
     public function reset(): void
@@ -59,6 +51,15 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function lateCollect(): void
     {
+        $empty = ['calls' => [], 'adapters' => [], 'config' => [], 'options' => [], 'statistics' => []];
+        $this->data = ['instances' => $empty, 'total' => $empty];
+        foreach ($this->instances as $name => $instance) {
+            $this->data['instances']['calls'][$name] = $instance->getCalls();
+            $this->data['instances']['adapters'][$name] = get_debug_type($instance->getPool());
+        }
+
+        $this->data['instances']['statistics'] = $this->calculateStatistics();
+        $this->data['total']['statistics'] = $this->calculateTotalStatistics();
         $this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
     }
 
@@ -142,6 +143,8 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
                     }
                 } elseif ('save' === $call->name) {
                     ++$statistics[$name]['writes'];
+                } elseif ('saveDeferred' === $call->name) {
+                    ++$statistics[$name]['writes'];
                 } elseif ('deleteItem' === $call->name) {
                     ++$statistics[$name]['deletes'];
                 }
diff --git a/lib/symfony/cache/DependencyInjection/CachePoolPass.php b/lib/symfony/cache/DependencyInjection/CachePoolPass.php
index f6622f27b..9d2273d90 100644
--- a/lib/symfony/cache/DependencyInjection/CachePoolPass.php
+++ b/lib/symfony/cache/DependencyInjection/CachePoolPass.php
@@ -16,7 +16,9 @@ use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\ParameterNormalizer;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Messenger\EarlyExpirationDispatcher;
+use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -51,6 +53,7 @@ class CachePoolPass implements CompilerPassInterface
             'default_lifetime',
             'early_expiration_message_bus',
             'reset',
+            'pruneable',
         ];
         foreach ($container->findTaggedServiceIds('cache.pool') as $id => $tags) {
             $adapter = $pool = $container->getDefinition($id);
@@ -58,9 +61,11 @@ class CachePoolPass implements CompilerPassInterface
                 continue;
             }
             $class = $adapter->getClass();
+            $providers = $adapter->getArguments();
             while ($adapter instanceof ChildDefinition) {
                 $adapter = $container->findDefinition($adapter->getParent());
                 $class = $class ?: $adapter->getClass();
+                $providers += $adapter->getArguments();
                 if ($t = $adapter->getTag('cache.pool')) {
                     $tags[0] += $t[0];
                 }
@@ -88,11 +93,13 @@ class CachePoolPass implements CompilerPassInterface
                 $tags[0]['provider'] = new Reference(static::getServiceProvider($container, $tags[0]['provider']));
             }
 
+            $pruneable = $tags[0]['pruneable'] ?? $container->getReflectionClass($class, false)?->implementsInterface(PruneableInterface::class) ?? false;
+
             if (ChainAdapter::class === $class) {
                 $adapters = [];
-                foreach ($adapter->getArgument(0) as $provider => $adapter) {
+                foreach ($providers['index_0'] ?? $providers[0] as $provider => $adapter) {
                     if ($adapter instanceof ChildDefinition) {
-                        $chainedPool = $adapter;
+                        $chainedPool = clone $adapter;
                     } else {
                         $chainedPool = $adapter = new ChildDefinition($adapter);
                     }
@@ -109,7 +116,7 @@ class CachePoolPass implements CompilerPassInterface
                     }
 
                     if (ChainAdapter::class === $chainedClass) {
-                        throw new InvalidArgumentException(sprintf('Invalid service "%s": chain of adapters cannot reference another chain, found "%s".', $id, $chainedPool->getParent()));
+                        throw new InvalidArgumentException(\sprintf('Invalid service "%s": chain of adapters cannot reference another chain, found "%s".', $id, $chainedPool->getParent()));
                     }
 
                     $i = 0;
@@ -154,7 +161,9 @@ class CachePoolPass implements CompilerPassInterface
                         ),
                     ]);
                     $pool->addTag('container.reversible');
-                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class], true)) {
+                } elseif ('pruneable' === $attr) {
+                    // no-op
+                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class, TagAwareAdapter::class], true)) {
                     $argument = $tags[0][$attr];
 
                     if ('default_lifetime' === $attr && !is_numeric($argument)) {
@@ -167,13 +176,17 @@ class CachePoolPass implements CompilerPassInterface
                 unset($tags[0][$attr]);
             }
             if (!empty($tags[0])) {
-                throw new InvalidArgumentException(sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "clearer", "provider", "name", "namespace", "default_lifetime", "early_expiration_message_bus" and "reset", found "%s".', $id, implode('", "', array_keys($tags[0]))));
+                throw new InvalidArgumentException(\sprintf('Invalid "cache.pool" tag for service "%s": accepted attributes are "clearer", "provider", "name", "namespace", "default_lifetime", "early_expiration_message_bus", "reset" and "pruneable", found "%s".', $id, implode('", "', array_keys($tags[0]))));
             }
 
             if (null !== $clearer) {
                 $clearers[$clearer][$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
 
+            $poolTags = $pool->getTags();
+            $poolTags['cache.pool'][0]['pruneable'] ??= $pruneable;
+            $pool->setTags($poolTags);
+
             $allPools[$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
         }
 
@@ -197,10 +210,6 @@ class CachePoolPass implements CompilerPassInterface
                 $clearer->setArgument(0, $pools);
             }
             $clearer->addTag('cache.pool.clearer');
-
-            if ('cache.system_clearer' === $id) {
-                $clearer->addTag('kernel.cache_clearer');
-            }
         }
 
         $allPoolsKeys = array_keys($allPools);
diff --git a/lib/symfony/cache/DependencyInjection/CachePoolPrunerPass.php b/lib/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
index 00e912686..870023141 100644
--- a/lib/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
+++ b/lib/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
@@ -15,7 +15,6 @@ use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -35,14 +34,8 @@ class CachePoolPrunerPass implements CompilerPassInterface
         $services = [];
 
         foreach ($container->findTaggedServiceIds('cache.pool') as $id => $tags) {
-            $class = $container->getParameterBag()->resolveValue($container->getDefinition($id)->getClass());
-
-            if (!$reflection = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
-            }
-
-            if ($reflection->implementsInterface(PruneableInterface::class)) {
-                $services[$id] = new Reference($id);
+            if ($tags[0]['pruneable'] ?? $container->getReflectionClass($container->getDefinition($id)->getClass(), false)?->implementsInterface(PruneableInterface::class) ?? false) {
+                $services[$tags[0]['name'] ?? $id] = new Reference($id);
             }
         }
 
diff --git a/lib/symfony/cache/LockRegistry.php b/lib/symfony/cache/LockRegistry.php
index c5c5fde89..31ec51ced 100644
--- a/lib/symfony/cache/LockRegistry.php
+++ b/lib/symfony/cache/LockRegistry.php
@@ -83,7 +83,7 @@ final class LockRegistry
         return $previousFiles;
     }
 
-    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, ?\Closure $setMetadata = null, ?LoggerInterface $logger = null): mixed
+    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, ?\Closure $setMetadata = null, ?LoggerInterface $logger = null, ?float $beta = null): mixed
     {
         if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
             // disable locking on Windows by default
@@ -105,7 +105,7 @@ final class LockRegistry
                 $locked = flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock);
 
                 if ($locked || !$wouldBlock) {
-                    $logger?->info(sprintf('Lock %s, now computing item "{key}"', $locked ? 'acquired' : 'not supported'), ['key' => $item->getKey()]);
+                    $logger?->info(\sprintf('Lock %s, now computing item "{key}"', $locked ? 'acquired' : 'not supported'), ['key' => $item->getKey()]);
                     self::$lockedFiles[$key] = true;
 
                     $value = $callback($item, $save);
@@ -124,6 +124,11 @@ final class LockRegistry
                 // if we failed the race, retry locking in blocking mode to wait for the winner
                 $logger?->info('Item "{key}" is locked, waiting for it to be released', ['key' => $item->getKey()]);
                 flock($lock, \LOCK_SH);
+
+                if (\INF === $beta) {
+                    $logger?->info('Force-recomputing item "{key}"', ['key' => $item->getKey()]);
+                    continue;
+                }
             } finally {
                 flock($lock, \LOCK_UN);
                 unset(self::$lockedFiles[$key]);
diff --git a/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php b/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
index 8fe0f2515..5c8cf8d67 100644
--- a/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
+++ b/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
@@ -37,13 +37,13 @@ class EarlyExpirationDispatcher
     /**
      * @return mixed
      */
-    public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger = null)
+    public function __invoke(callable $callback, CacheItem $item, bool &$save, AdapterInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger = null, ?float $beta = null)
     {
         if (!$item->isHit() || null === $message = EarlyExpirationMessage::create($this->reverseContainer, $callback, $item, $pool)) {
             // The item is stale or the callback cannot be reversed: we must compute the value now
             $logger?->info('Computing item "{key}" online: '.($item->isHit() ? 'callback cannot be reversed' : 'item is stale'), ['key' => $item->getKey()]);
 
-            return null !== $this->callbackWrapper ? ($this->callbackWrapper)($callback, $item, $save, $pool, $setMetadata, $logger) : $callback($item, $save);
+            return null !== $this->callbackWrapper ? ($this->callbackWrapper)($callback, $item, $save, $pool, $setMetadata, $logger, $beta) : $callback($item, $save);
         }
 
         $envelope = $this->bus->dispatch($message);
diff --git a/lib/symfony/cache/Messenger/EarlyExpirationMessage.php b/lib/symfony/cache/Messenger/EarlyExpirationMessage.php
index 6056ebab4..99cca0499 100644
--- a/lib/symfony/cache/Messenger/EarlyExpirationMessage.php
+++ b/lib/symfony/cache/Messenger/EarlyExpirationMessage.php
@@ -35,6 +35,11 @@ final class EarlyExpirationMessage
 
         $pool = $reverseContainer->getId($pool);
 
+        if ($callback instanceof \Closure && !str_contains(($r = new \ReflectionFunction($callback))->name, '{closure')) {
+            $callback = [$r->getClosureThis() ?? (\PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass())?->name, $r->name];
+            $callback[0] ?: $callback = $r->name;
+        }
+
         if (\is_object($callback)) {
             if (null === $id = $reverseContainer->getId($callback)) {
                 return null;
diff --git a/lib/symfony/cache/Psr16Cache.php b/lib/symfony/cache/Psr16Cache.php
index f21384fee..01494d714 100644
--- a/lib/symfony/cache/Psr16Cache.php
+++ b/lib/symfony/cache/Psr16Cache.php
@@ -135,7 +135,7 @@ class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterf
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
         } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', get_debug_type($keys)));
+            throw new InvalidArgumentException(\sprintf('Cache keys must be array or Traversable, "%s" given.', get_debug_type($keys)));
         }
 
         try {
@@ -166,7 +166,7 @@ class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterf
     {
         $valuesIsArray = \is_array($values);
         if (!$valuesIsArray && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', get_debug_type($values)));
+            throw new InvalidArgumentException(\sprintf('Cache values must be array or Traversable, "%s" given.', get_debug_type($values)));
         }
         $items = [];
 
@@ -215,7 +215,7 @@ class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterf
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
         } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', get_debug_type($keys)));
+            throw new InvalidArgumentException(\sprintf('Cache keys must be array or Traversable, "%s" given.', get_debug_type($keys)));
         }
 
         try {
diff --git a/lib/symfony/cache/Traits/AbstractAdapterTrait.php b/lib/symfony/cache/Traits/AbstractAdapterTrait.php
index 4ab2537db..c5b5e4a91 100644
--- a/lib/symfony/cache/Traits/AbstractAdapterTrait.php
+++ b/lib/symfony/cache/Traits/AbstractAdapterTrait.php
@@ -276,15 +276,12 @@ trait AbstractAdapterTrait
         $this->ids = [];
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
@@ -303,7 +300,7 @@ trait AbstractAdapterTrait
         try {
             foreach ($items as $id => $value) {
                 if (!isset($keys[$id])) {
-                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
+                    throw new InvalidArgumentException(\sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
                 }
                 $key = $keys[$id];
                 unset($keys[$id]);
diff --git a/lib/symfony/cache/Traits/CachedValueInterface.php b/lib/symfony/cache/Traits/CachedValueInterface.php
new file mode 100644
index 000000000..8e95f60b0
--- /dev/null
+++ b/lib/symfony/cache/Traits/CachedValueInterface.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\Cache\Traits;
+
+/**
+ * @internal
+ */
+interface CachedValueInterface
+{
+    public function getValue(): mixed;
+}
diff --git a/lib/symfony/cache/Traits/ContractsTrait.php b/lib/symfony/cache/Traits/ContractsTrait.php
index 8d830f0ab..c93256eba 100644
--- a/lib/symfony/cache/Traits/ContractsTrait.php
+++ b/lib/symfony/cache/Traits/ContractsTrait.php
@@ -54,7 +54,7 @@ trait ContractsTrait
         }
 
         $previousWrapper = $this->callbackWrapper;
-        $this->callbackWrapper = $callbackWrapper ?? static fn (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger) => $callback($item, $save);
+        $this->callbackWrapper = $callbackWrapper ?? static fn (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger, ?float $beta = null) => $callback($item, $save);
 
         return $previousWrapper;
     }
@@ -62,7 +62,7 @@ trait ContractsTrait
     private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, ?array &$metadata = null): mixed
     {
         if (0 > $beta ??= 1.0) {
-            throw new InvalidArgumentException(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta));
+            throw new InvalidArgumentException(\sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta));
         }
 
         static $setMetadata;
@@ -82,7 +82,7 @@ trait ContractsTrait
 
         $this->callbackWrapper ??= LockRegistry::compute(...);
 
-        return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key) {
+        return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key, $beta) {
             // don't wrap nor save recursive calls
             if (isset($this->computing[$key])) {
                 $value = $callback($item, $save);
@@ -101,7 +101,7 @@ trait ContractsTrait
             try {
                 $value = ($this->callbackWrapper)($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) {
                     $setMetadata($item, $startTime, $metadata);
-                }, $this->logger ?? null);
+                }, $this->logger ?? null, $beta);
                 $setMetadata($item, $startTime, $metadata);
 
                 return $value;
diff --git a/lib/symfony/cache/Traits/FilesystemCommonTrait.php b/lib/symfony/cache/Traits/FilesystemCommonTrait.php
index 3b976b66f..09e8e26fd 100644
--- a/lib/symfony/cache/Traits/FilesystemCommonTrait.php
+++ b/lib/symfony/cache/Traits/FilesystemCommonTrait.php
@@ -32,7 +32,7 @@ trait FilesystemCommonTrait
         }
         if (isset($namespace[0])) {
             if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
-                throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
+                throw new InvalidArgumentException(\sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
             }
             $directory .= \DIRECTORY_SEPARATOR.$namespace;
         } else {
@@ -44,7 +44,7 @@ trait FilesystemCommonTrait
         $directory .= \DIRECTORY_SEPARATOR;
         // On Windows the whole path is limited to 258 chars
         if ('\\' === \DIRECTORY_SEPARATOR && \strlen($directory) > 234) {
-            throw new InvalidArgumentException(sprintf('Cache directory too long (%s).', $directory));
+            throw new InvalidArgumentException(\sprintf('Cache directory too long (%s).', $directory));
         }
 
         $this->directory = $directory;
@@ -172,15 +172,12 @@ trait FilesystemCommonTrait
         }
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
diff --git a/lib/symfony/cache/Traits/FilesystemTrait.php b/lib/symfony/cache/Traits/FilesystemTrait.php
index 47e9b838f..05fa10e96 100644
--- a/lib/symfony/cache/Traits/FilesystemTrait.php
+++ b/lib/symfony/cache/Traits/FilesystemTrait.php
@@ -92,7 +92,7 @@ trait FilesystemTrait
         }
 
         if ($failed && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
+            throw new CacheException(\sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
         return $failed;
diff --git a/lib/symfony/cache/Traits/Redis6ProxyTrait.php b/lib/symfony/cache/Traits/Redis61ProxyTrait.php
similarity index 98%
rename from lib/symfony/cache/Traits/Redis6ProxyTrait.php
rename to lib/symfony/cache/Traits/Redis61ProxyTrait.php
index 34f60cb10..0ec7b5762 100644
--- a/lib/symfony/cache/Traits/Redis6ProxyTrait.php
+++ b/lib/symfony/cache/Traits/Redis61ProxyTrait.php
@@ -15,7 +15,7 @@ if (version_compare(phpversion('redis'), '6.1.0-dev', '>=')) {
     /**
      * @internal
      */
-    trait Redis6ProxyTrait
+    trait Redis61ProxyTrait
     {
         public function dump($key): \Redis|string|false
         {
@@ -51,7 +51,7 @@ if (version_compare(phpversion('redis'), '6.1.0-dev', '>=')) {
     /**
      * @internal
      */
-    trait Redis6ProxyTrait
+    trait Redis61ProxyTrait
     {
         public function dump($key): \Redis|string
         {
diff --git a/lib/symfony/cache/Traits/Redis62ProxyTrait.php b/lib/symfony/cache/Traits/Redis62ProxyTrait.php
new file mode 100644
index 000000000..4ea807220
--- /dev/null
+++ b/lib/symfony/cache/Traits/Redis62ProxyTrait.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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.2.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Redis62ProxyTrait
+    {
+        public function expiremember($key, $field, $ttl, $unit = null): \Redis|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expiremember(...\func_get_args());
+        }
+
+        public function expirememberat($key, $field, $timestamp): \Redis|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expirememberat(...\func_get_args());
+        }
+
+        public function getWithMeta($key): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getWithMeta(...\func_get_args());
+        }
+
+        public function serverName(): false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverName(...\func_get_args());
+        }
+
+        public function serverVersion(): false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverVersion(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Redis62ProxyTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Redis63ProxyTrait.php b/lib/symfony/cache/Traits/Redis63ProxyTrait.php
new file mode 100644
index 000000000..6f6b37017
--- /dev/null
+++ b/lib/symfony/cache/Traits/Redis63ProxyTrait.php
@@ -0,0 +1,162 @@
+<?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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.3.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Redis63ProxyTrait
+    {
+        public function delifeq($key, $value): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->delifeq(...\func_get_args());
+        }
+
+        public function hexpire($key, $ttl, $fields, $mode = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpire(...\func_get_args());
+        }
+
+        public function hexpireat($key, $time, $fields, $mode = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpireat(...\func_get_args());
+        }
+
+        public function hexpiretime($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpiretime(...\func_get_args());
+        }
+
+        public function hgetdel($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetdel(...\func_get_args());
+        }
+
+        public function hgetex($key, $fields, $expiry = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetex(...\func_get_args());
+        }
+
+        public function hGetWithMeta($key, $member): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hGetWithMeta(...\func_get_args());
+        }
+
+        public function hpersist($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpersist(...\func_get_args());
+        }
+
+        public function hpexpire($key, $ttl, $fields, $mode = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpire(...\func_get_args());
+        }
+
+        public function hpexpireat($key, $mstime, $fields, $mode = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpireat(...\func_get_args());
+        }
+
+        public function hpexpiretime($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpiretime(...\func_get_args());
+        }
+
+        public function hpttl($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpttl(...\func_get_args());
+        }
+
+        public function hsetex($key, $fields, $expiry = null): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetex(...\func_get_args());
+        }
+
+        public function httl($key, $fields): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->httl(...\func_get_args());
+        }
+
+        public function vadd($key, $values, $element, $options = null): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vadd(...\func_get_args());
+        }
+
+        public function vcard($key): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vcard(...\func_get_args());
+        }
+
+        public function vdim($key): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vdim(...\func_get_args());
+        }
+
+        public function vemb($key, $member, $raw = false): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vemb(...\func_get_args());
+        }
+
+        public function vgetattr($key, $member, $decode = true): \Redis|array|string|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vgetattr(...\func_get_args());
+        }
+
+        public function vinfo($key): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vinfo(...\func_get_args());
+        }
+
+        public function vismember($key, $member): \Redis|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vismember(...\func_get_args());
+        }
+
+        public function vlinks($key, $member, $withscores = false): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vlinks(...\func_get_args());
+        }
+
+        public function vrandmember($key, $count = 0): \Redis|array|string|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrandmember(...\func_get_args());
+        }
+
+        public function vrange($key, $min, $max, $count = -1): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrange(...\func_get_args());
+        }
+
+        public function vrem($key, $member): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrem(...\func_get_args());
+        }
+
+        public function vsetattr($key, $member, $attributes): \Redis|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsetattr(...\func_get_args());
+        }
+
+        public function vsim($key, $member, $options = null): \Redis|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsim(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Redis63ProxyTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Redis6Proxy.php b/lib/symfony/cache/Traits/Redis6Proxy.php
index c841d4269..e321fee62 100644
--- a/lib/symfony/cache/Traits/Redis6Proxy.php
+++ b/lib/symfony/cache/Traits/Redis6Proxy.php
@@ -25,7 +25,9 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
  */
 class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
 {
-    use Redis6ProxyTrait;
+    use Redis61ProxyTrait;
+    use Redis62ProxyTrait;
+    use Redis63ProxyTrait;
     use LazyProxyTrait {
         resetLazyObject as reset;
     }
diff --git a/lib/symfony/cache/Traits/RedisCluster6ProxyTrait.php b/lib/symfony/cache/Traits/RedisCluster61ProxyTrait.php
similarity index 95%
rename from lib/symfony/cache/Traits/RedisCluster6ProxyTrait.php
rename to lib/symfony/cache/Traits/RedisCluster61ProxyTrait.php
index 9c3169e32..9ff5b19da 100644
--- a/lib/symfony/cache/Traits/RedisCluster6ProxyTrait.php
+++ b/lib/symfony/cache/Traits/RedisCluster61ProxyTrait.php
@@ -15,7 +15,7 @@ if (version_compare(phpversion('redis'), '6.1.0-dev', '>')) {
     /**
      * @internal
      */
-    trait RedisCluster6ProxyTrait
+    trait RedisCluster61ProxyTrait
     {
         public function getex($key, $options = []): \RedisCluster|string|false
         {
@@ -36,7 +36,7 @@ if (version_compare(phpversion('redis'), '6.1.0-dev', '>')) {
     /**
      * @internal
      */
-    trait RedisCluster6ProxyTrait
+    trait RedisCluster61ProxyTrait
     {
         public function publish($channel, $message): \RedisCluster|bool
         {
diff --git a/lib/symfony/cache/Traits/RedisCluster62ProxyTrait.php b/lib/symfony/cache/Traits/RedisCluster62ProxyTrait.php
new file mode 100644
index 000000000..e8f864a05
--- /dev/null
+++ b/lib/symfony/cache/Traits/RedisCluster62ProxyTrait.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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.2.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait RedisCluster62ProxyTrait
+    {
+        public function expiremember($key, $field, $ttl, $unit = null): \Redis|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expiremember(...\func_get_args());
+        }
+
+        public function expirememberat($key, $field, $timestamp): \Redis|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expirememberat(...\func_get_args());
+        }
+
+        public function getdel($key): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getdel(...\func_get_args());
+        }
+
+        public function getWithMeta($key): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getWithMeta(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait RedisCluster62ProxyTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/RedisCluster63ProxyTrait.php b/lib/symfony/cache/Traits/RedisCluster63ProxyTrait.php
new file mode 100644
index 000000000..374f96214
--- /dev/null
+++ b/lib/symfony/cache/Traits/RedisCluster63ProxyTrait.php
@@ -0,0 +1,162 @@
+<?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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.3.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait RedisCluster63ProxyTrait
+    {
+        public function delifeq($key, $value): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->delifeq(...\func_get_args());
+        }
+
+        public function hexpire($key, $ttl, $fields, $mode = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpire(...\func_get_args());
+        }
+
+        public function hexpireat($key, $time, $fields, $mode = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpireat(...\func_get_args());
+        }
+
+        public function hexpiretime($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpiretime(...\func_get_args());
+        }
+
+        public function hgetdel($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetdel(...\func_get_args());
+        }
+
+        public function hgetex($key, $fields, $expiry = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetex(...\func_get_args());
+        }
+
+        public function hgetWithMeta($key, $member): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetWithMeta(...\func_get_args());
+        }
+
+        public function hpersist($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpersist(...\func_get_args());
+        }
+
+        public function hpexpire($key, $ttl, $fields, $mode = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpire(...\func_get_args());
+        }
+
+        public function hpexpireat($key, $mstime, $fields, $mode = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpireat(...\func_get_args());
+        }
+
+        public function hpexpiretime($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpiretime(...\func_get_args());
+        }
+
+        public function hpttl($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpttl(...\func_get_args());
+        }
+
+        public function hsetex($key, $fields, $expiry = null): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetex(...\func_get_args());
+        }
+
+        public function httl($key, $fields): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->httl(...\func_get_args());
+        }
+
+        public function vadd($key, $values, $element, $options = null): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vadd(...\func_get_args());
+        }
+
+        public function vcard($key): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vcard(...\func_get_args());
+        }
+
+        public function vdim($key): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vdim(...\func_get_args());
+        }
+
+        public function vemb($key, $member, $raw = false): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vemb(...\func_get_args());
+        }
+
+        public function vgetattr($key, $member, $decode = true): \RedisCluster|array|string|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vgetattr(...\func_get_args());
+        }
+
+        public function vinfo($key): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vinfo(...\func_get_args());
+        }
+
+        public function vismember($key, $member): \RedisCluster|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vismember(...\func_get_args());
+        }
+
+        public function vlinks($key, $member, $withscores = false): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vlinks(...\func_get_args());
+        }
+
+        public function vrandmember($key, $count = 0): \RedisCluster|array|string|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrandmember(...\func_get_args());
+        }
+
+        public function vrange($key, $min, $max, $count = -1): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrange(...\func_get_args());
+        }
+
+        public function vrem($key, $member): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrem(...\func_get_args());
+        }
+
+        public function vsetattr($key, $member, $attributes): \RedisCluster|int|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsetattr(...\func_get_args());
+        }
+
+        public function vsim($key, $member, $options = null): \RedisCluster|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsim(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait RedisCluster63ProxyTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/RedisCluster6Proxy.php b/lib/symfony/cache/Traits/RedisCluster6Proxy.php
index c19aa1620..1ea025dd0 100644
--- a/lib/symfony/cache/Traits/RedisCluster6Proxy.php
+++ b/lib/symfony/cache/Traits/RedisCluster6Proxy.php
@@ -25,7 +25,9 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
  */
 class RedisCluster6Proxy extends \RedisCluster implements ResetInterface, LazyObjectInterface
 {
-    use RedisCluster6ProxyTrait;
+    use RedisCluster61ProxyTrait;
+    use RedisCluster62ProxyTrait;
+    use RedisCluster63ProxyTrait;
     use LazyProxyTrait {
         resetLazyObject as reset;
     }
diff --git a/lib/symfony/cache/Traits/RedisTrait.php b/lib/symfony/cache/Traits/RedisTrait.php
index 2a1fa3921..c3fc68990 100644
--- a/lib/symfony/cache/Traits/RedisTrait.php
+++ b/lib/symfony/cache/Traits/RedisTrait.php
@@ -17,6 +17,7 @@ use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Connection\Cluster\ClusterInterface as Predis2ClusterInterface;
 use Predis\Connection\Cluster\RedisCluster as Predis2RedisCluster;
+use Predis\Connection\Replication\ReplicationInterface as Predis2ReplicationInterface;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Relay\Relay;
@@ -36,6 +37,7 @@ trait RedisTrait
 {
     private static array $defaultConnectionOptions = [
         'class' => null,
+        'auth' => null,
         'persistent' => 0,
         'persistent_id' => null,
         'timeout' => 30,
@@ -57,7 +59,7 @@ trait RedisTrait
         parent::__construct($namespace, $defaultLifetime);
 
         if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
-            throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
+            throw new InvalidArgumentException(\sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
 
         if ($redis instanceof \Predis\ClientInterface && $redis->getOptions()->exceptions) {
@@ -94,10 +96,11 @@ trait RedisTrait
             throw new InvalidArgumentException('Invalid Redis DSN: it does not start with "redis[s]:".');
         }
 
-        if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
-            throw new CacheException('Cannot find the "redis" extension nor the "predis/predis" package.');
+        if (!\extension_loaded('redis') && !\extension_loaded('relay') && !class_exists(\Predis\Client::class)) {
+            throw new CacheException('Cannot find the "redis" extension nor the "relay" extension nor the "predis/predis" package.');
         }
 
+        $auth = null;
         $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m['password'])) {
                 if (\in_array($m['user'], ['', 'default'], true)) {
@@ -172,6 +175,7 @@ trait RedisTrait
         }
 
         $params += $query + $options + self::$defaultConnectionOptions;
+        $params['auth'] ??= $auth;
 
         if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class) && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
             throw new CacheException('Redis Sentinel support requires one of: "predis/predis", "ext-redis >= 5.2", "ext-relay".');
@@ -200,7 +204,7 @@ trait RedisTrait
         };
 
         if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true) && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
-            throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and neither ext-redis >= 5.2 nor ext-relay have been found.', $class));
+            throw new CacheException(\sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and neither ext-redis >= 5.2 nor ext-relay have been found.', $class));
         }
 
         $isRedisExt = is_a($class, \Redis::class, true);
@@ -216,7 +220,7 @@ trait RedisTrait
                 do {
                     $host = $hosts[$hostIndex]['host'] ?? $hosts[$hostIndex]['path'];
                     $port = $hosts[$hostIndex]['port'] ?? 0;
-                    $passAuth = isset($params['auth']) && (!$isRedisExt || \defined('Redis::OPT_NULL_MULTIBULK_AS_NULL'));
+                    $passAuth = null !== $params['auth'] && (!$isRedisExt || \defined('Redis::OPT_NULL_MULTIBULK_AS_NULL'));
                     $address = false;
 
                     if (isset($hosts[$hostIndex]['host']) && $tls) {
@@ -228,7 +232,7 @@ trait RedisTrait
                     }
 
                     try {
-                        if (version_compare(phpversion('redis'), '6.0.0', '>=') && $isRedisExt) {
+                        if ($isRedisExt && version_compare(phpversion('redis'), '6.0.0', '>=')) {
                             $options = [
                                 'host' => $host,
                                 'port' => $port,
@@ -246,10 +250,10 @@ trait RedisTrait
                         } else {
                             $extra = $passAuth ? [$params['auth']] : [];
 
-                            $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
+                            $sentinel = @new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
                         }
 
-                        if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
+                        if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                             [$host, $port] = $address;
                         }
                     } catch (\RedisException|\Relay\Exception $redisException) {
@@ -257,7 +261,7 @@ trait RedisTrait
                 } while (++$hostIndex < \count($hosts) && !$address);
 
                 if (isset($params['redis_sentinel']) && !$address) {
-                    throw new InvalidArgumentException(sprintf('Failed to retrieve master information from sentinel "%s".', $params['redis_sentinel']), previous: $redisException ?? null);
+                    throw new InvalidArgumentException(\sprintf('Failed to retrieve master information from sentinel "%s".', $params['redis_sentinel']), previous: $redisException ?? null);
                 }
 
                 try {
@@ -280,7 +284,7 @@ trait RedisTrait
                         }
                     }
 
-                    if (isset($params['auth'])) {
+                    if (null !== $params['auth']) {
                         $extra['auth'] = $params['auth'];
                     }
                     @$redis->{$connect}($host, $port, (float) $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') || !$isRedisExt ? [$extra] : []);
@@ -292,23 +296,19 @@ trait RedisTrait
                         restore_error_handler();
                     }
                     if (!$isConnected) {
-                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error ?? $redis->getLastError() ?? '', $error) ? sprintf(' (%s)', $error[1]) : '';
+                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error ?? $redis->getLastError() ?? '', $error) ? \sprintf(' (%s)', $error[1]) : '';
                         throw new InvalidArgumentException('Redis connection failed: '.$error.'.');
                     }
 
-                    if ((null !== $auth && !$redis->auth($auth))
-                        // Due to a bug in phpredis we must always select the dbindex if persistent pooling is enabled
-                        // @see https://github.com/phpredis/phpredis/issues/1920
-                        // @see https://github.com/symfony/symfony/issues/51578
-                        || (($params['dbindex'] || ('pconnect' === $connect && '0' !== \ini_get('redis.pconnect.pooling_enabled'))) && !$redis->select($params['dbindex']))
-                    ) {
-                        $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                        throw new InvalidArgumentException('Redis connection failed: '.$e.'.');
-                    }
-
                     if (0 < $params['tcp_keepalive'] && (!$isRedisExt || \defined('Redis::OPT_TCP_KEEPALIVE'))) {
                         $redis->setOption($isRedisExt ? \Redis::OPT_TCP_KEEPALIVE : Relay::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
                     }
+
+                    if ((!\defined('Redis::SCAN_PREFIX') && null !== $auth && $isRedisExt && !$redis->auth($auth)) || !$redis->select($params['dbindex'])) {
+                        $e = preg_replace('/^ERR /', '', $redis->getLastError());
+                        throw new InvalidArgumentException('Redis connection failed: '.$e.'.');
+                    }
+
                 } catch (\RedisException|\Relay\Exception $e) {
                     throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
                 }
@@ -388,14 +388,12 @@ trait RedisTrait
             if ($params['dbindex']) {
                 $params['parameters']['database'] = $params['dbindex'];
             }
-            if (null !== $auth) {
-                if (\is_array($auth)) {
-                    // ACL
-                    $params['parameters']['username'] = $auth[0];
-                    $params['parameters']['password'] = $auth[1];
-                } else {
-                    $params['parameters']['password'] = $auth;
-                }
+            if (\is_array($params['auth'])) {
+                // ACL
+                $params['parameters']['username'] = $params['auth'][0];
+                $params['parameters']['password'] = $params['auth'][1];
+            } elseif (null !== $params['auth']) {
+                $params['parameters']['password'] = $params['auth'];
             }
 
             if (isset($params['ssl'])) {
@@ -417,9 +415,9 @@ trait RedisTrait
                 $redis->getConnection()->setSentinelTimeout($params['timeout']);
             }
         } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster", "Relay\Relay" nor "Predis\ClientInterface".', $class));
+            throw new InvalidArgumentException(\sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster", "Relay\Relay" nor "Predis\ClientInterface".', $class));
         } else {
-            throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
+            throw new InvalidArgumentException(\sprintf('Class "%s" does not exist.', $class));
         }
 
         return $redis;
@@ -433,7 +431,7 @@ trait RedisTrait
 
         $result = [];
 
-        if ($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) {
+        if (($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) || $this->redis instanceof RelayCluster) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
                     yield 'get' => [$id];
@@ -473,9 +471,16 @@ trait RedisTrait
         $cleared = true;
         $hosts = $this->getHosts();
         $host = reset($hosts);
-        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
-            // Predis supports info command only on the master in replication environments
-            $hosts = [$host->getClientFor('master')];
+        if ($host instanceof \Predis\Client) {
+            $connection = $host->getConnection();
+
+            if ($connection instanceof ReplicationInterface) {
+                $hosts = [$host->getClientFor('master')];
+            } elseif ($connection instanceof Predis2ReplicationInterface) {
+                $connection->switchToMaster();
+
+                $hosts = [$host];
+            }
         }
 
         foreach ($hosts as $host) {
@@ -508,7 +513,7 @@ trait RedisTrait
 
             $cursor = null;
             do {
-                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
+                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor ?? 0, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
                 if (isset($keys[1]) && \is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
diff --git a/lib/symfony/cache/Traits/Relay/BgsaveTrait.php b/lib/symfony/cache/Traits/Relay/BgsaveTrait.php
new file mode 100644
index 000000000..367f82f7b
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/BgsaveTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.11', '>=')) {
+    /**
+     * @internal
+     */
+    trait BgsaveTrait
+    {
+        public function bgsave($arg = null): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait BgsaveTrait
+    {
+        public function bgsave($schedule = false): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/CopyTrait.php b/lib/symfony/cache/Traits/Relay/CopyTrait.php
new file mode 100644
index 000000000..a271a9d10
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/CopyTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.8.1', '>=')) {
+    /**
+     * @internal
+     */
+    trait CopyTrait
+    {
+        public function copy($src, $dst, $options = null): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait CopyTrait
+    {
+        public function copy($src, $dst, $options = null): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/FtTrait.php b/lib/symfony/cache/Traits/Relay/FtTrait.php
new file mode 100644
index 000000000..1abf0455b
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/FtTrait.php
@@ -0,0 +1,132 @@
+<?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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait FtTrait
+    {
+        public function ftAggregate($index, $query, $options = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAggregate(...\func_get_args());
+        }
+
+        public function ftAliasAdd($index, $alias): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasAdd(...\func_get_args());
+        }
+
+        public function ftAliasDel($alias): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasDel(...\func_get_args());
+        }
+
+        public function ftAliasUpdate($index, $alias): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAliasUpdate(...\func_get_args());
+        }
+
+        public function ftAlter($index, $schema, $skipinitialscan = false): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftAlter(...\func_get_args());
+        }
+
+        public function ftConfig($operation, $option, $value = null): \Relay\Relay|array|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftConfig(...\func_get_args());
+        }
+
+        public function ftCreate($index, $schema, $options = null): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftCreate(...\func_get_args());
+        }
+
+        public function ftCursor($operation, $index, $cursor, $options = null): \Relay\Relay|array|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftCursor(...\func_get_args());
+        }
+
+        public function ftDictAdd($dict, $term, ...$other_terms): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictAdd(...\func_get_args());
+        }
+
+        public function ftDictDel($dict, $term, ...$other_terms): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictDel(...\func_get_args());
+        }
+
+        public function ftDictDump($dict): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDictDump(...\func_get_args());
+        }
+
+        public function ftDropIndex($index, $dd = false): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftDropIndex(...\func_get_args());
+        }
+
+        public function ftExplain($index, $query, $dialect = 0): \Relay\Relay|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftExplain(...\func_get_args());
+        }
+
+        public function ftExplainCli($index, $query, $dialect = 0): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftExplainCli(...\func_get_args());
+        }
+
+        public function ftInfo($index): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftInfo(...\func_get_args());
+        }
+
+        public function ftProfile($index, $command, $query, $limited = false): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftProfile(...\func_get_args());
+        }
+
+        public function ftSearch($index, $query, $options = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSearch(...\func_get_args());
+        }
+
+        public function ftSpellCheck($index, $query, $options = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSpellCheck(...\func_get_args());
+        }
+
+        public function ftSynDump($index): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSynDump(...\func_get_args());
+        }
+
+        public function ftSynUpdate($index, $synonym, $term_or_terms, $skipinitialscan = false): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftSynUpdate(...\func_get_args());
+        }
+
+        public function ftTagVals($index, $tag): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ftTagVals(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait FtTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/GeosearchTrait.php b/lib/symfony/cache/Traits/Relay/GeosearchTrait.php
new file mode 100644
index 000000000..88ed1e9d3
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/GeosearchTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait GeosearchTrait
+    {
+        public function geosearch($key, $position, $shape, $unit, $options = []): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearch(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait GeosearchTrait
+    {
+        public function geosearch($key, $position, $shape, $unit, $options = []): \Relay\Relay|array
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearch(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/GetWithMetaTrait.php b/lib/symfony/cache/Traits/Relay/GetWithMetaTrait.php
new file mode 100644
index 000000000..d0643c339
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/GetWithMetaTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.10.1', '>=')) {
+    /**
+     * @internal
+     */
+    trait GetWithMetaTrait
+    {
+        public function getWithMeta($key): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getWithMeta(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait GetWithMetaTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/GetrangeTrait.php b/lib/symfony/cache/Traits/Relay/GetrangeTrait.php
new file mode 100644
index 000000000..4522d20b5
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/GetrangeTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait GetrangeTrait
+    {
+        public function getrange($key, $start, $end): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getrange(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait GetrangeTrait
+    {
+        public function getrange($key, $start, $end): \Relay\Relay|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getrange(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/HsetTrait.php b/lib/symfony/cache/Traits/Relay/HsetTrait.php
new file mode 100644
index 000000000..a7cb8fff0
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/HsetTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait HsetTrait
+    {
+        public function hset($key, ...$keys_and_vals): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hset(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait HsetTrait
+    {
+        public function hset($key, $mem, $val, ...$kvals): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hset(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/IsTrackedTrait.php b/lib/symfony/cache/Traits/Relay/IsTrackedTrait.php
new file mode 100644
index 000000000..8055e2e92
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/IsTrackedTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.11.1', '>=')) {
+    /**
+     * @internal
+     */
+    trait IsTrackedTrait
+    {
+        public function isTracked($key): bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->isTracked(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait IsTrackedTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/MoveTrait.php b/lib/symfony/cache/Traits/Relay/MoveTrait.php
new file mode 100644
index 000000000..358e52f61
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/MoveTrait.php
@@ -0,0 +1,46 @@
+<?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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait MoveTrait
+    {
+        public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blmove(...\func_get_args());
+        }
+
+        public function lmove($srckey, $dstkey, $srcpos, $dstpos): mixed
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lmove(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait MoveTrait
+    {
+        public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|string|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blmove(...\func_get_args());
+        }
+
+        public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|string|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lmove(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/NullableReturnTrait.php b/lib/symfony/cache/Traits/Relay/NullableReturnTrait.php
new file mode 100644
index 000000000..0b7409045
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/NullableReturnTrait.php
@@ -0,0 +1,96 @@
+<?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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait NullableReturnTrait
+    {
+        public function dump($key): \Relay\Relay|false|string|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dump(...\func_get_args());
+        }
+
+        public function geodist($key, $src, $dst, $unit = null): \Relay\Relay|false|float|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geodist(...\func_get_args());
+        }
+
+        public function hrandfield($hash, $options = null): \Relay\Relay|array|false|string|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hrandfield(...\func_get_args());
+        }
+
+        public function xadd($key, $id, $values, $maxlen = 0, $approx = false, $nomkstream = false): \Relay\Relay|false|string|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xadd(...\func_get_args());
+        }
+
+        public function zrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank(...\func_get_args());
+        }
+
+        public function zrevrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank(...\func_get_args());
+        }
+
+        public function zscore($key, $member): \Relay\Relay|false|float|null
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscore(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait NullableReturnTrait
+    {
+        public function dump($key): \Relay\Relay|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dump(...\func_get_args());
+        }
+
+        public function geodist($key, $src, $dst, $unit = null): \Relay\Relay|false|float
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geodist(...\func_get_args());
+        }
+
+        public function hrandfield($hash, $options = null): \Relay\Relay|array|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hrandfield(...\func_get_args());
+        }
+
+        public function xadd($key, $id, $values, $maxlen = 0, $approx = false, $nomkstream = false): \Relay\Relay|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xadd(...\func_get_args());
+        }
+
+        public function zrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank(...\func_get_args());
+        }
+
+        public function zrevrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank(...\func_get_args());
+        }
+
+        public function zscore($key, $member): \Relay\Relay|false|float
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscore(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/PfcountTrait.php b/lib/symfony/cache/Traits/Relay/PfcountTrait.php
new file mode 100644
index 000000000..340db8af7
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/PfcountTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait PfcountTrait
+    {
+        public function pfcount($key_or_keys): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfcount(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait PfcountTrait
+    {
+        public function pfcount($key): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfcount(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/Relay11Trait.php b/lib/symfony/cache/Traits/Relay/Relay11Trait.php
new file mode 100644
index 000000000..289d8faa0
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/Relay11Trait.php
@@ -0,0 +1,132 @@
+<?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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.11.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Relay11Trait
+    {
+        public function cmsIncrBy($key, $field, $value, ...$fields_and_falues): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsIncrBy(...\func_get_args());
+        }
+
+        public function cmsInfo($key): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInfo(...\func_get_args());
+        }
+
+        public function cmsInitByDim($key, $width, $depth): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInitByDim(...\func_get_args());
+        }
+
+        public function cmsInitByProb($key, $error, $probability): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsInitByProb(...\func_get_args());
+        }
+
+        public function cmsMerge($dstkey, $keys, $weights = []): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsMerge(...\func_get_args());
+        }
+
+        public function cmsQuery($key, ...$fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->cmsQuery(...\func_get_args());
+        }
+
+        public function commandlog($subcmd, ...$args): \Relay\Relay|array|bool|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->commandlog(...\func_get_args());
+        }
+
+        public function hexpire($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpire(...\func_get_args());
+        }
+
+        public function hexpireat($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpireat(...\func_get_args());
+        }
+
+        public function hexpiretime($hash, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexpiretime(...\func_get_args());
+        }
+
+        public function hgetdel($key, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetdel(...\func_get_args());
+        }
+
+        public function hgetex($hash, $fields, $expiry = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetex(...\func_get_args());
+        }
+
+        public function hpersist($hash, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpersist(...\func_get_args());
+        }
+
+        public function hpexpire($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpire(...\func_get_args());
+        }
+
+        public function hpexpireat($hash, $ttl, $fields, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpireat(...\func_get_args());
+        }
+
+        public function hpexpiretime($hash, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpexpiretime(...\func_get_args());
+        }
+
+        public function hpttl($hash, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hpttl(...\func_get_args());
+        }
+
+        public function hsetex($key, $fields, $expiry = null): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetex(...\func_get_args());
+        }
+
+        public function httl($hash, $fields): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->httl(...\func_get_args());
+        }
+
+        public function serverName(): false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverName(...\func_get_args());
+        }
+
+        public function serverVersion(): false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->serverVersion(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Relay11Trait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/Relay121Trait.php b/lib/symfony/cache/Traits/Relay/Relay121Trait.php
new file mode 100644
index 000000000..da222ba8f
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/Relay121Trait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.12.1', '>=')) {
+    /**
+     * @internal
+     */
+    trait Relay121Trait
+    {
+        public function hgetWithMeta($hash, $member): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetWithMeta(...\func_get_args());
+        }
+
+        public function select($db): \Relay\Relay|bool|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
+        }
+
+        public function watch($key, ...$other_keys): \Relay\Relay|bool|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Relay121Trait
+    {
+        public function select($db): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
+        }
+
+        public function watch($key, ...$other_keys): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
+        }
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/Relay12Trait.php b/lib/symfony/cache/Traits/Relay/Relay12Trait.php
new file mode 100644
index 000000000..26df3211f
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/Relay12Trait.php
@@ -0,0 +1,107 @@
+<?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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.12.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Relay12Trait
+    {
+        public function delifeq($key, $value): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->delifeq(...\func_get_args());
+        }
+
+        public function vadd($key, $values, $element, $options = null): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vadd(...\func_get_args());
+        }
+
+        public function vcard($key): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vcard(...\func_get_args());
+        }
+
+        public function vdim($key): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vdim(...\func_get_args());
+        }
+
+        public function vemb($key, $element, $raw = false): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vemb(...\func_get_args());
+        }
+
+        public function vgetattr($key, $element, $raw = false): \Relay\Relay|array|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vgetattr(...\func_get_args());
+        }
+
+        public function vinfo($key): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vinfo(...\func_get_args());
+        }
+
+        public function vismember($key, $element): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vismember(...\func_get_args());
+        }
+
+        public function vlinks($key, $element, $withscores): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vlinks(...\func_get_args());
+        }
+
+        public function vrandmember($key, $count = 0): \Relay\Relay|array|false|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrandmember(...\func_get_args());
+        }
+
+        public function vrange($key, $min, $max, $count = -1): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrange(...\func_get_args());
+        }
+
+        public function vrem($key, $element): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vrem(...\func_get_args());
+        }
+
+        public function vsetattr($key, $element, $attributes): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsetattr(...\func_get_args());
+        }
+
+        public function vsim($key, $member, $options = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->vsim(...\func_get_args());
+        }
+
+        public function xdelex($key, $ids, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xdelex(...\func_get_args());
+        }
+
+        public function xackdel($key, $group, $ids, $mode = null): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xackdel(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Relay12Trait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/Relay20Trait.php b/lib/symfony/cache/Traits/Relay/Relay20Trait.php
new file mode 100644
index 000000000..b062ca9a6
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/Relay20Trait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.20.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Relay20Trait
+    {
+        public function _digest($value): string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_digest(...\func_get_args());
+        }
+
+        public function delex($key, $options = null): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->delex(...\func_get_args());
+        }
+
+        public function digest($key): \Relay\Relay|false|null|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->digest(...\func_get_args());
+        }
+
+        public function msetex($kvals, $ttl = null): \Relay\Relay|false|int
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->msetx(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Relay20Trait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/Relay/SwapdbTrait.php b/lib/symfony/cache/Traits/Relay/SwapdbTrait.php
new file mode 100644
index 000000000..8ae0a079d
--- /dev/null
+++ b/lib/symfony/cache/Traits/Relay/SwapdbTrait.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\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.9.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait SwapdbTrait
+    {
+        public function swapdb($index1, $index2): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->swapdb(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait SwapdbTrait
+    {
+    }
+}
diff --git a/lib/symfony/cache/Traits/RelayProxy.php b/lib/symfony/cache/Traits/RelayProxy.php
index 96d7d19b4..8933e93ac 100644
--- a/lib/symfony/cache/Traits/RelayProxy.php
+++ b/lib/symfony/cache/Traits/RelayProxy.php
@@ -11,6 +11,22 @@
 
 namespace Symfony\Component\Cache\Traits;
 
+use Symfony\Component\Cache\Traits\Relay\BgsaveTrait;
+use Symfony\Component\Cache\Traits\Relay\CopyTrait;
+use Symfony\Component\Cache\Traits\Relay\FtTrait;
+use Symfony\Component\Cache\Traits\Relay\GeosearchTrait;
+use Symfony\Component\Cache\Traits\Relay\GetrangeTrait;
+use Symfony\Component\Cache\Traits\Relay\GetWithMetaTrait;
+use Symfony\Component\Cache\Traits\Relay\HsetTrait;
+use Symfony\Component\Cache\Traits\Relay\IsTrackedTrait;
+use Symfony\Component\Cache\Traits\Relay\MoveTrait;
+use Symfony\Component\Cache\Traits\Relay\NullableReturnTrait;
+use Symfony\Component\Cache\Traits\Relay\PfcountTrait;
+use Symfony\Component\Cache\Traits\Relay\Relay11Trait;
+use Symfony\Component\Cache\Traits\Relay\Relay121Trait;
+use Symfony\Component\Cache\Traits\Relay\Relay12Trait;
+use Symfony\Component\Cache\Traits\Relay\Relay20Trait;
+use Symfony\Component\Cache\Traits\Relay\SwapdbTrait;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 use Symfony\Component\VarExporter\LazyProxyTrait;
 use Symfony\Contracts\Service\ResetInterface;
@@ -25,10 +41,26 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
  */
 class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInterface
 {
+    use BgsaveTrait;
+    use CopyTrait;
+    use FtTrait;
+    use GeosearchTrait;
+    use GetrangeTrait;
+    use GetWithMetaTrait;
+    use HsetTrait;
+    use IsTrackedTrait;
     use LazyProxyTrait {
         resetLazyObject as reset;
     }
+    use MoveTrait;
+    use NullableReturnTrait;
+    use PfcountTrait;
     use RelayProxyTrait;
+    use Relay11Trait;
+    use Relay12Trait;
+    use Relay121Trait;
+    use Relay20Trait;
+    use SwapdbTrait;
 
     private const LAZY_OBJECT_PROPERTY_SCOPES = [];
 
@@ -222,11 +254,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rawCommand(...\func_get_args());
     }
 
-    public function select($db): \Relay\Relay|bool
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
-    }
-
     public function auth(#[\SensitiveParameter] $auth): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->auth(...\func_get_args());
@@ -267,11 +294,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dbsize(...\func_get_args());
     }
 
-    public function dump($key): \Relay\Relay|false|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dump(...\func_get_args());
-    }
-
     public function replicaof($host = null, $port = 0): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->replicaof(...\func_get_args());
@@ -332,11 +354,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lcs(...\func_get_args());
     }
 
-    public function bgsave($schedule = false): \Relay\Relay|bool
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());
-    }
-
     public function save(): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->save(...\func_get_args());
@@ -392,11 +409,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geoadd(...\func_get_args());
     }
 
-    public function geodist($key, $src, $dst, $unit = null): \Relay\Relay|false|float
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geodist(...\func_get_args());
-    }
-
     public function geohash($key, $member, ...$other_members): \Relay\Relay|array|false
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geohash(...\func_get_args());
@@ -422,11 +434,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->georadius_ro(...\func_get_args());
     }
 
-    public function geosearch($key, $position, $shape, $unit, $options = []): \Relay\Relay|array
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearch(...\func_get_args());
-    }
-
     public function geosearchstore($dst, $src, $position, $shape, $unit, $options = []): \Relay\Relay|false|int
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearchstore(...\func_get_args());
@@ -442,11 +449,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getset(...\func_get_args());
     }
 
-    public function getrange($key, $start, $end): \Relay\Relay|false|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getrange(...\func_get_args());
-    }
-
     public function setrange($key, $start, $value): \Relay\Relay|false|int
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setrange(...\func_get_args());
@@ -527,11 +529,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfadd(...\func_get_args());
     }
 
-    public function pfcount($key): \Relay\Relay|false|int
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfcount(...\func_get_args());
-    }
-
     public function pfmerge($dst, $srckeys): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfmerge(...\func_get_args());
@@ -642,16 +639,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->type(...\func_get_args());
     }
 
-    public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|null|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lmove(...\func_get_args());
-    }
-
-    public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|null|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blmove(...\func_get_args());
-    }
-
     public function lrange($key, $start, $stop): \Relay\Relay|array|false
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lrange(...\func_get_args());
@@ -807,11 +794,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hmget(...\func_get_args());
     }
 
-    public function hrandfield($hash, $options = null): \Relay\Relay|array|false|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hrandfield(...\func_get_args());
-    }
-
     public function hmset($hash, $members): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hmset(...\func_get_args());
@@ -827,11 +809,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetnx(...\func_get_args());
     }
 
-    public function hset($key, $mem, $val, ...$kvals): \Relay\Relay|false|int
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hset(...\func_get_args());
-    }
-
     public function hdel($key, $mem, ...$mems): \Relay\Relay|false|int
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hdel(...\func_get_args());
@@ -962,11 +939,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->wait(...\func_get_args());
     }
 
-    public function watch($key, ...$other_keys): \Relay\Relay|bool
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
-    }
-
     public function unwatch(): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->unwatch(...\func_get_args());
@@ -1097,11 +1069,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xack(...\func_get_args());
     }
 
-    public function xadd($key, $id, $values, $maxlen = 0, $approx = false, $nomkstream = false): \Relay\Relay|false|string
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xadd(...\func_get_args());
-    }
-
     public function xclaim($key, $group, $consumer, $min_idle, $ids, $options): \Relay\Relay|array|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xclaim(...\func_get_args());
@@ -1207,16 +1174,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrangebylex(...\func_get_args());
     }
 
-    public function zrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank(...\func_get_args());
-    }
-
-    public function zrevrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank(...\func_get_args());
-    }
-
     public function zrem($key, ...$args): \Relay\Relay|false|int
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrem(...\func_get_args());
@@ -1272,11 +1229,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zmscore(...\func_get_args());
     }
 
-    public function zscore($key, $member): \Relay\Relay|false|float
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscore(...\func_get_args());
-    }
-
     public function zinter($keys, $weights = null, $options = null): \Relay\Relay|array|false
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zinter(...\func_get_args());
diff --git a/lib/symfony/cache/Traits/RelayProxyTrait.php b/lib/symfony/cache/Traits/RelayProxyTrait.php
index a1d252b96..c35b5fa01 100644
--- a/lib/symfony/cache/Traits/RelayProxyTrait.php
+++ b/lib/symfony/cache/Traits/RelayProxyTrait.php
@@ -17,11 +17,6 @@ if (version_compare(phpversion('relay'), '0.8.1', '>=')) {
      */
     trait RelayProxyTrait
     {
-        public function copy($src, $dst, $options = null): \Relay\Relay|bool
-        {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
-        }
-
         public function jsonArrAppend($key, $value_or_array, $path = null): \Relay\Relay|array|false
         {
             return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrAppend(...\func_get_args());
@@ -148,9 +143,5 @@ if (version_compare(phpversion('relay'), '0.8.1', '>=')) {
      */
     trait RelayProxyTrait
     {
-        public function copy($src, $dst, $options = null): \Relay\Relay|false|int
-        {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
-        }
     }
 }
diff --git a/lib/symfony/config/Builder/ClassBuilder.php b/lib/symfony/config/Builder/ClassBuilder.php
index 8194a1526..c4fd9bc0f 100644
--- a/lib/symfony/config/Builder/ClassBuilder.php
+++ b/lib/symfony/config/Builder/ClassBuilder.php
@@ -63,11 +63,11 @@ class ClassBuilder
                 }
                 unset($path[$key]);
             }
-            $require .= sprintf('require_once __DIR__.\DIRECTORY_SEPARATOR.\'%s\';', implode('\'.\DIRECTORY_SEPARATOR.\'', $path))."\n";
+            $require .= \sprintf('require_once __DIR__.\DIRECTORY_SEPARATOR.\'%s\';', implode('\'.\DIRECTORY_SEPARATOR.\'', $path))."\n";
         }
         $use = $require ? "\n" : '';
         foreach (array_keys($this->use) as $statement) {
-            $use .= sprintf('use %s;', $statement)."\n";
+            $use .= \sprintf('use %s;', $statement)."\n";
         }
 
         $implements = [] === $this->implements ? '' : 'implements '.implode(', ', $this->implements);
@@ -119,15 +119,15 @@ BODY
         $this->methods[] = new Method(strtr($body, ['NAME' => $this->camelCase($name)] + $params));
     }
 
-    public function addProperty(string $name, string $classType = null, string $defaultValue = null): Property
+    public function addProperty(string $name, ?string $classType = null, ?string $defaultValue = null): Property
     {
         $property = new Property($name, '_' !== $name[0] ? $this->camelCase($name) : $name);
         if (null !== $classType) {
             $property->setType($classType);
         }
         $this->properties[] = $property;
-        $defaultValue = null !== $defaultValue ? sprintf(' = %s', $defaultValue) : '';
-        $property->setContent(sprintf('private $%s%s;', $property->getName(), $defaultValue));
+        $defaultValue = null !== $defaultValue ? \sprintf(' = %s', $defaultValue) : '';
+        $property->setContent(\sprintf('private $%s%s;', $property->getName(), $defaultValue));
 
         return $property;
     }
diff --git a/lib/symfony/config/Builder/ConfigBuilderGenerator.php b/lib/symfony/config/Builder/ConfigBuilderGenerator.php
index d43d814eb..cfd2810f7 100644
--- a/lib/symfony/config/Builder/ConfigBuilderGenerator.php
+++ b/lib/symfony/config/Builder/ConfigBuilderGenerator.php
@@ -115,7 +115,7 @@ public function NAME(): string
                 $child instanceof PrototypedArrayNode => $this->handlePrototypedArrayNode($child, $class, $namespace),
                 $child instanceof VariableNode => $this->handleVariableNode($child, $class),
                 $child instanceof ArrayNode => $this->handleArrayNode($child, $class, $namespace),
-                default => throw new \RuntimeException(sprintf('Unknown node "%s".', $child::class)),
+                default => throw new \RuntimeException(\sprintf('Unknown node "%s".', $child::class)),
             };
         }
     }
@@ -127,12 +127,15 @@ public function NAME(): string
         $class->addRequire($childClass);
         $this->classes[] = $childClass;
 
+        $nodeTypes = $this->getParameterTypes($node);
+        $paramType = $this->getParamType($nodeTypes);
+
         $hasNormalizationClosures = $this->hasNormalizationClosures($node);
         $comment = $this->getComment($node);
-        if ($hasNormalizationClosures) {
-            $comment = sprintf(" * @template TValue\n * @param TValue \$value\n%s", $comment);
-            $comment .= sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
-            $comment .= sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
+        if ($hasNormalizationClosures && 'array' !== $paramType) {
+            $comment = \sprintf(" * @template TValue of %s\n * @param TValue \$value\n%s", $paramType, $comment);
+            $comment .= \sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
+            $comment .= \sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
         }
         if ('' !== $comment) {
             $comment = "/**\n$comment*/\n";
@@ -142,8 +145,7 @@ public function NAME(): string
             $node->getName(),
             $this->getType($childClass->getFqcn(), $hasNormalizationClosures)
         );
-        $nodeTypes = $this->getParameterTypes($node);
-        $body = $hasNormalizationClosures ? '
+        $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(PARAM_TYPE $value = []): CLASS|static
 {
     if (!\is_array($value)) {
@@ -178,7 +180,7 @@ COMMENTpublic function NAME(array $value = []): CLASS
             'COMMENT' => $comment,
             'PROPERTY' => $property->getName(),
             'CLASS' => $childClass->getFqcn(),
-            'PARAM_TYPE' => \in_array('mixed', $nodeTypes, true) ? 'mixed' : implode('|', $nodeTypes),
+            'PARAM_TYPE' => $paramType,
         ]);
 
         $this->buildNode($node, $childClass, $this->getSubNamespace($childClass));
@@ -218,10 +220,11 @@ public function NAME(mixed $valueDEFAULT): static
 
         $nodeParameterTypes = $this->getParameterTypes($node);
         $prototypeParameterTypes = $this->getParameterTypes($prototype);
+        $noKey = null === $key = $node->getKeyAttribute();
         if (!$prototype instanceof ArrayNode || ($prototype instanceof PrototypedArrayNode && $prototype->getPrototype() instanceof ScalarNode)) {
             $class->addUse(ParamConfigurator::class);
             $property = $class->addProperty($node->getName());
-            if (null === $key = $node->getKeyAttribute()) {
+            if ($noKey) {
                 // This is an array of values; don't use singular name
                 $nodeTypesWithoutArray = array_filter($nodeParameterTypes, static fn ($type) => 'array' !== $type);
                 $body = '
@@ -242,7 +245,7 @@ public function NAME(PARAM_TYPE $value): static
                     'PROPERTY' => $property->getName(),
                     'PROTOTYPE_TYPE' => implode('|', $prototypeParameterTypes),
                     'EXTRA_TYPE' => $nodeTypesWithoutArray ? '|'.implode('|', $nodeTypesWithoutArray) : '',
-                    'PARAM_TYPE' => \in_array('mixed', $nodeParameterTypes, true) ? 'mixed' : 'ParamConfigurator|'.implode('|', $nodeParameterTypes),
+                    'PARAM_TYPE' => $this->getParamType($nodeParameterTypes, true),
                 ]);
             } else {
                 $body = '
@@ -259,7 +262,7 @@ public function NAME(string $VAR, TYPE $VALUE): static
 
                 $class->addMethod($methodName, $body, [
                     'PROPERTY' => $property->getName(),
-                    'TYPE' => \in_array('mixed', $prototypeParameterTypes, true) ? 'mixed' : 'ParamConfigurator|'.implode('|', $prototypeParameterTypes),
+                    'TYPE' => $this->getParamType($prototypeParameterTypes, true),
                     'VAR' => '' === $key ? 'key' : $key,
                     'VALUE' => 'value' === $key ? 'data' : 'value',
                 ]);
@@ -280,18 +283,20 @@ public function NAME(string $VAR, TYPE $VALUE): static
             $this->getType($childClass->getFqcn().'[]', $hasNormalizationClosures)
         );
 
+        $paramType = $this->getParamType($noKey ? $nodeParameterTypes : $prototypeParameterTypes);
+
         $comment = $this->getComment($node);
-        if ($hasNormalizationClosures) {
-            $comment = sprintf(" * @template TValue\n * @param TValue \$value\n%s", $comment);
-            $comment .= sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
-            $comment .= sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
+        if ($hasNormalizationClosures && 'array' !== $paramType) {
+            $comment = \sprintf(" * @template TValue of %s\n * @param TValue \$value\n%s", $paramType, $comment);
+            $comment .= \sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
+            $comment .= \sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
         }
         if ('' !== $comment) {
             $comment = "/**\n$comment*/\n";
         }
 
-        if (null === $key = $node->getKeyAttribute()) {
-            $body = $hasNormalizationClosures ? '
+        if ($noKey) {
+            $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(PARAM_TYPE $value = []): CLASS|static
 {
     $this->_usedProperties[\'PROPERTY\'] = true;
@@ -313,10 +318,10 @@ COMMENTpublic function NAME(array $value = []): CLASS
                 'COMMENT' => $comment,
                 'PROPERTY' => $property->getName(),
                 'CLASS' => $childClass->getFqcn(),
-                'PARAM_TYPE' => \in_array('mixed', $nodeParameterTypes, true) ? 'mixed' : implode('|', $nodeParameterTypes),
+                'PARAM_TYPE' => $paramType,
             ]);
         } else {
-            $body = $hasNormalizationClosures ? '
+            $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(string $VAR, PARAM_TYPE $VALUE = []): CLASS|static
 {
     if (!\is_array($VALUE)) {
@@ -352,7 +357,7 @@ COMMENTpublic function NAME(string $VAR, array $VALUE = []): CLASS
                 'CLASS' => $childClass->getFqcn(),
                 'VAR' => '' === $key ? 'key' : $key,
                 'VALUE' => 'value' === $key ? 'data' : 'value',
-                'PARAM_TYPE' => \in_array('mixed', $prototypeParameterTypes, true) ? 'mixed' : implode('|', $prototypeParameterTypes),
+                'PARAM_TYPE' => $paramType,
             ]);
         }
 
@@ -413,39 +418,39 @@ public function NAME($value): static
     {
         $comment = '';
         if ('' !== $info = (string) $node->getInfo()) {
-            $comment .= ' * '.$info."\n";
+            $comment .= $info."\n";
         }
 
         if (!$node instanceof ArrayNode) {
             foreach ((array) ($node->getExample() ?? []) as $example) {
-                $comment .= ' * @example '.$example."\n";
+                $comment .= '@example '.$example."\n";
             }
 
             if ('' !== $default = $node->getDefaultValue()) {
-                $comment .= ' * @default '.(null === $default ? 'null' : var_export($default, true))."\n";
+                $comment .= '@default '.(null === $default ? 'null' : var_export($default, true))."\n";
             }
 
             if ($node instanceof EnumNode) {
-                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_unique(array_map(fn ($a) => !$a instanceof \UnitEnum ? var_export($a, true) : '\\'.ltrim(var_export($a, true), '\\'), $node->getValues()))))."\n";
+                $comment .= \sprintf('@param ParamConfigurator|%s $value', implode('|', array_unique(array_map(fn ($a) => !$a instanceof \UnitEnum ? var_export($a, true) : '\\'.ltrim(var_export($a, true), '\\'), $node->getValues()))))."\n";
             } else {
                 $parameterTypes = $this->getParameterTypes($node);
-                $comment .= ' * @param ParamConfigurator|'.implode('|', $parameterTypes).' $value'."\n";
+                $comment .= '@param ParamConfigurator|'.implode('|', $parameterTypes).' $value'."\n";
             }
         } else {
             foreach ((array) ($node->getExample() ?? []) as $example) {
-                $comment .= ' * @example '.json_encode($example)."\n";
+                $comment .= '@example '.json_encode($example)."\n";
             }
 
             if ($node->hasDefaultValue() && [] != $default = $node->getDefaultValue()) {
-                $comment .= ' * @default '.json_encode($default)."\n";
+                $comment .= '@default '.json_encode($default)."\n";
             }
         }
 
         if ($node->isDeprecated()) {
-            $comment .= ' * @deprecated '.$node->getDeprecation($node->getName(), $node->getParent()->getName())['message']."\n";
+            $comment .= '@deprecated '.$node->getDeprecation($node->getName(), $node->getParent()->getName())['message']."\n";
         }
 
-        return $comment;
+        return $comment ? ' * '.str_replace("\n", "\n * ", rtrim($comment, "\n"))."\n" : '';
     }
 
     /**
@@ -579,7 +584,7 @@ public function NAME(string $key, mixed $value): static
 
     private function getSubNamespace(ClassBuilder $rootClass): string
     {
-        return sprintf('%s\\%s', $rootClass->getNamespace(), substr($rootClass->getName(), 0, -6));
+        return \sprintf('%s\\%s', $rootClass->getNamespace(), substr($rootClass->getName(), 0, -6));
     }
 
     private function hasNormalizationClosures(NodeInterface $node): bool
@@ -597,4 +602,9 @@ public function NAME(string $key, mixed $value): static
     {
         return $classType.($hasNormalizationClosures ? '|scalar' : '');
     }
+
+    private function getParamType(array $types, bool $withParamConfigurator = false): string
+    {
+        return \in_array('mixed', $types, true) ? 'mixed' : ($withParamConfigurator ? 'ParamConfigurator|' : '').implode('|', $types);
+    }
 }
diff --git a/lib/symfony/config/ConfigCacheInterface.php b/lib/symfony/config/ConfigCacheInterface.php
index be7f0986c..f8d270634 100644
--- a/lib/symfony/config/ConfigCacheInterface.php
+++ b/lib/symfony/config/ConfigCacheInterface.php
@@ -43,5 +43,5 @@ interface ConfigCacheInterface
      *
      * @throws \RuntimeException When the cache file cannot be written
      */
-    public function write(string $content, array $metadata = null);
+    public function write(string $content, ?array $metadata = null);
 }
diff --git a/lib/symfony/config/Definition/ArrayNode.php b/lib/symfony/config/Definition/ArrayNode.php
index 1448220cd..44912da41 100644
--- a/lib/symfony/config/Definition/ArrayNode.php
+++ b/lib/symfony/config/Definition/ArrayNode.php
@@ -177,7 +177,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     public function getDefaultValue(): mixed
     {
         if (!$this->hasDefaultValue()) {
-            throw new \RuntimeException(sprintf('The node at path "%s" has no default value.', $this->getPath()));
+            throw new \RuntimeException(\sprintf('The node at path "%s" has no default value.', $this->getPath()));
         }
 
         $defaults = [];
@@ -205,7 +205,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
             throw new \InvalidArgumentException('Child nodes must be named.');
         }
         if (isset($this->children[$name])) {
-            throw new \InvalidArgumentException(sprintf('A child node named "%s" already exists.', $name));
+            throw new \InvalidArgumentException(\sprintf('A child node named "%s" already exists.', $name));
         }
 
         $this->children[$name] = $node;
@@ -218,15 +218,15 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     protected function finalizeValue(mixed $value): mixed
     {
         if (false === $value) {
-            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
+            throw new UnsetKeyException(\sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
         }
 
         foreach ($this->children as $name => $child) {
             if (!\array_key_exists($name, $value)) {
                 if ($child->isRequired()) {
-                    $message = sprintf('The child config "%s" under "%s" must be configured', $name, $this->getPath());
+                    $message = \sprintf('The child config "%s" under "%s" must be configured', $name, $this->getPath());
                     if ($child->getInfo()) {
-                        $message .= sprintf(': %s', $child->getInfo());
+                        $message .= \sprintf(': %s', $child->getInfo());
                     } else {
                         $message .= '.';
                     }
@@ -264,7 +264,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     protected function validateType(mixed $value)
     {
         if (!\is_array($value) && (!$this->allowFalse || false !== $value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected "array", but got "%s"', $this->getPath(), get_debug_type($value)));
+            $ex = new InvalidTypeException(\sprintf('Invalid type for path "%s". Expected "array", but got "%s"', $this->getPath(), get_debug_type($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
@@ -315,13 +315,13 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
                 }
             }
 
-            $msg = sprintf('Unrecognized option%s "%s" under "%s"', 1 === \count($value) ? '' : 's', implode(', ', array_keys($value)), $this->getPath());
+            $msg = \sprintf('Unrecognized option%s "%s" under "%s"', 1 === \count($value) ? '' : 's', implode(', ', array_keys($value)), $this->getPath());
 
             if (\count($guesses)) {
                 asort($guesses);
-                $msg .= sprintf('. Did you mean "%s"?', implode('", "', array_keys($guesses)));
+                $msg .= \sprintf('. Did you mean "%s"?', implode('", "', array_keys($guesses)));
             } else {
-                $msg .= sprintf('. Available option%s %s "%s".', 1 === \count($proposals) ? '' : 's', 1 === \count($proposals) ? 'is' : 'are', implode('", "', $proposals));
+                $msg .= \sprintf('. Available option%s %s "%s".', 1 === \count($proposals) ? '' : 's', 1 === \count($proposals) ? 'is' : 'are', implode('", "', $proposals));
             }
 
             $ex = new InvalidConfigurationException($msg);
@@ -370,7 +370,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
             // no conflict
             if (!\array_key_exists($k, $leftSide)) {
                 if (!$this->allowNewKeys) {
-                    $ex = new InvalidConfigurationException(sprintf('You are not allowed to define new elements for path "%s". Please define all elements for this path in one config file. If you are trying to overwrite an element, make sure you redefine it with the same name.', $this->getPath()));
+                    $ex = new InvalidConfigurationException(\sprintf('You are not allowed to define new elements for path "%s". Please define all elements for this path in one config file. If you are trying to overwrite an element, make sure you redefine it with the same name.', $this->getPath()));
                     $ex->setPath($this->getPath());
 
                     throw $ex;
diff --git a/lib/symfony/config/Definition/BaseNode.php b/lib/symfony/config/Definition/BaseNode.php
index 85f0f7eeb..e8b6bf1ff 100644
--- a/lib/symfony/config/Definition/BaseNode.php
+++ b/lib/symfony/config/Definition/BaseNode.php
@@ -46,7 +46,7 @@ abstract class BaseNode implements NodeInterface
     /**
      * @throws \InvalidArgumentException if the name contains a period
      */
-    public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
     {
         if (str_contains($name = (string) $name, $pathSeparator)) {
             throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".');
@@ -313,7 +313,7 @@ abstract class BaseNode implements NodeInterface
     final public function merge(mixed $leftSide, mixed $rightSide): mixed
     {
         if (!$this->allowOverwrite) {
-            throw new ForbiddenOverwriteException(sprintf('Configuration path "%s" cannot be overwritten. You have to define all options for this path, and any of its sub-paths in one configuration section.', $this->getPath()));
+            throw new ForbiddenOverwriteException(\sprintf('Configuration path "%s" cannot be overwritten. You have to define all options for this path, and any of its sub-paths in one configuration section.', $this->getPath()));
         }
 
         if ($leftSide !== $leftPlaceholders = self::resolvePlaceholderValue($leftSide)) {
@@ -432,7 +432,7 @@ abstract class BaseNode implements NodeInterface
 
                 throw $e;
             } catch (\Exception $e) {
-                throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": ', $this->getPath()).$e->getMessage(), $e->getCode(), $e);
+                throw new InvalidConfigurationException(\sprintf('Invalid configuration for path "%s": ', $this->getPath()).$e->getMessage(), $e->getCode(), $e);
             }
         }
 
@@ -507,7 +507,7 @@ abstract class BaseNode implements NodeInterface
     private function doValidateType(mixed $value): void
     {
         if (null !== $this->handlingPlaceholder && !$this->allowPlaceholders()) {
-            $e = new InvalidTypeException(sprintf('A dynamic value is not compatible with a "%s" node type at path "%s".', static::class, $this->getPath()));
+            $e = new InvalidTypeException(\sprintf('A dynamic value is not compatible with a "%s" node type at path "%s".', static::class, $this->getPath()));
             $e->setPath($this->getPath());
 
             throw $e;
@@ -523,7 +523,7 @@ abstract class BaseNode implements NodeInterface
         $validTypes = $this->getValidPlaceholderTypes();
 
         if ($validTypes && array_diff($knownTypes, $validTypes)) {
-            $e = new InvalidTypeException(sprintf(
+            $e = new InvalidTypeException(\sprintf(
                 'Invalid type for path "%s". Expected %s, but got %s.',
                 $this->getPath(),
                 1 === \count($validTypes) ? '"'.reset($validTypes).'"' : 'one of "'.implode('", "', $validTypes).'"',
diff --git a/lib/symfony/config/Definition/BooleanNode.php b/lib/symfony/config/Definition/BooleanNode.php
index 7ec903cd6..5d7c573e9 100644
--- a/lib/symfony/config/Definition/BooleanNode.php
+++ b/lib/symfony/config/Definition/BooleanNode.php
@@ -26,7 +26,7 @@ class BooleanNode extends ScalarNode
     protected function validateType(mixed $value)
     {
         if (!\is_bool($value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected "bool", but got "%s".', $this->getPath(), get_debug_type($value)));
+            $ex = new InvalidTypeException(\sprintf('Invalid type for path "%s". Expected "bool", but got "%s".', $this->getPath(), get_debug_type($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
diff --git a/lib/symfony/config/Definition/Builder/ArrayNodeDefinition.php b/lib/symfony/config/Definition/Builder/ArrayNodeDefinition.php
index 3ada5c550..e4938352c 100644
--- a/lib/symfony/config/Definition/Builder/ArrayNodeDefinition.php
+++ b/lib/symfony/config/Definition/Builder/ArrayNodeDefinition.php
@@ -37,7 +37,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
     protected $nodeBuilder;
     protected $normalizeKeys = true;
 
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         parent::__construct($name, $parent);
 
@@ -126,7 +126,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
      *
      * @return $this
      */
-    public function addDefaultChildrenIfNoneSet(int|string|array $children = null): static
+    public function addDefaultChildrenIfNoneSet(int|string|array|null $children = null): static
     {
         $this->addDefaultChildren = $children;
 
@@ -169,7 +169,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
      *
      * @return $this
      */
-    public function fixXmlConfig(string $singular, string $plural = null): static
+    public function fixXmlConfig(string $singular, ?string $plural = null): static
     {
         $this->normalization()->remap($singular, $plural);
 
@@ -331,7 +331,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
 
     public function append(NodeDefinition $node): static
     {
-        $this->children[$node->name] = $node->setParent($this);
+        $this->children[$node->name ?? ''] = $node->setParent($this);
 
         return $this;
     }
@@ -374,7 +374,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
 
             if ($this->default) {
                 if (!\is_array($this->defaultValue)) {
-                    throw new \InvalidArgumentException(sprintf('%s: the default value of an array node has to be an array.', $node->getPath()));
+                    throw new \InvalidArgumentException(\sprintf('%s: the default value of an array node has to be an array.', $node->getPath()));
                 }
 
                 $node->setDefaultValue($this->defaultValue);
@@ -434,23 +434,23 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
         $path = $node->getPath();
 
         if (null !== $this->key) {
-            throw new InvalidDefinitionException(sprintf('->useAttributeAsKey() is not applicable to concrete nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->useAttributeAsKey() is not applicable to concrete nodes at path "%s".', $path));
         }
 
         if (false === $this->allowEmptyValue) {
-            throw new InvalidDefinitionException(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s".', $path));
         }
 
         if (true === $this->atLeastOne) {
-            throw new InvalidDefinitionException(sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s".', $path));
         }
 
         if ($this->default) {
-            throw new InvalidDefinitionException(sprintf('->defaultValue() is not applicable to concrete nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->defaultValue() is not applicable to concrete nodes at path "%s".', $path));
         }
 
         if (false !== $this->addDefaultChildren) {
-            throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s".', $path));
         }
     }
 
@@ -466,20 +466,20 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
         $path = $node->getPath();
 
         if ($this->addDefaults) {
-            throw new InvalidDefinitionException(sprintf('->addDefaultsIfNotSet() is not applicable to prototype nodes at path "%s".', $path));
+            throw new InvalidDefinitionException(\sprintf('->addDefaultsIfNotSet() is not applicable to prototype nodes at path "%s".', $path));
         }
 
         if (false !== $this->addDefaultChildren) {
             if ($this->default) {
-                throw new InvalidDefinitionException(sprintf('A default value and default children might not be used together at path "%s".', $path));
+                throw new InvalidDefinitionException(\sprintf('A default value and default children might not be used together at path "%s".', $path));
             }
 
             if (null !== $this->key && (null === $this->addDefaultChildren || \is_int($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
-                throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s".', $path));
+                throw new InvalidDefinitionException(\sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s".', $path));
             }
 
             if (null === $this->key && (\is_string($this->addDefaultChildren) || \is_array($this->addDefaultChildren))) {
-                throw new InvalidDefinitionException(sprintf('->addDefaultChildrenIfNoneSet() might not set default children names as ->useAttributeAsKey() is not used at path "%s".', $path));
+                throw new InvalidDefinitionException(\sprintf('->addDefaultChildrenIfNoneSet() might not set default children names as ->useAttributeAsKey() is not used at path "%s".', $path));
             }
         }
     }
@@ -504,7 +504,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
             : substr($nodePath, 0, $pathSeparatorPos);
 
         if (null === $node = ($this->children[$firstPathSegment] ?? null)) {
-            throw new \RuntimeException(sprintf('Node with name "%s" does not exist in the current node "%s".', $firstPathSegment, $this->name));
+            throw new \RuntimeException(\sprintf('Node with name "%s" does not exist in the current node "%s".', $firstPathSegment, $this->name));
         }
 
         if (false === $pathSeparatorPos) {
diff --git a/lib/symfony/config/Definition/Builder/BooleanNodeDefinition.php b/lib/symfony/config/Definition/Builder/BooleanNodeDefinition.php
index 3d8fad4d5..15e63961a 100644
--- a/lib/symfony/config/Definition/Builder/BooleanNodeDefinition.php
+++ b/lib/symfony/config/Definition/Builder/BooleanNodeDefinition.php
@@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
  */
 class BooleanNodeDefinition extends ScalarNodeDefinition
 {
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         parent::__construct($name, $parent);
 
diff --git a/lib/symfony/config/Definition/Builder/ExprBuilder.php b/lib/symfony/config/Definition/Builder/ExprBuilder.php
index 9cb441481..0323428f7 100644
--- a/lib/symfony/config/Definition/Builder/ExprBuilder.php
+++ b/lib/symfony/config/Definition/Builder/ExprBuilder.php
@@ -42,7 +42,7 @@ class ExprBuilder
      *
      * @return $this
      */
-    public function always(\Closure $then = null): static
+    public function always(?\Closure $then = null): static
     {
         $this->ifPart = static fn () => true;
         $this->allowedTypes = self::TYPE_ANY;
@@ -61,7 +61,7 @@ class ExprBuilder
      *
      * @return $this
      */
-    public function ifTrue(\Closure $closure = null): static
+    public function ifTrue(?\Closure $closure = null): static
     {
         $this->ifPart = $closure ?? static fn ($v) => true === $v;
         $this->allowedTypes = self::TYPE_ANY;
@@ -196,7 +196,7 @@ class ExprBuilder
      */
     public function thenInvalid(string $message): static
     {
-        $this->thenPart = static fn ($v) => throw new \InvalidArgumentException(sprintf($message, json_encode($v)));
+        $this->thenPart = static fn ($v) => throw new \InvalidArgumentException(\sprintf($message, json_encode($v)));
 
         return $this;
     }
diff --git a/lib/symfony/config/Definition/Builder/NodeBuilder.php b/lib/symfony/config/Definition/Builder/NodeBuilder.php
index 7cda0bc7d..d9c03dd9d 100644
--- a/lib/symfony/config/Definition/Builder/NodeBuilder.php
+++ b/lib/symfony/config/Definition/Builder/NodeBuilder.php
@@ -39,7 +39,7 @@ class NodeBuilder implements NodeParentInterface
      *
      * @return $this
      */
-    public function setParent(ParentNodeDefinitionInterface $parent = null): static
+    public function setParent(?ParentNodeDefinitionInterface $parent = null): static
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/form', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -190,13 +190,13 @@ class NodeBuilder implements NodeParentInterface
         $type = strtolower($type);
 
         if (!isset($this->nodeMapping[$type])) {
-            throw new \RuntimeException(sprintf('The node type "%s" is not registered.', $type));
+            throw new \RuntimeException(\sprintf('The node type "%s" is not registered.', $type));
         }
 
         $class = $this->nodeMapping[$type];
 
         if (!class_exists($class)) {
-            throw new \RuntimeException(sprintf('The node class "%s" does not exist.', $class));
+            throw new \RuntimeException(\sprintf('The node class "%s" does not exist.', $class));
         }
 
         return $class;
diff --git a/lib/symfony/config/Definition/Builder/NodeDefinition.php b/lib/symfony/config/Definition/Builder/NodeDefinition.php
index 2c93a0f7d..cf2173e17 100644
--- a/lib/symfony/config/Definition/Builder/NodeDefinition.php
+++ b/lib/symfony/config/Definition/Builder/NodeDefinition.php
@@ -38,7 +38,7 @@ abstract class NodeDefinition implements NodeParentInterface
     protected $parent;
     protected $attributes = [];
 
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         $this->parent = $parent;
         $this->name = $name;
diff --git a/lib/symfony/config/Definition/Builder/NormalizationBuilder.php b/lib/symfony/config/Definition/Builder/NormalizationBuilder.php
index 0e362d9fa..1f6b34441 100644
--- a/lib/symfony/config/Definition/Builder/NormalizationBuilder.php
+++ b/lib/symfony/config/Definition/Builder/NormalizationBuilder.php
@@ -36,7 +36,7 @@ class NormalizationBuilder
      *
      * @return $this
      */
-    public function remap(string $key, string $plural = null): static
+    public function remap(string $key, ?string $plural = null): static
     {
         $this->remappings[] = [$key, null === $plural ? $key.'s' : $plural];
 
@@ -48,7 +48,7 @@ class NormalizationBuilder
      *
      * @return ExprBuilder|$this
      */
-    public function before(\Closure $closure = null): ExprBuilder|static
+    public function before(?\Closure $closure = null): ExprBuilder|static
     {
         if (null !== $closure) {
             $this->before[] = $closure;
diff --git a/lib/symfony/config/Definition/Builder/NumericNodeDefinition.php b/lib/symfony/config/Definition/Builder/NumericNodeDefinition.php
index 890910c95..fc89df55b 100644
--- a/lib/symfony/config/Definition/Builder/NumericNodeDefinition.php
+++ b/lib/symfony/config/Definition/Builder/NumericNodeDefinition.php
@@ -33,7 +33,7 @@ abstract class NumericNodeDefinition extends ScalarNodeDefinition
     public function max(int|float $max): static
     {
         if (isset($this->min) && $this->min > $max) {
-            throw new \InvalidArgumentException(sprintf('You cannot define a max(%s) as you already have a min(%s).', $max, $this->min));
+            throw new \InvalidArgumentException(\sprintf('You cannot define a max(%s) as you already have a min(%s).', $max, $this->min));
         }
         $this->max = $max;
 
@@ -50,7 +50,7 @@ abstract class NumericNodeDefinition extends ScalarNodeDefinition
     public function min(int|float $min): static
     {
         if (isset($this->max) && $this->max < $min) {
-            throw new \InvalidArgumentException(sprintf('You cannot define a min(%s) as you already have a max(%s).', $min, $this->max));
+            throw new \InvalidArgumentException(\sprintf('You cannot define a min(%s) as you already have a max(%s).', $min, $this->max));
         }
         $this->min = $min;
 
diff --git a/lib/symfony/config/Definition/Builder/TreeBuilder.php b/lib/symfony/config/Definition/Builder/TreeBuilder.php
index cdee55772..f7da3e794 100644
--- a/lib/symfony/config/Definition/Builder/TreeBuilder.php
+++ b/lib/symfony/config/Definition/Builder/TreeBuilder.php
@@ -30,7 +30,7 @@ class TreeBuilder implements NodeParentInterface
      */
     protected $root;
 
-    public function __construct(string $name, string $type = 'array', NodeBuilder $builder = null)
+    public function __construct(string $name, string $type = 'array', ?NodeBuilder $builder = null)
     {
         $builder ??= new NodeBuilder();
         $this->root = $builder->node($name, $type)->setParent($this);
diff --git a/lib/symfony/config/Definition/Builder/ValidationBuilder.php b/lib/symfony/config/Definition/Builder/ValidationBuilder.php
index 1bee851b6..64623d6d6 100644
--- a/lib/symfony/config/Definition/Builder/ValidationBuilder.php
+++ b/lib/symfony/config/Definition/Builder/ValidationBuilder.php
@@ -31,7 +31,7 @@ class ValidationBuilder
      *
      * @return ExprBuilder|$this
      */
-    public function rule(\Closure $closure = null): ExprBuilder|static
+    public function rule(?\Closure $closure = null): ExprBuilder|static
     {
         if (null !== $closure) {
             $this->rules[] = $closure;
diff --git a/lib/symfony/config/Definition/Configurator/DefinitionConfigurator.php b/lib/symfony/config/Definition/Configurator/DefinitionConfigurator.php
index 006a444be..13fe45ca4 100644
--- a/lib/symfony/config/Definition/Configurator/DefinitionConfigurator.php
+++ b/lib/symfony/config/Definition/Configurator/DefinitionConfigurator.php
@@ -29,7 +29,7 @@ class DefinitionConfigurator
     ) {
     }
 
-    public function import(string $resource, string $type = null, bool $ignoreErrors = false): void
+    public function import(string $resource, ?string $type = null, bool $ignoreErrors = false): void
     {
         $this->loader->setCurrentDir(\dirname($this->path));
         $this->loader->import($resource, $type, $ignoreErrors, $this->file);
diff --git a/lib/symfony/config/Definition/Dumper/XmlReferenceDumper.php b/lib/symfony/config/Definition/Dumper/XmlReferenceDumper.php
index 34f93ce07..32317b1db 100644
--- a/lib/symfony/config/Definition/Dumper/XmlReferenceDumper.php
+++ b/lib/symfony/config/Definition/Dumper/XmlReferenceDumper.php
@@ -34,7 +34,7 @@ class XmlReferenceDumper
     /**
      * @return string
      */
-    public function dump(ConfigurationInterface $configuration, string $namespace = null)
+    public function dump(ConfigurationInterface $configuration, ?string $namespace = null)
     {
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
     }
@@ -42,7 +42,7 @@ class XmlReferenceDumper
     /**
      * @return string
      */
-    public function dumpNode(NodeInterface $node, string $namespace = null)
+    public function dumpNode(NodeInterface $node, ?string $namespace = null)
     {
         $this->reference = '';
         $this->writeNode($node, 0, true, $namespace);
@@ -52,7 +52,7 @@ class XmlReferenceDumper
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, string $namespace = null): void
+    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, ?string $namespace = null): void
     {
         $rootName = ($root ? 'config' : $node->getName());
         $rootNamespace = ($namespace ?: ($root ? 'http://example.org/schema/dic/'.$node->getName() : null));
@@ -151,7 +151,7 @@ class XmlReferenceDumper
 
                 if ($child instanceof BaseNode && $child->isDeprecated()) {
                     $deprecation = $child->getDeprecation($child->getName(), $node->getPath());
-                    $comments[] = sprintf('Deprecated (%s)', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
+                    $comments[] = \sprintf('Deprecated (%s)', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
                 }
 
                 if ($child instanceof EnumNode) {
@@ -205,7 +205,7 @@ class XmlReferenceDumper
         $rootOpenTag = '<'.$rootName;
         if (1 >= ($attributesCount = \count($rootAttributes))) {
             if (1 === $attributesCount) {
-                $rootOpenTag .= sprintf(' %s="%s"', current(array_keys($rootAttributes)), $this->writeValue(current($rootAttributes)));
+                $rootOpenTag .= \sprintf(' %s="%s"', current(array_keys($rootAttributes)), $this->writeValue(current($rootAttributes)));
             }
 
             $rootOpenTag .= $rootIsEmptyTag ? ' />' : '>';
@@ -221,7 +221,7 @@ class XmlReferenceDumper
             $i = 1;
 
             foreach ($rootAttributes as $attrName => $attrValue) {
-                $attr = sprintf('%s="%s"', $attrName, $this->writeValue($attrValue));
+                $attr = \sprintf('%s="%s"', $attrName, $this->writeValue($attrValue));
 
                 $this->writeLine($attr, $depth + 4);
 
@@ -258,7 +258,7 @@ class XmlReferenceDumper
         $indent = \strlen($text) + $indent;
         $format = '%'.$indent.'s';
 
-        $this->reference .= sprintf($format, $text).\PHP_EOL;
+        $this->reference .= \sprintf($format, $text).\PHP_EOL;
     }
 
     /**
diff --git a/lib/symfony/config/Definition/Dumper/YamlReferenceDumper.php b/lib/symfony/config/Definition/Dumper/YamlReferenceDumper.php
index 97a391ada..7840ef409 100644
--- a/lib/symfony/config/Definition/Dumper/YamlReferenceDumper.php
+++ b/lib/symfony/config/Definition/Dumper/YamlReferenceDumper.php
@@ -18,7 +18,6 @@ use Symfony\Component\Config\Definition\EnumNode;
 use Symfony\Component\Config\Definition\NodeInterface;
 use Symfony\Component\Config\Definition\PrototypedArrayNode;
 use Symfony\Component\Config\Definition\ScalarNode;
-use Symfony\Component\Config\Definition\VariableNode;
 use Symfony\Component\Yaml\Inline;
 
 /**
@@ -47,7 +46,7 @@ class YamlReferenceDumper
 
         foreach (explode('.', $path) as $step) {
             if (!$node instanceof ArrayNode) {
-                throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path));
+                throw new \UnexpectedValueException(\sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path));
             }
 
             /** @var NodeInterface[] $children */
@@ -61,7 +60,7 @@ class YamlReferenceDumper
                 }
             }
 
-            throw new \UnexpectedValueException(sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path));
+            throw new \UnexpectedValueException(\sprintf('Unable to find node at path "%s.%s".', $rootNode->getName(), $path));
         }
 
         return $this->dumpNode($node);
@@ -80,7 +79,7 @@ class YamlReferenceDumper
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false): void
+    private function writeNode(NodeInterface $node, ?NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false): void
     {
         $comments = [];
         $default = '';
@@ -99,19 +98,12 @@ class YamlReferenceDumper
                 $children = $this->getPrototypeChildren($node);
             }
 
-            if (!$children) {
-                if ($node->hasDefaultValue() && \count($defaultArray = $node->getDefaultValue())) {
-                    $default = '';
-                } elseif (!\is_array($example)) {
-                    $default = '[]';
-                }
+            if (!$children && !($node->hasDefaultValue() && \count($defaultArray = $node->getDefaultValue()))) {
+                $default = '[]';
             }
         } elseif ($node instanceof EnumNode) {
             $comments[] = 'One of '.$node->getPermissibleValues('; ');
             $default = $node->hasDefaultValue() ? Inline::dump($node->getDefaultValue()) : '~';
-        } elseif (VariableNode::class === $node::class && \is_array($example)) {
-            // If there is an array example, we are sure we dont need to print a default value
-            $default = '';
         } else {
             $default = '~';
 
@@ -138,7 +130,7 @@ class YamlReferenceDumper
         // deprecated?
         if ($node instanceof BaseNode && $node->isDeprecated()) {
             $deprecation = $node->getDeprecation($node->getName(), $parentNode ? $parentNode->getPath() : $node->getPath());
-            $comments[] = sprintf('Deprecated (%s)', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
+            $comments[] = \sprintf('Deprecated (%s)', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
         }
 
         // example
@@ -150,12 +142,12 @@ class YamlReferenceDumper
         $comments = \count($comments) ? '# '.implode(', ', $comments) : '';
 
         $key = $prototypedArray ? '-' : $node->getName().':';
-        $text = rtrim(sprintf('%-21s%s %s', $key, $default, $comments), ' ');
+        $text = rtrim(\sprintf('%-21s%s %s', $key, $default, $comments), ' ');
 
         if ($node instanceof BaseNode && $info = $node->getInfo()) {
             $this->writeLine('');
             // indenting multi-line info
-            $info = str_replace("\n", sprintf("\n%".($depth * 4).'s# ', ' '), $info);
+            $info = str_replace("\n", \sprintf("\n%".($depth * 4).'s# ', ' '), $info);
             $this->writeLine('# '.$info, $depth * 4);
         }
 
@@ -179,7 +171,7 @@ class YamlReferenceDumper
 
             $this->writeLine('# '.$message.':', $depth * 4 + 4);
 
-            $this->writeArray(array_map(Inline::dump(...), $example), $depth + 1);
+            $this->writeArray(array_map(Inline::dump(...), $example), $depth + 1, true);
         }
 
         if ($children) {
@@ -197,10 +189,10 @@ class YamlReferenceDumper
         $indent = \strlen($text) + $indent;
         $format = '%'.$indent.'s';
 
-        $this->reference .= sprintf($format, $text)."\n";
+        $this->reference .= \sprintf($format, $text)."\n";
     }
 
-    private function writeArray(array $array, int $depth): void
+    private function writeArray(array $array, int $depth, bool $asComment = false): void
     {
         $isIndexed = array_is_list($array);
 
@@ -211,14 +203,16 @@ class YamlReferenceDumper
                 $val = $value;
             }
 
+            $prefix = $asComment ? '# ' : '';
+
             if ($isIndexed) {
-                $this->writeLine('- '.$val, $depth * 4);
+                $this->writeLine($prefix.'- '.$val, $depth * 4);
             } else {
-                $this->writeLine(sprintf('%-20s %s', $key.':', $val), $depth * 4);
+                $this->writeLine(\sprintf('%s%-20s %s', $prefix, $key.':', $val), $depth * 4);
             }
 
             if (\is_array($value)) {
-                $this->writeArray($value, $depth + 1);
+                $this->writeArray($value, $depth + 1, $asComment);
             }
         }
     }
@@ -255,6 +249,6 @@ class YamlReferenceDumper
         }
         $keyNode->setInfo($info);
 
-        return [$key => $keyNode];
+        return [$key ?? '' => $keyNode];
     }
 }
diff --git a/lib/symfony/config/Definition/EnumNode.php b/lib/symfony/config/Definition/EnumNode.php
index 4edeae904..afe509d9a 100644
--- a/lib/symfony/config/Definition/EnumNode.php
+++ b/lib/symfony/config/Definition/EnumNode.php
@@ -22,7 +22,7 @@ class EnumNode extends ScalarNode
 {
     private array $values;
 
-    public function __construct(?string $name, NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
     {
         if (!$values) {
             throw new \InvalidArgumentException('$values must contain at least one element.');
@@ -34,11 +34,11 @@ class EnumNode extends ScalarNode
             }
 
             if (!$value instanceof \UnitEnum) {
-                throw new \InvalidArgumentException(sprintf('"%s" only supports scalar, enum, or null values, "%s" given.', __CLASS__, get_debug_type($value)));
+                throw new \InvalidArgumentException(\sprintf('"%s" only supports scalar, enum, or null values, "%s" given.', __CLASS__, get_debug_type($value)));
             }
 
             if ($value::class !== ($enumClass ??= $value::class)) {
-                throw new \InvalidArgumentException(sprintf('"%s" only supports one type of enum, "%s" and "%s" passed.', __CLASS__, $enumClass, $value::class));
+                throw new \InvalidArgumentException(\sprintf('"%s" only supports one type of enum, "%s" and "%s" passed.', __CLASS__, $enumClass, $value::class));
             }
         }
 
@@ -85,7 +85,7 @@ class EnumNode extends ScalarNode
         $value = parent::finalizeValue($value);
 
         if (!\in_array($value, $this->values, true)) {
-            $ex = new InvalidConfigurationException(sprintf('The value %s is not allowed for path "%s". Permissible values: %s', json_encode($value), $this->getPath(), $this->getPermissibleValues(', ')));
+            $ex = new InvalidConfigurationException(\sprintf('The value %s is not allowed for path "%s". Permissible values: %s', json_encode($value), $this->getPath(), $this->getPermissibleValues(', ')));
             $ex->setPath($this->getPath());
 
             throw $ex;
diff --git a/lib/symfony/config/Definition/FloatNode.php b/lib/symfony/config/Definition/FloatNode.php
index ce4193e09..9da243427 100644
--- a/lib/symfony/config/Definition/FloatNode.php
+++ b/lib/symfony/config/Definition/FloatNode.php
@@ -31,7 +31,7 @@ class FloatNode extends NumericNode
         }
 
         if (!\is_float($value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected "float", but got "%s".', $this->getPath(), get_debug_type($value)));
+            $ex = new InvalidTypeException(\sprintf('Invalid type for path "%s". Expected "float", but got "%s".', $this->getPath(), get_debug_type($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
diff --git a/lib/symfony/config/Definition/IntegerNode.php b/lib/symfony/config/Definition/IntegerNode.php
index 4a3e3253c..f5a500605 100644
--- a/lib/symfony/config/Definition/IntegerNode.php
+++ b/lib/symfony/config/Definition/IntegerNode.php
@@ -26,7 +26,7 @@ class IntegerNode extends NumericNode
     protected function validateType(mixed $value)
     {
         if (!\is_int($value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected "int", but got "%s".', $this->getPath(), get_debug_type($value)));
+            $ex = new InvalidTypeException(\sprintf('Invalid type for path "%s". Expected "int", but got "%s".', $this->getPath(), get_debug_type($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
diff --git a/lib/symfony/config/Definition/Loader/DefinitionFileLoader.php b/lib/symfony/config/Definition/Loader/DefinitionFileLoader.php
index 506f787ca..09147f791 100644
--- a/lib/symfony/config/Definition/Loader/DefinitionFileLoader.php
+++ b/lib/symfony/config/Definition/Loader/DefinitionFileLoader.php
@@ -34,7 +34,7 @@ class DefinitionFileLoader extends FileLoader
         parent::__construct($locator);
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         // the loader variable is exposed to the included file below
         $loader = $this;
@@ -57,7 +57,7 @@ class DefinitionFileLoader extends FileLoader
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
@@ -81,7 +81,7 @@ class DefinitionFileLoader extends FileLoader
             $reflectionType = $parameter->getType();
 
             if (!$reflectionType instanceof \ReflectionNamedType) {
-                throw new \InvalidArgumentException(sprintf('Could not resolve argument "$%s" for "%s". You must typehint it (for example with "%s").', $parameter->getName(), $path, DefinitionConfigurator::class));
+                throw new \InvalidArgumentException(\sprintf('Could not resolve argument "$%s" for "%s". You must typehint it (for example with "%s").', $parameter->getName(), $path, DefinitionConfigurator::class));
             }
 
             $arguments[] = match ($reflectionType->getName()) {
diff --git a/lib/symfony/config/Definition/NumericNode.php b/lib/symfony/config/Definition/NumericNode.php
index da32b843a..98c99c01e 100644
--- a/lib/symfony/config/Definition/NumericNode.php
+++ b/lib/symfony/config/Definition/NumericNode.php
@@ -23,7 +23,7 @@ class NumericNode extends ScalarNode
     protected $min;
     protected $max;
 
-    public function __construct(?string $name, NodeInterface $parent = null, int|float $min = null, int|float $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, int|float|null $min = null, int|float|null $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
     {
         parent::__construct($name, $parent, $pathSeparator);
         $this->min = $min;
@@ -36,10 +36,10 @@ class NumericNode extends ScalarNode
 
         $errorMsg = null;
         if (isset($this->min) && $value < $this->min) {
-            $errorMsg = sprintf('The value %s is too small for path "%s". Should be greater than or equal to %s', $value, $this->getPath(), $this->min);
+            $errorMsg = \sprintf('The value %s is too small for path "%s". Should be greater than or equal to %s', $value, $this->getPath(), $this->min);
         }
         if (isset($this->max) && $value > $this->max) {
-            $errorMsg = sprintf('The value %s is too big for path "%s". Should be less than or equal to %s', $value, $this->getPath(), $this->max);
+            $errorMsg = \sprintf('The value %s is too big for path "%s". Should be less than or equal to %s', $value, $this->getPath(), $this->max);
         }
         if (isset($errorMsg)) {
             $ex = new InvalidConfigurationException($errorMsg);
diff --git a/lib/symfony/config/Definition/Processor.php b/lib/symfony/config/Definition/Processor.php
index dc3d4c69b..272ddcc44 100644
--- a/lib/symfony/config/Definition/Processor.php
+++ b/lib/symfony/config/Definition/Processor.php
@@ -67,7 +67,7 @@ class Processor
      * @param string      $key    The key to normalize
      * @param string|null $plural The plural form of the key if it is irregular
      */
-    public static function normalizeConfig(array $config, string $key, string $plural = null): array
+    public static function normalizeConfig(array $config, string $key, ?string $plural = null): array
     {
         $plural ??= $key.'s';
 
diff --git a/lib/symfony/config/Definition/PrototypedArrayNode.php b/lib/symfony/config/Definition/PrototypedArrayNode.php
index c105ac1f3..781408b28 100644
--- a/lib/symfony/config/Definition/PrototypedArrayNode.php
+++ b/lib/symfony/config/Definition/PrototypedArrayNode.php
@@ -168,7 +168,7 @@ class PrototypedArrayNode extends ArrayNode
     protected function finalizeValue(mixed $value): mixed
     {
         if (false === $value) {
-            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
+            throw new UnsetKeyException(\sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
         }
 
         foreach ($value as $k => $v) {
@@ -181,7 +181,7 @@ class PrototypedArrayNode extends ArrayNode
         }
 
         if (\count($value) < $this->minNumberOfElements) {
-            $ex = new InvalidConfigurationException(sprintf('The path "%s" should have at least %d element(s) defined.', $this->getPath(), $this->minNumberOfElements));
+            $ex = new InvalidConfigurationException(\sprintf('The path "%s" should have at least %d element(s) defined.', $this->getPath(), $this->minNumberOfElements));
             $ex->setPath($this->getPath());
 
             throw $ex;
@@ -206,7 +206,7 @@ class PrototypedArrayNode extends ArrayNode
         foreach ($value as $k => $v) {
             if (null !== $this->keyAttribute && \is_array($v)) {
                 if (!isset($v[$this->keyAttribute]) && \is_int($k) && $isList) {
-                    $ex = new InvalidConfigurationException(sprintf('The attribute "%s" must be set for path "%s".', $this->keyAttribute, $this->getPath()));
+                    $ex = new InvalidConfigurationException(\sprintf('The attribute "%s" must be set for path "%s".', $this->keyAttribute, $this->getPath()));
                     $ex->setPath($this->getPath());
 
                     throw $ex;
@@ -239,7 +239,7 @@ class PrototypedArrayNode extends ArrayNode
                 }
 
                 if (\array_key_exists($k, $normalized)) {
-                    $ex = new DuplicateKeyException(sprintf('Duplicate key "%s" for path "%s".', $k, $this->getPath()));
+                    $ex = new DuplicateKeyException(\sprintf('Duplicate key "%s" for path "%s".', $k, $this->getPath()));
                     $ex->setPath($this->getPath());
 
                     throw $ex;
@@ -280,7 +280,7 @@ class PrototypedArrayNode extends ArrayNode
             // no conflict
             if (!\array_key_exists($k, $leftSide)) {
                 if (!$this->allowNewKeys) {
-                    $ex = new InvalidConfigurationException(sprintf('You are not allowed to define new elements for path "%s". Please define all elements for this path in one config file.', $this->getPath()));
+                    $ex = new InvalidConfigurationException(\sprintf('You are not allowed to define new elements for path "%s". Please define all elements for this path in one config file.', $this->getPath()));
                     $ex->setPath($this->getPath());
 
                     throw $ex;
diff --git a/lib/symfony/config/Definition/ScalarNode.php b/lib/symfony/config/Definition/ScalarNode.php
index e11fa1ee1..3e348672d 100644
--- a/lib/symfony/config/Definition/ScalarNode.php
+++ b/lib/symfony/config/Definition/ScalarNode.php
@@ -33,7 +33,7 @@ class ScalarNode extends VariableNode
     protected function validateType(mixed $value)
     {
         if (!\is_scalar($value) && null !== $value) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected "scalar", but got "%s".', $this->getPath(), get_debug_type($value)));
+            $ex = new InvalidTypeException(\sprintf('Invalid type for path "%s". Expected "scalar", but got "%s".', $this->getPath(), get_debug_type($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
diff --git a/lib/symfony/config/Definition/VariableNode.php b/lib/symfony/config/Definition/VariableNode.php
index 6bdc65b4e..094962aa1 100644
--- a/lib/symfony/config/Definition/VariableNode.php
+++ b/lib/symfony/config/Definition/VariableNode.php
@@ -80,7 +80,7 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
         // deny environment variables only when using custom validators
         // this avoids ever passing an empty value to final validation closures
         if (!$this->allowEmptyValue && $this->isHandlingPlaceholder() && $this->finalValidationClosures) {
-            $e = new InvalidConfigurationException(sprintf('The path "%s" cannot contain an environment variable when empty values are not allowed by definition and are validated.', $this->getPath()));
+            $e = new InvalidConfigurationException(\sprintf('The path "%s" cannot contain an environment variable when empty values are not allowed by definition and are validated.', $this->getPath()));
             if ($hint = $this->getInfo()) {
                 $e->addHint($hint);
             }
@@ -90,7 +90,7 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
         }
 
         if (!$this->allowEmptyValue && $this->isValueEmpty($value)) {
-            $ex = new InvalidConfigurationException(sprintf('The path "%s" cannot contain an empty value, but got %s.', $this->getPath(), json_encode($value)));
+            $ex = new InvalidConfigurationException(\sprintf('The path "%s" cannot contain an empty value, but got %s.', $this->getPath(), json_encode($value)));
             if ($hint = $this->getInfo()) {
                 $ex->addHint($hint);
             }
diff --git a/lib/symfony/config/Exception/FileLoaderImportCircularReferenceException.php b/lib/symfony/config/Exception/FileLoaderImportCircularReferenceException.php
index da0b55ba8..d39bde046 100644
--- a/lib/symfony/config/Exception/FileLoaderImportCircularReferenceException.php
+++ b/lib/symfony/config/Exception/FileLoaderImportCircularReferenceException.php
@@ -18,9 +18,9 @@ namespace Symfony\Component\Config\Exception;
  */
 class FileLoaderImportCircularReferenceException extends LoaderLoadException
 {
-    public function __construct(array $resources, int $code = 0, \Throwable $previous = null)
+    public function __construct(array $resources, int $code = 0, ?\Throwable $previous = null)
     {
-        $message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
+        $message = \sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
 
         \Exception::__construct($message, $code, $previous);
     }
diff --git a/lib/symfony/config/Exception/FileLocatorFileNotFoundException.php b/lib/symfony/config/Exception/FileLocatorFileNotFoundException.php
index c5173ae58..a3fcc901b 100644
--- a/lib/symfony/config/Exception/FileLocatorFileNotFoundException.php
+++ b/lib/symfony/config/Exception/FileLocatorFileNotFoundException.php
@@ -20,7 +20,7 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException
 {
     private array $paths;
 
-    public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, array $paths = [])
+    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, array $paths = [])
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/lib/symfony/config/Exception/LoaderLoadException.php b/lib/symfony/config/Exception/LoaderLoadException.php
index 57afd6a8d..89f7fd719 100644
--- a/lib/symfony/config/Exception/LoaderLoadException.php
+++ b/lib/symfony/config/Exception/LoaderLoadException.php
@@ -25,13 +25,13 @@ class LoaderLoadException extends \Exception
      * @param \Throwable|null $previous       A previous exception
      * @param string|null     $type           The type of resource
      */
-    public function __construct(mixed $resource, string $sourceResource = null, int $code = 0, \Throwable $previous = null, string $type = null)
+    public function __construct(mixed $resource, ?string $sourceResource = null, int $code = 0, ?\Throwable $previous = null, ?string $type = null)
     {
         if (!\is_string($resource)) {
             try {
                 $resource = json_encode($resource, \JSON_THROW_ON_ERROR);
             } catch (\JsonException) {
-                $resource = sprintf('resource of type "%s"', get_debug_type($resource));
+                $resource = \sprintf('resource of type "%s"', get_debug_type($resource));
             }
         }
 
@@ -42,35 +42,35 @@ class LoaderLoadException extends \Exception
             // Trim the trailing period of the previous message. We only want 1 period remove so no rtrim...
             if (str_ends_with($previous->getMessage(), '.')) {
                 $trimmedMessage = substr($previous->getMessage(), 0, -1);
-                $message .= sprintf('%s', $trimmedMessage).' in ';
+                $message .= \sprintf('%s', $trimmedMessage).' in ';
             } else {
-                $message .= sprintf('%s', $previous->getMessage()).' in ';
+                $message .= \sprintf('%s', $previous->getMessage()).' in ';
             }
             $message .= $resource.' ';
 
             // show tweaked trace to complete the human readable sentence
             if (null === $sourceResource) {
-                $message .= sprintf('(which is loaded in resource "%s")', $resource);
+                $message .= \sprintf('(which is loaded in resource "%s")', $resource);
             } else {
-                $message .= sprintf('(which is being imported from "%s")', $sourceResource);
+                $message .= \sprintf('(which is being imported from "%s")', $sourceResource);
             }
             $message .= '.';
 
         // if there's no previous message, present it the default way
         } elseif (null === $sourceResource) {
-            $message .= sprintf('Cannot load resource "%s".', $resource);
+            $message .= \sprintf('Cannot load resource "%s".', $resource);
         } else {
-            $message .= sprintf('Cannot import resource "%s" from "%s".', $resource, $sourceResource);
+            $message .= \sprintf('Cannot import resource "%s" from "%s".', $resource, $sourceResource);
         }
 
         // Is the resource located inside a bundle?
         if ('@' === $resource[0]) {
             $parts = explode(\DIRECTORY_SEPARATOR, $resource);
             $bundle = substr($parts[0], 1);
-            $message .= sprintf(' Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
-            $message .= sprintf(' If the bundle is registered, make sure the bundle path "%s" is not empty.', $resource);
+            $message .= \sprintf(' Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
+            $message .= \sprintf(' If the bundle is registered, make sure the bundle path "%s" is not empty.', $resource);
         } elseif (null !== $type) {
-            $message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type);
+            $message .= \sprintf(' Make sure there is a loader supporting the "%s" type.', $type);
         }
 
         parent::__construct($message, $code, $previous);
@@ -82,20 +82,20 @@ class LoaderLoadException extends \Exception
     protected function varToString(mixed $var)
     {
         if (\is_object($var)) {
-            return sprintf('Object(%s)', $var::class);
+            return \sprintf('Object(%s)', $var::class);
         }
 
         if (\is_array($var)) {
             $a = [];
             foreach ($var as $k => $v) {
-                $a[] = sprintf('%s => %s', $k, $this->varToString($v));
+                $a[] = \sprintf('%s => %s', $k, $this->varToString($v));
             }
 
-            return sprintf('Array(%s)', implode(', ', $a));
+            return \sprintf('Array(%s)', implode(', ', $a));
         }
 
         if (\is_resource($var)) {
-            return sprintf('Resource(%s)', get_resource_type($var));
+            return \sprintf('Resource(%s)', get_resource_type($var));
         }
 
         if (null === $var) {
diff --git a/lib/symfony/config/FileLocator.php b/lib/symfony/config/FileLocator.php
index e147d9b1a..6e08a5fb0 100644
--- a/lib/symfony/config/FileLocator.php
+++ b/lib/symfony/config/FileLocator.php
@@ -31,9 +31,11 @@ class FileLocator implements FileLocatorInterface
     }
 
     /**
-     * @return string|array
+     * @return string|string[]
+     *
+     * @psalm-return ($first is true ? string : string[])
      */
-    public function locate(string $name, string $currentPath = null, bool $first = true)
+    public function locate(string $name, ?string $currentPath = null, bool $first = true)
     {
         if ('' === $name) {
             throw new \InvalidArgumentException('An empty file name is not valid to be located.');
@@ -41,7 +43,7 @@ class FileLocator implements FileLocatorInterface
 
         if ($this->isAbsolutePath($name)) {
             if (!file_exists($name)) {
-                throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist.', $name), 0, null, [$name]);
+                throw new FileLocatorFileNotFoundException(\sprintf('The file "%s" does not exist.', $name), 0, null, [$name]);
             }
 
             return $name;
@@ -68,7 +70,7 @@ class FileLocator implements FileLocatorInterface
         }
 
         if (!$filepaths) {
-            throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist (in: "%s").', $name, implode('", "', $paths)), 0, null, $notfound);
+            throw new FileLocatorFileNotFoundException(\sprintf('The file "%s" does not exist (in: "%s").', $name, implode('", "', $paths)), 0, null, $notfound);
         }
 
         return $filepaths;
@@ -84,7 +86,8 @@ class FileLocator implements FileLocatorInterface
                 && ':' === $file[1]
                 && ('\\' === $file[2] || '/' === $file[2])
             )
-            || null !== parse_url($file, \PHP_URL_SCHEME)
+            || parse_url($file, \PHP_URL_SCHEME)
+            || str_starts_with($file, 'phar:///') // "parse_url()" doesn't handle absolute phar path, despite being valid
         ) {
             return true;
         }
diff --git a/lib/symfony/config/FileLocatorInterface.php b/lib/symfony/config/FileLocatorInterface.php
index e3ca1d49c..32d10d0cb 100644
--- a/lib/symfony/config/FileLocatorInterface.php
+++ b/lib/symfony/config/FileLocatorInterface.php
@@ -25,10 +25,12 @@ interface FileLocatorInterface
      * @param string|null $currentPath The current path
      * @param bool        $first       Whether to return the first occurrence or an array of filenames
      *
-     * @return string|array The full path to the file or an array of file paths
+     * @return string|string[] The full path to the file or an array of file paths
+     *
+     * @psalm-return ($first is true ? string : string[])
      *
      * @throws \InvalidArgumentException        If $name is empty
      * @throws FileLocatorFileNotFoundException If a file is not found
      */
-    public function locate(string $name, string $currentPath = null, bool $first = true);
+    public function locate(string $name, ?string $currentPath = null, bool $first = true);
 }
diff --git a/lib/symfony/config/Loader/DelegatingLoader.php b/lib/symfony/config/Loader/DelegatingLoader.php
index fac3724e9..045a559e2 100644
--- a/lib/symfony/config/Loader/DelegatingLoader.php
+++ b/lib/symfony/config/Loader/DelegatingLoader.php
@@ -28,7 +28,7 @@ class DelegatingLoader extends Loader
         $this->resolver = $resolver;
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         if (false === $loader = $this->resolver->resolve($resource, $type)) {
             throw new LoaderLoadException($resource, null, 0, null, $type);
@@ -37,7 +37,7 @@ class DelegatingLoader extends Loader
         return $loader->load($resource, $type);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return false !== $this->resolver->resolve($resource, $type);
     }
diff --git a/lib/symfony/config/Loader/FileLoader.php b/lib/symfony/config/Loader/FileLoader.php
index 8cfaa23ba..8275ffcd3 100644
--- a/lib/symfony/config/Loader/FileLoader.php
+++ b/lib/symfony/config/Loader/FileLoader.php
@@ -31,7 +31,7 @@ abstract class FileLoader extends Loader
 
     private ?string $currentDir = null;
 
-    public function __construct(FileLocatorInterface $locator, string $env = null)
+    public function __construct(FileLocatorInterface $locator, ?string $env = null)
     {
         $this->locator = $locator;
         parent::__construct($env);
@@ -70,7 +70,7 @@ abstract class FileLoader extends Loader
      * @throws FileLoaderImportCircularReferenceException
      * @throws FileLocatorFileNotFoundException
      */
-    public function import(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null, string|array $exclude = null)
+    public function import(mixed $resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null, string|array|null $exclude = null)
     {
         if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) {
             $excluded = [];
@@ -101,7 +101,7 @@ abstract class FileLoader extends Loader
     /**
      * @internal
      */
-    protected function glob(string $pattern, bool $recursive, array|GlobResource &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = []): iterable
+    protected function glob(string $pattern, bool $recursive, array|GlobResource|null &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = []): iterable
     {
         if (\strlen($pattern) === $i = strcspn($pattern, '*?{[')) {
             $prefix = $pattern;
@@ -133,7 +133,7 @@ abstract class FileLoader extends Loader
         yield from $resource;
     }
 
-    private function doImport(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null): mixed
+    private function doImport(mixed $resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null): mixed
     {
         try {
             $loader = $this->resolve($resource, $type);
diff --git a/lib/symfony/config/Loader/GlobFileLoader.php b/lib/symfony/config/Loader/GlobFileLoader.php
index f921ec555..31eebf69d 100644
--- a/lib/symfony/config/Loader/GlobFileLoader.php
+++ b/lib/symfony/config/Loader/GlobFileLoader.php
@@ -18,12 +18,12 @@ namespace Symfony\Component\Config\Loader;
  */
 class GlobFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         return $this->import($resource);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'glob' === $type;
     }
diff --git a/lib/symfony/config/Loader/Loader.php b/lib/symfony/config/Loader/Loader.php
index 36e85ad34..66c38bbea 100644
--- a/lib/symfony/config/Loader/Loader.php
+++ b/lib/symfony/config/Loader/Loader.php
@@ -23,7 +23,7 @@ abstract class Loader implements LoaderInterface
     protected $resolver;
     protected $env;
 
-    public function __construct(string $env = null)
+    public function __construct(?string $env = null)
     {
         $this->env = $env;
     }
@@ -46,7 +46,7 @@ abstract class Loader implements LoaderInterface
      *
      * @return mixed
      */
-    public function import(mixed $resource, string $type = null)
+    public function import(mixed $resource, ?string $type = null)
     {
         return $this->resolve($resource, $type)->load($resource, $type);
     }
@@ -56,7 +56,7 @@ abstract class Loader implements LoaderInterface
      *
      * @throws LoaderLoadException If no loader is found
      */
-    public function resolve(mixed $resource, string $type = null): LoaderInterface
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface
     {
         if ($this->supports($resource, $type)) {
             return $this;
diff --git a/lib/symfony/config/Loader/LoaderInterface.php b/lib/symfony/config/Loader/LoaderInterface.php
index 4e0746d4d..190d2c630 100644
--- a/lib/symfony/config/Loader/LoaderInterface.php
+++ b/lib/symfony/config/Loader/LoaderInterface.php
@@ -25,7 +25,7 @@ interface LoaderInterface
      *
      * @throws \Exception If something went wrong
      */
-    public function load(mixed $resource, string $type = null);
+    public function load(mixed $resource, ?string $type = null);
 
     /**
      * Returns whether this class supports the given resource.
@@ -34,7 +34,7 @@ interface LoaderInterface
      *
      * @return bool
      */
-    public function supports(mixed $resource, string $type = null);
+    public function supports(mixed $resource, ?string $type = null);
 
     /**
      * Gets the loader resolver.
diff --git a/lib/symfony/config/Loader/LoaderResolver.php b/lib/symfony/config/Loader/LoaderResolver.php
index 670e32012..72ab33411 100644
--- a/lib/symfony/config/Loader/LoaderResolver.php
+++ b/lib/symfony/config/Loader/LoaderResolver.php
@@ -36,7 +36,7 @@ class LoaderResolver implements LoaderResolverInterface
         }
     }
 
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface|false
     {
         foreach ($this->loaders as $loader) {
             if ($loader->supports($resource, $type)) {
diff --git a/lib/symfony/config/Loader/LoaderResolverInterface.php b/lib/symfony/config/Loader/LoaderResolverInterface.php
index 076c5207c..a8bb3a437 100644
--- a/lib/symfony/config/Loader/LoaderResolverInterface.php
+++ b/lib/symfony/config/Loader/LoaderResolverInterface.php
@@ -23,5 +23,5 @@ interface LoaderResolverInterface
      *
      * @param string|null $type The resource type or null if unknown
      */
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false;
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface|false;
 }
diff --git a/lib/symfony/config/Resource/ClassExistenceResource.php b/lib/symfony/config/Resource/ClassExistenceResource.php
index cae3877ad..49a6074da 100644
--- a/lib/symfony/config/Resource/ClassExistenceResource.php
+++ b/lib/symfony/config/Resource/ClassExistenceResource.php
@@ -34,7 +34,7 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
      * @param string    $resource The fully-qualified class name
      * @param bool|null $exists   Boolean when the existence check has already been done
      */
-    public function __construct(string $resource, bool $exists = null)
+    public function __construct(string $resource, ?bool $exists = null)
     {
         $this->resource = $resource;
         if (null !== $exists) {
@@ -101,23 +101,23 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
         return $this->exists[0] xor !$exists[0];
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         if (null === $this->exists) {
             $this->isFresh(0);
         }
 
-        return ['resource', 'exists'];
+        return [
+            'resource' => $this->resource,
+            'exists' => $this->exists,
+        ];
     }
 
-    /**
-     * @internal
-     */
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
+        $this->resource = array_shift($data);
+        $this->exists = array_shift($data);
+
         if (\is_bool($this->exists)) {
             $this->exists = [$this->exists, null];
         }
@@ -139,7 +139,7 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
      *
      * @internal
      */
-    public static function throwOnRequiredClass(string $class, \Exception $previous = null): void
+    public static function throwOnRequiredClass(string $class, ?\Exception $previous = null): void
     {
         // If the passed class is the resource being checked, we shouldn't throw.
         if (null === $previous && self::$autoloadedClass === $class) {
@@ -158,10 +158,10 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
             throw $previous;
         }
 
-        $message = sprintf('Class "%s" not found.', $class);
+        $message = \sprintf('Class "%s" not found.', $class);
 
         if ($class !== (self::$autoloadedClass ?? $class)) {
-            $message = substr_replace($message, sprintf(' while loading "%s"', self::$autoloadedClass), -1, 0);
+            $message = substr_replace($message, \sprintf(' while loading "%s"', self::$autoloadedClass), -1, 0);
         }
 
         if (null !== $previous) {
diff --git a/lib/symfony/config/Resource/DirectoryResource.php b/lib/symfony/config/Resource/DirectoryResource.php
index 7560cd3b3..dd43742b7 100644
--- a/lib/symfony/config/Resource/DirectoryResource.php
+++ b/lib/symfony/config/Resource/DirectoryResource.php
@@ -29,13 +29,13 @@ class DirectoryResource implements SelfCheckingResourceInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $resource, string $pattern = null)
+    public function __construct(string $resource, ?string $pattern = null)
     {
         $resolvedResource = realpath($resource) ?: (file_exists($resource) ? $resource : false);
         $this->pattern = $pattern;
 
         if (false === $resolvedResource || !is_dir($resolvedResource)) {
-            throw new \InvalidArgumentException(sprintf('The directory "%s" does not exist.', $resource));
+            throw new \InvalidArgumentException(\sprintf('The directory "%s" does not exist.', $resource));
         }
 
         $this->resource = $resolvedResource;
diff --git a/lib/symfony/config/Resource/FileResource.php b/lib/symfony/config/Resource/FileResource.php
index 6e8f9bdb3..44e5bbc57 100644
--- a/lib/symfony/config/Resource/FileResource.php
+++ b/lib/symfony/config/Resource/FileResource.php
@@ -34,7 +34,7 @@ class FileResource implements SelfCheckingResourceInterface
         $resolvedResource = realpath($resource) ?: (file_exists($resource) ? $resource : false);
 
         if (false === $resolvedResource) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $resource));
+            throw new \InvalidArgumentException(\sprintf('The file "%s" does not exist.', $resource));
         }
 
         $this->resource = $resolvedResource;
diff --git a/lib/symfony/config/Resource/GlobResource.php b/lib/symfony/config/Resource/GlobResource.php
index 2aedc84b3..f00e1c8b9 100644
--- a/lib/symfony/config/Resource/GlobResource.php
+++ b/lib/symfony/config/Resource/GlobResource.php
@@ -53,7 +53,7 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
         $this->globBrace = \defined('GLOB_BRACE') ? \GLOB_BRACE : 0;
 
         if (false === $resolvedPrefix) {
-            throw new \InvalidArgumentException(sprintf('The path "%s" does not exist.', $prefix));
+            throw new \InvalidArgumentException(\sprintf('The path "%s" does not exist.', $prefix));
         }
 
         $this->prefix = $resolvedPrefix;
@@ -77,21 +77,28 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
         return $this->hash === $hash;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         $this->hash ??= $this->computeHash();
 
-        return ['prefix', 'pattern', 'recursive', 'hash', 'forExclusion', 'excludedPrefixes'];
+        return [
+            'prefix' => $this->prefix,
+            'pattern' => $this->pattern,
+            'recursive' => $this->recursive,
+            'hash' => $this->hash,
+            'forExclusion' => $this->forExclusion,
+            'excludedPrefixes' => $this->excludedPrefixes,
+        ];
     }
 
-    /**
-     * @internal
-     */
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
+        $this->prefix = array_shift($data);
+        $this->pattern = array_shift($data);
+        $this->recursive = array_shift($data);
+        $this->hash = array_shift($data);
+        $this->forExclusion = array_shift($data);
+        $this->excludedPrefixes = array_shift($data);
         $this->globBrace = \defined('GLOB_BRACE') ? \GLOB_BRACE : 0;
     }
 
@@ -111,7 +118,7 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
         if (class_exists(Finder::class)) {
             $regex = Glob::toRegex($pattern);
             if ($this->recursive) {
-                $regex = substr_replace($regex, '(/|$)', -2, 1);
+                $regex = substr_replace($regex, str_ends_with($pattern, '/') ? '' : '(/|$)', -2, 1);
             }
         } else {
             $regex = null;
diff --git a/lib/symfony/config/Resource/ReflectionClassResource.php b/lib/symfony/config/Resource/ReflectionClassResource.php
index dbd47e66d..8b7bfba82 100644
--- a/lib/symfony/config/Resource/ReflectionClassResource.php
+++ b/lib/symfony/config/Resource/ReflectionClassResource.php
@@ -60,17 +60,19 @@ class ReflectionClassResource implements SelfCheckingResourceInterface
         return 'reflection.'.$this->className;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         if (!isset($this->hash)) {
             $this->hash = $this->computeHash();
             $this->loadFiles($this->classReflector);
         }
 
-        return ['files', 'className', 'hash'];
+        return [
+            'files' => $this->files,
+            'className' => $this->className,
+            'excludedVendors' => $this->excludedVendors,
+            'hash' => $this->hash,
+        ];
     }
 
     private function loadFiles(\ReflectionClass $class): void
@@ -123,7 +125,7 @@ class ReflectionClassResource implements SelfCheckingResourceInterface
         yield print_r($attributes, true);
         $attributes = [];
 
-        yield $class->getDocComment();
+        yield $class->getDocComment() ?: '';
         yield (int) $class->isFinal();
         yield (int) $class->isAbstract();
 
@@ -135,6 +137,14 @@ class ReflectionClassResource implements SelfCheckingResourceInterface
             yield print_r($class->getConstants(), true);
         }
 
+        foreach ($class->getReflectionConstants() as $constant) {
+            foreach ($constant->getAttributes() as $a) {
+                $attributes[] = [$a->getName(), (string) $a];
+            }
+            yield $constant->name.print_r($attributes, true);
+            $attributes = [];
+        }
+
         if (!$class->isInterface()) {
             $defaults = $class->getDefaultProperties();
 
@@ -145,7 +155,7 @@ class ReflectionClassResource implements SelfCheckingResourceInterface
                 yield print_r($attributes, true);
                 $attributes = [];
 
-                yield $p->getDocComment();
+                yield $p->getDocComment() ?: '';
                 yield $p->isDefault() ? '<default>' : '';
                 yield $p->isPublic() ? 'public' : 'protected';
                 yield $p->isStatic() ? 'static' : '';
diff --git a/lib/symfony/config/ResourceCheckerConfigCache.php b/lib/symfony/config/ResourceCheckerConfigCache.php
index a8478a8cc..1e58d21ed 100644
--- a/lib/symfony/config/ResourceCheckerConfigCache.php
+++ b/lib/symfony/config/ResourceCheckerConfigCache.php
@@ -109,7 +109,7 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
      *
      * @throws \RuntimeException When cache file can't be written
      */
-    public function write(string $content, array $metadata = null)
+    public function write(string $content, ?array $metadata = null)
     {
         $mode = 0666;
         $umask = umask();
@@ -150,7 +150,7 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
         $signalingException = new \UnexpectedValueException();
         $prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {
-            if (__FILE__ === $file) {
+            if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) {
                 throw $signalingException;
             }
 
diff --git a/lib/symfony/config/Util/XmlUtils.php b/lib/symfony/config/Util/XmlUtils.php
index cc024da46..7a6ef9acc 100644
--- a/lib/symfony/config/Util/XmlUtils.php
+++ b/lib/symfony/config/Util/XmlUtils.php
@@ -42,7 +42,7 @@ class XmlUtils
      * @throws InvalidXmlException When parsing of XML with schema or callable produces any errors unrelated to the XML parsing itself
      * @throws \RuntimeException   When DOM extension is missing
      */
-    public static function parse(string $content, string|callable $schemaOrCallable = null): \DOMDocument
+    public static function parse(string $content, string|callable|null $schemaOrCallable = null): \DOMDocument
     {
         if (!\extension_loaded('dom')) {
             throw new \LogicException('Extension DOM is required.');
@@ -84,7 +84,7 @@ class XmlUtils
             } else {
                 libxml_use_internal_errors($internalErrors);
 
-                throw new XmlParsingException(sprintf('Invalid XSD file: "%s".', $schemaOrCallable));
+                throw new XmlParsingException(\sprintf('Invalid XSD file: "%s".', $schemaOrCallable));
             }
 
             if (!$valid) {
@@ -112,26 +112,26 @@ class XmlUtils
      * @throws XmlParsingException       When XML parsing returns any errors
      * @throws \RuntimeException         When DOM extension is missing
      */
-    public static function loadFile(string $file, string|callable $schemaOrCallable = null): \DOMDocument
+    public static function loadFile(string $file, string|callable|null $schemaOrCallable = null): \DOMDocument
     {
         if (!is_file($file)) {
-            throw new \InvalidArgumentException(sprintf('Resource "%s" is not a file.', $file));
+            throw new \InvalidArgumentException(\sprintf('Resource "%s" is not a file.', $file));
         }
 
         if (!is_readable($file)) {
-            throw new \InvalidArgumentException(sprintf('File "%s" is not readable.', $file));
+            throw new \InvalidArgumentException(\sprintf('File "%s" is not readable.', $file));
         }
 
         $content = @file_get_contents($file);
 
         if ('' === trim($content)) {
-            throw new \InvalidArgumentException(sprintf('File "%s" does not contain valid XML, it is empty.', $file));
+            throw new \InvalidArgumentException(\sprintf('File "%s" does not contain valid XML, it is empty.', $file));
         }
 
         try {
             return static::parse($content, $schemaOrCallable);
         } catch (InvalidXmlException $e) {
-            throw new XmlParsingException(sprintf('The XML file "%s" is not valid.', $file), 0, $e->getPrevious());
+            throw new XmlParsingException(\sprintf('The XML file "%s" is not valid.', $file), 0, $e->getPrevious());
         }
     }
 
@@ -245,7 +245,7 @@ class XmlUtils
     {
         $errors = [];
         foreach (libxml_get_errors() as $error) {
-            $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
+            $errors[] = \sprintf('[%s %s] %s (in %s - line %d, column %d)',
                 \LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
                 $error->code,
                 trim($error->message),
diff --git a/lib/symfony/console/Application.php b/lib/symfony/console/Application.php
index 01b6a373d..f61761df5 100644
--- a/lib/symfony/console/Application.php
+++ b/lib/symfony/console/Application.php
@@ -143,7 +143,7 @@ class Application implements ResetInterface
      *
      * @throws \Exception When running fails. Bypass this when {@link setCatchExceptions()}.
      */
-    public function run(InputInterface $input = null, OutputInterface $output = null): int
+    public function run(?InputInterface $input = null, ?OutputInterface $output = null): int
     {
         if (\function_exists('putenv')) {
             @putenv('LINES='.$this->terminal->getHeight());
@@ -169,9 +169,9 @@ class Application implements ResetInterface
             }
         }
 
-        $this->configureIO($input, $output);
-
         try {
+            $this->configureIO($input, $output);
+
             $exitCode = $this->doRun($input, $output);
         } catch (\Throwable $e) {
             if ($e instanceof \Exception && !$this->catchExceptions) {
@@ -270,9 +270,9 @@ class Application implements ResetInterface
 
                 $style = new SymfonyStyle($input, $output);
                 $output->writeln('');
-                $formattedBlock = (new FormatterHelper())->formatBlock(sprintf('Command "%s" is not defined.', $name), 'error', true);
+                $formattedBlock = (new FormatterHelper())->formatBlock(\sprintf('Command "%s" is not defined.', $name), 'error', true);
                 $output->writeln($formattedBlock);
-                if (!$style->confirm(sprintf('Do you want to run "%s" instead? ', $alternative), false)) {
+                if (!$style->confirm(\sprintf('Do you want to run "%s" instead? ', $alternative), false)) {
                     if (null !== $this->dispatcher) {
                         $event = new ConsoleErrorEvent($input, $output, $e);
                         $this->dispatcher->dispatch($event, ConsoleEvents::ERROR);
@@ -403,6 +403,15 @@ class Application implements ResetInterface
 
             return;
         }
+
+        if (
+            CompletionInput::TYPE_OPTION_VALUE === $input->getCompletionType()
+            && ($definition = $this->getDefinition())->hasOption($input->getCompletionName())
+        ) {
+            $definition->getOption($input->getCompletionName())->complete($input, $suggestions);
+
+            return;
+        }
     }
 
     /**
@@ -502,7 +511,7 @@ class Application implements ResetInterface
     {
         if ('UNKNOWN' !== $this->getName()) {
             if ('UNKNOWN' !== $this->getVersion()) {
-                return sprintf('%s <info>%s</info>', $this->getName(), $this->getVersion());
+                return \sprintf('%s <info>%s</info>', $this->getName(), $this->getVersion());
             }
 
             return $this->getName();
@@ -561,7 +570,7 @@ class Application implements ResetInterface
         }
 
         if (!$command->getName()) {
-            throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_debug_type($command)));
+            throw new LogicException(\sprintf('The command defined in "%s" cannot have an empty name.', get_debug_type($command)));
         }
 
         $this->commands[$command->getName()] = $command;
@@ -585,12 +594,12 @@ class Application implements ResetInterface
         $this->init();
 
         if (!$this->has($name)) {
-            throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));
+            throw new CommandNotFoundException(\sprintf('The command "%s" does not exist.', $name));
         }
 
         // When the command has a different name than the one used at the command loader level
         if (!isset($this->commands[$name])) {
-            throw new CommandNotFoundException(sprintf('The "%s" command cannot be found because it is registered under multiple names. Make sure you don\'t set a different name via constructor or "setName()".', $name));
+            throw new CommandNotFoundException(\sprintf('The "%s" command cannot be found because it is registered under multiple names. Make sure you don\'t set a different name via constructor or "setName()".', $name));
         }
 
         $command = $this->commands[$name];
@@ -654,7 +663,7 @@ class Application implements ResetInterface
         $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
-            $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
+            $message = \sprintf('There are no commands defined in the "%s" namespace.', $namespace);
 
             if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
                 if (1 == \count($alternatives)) {
@@ -671,7 +680,7 @@ class Application implements ResetInterface
 
         $exact = \in_array($namespace, $namespaces, true);
         if (\count($namespaces) > 1 && !$exact) {
-            throw new NamespaceNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
+            throw new NamespaceNotFoundException(\sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
         }
 
         return $exact ? $namespace : reset($namespaces);
@@ -720,18 +729,17 @@ class Application implements ResetInterface
                 $this->findNamespace(substr($name, 0, $pos));
             }
 
-            $message = sprintf('Command "%s" is not defined.', $name);
+            $message = \sprintf('Command "%s" is not defined.', $name);
 
             if ($alternatives = $this->findAlternatives($name, $allCommands)) {
-                // remove hidden commands
-                $alternatives = array_filter($alternatives, fn ($name) => !$this->get($name)->isHidden());
+                $wantHelps = $this->wantHelps;
+                $this->wantHelps = false;
 
-                if (1 == \count($alternatives)) {
-                    $message .= "\n\nDid you mean this?\n    ";
-                } else {
-                    $message .= "\n\nDid you mean one of these?\n    ";
+                // remove hidden commands
+                if ($alternatives = array_filter($alternatives, fn ($name) => !$this->get($name)->isHidden())) {
+                    $message .= \sprintf("\n\nDid you mean %s?\n    %s", 1 === \count($alternatives) ? 'this' : 'one of these', implode("\n    ", $alternatives));
                 }
-                $message .= implode("\n    ", $alternatives);
+                $this->wantHelps = $wantHelps;
             }
 
             throw new CommandNotFoundException($message, array_values($alternatives));
@@ -775,14 +783,14 @@ class Application implements ResetInterface
             if (\count($commands) > 1) {
                 $suggestions = $this->getAbbreviationSuggestions(array_filter($abbrevs));
 
-                throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $name, $suggestions), array_values($commands));
+                throw new CommandNotFoundException(\sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $name, $suggestions), array_values($commands));
             }
         }
 
-        $command = $this->get(reset($commands));
+        $command = $commands ? $this->get(reset($commands)) : null;
 
-        if ($command->isHidden()) {
-            throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));
+        if (!$command || $command->isHidden()) {
+            throw new CommandNotFoundException(\sprintf('The command "%s" does not exist.', $name));
         }
 
         return $command;
@@ -795,7 +803,7 @@ class Application implements ResetInterface
      *
      * @return Command[]
      */
-    public function all(string $namespace = null)
+    public function all(?string $namespace = null)
     {
         $this->init();
 
@@ -857,7 +865,7 @@ class Application implements ResetInterface
         $this->doRenderThrowable($e, $output);
 
         if (null !== $this->runningCommand) {
-            $output->writeln(sprintf('<info>%s</info>', OutputFormatter::escape(sprintf($this->runningCommand->getSynopsis(), $this->getName()))), OutputInterface::VERBOSITY_QUIET);
+            $output->writeln(\sprintf('<info>%s</info>', OutputFormatter::escape(\sprintf($this->runningCommand->getSynopsis(), $this->getName()))), OutputInterface::VERBOSITY_QUIET);
             $output->writeln('', OutputInterface::VERBOSITY_QUIET);
         }
     }
@@ -868,14 +876,14 @@ class Application implements ResetInterface
             $message = trim($e->getMessage());
             if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $class = get_debug_type($e);
-                $title = sprintf('  [%s%s]  ', $class, 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : '');
+                $title = \sprintf('  [%s%s]  ', $class, 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : '');
                 $len = Helper::width($title);
             } else {
                 $len = 0;
             }
 
             if (str_contains($message, "@anonymous\0")) {
-                $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
+                $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
             }
 
             $width = $this->terminal->getWidth() ? $this->terminal->getWidth() - 1 : \PHP_INT_MAX;
@@ -892,14 +900,14 @@ class Application implements ResetInterface
 
             $messages = [];
             if (!$e instanceof ExceptionInterface || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $messages[] = sprintf('<comment>%s</comment>', OutputFormatter::escape(sprintf('In %s line %s:', basename($e->getFile()) ?: 'n/a', $e->getLine() ?: 'n/a')));
+                $messages[] = \sprintf('<comment>%s</comment>', OutputFormatter::escape(\sprintf('In %s line %s:', basename($e->getFile()) ?: 'n/a', $e->getLine() ?: 'n/a')));
             }
-            $messages[] = $emptyLine = sprintf('<error>%s</error>', str_repeat(' ', $len));
+            $messages[] = $emptyLine = \sprintf('<error>%s</error>', str_repeat(' ', $len));
             if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $messages[] = sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - Helper::width($title))));
+                $messages[] = \sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - Helper::width($title))));
             }
             foreach ($lines as $line) {
-                $messages[] = sprintf('<error>  %s  %s</error>', OutputFormatter::escape($line[0]), str_repeat(' ', $len - $line[1]));
+                $messages[] = \sprintf('<error>  %s  %s</error>', OutputFormatter::escape($line[0]), str_repeat(' ', $len - $line[1]));
             }
             $messages[] = $emptyLine;
             $messages[] = '';
@@ -926,7 +934,7 @@ class Application implements ResetInterface
                     $file = $trace[$i]['file'] ?? 'n/a';
                     $line = $trace[$i]['line'] ?? 'n/a';
 
-                    $output->writeln(sprintf(' %s%s at <info>%s:%s</info>', $class, $function ? $type.$function.'()' : '', $file, $line), OutputInterface::VERBOSITY_QUIET);
+                    $output->writeln(\sprintf(' %s%s at <info>%s:%s</info>', $class, $function ? $type.$function.'()' : '', $file, $line), OutputInterface::VERBOSITY_QUIET);
                 }
 
                 $output->writeln('', OutputInterface::VERBOSITY_QUIET);
@@ -1012,19 +1020,15 @@ class Application implements ResetInterface
             }
         }
 
+        $registeredSignals = false;
         $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
         if ($commandSignals || $this->dispatcher && $this->signalsToDispatchEvent) {
             if (!$this->signalRegistry) {
                 throw new RuntimeException('Unable to subscribe to signal events. Make sure that the "pcntl" extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
             }
 
-            if (Terminal::hasSttyAvailable()) {
-                $sttyMode = shell_exec('stty -g');
-
-                foreach ([\SIGINT, \SIGTERM] as $signal) {
-                    $this->signalRegistry->register($signal, static fn () => shell_exec('stty '.$sttyMode));
-                }
-            }
+            $registeredSignals = true;
+            $this->getSignalRegistry()->pushCurrentHandlers();
 
             if ($this->dispatcher) {
                 // We register application signals, so that we can dispatch the event
@@ -1075,7 +1079,13 @@ class Application implements ResetInterface
         }
 
         if (null === $this->dispatcher) {
-            return $command->run($input, $output);
+            try {
+                return $command->run($input, $output);
+            } finally {
+                if ($registeredSignals) {
+                    $this->getSignalRegistry()->popPreviousHandlers();
+                }
+            }
         }
 
         // bind before the console.command event, so the listeners have access to input options/arguments
@@ -1105,6 +1115,10 @@ class Application implements ResetInterface
             if (0 === $exitCode = $event->getExitCode()) {
                 $e = null;
             }
+        } finally {
+            if ($registeredSignals) {
+                $this->getSignalRegistry()->popPreviousHandlers();
+            }
         }
 
         $event = new ConsoleTerminateEvent($command, $input, $output, $exitCode);
@@ -1177,7 +1191,7 @@ class Application implements ResetInterface
      *
      * This method is not part of public API and should not be used directly.
      */
-    public function extractNamespace(string $name, int $limit = null): string
+    public function extractNamespace(string $name, ?int $limit = null): string
     {
         $parts = explode(':', $name, -1);
 
@@ -1278,7 +1292,7 @@ class Application implements ResetInterface
 
             foreach (preg_split('//u', $m[0]) as $char) {
                 // test if $char could be appended to current line
-                if (mb_strwidth($line.$char, 'utf8') <= $width) {
+                if (Helper::width($line.$char) <= $width) {
                     $line .= $char;
                     continue;
                 }
diff --git a/lib/symfony/console/CI/GithubActionReporter.php b/lib/symfony/console/CI/GithubActionReporter.php
index 7e5565469..28112c2a2 100644
--- a/lib/symfony/console/CI/GithubActionReporter.php
+++ b/lib/symfony/console/CI/GithubActionReporter.php
@@ -57,7 +57,7 @@ class GithubActionReporter
      *
      * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
      */
-    public function error(string $message, string $file = null, int $line = null, int $col = null): void
+    public function error(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void
     {
         $this->log('error', $message, $file, $line, $col);
     }
@@ -67,7 +67,7 @@ class GithubActionReporter
      *
      * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message
      */
-    public function warning(string $message, string $file = null, int $line = null, int $col = null): void
+    public function warning(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void
     {
         $this->log('warning', $message, $file, $line, $col);
     }
@@ -77,23 +77,23 @@ class GithubActionReporter
      *
      * @see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-a-debug-message
      */
-    public function debug(string $message, string $file = null, int $line = null, int $col = null): void
+    public function debug(string $message, ?string $file = null, ?int $line = null, ?int $col = null): void
     {
         $this->log('debug', $message, $file, $line, $col);
     }
 
-    private function log(string $type, string $message, string $file = null, int $line = null, int $col = null): void
+    private function log(string $type, string $message, ?string $file = null, ?int $line = null, ?int $col = null): void
     {
         // Some values must be encoded.
         $message = strtr($message, self::ESCAPED_DATA);
 
         if (!$file) {
             // No file provided, output the message solely:
-            $this->output->writeln(sprintf('::%s::%s', $type, $message));
+            $this->output->writeln(\sprintf('::%s::%s', $type, $message));
 
             return;
         }
 
-        $this->output->writeln(sprintf('::%s file=%s,line=%s,col=%s::%s', $type, strtr($file, self::ESCAPED_PROPERTIES), strtr($line ?? 1, self::ESCAPED_PROPERTIES), strtr($col ?? 0, self::ESCAPED_PROPERTIES), $message));
+        $this->output->writeln(\sprintf('::%s file=%s,line=%s,col=%s::%s', $type, strtr($file, self::ESCAPED_PROPERTIES), strtr($line ?? 1, self::ESCAPED_PROPERTIES), strtr($col ?? 0, self::ESCAPED_PROPERTIES), $message));
     }
 }
diff --git a/lib/symfony/console/Color.php b/lib/symfony/console/Color.php
index 60ed046a6..b1914c19a 100644
--- a/lib/symfony/console/Color.php
+++ b/lib/symfony/console/Color.php
@@ -60,7 +60,7 @@ final class Color
 
         foreach ($options as $option) {
             if (!isset(self::AVAILABLE_OPTIONS[$option])) {
-                throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(self::AVAILABLE_OPTIONS))));
+                throw new InvalidArgumentException(\sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(self::AVAILABLE_OPTIONS))));
             }
 
             $this->options[$option] = self::AVAILABLE_OPTIONS[$option];
@@ -88,7 +88,7 @@ final class Color
             return '';
         }
 
-        return sprintf("\033[%sm", implode(';', $setCodes));
+        return \sprintf("\033[%sm", implode(';', $setCodes));
     }
 
     public function unset(): string
@@ -107,7 +107,7 @@ final class Color
             return '';
         }
 
-        return sprintf("\033[%sm", implode(';', $unsetCodes));
+        return \sprintf("\033[%sm", implode(';', $unsetCodes));
     }
 
     private function parseColor(string $color, bool $background = false): string
@@ -128,6 +128,6 @@ final class Color
             return ($background ? '10' : '9').self::BRIGHT_COLORS[$color];
         }
 
-        throw new InvalidArgumentException(sprintf('Invalid "%s" color; expected one of (%s).', $color, implode(', ', array_merge(array_keys(self::COLORS), array_keys(self::BRIGHT_COLORS)))));
+        throw new InvalidArgumentException(\sprintf('Invalid "%s" color; expected one of (%s).', $color, implode(', ', array_merge(array_keys(self::COLORS), array_keys(self::BRIGHT_COLORS)))));
     }
 }
diff --git a/lib/symfony/console/Command/Command.php b/lib/symfony/console/Command/Command.php
index 704b112d1..3ede6ca6b 100644
--- a/lib/symfony/console/Command/Command.php
+++ b/lib/symfony/console/Command/Command.php
@@ -111,7 +111,7 @@ class Command
      *
      * @throws LogicException When the command name is empty
      */
-    public function __construct(string $name = null)
+    public function __construct(?string $name = null)
     {
         $this->definition = new InputDefinition();
 
@@ -152,7 +152,7 @@ class Command
     /**
      * @return void
      */
-    public function setApplication(Application $application = null)
+    public function setApplication(?Application $application = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -326,7 +326,7 @@ class Command
             $statusCode = $this->execute($input, $output);
 
             if (!\is_int($statusCode)) {
-                throw new \TypeError(sprintf('Return value of "%s::execute()" must be of the type int, "%s" returned.', static::class, get_debug_type($statusCode)));
+                throw new \TypeError(\sprintf('Return value of "%s::execute()" must be of the type int, "%s" returned.', static::class, get_debug_type($statusCode)));
             }
         }
 
@@ -446,7 +446,7 @@ class Command
      */
     public function getNativeDefinition(): InputDefinition
     {
-        return $this->definition ?? throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', static::class));
+        return $this->definition ?? throw new LogicException(\sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', static::class));
     }
 
     /**
@@ -460,11 +460,11 @@ class Command
      *
      * @throws InvalidArgumentException When argument mode is not valid
      */
-    public function addArgument(string $name, int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = null */): static
+    public function addArgument(string $name, ?int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = null */): static
     {
         $suggestedValues = 5 <= \func_num_args() ? func_get_arg(4) : [];
         if (!\is_array($suggestedValues) && !$suggestedValues instanceof \Closure) {
-            throw new \TypeError(sprintf('Argument 5 passed to "%s()" must be array or \Closure, "%s" given.', __METHOD__, get_debug_type($suggestedValues)));
+            throw new \TypeError(\sprintf('Argument 5 passed to "%s()" must be array or \Closure, "%s" given.', __METHOD__, get_debug_type($suggestedValues)));
         }
         $this->definition->addArgument(new InputArgument($name, $mode, $description, $default, $suggestedValues));
         $this->fullDefinition?->addArgument(new InputArgument($name, $mode, $description, $default, $suggestedValues));
@@ -484,11 +484,11 @@ class Command
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      */
-    public function addOption(string $name, string|array $shortcut = null, int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
+    public function addOption(string $name, string|array|null $shortcut = null, ?int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
     {
         $suggestedValues = 6 <= \func_num_args() ? func_get_arg(5) : [];
         if (!\is_array($suggestedValues) && !$suggestedValues instanceof \Closure) {
-            throw new \TypeError(sprintf('Argument 5 passed to "%s()" must be array or \Closure, "%s" given.', __METHOD__, get_debug_type($suggestedValues)));
+            throw new \TypeError(\sprintf('Argument 5 passed to "%s()" must be array or \Closure, "%s" given.', __METHOD__, get_debug_type($suggestedValues)));
         }
         $this->definition->addOption(new InputOption($name, $shortcut, $mode, $description, $default, $suggestedValues));
         $this->fullDefinition?->addOption(new InputOption($name, $shortcut, $mode, $description, $default, $suggestedValues));
@@ -662,7 +662,7 @@ class Command
         $key = $short ? 'short' : 'long';
 
         if (!isset($this->synopsis[$key])) {
-            $this->synopsis[$key] = trim(sprintf('%s %s', $this->name, $this->definition->getSynopsis($short)));
+            $this->synopsis[$key] = trim(\sprintf('%s %s', $this->name, $this->definition->getSynopsis($short)));
         }
 
         return $this->synopsis[$key];
@@ -676,7 +676,7 @@ class Command
     public function addUsage(string $usage): static
     {
         if (!str_starts_with($usage, $this->name)) {
-            $usage = sprintf('%s %s', $this->name, $usage);
+            $usage = \sprintf('%s %s', $this->name, $usage);
         }
 
         $this->usages[] = $usage;
@@ -703,7 +703,7 @@ class Command
     public function getHelper(string $name): mixed
     {
         if (null === $this->helperSet) {
-            throw new LogicException(sprintf('Cannot retrieve helper "%s" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.', $name));
+            throw new LogicException(\sprintf('Cannot retrieve helper "%s" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.', $name));
         }
 
         return $this->helperSet->get($name);
@@ -719,7 +719,7 @@ class Command
     private function validateName(string $name): void
     {
         if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
-            throw new InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
+            throw new InvalidArgumentException(\sprintf('Command name "%s" is invalid.', $name));
         }
     }
 }
diff --git a/lib/symfony/console/Command/CompleteCommand.php b/lib/symfony/console/Command/CompleteCommand.php
index 23be5577b..33f7f93c8 100644
--- a/lib/symfony/console/Command/CompleteCommand.php
+++ b/lib/symfony/console/Command/CompleteCommand.php
@@ -85,7 +85,7 @@ final class CompleteCommand extends Command
             // "symfony" must be kept for compat with the shell scripts generated by Symfony Console 5.4 - 6.1
             $version = $input->getOption('symfony') ? '1' : $input->getOption('api-version');
             if ($version && version_compare($version, self::COMPLETION_API_VERSION, '<')) {
-                $message = sprintf('Completion script version is not supported ("%s" given, ">=%s" required).', $version, self::COMPLETION_API_VERSION);
+                $message = \sprintf('Completion script version is not supported ("%s" given, ">=%s" required).', $version, self::COMPLETION_API_VERSION);
                 $this->log($message);
 
                 $output->writeln($message.' Install the Symfony completion script again by using the "completion" command.');
@@ -99,7 +99,7 @@ final class CompleteCommand extends Command
             }
 
             if (!$completionOutput = $this->completionOutputs[$shell] ?? false) {
-                throw new \RuntimeException(sprintf('Shell completion is not supported for your shell: "%s" (supported: "%s").', $shell, implode('", "', array_keys($this->completionOutputs))));
+                throw new \RuntimeException(\sprintf('Shell completion is not supported for your shell: "%s" (supported: "%s").', $shell, implode('", "', array_keys($this->completionOutputs))));
             }
 
             $completionInput = $this->createCompletionInput($input);
diff --git a/lib/symfony/console/Command/DumpCompletionCommand.php b/lib/symfony/console/Command/DumpCompletionCommand.php
index 51b613a14..571425b88 100644
--- a/lib/symfony/console/Command/DumpCompletionCommand.php
+++ b/lib/symfony/console/Command/DumpCompletionCommand.php
@@ -108,9 +108,9 @@ EOH
                 $output = $output->getErrorOutput();
             }
             if ($shell) {
-                $output->writeln(sprintf('<error>Detected shell "%s", which is not supported by Symfony shell completion (supported shells: "%s").</>', $shell, implode('", "', $supportedShells)));
+                $output->writeln(\sprintf('<error>Detected shell "%s", which is not supported by Symfony shell completion (supported shells: "%s").</>', $shell, implode('", "', $supportedShells)));
             } else {
-                $output->writeln(sprintf('<error>Shell not detected, Symfony shell completion only supports "%s").</>', implode('", "', $supportedShells)));
+                $output->writeln(\sprintf('<error>Shell not detected, Symfony shell completion only supports "%s").</>', implode('", "', $supportedShells)));
             }
 
             return 2;
diff --git a/lib/symfony/console/Command/LazyCommand.php b/lib/symfony/console/Command/LazyCommand.php
index d56058221..b94da6665 100644
--- a/lib/symfony/console/Command/LazyCommand.php
+++ b/lib/symfony/console/Command/LazyCommand.php
@@ -45,7 +45,7 @@ final class LazyCommand extends Command
         $this->getCommand()->ignoreValidationErrors();
     }
 
-    public function setApplication(Application $application = null): void
+    public function setApplication(?Application $application = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -116,7 +116,7 @@ final class LazyCommand extends Command
     /**
      * @param array|\Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion> $suggestedValues The values used for input completion
      */
-    public function addArgument(string $name, int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
+    public function addArgument(string $name, ?int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
     {
         $suggestedValues = 5 <= \func_num_args() ? func_get_arg(4) : [];
         $this->getCommand()->addArgument($name, $mode, $description, $default, $suggestedValues);
@@ -127,7 +127,7 @@ final class LazyCommand extends Command
     /**
      * @param array|\Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion> $suggestedValues The values used for input completion
      */
-    public function addOption(string $name, string|array $shortcut = null, int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
+    public function addOption(string $name, string|array|null $shortcut = null, ?int $mode = null, string $description = '', mixed $default = null /* array|\Closure $suggestedValues = [] */): static
     {
         $suggestedValues = 6 <= \func_num_args() ? func_get_arg(5) : [];
         $this->getCommand()->addOption($name, $shortcut, $mode, $description, $default, $suggestedValues);
diff --git a/lib/symfony/console/Command/LockableTrait.php b/lib/symfony/console/Command/LockableTrait.php
index c1006a65c..cd7548f02 100644
--- a/lib/symfony/console/Command/LockableTrait.php
+++ b/lib/symfony/console/Command/LockableTrait.php
@@ -29,7 +29,7 @@ trait LockableTrait
     /**
      * Locks a command.
      */
-    private function lock(string $name = null, bool $blocking = false): bool
+    private function lock(?string $name = null, bool $blocking = false): bool
     {
         if (!class_exists(SemaphoreStore::class)) {
             throw new LogicException('To enable the locking feature you must install the symfony/lock component. Try running "composer require symfony/lock".');
diff --git a/lib/symfony/console/Command/SignalableCommandInterface.php b/lib/symfony/console/Command/SignalableCommandInterface.php
index f8eb8e522..74d59b086 100644
--- a/lib/symfony/console/Command/SignalableCommandInterface.php
+++ b/lib/symfony/console/Command/SignalableCommandInterface.php
@@ -30,5 +30,5 @@ interface SignalableCommandInterface
      *
      * @return int|false The exit code to return or false to continue the normal execution
      */
-    public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */);
+    public function handleSignal(int $signal/* , int|false $previousExitCode = 0 */);
 }
diff --git a/lib/symfony/console/Command/TraceableCommand.php b/lib/symfony/console/Command/TraceableCommand.php
index d8c46b7fa..9df467b0d 100644
--- a/lib/symfony/console/Command/TraceableCommand.php
+++ b/lib/symfony/console/Command/TraceableCommand.php
@@ -134,7 +134,7 @@ final class TraceableCommand extends Command implements SignalableCommandInterfa
         parent::ignoreValidationErrors();
     }
 
-    public function setApplication(Application $application = null): void
+    public function setApplication(?Application $application = null): void
     {
         $this->command->setApplication($application);
     }
@@ -209,14 +209,14 @@ final class TraceableCommand extends Command implements SignalableCommandInterfa
         return $this->command->getNativeDefinition();
     }
 
-    public function addArgument(string $name, int $mode = null, string $description = '', mixed $default = null, array|\Closure $suggestedValues = []): static
+    public function addArgument(string $name, ?int $mode = null, string $description = '', mixed $default = null, array|\Closure $suggestedValues = []): static
     {
         $this->command->addArgument($name, $mode, $description, $default, $suggestedValues);
 
         return $this;
     }
 
-    public function addOption(string $name, string|array $shortcut = null, int $mode = null, string $description = '', mixed $default = null, array|\Closure $suggestedValues = []): static
+    public function addOption(string $name, string|array|null $shortcut = null, ?int $mode = null, string $description = '', mixed $default = null, array|\Closure $suggestedValues = []): static
     {
         $this->command->addOption($name, $shortcut, $mode, $description, $default, $suggestedValues);
 
@@ -283,7 +283,7 @@ final class TraceableCommand extends Command implements SignalableCommandInterfa
         $event = $this->stopwatch->start($this->getName(), 'command');
 
         try {
-            $this->exitCode = parent::run($input, $output);
+            $this->exitCode = $this->command->run($input, $output);
         } finally {
             $event->stop();
 
diff --git a/lib/symfony/console/CommandLoader/ContainerCommandLoader.php b/lib/symfony/console/CommandLoader/ContainerCommandLoader.php
index bfa0ac467..1638f2fd0 100644
--- a/lib/symfony/console/CommandLoader/ContainerCommandLoader.php
+++ b/lib/symfony/console/CommandLoader/ContainerCommandLoader.php
@@ -37,7 +37,7 @@ class ContainerCommandLoader implements CommandLoaderInterface
     public function get(string $name): Command
     {
         if (!$this->has($name)) {
-            throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
+            throw new CommandNotFoundException(\sprintf('Command "%s" does not exist.', $name));
         }
 
         return $this->container->get($this->commandMap[$name]);
diff --git a/lib/symfony/console/CommandLoader/FactoryCommandLoader.php b/lib/symfony/console/CommandLoader/FactoryCommandLoader.php
index 9ced75aeb..ffe1b520c 100644
--- a/lib/symfony/console/CommandLoader/FactoryCommandLoader.php
+++ b/lib/symfony/console/CommandLoader/FactoryCommandLoader.php
@@ -39,7 +39,7 @@ class FactoryCommandLoader implements CommandLoaderInterface
     public function get(string $name): Command
     {
         if (!isset($this->factories[$name])) {
-            throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
+            throw new CommandNotFoundException(\sprintf('Command "%s" does not exist.', $name));
         }
 
         $factory = $this->factories[$name];
diff --git a/lib/symfony/console/Completion/CompletionInput.php b/lib/symfony/console/Completion/CompletionInput.php
index 7ba41c083..79c2f659a 100644
--- a/lib/symfony/console/Completion/CompletionInput.php
+++ b/lib/symfony/console/Completion/CompletionInput.php
@@ -53,7 +53,7 @@ final class CompletionInput extends ArgvInput
      * Create an input based on an COMP_WORDS token list.
      *
      * @param string[] $tokens       the set of split tokens (e.g. COMP_WORDS or argv)
-     * @param          $currentIndex the index of the cursor (e.g. COMP_CWORD)
+     * @param int      $currentIndex the index of the cursor (e.g. COMP_CWORD)
      */
     public static function fromTokens(array $tokens, int $currentIndex): self
     {
diff --git a/lib/symfony/console/Completion/Suggestion.php b/lib/symfony/console/Completion/Suggestion.php
index 7392965a2..3251b079f 100644
--- a/lib/symfony/console/Completion/Suggestion.php
+++ b/lib/symfony/console/Completion/Suggestion.php
@@ -20,7 +20,7 @@ class Suggestion implements \Stringable
 {
     public function __construct(
         private readonly string $value,
-        private readonly string $description = ''
+        private readonly string $description = '',
     ) {
     }
 
diff --git a/lib/symfony/console/Cursor.php b/lib/symfony/console/Cursor.php
index 69fd3821c..45243c796 100644
--- a/lib/symfony/console/Cursor.php
+++ b/lib/symfony/console/Cursor.php
@@ -36,7 +36,7 @@ final class Cursor
      */
     public function moveUp(int $lines = 1): static
     {
-        $this->output->write(sprintf("\x1b[%dA", $lines));
+        $this->output->write(\sprintf("\x1b[%dA", $lines));
 
         return $this;
     }
@@ -46,7 +46,7 @@ final class Cursor
      */
     public function moveDown(int $lines = 1): static
     {
-        $this->output->write(sprintf("\x1b[%dB", $lines));
+        $this->output->write(\sprintf("\x1b[%dB", $lines));
 
         return $this;
     }
@@ -56,7 +56,7 @@ final class Cursor
      */
     public function moveRight(int $columns = 1): static
     {
-        $this->output->write(sprintf("\x1b[%dC", $columns));
+        $this->output->write(\sprintf("\x1b[%dC", $columns));
 
         return $this;
     }
@@ -66,7 +66,7 @@ final class Cursor
      */
     public function moveLeft(int $columns = 1): static
     {
-        $this->output->write(sprintf("\x1b[%dD", $columns));
+        $this->output->write(\sprintf("\x1b[%dD", $columns));
 
         return $this;
     }
@@ -76,7 +76,7 @@ final class Cursor
      */
     public function moveToColumn(int $column): static
     {
-        $this->output->write(sprintf("\x1b[%dG", $column));
+        $this->output->write(\sprintf("\x1b[%dG", $column));
 
         return $this;
     }
@@ -86,7 +86,7 @@ final class Cursor
      */
     public function moveToPosition(int $column, int $row): static
     {
-        $this->output->write(sprintf("\x1b[%d;%dH", $row + 1, $column));
+        $this->output->write(\sprintf("\x1b[%d;%dH", $row + 1, $column));
 
         return $this;
     }
@@ -195,7 +195,7 @@ final class Cursor
 
         $code = trim(fread($this->input, 1024));
 
-        shell_exec(sprintf('stty %s', $sttyMode));
+        shell_exec(\sprintf('stty %s', $sttyMode));
 
         sscanf($code, "\033[%d;%dR", $row, $col);
 
diff --git a/lib/symfony/console/DataCollector/CommandDataCollector.php b/lib/symfony/console/DataCollector/CommandDataCollector.php
index 16a0eadf4..3cbe72b59 100644
--- a/lib/symfony/console/DataCollector/CommandDataCollector.php
+++ b/lib/symfony/console/DataCollector/CommandDataCollector.php
@@ -27,7 +27,7 @@ use Symfony\Component\VarDumper\Cloner\Data;
  */
 final class CommandDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if (!$request instanceof CliRequest) {
             return;
@@ -118,7 +118,7 @@ final class CommandDataCollector extends DataCollector
     public function getInterruptedBySignal(): ?string
     {
         if (isset($this->data['interrupted_by_signal'])) {
-            return sprintf('%s (%d)', SignalMap::getSignalName($this->data['interrupted_by_signal']), $this->data['interrupted_by_signal']);
+            return \sprintf('%s (%d)', SignalMap::getSignalName($this->data['interrupted_by_signal']), $this->data['interrupted_by_signal']);
         }
 
         return null;
@@ -204,7 +204,7 @@ final class CommandDataCollector extends DataCollector
     public function getSignalable(): array
     {
         return array_map(
-            static fn (int $signal): string => sprintf('%s (%d)', SignalMap::getSignalName($signal), $signal),
+            static fn (int $signal): string => \sprintf('%s (%d)', SignalMap::getSignalName($signal), $signal),
             $this->data['signalable']
         );
     }
@@ -212,7 +212,7 @@ final class CommandDataCollector extends DataCollector
     public function getHandledSignals(): array
     {
         $keys = array_map(
-            static fn (int $signal): string => sprintf('%s (%d)', SignalMap::getSignalName($signal), $signal),
+            static fn (int $signal): string => \sprintf('%s (%d)', SignalMap::getSignalName($signal), $signal),
             array_keys($this->data['handled_signals'])
         );
 
diff --git a/lib/symfony/console/DependencyInjection/AddConsoleCommandPass.php b/lib/symfony/console/DependencyInjection/AddConsoleCommandPass.php
index 27705ddb6..3cf05734b 100644
--- a/lib/symfony/console/DependencyInjection/AddConsoleCommandPass.php
+++ b/lib/symfony/console/DependencyInjection/AddConsoleCommandPass.php
@@ -48,10 +48,10 @@ class AddConsoleCommandPass implements CompilerPassInterface
                 $aliases = $tags[0]['command'];
             } else {
                 if (!$r = $container->getReflectionClass($class)) {
-                    throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                    throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
                 }
                 if (!$r->isSubclassOf(Command::class)) {
-                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
+                    throw new InvalidArgumentException(\sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
                 }
                 $aliases = str_replace('%', '%%', $class::getDefaultName() ?? '');
             }
@@ -105,10 +105,10 @@ class AddConsoleCommandPass implements CompilerPassInterface
 
             if (!$description) {
                 if (!$r = $container->getReflectionClass($class)) {
-                    throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                    throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
                 }
                 if (!$r->isSubclassOf(Command::class)) {
-                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
+                    throw new InvalidArgumentException(\sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
                 }
                 $description = str_replace('%', '%%', $class::getDefaultDescription() ?? '');
             }
diff --git a/lib/symfony/console/Descriptor/ApplicationDescription.php b/lib/symfony/console/Descriptor/ApplicationDescription.php
index f8ed18045..3f38379c9 100644
--- a/lib/symfony/console/Descriptor/ApplicationDescription.php
+++ b/lib/symfony/console/Descriptor/ApplicationDescription.php
@@ -39,7 +39,7 @@ class ApplicationDescription
      */
     private array $aliases = [];
 
-    public function __construct(Application $application, string $namespace = null, bool $showHidden = false)
+    public function __construct(Application $application, ?string $namespace = null, bool $showHidden = false)
     {
         $this->application = $application;
         $this->namespace = $namespace;
@@ -73,7 +73,7 @@ class ApplicationDescription
     public function getCommand(string $name): Command
     {
         if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
-            throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
+            throw new CommandNotFoundException(\sprintf('Command "%s" does not exist.', $name));
         }
 
         return $this->commands[$name] ?? $this->aliases[$name];
diff --git a/lib/symfony/console/Descriptor/Descriptor.php b/lib/symfony/console/Descriptor/Descriptor.php
index 7b2509c60..2143a17c3 100644
--- a/lib/symfony/console/Descriptor/Descriptor.php
+++ b/lib/symfony/console/Descriptor/Descriptor.php
@@ -38,7 +38,7 @@ abstract class Descriptor implements DescriptorInterface
             $object instanceof InputDefinition => $this->describeInputDefinition($object, $options),
             $object instanceof Command => $this->describeCommand($object, $options),
             $object instanceof Application => $this->describeApplication($object, $options),
-            default => throw new InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
+            default => throw new InvalidArgumentException(\sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
         };
     }
 
diff --git a/lib/symfony/console/Descriptor/JsonDescriptor.php b/lib/symfony/console/Descriptor/JsonDescriptor.php
index 956303709..9a8e696cd 100644
--- a/lib/symfony/console/Descriptor/JsonDescriptor.php
+++ b/lib/symfony/console/Descriptor/JsonDescriptor.php
@@ -108,7 +108,7 @@ class JsonDescriptor extends Descriptor
             'is_value_required' => false,
             'is_multiple' => false,
             'description' => 'Negate the "--'.$option->getName().'" option',
-            'default' => false,
+            'default' => null === $option->getDefault() ? null : !$option->getDefault(),
         ] : [
             'name' => '--'.$option->getName(),
             'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '',
diff --git a/lib/symfony/console/Descriptor/MarkdownDescriptor.php b/lib/symfony/console/Descriptor/MarkdownDescriptor.php
index b3f16ee90..8b7075943 100644
--- a/lib/symfony/console/Descriptor/MarkdownDescriptor.php
+++ b/lib/symfony/console/Descriptor/MarkdownDescriptor.php
@@ -149,7 +149,7 @@ class MarkdownDescriptor extends Descriptor
             }
 
             $this->write("\n\n");
-            $this->write(implode("\n", array_map(fn ($commandName) => sprintf('* [`%s`](#%s)', $commandName, str_replace(':', '', $description->getCommand($commandName)->getName())), $namespace['commands'])));
+            $this->write(implode("\n", array_map(fn ($commandName) => \sprintf('* [`%s`](#%s)', $commandName, str_replace(':', '', $description->getCommand($commandName)->getName())), $namespace['commands'])));
         }
 
         foreach ($description->getCommands() as $command) {
@@ -162,7 +162,7 @@ class MarkdownDescriptor extends Descriptor
     {
         if ('UNKNOWN' !== $application->getName()) {
             if ('UNKNOWN' !== $application->getVersion()) {
-                return sprintf('%s %s', $application->getName(), $application->getVersion());
+                return \sprintf('%s %s', $application->getName(), $application->getVersion());
             }
 
             return $application->getName();
diff --git a/lib/symfony/console/Descriptor/ReStructuredTextDescriptor.php b/lib/symfony/console/Descriptor/ReStructuredTextDescriptor.php
index d4423fd34..a2b754276 100644
--- a/lib/symfony/console/Descriptor/ReStructuredTextDescriptor.php
+++ b/lib/symfony/console/Descriptor/ReStructuredTextDescriptor.php
@@ -167,7 +167,7 @@ class ReStructuredTextDescriptor extends Descriptor
             return 'Console Tool';
         }
         if ('UNKNOWN' !== $application->getVersion()) {
-            return sprintf('%s %s', $application->getName(), $application->getVersion());
+            return \sprintf('%s %s', $application->getName(), $application->getVersion());
         }
 
         return $application->getName();
@@ -209,7 +209,7 @@ class ReStructuredTextDescriptor extends Descriptor
             $commands = $this->removeAliasesAndHiddenCommands($commands);
 
             $this->write("\n\n");
-            $this->write(implode("\n", array_map(static fn ($commandName) => sprintf('- `%s`_', $commandName), array_keys($commands))));
+            $this->write(implode("\n", array_map(static fn ($commandName) => \sprintf('- `%s`_', $commandName), array_keys($commands))));
         }
     }
 
diff --git a/lib/symfony/console/Descriptor/TextDescriptor.php b/lib/symfony/console/Descriptor/TextDescriptor.php
index d04d10238..51c411f46 100644
--- a/lib/symfony/console/Descriptor/TextDescriptor.php
+++ b/lib/symfony/console/Descriptor/TextDescriptor.php
@@ -31,7 +31,7 @@ class TextDescriptor extends Descriptor
     protected function describeInputArgument(InputArgument $argument, array $options = []): void
     {
         if (null !== $argument->getDefault() && (!\is_array($argument->getDefault()) || \count($argument->getDefault()))) {
-            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
+            $default = \sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
         } else {
             $default = '';
         }
@@ -39,7 +39,7 @@ class TextDescriptor extends Descriptor
         $totalWidth = $options['total_width'] ?? Helper::width($argument->getName());
         $spacingWidth = $totalWidth - \strlen($argument->getName());
 
-        $this->writeText(sprintf('  <info>%s</info>  %s%s%s',
+        $this->writeText(\sprintf('  <info>%s</info>  %s%s%s',
             $argument->getName(),
             str_repeat(' ', $spacingWidth),
             // + 4 = 2 spaces before <info>, 2 spaces after </info>
@@ -51,7 +51,7 @@ class TextDescriptor extends Descriptor
     protected function describeInputOption(InputOption $option, array $options = []): void
     {
         if ($option->acceptValue() && null !== $option->getDefault() && (!\is_array($option->getDefault()) || \count($option->getDefault()))) {
-            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
+            $default = \sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
         } else {
             $default = '';
         }
@@ -66,14 +66,14 @@ class TextDescriptor extends Descriptor
         }
 
         $totalWidth = $options['total_width'] ?? $this->calculateTotalWidthForOptions([$option]);
-        $synopsis = sprintf('%s%s',
-            $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ',
-            sprintf($option->isNegatable() ? '--%1$s|--no-%1$s' : '--%1$s%2$s', $option->getName(), $value)
+        $synopsis = \sprintf('%s%s',
+            $option->getShortcut() ? \sprintf('-%s, ', $option->getShortcut()) : '    ',
+            \sprintf($option->isNegatable() ? '--%1$s|--no-%1$s' : '--%1$s%2$s', $option->getName(), $value)
         );
 
         $spacingWidth = $totalWidth - Helper::width($synopsis);
 
-        $this->writeText(sprintf('  <info>%s</info>  %s%s%s%s',
+        $this->writeText(\sprintf('  <info>%s</info>  %s%s%s%s',
             $synopsis,
             str_repeat(' ', $spacingWidth),
             // + 4 = 2 spaces before <info>, 2 spaces after </info>
@@ -166,7 +166,7 @@ class TextDescriptor extends Descriptor
             $width = $this->getColumnWidth($description->getCommands());
 
             foreach ($description->getCommands() as $command) {
-                $this->writeText(sprintf("%-{$width}s %s", $command->getName(), $command->getDescription()), $options);
+                $this->writeText(\sprintf("%-{$width}s %s", $command->getName(), $command->getDescription()), $options);
                 $this->writeText("\n");
             }
         } else {
@@ -196,7 +196,7 @@ class TextDescriptor extends Descriptor
             $width = $this->getColumnWidth(array_merge(...array_values(array_map(fn ($namespace) => array_intersect($namespace['commands'], array_keys($commands)), array_values($namespaces)))));
 
             if ($describedNamespace) {
-                $this->writeText(sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
+                $this->writeText(\sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
             } else {
                 $this->writeText('<comment>Available commands:</comment>', $options);
             }
@@ -218,7 +218,7 @@ class TextDescriptor extends Descriptor
                     $spacingWidth = $width - Helper::width($name);
                     $command = $commands[$name];
                     $commandAliases = $name === $command->getName() ? $this->getCommandAliasesText($command) : '';
-                    $this->writeText(sprintf('  <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $commandAliases.$command->getDescription()), $options);
+                    $this->writeText(\sprintf('  <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $commandAliases.$command->getDescription()), $options);
                 }
             }
 
diff --git a/lib/symfony/console/Descriptor/XmlDescriptor.php b/lib/symfony/console/Descriptor/XmlDescriptor.php
index 72580fd98..866c71856 100644
--- a/lib/symfony/console/Descriptor/XmlDescriptor.php
+++ b/lib/symfony/console/Descriptor/XmlDescriptor.php
@@ -79,7 +79,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    public function getApplicationDocument(Application $application, string $namespace = null, bool $short = false): \DOMDocument
+    public function getApplicationDocument(Application $application, ?string $namespace = null, bool $short = false): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($rootXml = $dom->createElement('symfony'));
diff --git a/lib/symfony/console/Event/ConsoleErrorEvent.php b/lib/symfony/console/Event/ConsoleErrorEvent.php
index d4a691216..7be2ff83e 100644
--- a/lib/symfony/console/Event/ConsoleErrorEvent.php
+++ b/lib/symfony/console/Event/ConsoleErrorEvent.php
@@ -25,7 +25,7 @@ final class ConsoleErrorEvent extends ConsoleEvent
     private \Throwable $error;
     private int $exitCode;
 
-    public function __construct(InputInterface $input, OutputInterface $output, \Throwable $error, Command $command = null)
+    public function __construct(InputInterface $input, OutputInterface $output, \Throwable $error, ?Command $command = null)
     {
         parent::__construct($command, $input, $output);
 
diff --git a/lib/symfony/console/EventListener/ErrorListener.php b/lib/symfony/console/EventListener/ErrorListener.php
index 9925a5f74..c9ec24434 100644
--- a/lib/symfony/console/EventListener/ErrorListener.php
+++ b/lib/symfony/console/EventListener/ErrorListener.php
@@ -26,7 +26,7 @@ class ErrorListener implements EventSubscriberInterface
 {
     private ?LoggerInterface $logger;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger;
     }
diff --git a/lib/symfony/console/Exception/CommandNotFoundException.php b/lib/symfony/console/Exception/CommandNotFoundException.php
index 1e9f1c793..541b32b23 100644
--- a/lib/symfony/console/Exception/CommandNotFoundException.php
+++ b/lib/symfony/console/Exception/CommandNotFoundException.php
@@ -26,7 +26,7 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce
      * @param int             $code         Exception code
      * @param \Throwable|null $previous     Previous exception used for the exception chaining
      */
-    public function __construct(string $message, array $alternatives = [], int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message, array $alternatives = [], int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/lib/symfony/console/Formatter/NullOutputFormatterStyle.php b/lib/symfony/console/Formatter/NullOutputFormatterStyle.php
index c2ce7d14c..ae23decb1 100644
--- a/lib/symfony/console/Formatter/NullOutputFormatterStyle.php
+++ b/lib/symfony/console/Formatter/NullOutputFormatterStyle.php
@@ -21,7 +21,7 @@ final class NullOutputFormatterStyle implements OutputFormatterStyleInterface
         return $text;
     }
 
-    public function setBackground(string $color = null): void
+    public function setBackground(?string $color = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -29,7 +29,7 @@ final class NullOutputFormatterStyle implements OutputFormatterStyleInterface
         // do nothing
     }
 
-    public function setForeground(string $color = null): void
+    public function setForeground(?string $color = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
diff --git a/lib/symfony/console/Formatter/OutputFormatter.php b/lib/symfony/console/Formatter/OutputFormatter.php
index 3e4897c33..a30e44d84 100644
--- a/lib/symfony/console/Formatter/OutputFormatter.php
+++ b/lib/symfony/console/Formatter/OutputFormatter.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Formatter;
 
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Helper\Helper;
 
 use function Symfony\Component\String\b;
 
@@ -112,7 +113,7 @@ class OutputFormatter implements WrappableOutputFormatterInterface
     public function getStyle(string $name): OutputFormatterStyleInterface
     {
         if (!$this->hasStyle($name)) {
-            throw new InvalidArgumentException(sprintf('Undefined style: "%s".', $name));
+            throw new InvalidArgumentException(\sprintf('Undefined style: "%s".', $name));
         }
 
         return $this->styles[strtolower($name)];
@@ -146,9 +147,11 @@ class OutputFormatter implements WrappableOutputFormatterInterface
                 continue;
             }
 
+            // convert byte position to character position.
+            $pos = Helper::length(substr($message, 0, $pos));
             // add the text up to the next tag
-            $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset), $output, $width, $currentLineLength);
-            $offset = $pos + \strlen($text);
+            $output .= $this->applyCurrentStyle(Helper::substr($message, $offset, $pos - $offset), $output, $width, $currentLineLength);
+            $offset = $pos + Helper::length($text);
 
             // opening tag?
             if ($open = '/' !== $text[1]) {
@@ -169,7 +172,7 @@ class OutputFormatter implements WrappableOutputFormatterInterface
             }
         }
 
-        $output .= $this->applyCurrentStyle(substr($message, $offset), $output, $width, $currentLineLength);
+        $output .= $this->applyCurrentStyle(Helper::substr($message, $offset), $output, $width, $currentLineLength);
 
         return strtr($output, ["\0" => '\\', '\\<' => '<', '\\>' => '>']);
     }
@@ -236,8 +239,18 @@ class OutputFormatter implements WrappableOutputFormatterInterface
         }
 
         if ($currentLineLength) {
-            $prefix = substr($text, 0, $i = $width - $currentLineLength)."\n";
-            $text = substr($text, $i);
+            $lines = explode("\n", $text, 2);
+            $prefix = Helper::substr($lines[0], 0, $i = $width - $currentLineLength)."\n";
+            $text = Helper::substr($lines[0], $i);
+
+            if (isset($lines[1])) {
+                // $prefix may contain the full first line in which the \n is already a part of $prefix.
+                if ('' !== $text) {
+                    $text .= "\n";
+                }
+
+                $text .= $lines[1];
+            }
         } else {
             $prefix = '';
         }
@@ -252,8 +265,8 @@ class OutputFormatter implements WrappableOutputFormatterInterface
 
         $lines = explode("\n", $text);
 
-        foreach ($lines as $line) {
-            $currentLineLength += \strlen($line);
+        foreach ($lines as $i => $line) {
+            $currentLineLength = 0 === $i ? $currentLineLength + Helper::length($line) : Helper::length($line);
             if ($width <= $currentLineLength) {
                 $currentLineLength = 0;
             }
@@ -272,6 +285,6 @@ class OutputFormatter implements WrappableOutputFormatterInterface
     {
         $encoding = mb_detect_encoding($text, null, true) ?: 'UTF-8';
 
-        return b($text)->toCodePointString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);
+        return b($text)->toUnicodeString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);
     }
 }
diff --git a/lib/symfony/console/Formatter/OutputFormatterStyle.php b/lib/symfony/console/Formatter/OutputFormatterStyle.php
index 346a474c6..21e7f5ab0 100644
--- a/lib/symfony/console/Formatter/OutputFormatterStyle.php
+++ b/lib/symfony/console/Formatter/OutputFormatterStyle.php
@@ -33,7 +33,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
      * @param string|null $foreground The style foreground color name
      * @param string|null $background The style background color name
      */
-    public function __construct(string $foreground = null, string $background = null, array $options = [])
+    public function __construct(?string $foreground = null, ?string $background = null, array $options = [])
     {
         $this->color = new Color($this->foreground = $foreground ?: '', $this->background = $background ?: '', $this->options = $options);
     }
@@ -41,7 +41,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * @return void
      */
-    public function setForeground(string $color = null)
+    public function setForeground(?string $color = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -52,7 +52,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * @return void
      */
-    public function setBackground(string $color = null)
+    public function setBackground(?string $color = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
diff --git a/lib/symfony/console/Formatter/OutputFormatterStyleStack.php b/lib/symfony/console/Formatter/OutputFormatterStyleStack.php
index f98c2eff7..62d2ca0e7 100644
--- a/lib/symfony/console/Formatter/OutputFormatterStyleStack.php
+++ b/lib/symfony/console/Formatter/OutputFormatterStyleStack.php
@@ -26,7 +26,7 @@ class OutputFormatterStyleStack implements ResetInterface
 
     private OutputFormatterStyleInterface $emptyStyle;
 
-    public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
+    public function __construct(?OutputFormatterStyleInterface $emptyStyle = null)
     {
         $this->emptyStyle = $emptyStyle ?? new OutputFormatterStyle();
         $this->reset();
@@ -57,7 +57,7 @@ class OutputFormatterStyleStack implements ResetInterface
      *
      * @throws InvalidArgumentException When style tags incorrectly nested
      */
-    public function pop(OutputFormatterStyleInterface $style = null): OutputFormatterStyleInterface
+    public function pop(?OutputFormatterStyleInterface $style = null): OutputFormatterStyleInterface
     {
         if (!$this->styles) {
             return $this->emptyStyle;
diff --git a/lib/symfony/console/Helper/DebugFormatterHelper.php b/lib/symfony/console/Helper/DebugFormatterHelper.php
index 9ea7fb914..dfdb8a82c 100644
--- a/lib/symfony/console/Helper/DebugFormatterHelper.php
+++ b/lib/symfony/console/Helper/DebugFormatterHelper.php
@@ -31,7 +31,7 @@ class DebugFormatterHelper extends Helper
     {
         $this->started[$id] = ['border' => ++$this->count % \count(self::COLORS)];
 
-        return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
+        return \sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
     }
 
     /**
@@ -47,22 +47,22 @@ class DebugFormatterHelper extends Helper
                 unset($this->started[$id]['out']);
             }
             if (!isset($this->started[$id]['err'])) {
-                $message .= sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
+                $message .= \sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
                 $this->started[$id]['err'] = true;
             }
 
-            $message .= str_replace("\n", sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
+            $message .= str_replace("\n", \sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
         } else {
             if (isset($this->started[$id]['err'])) {
                 $message .= "\n";
                 unset($this->started[$id]['err']);
             }
             if (!isset($this->started[$id]['out'])) {
-                $message .= sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
+                $message .= \sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
                 $this->started[$id]['out'] = true;
             }
 
-            $message .= str_replace("\n", sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
+            $message .= str_replace("\n", \sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
         }
 
         return $message;
@@ -76,10 +76,10 @@ class DebugFormatterHelper extends Helper
         $trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
 
         if ($successful) {
-            return sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+            return \sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
         }
 
-        $message = sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+        $message = \sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
 
         unset($this->started[$id]['out'], $this->started[$id]['err']);
 
@@ -88,7 +88,7 @@ class DebugFormatterHelper extends Helper
 
     private function getBorder(string $id): string
     {
-        return sprintf('<bg=%s> </>', self::COLORS[$this->started[$id]['border']]);
+        return \sprintf('<bg=%s> </>', self::COLORS[$this->started[$id]['border']]);
     }
 
     public function getName(): string
diff --git a/lib/symfony/console/Helper/DescriptorHelper.php b/lib/symfony/console/Helper/DescriptorHelper.php
index eb32bce8f..fda6779b9 100644
--- a/lib/symfony/console/Helper/DescriptorHelper.php
+++ b/lib/symfony/console/Helper/DescriptorHelper.php
@@ -62,7 +62,7 @@ class DescriptorHelper extends Helper
         ], $options);
 
         if (!isset($this->descriptors[$options['format']])) {
-            throw new InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
+            throw new InvalidArgumentException(\sprintf('Unsupported format "%s".', $options['format']));
         }
 
         $descriptor = $this->descriptors[$options['format']];
diff --git a/lib/symfony/console/Helper/Dumper.php b/lib/symfony/console/Helper/Dumper.php
index 8c6a94d51..a3b8e3952 100644
--- a/lib/symfony/console/Helper/Dumper.php
+++ b/lib/symfony/console/Helper/Dumper.php
@@ -26,7 +26,7 @@ final class Dumper
     private ?ClonerInterface $cloner;
     private \Closure $handler;
 
-    public function __construct(OutputInterface $output, CliDumper $dumper = null, ClonerInterface $cloner = null)
+    public function __construct(OutputInterface $output, ?CliDumper $dumper = null, ?ClonerInterface $cloner = null)
     {
         $this->output = $output;
         $this->dumper = $dumper;
diff --git a/lib/symfony/console/Helper/FormatterHelper.php b/lib/symfony/console/Helper/FormatterHelper.php
index 279e4c799..3646b3d6f 100644
--- a/lib/symfony/console/Helper/FormatterHelper.php
+++ b/lib/symfony/console/Helper/FormatterHelper.php
@@ -25,7 +25,7 @@ class FormatterHelper extends Helper
      */
     public function formatSection(string $section, string $message, string $style = 'info'): string
     {
-        return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
+        return \sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
     }
 
     /**
@@ -41,7 +41,7 @@ class FormatterHelper extends Helper
         $lines = [];
         foreach ($messages as $message) {
             $message = OutputFormatter::escape($message);
-            $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
+            $lines[] = \sprintf($large ? '  %s  ' : ' %s ', $message);
             $len = max(self::width($message) + ($large ? 4 : 2), $len);
         }
 
@@ -54,7 +54,7 @@ class FormatterHelper extends Helper
         }
 
         for ($i = 0; isset($messages[$i]); ++$i) {
-            $messages[$i] = sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
+            $messages[$i] = \sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
         }
 
         return implode("\n", $messages);
diff --git a/lib/symfony/console/Helper/Helper.php b/lib/symfony/console/Helper/Helper.php
index c4b3df72e..468d06689 100644
--- a/lib/symfony/console/Helper/Helper.php
+++ b/lib/symfony/console/Helper/Helper.php
@@ -26,7 +26,7 @@ abstract class Helper implements HelperInterface
     /**
      * @return void
      */
-    public function setHelperSet(HelperSet $helperSet = null)
+    public function setHelperSet(?HelperSet $helperSet = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -48,7 +48,9 @@ abstract class Helper implements HelperInterface
         $string ??= '';
 
         if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(false);
+            $string = preg_replace('/[\p{Cc}\x7F]++/u', '', $string, -1, $count);
+
+            return (new UnicodeString($string))->width(false) + $count;
         }
 
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
@@ -80,10 +82,14 @@ abstract class Helper implements HelperInterface
     /**
      * Returns the subset of a string, using mb_substr if it is available.
      */
-    public static function substr(?string $string, int $from, int $length = null): string
+    public static function substr(?string $string, int $from, ?int $length = null): string
     {
         $string ??= '';
 
+        if (preg_match('//u', $string)) {
+            return (new UnicodeString($string))->slice($from, $length);
+        }
+
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return substr($string, $from, $length);
         }
@@ -140,18 +146,18 @@ abstract class Helper implements HelperInterface
     public static function formatMemory(int $memory)
     {
         if ($memory >= 1024 * 1024 * 1024) {
-            return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
+            return \sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
         }
 
         if ($memory >= 1024 * 1024) {
-            return sprintf('%.1f MiB', $memory / 1024 / 1024);
+            return \sprintf('%.1f MiB', $memory / 1024 / 1024);
         }
 
         if ($memory >= 1024) {
-            return sprintf('%d KiB', $memory / 1024);
+            return \sprintf('%d KiB', $memory / 1024);
         }
 
-        return sprintf('%d B', $memory);
+        return \sprintf('%d B', $memory);
     }
 
     /**
diff --git a/lib/symfony/console/Helper/HelperSet.php b/lib/symfony/console/Helper/HelperSet.php
index dc5d499ca..8deb22ee7 100644
--- a/lib/symfony/console/Helper/HelperSet.php
+++ b/lib/symfony/console/Helper/HelperSet.php
@@ -38,7 +38,7 @@ class HelperSet implements \IteratorAggregate
     /**
      * @return void
      */
-    public function set(HelperInterface $helper, string $alias = null)
+    public function set(HelperInterface $helper, ?string $alias = null)
     {
         $this->helpers[$helper->getName()] = $helper;
         if (null !== $alias) {
@@ -64,7 +64,7 @@ class HelperSet implements \IteratorAggregate
     public function get(string $name): HelperInterface
     {
         if (!$this->has($name)) {
-            throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
+            throw new InvalidArgumentException(\sprintf('The helper "%s" is not defined.', $name));
         }
 
         return $this->helpers[$name];
diff --git a/lib/symfony/console/Helper/OutputWrapper.php b/lib/symfony/console/Helper/OutputWrapper.php
index 2ec819c74..a615ed2f9 100644
--- a/lib/symfony/console/Helper/OutputWrapper.php
+++ b/lib/symfony/console/Helper/OutputWrapper.php
@@ -49,7 +49,7 @@ final class OutputWrapper
     private const URL_PATTERN = 'https?://\S+';
 
     public function __construct(
-        private bool $allowCutUrls = false
+        private bool $allowCutUrls = false,
     ) {
     }
 
@@ -59,7 +59,7 @@ final class OutputWrapper
             return $text;
         }
 
-        $tagPattern = sprintf('<(?:(?:%s)|/(?:%s)?)>', self::TAG_OPEN_REGEX_SEGMENT, self::TAG_CLOSE_REGEX_SEGMENT);
+        $tagPattern = \sprintf('<(?:(?:%s)|/(?:%s)?)>', self::TAG_OPEN_REGEX_SEGMENT, self::TAG_CLOSE_REGEX_SEGMENT);
         $limitPattern = "{1,$width}";
         $patternBlocks = [$tagPattern];
         if (!$this->allowCutUrls) {
@@ -68,7 +68,7 @@ final class OutputWrapper
         $patternBlocks[] = '.';
         $blocks = implode('|', $patternBlocks);
         $rowPattern = "(?:$blocks)$limitPattern";
-        $pattern = sprintf('#(?:((?>(%1$s)((?<=[^\S\r\n])[^\S\r\n]?|(?=\r?\n)|$|[^\S\r\n]))|(%1$s))(?:\r?\n)?|(?:\r?\n|$))#imux', $rowPattern);
+        $pattern = \sprintf('#(?:((?>(%1$s)((?<=[^\S\r\n])[^\S\r\n]?|(?=\r?\n)|$|[^\S\r\n]))|(%1$s))(?:\r?\n)?|(?:\r?\n|$))#imux', $rowPattern);
         $output = rtrim(preg_replace($pattern, '\\1'.$break, $text), $break);
 
         return str_replace(' '.$break, $break, $output);
diff --git a/lib/symfony/console/Helper/ProcessHelper.php b/lib/symfony/console/Helper/ProcessHelper.php
index 26d35a1a8..ae55a83c2 100644
--- a/lib/symfony/console/Helper/ProcessHelper.php
+++ b/lib/symfony/console/Helper/ProcessHelper.php
@@ -32,7 +32,7 @@ class ProcessHelper extends Helper
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
      */
-    public function run(OutputInterface $output, array|Process $cmd, string $error = null, callable $callback = null, int $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE): Process
+    public function run(OutputInterface $output, array|Process $cmd, ?string $error = null, ?callable $callback = null, int $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE): Process
     {
         if (!class_exists(Process::class)) {
             throw new \LogicException('The ProcessHelper cannot be run as the Process component is not installed. Try running "compose require symfony/process".');
@@ -55,7 +55,7 @@ class ProcessHelper extends Helper
             $process = $cmd[0];
             unset($cmd[0]);
         } else {
-            throw new \InvalidArgumentException(sprintf('Invalid command provided to "%s()": the command should be an array whose first element is either the path to the binary to run or a "Process" object.', __METHOD__));
+            throw new \InvalidArgumentException(\sprintf('Invalid command provided to "%s()": the command should be an array whose first element is either the path to the binary to run or a "Process" object.', __METHOD__));
         }
 
         if ($verbosity <= $output->getVerbosity()) {
@@ -69,12 +69,12 @@ class ProcessHelper extends Helper
         $process->run($callback, $cmd);
 
         if ($verbosity <= $output->getVerbosity()) {
-            $message = $process->isSuccessful() ? 'Command ran successfully' : sprintf('%s Command did not run successfully', $process->getExitCode());
+            $message = $process->isSuccessful() ? 'Command ran successfully' : \sprintf('%s Command did not run successfully', $process->getExitCode());
             $output->write($formatter->stop(spl_object_hash($process), $message, $process->isSuccessful()));
         }
 
         if (!$process->isSuccessful() && null !== $error) {
-            $output->writeln(sprintf('<error>%s</error>', $this->escapeString($error)));
+            $output->writeln(\sprintf('<error>%s</error>', $this->escapeString($error)));
         }
 
         return $process;
@@ -94,7 +94,7 @@ class ProcessHelper extends Helper
      *
      * @see run()
      */
-    public function mustRun(OutputInterface $output, array|Process $cmd, string $error = null, callable $callback = null): Process
+    public function mustRun(OutputInterface $output, array|Process $cmd, ?string $error = null, ?callable $callback = null): Process
     {
         $process = $this->run($output, $cmd, $error, $callback);
 
@@ -108,7 +108,7 @@ class ProcessHelper extends Helper
     /**
      * Wraps a Process callback to add debugging output.
      */
-    public function wrapCallback(OutputInterface $output, Process $process, callable $callback = null): callable
+    public function wrapCallback(OutputInterface $output, Process $process, ?callable $callback = null): callable
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
diff --git a/lib/symfony/console/Helper/ProgressBar.php b/lib/symfony/console/Helper/ProgressBar.php
index 64389c4a2..8143acaff 100644
--- a/lib/symfony/console/Helper/ProgressBar.php
+++ b/lib/symfony/console/Helper/ProgressBar.php
@@ -183,9 +183,9 @@ final class ProgressBar
         $this->messages[$name] = $message;
     }
 
-    public function getMessage(string $name = 'message'): string
+    public function getMessage(string $name = 'message'): ?string
     {
-        return $this->messages[$name];
+        return $this->messages[$name] ?? null;
     }
 
     public function getStartTime(): int
@@ -229,7 +229,7 @@ final class ProgressBar
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if (0 === $this->step || $this->step === $this->startingStep) {
             return 0;
         }
 
@@ -313,7 +313,7 @@ final class ProgressBar
      *
      * @return iterable<TKey, TValue>
      */
-    public function iterate(iterable $iterable, int $max = null): iterable
+    public function iterate(iterable $iterable, ?int $max = null): iterable
     {
         $this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
 
@@ -332,7 +332,7 @@ final class ProgressBar
      * @param int|null $max     Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
      * @param int      $startAt The starting point of the bar (useful e.g. when resuming a previously started bar)
      */
-    public function start(int $max = null, int $startAt = 0): void
+    public function start(?int $max = null, int $startAt = 0): void
     {
         $this->startTime = time();
         $this->step = $startAt;
@@ -486,12 +486,21 @@ final class ProgressBar
                 if ($this->output instanceof ConsoleSectionOutput) {
                     $messageLines = explode("\n", $this->previousMessage);
                     $lineCount = \count($messageLines);
+
+                    $lastLineWithoutDecoration = Helper::removeDecoration($this->output->getFormatter(), end($messageLines) ?? '');
+
+                    // When the last previous line is empty (without formatting) it is already cleared by the section output, so we don't need to clear it again
+                    if ('' === $lastLineWithoutDecoration) {
+                        --$lineCount;
+                    }
+
                     foreach ($messageLines as $messageLine) {
                         $messageLineLength = Helper::width(Helper::removeDecoration($this->output->getFormatter(), $messageLine));
                         if ($messageLineLength > $this->terminal->getWidth()) {
                             $lineCount += floor($messageLineLength / $this->terminal->getWidth());
                         }
                     }
+
                     $this->output->clear($lineCount);
                 } else {
                     $lineCount = substr_count($this->previousMessage, "\n");
@@ -594,7 +603,7 @@ final class ProgressBar
             }
 
             if (isset($matches[2])) {
-                $text = sprintf('%'.$matches[2], $text);
+                $text = \sprintf('%'.$matches[2], $text);
             }
 
             return $text;
diff --git a/lib/symfony/console/Helper/ProgressIndicator.php b/lib/symfony/console/Helper/ProgressIndicator.php
index 79d47643e..92106caf6 100644
--- a/lib/symfony/console/Helper/ProgressIndicator.php
+++ b/lib/symfony/console/Helper/ProgressIndicator.php
@@ -50,7 +50,7 @@ class ProgressIndicator
      * @param int        $indicatorChangeInterval Change interval in milliseconds
      * @param array|null $indicatorValues         Animated indicator characters
      */
-    public function __construct(OutputInterface $output, string $format = null, int $indicatorChangeInterval = 100, array $indicatorValues = null)
+    public function __construct(OutputInterface $output, ?string $format = null, int $indicatorChangeInterval = 100, ?array $indicatorValues = null)
     {
         $this->output = $output;
 
diff --git a/lib/symfony/console/Helper/QuestionHelper.php b/lib/symfony/console/Helper/QuestionHelper.php
index f32813c6c..d652a05ef 100644
--- a/lib/symfony/console/Helper/QuestionHelper.php
+++ b/lib/symfony/console/Helper/QuestionHelper.php
@@ -220,7 +220,7 @@ class QuestionHelper extends Helper
         foreach ($choices as $key => $value) {
             $padding = str_repeat(' ', $maxWidth - self::width($key));
 
-            $messages[] = sprintf("  [<$tag>%s$padding</$tag>] %s", $key, $value);
+            $messages[] = \sprintf("  [<$tag>%s$padding</$tag>] %s", $key, $value);
         }
 
         return $messages;
@@ -258,11 +258,7 @@ class QuestionHelper extends Helper
         $ofs = -1;
         $matches = $autocomplete($ret);
         $numMatches = \count($matches);
-
-        $sttyMode = shell_exec('stty -g');
-        $isStdin = 'php://stdin' === (stream_get_meta_data($inputStream)['uri'] ?? null);
-        $r = [$inputStream];
-        $w = [];
+        $inputHelper = new TerminalInputHelper($inputStream);
 
         // Disable icanon (so we can fread each keypress) and echo (we'll do echoing here instead)
         shell_exec('stty -icanon -echo');
@@ -272,15 +268,13 @@ class QuestionHelper extends Helper
 
         // Read a keypress
         while (!feof($inputStream)) {
-            while ($isStdin && 0 === @stream_select($r, $w, $w, 0, 100)) {
-                // Give signal handlers a chance to run
-                $r = [$inputStream];
-            }
+            $inputHelper->waitForInput();
             $c = fread($inputStream, 1);
 
             // as opposed to fgets(), fread() returns an empty string when the stream content is empty, not false.
             if (false === $c || ('' === $ret && '' === $c && null === $question->getDefault())) {
-                shell_exec('stty '.$sttyMode);
+                // Restore the terminal so it behaves normally again
+                $inputHelper->finish();
                 throw new MissingInputException('Aborted.');
             } elseif ("\177" === $c) { // Backspace Character
                 if (0 === $numMatches && 0 !== $i) {
@@ -317,12 +311,12 @@ class QuestionHelper extends Helper
                     $ofs += ('A' === $c[2]) ? -1 : 1;
                     $ofs = ($numMatches + $ofs) % $numMatches;
                 }
-            } elseif (\ord($c) < 32) {
+            } elseif ('' === $c || \ord($c) < 32) {
                 if ("\t" === $c || "\n" === $c) {
                     if ($numMatches > 0 && -1 !== $ofs) {
                         $ret = (string) $matches[$ofs];
                         // Echo out remaining chars for current match
-                        $remainingCharacters = substr($ret, \strlen(trim($this->mostRecentlyEnteredValue($fullChoice))));
+                        $remainingCharacters = substr($ret, \strlen($this->mostRecentlyEnteredValue($fullChoice)));
                         $output->write($remainingCharacters);
                         $fullChoice .= $remainingCharacters;
                         $i = (false === $encoding = mb_detect_encoding($fullChoice, null, true)) ? \strlen($fullChoice) : mb_strlen($fullChoice, $encoding);
@@ -376,14 +370,14 @@ class QuestionHelper extends Helper
             if ($numMatches > 0 && -1 !== $ofs) {
                 $cursor->savePosition();
                 // Write highlighted text, complete the partially entered response
-                $charactersEntered = \strlen(trim($this->mostRecentlyEnteredValue($fullChoice)));
+                $charactersEntered = \strlen($this->mostRecentlyEnteredValue($fullChoice));
                 $output->write('<hl>'.OutputFormatter::escapeTrailingBackslash(substr($matches[$ofs], $charactersEntered)).'</hl>');
                 $cursor->restorePosition();
             }
         }
 
-        // Reset stty so it behaves normally again
-        shell_exec('stty '.$sttyMode);
+        // Restore the terminal so it behaves normally again
+        $inputHelper->finish();
 
         return $fullChoice;
     }
@@ -434,27 +428,25 @@ class QuestionHelper extends Helper
             return $value;
         }
 
+        $inputHelper = null;
+
         if (self::$stty && Terminal::hasSttyAvailable()) {
-            $sttyMode = shell_exec('stty -g');
+            $inputHelper = new TerminalInputHelper($inputStream);
             shell_exec('stty -echo');
         } elseif ($this->isInteractiveInput($inputStream)) {
             throw new RuntimeException('Unable to hide the response.');
         }
 
-        $value = fgets($inputStream, 4096);
+        $value = $this->doReadInput($inputStream, helper: $inputHelper);
 
         if (4095 === \strlen($value)) {
             $errOutput = $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output;
             $errOutput->warning('The value was possibly truncated by your shell or terminal emulator');
         }
 
-        if (self::$stty && Terminal::hasSttyAvailable()) {
-            shell_exec('stty '.$sttyMode);
-        }
+        // Restore the terminal so it behaves normally again
+        $inputHelper?->finish();
 
-        if (false === $value) {
-            throw new MissingInputException('Aborted.');
-        }
         if ($trimmable) {
             $value = trim($value);
         }
@@ -501,19 +493,7 @@ class QuestionHelper extends Helper
             return self::$stdinIsInteractive;
         }
 
-        if (\function_exists('stream_isatty')) {
-            return self::$stdinIsInteractive = @stream_isatty(fopen('php://stdin', 'r'));
-        }
-
-        if (\function_exists('posix_isatty')) {
-            return self::$stdinIsInteractive = @posix_isatty(fopen('php://stdin', 'r'));
-        }
-
-        if (!\function_exists('shell_exec')) {
-            return self::$stdinIsInteractive = true;
-        }
-
-        return self::$stdinIsInteractive = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));
+        return self::$stdinIsInteractive = @stream_isatty(fopen('php://stdin', 'r'));
     }
 
     /**
@@ -526,7 +506,7 @@ class QuestionHelper extends Helper
     {
         if (!$question->isMultiline()) {
             $cp = $this->setIOCodepage();
-            $ret = fgets($inputStream, 4096);
+            $ret = $this->doReadInput($inputStream);
 
             return $this->resetIOCodepage($cp, $ret);
         }
@@ -536,13 +516,11 @@ class QuestionHelper extends Helper
             return false;
         }
 
-        $ret = '';
         $cp = $this->setIOCodepage();
-        while (false !== ($char = fgetc($multiLineStreamReader))) {
-            if (\PHP_EOL === "{$ret}{$char}") {
-                break;
-            }
-            $ret .= $char;
+        $ret = $this->doReadInput($multiLineStreamReader, "\x4");
+
+        if (stream_get_meta_data($inputStream)['seekable']) {
+            fseek($inputStream, ftell($multiLineStreamReader));
         }
 
         return $this->resetIOCodepage($cp, $ret);
@@ -609,4 +587,35 @@ class QuestionHelper extends Helper
 
         return $cloneStream;
     }
+
+    /**
+     * @param resource $inputStream
+     */
+    private function doReadInput($inputStream, ?string $exitChar = null, ?TerminalInputHelper $helper = null): string
+    {
+        $ret = '';
+        $helper ??= new TerminalInputHelper($inputStream, false);
+
+        while (!feof($inputStream)) {
+            $helper->waitForInput();
+            $char = fread($inputStream, 1);
+
+            // as opposed to fgets(), fread() returns an empty string when the stream content is empty, not false.
+            if (false === $char || ('' === $ret && '' === $char)) {
+                throw new MissingInputException('Aborted.');
+            }
+
+            if (\PHP_EOL === "{$ret}{$char}" || $exitChar === $char) {
+                break;
+            }
+
+            $ret .= $char;
+
+            if (null === $exitChar && "\n" === $char) {
+                break;
+            }
+        }
+
+        return $ret;
+    }
 }
diff --git a/lib/symfony/console/Helper/SymfonyQuestionHelper.php b/lib/symfony/console/Helper/SymfonyQuestionHelper.php
index 8ebc84376..634550d3c 100644
--- a/lib/symfony/console/Helper/SymfonyQuestionHelper.php
+++ b/lib/symfony/console/Helper/SymfonyQuestionHelper.php
@@ -34,17 +34,17 @@ class SymfonyQuestionHelper extends QuestionHelper
         $default = $question->getDefault();
 
         if ($question->isMultiline()) {
-            $text .= sprintf(' (press %s to continue)', $this->getEofShortcut());
+            $text .= \sprintf(' (press %s to continue)', $this->getEofShortcut($output));
         }
 
         switch (true) {
             case null === $default:
-                $text = sprintf(' <info>%s</info>:', $text);
+                $text = \sprintf(' <info>%s</info>:', $text);
 
                 break;
 
             case $question instanceof ConfirmationQuestion:
-                $text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
+                $text = \sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
 
                 break;
 
@@ -56,18 +56,18 @@ class SymfonyQuestionHelper extends QuestionHelper
                     $default[$key] = $choices[trim($value)];
                 }
 
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(implode(', ', $default)));
+                $text = \sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(implode(', ', $default)));
 
                 break;
 
             case $question instanceof ChoiceQuestion:
                 $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
+                $text = \sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
 
                 break;
 
             default:
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
+                $text = \sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
         }
 
         $output->writeln($text);
@@ -98,9 +98,9 @@ class SymfonyQuestionHelper extends QuestionHelper
         parent::writeError($output, $error);
     }
 
-    private function getEofShortcut(): string
+    private function getEofShortcut(OutputInterface $output): string
     {
-        if ('Windows' === \PHP_OS_FAMILY) {
+        if ('\\' === \DIRECTORY_SEPARATOR && !$output->isDecorated()) {
             return '<comment>Ctrl+Z</comment> then <comment>Enter</comment>';
         }
 
diff --git a/lib/symfony/console/Helper/Table.php b/lib/symfony/console/Helper/Table.php
index 3c189580e..469d228d6 100644
--- a/lib/symfony/console/Helper/Table.php
+++ b/lib/symfony/console/Helper/Table.php
@@ -83,7 +83,7 @@ class Table
     {
         self::$styles ??= self::initStyles();
 
-        return self::$styles[$name] ?? throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
+        return self::$styles[$name] ?? throw new InvalidArgumentException(\sprintf('Style "%s" is not defined.', $name));
     }
 
     /**
@@ -168,7 +168,7 @@ class Table
     public function setColumnMaxWidth(int $columnIndex, int $width): static
     {
         if (!$this->output->getFormatter() instanceof WrappableOutputFormatterInterface) {
-            throw new \LogicException(sprintf('Setting a maximum column width is only supported when using a "%s" formatter, got "%s".', WrappableOutputFormatterInterface::class, get_debug_type($this->output->getFormatter())));
+            throw new \LogicException(\sprintf('Setting a maximum column width is only supported when using a "%s" formatter, got "%s".', WrappableOutputFormatterInterface::class, get_debug_type($this->output->getFormatter())));
         }
 
         $this->columnMaxWidths[$columnIndex] = $width;
@@ -237,7 +237,7 @@ class Table
     public function appendRow(TableSeparator|array $row): static
     {
         if (!$this->output instanceof ConsoleSectionOutput) {
-            throw new RuntimeException(sprintf('Output should be an instance of "%s" when calling "%s".', ConsoleSectionOutput::class, __METHOD__));
+            throw new RuntimeException(\sprintf('Output should be an instance of "%s" when calling "%s".', ConsoleSectionOutput::class, __METHOD__));
         }
 
         if ($this->rendered) {
@@ -365,17 +365,19 @@ class Table
                 for ($i = 0; $i < $maxRows; ++$i) {
                     $cell = (string) ($row[$i] ?? '');
 
-                    $parts = explode("\n", $cell);
+                    $eol = str_contains($cell, "\r\n") ? "\r\n" : "\n";
+                    $parts = explode($eol, $cell);
                     foreach ($parts as $idx => $part) {
                         if ($headers && !$containsColspan) {
                             if (0 === $idx) {
-                                $rows[] = [sprintf(
-                                    '<comment>%s</>: %s',
-                                    str_pad($headers[$i] ?? '', $maxHeaderLength, ' ', \STR_PAD_LEFT),
+                                $rows[] = [\sprintf(
+                                    '<comment>%s%s</>: %s',
+                                    str_repeat(' ', $maxHeaderLength - Helper::width(Helper::removeDecoration($formatter, $headers[$i] ?? ''))),
+                                    $headers[$i] ?? '',
                                     $part
                                 )];
                             } else {
-                                $rows[] = [sprintf(
+                                $rows[] = [\sprintf(
                                     '%s  %s',
                                     str_pad('', $maxHeaderLength, ' ', \STR_PAD_LEFT),
                                     $part
@@ -466,7 +468,7 @@ class Table
      *
      *     +-----+-----------+-------+
      */
-    private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $title = null, string $titleFormat = null): void
+    private function renderRowSeparator(int $type = self::SEPARATOR_MID, ?string $title = null, ?string $titleFormat = null): void
     {
         if (!$count = $this->numberOfColumns) {
             return;
@@ -495,12 +497,12 @@ class Table
         }
 
         if (null !== $title) {
-            $titleLength = Helper::width(Helper::removeDecoration($formatter = $this->output->getFormatter(), $formattedTitle = sprintf($titleFormat, $title)));
+            $titleLength = Helper::width(Helper::removeDecoration($formatter = $this->output->getFormatter(), $formattedTitle = \sprintf($titleFormat, $title)));
             $markupLength = Helper::width($markup);
             if ($titleLength > $limit = $markupLength - 4) {
                 $titleLength = $limit;
-                $formatLength = Helper::width(Helper::removeDecoration($formatter, sprintf($titleFormat, '')));
-                $formattedTitle = sprintf($titleFormat, Helper::substr($title, 0, $limit - $formatLength - 3).'...');
+                $formatLength = Helper::width(Helper::removeDecoration($formatter, \sprintf($titleFormat, '')));
+                $formattedTitle = \sprintf($titleFormat, Helper::substr($title, 0, $limit - $formatLength - 3).'...');
             }
 
             $titleStart = intdiv($markupLength - $titleLength, 2);
@@ -511,7 +513,7 @@ class Table
             }
         }
 
-        $this->output->writeln(sprintf($this->style->getBorderFormat(), $markup));
+        $this->output->writeln(\sprintf($this->style->getBorderFormat(), $markup));
     }
 
     /**
@@ -521,7 +523,7 @@ class Table
     {
         $borders = $this->style->getBorderChars();
 
-        return sprintf($this->style->getBorderFormat(), self::BORDER_OUTSIDE === $type ? $borders[1] : $borders[3]);
+        return \sprintf($this->style->getBorderFormat(), self::BORDER_OUTSIDE === $type ? $borders[1] : $borders[3]);
     }
 
     /**
@@ -531,7 +533,7 @@ class Table
      *
      *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
      */
-    private function renderRow(array $row, string $cellFormat, string $firstCellFormat = null): void
+    private function renderRow(array $row, string $cellFormat, ?string $firstCellFormat = null): void
     {
         $rowContent = $this->renderColumnSeparator(self::BORDER_OUTSIDE);
         $columns = $this->getRowColumns($row);
@@ -562,18 +564,15 @@ class Table
         }
 
         // str_pad won't work properly with multi-byte strings, we need to fix the padding
-        if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
-            $width += \strlen($cell) - mb_strwidth($cell, $encoding);
-        }
-
+        $width += \strlen($cell) - Helper::width($cell) - substr_count($cell, "\0");
         $style = $this->getColumnStyle($column);
 
         if ($cell instanceof TableSeparator) {
-            return sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));
+            return \sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));
         }
 
         $width += Helper::length($cell) - Helper::length(Helper::removeDecoration($this->output->getFormatter(), $cell));
-        $content = sprintf($style->getCellRowContentFormat(), $cell);
+        $content = \sprintf($style->getCellRowContentFormat(), $cell);
 
         $padType = $style->getPadType();
         if ($cell instanceof TableCell && $cell->getStyle() instanceof TableCellStyle) {
@@ -598,7 +597,7 @@ class Table
             $padType = $cell->getStyle()->getPadByAlign();
         }
 
-        return sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $padType));
+        return \sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $padType));
     }
 
     /**
@@ -630,15 +629,56 @@ class Table
             foreach ($rows[$rowKey] as $column => $cell) {
                 $colspan = $cell instanceof TableCell ? $cell->getColspan() : 1;
 
-                if (isset($this->columnMaxWidths[$column]) && Helper::width(Helper::removeDecoration($formatter, $cell)) > $this->columnMaxWidths[$column]) {
-                    $cell = $formatter->formatAndWrap($cell, $this->columnMaxWidths[$column] * $colspan);
+                $minWrappedWidth = 0;
+                $widthApplied = [];
+                $lengthColumnBorder = $this->getColumnSeparatorWidth() + Helper::width($this->style->getCellRowContentFormat()) - 2;
+                for ($i = $column; $i < ($column + $colspan); ++$i) {
+                    if (isset($this->columnMaxWidths[$i])) {
+                        $minWrappedWidth += $this->columnMaxWidths[$i];
+                        $widthApplied[] = ['type' => 'max', 'column' => $i];
+                    } elseif (($this->columnWidths[$i] ?? 0) > 0 && $colspan > 1) {
+                        $minWrappedWidth += $this->columnWidths[$i];
+                        $widthApplied[] = ['type' => 'min', 'column' => $i];
+                    }
+                }
+                if (1 === \count($widthApplied)) {
+                    if ($colspan > 1) {
+                        $minWrappedWidth *= $colspan;  // previous logic
+                    }
+                } elseif (\count($widthApplied) > 1) {
+                    $minWrappedWidth += (\count($widthApplied) - 1) * $lengthColumnBorder;
+                }
+
+                $cellWidth = Helper::width(Helper::removeDecoration($formatter, $cell));
+                if ($minWrappedWidth && $cellWidth > $minWrappedWidth) {
+                    $cell = $formatter->formatAndWrap($cell, $minWrappedWidth);
+                }
+                // update minimal columnWidths for spanned columns
+                if ($colspan > 1 && $minWrappedWidth > 0) {
+                    $columnsMinWidthProcessed = [];
+                    $cellWidth = min($cellWidth, $minWrappedWidth);
+                    foreach ($widthApplied as $item) {
+                        if ('max' === $item['type'] && $cellWidth >= $this->columnMaxWidths[$item['column']]) {
+                            $minWidthColumn = $this->columnMaxWidths[$item['column']];
+                            $this->columnWidths[$item['column']] = $minWidthColumn;
+                            $columnsMinWidthProcessed[$item['column']] = true;
+                            $cellWidth -= $minWidthColumn + $lengthColumnBorder;
+                        }
+                    }
+                    for ($i = $column; $i < ($column + $colspan); ++$i) {
+                        if (isset($columnsMinWidthProcessed[$i])) {
+                            continue;
+                        }
+                        $this->columnWidths[$i] = $cellWidth + $lengthColumnBorder;
+                    }
                 }
                 if (!str_contains($cell ?? '', "\n")) {
                     continue;
                 }
-                $escaped = implode("\n", array_map(OutputFormatter::escapeTrailingBackslash(...), explode("\n", $cell)));
+                $eol = str_contains($cell ?? '', "\r\n") ? "\r\n" : "\n";
+                $escaped = implode($eol, array_map(OutputFormatter::escapeTrailingBackslash(...), explode($eol, $cell)));
                 $cell = $cell instanceof TableCell ? new TableCell($escaped, ['colspan' => $cell->getColspan()]) : $escaped;
-                $lines = explode("\n", str_replace("\n", "<fg=default;bg=default></>\n", $cell));
+                $lines = explode($eol, str_replace($eol, '<fg=default;bg=default></>'.$eol, $cell));
                 foreach ($lines as $lineKey => $line) {
                     if ($colspan > 1) {
                         $line = new TableCell($line, ['colspan' => $colspan]);
@@ -694,14 +734,15 @@ class Table
         $unmergedRows = [];
         foreach ($rows[$line] as $column => $cell) {
             if (null !== $cell && !$cell instanceof TableCell && !\is_scalar($cell) && !$cell instanceof \Stringable) {
-                throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', get_debug_type($cell)));
+                throw new InvalidArgumentException(\sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', get_debug_type($cell)));
             }
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
                 $nbLines = $cell->getRowspan() - 1;
                 $lines = [$cell];
                 if (str_contains($cell, "\n")) {
-                    $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
-                    $nbLines = \count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
+                    $eol = str_contains($cell, "\r\n") ? "\r\n" : "\n";
+                    $lines = explode($eol, str_replace($eol, '<fg=default;bg=default>'.$eol.'</>', $cell));
+                    $nbLines = \count($lines) > $nbLines ? substr_count($cell, $eol) : $nbLines;
 
                     $rows[$line][$column] = new TableCell($lines[0], ['colspan' => $cell->getColspan(), 'style' => $cell->getStyle()]);
                     unset($lines[0]);
@@ -838,7 +879,7 @@ class Table
 
     private function getColumnSeparatorWidth(): int
     {
-        return Helper::width(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));
+        return Helper::width(\sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));
     }
 
     private function getCellWidth(array $row, int $column): int
@@ -921,6 +962,6 @@ class Table
             return $name;
         }
 
-        return self::$styles[$name] ?? throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
+        return self::$styles[$name] ?? throw new InvalidArgumentException(\sprintf('Style "%s" is not defined.', $name));
     }
 }
diff --git a/lib/symfony/console/Helper/TableCell.php b/lib/symfony/console/Helper/TableCell.php
index 394b2bc95..ead32f283 100644
--- a/lib/symfony/console/Helper/TableCell.php
+++ b/lib/symfony/console/Helper/TableCell.php
@@ -31,7 +31,7 @@ class TableCell
 
         // check option names
         if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The TableCell does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+            throw new InvalidArgumentException(\sprintf('The TableCell does not support the following options: \'%s\'.', implode('\', \'', $diff)));
         }
 
         if (isset($options['style']) && !$options['style'] instanceof TableCellStyle) {
diff --git a/lib/symfony/console/Helper/TableCellStyle.php b/lib/symfony/console/Helper/TableCellStyle.php
index 9419dcb40..1b1ef276e 100644
--- a/lib/symfony/console/Helper/TableCellStyle.php
+++ b/lib/symfony/console/Helper/TableCellStyle.php
@@ -43,11 +43,11 @@ class TableCellStyle
     public function __construct(array $options = [])
     {
         if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+            throw new InvalidArgumentException(\sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
         }
 
         if (isset($options['align']) && !\array_key_exists($options['align'], self::ALIGN_MAP)) {
-            throw new InvalidArgumentException(sprintf('Wrong align value. Value must be following: \'%s\'.', implode('\', \'', array_keys(self::ALIGN_MAP))));
+            throw new InvalidArgumentException(\sprintf('Wrong align value. Value must be following: \'%s\'.', implode('\', \'', array_keys(self::ALIGN_MAP))));
         }
 
         $this->options = array_merge($this->options, $options);
diff --git a/lib/symfony/console/Helper/TableStyle.php b/lib/symfony/console/Helper/TableStyle.php
index bbad98e73..b0c94deb7 100644
--- a/lib/symfony/console/Helper/TableStyle.php
+++ b/lib/symfony/console/Helper/TableStyle.php
@@ -77,30 +77,6 @@ class TableStyle
      *
      * <code>
      * ╔═══════════════╤══════════════════════════╤══════════════════╗
-     * 1 ISBN          2 Title                    │ Author           ║
-     * ╠═══════════════╪══════════════════════════╪══════════════════╣
-     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
-     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
-     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
-     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
-     * ╚═══════════════╧══════════════════════════╧══════════════════╝
-     * </code>
-     *
-     * @return $this
-     */
-    public function setHorizontalBorderChars(string $outside, string $inside = null): static
-    {
-        $this->horizontalOutsideBorderChar = $outside;
-        $this->horizontalInsideBorderChar = $inside ?? $outside;
-
-        return $this;
-    }
-
-    /**
-     * Sets vertical border characters.
-     *
-     * <code>
-     * ╔═══════════════╤══════════════════════════╤══════════════════╗
      * ║ ISBN          │ Title                    │ Author           ║
      * ╠═══════1═══════╪══════════════════════════╪══════════════════╣
      * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
@@ -113,7 +89,31 @@ class TableStyle
      *
      * @return $this
      */
-    public function setVerticalBorderChars(string $outside, string $inside = null): static
+    public function setHorizontalBorderChars(string $outside, ?string $inside = null): static
+    {
+        $this->horizontalOutsideBorderChar = $outside;
+        $this->horizontalInsideBorderChar = $inside ?? $outside;
+
+        return $this;
+    }
+
+    /**
+     * Sets vertical border characters.
+     *
+     * <code>
+     * ╔═══════════════╤══════════════════════════╤══════════════════╗
+     * 1 ISBN          2 Title                    │ Author           ║
+     * ╠═══════════════╪══════════════════════════╪══════════════════╣
+     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+     * ╚═══════════════╧══════════════════════════╧══════════════════╝
+     * </code>
+     *
+     * @return $this
+     */
+    public function setVerticalBorderChars(string $outside, ?string $inside = null): static
     {
         $this->verticalOutsideBorderChar = $outside;
         $this->verticalInsideBorderChar = $inside ?? $outside;
@@ -167,7 +167,7 @@ class TableStyle
      *
      * @return $this
      */
-    public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): static
+    public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, ?string $topLeftBottom = null, ?string $topMidBottom = null, ?string $topRightBottom = null): static
     {
         $this->crossingChar = $cross;
         $this->crossingTopLeftChar = $topLeft;
diff --git a/lib/symfony/console/Helper/TerminalInputHelper.php b/lib/symfony/console/Helper/TerminalInputHelper.php
new file mode 100644
index 000000000..d6f07db8b
--- /dev/null
+++ b/lib/symfony/console/Helper/TerminalInputHelper.php
@@ -0,0 +1,156 @@
+<?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\Console\Helper;
+
+/**
+ * TerminalInputHelper stops Ctrl-C and similar signals from leaving the terminal in
+ * an unusable state if its settings have been modified when reading user input.
+ * This can be an issue on non-Windows platforms.
+ *
+ * Usage:
+ *
+ *     $inputHelper = new TerminalInputHelper($inputStream);
+ *
+ *     ...change terminal settings
+ *
+ *     // Wait for input before all input reads
+ *     $inputHelper->waitForInput();
+ *
+ *     ...read input
+ *
+ *     // Call finish to restore terminal settings and signal handlers
+ *     $inputHelper->finish()
+ *
+ * @internal
+ */
+final class TerminalInputHelper
+{
+    /** @var resource */
+    private $inputStream;
+    private bool $isStdin;
+    private string $initialState = '';
+    private int $signalToKill = 0;
+    private array $signalHandlers = [];
+    private array $targetSignals = [];
+    private bool $withStty;
+
+    /**
+     * @param resource $inputStream
+     *
+     * @throws \RuntimeException If unable to read terminal settings
+     */
+    public function __construct($inputStream, bool $withStty = true)
+    {
+        $this->inputStream = $inputStream;
+        $this->isStdin = 'php://stdin' === stream_get_meta_data($inputStream)['uri'];
+        $this->withStty = $withStty;
+
+        if ($withStty) {
+            if (!\is_string($state = shell_exec('stty -g'))) {
+                throw new \RuntimeException('Unable to read the terminal settings.');
+            }
+
+            $this->initialState = $state;
+
+            $this->createSignalHandlers();
+        }
+    }
+
+    /**
+     * Waits for input.
+     */
+    public function waitForInput(): void
+    {
+        if ($this->isStdin) {
+            $r = [$this->inputStream];
+            $w = [];
+
+            // Allow signal handlers to run
+            while (0 === @stream_select($r, $w, $w, 0, 100)) {
+                $r = [$this->inputStream];
+            }
+        }
+
+        if ($this->withStty) {
+            $this->checkForKillSignal();
+        }
+    }
+
+    /**
+     * Restores terminal state and signal handlers.
+     */
+    public function finish(): void
+    {
+        if (!$this->withStty) {
+            return;
+        }
+
+        // Safeguard in case an unhandled kill signal exists
+        $this->checkForKillSignal();
+        shell_exec('stty '.$this->initialState);
+        $this->signalToKill = 0;
+
+        foreach ($this->signalHandlers as $signal => $originalHandler) {
+            pcntl_signal($signal, $originalHandler);
+        }
+        $this->signalHandlers = [];
+        $this->targetSignals = [];
+    }
+
+    private function createSignalHandlers(): void
+    {
+        if (!\function_exists('pcntl_async_signals') || !\function_exists('pcntl_signal')) {
+            return;
+        }
+
+        pcntl_async_signals(true);
+        $this->targetSignals = [\SIGINT, \SIGQUIT, \SIGTERM];
+
+        foreach ($this->targetSignals as $signal) {
+            $this->signalHandlers[$signal] = pcntl_signal_get_handler($signal);
+
+            pcntl_signal($signal, function ($signal) {
+                // Save current state, then restore to initial state
+                $currentState = shell_exec('stty -g');
+                shell_exec('stty '.$this->initialState);
+                $originalHandler = $this->signalHandlers[$signal];
+
+                if (\is_callable($originalHandler)) {
+                    $originalHandler($signal);
+                    // Handler did not exit, so restore to current state
+                    shell_exec('stty '.$currentState);
+
+                    return;
+                }
+
+                // Not a callable, so SIG_DFL or SIG_IGN
+                if (\SIG_DFL === $originalHandler) {
+                    $this->signalToKill = $signal;
+                }
+            });
+        }
+    }
+
+    private function checkForKillSignal(): void
+    {
+        if (\in_array($this->signalToKill, $this->targetSignals, true)) {
+            // Try posix_kill
+            if (\function_exists('posix_kill')) {
+                pcntl_signal($this->signalToKill, \SIG_DFL);
+                posix_kill(getmypid(), $this->signalToKill);
+            }
+
+            // Best attempt fallback
+            exit(128 + $this->signalToKill);
+        }
+    }
+}
diff --git a/lib/symfony/console/Input/ArgvInput.php b/lib/symfony/console/Input/ArgvInput.php
index 59f9217ec..b5f866689 100644
--- a/lib/symfony/console/Input/ArgvInput.php
+++ b/lib/symfony/console/Input/ArgvInput.php
@@ -43,7 +43,7 @@ class ArgvInput extends Input
     private array $tokens;
     private array $parsed;
 
-    public function __construct(array $argv = null, InputDefinition $definition = null)
+    public function __construct(?array $argv = null, ?InputDefinition $definition = null)
     {
         $argv ??= $_SERVER['argv'] ?? [];
 
@@ -122,7 +122,7 @@ class ArgvInput extends Input
         for ($i = 0; $i < $len; ++$i) {
             if (!$this->definition->hasShortcut($name[$i])) {
                 $encoding = mb_detect_encoding($name, null, true);
-                throw new RuntimeException(sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding)));
+                throw new RuntimeException(\sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding)));
             }
 
             $option = $this->definition->getOptionForShortcut($name[$i]);
@@ -176,21 +176,21 @@ class ArgvInput extends Input
         } else {
             $all = $this->definition->getArguments();
             $symfonyCommandName = null;
-            if (($inputArgument = $all[$key = array_key_first($all)] ?? null) && 'command' === $inputArgument->getName()) {
+            if (($inputArgument = $all[$key = array_key_first($all) ?? ''] ?? null) && 'command' === $inputArgument->getName()) {
                 $symfonyCommandName = $this->arguments['command'] ?? null;
                 unset($all[$key]);
             }
 
             if (\count($all)) {
                 if ($symfonyCommandName) {
-                    $message = sprintf('Too many arguments to "%s" command, expected arguments "%s".', $symfonyCommandName, implode('" "', array_keys($all)));
+                    $message = \sprintf('Too many arguments to "%s" command, expected arguments "%s".', $symfonyCommandName, implode('" "', array_keys($all)));
                 } else {
-                    $message = sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all)));
+                    $message = \sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all)));
                 }
             } elseif ($symfonyCommandName) {
-                $message = sprintf('No arguments expected for "%s" command, got "%s".', $symfonyCommandName, $token);
+                $message = \sprintf('No arguments expected for "%s" command, got "%s".', $symfonyCommandName, $token);
             } else {
-                $message = sprintf('No arguments expected, got "%s".', $token);
+                $message = \sprintf('No arguments expected, got "%s".', $token);
             }
 
             throw new RuntimeException($message);
@@ -205,7 +205,7 @@ class ArgvInput extends Input
     private function addShortOption(string $shortcut, mixed $value): void
     {
         if (!$this->definition->hasShortcut($shortcut)) {
-            throw new RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut));
+            throw new RuntimeException(\sprintf('The "-%s" option does not exist.', $shortcut));
         }
 
         $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
@@ -220,12 +220,12 @@ class ArgvInput extends Input
     {
         if (!$this->definition->hasOption($name)) {
             if (!$this->definition->hasNegation($name)) {
-                throw new RuntimeException(sprintf('The "--%s" option does not exist.', $name));
+                throw new RuntimeException(\sprintf('The "--%s" option does not exist.', $name));
             }
 
             $optionName = $this->definition->negationToName($name);
             if (null !== $value) {
-                throw new RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
+                throw new RuntimeException(\sprintf('The "--%s" option does not accept a value.', $name));
             }
             $this->options[$optionName] = false;
 
@@ -235,7 +235,7 @@ class ArgvInput extends Input
         $option = $this->definition->getOption($name);
 
         if (null !== $value && !$option->acceptValue()) {
-            throw new RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
+            throw new RuntimeException(\sprintf('The "--%s" option does not accept a value.', $name));
         }
 
         if (\in_array($value, ['', null], true) && $option->acceptValue() && \count($this->parsed)) {
@@ -251,7 +251,7 @@ class ArgvInput extends Input
 
         if (null === $value) {
             if ($option->isValueRequired()) {
-                throw new RuntimeException(sprintf('The "--%s" option requires a value.', $name));
+                throw new RuntimeException(\sprintf('The "--%s" option requires a value.', $name));
             }
 
             if (!$option->isArray() && !$option->isValueOptional()) {
diff --git a/lib/symfony/console/Input/ArrayInput.php b/lib/symfony/console/Input/ArrayInput.php
index 355de61dd..b9f753394 100644
--- a/lib/symfony/console/Input/ArrayInput.php
+++ b/lib/symfony/console/Input/ArrayInput.php
@@ -27,7 +27,7 @@ class ArrayInput extends Input
 {
     private array $parameters;
 
-    public function __construct(array $parameters, InputDefinition $definition = null)
+    public function __construct(array $parameters, ?InputDefinition $definition = null)
     {
         $this->parameters = $parameters;
 
@@ -140,7 +140,7 @@ class ArrayInput extends Input
     private function addShortOption(string $shortcut, mixed $value): void
     {
         if (!$this->definition->hasShortcut($shortcut)) {
-            throw new InvalidOptionException(sprintf('The "-%s" option does not exist.', $shortcut));
+            throw new InvalidOptionException(\sprintf('The "-%s" option does not exist.', $shortcut));
         }
 
         $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
@@ -156,7 +156,7 @@ class ArrayInput extends Input
     {
         if (!$this->definition->hasOption($name)) {
             if (!$this->definition->hasNegation($name)) {
-                throw new InvalidOptionException(sprintf('The "--%s" option does not exist.', $name));
+                throw new InvalidOptionException(\sprintf('The "--%s" option does not exist.', $name));
             }
 
             $optionName = $this->definition->negationToName($name);
@@ -169,7 +169,7 @@ class ArrayInput extends Input
 
         if (null === $value) {
             if ($option->isValueRequired()) {
-                throw new InvalidOptionException(sprintf('The "--%s" option requires a value.', $name));
+                throw new InvalidOptionException(\sprintf('The "--%s" option requires a value.', $name));
             }
 
             if (!$option->isValueOptional()) {
@@ -188,7 +188,7 @@ class ArrayInput extends Input
     private function addArgument(string|int $name, mixed $value): void
     {
         if (!$this->definition->hasArgument($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" argument does not exist.', $name));
         }
 
         $this->arguments[$name] = $value;
diff --git a/lib/symfony/console/Input/Input.php b/lib/symfony/console/Input/Input.php
index c7959a6ce..d3a3c7fd2 100644
--- a/lib/symfony/console/Input/Input.php
+++ b/lib/symfony/console/Input/Input.php
@@ -34,7 +34,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
     protected $arguments = [];
     protected $interactive = true;
 
-    public function __construct(InputDefinition $definition = null)
+    public function __construct(?InputDefinition $definition = null)
     {
         if (null === $definition) {
             $this->definition = new InputDefinition();
@@ -74,7 +74,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
         $missingArguments = array_filter(array_keys($definition->getArguments()), fn ($argument) => !\array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired());
 
         if (\count($missingArguments) > 0) {
-            throw new RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments)));
+            throw new RuntimeException(\sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments)));
         }
     }
 
@@ -99,7 +99,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
     public function getArgument(string $name): mixed
     {
         if (!$this->definition->hasArgument($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" argument does not exist.', $name));
         }
 
         return $this->arguments[$name] ?? $this->definition->getArgument($name)->getDefault();
@@ -111,7 +111,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
     public function setArgument(string $name, mixed $value)
     {
         if (!$this->definition->hasArgument($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" argument does not exist.', $name));
         }
 
         $this->arguments[$name] = $value;
@@ -138,7 +138,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
         }
 
         if (!$this->definition->hasOption($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" option does not exist.', $name));
         }
 
         return \array_key_exists($name, $this->options) ? $this->options[$name] : $this->definition->getOption($name)->getDefault();
@@ -154,7 +154,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
 
             return;
         } elseif (!$this->definition->hasOption($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" option does not exist.', $name));
         }
 
         $this->options[$name] = $value;
diff --git a/lib/symfony/console/Input/InputArgument.php b/lib/symfony/console/Input/InputArgument.php
index 5cb151488..fd203919f 100644
--- a/lib/symfony/console/Input/InputArgument.php
+++ b/lib/symfony/console/Input/InputArgument.php
@@ -31,7 +31,7 @@ class InputArgument
 
     private string $name;
     private int $mode;
-    private string|int|bool|array|null|float $default;
+    private string|int|bool|array|float|null $default;
     private array|\Closure $suggestedValues;
     private string $description;
 
@@ -44,12 +44,12 @@ class InputArgument
      *
      * @throws InvalidArgumentException When argument mode is not valid
      */
-    public function __construct(string $name, int $mode = null, string $description = '', string|bool|int|float|array $default = null, \Closure|array $suggestedValues = [])
+    public function __construct(string $name, ?int $mode = null, string $description = '', string|bool|int|float|array|null $default = null, \Closure|array $suggestedValues = [])
     {
         if (null === $mode) {
             $mode = self::OPTIONAL;
         } elseif ($mode > 7 || $mode < 1) {
-            throw new InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode));
+            throw new InvalidArgumentException(\sprintf('Argument mode "%s" is not valid.', $mode));
         }
 
         $this->name = $name;
@@ -95,7 +95,7 @@ class InputArgument
      *
      * @throws LogicException When incorrect default value is given
      */
-    public function setDefault(string|bool|int|float|array $default = null)
+    public function setDefault(string|bool|int|float|array|null $default = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -137,7 +137,7 @@ class InputArgument
     {
         $values = $this->suggestedValues;
         if ($values instanceof \Closure && !\is_array($values = $values($input))) {
-            throw new LogicException(sprintf('Closure for argument "%s" must return an array. Got "%s".', $this->name, get_debug_type($values)));
+            throw new LogicException(\sprintf('Closure for argument "%s" must return an array. Got "%s".', $this->name, get_debug_type($values)));
         }
         if ($values) {
             $suggestions->suggestValues($values);
diff --git a/lib/symfony/console/Input/InputDefinition.php b/lib/symfony/console/Input/InputDefinition.php
index b7162d770..b5c202838 100644
--- a/lib/symfony/console/Input/InputDefinition.php
+++ b/lib/symfony/console/Input/InputDefinition.php
@@ -105,15 +105,15 @@ class InputDefinition
     public function addArgument(InputArgument $argument)
     {
         if (isset($this->arguments[$argument->getName()])) {
-            throw new LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName()));
+            throw new LogicException(\sprintf('An argument with name "%s" already exists.', $argument->getName()));
         }
 
         if (null !== $this->lastArrayArgument) {
-            throw new LogicException(sprintf('Cannot add a required argument "%s" after an array argument "%s".', $argument->getName(), $this->lastArrayArgument->getName()));
+            throw new LogicException(\sprintf('Cannot add a required argument "%s" after an array argument "%s".', $argument->getName(), $this->lastArrayArgument->getName()));
         }
 
         if ($argument->isRequired() && null !== $this->lastOptionalArgument) {
-            throw new LogicException(sprintf('Cannot add a required argument "%s" after an optional one "%s".', $argument->getName(), $this->lastOptionalArgument->getName()));
+            throw new LogicException(\sprintf('Cannot add a required argument "%s" after an optional one "%s".', $argument->getName(), $this->lastOptionalArgument->getName()));
         }
 
         if ($argument->isArray()) {
@@ -137,7 +137,7 @@ class InputDefinition
     public function getArgument(string|int $name): InputArgument
     {
         if (!$this->hasArgument($name)) {
-            throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "%s" argument does not exist.', $name));
         }
 
         $arguments = \is_int($name) ? array_values($this->arguments) : $this->arguments;
@@ -231,16 +231,16 @@ class InputDefinition
     public function addOption(InputOption $option)
     {
         if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
-            throw new LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
+            throw new LogicException(\sprintf('An option named "%s" already exists.', $option->getName()));
         }
         if (isset($this->negations[$option->getName()])) {
-            throw new LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
+            throw new LogicException(\sprintf('An option named "%s" already exists.', $option->getName()));
         }
 
         if ($option->getShortcut()) {
             foreach (explode('|', $option->getShortcut()) as $shortcut) {
                 if (isset($this->shortcuts[$shortcut]) && !$option->equals($this->options[$this->shortcuts[$shortcut]])) {
-                    throw new LogicException(sprintf('An option with shortcut "%s" already exists.', $shortcut));
+                    throw new LogicException(\sprintf('An option with shortcut "%s" already exists.', $shortcut));
                 }
             }
         }
@@ -255,7 +255,7 @@ class InputDefinition
         if ($option->isNegatable()) {
             $negatedName = 'no-'.$option->getName();
             if (isset($this->options[$negatedName])) {
-                throw new LogicException(sprintf('An option named "%s" already exists.', $negatedName));
+                throw new LogicException(\sprintf('An option named "%s" already exists.', $negatedName));
             }
             $this->negations[$negatedName] = $option->getName();
         }
@@ -269,7 +269,7 @@ class InputDefinition
     public function getOption(string $name): InputOption
     {
         if (!$this->hasOption($name)) {
-            throw new InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name));
+            throw new InvalidArgumentException(\sprintf('The "--%s" option does not exist.', $name));
         }
 
         return $this->options[$name];
@@ -343,7 +343,7 @@ class InputDefinition
     public function shortcutToName(string $shortcut): string
     {
         if (!isset($this->shortcuts[$shortcut])) {
-            throw new InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut));
+            throw new InvalidArgumentException(\sprintf('The "-%s" option does not exist.', $shortcut));
         }
 
         return $this->shortcuts[$shortcut];
@@ -359,7 +359,7 @@ class InputDefinition
     public function negationToName(string $negation): string
     {
         if (!isset($this->negations[$negation])) {
-            throw new InvalidArgumentException(sprintf('The "--%s" option does not exist.', $negation));
+            throw new InvalidArgumentException(\sprintf('The "--%s" option does not exist.', $negation));
         }
 
         return $this->negations[$negation];
@@ -378,7 +378,7 @@ class InputDefinition
             foreach ($this->getOptions() as $option) {
                 $value = '';
                 if ($option->acceptValue()) {
-                    $value = sprintf(
+                    $value = \sprintf(
                         ' %s%s%s',
                         $option->isValueOptional() ? '[' : '',
                         strtoupper($option->getName()),
@@ -386,9 +386,9 @@ class InputDefinition
                     );
                 }
 
-                $shortcut = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : '';
-                $negation = $option->isNegatable() ? sprintf('|--no-%s', $option->getName()) : '';
-                $elements[] = sprintf('[%s--%s%s%s]', $shortcut, $option->getName(), $value, $negation);
+                $shortcut = $option->getShortcut() ? \sprintf('-%s|', $option->getShortcut()) : '';
+                $negation = $option->isNegatable() ? \sprintf('|--no-%s', $option->getName()) : '';
+                $elements[] = \sprintf('[%s--%s%s%s]', $shortcut, $option->getName(), $value, $negation);
             }
         }
 
diff --git a/lib/symfony/console/Input/InputOption.php b/lib/symfony/console/Input/InputOption.php
index fdf88dcc2..3adc8c424 100644
--- a/lib/symfony/console/Input/InputOption.php
+++ b/lib/symfony/console/Input/InputOption.php
@@ -53,7 +53,7 @@ class InputOption
     private string $name;
     private string|array|null $shortcut;
     private int $mode;
-    private string|int|bool|array|null|float $default;
+    private string|int|bool|array|float|null $default;
     private array|\Closure $suggestedValues;
     private string $description;
 
@@ -65,7 +65,7 @@ class InputOption
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      */
-    public function __construct(string $name, string|array $shortcut = null, int $mode = null, string $description = '', string|bool|int|float|array $default = null, array|\Closure $suggestedValues = [])
+    public function __construct(string $name, string|array|null $shortcut = null, ?int $mode = null, string $description = '', string|bool|int|float|array|null $default = null, array|\Closure $suggestedValues = [])
     {
         if (str_starts_with($name, '--')) {
             $name = substr($name, 2);
@@ -75,7 +75,7 @@ class InputOption
             throw new InvalidArgumentException('An option name cannot be empty.');
         }
 
-        if (empty($shortcut)) {
+        if ('' === $shortcut || [] === $shortcut || false === $shortcut) {
             $shortcut = null;
         }
 
@@ -84,10 +84,10 @@ class InputOption
                 $shortcut = implode('|', $shortcut);
             }
             $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-'));
-            $shortcuts = array_filter($shortcuts);
+            $shortcuts = array_filter($shortcuts, 'strlen');
             $shortcut = implode('|', $shortcuts);
 
-            if (empty($shortcut)) {
+            if ('' === $shortcut) {
                 throw new InvalidArgumentException('An option shortcut cannot be empty.');
             }
         }
@@ -95,7 +95,7 @@ class InputOption
         if (null === $mode) {
             $mode = self::VALUE_NONE;
         } elseif ($mode >= (self::VALUE_NEGATABLE << 1) || $mode < 1) {
-            throw new InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode));
+            throw new InvalidArgumentException(\sprintf('Option mode "%s" is not valid.', $mode));
         }
 
         $this->name = $name;
@@ -181,7 +181,7 @@ class InputOption
     /**
      * @return void
      */
-    public function setDefault(string|bool|int|float|array $default = null)
+    public function setDefault(string|bool|int|float|array|null $default = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -231,7 +231,7 @@ class InputOption
     {
         $values = $this->suggestedValues;
         if ($values instanceof \Closure && !\is_array($values = $values($input))) {
-            throw new LogicException(sprintf('Closure for option "%s" must return an array. Got "%s".', $this->name, get_debug_type($values)));
+            throw new LogicException(\sprintf('Closure for option "%s" must return an array. Got "%s".', $this->name, get_debug_type($values)));
         }
         if ($values) {
             $suggestions->suggestValues($values);
diff --git a/lib/symfony/console/Input/StringInput.php b/lib/symfony/console/Input/StringInput.php
index 82bd21440..9b94784af 100644
--- a/lib/symfony/console/Input/StringInput.php
+++ b/lib/symfony/console/Input/StringInput.php
@@ -72,7 +72,7 @@ class StringInput extends ArgvInput
                 $token .= $match[1];
             } else {
                 // should never happen
-                throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($input, $cursor, 10)));
+                throw new InvalidArgumentException(\sprintf('Unable to parse input near "... %s ...".', substr($input, $cursor, 10)));
             }
 
             $cursor += \strlen($match[0]);
diff --git a/lib/symfony/console/Logger/ConsoleLogger.php b/lib/symfony/console/Logger/ConsoleLogger.php
index fddef50cd..70432b7de 100644
--- a/lib/symfony/console/Logger/ConsoleLogger.php
+++ b/lib/symfony/console/Logger/ConsoleLogger.php
@@ -62,7 +62,7 @@ class ConsoleLogger extends AbstractLogger
     public function log($level, $message, array $context = []): void
     {
         if (!isset($this->verbosityLevelMap[$level])) {
-            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
+            throw new InvalidArgumentException(\sprintf('The log level "%s" does not exist.', $level));
         }
 
         $output = $this->output;
@@ -78,7 +78,7 @@ class ConsoleLogger extends AbstractLogger
         // the if condition check isn't necessary -- it's the same one that $output will do internally anyway.
         // We only do it for efficiency here as the message formatting is relatively expensive.
         if ($output->getVerbosity() >= $this->verbosityLevelMap[$level]) {
-            $output->writeln(sprintf('<%1$s>[%2$s] %3$s</%1$s>', $this->formatLevelMap[$level], $level, $this->interpolate($message, $context)), $this->verbosityLevelMap[$level]);
+            $output->writeln(\sprintf('<%1$s>[%2$s] %3$s</%1$s>', $this->formatLevelMap[$level], $level, $this->interpolate($message, $context)), $this->verbosityLevelMap[$level]);
         }
     }
 
diff --git a/lib/symfony/console/Messenger/RunCommandMessageHandler.php b/lib/symfony/console/Messenger/RunCommandMessageHandler.php
index 14f9c1764..3f4286542 100644
--- a/lib/symfony/console/Messenger/RunCommandMessageHandler.php
+++ b/lib/symfony/console/Messenger/RunCommandMessageHandler.php
@@ -16,6 +16,8 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\RunCommandFailedException;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\Messenger\Exception\RecoverableExceptionInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableExceptionInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
@@ -35,12 +37,14 @@ final class RunCommandMessageHandler
 
         try {
             $exitCode = $this->application->run($input, $output);
+        } catch (UnrecoverableExceptionInterface|RecoverableExceptionInterface $e) {
+            throw $e;
         } catch (\Throwable $e) {
             throw new RunCommandFailedException($e, new RunCommandContext($message, Command::FAILURE, $output->fetch()));
         }
 
         if ($message->throwOnFailure && Command::SUCCESS !== $exitCode) {
-            throw new RunCommandFailedException(sprintf('Command "%s" exited with code "%s".', $message->input, $exitCode), new RunCommandContext($message, $exitCode, $output->fetch()));
+            throw new RunCommandFailedException(\sprintf('Command "%s" exited with code "%s".', $message->input, $exitCode), new RunCommandContext($message, $exitCode, $output->fetch()));
         }
 
         return new RunCommandContext($message, $exitCode, $output->fetch());
diff --git a/lib/symfony/console/Output/AnsiColorMode.php b/lib/symfony/console/Output/AnsiColorMode.php
index 5f9f744fe..dcdd1d5c4 100644
--- a/lib/symfony/console/Output/AnsiColorMode.php
+++ b/lib/symfony/console/Output/AnsiColorMode.php
@@ -51,7 +51,7 @@ enum AnsiColorMode
         }
 
         if (6 !== \strlen($hexColor)) {
-            throw new InvalidArgumentException(sprintf('Invalid "#%s" color.', $hexColor));
+            throw new InvalidArgumentException(\sprintf('Invalid "#%s" color.', $hexColor));
         }
 
         $color = hexdec($hexColor);
@@ -63,7 +63,7 @@ enum AnsiColorMode
         return match ($this) {
             self::Ansi4 => (string) $this->convertFromRGB($r, $g, $b),
             self::Ansi8 => '8;5;'.((string) $this->convertFromRGB($r, $g, $b)),
-            self::Ansi24 => sprintf('8;2;%d;%d;%d', $r, $g, $b)
+            self::Ansi24 => \sprintf('8;2;%d;%d;%d', $r, $g, $b),
         };
     }
 
@@ -72,7 +72,7 @@ enum AnsiColorMode
         return match ($this) {
             self::Ansi4 => $this->degradeHexColorToAnsi4($r, $g, $b),
             self::Ansi8 => $this->degradeHexColorToAnsi8($r, $g, $b),
-            default => throw new InvalidArgumentException("RGB cannot be converted to {$this->name}.")
+            default => throw new InvalidArgumentException("RGB cannot be converted to {$this->name}."),
         };
     }
 
diff --git a/lib/symfony/console/Output/ConsoleOutput.php b/lib/symfony/console/Output/ConsoleOutput.php
index c1eb7cd14..5837e74a3 100644
--- a/lib/symfony/console/Output/ConsoleOutput.php
+++ b/lib/symfony/console/Output/ConsoleOutput.php
@@ -37,7 +37,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
      * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
      */
-    public function __construct(int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null)
+    public function __construct(int $verbosity = self::VERBOSITY_NORMAL, ?bool $decorated = null, ?OutputFormatterInterface $formatter = null)
     {
         parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
 
diff --git a/lib/symfony/console/Output/ConsoleSectionOutput.php b/lib/symfony/console/Output/ConsoleSectionOutput.php
index 21c4a44a8..04d587cf2 100644
--- a/lib/symfony/console/Output/ConsoleSectionOutput.php
+++ b/lib/symfony/console/Output/ConsoleSectionOutput.php
@@ -63,7 +63,7 @@ class ConsoleSectionOutput extends StreamOutput
      *
      * @return void
      */
-    public function clear(int $lines = null)
+    public function clear(?int $lines = null)
     {
         if (empty($this->content) || !$this->isDecorated()) {
             return;
@@ -229,7 +229,7 @@ class ConsoleSectionOutput extends StreamOutput
 
         if ($numberOfLinesToClear > 0) {
             // move cursor up n lines
-            parent::doWrite(sprintf("\x1b[%dA", $numberOfLinesToClear), false);
+            parent::doWrite(\sprintf("\x1b[%dA", $numberOfLinesToClear), false);
             // erase to end of screen
             parent::doWrite("\x1b[0J", false);
         }
diff --git a/lib/symfony/console/Output/Output.php b/lib/symfony/console/Output/Output.php
index 3a06311a8..00f481e03 100644
--- a/lib/symfony/console/Output/Output.php
+++ b/lib/symfony/console/Output/Output.php
@@ -37,7 +37,7 @@ abstract class Output implements OutputInterface
      * @param bool                          $decorated Whether to decorate messages
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
      */
-    public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
+    public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, ?OutputFormatterInterface $formatter = null)
     {
         $this->verbosity = $verbosity ?? self::VERBOSITY_NORMAL;
         $this->formatter = $formatter ?? new OutputFormatter();
diff --git a/lib/symfony/console/Output/StreamOutput.php b/lib/symfony/console/Output/StreamOutput.php
index 08005c292..f51d03763 100644
--- a/lib/symfony/console/Output/StreamOutput.php
+++ b/lib/symfony/console/Output/StreamOutput.php
@@ -40,7 +40,7 @@ class StreamOutput extends Output
      *
      * @throws InvalidArgumentException When first argument is not a real stream
      */
-    public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null)
+    public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, ?bool $decorated = null, ?OutputFormatterInterface $formatter = null)
     {
         if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) {
             throw new InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');
@@ -93,21 +93,33 @@ class StreamOutput extends Output
     protected function hasColorSupport(): bool
     {
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 
-        if (\DIRECTORY_SEPARATOR === '\\'
-            && \function_exists('sapi_windows_vt100_support')
-            && @sapi_windows_vt100_support($this->stream)
+        // Detect msysgit/mingw and assume this is a tty because detection
+        // does not work correctly, see https://github.com/composer/composer/issues/9690
+        if (!@stream_isatty($this->stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
+            return false;
+        }
+
+        if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($this->stream)) {
+            return true;
+        }
+
+        if ('Hyper' === getenv('TERM_PROGRAM')
+            || false !== getenv('COLORTERM')
+            || false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
         ) {
             return true;
         }
 
-        return 'Hyper' === getenv('TERM_PROGRAM')
-            || false !== getenv('ANSICON')
-            || 'ON' === getenv('ConEmuANSI')
-            || str_starts_with((string) getenv('TERM'), 'xterm')
-            || stream_isatty($this->stream);
+        if ('dumb' === $term = (string) getenv('TERM')) {
+            return false;
+        }
+
+        // See https://github.com/chalk/supports-color/blob/d4f413efaf8da045c5ab440ed418ef02dbb28bf1/index.js#L157
+        return preg_match('/^((screen|xterm|vt100|vt220|putty|rxvt|ansi|cygwin|linux).*)|(.*-256(color)?(-bce)?)$/', $term);
     }
 }
diff --git a/lib/symfony/console/Output/TrimmedBufferOutput.php b/lib/symfony/console/Output/TrimmedBufferOutput.php
index b00445ece..90ee45aae 100644
--- a/lib/symfony/console/Output/TrimmedBufferOutput.php
+++ b/lib/symfony/console/Output/TrimmedBufferOutput.php
@@ -24,10 +24,10 @@ class TrimmedBufferOutput extends Output
     private int $maxLength;
     private string $buffer = '';
 
-    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
+    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, ?OutputFormatterInterface $formatter = null)
     {
         if ($maxLength <= 0) {
-            throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
+            throw new InvalidArgumentException(\sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
         }
 
         parent::__construct($verbosity, $decorated, $formatter);
diff --git a/lib/symfony/console/Question/ChoiceQuestion.php b/lib/symfony/console/Question/ChoiceQuestion.php
index e449ff683..bcfe4dc45 100644
--- a/lib/symfony/console/Question/ChoiceQuestion.php
+++ b/lib/symfony/console/Question/ChoiceQuestion.php
@@ -26,11 +26,11 @@ class ChoiceQuestion extends Question
     private string $errorMessage = 'Value "%s" is invalid';
 
     /**
-     * @param string $question The question to ask to the user
-     * @param array  $choices  The list of available choices
-     * @param mixed  $default  The default answer to return
+     * @param string                                   $question The question to ask to the user
+     * @param array<string|bool|int|float|\Stringable> $choices  The list of available choices
+     * @param string|bool|int|float|null               $default  The default answer to return
      */
-    public function __construct(string $question, array $choices, mixed $default = null)
+    public function __construct(string $question, array $choices, string|bool|int|float|null $default = null)
     {
         if (!$choices) {
             throw new \LogicException('Choice question must have at least 1 choice available.');
@@ -44,7 +44,7 @@ class ChoiceQuestion extends Question
     }
 
     /**
-     * Returns available choices.
+     * @return array<string|bool|int|float|\Stringable>
      */
     public function getChoices(): array
     {
@@ -120,7 +120,7 @@ class ChoiceQuestion extends Question
             if ($multiselect) {
                 // Check for a separated comma values
                 if (!preg_match('/^[^,]+(?:,[^,]+)*$/', (string) $selected, $matches)) {
-                    throw new InvalidArgumentException(sprintf($errorMessage, $selected));
+                    throw new InvalidArgumentException(\sprintf($errorMessage, $selected));
                 }
 
                 $selectedChoices = explode(',', (string) $selected);
@@ -144,7 +144,7 @@ class ChoiceQuestion extends Question
                 }
 
                 if (\count($results) > 1) {
-                    throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of "%s".', implode('" or "', $results)));
+                    throw new InvalidArgumentException(\sprintf('The provided answer is ambiguous. Value should be one of "%s".', implode('" or "', $results)));
                 }
 
                 $result = array_search($value, $choices);
@@ -160,7 +160,7 @@ class ChoiceQuestion extends Question
                 }
 
                 if (false === $result) {
-                    throw new InvalidArgumentException(sprintf($errorMessage, $value));
+                    throw new InvalidArgumentException(\sprintf($errorMessage, $value));
                 }
 
                 // For associative choices, consistently return the key as string:
diff --git a/lib/symfony/console/Question/Question.php b/lib/symfony/console/Question/Question.php
index 26896bb53..ecbde56d5 100644
--- a/lib/symfony/console/Question/Question.php
+++ b/lib/symfony/console/Question/Question.php
@@ -27,7 +27,7 @@ class Question
     private bool $hiddenFallback = true;
     private ?\Closure $autocompleterCallback = null;
     private ?\Closure $validator = null;
-    private string|int|bool|null|float $default;
+    private string|int|bool|float|null $default;
     private ?\Closure $normalizer = null;
     private bool $trimmable = true;
     private bool $multiline = false;
@@ -36,7 +36,7 @@ class Question
      * @param string                     $question The question to ask to the user
      * @param string|bool|int|float|null $default  The default answer to return if the user enters nothing
      */
-    public function __construct(string $question, string|bool|int|float $default = null)
+    public function __construct(string $question, string|bool|int|float|null $default = null)
     {
         $this->question = $question;
         $this->default = $default;
@@ -175,7 +175,7 @@ class Question
      *
      * @return $this
      */
-    public function setAutocompleterCallback(callable $callback = null): static
+    public function setAutocompleterCallback(?callable $callback = null): static
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -194,7 +194,7 @@ class Question
      *
      * @return $this
      */
-    public function setValidator(callable $validator = null): static
+    public function setValidator(?callable $validator = null): static
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/console', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
diff --git a/lib/symfony/console/Resources/completion.bash b/lib/symfony/console/Resources/completion.bash
index 0d76eacc3..2befe76cb 100644
--- a/lib/symfony/console/Resources/completion.bash
+++ b/lib/symfony/console/Resources/completion.bash
@@ -17,7 +17,7 @@ _sf_{{ COMMAND_NAME }}() {
     done
 
     # Use newline as only separator to allow space in completion values
-    IFS=$'\n'
+    local IFS=$'\n'
     local sf_cmd="${COMP_WORDS[0]}"
 
     # for an alias, get the real script behind it
@@ -37,7 +37,7 @@ _sf_{{ COMMAND_NAME }}() {
 
     local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a{{ VERSION }}")
     for w in ${words[@]}; do
-        w=$(printf -- '%b' "$w")
+        w="${w//\\\\/\\}"
         # remove quotes from typed values
         quote="${w:0:1}"
         if [ "$quote" == \' ]; then
diff --git a/lib/symfony/console/SignalRegistry/SignalMap.php b/lib/symfony/console/SignalRegistry/SignalMap.php
index de419bda7..2f9aa67c1 100644
--- a/lib/symfony/console/SignalRegistry/SignalMap.php
+++ b/lib/symfony/console/SignalRegistry/SignalMap.php
@@ -27,7 +27,7 @@ class SignalMap
         if (!isset(self::$map)) {
             $r = new \ReflectionExtension('pcntl');
             $c = $r->getConstants();
-            $map = array_filter($c, fn ($k) => str_starts_with($k, 'SIG') && !str_starts_with($k, 'SIG_'), \ARRAY_FILTER_USE_KEY);
+            $map = array_filter($c, fn ($k) => str_starts_with($k, 'SIG') && !str_starts_with($k, 'SIG_') && 'SIGBABY' !== $k, \ARRAY_FILTER_USE_KEY);
             self::$map = array_flip($map);
         }
 
diff --git a/lib/symfony/console/SignalRegistry/SignalRegistry.php b/lib/symfony/console/SignalRegistry/SignalRegistry.php
index ef2e5f04e..ac8851b06 100644
--- a/lib/symfony/console/SignalRegistry/SignalRegistry.php
+++ b/lib/symfony/console/SignalRegistry/SignalRegistry.php
@@ -13,8 +13,21 @@ namespace Symfony\Component\Console\SignalRegistry;
 
 final class SignalRegistry
 {
+    /**
+     * @var array<int, array<callable>>
+     */
     private array $signalHandlers = [];
 
+    /**
+     * @var array<array<int, array<callable>>>
+     */
+    private array $stack = [];
+
+    /**
+     * @var array<int, callable|int|string>
+     */
+    private array $originalHandlers = [];
+
     public function __construct()
     {
         if (\function_exists('pcntl_async_signals')) {
@@ -24,17 +37,21 @@ final class SignalRegistry
 
     public function register(int $signal, callable $signalHandler): void
     {
-        if (!isset($this->signalHandlers[$signal])) {
-            $previousCallback = pcntl_signal_get_handler($signal);
+        $previous = pcntl_signal_get_handler($signal);
 
-            if (\is_callable($previousCallback)) {
-                $this->signalHandlers[$signal][] = $previousCallback;
+        if (!isset($this->originalHandlers[$signal])) {
+            $this->originalHandlers[$signal] = $previous;
+        }
+
+        if (!isset($this->signalHandlers[$signal])) {
+            if (\is_callable($previous) && [$this, 'handle'] !== $previous) {
+                $this->signalHandlers[$signal][] = $previous;
             }
         }
 
         $this->signalHandlers[$signal][] = $signalHandler;
 
-        pcntl_signal($signal, $this->handle(...));
+        pcntl_signal($signal, [$this, 'handle']);
     }
 
     public static function isSupported(): bool
@@ -54,4 +71,38 @@ final class SignalRegistry
             $signalHandler($signal, $hasNext);
         }
     }
+
+    /**
+     * Pushes the current active handlers onto the stack and clears the active list.
+     *
+     * This prepares the registry for a new set of handlers within a specific scope.
+     *
+     * @internal
+     */
+    public function pushCurrentHandlers(): void
+    {
+        $this->stack[] = $this->signalHandlers;
+        $this->signalHandlers = [];
+    }
+
+    /**
+     * Restores the previous handlers from the stack, making them active.
+     *
+     * This also restores the original OS-level signal handler if no
+     * more handlers are registered for a signal that was just popped.
+     *
+     * @internal
+     */
+    public function popPreviousHandlers(): void
+    {
+        $popped = $this->signalHandlers;
+        $this->signalHandlers = array_pop($this->stack) ?? [];
+
+        // Restore OS handler if no more Symfony handlers for this signal
+        foreach ($popped as $signal => $handlers) {
+            if (!($this->signalHandlers[$signal] ?? false) && isset($this->originalHandlers[$signal])) {
+                pcntl_signal($signal, $this->originalHandlers[$signal]);
+            }
+        }
+    }
 }
diff --git a/lib/symfony/console/SingleCommandApplication.php b/lib/symfony/console/SingleCommandApplication.php
index 4f0b5ba3c..ff1c17247 100644
--- a/lib/symfony/console/SingleCommandApplication.php
+++ b/lib/symfony/console/SingleCommandApplication.php
@@ -46,7 +46,7 @@ class SingleCommandApplication extends Command
         return $this;
     }
 
-    public function run(InputInterface $input = null, OutputInterface $output = null): int
+    public function run(?InputInterface $input = null, ?OutputInterface $output = null): int
     {
         if ($this->running) {
             return parent::run($input, $output);
diff --git a/lib/symfony/console/Style/StyleInterface.php b/lib/symfony/console/Style/StyleInterface.php
index e25a65bd2..6bced158a 100644
--- a/lib/symfony/console/Style/StyleInterface.php
+++ b/lib/symfony/console/Style/StyleInterface.php
@@ -91,12 +91,12 @@ interface StyleInterface
     /**
      * Asks a question.
      */
-    public function ask(string $question, string $default = null, callable $validator = null): mixed;
+    public function ask(string $question, ?string $default = null, ?callable $validator = null): mixed;
 
     /**
      * Asks a question with the user input hidden.
      */
-    public function askHidden(string $question, callable $validator = null): mixed;
+    public function askHidden(string $question, ?callable $validator = null): mixed;
 
     /**
      * Asks for confirmation.
diff --git a/lib/symfony/console/Style/SymfonyStyle.php b/lib/symfony/console/Style/SymfonyStyle.php
index 43d2edf5a..135f4fd0e 100644
--- a/lib/symfony/console/Style/SymfonyStyle.php
+++ b/lib/symfony/console/Style/SymfonyStyle.php
@@ -63,7 +63,7 @@ class SymfonyStyle extends OutputStyle
      *
      * @return void
      */
-    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
+    public function block(string|array $messages, ?string $type = null, ?string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
     {
         $messages = \is_array($messages) ? array_values($messages) : [$messages];
 
@@ -79,8 +79,8 @@ class SymfonyStyle extends OutputStyle
     {
         $this->autoPrependBlock();
         $this->writeln([
-            sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
-            sprintf('<comment>%s</>', str_repeat('=', Helper::width(Helper::removeDecoration($this->getFormatter(), $message)))),
+            \sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
+            \sprintf('<comment>%s</>', str_repeat('=', Helper::width(Helper::removeDecoration($this->getFormatter(), $message)))),
         ]);
         $this->newLine();
     }
@@ -92,8 +92,8 @@ class SymfonyStyle extends OutputStyle
     {
         $this->autoPrependBlock();
         $this->writeln([
-            sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
-            sprintf('<comment>%s</>', str_repeat('-', Helper::width(Helper::removeDecoration($this->getFormatter(), $message)))),
+            \sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
+            \sprintf('<comment>%s</>', str_repeat('-', Helper::width(Helper::removeDecoration($this->getFormatter(), $message)))),
         ]);
         $this->newLine();
     }
@@ -104,7 +104,7 @@ class SymfonyStyle extends OutputStyle
     public function listing(array $elements)
     {
         $this->autoPrependText();
-        $elements = array_map(fn ($element) => sprintf(' * %s', $element), $elements);
+        $elements = array_map(fn ($element) => \sprintf(' * %s', $element), $elements);
 
         $this->writeln($elements);
         $this->newLine();
@@ -119,7 +119,7 @@ class SymfonyStyle extends OutputStyle
 
         $messages = \is_array($message) ? array_values($message) : [$message];
         foreach ($messages as $message) {
-            $this->writeln(sprintf(' %s', $message));
+            $this->writeln(\sprintf(' %s', $message));
         }
     }
 
@@ -249,7 +249,7 @@ class SymfonyStyle extends OutputStyle
         $this->horizontalTable($headers, [$row]);
     }
 
-    public function ask(string $question, string $default = null, callable $validator = null): mixed
+    public function ask(string $question, ?string $default = null, ?callable $validator = null): mixed
     {
         $question = new Question($question, $default);
         $question->setValidator($validator);
@@ -257,7 +257,7 @@ class SymfonyStyle extends OutputStyle
         return $this->askQuestion($question);
     }
 
-    public function askHidden(string $question, callable $validator = null): mixed
+    public function askHidden(string $question, ?callable $validator = null): mixed
     {
         $question = new Question($question);
 
@@ -336,7 +336,7 @@ class SymfonyStyle extends OutputStyle
      *
      * @return iterable<TKey, TValue>
      */
-    public function progressIterate(iterable $iterable, int $max = null): iterable
+    public function progressIterate(iterable $iterable, ?int $max = null): iterable
     {
         yield from $this->createProgressBar()->iterate($iterable, $max);
 
@@ -456,14 +456,14 @@ class SymfonyStyle extends OutputStyle
         $this->bufferedOutput->write($message, $newLine, $type);
     }
 
-    private function createBlock(iterable $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false): array
+    private function createBlock(iterable $messages, ?string $type = null, ?string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false): array
     {
         $indentLength = 0;
         $prefixLength = Helper::width(Helper::removeDecoration($this->getFormatter(), $prefix));
         $lines = [];
 
         if (null !== $type) {
-            $type = sprintf('[%s] ', $type);
+            $type = \sprintf('[%s] ', $type);
             $indentLength = Helper::width($type);
             $lineIndentation = str_repeat(' ', $indentLength);
         }
@@ -505,7 +505,7 @@ class SymfonyStyle extends OutputStyle
             $line .= str_repeat(' ', max($this->lineLength - Helper::width(Helper::removeDecoration($this->getFormatter(), $line)), 0));
 
             if ($style) {
-                $line = sprintf('<%s>%s</>', $style, $line);
+                $line = \sprintf('<%s>%s</>', $style, $line);
             }
         }
 
diff --git a/lib/symfony/console/Terminal.php b/lib/symfony/console/Terminal.php
index 3eda0376b..f094adedc 100644
--- a/lib/symfony/console/Terminal.php
+++ b/lib/symfony/console/Terminal.php
@@ -217,8 +217,7 @@ class Terminal
 
         $cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;
 
-        $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (!\is_resource($process)) {
+        if (!$process = @proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {
             return null;
         }
 
diff --git a/lib/symfony/console/Tester/Constraint/CommandIsSuccessful.php b/lib/symfony/console/Tester/Constraint/CommandIsSuccessful.php
index 09c6194b9..d677c27aa 100644
--- a/lib/symfony/console/Tester/Constraint/CommandIsSuccessful.php
+++ b/lib/symfony/console/Tester/Constraint/CommandIsSuccessful.php
@@ -38,6 +38,6 @@ final class CommandIsSuccessful extends Constraint
             Command::INVALID => 'Command was invalid.',
         ];
 
-        return $mapping[$other] ?? sprintf('Command returned exit status %d.', $other);
+        return $mapping[$other] ?? \sprintf('Command returned exit status %d.', $other);
     }
 }
diff --git a/lib/symfony/console/Tester/TesterTrait.php b/lib/symfony/console/Tester/TesterTrait.php
index 1ab7a70aa..238c7b7eb 100644
--- a/lib/symfony/console/Tester/TesterTrait.php
+++ b/lib/symfony/console/Tester/TesterTrait.php
@@ -168,7 +168,11 @@ trait TesterTrait
         $stream = fopen('php://memory', 'r+', false);
 
         foreach ($inputs as $input) {
-            fwrite($stream, $input.\PHP_EOL);
+            fwrite($stream, $input);
+
+            if (!str_ends_with($input, "\x4")) {
+                fwrite($stream, \PHP_EOL);
+            }
         }
 
         rewind($stream);
diff --git a/lib/symfony/css-selector/Exception/SyntaxErrorException.php b/lib/symfony/css-selector/Exception/SyntaxErrorException.php
index 5a9d8078d..52d8259b8 100644
--- a/lib/symfony/css-selector/Exception/SyntaxErrorException.php
+++ b/lib/symfony/css-selector/Exception/SyntaxErrorException.php
@@ -25,17 +25,17 @@ class SyntaxErrorException extends ParseException
 {
     public static function unexpectedToken(string $expectedValue, Token $foundToken): self
     {
-        return new self(sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));
+        return new self(\sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));
     }
 
     public static function pseudoElementFound(string $pseudoElement, string $unexpectedLocation): self
     {
-        return new self(sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));
+        return new self(\sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));
     }
 
     public static function unclosedString(int $position): self
     {
-        return new self(sprintf('Unclosed/invalid string at %s.', $position));
+        return new self(\sprintf('Unclosed/invalid string at %s.', $position));
     }
 
     public static function nestedNot(): self
@@ -45,7 +45,7 @@ class SyntaxErrorException extends ParseException
 
     public static function notAtTheStartOfASelector(string $pseudoElement): self
     {
-        return new self(sprintf('Got immediate child pseudo-element ":%s" not at the start of a selector', $pseudoElement));
+        return new self(\sprintf('Got immediate child pseudo-element ":%s" not at the start of a selector', $pseudoElement));
     }
 
     public static function stringAsFunctionArgument(): self
diff --git a/lib/symfony/css-selector/Node/AttributeNode.php b/lib/symfony/css-selector/Node/AttributeNode.php
index ba4df3100..967cb7ce0 100644
--- a/lib/symfony/css-selector/Node/AttributeNode.php
+++ b/lib/symfony/css-selector/Node/AttributeNode.php
@@ -73,7 +73,7 @@ class AttributeNode extends AbstractNode
         $attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute;
 
         return 'exists' === $this->operator
-            ? sprintf('%s[%s[%s]]', $this->getNodeName(), $this->selector, $attribute)
-            : sprintf("%s[%s[%s %s '%s']]", $this->getNodeName(), $this->selector, $attribute, $this->operator, $this->value);
+            ? \sprintf('%s[%s[%s]]', $this->getNodeName(), $this->selector, $attribute)
+            : \sprintf("%s[%s[%s %s '%s']]", $this->getNodeName(), $this->selector, $attribute, $this->operator, $this->value);
     }
 }
diff --git a/lib/symfony/css-selector/Node/ClassNode.php b/lib/symfony/css-selector/Node/ClassNode.php
index 717445870..7cca6d90b 100644
--- a/lib/symfony/css-selector/Node/ClassNode.php
+++ b/lib/symfony/css-selector/Node/ClassNode.php
@@ -49,6 +49,6 @@ class ClassNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
+        return \sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
     }
 }
diff --git a/lib/symfony/css-selector/Node/CombinedSelectorNode.php b/lib/symfony/css-selector/Node/CombinedSelectorNode.php
index 19fecb700..1db62a229 100644
--- a/lib/symfony/css-selector/Node/CombinedSelectorNode.php
+++ b/lib/symfony/css-selector/Node/CombinedSelectorNode.php
@@ -58,6 +58,6 @@ class CombinedSelectorNode extends AbstractNode
     {
         $combinator = ' ' === $this->combinator ? '<followed>' : $this->combinator;
 
-        return sprintf('%s[%s %s %s]', $this->getNodeName(), $this->selector, $combinator, $this->subSelector);
+        return \sprintf('%s[%s %s %s]', $this->getNodeName(), $this->selector, $combinator, $this->subSelector);
     }
 }
diff --git a/lib/symfony/css-selector/Node/ElementNode.php b/lib/symfony/css-selector/Node/ElementNode.php
index 39f4d9cc0..bd4a7fe45 100644
--- a/lib/symfony/css-selector/Node/ElementNode.php
+++ b/lib/symfony/css-selector/Node/ElementNode.php
@@ -26,7 +26,7 @@ class ElementNode extends AbstractNode
     private ?string $namespace;
     private ?string $element;
 
-    public function __construct(string $namespace = null, string $element = null)
+    public function __construct(?string $namespace = null, ?string $element = null)
     {
         $this->namespace = $namespace;
         $this->element = $element;
@@ -51,6 +51,6 @@ class ElementNode extends AbstractNode
     {
         $element = $this->element ?: '*';
 
-        return sprintf('%s[%s]', $this->getNodeName(), $this->namespace ? $this->namespace.'|'.$element : $element);
+        return \sprintf('%s[%s]', $this->getNodeName(), $this->namespace ? $this->namespace.'|'.$element : $element);
     }
 }
diff --git a/lib/symfony/css-selector/Node/FunctionNode.php b/lib/symfony/css-selector/Node/FunctionNode.php
index 938a82b1a..09342a1bf 100644
--- a/lib/symfony/css-selector/Node/FunctionNode.php
+++ b/lib/symfony/css-selector/Node/FunctionNode.php
@@ -66,6 +66,6 @@ class FunctionNode extends AbstractNode
     {
         $arguments = implode(', ', array_map(fn (Token $token) => "'".$token->getValue()."'", $this->arguments));
 
-        return sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
+        return \sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
     }
 }
diff --git a/lib/symfony/css-selector/Node/HashNode.php b/lib/symfony/css-selector/Node/HashNode.php
index 3af8e8474..014ae54ec 100644
--- a/lib/symfony/css-selector/Node/HashNode.php
+++ b/lib/symfony/css-selector/Node/HashNode.php
@@ -49,6 +49,6 @@ class HashNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
+        return \sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
     }
 }
diff --git a/lib/symfony/css-selector/Node/NegationNode.php b/lib/symfony/css-selector/Node/NegationNode.php
index f80675838..967b65bb5 100644
--- a/lib/symfony/css-selector/Node/NegationNode.php
+++ b/lib/symfony/css-selector/Node/NegationNode.php
@@ -49,6 +49,6 @@ class NegationNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
+        return \sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
     }
 }
diff --git a/lib/symfony/css-selector/Node/PseudoNode.php b/lib/symfony/css-selector/Node/PseudoNode.php
index c21cd6e92..cbebd9f45 100644
--- a/lib/symfony/css-selector/Node/PseudoNode.php
+++ b/lib/symfony/css-selector/Node/PseudoNode.php
@@ -49,6 +49,6 @@ class PseudoNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
+        return \sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
     }
 }
diff --git a/lib/symfony/css-selector/Node/SelectorNode.php b/lib/symfony/css-selector/Node/SelectorNode.php
index 0b09ab5dc..6b70535c9 100644
--- a/lib/symfony/css-selector/Node/SelectorNode.php
+++ b/lib/symfony/css-selector/Node/SelectorNode.php
@@ -26,7 +26,7 @@ class SelectorNode extends AbstractNode
     private NodeInterface $tree;
     private ?string $pseudoElement;
 
-    public function __construct(NodeInterface $tree, string $pseudoElement = null)
+    public function __construct(NodeInterface $tree, ?string $pseudoElement = null)
     {
         $this->tree = $tree;
         $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;
@@ -49,6 +49,6 @@ class SelectorNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
+        return \sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
     }
 }
diff --git a/lib/symfony/css-selector/Parser/Handler/StringHandler.php b/lib/symfony/css-selector/Parser/Handler/StringHandler.php
index 5fd44df26..d5c6d3618 100644
--- a/lib/symfony/css-selector/Parser/Handler/StringHandler.php
+++ b/lib/symfony/css-selector/Parser/Handler/StringHandler.php
@@ -52,7 +52,7 @@ class StringHandler implements HandlerInterface
         $match = $reader->findPattern($this->patterns->getQuotedStringPattern($quote));
 
         if (!$match) {
-            throw new InternalErrorException(sprintf('Should have found at least an empty match at %d.', $reader->getPosition()));
+            throw new InternalErrorException(\sprintf('Should have found at least an empty match at %d.', $reader->getPosition()));
         }
 
         // check unclosed strings
diff --git a/lib/symfony/css-selector/Parser/Parser.php b/lib/symfony/css-selector/Parser/Parser.php
index 5313d3435..309c9b521 100644
--- a/lib/symfony/css-selector/Parser/Parser.php
+++ b/lib/symfony/css-selector/Parser/Parser.php
@@ -29,7 +29,7 @@ class Parser implements ParserInterface
 {
     private Tokenizer $tokenizer;
 
-    public function __construct(Tokenizer $tokenizer = null)
+    public function __construct(?Tokenizer $tokenizer = null)
     {
         $this->tokenizer = $tokenizer ?? new Tokenizer();
     }
diff --git a/lib/symfony/css-selector/Parser/Token.php b/lib/symfony/css-selector/Parser/Token.php
index b50441a8e..5bf8c22ef 100644
--- a/lib/symfony/css-selector/Parser/Token.php
+++ b/lib/symfony/css-selector/Parser/Token.php
@@ -103,9 +103,9 @@ class Token
     public function __toString(): string
     {
         if ($this->value) {
-            return sprintf('<%s "%s" at %s>', $this->type, $this->value, $this->position);
+            return \sprintf('<%s "%s" at %s>', $this->type, $this->value, $this->position);
         }
 
-        return sprintf('<%s at %s>', $this->type, $this->position);
+        return \sprintf('<%s at %s>', $this->type, $this->position);
     }
 }
diff --git a/lib/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php b/lib/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php
index 3c77cf091..1825bbf35 100644
--- a/lib/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php
+++ b/lib/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php
@@ -84,6 +84,6 @@ class TokenizerPatterns
 
     public function getQuotedStringPattern(string $quote): string
     {
-        return '~^'.sprintf($this->quotedStringPattern, $quote).'~i';
+        return '~^'.\sprintf($this->quotedStringPattern, $quote).'~i';
     }
 }
diff --git a/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php b/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
index 3c785e97a..28a16c1b7 100644
--- a/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
+++ b/lib/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
@@ -47,12 +47,12 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translateEquals(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition(sprintf('%s = %s', $attribute, Translator::getXpathLiteral($value)));
+        return $xpath->addCondition(\sprintf('%s = %s', $attribute, Translator::getXpathLiteral($value)));
     }
 
     public function translateIncludes(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition($value ? sprintf(
+        return $xpath->addCondition($value ? \sprintf(
             '%1$s and contains(concat(\' \', normalize-space(%1$s), \' \'), %2$s)',
             $attribute,
             Translator::getXpathLiteral(' '.$value.' ')
@@ -61,7 +61,7 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translateDashMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition(sprintf(
+        return $xpath->addCondition(\sprintf(
             '%1$s and (%1$s = %2$s or starts-with(%1$s, %3$s))',
             $attribute,
             Translator::getXpathLiteral($value),
@@ -71,7 +71,7 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translatePrefixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition($value ? sprintf(
+        return $xpath->addCondition($value ? \sprintf(
             '%1$s and starts-with(%1$s, %2$s)',
             $attribute,
             Translator::getXpathLiteral($value)
@@ -80,7 +80,7 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translateSuffixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition($value ? sprintf(
+        return $xpath->addCondition($value ? \sprintf(
             '%1$s and substring(%1$s, string-length(%1$s)-%2$s) = %3$s',
             $attribute,
             \strlen($value) - 1,
@@ -90,7 +90,7 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translateSubstringMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition($value ? sprintf(
+        return $xpath->addCondition($value ? \sprintf(
             '%1$s and contains(%1$s, %2$s)',
             $attribute,
             Translator::getXpathLiteral($value)
@@ -99,7 +99,7 @@ class AttributeMatchingExtension extends AbstractExtension
 
     public function translateDifferent(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
     {
-        return $xpath->addCondition(sprintf(
+        return $xpath->addCondition(\sprintf(
             $value ? 'not(%1$s) or %1$s != %2$s' : '%s != %s',
             $attribute,
             Translator::getXpathLiteral($value)
diff --git a/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php b/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php
index 4b9d7bc26..557e30523 100644
--- a/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php
+++ b/lib/symfony/css-selector/XPath/Extension/FunctionExtension.php
@@ -50,7 +50,7 @@ class FunctionExtension extends AbstractExtension
         try {
             [$a, $b] = Parser::parseSeries($function->getArguments());
         } catch (SyntaxErrorException $e) {
-            throw new ExpressionErrorException(sprintf('Invalid series: "%s".', implode('", "', $function->getArguments())), 0, $e);
+            throw new ExpressionErrorException(\sprintf('Invalid series: "%s".', implode('", "', $function->getArguments())), 0, $e);
         }
 
         $xpath->addStarPrefix();
@@ -83,10 +83,10 @@ class FunctionExtension extends AbstractExtension
             $expr .= ' - '.$b;
         }
 
-        $conditions = [sprintf('%s %s 0', $expr, $sign)];
+        $conditions = [\sprintf('%s %s 0', $expr, $sign)];
 
         if (1 !== $a && -1 !== $a) {
-            $conditions[] = sprintf('(%s) mod %d = 0', $expr, $a);
+            $conditions[] = \sprintf('(%s) mod %d = 0', $expr, $a);
         }
 
         return $xpath->addCondition(implode(' and ', $conditions));
@@ -134,7 +134,7 @@ class FunctionExtension extends AbstractExtension
             }
         }
 
-        return $xpath->addCondition(sprintf(
+        return $xpath->addCondition(\sprintf(
             'contains(string(.), %s)',
             Translator::getXpathLiteral($arguments[0]->getValue())
         ));
@@ -152,7 +152,7 @@ class FunctionExtension extends AbstractExtension
             }
         }
 
-        return $xpath->addCondition(sprintf(
+        return $xpath->addCondition(\sprintf(
             'lang(%s)',
             Translator::getXpathLiteral($arguments[0]->getValue())
         ));
diff --git a/lib/symfony/css-selector/XPath/Extension/HtmlExtension.php b/lib/symfony/css-selector/XPath/Extension/HtmlExtension.php
index 4653add5d..b3bf1320b 100644
--- a/lib/symfony/css-selector/XPath/Extension/HtmlExtension.php
+++ b/lib/symfony/css-selector/XPath/Extension/HtmlExtension.php
@@ -142,7 +142,7 @@ class HtmlExtension extends AbstractExtension
             }
         }
 
-        return $xpath->addCondition(sprintf(
+        return $xpath->addCondition(\sprintf(
             'ancestor-or-self::*[@lang][1][starts-with(concat('
             ."translate(@%s, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), '-')"
             .', %s)]',
diff --git a/lib/symfony/css-selector/XPath/Extension/NodeExtension.php b/lib/symfony/css-selector/XPath/Extension/NodeExtension.php
index 49e894ade..2ccf71a40 100644
--- a/lib/symfony/css-selector/XPath/Extension/NodeExtension.php
+++ b/lib/symfony/css-selector/XPath/Extension/NodeExtension.php
@@ -91,7 +91,7 @@ class NodeExtension extends AbstractExtension
         $subXpath->addNameTest();
 
         if ($subXpath->getCondition()) {
-            return $xpath->addCondition(sprintf('not(%s)', $subXpath->getCondition()));
+            return $xpath->addCondition(\sprintf('not(%s)', $subXpath->getCondition()));
         }
 
         return $xpath->addCondition('0');
@@ -121,11 +121,11 @@ class NodeExtension extends AbstractExtension
         }
 
         if ($node->getNamespace()) {
-            $name = sprintf('%s:%s', $node->getNamespace(), $name);
+            $name = \sprintf('%s:%s', $node->getNamespace(), $name);
             $safe = $safe && $this->isSafeName($node->getNamespace());
         }
 
-        $attribute = $safe ? '@'.$name : sprintf('attribute::*[name() = %s]', Translator::getXpathLiteral($name));
+        $attribute = $safe ? '@'.$name : \sprintf('attribute::*[name() = %s]', Translator::getXpathLiteral($name));
         $value = $node->getValue();
         $xpath = $translator->nodeToXPath($node->getSelector());
 
@@ -166,7 +166,7 @@ class NodeExtension extends AbstractExtension
         }
 
         if ($node->getNamespace()) {
-            $element = sprintf('%s:%s', $node->getNamespace(), $element);
+            $element = \sprintf('%s:%s', $node->getNamespace(), $element);
             $safe = $safe && $this->isSafeName($node->getNamespace());
         }
 
diff --git a/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php b/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php
index aada83291..397f06f7b 100644
--- a/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php
+++ b/lib/symfony/css-selector/XPath/Extension/PseudoClassExtension.php
@@ -107,7 +107,7 @@ class PseudoClassExtension extends AbstractExtension
     {
         $element = $xpath->getElement();
 
-        return $xpath->addCondition(sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element));
+        return $xpath->addCondition(\sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element));
     }
 
     public function translateEmpty(XPathExpr $xpath): XPathExpr
diff --git a/lib/symfony/css-selector/XPath/Translator.php b/lib/symfony/css-selector/XPath/Translator.php
index 83e855b5c..b2623e506 100644
--- a/lib/symfony/css-selector/XPath/Translator.php
+++ b/lib/symfony/css-selector/XPath/Translator.php
@@ -48,7 +48,7 @@ class Translator implements TranslatorInterface
     private array $pseudoClassTranslators = [];
     private array $attributeMatchingTranslators = [];
 
-    public function __construct(ParserInterface $parser = null)
+    public function __construct(?ParserInterface $parser = null)
     {
         $this->mainParser = $parser ?? new Parser();
 
@@ -75,7 +75,7 @@ class Translator implements TranslatorInterface
         $parts = [];
         while (true) {
             if (false !== $pos = strpos($string, "'")) {
-                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
+                $parts[] = \sprintf("'%s'", substr($string, 0, $pos));
                 $parts[] = "\"'\"";
                 $string = substr($string, $pos + 1);
             } else {
@@ -84,7 +84,7 @@ class Translator implements TranslatorInterface
             }
         }
 
-        return sprintf('concat(%s)', implode(', ', $parts));
+        return \sprintf('concat(%s)', implode(', ', $parts));
     }
 
     public function cssToXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string
@@ -130,7 +130,7 @@ class Translator implements TranslatorInterface
     public function getExtension(string $name): Extension\ExtensionInterface
     {
         if (!isset($this->extensions[$name])) {
-            throw new ExpressionErrorException(sprintf('Extension "%s" not registered.', $name));
+            throw new ExpressionErrorException(\sprintf('Extension "%s" not registered.', $name));
         }
 
         return $this->extensions[$name];
@@ -152,7 +152,7 @@ class Translator implements TranslatorInterface
     public function nodeToXPath(NodeInterface $node): XPathExpr
     {
         if (!isset($this->nodeTranslators[$node->getNodeName()])) {
-            throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
+            throw new ExpressionErrorException(\sprintf('Node "%s" not supported.', $node->getNodeName()));
         }
 
         return $this->nodeTranslators[$node->getNodeName()]($node, $this);
@@ -164,7 +164,7 @@ class Translator implements TranslatorInterface
     public function addCombination(string $combiner, NodeInterface $xpath, NodeInterface $combinedXpath): XPathExpr
     {
         if (!isset($this->combinationTranslators[$combiner])) {
-            throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
+            throw new ExpressionErrorException(\sprintf('Combiner "%s" not supported.', $combiner));
         }
 
         return $this->combinationTranslators[$combiner]($this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
@@ -176,7 +176,7 @@ class Translator implements TranslatorInterface
     public function addFunction(XPathExpr $xpath, FunctionNode $function): XPathExpr
     {
         if (!isset($this->functionTranslators[$function->getName()])) {
-            throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
+            throw new ExpressionErrorException(\sprintf('Function "%s" not supported.', $function->getName()));
         }
 
         return $this->functionTranslators[$function->getName()]($xpath, $function);
@@ -188,7 +188,7 @@ class Translator implements TranslatorInterface
     public function addPseudoClass(XPathExpr $xpath, string $pseudoClass): XPathExpr
     {
         if (!isset($this->pseudoClassTranslators[$pseudoClass])) {
-            throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
+            throw new ExpressionErrorException(\sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
         }
 
         return $this->pseudoClassTranslators[$pseudoClass]($xpath);
@@ -200,7 +200,7 @@ class Translator implements TranslatorInterface
     public function addAttributeMatching(XPathExpr $xpath, string $operator, string $attribute, ?string $value): XPathExpr
     {
         if (!isset($this->attributeMatchingTranslators[$operator])) {
-            throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
+            throw new ExpressionErrorException(\sprintf('Attribute matcher operator "%s" not supported.', $operator));
         }
 
         return $this->attributeMatchingTranslators[$operator]($xpath, $attribute, $value);
diff --git a/lib/symfony/css-selector/XPath/XPathExpr.php b/lib/symfony/css-selector/XPath/XPathExpr.php
index a76e30bec..4b1ffaa69 100644
--- a/lib/symfony/css-selector/XPath/XPathExpr.php
+++ b/lib/symfony/css-selector/XPath/XPathExpr.php
@@ -48,7 +48,7 @@ class XPathExpr
      */
     public function addCondition(string $condition): static
     {
-        $this->condition = $this->condition ? sprintf('(%s) and (%s)', $this->condition, $condition) : $condition;
+        $this->condition = $this->condition ? \sprintf('(%s) and (%s)', $this->condition, $condition) : $condition;
 
         return $this;
     }
diff --git a/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php b/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php
index 44023876f..69ee83d18 100644
--- a/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php
+++ b/lib/symfony/debug-bundle/Command/ServerDumpPlaceholderCommand.php
@@ -31,7 +31,7 @@ class ServerDumpPlaceholderCommand extends Command
 {
     private ServerDumpCommand $replacedCommand;
 
-    public function __construct(DumpServer $server = null, array $descriptors = [])
+    public function __construct(?DumpServer $server = null, array $descriptors = [])
     {
         $this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors);
 
diff --git a/lib/symfony/debug-bundle/DebugBundle.php b/lib/symfony/debug-bundle/DebugBundle.php
index 9782bf8e3..0af84fb5a 100644
--- a/lib/symfony/debug-bundle/DebugBundle.php
+++ b/lib/symfony/debug-bundle/DebugBundle.php
@@ -35,10 +35,10 @@ class DebugBundle extends Bundle
             // The dump data collector is used by default, so dump output is sent to
             // the WDT. In a CLI context, if dump is used too soon, the data collector
             // will buffer it, and release it at the end of the script.
-            VarDumper::setHandler(function ($var, string $label = null) use ($container) {
+            VarDumper::setHandler(function ($var, ?string $label = null) use ($container) {
                 $dumper = $container->get('data_collector.dump');
                 $cloner = $container->get('var_dumper.cloner');
-                $handler = function ($var, string $label = null) use ($dumper, $cloner) {
+                $handler = function ($var, ?string $label = null) use ($dumper, $cloner) {
                     $var = $cloner->cloneVar($var);
                     if (null !== $label) {
                         $var = $var->withContext(['label' => $label]);
diff --git a/lib/symfony/debug-bundle/Resources/config/services.php b/lib/symfony/debug-bundle/Resources/config/services.php
index ea2d05731..0193f65a2 100644
--- a/lib/symfony/debug-bundle/Resources/config/services.php
+++ b/lib/symfony/debug-bundle/Resources/config/services.php
@@ -52,6 +52,7 @@ return static function (ContainerConfigurator $container) {
                 param('kernel.charset'),
                 service('.virtual_request_stack'),
                 null, // var_dumper.cli_dumper or var_dumper.server_connection when debug.dump_destination is set
+                param('kernel.runtime_mode.web'),
             ])
             ->tag('data_collector', [
                 'id' => 'dump',
diff --git a/lib/symfony/dependency-injection/Argument/BoundArgument.php b/lib/symfony/dependency-injection/Argument/BoundArgument.php
index be24e20af..22d94140a 100644
--- a/lib/symfony/dependency-injection/Argument/BoundArgument.php
+++ b/lib/symfony/dependency-injection/Argument/BoundArgument.php
@@ -28,7 +28,7 @@ final class BoundArgument implements ArgumentInterface
     private int $type;
     private ?string $file;
 
-    public function __construct(mixed $value, bool $trackUsage = true, int $type = 0, string $file = null)
+    public function __construct(mixed $value, bool $trackUsage = true, int $type = 0, ?string $file = null)
     {
         $this->value = $value;
         if ($trackUsage) {
diff --git a/lib/symfony/dependency-injection/Argument/LazyClosure.php b/lib/symfony/dependency-injection/Argument/LazyClosure.php
index 230363a95..3dcc34e4f 100644
--- a/lib/symfony/dependency-injection/Argument/LazyClosure.php
+++ b/lib/symfony/dependency-injection/Argument/LazyClosure.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Argument;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
@@ -36,42 +35,42 @@ class LazyClosure
     public function __get(mixed $name): mixed
     {
         if ('service' !== $name) {
-            throw new InvalidArgumentException(sprintf('Cannot read property "%s" from a lazy closure.', $name));
+            throw new InvalidArgumentException(\sprintf('Cannot read property "%s" from a lazy closure.', $name));
         }
 
         if (isset($this->initializer)) {
-            $this->service = ($this->initializer)();
+            if (\is_string($service = ($this->initializer)())) {
+                $service = (new \ReflectionClass($service))->newInstanceWithoutConstructor();
+            }
+            $this->service = $service;
             unset($this->initializer);
         }
 
         return $this->service;
     }
 
-    public static function getCode(string $initializer, array $callable, Definition $definition, ContainerBuilder $container, ?string $id): string
+    public static function getCode(string $initializer, array $callable, string $class, ContainerBuilder $container, ?string $id): string
     {
         $method = $callable[1];
-        $asClosure = 'Closure' === ($definition->getClass() ?: 'Closure');
 
-        if ($asClosure) {
+        if ($asClosure = 'Closure' === $class) {
             $class = ($callable[0] instanceof Reference ? $container->findDefinition($callable[0]) : $callable[0])->getClass();
-        } else {
-            $class = $definition->getClass();
         }
 
         $r = $container->getReflectionClass($class);
 
         if (null !== $id) {
-            $id = sprintf(' for service "%s"', $id);
+            $id = \sprintf(' for service "%s"', $id);
         }
 
         if (!$asClosure) {
             $id = str_replace('%', '%%', (string) $id);
 
             if (!$r || !$r->isInterface()) {
-                throw new RuntimeException(sprintf("Cannot create adapter{$id} because \"%s\" is not an interface.", $class));
+                throw new RuntimeException(\sprintf("Cannot create adapter{$id} because \"%s\" is not an interface.", $class));
             }
             if (1 !== \count($method = $r->getMethods())) {
-                throw new RuntimeException(sprintf("Cannot create adapter{$id} because interface \"%s\" doesn't have exactly one method.", $class));
+                throw new RuntimeException(\sprintf("Cannot create adapter{$id} because interface \"%s\" doesn't have exactly one method.", $class));
             }
             $method = $method[0]->name;
         } elseif (!$r || !$r->hasMethod($method)) {
diff --git a/lib/symfony/dependency-injection/Argument/ReferenceSetArgumentTrait.php b/lib/symfony/dependency-injection/Argument/ReferenceSetArgumentTrait.php
index 293d9a0a1..d8bcad806 100644
--- a/lib/symfony/dependency-injection/Argument/ReferenceSetArgumentTrait.php
+++ b/lib/symfony/dependency-injection/Argument/ReferenceSetArgumentTrait.php
@@ -51,7 +51,7 @@ trait ReferenceSetArgumentTrait
     {
         foreach ($values as $k => $v) {
             if (null !== $v && !$v instanceof Reference) {
-                throw new InvalidArgumentException(sprintf('A "%s" must hold only Reference instances, "%s" given.', __CLASS__, get_debug_type($v)));
+                throw new InvalidArgumentException(\sprintf('A "%s" must hold only Reference instances, "%s" given.', __CLASS__, get_debug_type($v)));
             }
         }
 
diff --git a/lib/symfony/dependency-injection/Argument/ServiceLocator.php b/lib/symfony/dependency-injection/Argument/ServiceLocator.php
index e58293489..8276f6a39 100644
--- a/lib/symfony/dependency-injection/Argument/ServiceLocator.php
+++ b/lib/symfony/dependency-injection/Argument/ServiceLocator.php
@@ -24,7 +24,7 @@ class ServiceLocator extends BaseServiceLocator
     private array $serviceMap;
     private ?array $serviceTypes;
 
-    public function __construct(\Closure $factory, array $serviceMap, array $serviceTypes = null)
+    public function __construct(\Closure $factory, array $serviceMap, ?array $serviceTypes = null)
     {
         $this->factory = $factory;
         $this->serviceMap = $serviceMap;
diff --git a/lib/symfony/dependency-injection/Argument/TaggedIteratorArgument.php b/lib/symfony/dependency-injection/Argument/TaggedIteratorArgument.php
index b4e982c45..bba5e34ae 100644
--- a/lib/symfony/dependency-injection/Argument/TaggedIteratorArgument.php
+++ b/lib/symfony/dependency-injection/Argument/TaggedIteratorArgument.php
@@ -35,7 +35,7 @@ class TaggedIteratorArgument extends IteratorArgument
      * @param array       $exclude               Services to exclude from the iterator
      * @param bool        $excludeSelf           Whether to automatically exclude the referencing service from the iterator
      */
-    public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false, string $defaultPriorityMethod = null, array $exclude = [], bool $excludeSelf = true)
+    public function __construct(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, bool $needsIndexes = false, ?string $defaultPriorityMethod = null, array $exclude = [], bool $excludeSelf = true)
     {
         parent::__construct([]);
 
diff --git a/lib/symfony/dependency-injection/Attribute/AutoconfigureTag.php b/lib/symfony/dependency-injection/Attribute/AutoconfigureTag.php
index ed5807ca0..a83a6e975 100644
--- a/lib/symfony/dependency-injection/Attribute/AutoconfigureTag.php
+++ b/lib/symfony/dependency-injection/Attribute/AutoconfigureTag.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\DependencyInjection\Attribute;
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
 class AutoconfigureTag extends Autoconfigure
 {
-    public function __construct(string $name = null, array $attributes = [])
+    public function __construct(?string $name = null, array $attributes = [])
     {
         parent::__construct(
             tags: [
diff --git a/lib/symfony/dependency-injection/Attribute/Autowire.php b/lib/symfony/dependency-injection/Attribute/Autowire.php
index c17eb1370..c2d6c56c5 100644
--- a/lib/symfony/dependency-injection/Attribute/Autowire.php
+++ b/lib/symfony/dependency-injection/Attribute/Autowire.php
@@ -38,11 +38,11 @@ class Autowire
      * @param bool|class-string|class-string[]    $lazy       Whether to use lazy-loading for this argument
      */
     public function __construct(
-        string|array|ArgumentInterface $value = null,
-        string $service = null,
-        string $expression = null,
-        string $env = null,
-        string $param = null,
+        string|array|ArgumentInterface|null $value = null,
+        ?string $service = null,
+        ?string $expression = null,
+        ?string $env = null,
+        ?string $param = null,
         bool|string|array $lazy = false,
     ) {
         if ($this->lazy = \is_string($lazy) ? [$lazy] : $lazy) {
@@ -52,7 +52,7 @@ class Autowire
             if (null !== $value && null !== $service) {
                 throw new LogicException('#[Autowire] attribute cannot declare $value and $service at the same time.');
             }
-        } elseif (!(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
+        } elseif (1 !== (null !== $value) + (null !== $service) + (null !== $expression) + (null !== $env) + (null !== $param)) {
             throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, $env, $param or $value.');
         }
 
diff --git a/lib/symfony/dependency-injection/Attribute/AutowireCallable.php b/lib/symfony/dependency-injection/Attribute/AutowireCallable.php
index 87e119746..da9ac0d00 100644
--- a/lib/symfony/dependency-injection/Attribute/AutowireCallable.php
+++ b/lib/symfony/dependency-injection/Attribute/AutowireCallable.php
@@ -25,9 +25,9 @@ class AutowireCallable extends Autowire
      * @param bool|class-string $lazy Whether to use lazy-loading for this argument
      */
     public function __construct(
-        string|array $callable = null,
-        string $service = null,
-        string $method = null,
+        string|array|null $callable = null,
+        ?string $service = null,
+        ?string $method = null,
         bool|string $lazy = false,
     ) {
         if (!(null !== $callable xor null !== $service)) {
@@ -42,7 +42,7 @@ class AutowireCallable extends Autowire
 
     public function buildDefinition(mixed $value, ?string $type, \ReflectionParameter $parameter): Definition
     {
-        return (new Definition($type = \is_string($this->lazy) ? $this->lazy : ($type ?: 'Closure')))
+        return (new Definition($type = \is_array($this->lazy) ? current($this->lazy) : ($type ?: 'Closure')))
             ->setFactory(['Closure', 'fromCallable'])
             ->setArguments([\is_array($value) ? $value + [1 => '__invoke'] : $value])
             ->setLazy($this->lazy || 'Closure' !== $type && 'callable' !== (string) $parameter->getType());
diff --git a/lib/symfony/dependency-injection/Attribute/AutowireIterator.php b/lib/symfony/dependency-injection/Attribute/AutowireIterator.php
index b81bd8f92..1c4d2a3df 100644
--- a/lib/symfony/dependency-injection/Attribute/AutowireIterator.php
+++ b/lib/symfony/dependency-injection/Attribute/AutowireIterator.php
@@ -24,9 +24,9 @@ class AutowireIterator extends Autowire
      */
     public function __construct(
         string $tag,
-        string $indexAttribute = null,
-        string $defaultIndexMethod = null,
-        string $defaultPriorityMethod = null,
+        ?string $indexAttribute = null,
+        ?string $defaultIndexMethod = null,
+        ?string $defaultPriorityMethod = null,
         string|array $exclude = [],
         bool $excludeSelf = true,
     ) {
diff --git a/lib/symfony/dependency-injection/Attribute/AutowireLocator.php b/lib/symfony/dependency-injection/Attribute/AutowireLocator.php
index a60a76960..bff4b6fc6 100644
--- a/lib/symfony/dependency-injection/Attribute/AutowireLocator.php
+++ b/lib/symfony/dependency-injection/Attribute/AutowireLocator.php
@@ -28,14 +28,14 @@ class AutowireLocator extends Autowire
     /**
      * @see ServiceSubscriberInterface::getSubscribedServices()
      *
-     * @param string|array<string|SubscribedService> $services An explicit list of services or a tag name
-     * @param string|string[]                        $exclude  A service or a list of services to exclude
+     * @param string|array<string|Autowire|SubscribedService> $services An explicit list of services or a tag name
+     * @param string|string[]                                 $exclude  A service or a list of services to exclude
      */
     public function __construct(
         string|array $services,
-        string $indexAttribute = null,
-        string $defaultIndexMethod = null,
-        string $defaultPriorityMethod = null,
+        ?string $indexAttribute = null,
+        ?string $defaultIndexMethod = null,
+        ?string $defaultPriorityMethod = null,
         string|array $exclude = [],
         bool $excludeSelf = true,
     ) {
@@ -58,11 +58,11 @@ class AutowireLocator extends Autowire
             if ($type instanceof SubscribedService) {
                 $key = $type->key ?? $key;
                 $attributes = $type->attributes;
-                $type = ($type->nullable ? '?' : '').($type->type ?? throw new InvalidArgumentException(sprintf('When "%s" is used, a type must be set.', SubscribedService::class)));
+                $type = ($type->nullable ? '?' : '').($type->type ?? throw new InvalidArgumentException(\sprintf('When "%s" is used, a type must be set.', SubscribedService::class)));
             }
 
             if (!\is_string($type) || !preg_match('/(?(DEFINE)(?<cn>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))(?(DEFINE)(?<fqcn>(?&cn)(?:\\\\(?&cn))*+))^\??(?&fqcn)(?:(?:\|(?&fqcn))*+|(?:&(?&fqcn))*+)$/', $type)) {
-                throw new InvalidArgumentException(sprintf('"%s" is not a PHP type for key "%s".', \is_string($type) ? $type : get_debug_type($type), $key));
+                throw new InvalidArgumentException(\sprintf('"%s" is not a PHP type for key "%s".', \is_string($type) ? $type : get_debug_type($type), $key));
             }
             $optionalBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
             if ('?' === $type[0]) {
diff --git a/lib/symfony/dependency-injection/Attribute/Target.php b/lib/symfony/dependency-injection/Attribute/Target.php
index 6fbb3ad42..0de388e71 100644
--- a/lib/symfony/dependency-injection/Attribute/Target.php
+++ b/lib/symfony/dependency-injection/Attribute/Target.php
@@ -30,13 +30,13 @@ final class Target
     public function getParsedName(): string
     {
         if (null === $this->name) {
-            throw new LogicException(sprintf('Cannot parse the name of a #[Target] attribute that has not been resolved. Did you forget to call "%s::parseName()"?', __CLASS__));
+            throw new LogicException(\sprintf('Cannot parse the name of a #[Target] attribute that has not been resolved. Did you forget to call "%s::parseName()"?', __CLASS__));
         }
 
         return lcfirst(str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $this->name))));
     }
 
-    public static function parseName(\ReflectionParameter $parameter, self &$attribute = null, string &$parsedName = null): string
+    public static function parseName(\ReflectionParameter $parameter, ?self &$attribute = null, ?string &$parsedName = null): string
     {
         $attribute = null;
         if (!$target = $parameter->getAttributes(self::class)[0] ?? null) {
@@ -56,7 +56,7 @@ final class Target
                 $function = $function->name;
             }
 
-            throw new InvalidArgumentException(sprintf('Invalid #[Target] name "%s" on parameter "$%s" of "%s()": the first character must be a letter.', $name, $parameter->name, $function));
+            throw new InvalidArgumentException(\sprintf('Invalid #[Target] name "%s" on parameter "$%s" of "%s()": the first character must be a letter.', $name, $parameter->name, $function));
         }
 
         return preg_match('/^[a-zA-Z0-9_\x7f-\xff]++$/', $name) ? $name : $parsedName;
diff --git a/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php b/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
index f18baa57c..990a31f05 100644
--- a/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
+++ b/lib/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
@@ -82,7 +82,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
                     continue;
                 }
                 if ($isRoot) {
-                    if ($v->hasTag('container.excluded')) {
+                    if ($v instanceof Definition && $v->hasTag('container.excluded')) {
                         continue;
                     }
                     $this->currentId = $k;
@@ -136,7 +136,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
             }
 
             if (!\function_exists($factory)) {
-                throw new RuntimeException(sprintf('Invalid service "%s": function "%s" does not exist.', $this->currentId, $factory));
+                throw new RuntimeException(\sprintf('Invalid service "%s": function "%s" does not exist.', $this->currentId, $factory));
             }
             $r = new \ReflectionFunction($factory);
             if (false !== $r->getFileName() && file_exists($r->getFileName())) {
@@ -150,7 +150,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
             [$class, $method] = $factory;
 
             if ('__construct' === $method) {
-                throw new RuntimeException(sprintf('Invalid service "%s": "__construct()" cannot be used as a factory method.', $this->currentId));
+                throw new RuntimeException(\sprintf('Invalid service "%s": "__construct()" cannot be used as a factory method.', $this->currentId));
             }
 
             if ($class instanceof Reference) {
@@ -174,20 +174,20 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
         try {
             if (!$r = $this->container->getReflectionClass($class)) {
                 if (null === $class) {
-                    throw new RuntimeException(sprintf('Invalid service "%s": the class is not set.', $this->currentId));
+                    throw new RuntimeException(\sprintf('Invalid service "%s": the class is not set.', $this->currentId));
                 }
 
-                throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
+                throw new RuntimeException(\sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
             }
         } catch (\ReflectionException $e) {
-            throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).lcfirst($e->getMessage()));
+            throw new RuntimeException(\sprintf('Invalid service "%s": ', $this->currentId).lcfirst($e->getMessage()));
         }
         if (!$r = $r->getConstructor()) {
             if ($required) {
-                throw new RuntimeException(sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
+                throw new RuntimeException(\sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, \sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
             }
         } elseif (!$r->isPublic()) {
-            throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class).' must be public.');
+            throw new RuntimeException(\sprintf('Invalid service "%s": ', $this->currentId).\sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class).' must be public.');
         }
 
         return $r;
@@ -207,11 +207,11 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
         }
 
         if (null === $class) {
-            throw new RuntimeException(sprintf('Invalid service "%s": the class is not set.', $this->currentId));
+            throw new RuntimeException(\sprintf('Invalid service "%s": the class is not set.', $this->currentId));
         }
 
         if (!$r = $this->container->getReflectionClass($class)) {
-            throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
+            throw new RuntimeException(\sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
         }
 
         if (!$r->hasMethod($method)) {
@@ -219,12 +219,16 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
                 return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
             }
 
-            throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
+            if ($r->hasMethod('__callStatic') && ($r = $r->getMethod('__callStatic')) && $r->isPublic()) {
+                return new \ReflectionMethod(static function (...$arguments) {}, '__invoke');
+            }
+
+            throw new RuntimeException(\sprintf('Invalid service "%s": method "%s()" does not exist.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 
         $r = $r->getMethod($method);
         if (!$r->isPublic()) {
-            throw new RuntimeException(sprintf('Invalid service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
+            throw new RuntimeException(\sprintf('Invalid service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
         }
 
         return $r;
@@ -245,12 +249,12 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
                     $arg = $this->processValue(new Reference($id));
                     $this->inExpression = false;
                     if (!$arg instanceof Reference) {
-                        throw new RuntimeException(sprintf('"%s::processValue()" must return a Reference when processing an expression, "%s" returned for service("%s").', static::class, get_debug_type($arg), $id));
+                        throw new RuntimeException(\sprintf('"%s::processValue()" must return a Reference when processing an expression, "%s" returned for service("%s").', static::class, get_debug_type($arg), $id));
                     }
-                    $arg = sprintf('"%s"', $arg);
+                    $arg = \sprintf('"%s"', $arg);
                 }
 
-                return sprintf('$this->get(%s)', $arg);
+                return \sprintf('$this->get(%s)', $arg);
             });
         }
 
diff --git a/lib/symfony/dependency-injection/Compiler/AliasDeprecatedPublicServicesPass.php b/lib/symfony/dependency-injection/Compiler/AliasDeprecatedPublicServicesPass.php
index 7aa7ec2ad..4fb9cab77 100644
--- a/lib/symfony/dependency-injection/Compiler/AliasDeprecatedPublicServicesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/AliasDeprecatedPublicServicesPass.php
@@ -25,11 +25,11 @@ final class AliasDeprecatedPublicServicesPass extends AbstractRecursivePass
     {
         foreach ($container->findTaggedServiceIds('container.private') as $id => $tags) {
             if (null === $package = $tags[0]['package'] ?? null) {
-                throw new InvalidArgumentException(sprintf('The "package" attribute is mandatory for the "container.private" tag on the "%s" service.', $id));
+                throw new InvalidArgumentException(\sprintf('The "package" attribute is mandatory for the "container.private" tag on the "%s" service.', $id));
             }
 
             if (null === $version = $tags[0]['version'] ?? null) {
-                throw new InvalidArgumentException(sprintf('The "version" attribute is mandatory for the "container.private" tag on the "%s" service.', $id));
+                throw new InvalidArgumentException(\sprintf('The "version" attribute is mandatory for the "container.private" tag on the "%s" service.', $id));
             }
 
             $definition = $container->getDefinition($id);
diff --git a/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php b/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
index 4fea73217..ea1986ce9 100644
--- a/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
@@ -41,6 +41,7 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
     private bool $lazy;
     private bool $byConstructor;
     private bool $byFactory;
+    private bool $byMultiUseArgument;
     private array $definitions;
     private array $aliases;
 
@@ -67,6 +68,7 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
         $this->lazy = false;
         $this->byConstructor = false;
         $this->byFactory = false;
+        $this->byMultiUseArgument = false;
         $this->definitions = $container->getDefinitions();
         $this->aliases = $container->getAliases();
 
@@ -89,7 +91,12 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
 
         if ($value instanceof ArgumentInterface) {
             $this->lazy = !$this->byFactory || !$value instanceof IteratorArgument;
+            $byMultiUseArgument = $this->byMultiUseArgument;
+            if ($value instanceof IteratorArgument) {
+                $this->byMultiUseArgument = true;
+            }
             parent::processValue($value->getValues());
+            $this->byMultiUseArgument = $byMultiUseArgument;
             $this->lazy = $lazy;
 
             return $value;
@@ -106,7 +113,8 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
                 $value,
                 $this->lazy || ($this->hasProxyDumper && $targetDefinition?->isLazy()),
                 ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior(),
-                $this->byConstructor
+                $this->byConstructor,
+                $this->byMultiUseArgument
             );
 
             if ($inExpression) {
@@ -117,7 +125,9 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
                     $targetDefinition,
                     $value,
                     $this->lazy || $targetDefinition?->isLazy(),
-                    true
+                    true,
+                    $this->byConstructor,
+                    $this->byMultiUseArgument
                 );
             }
 
diff --git a/lib/symfony/dependency-injection/Compiler/AttributeAutoconfigurationPass.php b/lib/symfony/dependency-injection/Compiler/AttributeAutoconfigurationPass.php
index cb428565e..466d658b9 100644
--- a/lib/symfony/dependency-injection/Compiler/AttributeAutoconfigurationPass.php
+++ b/lib/symfony/dependency-injection/Compiler/AttributeAutoconfigurationPass.php
@@ -52,7 +52,7 @@ final class AttributeAutoconfigurationPass extends AbstractRecursivePass
             } elseif ($parameterType instanceof \ReflectionNamedType) {
                 $types[] = $parameterType->getName();
             } else {
-                throw new LogicException(sprintf('Argument "$%s" of attribute autoconfigurator should have a type, use one or more of "\ReflectionClass|\ReflectionMethod|\ReflectionProperty|\ReflectionParameter|\Reflector" in "%s" on line "%d".', $reflectorParameter->getName(), $callableReflector->getFileName(), $callableReflector->getStartLine()));
+                throw new LogicException(\sprintf('Argument "$%s" of attribute autoconfigurator should have a type, use one or more of "\ReflectionClass|\ReflectionMethod|\ReflectionProperty|\ReflectionParameter|\Reflector" in "%s" on line "%d".', $reflectorParameter->getName(), $callableReflector->getFileName(), $callableReflector->getStartLine()));
             }
 
             try {
@@ -70,7 +70,7 @@ final class AttributeAutoconfigurationPass extends AbstractRecursivePass
                         continue;
                     }
                     if (!($targets & \constant('Attribute::TARGET_'.strtoupper($symbol)))) {
-                        throw new LogicException(sprintf('Invalid type "Reflection%s" on argument "$%s": attribute "%s" cannot target a '.$symbol.' in "%s" on line "%d".', ucfirst($symbol), $reflectorParameter->getName(), $attributeName, $callableReflector->getFileName(), $callableReflector->getStartLine()));
+                        throw new LogicException(\sprintf('Invalid type "Reflection%s" on argument "$%s": attribute "%s" cannot target a '.$symbol.' in "%s" on line "%d".', ucfirst($symbol), $reflectorParameter->getName(), $attributeName, $callableReflector->getFileName(), $callableReflector->getStartLine()));
                     }
                 }
                 $this->{$symbol.'AttributeConfigurators'}[$attributeName] = $callable;
diff --git a/lib/symfony/dependency-injection/Compiler/AutoAliasServicePass.php b/lib/symfony/dependency-injection/Compiler/AutoAliasServicePass.php
index 3f070dcc0..1a019d6c7 100644
--- a/lib/symfony/dependency-injection/Compiler/AutoAliasServicePass.php
+++ b/lib/symfony/dependency-injection/Compiler/AutoAliasServicePass.php
@@ -28,7 +28,7 @@ class AutoAliasServicePass implements CompilerPassInterface
         foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
             foreach ($tags as $tag) {
                 if (!isset($tag['format'])) {
-                    throw new InvalidArgumentException(sprintf('Missing tag information "format" on auto_alias service "%s".', $serviceId));
+                    throw new InvalidArgumentException(\sprintf('Missing tag information "format" on auto_alias service "%s".', $serviceId));
                 }
 
                 $aliasId = $container->getParameterBag()->resolveValue($tag['format']);
diff --git a/lib/symfony/dependency-injection/Compiler/AutowirePass.php b/lib/symfony/dependency-injection/Compiler/AutowirePass.php
index 9786ec4de..a790244d4 100644
--- a/lib/symfony/dependency-injection/Compiler/AutowirePass.php
+++ b/lib/symfony/dependency-injection/Compiler/AutowirePass.php
@@ -54,7 +54,7 @@ class AutowirePass extends AbstractRecursivePass
     public function __construct(bool $throwOnAutowireException = true)
     {
         $this->throwOnAutowiringException = $throwOnAutowireException;
-        $this->defaultArgument = new class() {
+        $this->defaultArgument = new class {
             public $value;
             public $names;
             public $bag;
@@ -141,7 +141,7 @@ class AutowirePass extends AbstractRecursivePass
                 $message = $this->createTypeNotFoundMessageCallback($value, 'it');
 
                 // since the error message varies by referenced id and $this->currentId, so should the id of the dummy errored definition
-                $this->container->register($id = sprintf('.errored.%s.%s', $this->currentId, (string) $value), $value->getType())
+                $this->container->register($id = \sprintf('.errored.%s.%s', $this->currentId, (string) $value), $value->getType())
                     ->addError($message);
 
                 return new TypedReference($id, $value->getType(), $value->getInvalidBehavior(), $value->getName());
@@ -153,7 +153,7 @@ class AutowirePass extends AbstractRecursivePass
             return $value;
         }
         if (!$reflectionClass = $this->container->getReflectionClass($value->getClass(), false)) {
-            $this->container->log($this, sprintf('Skipping service "%s": Class or interface "%s" cannot be loaded.', $this->currentId, $value->getClass()));
+            $this->container->log($this, \sprintf('Skipping service "%s": Class or interface "%s" cannot be loaded.', $this->currentId, $value->getClass()));
 
             return $value;
         }
@@ -290,7 +290,7 @@ class AutowirePass extends AbstractRecursivePass
 
             $getValue = function () use ($type, $parameter, $class, $method, $name, $target) {
                 if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target), false)) {
-                    $failureMessage = $this->createTypeNotFoundMessageCallback($ref, sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
+                    $failureMessage = $this->createTypeNotFoundMessageCallback($ref, \sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
 
                     if ($parameter->isDefaultValueAvailable()) {
                         $value = $this->defaultArgument->withValue($parameter);
@@ -329,7 +329,7 @@ class AutowirePass extends AbstractRecursivePass
 
                         if (!\is_array($lazy)) {
                             if (str_contains($type, '|')) {
-                                throw new AutowiringFailedException($this->currentId, sprintf('Cannot use #[Autowire] with option "lazy: true" on union types for service "%s"; set the option to the interface(s) that should be proxied instead.', $this->currentId));
+                                throw new AutowiringFailedException($this->currentId, \sprintf('Cannot use #[Autowire] with option "lazy: true" on union types for service "%s"; set the option to the interface(s) that should be proxied instead.', $this->currentId));
                             }
                             $lazy = str_contains($type, '&') ? explode('&', $type) : [];
                         }
@@ -382,9 +382,9 @@ class AutowirePass extends AbstractRecursivePass
                         break;
                     }
                     $type = ProxyHelper::exportType($parameter);
-                    $type = $type ? sprintf('is type-hinted "%s"', preg_replace('/(^|[(|&])\\\\|^\?\\\\?/', '\1', $type)) : 'has no type-hint';
+                    $type = $type ? \sprintf('is type-hinted "%s"', preg_replace('/(^|[(|&])\\\\|^\?\\\\?/', '\1', $type)) : 'has no type-hint';
 
-                    throw new AutowiringFailedException($this->currentId, sprintf('Cannot autowire service "%s": argument "$%s" of method "%s()" %s, you should configure its value explicitly.', $this->currentId, $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method, $type));
+                    throw new AutowiringFailedException($this->currentId, \sprintf('Cannot autowire service "%s": argument "$%s" of method "%s()" %s, you should configure its value explicitly.', $this->currentId, $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method, $type));
                 }
 
                 // specifically pass the default value
@@ -593,7 +593,7 @@ class AutowirePass extends AbstractRecursivePass
             $namespace = substr($namespace, 0, $i);
 
             if ($this->container->hasDefinition($namespace) && $tag = $this->container->getDefinition($namespace)->getTag('container.excluded')) {
-                return sprintf('Cannot autowire service "%s": %s needs an instance of "%s" but this type has been excluded %s.', $currentId, $label, $type, $tag[0]['source'] ?? 'from autowiring');
+                return \sprintf('Cannot autowire service "%s": %s needs an instance of "%s" but this type has been excluded %s.', $currentId, $label, $type, $tag[0]['source'] ?? 'from autowiring');
             }
         } while (false !== $i = strrpos($namespace, '\\'));
 
@@ -609,19 +609,19 @@ class AutowirePass extends AbstractRecursivePass
                     $parentMsg = "couldn't be loaded. Either it was not found or it is missing a parent class or a trait";
                 }
             } catch (\ReflectionException $e) {
-                $parentMsg = sprintf('is missing a parent class (%s)', $e->getMessage());
+                $parentMsg = \sprintf('is missing a parent class (%s)', $e->getMessage());
             }
 
-            $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ?: 'was not found');
+            $message = \sprintf('has type "%s" but this class %s.', $type, $parentMsg ?: 'was not found');
         } else {
             $alternatives = $this->createTypeAlternatives($this->container, $reference);
 
             if (null !== $target = (array_filter($reference->getAttributes(), static fn ($a) => $a instanceof Target)[0] ?? null)) {
                 $target = null !== $target->name ? "('{$target->name}')" : '';
-                $message = sprintf('has "#[Target%s]" but no such target exists.%s', $target, $alternatives);
+                $message = \sprintf('has "#[Target%s]" but no such target exists.%s', $target, $alternatives);
             } else {
                 $message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';
-                $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $alternatives);
+                $message = \sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $alternatives);
             }
 
             if ($r->isInterface() && !$alternatives) {
@@ -629,7 +629,7 @@ class AutowirePass extends AbstractRecursivePass
             }
         }
 
-        $message = sprintf('Cannot autowire service "%s": %s %s', $currentId, $label, $message);
+        $message = \sprintf('Cannot autowire service "%s": %s %s', $currentId, $label, $message);
 
         if (null !== $this->lastFailure) {
             $message = $this->lastFailure."\n".$message;
@@ -654,20 +654,20 @@ class AutowirePass extends AbstractRecursivePass
         unset($autowiringAliases['']);
 
         if ($autowiringAliases) {
-            return sprintf(' Did you mean to target%s "%s" instead?', 1 < \count($autowiringAliases) ? ' one of' : '', implode('", "', $autowiringAliases));
+            return \sprintf(' Did you mean to target%s "%s" instead?', 1 < \count($autowiringAliases) ? ' one of' : '', implode('", "', $autowiringAliases));
         }
 
         if (!$container->has($type) && false !== $key = array_search(strtolower($type), array_map('strtolower', $servicesAndAliases))) {
-            return sprintf(' Did you mean "%s"?', $servicesAndAliases[$key]);
+            return \sprintf(' Did you mean "%s"?', $servicesAndAliases[$key]);
         } elseif (isset($this->ambiguousServiceTypes[$type])) {
-            $message = sprintf('one of these existing services: "%s"', implode('", "', $this->ambiguousServiceTypes[$type]));
+            $message = \sprintf('one of these existing services: "%s"', implode('", "', $this->ambiguousServiceTypes[$type]));
         } elseif (isset($this->types[$type])) {
-            $message = sprintf('the existing "%s" service', $this->types[$type]);
+            $message = \sprintf('the existing "%s" service', $this->types[$type]);
         } else {
             return '';
         }
 
-        return sprintf(' You should maybe alias this %s to %s.', class_exists($type, false) ? 'class' : 'interface', $message);
+        return \sprintf(' You should maybe alias this %s to %s.', class_exists($type, false) ? 'class' : 'interface', $message);
     }
 
     private function getAliasesSuggestionForType(ContainerBuilder $container, string $type): ?string
@@ -682,21 +682,21 @@ class AutowirePass extends AbstractRecursivePass
         if (1 < $len = \count($aliases)) {
             $message = 'Try changing the type-hint to one of its parents: ';
             for ($i = 0, --$len; $i < $len; ++$i) {
-                $message .= sprintf('%s "%s", ', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
+                $message .= \sprintf('%s "%s", ', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
             }
-            $message .= sprintf('or %s "%s".', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
+            $message .= \sprintf('or %s "%s".', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
 
             return $message;
         }
 
         if ($aliases) {
-            return sprintf('Try changing the type-hint to "%s" instead.', $aliases[0]);
+            return \sprintf('Try changing the type-hint to "%s" instead.', $aliases[0]);
         }
 
         return null;
     }
 
-    private function populateAutowiringAlias(string $id, string $target = null): void
+    private function populateAutowiringAlias(string $id, ?string $target = null): void
     {
         if (!preg_match('/(?(DEFINE)(?<V>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))^((?&V)(?:\\\\(?&V))*+)(?: \$((?&V)))?$/', $id, $m)) {
             return;
@@ -716,7 +716,7 @@ class AutowirePass extends AbstractRecursivePass
         }
     }
 
-    private function getCombinedAlias(string $type, string $name = null): ?string
+    private function getCombinedAlias(string $type, ?string $name = null): ?string
     {
         if (str_contains($type, '&')) {
             $types = explode('&', $type);
diff --git a/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php b/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
index 8cbd72292..9bf986490 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckArgumentsValidityPass.php
@@ -47,7 +47,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
 
             if ($k !== $i++) {
                 if (!\is_int($k)) {
-                    $msg = sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k);
+                    $msg = \sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k);
                     $value->addError($msg);
                     if ($this->throwExceptions) {
                         throw new RuntimeException($msg);
@@ -56,7 +56,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
                     break;
                 }
 
-                $msg = sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i);
+                $msg = \sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i);
                 $value->addError($msg);
                 if ($this->throwExceptions) {
                     throw new RuntimeException($msg);
@@ -64,7 +64,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
             }
 
             if ($hasNamedArgs) {
-                $msg = sprintf('Invalid constructor argument for service "%s": cannot use positional argument after named argument. Check your service definition.', $this->currentId);
+                $msg = \sprintf('Invalid constructor argument for service "%s": cannot use positional argument after named argument. Check your service definition.', $this->currentId);
                 $value->addError($msg);
                 if ($this->throwExceptions) {
                     throw new RuntimeException($msg);
@@ -85,7 +85,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
 
                 if ($k !== $i++) {
                     if (!\is_int($k)) {
-                        $msg = sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k);
+                        $msg = \sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k);
                         $value->addError($msg);
                         if ($this->throwExceptions) {
                             throw new RuntimeException($msg);
@@ -94,7 +94,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
                         break;
                     }
 
-                    $msg = sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i);
+                    $msg = \sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i);
                     $value->addError($msg);
                     if ($this->throwExceptions) {
                         throw new RuntimeException($msg);
@@ -102,7 +102,7 @@ class CheckArgumentsValidityPass extends AbstractRecursivePass
                 }
 
                 if ($hasNamedArgs) {
-                    $msg = sprintf('Invalid argument for method call "%s" of service "%s": cannot use positional argument after named argument. Check your service definition.', $methodCall[0], $this->currentId);
+                    $msg = \sprintf('Invalid argument for method call "%s" of service "%s": cannot use positional argument after named argument. Check your service definition.', $methodCall[0], $this->currentId);
                     $value->addError($msg);
                     if ($this->throwExceptions) {
                         throw new RuntimeException($msg);
diff --git a/lib/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php b/lib/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
index 1fb8935c3..c6957648e 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
@@ -28,6 +28,7 @@ class CheckCircularReferencesPass implements CompilerPassInterface
 {
     private array $currentPath;
     private array $checkedNodes;
+    private array $checkedLazyNodes;
 
     /**
      * Checks the ContainerBuilder object for circular references.
@@ -59,22 +60,36 @@ class CheckCircularReferencesPass implements CompilerPassInterface
             $node = $edge->getDestNode();
             $id = $node->getId();
 
-            if (empty($this->checkedNodes[$id])) {
-                // Don't check circular references for lazy edges
-                if (!$node->getValue() || (!$edge->isLazy() && !$edge->isWeak())) {
-                    $searchKey = array_search($id, $this->currentPath);
-                    $this->currentPath[] = $id;
+            if (!empty($this->checkedNodes[$id])) {
+                continue;
+            }
 
-                    if (false !== $searchKey) {
-                        throw new ServiceCircularReferenceException($id, \array_slice($this->currentPath, $searchKey));
-                    }
+            $isLeaf = (bool) $node->getValue();
+            $isConcrete = !$edge->isLazy() && !$edge->isWeak();
 
-                    $this->checkOutEdges($node->getOutEdges());
+            // Skip already checked lazy services if they are still lazy. Will not gain any new information.
+            if (!empty($this->checkedLazyNodes[$id]) && (!$isLeaf || !$isConcrete)) {
+                continue;
+            }
+
+            // Process concrete references, otherwise defer check circular references for lazy edges.
+            if (!$isLeaf || $isConcrete) {
+                $searchKey = array_search($id, $this->currentPath);
+                $this->currentPath[] = $id;
+
+                if (false !== $searchKey) {
+                    throw new ServiceCircularReferenceException($id, \array_slice($this->currentPath, $searchKey));
                 }
 
+                $this->checkOutEdges($node->getOutEdges());
+
                 $this->checkedNodes[$id] = true;
-                array_pop($this->currentPath);
+                unset($this->checkedLazyNodes[$id]);
+            } else {
+                $this->checkedLazyNodes[$id] = true;
             }
+
+            array_pop($this->currentPath);
         }
     }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php b/lib/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
index c62345f26..0d185ac52 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
@@ -40,25 +40,29 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
+            if ($definition->hasErrors()) {
+                continue;
+            }
+
             // synthetic service is public
             if ($definition->isSynthetic() && !$definition->isPublic()) {
-                throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
+                throw new RuntimeException(\sprintf('A synthetic service ("%s") must be public.', $id));
             }
 
             // non-synthetic, non-abstract service has class
             if (!$definition->isAbstract() && !$definition->isSynthetic() && !$definition->getClass() && !$definition->hasTag('container.service_locator') && (!$definition->getFactory() || !preg_match(FileLoader::ANONYMOUS_ID_REGEXP, $id))) {
                 if ($definition->getFactory()) {
-                    throw new RuntimeException(sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
+                    throw new RuntimeException(\sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
                 }
                 if (class_exists($id) || interface_exists($id, false)) {
                     if (str_starts_with($id, '\\') && 1 < substr_count($id, '\\')) {
-                        throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
+                        throw new RuntimeException(\sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
                     }
 
-                    throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface in the global namespace. Leaving out the "class" attribute is only allowed for namespaced classes. Please specify the class attribute explicitly to get rid of this error.', $id));
+                    throw new RuntimeException(\sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface in the global namespace. Leaving out the "class" attribute is only allowed for namespaced classes. Please specify the class attribute explicitly to get rid of this error.', $id));
                 }
 
-                throw new RuntimeException(sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));
+                throw new RuntimeException(\sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));
             }
 
             // tag attribute values must be scalars
@@ -93,7 +97,7 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
                 $this->validateAttributes($id, $tag, $value, [...$path, $name]);
             } elseif (!\is_scalar($value) && null !== $value) {
                 $name = implode('.', [...$path, $name]);
-                throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $tag, $name));
+                throw new RuntimeException(\sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $tag, $name));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/lib/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
index 7a6dd7687..2ce8c23c0 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
@@ -60,15 +60,7 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
         if (isset($this->serviceLocatorContextIds[$currentId])) {
             $currentId = $this->serviceLocatorContextIds[$currentId];
             $locator = $this->container->getDefinition($this->currentId)->getFactory()[0];
-
-            foreach ($locator->getArgument(0) as $k => $v) {
-                if ($v->getValues()[0] === $value) {
-                    if ($k !== $id) {
-                        $currentId = $k.'" in the container provided to "'.$currentId;
-                    }
-                    throw new ServiceNotFoundException($id, $currentId, null, $this->getAlternatives($id));
-                }
-            }
+            $this->throwServiceNotFoundException($value, $currentId, $locator->getArgument(0));
         }
 
         if ('.' === $currentId[0] && $graph->hasNode($currentId)) {
@@ -82,14 +74,21 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
                     $currentId = $sourceId;
                     break;
                 }
+
+                if (isset($this->serviceLocatorContextIds[$sourceId])) {
+                    $currentId = $this->serviceLocatorContextIds[$sourceId];
+                    $locator = $this->container->getDefinition($this->currentId);
+                    $this->throwServiceNotFoundException($value, $currentId, $locator->getArgument(0));
+                }
             }
         }
 
-        throw new ServiceNotFoundException($id, $currentId, null, $this->getAlternatives($id));
+        $this->throwServiceNotFoundException($value, $currentId, $value);
     }
 
-    private function getAlternatives(string $id): array
+    private function throwServiceNotFoundException(Reference $ref, string $sourceId, $value): void
     {
+        $id = (string) $ref;
         $alternatives = [];
         foreach ($this->container->getServiceIds() as $knownId) {
             if ('' === $knownId || '.' === $knownId[0] || $knownId === $this->currentId) {
@@ -102,6 +101,28 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
             }
         }
 
-        return $alternatives;
+        $pass = new class extends AbstractRecursivePass {
+            public Reference $ref;
+            public string $sourceId;
+            public array $alternatives;
+
+            public function processValue(mixed $value, bool $isRoot = false): mixed
+            {
+                if ($this->ref !== $value) {
+                    return parent::processValue($value, $isRoot);
+                }
+                $sourceId = $this->sourceId;
+                if (null !== $this->currentId && $this->currentId !== (string) $value) {
+                    $sourceId = $this->currentId.'" in the container provided to "'.$sourceId;
+                }
+
+                throw new ServiceNotFoundException((string) $value, $sourceId, null, $this->alternatives);
+            }
+        };
+        $pass->ref = $ref;
+        $pass->sourceId = $sourceId;
+        $pass->alternatives = $alternatives;
+
+        $pass->processValue($value, true);
     }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php b/lib/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php
index 5c54a6577..d680bf897 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php
@@ -36,7 +36,7 @@ class CheckReferenceValidityPass extends AbstractRecursivePass
             $targetDefinition = $this->container->getDefinition((string) $value);
 
             if ($targetDefinition->isAbstract()) {
-                throw new RuntimeException(sprintf('The definition "%s" has a reference to an abstract definition "%s". Abstract definitions cannot be the target of references.', $this->currentId, $value));
+                throw new RuntimeException(\sprintf('The definition "%s" has a reference to an abstract definition "%s". Abstract definitions cannot be the target of references.', $this->currentId, $value));
             }
         }
 
diff --git a/lib/symfony/dependency-injection/Compiler/CheckTypeDeclarationsPass.php b/lib/symfony/dependency-injection/Compiler/CheckTypeDeclarationsPass.php
index 4830bad1a..b783a21f3 100644
--- a/lib/symfony/dependency-injection/Compiler/CheckTypeDeclarationsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/CheckTypeDeclarationsPass.php
@@ -79,7 +79,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
 
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
-        if (isset($this->skippedIds[$this->currentId])) {
+        if (isset($this->skippedIds[$this->currentId ?? ''])) {
             return $value;
         }
 
@@ -129,7 +129,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
         $numberOfRequiredParameters = $reflectionFunction->getNumberOfRequiredParameters();
 
         if (\count($values) < $numberOfRequiredParameters) {
-            throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": "%s::%s()" requires %d arguments, %d passed.', $this->currentId, $reflectionFunction->class, $reflectionFunction->name, $numberOfRequiredParameters, \count($values)));
+            throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": "%s::%s()" requires %d arguments, %d passed.', $this->currentId, $reflectionFunction->class, $reflectionFunction->name, $numberOfRequiredParameters, \count($values)));
         }
 
         $reflectionParameters = $reflectionFunction->getParameters();
@@ -142,13 +142,14 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
             if (!$p->hasType() || $p->isVariadic()) {
                 continue;
             }
+            $key = $i;
             if (\array_key_exists($p->name, $values)) {
-                $i = $p->name;
+                $key = $p->name;
             } elseif (!\array_key_exists($i, $values)) {
                 continue;
             }
 
-            $this->checkType($checkedDefinition, $values[$i], $p, $envPlaceholderUniquePrefix);
+            $this->checkType($checkedDefinition, $values[$key], $p, $envPlaceholderUniquePrefix);
         }
 
         if ($reflectionFunction->isVariadic() && ($lastParameter = end($reflectionParameters))->hasType()) {
@@ -163,7 +164,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
     /**
      * @throws InvalidParameterTypeException When a parameter is not compatible with the declared type
      */
-    private function checkType(Definition $checkedDefinition, mixed $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, \ReflectionType $reflectionType = null): void
+    private function checkType(Definition $checkedDefinition, mixed $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, ?\ReflectionType $reflectionType = null): void
     {
         $reflectionType ??= $parameter->getType();
 
@@ -318,7 +319,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
                 return;
             }
         } elseif ($reflectionType->isBuiltin()) {
-            $checkFunction = sprintf('is_%s', $type);
+            $checkFunction = \sprintf('is_%s', $type);
             if ($checkFunction($value)) {
                 return;
             }
diff --git a/lib/symfony/dependency-injection/Compiler/DecoratorServicePass.php b/lib/symfony/dependency-injection/Compiler/DecoratorServicePass.php
index 92e1e2de4..2307c54c4 100644
--- a/lib/symfony/dependency-injection/Compiler/DecoratorServicePass.php
+++ b/lib/symfony/dependency-injection/Compiler/DecoratorServicePass.php
@@ -92,7 +92,7 @@ class DecoratorServicePass extends AbstractRecursivePass
             }
 
             if ($decoratedDefinition?->isSynthetic()) {
-                throw new InvalidArgumentException(sprintf('A synthetic service cannot be decorated: service "%s" cannot decorate "%s".', $id, $inner));
+                throw new InvalidArgumentException(\sprintf('A synthetic service cannot be decorated: service "%s" cannot decorate "%s".', $id, $inner));
             }
 
             if (isset($decoratingDefinitions[$inner])) {
diff --git a/lib/symfony/dependency-injection/Compiler/DefinitionErrorExceptionPass.php b/lib/symfony/dependency-injection/Compiler/DefinitionErrorExceptionPass.php
index b6a2cf907..251f26ef2 100644
--- a/lib/symfony/dependency-injection/Compiler/DefinitionErrorExceptionPass.php
+++ b/lib/symfony/dependency-injection/Compiler/DefinitionErrorExceptionPass.php
@@ -65,10 +65,13 @@ class DefinitionErrorExceptionPass extends AbstractRecursivePass
         }
 
         if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {
-            if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
-                $this->sourceReferences[$targetId][$this->currentId] ??= true;
+            if (
+                ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()
+                || ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior()
+            ) {
+                $this->sourceReferences[$targetId][$this->currentId ?? ''] ??= true;
             } else {
-                $this->sourceReferences[$targetId][$this->currentId] = false;
+                $this->sourceReferences[$targetId][$this->currentId ?? ''] = false;
             }
 
             return $value;
@@ -78,7 +81,7 @@ class DefinitionErrorExceptionPass extends AbstractRecursivePass
             return parent::processValue($value, $isRoot);
         }
 
-        $this->erroredDefinitions[$this->currentId] = $value;
+        $this->erroredDefinitions[$this->currentId ?? ''] = $value;
 
         return parent::processValue($value);
     }
diff --git a/lib/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php b/lib/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php
index 57e14b77b..0909cf3f9 100644
--- a/lib/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php
@@ -34,7 +34,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
     private array $notInlinableIds = [];
     private ?ServiceReferenceGraph $graph = null;
 
-    public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
+    public function __construct(?AnalyzeServiceReferencesPass $analyzingPass = null)
     {
         $this->analyzingPass = $analyzingPass;
     }
@@ -73,6 +73,9 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
                     if (!$this->graph->hasNode($id)) {
                         continue;
                     }
+                    if ($definition->isPublic()) {
+                        $this->connectedIds[$id] = true;
+                    }
                     foreach ($this->graph->getNode($id)->getOutEdges() as $edge) {
                         if (isset($notInlinedIds[$edge->getSourceNode()->getId()])) {
                             $this->currentId = $id;
@@ -141,9 +144,9 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
             return $value;
         }
 
-        $this->container->log($this, sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));
+        $this->container->log($this, \sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));
         $this->inlinedIds[$id] = $definition->isPublic() || !$definition->isShared();
-        $this->notInlinedIds[$this->currentId] = true;
+        $this->notInlinedIds[$this->currentId ?? ''] = true;
 
         if ($definition->isShared()) {
             return $definition;
@@ -189,17 +192,13 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
             return true;
         }
 
-        if ($definition->isPublic()) {
+        if ($definition->isPublic()
+            || $this->currentId === $id
+            || !$this->graph->hasNode($id)
+        ) {
             return false;
         }
 
-        if (!$this->graph->hasNode($id)) {
-            return true;
-        }
-
-        if ($this->currentId === $id) {
-            return false;
-        }
         $this->connectedIds[$id] = true;
 
         $srcIds = [];
@@ -224,6 +223,8 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
             return false;
         }
 
-        return $this->container->getDefinition($srcId)->isShared();
+        $srcDefinition = $this->container->getDefinition($srcId);
+
+        return $srcDefinition->isShared() && !$srcDefinition->isLazy();
     }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php b/lib/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
index cd8ebfe0f..145d293ba 100644
--- a/lib/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
+++ b/lib/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
@@ -156,7 +156,7 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
 {
     private string $extensionClass;
 
-    public function __construct(ExtensionInterface $extension, ParameterBagInterface $parameterBag = null)
+    public function __construct(ExtensionInterface $extension, ?ParameterBagInterface $parameterBag = null)
     {
         parent::__construct($parameterBag);
 
@@ -165,20 +165,20 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
 
     public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): static
     {
-        throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', get_debug_type($pass), $this->extensionClass));
+        throw new LogicException(\sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', get_debug_type($pass), $this->extensionClass));
     }
 
     public function registerExtension(ExtensionInterface $extension)
     {
-        throw new LogicException(sprintf('You cannot register extension "%s" from "%s". Extensions must be registered before the container is compiled.', get_debug_type($extension), $this->extensionClass));
+        throw new LogicException(\sprintf('You cannot register extension "%s" from "%s". Extensions must be registered before the container is compiled.', get_debug_type($extension), $this->extensionClass));
     }
 
     public function compile(bool $resolveEnvPlaceholders = false)
     {
-        throw new LogicException(sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
+        throw new LogicException(\sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
     }
 
-    public function resolveEnvPlaceholders(mixed $value, string|bool $format = null, array &$usedEnvs = null): mixed
+    public function resolveEnvPlaceholders(mixed $value, string|bool|null $format = null, ?array &$usedEnvs = null): mixed
     {
         if (true !== $format || !\is_string($value)) {
             return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
@@ -197,7 +197,7 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
             }
             foreach ($placeholders as $placeholder) {
                 if (false !== stripos($value, $placeholder)) {
-                    throw new RuntimeException(sprintf('Using a cast in "env(%s)" is incompatible with resolution at compile time in "%s". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.', $env, $this->extensionClass));
+                    throw new RuntimeException(\sprintf('Using a cast in "env(%s)" is incompatible with resolution at compile time in "%s". The logic in the extension should be moved to a compiler pass, or an env parameter with no cast should be used instead.', $env, $this->extensionClass));
                 }
             }
         }
diff --git a/lib/symfony/dependency-injection/Compiler/PassConfig.php b/lib/symfony/dependency-injection/Compiler/PassConfig.php
index 16b24cc71..369ff47a9 100644
--- a/lib/symfony/dependency-injection/Compiler/PassConfig.php
+++ b/lib/symfony/dependency-injection/Compiler/PassConfig.php
@@ -97,7 +97,8 @@ class PassConfig
                 new AliasDeprecatedPublicServicesPass(),
             ],
             // Let build parameters be available as late as possible
-            -2048 => [new RemoveBuildParametersPass()],
+            // Don't remove array parameters since ResolveParameterPlaceHoldersPass doesn't resolve them
+            -2048 => [new RemoveBuildParametersPass(true)],
         ];
     }
 
@@ -129,7 +130,7 @@ class PassConfig
     {
         $property = $type.'Passes';
         if (!isset($this->$property)) {
-            throw new InvalidArgumentException(sprintf('Invalid type "%s".', $type));
+            throw new InvalidArgumentException(\sprintf('Invalid type "%s".', $type));
         }
 
         $passes = &$this->$property;
diff --git a/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php b/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
index 701786245..36964dd0e 100644
--- a/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
+++ b/lib/symfony/dependency-injection/Compiler/PriorityTaggedServiceTrait.php
@@ -85,7 +85,8 @@ trait PriorityTaggedServiceTrait
                 } elseif (null === $defaultIndex && $defaultPriorityMethod && $class) {
                     $defaultIndex = PriorityTaggedServiceUtil::getDefault($container, $serviceId, $class, $defaultIndexMethod ?? 'getDefaultName', $tagName, $indexAttribute, $checkTaggedItem);
                 }
-                $index ??= $defaultIndex ??= $serviceId;
+                $decorated = $definition->getTag('container.decorator')[0]['id'] ?? null;
+                $index = $index ?? $defaultIndex ?? $defaultIndex = $decorated ?? $serviceId;
 
                 $services[] = [$priority, ++$i, $index, $serviceId, $class];
             }
@@ -133,11 +134,15 @@ class PriorityTaggedServiceUtil
             return null;
         }
 
+        if ($r->isInterface()) {
+            return null;
+        }
+
         if (null !== $indexAttribute) {
-            $service = $class !== $serviceId ? sprintf('service "%s"', $serviceId) : 'on the corresponding service';
-            $message = [sprintf('Either method "%s::%s()" should ', $class, $defaultMethod), sprintf(' or tag "%s" on %s is missing attribute "%s".', $tagName, $service, $indexAttribute)];
+            $service = $class !== $serviceId ? \sprintf('service "%s"', $serviceId) : 'on the corresponding service';
+            $message = [\sprintf('Either method "%s::%s()" should ', $class, $defaultMethod), \sprintf(' or tag "%s" on %s is missing attribute "%s".', $tagName, $service, $indexAttribute)];
         } else {
-            $message = [sprintf('Method "%s::%s()" should ', $class, $defaultMethod), '.'];
+            $message = [\sprintf('Method "%s::%s()" should ', $class, $defaultMethod), '.'];
         }
 
         if (!($rm = $r->getMethod($defaultMethod))->isStatic()) {
@@ -152,7 +157,7 @@ class PriorityTaggedServiceUtil
 
         if ('priority' === $indexAttribute) {
             if (!\is_int($default)) {
-                throw new InvalidArgumentException(implode(sprintf('return int (got "%s")', get_debug_type($default)), $message));
+                throw new InvalidArgumentException(implode(\sprintf('return int (got "%s")', get_debug_type($default)), $message));
             }
 
             return $default;
@@ -163,7 +168,7 @@ class PriorityTaggedServiceUtil
         }
 
         if (!\is_string($default)) {
-            throw new InvalidArgumentException(implode(sprintf('return string|int (got "%s")', get_debug_type($default)), $message));
+            throw new InvalidArgumentException(implode(\sprintf('return string|int (got "%s")', get_debug_type($default)), $message));
         }
 
         return $default;
diff --git a/lib/symfony/dependency-injection/Compiler/RegisterEnvVarProcessorsPass.php b/lib/symfony/dependency-injection/Compiler/RegisterEnvVarProcessorsPass.php
index 2a706bfe5..fa8a593cc 100644
--- a/lib/symfony/dependency-injection/Compiler/RegisterEnvVarProcessorsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -37,9 +37,9 @@ class RegisterEnvVarProcessorsPass implements CompilerPassInterface
         $processors = [];
         foreach ($container->findTaggedServiceIds('container.env_var_processor') as $id => $tags) {
             if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
             } elseif (!$r->isSubclassOf(EnvVarProcessorInterface::class)) {
-                throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, EnvVarProcessorInterface::class));
+                throw new InvalidArgumentException(\sprintf('Service "%s" must implement interface "%s".', $id, EnvVarProcessorInterface::class));
             }
             foreach ($class::getProvidedTypes() as $prefix => $type) {
                 $processors[$prefix] = new Reference($id);
@@ -69,7 +69,7 @@ class RegisterEnvVarProcessorsPass implements CompilerPassInterface
 
         foreach ($types as $type) {
             if (!\in_array($type, self::ALLOWED_TYPES)) {
-                throw new InvalidArgumentException(sprintf('Invalid type "%s" returned by "%s::getProvidedTypes()", expected one of "%s".', $type, $class, implode('", "', self::ALLOWED_TYPES)));
+                throw new InvalidArgumentException(\sprintf('Invalid type "%s" returned by "%s::getProvidedTypes()", expected one of "%s".', $type, $class, implode('", "', self::ALLOWED_TYPES)));
             }
         }
 
diff --git a/lib/symfony/dependency-injection/Compiler/RegisterServiceSubscribersPass.php b/lib/symfony/dependency-injection/Compiler/RegisterServiceSubscribersPass.php
index dab84cd37..63525b7dc 100644
--- a/lib/symfony/dependency-injection/Compiler/RegisterServiceSubscribersPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RegisterServiceSubscribersPass.php
@@ -50,10 +50,10 @@ class RegisterServiceSubscribersPass extends AbstractRecursivePass
             }
             ksort($attributes);
             if ([] !== array_diff(array_keys($attributes), ['id', 'key'])) {
-                throw new InvalidArgumentException(sprintf('The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "%s" given for service "%s".', implode('", "', array_keys($attributes)), $this->currentId));
+                throw new InvalidArgumentException(\sprintf('The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "%s" given for service "%s".', implode('", "', array_keys($attributes)), $this->currentId));
             }
             if (!\array_key_exists('id', $attributes)) {
-                throw new InvalidArgumentException(sprintf('Missing "id" attribute on "container.service_subscriber" tag with key="%s" for service "%s".', $attributes['key'], $this->currentId));
+                throw new InvalidArgumentException(\sprintf('Missing "id" attribute on "container.service_subscriber" tag with key="%s" for service "%s".', $attributes['key'], $this->currentId));
             }
             if (!\array_key_exists('key', $attributes)) {
                 $attributes['key'] = $attributes['id'];
@@ -66,10 +66,10 @@ class RegisterServiceSubscribersPass extends AbstractRecursivePass
         $class = $value->getClass();
 
         if (!$r = $this->container->getReflectionClass($class)) {
-            throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $this->currentId));
+            throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $this->currentId));
         }
         if (!$r->isSubclassOf(ServiceSubscriberInterface::class)) {
-            throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $this->currentId, ServiceSubscriberInterface::class));
+            throw new InvalidArgumentException(\sprintf('Service "%s" must implement interface "%s".', $this->currentId, ServiceSubscriberInterface::class));
         }
         $class = $r->name;
         // to remove when symfony/dependency-injection will stop being compatible with symfony/framework-bundle<6.0
@@ -87,11 +87,11 @@ class RegisterServiceSubscribersPass extends AbstractRecursivePass
             if ($type instanceof SubscribedService) {
                 $key = $type->key ?? $key;
                 $attributes = $type->attributes;
-                $type = ($type->nullable ? '?' : '').($type->type ?? throw new InvalidArgumentException(sprintf('When "%s::getSubscribedServices()" returns "%s", a type must be set.', $class, SubscribedService::class)));
+                $type = ($type->nullable ? '?' : '').($type->type ?? throw new InvalidArgumentException(\sprintf('When "%s::getSubscribedServices()" returns "%s", a type must be set.', $class, SubscribedService::class)));
             }
 
             if (!\is_string($type) || !preg_match('/(?(DEFINE)(?<cn>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))(?(DEFINE)(?<fqcn>(?&cn)(?:\\\\(?&cn))*+))^\??(?&fqcn)(?:(?:\|(?&fqcn))*+|(?:&(?&fqcn))*+)$/', $type)) {
-                throw new InvalidArgumentException(sprintf('"%s::getSubscribedServices()" must return valid PHP types for service "%s" key "%s", "%s" returned.', $class, $this->currentId, $key, \is_string($type) ? $type : get_debug_type($type)));
+                throw new InvalidArgumentException(\sprintf('"%s::getSubscribedServices()" must return valid PHP types for service "%s" key "%s", "%s" returned.', $class, $this->currentId, $key, \is_string($type) ? $type : get_debug_type($type)));
             }
             $optionalBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
             if ('?' === $type[0]) {
@@ -104,7 +104,7 @@ class RegisterServiceSubscribersPass extends AbstractRecursivePass
             }
             if (!isset($serviceMap[$key])) {
                 if (!$autowire) {
-                    throw new InvalidArgumentException(sprintf('Service "%s" misses a "container.service_subscriber" tag with "key"/"id" attributes corresponding to entry "%s" as returned by "%s::getSubscribedServices()".', $this->currentId, $key, $class));
+                    throw new InvalidArgumentException(\sprintf('Service "%s" misses a "container.service_subscriber" tag with "key"/"id" attributes corresponding to entry "%s" as returned by "%s::getSubscribedServices()".', $this->currentId, $key, $class));
                 }
                 if ($replaceDeprecatedSession && SessionInterface::class === $type) {
                     // This prevents triggering the deprecation when building the container
@@ -132,8 +132,8 @@ class RegisterServiceSubscribersPass extends AbstractRecursivePass
         }
 
         if ($serviceMap = array_keys($serviceMap)) {
-            $message = sprintf(1 < \count($serviceMap) ? 'keys "%s" do' : 'key "%s" does', str_replace('%', '%%', implode('", "', $serviceMap)));
-            throw new InvalidArgumentException(sprintf('Service %s not exist in the map returned by "%s::getSubscribedServices()" for service "%s".', $message, $class, $this->currentId));
+            $message = \sprintf(1 < \count($serviceMap) ? 'keys "%s" do' : 'key "%s" does', str_replace('%', '%%', implode('", "', $serviceMap)));
+            throw new InvalidArgumentException(\sprintf('Service %s not exist in the map returned by "%s::getSubscribedServices()" for service "%s".', $message, $class, $this->currentId));
         }
 
         $locatorRef = ServiceLocatorTagPass::register($this->container, $subscriberMap, $this->currentId);
diff --git a/lib/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php b/lib/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php
index d0ebfcc50..dbe87aad1 100644
--- a/lib/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php
@@ -28,7 +28,7 @@ class RemoveAbstractDefinitionsPass implements CompilerPassInterface
         foreach ($container->getDefinitions() as $id => $definition) {
             if ($definition->isAbstract()) {
                 $container->removeDefinition($id);
-                $container->log($this, sprintf('Removed service "%s"; reason: abstract.', $id));
+                $container->log($this, \sprintf('Removed service "%s"; reason: abstract.', $id));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Compiler/RemoveBuildParametersPass.php b/lib/symfony/dependency-injection/Compiler/RemoveBuildParametersPass.php
index 75e714475..c2cf2903c 100644
--- a/lib/symfony/dependency-injection/Compiler/RemoveBuildParametersPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RemoveBuildParametersPass.php
@@ -20,6 +20,11 @@ class RemoveBuildParametersPass implements CompilerPassInterface
      */
     private array $removedParameters = [];
 
+    public function __construct(
+        private bool $preserveArrays = false,
+    ) {
+    }
+
     /**
      * @return void
      */
@@ -29,11 +34,11 @@ class RemoveBuildParametersPass implements CompilerPassInterface
         $this->removedParameters = [];
 
         foreach ($parameterBag->all() as $name => $value) {
-            if ('.' === ($name[0] ?? '')) {
+            if ('.' === ($name[0] ?? '') && (!$this->preserveArrays || !\is_array($value))) {
                 $this->removedParameters[$name] = $value;
 
                 $parameterBag->remove($name);
-                $container->log($this, sprintf('Removing build parameter "%s".', $name));
+                $container->log($this, \sprintf('Removing build parameter "%s".', $name));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php b/lib/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php
index 93c3fd267..a35147f41 100644
--- a/lib/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php
@@ -35,7 +35,7 @@ class RemovePrivateAliasesPass implements CompilerPassInterface
             }
 
             $container->removeAlias($id);
-            $container->log($this, sprintf('Removed service "%s"; reason: private alias.', $id));
+            $container->log($this, \sprintf('Removed service "%s"; reason: private alias.', $id));
         }
     }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php b/lib/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php
index d6ee5ea56..17e38a6ec 100644
--- a/lib/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -67,7 +67,7 @@ class RemoveUnusedDefinitionsPass extends AbstractRecursivePass
                 if (!isset($connectedIds[$id])) {
                     $container->removeDefinition($id);
                     $container->resolveEnvPlaceholders(!$definition->hasErrors() ? serialize($definition) : $definition);
-                    $container->log($this, sprintf('Removed service "%s"; reason: unused.', $id));
+                    $container->log($this, \sprintf('Removed service "%s"; reason: unused.', $id));
                 }
             }
         } finally {
diff --git a/lib/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php b/lib/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 46d615f83..d6377bb9b 100644
--- a/lib/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -41,7 +41,15 @@ class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
         $seenAliasTargets = [];
         $replacements = [];
 
-        foreach ($container->getAliases() as $definitionId => $target) {
+        // Sort aliases so non-deprecated ones come first. This ensures that when
+        // multiple aliases point to the same private definition, non-deprecated
+        // aliases get priority for renaming. Otherwise, the definition might be
+        // renamed to a deprecated alias ID, causing the original service ID to
+        // become an alias to the deprecated one (inverting the alias chain).
+        $aliases = $container->getAliases();
+        uasort($aliases, static fn ($a, $b) => $a->isDeprecated() <=> $b->isDeprecated());
+
+        foreach ($aliases as $definitionId => $target) {
             $targetId = (string) $target;
             // Special case: leave this target alone
             if ('service_container' === $targetId) {
@@ -95,7 +103,7 @@ class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
             // Perform the replacement
             $newId = $this->replacements[$referenceId];
             $value = new Reference($newId, $value->getInvalidBehavior());
-            $this->container->log($this, sprintf('Changed reference of service "%s" previously pointing to "%s" to "%s".', $this->currentId, $referenceId, $newId));
+            $this->container->log($this, \sprintf('Changed reference of service "%s" previously pointing to "%s" to "%s".', $this->currentId, $referenceId, $newId));
         }
 
         return parent::processValue($value, $isRoot);
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveBindingsPass.php b/lib/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
index 2fa7db848..9fa617822 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
@@ -11,9 +11,11 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -56,11 +58,11 @@ class ResolveBindingsPass extends AbstractRecursivePass
                 }
 
                 if ($argumentType) {
-                    $message .= sprintf('of type "%s" ', $argumentType);
+                    $message .= \sprintf('of type "%s" ', $argumentType);
                 }
 
                 if ($argumentName) {
-                    $message .= sprintf('named "%s" ', $argumentName);
+                    $message .= \sprintf('named "%s" ', $argumentName);
                 }
 
                 if (BoundArgument::DEFAULTS_BINDING === $bindingType) {
@@ -68,17 +70,17 @@ class ResolveBindingsPass extends AbstractRecursivePass
                 } elseif (BoundArgument::INSTANCEOF_BINDING === $bindingType) {
                     $message .= 'under "_instanceof"';
                 } else {
-                    $message .= sprintf('for service "%s"', $serviceId);
+                    $message .= \sprintf('for service "%s"', $serviceId);
                 }
 
                 if ($file) {
-                    $message .= sprintf(' in file "%s"', $file);
+                    $message .= \sprintf(' in file "%s"', $file);
                 }
 
-                $message = sprintf('A binding is configured for an argument %s, but no corresponding argument has been found. It may be unused and should be removed, or it may have a typo.', $message);
+                $message = \sprintf('A binding is configured for an argument %s, but no corresponding argument has been found. It may be unused and should be removed, or it may have a typo.', $message);
 
                 if ($this->errorMessages) {
-                    $message .= sprintf("\nCould be related to%s:", 1 < \count($this->errorMessages) ? ' one of' : '');
+                    $message .= \sprintf("\nCould be related to%s:", 1 < \count($this->errorMessages) ? ' one of' : '');
                 }
                 foreach ($this->errorMessages as $m) {
                     $message .= "\n - ".$m;
@@ -119,10 +121,10 @@ class ResolveBindingsPass extends AbstractRecursivePass
         foreach ($bindings as $key => $binding) {
             [$bindingValue, $bindingId, $used, $bindingType, $file] = $binding->getValues();
             if ($used) {
-                $this->usedBindings[$bindingId] = true;
-                unset($this->unusedBindings[$bindingId]);
-            } elseif (!isset($this->usedBindings[$bindingId])) {
-                $this->unusedBindings[$bindingId] = [$key, $this->currentId, $bindingType, $file];
+                $this->usedBindings[$bindingId ?? ''] = true;
+                unset($this->unusedBindings[$bindingId ?? '']);
+            } elseif (!isset($this->usedBindings[$bindingId ?? ''])) {
+                $this->unusedBindings[$bindingId ?? ''] = [$key, $this->currentId, $bindingType, $file];
             }
 
             if (preg_match('/^(?:(?:array|bool|float|int|string|iterable|([^ $]++)) )\$/', $key, $m)) {
@@ -139,7 +141,7 @@ class ResolveBindingsPass extends AbstractRecursivePass
             }
 
             if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition && !$bindingValue instanceof TaggedIteratorArgument && !$bindingValue instanceof ServiceLocatorArgument) {
-                throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected "%s", "%s", "%s", "%s" or null, "%s" given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, ServiceLocatorArgument::class, get_debug_type($bindingValue)));
+                throw new InvalidArgumentException(\sprintf('Invalid value for binding key "%s" for service "%s": expected "%s", "%s", "%s", "%s" or null, "%s" given.', $key, $this->currentId, Reference::class, Definition::class, TaggedIteratorArgument::class, ServiceLocatorArgument::class, get_debug_type($bindingValue)));
             }
         }
 
@@ -181,10 +183,17 @@ class ResolveBindingsPass extends AbstractRecursivePass
             foreach ($reflectionMethod->getParameters() as $key => $parameter) {
                 $names[$key] = $parameter->name;
 
-                if (\array_key_exists($key, $arguments) && '' !== $arguments[$key]) {
+                if (\array_key_exists($key, $arguments) && '' !== $arguments[$key] && !$arguments[$key] instanceof AbstractArgument) {
                     continue;
                 }
-                if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name]) {
+                if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name] && !$arguments[$parameter->name] instanceof AbstractArgument) {
+                    continue;
+                }
+                if (
+                    $value->isAutowired()
+                    && !$value->hasTag('container.ignore_attributes')
+                    && $parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)
+                ) {
                     continue;
                 }
 
@@ -216,13 +225,15 @@ class ResolveBindingsPass extends AbstractRecursivePass
                 if (isset($bindingNames[$name]) || isset($bindingNames[$parsedName]) || isset($bindingNames[$parameter->name])) {
                     $bindingKey = array_search($binding, $bindings, true);
                     $argumentType = substr($bindingKey, 0, strpos($bindingKey, ' '));
-                    $this->errorMessages[] = sprintf('Did you forget to add the type "%s" to argument "$%s" of method "%s::%s()"?', $argumentType, $parameter->name, $reflectionMethod->class, $reflectionMethod->name);
+                    $this->errorMessages[] = \sprintf('Did you forget to add the type "%s" to argument "$%s" of method "%s::%s()"?', $argumentType, $parameter->name, $reflectionMethod->class, $reflectionMethod->name);
                 }
             }
 
             foreach ($names as $key => $name) {
                 if (\array_key_exists($name, $arguments) && (0 === $key || \array_key_exists($key - 1, $arguments))) {
-                    $arguments[$key] = $arguments[$name];
+                    if (!\array_key_exists($key, $arguments)) {
+                        $arguments[$key] = $arguments[$name];
+                    }
                     unset($arguments[$name]);
                 }
             }
@@ -252,8 +263,8 @@ class ResolveBindingsPass extends AbstractRecursivePass
     {
         [$bindingValue, $bindingId] = $binding->getValues();
 
-        $this->usedBindings[$bindingId] = true;
-        unset($this->unusedBindings[$bindingId]);
+        $this->usedBindings[$bindingId ?? ''] = true;
+        unset($this->unusedBindings[$bindingId ?? '']);
 
         return $bindingValue;
     }
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveChildDefinitionsPass.php b/lib/symfony/dependency-injection/Compiler/ResolveChildDefinitionsPass.php
index bc1eeebe2..15a5af094 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveChildDefinitionsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveChildDefinitionsPass.php
@@ -65,7 +65,7 @@ class ResolveChildDefinitionsPass extends AbstractRecursivePass
             throw $e;
         } catch (ExceptionInterface $e) {
             $r = new \ReflectionProperty($e, 'message');
-            $r->setValue($e, sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
+            $r->setValue($e, \sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
 
             throw $e;
         }
@@ -74,7 +74,7 @@ class ResolveChildDefinitionsPass extends AbstractRecursivePass
     private function doResolveDefinition(ChildDefinition $definition): Definition
     {
         if (!$this->container->has($parent = $definition->getParent())) {
-            throw new RuntimeException(sprintf('Parent definition "%s" does not exist.', $parent));
+            throw new RuntimeException(\sprintf('Parent definition "%s" does not exist.', $parent));
         }
 
         $searchKey = array_search($parent, $this->currentPath);
@@ -93,7 +93,7 @@ class ResolveChildDefinitionsPass extends AbstractRecursivePass
             $this->currentId = $id;
         }
 
-        $this->container->log($this, sprintf('Resolving inheritance for "%s" (parent: %s).', $this->currentId, $parent));
+        $this->container->log($this, \sprintf('Resolving inheritance for "%s" (parent: %s).', $this->currentId, $parent));
         $def = new Definition();
 
         // merge in parent definition
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveClassPass.php b/lib/symfony/dependency-injection/Compiler/ResolveClassPass.php
index 468837672..23d711ca5 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveClassPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveClassPass.php
@@ -26,15 +26,17 @@ class ResolveClassPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isSynthetic() || null !== $definition->getClass()) {
+            if ($definition->isSynthetic()
+                || $definition->hasErrors()
+                || null !== $definition->getClass()
+                || !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)
+            ) {
                 continue;
             }
-            if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)) {
-                if ($definition instanceof ChildDefinition && !class_exists($id)) {
-                    throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
-                }
-                $definition->setClass($id);
+            if ($definition instanceof ChildDefinition && !class_exists($id)) {
+                throw new InvalidArgumentException(\sprintf('Service definition "%s" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
             }
+            $definition->setClass($id);
         }
     }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveDecoratorStackPass.php b/lib/symfony/dependency-injection/Compiler/ResolveDecoratorStackPass.php
index da02622b2..b0a90df83 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveDecoratorStackPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveDecoratorStackPass.php
@@ -35,11 +35,11 @@ class ResolveDecoratorStackPass implements CompilerPassInterface
             $definition = $container->getDefinition($id);
 
             if (!$definition instanceof ChildDefinition) {
-                throw new InvalidArgumentException(sprintf('Invalid service "%s": only definitions with a "parent" can have the "container.stack" tag.', $id));
+                throw new InvalidArgumentException(\sprintf('Invalid service "%s": only definitions with a "parent" can have the "container.stack" tag.', $id));
             }
 
             if (!$stack = $definition->getArguments()) {
-                throw new InvalidArgumentException(sprintf('Invalid service "%s": the stack of decorators is empty.', $id));
+                throw new InvalidArgumentException(\sprintf('Invalid service "%s": the stack of decorators is empty.', $id));
             }
 
             $stacks[$id] = $stack;
@@ -99,7 +99,7 @@ class ResolveDecoratorStackPass implements CompilerPassInterface
             } elseif ($definition instanceof Reference || $definition instanceof Alias) {
                 $path[] = (string) $definition;
             } else {
-                throw new InvalidArgumentException(sprintf('Invalid service "%s": unexpected value of type "%s" found in the stack of decorators.', $id, get_debug_type($definition)));
+                throw new InvalidArgumentException(\sprintf('Invalid service "%s": unexpected value of type "%s" found in the stack of decorators.', $id, get_debug_type($definition)));
             }
 
             $p = $prefix.$k;
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveFactoryClassPass.php b/lib/symfony/dependency-injection/Compiler/ResolveFactoryClassPass.php
index 2beaa01b6..1eb5c9b66 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveFactoryClassPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveFactoryClassPass.php
@@ -25,7 +25,7 @@ class ResolveFactoryClassPass extends AbstractRecursivePass
     {
         if ($value instanceof Definition && \is_array($factory = $value->getFactory()) && null === $factory[0]) {
             if (null === $class = $value->getClass()) {
-                throw new RuntimeException(sprintf('The "%s" service is defined to be created by a factory, but is missing the factory class. Did you forget to define the factory or service class?', $this->currentId));
+                throw new RuntimeException(\sprintf('The "%s" service is defined to be created by a factory, but is missing the factory class. Did you forget to define the factory or service class?', $this->currentId));
             }
 
             $factory[0] = $class;
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveHotPathPass.php b/lib/symfony/dependency-injection/Compiler/ResolveHotPathPass.php
index 705bb837b..59d87b394 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveHotPathPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveHotPathPass.php
@@ -51,7 +51,7 @@ class ResolveHotPathPass extends AbstractRecursivePass
                 return $value->clearTag('container.hot_path');
             }
 
-            $this->resolvedIds[$this->currentId] = true;
+            $this->resolvedIds[$this->currentId ?? ''] = true;
 
             if (!$value->hasTag('container.hot_path')) {
                 return $value;
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php b/lib/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
index fbce044e3..1adb9475f 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -31,7 +31,7 @@ class ResolveInstanceofConditionalsPass implements CompilerPassInterface
     {
         foreach ($container->getAutoconfiguredInstanceof() as $interface => $definition) {
             if ($definition->getArguments()) {
-                throw new InvalidArgumentException(sprintf('Autoconfigured instanceof for type "%s" defines arguments but these are not supported and should be removed.', $interface));
+                throw new InvalidArgumentException(\sprintf('Autoconfigured instanceof for type "%s" defines arguments but these are not supported and should be removed.', $interface));
             }
         }
 
@@ -163,7 +163,7 @@ class ResolveInstanceofConditionalsPass implements CompilerPassInterface
         foreach ($instanceofConditionals as $interface => $instanceofDef) {
             // make sure the interface/class exists (but don't validate automaticInstanceofConditionals)
             if (!$container->getReflectionClass($interface)) {
-                throw new RuntimeException(sprintf('"%s" is set as an "instanceof" conditional, but it does not exist.', $interface));
+                throw new RuntimeException(\sprintf('"%s" is set as an "instanceof" conditional, but it does not exist.', $interface));
             }
 
             if (!isset($autoconfiguredInstanceof[$interface])) {
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php b/lib/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
index 7a2a69aa6..5b45cc76b 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
@@ -114,7 +114,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
                 $e = new ServiceNotFoundException($id, $this->currentId);
 
                 // since the error message varies by $id and $this->currentId, so should the id of the dummy errored definition
-                $this->container->register($id = sprintf('.errored.%s.%s', $this->currentId, $id), $value->getType())
+                $this->container->register($id = \sprintf('.errored.%s.%s', $this->currentId, $id), $value->getType())
                     ->addError($e->getMessage());
 
                 return new TypedReference($id, $value->getType(), $value->getInvalidBehavior());
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php b/lib/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
index 24fac737c..e637a27e1 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
@@ -29,7 +29,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($value instanceof AbstractArgument && $value->getText().'.' === $value->getTextWithContext()) {
-            $value->setContext(sprintf('A value found in service "%s"', $this->currentId));
+            $value->setContext(\sprintf('A value found in service "%s"', $this->currentId));
         }
 
         if (!$value instanceof Definition) {
@@ -47,7 +47,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
 
             foreach ($arguments as $key => $argument) {
                 if ($argument instanceof AbstractArgument && $argument->getText().'.' === $argument->getTextWithContext()) {
-                    $argument->setContext(sprintf('Argument '.(\is_int($key) ? 1 + $key : '"%3$s"').' of '.('__construct' === $method ? 'service "%s"' : 'method call "%s::%s()"'), $this->currentId, $method, $key));
+                    $argument->setContext(\sprintf('Argument '.(\is_int($key) ? 1 + $key : '"%3$s"').' of '.('__construct' === $method ? 'service "%s"' : 'method call "%s::%s()"'), $this->currentId, $method, $key));
                 }
 
                 if (\is_int($key)) {
@@ -64,7 +64,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
                 }
 
                 if (isset($key[0]) && '$' !== $key[0] && !class_exists($key) && !interface_exists($key, false)) {
-                    throw new InvalidArgumentException(sprintf('Invalid service "%s": did you forget to add the "$" prefix to argument "%s"?', $this->currentId, $key));
+                    throw new InvalidArgumentException(\sprintf('Invalid service "%s": did you forget to add the "$" prefix to argument "%s"?', $this->currentId, $key));
                 }
 
                 if (isset($key[0]) && '$' === $key[0]) {
@@ -84,11 +84,11 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
                         }
                     }
 
-                    throw new InvalidArgumentException(sprintf('Invalid service "%s": method "%s()" has no argument named "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
+                    throw new InvalidArgumentException(\sprintf('Invalid service "%s": method "%s()" has no argument named "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
                 }
 
                 if (null !== $argument && !$argument instanceof Reference && !$argument instanceof Definition) {
-                    throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of "%s" or an instance of "%s", "%s" given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, get_debug_type($argument)));
+                    throw new InvalidArgumentException(\sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of "%s" or an instance of "%s", "%s" given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, get_debug_type($argument)));
                 }
 
                 $typeFound = false;
@@ -101,7 +101,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
                 }
 
                 if (!$typeFound) {
-                    throw new InvalidArgumentException(sprintf('Invalid service "%s": method "%s()" has no argument type-hinted as "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
+                    throw new InvalidArgumentException(\sprintf('Invalid service "%s": method "%s()" has no argument type-hinted as "%s". Check your service definition.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method, $key));
                 }
             }
 
@@ -128,7 +128,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
 
         foreach ($value->getProperties() as $key => $argument) {
             if ($argument instanceof AbstractArgument && $argument->getText().'.' === $argument->getTextWithContext()) {
-                $argument->setContext(sprintf('Property "%s" of service "%s"', $key, $this->currentId));
+                $argument->setContext(\sprintf('Property "%s" of service "%s"', $key, $this->currentId));
             }
         }
 
diff --git a/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php b/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
index 16d0e9fcb..015db9d1c 100644
--- a/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
@@ -36,7 +36,11 @@ class ResolveReferencesToAliasesPass extends AbstractRecursivePass
             $this->currentId = $id;
 
             if ($aliasId !== $defId = $this->getDefinitionId($aliasId, $container)) {
-                $container->setAlias($id, $defId)->setPublic($alias->isPublic());
+                $newAlias = $container->setAlias($id, $defId)->setPublic($alias->isPublic());
+
+                if ($alias->isDeprecated()) {
+                    $newAlias->setDeprecated(...array_values($alias->getDeprecation('%alias_id%')));
+                }
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php b/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
index fb0fc2682..a47cd2478 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
@@ -61,7 +61,7 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
         }
 
         if (!\is_array($services)) {
-            throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
+            throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
         }
 
         $i = 0;
@@ -102,7 +102,7 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
         return new Reference($id);
     }
 
-    public static function register(ContainerBuilder $container, array $map, string $callerId = null): Reference
+    public static function register(ContainerBuilder $container, array $map, ?string $callerId = null): Reference
     {
         foreach ($map as $k => $v) {
             $map[$k] = new ServiceClosureArgument($v);
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
index c90fc7ac5..97f9398e1 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
@@ -44,7 +44,7 @@ class ServiceReferenceGraph
     public function getNode(string $id): ServiceReferenceGraphNode
     {
         if (!isset($this->nodes[$id])) {
-            throw new InvalidArgumentException(sprintf('There is no node with id "%s".', $id));
+            throw new InvalidArgumentException(\sprintf('There is no node with id "%s".', $id));
         }
 
         return $this->nodes[$id];
@@ -74,7 +74,7 @@ class ServiceReferenceGraph
     /**
      * Connects 2 nodes together in the Graph.
      */
-    public function connect(?string $sourceId, mixed $sourceValue, ?string $destId, mixed $destValue = null, Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false): void
+    public function connect(?string $sourceId, mixed $sourceValue, ?string $destId, mixed $destValue = null, ?Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false, bool $byMultiUseArgument = false): void
     {
         if (null === $sourceId || null === $destId) {
             return;
@@ -82,7 +82,7 @@ class ServiceReferenceGraph
 
         $sourceNode = $this->createNode($sourceId, $sourceValue);
         $destNode = $this->createNode($destId, $destValue);
-        $edge = new ServiceReferenceGraphEdge($sourceNode, $destNode, $reference, $lazy, $weak, $byConstructor);
+        $edge = new ServiceReferenceGraphEdge($sourceNode, $destNode, $reference, $lazy, $weak, $byConstructor, $byMultiUseArgument);
 
         $sourceNode->addOutEdge($edge);
         $destNode->addInEdge($edge);
diff --git a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
index b607164a6..1fad56666 100644
--- a/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
+++ b/lib/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
@@ -26,8 +26,9 @@ class ServiceReferenceGraphEdge
     private bool $lazy;
     private bool $weak;
     private bool $byConstructor;
+    private bool $byMultiUseArgument;
 
-    public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, mixed $value = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false)
+    public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, mixed $value = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false, bool $byMultiUseArgument = false)
     {
         $this->sourceNode = $sourceNode;
         $this->destNode = $destNode;
@@ -35,6 +36,7 @@ class ServiceReferenceGraphEdge
         $this->lazy = $lazy;
         $this->weak = $weak;
         $this->byConstructor = $byConstructor;
+        $this->byMultiUseArgument = $byMultiUseArgument;
     }
 
     /**
@@ -84,4 +86,9 @@ class ServiceReferenceGraphEdge
     {
         return $this->byConstructor;
     }
+
+    public function isFromMultiUseArgument(): bool
+    {
+        return $this->byMultiUseArgument;
+    }
 }
diff --git a/lib/symfony/dependency-injection/Compiler/ValidateEnvPlaceholdersPass.php b/lib/symfony/dependency-injection/Compiler/ValidateEnvPlaceholdersPass.php
index 2d6542660..75bd6097d 100644
--- a/lib/symfony/dependency-injection/Compiler/ValidateEnvPlaceholdersPass.php
+++ b/lib/symfony/dependency-injection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -49,17 +49,8 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface
         $defaultBag = new ParameterBag($resolvingBag->all());
         $envTypes = $resolvingBag->getProvidedTypes();
         foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
-            $values = [];
-            if (false === $i = strpos($env, ':')) {
-                $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
-                $defaultType = null !== $default ? get_debug_type($default) : 'string';
-                $values[$defaultType] = $default;
-            } else {
-                $prefix = substr($env, 0, $i);
-                foreach ($envTypes[$prefix] ?? ['string'] as $type) {
-                    $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
-                }
-            }
+            $values = $this->getPlaceholderValues($env, $defaultBag, $envTypes);
+
             foreach ($placeholders as $placeholder) {
                 BaseNode::setPlaceholder($placeholder, $values);
             }
@@ -100,4 +91,50 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface
             $this->extensionConfig = [];
         }
     }
+
+    /**
+     * @param array<string, list<string>> $envTypes
+     *
+     * @return array<string, mixed>
+     */
+    private function getPlaceholderValues(string $env, ParameterBag $defaultBag, array $envTypes): array
+    {
+        if (false === $i = strpos($env, ':')) {
+            [$default, $defaultType] = $this->getParameterDefaultAndDefaultType("env($env)", $defaultBag);
+
+            return [$defaultType => $default];
+        }
+
+        $prefix = substr($env, 0, $i);
+        if ('default' === $prefix) {
+            $parts = explode(':', $env);
+            array_shift($parts); // Remove 'default' prefix
+            $parameter = array_shift($parts); // Retrieve and remove parameter
+
+            [$defaultParameter, $defaultParameterType] = $this->getParameterDefaultAndDefaultType($parameter, $defaultBag);
+
+            return [
+                $defaultParameterType => $defaultParameter,
+                ...$this->getPlaceholderValues(implode(':', $parts), $defaultBag, $envTypes),
+            ];
+        }
+
+        $values = [];
+        foreach ($envTypes[$prefix] ?? ['string'] as $type) {
+            $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
+        }
+
+        return $values;
+    }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getParameterDefaultAndDefaultType(string $name, ParameterBag $defaultBag): array
+    {
+        $default = $defaultBag->has($name) ? $defaultBag->get($name) : self::TYPE_FIXTURES['string'];
+        $defaultType = null !== $default ? get_debug_type($default) : 'string';
+
+        return [$default, $defaultType];
+    }
 }
diff --git a/lib/symfony/dependency-injection/Container.php b/lib/symfony/dependency-injection/Container.php
index 0777a8755..57c6c1e6f 100644
--- a/lib/symfony/dependency-injection/Container.php
+++ b/lib/symfony/dependency-injection/Container.php
@@ -67,7 +67,7 @@ class Container implements ContainerInterface, ResetInterface
 
     private static \Closure $make;
 
-    public function __construct(ParameterBagInterface $parameterBag = null)
+    public function __construct(?ParameterBagInterface $parameterBag = null)
     {
         $this->parameterBag = $parameterBag ?? new EnvPlaceholderParameterBag();
     }
@@ -160,12 +160,12 @@ class Container implements ContainerInterface, ResetInterface
             if (isset($this->syntheticIds[$id]) || !isset($this->getRemovedIds()[$id])) {
                 // no-op
             } elseif (null === $service) {
-                throw new InvalidArgumentException(sprintf('The "%s" service is private, you cannot unset it.', $id));
+                throw new InvalidArgumentException(\sprintf('The "%s" service is private, you cannot unset it.', $id));
             } else {
-                throw new InvalidArgumentException(sprintf('The "%s" service is private, you cannot replace it.', $id));
+                throw new InvalidArgumentException(\sprintf('The "%s" service is private, you cannot replace it.', $id));
             }
         } elseif (isset($this->services[$id])) {
-            throw new InvalidArgumentException(sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
+            throw new InvalidArgumentException(\sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
         }
 
         if (isset($this->aliases[$id])) {
@@ -243,10 +243,10 @@ class Container implements ContainerInterface, ResetInterface
                 throw new ServiceNotFoundException($id);
             }
             if (isset($container->syntheticIds[$id])) {
-                throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
+                throw new ServiceNotFoundException($id, null, null, [], \sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
             }
             if (isset($container->getRemovedIds()[$id])) {
-                throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
+                throw new ServiceNotFoundException($id, null, null, [], \sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
             }
 
             $alternatives = [];
@@ -288,7 +288,6 @@ class Container implements ContainerInterface, ResetInterface
     public function reset()
     {
         $services = $this->services + $this->privates;
-        $this->services = $this->factories = $this->privates = [];
 
         foreach ($services as $service) {
             try {
@@ -299,6 +298,8 @@ class Container implements ContainerInterface, ResetInterface
                 continue;
             }
         }
+
+        $this->services = $this->factories = $this->privates = [];
     }
 
     /**
diff --git a/lib/symfony/dependency-injection/ContainerAwareTrait.php b/lib/symfony/dependency-injection/ContainerAwareTrait.php
index be6b225a3..d716a580d 100644
--- a/lib/symfony/dependency-injection/ContainerAwareTrait.php
+++ b/lib/symfony/dependency-injection/ContainerAwareTrait.php
@@ -30,7 +30,7 @@ trait ContainerAwareTrait
     /**
      * @return void
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/dependency-injection', '6.2', 'Calling "%s::%s()" without any arguments is deprecated, pass null explicitly instead.', __CLASS__, __FUNCTION__);
diff --git a/lib/symfony/dependency-injection/ContainerBuilder.php b/lib/symfony/dependency-injection/ContainerBuilder.php
index f56072a35..bca435631 100644
--- a/lib/symfony/dependency-injection/ContainerBuilder.php
+++ b/lib/symfony/dependency-injection/ContainerBuilder.php
@@ -117,7 +117,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     private array $vendors;
 
     /**
-     * @var string[] the list of paths in vendor directories
+     * @var array<string, bool> the cache for paths being in vendor directories
      */
     private array $pathsInVendor = [];
 
@@ -155,7 +155,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         'mixed' => true,
     ];
 
-    public function __construct(ParameterBagInterface $parameterBag = null)
+    public function __construct(?ParameterBagInterface $parameterBag = null)
     {
         parent::__construct($parameterBag);
 
@@ -207,7 +207,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         $this->extensions[$extension->getAlias()] = $extension;
 
         if (false !== $extension->getNamespace()) {
-            $this->extensionsByNs[$extension->getNamespace()] = $extension;
+            $this->extensionsByNs[$extension->getNamespace() ?? ''] = $extension;
         }
     }
 
@@ -226,7 +226,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
             return $this->extensionsByNs[$name];
         }
 
-        throw new LogicException(sprintf('Container extension "%s" is not registered.', $name));
+        throw new LogicException(\sprintf('Container extension "%s" is not registered.', $name));
     }
 
     /**
@@ -360,7 +360,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
                 $resource = new ClassExistenceResource($class, false);
                 $classReflector = $resource->isFresh(0) ? false : new \ReflectionClass($class);
             } else {
-                $classReflector = class_exists($class) ? new \ReflectionClass($class) : false;
+                $classReflector = class_exists($class) || interface_exists($class, false) ? new \ReflectionClass($class) : false;
             }
         } catch (\ReflectionException $e) {
             if ($throw) {
@@ -431,7 +431,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * @throws BadMethodCallException When this ContainerBuilder is compiled
      * @throws \LogicException        if the extension is not registered
      */
-    public function loadFromExtension(string $extension, array $values = null): static
+    public function loadFromExtension(string $extension, ?array $values = null): static
     {
         if ($this->isCompiled()) {
             throw new BadMethodCallException('Cannot load from an extension on a compiled container.');
@@ -488,7 +488,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     {
         if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
             // setting a synthetic service on a compiled container is alright
-            throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
+            throw new BadMethodCallException(\sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
         }
 
         unset($this->definitions[$id], $this->aliasDefinitions[$id], $this->removedIds[$id]);
@@ -531,7 +531,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         return $this->doGet($id, $invalidBehavior);
     }
 
-    private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, array &$inlineServices = null, bool $isConstructorArgument = false): mixed
+    private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, ?array &$inlineServices = null, bool $isConstructorArgument = false): mixed
     {
         if (isset($inlineServices[$id])) {
             return $inlineServices[$id];
@@ -669,7 +669,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
         foreach ($container->getAutoconfiguredInstanceof() as $interface => $childDefinition) {
             if (isset($this->autoconfiguredInstanceof[$interface])) {
-                throw new InvalidArgumentException(sprintf('"%s" has already been autoconfigured and merge() does not support merging autoconfiguration for the same class/interface.', $interface));
+                throw new InvalidArgumentException(\sprintf('"%s" has already been autoconfigured and merge() does not support merging autoconfiguration for the same class/interface.', $interface));
             }
 
             $this->autoconfiguredInstanceof[$interface] = $childDefinition;
@@ -677,7 +677,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
         foreach ($container->getAutoconfiguredAttributes() as $attribute => $configurator) {
             if (isset($this->autoconfiguredAttributes[$attribute])) {
-                throw new InvalidArgumentException(sprintf('"%s" has already been autoconfigured and merge() does not support merging autoconfiguration for the same attribute.', $attribute));
+                throw new InvalidArgumentException(\sprintf('"%s" has already been autoconfigured and merge() does not support merging autoconfiguration for the same attribute.', $attribute));
             }
 
             $this->autoconfiguredAttributes[$attribute] = $configurator;
@@ -722,7 +722,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     public function deprecateParameter(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
     {
         if (!$this->parameterBag instanceof ParameterBag) {
-            throw new BadMethodCallException(sprintf('The parameter bag must be an instance of "%s" to call "%s".', ParameterBag::class, __METHOD__));
+            throw new BadMethodCallException(\sprintf('The parameter bag must be an instance of "%s" to call "%s".', ParameterBag::class, __METHOD__));
         }
 
         $this->parameterBag->deprecate($name, $package, $version, $message);
@@ -742,10 +742,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *  * The parameter bag is frozen;
      *  * Extension loading is disabled.
      *
-     * @param bool $resolveEnvPlaceholders Whether %env()% parameters should be resolved using the current
-     *                                     env vars or be replaced by uniquely identifiable placeholders.
-     *                                     Set to "true" when you want to use the current ContainerBuilder
-     *                                     directly, keep to "false" when the container is dumped instead.
+     * @param bool $resolveEnvPlaceholders Whether %env()% parameters should be resolved at build time using
+     *                                     the current env var values (true), or be resolved at runtime based
+     *                                     on the environment (false). In general, this should be set to "true"
+     *                                     when you want to use the current ContainerBuilder directly, and to
+     *                                     "false" when the container is dumped instead.
      *
      * @return void
      */
@@ -776,7 +777,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
         if ($bag instanceof EnvPlaceholderParameterBag) {
             if ($resolveEnvPlaceholders) {
-                $this->parameterBag = new ParameterBag($this->resolveEnvPlaceholders($bag->all(), true));
+                $this->parameterBag = new ParameterBag($this->resolveEnvPlaceholders($this->escapeParameters($bag->all()), true));
             }
 
             $this->envPlaceholders = $bag->getEnvPlaceholders();
@@ -842,7 +843,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     public function setAlias(string $alias, string|Alias $id): Alias
     {
         if ('' === $alias || '\\' === $alias[-1] || \strlen($alias) !== strcspn($alias, "\0\r\n'")) {
-            throw new InvalidArgumentException(sprintf('Invalid alias id: "%s".', $alias));
+            throw new InvalidArgumentException(\sprintf('Invalid alias id: "%s".', $alias));
         }
 
         if (\is_string($id)) {
@@ -850,7 +851,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         }
 
         if ($alias === (string) $id) {
-            throw new InvalidArgumentException(sprintf('An alias cannot reference itself, got a circular reference on "%s".', $alias));
+            throw new InvalidArgumentException(\sprintf('An alias cannot reference itself, got a circular reference on "%s".', $alias));
         }
 
         unset($this->definitions[$alias], $this->removedIds[$alias]);
@@ -888,7 +889,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     public function getAlias(string $id): Alias
     {
         if (!isset($this->aliasDefinitions[$id])) {
-            throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));
+            throw new InvalidArgumentException(\sprintf('The service alias "%s" does not exist.', $id));
         }
 
         return $this->aliasDefinitions[$id];
@@ -900,7 +901,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * This methods allows for simple registration of service definition
      * with a fluid interface.
      */
-    public function register(string $id, string $class = null): Definition
+    public function register(string $id, ?string $class = null): Definition
     {
         return $this->setDefinition($id, new Definition($class));
     }
@@ -911,7 +912,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * This method implements a shortcut for using setDefinition() with
      * an autowired definition.
      */
-    public function autowire(string $id, string $class = null): Definition
+    public function autowire(string $id, ?string $class = null): Definition
     {
         return $this->setDefinition($id, (new Definition($class))->setAutowired(true));
     }
@@ -965,7 +966,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         }
 
         if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
-            throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id));
+            throw new InvalidArgumentException(\sprintf('Invalid service id: "%s".', $id));
         }
 
         unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
@@ -1029,18 +1030,18 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * @throws RuntimeException         When the service is a synthetic service
      * @throws InvalidArgumentException When configure callable is not callable
      */
-    private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, string $id = null, bool|object $tryProxy = true): mixed
+    private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, ?string $id = null, bool|object $tryProxy = true): mixed
     {
         if (null === $id && isset($inlineServices[$h = spl_object_hash($definition)])) {
             return $inlineServices[$h];
         }
 
         if ($definition instanceof ChildDefinition) {
-            throw new RuntimeException(sprintf('Constructing service "%s" from a parent definition is not supported at build time.', $id));
+            throw new RuntimeException(\sprintf('Constructing service "%s" from a parent definition is not supported at build time.', $id));
         }
 
         if ($definition->isSynthetic()) {
-            throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
+            throw new RuntimeException(\sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
         }
 
         if ($definition->isDeprecated()) {
@@ -1059,14 +1060,15 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
             }
 
             if (\is_array($callable) && (
-                $callable[0] instanceof Reference
+                'Closure' !== $class
+                || $callable[0] instanceof Reference
                 || $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])
             )) {
                 $initializer = function () use ($callable, &$inlineServices) {
                     return $this->doResolveServices($callable[0], $inlineServices);
                 };
 
-                $proxy = eval('return '.LazyClosure::getCode('$initializer', $callable, $definition, $this, $id).';');
+                $proxy = eval('return '.LazyClosure::getCode('$initializer', $callable, $class, $this, $id).';');
                 $this->shareService($definition, $proxy, $id, $inlineServices);
 
                 return $proxy;
@@ -1100,7 +1102,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
             if (\is_array($factory)) {
                 $factory = [$this->doResolveServices($parameterBag->resolveValue($factory[0]), $inlineServices, $isConstructorArgument), $factory[1]];
             } elseif (!\is_string($factory)) {
-                throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory.', $id));
+                throw new RuntimeException(\sprintf('Cannot create service "%s" because of invalid factory.', $id));
             } elseif (str_starts_with($factory, '@=')) {
                 $factory = fn (ServiceLocator $arguments) => $this->getExpressionLanguage()->evaluate(substr($factory, 2), ['container' => $this, 'args' => $arguments]);
                 $arguments = [new ServiceLocatorArgument($arguments)];
@@ -1123,7 +1125,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
             if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {
                 $r = new \ReflectionClass($factory[0]);
 
-                if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+                if (0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {
                     trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name);
                 }
             }
@@ -1140,7 +1142,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
                 $service = $r->getConstructor() ? $r->newInstanceArgs($arguments) : $r->newInstance();
             }
 
-            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {
                 trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);
             }
         }
@@ -1183,7 +1185,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
             }
 
             if (!\is_callable($callable)) {
-                throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_debug_type($service)));
+                throw new InvalidArgumentException(\sprintf('The configure callable for class "%s" is not a callable.', get_debug_type($service)));
             }
 
             $callable($service);
@@ -1292,7 +1294,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         foreach ($this->getDefinitions() as $id => $definition) {
             if ($definition->hasTag($name) && !$definition->hasTag('container.excluded')) {
                 if ($throwOnAbstract && $definition->isAbstract()) {
-                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
+                    throw new InvalidArgumentException(\sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
                 }
                 $tags[$id] = $definition->getTag($name);
             }
@@ -1380,16 +1382,16 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      * "$fooBar"-named arguments with $type as type-hint. Such arguments will
      * receive the service $id when autowiring is used.
      */
-    public function registerAliasForArgument(string $id, string $type, string $name = null): Alias
+    public function registerAliasForArgument(string $id, string $type, ?string $name = null): Alias
     {
         $parsedName = (new Target($name ??= $id))->getParsedName();
 
         if (!preg_match('/^[a-zA-Z_\x7f-\xff]/', $parsedName)) {
             if ($id !== $name) {
-                $id = sprintf(' for service "%s"', $id);
+                $id = \sprintf(' for service "%s"', $id);
             }
 
-            throw new InvalidArgumentException(sprintf('Invalid argument name "%s"'.$id.': the first character must be a letter.', $name));
+            throw new InvalidArgumentException(\sprintf('Invalid argument name "%s"'.$id.': the first character must be a letter.', $name));
         }
 
         if ($parsedName !== $name) {
@@ -1427,7 +1429,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      *
      * @return mixed The value with env parameters resolved if a string or an array is passed
      */
-    public function resolveEnvPlaceholders(mixed $value, string|bool $format = null, array &$usedEnvs = null): mixed
+    public function resolveEnvPlaceholders(mixed $value, string|bool|null $format = null, ?array &$usedEnvs = null): mixed
     {
         $bag = $this->getParameterBag();
         if (true === $format ??= '%%env(%s)%%') {
@@ -1461,14 +1463,14 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
                     if (true === $format) {
                         $resolved = $bag->escapeValue($this->getEnv($env));
                     } else {
-                        $resolved = sprintf($format, $env);
+                        $resolved = \sprintf($format, $env);
                     }
                     if ($placeholder === $value) {
                         $value = $resolved;
                         $completed = true;
                     } else {
                         if (!\is_string($resolved) && !is_numeric($resolved)) {
-                            throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type "%s" inside string value "%s".', $env, get_debug_type($resolved), $this->resolveEnvPlaceholders($value)));
+                            throw new RuntimeException(\sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type "%s" inside string value "%s".', $env, get_debug_type($resolved), $this->resolveEnvPlaceholders($value)));
                         }
                         $value = str_ireplace($placeholder, $resolved, $value);
                     }
@@ -1523,7 +1525,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     final public static function willBeAvailable(string $package, string $class, array $parentPackages): bool
     {
         if (!class_exists(InstalledVersions::class)) {
-            throw new \LogicException(sprintf('Calling "%s" when dependencies have been installed with Composer 1 is not supported. Consider upgrading to Composer 2.', __METHOD__));
+            throw new \LogicException(\sprintf('Calling "%s" when dependencies have been installed with Composer 1 is not supported. Consider upgrading to Composer 2.', __METHOD__));
         }
 
         if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
@@ -1726,4 +1728,18 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
         return $this->pathsInVendor[$path] = false;
     }
+
+    private function escapeParameters(array $parameters): array
+    {
+        $params = [];
+        foreach ($parameters as $k => $v) {
+            $params[$k] = match (true) {
+                \is_array($v) => $this->escapeParameters($v),
+                \is_string($v) => str_replace('%', '%%', $v),
+                default => $v,
+            };
+        }
+
+        return $params;
+    }
 }
diff --git a/lib/symfony/dependency-injection/Definition.php b/lib/symfony/dependency-injection/Definition.php
index 71e6258a8..16a71a237 100644
--- a/lib/symfony/dependency-injection/Definition.php
+++ b/lib/symfony/dependency-injection/Definition.php
@@ -61,7 +61,7 @@ class Definition
      */
     public ?int $decorationOnInvalid = null;
 
-    public function __construct(string $class = null, array $arguments = [])
+    public function __construct(?string $class = null, array $arguments = [])
     {
         if (null !== $class) {
             $this->setClass($class);
@@ -133,10 +133,10 @@ class Definition
      *
      * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
      */
-    public function setDecoratedService(?string $id, string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): static
+    public function setDecoratedService(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): static
     {
         if ($renamedId && $id === $renamedId) {
-            throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
+            throw new InvalidArgumentException(\sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
         }
 
         $this->changes['decorated_service'] = true;
@@ -180,8 +180,6 @@ class Definition
 
     /**
      * Gets the service class.
-     *
-     * @return class-string|null
      */
     public function getClass(): ?string
     {
@@ -254,15 +252,15 @@ class Definition
     public function replaceArgument(int|string $index, mixed $argument): static
     {
         if (0 === \count($this->arguments)) {
-            throw new OutOfBoundsException(sprintf('Cannot replace arguments for class "%s" if none have been configured yet.', $this->class));
+            throw new OutOfBoundsException(\sprintf('Cannot replace arguments for class "%s" if none have been configured yet.', $this->class));
         }
 
         if (\is_int($index) && ($index < 0 || $index > \count($this->arguments) - 1)) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d] of the arguments of class "%s".', $index, \count($this->arguments) - 1, $this->class));
+            throw new OutOfBoundsException(\sprintf('The index "%d" is not in the range [0, %d] of the arguments of class "%s".', $index, \count($this->arguments) - 1, $this->class));
         }
 
         if (!\array_key_exists($index, $this->arguments)) {
-            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
+            throw new OutOfBoundsException(\sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
         }
 
         $this->arguments[$index] = $argument;
@@ -298,7 +296,7 @@ class Definition
     public function getArgument(int|string $index): mixed
     {
         if (!\array_key_exists($index, $this->arguments)) {
-            throw new OutOfBoundsException(sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
+            throw new OutOfBoundsException(\sprintf('The argument "%s" doesn\'t exist in class "%s".', $index, $this->class));
         }
 
         return $this->arguments[$index];
diff --git a/lib/symfony/dependency-injection/Dumper/GraphvizDumper.php b/lib/symfony/dependency-injection/Dumper/GraphvizDumper.php
index 11342815f..e9c2c321e 100644
--- a/lib/symfony/dependency-injection/Dumper/GraphvizDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/GraphvizDumper.php
@@ -34,13 +34,13 @@ class GraphvizDumper extends Dumper
     private array $edges;
     // All values should be strings
     private array $options = [
-            'graph' => ['ratio' => 'compress'],
-            'node' => ['fontsize' => '11', 'fontname' => 'Arial', 'shape' => 'record'],
-            'edge' => ['fontsize' => '9', 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => '0.5'],
-            'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
-            'node.definition' => ['fillcolor' => '#eeeeee'],
-            'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],
-        ];
+        'graph' => ['ratio' => 'compress'],
+        'node' => ['fontsize' => '11', 'fontname' => 'Arial', 'shape' => 'record'],
+        'edge' => ['fontsize' => '9', 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => '0.5'],
+        'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
+        'node.definition' => ['fillcolor' => '#eeeeee'],
+        'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],
+    ];
 
     /**
      * Dumps the service container as a graphviz graph.
@@ -88,7 +88,7 @@ class GraphvizDumper extends Dumper
         foreach ($this->nodes as $id => $node) {
             $aliases = $this->getAliases($id);
 
-            $code .= sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
+            $code .= \sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
         }
 
         return $code;
@@ -99,7 +99,7 @@ class GraphvizDumper extends Dumper
         $code = '';
         foreach ($this->edges as $id => $edges) {
             foreach ($edges as $edge) {
-                $code .= sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"%s];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed', $edge['lazy'] ? ' color="#9999ff"' : '');
+                $code .= \sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"%s];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed', $edge['lazy'] ? ' color="#9999ff"' : '');
             }
         }
 
@@ -198,7 +198,7 @@ class GraphvizDumper extends Dumper
 
     private function startDot(): string
     {
-        return sprintf("digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
+        return \sprintf("digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
             $this->addOptions($this->options['graph']),
             $this->addOptions($this->options['node']),
             $this->addOptions($this->options['edge'])
@@ -214,7 +214,7 @@ class GraphvizDumper extends Dumper
     {
         $code = [];
         foreach ($attributes as $k => $v) {
-            $code[] = sprintf('%s="%s"', $k, $v);
+            $code[] = \sprintf('%s="%s"', $k, $v);
         }
 
         return $code ? ', '.implode(', ', $code) : '';
@@ -224,7 +224,7 @@ class GraphvizDumper extends Dumper
     {
         $code = [];
         foreach ($options as $k => $v) {
-            $code[] = sprintf('%s="%s"', $k, $v);
+            $code[] = \sprintf('%s="%s"', $k, $v);
         }
 
         return implode(' ', $code);
diff --git a/lib/symfony/dependency-injection/Dumper/PhpDumper.php b/lib/symfony/dependency-injection/Dumper/PhpDumper.php
index 65985fd9c..d55a5a100 100644
--- a/lib/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -185,7 +185,7 @@ class PhpDumper extends Dumper
         $this->class = $options['class'];
 
         if (!str_starts_with($baseClass = $options['base_class'], '\\') && 'Container' !== $baseClass) {
-            $baseClass = sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);
+            $baseClass = \sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);
             $this->baseClass = $baseClass;
         } elseif ('Container' === $baseClass) {
             $this->baseClass = Container::class;
@@ -217,7 +217,7 @@ class PhpDumper extends Dumper
                 $this->targetDirMaxMatches = $i - $lastOptionalDir;
 
                 while (--$i >= $lastOptionalDir) {
-                    $regex = sprintf('(%s%s)?', preg_quote(\DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
+                    $regex = \sprintf('(%s%s)?', preg_quote(\DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
                 }
 
                 do {
@@ -287,7 +287,7 @@ EOF;
 
             if (!$this->inlineFactories) {
                 foreach ($this->generateServiceFiles($services) as $file => [$c, $preload]) {
-                    $files[$file] = sprintf($fileTemplate, substr($file, 0, -4), $c);
+                    $files[$file] = \sprintf($fileTemplate, substr($file, 0, -4), $c);
 
                     if ($preload) {
                         $preloadedFiles[$file] = $file;
@@ -353,11 +353,11 @@ $preloadedFiles
 EOF;
 
                 foreach ($this->preload as $class) {
-                    if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void'], true)) {
+                    if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void', 'never'], true)) {
                         continue;
                     }
                     if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
-                        $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);
+                        $code[$options['class'].'.preload.php'] .= \sprintf("\$classes[] = '%s';\n", $class);
                     }
                 }
 
@@ -458,7 +458,7 @@ EOF;
         foreach ($edges as $edge) {
             $node = $edge->getDestNode();
             $id = $node->getId();
-            if ($sourceId === $id || !$node->getValue() instanceof Definition || $edge->isWeak()) {
+            if (($sourceId === $id && !$edge->isLazy()) || !$node->getValue() instanceof Definition || $edge->isWeak()) {
                 continue;
             }
 
@@ -542,7 +542,7 @@ EOF;
             return;
         }
         $file = $r->getFileName();
-        if (str_ends_with($file, ') : eval()\'d code')) {
+        if ($file && str_ends_with($file, ') : eval()\'d code')) {
             $file = substr($file, 0, strrpos($file, '(', -17));
         }
         if (!$file || $this->doExport($file) === $exportedFile = $this->export($file)) {
@@ -589,12 +589,13 @@ EOF;
                     continue;
                 }
                 do {
-                    $file = $r->getFileName();
-                    if (str_ends_with($file, ') : eval()\'d code')) {
-                        $file = substr($file, 0, strrpos($file, '(', -17));
-                    }
-                    if (is_file($file)) {
-                        $this->container->addResource(new FileResource($file));
+                    if ($file = $r->getFileName()) {
+                        if (str_ends_with($file, ') : eval()\'d code')) {
+                            $file = substr($file, 0, strrpos($file, '(', -17));
+                        }
+                        if (is_file($file)) {
+                            $this->container->addResource(new FileResource($file));
+                        }
                     }
                     $r = $r->getParentClass() ?: null;
                 } while ($r?->isUserDefined());
@@ -613,7 +614,7 @@ EOF;
                     if ($this->inlineFactories) {
                         $this->inlinedRequires[$file] = true;
                     }
-                    $code .= sprintf("include_once %s;\n", $file);
+                    $code .= \sprintf("include_once %s;\n", $file);
                 }
 
                 $proxyCode = $code.$proxyCode;
@@ -624,7 +625,9 @@ EOF;
                 $proxyCode = substr(self::stripComments($proxyCode), 5);
             }
 
-            $proxyClass = explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1];
+            $proxyClass = $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode;
+            $i = strpos($proxyClass, 'class');
+            $proxyClass = substr($proxyClass, 6 + $i, strpos($proxyClass, ' ', 7 + $i) - $i - 6);
 
             if ($this->asFiles || $this->namespace) {
                 $proxyCode .= "\nif (!\\class_exists('$proxyClass', false)) {\n    \\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n}\n";
@@ -663,7 +666,7 @@ EOF;
             }
 
             foreach (array_diff_key(array_flip($lineage), $this->inlinedRequires) as $file => $class) {
-                $code .= sprintf("        include_once %s;\n", $file);
+                $code .= \sprintf("        include_once %s;\n", $file);
             }
         }
 
@@ -671,7 +674,7 @@ EOF;
             if ($file = $def->getFile()) {
                 $file = $this->dumpValue($file);
                 $file = '(' === $file[0] ? substr($file, 1, -1) : $file;
-                $code .= sprintf("        include_once %s;\n", $file);
+                $code .= \sprintf("        include_once %s;\n", $file);
             }
         }
 
@@ -691,12 +694,11 @@ EOF;
         $class = $this->dumpValue($definition->getClass());
 
         if (str_starts_with($class, "'") && !str_contains($class, '$') && !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
+            throw new InvalidArgumentException(\sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
         }
 
         $asGhostObject = false;
         $isProxyCandidate = $this->isProxyCandidate($definition, $asGhostObject, $id);
-        $instantiation = '';
 
         $lastWitherIndex = null;
         foreach ($definition->getMethodCalls() as $k => $call) {
@@ -705,20 +707,26 @@ EOF;
             }
         }
 
-        if (!$isProxyCandidate && $definition->isShared() && !isset($this->singleUsePrivateIds[$id]) && null === $lastWitherIndex) {
-            $instantiation = sprintf('$container->%s[%s] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id), $isSimpleInstance ? '' : '$instance');
-        } elseif (!$isSimpleInstance) {
-            $instantiation = '$instance';
+        $shouldShareInline = !$isProxyCandidate && $definition->isShared() && !isset($this->singleUsePrivateIds[$id]) && null === $lastWitherIndex;
+        $serviceAccessor = \sprintf('$container->%s[%s]', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id));
+        $return = match (true) {
+            $shouldShareInline && !isset($this->circularReferences[$id]) && $isSimpleInstance => 'return '.$serviceAccessor.' = ',
+            $shouldShareInline && !isset($this->circularReferences[$id]) => $serviceAccessor.' = $instance = ',
+            $shouldShareInline || !$isSimpleInstance => '$instance = ',
+            default => 'return ',
+        };
+
+        $code = $this->addNewInstance($definition, '        '.$return, $id, $asGhostObject);
+
+        if ($shouldShareInline && isset($this->circularReferences[$id])) {
+            $code .= \sprintf(
+                "\n        if (isset(%s)) {\n            return %1\$s;\n        }\n\n        %s%1\$s = \$instance;\n",
+                $serviceAccessor,
+                $isSimpleInstance ? 'return ' : ''
+            );
         }
 
-        $return = '';
-        if ($isSimpleInstance) {
-            $return = 'return ';
-        } else {
-            $instantiation .= ' = ';
-        }
-
-        return $this->addNewInstance($definition, '        '.$return.$instantiation, $id, $asGhostObject);
+        return $code;
     }
 
     private function isTrivialInstance(Definition $definition): bool
@@ -782,12 +790,12 @@ EOF;
 
             if ($call[2] ?? false) {
                 if (null !== $sharedNonLazyId && $lastWitherIndex === $k && 'instance' === $variableName) {
-                    $witherAssignation = sprintf('$container->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
+                    $witherAssignation = \sprintf('$container->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
                 }
-                $witherAssignation .= sprintf('$%s = ', $variableName);
+                $witherAssignation .= \sprintf('$%s = ', $variableName);
             }
 
-            $calls .= $this->wrapServiceConditionals($call[1], sprintf("        %s\$%s->%s(%s);\n", $witherAssignation, $variableName, $call[0], implode(', ', $arguments)));
+            $calls .= $this->wrapServiceConditionals($call[1], \sprintf("        %s\$%s->%s(%s);\n", $witherAssignation, $variableName, $call[0], implode(', ', $arguments)));
         }
 
         return $calls;
@@ -797,7 +805,7 @@ EOF;
     {
         $code = '';
         foreach ($definition->getProperties() as $name => $value) {
-            $code .= sprintf("        \$%s->%s = %s;\n", $variableName, $name, $this->dumpValue($value));
+            $code .= \sprintf("        \$%s->%s = %s;\n", $variableName, $name, $this->dumpValue($value));
         }
 
         return $code;
@@ -811,25 +819,25 @@ EOF;
 
         if (\is_array($callable)) {
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+                || ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
             ) {
-                return sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+                return \sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
 
             $class = $this->dumpValue($callable[0]);
             // If the class is a string we can optimize away
             if (str_starts_with($class, "'") && !str_contains($class, '$')) {
-                return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
+                return \sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
             }
 
             if (str_starts_with($class, 'new ')) {
-                return sprintf("        (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+                return \sprintf("        (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
 
-            return sprintf("        [%s, '%s'](\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+            return \sprintf("        [%s, '%s'](\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
 
-        return sprintf("        %s(\$%s);\n", $callable, $variableName);
+        return \sprintf("        %s(\$%s);\n", $callable, $variableName);
     }
 
     private function addService(string $id, Definition $definition): array
@@ -843,15 +851,14 @@ EOF;
 
         if ($class = $definition->getClass()) {
             $class = $class instanceof Parameter ? '%'.$class.'%' : $this->container->resolveEnvPlaceholders($class);
-            $return[] = sprintf(str_starts_with($class, '%') ? '@return object A %1$s instance' : '@return \%s', ltrim($class, '\\'));
-        } elseif ($definition->getFactory()) {
-            $factory = $definition->getFactory();
+            $return[] = \sprintf(str_starts_with($class, '%') ? '@return object A %1$s instance' : '@return \%s', ltrim($class, '\\'));
+        } elseif ($factory = $definition->getFactory()) {
             if (\is_string($factory) && !str_starts_with($factory, '@=')) {
-                $return[] = sprintf('@return object An instance returned by %s()', $factory);
+                $return[] = \sprintf('@return object An instance returned by %s()', $factory);
             } elseif (\is_array($factory) && (\is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
                 $class = $factory[0] instanceof Definition ? $factory[0]->getClass() : (string) $factory[0];
                 $class = $class instanceof Parameter ? '%'.$class.'%' : $this->container->resolveEnvPlaceholders($class);
-                $return[] = sprintf('@return object An instance returned by %s::%s()', $class, $factory[1]);
+                $return[] = \sprintf('@return object An instance returned by %s::%s()', $class, $factory[1]);
             }
         }
 
@@ -861,7 +868,7 @@ EOF;
             }
 
             $deprecation = $definition->getDeprecation($id);
-            $return[] = sprintf('@deprecated %s', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
+            $return[] = \sprintf('@deprecated %s', ($deprecation['package'] || $deprecation['version'] ? "Since {$deprecation['package']} {$deprecation['version']}: " : '').$deprecation['message']);
         }
 
         $return = str_replace("\n     * \n", "\n     *\n", implode("\n     * ", $return));
@@ -902,14 +909,14 @@ EOF;
         }
 
         if ($definition->hasErrors() && $e = $definition->getErrors()) {
-            $code .= sprintf("        throw new RuntimeException(%s);\n", $this->export(reset($e)));
+            $code .= \sprintf("        throw new RuntimeException(%s);\n", $this->export(reset($e)));
         } else {
             $this->serviceCalls = [];
             $this->inlinedDefinitions = $this->getDefinitionsFromArguments([$definition], null, $this->serviceCalls);
 
             if ($definition->isDeprecated()) {
                 $deprecation = $definition->getDeprecation($id);
-                $code .= sprintf("        trigger_deprecation(%s, %s, %s);\n\n", $this->export($deprecation['package']), $this->export($deprecation['version']), $this->export($deprecation['message']));
+                $code .= \sprintf("        trigger_deprecation(%s, %s, %s);\n\n", $this->export($deprecation['package']), $this->export($deprecation['version']), $this->export($deprecation['message']));
             } elseif ($definition->hasTag($this->hotPathTag) || !$definition->hasTag($this->preloadTags[1])) {
                 foreach ($this->inlinedDefinitions as $def) {
                     foreach ($this->getClasses($def, $id) as $class) {
@@ -919,7 +926,7 @@ EOF;
             }
 
             if (!$definition->isShared()) {
-                $factory = sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
+                $factory = \sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
             }
 
             $asGhostObject = false;
@@ -927,17 +934,17 @@ EOF;
                 $definition = $isProxyCandidate;
 
                 if (!$definition->isShared()) {
-                    $code .= sprintf('        %s ??= ', $factory);
+                    $code .= \sprintf('        %s ??= ', $factory);
 
                     if ($definition->isPublic()) {
-                        $code .= sprintf("fn () => self::%s(\$container);\n\n", $asFile ? 'do' : $methodName);
+                        $code .= \sprintf("fn () => self::%s(\$container);\n\n", $asFile ? 'do' : $methodName);
                     } else {
-                        $code .= sprintf("self::%s(...);\n\n", $asFile ? 'do' : $methodName);
+                        $code .= \sprintf("self::%s(...);\n\n", $asFile ? 'do' : $methodName);
                     }
                 }
                 $lazyLoad = $asGhostObject ? '$proxy' : 'false';
 
-                $factoryCode = $asFile ? sprintf('self::do($container, %s)', $lazyLoad) : sprintf('self::%s($container, %s)', $methodName, $lazyLoad);
+                $factoryCode = $asFile ? \sprintf('self::do($container, %s)', $lazyLoad) : \sprintf('self::%s($container, %s)', $methodName, $lazyLoad);
                 $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $factoryCode);
             }
 
@@ -960,7 +967,7 @@ EOF;
                 $c = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $c)));
                 $lazyloadInitialization = $definition->isLazy() ? ', $lazyLoad = true' : '';
 
-                $c = sprintf("        %s = function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
+                $c = \sprintf("        %s = function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
             }
 
             $code .= $c;
@@ -1027,13 +1034,13 @@ EOF;
         $this->referenceVariables[$targetId] = new Variable($name);
 
         $reference = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $behavior ? new Reference($targetId, $behavior) : null;
-        $code .= sprintf("        \$%s = %s;\n", $name, $this->getServiceCall($targetId, $reference));
+        $code .= \sprintf("        \$%s = %s;\n", $name, $this->getServiceCall($targetId, $reference));
 
         if (!$hasSelfRef || !$forConstructor) {
             return $code;
         }
 
-        $code .= sprintf(<<<'EOTXT'
+        $code .= \sprintf(<<<'EOTXT'
 
         if (isset($container->%s[%s])) {
             return $container->%1$s[%2$s];
@@ -1048,12 +1055,12 @@ EOTXT
         return $code;
     }
 
-    private function addInlineService(string $id, Definition $definition, Definition $inlineDef = null, bool $forConstructor = true): string
+    private function addInlineService(string $id, Definition $definition, ?Definition $inlineDef = null, bool $forConstructor = true): string
     {
         $code = '';
 
         if ($isSimpleInstance = $isRootInstance = null === $inlineDef) {
-            foreach ($this->serviceCalls as $targetId => [$callCount, $behavior, $byConstructor]) {
+            foreach ($this->serviceCalls as $targetId => [, , $byConstructor]) {
                 if ($byConstructor && isset($this->circularReferences[$id][$targetId]) && !$this->circularReferences[$id][$targetId] && !($this->hasProxyDumper && $definition->isLazy())) {
                     $code .= $this->addInlineReference($id, $definition, $targetId, $forConstructor);
                 }
@@ -1108,7 +1115,7 @@ EOTXT
         return $code."\n        return \$instance;\n";
     }
 
-    private function addServices(array &$services = null): string
+    private function addServices(?array &$services = null): string
     {
         $publicServices = $privateServices = '';
         $definitions = $this->container->getDefinitions();
@@ -1150,7 +1157,7 @@ EOTXT
         }
     }
 
-    private function addNewInstance(Definition $definition, string $return = '', string $id = null, bool $asGhostObject = false): string
+    private function addNewInstance(Definition $definition, string $return = '', ?string $id = null, bool $asGhostObject = false): string
     {
         $tail = $return ? str_repeat(')', substr_count($return, '(') - substr_count($return, ')')).";\n" : '';
 
@@ -1168,9 +1175,7 @@ EOTXT
             $arguments[] = (\is_string($i) ? $i.': ' : '').$this->dumpValue($value);
         }
 
-        if (null !== $definition->getFactory()) {
-            $callable = $definition->getFactory();
-
+        if ($callable = $definition->getFactory()) {
             if ('current' === $callable && [0] === array_keys($definition->getArguments()) && \is_array($value) && [0] === array_keys($value)) {
                 return $return.$this->dumpValue($value[0]).$tail;
             }
@@ -1189,50 +1194,51 @@ EOTXT
             }
 
             if (\is_string($callable) && str_starts_with($callable, '@=')) {
-                return $return.sprintf('(($args = %s) ? (%s) : null)',
+                return $return.\sprintf('(($args = %s) ? (%s) : null)',
                     $this->dumpValue(new ServiceLocatorArgument($definition->getArguments())),
                     $this->getExpressionLanguage()->compile(substr($callable, 2), ['container' => 'container', 'args' => 'args'])
                 ).$tail;
             }
 
             if (!\is_array($callable)) {
-                return $return.sprintf('%s(%s)', $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '').$tail;
+                return $return.\sprintf('%s(%s)', $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
             if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $callable[1])) {
-                throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
+                throw new RuntimeException(\sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
             }
 
-            if (['...'] === $arguments && ($definition->isLazy() || 'Closure' !== ($definition->getClass() ?? 'Closure')) && (
+            if (['...'] === $arguments && ('Closure' !== ($class = $definition->getClass() ?: 'Closure') || $definition->isLazy() && (
                 $callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
-            )) {
+                || ($callable[0] instanceof Definition && !$this->definitionVariables->offsetExists($callable[0]))
+            ))) {
                 $initializer = 'fn () => '.$this->dumpValue($callable[0]);
+                $this->preload[LazyClosure::class] = LazyClosure::class;
 
-                return $return.LazyClosure::getCode($initializer, $callable, $definition, $this->container, $id).$tail;
+                return $return.LazyClosure::getCode($initializer, $callable, $class, $this->container, $id).$tail;
             }
 
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+                || ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
             ) {
-                return $return.sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+                return $return.\sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
             $class = $this->dumpValue($callable[0]);
             // If the class is a string we can optimize away
             if (str_starts_with($class, "'") && !str_contains($class, '$')) {
                 if ("''" === $class) {
-                    throw new RuntimeException(sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
+                    throw new RuntimeException(\sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
                 }
 
-                return $return.sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+                return $return.\sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
             if (str_starts_with($class, 'new ')) {
-                return $return.sprintf('(%s)->%s(%s)', $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+                return $return.\sprintf('(%s)->%s(%s)', $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
-            return $return.sprintf("[%s, '%s'](%s)", $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+            return $return.\sprintf("[%s, '%s'](%s)", $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
         }
 
         if (null === $class = $definition->getClass()) {
@@ -1240,14 +1246,14 @@ EOTXT
         }
 
         if (!$asGhostObject) {
-            return $return.sprintf('new %s(%s)', $this->dumpLiteralClass($this->dumpValue($class)), implode(', ', $arguments)).$tail;
+            return $return.\sprintf('new %s(%s)', $this->dumpLiteralClass($this->dumpValue($class)), implode(', ', $arguments)).$tail;
         }
 
         if (!method_exists($this->container->getParameterBag()->resolveValue($class), '__construct')) {
             return $return.'$lazyLoad'.$tail;
         }
 
-        return $return.sprintf('($lazyLoad->__construct(%s) && false ?: $lazyLoad)', implode(', ', $arguments)).$tail;
+        return $return.\sprintf('($lazyLoad->__construct(%s) && false ?: $lazyLoad)', implode(', ', $arguments)).$tail;
     }
 
     private function startClass(string $class, string $baseClass, bool $hasProxyClasses): string
@@ -1473,7 +1479,7 @@ EOF;
         ksort($definitions);
         foreach ($definitions as $id => $definition) {
             if (!$definition->isSynthetic() && $definition->isPublic() && !$this->isHotPath($definition)) {
-                $code .= sprintf("            %s => '%s',\n", $this->doExport($id), $this->generateMethodName($id));
+                $code .= \sprintf("            %s => '%s',\n", $this->doExport($id), $this->generateMethodName($id));
             }
         }
 
@@ -1565,7 +1571,7 @@ EOF;
         foreach ($lineage as $file) {
             if (!isset($this->inlinedRequires[$file])) {
                 $this->inlinedRequires[$file] = true;
-                $code .= sprintf("\n            include_once %s;", $file);
+                $code .= \sprintf("\n            include_once %s;", $file);
             }
         }
 
@@ -1573,7 +1579,7 @@ EOF;
             $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
-        return $code ? sprintf("\n        \$this->privates['service_container'] = static function (\$container) {%s\n        };\n", $code) : '';
+        return $code ? \sprintf("\n        \$this->privates['service_container'] = static function (\$container) {%s\n        };\n", $code) : '';
     }
 
     private function addDefaultParametersMethod(): string
@@ -1587,20 +1593,20 @@ EOF;
 
         foreach ($this->container->getParameterBag()->all() as $key => $value) {
             if ($key !== $resolvedKey = $this->container->resolveEnvPlaceholders($key)) {
-                throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: "%s".', $resolvedKey));
+                throw new InvalidArgumentException(\sprintf('Parameter name cannot use env parameters: "%s".', $resolvedKey));
             }
             $hasEnum = false;
             $export = $this->exportParameters([$value], '', 12, $hasEnum);
             $export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);
 
             if ($hasEnum || preg_match("/\\\$container->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w*+'\)|targetDir\.'')/", $export[1])) {
-                $dynamicPhp[$key] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
+                $dynamicPhp[$key] = \sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
                 $this->dynamicParameters[$key] = true;
             } else {
-                $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
+                $php[] = \sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
             }
         }
-        $parameters = sprintf("[\n%s\n%s]", implode("\n", $php), str_repeat(' ', 8));
+        $parameters = \sprintf("[\n%s\n%s]", implode("\n", $php), str_repeat(' ', 8));
 
         $code = <<<'EOF'
 
@@ -1610,27 +1616,28 @@ EOF;
             trigger_deprecation(...self::DEPRECATED_PARAMETERS[$name]);
         }
 
-        if (isset($this->buildParameters[$name])) {
+        if (\array_key_exists($name, $this->buildParameters)) {
             return $this->buildParameters[$name];
         }
 
-        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
-            throw new ParameterNotFoundException($name);
-        }
         if (isset($this->loadedDynamicParameters[$name])) {
             return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
         }
 
+        if (!\array_key_exists($name, $this->parameters) || '.' === ($name[0] ?? '')) {
+            throw new ParameterNotFoundException($name);
+        }
+
         return $this->parameters[$name];
     }
 
     public function hasParameter(string $name): bool
     {
-        if (isset($this->buildParameters[$name])) {
+        if (\array_key_exists($name, $this->buildParameters)) {
             return true;
         }
 
-        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
+        return \array_key_exists($name, $this->parameters) || isset($this->loadedDynamicParameters[$name]);
     }
 
     public function setParameter(string $name, $value): void
@@ -1677,7 +1684,7 @@ EOF;
 
         return $this->dynamicParameters[$name] = $value;
 EOF;
-            $getDynamicParameter = sprintf($getDynamicParameter, implode("\n", $dynamicPhp));
+            $getDynamicParameter = \sprintf($getDynamicParameter, implode("\n", $dynamicPhp));
         } else {
             $loadedDynamicParameters = '[]';
             $getDynamicParameter = str_repeat(' ', 8).'throw new ParameterNotFoundException($name);';
@@ -1713,26 +1720,26 @@ EOF;
             if (\is_array($value)) {
                 $value = $this->exportParameters($value, $path.'/'.$key, $indent + 4, $hasEnum);
             } elseif ($value instanceof ArgumentInterface) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain special arguments. "%s" found in "%s".', get_debug_type($value), $path.'/'.$key));
+                throw new InvalidArgumentException(\sprintf('You cannot dump a container with parameters that contain special arguments. "%s" found in "%s".', get_debug_type($value), $path.'/'.$key));
             } elseif ($value instanceof Variable) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain variable references. Variable "%s" found in "%s".', $value, $path.'/'.$key));
+                throw new InvalidArgumentException(\sprintf('You cannot dump a container with parameters that contain variable references. Variable "%s" found in "%s".', $value, $path.'/'.$key));
             } elseif ($value instanceof Definition) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain service definitions. Definition for "%s" found in "%s".', $value->getClass(), $path.'/'.$key));
+                throw new InvalidArgumentException(\sprintf('You cannot dump a container with parameters that contain service definitions. Definition for "%s" found in "%s".', $value->getClass(), $path.'/'.$key));
             } elseif ($value instanceof Reference) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain references to other services (reference to service "%s" found in "%s").', $value, $path.'/'.$key));
+                throw new InvalidArgumentException(\sprintf('You cannot dump a container with parameters that contain references to other services (reference to service "%s" found in "%s").', $value, $path.'/'.$key));
             } elseif ($value instanceof Expression) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain expressions. Expression "%s" found in "%s".', $value, $path.'/'.$key));
+                throw new InvalidArgumentException(\sprintf('You cannot dump a container with parameters that contain expressions. Expression "%s" found in "%s".', $value, $path.'/'.$key));
             } elseif ($value instanceof \UnitEnum) {
                 $hasEnum = true;
-                $value = sprintf('\%s::%s', $value::class, $value->name);
+                $value = \sprintf('\%s::%s', $value::class, $value->name);
             } else {
                 $value = $this->export($value);
             }
 
-            $php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), $this->export($key), $value);
+            $php[] = \sprintf('%s%s => %s,', str_repeat(' ', $indent), $this->export($key), $value);
         }
 
-        return sprintf("[\n%s\n%s]", implode("\n", $php), str_repeat(' ', $indent - 4));
+        return \sprintf("[\n%s\n%s]", implode("\n", $php), str_repeat(' ', $indent - 4));
     }
 
     private function endClass(): string
@@ -1752,7 +1759,7 @@ EOF;
         // re-indent the wrapped code
         $code = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $code)));
 
-        return sprintf("        if (%s) {\n%s        }\n", $condition, $code);
+        return \sprintf("        if (%s) {\n%s        }\n", $condition, $code);
     }
 
     private function getServiceConditionals(mixed $value): string
@@ -1762,14 +1769,14 @@ EOF;
             if (!$this->container->hasDefinition($service)) {
                 return 'false';
             }
-            $conditions[] = sprintf('isset($container->%s[%s])', $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));
+            $conditions[] = \sprintf('isset($container->%s[%s])', $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));
         }
         foreach (ContainerBuilder::getServiceConditionals($value) as $service) {
             if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {
                 continue;
             }
 
-            $conditions[] = sprintf('$container->has(%s)', $this->doExport($service));
+            $conditions[] = \sprintf('$container->has(%s)', $this->doExport($service));
         }
 
         if (!$conditions) {
@@ -1779,7 +1786,7 @@ EOF;
         return implode(' && ', $conditions);
     }
 
-    private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage $definitions = null, array &$calls = [], bool $byConstructor = null): \SplObjectStorage
+    private function getDefinitionsFromArguments(array $arguments, ?\SplObjectStorage $definitions = null, array &$calls = [], ?bool $byConstructor = null): \SplObjectStorage
     {
         $definitions ??= new \SplObjectStorage();
 
@@ -1828,10 +1835,10 @@ EOF;
             $isList = array_is_list($value);
             $code = [];
             foreach ($value as $k => $v) {
-                $code[] = $isList ? $this->dumpValue($v, $interpolate) : sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
+                $code[] = $isList ? $this->dumpValue($v, $interpolate) : \sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
             }
 
-            return sprintf('[%s]', implode(', ', $code));
+            return \sprintf('[%s]', implode(', ', $code));
         } elseif ($value instanceof ArgumentInterface) {
             $scope = [$this->definitionVariables, $this->referenceVariables];
             $this->definitionVariables = $this->referenceVariables = null;
@@ -1843,7 +1850,15 @@ EOF;
 
                     $returnedType = '';
                     if ($value instanceof TypedReference) {
-                        $returnedType = sprintf(': %s\%s', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $value->getInvalidBehavior() ? '' : '?', str_replace(['|', '&'], ['|\\', '&\\'], $value->getType()));
+                        $type = $value->getType();
+                        $nullable = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $value->getInvalidBehavior() ? '' : '?';
+
+                        if ('?' === ($type[0] ?? '')) {
+                            $type = substr($type, 1);
+                            $nullable = '?';
+                        }
+
+                        $returnedType = \sprintf(': %s\%s', $nullable, str_replace(['|', '&'], ['|\\', '&\\'], $type));
                     }
 
                     $attribute = '';
@@ -1854,10 +1869,10 @@ EOF;
                             $attribute .= ', class: '.$this->dumpValue($class, $interpolate);
                         }
 
-                        $attribute = sprintf('#[\Closure(%s)] ', $attribute);
+                        $attribute = \sprintf('#[\Closure(%s)] ', $attribute);
                     }
 
-                    return sprintf('%sfn ()%s => %s', $attribute, $returnedType, $code);
+                    return \sprintf('%sfn ()%s => %s', $attribute, $returnedType, $code);
                 }
 
                 if ($value instanceof IteratorArgument) {
@@ -1871,7 +1886,7 @@ EOF;
                     $operands = [0];
                     foreach ($values as $k => $v) {
                         ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
-                        $v = $this->wrapServiceConditionals($v, sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));
+                        $v = $this->wrapServiceConditionals($v, \sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));
                         foreach (explode("\n", $v) as $v) {
                             if ($v) {
                                 $code[] = '    '.$v;
@@ -1879,7 +1894,7 @@ EOF;
                         }
                     }
 
-                    $code[] = sprintf('        }, %s)', \count($operands) > 1 ? 'fn () => '.implode(' + ', $operands) : $operands[0]);
+                    $code[] = \sprintf('        }, %s)', \count($operands) > 1 ? 'fn () => '.implode(' + ', $operands) : $operands[0]);
 
                     return implode("\n", $code);
                 }
@@ -1889,8 +1904,8 @@ EOF;
                     $serviceTypes = '';
                     foreach ($value->getValues() as $k => $v) {
                         if (!$v instanceof Reference) {
-                            $serviceMap .= sprintf("\n            %s => [%s],", $this->export($k), $this->dumpValue($v));
-                            $serviceTypes .= sprintf("\n            %s => '?',", $this->export($k));
+                            $serviceMap .= \sprintf("\n            %s => [%s],", $this->export($k), $this->dumpValue($v));
+                            $serviceTypes .= \sprintf("\n            %s => '?',", $this->export($k));
                             continue;
                         }
                         $id = (string) $v;
@@ -1899,28 +1914,28 @@ EOF;
                         }
                         $definition = $this->container->getDefinition($id);
                         $load = !($definition->hasErrors() && $e = $definition->getErrors()) ? $this->asFiles && !$this->inlineFactories && !$this->isHotPath($definition) : reset($e);
-                        $serviceMap .= sprintf("\n            %s => [%s, %s, %s, %s],",
+                        $serviceMap .= \sprintf("\n            %s => [%s, %s, %s, %s],",
                             $this->export($k),
                             $this->export($definition->isShared() ? ($definition->isPublic() ? 'services' : 'privates') : false),
                             $this->doExport($id),
                             $this->export(ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE !== $v->getInvalidBehavior() && !\is_string($load) ? $this->generateMethodName($id) : null),
                             $this->export($load)
                         );
-                        $serviceTypes .= sprintf("\n            %s => %s,", $this->export($k), $this->export($v instanceof TypedReference ? $v->getType() : '?'));
+                        $serviceTypes .= \sprintf("\n            %s => %s,", $this->export($k), $this->export($v instanceof TypedReference ? $v->getType() : '?'));
                         $this->locatedIds[$id] = true;
                     }
                     $this->addGetService = true;
 
-                    return sprintf('new \%s($container->getService ??= $container->getService(...), [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
+                    return \sprintf('new \%s($container->getService ??= $container->getService(...), [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
                 }
             } finally {
                 [$this->definitionVariables, $this->referenceVariables] = $scope;
             }
         } elseif ($value instanceof Definition) {
             if ($value->hasErrors() && $e = $value->getErrors()) {
-                return sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
+                return \sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
             }
-            if ($this->definitionVariables?->contains($value)) {
+            if ($this->definitionVariables?->offsetExists($value)) {
                 return $this->dumpValue($this->definitionVariables[$value], $interpolate);
             }
             if ($value->getMethodCalls()) {
@@ -1965,11 +1980,11 @@ EOF;
                 return $code;
             }
         } elseif ($value instanceof \UnitEnum) {
-            return sprintf('\%s::%s', $value::class, $value->name);
+            return \sprintf('\%s::%s', $value::class, $value->name);
         } elseif ($value instanceof AbstractArgument) {
             throw new RuntimeException($value->getTextWithContext());
         } elseif (\is_object($value) || \is_resource($value)) {
-            throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
+            throw new RuntimeException(\sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
         }
 
         return $this->export($value);
@@ -1983,10 +1998,10 @@ EOF;
     private function dumpLiteralClass(string $class): string
     {
         if (str_contains($class, '$')) {
-            return sprintf('${($_ = %s) && false ?: "_"}', $class);
+            return \sprintf('${($_ = %s) && false ?: "_"}', $class);
         }
         if (!str_starts_with($class, "'") || !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
-            throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s).', $class ?: 'n/a'));
+            throw new RuntimeException(\sprintf('Cannot dump definition because of invalid class name (%s).', $class ?: 'n/a'));
         }
 
         $class = substr(str_replace('\\\\', '\\', $class), 1, -1);
@@ -1997,7 +2012,7 @@ EOF;
     private function dumpParameter(string $name): string
     {
         if (!$this->container->hasParameter($name) || ($this->dynamicParameters[$name] ?? false)) {
-            return sprintf('$container->getParameter(%s)', $this->doExport($name));
+            return \sprintf('$container->getParameter(%s)', $this->doExport($name));
         }
 
         $value = $this->container->getParameter($name);
@@ -2007,10 +2022,10 @@ EOF;
             return $dumpedValue;
         }
 
-        return sprintf('$container->parameters[%s]', $this->doExport($name));
+        return \sprintf('$container->parameters[%s]', $this->doExport($name));
     }
 
-    private function getServiceCall(string $id, Reference $reference = null): string
+    private function getServiceCall(string $id, ?Reference $reference = null): string
     {
         while ($this->container->hasAlias($id)) {
             $id = (string) $this->container->getAlias($id);
@@ -2022,7 +2037,7 @@ EOF;
 
         if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {
             if ($definition->isSynthetic()) {
-                $code = sprintf('$container->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
+                $code = \sprintf('$container->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
             } elseif (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) {
                 $code = 'null';
                 if (!$definition->isShared()) {
@@ -2030,24 +2045,24 @@ EOF;
                 }
             } elseif ($this->isTrivialInstance($definition)) {
                 if ($definition->hasErrors() && $e = $definition->getErrors()) {
-                    return sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
+                    return \sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
                 }
                 $code = $this->addNewInstance($definition, '', $id);
                 if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {
-                    return sprintf('($container->%s[%s] ??= %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
+                    return \sprintf('($container->%s[%s] ??= %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
                 }
                 $code = "($code)";
             } else {
                 $code = $this->asFiles && !$this->inlineFactories && !$this->isHotPath($definition) ? "\$container->load('%s')" : 'self::%s($container)';
-                $code = sprintf($code, $this->generateMethodName($id));
+                $code = \sprintf($code, $this->generateMethodName($id));
 
                 if (!$definition->isShared()) {
-                    $factory = sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
-                    $code = sprintf('(isset(%s) ? %1$s($container) : %s)', $factory, $code);
+                    $factory = \sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
+                    $code = \sprintf('(isset(%s) ? %1$s($container) : %s)', $factory, $code);
                 }
             }
             if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {
-                $code = sprintf('($container->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
+                $code = \sprintf('($container->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
             }
 
             return $code;
@@ -2056,12 +2071,12 @@ EOF;
             return 'null';
         }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $reference->getInvalidBehavior()) {
-            $code = sprintf('$container->get(%s, ContainerInterface::NULL_ON_INVALID_REFERENCE)', $this->doExport($id));
+            $code = \sprintf('$container->get(%s, ContainerInterface::NULL_ON_INVALID_REFERENCE)', $this->doExport($id));
         } else {
-            $code = sprintf('$container->get(%s)', $this->doExport($id));
+            $code = \sprintf('$container->get(%s)', $this->doExport($id));
         }
 
-        return sprintf('($container->services[%s] ?? %s)', $this->doExport($id), $code);
+        return \sprintf('($container->services[%s] ?? %s)', $this->doExport($id), $code);
     }
 
     /**
@@ -2152,7 +2167,7 @@ EOF;
                     return $this->getServiceCall($id);
                 }
 
-                return sprintf('$container->get(%s)', $arg);
+                return \sprintf('$container->get(%s)', $arg);
             });
 
             if ($this->container->isTrackingResources()) {
@@ -2180,7 +2195,13 @@ EOF;
             if (!$value = $edge->getSourceNode()->getValue()) {
                 continue;
             }
-            if ($edge->isLazy() || !$value instanceof Definition || !$value->isShared()) {
+            if ($edge->isLazy() || !$value instanceof Definition || !$value->isShared() || $edge->isFromMultiUseArgument()) {
+                return false;
+            }
+
+            // When the source node is a proxy or ghost, it will construct its references only when the node itself is initialized.
+            // Since the node can be cloned before being fully initialized, we do not know how often its references are used.
+            if ($this->getProxyDumper()->isProxyCandidate($value)) {
                 return false;
             }
             $ids[$edge->getSourceNode()->getId()] = true;
@@ -2208,13 +2229,13 @@ EOF;
             $offset = 2 + $this->targetDirMaxMatches - \count($matches);
 
             if (0 < $offset) {
-                $dirname = sprintf('\dirname(__DIR__, %d)', $offset + (int) $this->asFiles);
+                $dirname = \sprintf('\dirname(__DIR__, %d)', $offset + (int) $this->asFiles);
             } elseif ($this->asFiles) {
                 $dirname = "\$container->targetDir.''"; // empty string concatenation on purpose
             }
 
             if ($prefix || $suffix) {
-                return sprintf('(%s%s%s)', $prefix, $dirname, $suffix);
+                return \sprintf('(%s%s%s)', $prefix, $dirname, $suffix);
             }
 
             return $dirname;
@@ -2291,36 +2312,35 @@ EOF;
     private function getClasses(Definition $definition, string $id): array
     {
         $classes = [];
-        $resolve = $this->container->getParameterBag()->resolveValue(...);
 
         while ($definition instanceof Definition) {
             foreach ($definition->getTag($this->preloadTags[0]) as $tag) {
                 if (!isset($tag['class'])) {
-                    throw new InvalidArgumentException(sprintf('Missing attribute "class" on tag "%s" for service "%s".', $this->preloadTags[0], $id));
+                    throw new InvalidArgumentException(\sprintf('Missing attribute "class" on tag "%s" for service "%s".', $this->preloadTags[0], $id));
                 }
 
                 $classes[] = trim($tag['class'], '\\');
             }
 
             if ($class = $definition->getClass()) {
-                $classes[] = trim($resolve($class), '\\');
+                $classes[] = trim($class, '\\');
             }
             $factory = $definition->getFactory();
 
-            if (!\is_array($factory)) {
-                $factory = [$factory];
+            if (\is_string($factory) && !str_starts_with($factory, '@=') && str_contains($factory, '::')) {
+                $factory = explode('::', $factory);
             }
 
-            if (\is_string($factory[0])) {
-                $factory[0] = $resolve($factory[0]);
+            if (!\is_array($factory)) {
+                $definition = $factory;
+                continue;
+            }
 
-                if (false !== $i = strrpos($factory[0], '::')) {
-                    $factory[0] = substr($factory[0], 0, $i);
-                }
+            $definition = $factory[0] ?? null;
+
+            if (\is_string($definition)) {
                 $classes[] = trim($factory[0], '\\');
             }
-
-            $definition = $factory[0];
         }
 
         return $classes;
diff --git a/lib/symfony/dependency-injection/Dumper/Preloader.php b/lib/symfony/dependency-injection/Dumper/Preloader.php
index 8caa1de48..d4d4c9b5a 100644
--- a/lib/symfony/dependency-injection/Dumper/Preloader.php
+++ b/lib/symfony/dependency-injection/Dumper/Preloader.php
@@ -19,7 +19,7 @@ final class Preloader
     public static function append(string $file, array $list): void
     {
         if (!file_exists($file)) {
-            throw new \LogicException(sprintf('File "%s" does not exist.', $file));
+            throw new \LogicException(\sprintf('File "%s" does not exist.', $file));
         }
 
         $cacheDir = \dirname($file);
@@ -27,14 +27,14 @@ final class Preloader
 
         foreach ($list as $item) {
             if (str_starts_with($item, $cacheDir)) {
-                file_put_contents($file, sprintf("require_once __DIR__.%s;\n", var_export(strtr(substr($item, \strlen($cacheDir)), \DIRECTORY_SEPARATOR, '/'), true)), \FILE_APPEND);
+                file_put_contents($file, \sprintf("require_once __DIR__.%s;\n", var_export(strtr(substr($item, \strlen($cacheDir)), \DIRECTORY_SEPARATOR, '/'), true)), \FILE_APPEND);
                 continue;
             }
 
-            $classes[] = sprintf("\$classes[] = %s;\n", var_export($item, true));
+            $classes[] = \sprintf("\$classes[] = %s;\n", var_export($item, true));
         }
 
-        file_put_contents($file, sprintf("\n\$classes = [];\n%s\$preloaded = Preloader::preload(\$classes, \$preloaded);\n", implode('', $classes)), \FILE_APPEND);
+        file_put_contents($file, \sprintf("\n\$classes = [];\n%s\$preloaded = Preloader::preload(\$classes, \$preloaded);\n", implode('', $classes)), \FILE_APPEND);
     }
 
     public static function preload(array $classes, array $preloaded = []): array
diff --git a/lib/symfony/dependency-injection/Dumper/XmlDumper.php b/lib/symfony/dependency-injection/Dumper/XmlDumper.php
index 05d424d15..7c38455b5 100644
--- a/lib/symfony/dependency-injection/Dumper/XmlDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/XmlDumper.php
@@ -134,16 +134,17 @@ class XmlDumper extends Dumper
         foreach ($tags as $name => $tags) {
             foreach ($tags as $attributes) {
                 $tag = $this->document->createElement('tag');
-                if (!\array_key_exists('name', $attributes)) {
-                    $tag->setAttribute('name', $name);
-                } else {
-                    $tag->appendChild($this->document->createTextNode($name));
-                }
 
                 // Check if we have recursive attributes
                 if (array_filter($attributes, \is_array(...))) {
+                    $tag->setAttribute('name', $name);
                     $this->addTagRecursiveAttributes($tag, $attributes);
                 } else {
+                    if (!\array_key_exists('name', $attributes)) {
+                        $tag->setAttribute('name', $name);
+                    } else {
+                        $tag->appendChild($this->document->createTextNode($name));
+                    }
                     foreach ($attributes as $key => $value) {
                         $tag->setAttribute($key, $value ?? '');
                     }
@@ -421,9 +422,9 @@ class XmlDumper extends Dumper
             case $value instanceof Parameter:
                 return '%'.$value.'%';
             case $value instanceof \UnitEnum:
-                return sprintf('%s::%s', $value::class, $value->name);
+                return \sprintf('%s::%s', $value::class, $value->name);
             case \is_object($value) || \is_resource($value):
-                throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
+                throw new RuntimeException(\sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
             default:
                 return (string) $value;
         }
diff --git a/lib/symfony/dependency-injection/Dumper/YamlDumper.php b/lib/symfony/dependency-injection/Dumper/YamlDumper.php
index 5c96e3b32..4a120b644 100644
--- a/lib/symfony/dependency-injection/Dumper/YamlDumper.php
+++ b/lib/symfony/dependency-injection/Dumper/YamlDumper.php
@@ -50,22 +50,22 @@ class YamlDumper extends Dumper
 
         $this->dumper ??= new YmlDumper();
 
-        return $this->container->resolveEnvPlaceholders($this->addParameters()."\n".$this->addServices());
+        return $this->addParameters()."\n".$this->addServices();
     }
 
     private function addService(string $id, Definition $definition): string
     {
-        $code = "    $id:\n";
+        $code = "    {$this->dumper->dump($id)}:\n";
         if ($class = $definition->getClass()) {
             if (str_starts_with($class, '\\')) {
                 $class = substr($class, 1);
             }
 
-            $code .= sprintf("        class: %s\n", $this->dumper->dump($class));
+            $code .= \sprintf("        class: %s\n", $this->dumper->dump($this->container->resolveEnvPlaceholders($class)));
         }
 
         if (!$definition->isPrivate()) {
-            $code .= sprintf("        public: %s\n", $definition->isPublic() ? 'true' : 'false');
+            $code .= \sprintf("        public: %s\n", $definition->isPublic() ? 'true' : 'false');
         }
 
         $tagsCode = '';
@@ -75,11 +75,11 @@ class YamlDumper extends Dumper
             foreach ($tags as $attributes) {
                 $att = [];
                 foreach ($attributes as $key => $value) {
-                    $att[] = sprintf('%s: %s', $this->dumper->dump($key), $this->dumper->dump($value));
+                    $att[] = \sprintf('%s: %s', $this->dumper->dump($key), $this->dumper->dump($value));
                 }
                 $att = $att ? ': { '.implode(', ', $att).' }' : '';
 
-                $tagsCode .= sprintf("            - %s%s\n", $this->dumper->dump($name), $att);
+                $tagsCode .= \sprintf("            - %s%s\n", $this->dumper->dump($name), $att);
             }
         }
         if ($tagsCode) {
@@ -87,7 +87,7 @@ class YamlDumper extends Dumper
         }
 
         if ($definition->getFile()) {
-            $code .= sprintf("        file: %s\n", $this->dumper->dump($definition->getFile()));
+            $code .= \sprintf("        file: %s\n", $this->dumper->dump($this->container->resolveEnvPlaceholders($definition->getFile())));
         }
 
         if ($definition->isSynthetic()) {
@@ -98,7 +98,7 @@ class YamlDumper extends Dumper
             $code .= "        deprecated:\n";
             foreach ($definition->getDeprecation('%service_id%') as $key => $value) {
                 if ('' !== $value) {
-                    $code .= sprintf("            %s: %s\n", $key, $this->dumper->dump($value));
+                    $code .= \sprintf("            %s: %s\n", $key, $this->dumper->dump($value));
                 }
             }
         }
@@ -120,15 +120,15 @@ class YamlDumper extends Dumper
         }
 
         if ($definition->getArguments()) {
-            $code .= sprintf("        arguments: %s\n", $this->dumper->dump($this->dumpValue($definition->getArguments()), 0));
+            $code .= \sprintf("        arguments: %s\n", $this->dumper->dump($this->dumpValue($definition->getArguments()), 0));
         }
 
         if ($definition->getProperties()) {
-            $code .= sprintf("        properties: %s\n", $this->dumper->dump($this->dumpValue($definition->getProperties()), 0));
+            $code .= \sprintf("        properties: %s\n", $this->dumper->dump($this->dumpValue($definition->getProperties()), 0));
         }
 
         if ($definition->getMethodCalls()) {
-            $code .= sprintf("        calls:\n%s\n", $this->dumper->dump($this->dumpValue($definition->getMethodCalls()), 1, 12));
+            $code .= \sprintf("        calls:\n%s\n", $this->dumper->dump($this->dumpValue($definition->getMethodCalls()), 1, 12));
         }
 
         if (!$definition->isShared()) {
@@ -137,31 +137,31 @@ class YamlDumper extends Dumper
 
         if (null !== $decoratedService = $definition->getDecoratedService()) {
             [$decorated, $renamedId, $priority] = $decoratedService;
-            $code .= sprintf("        decorates: %s\n", $decorated);
+            $code .= \sprintf("        decorates: %s\n", $decorated);
             if (null !== $renamedId) {
-                $code .= sprintf("        decoration_inner_name: %s\n", $renamedId);
+                $code .= \sprintf("        decoration_inner_name: %s\n", $renamedId);
             }
             if (0 !== $priority) {
-                $code .= sprintf("        decoration_priority: %s\n", $priority);
+                $code .= \sprintf("        decoration_priority: %s\n", $priority);
             }
 
             $decorationOnInvalid = $decoratedService[3] ?? ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
             if (\in_array($decorationOnInvalid, [ContainerInterface::IGNORE_ON_INVALID_REFERENCE, ContainerInterface::NULL_ON_INVALID_REFERENCE])) {
                 $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE === $decorationOnInvalid ? 'null' : 'ignore';
-                $code .= sprintf("        decoration_on_invalid: %s\n", $invalidBehavior);
+                $code .= \sprintf("        decoration_on_invalid: %s\n", $invalidBehavior);
             }
         }
 
         if ($callable = $definition->getFactory()) {
             if (\is_array($callable) && ['Closure', 'fromCallable'] !== $callable && $definition->getClass() === $callable[0]) {
-                $code .= sprintf("        constructor: %s\n", $callable[1]);
+                $code .= \sprintf("        constructor: %s\n", $callable[1]);
             } else {
-                $code .= sprintf("        factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
+                $code .= \sprintf("        factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
             }
         }
 
         if ($callable = $definition->getConfigurator()) {
-            $code .= sprintf("        configurator: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
+            $code .= \sprintf("        configurator: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
         }
 
         return $code;
@@ -176,20 +176,20 @@ class YamlDumper extends Dumper
 
             foreach ($id->getDeprecation('%alias_id%') as $key => $value) {
                 if ('' !== $value) {
-                    $deprecated .= sprintf("            %s: %s\n", $key, $value);
+                    $deprecated .= \sprintf("            %s: %s\n", $key, $value);
                 }
             }
         }
 
         if (!$id->isDeprecated() && $id->isPrivate()) {
-            return sprintf("    %s: '@%s'\n", $alias, $id);
+            return \sprintf("    %s: '@%s'\n", $alias, $id);
         }
 
         if ($id->isPublic()) {
             $deprecated = "        public: true\n".$deprecated;
         }
 
-        return sprintf("    %s:\n        alias: %s\n%s", $alias, $id, $deprecated);
+        return \sprintf("    %s:\n        alias: %s\n%s", $alias, $id, $deprecated);
     }
 
     private function addServices(): string
@@ -238,7 +238,7 @@ class YamlDumper extends Dumper
             }
         }
 
-        return $callable;
+        return $this->container->resolveEnvPlaceholders($callable);
     }
 
     /**
@@ -290,7 +290,7 @@ class YamlDumper extends Dumper
             } elseif ($value instanceof ServiceLocatorArgument) {
                 $tag = 'service_locator';
             } else {
-                throw new RuntimeException(sprintf('Unspecified Yaml tag for type "%s".', get_debug_type($value)));
+                throw new RuntimeException(\sprintf('Unspecified Yaml tag for type "%s".', get_debug_type($value)));
             }
 
             return new TaggedValue($tag, $this->dumpValue($value->getValues()));
@@ -299,7 +299,7 @@ class YamlDumper extends Dumper
         if (\is_array($value)) {
             $code = [];
             foreach ($value as $k => $v) {
-                $code[$k] = $this->dumpValue($v);
+                $code[$this->container->resolveEnvPlaceholders($k)] = $this->dumpValue($v);
             }
 
             return $code;
@@ -312,38 +312,38 @@ class YamlDumper extends Dumper
         } elseif ($value instanceof Definition) {
             return new TaggedValue('service', (new Parser())->parse("_:\n".$this->addService('_', $value), Yaml::PARSE_CUSTOM_TAGS)['_']['_']);
         } elseif ($value instanceof \UnitEnum) {
-            return new TaggedValue('php/const', sprintf('%s::%s', $value::class, $value->name));
+            return new TaggedValue('php/const', \sprintf('%s::%s', $value::class, $value->name));
         } elseif ($value instanceof AbstractArgument) {
             return new TaggedValue('abstract', $value->getText());
         } elseif (\is_object($value) || \is_resource($value)) {
-            throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
+            throw new RuntimeException(\sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
         }
 
-        return $value;
+        return $this->container->resolveEnvPlaceholders($value);
     }
 
-    private function getServiceCall(string $id, Reference $reference = null): string
+    private function getServiceCall(string $id, ?Reference $reference = null): string
     {
         if (null !== $reference) {
             switch ($reference->getInvalidBehavior()) {
                 case ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE: break;
                 case ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE: break;
-                case ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE: return sprintf('@!%s', $id);
-                default: return sprintf('@?%s', $id);
+                case ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE: return \sprintf('@!%s', $id);
+                default: return \sprintf('@?%s', $id);
             }
         }
 
-        return sprintf('@%s', $id);
+        return \sprintf('@%s', $id);
     }
 
     private function getParameterCall(string $id): string
     {
-        return sprintf('%%%s%%', $id);
+        return \sprintf('%%%s%%', $id);
     }
 
     private function getExpressionCall(string $expression): string
     {
-        return sprintf('@=%s', $expression);
+        return \sprintf('@=%s', $expression);
     }
 
     private function prepareParameters(array $parameters, bool $escape = true): array
@@ -359,7 +359,7 @@ class YamlDumper extends Dumper
             $filtered[$key] = $value;
         }
 
-        return $escape ? $this->escape($filtered) : $filtered;
+        return $escape ? $this->container->resolveEnvPlaceholders($this->escape($filtered)) : $filtered;
     }
 
     private function escape(array $arguments): array
diff --git a/lib/symfony/dependency-injection/EnvVarLoaderInterface.php b/lib/symfony/dependency-injection/EnvVarLoaderInterface.php
index 0c547f8a5..803156be2 100644
--- a/lib/symfony/dependency-injection/EnvVarLoaderInterface.php
+++ b/lib/symfony/dependency-injection/EnvVarLoaderInterface.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\DependencyInjection;
 interface EnvVarLoaderInterface
 {
     /**
-     * @return string[] Key/value pairs that can be accessed using the regular "%env()%" syntax
+     * @return array<string|\Stringable> Key/value pairs that can be accessed using the regular "%env()%" syntax
      */
     public function loadEnvVars(): array;
 }
diff --git a/lib/symfony/dependency-injection/EnvVarProcessor.php b/lib/symfony/dependency-injection/EnvVarProcessor.php
index bae5e289d..b5bf0b22c 100644
--- a/lib/symfony/dependency-injection/EnvVarProcessor.php
+++ b/lib/symfony/dependency-injection/EnvVarProcessor.php
@@ -28,7 +28,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
     /**
      * @param \Traversable<EnvVarLoaderInterface>|null $loaders
      */
-    public function __construct(ContainerInterface $container, \Traversable $loaders = null)
+    public function __construct(ContainerInterface $container, ?\Traversable $loaders = null)
     {
         $this->container = $container;
         $this->loaders = $loaders ?? new \ArrayIterator();
@@ -66,7 +66,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('key' === $prefix) {
             if (false === $i) {
-                throw new RuntimeException(sprintf('Invalid env "key:%s": a key specifier should be provided.', $name));
+                throw new RuntimeException(\sprintf('Invalid env "key:%s": a key specifier should be provided.', $name));
             }
 
             $next = substr($name, $i + 1);
@@ -74,11 +74,11 @@ class EnvVarProcessor implements EnvVarProcessorInterface
             $array = $getEnv($next);
 
             if (!\is_array($array)) {
-                throw new RuntimeException(sprintf('Resolved value of "%s" did not result in an array value.', $next));
+                throw new RuntimeException(\sprintf('Resolved value of "%s" did not result in an array value.', $next));
             }
 
             if (!isset($array[$key]) && !\array_key_exists($key, $array)) {
-                throw new EnvNotFoundException(sprintf('Key "%s" not found in %s (resolved from "%s").', $key, json_encode($array), $next));
+                throw new EnvNotFoundException(\sprintf('Key "%s" not found in %s (resolved from "%s").', $key, json_encode($array), $next));
             }
 
             return $array[$key];
@@ -86,7 +86,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('enum' === $prefix) {
             if (false === $i) {
-                throw new RuntimeException(sprintf('Invalid env "enum:%s": a "%s" class-string should be provided.', $name, \BackedEnum::class));
+                throw new RuntimeException(\sprintf('Invalid env "enum:%s": a "%s" class-string should be provided.', $name, \BackedEnum::class));
             }
 
             $next = substr($name, $i + 1);
@@ -94,14 +94,14 @@ class EnvVarProcessor implements EnvVarProcessorInterface
             $backedEnumValue = $getEnv($next);
 
             if (!\is_string($backedEnumValue) && !\is_int($backedEnumValue)) {
-                throw new RuntimeException(sprintf('Resolved value of "%s" did not result in a string or int value.', $next));
+                throw new RuntimeException(\sprintf('Resolved value of "%s" did not result in a string or int value.', $next));
             }
 
             if (!is_subclass_of($backedEnumClassName, \BackedEnum::class)) {
-                throw new RuntimeException(sprintf('"%s" is not a "%s".', $backedEnumClassName, \BackedEnum::class));
+                throw new RuntimeException(\sprintf('"%s" is not a "%s".', $backedEnumClassName, \BackedEnum::class));
             }
 
-            return $backedEnumClassName::tryFrom($backedEnumValue) ?? throw new RuntimeException(sprintf('Enum value "%s" is not backed by "%s".', $backedEnumValue, $backedEnumClassName));
+            return $backedEnumClassName::tryFrom($backedEnumValue) ?? throw new RuntimeException(\sprintf('Enum value "%s" is not backed by "%s".', $backedEnumValue, $backedEnumClassName));
         }
 
         if ('defined' === $prefix) {
@@ -114,14 +114,14 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('default' === $prefix) {
             if (false === $i) {
-                throw new RuntimeException(sprintf('Invalid env "default:%s": a fallback parameter should be provided.', $name));
+                throw new RuntimeException(\sprintf('Invalid env "default:%s": a fallback parameter should be provided.', $name));
             }
 
             $next = substr($name, $i + 1);
             $default = substr($name, 0, $i);
 
             if ('' !== $default && !$this->container->hasParameter($default)) {
-                throw new RuntimeException(sprintf('Invalid env fallback in "default:%s": parameter "%s" not found.', $name, $default));
+                throw new RuntimeException(\sprintf('Invalid env fallback in "default:%s": parameter "%s" not found.', $name, $default));
             }
 
             try {
@@ -139,10 +139,10 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('file' === $prefix || 'require' === $prefix) {
             if (!\is_scalar($file = $getEnv($name))) {
-                throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
+                throw new RuntimeException(\sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
             }
             if (!is_file($file)) {
-                throw new EnvNotFoundException(sprintf('File "%s" not found (resolved from "%s").', $file, $name));
+                throw new EnvNotFoundException(\sprintf('File "%s" not found (resolved from "%s").', $file, $name));
             }
 
             if ('file' === $prefix) {
@@ -164,10 +164,16 @@ class EnvVarProcessor implements EnvVarProcessorInterface
         if (false !== $i || 'string' !== $prefix) {
             $env = $getEnv($name);
         } elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))
-            || (false !== $env && false === ($env = $env ?? getenv($name) ?? false)) // null is a possible value because of thread safety issues
+            || (false !== $env && false === $env ??= getenv($name) ?? false) // null is a possible value because of thread safety issues
         ) {
-            foreach ($this->loadedVars as $vars) {
-                if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
+            foreach ($this->loadedVars as $i => $vars) {
+                if (false === $env = $vars[$name] ?? $env) {
+                    continue;
+                }
+                if ($env instanceof \Stringable) {
+                    $this->loadedVars[$i][$name] = $env = (string) $env;
+                }
+                if ('' !== ($env ?? '')) {
                     break;
                 }
             }
@@ -185,7 +191,13 @@ class EnvVarProcessor implements EnvVarProcessorInterface
                             continue;
                         }
                         $this->loadedVars[] = $vars = $loader->loadEnvVars();
-                        if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
+                        if (false === $env = $vars[$name] ?? $env) {
+                            continue;
+                        }
+                        if ($env instanceof \Stringable) {
+                            $this->loadedVars[array_key_last($this->loadedVars)][$name] = $env = (string) $env;
+                        }
+                        if ('' !== ($env ?? '')) {
                             $ended = false;
                             break;
                         }
@@ -202,7 +214,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
             if (false === $env) {
                 if (!$this->container->hasParameter("env($name)")) {
-                    throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
+                    throw new EnvNotFoundException(\sprintf('Environment variable not found: "%s".', $name));
                 }
 
                 $env = $this->container->getParameter("env($name)");
@@ -215,7 +227,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
             }
 
             if (!isset($this->getProvidedTypes()[$prefix])) {
-                throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
+                throw new RuntimeException(\sprintf('Unsupported env var prefix "%s".', $prefix));
             }
 
             if (!\in_array($prefix, ['string', 'bool', 'not', 'int', 'float'], true)) {
@@ -224,13 +236,13 @@ class EnvVarProcessor implements EnvVarProcessorInterface
         }
 
         if ('shuffle' === $prefix) {
-            \is_array($env) ? shuffle($env) : throw new RuntimeException(sprintf('Env var "%s" cannot be shuffled, expected array, got "%s".', $name, get_debug_type($env)));
+            \is_array($env) ? shuffle($env) : throw new RuntimeException(\sprintf('Env var "%s" cannot be shuffled, expected array, got "%s".', $name, get_debug_type($env)));
 
             return $env;
         }
 
         if (null !== $env && !\is_scalar($env)) {
-            throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
+            throw new RuntimeException(\sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
         }
 
         if ('string' === $prefix) {
@@ -245,7 +257,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('int' === $prefix) {
             if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {
-                throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
+                throw new RuntimeException(\sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
             }
 
             return (int) $env;
@@ -253,7 +265,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('float' === $prefix) {
             if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {
-                throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
+                throw new RuntimeException(\sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
             }
 
             return (float) $env;
@@ -261,7 +273,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 
         if ('const' === $prefix) {
             if (!\defined($env)) {
-                throw new RuntimeException(sprintf('Env var "%s" maps to undefined constant "%s".', $name, $env));
+                throw new RuntimeException(\sprintf('Env var "%s" maps to undefined constant "%s".', $name, $env));
             }
 
             return \constant($env);
@@ -275,26 +287,26 @@ class EnvVarProcessor implements EnvVarProcessorInterface
             $env = json_decode($env, true);
 
             if (\JSON_ERROR_NONE !== json_last_error()) {
-                throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());
+                throw new RuntimeException(\sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());
             }
 
             if (null !== $env && !\is_array($env)) {
-                throw new RuntimeException(sprintf('Invalid JSON env var "%s": array or null expected, "%s" given.', $name, get_debug_type($env)));
+                throw new RuntimeException(\sprintf('Invalid JSON env var "%s": array or null expected, "%s" given.', $name, get_debug_type($env)));
             }
 
             return $env;
         }
 
         if ('url' === $prefix) {
-            $parsedEnv = parse_url($env);
+            $params = parse_url($env);
 
-            if (false === $parsedEnv) {
-                throw new RuntimeException(sprintf('Invalid URL in env var "%s".', $name));
+            if (false === $params) {
+                throw new RuntimeException(\sprintf('Invalid URL in env var "%s".', $name));
             }
-            if (!isset($parsedEnv['scheme'], $parsedEnv['host'])) {
-                throw new RuntimeException(sprintf('Invalid URL env var "%s": schema and host expected, "%s" given.', $name, $env));
+            if (!isset($params['scheme'], $params['host'])) {
+                throw new RuntimeException(\sprintf('Invalid URL in env var "%s": scheme and host expected.', $name));
             }
-            $parsedEnv += [
+            $params += [
                 'port' => null,
                 'user' => null,
                 'pass' => null,
@@ -303,14 +315,17 @@ class EnvVarProcessor implements EnvVarProcessorInterface
                 'fragment' => null,
             ];
 
-            // remove the '/' separator
-            $parsedEnv['path'] = '/' === ($parsedEnv['path'] ?? '/') ? '' : substr($parsedEnv['path'], 1);
+            $params['user'] = null !== $params['user'] ? rawurldecode($params['user']) : null;
+            $params['pass'] = null !== $params['pass'] ? rawurldecode($params['pass']) : null;
 
-            return $parsedEnv;
+            // remove the '/' separator
+            $params['path'] = '/' === ($params['path'] ?? '/') ? '' : substr($params['path'], 1);
+
+            return $params;
         }
 
         if ('query_string' === $prefix) {
-            $queryString = parse_url($env, \PHP_URL_QUERY) ?: $env;
+            $queryString = parse_url($env, \PHP_URL_QUERY) ?: (parse_url($env, \PHP_URL_SCHEME) ? '' : $env);
             parse_str($queryString, $result);
 
             return $result;
@@ -329,7 +344,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
                 }
 
                 if (!\is_scalar($value)) {
-                    throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, get_debug_type($value)));
+                    throw new RuntimeException(\sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, get_debug_type($value)));
                 }
 
                 return $value;
@@ -344,6 +359,6 @@ class EnvVarProcessor implements EnvVarProcessorInterface
             return trim($env);
         }
 
-        throw new RuntimeException(sprintf('Unsupported env var prefix "%s" for env name "%s".', $prefix, $name));
+        throw new RuntimeException(\sprintf('Unsupported env var prefix "%s" for env name "%s".', $prefix, $name));
     }
 }
diff --git a/lib/symfony/dependency-injection/Exception/AutowiringFailedException.php b/lib/symfony/dependency-injection/Exception/AutowiringFailedException.php
index 5f22fa53b..872e2609b 100644
--- a/lib/symfony/dependency-injection/Exception/AutowiringFailedException.php
+++ b/lib/symfony/dependency-injection/Exception/AutowiringFailedException.php
@@ -19,13 +19,11 @@ class AutowiringFailedException extends RuntimeException
     private string $serviceId;
     private ?\Closure $messageCallback = null;
 
-    public function __construct(string $serviceId, string|\Closure $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(string $serviceId, string|\Closure $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         $this->serviceId = $serviceId;
 
-        if ($message instanceof \Closure
-            && (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))
-        ) {
+        if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) {
             $message = $message();
         }
 
diff --git a/lib/symfony/dependency-injection/Exception/EnvParameterException.php b/lib/symfony/dependency-injection/Exception/EnvParameterException.php
index 48b5e486a..4d71b8755 100644
--- a/lib/symfony/dependency-injection/Exception/EnvParameterException.php
+++ b/lib/symfony/dependency-injection/Exception/EnvParameterException.php
@@ -18,8 +18,8 @@ namespace Symfony\Component\DependencyInjection\Exception;
  */
 class EnvParameterException extends InvalidArgumentException
 {
-    public function __construct(array $envs, \Throwable $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.')
+    public function __construct(array $envs, ?\Throwable $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.')
     {
-        parent::__construct(sprintf($message, implode('", "', $envs)), 0, $previous);
+        parent::__construct(\sprintf($message, implode('", "', $envs)), 0, $previous);
     }
 }
diff --git a/lib/symfony/dependency-injection/Exception/InvalidParameterTypeException.php b/lib/symfony/dependency-injection/Exception/InvalidParameterTypeException.php
index 2a11626fe..9be66a4a2 100644
--- a/lib/symfony/dependency-injection/Exception/InvalidParameterTypeException.php
+++ b/lib/symfony/dependency-injection/Exception/InvalidParameterTypeException.php
@@ -27,9 +27,9 @@ class InvalidParameterTypeException extends InvalidArgumentException
 
         $function = $parameter->getDeclaringFunction();
         $functionName = $function instanceof \ReflectionMethod
-            ? sprintf('%s::%s', $function->getDeclaringClass()->getName(), $function->getName())
+            ? \sprintf('%s::%s', $function->getDeclaringClass()->getName(), $function->getName())
             : $function->getName();
 
-        parent::__construct(sprintf('Invalid definition for service "%s": argument %d of "%s()" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $functionName, $acceptedType, $type));
+        parent::__construct(\sprintf('Invalid definition for service "%s": argument %d of "%s()" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $functionName, $acceptedType, $type));
     }
 }
diff --git a/lib/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php b/lib/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php
index 9fc3b50b6..f2ea41c28 100644
--- a/lib/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php
+++ b/lib/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php
@@ -20,9 +20,9 @@ class ParameterCircularReferenceException extends RuntimeException
 {
     private array $parameters;
 
-    public function __construct(array $parameters, \Throwable $previous = null)
+    public function __construct(array $parameters, ?\Throwable $previous = null)
     {
-        parent::__construct(sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous);
+        parent::__construct(\sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous);
 
         $this->parameters = $parameters;
     }
diff --git a/lib/symfony/dependency-injection/Exception/ParameterNotFoundException.php b/lib/symfony/dependency-injection/Exception/ParameterNotFoundException.php
index 69f7b3a50..894bea3ef 100644
--- a/lib/symfony/dependency-injection/Exception/ParameterNotFoundException.php
+++ b/lib/symfony/dependency-injection/Exception/ParameterNotFoundException.php
@@ -34,7 +34,7 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
      * @param string[]        $alternatives         Some parameter name alternatives
      * @param string|null     $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
      */
-    public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Throwable $previous = null, array $alternatives = [], string $nonNestedAlternative = null)
+    public function __construct(string $key, ?string $sourceId = null, ?string $sourceKey = null, ?\Throwable $previous = null, array $alternatives = [], ?string $nonNestedAlternative = null)
     {
         $this->key = $key;
         $this->sourceId = $sourceId;
@@ -53,13 +53,13 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
     public function updateRepr()
     {
         if (null !== $this->sourceId) {
-            $this->message = sprintf('The service "%s" has a dependency on a non-existent parameter "%s".', $this->sourceId, $this->key);
+            $this->message = \sprintf('The service "%s" has a dependency on a non-existent parameter "%s".', $this->sourceId, $this->key);
         } elseif (null !== $this->sourceKey) {
-            $this->message = sprintf('The parameter "%s" has a dependency on a non-existent parameter "%s".', $this->sourceKey, $this->key);
+            $this->message = \sprintf('The parameter "%s" has a dependency on a non-existent parameter "%s".', $this->sourceKey, $this->key);
         } elseif ('.' === ($this->key[0] ?? '')) {
-            $this->message = sprintf('Parameter "%s" not found. It was probably deleted during the compilation of the container.', $this->key);
+            $this->message = \sprintf('Parameter "%s" not found. It was probably deleted during the compilation of the container.', $this->key);
         } else {
-            $this->message = sprintf('You have requested a non-existent parameter "%s".', $this->key);
+            $this->message = \sprintf('You have requested a non-existent parameter "%s".', $this->key);
         }
 
         if ($this->alternatives) {
diff --git a/lib/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php b/lib/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php
index d62c22567..4929785a0 100644
--- a/lib/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php
+++ b/lib/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php
@@ -21,9 +21,9 @@ class ServiceCircularReferenceException extends RuntimeException
     private string $serviceId;
     private array $path;
 
-    public function __construct(string $serviceId, array $path, \Throwable $previous = null)
+    public function __construct(string $serviceId, array $path, ?\Throwable $previous = null)
     {
-        parent::__construct(sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous);
+        parent::__construct(\sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous);
 
         $this->serviceId = $serviceId;
         $this->path = $path;
diff --git a/lib/symfony/dependency-injection/Exception/ServiceNotFoundException.php b/lib/symfony/dependency-injection/Exception/ServiceNotFoundException.php
index d56db7727..60a0c85f0 100644
--- a/lib/symfony/dependency-injection/Exception/ServiceNotFoundException.php
+++ b/lib/symfony/dependency-injection/Exception/ServiceNotFoundException.php
@@ -24,14 +24,14 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
     private ?string $sourceId;
     private array $alternatives;
 
-    public function __construct(string $id, string $sourceId = null, \Throwable $previous = null, array $alternatives = [], string $msg = null)
+    public function __construct(string $id, ?string $sourceId = null, ?\Throwable $previous = null, array $alternatives = [], ?string $msg = null)
     {
         if (null !== $msg) {
             // no-op
         } elseif (null === $sourceId) {
-            $msg = sprintf('You have requested a non-existent service "%s".', $id);
+            $msg = \sprintf('You have requested a non-existent service "%s".', $id);
         } else {
-            $msg = sprintf('The service "%s" has a dependency on a non-existent service "%s".', $sourceId, $id);
+            $msg = \sprintf('The service "%s" has a dependency on a non-existent service "%s".', $sourceId, $id);
         }
 
         if ($alternatives) {
diff --git a/lib/symfony/dependency-injection/ExpressionLanguage.php b/lib/symfony/dependency-injection/ExpressionLanguage.php
index 1a7f5fd38..84d45dbdd 100644
--- a/lib/symfony/dependency-injection/ExpressionLanguage.php
+++ b/lib/symfony/dependency-injection/ExpressionLanguage.php
@@ -27,7 +27,7 @@ if (!class_exists(BaseExpressionLanguage::class)) {
  */
 class ExpressionLanguage extends BaseExpressionLanguage
 {
-    public function __construct(CacheItemPoolInterface $cache = null, array $providers = [], callable $serviceCompiler = null, \Closure $getEnv = null)
+    public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [], ?callable $serviceCompiler = null, ?\Closure $getEnv = null)
     {
         // prepend the default provider to let users override it easily
         array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler, $getEnv));
diff --git a/lib/symfony/dependency-injection/ExpressionLanguageProvider.php b/lib/symfony/dependency-injection/ExpressionLanguageProvider.php
index d0cc1f70b..e66484e93 100644
--- a/lib/symfony/dependency-injection/ExpressionLanguageProvider.php
+++ b/lib/symfony/dependency-injection/ExpressionLanguageProvider.php
@@ -30,7 +30,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 
     private ?\Closure $getEnv;
 
-    public function __construct(callable $serviceCompiler = null, \Closure $getEnv = null)
+    public function __construct(?callable $serviceCompiler = null, ?\Closure $getEnv = null)
     {
         $this->serviceCompiler = null === $serviceCompiler ? null : $serviceCompiler(...);
         $this->getEnv = $getEnv;
@@ -39,19 +39,19 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
     public function getFunctions(): array
     {
         return [
-            new ExpressionFunction('service', $this->serviceCompiler ?? fn ($arg) => sprintf('$container->get(%s)', $arg), fn (array $variables, $value) => $variables['container']->get($value)),
+            new ExpressionFunction('service', $this->serviceCompiler ?? fn ($arg) => \sprintf('$container->get(%s)', $arg), fn (array $variables, $value) => $variables['container']->get($value)),
 
-            new ExpressionFunction('parameter', fn ($arg) => sprintf('$container->getParameter(%s)', $arg), fn (array $variables, $value) => $variables['container']->getParameter($value)),
+            new ExpressionFunction('parameter', fn ($arg) => \sprintf('$container->getParameter(%s)', $arg), fn (array $variables, $value) => $variables['container']->getParameter($value)),
 
-            new ExpressionFunction('env', fn ($arg) => sprintf('$container->getEnv(%s)', $arg), function (array $variables, $value) {
+            new ExpressionFunction('env', fn ($arg) => \sprintf('$container->getEnv(%s)', $arg), function (array $variables, $value) {
                 if (!$this->getEnv) {
-                    throw new LogicException('You need to pass a getEnv closure to the expression langage provider to use the "env" function.');
+                    throw new LogicException('You need to pass a getEnv closure to the expression language provider to use the "env" function.');
                 }
 
                 return ($this->getEnv)($value);
             }),
 
-            new ExpressionFunction('arg', fn ($arg) => sprintf('$args?->get(%s)', $arg), fn (array $variables, $value) => $variables['args']?->get($value)),
+            new ExpressionFunction('arg', fn ($arg) => \sprintf('$args?->get(%s)', $arg), fn (array $variables, $value) => $variables['args']?->get($value)),
         ];
     }
 }
diff --git a/lib/symfony/dependency-injection/Extension/Extension.php b/lib/symfony/dependency-injection/Extension/Extension.php
index d0bd05ea4..03d08d6d6 100644
--- a/lib/symfony/dependency-injection/Extension/Extension.php
+++ b/lib/symfony/dependency-injection/Extension/Extension.php
@@ -92,7 +92,7 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
         }
 
         if (!$class->implementsInterface(ConfigurationInterface::class)) {
-            throw new LogicException(sprintf('The extension configuration class "%s" must implement "%s".', $class->getName(), ConfigurationInterface::class));
+            throw new LogicException(\sprintf('The extension configuration class "%s" must implement "%s".', $class->getName(), ConfigurationInterface::class));
         }
 
         if (!($constructor = $class->getConstructor()) || !$constructor->getNumberOfRequiredParameters()) {
diff --git a/lib/symfony/dependency-injection/LazyProxy/Instantiator/LazyServiceInstantiator.php b/lib/symfony/dependency-injection/LazyProxy/Instantiator/LazyServiceInstantiator.php
index 40b128df7..f5e7dead5 100644
--- a/lib/symfony/dependency-injection/LazyProxy/Instantiator/LazyServiceInstantiator.php
+++ b/lib/symfony/dependency-injection/LazyProxy/Instantiator/LazyServiceInstantiator.php
@@ -26,7 +26,7 @@ final class LazyServiceInstantiator implements InstantiatorInterface
         $dumper = new LazyServiceDumper();
 
         if (!$dumper->isProxyCandidate($definition, $asGhostObject, $id)) {
-            throw new InvalidArgumentException(sprintf('Cannot instantiate lazy proxy for service "%s".', $id));
+            throw new InvalidArgumentException(\sprintf('Cannot instantiate lazy proxy for service "%s".', $id));
         }
 
         if (!class_exists($proxyClass = $dumper->getProxyClass($definition, $asGhostObject), false)) {
diff --git a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
index 520977763..b8f31ee41 100644
--- a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
+++ b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
@@ -26,7 +26,7 @@ interface DumperInterface
      * @param bool|null   &$asGhostObject Set to true after the call if the proxy is a ghost object
      * @param string|null $id
      */
-    public function isProxyCandidate(Definition $definition/* , bool &$asGhostObject = null, string $id = null */): bool;
+    public function isProxyCandidate(Definition $definition/* , ?bool &$asGhostObject = null, ?string $id = null */): bool;
 
     /**
      * Generates the code to be used to instantiate a proxy in the dumped factory code.
@@ -38,5 +38,5 @@ interface DumperInterface
      *
      * @param string|null $id
      */
-    public function getProxyCode(Definition $definition/* , string $id = null */): string;
+    public function getProxyCode(Definition $definition/* , ?string $id = null */): string;
 }
diff --git a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/LazyServiceDumper.php b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/LazyServiceDumper.php
index 2571fccbf..c03bc5cb5 100644
--- a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/LazyServiceDumper.php
+++ b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -26,13 +26,13 @@ final class LazyServiceDumper implements DumperInterface
     ) {
     }
 
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         $asGhostObject = false;
 
         if ($definition->hasTag('proxy')) {
             if (!$definition->isLazy()) {
-                throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": setting the "proxy" tag on a service requires it to be "lazy".', $id ?? $definition->getClass()));
+                throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": setting the "proxy" tag on a service requires it to be "lazy".', $id ?? $definition->getClass()));
             }
 
             return true;
@@ -69,7 +69,7 @@ final class LazyServiceDumper implements DumperInterface
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $container->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
+            $instantiation .= \sprintf(' $container->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
         }
 
         $asGhostObject = str_contains($factoryCode, '$proxy');
@@ -85,7 +85,7 @@ final class LazyServiceDumper implements DumperInterface
             EOF;
         }
 
-        $factoryCode = sprintf('static fn ($proxy) => %s', $factoryCode);
+        $factoryCode = \sprintf('static fn ($proxy) => %s', $factoryCode);
 
         return <<<EOF
                 if (true === \$lazyLoad) {
@@ -96,18 +96,18 @@ final class LazyServiceDumper implements DumperInterface
         EOF;
     }
 
-    public function getProxyCode(Definition $definition, string $id = null): string
+    public function getProxyCode(Definition $definition, ?string $id = null): string
     {
         if (!$this->isProxyCandidate($definition, $asGhostObject, $id)) {
-            throw new InvalidArgumentException(sprintf('Cannot instantiate lazy proxy for service "%s".', $id ?? $definition->getClass()));
+            throw new InvalidArgumentException(\sprintf('Cannot instantiate lazy proxy for service "%s".', $id ?? $definition->getClass()));
         }
         $proxyClass = $this->getProxyClass($definition, $asGhostObject, $class);
 
         if ($asGhostObject) {
             try {
-                return 'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
+                return (\PHP_VERSION_ID >= 80200 && $class?->isReadOnly() ? 'readonly ' : '').'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
             } catch (LogicException $e) {
-                throw new InvalidArgumentException(sprintf('Cannot generate lazy ghost for service "%s".', $id ?? $definition->getClass()), 0, $e);
+                throw new InvalidArgumentException(\sprintf('Cannot generate lazy ghost for service "%s".', $id ?? $definition->getClass()), 0, $e);
             }
         }
         $interfaces = [];
@@ -115,13 +115,13 @@ final class LazyServiceDumper implements DumperInterface
         if ($definition->hasTag('proxy')) {
             foreach ($definition->getTag('proxy') as $tag) {
                 if (!isset($tag['interface'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": the "interface" attribute is missing on a "proxy" tag.', $id ?? $definition->getClass()));
+                    throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": the "interface" attribute is missing on a "proxy" tag.', $id ?? $definition->getClass()));
                 }
                 if (!interface_exists($tag['interface']) && !class_exists($tag['interface'], false)) {
-                    throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": several "proxy" tags found but "%s" is not an interface.', $id ?? $definition->getClass(), $tag['interface']));
+                    throw new InvalidArgumentException(\sprintf('Invalid definition for service "%s": several "proxy" tags found but "%s" is not an interface.', $id ?? $definition->getClass(), $tag['interface']));
                 }
                 if ('object' !== $definition->getClass() && !is_a($class->name, $tag['interface'], true)) {
-                    throw new InvalidArgumentException(sprintf('Invalid "proxy" tag for service "%s": class "%s" doesn\'t implement "%s".', $id ?? $definition->getClass(), $definition->getClass(), $tag['interface']));
+                    throw new InvalidArgumentException(\sprintf('Invalid "proxy" tag for service "%s": class "%s" doesn\'t implement "%s".', $id ?? $definition->getClass(), $definition->getClass(), $tag['interface']));
                 }
                 $interfaces[] = new \ReflectionClass($tag['interface']);
             }
@@ -135,11 +135,11 @@ final class LazyServiceDumper implements DumperInterface
         try {
             return (\PHP_VERSION_ID >= 80200 && $class?->isReadOnly() ? 'readonly ' : '').'class '.$proxyClass.ProxyHelper::generateLazyProxy($class, $interfaces);
         } catch (LogicException $e) {
-            throw new InvalidArgumentException(sprintf('Cannot generate lazy proxy for service "%s".', $id ?? $definition->getClass()), 0, $e);
+            throw new InvalidArgumentException(\sprintf('Cannot generate lazy proxy for service "%s".', $id ?? $definition->getClass()), 0, $e);
         }
     }
 
-    public function getProxyClass(Definition $definition, bool $asGhostObject, \ReflectionClass &$class = null): string
+    public function getProxyClass(Definition $definition, bool $asGhostObject, ?\ReflectionClass &$class = null): string
     {
         $class = 'object' !== $definition->getClass() ? $definition->getClass() : 'stdClass';
         $class = new \ReflectionClass($class);
diff --git a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php
index daa6fed79..c987b19d4 100644
--- a/lib/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php
+++ b/lib/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php
@@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\Definition;
  */
 class NullDumper implements DumperInterface
 {
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         return $asGhostObject = false;
     }
@@ -32,7 +32,7 @@ class NullDumper implements DumperInterface
         return '';
     }
 
-    public function getProxyCode(Definition $definition, string $id = null): string
+    public function getProxyCode(Definition $definition, ?string $id = null): string
     {
         return '';
     }
diff --git a/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php b/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
index bde7d6a3f..a1c05ea09 100644
--- a/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
+++ b/lib/symfony/dependency-injection/LazyProxy/ProxyHelper.php
@@ -23,7 +23,7 @@ class ProxyHelper
     /**
      * @return string|null The FQCN or builtin name of the type hint, or null when the type hint references an invalid self|parent context
      */
-    public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, bool $noBuiltin = false): ?string
+    public static function getTypeHint(\ReflectionFunctionAbstract $r, ?\ReflectionParameter $p = null, bool $noBuiltin = false): ?string
     {
         if ($p instanceof \ReflectionParameter) {
             $type = $p->getType();
@@ -59,7 +59,7 @@ class ProxyHelper
                     return null;
                 }
 
-                $types[] = sprintf('(%s)', $typeHint);
+                $types[] = \sprintf('(%s)', $typeHint);
 
                 continue;
             }
diff --git a/lib/symfony/dependency-injection/Loader/ClosureLoader.php b/lib/symfony/dependency-injection/Loader/ClosureLoader.php
index 94305ae94..1e3061d4f 100644
--- a/lib/symfony/dependency-injection/Loader/ClosureLoader.php
+++ b/lib/symfony/dependency-injection/Loader/ClosureLoader.php
@@ -25,18 +25,18 @@ class ClosureLoader extends Loader
 {
     private ContainerBuilder $container;
 
-    public function __construct(ContainerBuilder $container, string $env = null)
+    public function __construct(ContainerBuilder $container, ?string $env = null)
     {
         $this->container = $container;
         parent::__construct($env);
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         return $resource($this->container, $this->env);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return $resource instanceof \Closure;
     }
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
index a2aa85387..d96eacb6d 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
@@ -43,18 +43,15 @@ abstract class AbstractConfigurator
             return $this->{'set'.$method}(...$args);
         }
 
-        throw new \BadMethodCallException(sprintf('Call to undefined method "%s::%s()".', static::class, $method));
+        throw new \BadMethodCallException(\sprintf('Call to undefined method "%s::%s()".', static::class, $method));
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
@@ -98,7 +95,7 @@ abstract class AbstractConfigurator
         }
 
         if ($value instanceof self) {
-            throw new InvalidArgumentException(sprintf('"%s()" can be used only at the root of service configuration files.', $value::FACTORY));
+            throw new InvalidArgumentException(\sprintf('"%s()" can be used only at the root of service configuration files.', $value::FACTORY));
         }
 
         switch (true) {
@@ -118,6 +115,6 @@ abstract class AbstractConfigurator
                 }
         }
 
-        throw new InvalidArgumentException(sprintf('Cannot use values of type "%s" in service configuration files.', get_debug_type($value)));
+        throw new InvalidArgumentException(\sprintf('Cannot use values of type "%s" in service configuration files.', get_debug_type($value)));
     }
 }
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/AbstractServiceConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/AbstractServiceConfigurator.php
index abf88ff25..02ca9d4cd 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/AbstractServiceConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/AbstractServiceConfigurator.php
@@ -20,7 +20,7 @@ abstract class AbstractServiceConfigurator extends AbstractConfigurator
     protected $id;
     private array $defaultTags = [];
 
-    public function __construct(ServicesConfigurator $parent, Definition $definition, string $id = null, array $defaultTags = [])
+    public function __construct(ServicesConfigurator $parent, Definition $definition, ?string $id = null, array $defaultTags = [])
     {
         $this->parent = $parent;
         $this->definition = $definition;
@@ -42,7 +42,7 @@ abstract class AbstractServiceConfigurator extends AbstractConfigurator
     /**
      * Registers a service.
      */
-    final public function set(?string $id, string $class = null): ServiceConfigurator
+    final public function set(?string $id, ?string $class = null): ServiceConfigurator
     {
         $this->__destruct();
 
@@ -106,7 +106,7 @@ abstract class AbstractServiceConfigurator extends AbstractConfigurator
     /**
      * Registers a service.
      */
-    final public function __invoke(string $id, string $class = null): ServiceConfigurator
+    final public function __invoke(string $id, ?string $class = null): ServiceConfigurator
     {
         $this->__destruct();
 
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
index 52d03fb09..25fd9fd09 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
@@ -38,7 +38,7 @@ class ContainerConfigurator extends AbstractConfigurator
     private int $anonymousCount = 0;
     private ?string $env;
 
-    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file, string $env = null)
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file, ?string $env = null)
     {
         $this->container = $container;
         $this->loader = $loader;
@@ -52,13 +52,13 @@ class ContainerConfigurator extends AbstractConfigurator
     {
         if (!$this->container->hasExtension($namespace)) {
             $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
-            throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $this->file, $namespace, $extensions ? implode('", "', $extensions) : 'none'));
+            throw new InvalidArgumentException(\sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $this->file, $namespace, $extensions ? implode('", "', $extensions) : 'none'));
         }
 
         $this->container->loadFromExtension($namespace, static::processValue($config));
     }
 
-    final public function import(string $resource, string $type = null, bool|string $ignoreErrors = false): void
+    final public function import(string $resource, ?string $type = null, bool|string $ignoreErrors = false): void
     {
         $this->loader->setCurrentDir(\dirname($this->path));
         $this->loader->import($resource, $type, $ignoreErrors, $this->file);
@@ -111,7 +111,7 @@ function service(string $serviceId): ReferenceConfigurator
 /**
  * Creates an inline service.
  */
-function inline_service(string $class = null): InlineServiceConfigurator
+function inline_service(?string $class = null): InlineServiceConfigurator
 {
     return new InlineServiceConfigurator(new Definition($class));
 }
@@ -145,7 +145,7 @@ function iterator(array $values): IteratorArgument
 /**
  * Creates a lazy iterator by tag name.
  */
-function tagged_iterator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, string $defaultPriorityMethod = null, string|array $exclude = [], bool $excludeSelf = true): TaggedIteratorArgument
+function tagged_iterator(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, ?string $defaultPriorityMethod = null, string|array $exclude = [], bool $excludeSelf = true): TaggedIteratorArgument
 {
     return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, false, $defaultPriorityMethod, (array) $exclude, $excludeSelf);
 }
@@ -153,7 +153,7 @@ function tagged_iterator(string $tag, string $indexAttribute = null, string $def
 /**
  * Creates a service locator by tag name.
  */
-function tagged_locator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, string $defaultPriorityMethod = null, string|array $exclude = [], bool $excludeSelf = true): ServiceLocatorArgument
+function tagged_locator(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, ?string $defaultPriorityMethod = null, string|array $exclude = [], bool $excludeSelf = true): ServiceLocatorArgument
 {
     return new ServiceLocatorArgument(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, true, $defaultPriorityMethod, (array) $exclude, $excludeSelf));
 }
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/DefaultsConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/DefaultsConfigurator.php
index 2236cd77a..16efd4bf1 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/DefaultsConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/DefaultsConfigurator.php
@@ -28,7 +28,7 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
 
     private ?string $path;
 
-    public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null)
+    public function __construct(ServicesConfigurator $parent, Definition $definition, ?string $path = null)
     {
         parent::__construct($parent, $definition, null, []);
 
@@ -70,7 +70,7 @@ class DefaultsConfigurator extends AbstractServiceConfigurator
                 $this->validateAttributes($tag, $value, [...$path, $name]);
             } elseif (!\is_scalar($value ?? '')) {
                 $name = implode('.', [...$path, $name]);
-                throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type or an array of scalar-type.', $tag, $name));
+                throw new InvalidArgumentException(\sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type or an array of scalar-type.', $tag, $name));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/InstanceofConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/InstanceofConfigurator.php
index 2db004051..9de0baa4c 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/InstanceofConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/InstanceofConfigurator.php
@@ -33,7 +33,7 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
 
     private ?string $path;
 
-    public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, string $path = null)
+    public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, ?string $path = null)
     {
         parent::__construct($parent, $definition, $id, []);
 
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/ParametersConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/ParametersConfigurator.php
index df5a94b43..c1dec2a31 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/ParametersConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/ParametersConfigurator.php
@@ -35,7 +35,7 @@ class ParametersConfigurator extends AbstractConfigurator
     final public function set(string $name, mixed $value): static
     {
         if ($value instanceof Expression) {
-            throw new InvalidArgumentException(sprintf('Using an expression in parameter "%s" is not allowed.', $name));
+            throw new InvalidArgumentException(\sprintf('Using an expression in parameter "%s" is not allowed.', $name));
         }
 
         $this->container->setParameter($name, static::processValue($value, true));
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
index 4ab957a85..5d844722d 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
@@ -44,7 +44,7 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
     private bool $allowParent;
     private ?string $path;
 
-    public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, string $namespace, string $resource, bool $allowParent, string $path = null)
+    public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, string $namespace, string $resource, bool $allowParent, ?string $path = null)
     {
         $definition = new Definition();
         if (!$defaults->isPublic() || !$defaults->isPrivate()) {
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/ServiceConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/ServiceConfigurator.php
index 9042ed1d6..57f498acf 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/ServiceConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/ServiceConfigurator.php
@@ -49,7 +49,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     private ?string $path;
     private bool $destructed = false;
 
-    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, string $path = null)
+    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, ?string $path = null)
     {
         $this->container = $container;
         $this->instanceof = $instanceof;
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php b/lib/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
index ee4d1ad16..e34d938bb 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
@@ -34,7 +34,7 @@ class ServicesConfigurator extends AbstractConfigurator
     private string $anonymousHash;
     private int $anonymousCount;
 
-    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path = null, int &$anonymousCount = 0)
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, ?string $path = null, int &$anonymousCount = 0)
     {
         $this->defaults = new Definition();
         $this->container = $container;
@@ -70,7 +70,7 @@ class ServicesConfigurator extends AbstractConfigurator
      * @param string|null $id    The service id, or null to create an anonymous service
      * @param string|null $class The class of the service, or null when $id is also the class name
      */
-    final public function set(?string $id, string $class = null): ServiceConfigurator
+    final public function set(?string $id, ?string $class = null): ServiceConfigurator
     {
         $defaults = $this->defaults;
         $definition = new Definition();
@@ -80,7 +80,7 @@ class ServicesConfigurator extends AbstractConfigurator
                 throw new \LogicException('Anonymous services must have a class name.');
             }
 
-            $id = sprintf('.%d_%s', ++$this->anonymousCount, preg_replace('/^.*\\\\/', '', $class).'~'.$this->anonymousHash);
+            $id = \sprintf('.%d_%s', ++$this->anonymousCount, preg_replace('/^.*\\\\/', '', $class).'~'.$this->anonymousHash);
         } elseif (!$defaults->isPublic() || !$defaults->isPrivate()) {
             $definition->setPublic($defaults->isPublic() && !$defaults->isPrivate());
         }
@@ -163,7 +163,7 @@ class ServicesConfigurator extends AbstractConfigurator
 
                 $services[$i] = $definition;
             } elseif (!$service instanceof ReferenceConfigurator) {
-                throw new InvalidArgumentException(sprintf('"%s()" expects a list of definitions as returned by "%s()" or "%s()", "%s" given at index "%s" for service "%s".', __METHOD__, InlineServiceConfigurator::FACTORY, ReferenceConfigurator::FACTORY, $service instanceof AbstractConfigurator ? $service::FACTORY.'()' : get_debug_type($service), $i, $id));
+                throw new InvalidArgumentException(\sprintf('"%s()" expects a list of definitions as returned by "%s()" or "%s()", "%s" given at index "%s" for service "%s".', __METHOD__, InlineServiceConfigurator::FACTORY, ReferenceConfigurator::FACTORY, $service instanceof AbstractConfigurator ? $service::FACTORY.'()' : get_debug_type($service), $i, $id));
             }
         }
 
@@ -180,7 +180,7 @@ class ServicesConfigurator extends AbstractConfigurator
     /**
      * Registers a service.
      */
-    final public function __invoke(string $id, string $class = null): ServiceConfigurator
+    final public function __invoke(string $id, ?string $class = null): ServiceConfigurator
     {
         return $this->set($id, $class);
     }
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/Traits/DecorateTrait.php b/lib/symfony/dependency-injection/Loader/Configurator/Traits/DecorateTrait.php
index ae6d3c948..afb56ae3d 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/Traits/DecorateTrait.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/Traits/DecorateTrait.php
@@ -25,7 +25,7 @@ trait DecorateTrait
      *
      * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
      */
-    final public function decorate(?string $id, string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): static
+    final public function decorate(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): static
     {
         $this->definition->setDecoratedService($id, $renamedId, $priority, $invalidBehavior);
 
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/Traits/FactoryTrait.php b/lib/symfony/dependency-injection/Loader/Configurator/Traits/FactoryTrait.php
index 1c19f1d88..0314dea7f 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/Traits/FactoryTrait.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/Traits/FactoryTrait.php
@@ -27,7 +27,7 @@ trait FactoryTrait
         if (\is_string($factory) && 1 === substr_count($factory, ':')) {
             $factoryParts = explode(':', $factory);
 
-            throw new InvalidArgumentException(sprintf('Invalid factory "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $factory, $factoryParts[0], $factoryParts[1]));
+            throw new InvalidArgumentException(\sprintf('Invalid factory "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $factory, $factoryParts[0], $factoryParts[1]));
         }
 
         if ($factory instanceof Expression) {
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/Traits/FromCallableTrait.php b/lib/symfony/dependency-injection/Loader/Configurator/Traits/FromCallableTrait.php
index e3508ab89..0382db0d0 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/Traits/FromCallableTrait.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/Traits/FromCallableTrait.php
@@ -35,7 +35,7 @@ trait FromCallableTrait
             'calls' => 'getMethodCalls',
         ] as $key => $method) {
             if ($this->definition->$method()) {
-                throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported when using "fromCallable()".', $key));
+                throw new InvalidArgumentException(\sprintf('The configuration key "%s" is unsupported when using "fromCallable()".', $key));
             }
         }
 
@@ -44,7 +44,7 @@ trait FromCallableTrait
         if (\is_string($callable) && 1 === substr_count($callable, ':')) {
             $parts = explode(':', $callable);
 
-            throw new InvalidArgumentException(sprintf('Invalid callable "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $callable, $parts[0], $parts[1]));
+            throw new InvalidArgumentException(\sprintf('Invalid callable "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $callable, $parts[0], $parts[1]));
         }
 
         if ($callable instanceof Expression) {
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/Traits/ParentTrait.php b/lib/symfony/dependency-injection/Loader/Configurator/Traits/ParentTrait.php
index 409602581..ee95323ad 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/Traits/ParentTrait.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/Traits/ParentTrait.php
@@ -26,7 +26,7 @@ trait ParentTrait
     final public function parent(string $parent): static
     {
         if (!$this->allowParent) {
-            throw new InvalidArgumentException(sprintf('A parent cannot be defined when either "_instanceof" or "_defaults" are also defined for service prototype "%s".', $this->id));
+            throw new InvalidArgumentException(\sprintf('A parent cannot be defined when either "_instanceof" or "_defaults" are also defined for service prototype "%s".', $this->id));
         }
 
         if ($this->definition instanceof ChildDefinition) {
diff --git a/lib/symfony/dependency-injection/Loader/Configurator/Traits/TagTrait.php b/lib/symfony/dependency-injection/Loader/Configurator/Traits/TagTrait.php
index a38d04a83..4ee120adc 100644
--- a/lib/symfony/dependency-injection/Loader/Configurator/Traits/TagTrait.php
+++ b/lib/symfony/dependency-injection/Loader/Configurator/Traits/TagTrait.php
@@ -23,7 +23,7 @@ trait TagTrait
     final public function tag(string $name, array $attributes = []): static
     {
         if ('' === $name) {
-            throw new InvalidArgumentException(sprintf('The tag name for service "%s" must be a non-empty string.', $this->id));
+            throw new InvalidArgumentException(\sprintf('The tag name for service "%s" must be a non-empty string.', $this->id));
         }
 
         $this->validateAttributes($name, $attributes);
@@ -40,7 +40,7 @@ trait TagTrait
                 $this->validateAttributes($tag, $value, [...$path, $name]);
             } elseif (!\is_scalar($value ?? '')) {
                 $name = implode('.', [...$path, $name]);
-                throw new InvalidArgumentException(sprintf('A tag attribute must be of a scalar-type or an array of scalar-types for service "%s", tag "%s", attribute "%s".', $this->id, $tag, $name));
+                throw new InvalidArgumentException(\sprintf('A tag attribute must be of a scalar-type or an array of scalar-types for service "%s", tag "%s", attribute "%s".', $this->id, $tag, $name));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/Loader/DirectoryLoader.php b/lib/symfony/dependency-injection/Loader/DirectoryLoader.php
index 1b5e81d19..d435366f0 100644
--- a/lib/symfony/dependency-injection/Loader/DirectoryLoader.php
+++ b/lib/symfony/dependency-injection/Loader/DirectoryLoader.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\DependencyInjection\Loader;
  */
 class DirectoryLoader extends FileLoader
 {
-    public function load(mixed $file, string $type = null): mixed
+    public function load(mixed $file, ?string $type = null): mixed
     {
         $file = rtrim($file, '/');
         $path = $this->locator->locate($file);
@@ -39,7 +39,7 @@ class DirectoryLoader extends FileLoader
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if ('directory' === $type) {
             return true;
diff --git a/lib/symfony/dependency-injection/Loader/FileLoader.php b/lib/symfony/dependency-injection/Loader/FileLoader.php
index 4b56c1788..1b6cd6c2c 100644
--- a/lib/symfony/dependency-injection/Loader/FileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/FileLoader.php
@@ -46,7 +46,7 @@ abstract class FileLoader extends BaseFileLoader
     protected $aliases = [];
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = true;
 
-    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null)
+    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, ?string $env = null)
     {
         $this->container = $container;
 
@@ -56,14 +56,14 @@ abstract class FileLoader extends BaseFileLoader
     /**
      * @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found
      */
-    public function import(mixed $resource, string $type = null, bool|string $ignoreErrors = false, string $sourceResource = null, $exclude = null): mixed
+    public function import(mixed $resource, ?string $type = null, bool|string $ignoreErrors = false, ?string $sourceResource = null, $exclude = null): mixed
     {
         $args = \func_get_args();
 
         if ($ignoreNotFound = 'not_found' === $ignoreErrors) {
             $args[2] = false;
         } elseif (!\is_bool($ignoreErrors)) {
-            throw new \TypeError(sprintf('Invalid argument $ignoreErrors provided to "%s::import()": boolean or "not_found" expected, "%s" given.', static::class, get_debug_type($ignoreErrors)));
+            throw new \TypeError(\sprintf('Invalid argument $ignoreErrors provided to "%s::import()": boolean or "not_found" expected, "%s" given.', static::class, get_debug_type($ignoreErrors)));
         }
 
         try {
@@ -98,13 +98,13 @@ abstract class FileLoader extends BaseFileLoader
      *
      * @return void
      */
-    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */)
+    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array|null $exclude = null/* , string $source = null */)
     {
         if (!str_ends_with($namespace, '\\')) {
-            throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": "%s".', $namespace));
+            throw new InvalidArgumentException(\sprintf('Namespace prefix must end with a "\\": "%s".', $namespace));
         }
         if (!preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++$/', $namespace)) {
-            throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: "%s".', $namespace));
+            throw new InvalidArgumentException(\sprintf('Namespace is not a valid PSR-4 prefix: "%s".', $namespace));
         }
         // This can happen with YAML files
         if (\is_array($exclude) && \in_array(null, $exclude, true)) {
@@ -166,12 +166,12 @@ abstract class FileLoader extends BaseFileLoader
                 $this->interfaces[] = $class;
             } else {
                 $this->setDefinition($class, $definition = $getPrototype());
+                $definition->setClass($class);
                 if (null !== $errorMessage) {
                     $definition->addError($errorMessage);
 
                     continue;
                 }
-                $definition->setClass($class);
 
                 $interfaces = [];
                 foreach (class_implements($class, false) as $interface) {
@@ -190,10 +190,10 @@ abstract class FileLoader extends BaseFileLoader
                     $alias = $attribute->id ?? $defaultAlias;
                     $public = $attribute->public;
                     if (null === $alias) {
-                        throw new LogicException(sprintf('Alias cannot be automatically determined for class "%s". If you have used the #[AsAlias] attribute with a class implementing multiple interfaces, add the interface you want to alias to the first parameter of #[AsAlias].', $class));
+                        throw new LogicException(\sprintf('Alias cannot be automatically determined for class "%s". If you have used the #[AsAlias] attribute with a class implementing multiple interfaces, add the interface you want to alias to the first parameter of #[AsAlias].', $class));
                     }
                     if (isset($this->aliases[$alias])) {
-                        throw new LogicException(sprintf('The "%s" alias has already been defined with the #[AsAlias] attribute in "%s".', $alias, $this->aliases[$alias]));
+                        throw new LogicException(\sprintf('The "%s" alias has already been defined with the #[AsAlias] attribute in "%s".', $alias, $this->aliases[$alias]));
                     }
                     $this->aliases[$alias] = new Alias($class, $public);
                 }
@@ -240,7 +240,7 @@ abstract class FileLoader extends BaseFileLoader
 
         if ($this->isLoadingInstanceof) {
             if (!$definition instanceof ChildDefinition) {
-                throw new InvalidArgumentException(sprintf('Invalid type definition "%s": ChildDefinition expected, "%s" given.', $id, get_debug_type($definition)));
+                throw new InvalidArgumentException(\sprintf('Invalid type definition "%s": ChildDefinition expected, "%s" given.', $id, get_debug_type($definition)));
             }
             $this->instanceof[$id] = $definition;
         } else {
@@ -272,7 +272,7 @@ abstract class FileLoader extends BaseFileLoader
                 $prefixLen = \strlen($resource->getPrefix());
 
                 if ($excludePrefix && !str_starts_with($excludePrefix, $resource->getPrefix())) {
-                    throw new InvalidArgumentException(sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $namespace, $excludePattern, $pattern));
+                    throw new InvalidArgumentException(\sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $namespace, $excludePattern, $pattern));
                 }
             }
 
@@ -297,7 +297,7 @@ abstract class FileLoader extends BaseFileLoader
             }
             // check to make sure the expected class exists
             if (!$r) {
-                throw new InvalidArgumentException(sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
+                throw new InvalidArgumentException(\sprintf('Expected to find class "%s" in file "%s" while importing services from resource "%s", but it was not found! Check the namespace prefix used with the resource.', $class, $path, $pattern));
             }
 
             if ($r->isInstantiable() || $r->isInterface()) {
@@ -337,7 +337,7 @@ abstract class FileLoader extends BaseFileLoader
         static $attributes = [];
 
         if (null !== $source && !isset($attributes[$source])) {
-            $attributes[$source] = ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))];
+            $attributes[$source] = ['source' => \sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))];
         }
 
         $this->container->register($class, $class)
diff --git a/lib/symfony/dependency-injection/Loader/GlobFileLoader.php b/lib/symfony/dependency-injection/Loader/GlobFileLoader.php
index 50349b257..4716f11a7 100644
--- a/lib/symfony/dependency-injection/Loader/GlobFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/GlobFileLoader.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\DependencyInjection\Loader;
  */
 class GlobFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         foreach ($this->glob($resource, false, $globResource) as $path => $info) {
             $this->import($path);
@@ -29,7 +29,7 @@ class GlobFileLoader extends FileLoader
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'glob' === $type;
     }
diff --git a/lib/symfony/dependency-injection/Loader/IniFileLoader.php b/lib/symfony/dependency-injection/Loader/IniFileLoader.php
index c177790e3..cc2c137db 100644
--- a/lib/symfony/dependency-injection/Loader/IniFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/IniFileLoader.php
@@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
  */
 class IniFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         $path = $this->locator->locate($resource);
 
@@ -30,7 +30,7 @@ class IniFileLoader extends FileLoader
         // first pass to catch parsing errors
         $result = parse_ini_file($path, true);
         if (false === $result || [] === $result) {
-            throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));
+            throw new InvalidArgumentException(\sprintf('The "%s" file is not valid.', $resource));
         }
 
         // real raw parsing
@@ -55,7 +55,7 @@ class IniFileLoader extends FileLoader
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
diff --git a/lib/symfony/dependency-injection/Loader/PhpFileLoader.php b/lib/symfony/dependency-injection/Loader/PhpFileLoader.php
index e56fb5156..fb6cc81f7 100644
--- a/lib/symfony/dependency-injection/Loader/PhpFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/PhpFileLoader.php
@@ -36,13 +36,13 @@ class PhpFileLoader extends FileLoader
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
     private ?ConfigBuilderGeneratorInterface $generator;
 
-    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null)
+    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, ?string $env = null, ?ConfigBuilderGeneratorInterface $generator = null)
     {
         parent::__construct($container, $locator, $env);
         $this->generator = $generator;
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         // the container and loader variables are exposed to the included file below
         $container = $this->container;
@@ -57,6 +57,9 @@ class PhpFileLoader extends FileLoader
             return include $path;
         }, $this, ProtectedPhpFileLoader::class);
 
+        $instanceof = $this->instanceof;
+        $this->instanceof = [];
+
         try {
             $callback = $load($path, $this->env);
 
@@ -64,14 +67,14 @@ class PhpFileLoader extends FileLoader
                 $this->executeCallback($callback, new ContainerConfigurator($this->container, $this, $this->instanceof, $path, $resource, $this->env), $path);
             }
         } finally {
-            $this->instanceof = [];
+            $this->instanceof = $instanceof;
             $this->registerAliasesForSinglyImplementedInterfaces();
         }
 
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
@@ -108,7 +111,7 @@ class PhpFileLoader extends FileLoader
         foreach ($r->getParameters() as $parameter) {
             $reflectionType = $parameter->getType();
             if (!$reflectionType instanceof \ReflectionNamedType) {
-                throw new \InvalidArgumentException(sprintf('Could not resolve argument "$%s" for "%s". You must typehint it (for example with "%s" or "%s").', $parameter->getName(), $path, ContainerConfigurator::class, ContainerBuilder::class));
+                throw new \InvalidArgumentException(\sprintf('Could not resolve argument "$%s" for "%s". You must typehint it (for example with "%s" or "%s").', $parameter->getName(), $path, ContainerConfigurator::class, ContainerBuilder::class));
             }
             $type = $reflectionType->getName();
 
@@ -133,7 +136,7 @@ class PhpFileLoader extends FileLoader
                     try {
                         $configBuilder = $this->configBuilder($type);
                     } catch (InvalidArgumentException|\LogicException $e) {
-                        throw new \InvalidArgumentException(sprintf('Could not resolve argument "%s" for "%s".', $type.' $'.$parameter->getName(), $path), 0, $e);
+                        throw new \InvalidArgumentException(\sprintf('Could not resolve argument "%s" for "%s".', $type.' $'.$parameter->getName(), $path), 0, $e);
                     }
                     $configBuilders[] = $configBuilder;
                     $arguments[] = $configBuilder;
@@ -171,7 +174,7 @@ class PhpFileLoader extends FileLoader
 
         // If it does not start with Symfony\Config\ we don't know how to handle this
         if (!str_starts_with($namespace, 'Symfony\\Config\\')) {
-            throw new InvalidArgumentException(sprintf('Could not find or generate class "%s".', $namespace));
+            throw new InvalidArgumentException(\sprintf('Could not find or generate class "%s".', $namespace));
         }
 
         // Try to get the extension alias
@@ -183,12 +186,12 @@ class PhpFileLoader extends FileLoader
 
         if (!$this->container->hasExtension($alias)) {
             $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
-            throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s". Looked for namespace "%s", found "%s".', $namespace, $alias, $extensions ? implode('", "', $extensions) : 'none'));
+            throw new InvalidArgumentException(\sprintf('There is no extension able to load the configuration for "%s". Looked for namespace "%s", found "%s".', $namespace, $alias, $extensions ? implode('", "', $extensions) : 'none'));
         }
 
         $extension = $this->container->getExtension($alias);
         if (!$extension instanceof ConfigurationExtensionInterface) {
-            throw new \LogicException(sprintf('You cannot use the config builder for "%s" because the extension does not implement "%s".', $namespace, ConfigurationExtensionInterface::class));
+            throw new \LogicException(\sprintf('You cannot use the config builder for "%s" because the extension does not implement "%s".', $namespace, ConfigurationExtensionInterface::class));
         }
 
         $configuration = $extension->getConfiguration([], $this->container);
diff --git a/lib/symfony/dependency-injection/Loader/XmlFileLoader.php b/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
index b6eb6732b..c9aad2e83 100644
--- a/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/XmlFileLoader.php
@@ -41,7 +41,7 @@ class XmlFileLoader extends FileLoader
 
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         $path = $this->locator->locate($resource);
 
@@ -54,7 +54,7 @@ class XmlFileLoader extends FileLoader
         if ($this->env) {
             $xpath = new \DOMXPath($xml);
             $xpath->registerNamespace('container', self::NS);
-            foreach ($xpath->query(sprintf('//container:when[@env="%s"]', $this->env)) ?: [] as $root) {
+            foreach ($xpath->query(\sprintf('//container:when[@env="%s"]', $this->env)) ?: [] as $root) {
                 $env = $this->env;
                 $this->env = null;
                 try {
@@ -68,7 +68,7 @@ class XmlFileLoader extends FileLoader
         return null;
     }
 
-    private function loadXml(\DOMDocument $xml, string $path, \DOMNode $root = null): void
+    private function loadXml(\DOMDocument $xml, string $path, ?\DOMNode $root = null): void
     {
         $defaults = $this->getServiceDefaults($xml, $path, $root);
 
@@ -93,7 +93,7 @@ class XmlFileLoader extends FileLoader
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
@@ -106,19 +106,19 @@ class XmlFileLoader extends FileLoader
         return 'xml' === $type;
     }
 
-    private function parseParameters(\DOMDocument $xml, string $file, \DOMNode $root = null): void
+    private function parseParameters(\DOMDocument $xml, string $file, ?\DOMNode $root = null): void
     {
         if ($parameters = $this->getChildren($root ?? $xml->documentElement, 'parameters')) {
             $this->container->getParameterBag()->add($this->getArgumentsAsPhp($parameters[0], 'parameter', $file));
         }
     }
 
-    private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root = null): void
+    private function parseImports(\DOMDocument $xml, string $file, ?\DOMNode $root = null): void
     {
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (false === $imports = $xpath->query('.//container:imports/container:import', $root)) {
+        if (false === $imports = $xpath->query('./container:imports/container:import', $root)) {
             return;
         }
 
@@ -129,19 +129,19 @@ class XmlFileLoader extends FileLoader
         }
     }
 
-    private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, \DOMNode $root = null): void
+    private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, ?\DOMNode $root = null): void
     {
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (false === $services = $xpath->query('.//container:services/container:service|.//container:services/container:prototype|.//container:services/container:stack', $root)) {
+        if (false === $services = $xpath->query('./container:services/container:service|./container:services/container:prototype|./container:services/container:stack', $root)) {
             return;
         }
         $this->setCurrentDir(\dirname($file));
 
         $this->instanceof = [];
         $this->isLoadingInstanceof = true;
-        $instanceof = $xpath->query('.//container:services/container:instanceof', $root);
+        $instanceof = $xpath->query('./container:services/container:instanceof', $root);
         foreach ($instanceof as $service) {
             $this->setDefinition((string) $service->getAttribute('id'), $this->parseDefinition($service, $file, new Definition()));
         }
@@ -187,12 +187,12 @@ class XmlFileLoader extends FileLoader
         }
     }
 
-    private function getServiceDefaults(\DOMDocument $xml, string $file, \DOMNode $root = null): Definition
+    private function getServiceDefaults(\DOMDocument $xml, string $file, ?\DOMNode $root = null): Definition
     {
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (null === $defaultsNode = $xpath->query('.//container:services/container:defaults', $root)->item(0)) {
+        if (null === $defaultsNode = $xpath->query('./container:services/container:defaults', $root)->item(0)) {
             return new Definition();
         }
 
@@ -222,11 +222,11 @@ class XmlFileLoader extends FileLoader
                 $version = $deprecated[0]->getAttribute('version') ?: '';
 
                 if (!$deprecated[0]->hasAttribute('package')) {
-                    throw new InvalidArgumentException(sprintf('Missing attribute "package" at node "deprecated" in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('Missing attribute "package" at node "deprecated" in "%s".', $file));
                 }
 
                 if (!$deprecated[0]->hasAttribute('version')) {
-                    throw new InvalidArgumentException(sprintf('Missing attribute "version" at node "deprecated" in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('Missing attribute "version" at node "deprecated" in "%s".', $file));
                 }
 
                 $alias->setDeprecated($package, $version, $message);
@@ -282,11 +282,11 @@ class XmlFileLoader extends FileLoader
             $version = $deprecated[0]->getAttribute('version') ?: '';
 
             if (!$deprecated[0]->hasAttribute('package')) {
-                throw new InvalidArgumentException(sprintf('Missing attribute "package" at node "deprecated" in "%s".', $file));
+                throw new InvalidArgumentException(\sprintf('Missing attribute "package" at node "deprecated" in "%s".', $file));
             }
 
             if (!$deprecated[0]->hasAttribute('version')) {
-                throw new InvalidArgumentException(sprintf('Missing attribute "version" at node "deprecated" in "%s".', $file));
+                throw new InvalidArgumentException(\sprintf('Missing attribute "version" at node "deprecated" in "%s".', $file));
             }
 
             $definition->setDeprecated($package, $version, $message);
@@ -317,7 +317,7 @@ class XmlFileLoader extends FileLoader
 
         if ($constructor = $service->getAttribute('constructor')) {
             if (null !== $definition->getFactory()) {
-                throw new LogicException(sprintf('The "%s" service cannot declare a factory as well as a constructor.', $service->getAttribute('id')));
+                throw new LogicException(\sprintf('The "%s" service cannot declare a factory as well as a constructor.', $service->getAttribute('id')));
             }
 
             $definition->setFactory([null, $constructor]);
@@ -339,7 +339,11 @@ class XmlFileLoader extends FileLoader
         }
 
         foreach ($this->getChildren($service, 'call') as $call) {
-            $definition->addMethodCall($call->getAttribute('method'), $this->getArgumentsAsPhp($call, 'argument', $file), XmlUtils::phpize($call->getAttribute('returns-clone')));
+            $definition->addMethodCall(
+                $call->getAttribute('method'),
+                $this->getArgumentsAsPhp($call, 'argument', $file),
+                XmlUtils::phpize($call->getAttribute('returns-clone')) ?: false
+            );
         }
 
         $tags = $this->getChildren($service, 'tag');
@@ -347,10 +351,10 @@ class XmlFileLoader extends FileLoader
         foreach ($tags as $tag) {
             $tagNameComesFromAttribute = $tag->childElementCount || '' === $tag->nodeValue;
             if ('' === $tagName = $tagNameComesFromAttribute ? $tag->getAttribute('name') : $tag->nodeValue) {
-                throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
+                throw new InvalidArgumentException(\sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
             }
 
-            $parameters = $this->getTagAttributes($tag, sprintf('The attribute name of tag "%s" for service "%s" in %s must be a non-empty string.', $tagName, (string) $service->getAttribute('id'), $file));
+            $parameters = $this->getTagAttributes($tag, \sprintf('The attribute name of tag "%s" for service "%s" in %s must be a non-empty string.', $tagName, (string) $service->getAttribute('id'), $file));
             foreach ($tag->attributes as $name => $node) {
                 if ($tagNameComesFromAttribute && 'name' === $name) {
                     continue;
@@ -390,7 +394,7 @@ class XmlFileLoader extends FileLoader
             } elseif ('null' === $decorationOnInvalid) {
                 $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
             } else {
-                throw new InvalidArgumentException(sprintf('Invalid value "%s" for attribute "decoration-on-invalid" on service "%s". Did you mean "exception", "ignore" or "null" in "%s"?', $decorationOnInvalid, $service->getAttribute('id'), $file));
+                throw new InvalidArgumentException(\sprintf('Invalid value "%s" for attribute "decoration-on-invalid" on service "%s". Did you mean "exception", "ignore" or "null" in "%s"?', $decorationOnInvalid, $service->getAttribute('id'), $file));
             }
 
             $renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null;
@@ -401,7 +405,7 @@ class XmlFileLoader extends FileLoader
 
         if ($callable = $this->getChildren($service, 'from-callable')) {
             if ($definition instanceof ChildDefinition) {
-                throw new InvalidArgumentException(sprintf('Attribute "parent" is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+                throw new InvalidArgumentException(\sprintf('Attribute "parent" is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
             }
 
             foreach ([
@@ -414,7 +418,7 @@ class XmlFileLoader extends FileLoader
                 'Tag "<call>"' => 'getMethodCalls',
             ] as $key => $method) {
                 if ($definition->$method()) {
-                    throw new InvalidArgumentException($key.sprintf(' is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+                    throw new InvalidArgumentException($key.\sprintf(' is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
                 }
             }
 
@@ -458,7 +462,33 @@ class XmlFileLoader extends FileLoader
         try {
             $dom = XmlUtils::loadFile($file, $this->validateSchema(...));
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file).$e->getMessage(), $e->getCode(), $e);
+            $invalidSecurityElements = [];
+            $errors = explode("\n", $e->getMessage());
+            foreach ($errors as $i => $error) {
+                if (preg_match("#^\[ERROR 1871] Element '\{http://symfony\.com/schema/dic/security}([^']+)'#", $error, $matches)) {
+                    $invalidSecurityElements[$i] = $matches[1];
+                }
+            }
+            if ($invalidSecurityElements) {
+                $dom = XmlUtils::loadFile($file);
+
+                foreach ($invalidSecurityElements as $errorIndex => $tagName) {
+                    foreach ($dom->getElementsByTagNameNS('http://symfony.com/schema/dic/security', $tagName) as $element) {
+                        if (!$parent = $element->parentNode) {
+                            continue;
+                        }
+                        if ('http://symfony.com/schema/dic/security' !== $parent->namespaceURI) {
+                            continue;
+                        }
+                        if ('provider' === $parent->localName || 'firewall' === $parent->localName) {
+                            unset($errors[$errorIndex]);
+                        }
+                    }
+                }
+            }
+            if ($errors) {
+                throw new InvalidArgumentException(\sprintf('Unable to parse file "%s": ', $file).implode("\n", $errors), $e->getCode(), $e);
+            }
         }
 
         $this->validateExtensions($dom, $file);
@@ -469,7 +499,7 @@ class XmlFileLoader extends FileLoader
     /**
      * Processes anonymous services.
      */
-    private function processAnonymousServices(\DOMDocument $xml, string $file, \DOMNode $root = null): void
+    private function processAnonymousServices(\DOMDocument $xml, string $file, ?\DOMNode $root = null): void
     {
         $definitions = [];
         $count = 0;
@@ -483,7 +513,7 @@ class XmlFileLoader extends FileLoader
             foreach ($nodes as $node) {
                 if ($services = $this->getChildren($node, 'service')) {
                     // give it a unique name
-                    $id = sprintf('.%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $services[0]->getAttribute('class')).$suffix);
+                    $id = \sprintf('.%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $services[0]->getAttribute('class')).$suffix);
                     $node->setAttribute('id', $id);
                     $node->setAttribute('service', $id);
 
@@ -500,7 +530,7 @@ class XmlFileLoader extends FileLoader
         // anonymous services "in the wild"
         if (false !== $nodes = $xpath->query('.//container:services/container:service[not(@id)]', $root)) {
             foreach ($nodes as $node) {
-                throw new InvalidArgumentException(sprintf('Top-level services must have "id" attribute, none found in "%s" at line %d.', $file, $node->getLineNo()));
+                throw new InvalidArgumentException(\sprintf('Top-level services must have "id" attribute, none found in "%s" at line %d.', $file, $node->getLineNo()));
             }
         }
 
@@ -548,7 +578,7 @@ class XmlFileLoader extends FileLoader
             switch ($type = $arg->getAttribute('type')) {
                 case 'service':
                     if ('' === $arg->getAttribute('id')) {
-                        throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="service" has no or empty "id" attribute in "%s".', $name, $file));
+                        throw new InvalidArgumentException(\sprintf('Tag "<%s>" with type="service" has no or empty "id" attribute in "%s".', $name, $file));
                     }
 
                     $arguments[$key] = new Reference($arg->getAttribute('id'), $invalidBehavior);
@@ -596,7 +626,7 @@ class XmlFileLoader extends FileLoader
                     $forLocator = 'tagged_locator' === $type;
 
                     if (!$arg->getAttribute('tag')) {
-                        throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="%s" has no or empty "tag" attribute in "%s".', $name, $type, $file));
+                        throw new InvalidArgumentException(\sprintf('Tag "<%s>" with type="%s" has no or empty "tag" attribute in "%s".', $name, $type, $file));
                     }
 
                     $excludes = array_column($this->getChildren($arg, 'exclude'), 'nodeValue');
@@ -615,7 +645,7 @@ class XmlFileLoader extends FileLoader
                     break;
                 case 'binary':
                     if (false === $value = base64_decode($arg->nodeValue)) {
-                        throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="binary" is not a valid base64 encoded string.', $name));
+                        throw new InvalidArgumentException(\sprintf('Tag "<%s>" with type="binary" is not a valid base64 encoded string.', $name));
                     }
                     $arguments[$key] = $value;
                     break;
@@ -698,7 +728,7 @@ class XmlFileLoader extends FileLoader
                     $path = str_replace([$ns, str_replace('http://', 'https://', $ns)], str_replace('\\', '/', $extension->getXsdValidationBasePath()).'/', $items[$i + 1]);
 
                     if (!is_file($path)) {
-                        throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s".', get_debug_type($extension), $path));
+                        throw new RuntimeException(\sprintf('Extension "%s" references a non-existent XSD file "%s".', get_debug_type($extension), $path));
                     }
 
                     $schemaLocations[$items[$i]] = $path;
@@ -727,7 +757,7 @@ class XmlFileLoader extends FileLoader
             $drive = '\\' === \DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
             $location = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));
 
-            $imports .= sprintf('  <xsd:import namespace="%s" schemaLocation="%s" />'."\n", $namespace, $location);
+            $imports .= \sprintf('  <xsd:import namespace="%s" schemaLocation="%s" />'."\n", $namespace, $location);
         }
 
         $source = <<<EOF
@@ -786,7 +816,7 @@ EOF
     {
         foreach ($alias->attributes as $name => $node) {
             if (!\in_array($name, ['alias', 'id', 'public'])) {
-                throw new InvalidArgumentException(sprintf('Invalid attribute "%s" defined for alias "%s" in "%s".', $name, $alias->getAttribute('id'), $file));
+                throw new InvalidArgumentException(\sprintf('Invalid attribute "%s" defined for alias "%s" in "%s".', $name, $alias->getAttribute('id'), $file));
             }
         }
 
@@ -795,7 +825,7 @@ EOF
                 continue;
             }
             if ('deprecated' !== $child->localName) {
-                throw new InvalidArgumentException(sprintf('Invalid child element "%s" defined for alias "%s" in "%s".', $child->localName, $alias->getAttribute('id'), $file));
+                throw new InvalidArgumentException(\sprintf('Invalid child element "%s" defined for alias "%s" in "%s".', $child->localName, $alias->getAttribute('id'), $file));
             }
         }
     }
@@ -815,7 +845,7 @@ EOF
             // can it be handled by an extension?
             if (!$this->container->hasExtension($node->namespaceURI)) {
                 $extensionNamespaces = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getNamespace(), $this->container->getExtensions()));
-                throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? implode('", "', $extensionNamespaces) : 'none'));
+                throw new InvalidArgumentException(\sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? implode('", "', $extensionNamespaces) : 'none'));
             }
         }
     }
@@ -858,6 +888,6 @@ EOF
      */
     public static function convertDomElementToArray(\DOMElement $element): mixed
     {
-        return XmlUtils::convertDomElementToArray($element);
+        return XmlUtils::convertDomElementToArray($element, false);
     }
 }
diff --git a/lib/symfony/dependency-injection/Loader/YamlFileLoader.php b/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
index 822b45ef7..7b1aa660f 100644
--- a/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/lib/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -117,7 +117,7 @@ class YamlFileLoader extends FileLoader
 
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         $path = $this->locator->locate($resource);
 
@@ -135,7 +135,7 @@ class YamlFileLoader extends FileLoader
         // per-env configuration
         if ($this->env && isset($content['when@'.$this->env])) {
             if (!\is_array($content['when@'.$this->env])) {
-                throw new InvalidArgumentException(sprintf('The "when@%s" key should contain an array in "%s". Check your YAML syntax.', $this->env, $path));
+                throw new InvalidArgumentException(\sprintf('The "when@%s" key should contain an array in "%s". Check your YAML syntax.', $this->env, $path));
             }
 
             $env = $this->env;
@@ -158,7 +158,7 @@ class YamlFileLoader extends FileLoader
         // parameters
         if (isset($content['parameters'])) {
             if (!\is_array($content['parameters'])) {
-                throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in "%s". Check your YAML syntax.', $path));
+                throw new InvalidArgumentException(\sprintf('The "parameters" key should contain an array in "%s". Check your YAML syntax.', $path));
             }
 
             foreach ($content['parameters'] as $key => $value) {
@@ -181,7 +181,7 @@ class YamlFileLoader extends FileLoader
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
@@ -201,7 +201,7 @@ class YamlFileLoader extends FileLoader
         }
 
         if (!\is_array($content['imports'])) {
-            throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in "%s". Check your YAML syntax.', $file));
+            throw new InvalidArgumentException(\sprintf('The "imports" key should contain an array in "%s". Check your YAML syntax.', $file));
         }
 
         $defaultDirectory = \dirname($file);
@@ -210,7 +210,7 @@ class YamlFileLoader extends FileLoader
                 $import = ['resource' => $import];
             }
             if (!isset($import['resource'])) {
-                throw new InvalidArgumentException(sprintf('An import should provide a resource in "%s". Check your YAML syntax.', $file));
+                throw new InvalidArgumentException(\sprintf('An import should provide a resource in "%s". Check your YAML syntax.', $file));
             }
 
             $this->setCurrentDir($defaultDirectory);
@@ -225,7 +225,7 @@ class YamlFileLoader extends FileLoader
         }
 
         if (!\is_array($content['services'])) {
-            throw new InvalidArgumentException(sprintf('The "services" key should contain an array in "%s". Check your YAML syntax.', $file));
+            throw new InvalidArgumentException(\sprintf('The "services" key should contain an array in "%s". Check your YAML syntax.', $file));
         }
 
         if (\array_key_exists('_instanceof', $content['services'])) {
@@ -233,16 +233,16 @@ class YamlFileLoader extends FileLoader
             unset($content['services']['_instanceof']);
 
             if (!\is_array($instanceof)) {
-                throw new InvalidArgumentException(sprintf('Service "_instanceof" key must be an array, "%s" given in "%s".', get_debug_type($instanceof), $file));
+                throw new InvalidArgumentException(\sprintf('Service "_instanceof" key must be an array, "%s" given in "%s".', get_debug_type($instanceof), $file));
             }
             $this->instanceof = [];
             $this->isLoadingInstanceof = true;
             foreach ($instanceof as $id => $service) {
                 if (!$service || !\is_array($service)) {
-                    throw new InvalidArgumentException(sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
+                    throw new InvalidArgumentException(\sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
                 }
                 if (\is_string($service) && str_starts_with($service, '@')) {
-                    throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
+                    throw new InvalidArgumentException(\sprintf('Type definition "%s" cannot be an alias within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
                 }
                 $this->parseDefinition($id, $service, $file, [], false, $trackBindings);
             }
@@ -267,18 +267,18 @@ class YamlFileLoader extends FileLoader
         unset($content['services']['_defaults']);
 
         if (!\is_array($defaults)) {
-            throw new InvalidArgumentException(sprintf('Service "_defaults" key must be an array, "%s" given in "%s".', get_debug_type($defaults), $file));
+            throw new InvalidArgumentException(\sprintf('Service "_defaults" key must be an array, "%s" given in "%s".', get_debug_type($defaults), $file));
         }
 
         foreach ($defaults as $key => $default) {
             if (!isset(self::DEFAULTS_KEYWORDS[$key])) {
-                throw new InvalidArgumentException(sprintf('The configuration key "%s" cannot be used to define a default value in "%s". Allowed keys are "%s".', $key, $file, implode('", "', self::DEFAULTS_KEYWORDS)));
+                throw new InvalidArgumentException(\sprintf('The configuration key "%s" cannot be used to define a default value in "%s". Allowed keys are "%s".', $key, $file, implode('", "', self::DEFAULTS_KEYWORDS)));
             }
         }
 
         if (isset($defaults['tags'])) {
             if (!\is_array($tags = $defaults['tags'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
+                throw new InvalidArgumentException(\sprintf('Parameter "tags" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
             }
 
             foreach ($tags as $tag) {
@@ -291,23 +291,23 @@ class YamlFileLoader extends FileLoader
                     $tag = current($tag);
                 } else {
                     if (!isset($tag['name'])) {
-                        throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in "%s".', $file));
+                        throw new InvalidArgumentException(\sprintf('A "tags" entry in "_defaults" is missing a "name" key in "%s".', $file));
                     }
                     $name = $tag['name'];
                     unset($tag['name']);
                 }
 
                 if (!\is_string($name) || '' === $name) {
-                    throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('The tag name in "_defaults" must be a non-empty string in "%s".', $file));
                 }
 
-                $this->validateAttributes(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, '%s', $file), $tag);
+                $this->validateAttributes(\sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, '%s', $file), $tag);
             }
         }
 
         if (isset($defaults['bind'])) {
             if (!\is_array($defaults['bind'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
+                throw new InvalidArgumentException(\sprintf('Parameter "bind" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
             }
 
             foreach ($this->resolveServices($defaults['bind'], $file) as $argument => $value) {
@@ -335,7 +335,7 @@ class YamlFileLoader extends FileLoader
     private function parseDefinition(string $id, array|string|null $service, string $file, array $defaults, bool $return = false, bool $trackBindings = true): Definition|Alias|null
     {
         if (preg_match('/^_[a-zA-Z0-9_]*$/', $id)) {
-            throw new InvalidArgumentException(sprintf('Service names that start with an underscore are reserved. Rename the "%s" service or define it in XML instead.', $id));
+            throw new InvalidArgumentException(\sprintf('Service names that start with an underscore are reserved. Rename the "%s" service or define it in XML instead.', $id));
         }
 
         if (\is_string($service) && str_starts_with($service, '@')) {
@@ -353,12 +353,12 @@ class YamlFileLoader extends FileLoader
         }
 
         if (!\is_array($service ??= [])) {
-            throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but "%s" found for service "%s" in "%s". Check your YAML syntax.', get_debug_type($service), $id, $file));
+            throw new InvalidArgumentException(\sprintf('A service definition must be an array or a string starting with "@" but "%s" found for service "%s" in "%s". Check your YAML syntax.', get_debug_type($service), $id, $file));
         }
 
         if (isset($service['stack'])) {
             if (!\is_array($service['stack'])) {
-                throw new InvalidArgumentException(sprintf('A stack must be an array of definitions, "%s" given for service "%s" in "%s". Check your YAML syntax.', get_debug_type($service), $id, $file));
+                throw new InvalidArgumentException(\sprintf('A stack must be an array of definitions, "%s" given for service "%s" in "%s". Check your YAML syntax.', get_debug_type($service), $id, $file));
             }
 
             $stack = [];
@@ -372,7 +372,7 @@ class YamlFileLoader extends FileLoader
                 }
 
                 if (\is_array($frame) && isset($frame['stack'])) {
-                    throw new InvalidArgumentException(sprintf('Service stack "%s" cannot contain another stack in "%s".', $id, $file));
+                    throw new InvalidArgumentException(\sprintf('Service stack "%s" cannot contain another stack in "%s".', $id, $file));
                 }
 
                 $definition = $this->parseDefinition($id.'" at index "'.$k, $frame, $file, $defaults, true);
@@ -385,7 +385,7 @@ class YamlFileLoader extends FileLoader
             }
 
             if ($diff = array_diff(array_keys($service), ['stack', 'public', 'deprecated'])) {
-                throw new InvalidArgumentException(sprintf('Invalid attribute "%s"; supported ones are "public" and "deprecated" for service "%s" in "%s". Check your YAML syntax.', implode('", "', $diff), $id, $file));
+                throw new InvalidArgumentException(\sprintf('Invalid attribute "%s"; supported ones are "public" and "deprecated" for service "%s" in "%s". Check your YAML syntax.', implode('", "', $diff), $id, $file));
             }
 
             $service = [
@@ -403,7 +403,7 @@ class YamlFileLoader extends FileLoader
         if (isset($service['from_callable'])) {
             foreach (['alias', 'parent', 'synthetic', 'factory', 'file', 'arguments', 'properties', 'configurator', 'calls'] as $key) {
                 if (isset($service['factory'])) {
-                    throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for the service "%s" when using "from_callable" in "%s".', $key, $id, $file));
+                    throw new InvalidArgumentException(\sprintf('The configuration key "%s" is unsupported for the service "%s" when using "from_callable" in "%s".', $key, $id, $file));
                 }
             }
 
@@ -429,18 +429,18 @@ class YamlFileLoader extends FileLoader
 
             foreach ($service as $key => $value) {
                 if (!\in_array($key, ['alias', 'public', 'deprecated'])) {
-                    throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for the service "%s" which is defined as an alias in "%s". Allowed configuration keys for service aliases are "alias", "public" and "deprecated".', $key, $id, $file));
+                    throw new InvalidArgumentException(\sprintf('The configuration key "%s" is unsupported for the service "%s" which is defined as an alias in "%s". Allowed configuration keys for service aliases are "alias", "public" and "deprecated".', $key, $id, $file));
                 }
 
                 if ('deprecated' === $key) {
                     $deprecation = \is_array($value) ? $value : ['message' => $value];
 
                     if (!isset($deprecation['package'])) {
-                        throw new InvalidArgumentException(sprintf('Missing attribute "package" of the "deprecated" option in "%s".', $file));
+                        throw new InvalidArgumentException(\sprintf('Missing attribute "package" of the "deprecated" option in "%s".', $file));
                     }
 
                     if (!isset($deprecation['version'])) {
-                        throw new InvalidArgumentException(sprintf('Missing attribute "version" of the "deprecated" option in "%s".', $file));
+                        throw new InvalidArgumentException(\sprintf('Missing attribute "version" of the "deprecated" option in "%s".', $file));
                     }
 
                     $alias->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message'] ?? '');
@@ -450,13 +450,14 @@ class YamlFileLoader extends FileLoader
             return $return ? $alias : $this->container->setAlias($id, $alias);
         }
 
+        $changes = [];
         if (null !== $definition) {
-            // no-op
+            $changes = $definition->getChanges();
         } elseif ($this->isLoadingInstanceof) {
             $definition = new ChildDefinition('');
         } elseif (isset($service['parent'])) {
             if ('' !== $service['parent'] && '@' === $service['parent'][0]) {
-                throw new InvalidArgumentException(sprintf('The value of the "parent" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['parent'], substr($service['parent'], 1)));
+                throw new InvalidArgumentException(\sprintf('The value of the "parent" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['parent'], substr($service['parent'], 1)));
             }
 
             $definition = new ChildDefinition($service['parent']);
@@ -474,7 +475,7 @@ class YamlFileLoader extends FileLoader
             $definition->setAutoconfigured($defaults['autoconfigure']);
         }
 
-        $definition->setChanges([]);
+        $definition->setChanges($changes);
 
         if (isset($service['class'])) {
             $definition->setClass($service['class']);
@@ -507,11 +508,11 @@ class YamlFileLoader extends FileLoader
             $deprecation = \is_array($service['deprecated']) ? $service['deprecated'] : ['message' => $service['deprecated']];
 
             if (!isset($deprecation['package'])) {
-                throw new InvalidArgumentException(sprintf('Missing attribute "package" of the "deprecated" option in "%s".', $file));
+                throw new InvalidArgumentException(\sprintf('Missing attribute "package" of the "deprecated" option in "%s".', $file));
             }
 
             if (!isset($deprecation['version'])) {
-                throw new InvalidArgumentException(sprintf('Missing attribute "version" of the "deprecated" option in "%s".', $file));
+                throw new InvalidArgumentException(\sprintf('Missing attribute "version" of the "deprecated" option in "%s".', $file));
             }
 
             $definition->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message'] ?? '');
@@ -523,7 +524,7 @@ class YamlFileLoader extends FileLoader
 
         if (isset($service['constructor'])) {
             if (null !== $definition->getFactory()) {
-                throw new LogicException(sprintf('The "%s" service cannot declare a factory as well as a constructor.', $id));
+                throw new LogicException(\sprintf('The "%s" service cannot declare a factory as well as a constructor.', $id));
             }
 
             $definition->setFactory([null, $service['constructor']]);
@@ -547,16 +548,16 @@ class YamlFileLoader extends FileLoader
 
         if (isset($service['calls'])) {
             if (!\is_array($service['calls'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+                throw new InvalidArgumentException(\sprintf('Parameter "calls" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
             }
 
             foreach ($service['calls'] as $k => $call) {
                 if (!\is_array($call) && (!\is_string($k) || !$call instanceof TaggedValue)) {
-                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s": expected map or array, "%s" given in "%s".', $id, $call instanceof TaggedValue ? '!'.$call->getTag() : get_debug_type($call), $file));
+                    throw new InvalidArgumentException(\sprintf('Invalid method call for service "%s": expected map or array, "%s" given in "%s".', $id, $call instanceof TaggedValue ? '!'.$call->getTag() : get_debug_type($call), $file));
                 }
 
                 if (\is_string($k)) {
-                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
+                    throw new InvalidArgumentException(\sprintf('Invalid method call for service "%s", did you forget a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
                 }
 
                 if (isset($call['method']) && \is_string($call['method'])) {
@@ -570,7 +571,7 @@ class YamlFileLoader extends FileLoader
 
                         if ($args instanceof TaggedValue) {
                             if ('returns_clone' !== $args->getTag()) {
-                                throw new InvalidArgumentException(sprintf('Unsupported tag "!%s", did you mean "!returns_clone" for service "%s" in "%s"?', $args->getTag(), $id, $file));
+                                throw new InvalidArgumentException(\sprintf('Unsupported tag "!%s", did you mean "!returns_clone" for service "%s" in "%s"?', $args->getTag(), $id, $file));
                             }
 
                             $returnsClone = true;
@@ -579,7 +580,7 @@ class YamlFileLoader extends FileLoader
                             $returnsClone = false;
                         }
                     } elseif (empty($call[0])) {
-                        throw new InvalidArgumentException(sprintf('Invalid call for service "%s": the method must be defined as the first index of an array or as the only key of a map in "%s".', $id, $file));
+                        throw new InvalidArgumentException(\sprintf('Invalid call for service "%s": the method must be defined as the first index of an array or as the only key of a map in "%s".', $id, $file));
                     } else {
                         $method = $call[0];
                         $args = $call[1] ?? [];
@@ -588,7 +589,7 @@ class YamlFileLoader extends FileLoader
                 }
 
                 if (!\is_array($args)) {
-                    throw new InvalidArgumentException(sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in "%s". Check your YAML syntax.', $method, $id, $file));
+                    throw new InvalidArgumentException(\sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in "%s". Check your YAML syntax.', $method, $id, $file));
                 }
 
                 $args = $this->resolveServices($args, $file);
@@ -598,7 +599,7 @@ class YamlFileLoader extends FileLoader
 
         $tags = $service['tags'] ?? [];
         if (!\is_array($tags)) {
-            throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+            throw new InvalidArgumentException(\sprintf('Parameter "tags" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
         }
 
         if (isset($defaults['tags'])) {
@@ -615,24 +616,24 @@ class YamlFileLoader extends FileLoader
                 $tag = current($tag);
             } else {
                 if (!isset($tag['name'])) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in "%s".', $id, $file));
+                    throw new InvalidArgumentException(\sprintf('A "tags" entry is missing a "name" key for service "%s" in "%s".', $id, $file));
                 }
                 $name = $tag['name'];
                 unset($tag['name']);
             }
 
             if (!\is_string($name) || '' === $name) {
-                throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $id, $file));
+                throw new InvalidArgumentException(\sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $id, $file));
             }
 
-            $this->validateAttributes(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, '%s', $file), $tag);
+            $this->validateAttributes(\sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, '%s', $file), $tag);
 
             $definition->addTag($name, $tag);
         }
 
         if (null !== $decorates = $service['decorates'] ?? null) {
             if ('' !== $decorates && '@' === $decorates[0]) {
-                throw new InvalidArgumentException(sprintf('The value of the "decorates" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['decorates'], substr($decorates, 1)));
+                throw new InvalidArgumentException(\sprintf('The value of the "decorates" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $id, $service['decorates'], substr($decorates, 1)));
             }
 
             $decorationOnInvalid = \array_key_exists('decoration_on_invalid', $service) ? $service['decoration_on_invalid'] : 'exception';
@@ -643,9 +644,9 @@ class YamlFileLoader extends FileLoader
             } elseif (null === $decorationOnInvalid) {
                 $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
             } elseif ('null' === $decorationOnInvalid) {
-                throw new InvalidArgumentException(sprintf('Invalid value "%s" for attribute "decoration_on_invalid" on service "%s". Did you mean null (without quotes) in "%s"?', $decorationOnInvalid, $id, $file));
+                throw new InvalidArgumentException(\sprintf('Invalid value "%s" for attribute "decoration_on_invalid" on service "%s". Did you mean null (without quotes) in "%s"?', $decorationOnInvalid, $id, $file));
             } else {
-                throw new InvalidArgumentException(sprintf('Invalid value "%s" for attribute "decoration_on_invalid" on service "%s". Did you mean "exception", "ignore" or null in "%s"?', $decorationOnInvalid, $id, $file));
+                throw new InvalidArgumentException(\sprintf('Invalid value "%s" for attribute "decoration_on_invalid" on service "%s". Did you mean "exception", "ignore" or null in "%s"?', $decorationOnInvalid, $id, $file));
             }
 
             $renameId = $service['decoration_inner_name'] ?? null;
@@ -665,7 +666,7 @@ class YamlFileLoader extends FileLoader
 
             if (isset($service['bind'])) {
                 if (!\is_array($service['bind'])) {
-                    throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+                    throw new InvalidArgumentException(\sprintf('Parameter "bind" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
                 }
 
                 $bindings = array_merge($bindings, $this->resolveServices($service['bind'], $file));
@@ -685,12 +686,12 @@ class YamlFileLoader extends FileLoader
         }
 
         if (\array_key_exists('namespace', $service) && !\array_key_exists('resource', $service)) {
-            throw new InvalidArgumentException(sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+            throw new InvalidArgumentException(\sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in "%s". Check your YAML syntax.', $id, $file));
         }
 
         if ($return) {
             if (\array_key_exists('resource', $service)) {
-                throw new InvalidArgumentException(sprintf('Invalid "resource" attribute found for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+                throw new InvalidArgumentException(\sprintf('Invalid "resource" attribute found for service "%s" in "%s". Check your YAML syntax.', $id, $file));
             }
 
             return $definition;
@@ -698,7 +699,7 @@ class YamlFileLoader extends FileLoader
 
         if (\array_key_exists('resource', $service)) {
             if (!\is_string($service['resource'])) {
-                throw new InvalidArgumentException(sprintf('A "resource" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+                throw new InvalidArgumentException(\sprintf('A "resource" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file));
             }
             $exclude = $service['exclude'] ?? null;
             $namespace = $service['namespace'] ?? $id;
@@ -718,7 +719,7 @@ class YamlFileLoader extends FileLoader
         if (\is_string($callable)) {
             if (str_starts_with($callable, '@=')) {
                 if ('factory' !== $parameter) {
-                    throw new InvalidArgumentException(sprintf('Using expressions in "%s" for the "%s" service is not supported in "%s".', $parameter, $id, $file));
+                    throw new InvalidArgumentException(\sprintf('Using expressions in "%s" for the "%s" service is not supported in "%s".', $parameter, $id, $file));
                 }
                 if (!class_exists(Expression::class)) {
                     throw new \LogicException('The "@=" expression syntax cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
@@ -732,7 +733,7 @@ class YamlFileLoader extends FileLoader
                     return [$this->resolveServices($callable, $file), '__invoke'];
                 }
 
-                throw new InvalidArgumentException(sprintf('The value of the "%s" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s" in "%s").', $parameter, $id, $callable, substr($callable, 1), $file));
+                throw new InvalidArgumentException(\sprintf('The value of the "%s" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s" in "%s").', $parameter, $id, $callable, substr($callable, 1), $file));
             }
 
             return $callable;
@@ -747,10 +748,10 @@ class YamlFileLoader extends FileLoader
                 return $callable;
             }
 
-            throw new InvalidArgumentException(sprintf('Parameter "%s" must contain an array with two elements for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
+            throw new InvalidArgumentException(\sprintf('Parameter "%s" must contain an array with two elements for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
         }
 
-        throw new InvalidArgumentException(sprintf('Parameter "%s" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
+        throw new InvalidArgumentException(\sprintf('Parameter "%s" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
     }
 
     /**
@@ -760,16 +761,16 @@ class YamlFileLoader extends FileLoader
      */
     protected function loadFile(string $file): ?array
     {
-        if (!class_exists(\Symfony\Component\Yaml\Parser::class)) {
+        if (!class_exists(YamlParser::class)) {
             throw new RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed. Try running "composer require symfony/yaml".');
         }
 
         if (!stream_is_local($file)) {
-            throw new InvalidArgumentException(sprintf('This is not a local file "%s".', $file));
+            throw new InvalidArgumentException(\sprintf('This is not a local file "%s".', $file));
         }
 
         if (!is_file($file)) {
-            throw new InvalidArgumentException(sprintf('The file "%s" does not exist.', $file));
+            throw new InvalidArgumentException(\sprintf('The file "%s" does not exist.', $file));
         }
 
         $this->yamlParser ??= new YamlParser();
@@ -777,7 +778,7 @@ class YamlFileLoader extends FileLoader
         try {
             $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
         } catch (ParseException $e) {
-            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $file).$e->getMessage(), 0, $e);
+            throw new InvalidArgumentException(\sprintf('The file "%s" does not contain valid YAML: ', $file).$e->getMessage(), 0, $e);
         }
 
         return $this->validate($configuration, $file);
@@ -795,7 +796,7 @@ class YamlFileLoader extends FileLoader
         }
 
         if (!\is_array($content)) {
-            throw new InvalidArgumentException(sprintf('The service file "%s" is not valid. It should contain an array. Check your YAML syntax.', $file));
+            throw new InvalidArgumentException(\sprintf('The service file "%s" is not valid. It should contain an array. Check your YAML syntax.', $file));
         }
 
         foreach ($content as $namespace => $data) {
@@ -805,7 +806,7 @@ class YamlFileLoader extends FileLoader
 
             if (!$this->container->hasExtension($namespace)) {
                 $extensionNamespaces = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
-                throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
+                throw new InvalidArgumentException(\sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $file, $namespace, $extensionNamespaces ? \sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
             }
         }
 
@@ -826,7 +827,7 @@ class YamlFileLoader extends FileLoader
             }
             if ('iterator' === $value->getTag()) {
                 if (!\is_array($argument)) {
-                    throw new InvalidArgumentException(sprintf('"!iterator" tag only accepts sequences in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('"!iterator" tag only accepts sequences in "%s".', $file));
                 }
                 $argument = $this->resolveServices($argument, $file, $isParameter);
 
@@ -839,7 +840,7 @@ class YamlFileLoader extends FileLoader
             }
             if ('service_locator' === $value->getTag()) {
                 if (!\is_array($argument)) {
-                    throw new InvalidArgumentException(sprintf('"!service_locator" tag only accepts maps in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('"!service_locator" tag only accepts maps in "%s".', $file));
                 }
 
                 $argument = $this->resolveServices($argument, $file, $isParameter);
@@ -855,14 +856,14 @@ class YamlFileLoader extends FileLoader
 
                 if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {
                     if ($diff = array_diff(array_keys($argument), $supportedKeys = ['tag', 'index_by', 'default_index_method', 'default_priority_method', 'exclude', 'exclude_self'])) {
-                        throw new InvalidArgumentException(sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "%s".', $value->getTag(), implode('", "', $diff), implode('", "', $supportedKeys)));
+                        throw new InvalidArgumentException(\sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "%s".', $value->getTag(), implode('", "', $diff), implode('", "', $supportedKeys)));
                     }
 
                     $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator, $argument['default_priority_method'] ?? null, (array) ($argument['exclude'] ?? null), $argument['exclude_self'] ?? true);
                 } elseif (\is_string($argument) && $argument) {
                     $argument = new TaggedIteratorArgument($argument, null, null, $forLocator);
                 } else {
-                    throw new InvalidArgumentException(sprintf('"!%s" tags only accept a non empty string or an array with a key "tag" in "%s".', $value->getTag(), $file));
+                    throw new InvalidArgumentException(\sprintf('"!%s" tags only accept a non empty string or an array with a key "tag" in "%s".', $value->getTag(), $file));
                 }
 
                 if ($forLocator) {
@@ -873,7 +874,7 @@ class YamlFileLoader extends FileLoader
             }
             if ('service' === $value->getTag()) {
                 if ($isParameter) {
-                    throw new InvalidArgumentException(sprintf('Using an anonymous service in a parameter is not allowed in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('Using an anonymous service in a parameter is not allowed in "%s".', $file));
                 }
 
                 $isLoadingInstanceof = $this->isLoadingInstanceof;
@@ -881,11 +882,11 @@ class YamlFileLoader extends FileLoader
                 $instanceof = $this->instanceof;
                 $this->instanceof = [];
 
-                $id = sprintf('.%d_%s', ++$this->anonymousServicesCount, preg_replace('/^.*\\\\/', '', $argument['class'] ?? '').$this->anonymousServicesSuffix);
+                $id = \sprintf('.%d_%s', ++$this->anonymousServicesCount, preg_replace('/^.*\\\\/', '', $argument['class'] ?? '').$this->anonymousServicesSuffix);
                 $this->parseDefinition($id, $argument, $file, []);
 
                 if (!$this->container->hasDefinition($id)) {
-                    throw new InvalidArgumentException(sprintf('Creating an alias using the tag "!service" is not allowed in "%s".', $file));
+                    throw new InvalidArgumentException(\sprintf('Creating an alias using the tag "!service" is not allowed in "%s".', $file));
                 }
 
                 $this->container->getDefinition($id);
@@ -899,7 +900,7 @@ class YamlFileLoader extends FileLoader
                 return new AbstractArgument($value->getValue());
             }
 
-            throw new InvalidArgumentException(sprintf('Unsupported tag "!%s".', $value->getTag()));
+            throw new InvalidArgumentException(\sprintf('Unsupported tag "!%s".', $value->getTag()));
         }
 
         if (\is_array($value)) {
@@ -908,7 +909,7 @@ class YamlFileLoader extends FileLoader
             }
         } elseif (\is_string($value) && str_starts_with($value, '@=')) {
             if ($isParameter) {
-                throw new InvalidArgumentException(sprintf('Using expressions in parameters is not allowed in "%s".', $file));
+                throw new InvalidArgumentException(\sprintf('Using expressions in parameters is not allowed in "%s".', $file));
             }
 
             if (!class_exists(Expression::class)) {
@@ -966,7 +967,7 @@ class YamlFileLoader extends FileLoader
 
         foreach ($definition as $key => $value) {
             if (!isset($keywords[$key])) {
-                throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));
+                throw new InvalidArgumentException(\sprintf('The configuration key "%s" is unsupported for definition "%s" in "%s". Allowed configuration keys are "%s".', $key, $id, $file, implode('", "', $keywords)));
             }
         }
     }
@@ -978,7 +979,7 @@ class YamlFileLoader extends FileLoader
                 $this->validateAttributes($message, $value, [...$path, $name]);
             } elseif (!\is_scalar($value ?? '')) {
                 $name = implode('.', [...$path, $name]);
-                throw new InvalidArgumentException(sprintf($message, $name));
+                throw new InvalidArgumentException(\sprintf($message, $name));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php b/lib/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
index 4719d2126..60b5b9a32 100644
--- a/lib/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/lib/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -42,14 +42,14 @@ class EnvPlaceholderParameterBag extends ParameterBag
                 }
             }
             if (!preg_match('/^(?:[-.\w\\\\]*+:)*+\w*+$/', $env)) {
-                throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
+                throw new InvalidArgumentException(\sprintf('Invalid %s name: only "word" characters are allowed.', $name));
             }
             if ($this->has($name) && null !== ($defaultValue = parent::get($name)) && !\is_string($defaultValue)) {
-                throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', get_debug_type($defaultValue), $name));
+                throw new RuntimeException(\sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', get_debug_type($defaultValue), $name));
             }
 
             $uniqueName = hash('xxh128', $name.'_'.self::$counter++);
-            $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);
+            $placeholder = \sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);
             $this->envPlaceholders[$env][$placeholder] = $placeholder;
 
             return $placeholder;
@@ -151,7 +151,7 @@ class EnvPlaceholderParameterBag extends ParameterBag
 
         foreach ($this->envPlaceholders as $env => $placeholders) {
             if ($this->has($name = "env($env)") && null !== ($default = $this->parameters[$name]) && !\is_string($default)) {
-                throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, get_debug_type($default)));
+                throw new RuntimeException(\sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, get_debug_type($default)));
             }
         }
     }
diff --git a/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php b/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
index c1cd9087f..7ebc42f92 100644
--- a/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
+++ b/lib/symfony/dependency-injection/ParameterBag/ParameterBag.php
@@ -106,7 +106,7 @@ class ParameterBag implements ParameterBagInterface
     public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
     {
         if (is_numeric($name)) {
-            trigger_deprecation('symfony/dependency-injection', '6.2', sprintf('Using numeric parameter name "%s" is deprecated and will throw as of 7.0.', $name));
+            trigger_deprecation('symfony/dependency-injection', '6.2', \sprintf('Using numeric parameter name "%s" is deprecated and will throw as of 7.0.', $name));
             // uncomment the following line in 7.0
             // throw new InvalidArgumentException(sprintf('The parameter name "%s" cannot be numeric.', $name));
         }
@@ -189,7 +189,7 @@ class ParameterBag implements ParameterBagInterface
             foreach ($value as $key => $v) {
                 $resolvedKey = \is_string($key) ? $this->resolveValue($key, $resolving) : $key;
                 if (!\is_scalar($resolvedKey) && !$resolvedKey instanceof \Stringable) {
-                    throw new RuntimeException(sprintf('Array keys must be a scalar-value, but found key "%s" to resolve to type "%s".', $key, get_debug_type($resolvedKey)));
+                    throw new RuntimeException(\sprintf('Array keys must be a scalar-value, but found key "%s" to resolve to type "%s".', $key, get_debug_type($resolvedKey)));
                 }
 
                 $args[$resolvedKey] = $this->resolveValue($v, $resolving);
@@ -245,7 +245,7 @@ class ParameterBag implements ParameterBagInterface
             $resolved = $this->get($key);
 
             if (!\is_string($resolved) && !is_numeric($resolved)) {
-                throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type "%s" inside string value "%s".', $key, get_debug_type($resolved), $value));
+                throw new RuntimeException(\sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type "%s" inside string value "%s".', $key, get_debug_type($resolved), $value));
             }
 
             $resolved = (string) $resolved;
diff --git a/lib/symfony/dependency-injection/ReverseContainer.php b/lib/symfony/dependency-injection/ReverseContainer.php
index 22d1b35df..038f4f8be 100644
--- a/lib/symfony/dependency-injection/ReverseContainer.php
+++ b/lib/symfony/dependency-injection/ReverseContainer.php
@@ -66,7 +66,7 @@ final class ReverseContainer
         }
 
         if (isset($this->serviceContainer->getRemovedIds()[$id])) {
-            throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is private and cannot be accessed by reference. You should either make it public, or tag it as "%s".', $id, $this->tagName));
+            throw new ServiceNotFoundException($id, null, null, [], \sprintf('The "%s" service is private and cannot be accessed by reference. You should either make it public, or tag it as "%s".', $id, $this->tagName));
         }
 
         return $this->serviceContainer->get($id);
diff --git a/lib/symfony/dependency-injection/ServiceLocator.php b/lib/symfony/dependency-injection/ServiceLocator.php
index f36bfe5cb..c91b3aa92 100644
--- a/lib/symfony/dependency-injection/ServiceLocator.php
+++ b/lib/symfony/dependency-injection/ServiceLocator.php
@@ -46,11 +46,11 @@ class ServiceLocator implements ServiceProviderInterface, \Countable
         try {
             return $this->doGet($id);
         } catch (RuntimeException $e) {
-            $what = sprintf('service "%s" required by "%s"', $id, $this->externalId);
+            $what = \sprintf('service "%s" required by "%s"', $id, $this->externalId);
             $message = preg_replace('/service "\.service_locator\.[^"]++"/', $what, $e->getMessage());
 
             if ($e->getMessage() === $message) {
-                $message = sprintf('Cannot resolve %s: %s', $what, $message);
+                $message = \sprintf('Cannot resolve %s: %s', $what, $message);
             }
 
             $r = new \ReflectionProperty($e, 'message');
@@ -88,7 +88,7 @@ class ServiceLocator implements ServiceProviderInterface, \Countable
     private function createNotFoundException(string $id): NotFoundExceptionInterface
     {
         if ($this->loading) {
-            $msg = sprintf('The service "%s" has a dependency on a non-existent service "%s". This locator %s', end($this->loading), $id, $this->formatAlternatives());
+            $msg = \sprintf('The service "%s" has a dependency on a non-existent service "%s". This locator %s', end($this->loading), $id, $this->formatAlternatives());
 
             return new ServiceNotFoundException($id, end($this->loading) ?: null, null, [], $msg);
         }
@@ -98,7 +98,7 @@ class ServiceLocator implements ServiceProviderInterface, \Countable
         $externalId = $this->externalId ?: $class;
 
         $msg = [];
-        $msg[] = sprintf('Service "%s" not found:', $id);
+        $msg[] = \sprintf('Service "%s" not found:', $id);
 
         if (!$this->container) {
             $class = null;
@@ -110,22 +110,22 @@ class ServiceLocator implements ServiceProviderInterface, \Countable
                 $class = null;
             } catch (ServiceNotFoundException $e) {
                 if ($e->getAlternatives()) {
-                    $msg[] = sprintf('did you mean %s? Anyway,', $this->formatAlternatives($e->getAlternatives(), 'or'));
+                    $msg[] = \sprintf('did you mean %s? Anyway,', $this->formatAlternatives($e->getAlternatives(), 'or'));
                 } else {
                     $class = null;
                 }
             }
         }
         if ($externalId) {
-            $msg[] = sprintf('the container inside "%s" is a smaller service locator that %s', $externalId, $this->formatAlternatives());
+            $msg[] = \sprintf('the container inside "%s" is a smaller service locator that %s', $externalId, $this->formatAlternatives());
         } else {
-            $msg[] = sprintf('the current service locator %s', $this->formatAlternatives());
+            $msg[] = \sprintf('the current service locator %s', $this->formatAlternatives());
         }
 
         if (!$class) {
             // no-op
         } elseif (is_subclass_of($class, ServiceSubscriberInterface::class)) {
-            $msg[] = sprintf('Unless you need extra laziness, try using dependency injection instead. Otherwise, you need to declare it using "%s::getSubscribedServices()".', preg_replace('/([^\\\\]++\\\\)++/', '', $class));
+            $msg[] = \sprintf('Unless you need extra laziness, try using dependency injection instead. Otherwise, you need to declare it using "%s::getSubscribedServices()".', preg_replace('/([^\\\\]++\\\\)++/', '', $class));
         } else {
             $msg[] = 'Try using dependency injection instead.';
         }
@@ -138,17 +138,17 @@ class ServiceLocator implements ServiceProviderInterface, \Countable
         return new ServiceCircularReferenceException($id, $path);
     }
 
-    private function formatAlternatives(array $alternatives = null, string $separator = 'and'): string
+    private function formatAlternatives(?array $alternatives = null, string $separator = 'and'): string
     {
         $format = '"%s"%s';
         if (null === $alternatives) {
             if (!$alternatives = array_keys($this->factories)) {
                 return 'is empty...';
             }
-            $format = sprintf('only knows about the %s service%s.', $format, 1 < \count($alternatives) ? 's' : '');
+            $format = \sprintf('only knows about the %s service%s.', $format, 1 < \count($alternatives) ? 's' : '');
         }
         $last = array_pop($alternatives);
 
-        return sprintf($format, $alternatives ? implode('", "', $alternatives) : $last, $alternatives ? sprintf(' %s "%s"', $separator, $last) : '');
+        return \sprintf($format, $alternatives ? implode('", "', $alternatives) : $last, $alternatives ? \sprintf(' %s "%s"', $separator, $last) : '');
     }
 }
diff --git a/lib/symfony/dependency-injection/TypedReference.php b/lib/symfony/dependency-injection/TypedReference.php
index 9b431cd65..1c932c313 100644
--- a/lib/symfony/dependency-injection/TypedReference.php
+++ b/lib/symfony/dependency-injection/TypedReference.php
@@ -29,7 +29,7 @@ class TypedReference extends Reference
      * @param string|null $name            The name of the argument targeting the service
      * @param array       $attributes      The attributes to be used
      */
-    public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, string $name = null, array $attributes = [])
+    public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, ?string $name = null, array $attributes = [])
     {
         $this->name = $type === $id ? $name : null;
         parent::__construct($id, $invalidBehavior);
diff --git a/lib/symfony/dependency-injection/composer.json b/lib/symfony/dependency-injection/composer.json
index dc4a9feaf..86b05b917 100644
--- a/lib/symfony/dependency-injection/composer.json
+++ b/lib/symfony/dependency-injection/composer.json
@@ -20,7 +20,7 @@
         "psr/container": "^1.1|^2.0",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/service-contracts": "^2.5|^3.0",
-        "symfony/var-exporter": "^6.2.10|^7.0"
+        "symfony/var-exporter": "^6.4.20|^7.2.5"
     },
     "require-dev": {
         "symfony/yaml": "^5.4|^6.0|^7.0",
diff --git a/lib/symfony/dotenv/Command/DebugCommand.php b/lib/symfony/dotenv/Command/DebugCommand.php
index 0da80245e..b461c01ed 100644
--- a/lib/symfony/dotenv/Command/DebugCommand.php
+++ b/lib/symfony/dotenv/Command/DebugCommand.php
@@ -15,6 +15,7 @@ use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -80,21 +81,35 @@ EOT
             return 1;
         }
 
-        $envFiles = $this->getEnvFiles();
-        $availableFiles = array_filter($envFiles, fn (string $file) => is_file($this->getFilePath($file)));
+        if (!$filePath = $_SERVER['SYMFONY_DOTENV_PATH'] ?? null) {
+            $dotenvPath = $this->projectDirectory;
 
-        if (\in_array('.env.local.php', $availableFiles, true)) {
-            $io->warning('Due to existing dump file (.env.local.php) all other dotenv files are skipped.');
+            if (is_file($composerFile = $this->projectDirectory.'/composer.json')) {
+                $runtimeConfig = json_decode(file_get_contents($composerFile), true)['extra']['runtime'] ?? [];
+
+                if (isset($runtimeConfig['dotenv_path'])) {
+                    $dotenvPath = $this->projectDirectory.'/'.$runtimeConfig['dotenv_path'];
+                }
+            }
+
+            $filePath = $dotenvPath.'/.env';
         }
 
-        if (is_file($this->getFilePath('.env')) && is_file($this->getFilePath('.env.dist'))) {
-            $io->warning('The file .env.dist gets skipped due to the existence of .env.');
+        $envFiles = $this->getEnvFiles($filePath);
+        $availableFiles = array_filter($envFiles, 'is_file');
+
+        if (\in_array(\sprintf('%s.local.php', $filePath), $availableFiles, true)) {
+            $io->warning(\sprintf('Due to existing dump file (%s.local.php) all other dotenv files are skipped.', $this->getRelativeName($filePath)));
+        }
+
+        if (is_file($filePath) && is_file(\sprintf('%s.dist', $filePath))) {
+            $io->warning(\sprintf('The file %s.dist gets skipped due to the existence of %1$s.', $this->getRelativeName($filePath)));
         }
 
         $io->section('Scanned Files (in descending priority)');
-        $io->listing(array_map(static fn (string $envFile) => \in_array($envFile, $availableFiles, true)
-            ? sprintf('<fg=green>✓</> %s', $envFile)
-            : sprintf('<fg=red>⨯</> %s', $envFile), $envFiles));
+        $io->listing(array_map(fn (string $envFile) => \in_array($envFile, $availableFiles, true)
+            ? \sprintf('<fg=green>✓</> %s', $this->getRelativeName($envFile))
+            : \sprintf('<fg=red>⨯</> %s', $this->getRelativeName($envFile)), $envFiles));
 
         $nameFilter = $input->getArgument('filter');
         $variables = $this->getVariables($availableFiles, $nameFilter);
@@ -103,13 +118,13 @@ EOT
 
         if ($variables || null === $nameFilter) {
             $io->table(
-                array_merge(['Variable', 'Value'], $availableFiles),
-                $this->getVariables($availableFiles, $nameFilter)
+                array_merge(['Variable', 'Value'], array_map($this->getRelativeName(...), $availableFiles)),
+                $variables
             );
 
             $io->comment('Note that values might be different between web and CLI.');
         } else {
-            $io->warning(sprintf('No variables match the given filter "%s".', $nameFilter));
+            $io->warning(\sprintf('No variables match the given filter "%s".', $nameFilter));
         }
 
         return 0;
@@ -124,75 +139,84 @@ EOT
 
     private function getVariables(array $envFiles, ?string $nameFilter): array
     {
-        $vars = $this->getAvailableVars();
-
-        $output = [];
+        $variables = [];
         $fileValues = [];
-        foreach ($vars as $var) {
+        $dotenvVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? ''));
+
+        foreach ($envFiles as $envFile) {
+            $fileValues[$envFile] = $this->loadValues($envFile);
+            $variables += $fileValues[$envFile];
+        }
+
+        foreach ($variables as $var => $varDetails) {
             if (null !== $nameFilter && 0 !== stripos($var, $nameFilter)) {
+                unset($variables[$var]);
                 continue;
             }
 
-            $realValue = $_SERVER[$var];
-            $varDetails = [$var, $realValue];
-            foreach ($envFiles as $envFile) {
-                $values = $fileValues[$envFile] ??= $this->loadValues($envFile);
+            $realValue = $_SERVER[$var] ?? '';
+            $varDetails = [$var, '<fg=green>'.OutputFormatter::escape($realValue).'</>'];
+            $varSeen = !isset($dotenvVars[$var]);
 
-                $varString = $values[$var] ?? '<fg=yellow>n/a</>';
-                $shortenedVar = $this->getHelper('formatter')->truncate($varString, 30);
-                $varDetails[] = $varString === $realValue ? '<fg=green>'.$shortenedVar.'</>' : $shortenedVar;
+            foreach ($envFiles as $envFile) {
+                if (null === $value = $fileValues[$envFile][$var] ?? null) {
+                    $varDetails[] = '<fg=yellow>n/a</>';
+                    continue;
+                }
+
+                $shortenedValue = OutputFormatter::escape($this->getHelper('formatter')->truncate($value, 30));
+                $varDetails[] = $value === $realValue && !$varSeen ? '<fg=green>'.$shortenedValue.'</>' : $shortenedValue;
+                $varSeen = $varSeen || $value === $realValue;
             }
 
-            $output[] = $varDetails;
+            $variables[$var] = $varDetails;
         }
 
-        return $output;
+        ksort($variables);
+
+        return $variables;
     }
 
     private function getAvailableVars(): array
     {
-        $dotenvVars = $_SERVER['SYMFONY_DOTENV_VARS'] ?? '';
+        $filePath = $_SERVER['SYMFONY_DOTENV_PATH'] ?? $this->projectDirectory.\DIRECTORY_SEPARATOR.'.env';
+        $envFiles = $this->getEnvFiles($filePath);
 
-        if ('' === $dotenvVars) {
-            return [];
-        }
-
-        $vars = explode(',', $dotenvVars);
-        sort($vars);
-
-        return $vars;
+        return array_keys($this->getVariables(array_filter($envFiles, 'is_file'), null));
     }
 
-    private function getEnvFiles(): array
+    private function getEnvFiles(string $filePath): array
     {
         $files = [
-            '.env.local.php',
-            sprintf('.env.%s.local', $this->kernelEnvironment),
-            sprintf('.env.%s', $this->kernelEnvironment),
+            \sprintf('%s.local.php', $filePath),
+            \sprintf('%s.%s.local', $filePath, $this->kernelEnvironment),
+            \sprintf('%s.%s', $filePath, $this->kernelEnvironment),
         ];
 
         if ('test' !== $this->kernelEnvironment) {
-            $files[] = '.env.local';
+            $files[] = \sprintf('%s.local', $filePath);
         }
 
-        if (!is_file($this->getFilePath('.env')) && is_file($this->getFilePath('.env.dist'))) {
-            $files[] = '.env.dist';
+        if (!is_file($filePath) && is_file(\sprintf('%s.dist', $filePath))) {
+            $files[] = \sprintf('%s.dist', $filePath);
         } else {
-            $files[] = '.env';
+            $files[] = $filePath;
         }
 
         return $files;
     }
 
-    private function getFilePath(string $file): string
+    private function getRelativeName(string $filePath): string
     {
-        return $this->projectDirectory.\DIRECTORY_SEPARATOR.$file;
+        if (str_starts_with($filePath, $this->projectDirectory)) {
+            return substr($filePath, \strlen($this->projectDirectory) + 1);
+        }
+
+        return basename($filePath);
     }
 
-    private function loadValues(string $file): array
+    private function loadValues(string $filePath): array
     {
-        $filePath = $this->getFilePath($file);
-
         if (str_ends_with($filePath, '.php')) {
             return include $filePath;
         }
diff --git a/lib/symfony/dotenv/Command/DotenvDumpCommand.php b/lib/symfony/dotenv/Command/DotenvDumpCommand.php
index 051f4b05a..815c8e422 100644
--- a/lib/symfony/dotenv/Command/DotenvDumpCommand.php
+++ b/lib/symfony/dotenv/Command/DotenvDumpCommand.php
@@ -23,7 +23,13 @@ use Symfony\Component\Dotenv\Dotenv;
 /**
  * A console command to compile .env files into a PHP-optimized file called .env.local.php.
  *
- * @internal
+ * To use this command, first register it explicitly as a service, e.g in your services.yaml file:
+ *
+ *     ```yaml
+ *     services:
+ *         # [...]
+ *         Symfony\Component\Dotenv\Command\DotenvDumpCommand: ~
+ *     ```
  */
 #[Autoconfigure(bind: ['$projectDir' => '%kernel.project_dir%', '$defaultEnv' => '%kernel.environment%'])]
 #[AsCommand(name: 'dotenv:dump', description: 'Compile .env files to .env.local.php')]
@@ -32,7 +38,7 @@ final class DotenvDumpCommand extends Command
     private string $projectDir;
     private ?string $defaultEnv;
 
-    public function __construct(string $projectDir, string $defaultEnv = null)
+    public function __construct(string $projectDir, ?string $defaultEnv = null)
     {
         $this->projectDir = $projectDir;
         $this->defaultEnv = $defaultEnv;
@@ -88,17 +94,18 @@ return $vars;
 EOF;
         file_put_contents($dotenvPath.'.local.php', $vars, \LOCK_EX);
 
-        $output->writeln(sprintf('Successfully dumped .env files in <info>.env.local.php</> for the <info>%s</> environment.', $env));
+        $output->writeln(\sprintf('Successfully dumped .env files in <info>.env.local.php</> for the <info>%s</> environment.', $env));
 
         return 0;
     }
 
     private function loadEnv(string $dotenvPath, string $env, array $config): array
     {
-        $dotenv = new Dotenv();
         $envKey = $config['env_var_name'] ?? 'APP_ENV';
         $testEnvs = $config['test_envs'] ?? ['test'];
 
+        $dotenv = new Dotenv($envKey);
+
         $globalsBackup = [$_SERVER, $_ENV];
         unset($_SERVER[$envKey]);
         $_ENV = [$envKey => $env];
diff --git a/lib/symfony/dotenv/Dotenv.php b/lib/symfony/dotenv/Dotenv.php
index 9b905f31c..2d726285f 100644
--- a/lib/symfony/dotenv/Dotenv.php
+++ b/lib/symfony/dotenv/Dotenv.php
@@ -98,7 +98,7 @@ final class Dotenv
      * @throws FormatException when a file has a syntax error
      * @throws PathException   when a file does not exist or is not readable
      */
-    public function loadEnv(string $path, string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
+    public function loadEnv(string $path, ?string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
     {
         $k = $envKey ?? $this->envKey;
 
@@ -460,7 +460,7 @@ final class Dotenv
             try {
                 $process->mustRun();
             } catch (ProcessException) {
-                throw $this->createFormatException(sprintf('Issue expanding a command (%s)', $process->getErrorOutput()));
+                throw $this->createFormatException(\sprintf('Issue expanding a command (%s)', $process->getErrorOutput()));
             }
 
             return preg_replace('/[\r\n]+$/', '', $process->getOutput());
@@ -480,7 +480,7 @@ final class Dotenv
             (?!\()                             # no opening parenthesis
             (?P<opening_brace>\{)?             # optional brace
             (?P<name>'.self::VARNAME_REGEX.')? # var name
-            (?P<default_value>:[-=][^\}]++)?   # optional default value
+            (?P<default_value>:[-=][^\}]*+)?   # optional default value
             (?P<closing_brace>\})?             # optional closing brace
         /x';
 
@@ -515,7 +515,7 @@ final class Dotenv
             if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {
                 $unsupportedChars = strpbrk($matches['default_value'], '\'"{$');
                 if (false !== $unsupportedChars) {
-                    throw $this->createFormatException(sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));
+                    throw $this->createFormatException(\sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));
                 }
 
                 $value = substr($matches['default_value'], 2);
@@ -553,7 +553,13 @@ final class Dotenv
                 throw new PathException($path);
             }
 
-            $this->populate($this->parse(file_get_contents($path), $path), $overrideExistingVars);
+            $data = file_get_contents($path);
+
+            if ("\xEF\xBB\xBF" === substr($data, 0, 3)) {
+                throw new FormatException('Loading files starting with a byte-order-mark (BOM) is not supported.', new FormatExceptionContext($data, $path, 1, 0));
+            }
+
+            $this->populate($this->parse($data, $path), $overrideExistingVars);
         }
     }
 }
diff --git a/lib/symfony/dotenv/Exception/FormatException.php b/lib/symfony/dotenv/Exception/FormatException.php
index 8f1aa84b2..c2866d81f 100644
--- a/lib/symfony/dotenv/Exception/FormatException.php
+++ b/lib/symfony/dotenv/Exception/FormatException.php
@@ -20,11 +20,11 @@ final class FormatException extends \LogicException implements ExceptionInterfac
 {
     private FormatExceptionContext $context;
 
-    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, ?\Throwable $previous = null)
     {
         $this->context = $context;
 
-        parent::__construct(sprintf("%s in \"%s\" at line %d.\n%s", $message, $context->getPath(), $context->getLineno(), $context->getDetails()), $code, $previous);
+        parent::__construct(\sprintf("%s in \"%s\" at line %d.\n%s", $message, $context->getPath(), $context->getLineno(), $context->getDetails()), $code, $previous);
     }
 
     public function getContext(): FormatExceptionContext
diff --git a/lib/symfony/dotenv/Exception/PathException.php b/lib/symfony/dotenv/Exception/PathException.php
index 4a4d71722..568b009fb 100644
--- a/lib/symfony/dotenv/Exception/PathException.php
+++ b/lib/symfony/dotenv/Exception/PathException.php
@@ -18,8 +18,8 @@ namespace Symfony\Component\Dotenv\Exception;
  */
 final class PathException extends \RuntimeException implements ExceptionInterface
 {
-    public function __construct(string $path, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $path, int $code = 0, ?\Throwable $previous = null)
     {
-        parent::__construct(sprintf('Unable to read the "%s" environment file.', $path), $code, $previous);
+        parent::__construct(\sprintf('Unable to read the "%s" environment file.', $path), $code, $previous);
     }
 }
diff --git a/lib/symfony/error-handler/BufferingLogger.php b/lib/symfony/error-handler/BufferingLogger.php
index b33e07996..ddd0863f8 100644
--- a/lib/symfony/error-handler/BufferingLogger.php
+++ b/lib/symfony/error-handler/BufferingLogger.php
@@ -35,15 +35,12 @@ class BufferingLogger extends AbstractLogger
         return $logs;
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
@@ -65,7 +62,7 @@ class BufferingLogger extends AbstractLogger
                 }
             }
 
-            error_log(sprintf('%s [%s] %s', date(\DateTimeInterface::RFC3339), $level, $message));
+            error_log(\sprintf('%s [%s] %s', date(\DateTimeInterface::RFC3339), $level, $message));
         }
     }
 }
diff --git a/lib/symfony/error-handler/Debug.php b/lib/symfony/error-handler/Debug.php
index d54a38c4c..b090040d0 100644
--- a/lib/symfony/error-handler/Debug.php
+++ b/lib/symfony/error-handler/Debug.php
@@ -20,7 +20,7 @@ class Debug
 {
     public static function enable(): ErrorHandler
     {
-        error_reporting(-1);
+        error_reporting(\E_ALL & ~\E_DEPRECATED & ~\E_USER_DEPRECATED);
 
         if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
             ini_set('display_errors', 0);
diff --git a/lib/symfony/error-handler/DebugClassLoader.php b/lib/symfony/error-handler/DebugClassLoader.php
index 16af2d063..078f8af56 100644
--- a/lib/symfony/error-handler/DebugClassLoader.php
+++ b/lib/symfony/error-handler/DebugClassLoader.php
@@ -18,8 +18,10 @@ use Mockery\MockInterface;
 use Phake\IMock;
 use PHPUnit\Framework\MockObject\Matcher\StatelessInvocation;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use Prophecy\Prophecy\ProphecySubjectInterface;
 use ProxyManager\Proxy\ProxyInterface;
+use Symfony\Component\DependencyInjection\Argument\LazyClosure;
 use Symfony\Component\ErrorHandler\Internal\TentativeTypes;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 
@@ -180,7 +182,7 @@ class DebugClassLoader
     public static function enable(): void
     {
         // Ensures we don't hit https://bugs.php.net/42098
-        class_exists(\Symfony\Component\ErrorHandler\ErrorHandler::class);
+        class_exists(ErrorHandler::class);
         class_exists(\Psr\Log\LogLevel::class);
 
         if (!\is_array($functions = spl_autoload_functions())) {
@@ -252,6 +254,7 @@ class DebugClassLoader
 
             for (; $i < \count($symbols); ++$i) {
                 if (!is_subclass_of($symbols[$i], MockObject::class)
+                    && !is_subclass_of($symbols[$i], Stub::class)
                     && !is_subclass_of($symbols[$i], ProphecySubjectInterface::class)
                     && !is_subclass_of($symbols[$i], Proxy::class)
                     && !is_subclass_of($symbols[$i], ProxyInterface::class)
@@ -259,6 +262,7 @@ class DebugClassLoader
                     && !is_subclass_of($symbols[$i], LegacyProxy::class)
                     && !is_subclass_of($symbols[$i], MockInterface::class)
                     && !is_subclass_of($symbols[$i], IMock::class)
+                    && !(is_subclass_of($symbols[$i], LazyClosure::class) && str_contains($symbols[$i], "@anonymous\0"))
                 ) {
                     $loader->checkClass($symbols[$i]);
                 }
@@ -307,7 +311,7 @@ class DebugClassLoader
         $this->checkClass($class, $file);
     }
 
-    private function checkClass(string $class, string $file = null): void
+    private function checkClass(string $class, ?string $file = null): void
     {
         $exists = null === $file || class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false);
 
@@ -328,7 +332,7 @@ class DebugClassLoader
             $name = $refl->getName();
 
             if ($name !== $class && 0 === strcasecmp($name, $class)) {
-                throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: "%s" vs "%s".', $class, $name));
+                throw new \RuntimeException(\sprintf('Case mismatch between loaded and declared class names: "%s" vs "%s".', $class, $name));
             }
 
             $deprecations = $this->checkAnnotations($refl, $name);
@@ -344,14 +348,14 @@ class DebugClassLoader
 
         if (!$exists) {
             if (str_contains($class, '/')) {
-                throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
+                throw new \RuntimeException(\sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
             }
 
-            throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
+            throw new \RuntimeException(\sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
         }
 
         if (self::$caseCheck && $message = $this->checkCase($refl, $file, $class)) {
-            throw new \RuntimeException(sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', $message[0], $message[1], $message[2]));
+            throw new \RuntimeException(\sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', $message[0], $message[1], $message[2]));
         }
     }
 
@@ -412,7 +416,7 @@ class DebugClassLoader
             }
 
             if (isset(self::$final[$parent])) {
-                $deprecations[] = sprintf('The "%s" class is considered final%s It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $className);
+                $deprecations[] = \sprintf('The "%s" class is considered final%s It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $className);
             }
         }
 
@@ -425,10 +429,10 @@ class DebugClassLoader
                 $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
                 $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
 
-                $deprecations[] = sprintf('The "%s" %s %s "%s" that is deprecated%s', $className, $type, $verb, $use, self::$deprecated[$use]);
+                $deprecations[] = \sprintf('The "%s" %s %s "%s" that is deprecated%s', $className, $type, $verb, $use, self::$deprecated[$use]);
             }
             if (isset(self::$internal[$use]) && strncmp($vendor, str_replace('_', '\\', $use), $vendorLen)) {
-                $deprecations[] = sprintf('The "%s" %s is considered internal%s It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $className);
+                $deprecations[] = \sprintf('The "%s" %s is considered internal%s It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $className);
             }
             if (isset(self::$method[$use])) {
                 if ($refl->isAbstract()) {
@@ -454,7 +458,7 @@ class DebugClassLoader
                         }
                         $realName = substr($name, 0, strpos($name, '('));
                         if (!$refl->hasMethod($realName) || !($methodRefl = $refl->getMethod($realName))->isPublic() || ($static && !$methodRefl->isStatic()) || (!$static && $methodRefl->isStatic())) {
-                            $deprecations[] = sprintf('Class "%s" should implement method "%s::%s%s"%s', $className, ($static ? 'static ' : '').$interface, $name, $returnType ? ': '.$returnType : '', null === $description ? '.' : ': '.$description);
+                            $deprecations[] = \sprintf('Class "%s" should implement method "%s::%s%s"%s', $className, ($static ? 'static ' : '').$interface, $name, $returnType ? ': '.$returnType : '', null === $description ? '.' : ': '.$description);
                         }
                     }
                 }
@@ -518,13 +522,13 @@ class DebugClassLoader
 
             if ($parent && isset(self::$finalMethods[$parent][$method->name])) {
                 [$declaringClass, $message] = self::$finalMethods[$parent][$method->name];
-                $deprecations[] = sprintf('The "%s::%s()" method is considered final%s It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $className);
+                $deprecations[] = \sprintf('The "%s::%s()" method is considered final%s It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $className);
             }
 
             if (isset(self::$internalMethods[$class][$method->name])) {
                 [$declaringClass, $message] = self::$internalMethods[$class][$method->name];
                 if (strncmp($ns, $declaringClass, $len)) {
-                    $deprecations[] = sprintf('The "%s::%s()" method is considered internal%s It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $className);
+                    $deprecations[] = \sprintf('The "%s::%s()" method is considered internal%s It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $className);
                 }
             }
 
@@ -543,7 +547,7 @@ class DebugClassLoader
 
                 foreach (self::$annotatedParameters[$class][$method->name] as $parameterName => $deprecation) {
                     if (!isset($definedParameters[$parameterName]) && !isset($doc['param'][$parameterName])) {
-                        $deprecations[] = sprintf($deprecation, $className);
+                        $deprecations[] = \sprintf($deprecation, $className);
                     }
                 }
             }
@@ -581,7 +585,7 @@ class DebugClassLoader
                     if ('docblock' === $this->patchTypes['force']) {
                         $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                     } elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {
-                        $deprecations[] = sprintf('Method "%s::%s()" might add "%s" as a native return type declaration in the future. Do the same in %s "%s" now to avoid errors or add an explicit @return annotation to suppress this message.', $declaringClass, $method->name, $normalizedType, interface_exists($declaringClass) ? 'implementation' : 'child class', $className);
+                        $deprecations[] = \sprintf('Method "%s::%s()" might add "%s" as a native return type declaration in the future. Do the same in %s "%s" now to avoid errors or add an explicit @return annotation to suppress this message.', $declaringClass, $method->name, $normalizedType, interface_exists($declaringClass) ? 'implementation' : 'child class', $className);
                     }
                 }
             }
@@ -630,7 +634,7 @@ class DebugClassLoader
             }
             foreach ($doc['param'] as $parameterName => $parameterType) {
                 if (!isset($definedParameters[$parameterName])) {
-                    self::$annotatedParameters[$class][$method->name][$parameterName] = sprintf('The "%%s::%s()" method will require a new "%s$%s" argument in the next major version of its %s "%s", not defining it is deprecated.', $method->name, $parameterType ? $parameterType.' ' : '', $parameterName, interface_exists($className) ? 'interface' : 'parent class', $className);
+                    self::$annotatedParameters[$class][$method->name][$parameterName] = \sprintf('The "%%s::%s()" method will require a new "%s$%s" argument in the next major version of its %s "%s", not defining it is deprecated.', $method->name, $parameterType ? $parameterType.' ' : '', $parameterName, interface_exists($className) ? 'interface' : 'parent class', $className);
                 }
             }
         }
@@ -650,7 +654,7 @@ class DebugClassLoader
                 foreach ($parentAndOwnInterfaces as $use) {
                     if (isset(self::${$type}[$use][$r->name]) && !isset($doc['deprecated']) && ('finalConstants' === $type || substr($use, 0, strrpos($use, '\\')) !== substr($use, 0, strrpos($class, '\\')))) {
                         $msg = 'finalConstants' === $type ? '%s" constant' : '$%s" property';
-                        $deprecations[] = sprintf('The "%s::'.$msg.' is considered final. You should not override it in "%s".', self::${$type}[$use][$r->name], $r->name, $class);
+                        $deprecations[] = \sprintf('The "%s::'.$msg.' is considered final. You should not override it in "%s".', self::${$type}[$use][$r->name], $r->name, $class);
                     }
                 }
 
@@ -794,7 +798,7 @@ class DebugClassLoader
         return $ownInterfaces;
     }
 
-    private function setReturnType(string $types, string $class, string $method, string $filename, ?string $parent, \ReflectionType $returnType = null): void
+    private function setReturnType(string $types, string $class, string $method, string $filename, ?string $parent, ?\ReflectionType $returnType = null): void
     {
         if ('__construct' === $method) {
             return;
@@ -891,8 +895,8 @@ class DebugClassLoader
             }
         }
 
-        $phpType = sprintf($nullable ? (1 < \count($phpTypes) ? '%s|null' : '?%s') : '%s', implode($glue, $phpTypes));
-        $docType = sprintf($nullable ? '%s|null' : '%s', implode($glue, $docTypes));
+        $phpType = \sprintf($nullable ? (1 < \count($phpTypes) ? '%s|null' : '?%s') : '%s', implode($glue, $phpTypes));
+        $docType = \sprintf($nullable ? '%s|null' : '%s', implode($glue, $docTypes));
 
         self::$returnTypes[$class][$method] = [$phpType, $docType, $class, $filename];
     }
@@ -1024,7 +1028,7 @@ class DebugClassLoader
                 ++$fileOffset;
             }
 
-            $returnType[$i] = null !== $format ? sprintf($format, $alias) : $alias;
+            $returnType[$i] = null !== $format ? \sprintf($format, $alias) : $alias;
         }
 
         if ('docblock' === $this->patchTypes['force'] || ('object' === $normalizedType && '7.1' === $this->patchTypes['php'])) {
@@ -1212,7 +1216,7 @@ EOTXT;
             $static = 'static' === $parts[0];
 
             for ($i = $static ? 2 : 0; null !== $p = $parts[$i] ?? null; $i += 2) {
-                if (\in_array($p, ['', '|', '&', 'callable'], true) || \in_array(substr($returnType, -1), ['|', '&'], true)) {
+                if (\in_array($p, ['', 'callable'], true) || \in_array(substr($returnType, -1), ['|', '&'], true) || \in_array($p[0], ['|', '&'], true)) {
                     $returnType .= trim($parts[$i - 1] ?? '').$p;
                     continue;
                 }
diff --git a/lib/symfony/error-handler/Error/FatalError.php b/lib/symfony/error-handler/Error/FatalError.php
index a1fd5a995..a0657b7b8 100644
--- a/lib/symfony/error-handler/Error/FatalError.php
+++ b/lib/symfony/error-handler/Error/FatalError.php
@@ -18,7 +18,7 @@ class FatalError extends \Error
     /**
      * @param array $error An array as returned by error_get_last()
      */
-    public function __construct(string $message, int $code, array $error, int $traceOffset = null, bool $traceArgs = true, array $trace = null)
+    public function __construct(string $message, int $code, array $error, ?int $traceOffset = null, bool $traceArgs = true, ?array $trace = null)
     {
         parent::__construct($message, $code);
 
@@ -31,7 +31,7 @@ class FatalError extends \Error
                 }
             }
         } elseif (null !== $traceOffset) {
-            if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
+            if (\function_exists('xdebug_get_function_stack') && \in_array(\ini_get('xdebug.mode'), ['develop', false], true) && $trace = @xdebug_get_function_stack()) {
                 if (0 < $traceOffset) {
                     array_splice($trace, -$traceOffset);
                 }
diff --git a/lib/symfony/error-handler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/lib/symfony/error-handler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
index a98075fe4..fc243a619 100644
--- a/lib/symfony/error-handler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
+++ b/lib/symfony/error-handler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
@@ -34,11 +34,11 @@ class ClassNotFoundErrorEnhancer implements ErrorEnhancerInterface
         if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedClassName, '\\')) {
             $className = substr($fullyQualifiedClassName, $namespaceSeparatorIndex + 1);
             $namespacePrefix = substr($fullyQualifiedClassName, 0, $namespaceSeparatorIndex);
-            $message = sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
+            $message = \sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
             $tail = ' for another namespace?';
         } else {
             $className = $fullyQualifiedClassName;
-            $message = sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
+            $message = \sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
             $tail = '?';
         }
 
@@ -107,7 +107,8 @@ class ClassNotFoundErrorEnhancer implements ErrorEnhancerInterface
 
     private function findClassInPath(string $path, string $class, string $prefix): array
     {
-        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
+        $path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path);
+        if (!$path || !is_dir($path)) {
             return [];
         }
 
diff --git a/lib/symfony/error-handler/ErrorEnhancer/UndefinedFunctionErrorEnhancer.php b/lib/symfony/error-handler/ErrorEnhancer/UndefinedFunctionErrorEnhancer.php
index 0458c26ac..e1d54ab89 100644
--- a/lib/symfony/error-handler/ErrorEnhancer/UndefinedFunctionErrorEnhancer.php
+++ b/lib/symfony/error-handler/ErrorEnhancer/UndefinedFunctionErrorEnhancer.php
@@ -47,10 +47,10 @@ class UndefinedFunctionErrorEnhancer implements ErrorEnhancerInterface
         if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedFunctionName, '\\')) {
             $functionName = substr($fullyQualifiedFunctionName, $namespaceSeparatorIndex + 1);
             $namespacePrefix = substr($fullyQualifiedFunctionName, 0, $namespaceSeparatorIndex);
-            $message = sprintf('Attempted to call function "%s" from namespace "%s".', $functionName, $namespacePrefix);
+            $message = \sprintf('Attempted to call function "%s" from namespace "%s".', $functionName, $namespacePrefix);
         } else {
             $functionName = $fullyQualifiedFunctionName;
-            $message = sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
+            $message = \sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
         }
 
         $candidates = [];
diff --git a/lib/symfony/error-handler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php b/lib/symfony/error-handler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
index 80eaec9bf..e331c1795 100644
--- a/lib/symfony/error-handler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
+++ b/lib/symfony/error-handler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
@@ -34,7 +34,7 @@ class UndefinedMethodErrorEnhancer implements ErrorEnhancerInterface
         $className = $matches[1];
         $methodName = $matches[2];
 
-        $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
+        $message = \sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
 
         if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
             // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
diff --git a/lib/symfony/error-handler/ErrorHandler.php b/lib/symfony/error-handler/ErrorHandler.php
index 1ee29e1b8..142199eb4 100644
--- a/lib/symfony/error-handler/ErrorHandler.php
+++ b/lib/symfony/error-handler/ErrorHandler.php
@@ -55,7 +55,6 @@ class ErrorHandler
         \E_USER_DEPRECATED => 'User Deprecated',
         \E_NOTICE => 'Notice',
         \E_USER_NOTICE => 'User Notice',
-        \E_STRICT => 'Runtime Notice',
         \E_WARNING => 'Warning',
         \E_USER_WARNING => 'User Warning',
         \E_COMPILE_WARNING => 'Compile Warning',
@@ -73,7 +72,6 @@ class ErrorHandler
         \E_USER_DEPRECATED => [null, LogLevel::INFO],
         \E_NOTICE => [null, LogLevel::WARNING],
         \E_USER_NOTICE => [null, LogLevel::WARNING],
-        \E_STRICT => [null, LogLevel::WARNING],
         \E_WARNING => [null, LogLevel::WARNING],
         \E_USER_WARNING => [null, LogLevel::WARNING],
         \E_COMPILE_WARNING => [null, LogLevel::WARNING],
@@ -108,7 +106,7 @@ class ErrorHandler
     /**
      * Registers the error handler.
      */
-    public static function register(self $handler = null, bool $replace = true): self
+    public static function register(?self $handler = null, bool $replace = true): self
     {
         if (null === self::$reservedMemory) {
             self::$reservedMemory = str_repeat('x', 32768);
@@ -179,8 +177,13 @@ class ErrorHandler
         }
     }
 
-    public function __construct(BufferingLogger $bootstrappingLogger = null, bool $debug = false)
+    public function __construct(?BufferingLogger $bootstrappingLogger = null, bool $debug = false)
     {
+        if (\PHP_VERSION_ID < 80400) {
+            $this->levels[\E_STRICT] = 'Runtime Notice';
+            $this->loggers[\E_STRICT] = [null, LogLevel::WARNING];
+        }
+
         if ($bootstrappingLogger) {
             $this->bootstrappingLogger = $bootstrappingLogger;
             $this->setDefaultLogger($bootstrappingLogger);
@@ -190,7 +193,7 @@ class ErrorHandler
             $traceReflector->setValue($e, $trace);
             $e->file = $file ?? $e->file;
             $e->line = $line ?? $e->line;
-        }, null, new class() extends \Exception {
+        }, null, new class extends \Exception {
         });
         $this->debug = $debug;
     }
@@ -432,7 +435,7 @@ class ErrorHandler
                 return true;
             }
         } else {
-            if (str_contains($message, '@anonymous')) {
+            if (\PHP_VERSION_ID < 80303 && str_contains($message, '@anonymous')) {
                 $backtrace = debug_backtrace(false, 5);
 
                 for ($i = 1; isset($backtrace[$i]); ++$i) {
@@ -440,8 +443,7 @@ class ErrorHandler
                         && ('trigger_error' === $backtrace[$i]['function'] || 'user_error' === $backtrace[$i]['function'])
                     ) {
                         if ($backtrace[$i]['args'][0] !== $message) {
-                            $message = $this->parseAnonymousClass($backtrace[$i]['args'][0]);
-                            $logMessage = $this->levels[$type].': '.$message;
+                            $message = $backtrace[$i]['args'][0];
                         }
 
                         break;
@@ -449,6 +451,11 @@ class ErrorHandler
                 }
             }
 
+            if (str_contains($message, "@anonymous\0")) {
+                $message = $this->parseAnonymousClass($message);
+                $logMessage = $this->levels[$type].': '.$message;
+            }
+
             $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
 
             if ($throw || $this->tracedErrors & $type) {
@@ -559,7 +566,7 @@ class ErrorHandler
      *
      * @internal
      */
-    public static function handleFatalError(array $error = null): void
+    public static function handleFatalError(?array $error = null): void
     {
         if (null === self::$reservedMemory) {
             return;
@@ -591,6 +598,10 @@ class ErrorHandler
             set_exception_handler($h);
         }
         if (!$handler) {
+            if (null === $error && $exitCode = self::$exitCode) {
+                register_shutdown_function('register_shutdown_function', function () use ($exitCode) { exit($exitCode); });
+            }
+
             return;
         }
         if ($handler !== $h) {
@@ -626,8 +637,7 @@ class ErrorHandler
             // Ignore this re-throw
         }
 
-        if ($exit && self::$exitCode) {
-            $exitCode = self::$exitCode;
+        if ($exit && $exitCode = self::$exitCode) {
             register_shutdown_function('register_shutdown_function', function () use ($exitCode) { exit($exitCode); });
         }
     }
@@ -732,6 +742,6 @@ class ErrorHandler
      */
     private function parseAnonymousClass(string $message): string
     {
-        return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
+        return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', static fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
     }
 }
diff --git a/lib/symfony/error-handler/ErrorRenderer/CliErrorRenderer.php b/lib/symfony/error-handler/ErrorRenderer/CliErrorRenderer.php
index 04b3edb1b..c414c8307 100644
--- a/lib/symfony/error-handler/ErrorRenderer/CliErrorRenderer.php
+++ b/lib/symfony/error-handler/ErrorRenderer/CliErrorRenderer.php
@@ -26,7 +26,7 @@ class CliErrorRenderer implements ErrorRendererInterface
     public function render(\Throwable $exception): FlattenException
     {
         $cloner = new VarCloner();
-        $dumper = new class() extends CliDumper {
+        $dumper = new class extends CliDumper {
             protected function supportsColors(): bool
             {
                 $outputStream = $this->outputStream;
diff --git a/lib/symfony/error-handler/ErrorRenderer/FileLinkFormatter.php b/lib/symfony/error-handler/ErrorRenderer/FileLinkFormatter.php
index 29fcf835b..48f3a0a9d 100644
--- a/lib/symfony/error-handler/ErrorRenderer/FileLinkFormatter.php
+++ b/lib/symfony/error-handler/ErrorRenderer/FileLinkFormatter.php
@@ -30,9 +30,9 @@ class FileLinkFormatter
     private \Closure|string|null $urlFormat;
 
     /**
-     * @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
+     * @param string|\Closure $urlFormat The URL format, or a closure that returns it on-demand
      */
-    public function __construct(string|array $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, string|\Closure $urlFormat = null)
+    public function __construct(string|array|null $fileLinkFormat = null, ?RequestStack $requestStack = null, ?string $baseDir = null, string|\Closure|null $urlFormat = null)
     {
         $fileLinkFormat ??= $_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? '';
 
@@ -67,14 +67,11 @@ class FileLinkFormatter
         return false;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         $this->fileLinkFormat = $this->getFileLinkFormat();
 
-        return ['fileLinkFormat'];
+        return ['fileLinkFormat' => $this->fileLinkFormat];
     }
 
     /**
diff --git a/lib/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php b/lib/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php
index 4e2a99b80..12d708490 100644
--- a/lib/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php
+++ b/lib/symfony/error-handler/ErrorRenderer/HtmlErrorRenderer.php
@@ -47,7 +47,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
      * @param bool|callable   $debug        The debugging mode as a boolean or a callable that should return it
      * @param string|callable $outputBuffer The output buffer as a string or a callable that should return it
      */
-    public function __construct(bool|callable $debug = false, string $charset = null, string|FileLinkFormatter $fileLinkFormat = null, string $projectDir = null, string|callable $outputBuffer = '', LoggerInterface $logger = null)
+    public function __construct(bool|callable $debug = false, ?string $charset = null, string|FileLinkFormatter|null $fileLinkFormat = null, ?string $projectDir = null, string|callable $outputBuffer = '', ?LoggerInterface $logger = null)
     {
         $this->debug = \is_bool($debug) ? $debug : $debug(...);
         $this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
@@ -61,7 +61,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
     {
         $headers = ['Content-Type' => 'text/html; charset='.$this->charset];
         if (\is_bool($this->debug) ? $this->debug : ($this->debug)($exception)) {
-            $headers['X-Debug-Exception'] = rawurlencode($exception->getMessage());
+            $headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000));
             $headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine();
         }
 
@@ -140,7 +140,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
             'exceptionMessage' => $exceptionMessage,
             'statusText' => $statusText,
             'statusCode' => $statusCode,
-            'logger' => DebugLoggerConfigurator::getDebugLogger($this->logger),
+            'logger' => null !== $this->logger && class_exists(DebugLoggerConfigurator::class) ? DebugLoggerConfigurator::getDebugLogger($this->logger) : null,
             'currentContent' => \is_string($this->outputBuffer) ? $this->outputBuffer : ($this->outputBuffer)(),
         ]);
     }
@@ -158,20 +158,22 @@ class HtmlErrorRenderer implements ErrorRendererInterface
         $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
-                $formattedValue = sprintf('<em>object</em>(%s)', $this->abbrClass($item[1]));
+                $formattedValue = \sprintf('<em>object</em>(%s)', $this->abbrClass($item[1]));
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = \sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';
             } elseif ('boolean' === $item[0]) {
                 $formattedValue = '<em>'.strtolower(var_export($item[1], true)).'</em>';
             } elseif ('resource' === $item[0]) {
                 $formattedValue = '<em>resource</em>';
+            } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {
+                $formattedValue = '<em>binary string</em>';
             } else {
                 $formattedValue = str_replace("\n", '', $this->escape(var_export($item[1], true)));
             }
 
-            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escape($key), $formattedValue);
+            $result[] = \is_int($key) ? $formattedValue : \sprintf("'%s' => %s", $this->escape($key), $formattedValue);
         }
 
         return implode(', ', $result);
@@ -192,7 +194,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
         $parts = explode('\\', $class);
         $short = array_pop($parts);
 
-        return sprintf('<abbr title="%s">%s</abbr>', $class, $short);
+        return \sprintf('<abbr title="%s">%s</abbr>', $class, $short);
     }
 
     private function getFileRelative(string $file): ?string
@@ -213,7 +215,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
      * @param int    $line The line number
      * @param string $text Use this text for the link rather than the file path
      */
-    private function formatFile(string $file, int $line, string $text = null): string
+    private function formatFile(string $file, int $line, ?string $text = null): string
     {
         $file = trim($file);
 
@@ -221,7 +223,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
             $text = $file;
             if (null !== $rel = $this->getFileRelative($text)) {
                 $rel = explode('/', $rel, 2);
-                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->projectDir, $rel[0], '/'.($rel[1] ?? ''));
+                $text = \sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->projectDir, $rel[0], '/'.($rel[1] ?? ''));
             }
         }
 
@@ -229,9 +231,13 @@ class HtmlErrorRenderer implements ErrorRendererInterface
             $text .= ' at line '.$line;
         }
 
+        if (!file_exists($file)) {
+            return $text;
+        }
+
         $link = $this->fileLinkFormat->format($file, $line);
 
-        return sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $this->escape($link), $text);
+        return \sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $this->escape($link), $text);
     }
 
     /**
@@ -250,10 +256,10 @@ class HtmlErrorRenderer implements ErrorRendererInterface
             if (\PHP_VERSION_ID >= 80300) {
                 // remove main pre/code tags
                 $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
-                // split multiline code tags
-                $code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn ($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
-                // Convert spaces to html entities to preserve indentation when rendered
-                $code = str_replace(' ', '&nbsp;', $code);
+                // split multiline span tags
+                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<\\n]*+\\n)++[^<]*+)</span>#', function ($m) {
+                    return "<span $m[1]>".str_replace("\n", "</span>\n<span $m[1]>", $m[2]).'</span>';
+                }, $code);
                 $content = explode("\n", $code);
             } else {
                 // remove main code/span tags
@@ -299,7 +305,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
 
     private function formatFileFromText(string $text): string
     {
-        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', fn ($match) => 'in '.$this->formatFile($match[2], $match[3]), $text);
+        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', fn ($match) => 'in '.$this->formatFile($match[2], $match[3]), $text) ?? $text;
     }
 
     private function formatLogMessage(string $message, array $context): string
diff --git a/lib/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php b/lib/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php
index 1f286b784..b09a6e00c 100644
--- a/lib/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php
+++ b/lib/symfony/error-handler/ErrorRenderer/SerializerErrorRenderer.php
@@ -34,7 +34,7 @@ class SerializerErrorRenderer implements ErrorRendererInterface
      *                                                  formats not supported by Request::getMimeTypes() should be given as mime types
      * @param bool|callable                     $debug  The debugging mode as a boolean or a callable that should return it
      */
-    public function __construct(SerializerInterface $serializer, string|callable $format, ErrorRendererInterface $fallbackErrorRenderer = null, bool|callable $debug = false)
+    public function __construct(SerializerInterface $serializer, string|callable $format, ?ErrorRendererInterface $fallbackErrorRenderer = null, bool|callable $debug = false)
     {
         $this->serializer = $serializer;
         $this->format = \is_string($format) ? $format : $format(...);
@@ -47,7 +47,7 @@ class SerializerErrorRenderer implements ErrorRendererInterface
         $headers = ['Vary' => 'Accept'];
         $debug = \is_bool($this->debug) ? $this->debug : ($this->debug)($exception);
         if ($debug) {
-            $headers['X-Debug-Exception'] = rawurlencode($exception->getMessage());
+            $headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000));
             $headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine();
         }
 
diff --git a/lib/symfony/error-handler/Exception/FlattenException.php b/lib/symfony/error-handler/Exception/FlattenException.php
index ab62b1be3..f8ec1faf0 100644
--- a/lib/symfony/error-handler/Exception/FlattenException.php
+++ b/lib/symfony/error-handler/Exception/FlattenException.php
@@ -42,12 +42,12 @@ class FlattenException
     private ?string $asString = null;
     private Data $dataRepresentation;
 
-    public static function create(\Exception $exception, int $statusCode = null, array $headers = []): static
+    public static function create(\Exception $exception, ?int $statusCode = null, array $headers = []): static
     {
         return static::createFromThrowable($exception, $statusCode, $headers);
     }
 
-    public static function createFromThrowable(\Throwable $exception, int $statusCode = null, array $headers = []): static
+    public static function createFromThrowable(\Throwable $exception, ?int $statusCode = null, array $headers = []): static
     {
         $e = new static();
         $e->setMessage($exception->getMessage());
@@ -85,7 +85,7 @@ class FlattenException
         return $e;
     }
 
-    public static function createWithDataRepresentation(\Throwable $throwable, int $statusCode = null, array $headers = [], VarCloner $cloner = null): static
+    public static function createWithDataRepresentation(\Throwable $throwable, ?int $statusCode = null, array $headers = [], ?VarCloner $cloner = null): static
     {
         $e = static::createFromThrowable($throwable, $statusCode, $headers);
 
@@ -228,7 +228,7 @@ class FlattenException
     public function setMessage(string $message): static
     {
         if (str_contains($message, "@anonymous\0")) {
-            $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
+            $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
         }
 
         $this->message = $message;
diff --git a/lib/symfony/error-handler/Resources/assets/css/exception.css b/lib/symfony/error-handler/Resources/assets/css/exception.css
index 3e6eae5a9..8c3690720 100644
--- a/lib/symfony/error-handler/Resources/assets/css/exception.css
+++ b/lib/symfony/error-handler/Resources/assets/css/exception.css
@@ -57,7 +57,7 @@
     --page-background: #36393e;
     --color-text: #e0e0e0;
     --color-muted: #777;
-    --color-error: #d43934;
+    --color-error: #f76864;
     --tab-background: #404040;
     --tab-border-color: #737373;
     --tab-active-border-color: #171717;
@@ -80,7 +80,7 @@
     --metric-unit-color: #999;
     --metric-label-background: #777;
     --metric-label-color: #e0e0e0;
-    --trace-selected-background: #71663acc;
+    --trace-selected-background: #5d5227cc;
     --table-border: #444;
     --table-background: #333;
     --table-header: #555;
@@ -92,7 +92,7 @@
     --background-error: #b0413e;
     --highlight-comment: #dedede;
     --highlight-default: var(--base-6);
-    --highlight-keyword: #ff413c;
+    --highlight-keyword: #de8986;
     --highlight-string: #70a6fd;
     --base-0: #2e3136;
     --base-1: #444;
@@ -349,7 +349,7 @@ header .container { display: flex; justify-content: space-between; }
 .trace-code li { color: #969896; margin: 0; padding-left: 10px; float: left; width: 100%; }
 .trace-code li + li { margin-top: 5px; }
 .trace-code li.selected { background: var(--trace-selected-background); margin-top: 2px; }
-.trace-code li code { color: var(--base-6); white-space: nowrap; }
+.trace-code li code { color: var(--base-6); white-space: pre; }
 
 .trace-as-text .stacktrace { line-height: 1.8; margin: 0 0 15px; white-space: pre-wrap; }
 
diff --git a/lib/symfony/error-handler/Resources/assets/js/exception.js b/lib/symfony/error-handler/Resources/assets/js/exception.js
index 22ce675df..89c008334 100644
--- a/lib/symfony/error-handler/Resources/assets/js/exception.js
+++ b/lib/symfony/error-handler/Resources/assets/js/exception.js
@@ -145,6 +145,12 @@
             }
 
             addEventListener(toggles[i], 'click', function(e) {
+                var toggle = e.currentTarget;
+
+                if (e.target.closest('a, span[data-clipboard-text], .sf-toggle') !== toggle) {
+                    return;
+                }
+
                 e.preventDefault();
 
                 if ('' !== window.getSelection().toString()) {
@@ -152,14 +158,6 @@
                     return;
                 }
 
-                var toggle = e.target || e.srcElement;
-
-                /* needed because when the toggle contains HTML contents, user can click */
-                /* on any of those elements instead of their parent '.sf-toggle' element */
-                while (!hasClass(toggle, 'sf-toggle')) {
-                    toggle = toggle.parentNode;
-                }
-
                 var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
 
                 toggleClass(toggle, 'sf-toggle-on');
@@ -182,22 +180,6 @@
                 toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
             });
 
-            /* Prevents from disallowing clicks on links inside toggles */
-            var toggleLinks = toggles[i].querySelectorAll('a');
-            for (var j = 0; j < toggleLinks.length; j++) {
-                addEventListener(toggleLinks[j], 'click', function(e) {
-                    e.stopPropagation();
-                });
-            }
-
-            /* Prevents from disallowing clicks on "copy to clipboard" elements inside toggles */
-            var copyToClipboardElements = toggles[i].querySelectorAll('span[data-clipboard-text]');
-            for (var k = 0; k < copyToClipboardElements.length; k++) {
-                addEventListener(copyToClipboardElements[k], 'click', function(e) {
-                    e.stopPropagation();
-                });
-            }
-
             toggles[i].setAttribute('data-processed', 'true');
         }
     })();
diff --git a/lib/symfony/error-handler/Resources/bin/patch-type-declarations b/lib/symfony/error-handler/Resources/bin/patch-type-declarations
old mode 100644
new mode 100755
diff --git a/lib/symfony/error-handler/Resources/views/error.html.php b/lib/symfony/error-handler/Resources/views/error.html.php
index 1085a5adb..3fbf28f60 100644
--- a/lib/symfony/error-handler/Resources/views/error.html.php
+++ b/lib/symfony/error-handler/Resources/views/error.html.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="<?= $this->charset; ?>">
-    <meta name="robots" content="noindex,nofollow,noarchive">
+    <meta charset="<?= $this->charset; ?>" />
+    <meta name="robots" content="noindex,nofollow,noarchive" />
     <title>An Error Occurred: <?= $statusText; ?></title>
-    <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>❌</text></svg>">
+    <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>❌</text></svg>" />
     <style><?= $this->include('assets/css/error.css'); ?></style>
 </head>
 <body>
diff --git a/lib/symfony/error-handler/Resources/views/exception_full.html.php b/lib/symfony/error-handler/Resources/views/exception_full.html.php
index 9d5f6e336..af04db1bd 100644
--- a/lib/symfony/error-handler/Resources/views/exception_full.html.php
+++ b/lib/symfony/error-handler/Resources/views/exception_full.html.php
@@ -2,11 +2,11 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <meta charset="<?= $this->charset; ?>">
-        <meta name="robots" content="noindex,nofollow">
-        <meta name="viewport" content="width=device-width,initial-scale=1">
+        <meta charset="<?= $this->charset; ?>" />
+        <meta name="robots" content="noindex,nofollow" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
         <title><?= $_message; ?></title>
-        <link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>">
+        <link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>" />
         <style><?= $this->include('assets/css/exception.css'); ?></style>
         <style><?= $this->include('assets/css/exception_full.css'); ?></style>
     </head>
diff --git a/lib/symfony/filesystem/Exception/FileNotFoundException.php b/lib/symfony/filesystem/Exception/FileNotFoundException.php
index 48b640809..d0d27977d 100644
--- a/lib/symfony/filesystem/Exception/FileNotFoundException.php
+++ b/lib/symfony/filesystem/Exception/FileNotFoundException.php
@@ -19,13 +19,13 @@ namespace Symfony\Component\Filesystem\Exception;
  */
 class FileNotFoundException extends IOException
 {
-    public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null)
+    public function __construct(?string $message = null, int $code = 0, ?\Throwable $previous = null, ?string $path = null)
     {
         if (null === $message) {
             if (null === $path) {
                 $message = 'File could not be found.';
             } else {
-                $message = sprintf('File "%s" could not be found.', $path);
+                $message = \sprintf('File "%s" could not be found.', $path);
             }
         }
 
diff --git a/lib/symfony/filesystem/Exception/IOException.php b/lib/symfony/filesystem/Exception/IOException.php
index a3c544553..df3a0850a 100644
--- a/lib/symfony/filesystem/Exception/IOException.php
+++ b/lib/symfony/filesystem/Exception/IOException.php
@@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface
 {
     private ?string $path;
 
-    public function __construct(string $message, int $code = 0, \Throwable $previous = null, string $path = null)
+    public function __construct(string $message, int $code = 0, ?\Throwable $previous = null, ?string $path = null)
     {
         $this->path = $path;
 
diff --git a/lib/symfony/filesystem/Filesystem.php b/lib/symfony/filesystem/Filesystem.php
index 78458d5b9..71628ceed 100644
--- a/lib/symfony/filesystem/Filesystem.php
+++ b/lib/symfony/filesystem/Filesystem.php
@@ -40,25 +40,25 @@ class Filesystem
     {
         $originIsLocal = stream_is_local($originFile) || 0 === stripos($originFile, 'file://');
         if ($originIsLocal && !is_file($originFile)) {
-            throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
+            throw new FileNotFoundException(\sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
         }
 
         $this->mkdir(\dirname($targetFile));
 
         $doCopy = true;
-        if (!$overwriteNewerFiles && null === parse_url($originFile, \PHP_URL_HOST) && is_file($targetFile)) {
+        if (!$overwriteNewerFiles && !parse_url($originFile, \PHP_URL_HOST) && is_file($targetFile)) {
             $doCopy = filemtime($originFile) > filemtime($targetFile);
         }
 
         if ($doCopy) {
             // https://bugs.php.net/64634
             if (!$source = self::box('fopen', $originFile, 'r')) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s" because source file could not be opened for reading: ', $originFile, $targetFile).self::$lastError, 0, null, $originFile);
+                throw new IOException(\sprintf('Failed to copy "%s" to "%s" because source file could not be opened for reading: ', $originFile, $targetFile).self::$lastError, 0, null, $originFile);
             }
 
             // Stream context created to allow files overwrite when using FTP stream wrapper - disabled by default
             if (!$target = self::box('fopen', $targetFile, 'w', false, stream_context_create(['ftp' => ['overwrite' => true]]))) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s" because target file could not be opened for writing: ', $originFile, $targetFile).self::$lastError, 0, null, $originFile);
+                throw new IOException(\sprintf('Failed to copy "%s" to "%s" because target file could not be opened for writing: ', $originFile, $targetFile).self::$lastError, 0, null, $originFile);
             }
 
             $bytesCopied = stream_copy_to_stream($source, $target);
@@ -67,15 +67,18 @@ class Filesystem
             unset($source, $target);
 
             if (!is_file($targetFile)) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
+                throw new IOException(\sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
             }
 
             if ($originIsLocal) {
                 // Like `cp`, preserve executable permission bits
                 self::box('chmod', $targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
 
+                // Like `cp`, preserve the file modification time
+                self::box('touch', $targetFile, filemtime($originFile));
+
                 if ($bytesCopied !== $bytesOrigin = filesize($originFile)) {
-                    throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
+                    throw new IOException(\sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
                 }
             }
         }
@@ -96,7 +99,7 @@ class Filesystem
             }
 
             if (!self::box('mkdir', $dir, $mode, true) && !is_dir($dir)) {
-                throw new IOException(sprintf('Failed to create "%s": ', $dir).self::$lastError, 0, null, $dir);
+                throw new IOException(\sprintf('Failed to create "%s": ', $dir).self::$lastError, 0, null, $dir);
             }
         }
     }
@@ -110,7 +113,7 @@ class Filesystem
 
         foreach ($this->toIterable($files) as $file) {
             if (\strlen($file) > $maxPathLength) {
-                throw new IOException(sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);
+                throw new IOException(\sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);
             }
 
             if (!file_exists($file)) {
@@ -131,11 +134,11 @@ class Filesystem
      *
      * @throws IOException When touch fails
      */
-    public function touch(string|iterable $files, int $time = null, int $atime = null)
+    public function touch(string|iterable $files, ?int $time = null, ?int $atime = null)
     {
         foreach ($this->toIterable($files) as $file) {
             if (!($time ? self::box('touch', $file, $time, $atime) : self::box('touch', $file))) {
-                throw new IOException(sprintf('Failed to touch "%s": ', $file).self::$lastError, 0, null, $file);
+                throw new IOException(\sprintf('Failed to touch "%s": ', $file).self::$lastError, 0, null, $file);
             }
         }
     }
@@ -165,11 +168,11 @@ class Filesystem
             if (is_link($file)) {
                 // See https://bugs.php.net/52176
                 if (!(self::box('unlink', $file) || '\\' !== \DIRECTORY_SEPARATOR || self::box('rmdir', $file)) && file_exists($file)) {
-                    throw new IOException(sprintf('Failed to remove symlink "%s": ', $file).self::$lastError);
+                    throw new IOException(\sprintf('Failed to remove symlink "%s": ', $file).self::$lastError);
                 }
             } elseif (is_dir($file)) {
                 if (!$isRecursive) {
-                    $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-_'));
+                    $tmpName = \dirname(realpath($file)).'/.!'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-!'));
 
                     if (file_exists($tmpName)) {
                         try {
@@ -196,10 +199,10 @@ class Filesystem
                         $file = $origFile;
                     }
 
-                    throw new IOException(sprintf('Failed to remove directory "%s": ', $file).$lastError);
+                    throw new IOException(\sprintf('Failed to remove directory "%s": ', $file).$lastError);
                 }
-            } elseif (!self::box('unlink', $file) && (str_contains(self::$lastError, 'Permission denied') || file_exists($file))) {
-                throw new IOException(sprintf('Failed to remove file "%s": ', $file).self::$lastError);
+            } elseif (!self::box('unlink', $file) && ((self::$lastError && str_contains(self::$lastError, 'Permission denied')) || file_exists($file))) {
+                throw new IOException(\sprintf('Failed to remove file "%s": ', $file).self::$lastError);
             }
         }
     }
@@ -219,7 +222,7 @@ class Filesystem
     {
         foreach ($this->toIterable($files) as $file) {
             if (!self::box('chmod', $file, $mode & ~$umask)) {
-                throw new IOException(sprintf('Failed to chmod file "%s": ', $file).self::$lastError, 0, null, $file);
+                throw new IOException(\sprintf('Failed to chmod file "%s": ', $file).self::$lastError, 0, null, $file);
             }
             if ($recursive && is_dir($file) && !is_link($file)) {
                 $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
@@ -230,6 +233,10 @@ class Filesystem
     /**
      * Change the owner of an array of files or directories.
      *
+     * This method always throws on Windows, as the underlying PHP function is not supported.
+     *
+     * @see https://php.net/chown
+     *
      * @param string|int $user      A user name or number
      * @param bool       $recursive Whether change the owner recursively or not
      *
@@ -245,11 +252,11 @@ class Filesystem
             }
             if (is_link($file) && \function_exists('lchown')) {
                 if (!self::box('lchown', $file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s": ', $file).self::$lastError, 0, null, $file);
+                    throw new IOException(\sprintf('Failed to chown file "%s": ', $file).self::$lastError, 0, null, $file);
                 }
             } else {
                 if (!self::box('chown', $file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s": ', $file).self::$lastError, 0, null, $file);
+                    throw new IOException(\sprintf('Failed to chown file "%s": ', $file).self::$lastError, 0, null, $file);
                 }
             }
         }
@@ -258,6 +265,10 @@ class Filesystem
     /**
      * Change the group of an array of files or directories.
      *
+     * This method always throws on Windows, as the underlying PHP function is not supported.
+     *
+     * @see https://php.net/chgrp
+     *
      * @param string|int $group     A group name or number
      * @param bool       $recursive Whether change the group recursively or not
      *
@@ -273,11 +284,11 @@ class Filesystem
             }
             if (is_link($file) && \function_exists('lchgrp')) {
                 if (!self::box('lchgrp', $file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s": ', $file).self::$lastError, 0, null, $file);
+                    throw new IOException(\sprintf('Failed to chgrp file "%s": ', $file).self::$lastError, 0, null, $file);
                 }
             } else {
                 if (!self::box('chgrp', $file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s": ', $file).self::$lastError, 0, null, $file);
+                    throw new IOException(\sprintf('Failed to chgrp file "%s": ', $file).self::$lastError, 0, null, $file);
                 }
             }
         }
@@ -295,7 +306,7 @@ class Filesystem
     {
         // we check that target does not exist
         if (!$overwrite && $this->isReadable($target)) {
-            throw new IOException(sprintf('Cannot rename because the target "%s" already exists.', $target), 0, null, $target);
+            throw new IOException(\sprintf('Cannot rename because the target "%s" already exists.', $target), 0, null, $target);
         }
 
         if (!self::box('rename', $origin, $target)) {
@@ -306,7 +317,7 @@ class Filesystem
 
                 return;
             }
-            throw new IOException(sprintf('Cannot rename "%s" to "%s": ', $origin, $target).self::$lastError, 0, null, $target);
+            throw new IOException(\sprintf('Cannot rename "%s" to "%s": ', $origin, $target).self::$lastError, 0, null, $target);
         }
     }
 
@@ -320,7 +331,7 @@ class Filesystem
         $maxPathLength = \PHP_MAXPATHLEN - 2;
 
         if (\strlen($filename) > $maxPathLength) {
-            throw new IOException(sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);
+            throw new IOException(\sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);
         }
 
         return is_readable($filename);
@@ -381,7 +392,7 @@ class Filesystem
         }
 
         if (!is_file($originFile)) {
-            throw new FileNotFoundException(sprintf('Origin file "%s" is not a file.', $originFile));
+            throw new FileNotFoundException(\sprintf('Origin file "%s" is not a file.', $originFile));
         }
 
         foreach ($this->toIterable($targetFiles) as $targetFile) {
@@ -405,10 +416,10 @@ class Filesystem
     {
         if (self::$lastError) {
             if ('\\' === \DIRECTORY_SEPARATOR && str_contains(self::$lastError, 'error code(1314)')) {
-                throw new IOException(sprintf('Unable to create "%s" link due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?', $linkType), 0, null, $target);
+                throw new IOException(\sprintf('Unable to create "%s" link due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?', $linkType), 0, null, $target);
             }
         }
-        throw new IOException(sprintf('Failed to create "%s" link from "%s" to "%s": ', $linkType, $origin, $target).self::$lastError, 0, null, $target);
+        throw new IOException(\sprintf('Failed to create "%s" link from "%s" to "%s": ', $linkType, $origin, $target).self::$lastError, 0, null, $target);
     }
 
     /**
@@ -445,11 +456,11 @@ class Filesystem
     public function makePathRelative(string $endPath, string $startPath): string
     {
         if (!$this->isAbsolutePath($startPath)) {
-            throw new InvalidArgumentException(sprintf('The start path "%s" is not absolute.', $startPath));
+            throw new InvalidArgumentException(\sprintf('The start path "%s" is not absolute.', $startPath));
         }
 
         if (!$this->isAbsolutePath($endPath)) {
-            throw new InvalidArgumentException(sprintf('The end path "%s" is not absolute.', $endPath));
+            throw new InvalidArgumentException(\sprintf('The end path "%s" is not absolute.', $endPath));
         }
 
         // Normalize separators on Windows
@@ -530,14 +541,14 @@ class Filesystem
      *
      * @throws IOException When file type is unknown
      */
-    public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = [])
+    public function mirror(string $originDir, string $targetDir, ?\Traversable $iterator = null, array $options = [])
     {
         $targetDir = rtrim($targetDir, '/\\');
         $originDir = rtrim($originDir, '/\\');
         $originDirLen = \strlen($originDir);
 
         if (!$this->exists($originDir)) {
-            throw new IOException(sprintf('The origin directory specified "%s" was not found.', $originDir), 0, null, $originDir);
+            throw new IOException(\sprintf('The origin directory specified "%s" was not found.', $originDir), 0, null, $originDir);
         }
 
         // Iterate in destination folder to remove obsolete entries
@@ -581,7 +592,7 @@ class Filesystem
             } elseif (is_file($file)) {
                 $this->copy($file, $target, $options['override'] ?? false);
             } else {
-                throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
+                throw new IOException(\sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
             }
         }
     }
@@ -659,7 +670,7 @@ class Filesystem
     public function dumpFile(string $filename, $content)
     {
         if (\is_array($content)) {
-            throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));
+            throw new \TypeError(\sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));
         }
 
         $dir = \dirname($filename);
@@ -680,14 +691,18 @@ class Filesystem
 
         try {
             if (false === self::box('file_put_contents', $tmpFile, $content)) {
-                throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
+                throw new IOException(\sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
             }
 
-            self::box('chmod', $tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
+            self::box('chmod', $tmpFile, self::box('fileperms', $filename) ?: 0666 & ~umask());
 
             $this->rename($tmpFile, $filename, true);
         } finally {
             if (file_exists($tmpFile)) {
+                if ('\\' === \DIRECTORY_SEPARATOR && !is_writable($tmpFile)) {
+                    self::box('chmod', $tmpFile, self::box('fileperms', $tmpFile) | 0200);
+                }
+
                 self::box('unlink', $tmpFile);
             }
         }
@@ -706,7 +721,7 @@ class Filesystem
     public function appendToFile(string $filename, $content/* , bool $lock = false */)
     {
         if (\is_array($content)) {
-            throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));
+            throw new \TypeError(\sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));
         }
 
         $dir = \dirname($filename);
@@ -718,7 +733,7 @@ class Filesystem
         $lock = \func_num_args() > 2 && func_get_arg(2);
 
         if (false === self::box('file_put_contents', $filename, $content, \FILE_APPEND | ($lock ? \LOCK_EX : 0))) {
-            throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
+            throw new IOException(\sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
         }
     }
 
@@ -740,7 +755,7 @@ class Filesystem
     private static function assertFunctionExists(string $func): void
     {
         if (!\function_exists($func)) {
-            throw new IOException(sprintf('Unable to perform filesystem operation because the "%s()" function has been disabled.', $func));
+            throw new IOException(\sprintf('Unable to perform filesystem operation because the "%s()" function has been disabled.', $func));
         }
     }
 
diff --git a/lib/symfony/filesystem/Path.php b/lib/symfony/filesystem/Path.php
index 664396235..093d19f5e 100644
--- a/lib/symfony/filesystem/Path.php
+++ b/lib/symfony/filesystem/Path.php
@@ -254,7 +254,7 @@ final class Path
      * @param string|null $extension if specified, only that extension is cut
      *                               off (may contain leading dot)
      */
-    public static function getFilenameWithoutExtension(string $path, string $extension = null): string
+    public static function getFilenameWithoutExtension(string $path, ?string $extension = null): string
     {
         if ('' === $path) {
             return '';
@@ -365,7 +365,7 @@ final class Path
         }
 
         // Strip scheme
-        if (false !== $schemeSeparatorPosition = strpos($path, '://')) {
+        if (false !== ($schemeSeparatorPosition = strpos($path, '://')) && 1 !== $schemeSeparatorPosition) {
             $path = substr($path, $schemeSeparatorPosition + 3);
         }
 
@@ -437,11 +437,11 @@ final class Path
     public static function makeAbsolute(string $path, string $basePath): string
     {
         if ('' === $basePath) {
-            throw new InvalidArgumentException(sprintf('The base path must be a non-empty string. Got: "%s".', $basePath));
+            throw new InvalidArgumentException(\sprintf('The base path must be a non-empty string. Got: "%s".', $basePath));
         }
 
         if (!self::isAbsolute($basePath)) {
-            throw new InvalidArgumentException(sprintf('The base path "%s" is not an absolute path.', $basePath));
+            throw new InvalidArgumentException(\sprintf('The base path "%s" is not an absolute path.', $basePath));
         }
 
         if (self::isAbsolute($path)) {
@@ -531,12 +531,12 @@ final class Path
         // If the passed path is absolute, but the base path is not, we
         // cannot generate a relative path
         if ('' !== $root && '' === $baseRoot) {
-            throw new InvalidArgumentException(sprintf('The absolute path "%s" cannot be made relative to the relative path "%s". You should provide an absolute base path instead.', $path, $basePath));
+            throw new InvalidArgumentException(\sprintf('The absolute path "%s" cannot be made relative to the relative path "%s". You should provide an absolute base path instead.', $path, $basePath));
         }
 
         // Fail if the roots of the two paths are different
         if ($baseRoot && $root !== $baseRoot) {
-            throw new InvalidArgumentException(sprintf('The path "%s" cannot be made relative to "%s", because they have different roots ("%s" and "%s").', $path, $basePath, $root, $baseRoot));
+            throw new InvalidArgumentException(\sprintf('The path "%s" cannot be made relative to "%s", because they have different roots ("%s" and "%s").', $path, $basePath, $root, $baseRoot));
         }
 
         if ('' === $relativeBasePath) {
diff --git a/lib/symfony/filesystem/composer.json b/lib/symfony/filesystem/composer.json
index 10a7a531c..fd75755b2 100644
--- a/lib/symfony/filesystem/composer.json
+++ b/lib/symfony/filesystem/composer.json
@@ -20,6 +20,9 @@
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.8"
     },
+    "require-dev": {
+        "symfony/process": "^5.4|^6.4|^7.0"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Filesystem\\": "" },
         "exclude-from-classmap": [
diff --git a/lib/symfony/finder/Comparator/Comparator.php b/lib/symfony/finder/Comparator/Comparator.php
index bd6858347..23e42f719 100644
--- a/lib/symfony/finder/Comparator/Comparator.php
+++ b/lib/symfony/finder/Comparator/Comparator.php
@@ -22,7 +22,7 @@ class Comparator
     public function __construct(string $target, string $operator = '==')
     {
         if (!\in_array($operator, ['>', '<', '>=', '<=', '==', '!='])) {
-            throw new \InvalidArgumentException(sprintf('Invalid operator "%s".', $operator));
+            throw new \InvalidArgumentException(\sprintf('Invalid operator "%s".', $operator));
         }
 
         $this->target = $target;
diff --git a/lib/symfony/finder/Comparator/DateComparator.php b/lib/symfony/finder/Comparator/DateComparator.php
index e0c523d05..bcf93cfb6 100644
--- a/lib/symfony/finder/Comparator/DateComparator.php
+++ b/lib/symfony/finder/Comparator/DateComparator.php
@@ -26,17 +26,17 @@ class DateComparator extends Comparator
     public function __construct(string $test)
     {
         if (!preg_match('#^\s*(==|!=|[<>]=?|after|since|before|until)?\s*(.+?)\s*$#i', $test, $matches)) {
-            throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a date test.', $test));
+            throw new \InvalidArgumentException(\sprintf('Don\'t understand "%s" as a date test.', $test));
         }
 
         try {
             $date = new \DateTimeImmutable($matches[2]);
             $target = $date->format('U');
         } catch (\Exception) {
-            throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));
+            throw new \InvalidArgumentException(\sprintf('"%s" is not a valid date.', $matches[2]));
         }
 
-        $operator = $matches[1] ?? '==';
+        $operator = $matches[1] ?: '==';
         if ('since' === $operator || 'after' === $operator) {
             $operator = '>';
         }
diff --git a/lib/symfony/finder/Comparator/NumberComparator.php b/lib/symfony/finder/Comparator/NumberComparator.php
index dd3082077..49cfcc4bc 100644
--- a/lib/symfony/finder/Comparator/NumberComparator.php
+++ b/lib/symfony/finder/Comparator/NumberComparator.php
@@ -42,12 +42,12 @@ class NumberComparator extends Comparator
     public function __construct(?string $test)
     {
         if (null === $test || !preg_match('#^\s*(==|!=|[<>]=?)?\s*([0-9\.]+)\s*([kmg]i?)?\s*$#i', $test, $matches)) {
-            throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a number test.', $test ?? 'null'));
+            throw new \InvalidArgumentException(\sprintf('Don\'t understand "%s" as a number test.', $test ?? 'null'));
         }
 
         $target = $matches[2];
         if (!is_numeric($target)) {
-            throw new \InvalidArgumentException(sprintf('Invalid number "%s".', $target));
+            throw new \InvalidArgumentException(\sprintf('Invalid number "%s".', $target));
         }
         if (isset($matches[3])) {
             // magnitude
diff --git a/lib/symfony/finder/Finder.php b/lib/symfony/finder/Finder.php
index 0fd283c12..83e5d2a8b 100644
--- a/lib/symfony/finder/Finder.php
+++ b/lib/symfony/finder/Finder.php
@@ -57,8 +57,10 @@ class Finder implements \IteratorAggregate, \Countable
     private bool $reverseSorting = false;
     private \Closure|int|false $sort = false;
     private int $ignore = 0;
+    /** @var list<string> */
     private array $dirs = [];
     private array $dates = [];
+    /** @var list<iterable<SplFileInfo|\SplFileInfo|string>> */
     private array $iterators = [];
     private array $contains = [];
     private array $notContains = [];
@@ -124,7 +126,7 @@ class Finder implements \IteratorAggregate, \Countable
     public function depth(string|int|array $levels): static
     {
         foreach ((array) $levels as $level) {
-            $this->depths[] = new Comparator\NumberComparator($level);
+            $this->depths[] = new NumberComparator($level);
         }
 
         return $this;
@@ -152,7 +154,7 @@ class Finder implements \IteratorAggregate, \Countable
     public function date(string|array $dates): static
     {
         foreach ((array) $dates as $date) {
-            $this->dates[] = new Comparator\DateComparator($date);
+            $this->dates[] = new DateComparator($date);
         }
 
         return $this;
@@ -307,7 +309,7 @@ class Finder implements \IteratorAggregate, \Countable
     public function size(string|int|array $sizes): static
     {
         foreach ((array) $sizes as $size) {
-            $this->sizes[] = new Comparator\NumberComparator($size);
+            $this->sizes[] = new NumberComparator($size);
         }
 
         return $this;
@@ -438,7 +440,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByExtension(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_EXTENSION;
+        $this->sort = SortableIterator::SORT_BY_EXTENSION;
 
         return $this;
     }
@@ -454,7 +456,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByName(bool $useNaturalSort = false): static
     {
-        $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL : Iterator\SortableIterator::SORT_BY_NAME;
+        $this->sort = $useNaturalSort ? SortableIterator::SORT_BY_NAME_NATURAL : SortableIterator::SORT_BY_NAME;
 
         return $this;
     }
@@ -470,7 +472,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByCaseInsensitiveName(bool $useNaturalSort = false): static
     {
-        $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE : Iterator\SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;
+        $this->sort = $useNaturalSort ? SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE : SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;
 
         return $this;
     }
@@ -486,7 +488,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortBySize(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_SIZE;
+        $this->sort = SortableIterator::SORT_BY_SIZE;
 
         return $this;
     }
@@ -502,7 +504,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByType(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_TYPE;
+        $this->sort = SortableIterator::SORT_BY_TYPE;
 
         return $this;
     }
@@ -520,7 +522,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByAccessedTime(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_ACCESSED_TIME;
+        $this->sort = SortableIterator::SORT_BY_ACCESSED_TIME;
 
         return $this;
     }
@@ -552,7 +554,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByChangedTime(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_CHANGED_TIME;
+        $this->sort = SortableIterator::SORT_BY_CHANGED_TIME;
 
         return $this;
     }
@@ -570,7 +572,7 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function sortByModifiedTime(): static
     {
-        $this->sort = Iterator\SortableIterator::SORT_BY_MODIFIED_TIME;
+        $this->sort = SortableIterator::SORT_BY_MODIFIED_TIME;
 
         return $this;
     }
@@ -646,7 +648,7 @@ class Finder implements \IteratorAggregate, \Countable
                 sort($glob);
                 $resolvedDirs[] = array_map($this->normalizeDir(...), $glob);
             } else {
-                throw new DirectoryNotFoundException(sprintf('The "%s" directory does not exist.', $dir));
+                throw new DirectoryNotFoundException(\sprintf('The "%s" directory does not exist.', $dir));
             }
         }
 
@@ -666,31 +668,37 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function getIterator(): \Iterator
     {
-        if (0 === \count($this->dirs) && 0 === \count($this->iterators)) {
+        if (!$this->dirs && !$this->iterators) {
             throw new \LogicException('You must call one of in() or append() methods before iterating over a Finder.');
         }
 
-        if (1 === \count($this->dirs) && 0 === \count($this->iterators)) {
+        if (1 === \count($this->dirs) && !$this->iterators) {
             $iterator = $this->searchInDirectory($this->dirs[0]);
-
-            if ($this->sort || $this->reverseSorting) {
-                $iterator = (new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting))->getIterator();
+        } else {
+            $iterator = new \AppendIterator();
+            foreach ($this->dirs as $dir) {
+                $iterator->append(new \IteratorIterator(new LazyIterator(fn () => $this->searchInDirectory($dir))));
             }
 
-            return $iterator;
-        }
+            foreach ($this->iterators as $it) {
+                $iterator->append(new \IteratorIterator(new LazyIterator(static function () use ($it) {
+                    foreach ($it as $file) {
+                        if (!$file instanceof \SplFileInfo) {
+                            $file = new \SplFileInfo($file);
+                        }
+                        $key = $file->getPathname();
+                        if (!$file instanceof SplFileInfo) {
+                            $file = new SplFileInfo($key, $file->getPath(), $key);
+                        }
 
-        $iterator = new \AppendIterator();
-        foreach ($this->dirs as $dir) {
-            $iterator->append(new \IteratorIterator(new LazyIterator(fn () => $this->searchInDirectory($dir))));
-        }
-
-        foreach ($this->iterators as $it) {
-            $iterator->append($it);
+                        yield $key => $file;
+                    }
+                })));
+            }
         }
 
         if ($this->sort || $this->reverseSorting) {
-            $iterator = (new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting))->getIterator();
+            $iterator = (new SortableIterator($iterator, $this->sort, $this->reverseSorting))->getIterator();
         }
 
         return $iterator;
@@ -701,26 +709,13 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * The set can be another Finder, an Iterator, an IteratorAggregate, or even a plain array.
      *
-     * @return $this
+     * @param iterable<SplFileInfo|\SplFileInfo|string> $iterator
      *
-     * @throws \InvalidArgumentException when the given argument is not iterable
+     * @return $this
      */
     public function append(iterable $iterator): static
     {
-        if ($iterator instanceof \IteratorAggregate) {
-            $this->iterators[] = $iterator->getIterator();
-        } elseif ($iterator instanceof \Iterator) {
-            $this->iterators[] = $iterator;
-        } elseif (is_iterable($iterator)) {
-            $it = new \ArrayIterator();
-            foreach ($iterator as $file) {
-                $file = $file instanceof \SplFileInfo ? $file : new \SplFileInfo($file);
-                $it[$file->getPathname()] = $file;
-            }
-            $this->iterators[] = $it;
-        } else {
-            throw new \InvalidArgumentException('Finder::append() method wrong argument type.');
-        }
+        $this->iterators[] = $iterator;
 
         return $this;
     }
@@ -793,13 +788,13 @@ class Finder implements \IteratorAggregate, \Countable
         $iterator = new Iterator\RecursiveDirectoryIterator($dir, $flags, $this->ignoreUnreadableDirs);
 
         if ($exclude) {
-            $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $exclude);
+            $iterator = new ExcludeDirectoryFilterIterator($iterator, $exclude);
         }
 
         $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
 
         if ($minDepth > 0 || $maxDepth < \PHP_INT_MAX) {
-            $iterator = new Iterator\DepthRangeFilterIterator($iterator, $minDepth, $maxDepth);
+            $iterator = new DepthRangeFilterIterator($iterator, $minDepth, $maxDepth);
         }
 
         if ($this->mode) {
@@ -807,23 +802,23 @@ class Finder implements \IteratorAggregate, \Countable
         }
 
         if ($this->names || $this->notNames) {
-            $iterator = new Iterator\FilenameFilterIterator($iterator, $this->names, $this->notNames);
+            $iterator = new FilenameFilterIterator($iterator, $this->names, $this->notNames);
         }
 
         if ($this->contains || $this->notContains) {
-            $iterator = new Iterator\FilecontentFilterIterator($iterator, $this->contains, $this->notContains);
+            $iterator = new FilecontentFilterIterator($iterator, $this->contains, $this->notContains);
         }
 
         if ($this->sizes) {
-            $iterator = new Iterator\SizeRangeFilterIterator($iterator, $this->sizes);
+            $iterator = new SizeRangeFilterIterator($iterator, $this->sizes);
         }
 
         if ($this->dates) {
-            $iterator = new Iterator\DateRangeFilterIterator($iterator, $this->dates);
+            $iterator = new DateRangeFilterIterator($iterator, $this->dates);
         }
 
         if ($this->filters) {
-            $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters);
+            $iterator = new CustomFilterIterator($iterator, $this->filters);
         }
 
         if ($this->paths || $notPaths) {
diff --git a/lib/symfony/finder/Glob.php b/lib/symfony/finder/Glob.php
index 7fe8b1a86..d950e48fc 100644
--- a/lib/symfony/finder/Glob.php
+++ b/lib/symfony/finder/Glob.php
@@ -44,6 +44,9 @@ class Glob
         $escaping = false;
         $inCurlies = 0;
         $regex = '';
+        if ($unanchored = str_starts_with($glob, '**/')) {
+            $glob = '/'.$glob;
+        }
         $sizeGlob = \strlen($glob);
         for ($i = 0; $i < $sizeGlob; ++$i) {
             $car = $glob[$i];
@@ -104,6 +107,10 @@ class Glob
             $escaping = false;
         }
 
+        if ($unanchored) {
+            $regex = substr_replace($regex, '?', 1 + ('/' === $delimiter) + ($strictLeadingDot ? \strlen('(?=[^\.])') : 0), 0);
+        }
+
         return $delimiter.'^'.$regex.'$'.$delimiter;
     }
 }
diff --git a/lib/symfony/finder/Iterator/RecursiveDirectoryIterator.php b/lib/symfony/finder/Iterator/RecursiveDirectoryIterator.php
index 34cced688..f5fd2d4dc 100644
--- a/lib/symfony/finder/Iterator/RecursiveDirectoryIterator.php
+++ b/lib/symfony/finder/Iterator/RecursiveDirectoryIterator.php
@@ -63,8 +63,9 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
             $subPathname .= $this->directorySeparator;
         }
         $subPathname .= $this->getFilename();
+        $basePath = $this->rootPath;
 
-        if ('/' !== $basePath = $this->rootPath) {
+        if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator) && !str_ends_with($basePath, '/')) {
             $basePath .= $this->directorySeparator;
         }
 
diff --git a/lib/symfony/finder/Iterator/VcsIgnoredFilterIterator.php b/lib/symfony/finder/Iterator/VcsIgnoredFilterIterator.php
index ddd700772..b278706e9 100644
--- a/lib/symfony/finder/Iterator/VcsIgnoredFilterIterator.php
+++ b/lib/symfony/finder/Iterator/VcsIgnoredFilterIterator.php
@@ -37,9 +37,9 @@ final class VcsIgnoredFilterIterator extends \FilterIterator
     {
         $this->baseDir = $this->normalizePath($baseDir);
 
-        foreach ($this->parentDirectoriesUpwards($this->baseDir) as $parentDirectory) {
-            if (@is_dir("{$parentDirectory}/.git")) {
-                $this->baseDir = $parentDirectory;
+        foreach ([$this->baseDir, ...$this->parentDirectoriesUpwards($this->baseDir)] as $directory) {
+            if (@is_dir("{$directory}/.git")) {
+                $this->baseDir = $directory;
                 break;
             }
         }
diff --git a/lib/symfony/framework-bundle/CHANGELOG.md b/lib/symfony/framework-bundle/CHANGELOG.md
index 949aad31c..639fe721d 100644
--- a/lib/symfony/framework-bundle/CHANGELOG.md
+++ b/lib/symfony/framework-bundle/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `HttpClientAssertionsTrait`
  * Add `AbstractController::renderBlock()` and `renderBlockView()`
+ * Remove call to `renderView()` in `AbstractController::render()`
  * Add native return type to `Translator` and to `Application::reset()`
  * Deprecate the integration of Doctrine annotations, either uninstall the `doctrine/annotations` package or disable the integration by setting `framework.annotations` to `false`
  * Enable `json_decode_detailed_errors` context for Serializer by default if `kernel.debug` is true and the `seld/jsonlint` package is installed
diff --git a/lib/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php
index 7498a82d1..ae27502cf 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/CachePoolClearerCacheWarmer.php
@@ -37,7 +37,7 @@ final class CachePoolClearerCacheWarmer implements CacheWarmerInterface
         $this->pools = $pools;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         foreach ($this->pools as $pool) {
             if ($this->poolClearer->hasPool($pool)) {
diff --git a/lib/symfony/framework-bundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/ConfigBuilderCacheWarmer.php
index 7e039ae2f..c43fc8af1 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/ConfigBuilderCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -15,10 +15,14 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\Builder\ConfigBuilderGeneratorInterface;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
@@ -31,7 +35,7 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
     private KernelInterface $kernel;
     private ?LoggerInterface $logger;
 
-    public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
+    public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null)
     {
         $this->kernel = $kernel;
         $this->logger = $logger;
@@ -50,12 +54,27 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 
         $generator = new ConfigBuilderGenerator($buildDir);
 
-        foreach ($this->kernel->getBundles() as $bundle) {
-            $extension = $bundle->getContainerExtension();
-            if (null === $extension) {
-                continue;
-            }
+        if ($this->kernel instanceof Kernel) {
+            /** @var ContainerBuilder $container */
+            $container = \Closure::bind(function (Kernel $kernel) {
+                $containerBuilder = $kernel->getContainerBuilder();
+                $kernel->prepareContainer($containerBuilder);
 
+                return $containerBuilder;
+            }, null, $this->kernel)($this->kernel);
+
+            $extensions = $container->getExtensions();
+        } else {
+            $extensions = [];
+            foreach ($this->kernel->getBundles() as $bundle) {
+                $extension = $bundle->getContainerExtension();
+                if (null !== $extension) {
+                    $extensions[] = $extension;
+                }
+            }
+        }
+
+        foreach ($extensions as $extension) {
             try {
                 $this->dumpExtension($extension, $generator);
             } catch (\Exception $e) {
@@ -73,7 +92,8 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
         if ($extension instanceof ConfigurationInterface) {
             $configuration = $extension;
         } elseif ($extension instanceof ConfigurationExtensionInterface) {
-            $configuration = $extension->getConfiguration([], new ContainerBuilder($this->kernel->getContainer()->getParameterBag()));
+            $container = $this->kernel->getContainer();
+            $configuration = $extension->getConfiguration([], new ContainerBuilder($container instanceof Container ? new ContainerBag($container) : new ParameterBag()));
         }
 
         if (!$configuration) {
@@ -85,6 +105,6 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 
     public function isOptional(): bool
     {
-        return true;
+        return false;
     }
 }
diff --git a/lib/symfony/framework-bundle/CacheWarmer/RouterCacheWarmer.php b/lib/symfony/framework-bundle/CacheWarmer/RouterCacheWarmer.php
index 2af9a2fe8..b14bb74f1 100644
--- a/lib/symfony/framework-bundle/CacheWarmer/RouterCacheWarmer.php
+++ b/lib/symfony/framework-bundle/CacheWarmer/RouterCacheWarmer.php
@@ -34,7 +34,7 @@ class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterf
         $this->container = $container;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $router = $this->container->get('router');
 
@@ -42,7 +42,7 @@ class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterf
             return (array) $router->warmUp($cacheDir, $buildDir);
         }
 
-        throw new \LogicException(sprintf('The router "%s" cannot be warmed up because it does not implement "%s".', get_debug_type($router), WarmableInterface::class));
+        throw new \LogicException(\sprintf('The router "%s" cannot be warmed up because it does not implement "%s".', get_debug_type($router), WarmableInterface::class));
     }
 
     public function isOptional(): bool
diff --git a/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php b/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
index 94b95e502..ac2c5c9e6 100644
--- a/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
+++ b/lib/symfony/framework-bundle/Command/AbstractConfigCommand.php
@@ -117,7 +117,7 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
         foreach ($bundles as $bundle) {
             if ($name === $bundle->getName()) {
                 if (!$bundle->getContainerExtension()) {
-                    throw new \LogicException(sprintf('Bundle "%s" does not have a container extension.', $name));
+                    throw new \LogicException(\sprintf('Bundle "%s" does not have a container extension.', $name));
                 }
 
                 return $bundle->getContainerExtension();
@@ -147,13 +147,13 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
         }
 
         if (!str_ends_with($name, 'Bundle')) {
-            $message = sprintf('No extensions with configuration available for "%s".', $name);
+            $message = \sprintf('No extensions with configuration available for "%s".', $name);
         } else {
-            $message = sprintf('No extension with alias "%s" is enabled.', $name);
+            $message = \sprintf('No extension with alias "%s" is enabled.', $name);
         }
 
         if (isset($guess) && $minScore < 3) {
-            $message .= sprintf("\n\nDid you mean \"%s\"?", $guess);
+            $message .= \sprintf("\n\nDid you mean \"%s\"?", $guess);
         }
 
         throw new LogicException($message);
@@ -165,11 +165,11 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
     public function validateConfiguration(ExtensionInterface $extension, mixed $configuration)
     {
         if (!$configuration) {
-            throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias()));
+            throw new \LogicException(\sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias()));
         }
 
         if (!$configuration instanceof ConfigurationInterface) {
-            throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', get_debug_type($configuration)));
+            throw new \LogicException(\sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', get_debug_type($configuration)));
         }
     }
 
diff --git a/lib/symfony/framework-bundle/Command/AssetsInstallCommand.php b/lib/symfony/framework-bundle/Command/AssetsInstallCommand.php
index 264955d79..936912876 100644
--- a/lib/symfony/framework-bundle/Command/AssetsInstallCommand.php
+++ b/lib/symfony/framework-bundle/Command/AssetsInstallCommand.php
@@ -97,7 +97,7 @@ EOT
             $targetArg = $kernel->getProjectDir().'/'.$targetArg;
 
             if (!is_dir($targetArg)) {
-                throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $targetArg));
+                throw new InvalidArgumentException(\sprintf('The target directory "%s" does not exist.', $targetArg));
             }
         }
 
@@ -134,7 +134,7 @@ EOT
             $validAssetDirs[] = $assetDir;
 
             if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $message = sprintf("%s\n-> %s", $bundle->getName(), $targetDir);
+                $message = \sprintf("%s\n-> %s", $bundle->getName(), $targetDir);
             } else {
                 $message = $bundle->getName();
             }
@@ -155,13 +155,13 @@ EOT
                 }
 
                 if ($method === $expectedMethod) {
-                    $rows[] = [sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
+                    $rows[] = [\sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
                 } else {
-                    $rows[] = [sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
+                    $rows[] = [\sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
                 }
             } catch (\Exception $e) {
                 $exitCode = 1;
-                $rows[] = [sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
+                $rows[] = [\sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
             }
         }
         // remove the assets of the bundles that no longer exist
@@ -234,7 +234,7 @@ EOT
         }
         $this->filesystem->symlink($originDir, $targetDir);
         if (!file_exists($targetDir)) {
-            throw new IOException(sprintf('Symbolic link "%s" was created but appears to be broken.', $targetDir), 0, null, $targetDir);
+            throw new IOException(\sprintf('Symbolic link "%s" was created but appears to be broken.', $targetDir), 0, null, $targetDir);
         }
     }
 
diff --git a/lib/symfony/framework-bundle/Command/CacheClearCommand.php b/lib/symfony/framework-bundle/Command/CacheClearCommand.php
index 878157e87..df9f38a26 100644
--- a/lib/symfony/framework-bundle/Command/CacheClearCommand.php
+++ b/lib/symfony/framework-bundle/Command/CacheClearCommand.php
@@ -40,7 +40,7 @@ class CacheClearCommand extends Command
     private CacheClearerInterface $cacheClearer;
     private Filesystem $filesystem;
 
-    public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null)
+    public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $filesystem = null)
     {
         parent::__construct();
 
@@ -80,7 +80,7 @@ EOF
         $fs->remove($oldCacheDir);
 
         if (!is_writable($realCacheDir)) {
-            throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));
+            throw new RuntimeException(\sprintf('Unable to write in the "%s" directory.', $realCacheDir));
         }
 
         $useBuildDir = $realBuildDir !== $realCacheDir;
@@ -89,7 +89,7 @@ EOF
             $fs->remove($oldBuildDir);
 
             if (!is_writable($realBuildDir)) {
-                throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realBuildDir));
+                throw new RuntimeException(\sprintf('Unable to write in the "%s" directory.', $realBuildDir));
             }
 
             if ($this->isNfs($realCacheDir)) {
@@ -100,7 +100,7 @@ EOF
             $fs->mkdir($realCacheDir);
         }
 
-        $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(\sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
         if ($useBuildDir) {
             $this->cacheClearer->clear($realBuildDir);
         }
@@ -146,6 +146,16 @@ EOF
                     }
                     $this->warmupOptionals($useBuildDir ? $realCacheDir : $warmupDir, $warmupDir, $io);
                 }
+
+                // fix references to cached files with the real cache directory name
+                $search = [$warmupDir, str_replace('/', '\\/', $warmupDir), str_replace('\\', '\\\\', $warmupDir)];
+                $replace = str_replace('\\', '/', $realBuildDir);
+                foreach (Finder::create()->files()->in($warmupDir) as $file) {
+                    $content = str_replace($search, $replace, file_get_contents($file), $count);
+                    if ($count) {
+                        file_put_contents($file, $content);
+                    }
+                }
             }
 
             if (!$fs->exists($warmupDir.'/'.$containerDir)) {
@@ -154,7 +164,7 @@ EOF
             }
 
             if ($this->isNfs($realBuildDir)) {
-                $io->note('For better performances, you should move the cache and log directories to a non-shared folder of the VM.');
+                $io->note('For better performance, you should move the cache and log directories to a non-shared folder of the VM.');
                 $fs->remove($realBuildDir);
             } else {
                 $fs->rename($realBuildDir, $oldBuildDir);
@@ -189,7 +199,7 @@ EOF
             $io->comment('Finished');
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(\sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
@@ -200,7 +210,7 @@ EOF
 
         if (null === $mounts) {
             $mounts = [];
-            if ('/' === \DIRECTORY_SEPARATOR && $files = @file('/proc/mounts')) {
+            if ('/' === \DIRECTORY_SEPARATOR && @is_readable('/proc/mounts') && $files = @file('/proc/mounts')) {
                 foreach ($files as $mount) {
                     $mount = \array_slice(explode(' ', $mount), 1, -3);
                     if (!\in_array(array_pop($mount), ['vboxsf', 'nfs'])) {
@@ -227,16 +237,6 @@ EOF
             throw new \LogicException('Calling "cache:clear" with a kernel that does not implement "Symfony\Component\HttpKernel\RebootableInterface" is not supported.');
         }
         $kernel->reboot($warmupDir);
-
-        // fix references to cached files with the real cache directory name
-        $search = [$warmupDir, str_replace('\\', '\\\\', $warmupDir)];
-        $replace = str_replace('\\', '/', $realBuildDir);
-        foreach (Finder::create()->files()->in($warmupDir) as $file) {
-            $content = str_replace($search, $replace, file_get_contents($file), $count);
-            if ($count) {
-                file_put_contents($file, $content);
-            }
-        }
     }
 
     private function warmupOptionals(string $cacheDir, string $warmupDir, SymfonyStyle $io): void
diff --git a/lib/symfony/framework-bundle/Command/CachePoolClearCommand.php b/lib/symfony/framework-bundle/Command/CachePoolClearCommand.php
index fcd70ca0e..9d1662e65 100644
--- a/lib/symfony/framework-bundle/Command/CachePoolClearCommand.php
+++ b/lib/symfony/framework-bundle/Command/CachePoolClearCommand.php
@@ -38,7 +38,7 @@ final class CachePoolClearCommand extends Command
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
+    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
     {
         parent::__construct();
 
@@ -72,7 +72,7 @@ EOF
 
         $poolNames = $input->getArgument('pools');
         $excludedPoolNames = $input->getOption('exclude');
-        if ($input->getOption('all')) {
+        if ($clearAll = $input->getOption('all')) {
             if (!$this->poolNames) {
                 throw new InvalidArgumentException('Could not clear all cache pools, try specifying a specific pool or cache clearer.');
             }
@@ -91,7 +91,7 @@ EOF
         foreach ($poolNames as $id) {
             if ($this->poolClearer->hasPool($id)) {
                 $pools[$id] = $id;
-            } else {
+            } elseif (!$clearAll || $kernel->getContainer()->has($id)) {
                 $pool = $kernel->getContainer()->get($id);
 
                 if ($pool instanceof CacheItemPoolInterface) {
@@ -99,28 +99,28 @@ EOF
                 } elseif ($pool instanceof Psr6CacheClearer) {
                     $clearers[$id] = $pool;
                 } else {
-                    throw new InvalidArgumentException(sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
+                    throw new InvalidArgumentException(\sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
                 }
             }
         }
 
         foreach ($clearers as $id => $clearer) {
-            $io->comment(sprintf('Calling cache clearer: <info>%s</info>', $id));
+            $io->comment(\sprintf('Calling cache clearer: <info>%s</info>', $id));
             $clearer->clear($kernel->getContainer()->getParameter('kernel.cache_dir'));
         }
 
         $failure = false;
         foreach ($pools as $id => $pool) {
-            $io->comment(sprintf('Clearing cache pool: <info>%s</info>', $id));
+            $io->comment(\sprintf('Clearing cache pool: <info>%s</info>', $id));
 
             if ($pool instanceof CacheItemPoolInterface) {
                 if (!$pool->clear()) {
-                    $io->warning(sprintf('Cache pool "%s" could not be cleared.', $pool));
+                    $io->warning(\sprintf('Cache pool "%s" could not be cleared.', $pool));
                     $failure = true;
                 }
             } else {
                 if (false === $this->poolClearer->clearPool($id)) {
-                    $io->warning(sprintf('Cache pool "%s" could not be cleared.', $pool));
+                    $io->warning(\sprintf('Cache pool "%s" could not be cleared.', $pool));
                     $failure = true;
                 }
             }
diff --git a/lib/symfony/framework-bundle/Command/CachePoolDeleteCommand.php b/lib/symfony/framework-bundle/Command/CachePoolDeleteCommand.php
index 7b53ceb8b..3c5e49dbf 100644
--- a/lib/symfony/framework-bundle/Command/CachePoolDeleteCommand.php
+++ b/lib/symfony/framework-bundle/Command/CachePoolDeleteCommand.php
@@ -35,7 +35,7 @@ final class CachePoolDeleteCommand extends Command
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
+    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
     {
         parent::__construct();
 
@@ -67,16 +67,16 @@ EOF
         $cachePool = $this->poolClearer->getPool($pool);
 
         if (!$cachePool->hasItem($key)) {
-            $io->note(sprintf('Cache item "%s" does not exist in cache pool "%s".', $key, $pool));
+            $io->note(\sprintf('Cache item "%s" does not exist in cache pool "%s".', $key, $pool));
 
             return 0;
         }
 
         if (!$cachePool->deleteItem($key)) {
-            throw new \Exception(sprintf('Cache item "%s" could not be deleted.', $key));
+            throw new \Exception(\sprintf('Cache item "%s" could not be deleted.', $key));
         }
 
-        $io->success(sprintf('Cache item "%s" was successfully deleted.', $key));
+        $io->success(\sprintf('Cache item "%s" was successfully deleted.', $key));
 
         return 0;
     }
diff --git a/lib/symfony/framework-bundle/Command/CachePoolInvalidateTagsCommand.php b/lib/symfony/framework-bundle/Command/CachePoolInvalidateTagsCommand.php
index 9e6ef9330..8c56847e9 100644
--- a/lib/symfony/framework-bundle/Command/CachePoolInvalidateTagsCommand.php
+++ b/lib/symfony/framework-bundle/Command/CachePoolInvalidateTagsCommand.php
@@ -65,26 +65,26 @@ final class CachePoolInvalidateTagsCommand extends Command
         $errors = false;
 
         foreach ($pools as $name) {
-            $io->comment(sprintf('Invalidating tag(s): <info>%s</info> from pool <comment>%s</comment>.', $tagList, $name));
+            $io->comment(\sprintf('Invalidating tag(s): <info>%s</info> from pool <comment>%s</comment>.', $tagList, $name));
 
             try {
                 $pool = $this->pools->get($name);
             } catch (ServiceNotFoundException) {
-                $io->error(sprintf('Pool "%s" not found.', $name));
+                $io->error(\sprintf('Pool "%s" not found.', $name));
                 $errors = true;
 
                 continue;
             }
 
             if (!$pool instanceof TagAwareCacheInterface) {
-                $io->error(sprintf('Pool "%s" is not taggable.', $name));
+                $io->error(\sprintf('Pool "%s" is not taggable.', $name));
                 $errors = true;
 
                 continue;
             }
 
             if (!$pool->invalidateTags($tags)) {
-                $io->error(sprintf('Cache tag(s) "%s" could not be invalidated for pool "%s".', $tagList, $name));
+                $io->error(\sprintf('Cache tag(s) "%s" could not be invalidated for pool "%s".', $tagList, $name));
                 $errors = true;
             }
         }
diff --git a/lib/symfony/framework-bundle/Command/CachePoolPruneCommand.php b/lib/symfony/framework-bundle/Command/CachePoolPruneCommand.php
index fc0dc6d79..ff90a9dba 100644
--- a/lib/symfony/framework-bundle/Command/CachePoolPruneCommand.php
+++ b/lib/symfony/framework-bundle/Command/CachePoolPruneCommand.php
@@ -53,14 +53,21 @@ EOF
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
+        $exitCode = Command::SUCCESS;
 
         foreach ($this->pools as $name => $pool) {
-            $io->comment(sprintf('Pruning cache pool: <info>%s</info>', $name));
-            $pool->prune();
+            $io->comment(\sprintf('Pruning cache pool: <info>%s</info>', $name));
+
+            if (!$pool->prune()) {
+                $io->error(\sprintf('Cache pool "%s" could not be pruned.', $name));
+                $exitCode = Command::FAILURE;
+            }
         }
 
-        $io->success('Successfully pruned cache pool(s).');
+        if (Command::SUCCESS === $exitCode) {
+            $io->success('Successfully pruned cache pool(s).');
+        }
 
-        return 0;
+        return $exitCode;
     }
 }
diff --git a/lib/symfony/framework-bundle/Command/CacheWarmupCommand.php b/lib/symfony/framework-bundle/Command/CacheWarmupCommand.php
index 6f1073de4..08e6ebc4d 100644
--- a/lib/symfony/framework-bundle/Command/CacheWarmupCommand.php
+++ b/lib/symfony/framework-bundle/Command/CacheWarmupCommand.php
@@ -61,7 +61,7 @@ EOF
         $io = new SymfonyStyle($input, $output);
 
         $kernel = $this->getApplication()->getKernel();
-        $io->comment(sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(\sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         if (!$input->getOption('no-optional-warmers')) {
             $this->cacheWarmer->enableOptionalWarmers();
@@ -72,14 +72,15 @@ EOF
             $kernel->warmUp($cacheDir);
         }
 
-        $preload = $this->cacheWarmer->warmUp($cacheDir);
-
         $buildDir = $kernel->getContainer()->getParameter('kernel.build_dir');
+
+        $preload = $this->cacheWarmer->warmUp($cacheDir, $buildDir);
+
         if ($preload && $cacheDir === $buildDir && file_exists($preloadFile = $buildDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
             Preloader::append($preloadFile, $preload);
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(\sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
diff --git a/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php b/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
index cc116fc68..fcef7c1d6 100644
--- a/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/ConfigDebugCommand.php
@@ -41,7 +41,7 @@ class ConfigDebugCommand extends AbstractConfigCommand
 {
     protected function configure(): void
     {
-        $commentedHelpFormats = array_map(fn ($format) => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
+        $commentedHelpFormats = array_map(fn ($format) => \sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
         $helpFormats = implode('", "', $commentedHelpFormats);
 
         $this
@@ -49,7 +49,7 @@ class ConfigDebugCommand extends AbstractConfigCommand
                 new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
                 new InputOption('resolve-env', null, InputOption::VALUE_NONE, 'Display resolved environment variable values instead of placeholders'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), class_exists(Yaml::class) ? 'txt' : 'json'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), class_exists(Yaml::class) ? 'txt' : 'json'),
             ])
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the current configuration for an
@@ -106,7 +106,7 @@ EOF
         if (null === $path = $input->getArgument('path')) {
             if ('txt' === $input->getOption('format')) {
                 $io->title(
-                    sprintf('Current configuration for %s', $name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name))
+                    \sprintf('Current configuration for %s', $name === $extensionAlias ? \sprintf('extension with alias "%s"', $extensionAlias) : \sprintf('"%s"', $name))
                 );
             }
 
@@ -123,7 +123,7 @@ EOF
             return 1;
         }
 
-        $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
+        $io->title(\sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
 
         $io->writeln($this->convertToFormat($config, $format));
 
@@ -135,7 +135,7 @@ EOF
         return match ($format) {
             'txt', 'yaml' => Yaml::dump($config, 10),
             'json' => json_encode($config, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE),
-            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+            default => throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -161,8 +161,8 @@ EOF
         $steps = explode('.', $path);
 
         foreach ($steps as $step) {
-            if (!\array_key_exists($step, $config)) {
-                throw new LogicException(sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
+            if (!\is_array($config) || !\array_key_exists($step, $config)) {
+                throw new LogicException(\sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
             }
 
             $config = $config[$step];
@@ -190,7 +190,7 @@ EOF
         // Fall back to default config if the extension has one
 
         if (!$extension instanceof ConfigurationExtensionInterface && !$extension instanceof ConfigurationInterface) {
-            throw new \LogicException(sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
+            throw new \LogicException(\sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
         }
 
         $configs = $container->getExtensionConfig($extensionAlias);
diff --git a/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php b/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
index 3231e5a47..27dc01b11 100644
--- a/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
+++ b/lib/symfony/framework-bundle/Command/ConfigDumpReferenceCommand.php
@@ -39,14 +39,14 @@ class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
     protected function configure(): void
     {
-        $commentedHelpFormats = array_map(fn ($format) => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
+        $commentedHelpFormats = array_map(fn ($format) => \sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
         $helpFormats = implode('", "', $commentedHelpFormats);
 
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'yaml'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'yaml'),
             ])
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the default configuration for an
@@ -118,27 +118,27 @@ EOF
         }
 
         if ($name === $extension->getAlias()) {
-            $message = sprintf('Default configuration for extension with alias: "%s"', $name);
+            $message = \sprintf('Default configuration for extension with alias: "%s"', $name);
         } else {
-            $message = sprintf('Default configuration for "%s"', $name);
+            $message = \sprintf('Default configuration for "%s"', $name);
         }
 
         if (null !== $path) {
-            $message .= sprintf(' at path "%s"', $path);
+            $message .= \sprintf(' at path "%s"', $path);
         }
 
         switch ($format) {
             case 'yaml':
-                $io->writeln(sprintf('# %s', $message));
+                $io->writeln(\sprintf('# %s', $message));
                 $dumper = new YamlReferenceDumper();
                 break;
             case 'xml':
-                $io->writeln(sprintf('<!-- %s -->', $message));
+                $io->writeln(\sprintf('<!-- %s -->', $message));
                 $dumper = new XmlReferenceDumper();
                 break;
             default:
                 $io->writeln($message);
-                throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions())));
+                throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions())));
         }
 
         $io->writeln(null === $path ? $dumper->dump($configuration, $extension->getNamespace()) : $dumper->dumpAtPath($configuration, $path));
diff --git a/lib/symfony/framework-bundle/Command/ContainerDebugCommand.php b/lib/symfony/framework-bundle/Command/ContainerDebugCommand.php
index df6aef5dd..6847926ff 100644
--- a/lib/symfony/framework-bundle/Command/ContainerDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/ContainerDebugCommand.php
@@ -52,7 +52,7 @@ class ContainerDebugCommand extends Command
                 new InputOption('types', null, InputOption::VALUE_NONE, 'Display types (classes/interfaces) available in the container'),
                 new InputOption('env-var', null, InputOption::VALUE_REQUIRED, 'Display a specific environment variable used in the container'),
                 new InputOption('env-vars', null, InputOption::VALUE_NONE, 'Display environment variables used in the container'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
                 new InputOption('deprecations', null, InputOption::VALUE_NONE, 'Display deprecations generated when compiling and warming up the container'),
             ])
@@ -171,19 +171,19 @@ EOF
                 if ($object->hasDefinition($options['id'])) {
                     $definition = $object->getDefinition($options['id']);
                     if ($definition->isDeprecated()) {
-                        $errorIo->warning($definition->getDeprecation($options['id'])['message'] ?? sprintf('The "%s" service is deprecated.', $options['id']));
+                        $errorIo->warning($definition->getDeprecation($options['id'])['message'] ?? \sprintf('The "%s" service is deprecated.', $options['id']));
                     }
                 }
                 if ($object->hasAlias($options['id'])) {
                     $alias = $object->getAlias($options['id']);
                     if ($alias->isDeprecated()) {
-                        $errorIo->warning($alias->getDeprecation($options['id'])['message'] ?? sprintf('The "%s" alias is deprecated.', $options['id']));
+                        $errorIo->warning($alias->getDeprecation($options['id'])['message'] ?? \sprintf('The "%s" alias is deprecated.', $options['id']));
                     }
                 }
             }
 
             if (isset($options['id']) && isset($kernel->getContainer()->getRemovedIds()[$options['id']])) {
-                $errorIo->note(sprintf('The "%s" service or alias has been removed or inlined when the container was compiled.', $options['id']));
+                $errorIo->note(\sprintf('The "%s" service or alias has been removed or inlined when the container was compiled.', $options['id']));
             }
         } catch (ServiceNotFoundException $e) {
             if ('' !== $e->getId() && '@' === $e->getId()[0]) {
@@ -277,14 +277,16 @@ EOF
 
         $matchingServices = $this->findServiceIdsContaining($container, $name, $showHidden);
         if (!$matchingServices) {
-            throw new InvalidArgumentException(sprintf('No services found that match "%s".', $name));
+            throw new InvalidArgumentException(\sprintf('No services found that match "%s".', $name));
         }
 
         if (1 === \count($matchingServices)) {
             return $matchingServices[0];
         }
 
-        return $io->choice('Select one of the following services to display its information', $matchingServices);
+        natsort($matchingServices);
+
+        return $io->choice('Select one of the following services to display its information', array_values($matchingServices));
     }
 
     private function findProperTagName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $container, string $tagName): string
@@ -295,14 +297,16 @@ EOF
 
         $matchingTags = $this->findTagsContaining($container, $tagName);
         if (!$matchingTags) {
-            throw new InvalidArgumentException(sprintf('No tags found that match "%s".', $tagName));
+            throw new InvalidArgumentException(\sprintf('No tags found that match "%s".', $tagName));
         }
 
         if (1 === \count($matchingTags)) {
             return $matchingTags[0];
         }
 
-        return $io->choice('Select one of the following tags to display its information', $matchingTags);
+        natsort($matchingTags);
+
+        return $io->choice('Select one of the following tags to display its information', array_values($matchingTags));
     }
 
     private function findServiceIdsContaining(ContainerBuilder $container, string $name, bool $showHidden): array
diff --git a/lib/symfony/framework-bundle/Command/ContainerLintCommand.php b/lib/symfony/framework-bundle/Command/ContainerLintCommand.php
index b63ebe431..2cad0f349 100644
--- a/lib/symfony/framework-bundle/Command/ContainerLintCommand.php
+++ b/lib/symfony/framework-bundle/Command/ContainerLintCommand.php
@@ -80,7 +80,7 @@ final class ContainerLintCommand extends Command
 
         if (!$kernel->isDebug() || !$kernelContainer->getParameter('debug.container.dump') || !(new ConfigCache($kernelContainer->getParameter('debug.container.dump'), true))->isFresh()) {
             if (!$kernel instanceof Kernel) {
-                throw new RuntimeException(sprintf('This command does not support the application kernel: "%s" does not extend "%s".', get_debug_type($kernel), Kernel::class));
+                throw new RuntimeException(\sprintf('This command does not support the application kernel: "%s" does not extend "%s".', get_debug_type($kernel), Kernel::class));
             }
 
             $buildContainer = \Closure::bind(function (): ContainerBuilder {
@@ -91,7 +91,7 @@ final class ContainerLintCommand extends Command
             $container = $buildContainer();
         } else {
             if (!$kernelContainer instanceof Container) {
-                throw new RuntimeException(sprintf('This command does not support the application container: "%s" does not extend "%s".', get_debug_type($kernelContainer), Container::class));
+                throw new RuntimeException(\sprintf('This command does not support the application container: "%s" does not extend "%s".', get_debug_type($kernelContainer), Container::class));
             }
 
             (new XmlFileLoader($container = new ContainerBuilder($parameterBag = new EnvPlaceholderParameterBag()), new FileLocator()))->load($kernelContainer->getParameter('debug.container.dump'));
diff --git a/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php b/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
index ab4793b68..3fde1407b 100644
--- a/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
+++ b/lib/symfony/framework-bundle/Command/DebugAutowiringCommand.php
@@ -35,7 +35,7 @@ class DebugAutowiringCommand extends ContainerDebugCommand
 {
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(?string $name = null, ?FileLinkFormatter $fileLinkFormatter = null)
     {
         $this->fileLinkFormatter = $fileLinkFormatter;
         parent::__construct($name);
@@ -78,7 +78,7 @@ EOF
             $serviceIds = array_filter($serviceIds, fn ($serviceId) => false !== stripos(str_replace('\\', '', $serviceId), $searchNormalized) && !str_starts_with($serviceId, '.'));
 
             if (!$serviceIds) {
-                $errorIo->error(sprintf('No autowirable classes or interfaces found matching "%s"', $search));
+                $errorIo->error(\sprintf('No autowirable classes or interfaces found matching "%s"', $search));
 
                 return 1;
             }
@@ -97,7 +97,7 @@ EOF
         $io->title('Autowirable Types');
         $io->text('The following classes & interfaces can be used as type-hints when autowiring:');
         if ($search) {
-            $io->text(sprintf('(only showing classes/interfaces matching <comment>%s</comment>)', $search));
+            $io->text(\sprintf('(only showing classes/interfaces matching <comment>%s</comment>)', $search));
         }
         $hasAlias = [];
         $all = $input->getOption('all');
@@ -120,10 +120,10 @@ EOF
                 }
             }
 
-            $serviceLine = sprintf('<fg=yellow>%s</>', $serviceId);
+            $serviceLine = \sprintf('<fg=yellow>%s</>', $serviceId);
             if ('' !== $fileLink = $this->getFileLink($previousId)) {
                 $serviceLine = substr($serviceId, \strlen($previousId));
-                $serviceLine = sprintf('<fg=yellow;href=%s>%s</>', $fileLink, $previousId).('' !== $serviceLine ? sprintf('<fg=yellow>%s</>', $serviceLine) : '');
+                $serviceLine = \sprintf('<fg=yellow;href=%s>%s</>', $fileLink, $previousId).('' !== $serviceLine ? \sprintf('<fg=yellow>%s</>', $serviceLine) : '');
             }
 
             if ($container->hasAlias($serviceId)) {
@@ -168,7 +168,7 @@ EOF
         $io->newLine();
 
         if (0 < $serviceIdsNb) {
-            $io->text(sprintf('%s more concrete service%s would be displayed when adding the "--all" option.', $serviceIdsNb, $serviceIdsNb > 1 ? 's' : ''));
+            $io->text(\sprintf('%s more concrete service%s would be displayed when adding the "--all" option.', $serviceIdsNb, $serviceIdsNb > 1 ? 's' : ''));
         }
         if ($all) {
             $io->text('Pro-tip: use interfaces in your type-hints instead of classes to benefit from the dependency inversion principle.');
diff --git a/lib/symfony/framework-bundle/Command/EventDispatcherDebugCommand.php b/lib/symfony/framework-bundle/Command/EventDispatcherDebugCommand.php
index 1a74e8682..b6c644499 100644
--- a/lib/symfony/framework-bundle/Command/EventDispatcherDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/EventDispatcherDebugCommand.php
@@ -52,7 +52,7 @@ class EventDispatcherDebugCommand extends Command
             ->setDefinition([
                 new InputArgument('event', InputArgument::OPTIONAL, 'An event name or a part of the event name'),
                 new InputOption('dispatcher', null, InputOption::VALUE_REQUIRED, 'To view events of a specific event dispatcher', self::DEFAULT_DISPATCHER),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
             ])
             ->setHelp(<<<'EOF'
@@ -78,7 +78,7 @@ EOF
         $options = [];
         $dispatcherServiceName = $input->getOption('dispatcher');
         if (!$this->dispatchers->has($dispatcherServiceName)) {
-            $io->getErrorStyle()->error(sprintf('Event dispatcher "%s" is not available.', $dispatcherServiceName));
+            $io->getErrorStyle()->error(\sprintf('Event dispatcher "%s" is not available.', $dispatcherServiceName));
 
             return 1;
         }
@@ -92,7 +92,7 @@ EOF
                 // if there is no direct match, try find partial matches
                 $events = $this->searchForEvent($dispatcher, $event);
                 if (0 === \count($events)) {
-                    $io->getErrorStyle()->warning(sprintf('The event "%s" does not have any registered listeners.', $event));
+                    $io->getErrorStyle()->warning(\sprintf('The event "%s" does not have any registered listeners.', $event));
 
                     return 0;
                 } elseif (1 === \count($events)) {
diff --git a/lib/symfony/framework-bundle/Command/RouterDebugCommand.php b/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
index 8d4e38a29..9f689a142 100644
--- a/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/RouterDebugCommand.php
@@ -42,7 +42,7 @@ class RouterDebugCommand extends Command
     private RouterInterface $router;
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(RouterInterface $router, FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(RouterInterface $router, ?FileLinkFormatter $fileLinkFormatter = null)
     {
         parent::__construct();
 
@@ -57,7 +57,7 @@ class RouterDebugCommand extends Command
                 new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
                 new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
                 new InputOption('show-aliases', null, InputOption::VALUE_NONE, 'Show aliases in overview'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
             ])
             ->setHelp(<<<'EOF'
@@ -107,7 +107,7 @@ EOF
             }
 
             if (!$route) {
-                throw new InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
+                throw new InvalidArgumentException(\sprintf('The route "%s" does not exist.', $name));
             }
 
             $helper->describe($io, $route, [
diff --git a/lib/symfony/framework-bundle/Command/RouterMatchCommand.php b/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
index 7efd1f3ed..73e5c5d0d 100644
--- a/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
+++ b/lib/symfony/framework-bundle/Command/RouterMatchCommand.php
@@ -97,21 +97,21 @@ EOF
         $matches = false;
         foreach ($traces as $trace) {
             if (TraceableUrlMatcher::ROUTE_ALMOST_MATCHES == $trace['level']) {
-                $io->text(sprintf('Route <info>"%s"</> almost matches but %s', $trace['name'], lcfirst($trace['log'])));
+                $io->text(\sprintf('Route <info>"%s"</> almost matches but %s', $trace['name'], lcfirst($trace['log'])));
             } elseif (TraceableUrlMatcher::ROUTE_MATCHES == $trace['level']) {
-                $io->success(sprintf('Route "%s" matches', $trace['name']));
+                $io->success(\sprintf('Route "%s" matches', $trace['name']));
 
                 $routerDebugCommand = $this->getApplication()->find('debug:router');
                 $routerDebugCommand->run(new ArrayInput(['name' => $trace['name']]), $output);
 
                 $matches = true;
             } elseif ($input->getOption('verbose')) {
-                $io->text(sprintf('Route "%s" does not match: %s', $trace['name'], $trace['log']));
+                $io->text(\sprintf('Route "%s" does not match: %s', $trace['name'], $trace['log']));
             }
         }
 
         if (!$matches) {
-            $io->error(sprintf('None of the routes match the path "%s"', $input->getArgument('path_info')));
+            $io->error(\sprintf('None of the routes match the path "%s"', $input->getArgument('path_info')));
 
             return 1;
         }
diff --git a/lib/symfony/framework-bundle/Command/SecretsDecryptToLocalCommand.php b/lib/symfony/framework-bundle/Command/SecretsDecryptToLocalCommand.php
index 22be89502..665c5c454 100644
--- a/lib/symfony/framework-bundle/Command/SecretsDecryptToLocalCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsDecryptToLocalCommand.php
@@ -31,7 +31,7 @@ final class SecretsDecryptToLocalCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -48,7 +48,7 @@ The <info>%command.name%</info> command decrypts all secrets and copies them in
 
     <info>%command.full_name%</info>
 
-When the option <info>--force</info> is provided, secrets that already exist in the local vault are overriden.
+When the <info>--force</info> option is provided, secrets that already exist in the local vault are overridden.
 
     <info>%command.full_name% --force</info>
 EOF
@@ -68,7 +68,7 @@ EOF
 
         $secrets = $this->vault->list(true);
 
-        $io->comment(sprintf('%d secret%s found in the vault.', \count($secrets), 1 !== \count($secrets) ? 's' : ''));
+        $io->comment(\sprintf('%d secret%s found in the vault.', \count($secrets), 1 !== \count($secrets) ? 's' : ''));
 
         $skipped = 0;
         if (!$input->getOption('force')) {
@@ -82,14 +82,14 @@ EOF
 
         if ($skipped > 0) {
             $io->warning([
-                sprintf('%d secret%s already overridden in the local vault and will be skipped.', $skipped, 1 !== $skipped ? 's are' : ' is'),
+                \sprintf('%d secret%s already overridden in the local vault and will be skipped.', $skipped, 1 !== $skipped ? 's are' : ' is'),
                 'Use the --force flag to override these.',
             ]);
         }
 
         foreach ($secrets as $k => $v) {
             if (null === $v) {
-                $io->error($this->vault->getLastMessage() ?? sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));
+                $io->error($this->vault->getLastMessage() ?? \sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));
                 continue;
             }
 
diff --git a/lib/symfony/framework-bundle/Command/SecretsEncryptFromLocalCommand.php b/lib/symfony/framework-bundle/Command/SecretsEncryptFromLocalCommand.php
index 4c613ef7b..0eba8956c 100644
--- a/lib/symfony/framework-bundle/Command/SecretsEncryptFromLocalCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsEncryptFromLocalCommand.php
@@ -30,7 +30,7 @@ final class SecretsEncryptFromLocalCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -61,14 +61,13 @@ EOF
         }
 
         foreach ($this->vault->list(true) as $name => $value) {
-            $localValue = $this->localVault->reveal($name);
+            if (null === $localValue = $this->localVault->reveal($name)) {
+                continue;
+            }
 
-            if (null !== $localValue && $value !== $localValue) {
+            if ($value !== $localValue) {
                 $this->vault->seal($name, $localValue);
-            } elseif (null !== $message = $this->localVault->getLastMessage()) {
-                $io->error($message);
-
-                return 1;
+                $io->note($this->vault->getLastMessage());
             }
         }
 
diff --git a/lib/symfony/framework-bundle/Command/SecretsGenerateKeysCommand.php b/lib/symfony/framework-bundle/Command/SecretsGenerateKeysCommand.php
index 761f6c260..c250258c1 100644
--- a/lib/symfony/framework-bundle/Command/SecretsGenerateKeysCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsGenerateKeysCommand.php
@@ -33,7 +33,7 @@ final class SecretsGenerateKeysCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -67,7 +67,7 @@ EOF
         $vault = $input->getOption('local') ? $this->localVault : $this->vault;
 
         if (null === $vault) {
-            $io->success('The local vault is disabled.');
+            $io->error('The local vault is disabled.');
 
             return 1;
         }
diff --git a/lib/symfony/framework-bundle/Command/SecretsListCommand.php b/lib/symfony/framework-bundle/Command/SecretsListCommand.php
index de8a7e772..4ba335e62 100644
--- a/lib/symfony/framework-bundle/Command/SecretsListCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsListCommand.php
@@ -34,7 +34,7 @@ final class SecretsListCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -66,7 +66,7 @@ EOF
         $io->comment('Use <info>"%env(<name>)%"</info> to reference a secret in a config file.');
 
         if (!$reveal = $input->getOption('reveal')) {
-            $io->comment(sprintf('To reveal the secrets run <info>php %s %s --reveal</info>', $_SERVER['PHP_SELF'], $this->getName()));
+            $io->comment(\sprintf('To reveal the secrets run <info>php %s %s --reveal</info>', $_SERVER['PHP_SELF'], $this->getName()));
         }
 
         $secrets = $this->vault->list($reveal);
diff --git a/lib/symfony/framework-bundle/Command/SecretsRemoveCommand.php b/lib/symfony/framework-bundle/Command/SecretsRemoveCommand.php
index e03afcd0c..3e75ba0c4 100644
--- a/lib/symfony/framework-bundle/Command/SecretsRemoveCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsRemoveCommand.php
@@ -35,7 +35,7 @@ final class SecretsRemoveCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -63,7 +63,7 @@ EOF
         $vault = $input->getOption('local') ? $this->localVault : $this->vault;
 
         if (null === $vault) {
-            $io->success('The local vault is disabled.');
+            $io->error('The local vault is disabled.');
 
             return 1;
         }
diff --git a/lib/symfony/framework-bundle/Command/SecretsSetCommand.php b/lib/symfony/framework-bundle/Command/SecretsSetCommand.php
index 0e831a343..e2fc39e04 100644
--- a/lib/symfony/framework-bundle/Command/SecretsSetCommand.php
+++ b/lib/symfony/framework-bundle/Command/SecretsSetCommand.php
@@ -36,7 +36,7 @@ final class SecretsSetCommand extends Command
     private AbstractVault $vault;
     private ?AbstractVault $localVault;
 
-    public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
+    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
     {
         $this->vault = $vault;
         $this->localVault = $localVault;
@@ -88,7 +88,7 @@ EOF
         }
 
         if ($this->localVault === $vault && !\array_key_exists($name, $this->vault->list())) {
-            $io->error(sprintf('Secret "%s" does not exist in the vault, you cannot override it locally.', $name));
+            $io->error(\sprintf('Secret "%s" does not exist in the vault, you cannot override it locally.', $name));
 
             return 1;
         }
@@ -107,9 +107,9 @@ EOF
         } elseif (is_file($file) && is_readable($file)) {
             $value = file_get_contents($file);
         } elseif (!is_file($file)) {
-            throw new \InvalidArgumentException(sprintf('File not found: "%s".', $file));
+            throw new \InvalidArgumentException(\sprintf('File not found: "%s".', $file));
         } elseif (!is_readable($file)) {
-            throw new \InvalidArgumentException(sprintf('File is not readable: "%s".', $file));
+            throw new \InvalidArgumentException(\sprintf('File is not readable: "%s".', $file));
         }
 
         if ($vault->generateKeys()) {
diff --git a/lib/symfony/framework-bundle/Command/TranslationDebugCommand.php b/lib/symfony/framework-bundle/Command/TranslationDebugCommand.php
index 79a67847a..46e90ed40 100644
--- a/lib/symfony/framework-bundle/Command/TranslationDebugCommand.php
+++ b/lib/symfony/framework-bundle/Command/TranslationDebugCommand.php
@@ -59,7 +59,7 @@ class TranslationDebugCommand extends Command
     private array $codePaths;
     private array $enabledLocales;
 
-    public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
+    public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
     {
         parent::__construct();
 
@@ -79,7 +79,7 @@ class TranslationDebugCommand extends Command
             ->setDefinition([
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
-                new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'The messages domain'),
+                new InputOption('domain', null, InputOption::VALUE_REQUIRED, 'The messages domain'),
                 new InputOption('only-missing', null, InputOption::VALUE_NONE, 'Display only missing messages'),
                 new InputOption('only-unused', null, InputOption::VALUE_NONE, 'Display only unused messages'),
                 new InputOption('all', null, InputOption::VALUE_NONE, 'Load messages from all registered bundles'),
@@ -155,7 +155,7 @@ EOF
                 $codePaths = [$path.'/templates'];
 
                 if (!is_dir($transPaths[0])) {
-                    throw new InvalidArgumentException(sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
+                    throw new InvalidArgumentException(\sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
                 }
             }
         } elseif ($input->getOption('all')) {
@@ -181,10 +181,10 @@ EOF
 
         // No defined or extracted messages
         if (!$allMessages || null !== $domain && empty($allMessages[$domain])) {
-            $outputMessage = sprintf('No defined or extracted messages for locale "%s"', $locale);
+            $outputMessage = \sprintf('No defined or extracted messages for locale "%s"', $locale);
 
             if (null !== $domain) {
-                $outputMessage .= sprintf(' and domain "%s"', $domain);
+                $outputMessage .= \sprintf(' and domain "%s"', $domain);
             }
 
             $io->getErrorStyle()->warning($outputMessage);
@@ -196,9 +196,9 @@ EOF
         $fallbackCatalogues = $this->loadFallbackCatalogues($locale, $transPaths);
 
         // Display header line
-        $headers = ['State', 'Domain', 'Id', sprintf('Message Preview (%s)', $locale)];
+        $headers = ['State', 'Domain', 'Id', \sprintf('Message Preview (%s)', $locale)];
         foreach ($fallbackCatalogues as $fallbackCatalogue) {
-            $headers[] = sprintf('Fallback Message Preview (%s)', $fallbackCatalogue->getLocale());
+            $headers[] = \sprintf('Fallback Message Preview (%s)', $fallbackCatalogue->getLocale());
         }
         $rows = [];
         // Iterate all message ids and determine their state
@@ -320,7 +320,7 @@ EOF
 
     private function formatId(string $id): string
     {
-        return sprintf('<fg=cyan;options=bold>%s</>', $id);
+        return \sprintf('<fg=cyan;options=bold>%s</>', $id);
     }
 
     private function sanitizeString(string $string, int $length = 40): string
diff --git a/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php b/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
index 4563779ba..b8759bc92 100644
--- a/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
+++ b/lib/symfony/framework-bundle/Command/TranslationUpdateCommand.php
@@ -19,7 +19,6 @@ use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -60,10 +59,14 @@ class TranslationUpdateCommand extends Command
     private array $codePaths;
     private array $enabledLocales;
 
-    public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
+    public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
     {
         parent::__construct();
 
+        if (!method_exists($writer, 'getFormats')) {
+            throw new \InvalidArgumentException(\sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
+        }
+
         $this->writer = $writer;
         $this->reader = $reader;
         $this->extractor = $extractor;
@@ -81,14 +84,14 @@ class TranslationUpdateCommand extends Command
             ->setDefinition([
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
-                new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
-                new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'xlf12'),
+                new InputOption('prefix', null, InputOption::VALUE_REQUIRED, 'Override the default prefix', '__'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'Override the default output format', 'xlf12'),
                 new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Should the extract be done'),
                 new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
-                new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to extract'),
+                new InputOption('domain', null, InputOption::VALUE_REQUIRED, 'Specify the domain to extract'),
                 new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically (only works with --dump-messages)', 'asc'),
-                new InputOption('as-tree', null, InputOption::VALUE_OPTIONAL, 'Dump the messages as a tree-like structure: The given value defines the level where to switch to inline YAML'),
+                new InputOption('as-tree', null, InputOption::VALUE_REQUIRED, 'Dump the messages as a tree-like structure: The given value defines the level where to switch to inline YAML'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command extracts translation strings from templates
@@ -124,13 +127,6 @@ EOF
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = new SymfonyStyle($input, $output);
-        $errorIo = $output instanceof ConsoleOutputInterface ? new SymfonyStyle($input, $output->getErrorOutput()) : $io;
-
-        if ('translation:update' === $input->getFirstArgument()) {
-            $errorIo->caution('Command "translation:update" is deprecated since version 5.4 and will be removed in Symfony 6.0. Use "translation:extract" instead.');
-        }
-
         $io = new SymfonyStyle($input, $output);
         $errorIo = $io->getErrorStyle();
 
@@ -187,13 +183,13 @@ EOF
                 $codePaths = [$path.'/templates'];
 
                 if (!is_dir($transPaths[0])) {
-                    throw new InvalidArgumentException(sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
+                    throw new InvalidArgumentException(\sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
                 }
             }
         }
 
         $io->title('Translation Messages Extractor and Dumper');
-        $io->comment(sprintf('Generating "<info>%s</info>" translation files for "<info>%s</info>"', $input->getArgument('locale'), $currentName));
+        $io->comment(\sprintf('Generating "<info>%s</info>" translation files for "<info>%s</info>"', $input->getArgument('locale'), $currentName));
 
         $io->comment('Parsing templates...');
         $extractedCatalogue = $this->extractMessages($input->getArgument('locale'), $codePaths, $input->getOption('prefix'));
@@ -232,8 +228,8 @@ EOF
 
                 $list = array_merge(
                     array_diff($allKeys, $newKeys),
-                    array_map(fn ($id) => sprintf('<fg=green>%s</>', $id), $newKeys),
-                    array_map(fn ($id) => sprintf('<fg=red>%s</>', $id), array_keys($operation->getObsoleteMessages($domain)))
+                    array_map(fn ($id) => \sprintf('<fg=green>%s</>', $id), $newKeys),
+                    array_map(fn ($id) => \sprintf('<fg=red>%s</>', $id), array_keys($operation->getObsoleteMessages($domain)))
                 );
 
                 $domainMessagesCount = \count($list);
@@ -253,17 +249,17 @@ EOF
                     }
                 }
 
-                $io->section(sprintf('Messages extracted for domain "<info>%s</info>" (%d message%s)', $domain, $domainMessagesCount, $domainMessagesCount > 1 ? 's' : ''));
+                $io->section(\sprintf('Messages extracted for domain "<info>%s</info>" (%d message%s)', $domain, $domainMessagesCount, $domainMessagesCount > 1 ? 's' : ''));
                 $io->listing($list);
 
                 $extractedMessagesCount += $domainMessagesCount;
             }
 
             if ('xlf' === $format) {
-                $io->comment(sprintf('Xliff output version is <info>%s</info>', $xliffVersion));
+                $io->comment(\sprintf('Xliff output version is <info>%s</info>', $xliffVersion));
             }
 
-            $resultMessage = sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
+            $resultMessage = \sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
         }
 
         // save the files
diff --git a/lib/symfony/framework-bundle/Command/WorkflowDumpCommand.php b/lib/symfony/framework-bundle/Command/WorkflowDumpCommand.php
index f84a560c6..5abd98297 100644
--- a/lib/symfony/framework-bundle/Command/WorkflowDumpCommand.php
+++ b/lib/symfony/framework-bundle/Command/WorkflowDumpCommand.php
@@ -62,7 +62,7 @@ class WorkflowDumpCommand extends Command
             $this->definitions = $workflows;
             trigger_deprecation('symfony/framework-bundle', '6.2', 'Passing an array of definitions in "%s()" is deprecated. Inject a ServiceLocator filled with all workflows instead.', __METHOD__);
         } else {
-            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an array or a ServiceLocator, "%s" given.', __METHOD__, \gettype($workflows)));
+            throw new \TypeError(\sprintf('Argument 1 passed to "%s()" must be an array or a ServiceLocator, "%s" given.', __METHOD__, \gettype($workflows)));
         }
     }
 
@@ -94,7 +94,7 @@ EOF
 
         if (isset($this->workflows)) {
             if (!$this->workflows->has($workflowName)) {
-                throw new InvalidArgumentException(sprintf('The workflow named "%s" cannot be found.', $workflowName));
+                throw new InvalidArgumentException(\sprintf('The workflow named "%s" cannot be found.', $workflowName));
             }
             $workflow = $this->workflows->get($workflowName);
             $type = $workflow instanceof StateMachine ? 'state_machine' : 'workflow';
@@ -108,7 +108,7 @@ EOF
         }
 
         if (null === $definition) {
-            throw new InvalidArgumentException(sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $workflowName));
+            throw new InvalidArgumentException(\sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $workflowName));
         }
 
         switch ($input->getOption('dump-format')) {
diff --git a/lib/symfony/framework-bundle/Console/Application.php b/lib/symfony/framework-bundle/Console/Application.php
index 38dd8405a..a96336116 100644
--- a/lib/symfony/framework-bundle/Console/Application.php
+++ b/lib/symfony/framework-bundle/Console/Application.php
@@ -157,7 +157,7 @@ class Application extends BaseApplication
         return $command;
     }
 
-    public function all(string $namespace = null): array
+    public function all(?string $namespace = null): array
     {
         $this->registerCommands();
 
@@ -166,7 +166,7 @@ class Application extends BaseApplication
 
     public function getLongVersion(): string
     {
-        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().\sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command): ?Command
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
index ba500adb2..af5c3b10a 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/Descriptor.php
@@ -62,7 +62,7 @@ abstract class Descriptor implements DescriptorInterface
             $object instanceof Alias => $this->describeContainerAlias($object, $options),
             $object instanceof EventDispatcherInterface => $this->describeEventDispatcherListeners($object, $options),
             \is_callable($object) => $this->describeCallable($object, $options),
-            default => throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
+            default => throw new \InvalidArgumentException(\sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
         };
 
         if ($object instanceof ContainerBuilder) {
@@ -96,7 +96,7 @@ abstract class Descriptor implements DescriptorInterface
      *
      * @param Definition|Alias|object $service
      */
-    abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void;
+    abstract protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void;
 
     /**
      * Describes container services.
@@ -108,9 +108,9 @@ abstract class Descriptor implements DescriptorInterface
 
     abstract protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void;
 
-    abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void;
+    abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void;
 
-    abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void;
+    abstract protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void;
 
     abstract protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void;
 
@@ -133,7 +133,7 @@ abstract class Descriptor implements DescriptorInterface
         }
 
         if (\is_object($value)) {
-            return sprintf('object(%s)', $value::class);
+            return \sprintf('object(%s)', $value::class);
         }
 
         if (\is_string($value)) {
@@ -278,7 +278,7 @@ abstract class Descriptor implements DescriptorInterface
         return $reverseAliases;
     }
 
-    public static function getClassDescription(string $class, string &$resolvedClass = null): string
+    public static function getClassDescription(string $class, ?string &$resolvedClass = null): string
     {
         $resolvedClass = $class;
         try {
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
index 1dc567a3f..344db992f 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/JsonDescriptor.php
@@ -70,7 +70,7 @@ class JsonDescriptor extends Descriptor
         $this->writeData($data, $options);
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -121,12 +121,12 @@ class JsonDescriptor extends Descriptor
         $this->writeData($data, $options);
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
     {
         $this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'], $container, $options['id'] ?? null), $options);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (!$container) {
             $this->writeData($this->getContainerAliasData($alias), $options);
@@ -156,7 +156,7 @@ class JsonDescriptor extends Descriptor
         $data = [$key => $parameter];
 
         if ($deprecation) {
-            $data['_deprecation'] = sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2)));
+            $data['_deprecation'] = \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2)));
         }
 
         $this->writeData($data, $options);
@@ -169,7 +169,7 @@ class JsonDescriptor extends Descriptor
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -236,7 +236,7 @@ class JsonDescriptor extends Descriptor
             $deprecations = [];
 
             foreach ($deprecated as $parameter => $deprecation) {
-                $deprecations[$parameter] = sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2)));
+                $deprecations[$parameter] = \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2)));
             }
 
             $sortedParameters['_deprecations'] = $deprecations;
@@ -245,7 +245,7 @@ class JsonDescriptor extends Descriptor
         return $sortedParameters;
     }
 
-    private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ContainerBuilder $container = null, string $id = null): array
+    private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ?ContainerBuilder $container = null, ?string $id = null): array
     {
         $data = [
             'class' => (string) $definition->getClass(),
@@ -280,7 +280,7 @@ class JsonDescriptor extends Descriptor
                 if ($factory[0] instanceof Reference) {
                     $data['factory_service'] = (string) $factory[0];
                 } elseif ($factory[0] instanceof Definition) {
-                    $data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
+                    $data['factory_service'] = \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
                 } else {
                     $data['factory_class'] = $factory[0];
                 }
@@ -393,7 +393,7 @@ class JsonDescriptor extends Descriptor
             $data['type'] = 'closure';
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $data;
             }
             $data['name'] = $r->name;
@@ -418,7 +418,7 @@ class JsonDescriptor extends Descriptor
         throw new \InvalidArgumentException('Callable is not describable.');
     }
 
-    private function describeValue($value, bool $omitTags, bool $showArguments, ContainerBuilder $container = null, string $id = null): mixed
+    private function describeValue($value, bool $omitTags, bool $showArguments, ?ContainerBuilder $container = null, ?string $id = null): mixed
     {
         if (\is_array($value)) {
             $data = [];
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
index 275294d7e..c84fd5b1c 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/MarkdownDescriptor.php
@@ -40,7 +40,7 @@ class MarkdownDescriptor extends Descriptor
             }
             $this->describeRoute($route, ['name' => $name]);
             if (($showAliases ??= $options['show_aliases'] ?? false) && $aliases = ($reverseAliases ??= $this->getReverseAliases($routes))[$name] ?? []) {
-                $this->write(sprintf("- Aliases: \n%s", implode("\n", array_map(static fn (string $alias): string => sprintf('    - %s', $alias), $aliases))));
+                $this->write(\sprintf("- Aliases: \n%s", implode("\n", array_map(static fn (string $alias): string => \sprintf('    - %s', $alias), $aliases))));
             }
         }
         $this->write("\n");
@@ -75,11 +75,11 @@ class MarkdownDescriptor extends Descriptor
 
         $this->write("Container parameters\n====================\n");
         foreach ($this->sortParameters($parameters) as $key => $value) {
-            $this->write(sprintf(
+            $this->write(\sprintf(
                 "\n- `%s`: `%s`%s",
                 $key,
                 $this->formatParameter($value),
-                isset($deprecatedParameters[$key]) ? sprintf(' *Since %s %s: %s*', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], sprintf(...\array_slice($deprecatedParameters[$key], 2))) : ''
+                isset($deprecatedParameters[$key]) ? \sprintf(' *Since %s %s: %s*', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], \sprintf(...\array_slice($deprecatedParameters[$key], 2))) : ''
             ));
         }
     }
@@ -98,7 +98,7 @@ class MarkdownDescriptor extends Descriptor
         }
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -111,13 +111,13 @@ class MarkdownDescriptor extends Descriptor
         } elseif ($service instanceof Definition) {
             $this->describeContainerDefinition($service, $childOptions, $container);
         } else {
-            $this->write(sprintf('**`%s`:** `%s`', $options['id'], $service::class));
+            $this->write(\sprintf('**`%s`:** `%s`', $options['id'], $service::class));
         }
     }
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -132,11 +132,11 @@ class MarkdownDescriptor extends Descriptor
         $formattedLogs = [];
         $remainingCount = 0;
         foreach ($logs as $log) {
-            $formattedLogs[] = sprintf("- %sx: \"%s\" in %s:%s\n", $log['count'], $log['message'], $log['file'], $log['line']);
+            $formattedLogs[] = \sprintf("- %sx: \"%s\" in %s:%s\n", $log['count'], $log['message'], $log['file'], $log['line']);
             $remainingCount += $log['count'];
         }
 
-        $this->write(sprintf("## Remaining deprecations (%s)\n\n", $remainingCount));
+        $this->write(\sprintf("## Remaining deprecations (%s)\n\n", $remainingCount));
         foreach ($formattedLogs as $formattedLog) {
             $this->write($formattedLog);
         }
@@ -201,12 +201,12 @@ class MarkdownDescriptor extends Descriptor
             $this->write("\n\nServices\n--------\n");
             foreach ($services['services'] as $id => $service) {
                 $this->write("\n");
-                $this->write(sprintf('- `%s`: `%s`', $id, $service::class));
+                $this->write(\sprintf('- `%s`: `%s`', $id, $service::class));
             }
         }
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
     {
         $output = '';
 
@@ -244,7 +244,7 @@ class MarkdownDescriptor extends Descriptor
                 if ($factory[0] instanceof Reference) {
                     $output .= "\n".'- Factory Service: `'.$factory[0].'`';
                 } elseif ($factory[0] instanceof Definition) {
-                    $output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
+                    $output .= "\n".\sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? \sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
                 } else {
                     $output .= "\n".'- Factory Class: `'.$factory[0].'`';
                 }
@@ -273,10 +273,10 @@ class MarkdownDescriptor extends Descriptor
         $inEdges = null !== $container && isset($options['id']) ? $this->getServiceEdges($container, $options['id']) : [];
         $output .= "\n".'- Usages: '.($inEdges ? implode(', ', $inEdges) : 'none');
 
-        $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
+        $this->write(isset($options['id']) ? \sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         $output = '- Service: `'.$alias.'`'
             ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
@@ -287,7 +287,7 @@ class MarkdownDescriptor extends Descriptor
             return;
         }
 
-        $this->write(sprintf("### %s\n\n%s\n", $options['id'], $output));
+        $this->write(\sprintf("### %s\n\n%s\n", $options['id'], $output));
 
         if (!$container) {
             return;
@@ -300,7 +300,7 @@ class MarkdownDescriptor extends Descriptor
     protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
     {
         if (isset($options['parameter'])) {
-            $this->write(sprintf("%s\n%s\n\n%s%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter), $deprecation ? sprintf("\n\n*Since %s %s: %s*", $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))) : ''));
+            $this->write(\sprintf("%s\n%s\n\n%s%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter), $deprecation ? \sprintf("\n\n*Since %s %s: %s*", $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))) : ''));
         } else {
             $this->write($parameter);
         }
@@ -319,35 +319,35 @@ class MarkdownDescriptor extends Descriptor
         $title = 'Registered listeners';
 
         if (null !== $dispatcherServiceName) {
-            $title .= sprintf(' of event dispatcher "%s"', $dispatcherServiceName);
+            $title .= \sprintf(' of event dispatcher "%s"', $dispatcherServiceName);
         }
 
         if (null !== $event) {
-            $title .= sprintf(' for event `%s` ordered by descending priority', $event);
+            $title .= \sprintf(' for event `%s` ordered by descending priority', $event);
             $registeredListeners = $eventDispatcher->getListeners($event);
         } else {
             // Try to see if "events" exists
             $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
         }
 
-        $this->write(sprintf('# %s', $title)."\n");
+        $this->write(\sprintf('# %s', $title)."\n");
 
         if (null !== $event) {
             foreach ($registeredListeners as $order => $listener) {
-                $this->write("\n".sprintf('## Listener %d', $order + 1)."\n");
+                $this->write("\n".\sprintf('## Listener %d', $order + 1)."\n");
                 $this->describeCallable($listener);
-                $this->write(sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($event, $listener))."\n");
+                $this->write(\sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($event, $listener))."\n");
             }
         } else {
             ksort($registeredListeners);
 
             foreach ($registeredListeners as $eventListened => $eventListeners) {
-                $this->write("\n".sprintf('## %s', $eventListened)."\n");
+                $this->write("\n".\sprintf('## %s', $eventListened)."\n");
 
                 foreach ($eventListeners as $order => $eventListener) {
-                    $this->write("\n".sprintf('### Listener %d', $order + 1)."\n");
+                    $this->write("\n".\sprintf('### Listener %d', $order + 1)."\n");
                     $this->describeCallable($eventListener);
-                    $this->write(sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($eventListened, $eventListener))."\n");
+                    $this->write(\sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($eventListened, $eventListener))."\n");
                 }
             }
         }
@@ -361,16 +361,16 @@ class MarkdownDescriptor extends Descriptor
             $string .= "\n- Type: `function`";
 
             if (\is_object($callable[0])) {
-                $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
-                $string .= "\n".sprintf('- Class: `%s`', $callable[0]::class);
+                $string .= "\n".\sprintf('- Name: `%s`', $callable[1]);
+                $string .= "\n".\sprintf('- Class: `%s`', $callable[0]::class);
             } else {
                 if (!str_starts_with($callable[1], 'parent::')) {
-                    $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
-                    $string .= "\n".sprintf('- Class: `%s`', $callable[0]);
+                    $string .= "\n".\sprintf('- Name: `%s`', $callable[1]);
+                    $string .= "\n".\sprintf('- Class: `%s`', $callable[0]);
                     $string .= "\n- Static: yes";
                 } else {
-                    $string .= "\n".sprintf('- Name: `%s`', substr($callable[1], 8));
-                    $string .= "\n".sprintf('- Class: `%s`', $callable[0]);
+                    $string .= "\n".\sprintf('- Name: `%s`', substr($callable[1], 8));
+                    $string .= "\n".\sprintf('- Class: `%s`', $callable[0]);
                     $string .= "\n- Static: yes";
                     $string .= "\n- Parent: yes";
                 }
@@ -385,12 +385,12 @@ class MarkdownDescriptor extends Descriptor
             $string .= "\n- Type: `function`";
 
             if (!str_contains($callable, '::')) {
-                $string .= "\n".sprintf('- Name: `%s`', $callable);
+                $string .= "\n".\sprintf('- Name: `%s`', $callable);
             } else {
                 $callableParts = explode('::', $callable);
 
-                $string .= "\n".sprintf('- Name: `%s`', $callableParts[1]);
-                $string .= "\n".sprintf('- Class: `%s`', $callableParts[0]);
+                $string .= "\n".\sprintf('- Name: `%s`', $callableParts[1]);
+                $string .= "\n".\sprintf('- Class: `%s`', $callableParts[0]);
                 $string .= "\n- Static: yes";
             }
 
@@ -403,15 +403,15 @@ class MarkdownDescriptor extends Descriptor
             $string .= "\n- Type: `closure`";
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 $this->write($string."\n");
 
                 return;
             }
-            $string .= "\n".sprintf('- Name: `%s`', $r->name);
+            $string .= "\n".\sprintf('- Name: `%s`', $r->name);
 
             if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
-                $string .= "\n".sprintf('- Class: `%s`', $class->name);
+                $string .= "\n".\sprintf('- Class: `%s`', $class->name);
                 if (!$r->getClosureThis()) {
                     $string .= "\n- Static: yes";
                 }
@@ -424,7 +424,7 @@ class MarkdownDescriptor extends Descriptor
 
         if (method_exists($callable, '__invoke')) {
             $string .= "\n- Type: `object`";
-            $string .= "\n".sprintf('- Name: `%s`', $callable::class);
+            $string .= "\n".\sprintf('- Name: `%s`', $callable::class);
 
             $this->write($string."\n");
 
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
index b0fe7f2ac..9e05f90e3 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/TextDescriptor.php
@@ -40,7 +40,7 @@ class TextDescriptor extends Descriptor
 {
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(?FileLinkFormatter $fileLinkFormatter = null)
     {
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
@@ -133,7 +133,7 @@ class TextDescriptor extends Descriptor
 
             if (isset($deprecatedParameters[$parameter])) {
                 $tableRows[] = [new TableCell(
-                    sprintf('<comment>(Since %s %s: %s)</comment>', $deprecatedParameters[$parameter][0], $deprecatedParameters[$parameter][1], sprintf(...\array_slice($deprecatedParameters[$parameter], 2))),
+                    \sprintf('<comment>(Since %s %s: %s)</comment>', $deprecatedParameters[$parameter][0], $deprecatedParameters[$parameter][1], \sprintf(...\array_slice($deprecatedParameters[$parameter], 2))),
                     ['colspan' => 2]
                 )];
             }
@@ -154,12 +154,12 @@ class TextDescriptor extends Descriptor
         }
 
         foreach ($this->findDefinitionsByTag($container, $showHidden) as $tag => $definitions) {
-            $options['output']->section(sprintf('"%s" tag', $tag));
+            $options['output']->section(\sprintf('"%s" tag', $tag));
             $options['output']->listing(array_keys($definitions));
         }
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -170,7 +170,7 @@ class TextDescriptor extends Descriptor
         } elseif ($service instanceof Definition) {
             $this->describeContainerDefinition($service, $options, $container);
         } else {
-            $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
+            $options['output']->title(\sprintf('Information for Service "<info>%s</info>"', $options['id']));
             $options['output']->table(
                 ['Service ID', 'Class'],
                 [
@@ -192,7 +192,7 @@ class TextDescriptor extends Descriptor
         }
 
         if ($showTag) {
-            $title .= sprintf(' Tagged with "%s" Tag', $options['tag']);
+            $title .= \sprintf(' Tagged with "%s" Tag', $options['tag']);
         }
 
         $options['output']->title($title);
@@ -249,7 +249,7 @@ class TextDescriptor extends Descriptor
         foreach ($serviceIds as $serviceId) {
             $definition = $this->resolveServiceDefinition($container, $serviceId);
 
-            $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', OutputFormatter::escape($serviceId));
+            $styledServiceId = $rawOutput ? $serviceId : \sprintf('<fg=cyan>%s</fg=cyan>', OutputFormatter::escape($serviceId));
             if ($definition instanceof Definition) {
                 if ($showTag) {
                     foreach ($this->sortByPriority($definition->getTag($showTag)) as $key => $tag) {
@@ -272,7 +272,7 @@ class TextDescriptor extends Descriptor
                 }
             } elseif ($definition instanceof Alias) {
                 $alias = $definition;
-                $tableRows[] = array_merge([$styledServiceId, sprintf('alias for "%s"', $alias)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
+                $tableRows[] = array_merge([$styledServiceId, \sprintf('alias for "%s"', $alias)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             } else {
                 $tableRows[] = array_merge([$styledServiceId, $definition::class], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             }
@@ -281,10 +281,10 @@ class TextDescriptor extends Descriptor
         $options['output']->table($tableHeaders, $tableRows);
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (isset($options['id'])) {
-            $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
+            $options['output']->title(\sprintf('Information for Service "<info>%s</info>"', $options['id']));
         }
 
         if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
@@ -301,13 +301,13 @@ class TextDescriptor extends Descriptor
             $tagInformation = [];
             foreach ($tags as $tagName => $tagData) {
                 foreach ($tagData as $tagParameters) {
-                    $parameters = array_map(fn ($key, $value) => sprintf('<info>%s</info>: %s', $key, \is_array($value) ? $this->formatParameter($value) : $value), array_keys($tagParameters), array_values($tagParameters));
+                    $parameters = array_map(fn ($key, $value) => \sprintf('<info>%s</info>: %s', $key, \is_array($value) ? $this->formatParameter($value) : $value), array_keys($tagParameters), array_values($tagParameters));
                     $parameters = implode(', ', $parameters);
 
                     if ('' === $parameters) {
-                        $tagInformation[] = sprintf('%s', $tagName);
+                        $tagInformation[] = \sprintf('%s', $tagName);
                     } else {
-                        $tagInformation[] = sprintf('%s (%s)', $tagName, $parameters);
+                        $tagInformation[] = \sprintf('%s (%s)', $tagName, $parameters);
                     }
                 }
             }
@@ -343,7 +343,7 @@ class TextDescriptor extends Descriptor
                 if ($factory[0] instanceof Reference) {
                     $tableRows[] = ['Factory Service', $factory[0]];
                 } elseif ($factory[0] instanceof Definition) {
-                    $tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
+                    $tableRows[] = ['Factory Service', \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
                 } else {
                     $tableRows[] = ['Factory Class', $factory[0]];
                 }
@@ -361,27 +361,27 @@ class TextDescriptor extends Descriptor
                     $argument = $argument->getValues()[0];
                 }
                 if ($argument instanceof Reference) {
-                    $argumentsInformation[] = sprintf('Service(%s)', (string) $argument);
+                    $argumentsInformation[] = \sprintf('Service(%s)', (string) $argument);
                 } elseif ($argument instanceof IteratorArgument) {
                     if ($argument instanceof TaggedIteratorArgument) {
-                        $argumentsInformation[] = sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : sprintf(' (%d element(s))', \count($argument->getValues())));
+                        $argumentsInformation[] = \sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : \sprintf(' (%d element(s))', \count($argument->getValues())));
                     } else {
-                        $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues()));
+                        $argumentsInformation[] = \sprintf('Iterator (%d element(s))', \count($argument->getValues()));
                     }
 
                     foreach ($argument->getValues() as $ref) {
-                        $argumentsInformation[] = sprintf('- Service(%s)', $ref);
+                        $argumentsInformation[] = \sprintf('- Service(%s)', $ref);
                     }
                 } elseif ($argument instanceof ServiceLocatorArgument) {
-                    $argumentsInformation[] = sprintf('Service locator (%d element(s))', \count($argument->getValues()));
+                    $argumentsInformation[] = \sprintf('Service locator (%d element(s))', \count($argument->getValues()));
                 } elseif ($argument instanceof Definition) {
                     $argumentsInformation[] = 'Inlined Service';
                 } elseif ($argument instanceof \UnitEnum) {
                     $argumentsInformation[] = ltrim(var_export($argument, true), '\\');
                 } elseif ($argument instanceof AbstractArgument) {
-                    $argumentsInformation[] = sprintf('Abstract argument (%s)', $argument->getText());
+                    $argumentsInformation[] = \sprintf('Abstract argument (%s)', $argument->getText());
                 } else {
-                    $argumentsInformation[] = \is_array($argument) ? sprintf('Array (%d element(s))', \count($argument)) : $argument;
+                    $argumentsInformation[] = \is_array($argument) ? \sprintf('Array (%d element(s))', \count($argument)) : $argument;
                 }
             }
 
@@ -396,7 +396,7 @@ class TextDescriptor extends Descriptor
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             $options['output']->warning('The deprecation file does not exist, please try warming the cache first.');
 
@@ -413,19 +413,19 @@ class TextDescriptor extends Descriptor
         $formattedLogs = [];
         $remainingCount = 0;
         foreach ($logs as $log) {
-            $formattedLogs[] = sprintf("%sx: %s\n      in %s:%s", $log['count'], $log['message'], $log['file'], $log['line']);
+            $formattedLogs[] = \sprintf("%sx: %s\n      in %s:%s", $log['count'], $log['message'], $log['file'], $log['line']);
             $remainingCount += $log['count'];
         }
-        $options['output']->title(sprintf('Remaining deprecations (%s)', $remainingCount));
+        $options['output']->title(\sprintf('Remaining deprecations (%s)', $remainingCount));
         $options['output']->listing($formattedLogs);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         if ($alias->isPublic() && !$alias->isPrivate()) {
-            $options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
+            $options['output']->comment(\sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
         } else {
-            $options['output']->comment(sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));
+            $options['output']->comment(\sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));
         }
 
         if (!$container) {
@@ -444,7 +444,7 @@ class TextDescriptor extends Descriptor
 
         if ($deprecation) {
             $rows[] = [new TableCell(
-                sprintf('<comment>(Since %s %s: %s)</comment>', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))),
+                \sprintf('<comment>(Since %s %s: %s)</comment>', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))),
                 ['colspan' => 2]
             )];
         }
@@ -522,11 +522,11 @@ class TextDescriptor extends Descriptor
         $title = 'Registered Listeners';
 
         if (null !== $dispatcherServiceName) {
-            $title .= sprintf(' of Event Dispatcher "%s"', $dispatcherServiceName);
+            $title .= \sprintf(' of Event Dispatcher "%s"', $dispatcherServiceName);
         }
 
         if (null !== $event) {
-            $title .= sprintf(' for "%s" Event', $event);
+            $title .= \sprintf(' for "%s" Event', $event);
             $registeredListeners = $eventDispatcher->getListeners($event);
         } else {
             $title .= ' Grouped by Event';
@@ -540,7 +540,7 @@ class TextDescriptor extends Descriptor
         } else {
             ksort($registeredListeners);
             foreach ($registeredListeners as $eventListened => $eventListeners) {
-                $options['output']->section(sprintf('"%s" event', $eventListened));
+                $options['output']->section(\sprintf('"%s" event', $eventListened));
                 $this->renderEventListenerTable($eventDispatcher, $eventListened, $eventListeners, $options['output']);
             }
         }
@@ -557,7 +557,7 @@ class TextDescriptor extends Descriptor
         $tableRows = [];
 
         foreach ($eventListeners as $order => $listener) {
-            $tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
+            $tableRows[] = [\sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
         }
 
         $io->table($tableHeaders, $tableRows);
@@ -573,13 +573,13 @@ class TextDescriptor extends Descriptor
 
         $configAsString = '';
         foreach ($config as $key => $value) {
-            $configAsString .= sprintf("\n%s: %s", $key, $this->formatValue($value));
+            $configAsString .= \sprintf("\n%s: %s", $key, $this->formatValue($value));
         }
 
         return trim($configAsString);
     }
 
-    private function formatControllerLink(mixed $controller, string $anchorText, callable $getContainer = null): string
+    private function formatControllerLink(mixed $controller, string $anchorText, ?callable $getContainer = null): string
     {
         if (null === $this->fileLinkFormatter) {
             return $anchorText;
@@ -597,7 +597,7 @@ class TextDescriptor extends Descriptor
             } elseif (!\is_string($controller)) {
                 return $anchorText;
             } elseif (str_contains($controller, '::')) {
-                $r = new \ReflectionMethod($controller);
+                $r = new \ReflectionMethod(...explode('::', $controller, 2));
             } else {
                 $r = new \ReflectionFunction($controller);
             }
@@ -627,7 +627,7 @@ class TextDescriptor extends Descriptor
 
         $fileLink = $this->fileLinkFormatter->format($r->getFileName(), $r->getStartLine());
         if ($fileLink) {
-            return sprintf('<href=%s>%s</>', $fileLink, $anchorText);
+            return \sprintf('<href=%s>%s</>', $fileLink, $anchorText);
         }
 
         return $anchorText;
@@ -637,30 +637,30 @@ class TextDescriptor extends Descriptor
     {
         if (\is_array($callable)) {
             if (\is_object($callable[0])) {
-                return sprintf('%s::%s()', $callable[0]::class, $callable[1]);
+                return \sprintf('%s::%s()', $callable[0]::class, $callable[1]);
             }
 
-            return sprintf('%s::%s()', $callable[0], $callable[1]);
+            return \sprintf('%s::%s()', $callable[0], $callable[1]);
         }
 
         if (\is_string($callable)) {
-            return sprintf('%s()', $callable);
+            return \sprintf('%s()', $callable);
         }
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return 'Closure()';
             }
             if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
-                return sprintf('%s::%s()', $class->name, $r->name);
+                return \sprintf('%s::%s()', $class->name, $r->name);
             }
 
             return $r->name.'()';
         }
 
         if (method_exists($callable, '__invoke')) {
-            return sprintf('%s::__invoke()', $callable::class);
+            return \sprintf('%s::__invoke()', $callable::class);
         }
 
         throw new \InvalidArgumentException('Callable is not describable.');
diff --git a/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php b/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
index f12e4583b..fb4ab11a6 100644
--- a/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
+++ b/lib/symfony/framework-bundle/Console/Descriptor/XmlDescriptor.php
@@ -53,7 +53,7 @@ class XmlDescriptor extends Descriptor
         $this->writeDocument($this->getContainerTagsDocument($container, isset($options['show_hidden']) && $options['show_hidden']));
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -67,12 +67,12 @@ class XmlDescriptor extends Descriptor
         $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null, $options['id'] ?? null));
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
     {
         $this->writeDocument($this->getContainerDefinitionDocument($definition, $options['id'] ?? null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'], $container));
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
+    protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, $options['id'] ?? null)->childNodes->item(0), true));
@@ -110,7 +110,7 @@ class XmlDescriptor extends Descriptor
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -162,7 +162,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    private function getRouteDocument(Route $route, string $name = null): \DOMDocument
+    private function getRouteDocument(Route $route, ?string $name = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($routeXML = $dom->createElement('route'));
@@ -243,7 +243,7 @@ class XmlDescriptor extends Descriptor
             $parameterXML->appendChild(new \DOMText($this->formatParameter($value)));
 
             if (isset($deprecatedParameters[$key])) {
-                $parameterXML->setAttribute('deprecated', sprintf('Since %s %s: %s', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], sprintf(...\array_slice($deprecatedParameters[$key], 2))));
+                $parameterXML->setAttribute('deprecated', \sprintf('Since %s %s: %s', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], \sprintf(...\array_slice($deprecatedParameters[$key], 2))));
             }
         }
 
@@ -268,7 +268,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    private function getContainerServiceDocument(object $service, string $id, ContainerBuilder $container = null, bool $showArguments = false): \DOMDocument
+    private function getContainerServiceDocument(object $service, string $id, ?ContainerBuilder $container = null, bool $showArguments = false): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
@@ -288,7 +288,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    private function getContainerServicesDocument(ContainerBuilder $container, string $tag = null, bool $showHidden = false, bool $showArguments = false, callable $filter = null, string $id = null): \DOMDocument
+    private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null, ?string $id = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($containerXML = $dom->createElement('container'));
@@ -318,7 +318,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    private function getContainerDefinitionDocument(Definition $definition, string $id = null, bool $omitTags = false, bool $showArguments = false, ContainerBuilder $container = null): \DOMDocument
+    private function getContainerDefinitionDocument(Definition $definition, ?string $id = null, bool $omitTags = false, bool $showArguments = false, ?ContainerBuilder $container = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($serviceXML = $dom->createElement('definition'));
@@ -341,7 +341,7 @@ class XmlDescriptor extends Descriptor
                 if ($factory[0] instanceof Reference) {
                     $factoryXML->setAttribute('service', (string) $factory[0]);
                 } elseif ($factory[0] instanceof Definition) {
-                    $factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
+                    $factoryXML->setAttribute('service', \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
                 } else {
                     $factoryXML->setAttribute('class', $factory[0]);
                 }
@@ -418,7 +418,7 @@ class XmlDescriptor extends Descriptor
     /**
      * @return \DOMNode[]
      */
-    private function getArgumentNodes(array $arguments, \DOMDocument $dom, ContainerBuilder $container = null): array
+    private function getArgumentNodes(array $arguments, \DOMDocument $dom, ?ContainerBuilder $container = null): array
     {
         $nodes = [];
 
@@ -466,7 +466,7 @@ class XmlDescriptor extends Descriptor
         return $nodes;
     }
 
-    private function getContainerAliasDocument(Alias $alias, string $id = null): \DOMDocument
+    private function getContainerAliasDocument(Alias $alias, ?string $id = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($aliasXML = $dom->createElement('alias'));
@@ -490,7 +490,7 @@ class XmlDescriptor extends Descriptor
             $parameterXML->setAttribute('key', $options['parameter']);
 
             if ($deprecation) {
-                $parameterXML->setAttribute('deprecated', sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))));
+                $parameterXML->setAttribute('deprecated', \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))));
             }
         }
 
@@ -581,7 +581,7 @@ class XmlDescriptor extends Descriptor
             $callableXML->setAttribute('type', 'closure');
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $dom;
             }
             $callableXML->setAttribute('name', $r->name);
diff --git a/lib/symfony/framework-bundle/Console/Helper/DescriptorHelper.php b/lib/symfony/framework-bundle/Console/Helper/DescriptorHelper.php
index 47d69fef4..b12a8d862 100644
--- a/lib/symfony/framework-bundle/Console/Helper/DescriptorHelper.php
+++ b/lib/symfony/framework-bundle/Console/Helper/DescriptorHelper.php
@@ -25,7 +25,7 @@ use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
  */
 class DescriptorHelper extends BaseDescriptorHelper
 {
-    public function __construct(FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(?FileLinkFormatter $fileLinkFormatter = null)
     {
         $this
             ->register('txt', new TextDescriptor($fileLinkFormatter))
diff --git a/lib/symfony/framework-bundle/Controller/AbstractController.php b/lib/symfony/framework-bundle/Controller/AbstractController.php
index 4ede883f7..b47449816 100644
--- a/lib/symfony/framework-bundle/Controller/AbstractController.php
+++ b/lib/symfony/framework-bundle/Controller/AbstractController.php
@@ -75,7 +75,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
     protected function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
     {
         if (!$this->container->has('parameter_bag')) {
-            throw new ServiceNotFoundException('parameter_bag.', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
+            throw new ServiceNotFoundException('parameter_bag.', null, null, [], \sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
         }
 
         return $this->container->get('parameter_bag')->get($name);
@@ -157,13 +157,17 @@ abstract class AbstractController implements ServiceSubscriberInterface
             return new JsonResponse($json, $status, $headers, true);
         }
 
+        if (null === $data) {
+            return new JsonResponse('null', $status, $headers, true);
+        }
+
         return new JsonResponse($data, $status, $headers);
     }
 
     /**
      * Returns a BinaryFileResponse object with original or customized file name and disposition header.
      */
-    protected function file(\SplFileInfo|string $file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
+    protected function file(\SplFileInfo|string $file, ?string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
     {
         $response = new BinaryFileResponse($file);
         $response->setContentDisposition($disposition, $fileName ?? $response->getFile()->getFilename());
@@ -248,7 +252,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      * If an invalid form is found in the list of parameters, a 422 status code is returned.
      * Forms found in parameters are auto-cast to form views.
      */
-    protected function render(string $view, array $parameters = [], Response $response = null): Response
+    protected function render(string $view, array $parameters = [], ?Response $response = null): Response
     {
         return $this->doRender($view, null, $parameters, $response, __FUNCTION__);
     }
@@ -259,7 +263,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      * If an invalid form is found in the list of parameters, a 422 status code is returned.
      * Forms found in parameters are auto-cast to form views.
      */
-    protected function renderBlock(string $view, string $block, array $parameters = [], Response $response = null): Response
+    protected function renderBlock(string $view, string $block, array $parameters = [], ?Response $response = null): Response
     {
         return $this->doRender($view, $block, $parameters, $response, __FUNCTION__);
     }
@@ -271,7 +275,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      *
      * @deprecated since Symfony 6.2, use render() instead
      */
-    protected function renderForm(string $view, array $parameters = [], Response $response = null): Response
+    protected function renderForm(string $view, array $parameters = [], ?Response $response = null): Response
     {
         trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s::renderForm()" method is deprecated, use "render()" instead.', get_debug_type($this));
 
@@ -281,7 +285,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
     /**
      * Streams a view.
      */
-    protected function stream(string $view, array $parameters = [], StreamedResponse $response = null): StreamedResponse
+    protected function stream(string $view, array $parameters = [], ?StreamedResponse $response = null): StreamedResponse
     {
         if (!$this->container->has('twig')) {
             throw new \LogicException('You cannot use the "stream" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
@@ -309,7 +313,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      *
      *     throw $this->createNotFoundException('Page not found!');
      */
-    protected function createNotFoundException(string $message = 'Not Found', \Throwable $previous = null): NotFoundHttpException
+    protected function createNotFoundException(string $message = 'Not Found', ?\Throwable $previous = null): NotFoundHttpException
     {
         return new NotFoundHttpException($message, $previous);
     }
@@ -323,7 +327,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      *
      * @throws \LogicException If the Security component is not available
      */
-    protected function createAccessDeniedException(string $message = 'Access Denied.', \Throwable $previous = null): AccessDeniedException
+    protected function createAccessDeniedException(string $message = 'Access Denied.', ?\Throwable $previous = null): AccessDeniedException
     {
         if (!class_exists(AccessDeniedException::class)) {
             throw new \LogicException('You cannot use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require symfony/security-bundle".');
@@ -406,7 +410,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
     /**
      * @param LinkInterface[] $links
      */
-    protected function sendEarlyHints(iterable $links = [], Response $response = null): Response
+    protected function sendEarlyHints(iterable $links = [], ?Response $response = null): Response
     {
         if (!$this->container->has('web_link.http_header_serializer')) {
             throw new \LogicException('You cannot use the "sendEarlyHints" method if the WebLink component is not available. Try running "composer require symfony/web-link".');
@@ -432,7 +436,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
     private function doRenderView(string $view, ?string $block, array $parameters, string $method): string
     {
         if (!$this->container->has('twig')) {
-            throw new \LogicException(sprintf('You cannot use the "%s" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".', $method));
+            throw new \LogicException(\sprintf('You cannot use the "%s" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".', $method));
         }
 
         foreach ($parameters as $k => $v) {
diff --git a/lib/symfony/framework-bundle/Controller/ControllerResolver.php b/lib/symfony/framework-bundle/Controller/ControllerResolver.php
index 3449740bf..8d7613d41 100644
--- a/lib/symfony/framework-bundle/Controller/ControllerResolver.php
+++ b/lib/symfony/framework-bundle/Controller/ControllerResolver.php
@@ -31,7 +31,7 @@ class ControllerResolver extends ContainerControllerResolver
         }
         if ($controller instanceof AbstractController) {
             if (null === $previousContainer = $controller->setContainer($this->container)) {
-                throw new \LogicException(sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));
+                throw new \LogicException(\sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));
             } else {
                 $controller->setContainer($previousContainer);
             }
diff --git a/lib/symfony/framework-bundle/Controller/RedirectController.php b/lib/symfony/framework-bundle/Controller/RedirectController.php
index f5f42a7f7..91d1e67dd 100644
--- a/lib/symfony/framework-bundle/Controller/RedirectController.php
+++ b/lib/symfony/framework-bundle/Controller/RedirectController.php
@@ -31,7 +31,7 @@ class RedirectController
     private ?int $httpPort;
     private ?int $httpsPort;
 
-    public function __construct(UrlGeneratorInterface $router = null, int $httpPort = null, int $httpsPort = null)
+    public function __construct(?UrlGeneratorInterface $router = null, ?int $httpPort = null, ?int $httpsPort = null)
     {
         $this->router = $router;
         $this->httpPort = $httpPort;
@@ -107,9 +107,9 @@ class RedirectController
      *
      * @throws HttpException In case the path is empty
      */
-    public function urlRedirectAction(Request $request, string $path, bool $permanent = false, string $scheme = null, int $httpPort = null, int $httpsPort = null, bool $keepRequestMethod = false): Response
+    public function urlRedirectAction(Request $request, string $path, bool $permanent = false, ?string $scheme = null, ?int $httpPort = null, ?int $httpsPort = null, bool $keepRequestMethod = false): Response
     {
-        if ('' == $path) {
+        if ('' === $path) {
             throw new HttpException($permanent ? 410 : 404);
         }
 
@@ -119,13 +119,17 @@ class RedirectController
             $statusCode = $permanent ? 301 : 302;
         }
 
+        $scheme ??= $request->getScheme();
+
+        if (str_starts_with($path, '//')) {
+            $path = $scheme.':'.$path;
+        }
+
         // redirect if the path is a full URL
         if (parse_url($path, \PHP_URL_SCHEME)) {
             return new RedirectResponse($path, $statusCode);
         }
 
-        $scheme ??= $request->getScheme();
-
         if ($qs = $request->server->get('QUERY_STRING') ?: $request->getQueryString()) {
             if (!str_contains($path, '?')) {
                 $qs = '?'.$qs;
@@ -172,7 +176,7 @@ class RedirectController
 
         if (\array_key_exists('route', $p)) {
             if (\array_key_exists('path', $p)) {
-                throw new \RuntimeException(sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));
+                throw new \RuntimeException(\sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));
             }
 
             return $this->redirectAction($request, $p['route'], $p['permanent'] ?? false, $p['ignoreAttributes'] ?? false, $p['keepRequestMethod'] ?? false, $p['keepQueryParams'] ?? false);
@@ -182,6 +186,6 @@ class RedirectController
             return $this->urlRedirectAction($request, $p['path'], $p['permanent'] ?? false, $p['scheme'] ?? null, $p['httpPort'] ?? null, $p['httpsPort'] ?? null, $p['keepRequestMethod'] ?? false);
         }
 
-        throw new \RuntimeException(sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));
+        throw new \RuntimeException(\sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));
     }
 }
diff --git a/lib/symfony/framework-bundle/Controller/TemplateController.php b/lib/symfony/framework-bundle/Controller/TemplateController.php
index 437458a49..97631572c 100644
--- a/lib/symfony/framework-bundle/Controller/TemplateController.php
+++ b/lib/symfony/framework-bundle/Controller/TemplateController.php
@@ -25,7 +25,7 @@ class TemplateController
 {
     private ?Environment $twig;
 
-    public function __construct(Environment $twig = null)
+    public function __construct(?Environment $twig = null)
     {
         $this->twig = $twig;
     }
@@ -40,7 +40,7 @@ class TemplateController
      * @param array     $context    The context (arguments) of the template
      * @param int       $statusCode The HTTP status code to return with the response (200 "OK" by default)
      */
-    public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = [], int $statusCode = 200): Response
+    public function templateAction(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response
     {
         if (null === $this->twig) {
             throw new \LogicException('You cannot use the TemplateController if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
@@ -68,7 +68,7 @@ class TemplateController
     /**
      * @param int $statusCode The HTTP status code (200 "OK" by default)
      */
-    public function __invoke(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = [], int $statusCode = 200): Response
+    public function __invoke(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response
     {
         return $this->templateAction($template, $maxAge, $sharedAge, $private, $context, $statusCode);
     }
diff --git a/lib/symfony/framework-bundle/DataCollector/RouterDataCollector.php b/lib/symfony/framework-bundle/DataCollector/RouterDataCollector.php
index 700d0f22d..e383d48ae 100644
--- a/lib/symfony/framework-bundle/DataCollector/RouterDataCollector.php
+++ b/lib/symfony/framework-bundle/DataCollector/RouterDataCollector.php
@@ -28,7 +28,7 @@ class RouterDataCollector extends BaseRouterDataCollector
             $controller = $controller[0];
         }
 
-        if ($controller instanceof RedirectController) {
+        if ($controller instanceof RedirectController && $request->attributes->has('_route')) {
             return $request->attributes->get('_route');
         }
 
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/lib/symfony/framework-bundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
index 5b31f2884..b76b1f3ca 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -41,7 +41,7 @@ class LoggingTranslatorPass implements CompilerPassInterface
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
             if (!$r = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $translatorAlias));
+                throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $translatorAlias));
             }
             if ($r->isSubclassOf(TranslatorInterface::class) && $r->isSubclassOf(TranslatorBagInterface::class)) {
                 $container->getDefinition('translator.logging')->setDecoratedService('translator');
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Compiler/ProfilerPass.php b/lib/symfony/framework-bundle/DependencyInjection/Compiler/ProfilerPass.php
index 8f3f9b220..f904e8b19 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Compiler/ProfilerPass.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Compiler/ProfilerPass.php
@@ -45,7 +45,7 @@ class ProfilerPass implements CompilerPassInterface
             if (isset($attributes[0]['template']) || is_subclass_of($collectorClass, TemplateAwareDataCollectorInterface::class)) {
                 $idForTemplate = $attributes[0]['id'] ?? $collectorClass;
                 if (!$idForTemplate) {
-                    throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id));
+                    throw new InvalidArgumentException(\sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id));
                 }
                 $template = [$idForTemplate, $attributes[0]['template'] ?? $collectorClass::getTemplate()];
             }
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/lib/symfony/framework-bundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
index 6e7669a71..428137ff8 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -34,7 +34,10 @@ class TestServiceContainerWeakRefPass implements CompilerPassInterface
         $definitions = $container->getDefinitions();
 
         foreach ($definitions as $id => $definition) {
-            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
+            if ($inner = $definition->getTag('container.decorator')[0]['inner'] ?? null) {
+                $privateServices[$inner] = new Reference($inner, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
+            }
+            if ($id && '.' !== $id[0] && ($definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
                 $privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
         }
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Compiler/UnusedTagsPass.php b/lib/symfony/framework-bundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 5f975f868..1d151fb61 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -132,9 +132,9 @@ class UnusedTagsPass implements CompilerPassInterface
             }
 
             $services = array_keys($container->findTaggedServiceIds($tag));
-            $message = sprintf('Tag "%s" was defined on service(s) "%s", but was never used.', $tag, implode('", "', $services));
+            $message = \sprintf('Tag "%s" was defined on service(s) "%s", but was never used.', $tag, implode('", "', $services));
             if ($candidates) {
-                $message .= sprintf(' Did you mean "%s"?', implode('", "', $candidates));
+                $message .= \sprintf(' Did you mean "%s"?', implode('", "', $candidates));
             }
 
             $container->log($this, $message);
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/lib/symfony/framework-bundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
index c07208311..6f40cc6a6 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
@@ -45,7 +45,7 @@ class WorkflowGuardListenerPass implements CompilerPassInterface
 
         foreach ($servicesNeeded as $service) {
             if (!$container->has($service)) {
-                throw new LogicException(sprintf('The "%s" service is needed to be able to use the workflow guard listener.', $service));
+                throw new LogicException(\sprintf('The "%s" service is needed to be able to use the workflow guard listener.', $service));
             }
         }
     }
diff --git a/lib/symfony/framework-bundle/DependencyInjection/Configuration.php b/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
index 46177a09e..7fe754e3d 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/Configuration.php
@@ -146,7 +146,7 @@ class Configuration implements ConfigurationInterface
             ->end()
         ;
 
-        $willBeAvailable = static function (string $package, string $class, string $parentPackage = null) {
+        $willBeAvailable = static function (string $package, string $class, ?string $parentPackage = null) {
             $parentPackages = (array) $parentPackage;
             $parentPackages[] = 'symfony/framework-bundle';
 
@@ -358,7 +358,7 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('workflows')
                     ->canBeEnabled()
                     ->beforeNormalization()
-                        ->always(function ($v) {
+                        ->always(static function ($v) {
                             if (\is_array($v) && true === $v['enabled']) {
                                 $workflows = $v;
                                 unset($workflows['enabled']);
@@ -367,13 +367,13 @@ class Configuration implements ConfigurationInterface
                                     $workflows = [];
                                 }
 
-                                if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions'])) {
+                                if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && array_diff_key($workflows['workflows'], ['audit_trail' => 1, 'type' => 1, 'marking_store' => 1, 'supports' => 1, 'support_strategy' => 1, 'initial_marking' => 1, 'places' => 1, 'transitions' => 1])) {
                                     $workflows = $workflows['workflows'];
                                 }
 
                                 foreach ($workflows as $key => $workflow) {
                                     if (isset($workflow['enabled']) && false === $workflow['enabled']) {
-                                        throw new LogicException(sprintf('Cannot disable a single workflow. Remove the configuration for the workflow "%s" instead.', $key));
+                                        throw new LogicException(\sprintf('Cannot disable a single workflow. Remove the configuration for the workflow "%s" instead.', $key));
                                     }
 
                                     unset($workflows[$key]['enabled']);
@@ -473,27 +473,16 @@ class Configuration implements ConfigurationInterface
                                                     throw new InvalidConfigurationException('The "places" option must be an array in workflow configuration.');
                                                 }
 
-                                                // It's an indexed array of shape  ['place1', 'place2']
-                                                if (isset($places[0]) && \is_string($places[0])) {
-                                                    return array_map(function (string $place) {
-                                                        return ['name' => $place];
-                                                    }, $places);
-                                                }
-
-                                                // It's an indexed array, we let the validation occur
-                                                if (isset($places[0]) && \is_array($places[0])) {
-                                                    return $places;
-                                                }
-
-                                                foreach ($places as $name => $place) {
-                                                    if (\is_array($place) && \array_key_exists('name', $place)) {
-                                                        continue;
+                                                $normalizedPlaces = [];
+                                                foreach ($places as $key => $value) {
+                                                    if (!\is_array($value)) {
+                                                        $value = ['name' => $value];
                                                     }
-                                                    $place['name'] = $name;
-                                                    $places[$name] = $place;
+                                                    $value['name'] ??= $key;
+                                                    $normalizedPlaces[] = $value;
                                                 }
 
-                                                return array_values($places);
+                                                return $normalizedPlaces;
                                             })
                                         ->end()
                                         ->isRequired()
@@ -516,26 +505,26 @@ class Configuration implements ConfigurationInterface
                                     ->end()
                                     ->arrayNode('transitions')
                                         ->beforeNormalization()
-                                            ->always()
-                                            ->then(function ($transitions) {
+                                            ->always(static function ($transitions) {
                                                 if (!\is_array($transitions)) {
                                                     throw new InvalidConfigurationException('The "transitions" option must be an array in workflow configuration.');
                                                 }
 
-                                                // It's an indexed array, we let the validation occur
-                                                if (isset($transitions[0]) && \is_array($transitions[0])) {
-                                                    return $transitions;
-                                                }
-
-                                                foreach ($transitions as $name => $transition) {
-                                                    if (\is_array($transition) && \array_key_exists('name', $transition)) {
-                                                        continue;
+                                                $normalizedTransitions = [];
+                                                foreach ($transitions as $key => $transition) {
+                                                    if (\is_array($transition)) {
+                                                        if (\is_string($key = $transition['key'] ?? $key)) {
+                                                            $transition['name'] ??= $key;
+                                                        }
+                                                        if (!($transition['name'] ?? false)) {
+                                                            throw new InvalidConfigurationException('The "name" option is required for each transition in workflow configuration.');
+                                                        }
+                                                        unset($transition['key']);
                                                     }
-                                                    $transition['name'] = $name;
-                                                    $transitions[$name] = $transition;
+                                                    $normalizedTransitions[$key] = $transition;
                                                 }
 
-                                                return $transitions;
+                                                return $normalizedTransitions;
                                             })
                                         ->end()
                                         ->isRequired()
@@ -552,6 +541,7 @@ class Configuration implements ConfigurationInterface
                                                     ->example('is_fully_authenticated() and is_granted(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'')
                                                 ->end()
                                                 ->arrayNode('from')
+                                                    ->performNoDeepMerging()
                                                     ->beforeNormalization()
                                                         ->ifString()
                                                         ->then(fn ($v) => [$v])
@@ -562,6 +552,7 @@ class Configuration implements ConfigurationInterface
                                                     ->end()
                                                 ->end()
                                                 ->arrayNode('to')
+                                                    ->performNoDeepMerging()
                                                     ->beforeNormalization()
                                                         ->ifString()
                                                         ->then(fn ($v) => [$v])
@@ -930,6 +921,10 @@ class Configuration implements ConfigurationInterface
                         ->end()
                         ->scalarNode('importmap_polyfill')
                             ->info('The importmap name that will be used to load the polyfill. Set to false to disable.')
+                            ->validate()
+                                ->ifTrue()
+                                ->thenInvalid('Invalid "importmap_polyfill" value. Must be either an importmap name or false.')
+                            ->end()
                             ->defaultValue('es-module-shims')
                         ->end()
                         ->arrayNode('importmap_script_attributes')
@@ -1062,7 +1057,7 @@ class Configuration implements ConfigurationInterface
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values(['html5', 'loose', 'strict'])->end()
+                        ->enumNode('email_validation_mode')->values(['html5', 'html5-allow-no-tld', 'strict', 'loose'])->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
@@ -1192,8 +1187,7 @@ class Configuration implements ConfigurationInterface
                         ->end()
                         ->arrayNode('default_context')
                             ->normalizeKeys(false)
-                            ->useAttributeAsKey('name')
-                            ->beforeNormalization()
+                            ->validate()
                                 ->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
                                 ->then(fn (array $v) => $v + [JsonDecode::DETAILED_ERROR_MESSAGES => true])
                             ->end()
@@ -1422,7 +1416,7 @@ class Configuration implements ConfigurationInterface
                                 ->info('The level of log message. Null to let Symfony decide.')
                                 ->validate()
                                     ->ifTrue(fn ($v) => null !== $v && !\in_array($v, $logLevels, true))
-                                    ->thenInvalid(sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
+                                    ->thenInvalid(\sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
                                 ->end()
                                 ->defaultNull()
                             ->end()
@@ -1590,7 +1584,7 @@ class Configuration implements ConfigurationInterface
                     ->end()
                     ->validate()
                         ->ifTrue(fn ($v) => isset($v['buses']) && null !== $v['default_bus'] && !isset($v['buses'][$v['default_bus']]))
-                        ->then(fn ($v) => throw new InvalidConfigurationException(sprintf('The specified default bus "%s" is not configured. Available buses are "%s".', $v['default_bus'], implode('", "', array_keys($v['buses'])))))
+                        ->then(fn ($v) => throw new InvalidConfigurationException(\sprintf('The specified default bus "%s" is not configured. Available buses are "%s".', $v['default_bus'], implode('", "', array_keys($v['buses'])))))
                     ->end()
                     ->children()
                         ->arrayNode('routing')
@@ -1863,6 +1857,7 @@ class Configuration implements ConfigurationInterface
                                 ->end()
                                 ->arrayNode('vars')
                                     ->info('Associative array: the default vars used to expand the templated URI.')
+                                    ->useAttributeAsKey('name')
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
@@ -1943,6 +1938,7 @@ class Configuration implements ConfigurationInterface
                                 ->end()
                                 ->arrayNode('extra')
                                     ->info('Extra options for specific HTTP client')
+                                    ->useAttributeAsKey('name')
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
@@ -2089,8 +2085,12 @@ class Configuration implements ConfigurationInterface
                                             ->variableNode('md5')->end()
                                         ->end()
                                     ->end()
+                                    ->scalarNode('crypto_method')
+                                        ->info('The minimum version of TLS to accept; must be one of STREAM_CRYPTO_METHOD_TLSv*_CLIENT constants.')
+                                    ->end()
                                     ->arrayNode('extra')
                                         ->info('Extra options for specific HTTP client')
+                                        ->useAttributeAsKey('name')
                                         ->normalizeKeys(false)
                                         ->variablePrototype()->end()
                                     ->end()
@@ -2195,6 +2195,7 @@ class Configuration implements ConfigurationInterface
                         ->end()
                         ->arrayNode('envelope')
                             ->info('Mailer Envelope configuration')
+                            ->fixXmlConfig('recipient')
                             ->children()
                                 ->scalarNode('sender')->end()
                                 ->arrayNode('recipients')
diff --git a/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php b/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
index 32026a84d..a8ef96b65 100644
--- a/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
+++ b/lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
@@ -122,6 +122,8 @@ use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Notifier\Bridge as NotifierBridge;
+use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
+use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory;
 use Symfony\Component\Notifier\ChatterInterface;
 use Symfony\Component\Notifier\Notifier;
 use Symfony\Component\Notifier\Recipient\Recipient;
@@ -161,6 +163,7 @@ use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
@@ -349,7 +352,7 @@ class FrameworkExtension extends Extension
                 throw new LogicException('AssetMapper support cannot be enabled as the AssetMapper component is not installed. Try running "composer require symfony/asset-mapper".');
             }
 
-            $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));
+            $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']), $this->readConfigEnabled('http_client', $container, $config['http_client']));
         } else {
             $container->removeDefinition('cache.asset_mapper');
         }
@@ -677,7 +680,7 @@ class FrameworkExtension extends Extension
             $tagAttributes = get_object_vars($attribute);
             if ($reflector instanceof \ReflectionMethod) {
                 if (isset($tagAttributes['method'])) {
-                    throw new LogicException(sprintf('AsEventListener attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+                    throw new LogicException(\sprintf('AsEventListener attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
                 }
                 $tagAttributes['method'] = $reflector->getName();
             }
@@ -695,7 +698,7 @@ class FrameworkExtension extends Extension
             unset($tagAttributes['fromTransport']);
             if ($reflector instanceof \ReflectionMethod) {
                 if (isset($tagAttributes['method'])) {
-                    throw new LogicException(sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+                    throw new LogicException(\sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
                 }
                 $tagAttributes['method'] = $reflector->getName();
             }
@@ -719,7 +722,7 @@ class FrameworkExtension extends Extension
                     ];
                     if ($reflector instanceof \ReflectionMethod) {
                         if (isset($tagAttributes['method'])) {
-                            throw new LogicException(sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
+                            throw new LogicException(\sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
                         }
                         $tagAttributes['method'] = $reflector->getName();
                     }
@@ -733,7 +736,7 @@ class FrameworkExtension extends Extension
             $container->getDefinition('config_cache_factory')->setArguments([]);
         }
 
-        if (!$config['disallow_search_engine_index'] ?? false) {
+        if (!$config['disallow_search_engine_index']) {
             $container->removeDefinition('disallow_search_engine_index_response_listener');
         }
 
@@ -906,7 +909,7 @@ class FrameworkExtension extends Extension
         // Choose storage class based on the DSN
         [$class] = explode(':', $config['dsn'], 2);
         if ('file' !== $class) {
-            throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
+            throw new \LogicException(\sprintf('Driver "%s" is not supported for the profiler.', $class));
         }
 
         $container->setParameter('profiler.storage.dsn', $config['dsn']);
@@ -918,11 +921,11 @@ class FrameworkExtension extends Extension
         $container->getDefinition('profiler_listener')
             ->addArgument($config['collect_parameter']);
 
-        if (!$container->getParameter('kernel.debug') || !class_exists(CliRequest::class) || !$container->has('debug.stopwatch')) {
+        if (!$container->getParameter('kernel.debug') || !$this->hasConsole() || !$container->has('debug.stopwatch') || !class_exists(CliRequest::class)) {
             $container->removeDefinition('console_profiler_listener');
         }
 
-        if (!class_exists(CommandDataCollector::class)) {
+        if (!$this->hasConsole() || !class_exists(CommandDataCollector::class)) {
             $container->removeDefinition('.data_collector.command');
         }
     }
@@ -945,7 +948,7 @@ class FrameworkExtension extends Extension
 
         foreach ($config['workflows'] as $name => $workflow) {
             $type = $workflow['type'];
-            $workflowId = sprintf('%s.%s', $type, $name);
+            $workflowId = \sprintf('%s.%s', $type, $name);
 
             // Process Metadata (workflow + places (transition is done in the "create transition" block))
             $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, [[], [], null]);
@@ -970,19 +973,19 @@ class FrameworkExtension extends Extension
             $transitionCounter = 0;
             foreach ($workflow['transitions'] as $transition) {
                 if ('workflow' === $type) {
-                    $transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $transition['from'], $transition['to']]);
-                    $transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
-                    $container->setDefinition($transitionId, $transitionDefinition);
+                    $transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
+                    $container->register($transitionId, Workflow\Transition::class)
+                        ->setArguments([$transition['name'], $transition['from'], $transition['to']]);
                     $transitions[] = new Reference($transitionId);
                     if (isset($transition['guard'])) {
-                        $configuration = new Definition(Workflow\EventListener\GuardExpression::class);
-                        $configuration->addArgument(new Reference($transitionId));
-                        $configuration->addArgument($transition['guard']);
-                        $eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
-                        $guardsConfiguration[$eventName][] = $configuration;
+                        $eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
+                        $guardsConfiguration[$eventName][] = new Definition(
+                            Workflow\EventListener\GuardExpression::class,
+                            [new Reference($transitionId), $transition['guard']]
+                        );
                     }
                     if ($transition['metadata']) {
-                        $transitionsMetadataDefinition->addMethodCall('attach', [
+                        $transitionsMetadataDefinition->addMethodCall('offsetSet', [
                             new Reference($transitionId),
                             $transition['metadata'],
                         ]);
@@ -990,19 +993,19 @@ class FrameworkExtension extends Extension
                 } elseif ('state_machine' === $type) {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
-                            $transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
-                            $transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
-                            $container->setDefinition($transitionId, $transitionDefinition);
+                            $transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
+                            $container->register($transitionId, Workflow\Transition::class)
+                                ->setArguments([$transition['name'], $from, $to]);
                             $transitions[] = new Reference($transitionId);
                             if (isset($transition['guard'])) {
-                                $configuration = new Definition(Workflow\EventListener\GuardExpression::class);
-                                $configuration->addArgument(new Reference($transitionId));
-                                $configuration->addArgument($transition['guard']);
-                                $eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
-                                $guardsConfiguration[$eventName][] = $configuration;
+                                $eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
+                                $guardsConfiguration[$eventName][] = new Definition(
+                                    Workflow\EventListener\GuardExpression::class,
+                                    [new Reference($transitionId), $transition['guard']]
+                                );
                             }
                             if ($transition['metadata']) {
-                                $transitionsMetadataDefinition->addMethodCall('attach', [
+                                $transitionsMetadataDefinition->addMethodCall('offsetSet', [
                                     new Reference($transitionId),
                                     $transition['metadata'],
                                 ]);
@@ -1012,7 +1015,7 @@ class FrameworkExtension extends Extension
                 }
             }
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
-            $container->setDefinition(sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
+            $container->setDefinition(\sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
 
             // Create places
             $places = array_column($workflow['places'], 'name');
@@ -1023,7 +1026,7 @@ class FrameworkExtension extends Extension
             $definitionDefinition->addArgument($places);
             $definitionDefinition->addArgument($transitions);
             $definitionDefinition->addArgument($initialMarking);
-            $definitionDefinition->addArgument(new Reference(sprintf('%s.metadata_store', $workflowId)));
+            $definitionDefinition->addArgument(new Reference(\sprintf('%s.metadata_store', $workflowId)));
 
             // Create MarkingStore
             $markingStoreDefinition = null;
@@ -1038,8 +1041,8 @@ class FrameworkExtension extends Extension
             }
 
             // Create Workflow
-            $workflowDefinition = new ChildDefinition(sprintf('%s.abstract', $type));
-            $workflowDefinition->replaceArgument(0, new Reference(sprintf('%s.definition', $workflowId)));
+            $workflowDefinition = new ChildDefinition(\sprintf('%s.abstract', $type));
+            $workflowDefinition->replaceArgument(0, new Reference(\sprintf('%s.definition', $workflowId)));
             $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             $workflowDefinition->replaceArgument(3, $name);
             $workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
@@ -1053,7 +1056,7 @@ class FrameworkExtension extends Extension
 
             // Store to container
             $container->setDefinition($workflowId, $workflowDefinition);
-            $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
+            $container->setDefinition(\sprintf('%s.definition', $workflowId), $definitionDefinition);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name.'.'.$type);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name);
 
@@ -1082,11 +1085,11 @@ class FrameworkExtension extends Extension
             if ($workflow['audit_trail']['enabled']) {
                 $listener = new Definition(Workflow\EventListener\AuditTrailListener::class);
                 $listener->addTag('monolog.logger', ['channel' => 'workflow']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.leave', $name), 'method' => 'onLeave']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.transition', $name), 'method' => 'onTransition']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.enter', $name), 'method' => 'onEnter']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.leave', $name), 'method' => 'onLeave']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.transition', $name), 'method' => 'onTransition']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.enter', $name), 'method' => 'onEnter']);
                 $listener->addArgument(new Reference('logger'));
-                $container->setDefinition(sprintf('.%s.listener.audit_trail', $workflowId), $listener);
+                $container->setDefinition(\sprintf('.%s.listener.audit_trail', $workflowId), $listener);
             }
 
             // Add Guard Listener
@@ -1114,7 +1117,7 @@ class FrameworkExtension extends Extension
                     $guard->addTag('kernel.event_listener', ['event' => $eventName, 'method' => 'onTransition']);
                 }
 
-                $container->setDefinition(sprintf('.%s.listener.guard', $workflowId), $guard);
+                $container->setDefinition(\sprintf('.%s.listener.guard', $workflowId), $guard);
                 $container->setParameter('workflow.has_guard_listeners', true);
             }
         }
@@ -1134,7 +1137,7 @@ class FrameworkExtension extends Extension
                 $tagAttributes = get_object_vars($attribute);
                 if ($reflector instanceof \ReflectionMethod) {
                     if (isset($tagAttributes['method'])) {
-                        throw new LogicException(sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
+                        throw new LogicException(\sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
                     }
                     $tagAttributes['method'] = $reflector->getName();
                 }
@@ -1330,7 +1333,7 @@ class FrameworkExtension extends Extension
         }
     }
 
-    private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled): void
+    private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled, bool $httpClientEnabled): void
     {
         $loader->load('asset_mapper.php');
 
@@ -1338,10 +1341,16 @@ class FrameworkExtension extends Extension
             $container->removeDefinition('asset_mapper.asset_package');
         }
 
+        if (!$httpClientEnabled) {
+            $container->register('asset_mapper.http_client', HttpClientInterface::class)
+                ->addTag('container.error')
+                ->addError('You cannot use the AssetMapper integration since the HttpClient component is not enabled. Try enabling the "framework.http_client" config option.');
+        }
+
         $paths = $config['paths'];
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
             if ($container->fileExists($dir = $bundle['path'].'/Resources/public') || $container->fileExists($dir = $bundle['path'].'/public')) {
-                $paths[$dir] = sprintf('bundles/%s', preg_replace('/bundle$/', '', strtolower($name)));
+                $paths[$dir] = \sprintf('bundles/%s', preg_replace('/bundle$/', '', strtolower($name)));
             }
         }
         $excludedPathPatterns = [];
@@ -1507,7 +1516,7 @@ class FrameworkExtension extends Extension
         $defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
             if ($container->fileExists($dir = $bundle['path'].'/Resources/translations') || $container->fileExists($dir = $bundle['path'].'/translations')) {
-                $dirs[] = $dir;
+                $dirs[] = $transPaths[] = $dir;
             } else {
                 $nonExistingDirs[] = $dir;
             }
@@ -1517,7 +1526,7 @@ class FrameworkExtension extends Extension
             if ($container->fileExists($dir)) {
                 $dirs[] = $transPaths[] = $dir;
             } else {
-                throw new \UnexpectedValueException(sprintf('"%s" defined in translator.paths does not exist or is not a directory.', $dir));
+                throw new \UnexpectedValueException(\sprintf('"%s" defined in translator.paths does not exist or is not a directory.', $dir));
             }
         }
 
@@ -1601,7 +1610,7 @@ class FrameworkExtension extends Extension
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('translation.provider_factory.'));
 
-            if (!$container->hasDefinition('http_client') || !ContainerBuilder::willBeAvailable(sprintf('symfony/%s-translation-provider', $package), $class, $parentPackages)) {
+            if (!$container->hasDefinition('http_client') || !ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-translation-provider', $package), $class, $parentPackages)) {
                 $container->removeDefinition($service);
             }
         }
@@ -1614,11 +1623,11 @@ class FrameworkExtension extends Extension
 
         foreach ($config['providers'] as $provider) {
             if ($provider['locales']) {
-                $locales += $provider['locales'];
+                $locales = array_merge($locales, $provider['locales']);
             }
         }
 
-        $locales = array_unique($locales);
+        $locales = array_values(array_unique($locales));
 
         $container->getDefinition('console.command.translation_pull')
             ->replaceArgument(4, array_merge($transPaths, [$config['default_path']]))
@@ -1762,11 +1771,11 @@ class FrameworkExtension extends Extension
                 $container->addResource(new DirectoryResource($path, '/^$/'));
             } elseif ($container->fileExists($path, false)) {
                 if (!preg_match('/\.(xml|ya?ml)$/', $path, $matches)) {
-                    throw new \RuntimeException(sprintf('Unsupported mapping type in "%s", supported types are XML & Yaml.', $path));
+                    throw new \RuntimeException(\sprintf('Unsupported mapping type in "%s", supported types are XML & Yaml.', $path));
                 }
                 $fileRecorder($matches[1], $path);
             } else {
-                throw new \RuntimeException(sprintf('Could not open file or directory "%s".', $path));
+                throw new \RuntimeException(\sprintf('Could not open file or directory "%s".', $path));
             }
         }
     }
@@ -1802,7 +1811,7 @@ class FrameworkExtension extends Extension
             $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
 
             if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-                throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));
+                throw new \RuntimeException(\sprintf('Could not create cache directory "%s".', $cacheDir));
             }
 
             $container
@@ -1874,7 +1883,7 @@ class FrameworkExtension extends Extension
 
         if ($config['decryption_env_var']) {
             if (!preg_match('/^(?:[-.\w\\\\]*+:)*+\w++$/', $config['decryption_env_var'])) {
-                throw new InvalidArgumentException(sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
+                throw new InvalidArgumentException(\sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
             }
 
             if (ContainerBuilder::willBeAvailable('symfony/string', LazyString::class, ['symfony/framework-bundle'])) {
@@ -1946,7 +1955,7 @@ class FrameworkExtension extends Extension
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
             $annotationLoader = new Definition(
                 AttributeLoader::class,
-                [new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]
+                interface_exists(CacheableSupportsMethodInterface::class) ? [new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)] : [],
             );
 
             $serializerLoaders[] = $annotationLoader;
@@ -1996,18 +2005,23 @@ class FrameworkExtension extends Extension
             $container->setParameter('serializer.default_context', $defaultContext);
         }
 
-        if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
+        if ($container->hasDefinition('serializer.normalizer.object')) {
             $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
-            $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
+            $context = $arguments[6] ?? $defaultContext;
+
+            if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
+                $context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
+                $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
+            }
+
+            if ($config['max_depth_handler'] ?? false) {
+                $context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+            }
+
             $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
         }
 
-        if ($config['max_depth_handler'] ?? false) {
-            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];
-            $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
-        }
+        $container->getDefinition('serializer.normalizer.property')->setArgument(5, $defaultContext);
     }
 
     private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
@@ -2201,16 +2215,18 @@ class FrameworkExtension extends Extension
                 $defaultMiddleware['after'][0]['arguments'] = [$bus['default_middleware']['allow_no_senders']];
                 $defaultMiddleware['after'][1]['arguments'] = [$bus['default_middleware']['allow_no_handlers']];
 
-                // argument to add_bus_name_stamp_middleware
-                $defaultMiddleware['before'][0]['arguments'] = [$busId];
-
                 $middleware = array_merge($defaultMiddleware['before'], $middleware, $defaultMiddleware['after']);
             }
 
-            foreach ($middleware as $middlewareItem) {
+            foreach ($middleware as $key => $middlewareItem) {
                 if (!$validationEnabled && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
                     throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
                 }
+
+                // argument to add_bus_name_stamp_middleware
+                if ('add_bus_name_stamp_middleware' === $middlewareItem['id']) {
+                    $middleware[$key]['arguments'] = [$busId];
+                }
             }
 
             if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class)) {
@@ -2245,7 +2261,7 @@ class FrameworkExtension extends Extension
         $failureTransports = [];
         if ($config['failure_transport']) {
             if (!isset($config['transports'][$config['failure_transport']])) {
-                throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
+                throw new LogicException(\sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
             }
 
             $container->setAlias('messenger.failure_transports.default', 'messenger.transport.'.$config['failure_transport']);
@@ -2267,14 +2283,17 @@ class FrameworkExtension extends Extension
         $transportRateLimiterReferences = [];
         foreach ($config['transports'] as $name => $transport) {
             $serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
+            $tags = [
+                'alias' => $name,
+                'is_failure_transport' => \in_array($name, $failureTransports),
+            ];
+            if (str_starts_with($transport['dsn'], 'sync://')) {
+                $tags['is_consumable'] = false;
+            }
             $transportDefinition = (new Definition(TransportInterface::class))
                 ->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
                 ->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
-                ->addTag('messenger.receiver', [
-                        'alias' => $name,
-                        'is_failure_transport' => \in_array($name, $failureTransports),
-                    ]
-                )
+                ->addTag('messenger.receiver', $tags)
             ;
             $container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
             $senderAliases[$name] = $transportId;
@@ -2282,7 +2301,7 @@ class FrameworkExtension extends Extension
             if (null !== $transport['retry_strategy']['service']) {
                 $transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
             } else {
-                $retryServiceId = sprintf('messenger.retry.multiplier_retry_strategy.%s', $name);
+                $retryServiceId = \sprintf('messenger.retry.multiplier_retry_strategy.%s', $name);
                 $retryDefinition = new ChildDefinition('messenger.retry.abstract_multiplier_retry_strategy');
                 $retryDefinition
                     ->replaceArgument(0, $transport['retry_strategy']['max_retries'])
@@ -2316,7 +2335,7 @@ class FrameworkExtension extends Extension
         foreach ($config['transports'] as $name => $transport) {
             if ($transport['failure_transport']) {
                 if (!isset($senderReferences[$transport['failure_transport']])) {
-                    throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $transport['failure_transport']));
+                    throw new LogicException(\sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $transport['failure_transport']));
                 }
             }
         }
@@ -2327,16 +2346,16 @@ class FrameworkExtension extends Extension
         foreach ($config['routing'] as $message => $messageConfiguration) {
             if ('*' !== $message && !class_exists($message) && !interface_exists($message, false) && !preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++\*$/', $message)) {
                 if (str_contains($message, '*')) {
-                    throw new LogicException(sprintf('Invalid Messenger routing configuration: invalid namespace "%s" wildcard.', $message));
+                    throw new LogicException(\sprintf('Invalid Messenger routing configuration: invalid namespace "%s" wildcard.', $message));
                 }
 
-                throw new LogicException(sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
+                throw new LogicException(\sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
             }
 
             // make sure senderAliases contains all senders
             foreach ($messageConfiguration['senders'] as $sender) {
                 if (!isset($senderReferences[$sender])) {
-                    throw new LogicException(sprintf('Invalid Messenger routing configuration: the "%s" class is being routed to a sender called "%s". This is not a valid transport or service id.', $message, $sender));
+                    throw new LogicException(\sprintf('Invalid Messenger routing configuration: the "%s" class is being routed to a sender called "%s". This is not a valid transport or service id.', $message, $sender));
                 }
             }
 
@@ -2537,7 +2556,7 @@ class FrameworkExtension extends Extension
 
         foreach ($config['scoped_clients'] as $name => $scopeConfig) {
             if ($container->has($name)) {
-                throw new InvalidArgumentException(sprintf('Invalid scope name: "%s" is reserved.', $name));
+                throw new InvalidArgumentException(\sprintf('Invalid scope name: "%s" is reserved.', $name));
             }
 
             $scope = $scopeConfig['scope'] ?? null;
@@ -2553,11 +2572,13 @@ class FrameworkExtension extends Extension
                     ->setFactory([ScopingHttpClient::class, 'forBaseUri'])
                     ->setArguments([new Reference('http_client.transport'), $baseUri, $scopeConfig])
                     ->addTag('http_client.client')
+                    ->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
                 ;
             } else {
                 $container->register($name, ScopingHttpClient::class)
                     ->setArguments([new Reference('http_client.transport'), [$scope => $scopeConfig], $scope])
                     ->addTag('http_client.client')
+                    ->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
                 ;
             }
 
@@ -2644,7 +2665,6 @@ class FrameworkExtension extends Extension
         }
         $transports = $config['dsn'] ? ['main' => $config['dsn']] : $config['transports'];
         $container->getDefinition('mailer.transports')->setArgument(0, $transports);
-        $container->getDefinition('mailer.default_transport')->setArgument(0, current($transports));
 
         $mailer = $container->getDefinition('mailer.mailer');
         if (false === $messageBus = $config['message_bus']) {
@@ -2673,7 +2693,7 @@ class FrameworkExtension extends Extension
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('mailer.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+            if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
                 $container->removeDefinition($service);
             }
         }
@@ -2690,7 +2710,7 @@ class FrameworkExtension extends Extension
             foreach ($webhookRequestParsers as $class => $service) {
                 $package = substr($service, \strlen('mailer.webhook.request_parser.'));
 
-                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+                if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
                     $container->removeDefinition($service);
                 }
             }
@@ -2753,7 +2773,7 @@ class FrameworkExtension extends Extension
             $container->removeDefinition('notifier.channel.email');
         }
 
-        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {
             if (!$container->hasDefinition($serviceId)) {
                 continue;
             }
@@ -2800,8 +2820,6 @@ class FrameworkExtension extends Extension
             NotifierBridge\Engagespot\EngagespotTransportFactory::class => 'notifier.transport_factory.engagespot',
             NotifierBridge\Esendex\EsendexTransportFactory::class => 'notifier.transport_factory.esendex',
             NotifierBridge\Expo\ExpoTransportFactory::class => 'notifier.transport_factory.expo',
-            NotifierBridge\FakeChat\FakeChatTransportFactory::class => 'notifier.transport_factory.fake-chat',
-            NotifierBridge\FakeSms\FakeSmsTransportFactory::class => 'notifier.transport_factory.fake-sms',
             NotifierBridge\Firebase\FirebaseTransportFactory::class => 'notifier.transport_factory.firebase',
             NotifierBridge\FortySixElks\FortySixElksTransportFactory::class => 'notifier.transport_factory.forty-six-elks',
             NotifierBridge\FreeMobile\FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
@@ -2820,7 +2838,7 @@ class FrameworkExtension extends Extension
             NotifierBridge\Mastodon\MastodonTransportFactory::class => 'notifier.transport_factory.mastodon',
             NotifierBridge\Mattermost\MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
             NotifierBridge\Mercure\MercureTransportFactory::class => 'notifier.transport_factory.mercure',
-            NotifierBridge\MessageBird\MessageBirdTransport::class => 'notifier.transport_factory.message-bird',
+            NotifierBridge\MessageBird\MessageBirdTransportFactory::class => 'notifier.transport_factory.message-bird',
             NotifierBridge\MessageMedia\MessageMediaTransportFactory::class => 'notifier.transport_factory.message-media',
             NotifierBridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoft-teams',
             NotifierBridge\Mobyt\MobytTransportFactory::class => 'notifier.transport_factory.mobyt',
@@ -2851,7 +2869,7 @@ class FrameworkExtension extends Extension
             NotifierBridge\Telegram\TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
             NotifierBridge\Telnyx\TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
             NotifierBridge\Termii\TermiiTransportFactory::class => 'notifier.transport_factory.termii',
-            NotifierBridge\TurboSms\TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
+            NotifierBridge\TurboSms\TurboSmsTransportFactory::class => 'notifier.transport_factory.turbo-sms',
             NotifierBridge\Twilio\TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
             NotifierBridge\Twitter\TwitterTransportFactory::class => 'notifier.transport_factory.twitter',
             NotifierBridge\Vonage\VonageTransportFactory::class => 'notifier.transport_factory.vonage',
@@ -2865,34 +2883,40 @@ class FrameworkExtension extends Extension
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('notifier.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, $parentPackages)) {
+            if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-notifier', $package), $class, $parentPackages)) {
                 $container->removeDefinition($service);
             }
         }
 
         if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
             $container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
-                ->replaceArgument('$registry', new Reference(HubRegistry::class))
-                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+                ->replaceArgument(0, new Reference(HubRegistry::class))
+                ->replaceArgument(1, new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
         } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
             $container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
-            $container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
-                ->replaceArgument('$mailer', new Reference('mailer'))
-                ->replaceArgument('$logger', new Reference('logger'))
-                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        // don't use ContainerBuilder::willBeAvailable() as these are not needed in production
+        if (class_exists(FakeChatTransportFactory::class)) {
+            $container->getDefinition('notifier.transport_factory.fake-chat')
+                ->replaceArgument(0, new Reference('mailer', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->replaceArgument(1, new Reference('logger', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        } else {
+            $container->removeDefinition('notifier.transport_factory.fake-chat');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
-            $container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
-                ->replaceArgument('$mailer', new Reference('mailer'))
-                ->replaceArgument('$logger', new Reference('logger'))
-                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        // don't use ContainerBuilder::willBeAvailable() as these are not needed in production
+        if (class_exists(FakeSmsTransportFactory::class)) {
+            $container->getDefinition('notifier.transport_factory.fake-sms')
+                ->replaceArgument(0, new Reference('mailer', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->replaceArgument(1, new Reference('logger', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->addArgument(new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        } else {
+            $container->removeDefinition('notifier.transport_factory.fake-sms');
         }
 
         if (isset($config['admin_recipients'])) {
@@ -2915,7 +2939,7 @@ class FrameworkExtension extends Extension
             foreach ($webhookRequestParsers as $class => $service) {
                 $package = substr($service, \strlen('notifier.webhook.request_parser.'));
 
-                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, ['symfony/framework-bundle', 'symfony/notifier'])) {
+                if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-notifier', $package), $class, ['symfony/framework-bundle', 'symfony/notifier'])) {
                     $container->removeDefinition($service);
                 }
             }
@@ -2964,11 +2988,11 @@ class FrameworkExtension extends Extension
 
             if (null !== $limiterConfig['lock_factory']) {
                 if (!interface_exists(LockInterface::class)) {
-                    throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
+                    throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
                 }
 
                 if (!$this->isInitializedConfigEnabled('lock')) {
-                    throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
+                    throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
                 }
 
                 $limiter->replaceArgument(2, new Reference($limiterConfig['lock_factory']));
@@ -3005,10 +3029,10 @@ class FrameworkExtension extends Extension
 
         if (null !== $limiterConfig['lock_factory']) {
             if (!interface_exists(LockInterface::class)) {
-                throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
+                throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
             }
             if (!$container->hasDefinition('lock.factory.abstract')) {
-                throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
+                throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
             }
 
             $limiter->replaceArgument(2, new Reference($limiterConfig['lock_factory']));
@@ -3173,7 +3197,7 @@ class FrameworkExtension extends Extension
             return $this->configsEnabled[$path];
         }
 
-        throw new LogicException(sprintf('Can not read config enabled at "%s" because it has not been initialized.', $path));
+        throw new LogicException(\sprintf('Can not read config enabled at "%s" because it has not been initialized.', $path));
     }
 
     private function readConfigEnabled(string $path, ContainerBuilder $container, array $config): bool
diff --git a/lib/symfony/framework-bundle/EventListener/ConsoleProfilerListener.php b/lib/symfony/framework-bundle/EventListener/ConsoleProfilerListener.php
index c2a71d0a7..15318d979 100644
--- a/lib/symfony/framework-bundle/EventListener/ConsoleProfilerListener.php
+++ b/lib/symfony/framework-bundle/EventListener/ConsoleProfilerListener.php
@@ -38,6 +38,8 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
     /** @var \SplObjectStorage<Request, ?Request> */
     private \SplObjectStorage $parents;
 
+    private bool $disabled = false;
+
     public function __construct(
         private readonly Profiler $profiler,
         private readonly RequestStack $requestStack,
@@ -66,7 +68,7 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
 
         $input = $event->getInput();
         if (!$input->hasOption('profile') || !$input->getOption('profile')) {
-            $this->profiler->disable();
+            $this->disabled = true;
 
             return;
         }
@@ -92,7 +94,12 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
 
     public function profile(ConsoleTerminateEvent $event): void
     {
-        if (!$this->cliMode || !$this->profiler->isEnabled()) {
+        $error = $this->error;
+        $this->error = null;
+
+        if (!$this->cliMode || $this->disabled) {
+            $this->disabled = false;
+
             return;
         }
 
@@ -102,6 +109,10 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
             return;
         }
 
+        if (!$this->profiler->isEnabled()) {
+            return;
+        }
+
         if (null !== $sectionId = $request->attributes->get('_stopwatch_token')) {
             // we must close the section before saving the profile to allow late collect
             try {
@@ -114,8 +125,7 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
         $request->command->exitCode = $event->getExitCode();
         $request->command->interruptedBySignal = $event->getInterruptingSignal();
 
-        $profile = $this->profiler->collect($request, $request->getResponse(), $this->error);
-        $this->error = null;
+        $profile = $this->profiler->collect($request, $request->getResponse(), $error);
         $this->profiles[$request] = $profile;
 
         if ($this->parents[$request] = $this->requestStack->getParentRequest()) {
@@ -142,7 +152,7 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
 
             if ($this->urlGenerator && $output) {
                 $token = $p->getToken();
-                $output->writeln(sprintf(
+                $output->writeln(\sprintf(
                     'See profile <href=%s>%s</>',
                     $this->urlGenerator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL),
                     $token
diff --git a/lib/symfony/framework-bundle/EventListener/SuggestMissingPackageSubscriber.php b/lib/symfony/framework-bundle/EventListener/SuggestMissingPackageSubscriber.php
index d7bdc8e66..a5a0d5d63 100644
--- a/lib/symfony/framework-bundle/EventListener/SuggestMissingPackageSubscriber.php
+++ b/lib/symfony/framework-bundle/EventListener/SuggestMissingPackageSubscriber.php
@@ -66,7 +66,7 @@ final class SuggestMissingPackageSubscriber implements EventSubscriberInterface
             return;
         }
 
-        $message = sprintf("%s\n\nYou may be looking for a command provided by the \"%s\" which is currently not installed. Try running \"composer require %s\".", $error->getMessage(), $suggestion[0], $suggestion[1]);
+        $message = \sprintf("%s\n\nYou may be looking for a command provided by the \"%s\" which is currently not installed. Try running \"composer require %s\".", $error->getMessage(), $suggestion[0], $suggestion[1]);
         $event->setError(new CommandNotFoundException($message));
     }
 
diff --git a/lib/symfony/framework-bundle/FrameworkBundle.php b/lib/symfony/framework-bundle/FrameworkBundle.php
index 4ba30a5c8..c371d10db 100644
--- a/lib/symfony/framework-bundle/FrameworkBundle.php
+++ b/lib/symfony/framework-bundle/FrameworkBundle.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RemoveUnusedSessionMarshallingHandlerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerRealRefPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerWeakRefPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationUpdateCommandPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\VirtualRequestStackPass;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
@@ -58,6 +59,7 @@ use Symfony\Component\Mime\DependencyInjection\AddMimeTypeGuesserPass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
 use Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass;
 use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
+use Symfony\Component\Runtime\SymfonyRuntime;
 use Symfony\Component\Scheduler\DependencyInjection\AddScheduleMessengerPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass;
@@ -99,13 +101,19 @@ class FrameworkBundle extends Bundle
     {
         $_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
 
-        $handler = ErrorHandler::register(null, false);
+        if (class_exists(SymfonyRuntime::class)) {
+            $handler = set_error_handler('var_dump');
+            restore_error_handler();
+        } else {
+            $handler = [ErrorHandler::register(null, false)];
+        }
 
-        // When upgrading an existing Symfony application from 6.2 to 6.3, and
-        // the cache is warmed up, the service is not available yet, so we need
-        // to check if it exists.
-        if ($this->container->has('debug.error_handler_configurator')) {
-            $this->container->get('debug.error_handler_configurator')->configure($handler);
+        if (!$this->container->has('debug.error_handler_configurator')) {
+            // When upgrading an existing Symfony application from 6.2 to 6.3, and
+            // the cache is warmed up, the service is not available yet, so we need
+            // to check if it exists.
+        } elseif (\is_array($handler) && $handler[0] instanceof ErrorHandler) {
+            $this->container->get('debug.error_handler_configurator')->configure($handler[0]);
         }
 
         if ($this->container->getParameter('kernel.http_method_override')) {
@@ -186,6 +194,7 @@ class FrameworkBundle extends Bundle
         // must be registered after MonologBundle's LoggerChannelPass
         $container->addCompilerPass(new ErrorLoggerCompilerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new VirtualRequestStackPass());
+        $container->addCompilerPass(new TranslationUpdateCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);
diff --git a/lib/symfony/framework-bundle/HttpCache/HttpCache.php b/lib/symfony/framework-bundle/HttpCache/HttpCache.php
index f312a7afe..481e8cf3c 100644
--- a/lib/symfony/framework-bundle/HttpCache/HttpCache.php
+++ b/lib/symfony/framework-bundle/HttpCache/HttpCache.php
@@ -37,7 +37,7 @@ class HttpCache extends BaseHttpCache
     /**
      * @param $cache The cache directory (default used if null) or the storage instance
      */
-    public function __construct(KernelInterface $kernel, string|StoreInterface $cache = null, SurrogateInterface $surrogate = null, array $options = null)
+    public function __construct(KernelInterface $kernel, string|StoreInterface|null $cache = null, ?SurrogateInterface $surrogate = null, ?array $options = null)
     {
         $this->kernel = $kernel;
         $this->surrogate = $surrogate;
@@ -60,7 +60,7 @@ class HttpCache extends BaseHttpCache
         parent::__construct($kernel, $this->createStore(), $this->createSurrogate(), array_merge($this->options, $this->getOptions()));
     }
 
-    protected function forward(Request $request, bool $catch = false, Response $entry = null): Response
+    protected function forward(Request $request, bool $catch = false, ?Response $entry = null): Response
     {
         $this->getKernel()->boot();
         $this->getKernel()->getContainer()->set('cache', $this);
diff --git a/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php b/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
index bbbfd5426..dd6f4eeff 100644
--- a/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
+++ b/lib/symfony/framework-bundle/Kernel/MicroKernelTrait.php
@@ -178,7 +178,7 @@ trait MicroKernelTrait
             }
 
             $file = (new \ReflectionObject($this))->getFileName();
-            /* @var ContainerPhpFileLoader $kernelLoader */
+            /** @var ContainerPhpFileLoader $kernelLoader */
             $kernelLoader = $loader->getResolver()->resolve($file);
             $kernelLoader->setCurrentDir(\dirname($file));
             $instanceof = &\Closure::bind(fn &() => $this->instanceof, $kernelLoader, $kernelLoader)();
@@ -204,7 +204,7 @@ trait MicroKernelTrait
     public function loadRoutes(LoaderInterface $loader): RouteCollection
     {
         $file = (new \ReflectionObject($this))->getFileName();
-        /* @var RoutingPhpFileLoader $kernelLoader */
+        /** @var RoutingPhpFileLoader $kernelLoader */
         $kernelLoader = $loader->getResolver()->resolve($file, 'php');
         $kernelLoader->setCurrentDir(\dirname($file));
         $collection = new RouteCollection();
@@ -217,7 +217,7 @@ trait MicroKernelTrait
 
             if (\is_array($controller) && [0, 1] === array_keys($controller) && $this === $controller[0]) {
                 $route->setDefault('_controller', ['kernel', $controller[1]]);
-            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure}')) {
+            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure')) {
                 $route->setDefault('_controller', ['kernel', $r->name]);
             }
         }
diff --git a/lib/symfony/framework-bundle/KernelBrowser.php b/lib/symfony/framework-bundle/KernelBrowser.php
index 45120e42b..cf1d1652f 100644
--- a/lib/symfony/framework-bundle/KernelBrowser.php
+++ b/lib/symfony/framework-bundle/KernelBrowser.php
@@ -34,7 +34,7 @@ class KernelBrowser extends HttpKernelBrowser
     private bool $profiler = false;
     private bool $reboot = true;
 
-    public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function __construct(KernelInterface $kernel, array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         parent::__construct($kernel, $server, $history, $cookieJar);
     }
@@ -117,11 +117,11 @@ class KernelBrowser extends HttpKernelBrowser
         $tokenAttributes = 2 < \func_num_args() ? func_get_arg(2) : [];
 
         if (!interface_exists(UserInterface::class)) {
-            throw new \LogicException(sprintf('"%s" requires symfony/security-core to be installed. Try running "composer require symfony/security-core".', __METHOD__));
+            throw new \LogicException(\sprintf('"%s" requires symfony/security-core to be installed. Try running "composer require symfony/security-core".', __METHOD__));
         }
 
         if (!$user instanceof UserInterface) {
-            throw new \LogicException(sprintf('The first argument of "%s" must be instance of "%s", "%s" provided.', __METHOD__, UserInterface::class, get_debug_type($user)));
+            throw new \LogicException(\sprintf('The first argument of "%s" must be instance of "%s", "%s" provided.', __METHOD__, UserInterface::class, get_debug_type($user)));
         }
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
diff --git a/lib/symfony/framework-bundle/README.md b/lib/symfony/framework-bundle/README.md
index 14c600fac..220d72a8a 100644
--- a/lib/symfony/framework-bundle/README.md
+++ b/lib/symfony/framework-bundle/README.md
@@ -17,4 +17,4 @@ Resources
    [send Pull Requests](https://github.com/symfony/symfony/pulls)
    in the [main Symfony repository](https://github.com/symfony/symfony)
 
-[3]: https://symfony.com/sponsor
+[1]: https://symfony.com/sponsor
diff --git a/lib/symfony/framework-bundle/Resources/config/asset_mapper.php b/lib/symfony/framework-bundle/Resources/config/asset_mapper.php
index f41574d3b..404e7af18 100644
--- a/lib/symfony/framework-bundle/Resources/config/asset_mapper.php
+++ b/lib/symfony/framework-bundle/Resources/config/asset_mapper.php
@@ -54,6 +54,8 @@ return static function (ContainerConfigurator $container) {
             ])
         ->alias(AssetMapperInterface::class, 'asset_mapper')
 
+        ->alias('asset_mapper.http_client', 'http_client')
+
         ->set('asset_mapper.mapped_asset_factory', MappedAssetFactory::class)
             ->args([
                 service('asset_mapper.public_assets_path_resolver'),
@@ -75,6 +77,7 @@ return static function (ContainerConfigurator $container) {
                 param('kernel.project_dir'),
                 abstract_arg('array of excluded path patterns'),
                 abstract_arg('exclude dot files'),
+                param('kernel.debug'),
             ])
 
         ->set('asset_mapper.public_assets_path_resolver', PublicAssetsPathResolver::class)
@@ -196,7 +199,7 @@ return static function (ContainerConfigurator $container) {
             ])
 
         ->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
-            ->args([service('http_client')])
+            ->args([service('asset_mapper.http_client')])
 
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
@@ -211,12 +214,12 @@ return static function (ContainerConfigurator $container) {
         ->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('http_client'),
+            service('asset_mapper.http_client'),
         ])
         ->set('asset_mapper.importmap.update_checker', ImportMapUpdateChecker::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('http_client'),
+            service('asset_mapper.http_client'),
         ])
 
         ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
diff --git a/lib/symfony/framework-bundle/Resources/config/cache.php b/lib/symfony/framework-bundle/Resources/config/cache.php
index 87207cf95..8cb1a95f6 100644
--- a/lib/symfony/framework-bundle/Resources/config/cache.php
+++ b/lib/symfony/framework-bundle/Resources/config/cache.php
@@ -88,7 +88,7 @@ return static function (ContainerConfigurator $container) {
                 '', // namespace
                 0, // default lifetime
                 abstract_arg('version'),
-                sprintf('%s/pools/system', param('kernel.cache_dir')),
+                \sprintf('%s/pools/system', param('kernel.cache_dir')),
                 service('logger')->ignoreOnInvalid(),
             ])
             ->tag('cache.pool', ['clearer' => 'cache.system_clearer', 'reset' => 'reset'])
@@ -110,7 +110,7 @@ return static function (ContainerConfigurator $container) {
             ->args([
                 '', // namespace
                 0, // default lifetime
-                sprintf('%s/pools/app', param('kernel.cache_dir')),
+                \sprintf('%s/pools/app', param('kernel.cache_dir')),
                 service('cache.default_marshaller')->ignoreOnInvalid(),
             ])
             ->call('setLogger', [service('logger')->ignoreOnInvalid()])
diff --git a/lib/symfony/framework-bundle/Resources/config/collectors.php b/lib/symfony/framework-bundle/Resources/config/collectors.php
index aa6d4e33c..954ddeffa 100644
--- a/lib/symfony/framework-bundle/Resources/config/collectors.php
+++ b/lib/symfony/framework-bundle/Resources/config/collectors.php
@@ -56,7 +56,7 @@ return static function (ContainerConfigurator $container) {
         ->set('data_collector.logger', LoggerDataCollector::class)
             ->args([
                 service('logger')->ignoreOnInvalid(),
-                sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
+                \sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
                 service('.virtual_request_stack')->ignoreOnInvalid(),
             ])
             ->tag('monolog.logger', ['channel' => 'profiler'])
diff --git a/lib/symfony/framework-bundle/Resources/config/http_client.php b/lib/symfony/framework-bundle/Resources/config/http_client.php
index a4c78d0ec..593b78fdd 100644
--- a/lib/symfony/framework-bundle/Resources/config/http_client.php
+++ b/lib/symfony/framework-bundle/Resources/config/http_client.php
@@ -39,6 +39,7 @@ return static function (ContainerConfigurator $container) {
             ->factory('current')
             ->args([[service('http_client.transport')]])
             ->tag('http_client.client')
+            ->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
 
         ->alias(HttpClientInterface::class, 'http_client')
 
diff --git a/lib/symfony/framework-bundle/Resources/config/mailer.php b/lib/symfony/framework-bundle/Resources/config/mailer.php
index 9eb545ca2..f1dc560ab 100644
--- a/lib/symfony/framework-bundle/Resources/config/mailer.php
+++ b/lib/symfony/framework-bundle/Resources/config/mailer.php
@@ -45,11 +45,7 @@ return static function (ContainerConfigurator $container) {
                 tagged_iterator('mailer.transport_factory'),
             ])
 
-        ->set('mailer.default_transport', TransportInterface::class)
-            ->factory([service('mailer.transport_factory'), 'fromString'])
-            ->args([
-                abstract_arg('env(MAILER_DSN)'),
-            ])
+        ->alias('mailer.default_transport', 'mailer.transports')
         ->alias(TransportInterface::class, 'mailer.default_transport')
 
         ->set('mailer.messenger.message_handler', MessageHandler::class)
diff --git a/lib/symfony/framework-bundle/Resources/config/notifier.php b/lib/symfony/framework-bundle/Resources/config/notifier.php
index 6ce674148..bcc124820 100644
--- a/lib/symfony/framework-bundle/Resources/config/notifier.php
+++ b/lib/symfony/framework-bundle/Resources/config/notifier.php
@@ -73,7 +73,10 @@ return static function (ContainerConfigurator $container) {
             ->tag('notifier.channel', ['channel' => 'email'])
 
         ->set('notifier.channel.push', PushChannel::class)
-            ->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'push'])
 
         ->set('notifier.monolog_handler', NotifierHandler::class)
diff --git a/lib/symfony/framework-bundle/Resources/config/profiling.php b/lib/symfony/framework-bundle/Resources/config/profiling.php
index eaef79597..4ae34649b 100644
--- a/lib/symfony/framework-bundle/Resources/config/profiling.php
+++ b/lib/symfony/framework-bundle/Resources/config/profiling.php
@@ -40,7 +40,7 @@ return static function (ContainerConfigurator $container) {
 
         ->set('console_profiler_listener', ConsoleProfilerListener::class)
             ->args([
-                service('profiler'),
+                service('.lazy_profiler'),
                 service('.virtual_request_stack'),
                 service('debug.stopwatch'),
                 param('kernel.runtime_mode.cli'),
@@ -48,6 +48,11 @@ return static function (ContainerConfigurator $container) {
             ])
             ->tag('kernel.event_subscriber')
 
+        ->set('.lazy_profiler', Profiler::class)
+            ->factory('current')
+            ->args([[service('profiler')]])
+            ->lazy()
+
         ->set('.virtual_request_stack', VirtualRequestStack::class)
             ->args([service('request_stack')])
             ->public()
diff --git a/lib/symfony/framework-bundle/Resources/config/schema/symfony-1.0.xsd b/lib/symfony/framework-bundle/Resources/config/schema/symfony-1.0.xsd
index ffa47c384..4a650af6b 100644
--- a/lib/symfony/framework-bundle/Resources/config/schema/symfony-1.0.xsd
+++ b/lib/symfony/framework-bundle/Resources/config/schema/symfony-1.0.xsd
@@ -266,6 +266,7 @@
             <xsd:element name="static-method" type="xsd:string" />
             <xsd:element name="mapping" type="file_mapping" />
             <xsd:element name="auto-mapping" type="auto_mapping" />
+            <xsd:element name="not-compromised-password" type="not-compromised-password" />
         </xsd:choice>
 
         <xsd:attribute name="enabled" type="xsd:boolean" />
@@ -294,11 +295,17 @@
     <xsd:simpleType name="email-validation-mode">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="html5" />
+            <xsd:enumeration value="html5-allow-no-tld" />
             <xsd:enumeration value="loose" />
             <xsd:enumeration value="strict" />
         </xsd:restriction>
     </xsd:simpleType>
 
+    <xsd:complexType name="not-compromised-password">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="endpoint" type="xsd:string" />
+    </xsd:complexType>
+
     <xsd:complexType name="annotations">
         <xsd:attribute name="cache" type="xsd:string" />
         <xsd:attribute name="debug" type="xsd:string" />
@@ -464,7 +471,8 @@
             <xsd:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="guard" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
+        <xsd:attribute name="name" type="xsd:string" />
+        <xsd:attribute name="key" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="place" mixed="true">
@@ -551,7 +559,7 @@
 
     <xsd:complexType name="lock">
         <xsd:sequence>
-            <xsd:element name="resource" type="lock_resource" minOccurs="1" maxOccurs="unbounded" />
+            <xsd:element name="resource" type="lock_resource" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
@@ -781,7 +789,7 @@
     <xsd:complexType name="mailer_envelope">
         <xsd:sequence>
             <xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="recipients" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
 
diff --git a/lib/symfony/framework-bundle/Resources/config/serializer.php b/lib/symfony/framework-bundle/Resources/config/serializer.php
index 2311df0fc..c29258d52 100644
--- a/lib/symfony/framework-bundle/Resources/config/serializer.php
+++ b/lib/symfony/framework-bundle/Resources/config/serializer.php
@@ -60,7 +60,7 @@ return static function (ContainerConfigurator $container) {
 
     $container->services()
         ->set('serializer', Serializer::class)
-            ->args([[], []])
+            ->args([[], [], []])
 
         ->alias(SerializerInterface::class, 'serializer')
         ->alias(NormalizerInterface::class, 'serializer')
@@ -116,7 +116,7 @@ return static function (ContainerConfigurator $container) {
 
         ->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
             ->args(['$translator' => service('translator')])
-            ->tag('serializer.normalizer', ['priority' => -890])
+            ->tag('serializer.normalizer', ['priority' => -920])
 
         ->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
             ->tag('serializer.normalizer', ['priority' => -915])
@@ -129,6 +129,8 @@ return static function (ContainerConfigurator $container) {
                 service('property_info')->ignoreOnInvalid(),
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
+                null,
+                service('property_info')->ignoreOnInvalid(),
             ])
             ->tag('serializer.normalizer', ['priority' => -1000])
 
diff --git a/lib/symfony/framework-bundle/Resources/config/services.php b/lib/symfony/framework-bundle/Resources/config/services.php
index 905e16f9b..78daa3b87 100644
--- a/lib/symfony/framework-bundle/Resources/config/services.php
+++ b/lib/symfony/framework-bundle/Resources/config/services.php
@@ -100,6 +100,7 @@ return static function (ContainerConfigurator $container) {
         ->alias(HttpKernelInterface::class, 'http_kernel')
 
         ->set('request_stack', RequestStack::class)
+            ->tag('kernel.reset', ['method' => 'resetRequestFormats', 'on_invalid' => 'ignore'])
             ->public()
         ->alias(RequestStack::class, 'request_stack')
 
@@ -130,7 +131,7 @@ return static function (ContainerConfigurator $container) {
             ->args([
                 tagged_iterator('kernel.cache_warmer'),
                 param('kernel.debug'),
-                sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
+                \sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
             ])
             ->tag('container.no_preload')
 
diff --git a/lib/symfony/framework-bundle/Resources/config/session.php b/lib/symfony/framework-bundle/Resources/config/session.php
index 907b1b584..2e481359a 100644
--- a/lib/symfony/framework-bundle/Resources/config/session.php
+++ b/lib/symfony/framework-bundle/Resources/config/session.php
@@ -90,6 +90,7 @@ return static function (ContainerConfigurator $container) {
                     'session_factory' => service('session.factory')->ignoreOnInvalid(),
                     'logger' => service('logger')->ignoreOnInvalid(),
                     'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
+                    'request_stack' => service('request_stack')->ignoreOnInvalid(),
                 ]),
                 param('kernel.debug'),
                 param('session.storage.options'),
diff --git a/lib/symfony/framework-bundle/Routing/Attribute/AsRoutingConditionService.php b/lib/symfony/framework-bundle/Routing/Attribute/AsRoutingConditionService.php
index d1f1a5f34..13f8ff26a 100644
--- a/lib/symfony/framework-bundle/Routing/Attribute/AsRoutingConditionService.php
+++ b/lib/symfony/framework-bundle/Routing/Attribute/AsRoutingConditionService.php
@@ -42,7 +42,7 @@ use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 class AsRoutingConditionService extends AutoconfigureTag
 {
     public function __construct(
-        string $alias = null,
+        ?string $alias = null,
         int $priority = 0,
     ) {
         parent::__construct('routing.condition_service', ['alias' => $alias, 'priority' => $priority]);
diff --git a/lib/symfony/framework-bundle/Routing/DelegatingLoader.php b/lib/symfony/framework-bundle/Routing/DelegatingLoader.php
index df7e9348c..3239d1094 100644
--- a/lib/symfony/framework-bundle/Routing/DelegatingLoader.php
+++ b/lib/symfony/framework-bundle/Routing/DelegatingLoader.php
@@ -40,7 +40,7 @@ class DelegatingLoader extends BaseDelegatingLoader
         parent::__construct($resolver);
     }
 
-    public function load(mixed $resource, string $type = null): RouteCollection
+    public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         if ($this->loading) {
             // This can happen if a fatal error occurs in parent::load().
diff --git a/lib/symfony/framework-bundle/Routing/RedirectableCompiledUrlMatcher.php b/lib/symfony/framework-bundle/Routing/RedirectableCompiledUrlMatcher.php
index 538427aae..609502bca 100644
--- a/lib/symfony/framework-bundle/Routing/RedirectableCompiledUrlMatcher.php
+++ b/lib/symfony/framework-bundle/Routing/RedirectableCompiledUrlMatcher.php
@@ -21,7 +21,7 @@ use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
  */
 class RedirectableCompiledUrlMatcher extends CompiledUrlMatcher implements RedirectableUrlMatcherInterface
 {
-    public function redirect(string $path, string $route, string $scheme = null): array
+    public function redirect(string $path, string $route, ?string $scheme = null): array
     {
         return [
             '_controller' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::urlRedirectAction',
diff --git a/lib/symfony/framework-bundle/Routing/Router.php b/lib/symfony/framework-bundle/Routing/Router.php
index 3367ecec2..ac6cb03a3 100644
--- a/lib/symfony/framework-bundle/Routing/Router.php
+++ b/lib/symfony/framework-bundle/Routing/Router.php
@@ -40,7 +40,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
     /**
      * @param mixed $resource The main resource to load
      */
-    public function __construct(ContainerInterface $container, mixed $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(ContainerInterface $container, mixed $resource, array $options = [], ?RequestContext $context = null, ?ContainerInterface $parameters = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->container = $container;
         $this->resource = $resource;
@@ -53,7 +53,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
         } elseif ($container instanceof SymfonyContainerInterface) {
             $this->paramFetcher = $container->getParameter(...);
         } else {
-            throw new \LogicException(sprintf('You should either pass a "%s" instance or provide the $parameters argument of the "%s" method.', SymfonyContainerInterface::class, __METHOD__));
+            throw new \LogicException(\sprintf('You should either pass a "%s" instance or provide the $parameters argument of the "%s" method.', SymfonyContainerInterface::class, __METHOD__));
         }
 
         $this->defaultLocale = $defaultLocale;
@@ -165,7 +165,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
             }
 
             if (preg_match('/^env\((?:\w++:)*+\w++\)$/', $match[1])) {
-                throw new RuntimeException(sprintf('Using "%%%s%%" is not allowed in routing configuration.', $match[1]));
+                throw new RuntimeException(\sprintf('Using "%%%s%%" is not allowed in routing configuration.', $match[1]));
             }
 
             $resolved = ($this->paramFetcher)($match[1]);
@@ -182,7 +182,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
                 }
             }
 
-            throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, get_debug_type($resolved)));
+            throw new RuntimeException(\sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, get_debug_type($resolved)));
         }, $value);
 
         return str_replace('%%', '%', $escapedValue);
diff --git a/lib/symfony/framework-bundle/Secrets/AbstractVault.php b/lib/symfony/framework-bundle/Secrets/AbstractVault.php
index b3eb0c6bc..1324b1409 100644
--- a/lib/symfony/framework-bundle/Secrets/AbstractVault.php
+++ b/lib/symfony/framework-bundle/Secrets/AbstractVault.php
@@ -36,7 +36,7 @@ abstract class AbstractVault
     protected function validateName(string $name): void
     {
         if (!preg_match('/^\w++$/D', $name)) {
-            throw new \LogicException(sprintf('Invalid secret name "%s": only "word" characters are allowed.', $name));
+            throw new \LogicException(\sprintf('Invalid secret name "%s": only "word" characters are allowed.', $name));
         }
     }
 
diff --git a/lib/symfony/framework-bundle/Secrets/DotenvVault.php b/lib/symfony/framework-bundle/Secrets/DotenvVault.php
index 994b31d18..c1f08e977 100644
--- a/lib/symfony/framework-bundle/Secrets/DotenvVault.php
+++ b/lib/symfony/framework-bundle/Secrets/DotenvVault.php
@@ -45,7 +45,7 @@ class DotenvVault extends AbstractVault
 
         file_put_contents($this->dotenvFile, $content);
 
-        $this->lastMessage = sprintf('Secret "%s" %s in "%s".', $name, $count ? 'added' : 'updated', $this->getPrettyPath($this->dotenvFile));
+        $this->lastMessage = \sprintf('Secret "%s" %s in "%s".', $name, $count ? 'added' : 'updated', $this->getPrettyPath($this->dotenvFile));
     }
 
     public function reveal(string $name): ?string
@@ -55,7 +55,7 @@ class DotenvVault extends AbstractVault
         $v = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null));
 
         if ('' === ($v ?? '')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
             return null;
         }
@@ -73,12 +73,12 @@ class DotenvVault extends AbstractVault
 
         if ($count) {
             file_put_contents($this->dotenvFile, $content);
-            $this->lastMessage = sprintf('Secret "%s" removed from file "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+            $this->lastMessage = \sprintf('Secret "%s" removed from file "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
             return true;
         }
 
-        $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+        $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
         return false;
     }
diff --git a/lib/symfony/framework-bundle/Secrets/SodiumVault.php b/lib/symfony/framework-bundle/Secrets/SodiumVault.php
index b6bb058b3..1aa03ac51 100644
--- a/lib/symfony/framework-bundle/Secrets/SodiumVault.php
+++ b/lib/symfony/framework-bundle/Secrets/SodiumVault.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Secrets;
 
 use Symfony\Component\DependencyInjection\EnvVarLoaderInterface;
+use Symfony\Component\String\LazyString;
 use Symfony\Component\VarExporter\VarExporter;
 
 /**
@@ -30,7 +31,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
      * @param $decryptionKey A string or a stringable object that defines the private key to use to decrypt the vault
      *                       or null to store generated keys in the provided $secretsDir
      */
-    public function __construct(string $secretsDir, #[\SensitiveParameter] string|\Stringable $decryptionKey = null)
+    public function __construct(string $secretsDir, #[\SensitiveParameter] string|\Stringable|null $decryptionKey = null)
     {
         $this->pathPrefix = rtrim(strtr($secretsDir, '/', \DIRECTORY_SEPARATOR), \DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR.basename($secretsDir).'.';
         $this->decryptionKey = $decryptionKey;
@@ -58,7 +59,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         }
 
         if (!$override && null !== $this->encryptionKey) {
-            $this->lastMessage = sprintf('Sodium keys already exist at "%s*.{public,private}" and won\'t be overridden.', $this->getPrettyPath($this->pathPrefix));
+            $this->lastMessage = \sprintf('Sodium keys already exist at "%s*.{public,private}" and won\'t be overridden.', $this->getPrettyPath($this->pathPrefix));
 
             return false;
         }
@@ -69,7 +70,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         $this->export('encrypt.public', $this->encryptionKey);
         $this->export('decrypt.private', $this->decryptionKey);
 
-        $this->lastMessage = sprintf('Sodium keys have been generated at "%s*.public/private.php".', $this->getPrettyPath($this->pathPrefix));
+        $this->lastMessage = \sprintf('Sodium keys have been generated at "%s*.public/private.php".', $this->getPrettyPath($this->pathPrefix));
 
         return true;
     }
@@ -85,9 +86,9 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         $list = $this->list();
         $list[$name] = null;
         uksort($list, 'strnatcmp');
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
+        file_put_contents($this->pathPrefix.'list.php', \sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
-        $this->lastMessage = sprintf('Secret "%s" encrypted in "%s"; you can commit it.', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+        $this->lastMessage = \sprintf('Secret "%s" encrypted in "%s"; you can commit it.', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
     }
 
     public function reveal(string $name): ?string
@@ -97,13 +98,13 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
 
         $filename = $this->getFilename($name);
         if (!is_file($file = $this->pathPrefix.$filename.'.php')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
 
         if (!\function_exists('sodium_crypto_box_seal')) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as the "sodium" PHP extension missing. Try running "composer require paragonie/sodium_compat" if you cannot enable the extension."', $name);
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as the "sodium" PHP extension missing. Try running "composer require paragonie/sodium_compat" if you cannot enable the extension."', $name);
 
             return null;
         }
@@ -111,13 +112,13 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         $this->loadKeys();
 
         if ('' === $this->decryptionKey) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as no decryption key was found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as no decryption key was found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
 
         if (false === $value = sodium_crypto_box_seal_open(include $file, $this->decryptionKey)) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as the wrong decryption key was provided for "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as the wrong decryption key was provided for "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
@@ -132,16 +133,16 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
 
         $filename = $this->getFilename($name);
         if (!is_file($file = $this->pathPrefix.$filename.'.php')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return false;
         }
 
         $list = $this->list();
         unset($list[$name]);
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
+        file_put_contents($this->pathPrefix.'list.php', \sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
-        $this->lastMessage = sprintf('Secret "%s" removed from "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+        $this->lastMessage = \sprintf('Secret "%s" removed from "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
         return @unlink($file) || !file_exists($file);
     }
@@ -169,7 +170,14 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
 
     public function loadEnvVars(): array
     {
-        return $this->list(true);
+        $envs = [];
+        $reveal = $this->reveal(...);
+
+        foreach ($this->list() as $name => $value) {
+            $envs[$name] = LazyString::fromCallable($reveal, $name);
+        }
+
+        return $envs;
     }
 
     private function loadKeys(): void
@@ -191,7 +199,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         } elseif ('' !== $this->decryptionKey) {
             $this->encryptionKey = sodium_crypto_box_publickey($this->decryptionKey);
         } else {
-            throw new \RuntimeException(sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
+            throw new \RuntimeException(\sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
         }
     }
 
@@ -200,7 +208,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
         $b64 = 'decrypt.private' === $filename ? '// SYMFONY_DECRYPTION_SECRET='.base64_encode($data)."\n" : '';
         $name = basename($this->pathPrefix.$filename);
         $data = str_replace('%', '\x', rawurlencode($data));
-        $data = sprintf("<?php // %s on %s\n\n%sreturn \"%s\";\n", $name, date('r'), $b64, $data);
+        $data = \sprintf("<?php // %s on %s\n\n%sreturn \"%s\";\n", $name, date('r'), $b64, $data);
 
         $this->createSecretsDir();
 
@@ -213,7 +221,7 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
     private function createSecretsDir(): void
     {
         if ($this->secretsDir && !is_dir($this->secretsDir) && !@mkdir($this->secretsDir, 0777, true) && !is_dir($this->secretsDir)) {
-            throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s).', $this->secretsDir));
+            throw new \RuntimeException(\sprintf('Unable to create the secrets directory (%s).', $this->secretsDir));
         }
 
         $this->secretsDir = null;
diff --git a/lib/symfony/framework-bundle/Test/BrowserKitAssertionsTrait.php b/lib/symfony/framework-bundle/Test/BrowserKitAssertionsTrait.php
index a6d4fed33..b09045b4f 100644
--- a/lib/symfony/framework-bundle/Test/BrowserKitAssertionsTrait.php
+++ b/lib/symfony/framework-bundle/Test/BrowserKitAssertionsTrait.php
@@ -43,7 +43,7 @@ trait BrowserKitAssertionsTrait
         self::assertThatForResponse(new ResponseConstraint\ResponseFormatSame(self::getRequest(), $expectedFormat), $message);
     }
 
-    public static function assertResponseRedirects(string $expectedLocation = null, int $expectedCode = null, string $message = ''): void
+    public static function assertResponseRedirects(?string $expectedLocation = null, ?int $expectedCode = null, string $message = ''): void
     {
         $constraint = new ResponseConstraint\ResponseIsRedirected();
         if ($expectedLocation) {
@@ -82,17 +82,17 @@ trait BrowserKitAssertionsTrait
         self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue)), $message);
     }
 
-    public static function assertResponseHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertResponseHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForResponse(new ResponseConstraint\ResponseHasCookie($name, $path, $domain), $message);
     }
 
-    public static function assertResponseNotHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertResponseNotHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHasCookie($name, $path, $domain)), $message);
     }
 
-    public static function assertResponseCookieValueSame(string $name, string $expectedValue, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertResponseCookieValueSame(string $name, string $expectedValue, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForResponse(LogicalAnd::fromConstraints(
             new ResponseConstraint\ResponseHasCookie($name, $path, $domain),
@@ -105,17 +105,17 @@ trait BrowserKitAssertionsTrait
         self::assertThatForResponse(new ResponseConstraint\ResponseIsUnprocessable(), $message);
     }
 
-    public static function assertBrowserHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertBrowserHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForClient(new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain), $message);
     }
 
-    public static function assertBrowserNotHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertBrowserNotHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForClient(new LogicalNot(new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain)), $message);
     }
 
-    public static function assertBrowserCookieValueSame(string $name, string $expectedValue, bool $raw = false, string $path = '/', string $domain = null, string $message = ''): void
+    public static function assertBrowserCookieValueSame(string $name, string $expectedValue, bool $raw = false, string $path = '/', ?string $domain = null, string $message = ''): void
     {
         self::assertThatForClient(LogicalAnd::fromConstraints(
             new BrowserKitConstraint\BrowserHasCookie($name, $path, $domain),
@@ -162,7 +162,7 @@ trait BrowserKitAssertionsTrait
         self::assertThat(self::getClient(), $constraint, $message);
     }
 
-    protected static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser
+    protected static function getClient(?AbstractBrowser $newClient = null): ?AbstractBrowser
     {
         static $client;
 
@@ -171,7 +171,7 @@ trait BrowserKitAssertionsTrait
         }
 
         if (!$client instanceof AbstractBrowser) {
-            static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
+            static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
         }
 
         return $client;
diff --git a/lib/symfony/framework-bundle/Test/DomCrawlerAssertionsTrait.php b/lib/symfony/framework-bundle/Test/DomCrawlerAssertionsTrait.php
index a16709461..ede359bcc 100644
--- a/lib/symfony/framework-bundle/Test/DomCrawlerAssertionsTrait.php
+++ b/lib/symfony/framework-bundle/Test/DomCrawlerAssertionsTrait.php
@@ -26,12 +26,12 @@ trait DomCrawlerAssertionsTrait
 {
     public static function assertSelectorExists(string $selector, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), new DomCrawlerConstraint\CrawlerSelectorExists($selector), $message);
+        self::assertThat(self::getCrawler(), new CrawlerSelectorExists($selector), $message);
     }
 
     public static function assertSelectorNotExists(string $selector, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorExists($selector)), $message);
+        self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists($selector)), $message);
     }
 
     public static function assertSelectorCount(int $expectedCount, string $selector, string $message = ''): void
@@ -42,7 +42,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertSelectorTextContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerSelectorTextContains($selector, $text)
         ), $message);
     }
@@ -50,7 +50,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertAnySelectorTextContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerAnySelectorTextContains($selector, $text)
         ), $message);
     }
@@ -58,7 +58,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertSelectorTextSame(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerSelectorTextSame($selector, $text)
         ), $message);
     }
@@ -66,7 +66,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertAnySelectorTextSame(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerAnySelectorTextSame($selector, $text)
         ), $message);
     }
@@ -74,7 +74,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertSelectorTextNotContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorTextContains($selector, $text))
         ), $message);
     }
@@ -82,7 +82,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertAnySelectorTextNotContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new LogicalNot(new DomCrawlerConstraint\CrawlerAnySelectorTextContains($selector, $text))
         ), $message);
     }
@@ -100,7 +100,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertInputValueSame(string $fieldName, string $expectedValue, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists("input[name=\"$fieldName\"]"),
+            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
             new DomCrawlerConstraint\CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'value', $expectedValue)
         ), $message);
     }
@@ -108,7 +108,7 @@ trait DomCrawlerAssertionsTrait
     public static function assertInputValueNotSame(string $fieldName, string $expectedValue, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists("input[name=\"$fieldName\"]"),
+            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
             new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'value', $expectedValue))
         ), $message);
     }
@@ -126,18 +126,18 @@ trait DomCrawlerAssertionsTrait
     public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void
     {
         $node = self::getCrawler()->filter($formSelector);
-        self::assertNotEmpty($node, sprintf('Form "%s" not found.', $formSelector));
+        self::assertNotEmpty($node, \sprintf('Form "%s" not found.', $formSelector));
         $values = $node->form()->getValues();
-        self::assertArrayHasKey($fieldName, $values, $message ?: sprintf('Field "%s" not found in form "%s".', $fieldName, $formSelector));
+        self::assertArrayHasKey($fieldName, $values, $message ?: \sprintf('Field "%s" not found in form "%s".', $fieldName, $formSelector));
         self::assertSame($value, $values[$fieldName]);
     }
 
     public static function assertNoFormValue(string $formSelector, string $fieldName, string $message = ''): void
     {
         $node = self::getCrawler()->filter($formSelector);
-        self::assertNotEmpty($node, sprintf('Form "%s" not found.', $formSelector));
+        self::assertNotEmpty($node, \sprintf('Form "%s" not found.', $formSelector));
         $values = $node->form()->getValues();
-        self::assertArrayNotHasKey($fieldName, $values, $message ?: sprintf('Field "%s" has a value in form "%s".', $fieldName, $formSelector));
+        self::assertArrayNotHasKey($fieldName, $values, $message ?: \sprintf('Field "%s" has a value in form "%s".', $fieldName, $formSelector));
     }
 
     private static function getCrawler(): Crawler
diff --git a/lib/symfony/framework-bundle/Test/HttpClientAssertionsTrait.php b/lib/symfony/framework-bundle/Test/HttpClientAssertionsTrait.php
index bed835fa1..4a8afbab4 100644
--- a/lib/symfony/framework-bundle/Test/HttpClientAssertionsTrait.php
+++ b/lib/symfony/framework-bundle/Test/HttpClientAssertionsTrait.php
@@ -14,13 +14,12 @@ namespace Symfony\Bundle\FrameworkBundle\Test;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
 
-/*
+/**
  * @author Mathieu Santostefano <msantostefano@protonmail.com>
  */
-
 trait HttpClientAssertionsTrait
 {
-    public static function assertHttpClientRequest(string $expectedUrl, string $expectedMethod = 'GET', string|array $expectedBody = null, array $expectedHeaders = [], string $httpClientId = 'http_client'): void
+    public static function assertHttpClientRequest(string $expectedUrl, string $expectedMethod = 'GET', string|array|null $expectedBody = null, array $expectedHeaders = [], string $httpClientId = 'http_client'): void
     {
         /** @var KernelBrowser $client */
         $client = static::getClient();
@@ -34,7 +33,7 @@ trait HttpClientAssertionsTrait
         $expectedRequestHasBeenFound = false;
 
         if (!\array_key_exists($httpClientId, $httpClientDataCollector->getClients())) {
-            static::fail(sprintf('HttpClient "%s" is not registered.', $httpClientId));
+            static::fail(\sprintf('HttpClient "%s" is not registered.', $httpClientId));
         }
 
         foreach ($httpClientDataCollector->getClients()[$httpClientId]['traces'] as $trace) {
@@ -102,7 +101,7 @@ trait HttpClientAssertionsTrait
         $unexpectedUrlHasBeenFound = false;
 
         if (!\array_key_exists($httpClientId, $httpClientDataCollector->getClients())) {
-            static::fail(sprintf('HttpClient "%s" is not registered.', $httpClientId));
+            static::fail(\sprintf('HttpClient "%s" is not registered.', $httpClientId));
         }
 
         foreach ($httpClientDataCollector->getClients()[$httpClientId]['traces'] as $trace) {
@@ -114,7 +113,7 @@ trait HttpClientAssertionsTrait
             }
         }
 
-        self::assertFalse($unexpectedUrlHasBeenFound, sprintf('Unexpected URL called: "%s" - "%s"', $expectedMethod, $unexpectedUrl));
+        self::assertFalse($unexpectedUrlHasBeenFound, \sprintf('Unexpected URL called: "%s" - "%s"', $expectedMethod, $unexpectedUrl));
     }
 
     public static function assertHttpClientRequestCount(int $count, string $httpClientId = 'http_client'): void
diff --git a/lib/symfony/framework-bundle/Test/KernelTestCase.php b/lib/symfony/framework-bundle/Test/KernelTestCase.php
index 8d27b757f..5c337b730 100644
--- a/lib/symfony/framework-bundle/Test/KernelTestCase.php
+++ b/lib/symfony/framework-bundle/Test/KernelTestCase.php
@@ -15,6 +15,7 @@ use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
@@ -45,6 +46,14 @@ abstract class KernelTestCase extends TestCase
         static::$booted = false;
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        static::ensureKernelShutdown();
+        static::$class = null;
+        static::$kernel = null;
+        static::$booted = false;
+    }
+
     /**
      * @throws \RuntimeException
      * @throws \LogicException
@@ -52,11 +61,11 @@ abstract class KernelTestCase extends TestCase
     protected static function getKernelClass(): string
     {
         if (!isset($_SERVER['KERNEL_CLASS']) && !isset($_ENV['KERNEL_CLASS'])) {
-            throw new \LogicException(sprintf('You must set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel in phpunit.xml / phpunit.xml.dist or override the "%1$s::createKernel()" or "%1$s::getKernelClass()" method.', static::class));
+            throw new \LogicException(\sprintf('You must set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel in phpunit.xml / phpunit.xml.dist or override the "%1$s::createKernel()" or "%1$s::getKernelClass()" method.', static::class));
         }
 
         if (!class_exists($class = $_ENV['KERNEL_CLASS'] ?? $_SERVER['KERNEL_CLASS'])) {
-            throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the "%s::createKernel()" method.', $class, static::class));
+            throw new \RuntimeException(\sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the "%s::createKernel()" method.', $class, static::class));
         }
 
         return $class;
@@ -74,6 +83,18 @@ abstract class KernelTestCase extends TestCase
         static::$kernel = $kernel;
         static::$booted = true;
 
+        // If the cache warmer is registered, it means that the cache has been
+        // warmed up, so the current container is not fresh anymore. Let's
+        // reboot a fresh one.
+        if (self::getContainer()->initialized('cache_warmer')) {
+            static::ensureKernelShutdown();
+
+            $kernel = static::createKernel($options);
+            $kernel->boot();
+            static::$kernel = $kernel;
+            static::$booted = true;
+        }
+
         return static::$kernel;
     }
 
@@ -126,12 +147,27 @@ abstract class KernelTestCase extends TestCase
         if (null !== static::$kernel) {
             static::$kernel->boot();
             $container = static::$kernel->getContainer();
+
+            $httpCacheDir = null;
+            if ($container->has('http_cache')) {
+                $httpCacheDir = static::$kernel->getCacheDir().'/http_cache';
+            }
+
+            if ($container->has('services_resetter')) {
+                // Instantiate the service because Container::reset() only resets services that have been used
+                $container->get('services_resetter');
+            }
+
             static::$kernel->shutdown();
             static::$booted = false;
 
             if ($container instanceof ResetInterface) {
                 $container->reset();
             }
+
+            if (null !== $httpCacheDir && is_dir($httpCacheDir)) {
+                (new Filesystem())->remove($httpCacheDir);
+            }
         }
     }
 }
diff --git a/lib/symfony/framework-bundle/Test/MailerAssertionsTrait.php b/lib/symfony/framework-bundle/Test/MailerAssertionsTrait.php
index 83643421e..2308c3e2f 100644
--- a/lib/symfony/framework-bundle/Test/MailerAssertionsTrait.php
+++ b/lib/symfony/framework-bundle/Test/MailerAssertionsTrait.php
@@ -20,12 +20,12 @@ use Symfony\Component\Mime\Test\Constraint as MimeConstraint;
 
 trait MailerAssertionsTrait
 {
-    public static function assertEmailCount(int $count, string $transport = null, string $message = ''): void
+    public static function assertEmailCount(int $count, ?string $transport = null, string $message = ''): void
     {
         self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport), $message);
     }
 
-    public static function assertQueuedEmailCount(int $count, string $transport = null, string $message = ''): void
+    public static function assertQueuedEmailCount(int $count, ?string $transport = null, string $message = ''): void
     {
         self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport, true), $message);
     }
@@ -103,12 +103,12 @@ trait MailerAssertionsTrait
     /**
      * @return MessageEvent[]
      */
-    public static function getMailerEvents(string $transport = null): array
+    public static function getMailerEvents(?string $transport = null): array
     {
         return self::getMessageMailerEvents()->getEvents($transport);
     }
 
-    public static function getMailerEvent(int $index = 0, string $transport = null): ?MessageEvent
+    public static function getMailerEvent(int $index = 0, ?string $transport = null): ?MessageEvent
     {
         return self::getMailerEvents($transport)[$index] ?? null;
     }
@@ -116,12 +116,12 @@ trait MailerAssertionsTrait
     /**
      * @return RawMessage[]
      */
-    public static function getMailerMessages(string $transport = null): array
+    public static function getMailerMessages(?string $transport = null): array
     {
         return self::getMessageMailerEvents()->getMessages($transport);
     }
 
-    public static function getMailerMessage(int $index = 0, string $transport = null): ?RawMessage
+    public static function getMailerMessage(int $index = 0, ?string $transport = null): ?RawMessage
     {
         return self::getMailerMessages($transport)[$index] ?? null;
     }
diff --git a/lib/symfony/framework-bundle/Test/NotificationAssertionsTrait.php b/lib/symfony/framework-bundle/Test/NotificationAssertionsTrait.php
index 53d24cb12..2c4c5467d 100644
--- a/lib/symfony/framework-bundle/Test/NotificationAssertionsTrait.php
+++ b/lib/symfony/framework-bundle/Test/NotificationAssertionsTrait.php
@@ -17,17 +17,17 @@ use Symfony\Component\Notifier\Event\NotificationEvents;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Test\Constraint as NotifierConstraint;
 
-/*
+/**
  * @author Smaïne Milianni <smaine.milianni@gmail.com>
  */
 trait NotificationAssertionsTrait
 {
-    public static function assertNotificationCount(int $count, string $transportName = null, string $message = ''): void
+    public static function assertNotificationCount(int $count, ?string $transportName = null, string $message = ''): void
     {
         self::assertThat(self::getNotificationEvents(), new NotifierConstraint\NotificationCount($count, $transportName), $message);
     }
 
-    public static function assertQueuedNotificationCount(int $count, string $transportName = null, string $message = ''): void
+    public static function assertQueuedNotificationCount(int $count, ?string $transportName = null, string $message = ''): void
     {
         self::assertThat(self::getNotificationEvents(), new NotifierConstraint\NotificationCount($count, $transportName, true), $message);
     }
@@ -52,12 +52,12 @@ trait NotificationAssertionsTrait
         self::assertThat($notification, new LogicalNot(new NotifierConstraint\NotificationSubjectContains($text)), $message);
     }
 
-    public static function assertNotificationTransportIsEqual(MessageInterface $notification, string $transportName = null, string $message = ''): void
+    public static function assertNotificationTransportIsEqual(MessageInterface $notification, ?string $transportName = null, string $message = ''): void
     {
         self::assertThat($notification, new NotifierConstraint\NotificationTransportIsEqual($transportName), $message);
     }
 
-    public static function assertNotificationTransportIsNotEqual(MessageInterface $notification, string $transportName = null, string $message = ''): void
+    public static function assertNotificationTransportIsNotEqual(MessageInterface $notification, ?string $transportName = null, string $message = ''): void
     {
         self::assertThat($notification, new LogicalNot(new NotifierConstraint\NotificationTransportIsEqual($transportName)), $message);
     }
@@ -65,12 +65,12 @@ trait NotificationAssertionsTrait
     /**
      * @return MessageEvent[]
      */
-    public static function getNotifierEvents(string $transportName = null): array
+    public static function getNotifierEvents(?string $transportName = null): array
     {
         return self::getNotificationEvents()->getEvents($transportName);
     }
 
-    public static function getNotifierEvent(int $index = 0, string $transportName = null): ?MessageEvent
+    public static function getNotifierEvent(int $index = 0, ?string $transportName = null): ?MessageEvent
     {
         return self::getNotifierEvents($transportName)[$index] ?? null;
     }
@@ -78,12 +78,12 @@ trait NotificationAssertionsTrait
     /**
      * @return MessageInterface[]
      */
-    public static function getNotifierMessages(string $transportName = null): array
+    public static function getNotifierMessages(?string $transportName = null): array
     {
         return self::getNotificationEvents()->getMessages($transportName);
     }
 
-    public static function getNotifierMessage(int $index = 0, string $transportName = null): ?MessageInterface
+    public static function getNotifierMessage(int $index = 0, ?string $transportName = null): ?MessageInterface
     {
         return self::getNotifierMessages($transportName)[$index] ?? null;
     }
diff --git a/lib/symfony/framework-bundle/Test/TestBrowserToken.php b/lib/symfony/framework-bundle/Test/TestBrowserToken.php
index 8bf365eb0..25d71d084 100644
--- a/lib/symfony/framework-bundle/Test/TestBrowserToken.php
+++ b/lib/symfony/framework-bundle/Test/TestBrowserToken.php
@@ -23,7 +23,7 @@ class TestBrowserToken extends AbstractToken
 {
     private string $firewallName;
 
-    public function __construct(array $roles = [], UserInterface $user = null, string $firewallName = 'main')
+    public function __construct(array $roles = [], ?UserInterface $user = null, string $firewallName = 'main')
     {
         parent::__construct($roles);
 
diff --git a/lib/symfony/framework-bundle/Test/TestContainer.php b/lib/symfony/framework-bundle/Test/TestContainer.php
index e1e7a8592..288fd76e8 100644
--- a/lib/symfony/framework-bundle/Test/TestContainer.php
+++ b/lib/symfony/framework-bundle/Test/TestContainer.php
@@ -71,15 +71,11 @@ class TestContainer extends Container
         $container = $this->getPublicContainer();
         $renamedId = $this->renamedIds[$id] ?? $id;
 
-        try {
+        if (!$this->getPrivateContainer()->has($renamedId)) {
             $container->set($renamedId, $service);
-        } catch (InvalidArgumentException $e) {
-            if (!str_starts_with($e->getMessage(), "The \"$renamedId\" service is private")) {
-                throw $e;
-            }
-            if (isset($container->privates[$renamedId])) {
-                throw new InvalidArgumentException(sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
-            }
+        } elseif (isset($container->privates[$renamedId])) {
+            throw new InvalidArgumentException(\sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
+        } else {
             $container->privates[$renamedId] = $service;
         }
     }
diff --git a/lib/symfony/framework-bundle/Test/WebTestCase.php b/lib/symfony/framework-bundle/Test/WebTestCase.php
index de31d4ba9..9c6ee9c98 100644
--- a/lib/symfony/framework-bundle/Test/WebTestCase.php
+++ b/lib/symfony/framework-bundle/Test/WebTestCase.php
@@ -38,7 +38,7 @@ abstract class WebTestCase extends KernelTestCase
     protected static function createClient(array $options = [], array $server = []): KernelBrowser
     {
         if (static::$booted) {
-            throw new \LogicException(sprintf('Booting the kernel before calling "%s()" is not supported, the kernel should only be booted once.', __METHOD__));
+            throw new \LogicException(\sprintf('Booting the kernel before calling "%s()" is not supported, the kernel should only be booted once.', __METHOD__));
         }
 
         $kernel = static::bootKernel($options);
diff --git a/lib/symfony/framework-bundle/Translation/Translator.php b/lib/symfony/framework-bundle/Translation/Translator.php
index 04b56308f..d53296ee6 100644
--- a/lib/symfony/framework-bundle/Translation/Translator.php
+++ b/lib/symfony/framework-bundle/Translation/Translator.php
@@ -83,7 +83,7 @@ class Translator extends BaseTranslator implements WarmableInterface
 
         // check option names
         if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+            throw new InvalidArgumentException(\sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
         }
 
         $this->options = array_merge($this->options, $options);
@@ -118,7 +118,7 @@ class Translator extends BaseTranslator implements WarmableInterface
         return [];
     }
 
-    public function addResource(string $format, mixed $resource, string $locale, string $domain = null): void
+    public function addResource(string $format, mixed $resource, string $locale, ?string $domain = null): void
     {
         if ($this->resourceFiles) {
             $this->addResourceFiles();
diff --git a/lib/symfony/framework-bundle/composer.json b/lib/symfony/framework-bundle/composer.json
index 3aedebd74..c3aab8455 100644
--- a/lib/symfony/framework-bundle/composer.json
+++ b/lib/symfony/framework-bundle/composer.json
@@ -21,7 +21,7 @@
         "ext-xml": "*",
         "symfony/cache": "^5.4|^6.0|^7.0",
         "symfony/config": "^6.1|^7.0",
-        "symfony/dependency-injection": "^6.4|^7.0",
+        "symfony/dependency-injection": "^6.4.12|^7.0",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1|^7.0",
         "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
@@ -57,7 +57,7 @@
         "symfony/notifier": "^5.4|^6.0|^7.0",
         "symfony/process": "^5.4|^6.0|^7.0",
         "symfony/rate-limiter": "^5.4|^6.0|^7.0",
-        "symfony/scheduler": "^6.4|^7.0",
+        "symfony/scheduler": "^6.4.4|^7.0.4",
         "symfony/security-bundle": "^5.4|^6.0|^7.0",
         "symfony/semaphore": "^5.4|^6.0|^7.0",
         "symfony/serializer": "^6.4|^7.0",
@@ -72,7 +72,7 @@
         "symfony/uid": "^5.4|^6.0|^7.0",
         "symfony/web-link": "^5.4|^6.0|^7.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/twig": "^2.10|^3.0"
+        "twig/twig": "^2.10|^3.0.4"
     },
     "conflict": {
         "doctrine/annotations": "<1.13.1",
@@ -93,7 +93,8 @@
         "symfony/mime": "<6.4",
         "symfony/property-info": "<5.4",
         "symfony/property-access": "<5.4",
-        "symfony/scheduler": "<6.4",
+        "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6",
+        "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
         "symfony/serializer": "<6.4",
         "symfony/security-csrf": "<5.4",
         "symfony/security-core": "<5.4",
diff --git a/lib/symfony/http-foundation/AcceptHeader.php b/lib/symfony/http-foundation/AcceptHeader.php
index 853c000e0..e735c7564 100644
--- a/lib/symfony/http-foundation/AcceptHeader.php
+++ b/lib/symfony/http-foundation/AcceptHeader.php
@@ -25,7 +25,7 @@ class_exists(AcceptHeaderItem::class);
 class AcceptHeader
 {
     /**
-     * @var AcceptHeaderItem[]
+     * @var array<string, AcceptHeaderItem>
      */
     private array $items = [];
 
@@ -46,18 +46,15 @@ class AcceptHeader
      */
     public static function fromString(?string $headerValue): self
     {
-        $parts = HeaderUtils::split($headerValue ?? '', ',;=');
+        $items = [];
+        foreach (HeaderUtils::split($headerValue ?? '', ',;=') as $i => $parts) {
+            $part = array_shift($parts);
+            $item = new AcceptHeaderItem($part[0], HeaderUtils::combine($parts));
 
-        return new self(array_map(function ($subParts) {
-            static $index = 0;
-            $part = array_shift($subParts);
-            $attributes = HeaderUtils::combine($subParts);
+            $items[] = $item->setIndex($i);
+        }
 
-            $item = new AcceptHeaderItem($part[0], $attributes);
-            $item->setIndex($index++);
-
-            return $item;
-        }, $parts));
+        return new self($items);
     }
 
     /**
@@ -73,7 +70,9 @@ class AcceptHeader
      */
     public function has(string $value): bool
     {
-        return isset($this->items[$value]);
+        $canonicalKey = $this->getCanonicalKey(AcceptHeaderItem::fromString($value));
+
+        return isset($this->items[$canonicalKey]);
     }
 
     /**
@@ -81,7 +80,26 @@ class AcceptHeader
      */
     public function get(string $value): ?AcceptHeaderItem
     {
-        return $this->items[$value] ?? $this->items[explode('/', $value)[0].'/*'] ?? $this->items['*/*'] ?? $this->items['*'] ?? null;
+        $queryItem = AcceptHeaderItem::fromString($value.';q=1');
+        $canonicalKey = $this->getCanonicalKey($queryItem);
+
+        if (isset($this->items[$canonicalKey])) {
+            return $this->items[$canonicalKey];
+        }
+
+        // Collect and filter matching candidates
+        if (!$candidates = array_filter($this->items, fn (AcceptHeaderItem $item) => $this->matches($item, $queryItem))) {
+            return null;
+        }
+
+        usort(
+            $candidates,
+            fn ($a, $b) => $this->getSpecificity($b, $queryItem) <=> $this->getSpecificity($a, $queryItem) // Descending specificity
+                ?: $b->getQuality() <=> $a->getQuality() // Descending quality
+                ?: $a->getIndex() <=> $b->getIndex() // Ascending index (stability)
+        );
+
+        return reset($candidates);
     }
 
     /**
@@ -91,7 +109,7 @@ class AcceptHeader
      */
     public function add(AcceptHeaderItem $item): static
     {
-        $this->items[$item->getValue()] = $item;
+        $this->items[$this->getCanonicalKey($item)] = $item;
         $this->sorted = false;
 
         return $this;
@@ -114,7 +132,7 @@ class AcceptHeader
      */
     public function filter(string $pattern): self
     {
-        return new self(array_filter($this->items, fn (AcceptHeaderItem $item) => preg_match($pattern, $item->getValue())));
+        return new self(array_filter($this->items, static fn ($item) => preg_match($pattern, $item->getValue())));
     }
 
     /**
@@ -133,18 +151,154 @@ class AcceptHeader
     private function sort(): void
     {
         if (!$this->sorted) {
-            uasort($this->items, function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
-                $qA = $a->getQuality();
-                $qB = $b->getQuality();
-
-                if ($qA === $qB) {
-                    return $a->getIndex() > $b->getIndex() ? 1 : -1;
-                }
-
-                return $qA > $qB ? -1 : 1;
-            });
+            uasort($this->items, static fn ($a, $b) => $b->getQuality() <=> $a->getQuality() ?: $a->getIndex() <=> $b->getIndex());
 
             $this->sorted = true;
         }
     }
+
+    /**
+     * Generates the canonical key for storing/retrieving an item.
+     */
+    private function getCanonicalKey(AcceptHeaderItem $item): string
+    {
+        $parts = [];
+
+        // Normalize and sort attributes for consistent key generation
+        $attributes = $this->getMediaParams($item);
+        ksort($attributes);
+
+        foreach ($attributes as $name => $value) {
+            if (null === $value) {
+                $parts[] = $name; // Flag parameter (e.g., "flowed")
+                continue;
+            }
+
+            // Quote values containing spaces, commas, semicolons, or equals per RFC 9110
+            // This handles cases like 'format="value with space"' or similar.
+            $quotedValue = \is_string($value) && preg_match('/[\s;,=]/', $value) ? '"'.addcslashes($value, '"\\').'"' : $value;
+
+            $parts[] = $name.'='.$quotedValue;
+        }
+
+        return $item->getValue().($parts ? ';'.implode(';', $parts) : '');
+    }
+
+    /**
+     * Checks if a given header item (range) matches a queried item (value).
+     *
+     * @param AcceptHeaderItem $rangeItem The item from the Accept header (e.g., text/*;format=flowed)
+     * @param AcceptHeaderItem $queryItem The item being queried (e.g., text/plain;format=flowed;charset=utf-8)
+     */
+    private function matches(AcceptHeaderItem $rangeItem, AcceptHeaderItem $queryItem): bool
+    {
+        $rangeValue = strtolower($rangeItem->getValue());
+        $queryValue = strtolower($queryItem->getValue());
+
+        // Handle universal wildcard ranges
+        if ('*' === $rangeValue || '*/*' === $rangeValue) {
+            return $this->rangeParametersMatch($rangeItem, $queryItem);
+        }
+
+        // Queries for '*' only match wildcard ranges (handled above)
+        if ('*' === $queryValue) {
+            return false;
+        }
+
+        // Ensure media vs. non-media consistency
+        $isQueryMedia = str_contains($queryValue, '/');
+        $isRangeMedia = str_contains($rangeValue, '/');
+
+        if ($isQueryMedia !== $isRangeMedia) {
+            return false;
+        }
+
+        // Non-media: exact match only (wildcards handled above)
+        if (!$isQueryMedia) {
+            return $rangeValue === $queryValue && $this->rangeParametersMatch($rangeItem, $queryItem);
+        }
+
+        // Media type: type/subtype with wildcards
+        [$queryType, $querySubtype] = explode('/', $queryValue, 2);
+        [$rangeType, $rangeSubtype] = explode('/', $rangeValue, 2) + [1 => '*'];
+
+        if ('*' !== $rangeType && $rangeType !== $queryType) {
+            return false;
+        }
+
+        if ('*' !== $rangeSubtype && $rangeSubtype !== $querySubtype) {
+            return false;
+        }
+
+        // Parameters must match
+        return $this->rangeParametersMatch($rangeItem, $queryItem);
+    }
+
+    /**
+     * Checks if the parameters of a range item are satisfied by the query item.
+     *
+     * Parameters are case-insensitive; range params must be a subset of query params.
+     */
+    private function rangeParametersMatch(AcceptHeaderItem $rangeItem, AcceptHeaderItem $queryItem): bool
+    {
+        $queryAttributes = $this->getMediaParams($queryItem);
+        $rangeAttributes = $this->getMediaParams($rangeItem);
+
+        foreach ($rangeAttributes as $name => $rangeValue) {
+            if (!\array_key_exists($name, $queryAttributes)) {
+                return false; // Missing required param
+            }
+
+            $queryValue = $queryAttributes[$name];
+
+            if (null === $rangeValue) {
+                return null === $queryValue; // Both flags or neither
+            }
+
+            if (null === $queryValue || strtolower($queryValue) !== strtolower($rangeValue)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Calculates a specificity score for sorting: media precision + param count.
+     */
+    private function getSpecificity(AcceptHeaderItem $item, AcceptHeaderItem $queryItem): int
+    {
+        $rangeValue = strtolower($item->getValue());
+        $queryValue = strtolower($queryItem->getValue());
+
+        $paramCount = \count($this->getMediaParams($item));
+
+        $isQueryMedia = str_contains($queryValue, '/');
+        $isRangeMedia = str_contains($rangeValue, '/');
+
+        if (!$isQueryMedia && !$isRangeMedia) {
+            return ('*' !== $rangeValue ? 2000 : 1000) + $paramCount;
+        }
+
+        [$rangeType, $rangeSubtype] = explode('/', $rangeValue, 2) + [1 => '*'];
+
+        $specificity = match (true) {
+            '*' !== $rangeSubtype => 3000, // Exact subtype (text/plain)
+            '*' !== $rangeType => 2000,    // Type wildcard (text/*)
+            default => 1000,               // Full wildcard (*/* or *)
+        };
+
+        return $specificity + $paramCount;
+    }
+
+    /**
+     * Returns normalized attributes: keys lowercased, excluding 'q'.
+     */
+    private function getMediaParams(AcceptHeaderItem $item): array
+    {
+        $attributes = array_change_key_case($item->getAttributes(), \CASE_LOWER);
+        unset($attributes['q']);
+
+        return $attributes;
+    }
 }
diff --git a/lib/symfony/http-foundation/Request.php b/lib/symfony/http-foundation/Request.php
index a66312c8e..8a497a77c 100644
--- a/lib/symfony/http-foundation/Request.php
+++ b/lib/symfony/http-foundation/Request.php
@@ -857,7 +857,7 @@ class Request
      *
      * Suppose this request is instantiated from /mysite on localhost:
      *
-     *  * http://localhost/mysite              returns an empty string
+     *  * http://localhost/mysite              returns '/'
      *  * http://localhost/mysite/about        returns '/about'
      *  * http://localhost/mysite/enco%20ded   returns '/enco%20ded'
      *  * http://localhost/mysite/about?var=1  returns '/about'
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 48c219a7a..8d757f03f 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -194,7 +194,6 @@ class PdoSessionHandler extends AbstractSessionHandler
                 $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
                 $table->addColumn($this->lifetimeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
                 $table->addColumn($this->timeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
-                $table->addOption('collate', 'utf8mb4_bin');
                 $table->addOption('engine', 'InnoDB');
                 break;
             case 'sqlite':
@@ -252,7 +251,7 @@ class PdoSessionHandler extends AbstractSessionHandler
             // - trailing space removal
             // - case-insensitivity
             // - language processing like é == e
-            'mysql' => "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8mb4_bin, ENGINE = InnoDB",
+            'mysql' => "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL), ENGINE = InnoDB",
             'sqlite' => "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)",
             'pgsql' => "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol BYTEA NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)",
             'oci' => "CREATE TABLE $this->table ($this->idCol VARCHAR2(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)",
@@ -795,6 +794,12 @@ class PdoSessionHandler extends AbstractSessionHandler
                 rewind($data);
                 $sql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, EMPTY_BLOB(), :expiry, :time) RETURNING $this->dataCol into :data";
                 break;
+            case 'sqlsrv':
+                $data = fopen('php://memory', 'r+');
+                fwrite($data, $sessionData);
+                rewind($data);
+                $sql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :expiry, :time)";
+                break;
             default:
                 $data = $sessionData;
                 $sql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :expiry, :time)";
@@ -822,6 +827,12 @@ class PdoSessionHandler extends AbstractSessionHandler
                 rewind($data);
                 $sql = "UPDATE $this->table SET $this->dataCol = EMPTY_BLOB(), $this->lifetimeCol = :expiry, $this->timeCol = :time WHERE $this->idCol = :id RETURNING $this->dataCol into :data";
                 break;
+            case 'sqlsrv':
+                $data = fopen('php://memory', 'r+');
+                fwrite($data, $sessionData);
+                rewind($data);
+                $sql = "UPDATE $this->table SET $this->dataCol = :data, $this->lifetimeCol = :expiry, $this->timeCol = :time WHERE $this->idCol = :id";
+                break;
             default:
                 $data = $sessionData;
                 $sql = "UPDATE $this->table SET $this->dataCol = :data, $this->lifetimeCol = :expiry, $this->timeCol = :time WHERE $this->idCol = :id";
@@ -869,12 +880,16 @@ class PdoSessionHandler extends AbstractSessionHandler
         $mergeStmt = $this->pdo->prepare($mergeSql);
 
         if ('sqlsrv' === $this->driver) {
+            $dataStream = fopen('php://memory', 'r+');
+            fwrite($dataStream, $data);
+            rewind($dataStream);
+
             $mergeStmt->bindParam(1, $sessionId, \PDO::PARAM_STR);
             $mergeStmt->bindParam(2, $sessionId, \PDO::PARAM_STR);
-            $mergeStmt->bindParam(3, $data, \PDO::PARAM_LOB);
+            $mergeStmt->bindParam(3, $dataStream, \PDO::PARAM_LOB);
             $mergeStmt->bindValue(4, time() + $maxlifetime, \PDO::PARAM_INT);
             $mergeStmt->bindValue(5, time(), \PDO::PARAM_INT);
-            $mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
+            $mergeStmt->bindParam(6, $dataStream, \PDO::PARAM_LOB);
             $mergeStmt->bindValue(7, time() + $maxlifetime, \PDO::PARAM_INT);
             $mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
         } else {
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php b/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
index 43a9eb84e..e41d03539 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -62,6 +62,7 @@ class SessionHandlerFactory
                     throw new \InvalidArgumentException('Unsupported Redis or Memcached DSN. Try running "composer require symfony/cache".');
                 }
                 $handlerClass = str_starts_with($connection, 'memcached:') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
+                $connection = preg_replace('/([?&])prefix=[^&]*+&?/', '\1', $connection);
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
                 return new $handlerClass($connection, array_intersect_key($options, ['prefix' => 1, 'ttl' => 1]));
diff --git a/lib/symfony/http-kernel/Attribute/MapQueryParameter.php b/lib/symfony/http-kernel/Attribute/MapQueryParameter.php
index f83e331e4..bbc1fff27 100644
--- a/lib/symfony/http-kernel/Attribute/MapQueryParameter.php
+++ b/lib/symfony/http-kernel/Attribute/MapQueryParameter.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValue
 final class MapQueryParameter extends ValueResolver
 {
     /**
-     * @see https://php.net/filter.filters.validate for filter, flags and options
+     * @see https://php.net/manual/filter.constants for filter, flags and options
      *
      * @param string|null $name The name of the query parameter. If null, the name of the argument in the controller will be used.
      */
diff --git a/lib/symfony/http-kernel/Attribute/WithLogLevel.php b/lib/symfony/http-kernel/Attribute/WithLogLevel.php
index 762b07704..10ed3b8ea 100644
--- a/lib/symfony/http-kernel/Attribute/WithLogLevel.php
+++ b/lib/symfony/http-kernel/Attribute/WithLogLevel.php
@@ -25,7 +25,7 @@ final class WithLogLevel
     public function __construct(public readonly string $level)
     {
         if (!\defined('Psr\Log\LogLevel::'.strtoupper($this->level))) {
-            throw new \InvalidArgumentException(sprintf('Invalid log level "%s".', $this->level));
+            throw new \InvalidArgumentException(\sprintf('Invalid log level "%s".', $this->level));
         }
     }
 }
diff --git a/lib/symfony/http-kernel/Bundle/Bundle.php b/lib/symfony/http-kernel/Bundle/Bundle.php
index 09a19c480..0efc21a5e 100644
--- a/lib/symfony/http-kernel/Bundle/Bundle.php
+++ b/lib/symfony/http-kernel/Bundle/Bundle.php
@@ -70,7 +70,7 @@ abstract class Bundle implements BundleInterface
 
             if (null !== $extension) {
                 if (!$extension instanceof ExtensionInterface) {
-                    throw new \LogicException(sprintf('Extension "%s" must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_debug_type($extension)));
+                    throw new \LogicException(\sprintf('Extension "%s" must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_debug_type($extension)));
                 }
 
                 // check naming convention
@@ -78,7 +78,7 @@ abstract class Bundle implements BundleInterface
                 $expectedAlias = Container::underscore($basename);
 
                 if ($expectedAlias != $extension->getAlias()) {
-                    throw new \LogicException(sprintf('Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.', $expectedAlias, $extension->getAlias()));
+                    throw new \LogicException(\sprintf('Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.', $expectedAlias, $extension->getAlias()));
                 }
 
                 $this->extension = $extension;
diff --git a/lib/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php b/lib/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
index 3c99b74af..87614e941 100644
--- a/lib/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
+++ b/lib/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
@@ -39,7 +39,7 @@ class Psr6CacheClearer implements CacheClearerInterface
     public function getPool(string $name): CacheItemPoolInterface
     {
         if (!$this->hasPool($name)) {
-            throw new \InvalidArgumentException(sprintf('Cache pool not found: "%s".', $name));
+            throw new \InvalidArgumentException(\sprintf('Cache pool not found: "%s".', $name));
         }
 
         return $this->pools[$name];
@@ -51,7 +51,7 @@ class Psr6CacheClearer implements CacheClearerInterface
     public function clearPool(string $name): bool
     {
         if (!isset($this->pools[$name])) {
-            throw new \InvalidArgumentException(sprintf('Cache pool not found: "%s".', $name));
+            throw new \InvalidArgumentException(\sprintf('Cache pool not found: "%s".', $name));
         }
 
         return $this->pools[$name]->clear();
diff --git a/lib/symfony/http-kernel/CacheWarmer/CacheWarmer.php b/lib/symfony/http-kernel/CacheWarmer/CacheWarmer.php
index f940ba4a7..664110a22 100644
--- a/lib/symfony/http-kernel/CacheWarmer/CacheWarmer.php
+++ b/lib/symfony/http-kernel/CacheWarmer/CacheWarmer.php
@@ -30,6 +30,6 @@ abstract class CacheWarmer implements CacheWarmerInterface
             return;
         }
 
-        throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
+        throw new \RuntimeException(\sprintf('Failed to write cache file "%s".', $file));
     }
 }
diff --git a/lib/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php b/lib/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
index a672956e0..9f1c53456 100644
--- a/lib/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/lib/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
@@ -31,7 +31,7 @@ class CacheWarmerAggregate implements CacheWarmerInterface
     /**
      * @param iterable<mixed, CacheWarmerInterface> $warmers
      */
-    public function __construct(iterable $warmers = [], bool $debug = false, string $deprecationLogsFilepath = null)
+    public function __construct(iterable $warmers = [], bool $debug = false, ?string $deprecationLogsFilepath = null)
     {
         $this->warmers = $warmers;
         $this->debug = $debug;
@@ -51,7 +51,7 @@ class CacheWarmerAggregate implements CacheWarmerInterface
     /**
      * @param string|null $buildDir
      */
-    public function warmUp(string $cacheDir, string|SymfonyStyle $buildDir = null, SymfonyStyle $io = null): array
+    public function warmUp(string $cacheDir, string|SymfonyStyle|null $buildDir = null, ?SymfonyStyle $io = null): array
     {
         if ($buildDir instanceof SymfonyStyle) {
             trigger_deprecation('symfony/http-kernel', '6.4', 'Passing a "%s" as second argument of "%s()" is deprecated, pass it as third argument instead, after the build directory.', SymfonyStyle::class, __METHOD__);
@@ -107,13 +107,13 @@ class CacheWarmerAggregate implements CacheWarmerInterface
                 $start = microtime(true);
                 foreach ((array) $warmer->warmUp($cacheDir, $buildDir) as $item) {
                     if (is_dir($item) || (str_starts_with($item, \dirname($cacheDir)) && !is_file($item)) || ($buildDir && str_starts_with($item, \dirname($buildDir)) && !is_file($item))) {
-                        throw new \LogicException(sprintf('"%s::warmUp()" should return a list of files or classes but "%s" is none of them.', $warmer::class, $item));
+                        throw new \LogicException(\sprintf('"%s::warmUp()" should return a list of files or classes but "%s" is none of them.', $warmer::class, $item));
                     }
                     $preload[] = $item;
                 }
 
                 if ($io?->isDebug()) {
-                    $io->info(sprintf('"%s" completed in %0.2fms.', $warmer::class, 1000 * (microtime(true) - $start)));
+                    $io->info(\sprintf('"%s" completed in %0.2fms.', $warmer::class, 1000 * (microtime(true) - $start)));
                 }
             }
         } finally {
diff --git a/lib/symfony/http-kernel/Config/FileLocator.php b/lib/symfony/http-kernel/Config/FileLocator.php
index f81f91925..fb6bb10f1 100644
--- a/lib/symfony/http-kernel/Config/FileLocator.php
+++ b/lib/symfony/http-kernel/Config/FileLocator.php
@@ -30,7 +30,7 @@ class FileLocator extends BaseFileLocator
         parent::__construct();
     }
 
-    public function locate(string $file, string $currentPath = null, bool $first = true): string|array
+    public function locate(string $file, ?string $currentPath = null, bool $first = true): string|array
     {
         if (isset($file[0]) && '@' === $file[0]) {
             $resource = $this->kernel->locateResource($file);
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver.php
index 6643cc58e..991e99bdc 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver.php
@@ -39,14 +39,14 @@ final class ArgumentResolver implements ArgumentResolverInterface
     /**
      * @param iterable<mixed, ArgumentValueResolverInterface|ValueResolverInterface> $argumentValueResolvers
      */
-    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [], ContainerInterface $namedResolvers = null)
+    public function __construct(?ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [], ?ContainerInterface $namedResolvers = null)
     {
         $this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory();
         $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
         $this->namedResolvers = $namedResolvers;
     }
 
-    public function getArguments(Request $request, callable $controller, \ReflectionFunctionAbstract $reflector = null): array
+    public function getArguments(Request $request, callable $controller, ?\ReflectionFunctionAbstract $reflector = null): array
     {
         $arguments = [];
 
@@ -60,7 +60,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
                     if ($attribute->disabled) {
                         $disabledResolvers[$attribute->resolver] = true;
                     } elseif ($resolverName) {
-                        throw new \LogicException(sprintf('You can only pin one resolver per argument, but argument "$%s" of "%s()" has more.', $metadata->getName(), $this->getPrettyName($controller)));
+                        throw new \LogicException(\sprintf('You can only pin one resolver per argument, but argument "$%s" of "%s()" has more.', $metadata->getName(), $this->getPrettyName($controller)));
                     } else {
                         $resolverName = $attribute->resolver;
                     }
@@ -94,7 +94,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
                 }
 
                 if (1 < $count && !$metadata->isVariadic()) {
-                    throw new \InvalidArgumentException(sprintf('"%s::resolve()" must yield at most one value for non-variadic arguments.', get_debug_type($resolver)));
+                    throw new \InvalidArgumentException(\sprintf('"%s::resolve()" must yield at most one value for non-variadic arguments.', get_debug_type($resolver)));
                 }
 
                 if ($count) {
@@ -103,11 +103,11 @@ final class ArgumentResolver implements ArgumentResolverInterface
                 }
 
                 if (!$resolver instanceof ValueResolverInterface) {
-                    throw new \InvalidArgumentException(sprintf('"%s::resolve()" must yield at least one value.', get_debug_type($resolver)));
+                    throw new \InvalidArgumentException(\sprintf('"%s::resolve()" must yield at least one value.', get_debug_type($resolver)));
                 }
             }
 
-            throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument. Either the argument is nullable and no null value has been provided, no default value has been provided or there is a non-optional argument after this one.', $this->getPrettyName($controller), $metadata->getName()));
+            throw new \RuntimeException(\sprintf('Controller "%s" requires that you provide a value for the "$%s" argument. Either the argument is nullable and no null value has been provided, no default value has been provided or there is a non-optional argument after this one.', $this->getPrettyName($controller), $metadata->getName()));
         }
 
         return $arguments;
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/BackedEnumValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
index 620e2de08..c29725dd2 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
@@ -78,7 +78,7 @@ class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueRe
         }
 
         if (!\is_int($value) && !\is_string($value)) {
-            throw new \LogicException(sprintf('Could not resolve the "%s $%s" controller argument: expecting an int or string, got "%s".', $argument->getType(), $argument->getName(), get_debug_type($value)));
+            throw new \LogicException(\sprintf('Could not resolve the "%s $%s" controller argument: expecting an int or string, got "%s".', $argument->getType(), $argument->getName(), get_debug_type($value)));
         }
 
         /** @var class-string<\BackedEnum> $enumType */
@@ -87,7 +87,7 @@ class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueRe
         try {
             return [$enumType::from($value)];
         } catch (\ValueError|\TypeError $e) {
-            throw new NotFoundHttpException(sprintf('Could not resolve the "%s $%s" controller argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e);
+            throw new NotFoundHttpException(\sprintf('Could not resolve the "%s $%s" controller argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e);
         }
     }
 }
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/DateTimeValueResolver.php
index 0cfd42bad..388f02b31 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/DateTimeValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -90,7 +90,7 @@ final class DateTimeValueResolver implements ArgumentValueResolverInterface, Val
         }
 
         if (!$date) {
-            throw new NotFoundHttpException(sprintf('Invalid date given for parameter "%s".', $argument->getName()));
+            throw new NotFoundHttpException(\sprintf('Invalid date given for parameter "%s".', $argument->getName()));
         }
 
         return [$date];
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
index 264036128..594f1b8a6 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
@@ -82,8 +82,8 @@ final class NotTaggedControllerValueResolver implements ArgumentValueResolverInt
             return [];
         }
 
-        $what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
-        $message = sprintf('Could not resolve %s, maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?', $what);
+        $what = \sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
+        $message = \sprintf('Could not resolve %s, maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?', $what);
 
         throw new RuntimeException($message);
     }
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/QueryParameterValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
index b186a39c5..0b64a444b 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
@@ -38,7 +38,7 @@ final class QueryParameterValueResolver implements ValueResolverInterface
                 return [];
             }
 
-            throw new NotFoundHttpException(sprintf('Missing query parameter "%s".', $name));
+            throw new NotFoundHttpException(\sprintf('Missing query parameter "%s".', $name));
         }
 
         $value = $request->query->all()[$name];
@@ -52,7 +52,7 @@ final class QueryParameterValueResolver implements ValueResolverInterface
             $filtered = array_values(array_filter((array) $value, \is_array(...)));
 
             if ($filtered !== $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
-                throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+                throw new NotFoundHttpException(\sprintf('Invalid query parameter "%s".', $name));
             }
 
             return $filtered;
@@ -80,8 +80,8 @@ final class QueryParameterValueResolver implements ValueResolverInterface
             default => match ($enumType = is_subclass_of($type, \BackedEnum::class) ? (new \ReflectionEnum($type))->getBackingType()->getName() : null) {
                 'int' => \FILTER_VALIDATE_INT,
                 'string' => \FILTER_DEFAULT,
-                default => throw new \LogicException(sprintf('#[MapQueryParameter] cannot be used on controller argument "%s$%s" of type "%s"; one of array, string, int, float, bool or \BackedEnum should be used.', $argument->isVariadic() ? '...' : '', $argument->getName(), $type ?? 'mixed')),
-            }
+                default => throw new \LogicException(\sprintf('#[MapQueryParameter] cannot be used on controller argument "%s$%s" of type "%s"; one of array, string, int, float, bool or \BackedEnum should be used.', $argument->isVariadic() ? '...' : '', $argument->getName(), $type ?? 'mixed')),
+            },
         };
 
         $value = filter_var($value, $attribute->filter ?? $filter, $options);
@@ -103,7 +103,7 @@ final class QueryParameterValueResolver implements ValueResolverInterface
         }
 
         if (null === $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
-            throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+            throw new NotFoundHttpException(\sprintf('Invalid query parameter "%s".', $name));
         }
 
         if (!\is_array($value)) {
@@ -117,7 +117,7 @@ final class QueryParameterValueResolver implements ValueResolverInterface
         }
 
         if ($filtered !== $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
-            throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+            throw new NotFoundHttpException(\sprintf('Invalid query parameter "%s".', $name));
         }
 
         return $argument->isVariadic() ? $filtered : [$filtered];
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
index 444be1b3f..0fb42944f 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -40,11 +40,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscriberInterface
 {
     /**
-     * @see \Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT
      * @see DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS
      */
     private const CONTEXT_DENORMALIZE = [
-        'disable_type_enforcement' => true,
         'collect_denormalization_errors' => true,
     ];
 
@@ -73,7 +71,7 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
         }
 
         if ($argument->isVariadic()) {
-            throw new \LogicException(sprintf('Mapping variadic argument "$%s" is not supported.', $argument->getName()));
+            throw new \LogicException(\sprintf('Mapping variadic argument "$%s" is not supported.', $argument->getName()));
         }
 
         $attribute->metadata = $argument;
@@ -98,7 +96,7 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
             $request = $event->getRequest();
 
             if (!$type = $argument->metadata->getType()) {
-                throw new \LogicException(sprintf('Could not resolve the "$%s" controller argument: argument should be typed.', $argument->metadata->getName()));
+                throw new \LogicException(\sprintf('Could not resolve the "$%s" controller argument: argument should be typed.', $argument->metadata->getName()));
             }
 
             if ($this->validator) {
@@ -108,11 +106,15 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
                 } catch (PartialDenormalizationException $e) {
                     $trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);
                     foreach ($e->getErrors() as $error) {
-                        $parameters = ['{{ type }}' => implode('|', $error->getExpectedTypes())];
+                        $parameters = [];
+                        $template = 'This value was of an unexpected type.';
+                        if ($expectedTypes = $error->getExpectedTypes()) {
+                            $template = 'This value should be of type {{ type }}.';
+                            $parameters['{{ type }}'] = implode('|', $expectedTypes);
+                        }
                         if ($error->canUseMessageForUser()) {
                             $parameters['hint'] = $error->getMessage();
                         }
-                        $template = 'This value should be of type {{ type }}.';
                         $message = $trans($template, $parameters, 'validators');
                         $violations->add(new ConstraintViolation($message, $template, $parameters, null, $error->getPath(), null));
                     }
@@ -138,7 +140,7 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
                 $payload = match (true) {
                     $argument->metadata->hasDefaultValue() => $argument->metadata->getDefaultValue(),
                     $argument->metadata->isNullable() => null,
-                    default => throw new HttpException($validationFailedCode)
+                    default => throw new HttpException($validationFailedCode),
                 };
             }
 
@@ -161,25 +163,25 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
             return null;
         }
 
-        return $this->serializer->denormalize($data, $type, null, $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
+        return $this->serializer->denormalize($data, $type, 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
     }
 
     private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
     {
+        if ('' === $data = $request->request->all() ?: $request->getContent()) {
+            return null;
+        }
+
         if (null === $format = $request->getContentTypeFormat()) {
             throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, 'Unsupported format.');
         }
 
         if ($attribute->acceptFormat && !\in_array($format, (array) $attribute->acceptFormat, true)) {
-            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, sprintf('Unsupported format, expects "%s", but "%s" given.', implode('", "', (array) $attribute->acceptFormat), $format));
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, \sprintf('Unsupported format, expects "%s", but "%s" given.', implode('", "', (array) $attribute->acceptFormat), $format));
         }
 
-        if ($data = $request->request->all()) {
-            return $this->serializer->denormalize($data, $type, null, $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
-        }
-
-        if ('' === $data = $request->getContent()) {
-            return null;
+        if (\is_array($data)) {
+            return $this->serializer->denormalize($data, $type, 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
         }
 
         if ('form' === $format) {
@@ -189,9 +191,9 @@ class RequestPayloadValueResolver implements ValueResolverInterface, EventSubscr
         try {
             return $this->serializer->deserialize($data, $type, $format, self::CONTEXT_DESERIALIZE + $attribute->serializationContext);
         } catch (UnsupportedFormatException $e) {
-            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, sprintf('Unsupported format: "%s".', $format), $e);
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, \sprintf('Unsupported format: "%s".', $format), $e);
         } catch (NotEncodableValueException $e) {
-            throw new HttpException(Response::HTTP_BAD_REQUEST, sprintf('Request payload contains invalid "%s" data.', $format), $e);
+            throw new HttpException(Response::HTTP_BAD_REQUEST, \sprintf('Request payload contains invalid "%s" data.', $format), $e);
         }
     }
 }
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
index 96e0337d6..fecf59caf 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -83,11 +83,11 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface, Valu
         try {
             return [$this->container->get($controller)->get($argument->getName())];
         } catch (RuntimeException $e) {
-            $what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
+            $what = \sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
             $message = preg_replace('/service "\.service_locator\.[^"]++"/', $what, $e->getMessage());
 
             if ($e->getMessage() === $message) {
-                $message = sprintf('Cannot resolve %s: %s', $what, $message);
+                $message = \sprintf('Cannot resolve %s: %s', $what, $message);
             }
 
             $r = new \ReflectionProperty($e, 'message');
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/UidValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/UidValueResolver.php
index 7a12e21ea..afe702300 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/UidValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/UidValueResolver.php
@@ -46,7 +46,7 @@ final class UidValueResolver implements ArgumentValueResolverInterface, ValueRes
         try {
             return [$uidClass::fromString($value)];
         } catch (\InvalidArgumentException $e) {
-            throw new NotFoundHttpException(sprintf('The uid for the "%s" parameter is invalid.', $argument->getName()), $e);
+            throw new NotFoundHttpException(\sprintf('The uid for the "%s" parameter is invalid.', $argument->getName()), $e);
         }
     }
 }
diff --git a/lib/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php b/lib/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
index 4f6cba729..b4946698d 100644
--- a/lib/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
+++ b/lib/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
@@ -42,7 +42,7 @@ final class VariadicValueResolver implements ArgumentValueResolverInterface, Val
         $values = $request->attributes->get($argument->getName());
 
         if (!\is_array($values)) {
-            throw new \InvalidArgumentException(sprintf('The action argument "...$%1$s" is required to be an array, the request attribute "%1$s" contains a type of "%2$s" instead.', $argument->getName(), get_debug_type($values)));
+            throw new \InvalidArgumentException(\sprintf('The action argument "...$%1$s" is required to be an array, the request attribute "%1$s" contains a type of "%2$s" instead.', $argument->getName(), get_debug_type($values)));
         }
 
         return $values;
diff --git a/lib/symfony/http-kernel/Controller/ContainerControllerResolver.php b/lib/symfony/http-kernel/Controller/ContainerControllerResolver.php
index 1c9254e73..5cd9edb31 100644
--- a/lib/symfony/http-kernel/Controller/ContainerControllerResolver.php
+++ b/lib/symfony/http-kernel/Controller/ContainerControllerResolver.php
@@ -25,7 +25,7 @@ class ContainerControllerResolver extends ControllerResolver
 {
     protected $container;
 
-    public function __construct(ContainerInterface $container, LoggerInterface $logger = null)
+    public function __construct(ContainerInterface $container, ?LoggerInterface $logger = null)
     {
         $this->container = $container;
 
@@ -48,16 +48,16 @@ class ContainerControllerResolver extends ControllerResolver
         $this->throwExceptionIfControllerWasRemoved($class, $e);
 
         if ($e instanceof \ArgumentCountError) {
-            throw new \InvalidArgumentException(sprintf('Controller "%s" has required constructor arguments and does not exist in the container. Did you forget to define the controller as a service?', $class), 0, $e);
+            throw new \InvalidArgumentException(\sprintf('Controller "%s" has required constructor arguments and does not exist in the container. Did you forget to define the controller as a service?', $class), 0, $e);
         }
 
-        throw new \InvalidArgumentException(sprintf('Controller "%s" does neither exist as service nor as class.', $class), 0, $e);
+        throw new \InvalidArgumentException(\sprintf('Controller "%s" does neither exist as service nor as class.', $class), 0, $e);
     }
 
     private function throwExceptionIfControllerWasRemoved(string $controller, \Throwable $previous): void
     {
         if ($this->container instanceof Container && isset($this->container->getRemovedIds()[$controller])) {
-            throw new \InvalidArgumentException(sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $controller), 0, $previous);
+            throw new \InvalidArgumentException(\sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $controller), 0, $previous);
         }
     }
 }
diff --git a/lib/symfony/http-kernel/Controller/ControllerResolver.php b/lib/symfony/http-kernel/Controller/ControllerResolver.php
index d39508949..72ece351b 100644
--- a/lib/symfony/http-kernel/Controller/ControllerResolver.php
+++ b/lib/symfony/http-kernel/Controller/ControllerResolver.php
@@ -29,7 +29,7 @@ class ControllerResolver implements ControllerResolverInterface
     private array $allowedControllerTypes = [];
     private array $allowedControllerAttributes = [AsController::class => AsController::class];
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger;
     }
@@ -74,7 +74,7 @@ class ControllerResolver implements ControllerResolverInterface
             }
 
             if (!\is_callable($controller)) {
-                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
+                throw new \InvalidArgumentException(\sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
             }
 
             return $this->checkController($request, $controller);
@@ -82,7 +82,7 @@ class ControllerResolver implements ControllerResolverInterface
 
         if (\is_object($controller)) {
             if (!\is_callable($controller)) {
-                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
+                throw new \InvalidArgumentException(\sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
             }
 
             return $this->checkController($request, $controller);
@@ -95,11 +95,11 @@ class ControllerResolver implements ControllerResolverInterface
         try {
             $callable = $this->createController($controller);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);
+            throw new \InvalidArgumentException(\sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);
         }
 
         if (!\is_callable($callable)) {
-            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($callable));
+            throw new \InvalidArgumentException(\sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($callable));
         }
 
         return $this->checkController($request, $callable);
@@ -159,19 +159,19 @@ class ControllerResolver implements ControllerResolverInterface
             if (str_contains($callable, '::')) {
                 $callable = explode('::', $callable, 2);
             } else {
-                return sprintf('Function "%s" does not exist.', $callable);
+                return \sprintf('Function "%s" does not exist.', $callable);
             }
         }
 
         if (\is_object($callable)) {
             $availableMethods = $this->getClassMethodsWithoutMagicMethods($callable);
-            $alternativeMsg = $availableMethods ? sprintf(' or use one of the available methods: "%s"', implode('", "', $availableMethods)) : '';
+            $alternativeMsg = $availableMethods ? \sprintf(' or use one of the available methods: "%s"', implode('", "', $availableMethods)) : '';
 
-            return sprintf('Controller class "%s" cannot be called without a method name. You need to implement "__invoke"%s.', get_debug_type($callable), $alternativeMsg);
+            return \sprintf('Controller class "%s" cannot be called without a method name. You need to implement "__invoke"%s.', get_debug_type($callable), $alternativeMsg);
         }
 
         if (!\is_array($callable)) {
-            return sprintf('Invalid type for controller given, expected string, array or object, got "%s".', get_debug_type($callable));
+            return \sprintf('Invalid type for controller given, expected string, array or object, got "%s".', get_debug_type($callable));
         }
 
         if (!isset($callable[0]) || !isset($callable[1]) || 2 !== \count($callable)) {
@@ -181,13 +181,13 @@ class ControllerResolver implements ControllerResolverInterface
         [$controller, $method] = $callable;
 
         if (\is_string($controller) && !class_exists($controller)) {
-            return sprintf('Class "%s" does not exist.', $controller);
+            return \sprintf('Class "%s" does not exist.', $controller);
         }
 
         $className = \is_object($controller) ? get_debug_type($controller) : $controller;
 
         if (method_exists($controller, $method)) {
-            return sprintf('Method "%s" on class "%s" should be public and non-abstract.', $method, $className);
+            return \sprintf('Method "%s" on class "%s" should be public and non-abstract.', $method, $className);
         }
 
         $collection = $this->getClassMethodsWithoutMagicMethods($controller);
@@ -204,12 +204,12 @@ class ControllerResolver implements ControllerResolverInterface
 
         asort($alternatives);
 
-        $message = sprintf('Expected method "%s" on class "%s"', $method, $className);
+        $message = \sprintf('Expected method "%s" on class "%s"', $method, $className);
 
         if (\count($alternatives) > 0) {
-            $message .= sprintf(', did you mean "%s"?', implode('", "', $alternatives));
+            $message .= \sprintf(', did you mean "%s"?', implode('", "', $alternatives));
         } else {
-            $message .= sprintf('. Available methods: "%s".', implode('", "', $collection));
+            $message .= \sprintf('. Available methods: "%s".', implode('", "', $collection));
         }
 
         return $message;
@@ -240,7 +240,7 @@ class ControllerResolver implements ControllerResolverInterface
             $r = new \ReflectionFunction($controller);
             $name = $r->name;
 
-            if (str_contains($name, '{closure}')) {
+            if (str_contains($name, '{closure')) {
                 $name = $class = \Closure::class;
             } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $class = $class->name;
@@ -265,7 +265,7 @@ class ControllerResolver implements ControllerResolverInterface
         }
 
         if (str_contains($name, '@anonymous')) {
-            $name = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $name);
+            $name = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $name);
         }
 
         if (-1 === $request->attributes->get('_check_controller_is_allowed')) {
@@ -274,6 +274,6 @@ class ControllerResolver implements ControllerResolverInterface
             return $controller;
         }
 
-        throw new BadRequestException(sprintf('Callable "%s()" is not allowed as a controller. Did you miss tagging it with "#[AsController]" or registering its type with "%s::allowControllers()"?', $name, self::class));
+        throw new BadRequestException(\sprintf('Callable "%s()" is not allowed as a controller. Did you miss tagging it with "#[AsController]" or registering its type with "%s::allowControllers()"?', $name, self::class));
     }
 }
diff --git a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
index a352090ea..d3ca53fa6 100644
--- a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
+++ b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
@@ -94,7 +94,7 @@ class ArgumentMetadata
     public function getDefaultValue(): mixed
     {
         if (!$this->hasDefaultValue) {
-            throw new \LogicException(sprintf('Argument $%s does not have a default value. Use "%s::hasDefaultValue()" to avoid this exception.', $this->name, __CLASS__));
+            throw new \LogicException(\sprintf('Argument $%s does not have a default value. Use "%s::hasDefaultValue()" to avoid this exception.', $this->name, __CLASS__));
         }
 
         return $this->defaultValue;
@@ -106,7 +106,7 @@ class ArgumentMetadata
      *
      * @return array<object>
      */
-    public function getAttributes(string $name = null, int $flags = 0): array
+    public function getAttributes(?string $name = null, int $flags = 0): array
     {
         if (!$name) {
             return $this->attributes;
diff --git a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
index cb7f0a78c..7eafdc94b 100644
--- a/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/lib/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\HttpKernel\ControllerMetadata;
  */
 final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
 {
-    public function createArgumentMetadata(string|object|array $controller, \ReflectionFunctionAbstract $reflector = null): array
+    public function createArgumentMetadata(string|object|array $controller, ?\ReflectionFunctionAbstract $reflector = null): array
     {
         $arguments = [];
         $reflector ??= new \ReflectionFunction($controller(...));
diff --git a/lib/symfony/http-kernel/DataCollector/AjaxDataCollector.php b/lib/symfony/http-kernel/DataCollector/AjaxDataCollector.php
index 016ef2ece..3c8d2f0f6 100644
--- a/lib/symfony/http-kernel/DataCollector/AjaxDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/AjaxDataCollector.php
@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Response;
  */
 class AjaxDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         // all collecting is done client side
     }
diff --git a/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php b/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
index 8a75227d4..ba8fc0c31 100644
--- a/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/ConfigDataCollector.php
@@ -30,7 +30,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
     /**
      * Sets the Kernel associated with this Request.
      */
-    public function setKernel(KernelInterface $kernel = null): void
+    public function setKernel(?KernelInterface $kernel = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/http-kernel', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -39,7 +39,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
         $this->kernel = $kernel;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $eom = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
         $eol = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
@@ -47,7 +47,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
         $this->data = [
             'token' => $response->headers->get('X-Debug-Token'),
             'symfony_version' => Kernel::VERSION,
-            'symfony_minor_version' => sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION),
+            'symfony_minor_version' => \sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION),
             'symfony_lts' => 4 === Kernel::MINOR_VERSION,
             'symfony_state' => $this->determineSymfonyState(),
             'symfony_eom' => $eom->format('F Y'),
diff --git a/lib/symfony/http-kernel/DataCollector/DataCollector.php b/lib/symfony/http-kernel/DataCollector/DataCollector.php
index d8b795d42..fdc73de06 100644
--- a/lib/symfony/http-kernel/DataCollector/DataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/DataCollector.php
@@ -63,9 +63,21 @@ abstract class DataCollector implements DataCollectorInterface
         $casters = [
             '*' => function ($v, array $a, Stub $s, $isNested) {
                 if (!$v instanceof Stub) {
+                    $b = $a;
                     foreach ($a as $k => $v) {
-                        if (\is_object($v) && !$v instanceof \DateTimeInterface && !$v instanceof Stub) {
-                            $a[$k] = new CutStub($v);
+                        if (!\is_object($v) || $v instanceof \DateTimeInterface || $v instanceof Stub) {
+                            continue;
+                        }
+
+                        try {
+                            $a[$k] = $s = new CutStub($v);
+
+                            if ($b[$k] === $s) {
+                                // we've hit a non-typed reference
+                                $a[$k] = $v;
+                            }
+                        } catch (\TypeError $e) {
+                            // we've hit a typed reference
                         }
                     }
                 }
diff --git a/lib/symfony/http-kernel/DataCollector/DataCollectorInterface.php b/lib/symfony/http-kernel/DataCollector/DataCollectorInterface.php
index 8df94ccb8..5e8593d07 100644
--- a/lib/symfony/http-kernel/DataCollector/DataCollectorInterface.php
+++ b/lib/symfony/http-kernel/DataCollector/DataCollectorInterface.php
@@ -27,7 +27,7 @@ interface DataCollectorInterface extends ResetInterface
      *
      * @return void
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null);
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null);
 
     /**
      * Returns the name of the collector.
diff --git a/lib/symfony/http-kernel/DataCollector/DumpDataCollector.php b/lib/symfony/http-kernel/DataCollector/DumpDataCollector.php
index ce02b545b..8c45b4279 100644
--- a/lib/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/DumpDataCollector.php
@@ -44,7 +44,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
     private mixed $sourceContextProvider;
     private bool $webMode;
 
-    public function __construct(Stopwatch $stopwatch = null, string|FileLinkFormatter $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, DataDumperInterface|Connection $dumper = null, bool $webMode = null)
+    public function __construct(?Stopwatch $stopwatch = null, string|FileLinkFormatter|null $fileLinkFormat = null, ?string $charset = null, ?RequestStack $requestStack = null, DataDumperInterface|Connection|null $dumper = null, ?bool $webMode = null)
     {
         $fileLinkFormat = $fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         $this->stopwatch = $stopwatch;
@@ -100,7 +100,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         return null;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if (!$this->dataCount) {
             $this->data = [];
@@ -143,10 +143,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         $this->clonesIndex = 0;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         if (!$this->dataCount) {
             $this->data = [];
@@ -161,16 +158,12 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         $this->dataCount = 0;
         $this->isCollected = true;
 
-        return parent::__sleep();
+        return ['data' => $this->data];
     }
 
-    /**
-     * @internal
-     */
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
-        parent::__wakeup();
-
+        $this->data = array_pop($data) ?? [];
         $charset = array_pop($this->data);
         $fileLinkFormat = array_pop($this->data);
         $this->dataCount = \count($this->data);
@@ -180,7 +173,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
             }
         }
 
-        self::__construct($this->stopwatch, \is_string($fileLinkFormat) || $fileLinkFormat instanceof FileLinkFormatter ? $fileLinkFormat : null, \is_string($charset) ? $charset : null);
+        self::__construct($this->stopwatch ?? null, \is_string($fileLinkFormat) || $fileLinkFormat instanceof FileLinkFormatter ? $fileLinkFormat : null, \is_string($charset) ? $charset : null);
     }
 
     public function getDumpsCount(): int
@@ -196,7 +189,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
             $dumper = new HtmlDumper($data, $this->charset);
             $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
         } else {
-            throw new \InvalidArgumentException(sprintf('Invalid dump format: "%s".', $format));
+            throw new \InvalidArgumentException(\sprintf('Invalid dump format: "%s".', $format));
         }
         $dumps = [];
 
@@ -263,9 +256,9 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
                         $f = strip_tags($this->style('', $file));
                         $name = strip_tags($this->style('', $name));
                         if ($fmt && $link = \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line)) {
-                            $name = sprintf('<a href="%s" title="%s">'.$s.'</a>', strip_tags($this->style('', $link)), $f, $name);
+                            $name = \sprintf('<a href="%s" title="%s">'.$s.'</a>', strip_tags($this->style('', $link)), $f, $name);
                         } else {
-                            $name = sprintf('<abbr title="%s">'.$s.'</abbr>', $f, $name);
+                            $name = \sprintf('<abbr title="%s">'.$s.'</abbr>', $f, $name);
                         }
                     } else {
                         $name = $this->style('meta', $name);
diff --git a/lib/symfony/http-kernel/DataCollector/EventDataCollector.php b/lib/symfony/http-kernel/DataCollector/EventDataCollector.php
index a6524ea04..3a94dbc32 100644
--- a/lib/symfony/http-kernel/DataCollector/EventDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/EventDataCollector.php
@@ -36,7 +36,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
      * @param iterable<EventDispatcherInterface>|EventDispatcherInterface|null $dispatchers
      */
     public function __construct(
-        iterable|EventDispatcherInterface $dispatchers = null,
+        iterable|EventDispatcherInterface|null $dispatchers = null,
         private ?RequestStack $requestStack = null,
         private string $defaultDispatcher = 'event_dispatcher',
     ) {
@@ -46,7 +46,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
         $this->dispatchers = $dispatchers ?? [];
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null;
         $this->data = [];
@@ -86,7 +86,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @see TraceableEventDispatcher
      */
-    public function setCalledListeners(array $listeners, string $dispatcher = null): void
+    public function setCalledListeners(array $listeners, ?string $dispatcher = null): void
     {
         $this->data[$dispatcher ?? $this->defaultDispatcher]['called_listeners'] = $listeners;
     }
@@ -94,7 +94,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @see TraceableEventDispatcher
      */
-    public function getCalledListeners(string $dispatcher = null): array|Data
+    public function getCalledListeners(?string $dispatcher = null): array|Data
     {
         return $this->data[$dispatcher ?? $this->defaultDispatcher]['called_listeners'] ?? [];
     }
@@ -102,7 +102,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @see TraceableEventDispatcher
      */
-    public function setNotCalledListeners(array $listeners, string $dispatcher = null): void
+    public function setNotCalledListeners(array $listeners, ?string $dispatcher = null): void
     {
         $this->data[$dispatcher ?? $this->defaultDispatcher]['not_called_listeners'] = $listeners;
     }
@@ -110,7 +110,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @see TraceableEventDispatcher
      */
-    public function getNotCalledListeners(string $dispatcher = null): array|Data
+    public function getNotCalledListeners(?string $dispatcher = null): array|Data
     {
         return $this->data[$dispatcher ?? $this->defaultDispatcher]['not_called_listeners'] ?? [];
     }
@@ -120,7 +120,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
      *
      * @see TraceableEventDispatcher
      */
-    public function setOrphanedEvents(array $events, string $dispatcher = null): void
+    public function setOrphanedEvents(array $events, ?string $dispatcher = null): void
     {
         $this->data[$dispatcher ?? $this->defaultDispatcher]['orphaned_events'] = $events;
     }
@@ -128,7 +128,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @see TraceableEventDispatcher
      */
-    public function getOrphanedEvents(string $dispatcher = null): array|Data
+    public function getOrphanedEvents(?string $dispatcher = null): array|Data
     {
         return $this->data[$dispatcher ?? $this->defaultDispatcher]['orphaned_events'] ?? [];
     }
diff --git a/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php b/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
index 16a29adc1..80156bc8d 100644
--- a/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\Response;
  */
 class ExceptionDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if (null !== $exception) {
             $this->data = [
diff --git a/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php b/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
index eb2b9c85c..cf17e7a73 100644
--- a/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/LoggerDataCollector.php
@@ -32,14 +32,14 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
     private ?RequestStack $requestStack;
     private ?array $processedLogs = null;
 
-    public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
+    public function __construct(?object $logger = null, ?string $containerPathPrefix = null, ?RequestStack $requestStack = null)
     {
         $this->logger = DebugLoggerConfigurator::getDebugLogger($logger);
         $this->containerPathPrefix = $containerPathPrefix;
         $this->requestStack = $requestStack;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null;
     }
@@ -199,7 +199,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
         return $logs;
     }
 
-    private function getContainerCompilerLogs(string $compilerLogsFilepath = null): array
+    private function getContainerCompilerLogs(?string $compilerLogsFilepath = null): array
     {
         if (!$compilerLogsFilepath || !is_file($compilerLogsFilepath)) {
             return [];
diff --git a/lib/symfony/http-kernel/DataCollector/MemoryDataCollector.php b/lib/symfony/http-kernel/DataCollector/MemoryDataCollector.php
index 8b8894367..9715f94ee 100644
--- a/lib/symfony/http-kernel/DataCollector/MemoryDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/MemoryDataCollector.php
@@ -26,7 +26,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
         $this->reset();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->updateMemoryUsage();
     }
diff --git a/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php b/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
index eae5f24b7..4792f160c 100644
--- a/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -38,13 +38,13 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
     private array $sessionUsages = [];
     private ?RequestStack $requestStack;
 
-    public function __construct(RequestStack $requestStack = null)
+    public function __construct(?RequestStack $requestStack = null)
     {
         $this->controllers = new \SplObjectStorage();
         $this->requestStack = $requestStack;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         // attributes are serialized and as they can be anything, they need to be converted to strings.
         $attributes = [];
@@ -63,7 +63,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         $sessionMetadata = [];
         $sessionAttributes = [];
         $flashes = [];
-        if ($request->hasSession()) {
+        if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()) {
             $session = $request->getSession();
             if ($session->isStarted()) {
                 $sessionMetadata['Created'] = date(\DATE_RFC822, $session->getMetadataBag()->getCreated());
@@ -452,7 +452,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         array_splice($trace, 0, $traceEndIndex);
 
         // Merge identical backtraces generated by internal call reports
-        $name = sprintf('%s:%s', $trace[1]['class'] ?? $trace[0]['file'], $trace[0]['line']);
+        $name = \sprintf('%s:%s', $trace[1]['class'] ?? $trace[0]['file'], $trace[0]['line']);
         if (!\array_key_exists($name, $this->sessionUsages)) {
             $this->sessionUsages[$name] = [
                 'name' => $name,
@@ -505,7 +505,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
                 'line' => $r->getStartLine(),
             ];
 
-            if (str_contains($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure')) {
                 return $controller;
             }
             $controller['method'] = $r->name;
diff --git a/lib/symfony/http-kernel/DataCollector/RouterDataCollector.php b/lib/symfony/http-kernel/DataCollector/RouterDataCollector.php
index 444138da7..75c21e4c5 100644
--- a/lib/symfony/http-kernel/DataCollector/RouterDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/RouterDataCollector.php
@@ -34,13 +34,13 @@ class RouterDataCollector extends DataCollector
     /**
      * @final
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if ($response instanceof RedirectResponse) {
             $this->data['redirect'] = true;
             $this->data['url'] = $response->getTargetUrl();
 
-            if ($this->controllers->contains($request)) {
+            if ($this->controllers->offsetExists($request)) {
                 $this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
             }
         }
diff --git a/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php b/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
index a8b7ead94..9799a1333 100644
--- a/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
+++ b/lib/symfony/http-kernel/DataCollector/TimeDataCollector.php
@@ -27,14 +27,14 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
     private ?KernelInterface $kernel;
     private ?Stopwatch $stopwatch;
 
-    public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
+    public function __construct(?KernelInterface $kernel = null, ?Stopwatch $stopwatch = null)
     {
         $this->kernel = $kernel;
         $this->stopwatch = $stopwatch;
         $this->data = ['events' => [], 'stopwatch_installed' => false, 'start_time' => 0];
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if (null !== $this->kernel) {
             $startTime = $this->kernel->getStartTime();
diff --git a/lib/symfony/http-kernel/Debug/ErrorHandlerConfigurator.php b/lib/symfony/http-kernel/Debug/ErrorHandlerConfigurator.php
index 49f188c22..5b3e1cddd 100644
--- a/lib/symfony/http-kernel/Debug/ErrorHandlerConfigurator.php
+++ b/lib/symfony/http-kernel/Debug/ErrorHandlerConfigurator.php
@@ -36,7 +36,7 @@ class ErrorHandlerConfigurator
      * @param bool           $scream  Enables/disables screaming mode, where even silenced errors are logged
      * @param bool           $scope   Enables/disables scoping mode
      */
-    public function __construct(LoggerInterface $logger = null, array|int|null $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, bool $scope = true, LoggerInterface $deprecationLogger = null)
+    public function __construct(?LoggerInterface $logger = null, array|int|null $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, bool $scope = true, ?LoggerInterface $deprecationLogger = null)
     {
         $this->logger = $logger;
         $this->levels = $levels ?? \E_ALL;
diff --git a/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
index d31ce7581..f3101d5b1 100644
--- a/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ b/lib/symfony/http-kernel/Debug/TraceableEventDispatcher.php
@@ -66,7 +66,11 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
                 if (null === $sectionId) {
                     break;
                 }
-                $this->stopwatch->stopSection($sectionId);
+                try {
+                    $this->stopwatch->stopSection($sectionId);
+                } catch (\LogicException) {
+                    // The stop watch service might have been reset in the meantime
+                }
                 break;
             case KernelEvents::TERMINATE:
                 // In the special case described in the `preDispatch` method above, the `$token` section
diff --git a/lib/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php b/lib/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
index f41d58b81..9a32b8a4e 100644
--- a/lib/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
+++ b/lib/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
@@ -41,10 +41,10 @@ class FragmentRendererPass implements CompilerPassInterface
             $class = $container->getParameterBag()->resolveValue($def->getClass());
 
             if (!$r = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
             }
             if (!$r->isSubclassOf(FragmentRendererInterface::class)) {
-                throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, FragmentRendererInterface::class));
+                throw new InvalidArgumentException(\sprintf('Service "%s" must implement interface "%s".', $id, FragmentRendererInterface::class));
             }
 
             foreach ($tags as $tag) {
diff --git a/lib/symfony/http-kernel/DependencyInjection/LoggerPass.php b/lib/symfony/http-kernel/DependencyInjection/LoggerPass.php
index 6270875be..0061a577c 100644
--- a/lib/symfony/http-kernel/DependencyInjection/LoggerPass.php
+++ b/lib/symfony/http-kernel/DependencyInjection/LoggerPass.php
@@ -30,7 +30,9 @@ class LoggerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $container->setAlias(LoggerInterface::class, 'logger');
+        if (!$container->has(LoggerInterface::class)) {
+            $container->setAlias(LoggerInterface::class, 'logger');
+        }
 
         if ($container->has('logger')) {
             return;
diff --git a/lib/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/lib/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index f2cf2422b..e2f50dcba 100644
--- a/lib/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/lib/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -45,6 +45,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
 
         $parameterBag = $container->getParameterBag();
         $controllers = [];
+        $controllerClasses = [];
 
         $publicAliases = [];
         foreach ($container->getAliases() as $id => $alias) {
@@ -58,6 +59,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
         foreach ($container->findTaggedServiceIds('controller.service_arguments', true) as $id => $tags) {
             $def = $container->getDefinition($id);
             $def->setPublic(true);
+            $def->setLazy(false);
             $class = $def->getClass();
             $autowire = $def->isAutowired();
             $bindings = $def->getBindings();
@@ -71,9 +73,11 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
             $class = $parameterBag->resolveValue($class);
 
             if (!$r = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+                throw new InvalidArgumentException(\sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
             }
 
+            $controllerClasses[] = $class;
+
             // get regular public methods
             $methods = [];
             $arguments = [];
@@ -94,11 +98,11 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                 }
                 foreach (['action', 'argument', 'id'] as $k) {
                     if (!isset($attributes[$k][0])) {
-                        throw new InvalidArgumentException(sprintf('Missing "%s" attribute on tag "controller.service_arguments" %s for service "%s".', $k, json_encode($attributes, \JSON_UNESCAPED_UNICODE), $id));
+                        throw new InvalidArgumentException(\sprintf('Missing "%s" attribute on tag "controller.service_arguments" %s for service "%s".', $k, json_encode($attributes, \JSON_UNESCAPED_UNICODE), $id));
                     }
                 }
                 if (!isset($methods[$action = strtolower($attributes['action'])])) {
-                    throw new InvalidArgumentException(sprintf('Invalid "action" attribute on tag "controller.service_arguments" for service "%s": no public "%s()" method found on class "%s".', $id, $attributes['action'], $class));
+                    throw new InvalidArgumentException(\sprintf('Invalid "action" attribute on tag "controller.service_arguments" for service "%s": no public "%s()" method found on class "%s".', $id, $attributes['action'], $class));
                 }
                 [$r, $parameters] = $methods[$action];
                 $found = false;
@@ -114,7 +118,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                 }
 
                 if (!$found) {
-                    throw new InvalidArgumentException(sprintf('Invalid "controller.service_arguments" tag for service "%s": method "%s()" has no "%s" argument on class "%s".', $id, $r->name, $attributes['argument'], $class));
+                    throw new InvalidArgumentException(\sprintf('Invalid "controller.service_arguments" tag for service "%s": method "%s()" has no "%s" argument on class "%s".', $id, $r->name, $attributes['argument'], $class));
                 }
             }
 
@@ -136,7 +140,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                         if ('?' !== $target[0]) {
                             $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                         } elseif ('' === $target = (string) substr($target, 1)) {
-                            throw new InvalidArgumentException(sprintf('A "controller.service_arguments" tag must have non-empty "id" attributes for service "%s".', $id));
+                            throw new InvalidArgumentException(\sprintf('A "controller.service_arguments" tag must have non-empty "id" attributes for service "%s".', $id));
                         } elseif ($p->allowsNull() && !$p->isOptional()) {
                             $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
                         }
@@ -155,7 +159,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                         continue;
                     } elseif (!$autowire || (!($autowireAttributes ??= $p->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) && (!$type || '\\' !== $target[0]))) {
                         continue;
-                    } elseif (is_subclass_of($type, \UnitEnum::class)) {
+                    } elseif (!$autowireAttributes && is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
                         continue;
                     } elseif (!$p->allowsNull()) {
@@ -187,7 +191,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                     }
 
                     if ($type && !$p->isOptional() && !$p->allowsNull() && !class_exists($type) && !interface_exists($type, false)) {
-                        $message = sprintf('Cannot determine controller argument for "%s::%s()": the $%s argument is type-hinted with the non-existent class or interface: "%s".', $class, $r->name, $p->name, $type);
+                        $message = \sprintf('Cannot determine controller argument for "%s::%s()": the $%s argument is type-hinted with the non-existent class or interface: "%s".', $class, $r->name, $p->name, $type);
 
                         // see if the type-hint lives in the same namespace as the controller
                         if (0 === strncmp($type, $class, strrpos($class, '\\'))) {
@@ -227,5 +231,10 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
         }
 
         $container->setAlias('argument_resolver.controller_locator', (string) $controllerLocatorRef);
+
+        if ($container->hasDefinition('controller_resolver')) {
+            $container->getDefinition('controller_resolver')
+                ->addMethodCall('allowControllers', [array_unique($controllerClasses)]);
+        }
     }
 }
diff --git a/lib/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/lib/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
index 7a21fe0e5..ef859a611 100644
--- a/lib/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+++ b/lib/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
@@ -34,7 +34,7 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
 
             if (!$argumentLocator->getArgument(0)) {
                 // remove empty argument locators
-                $reason = sprintf('Removing service-argument resolver for controller "%s": no corresponding services exist for the referenced types.', $controller);
+                $reason = \sprintf('Removing service-argument resolver for controller "%s": no corresponding services exist for the referenced types.', $controller);
             } else {
                 // any methods listed for call-at-instantiation cannot be actions
                 $reason = false;
@@ -47,7 +47,7 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
                 $controllerDef = $container->getDefinition($id);
                 foreach ($controllerDef->getMethodCalls() as [$method]) {
                     if (0 === strcasecmp($action, $method)) {
-                        $reason = sprintf('Removing method "%s" of service "%s" from controller candidates: the method is called at instantiation, thus cannot be an action.', $action, $id);
+                        $reason = \sprintf('Removing method "%s" of service "%s" from controller candidates: the method is called at instantiation, thus cannot be an action.', $action, $id);
                         break;
                     }
                 }
diff --git a/lib/symfony/http-kernel/DependencyInjection/ResettableServicePass.php b/lib/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
index da9f8d632..8479c8d63 100644
--- a/lib/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
+++ b/lib/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
@@ -39,7 +39,7 @@ class ResettableServicePass implements CompilerPassInterface
 
             foreach ($tags as $attributes) {
                 if (!isset($attributes['method'])) {
-                    throw new RuntimeException(sprintf('Tag "kernel.reset" requires the "method" attribute to be set on service "%s".', $id));
+                    throw new RuntimeException(\sprintf('Tag "kernel.reset" requires the "method" attribute to be set on service "%s".', $id));
                 }
 
                 if (!isset($methods[$id])) {
diff --git a/lib/symfony/http-kernel/Event/ControllerArgumentsEvent.php b/lib/symfony/http-kernel/Event/ControllerArgumentsEvent.php
index c90b7706f..4c804ccf1 100644
--- a/lib/symfony/http-kernel/Event/ControllerArgumentsEvent.php
+++ b/lib/symfony/http-kernel/Event/ControllerArgumentsEvent.php
@@ -52,7 +52,7 @@ final class ControllerArgumentsEvent extends KernelEvent
     /**
      * @param array<class-string, list<object>>|null $attributes
      */
-    public function setController(callable $controller, array $attributes = null): void
+    public function setController(callable $controller, ?array $attributes = null): void
     {
         $this->controllerEvent->setController($controller, $attributes);
         unset($this->namedArguments);
@@ -102,7 +102,7 @@ final class ControllerArgumentsEvent extends KernelEvent
      *
      * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
      */
-    public function getAttributes(string $className = null): array
+    public function getAttributes(?string $className = null): array
     {
         return $this->controllerEvent->getAttributes($className);
     }
diff --git a/lib/symfony/http-kernel/Event/ControllerEvent.php b/lib/symfony/http-kernel/Event/ControllerEvent.php
index 239b00512..6db2c15f9 100644
--- a/lib/symfony/http-kernel/Event/ControllerEvent.php
+++ b/lib/symfony/http-kernel/Event/ControllerEvent.php
@@ -51,7 +51,7 @@ final class ControllerEvent extends KernelEvent
     /**
      * @param array<class-string, list<object>>|null $attributes
      */
-    public function setController(callable $controller, array $attributes = null): void
+    public function setController(callable $controller, ?array $attributes = null): void
     {
         if (null !== $attributes) {
             $this->attributes = $attributes;
@@ -70,7 +70,7 @@ final class ControllerEvent extends KernelEvent
         if (\is_array($controller) && method_exists(...$controller)) {
             $this->controllerReflector = new \ReflectionMethod(...$controller);
         } elseif (\is_string($controller) && str_contains($controller, '::')) {
-            $this->controllerReflector = new \ReflectionMethod($controller);
+            $this->controllerReflector = new \ReflectionMethod(...explode('::', $controller, 2));
         } else {
             $this->controllerReflector = new \ReflectionFunction($controller(...));
         }
@@ -87,7 +87,7 @@ final class ControllerEvent extends KernelEvent
      *
      * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
      */
-    public function getAttributes(string $className = null): array
+    public function getAttributes(?string $className = null): array
     {
         if (isset($this->attributes)) {
             return null === $className ? $this->attributes : $this->attributes[$className] ?? [];
@@ -98,7 +98,7 @@ final class ControllerEvent extends KernelEvent
         } elseif (\is_string($this->controller) && false !== $i = strpos($this->controller, '::')) {
             $class = new \ReflectionClass(substr($this->controller, 0, $i));
         } else {
-            $class = str_contains($this->controllerReflector->name, '{closure}') ? null : (\PHP_VERSION_ID >= 80111 ? $this->controllerReflector->getClosureCalledClass() : $this->controllerReflector->getClosureScopeClass());
+            $class = str_contains($this->controllerReflector->name, '{closure') ? null : (\PHP_VERSION_ID >= 80111 ? $this->controllerReflector->getClosureCalledClass() : $this->controllerReflector->getClosureScopeClass());
         }
         $this->attributes = [];
 
diff --git a/lib/symfony/http-kernel/Event/KernelEvent.php b/lib/symfony/http-kernel/Event/KernelEvent.php
index e64cc419b..02426c52a 100644
--- a/lib/symfony/http-kernel/Event/KernelEvent.php
+++ b/lib/symfony/http-kernel/Event/KernelEvent.php
@@ -16,7 +16,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * Base class for events thrown in the HttpKernel component.
+ * Base class for events dispatched in the HttpKernel component.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/lib/symfony/http-kernel/Event/ViewEvent.php b/lib/symfony/http-kernel/Event/ViewEvent.php
index bf96985b2..4d963aea1 100644
--- a/lib/symfony/http-kernel/Event/ViewEvent.php
+++ b/lib/symfony/http-kernel/Event/ViewEvent.php
@@ -28,7 +28,7 @@ final class ViewEvent extends RequestEvent
     public readonly ?ControllerArgumentsEvent $controllerArgumentsEvent;
     private mixed $controllerResult;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, mixed $controllerResult, ControllerArgumentsEvent $controllerArgumentsEvent = null)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, mixed $controllerResult, ?ControllerArgumentsEvent $controllerArgumentsEvent = null)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php b/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
index 2f012ab52..1ce490537 100644
--- a/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
+++ b/lib/symfony/http-kernel/EventListener/AbstractSessionListener.php
@@ -55,7 +55,7 @@ abstract class AbstractSessionListener implements EventSubscriberInterface, Rese
     /**
      * @internal
      */
-    public function __construct(ContainerInterface $container = null, bool $debug = false, array $sessionOptions = [])
+    public function __construct(?ContainerInterface $container = null, bool $debug = false, array $sessionOptions = [])
     {
         $this->container = $container;
         $this->debug = $debug;
diff --git a/lib/symfony/http-kernel/EventListener/CacheAttributeListener.php b/lib/symfony/http-kernel/EventListener/CacheAttributeListener.php
index 723e758cd..310e7f25a 100644
--- a/lib/symfony/http-kernel/EventListener/CacheAttributeListener.php
+++ b/lib/symfony/http-kernel/EventListener/CacheAttributeListener.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\Cache;
@@ -123,10 +124,23 @@ class CacheAttributeListener implements EventSubscriberInterface
 
         unset($this->lastModified[$request]);
         unset($this->etags[$request]);
-        $hasVary = $response->headers->has('Vary');
+        // Check if the response has a Vary header that should be considered, ignoring cases where
+        // it's only 'Accept-Language' and the request has the '_vary_by_language' attribute
+        $hasVary = ['Accept-Language'] === $response->getVary() ? !$request->attributes->get('_vary_by_language') : $response->hasVary();
+        //Check if cache-control directive was set manually in cacheControl (not auto computed)
+        $hasCacheControlDirective = new class($response->headers) extends HeaderBag {
+            public function __construct(private parent $headerBag)
+            {
+            }
+
+            public function __invoke(string $key): bool
+            {
+                return \array_key_exists($key, $this->headerBag->cacheControl);
+            }
+        };
 
         foreach (array_reverse($attributes) as $cache) {
-            if (null !== $cache->smaxage && !$response->headers->hasCacheControlDirective('s-maxage')) {
+            if (null !== $cache->smaxage && !$hasCacheControlDirective('s-maxage')) {
                 $response->setSharedMaxAge($this->toSeconds($cache->smaxage));
             }
 
@@ -134,19 +148,19 @@ class CacheAttributeListener implements EventSubscriberInterface
                 $response->headers->addCacheControlDirective('must-revalidate');
             }
 
-            if (null !== $cache->maxage && !$response->headers->hasCacheControlDirective('max-age')) {
+            if (null !== $cache->maxage && !$hasCacheControlDirective('max-age')) {
                 $response->setMaxAge($this->toSeconds($cache->maxage));
             }
 
-            if (null !== $cache->maxStale && !$response->headers->hasCacheControlDirective('max-stale')) {
+            if (null !== $cache->maxStale && !$hasCacheControlDirective('max-stale')) {
                 $response->headers->addCacheControlDirective('max-stale', $this->toSeconds($cache->maxStale));
             }
 
-            if (null !== $cache->staleWhileRevalidate && !$response->headers->hasCacheControlDirective('stale-while-revalidate')) {
+            if (null !== $cache->staleWhileRevalidate && !$hasCacheControlDirective('stale-while-revalidate')) {
                 $response->headers->addCacheControlDirective('stale-while-revalidate', $this->toSeconds($cache->staleWhileRevalidate));
             }
 
-            if (null !== $cache->staleIfError && !$response->headers->hasCacheControlDirective('stale-if-error')) {
+            if (null !== $cache->staleIfError && !$hasCacheControlDirective('stale-if-error')) {
                 $response->headers->addCacheControlDirective('stale-if-error', $this->toSeconds($cache->staleIfError));
             }
 
@@ -159,12 +173,14 @@ class CacheAttributeListener implements EventSubscriberInterface
             }
         }
 
+        $hasPublicOrPrivateCacheControlDirective = $hasCacheControlDirective('public') || $hasCacheControlDirective('private');
+
         foreach ($attributes as $cache) {
-            if (true === $cache->public) {
+            if (true === $cache->public && !$hasPublicOrPrivateCacheControlDirective) {
                 $response->setPublic();
             }
 
-            if (false === $cache->public) {
+            if (false === $cache->public && !$hasPublicOrPrivateCacheControlDirective) {
                 $response->setPrivate();
             }
         }
diff --git a/lib/symfony/http-kernel/EventListener/DebugHandlersListener.php b/lib/symfony/http-kernel/EventListener/DebugHandlersListener.php
index ce746bd12..ee720b1ea 100644
--- a/lib/symfony/http-kernel/EventListener/DebugHandlersListener.php
+++ b/lib/symfony/http-kernel/EventListener/DebugHandlersListener.php
@@ -41,13 +41,14 @@ class DebugHandlersListener implements EventSubscriberInterface
      * @param bool          $webMode
      * @param callable|null $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
      */
-    public function __construct(callable $exceptionHandler = null, bool|LoggerInterface $webMode = null)
+    public function __construct(?callable $exceptionHandler = null, bool|LoggerInterface|null $webMode = null)
     {
         if ($webMode instanceof LoggerInterface) {
             // BC with Symfony 5
             $webMode = null;
         }
-        $handler = set_exception_handler('is_int');
+
+        $handler = set_exception_handler('var_dump');
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
@@ -58,7 +59,7 @@ class DebugHandlersListener implements EventSubscriberInterface
     /**
      * Configures the error handler.
      */
-    public function configure(object $event = null): void
+    public function configure(?object $event = null): void
     {
         if ($event instanceof ConsoleEvent && $this->webMode) {
             return;
@@ -67,6 +68,7 @@ class DebugHandlersListener implements EventSubscriberInterface
             return;
         }
         $this->firstCall = $this->hasTerminatedWithException = false;
+        $hasRun = null;
 
         if (!$this->exceptionHandler) {
             if ($event instanceof KernelEvent) {
@@ -93,7 +95,7 @@ class DebugHandlersListener implements EventSubscriberInterface
             }
         }
         if ($this->exceptionHandler) {
-            $handler = set_exception_handler(static fn () => null);
+            $handler = set_exception_handler('var_dump');
             $handler = \is_array($handler) ? $handler[0] : null;
             restore_exception_handler();
 
@@ -103,6 +105,19 @@ class DebugHandlersListener implements EventSubscriberInterface
 
             if ($handler instanceof ErrorHandler) {
                 $handler->setExceptionHandler($this->exceptionHandler);
+                if (null !== $hasRun) {
+                    $throwAt = $handler->throwAt(0) | \E_ERROR | \E_CORE_ERROR | \E_COMPILE_ERROR | \E_USER_ERROR | \E_RECOVERABLE_ERROR | \E_PARSE;
+                    $loggers = [];
+
+                    foreach ($handler->setLoggers([]) as $type => $log) {
+                        if ($type & $throwAt) {
+                            $loggers[$type] = [null, $log[1]];
+                        }
+                    }
+
+                    // Assume $kernel->terminateWithException() will log uncaught exceptions appropriately
+                    $handler->setLoggers($loggers);
+                }
             }
             $this->exceptionHandler = null;
         }
diff --git a/lib/symfony/http-kernel/EventListener/DumpListener.php b/lib/symfony/http-kernel/EventListener/DumpListener.php
index b10bd37f4..07a4e7e6a 100644
--- a/lib/symfony/http-kernel/EventListener/DumpListener.php
+++ b/lib/symfony/http-kernel/EventListener/DumpListener.php
@@ -29,7 +29,7 @@ class DumpListener implements EventSubscriberInterface
     private DataDumperInterface $dumper;
     private ?Connection $connection;
 
-    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, Connection $connection = null)
+    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, ?Connection $connection = null)
     {
         $this->cloner = $cloner;
         $this->dumper = $dumper;
@@ -45,7 +45,7 @@ class DumpListener implements EventSubscriberInterface
         $dumper = $this->dumper;
         $connection = $this->connection;
 
-        VarDumper::setHandler(static function ($var, string $label = null) use ($cloner, $dumper, $connection) {
+        VarDumper::setHandler(static function ($var, ?string $label = null) use ($cloner, $dumper, $connection) {
             $data = $cloner->cloneVar($var);
             if (null !== $label) {
                 $data = $data->withContext(['label' => $label]);
diff --git a/lib/symfony/http-kernel/EventListener/ErrorListener.php b/lib/symfony/http-kernel/EventListener/ErrorListener.php
index a2f6db57a..266d96cf8 100644
--- a/lib/symfony/http-kernel/EventListener/ErrorListener.php
+++ b/lib/symfony/http-kernel/EventListener/ErrorListener.php
@@ -44,7 +44,7 @@ class ErrorListener implements EventSubscriberInterface
     /**
      * @param array<class-string, array{log_level: string|null, status_code: int<100,599>|null}> $exceptionsMapping
      */
-    public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
+    public function __construct(string|object|array|null $controller, ?LoggerInterface $logger = null, bool $debug = false, array $exceptionsMapping = [])
     {
         $this->controller = $controller;
         $this->logger = $logger;
@@ -90,7 +90,7 @@ class ErrorListener implements EventSubscriberInterface
 
         $e = FlattenException::createFromThrowable($throwable);
 
-        $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), basename($e->getFile()), $e->getLine()), $logLevel);
+        $this->logException($throwable, \sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), basename($e->getFile()), $e->getLine()), $logLevel);
     }
 
     /**
@@ -104,11 +104,11 @@ class ErrorListener implements EventSubscriberInterface
 
         $throwable = $event->getThrowable();
 
-        if ($exceptionHandler = set_exception_handler(var_dump(...))) {
-            restore_exception_handler();
-            if (\is_array($exceptionHandler) && $exceptionHandler[0] instanceof ErrorHandler) {
-                $throwable = $exceptionHandler[0]->enhanceError($event->getThrowable());
-            }
+        $exceptionHandler = set_exception_handler('var_dump');
+        restore_exception_handler();
+
+        if (\is_array($exceptionHandler) && $exceptionHandler[0] instanceof ErrorHandler) {
+            $throwable = $exceptionHandler[0]->enhanceError($event->getThrowable());
         }
 
         $request = $this->duplicateRequest($throwable, $event->getRequest());
@@ -118,7 +118,7 @@ class ErrorListener implements EventSubscriberInterface
         } catch (\Exception $e) {
             $f = FlattenException::createFromThrowable($e);
 
-            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', $f->getClass(), $f->getMessage(), basename($e->getFile()), $e->getLine()));
+            $this->logException($e, \sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', $f->getClass(), $f->getMessage(), basename($e->getFile()), $e->getLine()));
 
             $prev = $e;
             do {
@@ -183,7 +183,7 @@ class ErrorListener implements EventSubscriberInterface
     /**
      * Logs an exception.
      */
-    protected function logException(\Throwable $exception, string $message, string $logLevel = null): void
+    protected function logException(\Throwable $exception, string $message, ?string $logLevel = null): void
     {
         if (null === $this->logger) {
             return;
diff --git a/lib/symfony/http-kernel/EventListener/LocaleListener.php b/lib/symfony/http-kernel/EventListener/LocaleListener.php
index 65a3bfde4..9feaa0b4f 100644
--- a/lib/symfony/http-kernel/EventListener/LocaleListener.php
+++ b/lib/symfony/http-kernel/EventListener/LocaleListener.php
@@ -35,7 +35,7 @@ class LocaleListener implements EventSubscriberInterface
     private bool $useAcceptLanguageHeader;
     private array $enabledLocales;
 
-    public function __construct(RequestStack $requestStack, string $defaultLocale = 'en', RequestContextAwareInterface $router = null, bool $useAcceptLanguageHeader = false, array $enabledLocales = [])
+    public function __construct(RequestStack $requestStack, string $defaultLocale = 'en', ?RequestContextAwareInterface $router = null, bool $useAcceptLanguageHeader = false, array $enabledLocales = [])
     {
         $this->defaultLocale = $defaultLocale;
         $this->requestStack = $requestStack;
diff --git a/lib/symfony/http-kernel/EventListener/ProfilerListener.php b/lib/symfony/http-kernel/EventListener/ProfilerListener.php
index 716d939fd..1f30582f4 100644
--- a/lib/symfony/http-kernel/EventListener/ProfilerListener.php
+++ b/lib/symfony/http-kernel/EventListener/ProfilerListener.php
@@ -48,7 +48,7 @@ class ProfilerListener implements EventSubscriberInterface
      * @param bool $onlyException    True if the profiler only collects data when an exception occurs, false otherwise
      * @param bool $onlyMainRequests True if the profiler only collects data when the request is the main request, false otherwise
      */
-    public function __construct(Profiler $profiler, RequestStack $requestStack, RequestMatcherInterface $matcher = null, bool $onlyException = false, bool $onlyMainRequests = false, string $collectParameter = null)
+    public function __construct(Profiler $profiler, RequestStack $requestStack, ?RequestMatcherInterface $matcher = null, bool $onlyException = false, bool $onlyMainRequests = false, ?string $collectParameter = null)
     {
         $this->profiler = $profiler;
         $this->matcher = $matcher;
@@ -97,7 +97,7 @@ class ProfilerListener implements EventSubscriberInterface
             return;
         }
 
-        $session = $request->hasPreviousSession() ? $request->getSession() : null;
+        $session = !$request->attributes->getBoolean('_stateless') && $request->hasPreviousSession() ? $request->getSession() : null;
 
         if ($session instanceof Session) {
             $usageIndexValue = $usageIndexReference = &$session->getUsageIndex();
diff --git a/lib/symfony/http-kernel/EventListener/RouterListener.php b/lib/symfony/http-kernel/EventListener/RouterListener.php
index bb393c779..fd8ac1a5c 100644
--- a/lib/symfony/http-kernel/EventListener/RouterListener.php
+++ b/lib/symfony/http-kernel/EventListener/RouterListener.php
@@ -53,7 +53,7 @@ class RouterListener implements EventSubscriberInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(UrlMatcherInterface|RequestMatcherInterface $matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null, string $projectDir = null, bool $debug = true)
+    public function __construct(UrlMatcherInterface|RequestMatcherInterface $matcher, RequestStack $requestStack, ?RequestContext $context = null, ?LoggerInterface $logger = null, ?string $projectDir = null, bool $debug = true)
     {
         if (null === $context && !$matcher instanceof RequestContextAwareInterface) {
             throw new \InvalidArgumentException('You must either pass a RequestContext or the matcher must implement RequestContextAwareInterface.');
@@ -118,15 +118,15 @@ class RouterListener implements EventSubscriberInterface
             unset($parameters['_route'], $parameters['_controller']);
             $request->attributes->set('_route_params', $parameters);
         } catch (ResourceNotFoundException $e) {
-            $message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getUriForPath($request->getPathInfo()));
+            $message = \sprintf('No route found for "%s %s"', $request->getMethod(), $request->getUriForPath($request->getPathInfo()));
 
             if ($referer = $request->headers->get('referer')) {
-                $message .= sprintf(' (from "%s")', $referer);
+                $message .= \sprintf(' (from "%s")', $referer);
             }
 
             throw new NotFoundHttpException($message, $e);
         } catch (MethodNotAllowedException $e) {
-            $message = sprintf('No route found for "%s %s": Method Not Allowed (Allow: %s)', $request->getMethod(), $request->getUriForPath($request->getPathInfo()), implode(', ', $e->getAllowedMethods()));
+            $message = \sprintf('No route found for "%s %s": Method Not Allowed (Allow: %s)', $request->getMethod(), $request->getUriForPath($request->getPathInfo()), implode(', ', $e->getAllowedMethods()));
 
             throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e);
         }
diff --git a/lib/symfony/http-kernel/EventListener/SurrogateListener.php b/lib/symfony/http-kernel/EventListener/SurrogateListener.php
index 17bdf2b39..a702a68f8 100644
--- a/lib/symfony/http-kernel/EventListener/SurrogateListener.php
+++ b/lib/symfony/http-kernel/EventListener/SurrogateListener.php
@@ -28,7 +28,7 @@ class SurrogateListener implements EventSubscriberInterface
 {
     private ?SurrogateInterface $surrogate;
 
-    public function __construct(SurrogateInterface $surrogate = null)
+    public function __construct(?SurrogateInterface $surrogate = null)
     {
         $this->surrogate = $surrogate;
     }
diff --git a/lib/symfony/http-kernel/Exception/AccessDeniedHttpException.php b/lib/symfony/http-kernel/Exception/AccessDeniedHttpException.php
index 78e8fe37d..0f9ea715c 100644
--- a/lib/symfony/http-kernel/Exception/AccessDeniedHttpException.php
+++ b/lib/symfony/http-kernel/Exception/AccessDeniedHttpException.php
@@ -17,7 +17,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class AccessDeniedHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(403, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/BadRequestHttpException.php b/lib/symfony/http-kernel/Exception/BadRequestHttpException.php
index c920fbd0d..57a7a2583 100644
--- a/lib/symfony/http-kernel/Exception/BadRequestHttpException.php
+++ b/lib/symfony/http-kernel/Exception/BadRequestHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class BadRequestHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(400, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/ConflictHttpException.php b/lib/symfony/http-kernel/Exception/ConflictHttpException.php
index a5a6f8405..997c4a681 100644
--- a/lib/symfony/http-kernel/Exception/ConflictHttpException.php
+++ b/lib/symfony/http-kernel/Exception/ConflictHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class ConflictHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(409, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/GoneHttpException.php b/lib/symfony/http-kernel/Exception/GoneHttpException.php
index 2893f05cb..c40d597cc 100644
--- a/lib/symfony/http-kernel/Exception/GoneHttpException.php
+++ b/lib/symfony/http-kernel/Exception/GoneHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class GoneHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(410, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/HttpException.php b/lib/symfony/http-kernel/Exception/HttpException.php
index e12abce00..6d2c253a3 100644
--- a/lib/symfony/http-kernel/Exception/HttpException.php
+++ b/lib/symfony/http-kernel/Exception/HttpException.php
@@ -21,7 +21,7 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface
     private int $statusCode;
     private array $headers;
 
-    public function __construct(int $statusCode, string $message = '', \Throwable $previous = null, array $headers = [], int $code = 0)
+    public function __construct(int $statusCode, string $message = '', ?\Throwable $previous = null, array $headers = [], int $code = 0)
     {
         $this->statusCode = $statusCode;
         $this->headers = $headers;
diff --git a/lib/symfony/http-kernel/Exception/LengthRequiredHttpException.php b/lib/symfony/http-kernel/Exception/LengthRequiredHttpException.php
index a3dd8b3cd..ca8741e40 100644
--- a/lib/symfony/http-kernel/Exception/LengthRequiredHttpException.php
+++ b/lib/symfony/http-kernel/Exception/LengthRequiredHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class LengthRequiredHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(411, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/LockedHttpException.php b/lib/symfony/http-kernel/Exception/LockedHttpException.php
index 069619bfc..3f05c2277 100644
--- a/lib/symfony/http-kernel/Exception/LockedHttpException.php
+++ b/lib/symfony/http-kernel/Exception/LockedHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class LockedHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(423, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php b/lib/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
index cfbaf5cb0..33572e461 100644
--- a/lib/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
+++ b/lib/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
@@ -19,7 +19,7 @@ class MethodNotAllowedHttpException extends HttpException
     /**
      * @param string[] $allow An array of allowed methods
      */
-    public function __construct(array $allow, string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(array $allow, string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         $headers['Allow'] = strtoupper(implode(', ', $allow));
 
diff --git a/lib/symfony/http-kernel/Exception/NotAcceptableHttpException.php b/lib/symfony/http-kernel/Exception/NotAcceptableHttpException.php
index ec2bb596f..13e9c2312 100644
--- a/lib/symfony/http-kernel/Exception/NotAcceptableHttpException.php
+++ b/lib/symfony/http-kernel/Exception/NotAcceptableHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class NotAcceptableHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(406, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/NotFoundHttpException.php b/lib/symfony/http-kernel/Exception/NotFoundHttpException.php
index 0e78fcc15..e1b489eed 100644
--- a/lib/symfony/http-kernel/Exception/NotFoundHttpException.php
+++ b/lib/symfony/http-kernel/Exception/NotFoundHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class NotFoundHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(404, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/PreconditionFailedHttpException.php b/lib/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
index 4431f89d0..8ec710e41 100644
--- a/lib/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
+++ b/lib/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class PreconditionFailedHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(412, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php b/lib/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
index f75afd370..848876939 100644
--- a/lib/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
+++ b/lib/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class PreconditionRequiredHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(428, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/ResolverNotFoundException.php b/lib/symfony/http-kernel/Exception/ResolverNotFoundException.php
index 6d9fb8a01..aa859d511 100644
--- a/lib/symfony/http-kernel/Exception/ResolverNotFoundException.php
+++ b/lib/symfony/http-kernel/Exception/ResolverNotFoundException.php
@@ -18,7 +18,7 @@ class ResolverNotFoundException extends \RuntimeException
      */
     public function __construct(string $name, array $alternatives = [])
     {
-        $msg = sprintf('You have requested a non-existent resolver "%s".', $name);
+        $msg = \sprintf('You have requested a non-existent resolver "%s".', $name);
         if ($alternatives) {
             if (1 === \count($alternatives)) {
                 $msg .= ' Did you mean this: "';
diff --git a/lib/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php b/lib/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
index d4862bd10..842271dc9 100644
--- a/lib/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
+++ b/lib/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
@@ -19,7 +19,7 @@ class ServiceUnavailableHttpException extends HttpException
     /**
      * @param int|string|null $retryAfter The number of seconds or HTTP-date after which the request may be retried
      */
-    public function __construct(int|string $retryAfter = null, string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(int|string|null $retryAfter = null, string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         if ($retryAfter) {
             $headers['Retry-After'] = $retryAfter;
diff --git a/lib/symfony/http-kernel/Exception/TooManyRequestsHttpException.php b/lib/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
index b71fb2508..2f749aa26 100644
--- a/lib/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
+++ b/lib/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
@@ -21,7 +21,7 @@ class TooManyRequestsHttpException extends HttpException
     /**
      * @param int|string|null $retryAfter The number of seconds or HTTP-date after which the request may be retried
      */
-    public function __construct(int|string $retryAfter = null, string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(int|string|null $retryAfter = null, string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         if ($retryAfter) {
             $headers['Retry-After'] = $retryAfter;
diff --git a/lib/symfony/http-kernel/Exception/UnauthorizedHttpException.php b/lib/symfony/http-kernel/Exception/UnauthorizedHttpException.php
index c86686128..de8f314b4 100644
--- a/lib/symfony/http-kernel/Exception/UnauthorizedHttpException.php
+++ b/lib/symfony/http-kernel/Exception/UnauthorizedHttpException.php
@@ -19,7 +19,7 @@ class UnauthorizedHttpException extends HttpException
     /**
      * @param string $challenge WWW-Authenticate challenge string
      */
-    public function __construct(string $challenge, string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $challenge, string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         $headers['WWW-Authenticate'] = $challenge;
 
diff --git a/lib/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php b/lib/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
index d58af6c2b..162aa30d6 100644
--- a/lib/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
+++ b/lib/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class UnprocessableEntityHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(422, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php b/lib/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
index 3060f1f91..736337bab 100644
--- a/lib/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/lib/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpKernel\Exception;
  */
 class UnsupportedMediaTypeHttpException extends HttpException
 {
-    public function __construct(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(string $message = '', ?\Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(415, $message, $previous, $headers, $code);
     }
diff --git a/lib/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php b/lib/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
index 55305d44e..7eea1aed4 100644
--- a/lib/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ b/lib/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -34,7 +34,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
      *
      * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported
      */
-    public function __construct(?SurrogateInterface $surrogate, FragmentRendererInterface $inlineStrategy, UriSigner $signer = null)
+    public function __construct(?SurrogateInterface $surrogate, FragmentRendererInterface $inlineStrategy, ?UriSigner $signer = null)
     {
         $this->surrogate = $surrogate;
         $this->inlineStrategy = $inlineStrategy;
diff --git a/lib/symfony/http-kernel/Fragment/FragmentHandler.php b/lib/symfony/http-kernel/Fragment/FragmentHandler.php
index 62b21e6d4..745242419 100644
--- a/lib/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/lib/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -73,7 +73,7 @@ class FragmentHandler
         }
 
         if (!isset($this->renderers[$renderer])) {
-            throw new \InvalidArgumentException(sprintf('The "%s" renderer does not exist.', $renderer));
+            throw new \InvalidArgumentException(\sprintf('The "%s" renderer does not exist.', $renderer));
         }
 
         if (!$request = $this->requestStack->getCurrentRequest()) {
@@ -97,7 +97,7 @@ class FragmentHandler
     {
         if (!$response->isSuccessful()) {
             $responseStatusCode = $response->getStatusCode();
-            throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $responseStatusCode), 0, new HttpException($responseStatusCode));
+            throw new \RuntimeException(\sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $responseStatusCode), 0, new HttpException($responseStatusCode));
         }
 
         if (!$response instanceof StreamedResponse) {
diff --git a/lib/symfony/http-kernel/Fragment/FragmentUriGenerator.php b/lib/symfony/http-kernel/Fragment/FragmentUriGenerator.php
index aeef41546..aeb1f7123 100644
--- a/lib/symfony/http-kernel/Fragment/FragmentUriGenerator.php
+++ b/lib/symfony/http-kernel/Fragment/FragmentUriGenerator.php
@@ -28,14 +28,14 @@ final class FragmentUriGenerator implements FragmentUriGeneratorInterface
     private ?UriSigner $signer;
     private ?RequestStack $requestStack;
 
-    public function __construct(string $fragmentPath, UriSigner $signer = null, RequestStack $requestStack = null)
+    public function __construct(string $fragmentPath, ?UriSigner $signer = null, ?RequestStack $requestStack = null)
     {
         $this->fragmentPath = $fragmentPath;
         $this->signer = $signer;
         $this->requestStack = $requestStack;
     }
 
-    public function generate(ControllerReference $controller, Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string
+    public function generate(ControllerReference $controller, ?Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string
     {
         if (null === $request && (null === $this->requestStack || null === $request = $this->requestStack->getCurrentRequest())) {
             throw new \LogicException('Generating a fragment URL can only be done when handling a Request.');
@@ -83,7 +83,7 @@ final class FragmentUriGenerator implements FragmentUriGeneratorInterface
             if (\is_array($value)) {
                 $this->checkNonScalar($value);
             } elseif (!\is_scalar($value) && null !== $value) {
-                throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
+                throw new \LogicException(\sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
             }
         }
     }
diff --git a/lib/symfony/http-kernel/Fragment/FragmentUriGeneratorInterface.php b/lib/symfony/http-kernel/Fragment/FragmentUriGeneratorInterface.php
index 968c002b9..6b1317c3a 100644
--- a/lib/symfony/http-kernel/Fragment/FragmentUriGeneratorInterface.php
+++ b/lib/symfony/http-kernel/Fragment/FragmentUriGeneratorInterface.php
@@ -28,5 +28,5 @@ interface FragmentUriGeneratorInterface
      * @param bool $strict   Whether to allow non-scalar attributes or not
      * @param bool $sign     Whether to sign the URL or not
      */
-    public function generate(ControllerReference $controller, Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string;
+    public function generate(ControllerReference $controller, ?Request $request = null, bool $absolute = false, bool $strict = true, bool $sign = true): string;
 }
diff --git a/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
index d5b6c4cd3..9cb01f321 100644
--- a/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/lib/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@@ -32,7 +32,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
     /**
      * @param string|null $globalDefaultTemplate The global default content (it can be a template name or the content)
      */
-    public function __construct(Environment $twig = null, UriSigner $signer = null, string $globalDefaultTemplate = null, string $charset = 'utf-8')
+    public function __construct(?Environment $twig = null, ?UriSigner $signer = null, ?string $globalDefaultTemplate = null, string $charset = 'utf-8')
     {
         $this->twig = $twig;
         $this->globalDefaultTemplate = $globalDefaultTemplate;
@@ -79,7 +79,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
         if (\count($attributes) > 0) {
             $flags = \ENT_QUOTES | \ENT_SUBSTITUTE;
             foreach ($attributes as $attribute => $value) {
-                $renderedAttributes .= sprintf(
+                $renderedAttributes .= \sprintf(
                     ' %s="%s"',
                     htmlspecialchars($attribute, $flags, $this->charset, false),
                     htmlspecialchars($value, $flags, $this->charset, false)
@@ -87,7 +87,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
             }
         }
 
-        return new Response(sprintf('<hx:include src="%s"%s>%s</hx:include>', $uri, $renderedAttributes, $content));
+        return new Response(\sprintf('<hx:include src="%s"%s>%s</hx:include>', $uri, $renderedAttributes, $content));
     }
 
     public function getName(): string
diff --git a/lib/symfony/http-kernel/Fragment/InlineFragmentRenderer.php b/lib/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
index ba3f6be70..1999603a3 100644
--- a/lib/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
+++ b/lib/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
@@ -30,7 +30,7 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
     private HttpKernelInterface $kernel;
     private ?EventDispatcherInterface $dispatcher;
 
-    public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null)
+    public function __construct(HttpKernelInterface $kernel, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->kernel = $kernel;
         $this->dispatcher = $dispatcher;
diff --git a/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php b/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
index 95518bed2..152aedad0 100644
--- a/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
+++ b/lib/symfony/http-kernel/HttpCache/AbstractSurrogate.php
@@ -56,7 +56,7 @@ abstract class AbstractSurrogate implements SurrogateInterface
             return false;
         }
 
-        return str_contains($value, sprintf('%s/1.0', strtoupper($this->getName())));
+        return str_contains($value, \sprintf('%s/1.0', strtoupper($this->getName())));
     }
 
     /**
@@ -65,7 +65,7 @@ abstract class AbstractSurrogate implements SurrogateInterface
     public function addSurrogateCapability(Request $request)
     {
         $current = $request->headers->get('Surrogate-Capability');
-        $new = sprintf('symfony="%s/1.0"', strtoupper($this->getName()));
+        $new = \sprintf('symfony="%s/1.0"', strtoupper($this->getName()));
 
         $request->headers->set('Surrogate-Capability', $current ? $current.', '.$new : $new);
     }
@@ -76,7 +76,7 @@ abstract class AbstractSurrogate implements SurrogateInterface
             return false;
         }
 
-        $pattern = sprintf('#content="[^"]*%s/1.0[^"]*"#', strtoupper($this->getName()));
+        $pattern = \sprintf('#content="[^"]*%s/1.0[^"]*"#', strtoupper($this->getName()));
 
         return (bool) preg_match($pattern, $control);
     }
@@ -89,7 +89,7 @@ abstract class AbstractSurrogate implements SurrogateInterface
             $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
 
             if (!$response->isSuccessful() && Response::HTTP_NOT_MODIFIED !== $response->getStatusCode()) {
-                throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $subRequest->getUri(), $response->getStatusCode()));
+                throw new \RuntimeException(\sprintf('Error when rendering "%s" (Status code is %d).', $subRequest->getUri(), $response->getStatusCode()));
             }
 
             return $response->getContent();
@@ -120,12 +120,12 @@ abstract class AbstractSurrogate implements SurrogateInterface
         $value = $response->headers->get('Surrogate-Control');
         $upperName = strtoupper($this->getName());
 
-        if (sprintf('content="%s/1.0"', $upperName) == $value) {
+        if (\sprintf('content="%s/1.0"', $upperName) == $value) {
             $response->headers->remove('Surrogate-Control');
-        } elseif (preg_match(sprintf('#,\s*content="%s/1.0"#', $upperName), $value)) {
-            $response->headers->set('Surrogate-Control', preg_replace(sprintf('#,\s*content="%s/1.0"#', $upperName), '', $value));
-        } elseif (preg_match(sprintf('#content="%s/1.0",\s*#', $upperName), $value)) {
-            $response->headers->set('Surrogate-Control', preg_replace(sprintf('#content="%s/1.0",\s*#', $upperName), '', $value));
+        } elseif (preg_match(\sprintf('#,\s*content="%s/1.0"#', $upperName), $value)) {
+            $response->headers->set('Surrogate-Control', preg_replace(\sprintf('#,\s*content="%s/1.0"#', $upperName), '', $value));
+        } elseif (preg_match(\sprintf('#content="%s/1.0",\s*#', $upperName), $value)) {
+            $response->headers->set('Surrogate-Control', preg_replace(\sprintf('#content="%s/1.0",\s*#', $upperName), '', $value));
         }
     }
 
diff --git a/lib/symfony/http-kernel/HttpCache/Esi.php b/lib/symfony/http-kernel/HttpCache/Esi.php
index 5db840a80..92b41a5dd 100644
--- a/lib/symfony/http-kernel/HttpCache/Esi.php
+++ b/lib/symfony/http-kernel/HttpCache/Esi.php
@@ -42,16 +42,16 @@ class Esi extends AbstractSurrogate
         }
     }
 
-    public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = ''): string
+    public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = ''): string
     {
-        $html = sprintf('<esi:include src="%s"%s%s />',
+        $html = \sprintf('<esi:include src="%s"%s%s />',
             $uri,
             $ignoreErrors ? ' onerror="continue"' : '',
-            $alt ? sprintf(' alt="%s"', $alt) : ''
+            $alt ? \sprintf(' alt="%s"', $alt) : ''
         );
 
         if (!empty($comment)) {
-            return sprintf("<esi:comment text=\"%s\" />\n%s", $comment, $html);
+            return \sprintf("<esi:comment text=\"%s\" />\n%s", $comment, $html);
         }
 
         return $html;
diff --git a/lib/symfony/http-kernel/HttpCache/HttpCache.php b/lib/symfony/http-kernel/HttpCache/HttpCache.php
index eabacfec6..8d1a3a579 100644
--- a/lib/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/lib/symfony/http-kernel/HttpCache/HttpCache.php
@@ -17,6 +17,7 @@
 
 namespace Symfony\Component\HttpKernel\HttpCache;
 
+use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -89,7 +90,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
      *                            Unless your application needs to process events on cache hits, it is recommended
      *                            to set this to false to avoid having to bootstrap the Symfony framework on a cache hit.
      */
-    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = [])
+    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, ?SurrogateInterface $surrogate = null, array $options = [])
     {
         $this->store = $store;
         $this->kernel = $kernel;
@@ -157,7 +158,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
     {
         $log = [];
         foreach ($this->traces as $request => $traces) {
-            $log[] = sprintf('%s: %s', $request, implode(', ', $traces));
+            $log[] = \sprintf('%s: %s', $request, implode(', ', $traces));
         }
 
         return implode('; ', $log);
@@ -218,7 +219,13 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $this->record($request, 'reload');
             $response = $this->fetch($request, $catch);
         } else {
-            $response = $this->lookup($request, $catch);
+            $response = null;
+            do {
+                try {
+                    $response = $this->lookup($request, $catch);
+                } catch (CacheWasLockedException) {
+                }
+            } while (null === $response);
         }
 
         $this->restoreResponseBody($request, $response);
@@ -237,7 +244,9 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
 
         $response->prepare($request);
 
-        $response->isNotModified($request);
+        if (HttpKernelInterface::MAIN_REQUEST === $type) {
+            $response->isNotModified($request);
+        }
 
         return $response;
     }
@@ -465,7 +474,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
      *
      * @return Response
      */
-    protected function forward(Request $request, bool $catch = false, Response $entry = null)
+    protected function forward(Request $request, bool $catch = false, ?Response $entry = null)
     {
         $this->surrogate?->addSurrogateCapability($request);
 
@@ -573,15 +582,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
 
         // wait for the lock to be released
         if ($this->waitForLock($request)) {
-            // replace the current entry with the fresh one
-            $new = $this->lookup($request);
-            $entry->headers = $new->headers;
-            $entry->setContent($new->getContent());
-            $entry->setStatusCode($new->getStatusCode());
-            $entry->setProtocolVersion($new->getProtocolVersion());
-            foreach ($new->headers->getCookies() as $cookie) {
-                $entry->headers->setCookie($cookie);
-            }
+            throw new CacheWasLockedException(); // unwind back to handle(), try again
         } else {
             // backend is slow as hell, send a 503 response (to avoid the dog pile effect)
             $entry->setStatusCode(503);
@@ -723,7 +724,11 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $path .= '?'.$qs;
         }
 
-        return $request->getMethod().' '.$path;
+        try {
+            return $request->getMethod().' '.$path;
+        } catch (SuspiciousOperationException $e) {
+            return '_BAD_METHOD_ '.$path;
+        }
     }
 
     /**
diff --git a/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
index 57b5d2196..05670967a 100644
--- a/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
+++ b/lib/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
@@ -37,7 +37,7 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
     private int $embeddedResponses = 0;
     private bool $isNotCacheableResponseEmbedded = false;
     private int $age = 0;
-    private \DateTimeInterface|null|false $lastModified = null;
+    private \DateTimeInterface|false|null $lastModified = null;
     private array $flagDirectives = [
         'no-cache' => null,
         'no-store' => null,
@@ -51,7 +51,7 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
     private array $ageDirectives = [
         'max-age' => null,
         's-maxage' => null,
-        'expires' => null,
+        'expires' => false,
     ];
 
     /**
@@ -82,15 +82,30 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
             return;
         }
 
-        $isHeuristicallyCacheable = $response->headers->hasCacheControlDirective('public');
         $maxAge = $response->headers->hasCacheControlDirective('max-age') ? (int) $response->headers->getCacheControlDirective('max-age') : null;
-        $this->storeRelativeAgeDirective('max-age', $maxAge, $age, $isHeuristicallyCacheable);
         $sharedMaxAge = $response->headers->hasCacheControlDirective('s-maxage') ? (int) $response->headers->getCacheControlDirective('s-maxage') : $maxAge;
-        $this->storeRelativeAgeDirective('s-maxage', $sharedMaxAge, $age, $isHeuristicallyCacheable);
-
         $expires = $response->getExpires();
         $expires = null !== $expires ? (int) $expires->format('U') - (int) $response->getDate()->format('U') : null;
-        $this->storeRelativeAgeDirective('expires', $expires >= 0 ? $expires : null, 0, $isHeuristicallyCacheable);
+
+        // See https://datatracker.ietf.org/doc/html/rfc7234#section-4.2.2
+        // If a response is "public" but does not have maximum lifetime, heuristics might be applied.
+        // Do not store NULL values so the final response can have more limiting value from other responses.
+        $isHeuristicallyCacheable = $response->headers->hasCacheControlDirective('public')
+            && null === $maxAge
+            && null === $sharedMaxAge
+            && null === $expires;
+
+        if (!$isHeuristicallyCacheable || null !== $maxAge || null !== $expires) {
+            $this->storeRelativeAgeDirective('max-age', $maxAge, $expires, $age);
+        }
+
+        if (!$isHeuristicallyCacheable || null !== $sharedMaxAge || null !== $expires) {
+            $this->storeRelativeAgeDirective('s-maxage', $sharedMaxAge, $expires, $age);
+        }
+
+        if (null !== $expires) {
+            $this->ageDirectives['expires'] = true;
+        }
 
         if (false !== $this->lastModified) {
             $lastModified = $response->getLastModified();
@@ -152,9 +167,9 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
             }
         }
 
-        if (is_numeric($this->ageDirectives['expires'])) {
+        if ($this->ageDirectives['expires'] && null !== $maxAge) {
             $date = clone $response->getDate();
-            $date = $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');
+            $date = $date->modify('+'.$maxAge.' seconds');
             $response->setExpires($date);
         }
     }
@@ -204,33 +219,16 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
      * we have to subtract the age so that the value is normalized for an age of 0.
      *
      * If the value is lower than the currently stored value, we update the value, to keep a rolling
-     * minimal value of each instruction.
-     *
-     * If the value is NULL and the isHeuristicallyCacheable parameter is false, the directive will
-     * not be set on the final response. In this case, not all responses had the directive set and no
-     * value can be found that satisfies the requirements of all responses. The directive will be dropped
-     * from the final response.
-     *
-     * If the isHeuristicallyCacheable parameter is true, however, the current response has been marked
-     * as cacheable in a public (shared) cache, but did not provide an explicit lifetime that would serve
-     * as an upper bound. In this case, we can proceed and possibly keep the directive on the final response.
+     * minimal value of each instruction. If the value is NULL, the directive will not be set on the final response.
      */
-    private function storeRelativeAgeDirective(string $directive, ?int $value, int $age, bool $isHeuristicallyCacheable): void
+    private function storeRelativeAgeDirective(string $directive, ?int $value, ?int $expires, int $age): void
     {
-        if (null === $value) {
-            if ($isHeuristicallyCacheable) {
-                /*
-                 * See https://datatracker.ietf.org/doc/html/rfc7234#section-4.2.2
-                 * This particular response does not require maximum lifetime; heuristics might be applied.
-                 * Other responses, however, might have more stringent requirements on maximum lifetime.
-                 * So, return early here so that the final response can have the more limiting value set.
-                 */
-                return;
-            }
+        if (null === $value && null === $expires) {
             $this->ageDirectives[$directive] = false;
         }
 
         if (false !== $this->ageDirectives[$directive]) {
+            $value = min($value ?? \PHP_INT_MAX, $expires ?? \PHP_INT_MAX);
             $value -= $age;
             $this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value;
         }
diff --git a/lib/symfony/http-kernel/HttpCache/Ssi.php b/lib/symfony/http-kernel/HttpCache/Ssi.php
index b17c90ac6..9e0839d63 100644
--- a/lib/symfony/http-kernel/HttpCache/Ssi.php
+++ b/lib/symfony/http-kernel/HttpCache/Ssi.php
@@ -36,9 +36,9 @@ class Ssi extends AbstractSurrogate
         }
     }
 
-    public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = ''): string
+    public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = ''): string
     {
-        return sprintf('<!--#include virtual="%s" -->', $uri);
+        return \sprintf('<!--#include virtual="%s" -->', $uri);
     }
 
     public function process(Request $request, Response $response): Response
diff --git a/lib/symfony/http-kernel/HttpCache/Store.php b/lib/symfony/http-kernel/HttpCache/Store.php
index 3f21e383f..4eba39337 100644
--- a/lib/symfony/http-kernel/HttpCache/Store.php
+++ b/lib/symfony/http-kernel/HttpCache/Store.php
@@ -45,7 +45,7 @@ class Store implements StoreInterface
     {
         $this->root = $root;
         if (!is_dir($this->root) && !@mkdir($this->root, 0777, true) && !is_dir($this->root)) {
-            throw new \RuntimeException(sprintf('Unable to create the store directory (%s).', $this->root));
+            throw new \RuntimeException(\sprintf('Unable to create the store directory (%s).', $this->root));
         }
         $this->keyCache = new \SplObjectStorage();
         $this->options = array_merge([
@@ -211,13 +211,9 @@ class Store implements StoreInterface
 
         // read existing cache entries, remove non-varying, and add this one to the list
         $entries = [];
-        $vary = $response->headers->get('vary');
+        $vary = implode(', ', $response->headers->all('vary'));
         foreach ($this->getMetadata($key) as $entry) {
-            if (!isset($entry[1]['vary'][0])) {
-                $entry[1]['vary'] = [''];
-            }
-
-            if ($entry[1]['vary'][0] != $vary || !$this->requestsMatch($vary ?? '', $entry[0], $storedEnv)) {
+            if (!$this->requestsMatch($vary ?? '', $entry[0], $storedEnv)) {
                 $entries[] = $entry;
             }
         }
@@ -285,7 +281,7 @@ class Store implements StoreInterface
      */
     private function requestsMatch(?string $vary, array $env1, array $env2): bool
     {
-        if (empty($vary)) {
+        if ('' === ($vary ?? '')) {
             return true;
         }
 
@@ -474,7 +470,7 @@ class Store implements StoreInterface
     /**
      * Restores a Response from the HTTP headers and body.
      */
-    private function restoreResponse(array $headers, string $path = null): ?Response
+    private function restoreResponse(array $headers, ?string $path = null): ?Response
     {
         $status = $headers['X-Status'][0];
         unset($headers['X-Status']);
diff --git a/lib/symfony/http-kernel/HttpCache/SubRequestHandler.php b/lib/symfony/http-kernel/HttpCache/SubRequestHandler.php
index 253071f07..4caf3daf2 100644
--- a/lib/symfony/http-kernel/HttpCache/SubRequestHandler.php
+++ b/lib/symfony/http-kernel/HttpCache/SubRequestHandler.php
@@ -51,16 +51,16 @@ class SubRequestHandler
         $trustedValues = [];
         foreach (array_reverse($request->getClientIps()) as $ip) {
             $trustedIps[] = $ip;
-            $trustedValues[] = sprintf('for="%s"', $ip);
+            $trustedValues[] = \sprintf('for="%s"', $ip);
         }
         if ($ip !== $remoteAddr) {
             $trustedIps[] = $remoteAddr;
-            $trustedValues[] = sprintf('for="%s"', $remoteAddr);
+            $trustedValues[] = \sprintf('for="%s"', $remoteAddr);
         }
 
         // set trusted values, reusing as much as possible the global trusted settings
         if (Request::HEADER_FORWARDED & $trustedHeaderSet) {
-            $trustedValues[0] .= sprintf(';host="%s";proto=%s', $request->getHttpHost(), $request->getScheme());
+            $trustedValues[0] .= \sprintf(';host="%s";proto=%s', $request->getHttpHost(), $request->getScheme());
             $request->headers->set('Forwarded', $v = implode(', ', $trustedValues));
             $request->server->set('HTTP_FORWARDED', $v);
         }
diff --git a/lib/symfony/http-kernel/HttpCache/SurrogateInterface.php b/lib/symfony/http-kernel/HttpCache/SurrogateInterface.php
index e444458f7..5ff10c963 100644
--- a/lib/symfony/http-kernel/HttpCache/SurrogateInterface.php
+++ b/lib/symfony/http-kernel/HttpCache/SurrogateInterface.php
@@ -58,7 +58,7 @@ interface SurrogateInterface
      * @param string|null $alt     An alternate URI
      * @param string      $comment A comment to add as an esi:include tag
      */
-    public function renderIncludeTag(string $uri, string $alt = null, bool $ignoreErrors = true, string $comment = ''): string;
+    public function renderIncludeTag(string $uri, ?string $alt = null, bool $ignoreErrors = true, string $comment = ''): string;
 
     /**
      * Replaces a Response Surrogate tags with the included resource content.
diff --git a/lib/symfony/http-kernel/HttpClientKernel.php b/lib/symfony/http-kernel/HttpClientKernel.php
index 1d8c30278..ebda2750d 100644
--- a/lib/symfony/http-kernel/HttpClientKernel.php
+++ b/lib/symfony/http-kernel/HttpClientKernel.php
@@ -33,10 +33,10 @@ final class HttpClientKernel implements HttpKernelInterface
 {
     private HttpClientInterface $client;
 
-    public function __construct(HttpClientInterface $client = null)
+    public function __construct(?HttpClientInterface $client = null)
     {
         if (null === $client && !class_exists(HttpClient::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
+            throw new \LogicException(\sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
         }
 
         $this->client = $client ?? HttpClient::create();
diff --git a/lib/symfony/http-kernel/HttpKernel.php b/lib/symfony/http-kernel/HttpKernel.php
index d2cf4eaee..886fca9cf 100644
--- a/lib/symfony/http-kernel/HttpKernel.php
+++ b/lib/symfony/http-kernel/HttpKernel.php
@@ -57,7 +57,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
     private ArgumentResolverInterface $argumentResolver;
     private bool $handleAllThrowables;
 
-    public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null, ArgumentResolverInterface $argumentResolver = null, bool $handleAllThrowables = false)
+    public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, ?RequestStack $requestStack = null, ?ArgumentResolverInterface $argumentResolver = null, bool $handleAllThrowables = false)
     {
         $this->dispatcher = $dispatcher;
         $this->resolver = $resolver;
@@ -118,7 +118,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
     /**
      * @internal
      */
-    public function terminateWithException(\Throwable $exception, Request $request = null): void
+    public function terminateWithException(\Throwable $exception, ?Request $request = null): void
     {
         if (!$request ??= $this->requestStack->getMainRequest()) {
             throw $exception;
@@ -162,7 +162,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
 
         // load controller
         if (false === $controller = $this->resolver->getController($request)) {
-            throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo()));
+            throw new NotFoundHttpException(\sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo()));
         }
 
         $event = new ControllerEvent($this, $controller, $request, $type);
@@ -188,7 +188,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
             if ($event->hasResponse()) {
                 $response = $event->getResponse();
             } else {
-                $msg = sprintf('The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.', $this->varToString($response));
+                $msg = \sprintf('The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.', $this->varToString($response));
 
                 // the user may have forgotten to return something
                 if (null === $response) {
@@ -278,20 +278,20 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
     private function varToString(mixed $var): string
     {
         if (\is_object($var)) {
-            return sprintf('an object of type %s', $var::class);
+            return \sprintf('an object of type %s', $var::class);
         }
 
         if (\is_array($var)) {
             $a = [];
             foreach ($var as $k => $v) {
-                $a[] = sprintf('%s => ...', $k);
+                $a[] = \sprintf('%s => ...', $k);
             }
 
-            return sprintf('an array ([%s])', mb_substr(implode(', ', $a), 0, 255));
+            return \sprintf('an array ([%s])', mb_substr(implode(', ', $a), 0, 255));
         }
 
         if (\is_resource($var)) {
-            return sprintf('a resource (%s)', get_resource_type($var));
+            return \sprintf('a resource (%s)', get_resource_type($var));
         }
 
         if (null === $var) {
@@ -307,11 +307,11 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
         }
 
         if (\is_string($var)) {
-            return sprintf('a string ("%s%s")', mb_substr($var, 0, 255), mb_strlen($var) > 255 ? '...' : '');
+            return \sprintf('a string ("%s%s")', mb_substr($var, 0, 255), mb_strlen($var) > 255 ? '...' : '');
         }
 
         if (is_numeric($var)) {
-            return sprintf('a number (%s)', (string) $var);
+            return \sprintf('a number (%s)', (string) $var);
         }
 
         return (string) $var;
diff --git a/lib/symfony/http-kernel/HttpKernelBrowser.php b/lib/symfony/http-kernel/HttpKernelBrowser.php
index 0f3630e7f..169789dda 100644
--- a/lib/symfony/http-kernel/HttpKernelBrowser.php
+++ b/lib/symfony/http-kernel/HttpKernelBrowser.php
@@ -36,7 +36,7 @@ class HttpKernelBrowser extends AbstractBrowser
     /**
      * @param array $server The server parameters (equivalent of $_SERVER)
      */
-    public function __construct(HttpKernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function __construct(HttpKernelInterface $kernel, array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         // These class properties must be set before calling the parent constructor, as it may depend on it.
         $this->kernel = $kernel;
diff --git a/lib/symfony/http-kernel/Kernel.php b/lib/symfony/http-kernel/Kernel.php
index 6247db901..a2bf0f827 100644
--- a/lib/symfony/http-kernel/Kernel.php
+++ b/lib/symfony/http-kernel/Kernel.php
@@ -70,17 +70,18 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private ?string $warmupDir = null;
     private int $requestStackSize = 0;
     private bool $resetServices = false;
+    private bool $handlingHttpCache = false;
 
     /**
      * @var array<string, bool>
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.4.2';
-    public const VERSION_ID = 60402;
+    public const VERSION = '6.4.33';
+    public const VERSION_ID = 60433;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 2;
+    public const RELEASE_VERSION = 33;
     public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2026';
@@ -89,7 +90,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     public function __construct(string $environment, bool $debug)
     {
         if (!$this->environment = $environment) {
-            throw new \InvalidArgumentException(sprintf('Invalid environment provided to "%s": the environment cannot be empty.', get_debug_type($this)));
+            throw new \InvalidArgumentException(\sprintf('Invalid environment provided to "%s": the environment cannot be empty.', get_debug_type($this)));
         }
 
         $this->debug = $debug;
@@ -101,6 +102,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         $this->container = null;
         $this->requestStackSize = 0;
         $this->resetServices = false;
+        $this->handlingHttpCache = false;
     }
 
     /**
@@ -108,7 +110,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     public function boot()
     {
-        if (true === $this->booted) {
+        if ($this->booted) {
             if (!$this->requestStackSize && $this->resetServices) {
                 if ($this->container->has('services_resetter')) {
                     $this->container->get('services_resetter')->reset();
@@ -122,7 +124,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
             return;
         }
 
-        if (null === $this->container) {
+        if (!$this->container) {
             $this->preBoot();
         }
 
@@ -149,7 +151,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     public function terminate(Request $request, Response $response)
     {
-        if (false === $this->booted) {
+        if (!$this->booted) {
             return;
         }
 
@@ -163,7 +165,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     public function shutdown()
     {
-        if (false === $this->booted) {
+        if (!$this->booted) {
             return;
         }
 
@@ -181,17 +183,26 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
     {
-        if (!$this->booted) {
-            $container = $this->container ?? $this->preBoot();
+        if (!$this->container) {
+            $this->preBoot();
+        }
 
-            if ($container->has('http_cache')) {
-                return $container->get('http_cache')->handle($request, $type, $catch);
+        if (HttpKernelInterface::MAIN_REQUEST === $type && !$this->handlingHttpCache && $this->container->has('http_cache')) {
+            $this->handlingHttpCache = true;
+
+            try {
+                return $this->container->get('http_cache')->handle($request, $type, $catch);
+            } finally {
+                $this->handlingHttpCache = false;
+                $this->resetServices = true;
             }
         }
 
         $this->boot();
         ++$this->requestStackSize;
-        $this->resetServices = true;
+        if (!$this->handlingHttpCache) {
+            $this->resetServices = true;
+        }
 
         try {
             return $this->getHttpKernel()->handle($request, $type, $catch);
@@ -216,7 +227,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     public function getBundle(string $name): BundleInterface
     {
         if (!isset($this->bundles[$name])) {
-            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the "registerBundles()" method of your "%s.php" file?', $name, get_debug_type($this)));
+            throw new \InvalidArgumentException(\sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the "registerBundles()" method of your "%s.php" file?', $name, get_debug_type($this)));
         }
 
         return $this->bundles[$name];
@@ -225,11 +236,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     public function locateResource(string $name): string
     {
         if ('@' !== $name[0]) {
-            throw new \InvalidArgumentException(sprintf('A resource name must start with @ ("%s" given).', $name));
+            throw new \InvalidArgumentException(\sprintf('A resource name must start with @ ("%s" given).', $name));
         }
 
         if (str_contains($name, '..')) {
-            throw new \RuntimeException(sprintf('File name "%s" contains invalid characters (..).', $name));
+            throw new \RuntimeException(\sprintf('File name "%s" contains invalid characters (..).', $name));
         }
 
         $bundleName = substr($name, 1);
@@ -243,7 +254,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
             return $file;
         }
 
-        throw new \InvalidArgumentException(sprintf('Unable to find file "%s".', $name));
+        throw new \InvalidArgumentException(\sprintf('Unable to find file "%s".', $name));
     }
 
     public function getEnvironment(): string
@@ -265,7 +276,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
             $r = new \ReflectionObject($this);
 
             if (!is_file($dir = $r->getFileName())) {
-                throw new \LogicException(sprintf('Cannot auto-detect project dir for kernel of class "%s".', $r->name));
+                throw new \LogicException(\sprintf('Cannot auto-detect project dir for kernel of class "%s".', $r->name));
             }
 
             $dir = $rootDir = \dirname($dir);
@@ -295,7 +306,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     public function setAnnotatedClassCache(array $annotatedClasses): void
     {
-        file_put_contents(($this->warmupDir ?: $this->getBuildDir()).'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)));
+        file_put_contents(($this->warmupDir ?: $this->getBuildDir()).'/annotations.map', \sprintf('<?php return %s;', var_export($annotatedClasses, true)));
     }
 
     public function getStartTime(): float
@@ -346,7 +357,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         foreach ($this->registerBundles() as $bundle) {
             $name = $bundle->getName();
             if (isset($this->bundles[$name])) {
-                throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s".', $name));
+                throw new \LogicException(\sprintf('Trying to register two bundles with the same name "%s".', $name));
             }
             $this->bundles[$name] = $bundle;
         }
@@ -375,7 +386,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         $class = str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
 
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $class)) {
-            throw new \InvalidArgumentException(sprintf('The environment "%s" contains invalid characters, it can only contain characters allowed in PHP class names.', $this->environment));
+            throw new \InvalidArgumentException(\sprintf('The environment "%s" contains invalid characters, it can only contain characters allowed in PHP class names.', $this->environment));
         }
 
         return $class;
@@ -407,7 +418,8 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         $cachePath = $cache->getPath();
 
         // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
-        $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+        $errorLevel = error_reporting();
+        error_reporting($errorLevel & ~\E_WARNING);
 
         try {
             if (is_file($cachePath) && \is_object($this->container = include $cachePath)
@@ -539,10 +551,18 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
             touch($oldContainerDir.'.legacy');
         }
 
-        $preload = $this instanceof WarmableInterface ? (array) $this->warmUp($this->container->getParameter('kernel.cache_dir'), $buildDir) : [];
+        $buildDir = $this->container->getParameter('kernel.build_dir');
+        $cacheDir = $this->container->getParameter('kernel.cache_dir');
+        $preload = $this instanceof WarmableInterface ? (array) $this->warmUp($cacheDir, $buildDir) : [];
 
         if ($this->container->has('cache_warmer')) {
-            $preload = array_merge($preload, (array) $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'), $buildDir));
+            $cacheWarmer = $this->container->get('cache_warmer');
+
+            if ($cacheDir !== $buildDir) {
+                $cacheWarmer->enableOptionalWarmers();
+            }
+
+            $preload = array_merge($preload, (array) $cacheWarmer->warmUp($cacheDir, $buildDir));
         }
 
         if ($preload && file_exists($preloadFile = $buildDir.'/'.$class.'.preload.php')) {
@@ -594,11 +614,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     {
         foreach (['cache' => $this->getCacheDir(), 'build' => $this->warmupDir ?: $this->getBuildDir(), 'logs' => $this->getLogDir()] as $name => $dir) {
             if (!is_dir($dir)) {
-                if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                    throw new \RuntimeException(sprintf('Unable to create the "%s" directory (%s).', $name, $dir));
+                if (!@mkdir($dir, 0o777, true) && !is_dir($dir)) {
+                    throw new \RuntimeException(\sprintf('Unable to create the "%s" directory (%s).', $name, $dir));
                 }
             } elseif (!is_writable($dir)) {
-                throw new \RuntimeException(sprintf('Unable to write in the "%s" directory (%s).', $name, $dir));
+                throw new \RuntimeException(\sprintf('Unable to write in the "%s" directory (%s).', $name, $dir));
             }
         }
 
diff --git a/lib/symfony/http-kernel/Log/DebugLoggerConfigurator.php b/lib/symfony/http-kernel/Log/DebugLoggerConfigurator.php
index 537c10040..e036f398e 100644
--- a/lib/symfony/http-kernel/Log/DebugLoggerConfigurator.php
+++ b/lib/symfony/http-kernel/Log/DebugLoggerConfigurator.php
@@ -20,7 +20,7 @@ class DebugLoggerConfigurator
 {
     private ?object $processor = null;
 
-    public function __construct(callable $processor, bool $enable = null)
+    public function __construct(callable $processor, ?bool $enable = null)
     {
         if ($enable ?? !\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
             $this->processor = \is_object($processor) ? $processor : $processor(...);
diff --git a/lib/symfony/http-kernel/Log/DebugLoggerInterface.php b/lib/symfony/http-kernel/Log/DebugLoggerInterface.php
index 1940c80a9..956abc6f3 100644
--- a/lib/symfony/http-kernel/Log/DebugLoggerInterface.php
+++ b/lib/symfony/http-kernel/Log/DebugLoggerInterface.php
@@ -33,14 +33,14 @@ interface DebugLoggerInterface
      *     timestamp_rfc3339: string,
      * }>
      */
-    public function getLogs(Request $request = null);
+    public function getLogs(?Request $request = null);
 
     /**
      * Returns the number of errors.
      *
      * @return int
      */
-    public function countErrors(Request $request = null);
+    public function countErrors(?Request $request = null);
 
     /**
      * Removes all log records.
diff --git a/lib/symfony/http-kernel/Log/Logger.php b/lib/symfony/http-kernel/Log/Logger.php
index 11d35b7e2..93c1dbc95 100644
--- a/lib/symfony/http-kernel/Log/Logger.php
+++ b/lib/symfony/http-kernel/Log/Logger.php
@@ -57,7 +57,7 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
     /**
      * @param string|resource|null $output
      */
-    public function __construct(string $minLevel = null, $output = null, callable $formatter = null, private readonly ?RequestStack $requestStack = null, bool $debug = false)
+    public function __construct(?string $minLevel = null, $output = null, ?callable $formatter = null, private readonly ?RequestStack $requestStack = null, bool $debug = false)
     {
         if (null === $minLevel) {
             $minLevel = null === $output || 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::ERROR : LogLevel::WARNING;
@@ -74,13 +74,13 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
         }
 
         if (!isset(self::LEVELS[$minLevel])) {
-            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $minLevel));
+            throw new InvalidArgumentException(\sprintf('The log level "%s" does not exist.', $minLevel));
         }
 
         $this->minLevelIndex = self::LEVELS[$minLevel];
         $this->formatter = null !== $formatter ? $formatter(...) : $this->format(...);
-        if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
-            throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
+        if ($output && false === $this->handle = \is_string($output) ? @fopen($output, 'a') : $output) {
+            throw new InvalidArgumentException(\sprintf('Unable to open "%s".', $output));
         }
         $this->debug = $debug;
     }
@@ -93,7 +93,7 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
     public function log($level, $message, array $context = []): void
     {
         if (!isset(self::LEVELS[$level])) {
-            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
+            throw new InvalidArgumentException(\sprintf('The log level "%s" does not exist.', $level));
         }
 
         if (self::LEVELS[$level] < $this->minLevelIndex) {
@@ -112,7 +112,7 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
         }
     }
 
-    public function getLogs(Request $request = null): array
+    public function getLogs(?Request $request = null): array
     {
         if ($request) {
             return $this->logs[spl_object_id($request)] ?? [];
@@ -121,7 +121,7 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
         return array_merge(...array_values($this->logs));
     }
 
-    public function countErrors(Request $request = null): int
+    public function countErrors(?Request $request = null): int
     {
         if ($request) {
             return $this->errorCount[spl_object_id($request)] ?? 0;
@@ -155,7 +155,7 @@ class Logger extends AbstractLogger implements DebugLoggerInterface
             $message = strtr($message, $replacements);
         }
 
-        $log = sprintf('[%s] %s', $level, $message);
+        $log = \sprintf('[%s] %s', $level, $message);
         if ($prefixDate) {
             $log = date(\DateTimeInterface::RFC3339).' '.$log;
         }
diff --git a/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php b/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
index df61f716f..f1e28bc2b 100644
--- a/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
+++ b/lib/symfony/http-kernel/Profiler/FileProfilerStorage.php
@@ -33,19 +33,19 @@ class FileProfilerStorage implements ProfilerStorageInterface
     public function __construct(string $dsn)
     {
         if (!str_starts_with($dsn, 'file:')) {
-            throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn));
+            throw new \RuntimeException(\sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn));
         }
         $this->folder = substr($dsn, 5);
 
         if (!is_dir($this->folder) && false === @mkdir($this->folder, 0777, true) && !is_dir($this->folder)) {
-            throw new \RuntimeException(sprintf('Unable to create the storage directory (%s).', $this->folder));
+            throw new \RuntimeException(\sprintf('Unable to create the storage directory (%s).', $this->folder));
         }
     }
 
     /**
      * @param \Closure|null $filter A filter to apply on the list of tokens
      */
-    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, int $start = null, int $end = null, string $statusCode = null/* , \Closure $filter = null */): array
+    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, ?string $statusCode = null/* , \Closure $filter = null */): array
     {
         $filter = 7 < \func_num_args() ? func_get_arg(7) : null;
         $file = $this->getIndexFilename();
@@ -59,7 +59,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
 
         $result = [];
         while (\count($result) < $limit && $line = $this->readLineFromFile($file)) {
-            $values = str_getcsv($line);
+            $values = str_getcsv($line, ',', '"', '\\');
 
             if (7 > \count($values)) {
                 // skip invalid lines
@@ -144,7 +144,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
             // Create directory
             $dir = \dirname($file);
             if (!is_dir($dir) && false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new \RuntimeException(sprintf('Unable to create the storage directory (%s).', $dir));
+                throw new \RuntimeException(\sprintf('Unable to create the storage directory (%s).', $dir));
             }
         }
 
@@ -193,7 +193,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
                 $profile->getParentToken(),
                 $profile->getStatusCode(),
                 $profile->getVirtualType() ?? 'request',
-            ]);
+            ], ',', '"', '\\');
             fclose($file);
 
             if (1 === mt_rand(1, 10)) {
@@ -272,7 +272,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
     /**
      * @return Profile
      */
-    protected function createProfileFromData(string $token, array $data, Profile $parent = null)
+    protected function createProfileFromData(string $token, array $data, ?Profile $parent = null)
     {
         $profile = new Profile($token);
         $profile->setIp($data['ip']);
@@ -300,7 +300,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         return $profile;
     }
 
-    private function doRead($token, Profile $profile = null): ?Profile
+    private function doRead($token, ?Profile $profile = null): ?Profile
     {
         if (!$token || !file_exists($file = $this->getFilename($token))) {
             return null;
@@ -334,7 +334,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         }
 
         while ($line = fgets($handle)) {
-            $values = str_getcsv($line);
+            $values = str_getcsv($line, ',', '"', '\\');
 
             if (7 > \count($values)) {
                 // skip invalid lines
diff --git a/lib/symfony/http-kernel/Profiler/Profile.php b/lib/symfony/http-kernel/Profiler/Profile.php
index 08e7b65a2..91ae51e95 100644
--- a/lib/symfony/http-kernel/Profiler/Profile.php
+++ b/lib/symfony/http-kernel/Profiler/Profile.php
@@ -232,7 +232,7 @@ class Profile
     public function getCollector(string $name): DataCollectorInterface
     {
         if (!isset($this->collectors[$name])) {
-            throw new \InvalidArgumentException(sprintf('Collector "%s" does not exist.', $name));
+            throw new \InvalidArgumentException(\sprintf('Collector "%s" does not exist.', $name));
         }
 
         return $this->collectors[$name];
diff --git a/lib/symfony/http-kernel/Profiler/Profiler.php b/lib/symfony/http-kernel/Profiler/Profiler.php
index 04ab0670d..65adf0f17 100644
--- a/lib/symfony/http-kernel/Profiler/Profiler.php
+++ b/lib/symfony/http-kernel/Profiler/Profiler.php
@@ -37,7 +37,7 @@ class Profiler implements ResetInterface
     private bool $initiallyEnabled = true;
     private bool $enabled = true;
 
-    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, bool $enable = true)
+    public function __construct(ProfilerStorageInterface $storage, ?LoggerInterface $logger = null, bool $enable = true)
     {
         $this->storage = $storage;
         $this->logger = $logger;
@@ -128,7 +128,7 @@ class Profiler implements ResetInterface
      *
      * @see https://php.net/datetime.formats for the supported date/time formats
      */
-    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, string $statusCode = null/* , \Closure $filter = null */): array
+    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?string $start, ?string $end, ?string $statusCode = null/* , \Closure $filter = null */): array
     {
         $filter = 7 < \func_num_args() ? func_get_arg(7) : null;
 
@@ -138,7 +138,7 @@ class Profiler implements ResetInterface
     /**
      * Collects data for the given Response.
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null): ?Profile
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): ?Profile
     {
         if (false === $this->enabled) {
             return null;
@@ -239,7 +239,7 @@ class Profiler implements ResetInterface
     public function get(string $name): DataCollectorInterface
     {
         if (!isset($this->collectors[$name])) {
-            throw new \InvalidArgumentException(sprintf('Collector "%s" does not exist.', $name));
+            throw new \InvalidArgumentException(\sprintf('Collector "%s" does not exist.', $name));
         }
 
         return $this->collectors[$name];
diff --git a/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php b/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
index 14b8993b6..e2a25bc99 100644
--- a/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
+++ b/lib/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
@@ -35,7 +35,7 @@ interface ProfilerStorageInterface
      * @param string|null   $statusCode The response status code
      * @param \Closure|null $filter     A filter to apply on the list of tokens
      */
-    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, int $start = null, int $end = null/* , string $statusCode = null, \Closure $filter = null */): array;
+    public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null/* , string $statusCode = null, \Closure $filter = null */): array;
 
     /**
      * Reads data associated with the given token.
diff --git a/lib/symfony/http-kernel/Resources/welcome.html.php b/lib/symfony/http-kernel/Resources/welcome.html.php
index d36b97527..03453c5c7 100644
--- a/lib/symfony/http-kernel/Resources/welcome.html.php
+++ b/lib/symfony/http-kernel/Resources/welcome.html.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="en">
 <head>
-    <meta charset="UTF-8">
-    <meta name="robots" content="noindex,nofollow,noarchive,nosnippet,noodp,notranslate,noimageindex">
+    <meta charset="UTF-8" />
+    <meta name="robots" content="noindex,nofollow,noarchive,nosnippet,noodp,notranslate,noimageindex" />
     <title>Welcome to Symfony!</title>
-    <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>👋</text></svg>">
+    <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>👋</text></svg>" />
     <style>
         <?php $hue = random_int(0, 360); ?>
         <?php $darkColor = static fn (float $alpha = 1) => "hsla($hue, 20%, 45%, $alpha)"; ?>
diff --git a/lib/symfony/http-kernel/composer.json b/lib/symfony/http-kernel/composer.json
index 142fffa50..1c70224aa 100644
--- a/lib/symfony/http-kernel/composer.json
+++ b/lib/symfony/http-kernel/composer.json
@@ -38,12 +38,13 @@
         "symfony/process": "^5.4|^6.0|^7.0",
         "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
         "symfony/routing": "^5.4|^6.0|^7.0",
-        "symfony/serializer": "^6.3|^7.0",
+        "symfony/serializer": "^6.4.4|^7.0.4",
         "symfony/stopwatch": "^5.4|^6.0|^7.0",
         "symfony/translation": "^5.4|^6.0|^7.0",
         "symfony/translation-contracts": "^2.5|^3",
         "symfony/uid": "^5.4|^6.0|^7.0",
         "symfony/validator": "^6.4|^7.0",
+        "symfony/var-dumper": "^5.4|^6.4|^7.0",
         "symfony/var-exporter": "^6.2|^7.0",
         "psr/cache": "^1.0|^2.0|^3.0",
         "twig/twig": "^2.13|^3.0.4"
diff --git a/lib/symfony/mailer/Transport/Smtp/SmtpTransport.php b/lib/symfony/mailer/Transport/Smtp/SmtpTransport.php
index ee37516e1..2570e3fc2 100644
--- a/lib/symfony/mailer/Transport/Smtp/SmtpTransport.php
+++ b/lib/symfony/mailer/Transport/Smtp/SmtpTransport.php
@@ -154,18 +154,7 @@ class SmtpTransport extends AbstractTransport
 
     protected function parseMessageId(string $mtaResult): string
     {
-        $regexps = [
-            '/250 Ok (?P<id>[0-9a-f-]+)\r?$/mis',
-            '/250 Ok:? queued as (?P<id>[A-Z0-9]+)\r?$/mis',
-        ];
-        $matches = [];
-        foreach ($regexps as $regexp) {
-            if (preg_match($regexp, $mtaResult, $matches)) {
-                return $matches['id'];
-            }
-        }
-
-        return '';
+        return preg_match('/^250 (?:\S+ )?Ok:?+ (?:queued as |id=)?+(?P<id>[A-Z0-9._-]++)/im', $mtaResult, $matches) ? $matches['id'] : '';
     }
 
     public function __toString(): string
@@ -372,15 +361,12 @@ class SmtpTransport extends AbstractTransport
         $this->restartCounter = 0;
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
diff --git a/lib/symfony/mime/Email.php b/lib/symfony/mime/Email.php
index 8183c7899..c5a65641b 100644
--- a/lib/symfony/mime/Email.php
+++ b/lib/symfony/mime/Email.php
@@ -507,7 +507,7 @@ class Email extends Message
                 }
 
                 if ($name !== $part->getContentId()) {
-                    $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html, $count);
+                    $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);
                 }
                 $relatedParts[$name] = $part;
                 $part->setName($part->getContentId())->asInline();
diff --git a/lib/symfony/mime/Encoder/QpContentEncoder.php b/lib/symfony/mime/Encoder/QpContentEncoder.php
index 777a6a96c..c425b6759 100644
--- a/lib/symfony/mime/Encoder/QpContentEncoder.php
+++ b/lib/symfony/mime/Encoder/QpContentEncoder.php
@@ -46,9 +46,9 @@ final class QpContentEncoder implements ContentEncoderInterface
         // transform =0D=0A to CRLF
         $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        return match (\ord(substr($string, -1))) {
-            0x09 => substr_replace($string, '=09', -1),
-            0x20 => substr_replace($string, '=20', -1),
+        return match ($string[-1] ?? '') {
+            "\x09" => substr_replace($string, '=09', -1),
+            "\x20" => substr_replace($string, '=20', -1),
             default => $string,
         };
     }
diff --git a/lib/symfony/mime/Encoder/QpEncoder.php b/lib/symfony/mime/Encoder/QpEncoder.php
index 160dde329..76ec445a3 100644
--- a/lib/symfony/mime/Encoder/QpEncoder.php
+++ b/lib/symfony/mime/Encoder/QpEncoder.php
@@ -183,9 +183,9 @@ class QpEncoder implements EncoderInterface
     {
         $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        return match ($end = \ord(substr($string, -1))) {
-            0x09,
-            0x20 => substr_replace($string, self::QP_MAP[$end], -1),
+        return match ($end = ($string[-1] ?? '')) {
+            "\x09",
+            "\x20" => substr_replace($string, self::QP_MAP[\ord($end)], -1),
             default => $string,
         };
     }
diff --git a/lib/symfony/mime/MimeTypes.php b/lib/symfony/mime/MimeTypes.php
index 19628b0b1..fd9881b72 100644
--- a/lib/symfony/mime/MimeTypes.php
+++ b/lib/symfony/mime/MimeTypes.php
@@ -135,7 +135,7 @@ final class MimeTypes implements MimeTypesInterface
     /**
      * A map of MIME types and their default extensions.
      *
-     * Updated from upstream on 2023-10-14.
+     * Updated from upstream on 2025-11-15.
      *
      * @see Resources/bin/update_mime_types.php
      */
@@ -143,7 +143,10 @@ final class MimeTypes implements MimeTypesInterface
         'application/acrobat' => ['pdf'],
         'application/andrew-inset' => ['ez'],
         'application/annodex' => ['anx'],
+        'application/appinstaller' => ['appinstaller'],
         'application/applixware' => ['aw'],
+        'application/appx' => ['appx'],
+        'application/appxbundle' => ['appxbundle'],
         'application/atom+xml' => ['atom'],
         'application/atomcat+xml' => ['atomcat'],
         'application/atomdeleted+xml' => ['atomdeleted'],
@@ -151,8 +154,11 @@ final class MimeTypes implements MimeTypesInterface
         'application/atsc-dwd+xml' => ['dwd'],
         'application/atsc-held+xml' => ['held'],
         'application/atsc-rsat+xml' => ['rsat'],
+        'application/automationml-aml+xml' => ['aml'],
+        'application/automationml-amlx+zip' => ['amlx'],
         'application/bat' => ['bat'],
         'application/bdoc' => ['bdoc'],
+        'application/buildstream+yaml' => ['bst'],
         'application/bzip2' => ['bz2', 'bz'],
         'application/calendar+xml' => ['xcs'],
         'application/cbor' => ['cbor'],
@@ -168,6 +174,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/cpl+xml' => ['cpl'],
         'application/csv' => ['csv'],
         'application/cu-seeme' => ['cu'],
+        'application/cwl' => ['cwl'],
         'application/dash+xml' => ['mpd'],
         'application/dash-patch+xml' => ['mpp'],
         'application/davmount+xml' => ['davmount'],
@@ -184,6 +191,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/epub+zip' => ['epub'],
         'application/exi' => ['exi'],
         'application/express' => ['exp'],
+        'application/fdf' => ['fdf'],
         'application/fdt+xml' => ['fdt'],
         'application/fits' => ['fits', 'fit', 'fts'],
         'application/font-tdpfr' => ['pfr'],
@@ -196,10 +204,12 @@ final class MimeTypes implements MimeTypesInterface
         'application/gpx+xml' => ['gpx'],
         'application/gxf' => ['gxf'],
         'application/gzip' => ['gz'],
+        'application/har+json' => ['har'],
         'application/hjson' => ['hjson'],
+        'application/hta' => ['hta'],
         'application/hyperstudio' => ['stk'],
         'application/ico' => ['ico'],
-        'application/ics' => ['vcs', 'ics'],
+        'application/ics' => ['vcs', 'ics', 'ifb', 'icalendar'],
         'application/illustrator' => ['ai'],
         'application/inkml+xml' => ['ink', 'inkml'],
         'application/ipfix' => ['ipfix'],
@@ -209,7 +219,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/java-byte-code' => ['class'],
         'application/java-serialized-object' => ['ser'],
         'application/java-vm' => ['class'],
-        'application/javascript' => ['js', 'mjs', 'jsm'],
+        'application/javascript' => ['js', 'cjs', 'jsm', 'mjs'],
         'application/jrd+json' => ['jrd'],
         'application/json' => ['json', 'map'],
         'application/json-patch+json' => ['json-patch'],
@@ -235,16 +245,20 @@ final class MimeTypes implements MimeTypesInterface
         'application/metalink+xml' => ['metalink'],
         'application/metalink4+xml' => ['meta4'],
         'application/mets+xml' => ['mets'],
+        'application/microsoftpatch' => ['msp'],
+        'application/microsoftupdate' => ['msu'],
         'application/mmt-aei+xml' => ['maei'],
         'application/mmt-usd+xml' => ['musd'],
         'application/mods+xml' => ['mods'],
         'application/mp21' => ['m21', 'mp21'],
-        'application/mp4' => ['mp4s', 'm4p'],
+        'application/mp4' => ['mp4', 'mpg4', 'mp4s', 'm4p'],
         'application/mrb-consumer+xml' => ['xdf'],
         'application/mrb-publish+xml' => ['xdf'],
         'application/ms-tnef' => ['tnef', 'tnf'],
         'application/msaccess' => ['mdb'],
         'application/msexcel' => ['xls', 'xlc', 'xll', 'xlm', 'xlw', 'xla', 'xlt', 'xld'],
+        'application/msix' => ['msix'],
+        'application/msixbundle' => ['msixbundle'],
         'application/mspowerpoint' => ['ppz', 'ppt', 'pps', 'pot'],
         'application/msword' => ['doc', 'dot'],
         'application/msword-template' => ['dot'],
@@ -269,7 +283,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/pgp' => ['pgp', 'gpg', 'asc'],
         'application/pgp-encrypted' => ['pgp', 'gpg', 'asc'],
         'application/pgp-keys' => ['asc', 'skr', 'pkr', 'pgp', 'gpg', 'key'],
-        'application/pgp-signature' => ['asc', 'sig', 'pgp', 'gpg'],
+        'application/pgp-signature' => ['sig', 'asc', 'pgp', 'gpg'],
         'application/photoshop' => ['psd'],
         'application/pics-rules' => ['prf'],
         'application/pkcs10' => ['p10'],
@@ -289,6 +303,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/powerpoint' => ['ppz', 'ppt', 'pps', 'pot'],
         'application/provenance+xml' => ['provx'],
         'application/prs.cww' => ['cww'],
+        'application/prs.wavefront-obj' => ['obj'],
+        'application/prs.xsf+xml' => ['xsf'],
         'application/pskc+xml' => ['pskcxml'],
         'application/ram' => ['ram'],
         'application/raml+yaml' => ['raml'],
@@ -324,6 +340,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/smil+xml' => ['smi', 'smil', 'sml', 'kino'],
         'application/sparql-query' => ['rq', 'qs'],
         'application/sparql-results+xml' => ['srx'],
+        'application/spdx+json' => ['spdx.json'],
         'application/sql' => ['sql'],
         'application/srgs' => ['gram'],
         'application/srgs+xml' => ['grxml'],
@@ -339,6 +356,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/toml' => ['toml'],
         'application/trig' => ['trig'],
         'application/ttml+xml' => ['ttml'],
+        'application/typescript' => ['cts', 'mts', 'ts'],
         'application/ubjson' => ['ubj'],
         'application/urc-ressheet+xml' => ['rsheet'],
         'application/urc-targetdesc+xml' => ['td'],
@@ -371,6 +389,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.anser-web-certificate-issue-initiation' => ['cii'],
         'application/vnd.anser-web-funds-transfer-initiation' => ['fti'],
         'application/vnd.antix.game-component' => ['atx'],
+        'application/vnd.apache.parquet' => ['parquet'],
         'application/vnd.appimage' => ['appimage'],
         'application/vnd.apple.installer+xml' => ['mpkg'],
         'application/vnd.apple.keynote' => ['key', 'keynote'],
@@ -378,6 +397,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.apple.numbers' => ['numbers'],
         'application/vnd.apple.pages' => ['pages'],
         'application/vnd.apple.pkpass' => ['pkpass'],
+        'application/vnd.apple.pkpasses' => ['pkpasses'],
         'application/vnd.aristanetworks.swi' => ['swi'],
         'application/vnd.astraea-software.iota' => ['iota'],
         'application/vnd.audiograph' => ['aep'],
@@ -412,6 +432,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.cups-ppd' => ['ppd'],
         'application/vnd.curl.car' => ['car'],
         'application/vnd.curl.pcurl' => ['pcurl'],
+        'application/vnd.cyclonedx+json' => ['cdx.json'],
+        'application/vnd.cyclonedx+xml' => ['cdx.xml'],
         'application/vnd.dart' => ['dart'],
         'application/vnd.data-vision.rdz' => ['rdz'],
         'application/vnd.dbf' => ['dbf'],
@@ -467,6 +489,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.genomatix.tuxedo' => ['txd'],
         'application/vnd.geo+json' => ['geojson', 'geo.json'],
         'application/vnd.geogebra.file' => ['ggb'],
+        'application/vnd.geogebra.slides' => ['ggs'],
         'application/vnd.geogebra.tool' => ['ggt'],
         'application/vnd.geometry-explorer' => ['gex', 'gre'],
         'application/vnd.geonext' => ['gxt'],
@@ -479,6 +502,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.google-apps.spreadsheet' => ['gsheet'],
         'application/vnd.google-earth.kml+xml' => ['kml'],
         'application/vnd.google-earth.kmz' => ['kmz'],
+        'application/vnd.gov.sk.xmldatacontainer+xml' => ['xdcf'],
         'application/vnd.grafeq' => ['gqf', 'gqs'],
         'application/vnd.groove-account' => ['gac'],
         'application/vnd.groove-help' => ['ghf'],
@@ -554,6 +578,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.mfmp' => ['mfm'],
         'application/vnd.micrografx.flo' => ['flo'],
         'application/vnd.micrografx.igx' => ['igx'],
+        'application/vnd.microsoft.portable-executable' => ['exe', 'dll', 'cpl', 'drv', 'scr', 'efi', 'ocx', 'sys', 'lib'],
         'application/vnd.mif' => ['mif'],
         'application/vnd.mobius.daf' => ['daf'],
         'application/vnd.mobius.dis' => ['dis'],
@@ -609,6 +634,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.musician' => ['mus'],
         'application/vnd.muvee.style' => ['msty'],
         'application/vnd.mynfc' => ['taglet'],
+        'application/vnd.nato.bindingdataobject+xml' => ['bdo'],
         'application/vnd.neurolanguage.nlu' => ['nlu'],
         'application/vnd.nintendo.snes.rom' => ['sfc', 'smc'],
         'application/vnd.nitf' => ['ntf', 'nitf'],
@@ -624,6 +650,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.novadigm.edx' => ['edx'],
         'application/vnd.novadigm.ext' => ['ext'],
         'application/vnd.oasis.docbook+xml' => ['dbk', 'docbook'],
+        'application/vnd.oasis.opendocument.base' => ['odb'],
         'application/vnd.oasis.opendocument.chart' => ['odc'],
         'application/vnd.oasis.opendocument.chart-template' => ['otc'],
         'application/vnd.oasis.opendocument.database' => ['odb'],
@@ -643,6 +670,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.oasis.opendocument.text' => ['odt'],
         'application/vnd.oasis.opendocument.text-flat-xml' => ['fodt'],
         'application/vnd.oasis.opendocument.text-master' => ['odm'],
+        'application/vnd.oasis.opendocument.text-master-template' => ['otm'],
         'application/vnd.oasis.opendocument.text-template' => ['ott'],
         'application/vnd.oasis.opendocument.text-web' => ['oth'],
         'application/vnd.olpc-sugar' => ['xo'],
@@ -673,7 +701,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.proteus.magazine' => ['mgz'],
         'application/vnd.publishare-delta-tree' => ['qps'],
         'application/vnd.pvi.ptid1' => ['ptid'],
-        'application/vnd.quark.quarkxpress' => ['qxd', 'qxt', 'qwd', 'qwt', 'qxl', 'qxb'],
+        'application/vnd.pwg-xhtml-print+xml' => ['xhtm'],
+        'application/vnd.quark.quarkxpress' => ['qxd', 'qxt', 'qwd', 'qwt', 'qxl', 'qxb', 'qxp'],
         'application/vnd.rar' => ['rar'],
         'application/vnd.realvnc.bed' => ['bed'],
         'application/vnd.recordare.musicxml' => ['mxl'],
@@ -702,15 +731,16 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.spotfire.dxp' => ['dxp'],
         'application/vnd.spotfire.sfs' => ['sfs'],
         'application/vnd.sqlite3' => ['sqlite3'],
-        'application/vnd.squashfs' => ['sqsh'],
+        'application/vnd.squashfs' => ['sfs', 'sqfs', 'sqsh', 'squashfs'],
         'application/vnd.stardivision.calc' => ['sdc'],
         'application/vnd.stardivision.chart' => ['sds'],
         'application/vnd.stardivision.draw' => ['sda'],
-        'application/vnd.stardivision.impress' => ['sdd', 'sdp'],
-        'application/vnd.stardivision.mail' => ['smd'],
+        'application/vnd.stardivision.impress' => ['sdd'],
+        'application/vnd.stardivision.impress-packed' => ['sdp'],
+        'application/vnd.stardivision.mail' => ['sdm'],
         'application/vnd.stardivision.math' => ['smf'],
-        'application/vnd.stardivision.writer' => ['sdw', 'vor', 'sgl'],
-        'application/vnd.stardivision.writer-global' => ['sgl', 'sdw', 'vor'],
+        'application/vnd.stardivision.writer' => ['sdw', 'vor'],
+        'application/vnd.stardivision.writer-global' => ['sgl'],
         'application/vnd.stepmania.package' => ['smzip'],
         'application/vnd.stepmania.stepchart' => ['sm'],
         'application/vnd.sun.wadl+xml' => ['wadl'],
@@ -743,7 +773,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/vnd.uiq.theme' => ['utz'],
         'application/vnd.umajin' => ['umj'],
         'application/vnd.unity' => ['unityweb'],
-        'application/vnd.uoml+xml' => ['uoml'],
+        'application/vnd.uoml+xml' => ['uoml', 'uo'],
         'application/vnd.vcx' => ['vcx'],
         'application/vnd.visio' => ['vsd', 'vst', 'vss', 'vsw'],
         'application/vnd.visionary' => ['vis'],
@@ -786,7 +816,9 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-abiword' => ['abw', 'abw.CRASHED', 'abw.gz', 'zabw'],
         'application/x-ace' => ['ace'],
         'application/x-ace-compressed' => ['ace'],
+        'application/x-alpine-package-keeper-package' => ['apk'],
         'application/x-alz' => ['alz'],
+        'application/x-amf' => ['amf'],
         'application/x-amiga-disk-format' => ['adf'],
         'application/x-amipro' => ['sam'],
         'application/x-annodex' => ['anx'],
@@ -796,7 +828,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-appleworks-document' => ['cwk'],
         'application/x-applix-spreadsheet' => ['as'],
         'application/x-applix-word' => ['aw'],
-        'application/x-archive' => ['a', 'ar'],
+        'application/x-archive' => ['a', 'ar', 'lib'],
         'application/x-arj' => ['arj'],
         'application/x-asar' => ['asar'],
         'application/x-asp' => ['asp'],
@@ -811,14 +843,16 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-bcpio' => ['bcpio'],
         'application/x-bdoc' => ['bdoc'],
         'application/x-bittorrent' => ['torrent'],
-        'application/x-blender' => ['blend', 'BLEND', 'blender'],
+        'application/x-blender' => ['blend', 'blender'],
         'application/x-blorb' => ['blb', 'blorb'],
         'application/x-bps-patch' => ['bps'],
         'application/x-bsdiff' => ['bsdiff'],
         'application/x-bz2' => ['bz2'],
         'application/x-bzdvi' => ['dvi.bz2'],
-        'application/x-bzip' => ['bz'],
-        'application/x-bzip-compressed-tar' => ['tar.bz', 'tbz', 'tbz2', 'tb2'],
+        'application/x-bzip' => ['bz', 'bz2'],
+        'application/x-bzip-compressed-tar' => ['tar.bz2', 'tbz2', 'tb2'],
+        'application/x-bzip1' => ['bz'],
+        'application/x-bzip1-compressed-tar' => ['tar.bz', 'tbz'],
         'application/x-bzip2' => ['bz2', 'boz'],
         'application/x-bzip2-compressed-tar' => ['tar.bz2', 'tbz2', 'tb2'],
         'application/x-bzip3' => ['bz3'],
@@ -866,6 +900,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-docbook+xml' => ['dbk', 'docbook'],
         'application/x-doom' => ['wad'],
         'application/x-doom-wad' => ['wad'],
+        'application/x-dosexec' => ['exe'],
         'application/x-dreamcast-rom' => ['iso'],
         'application/x-dtbncx+xml' => ['ncx'],
         'application/x-dtbook+xml' => ['dtb'],
@@ -900,6 +935,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-font-woff' => ['woff'],
         'application/x-frame' => ['fm'],
         'application/x-freearc' => ['arc'],
+        'application/x-freedesktop-appstream-component' => ['metainfo.xml', 'appdata.xml'],
+        'application/x-freedesktop-appstream-releases' => ['releases.xml'],
         'application/x-futuresplash' => ['spl'],
         'application/x-gameboy-color-rom' => ['gbc', 'cgb'],
         'application/x-gameboy-rom' => ['gb', 'sgb'],
@@ -912,7 +949,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-gdscript' => ['gd'],
         'application/x-gedcom' => ['ged', 'gedcom'],
         'application/x-genesis-32x-rom' => ['32x', 'mdx'],
-        'application/x-genesis-rom' => ['gen', 'smd', 'sgd'],
+        'application/x-genesis-rom' => ['gen', 'smd', 'md', 'sgd'],
         'application/x-gerber' => ['gbr'],
         'application/x-gerber-job' => ['gbrjob'],
         'application/x-gettext' => ['po'],
@@ -964,7 +1001,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-java-keystore' => ['jks', 'ks'],
         'application/x-java-pack200' => ['pack'],
         'application/x-java-vm' => ['class'],
-        'application/x-javascript' => ['js', 'jsm', 'mjs'],
+        'application/x-javascript' => ['js', 'cjs', 'jsm', 'mjs'],
         'application/x-jbuilder-project' => ['jpr', 'jpx'],
         'application/x-karbon' => ['karbon'],
         'application/x-kchart' => ['chrt'],
@@ -1018,7 +1055,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-modrinth-modpack+zip' => ['mrpack'],
         'application/x-ms-application' => ['application'],
         'application/x-ms-asx' => ['asx', 'wax', 'wvx', 'wmx'],
-        'application/x-ms-dos-executable' => ['exe'],
+        'application/x-ms-dos-executable' => ['exe', 'dll', 'cpl', 'drv', 'scr'],
+        'application/x-ms-ne-executable' => ['exe', 'dll', 'cpl', 'drv', 'scr'],
         'application/x-ms-pdb' => ['pdb'],
         'application/x-ms-shortcut' => ['lnk'],
         'application/x-ms-wim' => ['wim', 'swm'],
@@ -1030,7 +1068,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-mscardfile' => ['crd'],
         'application/x-msclip' => ['clp'],
         'application/x-msdos-program' => ['exe'],
-        'application/x-msdownload' => ['exe', 'dll', 'com', 'bat', 'msi'],
+        'application/x-msdownload' => ['exe', 'dll', 'com', 'bat', 'msi', 'cpl', 'drv', 'scr'],
         'application/x-msexcel' => ['xls', 'xlc', 'xll', 'xlm', 'xlw', 'xla', 'xlt', 'xld'],
         'application/x-msi' => ['msi'],
         'application/x-msmediaview' => ['mvb', 'm13', 'm14'],
@@ -1054,8 +1092,10 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-nintendo-3ds-executable' => ['3dsx'],
         'application/x-nintendo-3ds-rom' => ['3ds', 'cci'],
         'application/x-nintendo-ds-rom' => ['nds'],
+        'application/x-nintendo-switch-xci' => ['xci'],
         'application/x-ns-proxy-autoconfig' => ['pac'],
         'application/x-nuscript' => ['nu'],
+        'application/x-nx-xci' => ['xci'],
         'application/x-nzb' => ['nzb'],
         'application/x-object' => ['o', 'mod'],
         'application/x-ogg' => ['ogx'],
@@ -1066,9 +1106,11 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-pak' => ['pak'],
         'application/x-palm-database' => ['prc', 'pdb', 'pqa', 'oprc'],
         'application/x-par2' => ['PAR2', 'par2'],
+        'application/x-parquet' => ['parquet'],
         'application/x-partial-download' => ['wkdownload', 'crdownload', 'part'],
         'application/x-pc-engine-rom' => ['pce'],
         'application/x-pcap' => ['pcap', 'cap', 'dmp'],
+        'application/x-pcapng' => ['pcapng', 'scap', 'ntar'],
         'application/x-pdf' => ['pdf'],
         'application/x-perl' => ['pl', 'pm', 'PL', 'al', 'perl', 'pod', 't'],
         'application/x-photoshop' => ['psd'],
@@ -1079,15 +1121,17 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-pkcs7-certreqresp' => ['p7r'],
         'application/x-planperfect' => ['pln'],
         'application/x-pocket-word' => ['psw'],
+        'application/x-powershell' => ['ps1'],
         'application/x-pw' => ['pw'],
         'application/x-pyspread-bz-spreadsheet' => ['pys'],
         'application/x-pyspread-spreadsheet' => ['pysu'],
         'application/x-python-bytecode' => ['pyc', 'pyo'],
+        'application/x-qbrew' => ['qbrew'],
         'application/x-qed-disk' => ['qed'],
         'application/x-qemu-disk' => ['qcow2', 'qcow'],
         'application/x-qpress' => ['qp'],
         'application/x-qtiplot' => ['qti', 'qti.gz'],
-        'application/x-quattropro' => ['wb1', 'wb2', 'wb3'],
+        'application/x-quattropro' => ['wb1', 'wb2', 'wb3', 'qpw'],
         'application/x-quicktime-media-link' => ['qtl'],
         'application/x-quicktimeplayer' => ['qtl'],
         'application/x-qw' => ['qif'],
@@ -1102,6 +1146,8 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-rnc' => ['rnc'],
         'application/x-rpm' => ['rpm'],
         'application/x-ruby' => ['rb'],
+        'application/x-rzip' => ['rz'],
+        'application/x-rzip-compressed-tar' => ['tar.rz', 'trz'],
         'application/x-sami' => ['smi', 'sami'],
         'application/x-sap-file' => ['sap'],
         'application/x-saturn-rom' => ['iso'],
@@ -1124,6 +1170,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-smaf' => ['mmf', 'smaf'],
         'application/x-sms-rom' => ['sms'],
         'application/x-snes-rom' => ['sfc', 'smc'],
+        'application/x-sony-bbeb' => ['lrf'],
         'application/x-source-rpm' => ['src.rpm', 'spm'],
         'application/x-spss-por' => ['por'],
         'application/x-spss-sav' => ['sav', 'zsav'],
@@ -1132,11 +1179,20 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-sqlite2' => ['sqlite2'],
         'application/x-sqlite3' => ['sqlite3'],
         'application/x-srt' => ['srt'],
+        'application/x-starcalc' => ['sdc'],
+        'application/x-starchart' => ['sds'],
+        'application/x-stardraw' => ['sda'],
+        'application/x-starimpress' => ['sdd'],
+        'application/x-starmail' => ['smd'],
+        'application/x-starmath' => ['smf'],
+        'application/x-starwriter' => ['sdw', 'vor'],
+        'application/x-starwriter-global' => ['sgl'],
         'application/x-stuffit' => ['sit'],
         'application/x-stuffitx' => ['sitx'],
         'application/x-subrip' => ['srt'],
         'application/x-sv4cpio' => ['sv4cpio'],
         'application/x-sv4crc' => ['sv4crc'],
+        'application/x-sylk' => ['sylk', 'slk'],
         'application/x-t3vm-image' => ['t3'],
         'application/x-t602' => ['602'],
         'application/x-tads' => ['gam'],
@@ -1186,6 +1242,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-wii-iso-image' => ['iso'],
         'application/x-wii-rom' => ['iso'],
         'application/x-wii-wad' => ['wad'],
+        'application/x-win-lnk' => ['lnk'],
         'application/x-windows-themepack' => ['themepack'],
         'application/x-wmf' => ['wmf'],
         'application/x-wonderswan-color-rom' => ['wsc'],
@@ -1212,6 +1269,10 @@ final class MimeTypes implements MimeTypesInterface
         'application/x-zoo' => ['zoo'],
         'application/x-zpaq' => ['zpaq'],
         'application/x-zstd-compressed-tar' => ['tar.zst', 'tzst'],
+        'application/x.sf3-archive' => ['ar.sf3', 'sf3'],
+        'application/x.sf3-log' => ['log.sf3', 'sf3'],
+        'application/x.sf3-table' => ['tab.sf3', 'sf3'],
+        'application/x.sf3-text' => ['txt.sf3', 'sf3'],
         'application/xaml+xml' => ['xaml'],
         'application/xcap-att+xml' => ['xav'],
         'application/xcap-caps+xml' => ['xca'],
@@ -1220,6 +1281,7 @@ final class MimeTypes implements MimeTypesInterface
         'application/xcap-error+xml' => ['xer'],
         'application/xcap-ns+xml' => ['xns'],
         'application/xenc+xml' => ['xenc'],
+        'application/xfdf' => ['xfdf'],
         'application/xhtml+xml' => ['xhtml', 'xht', 'html', 'htm'],
         'application/xliff+xml' => ['xlf', 'xliff'],
         'application/xml' => ['xml', 'xsl', 'xsd', 'rng', 'xbl'],
@@ -1304,6 +1366,7 @@ final class MimeTypes implements MimeTypesInterface
         'audio/x-dff' => ['dff'],
         'audio/x-dsd' => ['dsf'],
         'audio/x-dsf' => ['dsf'],
+        'audio/x-dsp' => ['dsm', 'dsp'],
         'audio/x-dts' => ['dts'],
         'audio/x-dtshd' => ['dtshd'],
         'audio/x-flac' => ['flac'],
@@ -1363,6 +1426,7 @@ final class MimeTypes implements MimeTypesInterface
         'audio/x-xi' => ['xi'],
         'audio/x-xm' => ['xm'],
         'audio/x-xmf' => ['xmf'],
+        'audio/x.sf3' => ['au.sf3', 'sf3'],
         'audio/xm' => ['xm'],
         'audio/xmf' => ['xmf'],
         'chemical/x-cdx' => ['cdx'],
@@ -1370,6 +1434,7 @@ final class MimeTypes implements MimeTypesInterface
         'chemical/x-cmdf' => ['cmdf'],
         'chemical/x-cml' => ['cml'],
         'chemical/x-csml' => ['csml'],
+        'chemical/x-pdb' => ['pdb', 'brk'],
         'chemical/x-xyz' => ['xyz'],
         'flv-application/octet-stream' => ['flv'],
         'font/collection' => ['ttc'],
@@ -1388,6 +1453,7 @@ final class MimeTypes implements MimeTypesInterface
         'image/cdr' => ['cdr'],
         'image/cgm' => ['cgm'],
         'image/dicom-rle' => ['drle'],
+        'image/dpx' => ['dpx'],
         'image/emf' => ['emf'],
         'image/fax-g3' => ['g3'],
         'image/fits' => ['fits', 'fit', 'fts'],
@@ -1404,7 +1470,7 @@ final class MimeTypes implements MimeTypesInterface
         'image/ief' => ['ief'],
         'image/jls' => ['jls'],
         'image/jp2' => ['jp2', 'jpg2'],
-        'image/jpeg' => ['jpg', 'jpeg', 'jpe'],
+        'image/jpeg' => ['jpg', 'jpeg', 'jpe', 'jfif'],
         'image/jpeg2000' => ['jp2', 'jpg2'],
         'image/jpeg2000-image' => ['jp2', 'jpg2'],
         'image/jph' => ['jph'],
@@ -1424,9 +1490,9 @@ final class MimeTypes implements MimeTypesInterface
         'image/openraster' => ['ora'],
         'image/pdf' => ['pdf'],
         'image/photoshop' => ['psd'],
-        'image/pjpeg' => ['jpg', 'jpeg', 'jpe'],
+        'image/pjpeg' => ['jpg', 'jpeg', 'jpe', 'jfif'],
         'image/png' => ['png'],
-        'image/prs.btif' => ['btif'],
+        'image/prs.btif' => ['btif', 'btf'],
         'image/prs.pti' => ['pti'],
         'image/psd' => ['psd'],
         'image/qoi' => ['qoi'],
@@ -1460,6 +1526,7 @@ final class MimeTypes implements MimeTypesInterface
         'image/vnd.ms-photo' => ['wdp', 'jxr', 'hdp'],
         'image/vnd.net-fpx' => ['npx'],
         'image/vnd.pco.b16' => ['b16'],
+        'image/vnd.radiance' => ['hdr', 'pic', 'rgbe', 'xyze'],
         'image/vnd.rn-realpix' => ['rp'],
         'image/vnd.tencent.tap' => ['tap'],
         'image/vnd.valve.source.texture' => ['vtf'],
@@ -1486,12 +1553,14 @@ final class MimeTypes implements MimeTypesInterface
         'image/x-eps' => ['eps', 'epsi', 'epsf'],
         'image/x-exr' => ['exr'],
         'image/x-fits' => ['fits', 'fit', 'fts'],
+        'image/x-fpx' => ['fpx'],
         'image/x-freehand' => ['fh', 'fhc', 'fh4', 'fh5', 'fh7'],
         'image/x-fuji-raf' => ['raf'],
         'image/x-gimp-gbr' => ['gbr'],
         'image/x-gimp-gih' => ['gih'],
         'image/x-gimp-pat' => ['pat'],
         'image/x-gzeps' => ['eps.gz', 'epsi.gz', 'epsf.gz'],
+        'image/x-hdr' => ['hdr', 'pic', 'rgbe', 'xyze'],
         'image/x-icb' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'image/x-icns' => ['icns'],
         'image/x-ico' => ['ico'],
@@ -1501,6 +1570,7 @@ final class MimeTypes implements MimeTypesInterface
         'image/x-jng' => ['jng'],
         'image/x-jp2-codestream' => ['j2c', 'j2k', 'jpc'],
         'image/x-jpeg2000-image' => ['jp2', 'jpg2'],
+        'image/x-kiss-cel' => ['cel', 'kcf'],
         'image/x-kodak-dcr' => ['dcr'],
         'image/x-kodak-k25' => ['k25'],
         'image/x-kodak-kdc' => ['kdc'],
@@ -1520,6 +1590,8 @@ final class MimeTypes implements MimeTypesInterface
         'image/x-panasonic-rw2' => ['rw2'],
         'image/x-pcx' => ['pcx'],
         'image/x-pentax-pef' => ['pef'],
+        'image/x-pfm' => ['pfm'],
+        'image/x-phm' => ['phm'],
         'image/x-photo-cd' => ['pcd'],
         'image/x-photoshop' => ['psd'],
         'image/x-pict' => ['pic', 'pct', 'pict', 'pict1', 'pict2'],
@@ -1528,8 +1600,10 @@ final class MimeTypes implements MimeTypesInterface
         'image/x-portable-graymap' => ['pgm'],
         'image/x-portable-pixmap' => ['ppm'],
         'image/x-psd' => ['psd'],
+        'image/x-pxr' => ['pxr'],
         'image/x-quicktime' => ['qtif', 'qif'],
         'image/x-rgb' => ['rgb'],
+        'image/x-sct' => ['sct'],
         'image/x-sgi' => ['sgi'],
         'image/x-sigma-x3f' => ['x3f'],
         'image/x-skencil' => ['sk', 'sk1'],
@@ -1549,6 +1623,8 @@ final class MimeTypes implements MimeTypesInterface
         'image/x-xpm' => ['xpm'],
         'image/x-xwindowdump' => ['xwd'],
         'image/x.djvu' => ['djvu', 'djv'],
+        'image/x.sf3' => ['img.sf3', 'sf3'],
+        'image/x.sf3-vector' => ['vec.sf3', 'sf3'],
         'message/disposition-notification' => ['disposition-notification'],
         'message/global' => ['u8msg'],
         'message/global-delivery-status' => ['u8dsn'],
@@ -1560,13 +1636,19 @@ final class MimeTypes implements MimeTypesInterface
         'model/gltf+json' => ['gltf'],
         'model/gltf-binary' => ['glb'],
         'model/iges' => ['igs', 'iges'],
+        'model/jt' => ['jt'],
         'model/mesh' => ['msh', 'mesh', 'silo'],
         'model/mtl' => ['mtl'],
         'model/obj' => ['obj'],
+        'model/prc' => ['prc'],
+        'model/step' => ['step', 'stp'],
         'model/step+xml' => ['stpx'],
         'model/step+zip' => ['stpz'],
         'model/step-xml+zip' => ['stpxz'],
         'model/stl' => ['stl'],
+        'model/u3d' => ['u3d'],
+        'model/vnd.bary' => ['bary'],
+        'model/vnd.cld' => ['cld'],
         'model/vnd.collada+xml' => ['dae'],
         'model/vnd.dwf' => ['dwf'],
         'model/vnd.gdl' => ['gdl'],
@@ -1575,11 +1657,15 @@ final class MimeTypes implements MimeTypesInterface
         'model/vnd.opengex' => ['ogex'],
         'model/vnd.parasolid.transmit.binary' => ['x_b'],
         'model/vnd.parasolid.transmit.text' => ['x_t'],
+        'model/vnd.pytha.pyox' => ['pyo', 'pyox'],
         'model/vnd.sap.vds' => ['vds'],
+        'model/vnd.usda' => ['usda'],
         'model/vnd.usdz+zip' => ['usdz'],
         'model/vnd.valve.source.compiled-map' => ['bsp'],
         'model/vnd.vtu' => ['vtu'],
         'model/vrml' => ['wrl', 'vrml', 'vrm'],
+        'model/x.sf3' => ['mod.sf3', 'sf3'],
+        'model/x.sf3-physics' => ['phys.sf3', 'sf3'],
         'model/x.stl-ascii' => ['stl'],
         'model/x.stl-binary' => ['stl'],
         'model/x3d+binary' => ['x3db', 'x3dbz'],
@@ -1588,7 +1674,7 @@ final class MimeTypes implements MimeTypesInterface
         'model/x3d+xml' => ['x3d', 'x3dz'],
         'model/x3d-vrml' => ['x3dv'],
         'text/cache-manifest' => ['appcache', 'manifest'],
-        'text/calendar' => ['ics', 'ifb', 'vcs'],
+        'text/calendar' => ['ics', 'ifb', 'vcs', 'icalendar'],
         'text/coffeescript' => ['coffee', 'litcoffee'],
         'text/crystal' => ['cr'],
         'text/css' => ['css'],
@@ -1601,7 +1687,9 @@ final class MimeTypes implements MimeTypesInterface
         'text/html' => ['html', 'htm', 'shtml'],
         'text/ico' => ['ico'],
         'text/jade' => ['jade'],
-        'text/javascript' => ['js', 'jsm', 'mjs'],
+        'text/javascript' => ['js', 'mjs', 'cjs', 'jsm'],
+        'text/jscript' => ['cjs', 'js', 'jsm', 'mjs'],
+        'text/jscript.encode' => ['jse'],
         'text/jsx' => ['jsx'],
         'text/julia' => ['jl'],
         'text/less' => ['less'],
@@ -1630,6 +1718,7 @@ final class MimeTypes implements MimeTypesInterface
         'text/uri-list' => ['uri', 'uris', 'urls'],
         'text/vbs' => ['vbs'],
         'text/vbscript' => ['vbs'],
+        'text/vbscript.encode' => ['vbe'],
         'text/vcard' => ['vcard', 'vcf', 'vct', 'gcrd'],
         'text/vnd.curl' => ['curl'],
         'text/vnd.curl.dcurl' => ['dcurl'],
@@ -1647,11 +1736,14 @@ final class MimeTypes implements MimeTypesInterface
         'text/vnd.senx.warpscript' => ['mc2'],
         'text/vnd.sun.j2me.app-descriptor' => ['jad'],
         'text/vnd.trolltech.linguist' => ['ts'],
+        'text/vnd.typst' => ['typ'],
         'text/vnd.wap.wml' => ['wml'],
         'text/vnd.wap.wmlscript' => ['wmls'],
         'text/vtt' => ['vtt'],
+        'text/wgsl' => ['wgsl'],
         'text/x-adasrc' => ['adb', 'ads'],
         'text/x-asm' => ['s', 'asm'],
+        'text/x-basic' => ['bas'],
         'text/x-bibtex' => ['bib'],
         'text/x-blueprint' => ['blp'],
         'text/x-c' => ['c', 'cc', 'cxx', 'cpp', 'h', 'hh', 'dic'],
@@ -1667,12 +1759,14 @@ final class MimeTypes implements MimeTypesInterface
         'text/x-csharp' => ['cs'],
         'text/x-csrc' => ['c'],
         'text/x-csv' => ['csv'],
+        'text/x-cython' => ['pxd', 'pxi', 'pyx'],
         'text/x-dart' => ['dart'],
         'text/x-dbus-service' => ['service'],
         'text/x-dcl' => ['dcl'],
         'text/x-devicetree-binary' => ['dtb'],
         'text/x-devicetree-source' => ['dts', 'dtsi'],
         'text/x-diff' => ['diff', 'patch'],
+        'text/x-dockerfile' => ['Dockerfile'],
         'text/x-dsl' => ['dsl'],
         'text/x-dsrc' => ['d', 'di'],
         'text/x-dtd' => ['dtd'],
@@ -1717,17 +1811,24 @@ final class MimeTypes implements MimeTypesInterface
         'text/x-mpsub' => ['sub'],
         'text/x-mrml' => ['mrml', 'mrl'],
         'text/x-ms-regedit' => ['reg'],
+        'text/x-ms-visualstudio.project' => ['dsp'],
+        'text/x-ms-visualstudio.workspace' => ['dsw'],
         'text/x-mup' => ['mup', 'not'],
         'text/x-nfo' => ['nfo'],
         'text/x-nim' => ['nim'],
         'text/x-nimscript' => ['nims', 'nimble'],
+        'text/x-nix' => ['nix'],
+        'text/x-nsis' => ['nsi', 'nsh'],
         'text/x-nu' => ['nu'],
+        'text/x-nushell' => ['nu'],
         'text/x-objc++src' => ['mm'],
         'text/x-objcsrc' => ['m'],
         'text/x-ocaml' => ['ml', 'mli'],
         'text/x-ocl' => ['ocl'],
         'text/x-octave' => ['m'],
         'text/x-ooc' => ['ooc'],
+        'text/x-opencl-c++src' => ['clcpp'],
+        'text/x-opencl-csrc' => ['cl'],
         'text/x-opencl-src' => ['cl'],
         'text/x-opml' => ['opml'],
         'text/x-opml+xml' => ['opml'],
@@ -1738,12 +1839,14 @@ final class MimeTypes implements MimeTypesInterface
         'text/x-po' => ['po'],
         'text/x-pot' => ['pot'],
         'text/x-processing' => ['pde'],
-        'text/x-python' => ['py', 'pyx', 'wsgi'],
-        'text/x-python3' => ['py', 'py3', 'py3x', 'pyi'],
+        'text/x-python' => ['py', 'wsgi'],
+        'text/x-python2' => ['py', 'py2'],
+        'text/x-python3' => ['py', 'py3', 'pyi'],
         'text/x-qml' => ['qml', 'qmltypes', 'qmlproject'],
         'text/x-reject' => ['rej'],
         'text/x-rpm-spec' => ['spec'],
         'text/x-rst' => ['rst'],
+        'text/x-ruby' => ['rb'],
         'text/x-sagemath' => ['sage'],
         'text/x-sass' => ['sass'],
         'text/x-scala' => ['scala', 'sc'],
@@ -1754,6 +1857,7 @@ final class MimeTypes implements MimeTypesInterface
         'text/x-sh' => ['sh'],
         'text/x-sql' => ['sql'],
         'text/x-ssa' => ['ssa', 'ass'],
+        'text/x-ssh-public-key' => ['pub'],
         'text/x-subviewer' => ['sub'],
         'text/x-suse-ymp' => ['ymp'],
         'text/x-svhdr' => ['svh'],
@@ -1772,7 +1876,8 @@ final class MimeTypes implements MimeTypesInterface
         'text/x-uil' => ['uil'],
         'text/x-uuencode' => ['uu', 'uue'],
         'text/x-vala' => ['vala', 'vapi'],
-        'text/x-vcalendar' => ['vcs', 'ics'],
+        'text/x-vb' => ['vb'],
+        'text/x-vcalendar' => ['vcs', 'ics', 'ifb', 'icalendar'],
         'text/x-vcard' => ['vcf', 'vcard', 'vct', 'gcrd'],
         'text/x-verilog' => ['v'],
         'text/x-vhdl' => ['vhd', 'vhdl'],
@@ -1801,10 +1906,11 @@ final class MimeTypes implements MimeTypesInterface
         'video/jpm' => ['jpm', 'jpgm'],
         'video/mj2' => ['mj2', 'mjp2'],
         'video/mp2t' => ['ts', 'm2t', 'm2ts', 'mts', 'cpi', 'clpi', 'mpl', 'mpls', 'bdm', 'bdmv'],
-        'video/mp4' => ['mp4', 'mp4v', 'mpg4', 'm4v', 'f4v', 'lrv'],
-        'video/mp4v-es' => ['mp4', 'm4v', 'f4v', 'lrv'],
+        'video/mp4' => ['mp4', 'mp4v', 'mpg4', 'm4v', 'f4v', 'lrv', 'lrf'],
+        'video/mp4v-es' => ['mp4', 'm4v', 'f4v', 'lrv', 'lrf'],
         'video/mpeg' => ['mpeg', 'mpg', 'mpe', 'm1v', 'm2v', 'mp2', 'vob'],
         'video/mpeg-system' => ['mpeg', 'mpg', 'mp2', 'mpe', 'vob'],
+        'video/mpg4' => ['mpg4'],
         'video/msvideo' => ['avi', 'avf', 'divx'],
         'video/ogg' => ['ogv', 'ogg'],
         'video/quicktime' => ['mov', 'qt', 'moov', 'qtvr'],
@@ -1835,7 +1941,7 @@ final class MimeTypes implements MimeTypesInterface
         'video/x-flic' => ['fli', 'flc'],
         'video/x-flv' => ['flv'],
         'video/x-javafx' => ['fxm'],
-        'video/x-m4v' => ['m4v', 'mp4', 'f4v', 'lrv'],
+        'video/x-m4v' => ['m4v', 'mp4', 'f4v', 'lrv', 'lrf'],
         'video/x-matroska' => ['mkv', 'mk3d', 'mks'],
         'video/x-matroska-3d' => ['mk3d'],
         'video/x-mjpeg' => ['mjpeg', 'mjpg'],
@@ -1892,8 +1998,8 @@ final class MimeTypes implements MimeTypesInterface
         '669' => ['audio/x-mod'],
         '7z' => ['application/x-7z-compressed'],
         '7z.001' => ['application/x-7z-compressed'],
-        'BLEND' => ['application/x-blender'],
         'C' => ['text/x-c++src'],
+        'Dockerfile' => ['text/x-dockerfile'],
         'PAR2' => ['application/x-par2'],
         'PL' => ['application/x-perl', 'text/x-perl'],
         'Z' => ['application/x-compress'],
@@ -1937,7 +2043,10 @@ final class MimeTypes implements MimeTypesInterface
         'ait' => ['application/vnd.dvb.ait'],
         'al' => ['application/x-perl', 'text/x-perl'],
         'alz' => ['application/x-alz'],
+        'amf' => ['application/x-amf'],
         'ami' => ['application/vnd.amiga.ami'],
+        'aml' => ['application/automationml-aml+xml'],
+        'amlx' => ['application/automationml-amlx+zip'],
         'amr' => ['audio/amr', 'audio/amr-encrypted'],
         'amz' => ['audio/x-amzxml'],
         'ani' => ['application/x-navi-animation'],
@@ -1953,13 +2062,18 @@ final class MimeTypes implements MimeTypesInterface
         'animj' => ['video/x-anim'],
         'anx' => ['application/annodex', 'application/x-annodex'],
         'ape' => ['audio/x-ape'],
-        'apk' => ['application/vnd.android.package-archive'],
+        'apk' => ['application/vnd.android.package-archive', 'application/x-alpine-package-keeper-package'],
         'apng' => ['image/apng', 'image/vnd.mozilla.apng'],
         'appcache' => ['text/cache-manifest'],
+        'appdata.xml' => ['application/x-freedesktop-appstream-component'],
         'appimage' => ['application/vnd.appimage', 'application/x-iso9660-appimage'],
+        'appinstaller' => ['application/appinstaller'],
         'application' => ['application/x-ms-application'],
+        'appx' => ['application/appx'],
+        'appxbundle' => ['application/appxbundle'],
         'apr' => ['application/vnd.lotus-approach'],
         'ar' => ['application/x-archive'],
+        'ar.sf3' => ['application/x.sf3-archive'],
         'arc' => ['application/x-freearc'],
         'arj' => ['application/x-arj'],
         'arw' => ['image/x-sony-arw'],
@@ -1982,6 +2096,7 @@ final class MimeTypes implements MimeTypesInterface
         'atomsvc' => ['application/atomsvc+xml'],
         'atx' => ['application/vnd.antix.game-component'],
         'au' => ['audio/basic'],
+        'au.sf3' => ['audio/x.sf3'],
         'automount' => ['text/x-systemd-unit'],
         'avci' => ['image/avci'],
         'avcs' => ['image/avcs'],
@@ -2001,11 +2116,14 @@ final class MimeTypes implements MimeTypesInterface
         'azw3' => ['application/vnd.amazon.mobi8-ebook', 'application/x-mobi8-ebook'],
         'b16' => ['image/vnd.pco.b16'],
         'bak' => ['application/x-trash'],
+        'bary' => ['model/vnd.bary'],
+        'bas' => ['text/x-basic'],
         'bat' => ['application/bat', 'application/x-bat', 'application/x-msdownload'],
         'bcpio' => ['application/x-bcpio'],
         'bdf' => ['application/x-font-bdf'],
         'bdm' => ['application/vnd.syncml.dm+wbxml', 'video/mp2t'],
         'bdmv' => ['video/mp2t'],
+        'bdo' => ['application/vnd.nato.bindingdataobject+xml'],
         'bdoc' => ['application/bdoc', 'application/x-bdoc'],
         'bed' => ['application/vnd.realvnc.bed'],
         'bh2' => ['application/vnd.fujitsu.oasysprs'],
@@ -2025,11 +2143,14 @@ final class MimeTypes implements MimeTypesInterface
         'box' => ['application/vnd.previewsystems.box'],
         'boz' => ['application/x-bzip2'],
         'bps' => ['application/x-bps-patch'],
+        'brk' => ['chemical/x-pdb'],
         'bsdiff' => ['application/x-bsdiff'],
         'bsp' => ['model/vnd.valve.source.compiled-map'],
+        'bst' => ['application/buildstream+yaml'],
+        'btf' => ['image/prs.btif'],
         'btif' => ['image/prs.btif'],
-        'bz' => ['application/bzip2', 'application/x-bzip'],
-        'bz2' => ['application/x-bz2', 'application/bzip2', 'application/x-bzip2'],
+        'bz' => ['application/bzip2', 'application/x-bzip', 'application/x-bzip1'],
+        'bz2' => ['application/x-bz2', 'application/bzip2', 'application/x-bzip', 'application/x-bzip2'],
         'bz3' => ['application/x-bzip3'],
         'c' => ['text/x-c', 'text/x-csrc'],
         'c++' => ['text/x-c++src'],
@@ -2070,8 +2191,11 @@ final class MimeTypes implements MimeTypesInterface
         'cdmiq' => ['application/cdmi-queue'],
         'cdr' => ['application/cdr', 'application/coreldraw', 'application/vnd.corel-draw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'],
         'cdx' => ['chemical/x-cdx'],
+        'cdx.json' => ['application/vnd.cyclonedx+json'],
+        'cdx.xml' => ['application/vnd.cyclonedx+xml'],
         'cdxml' => ['application/vnd.chemdraw+xml'],
         'cdy' => ['application/vnd.cinderella'],
+        'cel' => ['image/x-kiss-cel'],
         'cer' => ['application/pkix-cert'],
         'cert' => ['application/x-x509-ca-cert'],
         'cfs' => ['application/x-cfs-compressed'],
@@ -2084,10 +2208,12 @@ final class MimeTypes implements MimeTypesInterface
         'cif' => ['chemical/x-cif'],
         'cii' => ['application/vnd.anser-web-certificate-issue-initiation'],
         'cil' => ['application/vnd.ms-artgalry'],
-        'cjs' => ['application/node'],
-        'cl' => ['text/x-opencl-src'],
+        'cjs' => ['application/javascript', 'application/node', 'application/x-javascript', 'text/javascript', 'text/jscript'],
+        'cl' => ['text/x-opencl-csrc', 'text/x-opencl-src'],
         'cla' => ['application/vnd.claymore'],
         'class' => ['application/java', 'application/java-byte-code', 'application/java-vm', 'application/x-java', 'application/x-java-class', 'application/x-java-vm'],
+        'clcpp' => ['text/x-opencl-c++src'],
+        'cld' => ['model/vnd.cld'],
         'clkk' => ['application/vnd.crick.clicker.keyboard'],
         'clkp' => ['application/vnd.crick.clicker.palette'],
         'clkt' => ['application/vnd.crick.clicker.template'],
@@ -2110,7 +2236,7 @@ final class MimeTypes implements MimeTypesInterface
         'cpi' => ['video/mp2t'],
         'cpio' => ['application/x-cpio'],
         'cpio.gz' => ['application/x-cpio-compressed'],
-        'cpl' => ['application/cpl+xml'],
+        'cpl' => ['application/cpl+xml', 'application/vnd.microsoft.portable-executable', 'application/x-ms-dos-executable', 'application/x-ms-ne-executable', 'application/x-msdownload'],
         'cpp' => ['text/x-c', 'text/x-c++src'],
         'cpt' => ['application/mac-compactpro'],
         'cr' => ['text/crystal', 'text/x-crystal'],
@@ -2133,11 +2259,13 @@ final class MimeTypes implements MimeTypesInterface
         'cst' => ['application/x-director'],
         'csv' => ['text/csv', 'application/csv', 'text/x-comma-separated-values', 'text/x-csv'],
         'csvs' => ['text/csv-schema'],
+        'cts' => ['application/typescript'],
         'cu' => ['application/cu-seeme'],
         'cue' => ['application/x-cue'],
         'cur' => ['image/x-win-bitmap'],
         'curl' => ['text/vnd.curl'],
         'cwk' => ['application/x-appleworks-document'],
+        'cwl' => ['application/cwl'],
         'cww' => ['application/prs.cww'],
         'cxt' => ['application/x-director'],
         'cxx' => ['text/x-c', 'text/x-c++src'],
@@ -2178,7 +2306,7 @@ final class MimeTypes implements MimeTypesInterface
         'divx' => ['video/avi', 'video/divx', 'video/msvideo', 'video/vnd.avi', 'video/vnd.divx', 'video/x-avi', 'video/x-msvideo'],
         'djv' => ['image/vnd.djvu', 'image/vnd.djvu+multipage', 'image/x-djvu', 'image/x.djvu'],
         'djvu' => ['image/vnd.djvu', 'image/vnd.djvu+multipage', 'image/x-djvu', 'image/x.djvu'],
-        'dll' => ['application/x-msdownload'],
+        'dll' => ['application/vnd.microsoft.portable-executable', 'application/x-ms-dos-executable', 'application/x-ms-ne-executable', 'application/x-msdownload'],
         'dmg' => ['application/x-apple-diskimage'],
         'dmp' => ['application/pcap', 'application/vnd.tcpdump.pcap', 'application/x-pcap'],
         'dna' => ['application/vnd.dna'],
@@ -2192,13 +2320,18 @@ final class MimeTypes implements MimeTypesInterface
         'dotx' => ['application/vnd.openxmlformats-officedocument.wordprocessingml.template'],
         'dp' => ['application/vnd.osgi.dp'],
         'dpg' => ['application/vnd.dpgraph'],
+        'dpx' => ['image/dpx'],
         'dra' => ['audio/vnd.dra'],
         'drl' => ['application/x-excellon'],
         'drle' => ['image/dicom-rle'],
+        'drv' => ['application/vnd.microsoft.portable-executable', 'application/x-ms-dos-executable', 'application/x-ms-ne-executable', 'application/x-msdownload'],
         'dsc' => ['text/prs.lines.tag'],
         'dsf' => ['audio/dsd', 'audio/dsf', 'audio/x-dsd', 'audio/x-dsf'],
         'dsl' => ['text/x-dsl'],
+        'dsm' => ['audio/x-dsp'],
+        'dsp' => ['audio/x-dsp', 'text/x-ms-visualstudio.project'],
         'dssc' => ['application/dssc+der'],
+        'dsw' => ['text/x-ms-visualstudio.workspace'],
         'dtb' => ['application/x-dtbook+xml', 'text/x-devicetree-binary'],
         'dtd' => ['application/xml-dtd', 'text/x-dtd'],
         'dts' => ['audio/vnd.dts', 'audio/x-dts', 'text/x-devicetree-source'],
@@ -2224,6 +2357,7 @@ final class MimeTypes implements MimeTypesInterface
         'ecma' => ['application/ecmascript'],
         'edm' => ['application/vnd.novadigm.edm'],
         'edx' => ['application/vnd.novadigm.edx'],
+        'efi' => ['application/vnd.microsoft.portable-executable'],
         'efif' => ['application/vnd.picsel'],
         'egon' => ['application/x-egon'],
         'ei6' => ['application/vnd.pg.osasli'],
@@ -2261,7 +2395,7 @@ final class MimeTypes implements MimeTypesInterface
         'eva' => ['application/x-eva'],
         'evy' => ['application/x-envoy'],
         'ex' => ['text/x-elixir'],
-        'exe' => ['application/x-ms-dos-executable', 'application/x-msdos-program', 'application/x-msdownload'],
+        'exe' => ['application/vnd.microsoft.portable-executable', 'application/x-dosexec', 'application/x-ms-dos-executable', 'application/x-ms-ne-executable', 'application/x-msdos-program', 'application/x-msdownload'],
         'exi' => ['application/exi'],
         'exp' => ['application/express'],
         'exr' => ['image/aces', 'image/x-exr'],
@@ -2284,7 +2418,7 @@ final class MimeTypes implements MimeTypesInterface
         'fcdt' => ['application/vnd.adobe.formscentral.fcdt'],
         'fcs' => ['application/vnd.isac.fcs'],
         'fd' => ['application/x-fd-file', 'application/x-raw-floppy-disk-image'],
-        'fdf' => ['application/vnd.fdf'],
+        'fdf' => ['application/fdf', 'application/vnd.fdf'],
         'fds' => ['application/x-fds-disk'],
         'fdt' => ['application/fdt+xml'],
         'fe_launch' => ['application/vnd.denovo.fcselayout-link'],
@@ -2320,7 +2454,7 @@ final class MimeTypes implements MimeTypesInterface
         'fods' => ['application/vnd.oasis.opendocument.spreadsheet-flat-xml'],
         'fodt' => ['application/vnd.oasis.opendocument.text-flat-xml'],
         'for' => ['text/x-fortran'],
-        'fpx' => ['image/vnd.fpx'],
+        'fpx' => ['image/vnd.fpx', 'image/x-fpx'],
         'frame' => ['application/vnd.framemaker'],
         'fsc' => ['application/vnd.fsc.weblaunch'],
         'fst' => ['image/vnd.fst'],
@@ -2361,6 +2495,7 @@ final class MimeTypes implements MimeTypesInterface
         'gf' => ['application/x-tex-gf'],
         'gg' => ['application/x-gamegear-rom'],
         'ggb' => ['application/vnd.geogebra.file'],
+        'ggs' => ['application/vnd.geogebra.slides'],
         'ggt' => ['application/vnd.geogebra.tool'],
         'ghf' => ['application/vnd.groove-help'],
         'gif' => ['image/gif'],
@@ -2418,6 +2553,7 @@ final class MimeTypes implements MimeTypesInterface
         'h4' => ['application/x-hdf'],
         'h5' => ['application/x-hdf'],
         'hal' => ['application/vnd.hal+xml'],
+        'har' => ['application/har+json'],
         'hbci' => ['application/vnd.hbci'],
         'hbs' => ['text/x-handlebars-template'],
         'hdd' => ['application/x-virtualbox-hdd'],
@@ -2425,6 +2561,7 @@ final class MimeTypes implements MimeTypesInterface
         'hdf4' => ['application/x-hdf'],
         'hdf5' => ['application/x-hdf'],
         'hdp' => ['image/jxr', 'image/vnd.ms-photo'],
+        'hdr' => ['image/vnd.radiance', 'image/x-hdr'],
         'heic' => ['image/heic', 'image/heic-sequence', 'image/heif', 'image/heif-sequence'],
         'heics' => ['image/heic-sequence'],
         'heif' => ['image/heic', 'image/heic-sequence', 'image/heif', 'image/heif-sequence'],
@@ -2444,6 +2581,7 @@ final class MimeTypes implements MimeTypesInterface
         'hqx' => ['application/stuffit', 'application/mac-binhex40'],
         'hs' => ['text/x-haskell'],
         'hsj2' => ['image/hsj2'],
+        'hta' => ['application/hta'],
         'htc' => ['text/x-component'],
         'htke' => ['application/vnd.kenameaapp'],
         'htm' => ['text/html', 'application/xhtml+xml'],
@@ -2456,6 +2594,7 @@ final class MimeTypes implements MimeTypesInterface
         'hxx' => ['text/x-c++hdr'],
         'i2g' => ['application/vnd.intergeo'],
         'ica' => ['application/x-ica'],
+        'icalendar' => ['application/ics', 'text/calendar', 'text/x-vcalendar'],
         'icb' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'icc' => ['application/vnd.iccprofile'],
         'ice' => ['x-conference/x-cooltalk'],
@@ -2465,7 +2604,7 @@ final class MimeTypes implements MimeTypesInterface
         'ics' => ['application/ics', 'text/calendar', 'text/x-vcalendar'],
         'idl' => ['text/x-idl'],
         'ief' => ['image/ief'],
-        'ifb' => ['text/calendar'],
+        'ifb' => ['application/ics', 'text/calendar', 'text/x-vcalendar'],
         'iff' => ['image/x-iff', 'image/x-ilbm'],
         'ifm' => ['application/vnd.shana.informed.formdata'],
         'iges' => ['model/iges'],
@@ -2477,6 +2616,7 @@ final class MimeTypes implements MimeTypesInterface
         'ilbm' => ['image/x-iff', 'image/x-ilbm'],
         'ime' => ['audio/imelody', 'audio/x-imelody', 'text/x-imelody'],
         'img' => ['application/vnd.efi.img', 'application/x-raw-disk-image'],
+        'img.sf3' => ['image/x.sf3'],
         'img.xz' => ['application/x-raw-disk-image-xz-compressed'],
         'imp' => ['application/vnd.accpac.simply.imp'],
         'ims' => ['application/vnd.ms-ims'],
@@ -2512,6 +2652,7 @@ final class MimeTypes implements MimeTypesInterface
         'jardiff' => ['application/x-java-archive-diff'],
         'java' => ['text/x-java', 'text/x-java-source'],
         'jceks' => ['application/x-java-jce-keystore'],
+        'jfif' => ['image/jpeg', 'image/pjpeg'],
         'jhc' => ['image/jphc'],
         'jisp' => ['application/vnd.jisp'],
         'jks' => ['application/x-java-keystore'],
@@ -2535,14 +2676,16 @@ final class MimeTypes implements MimeTypesInterface
         'jpr' => ['application/x-jbuilder-project'],
         'jpx' => ['application/x-jbuilder-project', 'image/jpx'],
         'jrd' => ['application/jrd+json'],
-        'js' => ['text/javascript', 'application/javascript', 'application/x-javascript'],
-        'jsm' => ['application/javascript', 'application/x-javascript', 'text/javascript'],
+        'js' => ['text/javascript', 'application/javascript', 'application/x-javascript', 'text/jscript'],
+        'jse' => ['text/jscript.encode'],
+        'jsm' => ['application/javascript', 'application/x-javascript', 'text/javascript', 'text/jscript'],
         'json' => ['application/json', 'application/schema+json'],
         'json-patch' => ['application/json-patch+json'],
         'json5' => ['application/json5'],
         'jsonld' => ['application/ld+json'],
         'jsonml' => ['application/jsonml+json'],
         'jsx' => ['text/jsx'],
+        'jt' => ['model/jt'],
         'jxl' => ['image/jxl'],
         'jxr' => ['image/jxr', 'image/vnd.ms-photo'],
         'jxra' => ['image/jxra'],
@@ -2555,6 +2698,7 @@ final class MimeTypes implements MimeTypesInterface
         'k7' => ['application/x-thomson-cassette'],
         'kar' => ['audio/midi', 'audio/x-midi'],
         'karbon' => ['application/vnd.kde.karbon', 'application/x-karbon'],
+        'kcf' => ['image/x-kiss-cel'],
         'kdbx' => ['application/x-keepass2'],
         'kdc' => ['image/x-kodak-kdc'],
         'kdelnk' => ['application/x-desktop', 'application/x-gnome-app-info'],
@@ -2603,6 +2747,7 @@ final class MimeTypes implements MimeTypesInterface
         'lha' => ['application/x-lha', 'application/x-lzh-compressed'],
         'lhs' => ['text/x-literate-haskell'],
         'lhz' => ['application/x-lhz'],
+        'lib' => ['application/vnd.microsoft.portable-executable', 'application/x-archive'],
         'link66' => ['application/vnd.route66.link66+xml'],
         'lisp' => ['text/x-common-lisp'],
         'list' => ['text/plain'],
@@ -2610,11 +2755,13 @@ final class MimeTypes implements MimeTypesInterface
         'listafp' => ['application/vnd.ibm.modcap'],
         'litcoffee' => ['text/coffeescript'],
         'lmdb' => ['application/x-lmdb'],
-        'lnk' => ['application/x-ms-shortcut'],
+        'lnk' => ['application/x-ms-shortcut', 'application/x-win-lnk'],
         'lnx' => ['application/x-atari-lynx-rom'],
         'loas' => ['audio/usac'],
         'log' => ['text/plain', 'text/x-log'],
+        'log.sf3' => ['application/x.sf3-log'],
         'lostxml' => ['application/lost+xml'],
+        'lrf' => ['application/x-sony-bbeb', 'video/mp4', 'video/mp4v-es', 'video/x-m4v'],
         'lrm' => ['application/vnd.ms-lrm'],
         'lrv' => ['video/mp4', 'video/mp4v-es', 'video/x-m4v'],
         'lrz' => ['application/x-lrzip'],
@@ -2676,7 +2823,7 @@ final class MimeTypes implements MimeTypesInterface
         'mc2' => ['text/vnd.senx.warpscript'],
         'mcd' => ['application/vnd.mcd'],
         'mcurl' => ['text/vnd.curl.mcurl'],
-        'md' => ['text/markdown', 'text/x-markdown'],
+        'md' => ['text/markdown', 'text/x-markdown', 'application/x-genesis-rom'],
         'mdb' => ['application/x-msaccess', 'application/mdb', 'application/msaccess', 'application/vnd.ms-access', 'application/vnd.msaccess', 'application/x-lmdb', 'application/x-mdb', 'zz-application/zz-winassoc-mdb'],
         'mdi' => ['image/vnd.ms-modi'],
         'mdx' => ['application/x-genesis-32x-rom', 'text/mdx'],
@@ -2684,6 +2831,7 @@ final class MimeTypes implements MimeTypesInterface
         'med' => ['audio/x-mod'],
         'mesh' => ['model/mesh'],
         'meta4' => ['application/metalink4+xml'],
+        'metainfo.xml' => ['application/x-freedesktop-appstream-component'],
         'metalink' => ['application/metalink+xml'],
         'mets' => ['application/mets+xml'],
         'mfm' => ['application/vnd.mfmp'],
@@ -2702,7 +2850,7 @@ final class MimeTypes implements MimeTypesInterface
         'mjp2' => ['video/mj2'],
         'mjpeg' => ['video/x-mjpeg'],
         'mjpg' => ['video/x-mjpeg'],
-        'mjs' => ['application/javascript', 'application/x-javascript', 'text/javascript'],
+        'mjs' => ['application/javascript', 'application/x-javascript', 'text/javascript', 'text/jscript'],
         'mk' => ['text/x-makefile'],
         'mk3d' => ['video/x-matroska', 'video/x-matroska-3d'],
         'mka' => ['audio/x-matroska'],
@@ -2724,6 +2872,7 @@ final class MimeTypes implements MimeTypesInterface
         'mobi' => ['application/x-mobipocket-ebook'],
         'moc' => ['text/x-moc'],
         'mod' => ['application/x-object', 'audio/x-mod'],
+        'mod.sf3' => ['model/x.sf3'],
         'mods' => ['application/mods+xml'],
         'mof' => ['text/x-mof'],
         'moov' => ['video/quicktime'],
@@ -2735,7 +2884,7 @@ final class MimeTypes implements MimeTypesInterface
         'mp21' => ['application/mp21'],
         'mp2a' => ['audio/mpeg'],
         'mp3' => ['audio/mpeg', 'audio/mp3', 'audio/x-mp3', 'audio/x-mpeg', 'audio/x-mpg'],
-        'mp4' => ['video/mp4', 'video/mp4v-es', 'video/x-m4v'],
+        'mp4' => ['video/mp4', 'application/mp4', 'video/mp4v-es', 'video/x-m4v'],
         'mp4a' => ['audio/mp4'],
         'mp4s' => ['application/mp4'],
         'mp4v' => ['video/mp4'],
@@ -2745,7 +2894,7 @@ final class MimeTypes implements MimeTypesInterface
         'mpeg' => ['video/mpeg', 'video/mpeg-system', 'video/x-mpeg', 'video/x-mpeg-system', 'video/x-mpeg2'],
         'mpf' => ['application/media-policy-dataset+xml'],
         'mpg' => ['video/mpeg', 'video/mpeg-system', 'video/x-mpeg', 'video/x-mpeg-system', 'video/x-mpeg2'],
-        'mpg4' => ['video/mp4'],
+        'mpg4' => ['video/mpg4', 'application/mp4', 'video/mp4'],
         'mpga' => ['audio/mp3', 'audio/mpeg', 'audio/x-mp3', 'audio/x-mpeg', 'audio/x-mpg'],
         'mpkg' => ['application/vnd.apple.installer+xml'],
         'mpl' => ['text/x-mpl2', 'video/mp2t'],
@@ -2770,13 +2919,17 @@ final class MimeTypes implements MimeTypesInterface
         'msg' => ['application/vnd.ms-outlook'],
         'msh' => ['model/mesh'],
         'msi' => ['application/x-msdownload', 'application/x-msi'],
+        'msix' => ['application/msix'],
+        'msixbundle' => ['application/msixbundle'],
         'msl' => ['application/vnd.mobius.msl'],
         'msod' => ['image/x-msod'],
+        'msp' => ['application/microsoftpatch'],
         'msty' => ['application/vnd.muvee.style'],
+        'msu' => ['application/microsoftupdate'],
         'msx' => ['application/x-msx-rom'],
         'mtl' => ['model/mtl'],
         'mtm' => ['audio/x-mod'],
-        'mts' => ['model/vnd.mts', 'video/mp2t'],
+        'mts' => ['application/typescript', 'model/vnd.mts', 'video/mp2t'],
         'mup' => ['text/x-mup'],
         'mus' => ['application/vnd.musician'],
         'musd' => ['application/mmt-usd+xml'],
@@ -2809,6 +2962,7 @@ final class MimeTypes implements MimeTypesInterface
         'nimble' => ['text/x-nimscript'],
         'nims' => ['text/x-nimscript'],
         'nitf' => ['application/vnd.nitf'],
+        'nix' => ['text/x-nix'],
         'nlu' => ['application/vnd.neurolanguage.nlu'],
         'nml' => ['application/vnd.enliven'],
         'nnd' => ['application/vnd.noblenet-directory'],
@@ -2820,10 +2974,13 @@ final class MimeTypes implements MimeTypesInterface
         'nrw' => ['image/x-nikon-nrw'],
         'nsc' => ['application/x-conference', 'application/x-netshow-channel'],
         'nsf' => ['application/vnd.lotus-notes'],
+        'nsh' => ['text/x-nsis'],
+        'nsi' => ['text/x-nsis'],
         'nsv' => ['video/x-nsv'],
         'nt' => ['application/n-triples'],
+        'ntar' => ['application/x-pcapng'],
         'ntf' => ['application/vnd.nitf'],
-        'nu' => ['application/x-nuscript', 'text/x-nu'],
+        'nu' => ['application/x-nuscript', 'text/x-nu', 'text/x-nushell'],
         'numbers' => ['application/vnd.apple.numbers', 'application/x-iwork-numbers-sffnumbers'],
         'nzb' => ['application/x-nzb'],
         'o' => ['application/x-object'],
@@ -2832,10 +2989,11 @@ final class MimeTypes implements MimeTypesInterface
         'oas' => ['application/vnd.fujitsu.oasys'],
         'obd' => ['application/x-msbinder'],
         'obgx' => ['application/vnd.openblox.game+xml'],
-        'obj' => ['application/x-tgif', 'model/obj'],
+        'obj' => ['application/prs.wavefront-obj', 'application/x-tgif', 'model/obj'],
         'ocl' => ['text/x-ocl'],
+        'ocx' => ['application/vnd.microsoft.portable-executable'],
         'oda' => ['application/oda'],
-        'odb' => ['application/vnd.oasis.opendocument.database', 'application/vnd.sun.xml.base'],
+        'odb' => ['application/vnd.oasis.opendocument.base', 'application/vnd.oasis.opendocument.database', 'application/vnd.sun.xml.base'],
         'odc' => ['application/vnd.oasis.opendocument.chart'],
         'odf' => ['application/vnd.oasis.opendocument.formula'],
         'odft' => ['application/vnd.oasis.opendocument.formula-template'],
@@ -2875,6 +3033,7 @@ final class MimeTypes implements MimeTypesInterface
         'otg' => ['application/vnd.oasis.opendocument.graphics-template'],
         'oth' => ['application/vnd.oasis.opendocument.text-web'],
         'oti' => ['application/vnd.oasis.opendocument.image-template'],
+        'otm' => ['application/vnd.oasis.opendocument.text-master-template'],
         'otp' => ['application/vnd.oasis.opendocument.presentation-template'],
         'ots' => ['application/vnd.oasis.opendocument.spreadsheet-template'],
         'ott' => ['application/vnd.oasis.opendocument.text-template'],
@@ -2901,6 +3060,7 @@ final class MimeTypes implements MimeTypesInterface
         'pages' => ['application/vnd.apple.pages', 'application/x-iwork-pages-sffpages'],
         'pak' => ['application/x-pak'],
         'par2' => ['application/x-par2'],
+        'parquet' => ['application/vnd.apache.parquet', 'application/x-parquet'],
         'part' => ['application/x-partial-download'],
         'pas' => ['text/x-pascal'],
         'pat' => ['image/x-gimp-pat'],
@@ -2910,6 +3070,7 @@ final class MimeTypes implements MimeTypesInterface
         'pbd' => ['application/vnd.powerbuilder6'],
         'pbm' => ['image/x-portable-bitmap'],
         'pcap' => ['application/pcap', 'application/vnd.tcpdump.pcap', 'application/x-pcap'],
+        'pcapng' => ['application/x-pcapng'],
         'pcd' => ['image/x-photo-cd'],
         'pce' => ['application/x-pc-engine-rom'],
         'pcf' => ['application/x-cisco-vpn-settings', 'application/x-font-pcf'],
@@ -2920,7 +3081,7 @@ final class MimeTypes implements MimeTypesInterface
         'pct' => ['image/x-pict'],
         'pcurl' => ['application/vnd.curl.pcurl'],
         'pcx' => ['image/vnd.zbrush.pcx', 'image/x-pcx'],
-        'pdb' => ['application/vnd.palm', 'application/x-aportisdoc', 'application/x-ms-pdb', 'application/x-palm-database', 'application/x-pilot'],
+        'pdb' => ['application/vnd.palm', 'application/x-aportisdoc', 'application/x-ms-pdb', 'application/x-palm-database', 'application/x-pilot', 'chemical/x-pdb'],
         'pdc' => ['application/x-aportisdoc'],
         'pde' => ['text/x-processing'],
         'pdf' => ['application/pdf', 'application/acrobat', 'application/nappdf', 'application/x-pdf', 'image/pdf'],
@@ -2933,18 +3094,20 @@ final class MimeTypes implements MimeTypesInterface
         'perl' => ['application/x-perl', 'text/x-perl'],
         'pfa' => ['application/x-font-type1'],
         'pfb' => ['application/x-font-type1'],
-        'pfm' => ['application/x-font-type1'],
+        'pfm' => ['application/x-font-type1', 'image/x-pfm'],
         'pfr' => ['application/font-tdpfr', 'application/vnd.truedoc'],
         'pfx' => ['application/pkcs12', 'application/x-pkcs12'],
         'pgm' => ['image/x-portable-graymap'],
         'pgn' => ['application/vnd.chess-pgn', 'application/x-chess-pgn'],
         'pgp' => ['application/pgp', 'application/pgp-encrypted', 'application/pgp-keys', 'application/pgp-signature'],
+        'phm' => ['image/x-phm'],
         'php' => ['application/x-php', 'application/x-httpd-php'],
         'php3' => ['application/x-php'],
         'php4' => ['application/x-php'],
         'php5' => ['application/x-php'],
         'phps' => ['application/x-php'],
-        'pic' => ['image/x-pict'],
+        'phys.sf3' => ['model/x.sf3-physics'],
+        'pic' => ['image/vnd.radiance', 'image/x-hdr', 'image/x-pict'],
         'pict' => ['image/x-pict'],
         'pict1' => ['image/x-pict'],
         'pict2' => ['image/x-pict'],
@@ -2953,6 +3116,7 @@ final class MimeTypes implements MimeTypesInterface
         'pki' => ['application/pkixcmp'],
         'pkipath' => ['application/pkix-pkipath'],
         'pkpass' => ['application/vnd.apple.pkpass'],
+        'pkpasses' => ['application/vnd.apple.pkpasses'],
         'pkr' => ['application/pgp-keys'],
         'pl' => ['application/x-perl', 'text/x-perl'],
         'pla' => ['audio/x-iriver-pla'],
@@ -2986,13 +3150,14 @@ final class MimeTypes implements MimeTypesInterface
         'pptx' => ['application/vnd.openxmlformats-officedocument.presentationml.presentation'],
         'ppz' => ['application/mspowerpoint', 'application/powerpoint', 'application/vnd.ms-powerpoint', 'application/x-mspowerpoint'],
         'pqa' => ['application/vnd.palm', 'application/x-palm-database'],
-        'prc' => ['application/vnd.palm', 'application/x-mobipocket-ebook', 'application/x-palm-database', 'application/x-pilot'],
+        'prc' => ['application/vnd.palm', 'application/x-mobipocket-ebook', 'application/x-palm-database', 'application/x-pilot', 'model/prc'],
         'pre' => ['application/vnd.lotus-freelance'],
         'prf' => ['application/pics-rules'],
         'provx' => ['application/provenance+xml'],
         'ps' => ['application/postscript'],
         'ps.bz2' => ['application/x-bzpostscript'],
         'ps.gz' => ['application/x-gzpostscript'],
+        'ps1' => ['application/x-powershell'],
         'psb' => ['application/vnd.3gpp.pic-bw-small'],
         'psd' => ['application/photoshop', 'application/x-photoshop', 'image/photoshop', 'image/psd', 'image/vnd.adobe.photoshop', 'image/x-photoshop', 'image/x-psd'],
         'psf' => ['application/x-font-linux-psf', 'audio/x-psf'],
@@ -3003,23 +3168,28 @@ final class MimeTypes implements MimeTypesInterface
         'psw' => ['application/x-pocket-word'],
         'pti' => ['image/prs.pti'],
         'ptid' => ['application/vnd.pvi.ptid1'],
-        'pub' => ['application/vnd.ms-publisher', 'application/x-mspublisher'],
+        'pub' => ['application/vnd.ms-publisher', 'application/x-mspublisher', 'text/x-ssh-public-key'],
         'pvb' => ['application/vnd.3gpp.pic-bw-var'],
         'pw' => ['application/x-pw'],
         'pwn' => ['application/vnd.3m.post-it-notes'],
-        'py' => ['text/x-python', 'text/x-python3'],
+        'pxd' => ['text/x-cython'],
+        'pxi' => ['text/x-cython'],
+        'pxr' => ['image/x-pxr'],
+        'py' => ['text/x-python', 'text/x-python2', 'text/x-python3'],
+        'py2' => ['text/x-python2'],
         'py3' => ['text/x-python3'],
-        'py3x' => ['text/x-python3'],
         'pya' => ['audio/vnd.ms-playready.media.pya'],
         'pyc' => ['application/x-python-bytecode'],
         'pyi' => ['text/x-python3'],
-        'pyo' => ['application/x-python-bytecode'],
+        'pyo' => ['application/x-python-bytecode', 'model/vnd.pytha.pyox'],
+        'pyox' => ['model/vnd.pytha.pyox'],
         'pys' => ['application/x-pyspread-bz-spreadsheet'],
         'pysu' => ['application/x-pyspread-spreadsheet'],
         'pyv' => ['video/vnd.ms-playready.media.pyv'],
-        'pyx' => ['text/x-python'],
+        'pyx' => ['text/x-cython'],
         'qam' => ['application/vnd.epson.quickanime'],
         'qbo' => ['application/vnd.intu.qbo'],
+        'qbrew' => ['application/x-qbrew'],
         'qcow' => ['application/x-qemu-disk'],
         'qcow2' => ['application/x-qemu-disk'],
         'qd' => ['application/x-fd-file', 'application/x-raw-floppy-disk-image'],
@@ -3032,6 +3202,7 @@ final class MimeTypes implements MimeTypesInterface
         'qoi' => ['image/qoi'],
         'qp' => ['application/x-qpress'],
         'qps' => ['application/vnd.publishare-delta-tree'],
+        'qpw' => ['application/x-quattropro'],
         'qs' => ['application/sparql-query'],
         'qt' => ['video/quicktime'],
         'qti' => ['application/x-qtiplot'],
@@ -3044,6 +3215,7 @@ final class MimeTypes implements MimeTypesInterface
         'qxb' => ['application/vnd.quark.quarkxpress'],
         'qxd' => ['application/vnd.quark.quarkxpress'],
         'qxl' => ['application/vnd.quark.quarkxpress'],
+        'qxp' => ['application/vnd.quark.quarkxpress'],
         'qxt' => ['application/vnd.quark.quarkxpress'],
         'ra' => ['audio/vnd.m-realaudio', 'audio/vnd.rn-realaudio', 'audio/x-pn-realaudio', 'audio/x-realaudio'],
         'raf' => ['image/x-fuji-raf'],
@@ -3056,17 +3228,19 @@ final class MimeTypes implements MimeTypesInterface
         'raw-disk-image' => ['application/vnd.efi.img', 'application/x-raw-disk-image'],
         'raw-disk-image.xz' => ['application/x-raw-disk-image-xz-compressed'],
         'rax' => ['audio/vnd.m-realaudio', 'audio/vnd.rn-realaudio', 'audio/x-pn-realaudio'],
-        'rb' => ['application/x-ruby'],
+        'rb' => ['application/x-ruby', 'text/x-ruby'],
         'rcprofile' => ['application/vnd.ipunplugged.rcprofile'],
         'rdf' => ['application/rdf+xml', 'text/rdf'],
         'rdfs' => ['application/rdf+xml', 'text/rdf'],
         'rdz' => ['application/vnd.data-vision.rdz'],
         'reg' => ['text/x-ms-regedit'],
         'rej' => ['application/x-reject', 'text/x-reject'],
+        'releases.xml' => ['application/x-freedesktop-appstream-releases'],
         'relo' => ['application/p2p-overlay+xml'],
         'rep' => ['application/vnd.businessobjects'],
         'res' => ['application/x-dtbresource+xml', 'application/x-godot-resource'],
         'rgb' => ['image/x-rgb'],
+        'rgbe' => ['image/vnd.radiance', 'image/x-hdr'],
         'rif' => ['application/reginfo+xml'],
         'rip' => ['audio/vnd.rip'],
         'ris' => ['application/x-research-info-systems'],
@@ -3107,6 +3281,7 @@ final class MimeTypes implements MimeTypesInterface
         'rv' => ['video/vnd.rn-realvideo', 'video/x-real-video'],
         'rvx' => ['video/vnd.rn-realvideo', 'video/x-real-video'],
         'rw2' => ['image/x-panasonic-raw2', 'image/x-panasonic-rw2'],
+        'rz' => ['application/x-rzip'],
         's' => ['text/x-asm'],
         's3m' => ['audio/s3m', 'audio/x-s3m'],
         'saf' => ['application/vnd.yamaha.smaf-audio'],
@@ -3119,22 +3294,26 @@ final class MimeTypes implements MimeTypesInterface
         'sbml' => ['application/sbml+xml'],
         'sc' => ['application/vnd.ibm.secure-container', 'text/x-scala'],
         'scala' => ['text/x-scala'],
+        'scap' => ['application/x-pcapng'],
         'scd' => ['application/x-msschedule'],
         'scm' => ['application/vnd.lotus-screencam', 'text/x-scheme'],
         'scn' => ['application/x-godot-scene'],
         'scope' => ['text/x-systemd-unit'],
         'scq' => ['application/scvp-cv-request'],
+        'scr' => ['application/vnd.microsoft.portable-executable', 'application/x-ms-dos-executable', 'application/x-ms-ne-executable', 'application/x-msdownload'],
         'scs' => ['application/scvp-cv-response'],
         'scss' => ['text/x-scss'],
+        'sct' => ['image/x-sct'],
         'scurl' => ['text/vnd.curl.scurl'],
-        'sda' => ['application/vnd.stardivision.draw'],
-        'sdc' => ['application/vnd.stardivision.calc'],
-        'sdd' => ['application/vnd.stardivision.impress'],
+        'sda' => ['application/vnd.stardivision.draw', 'application/x-stardraw'],
+        'sdc' => ['application/vnd.stardivision.calc', 'application/x-starcalc'],
+        'sdd' => ['application/vnd.stardivision.impress', 'application/x-starimpress'],
         'sdkd' => ['application/vnd.solent.sdkm+xml'],
         'sdkm' => ['application/vnd.solent.sdkm+xml'],
-        'sdp' => ['application/sdp', 'application/vnd.sdp', 'application/vnd.stardivision.impress', 'application/x-sdp'],
-        'sds' => ['application/vnd.stardivision.chart'],
-        'sdw' => ['application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global'],
+        'sdm' => ['application/vnd.stardivision.mail'],
+        'sdp' => ['application/sdp', 'application/vnd.sdp', 'application/vnd.stardivision.impress-packed', 'application/x-sdp'],
+        'sds' => ['application/vnd.stardivision.chart', 'application/x-starchart'],
+        'sdw' => ['application/vnd.stardivision.writer', 'application/x-starwriter'],
         'sea' => ['application/x-sea'],
         'see' => ['application/vnd.seemail'],
         'seed' => ['application/vnd.fdsn.seed'],
@@ -3147,16 +3326,17 @@ final class MimeTypes implements MimeTypesInterface
         'service' => ['text/x-dbus-service', 'text/x-systemd-unit'],
         'setpay' => ['application/set-payment-initiation'],
         'setreg' => ['application/set-registration-initiation'],
+        'sf3' => ['application/x.sf3-archive', 'application/x.sf3-log', 'application/x.sf3-table', 'application/x.sf3-text', 'audio/x.sf3', 'image/x.sf3', 'image/x.sf3-vector', 'model/x.sf3', 'model/x.sf3-physics'],
         'sfc' => ['application/vnd.nintendo.snes.rom', 'application/x-snes-rom'],
         'sfd-hdstx' => ['application/vnd.hydrostatix.sof-data'],
-        'sfs' => ['application/vnd.spotfire.sfs'],
+        'sfs' => ['application/vnd.spotfire.sfs', 'application/vnd.squashfs'],
         'sfv' => ['text/x-sfv'],
         'sg' => ['application/x-sg1000-rom'],
         'sgb' => ['application/x-gameboy-rom'],
         'sgd' => ['application/x-genesis-rom'],
         'sgf' => ['application/x-go-sgf'],
         'sgi' => ['image/sgi', 'image/x-sgi'],
-        'sgl' => ['application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global'],
+        'sgl' => ['application/vnd.stardivision.writer-global', 'application/x-starwriter-global'],
         'sgm' => ['text/sgml'],
         'sgml' => ['text/sgml'],
         'sh' => ['application/x-sh', 'application/x-shellscript', 'text/x-sh'],
@@ -3189,15 +3369,15 @@ final class MimeTypes implements MimeTypesInterface
         'sldx' => ['application/vnd.openxmlformats-officedocument.presentationml.slide'],
         'slice' => ['text/x-systemd-unit'],
         'slim' => ['text/slim'],
-        'slk' => ['text/spreadsheet'],
+        'slk' => ['application/x-sylk', 'text/spreadsheet'],
         'slm' => ['text/slim'],
         'sls' => ['application/route-s-tsid+xml'],
         'slt' => ['application/vnd.epson.salt'],
         'sm' => ['application/vnd.stepmania.stepchart'],
         'smaf' => ['application/vnd.smaf', 'application/x-smaf'],
         'smc' => ['application/vnd.nintendo.snes.rom', 'application/x-snes-rom'],
-        'smd' => ['application/vnd.stardivision.mail', 'application/x-genesis-rom'],
-        'smf' => ['application/vnd.stardivision.math'],
+        'smd' => ['application/x-genesis-rom', 'application/x-starmail'],
+        'smf' => ['application/vnd.stardivision.math', 'application/x-starmath'],
         'smi' => ['application/smil', 'application/smil+xml', 'application/x-sami'],
         'smil' => ['application/smil', 'application/smil+xml'],
         'smk' => ['video/vnd.radgamettools.smacker'],
@@ -3213,6 +3393,7 @@ final class MimeTypes implements MimeTypesInterface
         'spc' => ['application/x-pkcs7-certificates'],
         'spd' => ['application/x-font-speedo'],
         'spdx' => ['text/spdx'],
+        'spdx.json' => ['application/spdx+json'],
         'spec' => ['text/x-rpm-spec'],
         'spf' => ['application/vnd.yamaha.smaf-phrase'],
         'spl' => ['application/futuresplash', 'application/vnd.adobe.flash.movie', 'application/x-futuresplash', 'application/x-shockwave-flash'],
@@ -3221,10 +3402,12 @@ final class MimeTypes implements MimeTypesInterface
         'spp' => ['application/scvp-vp-response'],
         'spq' => ['application/scvp-vp-request'],
         'spx' => ['application/x-apple-systemprofiler+xml', 'audio/ogg', 'audio/x-speex', 'audio/x-speex+ogg'],
+        'sqfs' => ['application/vnd.squashfs'],
         'sql' => ['application/sql', 'application/x-sql', 'text/x-sql'],
         'sqlite2' => ['application/x-sqlite2'],
         'sqlite3' => ['application/vnd.sqlite3', 'application/x-sqlite3'],
         'sqsh' => ['application/vnd.squashfs'],
+        'squashfs' => ['application/vnd.squashfs'],
         'sr2' => ['image/x-sony-sr2'],
         'src' => ['application/x-wais-source'],
         'src.rpm' => ['application/x-source-rpm'],
@@ -3241,11 +3424,13 @@ final class MimeTypes implements MimeTypesInterface
         'st' => ['application/vnd.sailingtracker.track'],
         'stc' => ['application/vnd.sun.xml.calc.template'],
         'std' => ['application/vnd.sun.xml.draw.template'],
+        'step' => ['model/step'],
         'stf' => ['application/vnd.wt.stf'],
         'sti' => ['application/vnd.sun.xml.impress.template'],
         'stk' => ['application/hyperstudio'],
         'stl' => ['application/vnd.ms-pki.stl', 'model/stl', 'model/x.stl-ascii', 'model/x.stl-binary'],
         'stm' => ['audio/x-stm'],
+        'stp' => ['model/step'],
         'stpx' => ['model/step+xml'],
         'stpxz' => ['model/step-xml+zip'],
         'stpz' => ['model/step+zip'],
@@ -3279,19 +3464,21 @@ final class MimeTypes implements MimeTypesInterface
         'sxi' => ['application/vnd.sun.xml.impress'],
         'sxm' => ['application/vnd.sun.xml.math'],
         'sxw' => ['application/vnd.sun.xml.writer'],
-        'sylk' => ['text/spreadsheet'],
+        'sylk' => ['application/x-sylk', 'text/spreadsheet'],
+        'sys' => ['application/vnd.microsoft.portable-executable'],
         't' => ['application/x-perl', 'application/x-troff', 'text/troff', 'text/x-perl', 'text/x-troff'],
         't2t' => ['text/x-txt2tags'],
         't3' => ['application/x-t3vm-image'],
         't38' => ['image/t38'],
+        'tab.sf3' => ['application/x.sf3-table'],
         'taglet' => ['application/vnd.mynfc'],
         'tak' => ['audio/x-tak'],
         'tao' => ['application/vnd.tao.intent-module-archive'],
         'tap' => ['image/vnd.tencent.tap'],
         'tar' => ['application/x-tar', 'application/x-gtar'],
         'tar.Z' => ['application/x-tarz'],
-        'tar.bz' => ['application/x-bzip-compressed-tar'],
-        'tar.bz2' => ['application/x-bzip2-compressed-tar'],
+        'tar.bz' => ['application/x-bzip1-compressed-tar'],
+        'tar.bz2' => ['application/x-bzip-compressed-tar', 'application/x-bzip2-compressed-tar'],
         'tar.bz3' => ['application/x-bzip3-compressed-tar'],
         'tar.gz' => ['application/x-compressed-tar'],
         'tar.lrz' => ['application/x-lrzip-compressed-tar'],
@@ -3299,13 +3486,14 @@ final class MimeTypes implements MimeTypesInterface
         'tar.lz4' => ['application/x-lz4-compressed-tar'],
         'tar.lzma' => ['application/x-lzma-compressed-tar'],
         'tar.lzo' => ['application/x-tzo'],
+        'tar.rz' => ['application/x-rzip-compressed-tar'],
         'tar.xz' => ['application/x-xz-compressed-tar'],
         'tar.zst' => ['application/x-zstd-compressed-tar'],
         'target' => ['text/x-systemd-unit'],
         'taz' => ['application/x-tarz'],
-        'tb2' => ['application/x-bzip2-compressed-tar', 'application/x-bzip-compressed-tar'],
-        'tbz' => ['application/x-bzip-compressed-tar'],
-        'tbz2' => ['application/x-bzip2-compressed-tar', 'application/x-bzip-compressed-tar'],
+        'tb2' => ['application/x-bzip-compressed-tar', 'application/x-bzip2-compressed-tar'],
+        'tbz' => ['application/x-bzip1-compressed-tar'],
+        'tbz2' => ['application/x-bzip-compressed-tar', 'application/x-bzip2-compressed-tar'],
         'tbz3' => ['application/x-bzip3-compressed-tar'],
         'tcap' => ['application/vnd.3gpp2.tcap'],
         'tcl' => ['application/x-tcl', 'text/tcl', 'text/x-tcl'],
@@ -3346,7 +3534,8 @@ final class MimeTypes implements MimeTypesInterface
         'tres' => ['application/x-godot-resource'],
         'trig' => ['application/trig', 'application/x-trig'],
         'trm' => ['application/x-msterminal'],
-        'ts' => ['application/x-linguist', 'text/vnd.qt.linguist', 'text/vnd.trolltech.linguist', 'video/mp2t'],
+        'trz' => ['application/x-rzip-compressed-tar'],
+        'ts' => ['application/typescript', 'application/x-linguist', 'text/vnd.qt.linguist', 'text/vnd.trolltech.linguist', 'video/mp2t'],
         'tscn' => ['application/x-godot-scene'],
         'tsd' => ['application/timestamped-data'],
         'tsv' => ['text/tab-separated-values'],
@@ -3363,11 +3552,13 @@ final class MimeTypes implements MimeTypesInterface
         'txd' => ['application/vnd.genomatix.tuxedo'],
         'txf' => ['application/vnd.mobius.txf'],
         'txt' => ['text/plain'],
+        'txt.sf3' => ['application/x.sf3-text'],
         'txz' => ['application/x-xz-compressed-tar'],
-        'typ' => ['text/x-typst'],
+        'typ' => ['text/vnd.typst', 'text/x-typst'],
         'tzo' => ['application/x-tzo'],
         'tzst' => ['application/x-zstd-compressed-tar'],
         'u32' => ['application/x-authorware-bin'],
+        'u3d' => ['model/u3d'],
         'u8dsn' => ['message/global-delivery-status'],
         'u8hdr' => ['message/global-headers'],
         'u8mdn' => ['message/global-disposition-notification'],
@@ -3386,11 +3577,13 @@ final class MimeTypes implements MimeTypesInterface
         'uni' => ['audio/x-mod'],
         'unif' => ['application/x-nes-rom'],
         'unityweb' => ['application/vnd.unity'],
+        'uo' => ['application/vnd.uoml+xml'],
         'uoml' => ['application/vnd.uoml+xml'],
         'uri' => ['text/uri-list'],
         'uris' => ['text/uri-list'],
         'url' => ['application/x-mswinurl'],
         'urls' => ['text/uri-list'],
+        'usda' => ['model/vnd.usda'],
         'usdz' => ['model/vnd.usdz+zip'],
         'ustar' => ['application/x-ustar'],
         'utz' => ['application/vnd.uiq.theme'],
@@ -3428,7 +3621,8 @@ final class MimeTypes implements MimeTypesInterface
         'v64' => ['application/x-n64-rom'],
         'vala' => ['text/x-vala'],
         'vapi' => ['text/x-vala'],
-        'vb' => ['application/x-virtual-boy-rom'],
+        'vb' => ['application/x-virtual-boy-rom', 'text/x-vb'],
+        'vbe' => ['text/vbscript.encode'],
         'vbox' => ['application/x-virtualbox-vbox'],
         'vbox-extpack' => ['application/x-virtualbox-vbox-extpack'],
         'vbs' => ['text/vbs', 'text/vbscript'],
@@ -3442,6 +3636,7 @@ final class MimeTypes implements MimeTypesInterface
         'vda' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'vdi' => ['application/x-vdi-disk', 'application/x-virtualbox-vdi'],
         'vds' => ['model/vnd.sap.vds'],
+        'vec.sf3' => ['image/x.sf3-vector'],
         'vhd' => ['application/x-vhd-disk', 'application/x-virtualbox-vhd', 'text/x-vhdl'],
         'vhdl' => ['text/x-vhdl'],
         'vhdx' => ['application/x-vhdx-disk', 'application/x-virtualbox-vhdx'],
@@ -3452,7 +3647,7 @@ final class MimeTypes implements MimeTypesInterface
         'vmdk' => ['application/x-virtualbox-vmdk', 'application/x-vmdk-disk'],
         'vob' => ['video/mpeg', 'video/mpeg-system', 'video/x-mpeg', 'video/x-mpeg-system', 'video/x-mpeg2', 'video/x-ms-vob'],
         'voc' => ['audio/x-voc'],
-        'vor' => ['application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global'],
+        'vor' => ['application/vnd.stardivision.writer', 'application/x-starwriter'],
         'vox' => ['application/x-authorware-bin'],
         'vpc' => ['application/x-vhd-disk', 'application/x-virtualbox-vhd'],
         'vrm' => ['model/vrml'],
@@ -3494,6 +3689,7 @@ final class MimeTypes implements MimeTypesInterface
         'webmanifest' => ['application/manifest+json'],
         'webp' => ['image/webp'],
         'wg' => ['application/vnd.pmi.widget'],
+        'wgsl' => ['text/wgsl'],
         'wgt' => ['application/widget'],
         'wif' => ['application/watcherinfo+xml'],
         'wim' => ['application/x-ms-wim'],
@@ -3562,7 +3758,9 @@ final class MimeTypes implements MimeTypesInterface
         'xcf' => ['image/x-xcf'],
         'xcf.bz2' => ['image/x-compressed-xcf'],
         'xcf.gz' => ['image/x-compressed-xcf'],
+        'xci' => ['application/x-nintendo-switch-xci', 'application/x-nx-xci'],
         'xcs' => ['application/calendar+xml'],
+        'xdcf' => ['application/vnd.gov.sk.xmldatacontainer+xml'],
         'xdf' => ['application/mrb-consumer+xml', 'application/mrb-publish+xml', 'application/xcap-diff+xml'],
         'xdgapp' => ['application/vnd.flatpak', 'application/vnd.xdgapp'],
         'xdm' => ['application/vnd.syncml.dm+xml'],
@@ -3572,10 +3770,11 @@ final class MimeTypes implements MimeTypesInterface
         'xel' => ['application/xcap-el+xml'],
         'xenc' => ['application/xenc+xml'],
         'xer' => ['application/patch-ops-error+xml', 'application/xcap-error+xml'],
-        'xfdf' => ['application/vnd.adobe.xfdf'],
+        'xfdf' => ['application/vnd.adobe.xfdf', 'application/xfdf'],
         'xfdl' => ['application/vnd.xfdl'],
         'xhe' => ['audio/usac'],
         'xht' => ['application/xhtml+xml'],
+        'xhtm' => ['application/vnd.pwg-xhtml-print+xml'],
         'xhtml' => ['application/xhtml+xml'],
         'xhvml' => ['application/xv+xml'],
         'xi' => ['audio/x-xi'],
@@ -3612,6 +3811,7 @@ final class MimeTypes implements MimeTypesInterface
         'xpw' => ['application/vnd.intercon.formnet'],
         'xpx' => ['application/vnd.intercon.formnet'],
         'xsd' => ['application/xml', 'text/xml'],
+        'xsf' => ['application/prs.xsf+xml'],
         'xsl' => ['application/xml', 'application/xslt+xml'],
         'xslfo' => ['text/x-xslfo'],
         'xslt' => ['application/xslt+xml'],
@@ -3622,6 +3822,7 @@ final class MimeTypes implements MimeTypesInterface
         'xvml' => ['application/xv+xml'],
         'xwd' => ['image/x-xwindowdump'],
         'xyz' => ['chemical/x-xyz'],
+        'xyze' => ['image/vnd.radiance', 'image/x-hdr'],
         'xz' => ['application/x-xz'],
         'yaml' => ['application/yaml', 'application/x-yaml', 'text/x-yaml', 'text/yaml'],
         'yang' => ['application/yang'],
diff --git a/lib/symfony/mime/Part/MessagePart.php b/lib/symfony/mime/Part/MessagePart.php
index 9d30544ae..704211e46 100644
--- a/lib/symfony/mime/Part/MessagePart.php
+++ b/lib/symfony/mime/Part/MessagePart.php
@@ -60,13 +60,15 @@ class MessagePart extends DataPart
         return $this->message->toIterable();
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
-        return ['message'];
+        return ['message' => $this->message];
     }
 
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
+        $this->message = $data['message'] ?? $data["\0".self::class."\0message"];
+
         $this->__construct($this->message);
     }
 }
diff --git a/lib/symfony/mime/Resources/bin/update_mime_types.php b/lib/symfony/mime/Resources/bin/update_mime_types.php
index b707d458e..6811a7b25 100644
--- a/lib/symfony/mime/Resources/bin/update_mime_types.php
+++ b/lib/symfony/mime/Resources/bin/update_mime_types.php
@@ -80,7 +80,7 @@ $exts = [
     'html' => ['text/html'],
     'jar' => ['application/x-java-archive'],
     'jpg' => ['image/jpeg'],
-    'js' => ['text/javascript'],
+    'js' => ['text/javascript', 'application/javascript', 'application/x-javascript'],
     'keynote' => ['application/vnd.apple.keynote'],
     'key' => ['application/vnd.apple.keynote'],
     'm3u' => ['audio/x-mpegurl'],
diff --git a/lib/symfony/polyfill-ctype/composer.json b/lib/symfony/polyfill-ctype/composer.json
index e5c978f15..131ca7adb 100644
--- a/lib/symfony/polyfill-ctype/composer.json
+++ b/lib/symfony/polyfill-ctype/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.2"
     },
     "provide": {
         "ext-ctype": "*"
@@ -30,9 +30,6 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-main": "1.28-dev"
-        },
         "thanks": {
             "name": "symfony/polyfill",
             "url": "https://github.com/symfony/polyfill"
diff --git a/lib/symfony/polyfill-intl-grapheme/Grapheme.php b/lib/symfony/polyfill-intl-grapheme/Grapheme.php
index 5373f1685..f9e9e5741 100644
--- a/lib/symfony/polyfill-intl-grapheme/Grapheme.php
+++ b/lib/symfony/polyfill-intl-grapheme/Grapheme.php
@@ -26,6 +26,7 @@ namespace Symfony\Polyfill\Intl\Grapheme;
  * - 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 @@ final class Grapheme
         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/lib/symfony/polyfill-intl-grapheme/README.md b/lib/symfony/polyfill-intl-grapheme/README.md
index f55d92c5c..5d7c67875 100644
--- a/lib/symfony/polyfill-intl-grapheme/README.md
+++ b/lib/symfony/polyfill-intl-grapheme/README.md
@@ -21,6 +21,7 @@ This component provides a partial, native PHP implementation of the
 - [`grapheme_strstr`](https://php.net/grapheme_strstr): Returns part of haystack string from
   the first occurrence of needle to the end of haystack
 - [`grapheme_substr`](https://php.net/grapheme_substr): Return part of a string
+- [`grapheme_str_split`](https://php.net/grapheme_str_split): Splits a string into an array of individual or chunks of graphemes
 
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
diff --git a/lib/symfony/polyfill-intl-grapheme/bootstrap.php b/lib/symfony/polyfill-intl-grapheme/bootstrap.php
index a9ea03c7e..374dbd3a7 100644
--- a/lib/symfony/polyfill-intl-grapheme/bootstrap.php
+++ b/lib/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 @@ if (!function_exists('grapheme_strstr')) {
 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/lib/symfony/polyfill-intl-grapheme/bootstrap80.php b/lib/symfony/polyfill-intl-grapheme/bootstrap80.php
index b8c078677..d71175530 100644
--- a/lib/symfony/polyfill-intl-grapheme/bootstrap80.php
+++ b/lib/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/lib/symfony/polyfill-intl-grapheme/composer.json b/lib/symfony/polyfill-intl-grapheme/composer.json
index c00d4e9e4..0eea417d7 100644
--- a/lib/symfony/polyfill-intl-grapheme/composer.json
+++ b/lib/symfony/polyfill-intl-grapheme/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Polyfill\\Intl\\Grapheme\\": "" },
@@ -27,9 +27,6 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-main": "1.28-dev"
-        },
         "thanks": {
             "name": "symfony/polyfill",
             "url": "https://github.com/symfony/polyfill"
diff --git a/lib/symfony/routing/Attribute/Route.php b/lib/symfony/routing/Attribute/Route.php
index 0077f76db..32ee18e81 100644
--- a/lib/symfony/routing/Attribute/Route.php
+++ b/lib/symfony/routing/Attribute/Route.php
@@ -20,8 +20,6 @@ namespace Symfony\Component\Routing\Attribute;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander M. Turek <me@derrabus.de>
- *
- * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Route
@@ -37,7 +35,7 @@ class Route
      * @param string[]|string           $schemes
      */
     public function __construct(
-        string|array $path = null,
+        string|array|null $path = null,
         private ?string $name = null,
         private array $requirements = [],
         private array $options = [],
@@ -47,11 +45,11 @@ class Route
         array|string $schemes = [],
         private ?string $condition = null,
         private ?int $priority = null,
-        string $locale = null,
-        string $format = null,
-        bool $utf8 = null,
-        bool $stateless = null,
-        private ?string $env = null
+        ?string $locale = null,
+        ?string $format = null,
+        ?bool $utf8 = null,
+        ?bool $stateless = null,
+        private ?string $env = null,
     ) {
         if (\is_array($path)) {
             $this->localizedPaths = $path;
diff --git a/lib/symfony/routing/CompiledRoute.php b/lib/symfony/routing/CompiledRoute.php
index 8664158db..03215e368 100644
--- a/lib/symfony/routing/CompiledRoute.php
+++ b/lib/symfony/routing/CompiledRoute.php
@@ -37,7 +37,7 @@ class CompiledRoute implements \Serializable
      * @param array       $hostVariables An array of host variables
      * @param array       $variables     An array of variables (variables defined in the path and in the host patterns)
      */
-    public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])
+    public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, ?string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])
     {
         $this->staticPrefix = $staticPrefix;
         $this->regex = $regex;
diff --git a/lib/symfony/routing/Exception/MethodNotAllowedException.php b/lib/symfony/routing/Exception/MethodNotAllowedException.php
index 0e4381bb6..c96ae9b1c 100644
--- a/lib/symfony/routing/Exception/MethodNotAllowedException.php
+++ b/lib/symfony/routing/Exception/MethodNotAllowedException.php
@@ -25,7 +25,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn
     /**
      * @param string[] $allowedMethods
      */
-    public function __construct(array $allowedMethods, string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(array $allowedMethods, string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         $this->allowedMethods = array_map('strtoupper', $allowedMethods);
 
diff --git a/lib/symfony/routing/Exception/MissingMandatoryParametersException.php b/lib/symfony/routing/Exception/MissingMandatoryParametersException.php
index e5b83af6b..b64d6d84a 100644
--- a/lib/symfony/routing/Exception/MissingMandatoryParametersException.php
+++ b/lib/symfony/routing/Exception/MissingMandatoryParametersException.php
@@ -26,12 +26,12 @@ class MissingMandatoryParametersException extends \InvalidArgumentException impl
      * @param string[] $missingParameters
      * @param int      $code
      */
-    public function __construct(string $routeName = '', $missingParameters = null, $code = 0, \Throwable $previous = null)
+    public function __construct(string $routeName = '', $missingParameters = null, $code = 0, ?\Throwable $previous = null)
     {
         if (\is_array($missingParameters)) {
             $this->routeName = $routeName;
             $this->missingParameters = $missingParameters;
-            $message = sprintf('Some mandatory parameters are missing ("%s") to generate a URL for route "%s".', implode('", "', $missingParameters), $routeName);
+            $message = \sprintf('Some mandatory parameters are missing ("%s") to generate a URL for route "%s".', implode('", "', $missingParameters), $routeName);
         } else {
             trigger_deprecation('symfony/routing', '6.1', 'Construction of "%s" with an exception message is deprecated, provide the route name and an array of missing parameters instead.', __CLASS__);
             $message = $routeName;
diff --git a/lib/symfony/routing/Exception/RouteCircularReferenceException.php b/lib/symfony/routing/Exception/RouteCircularReferenceException.php
index 841e35989..3e20cbcbf 100644
--- a/lib/symfony/routing/Exception/RouteCircularReferenceException.php
+++ b/lib/symfony/routing/Exception/RouteCircularReferenceException.php
@@ -15,6 +15,6 @@ class RouteCircularReferenceException extends RuntimeException
 {
     public function __construct(string $routeId, array $path)
     {
-        parent::__construct(sprintf('Circular reference detected for route "%s", path: "%s".', $routeId, implode(' -> ', $path)));
+        parent::__construct(\sprintf('Circular reference detected for route "%s", path: "%s".', $routeId, implode(' -> ', $path)));
     }
 }
diff --git a/lib/symfony/routing/Generator/CompiledUrlGenerator.php b/lib/symfony/routing/Generator/CompiledUrlGenerator.php
index 2a3d5fd2d..b7429d1fd 100644
--- a/lib/symfony/routing/Generator/CompiledUrlGenerator.php
+++ b/lib/symfony/routing/Generator/CompiledUrlGenerator.php
@@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator
     private array $compiledRoutes = [];
     private ?string $defaultLocale;
 
-    public function __construct(array $compiledRoutes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(array $compiledRoutes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->compiledRoutes = $compiledRoutes;
         $this->context = $context;
@@ -47,7 +47,7 @@ class CompiledUrlGenerator extends UrlGenerator
         }
 
         if (!isset($this->compiledRoutes[$name])) {
-            throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
+            throw new RouteNotFoundException(\sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
         }
 
         [$variables, $defaults, $requirements, $tokens, $hostTokens, $requiredSchemes, $deprecations] = $this->compiledRoutes[$name] + [6 => []];
diff --git a/lib/symfony/routing/Generator/Dumper/CompiledUrlGeneratorDumper.php b/lib/symfony/routing/Generator/Dumper/CompiledUrlGeneratorDumper.php
index 1144fed5c..555c5bfbd 100644
--- a/lib/symfony/routing/Generator/Dumper/CompiledUrlGeneratorDumper.php
+++ b/lib/symfony/routing/Generator/Dumper/CompiledUrlGeneratorDumper.php
@@ -69,7 +69,7 @@ class CompiledUrlGeneratorDumper extends GeneratorDumper
             }
 
             if (null === $target = $routes->get($currentId)) {
-                throw new RouteNotFoundException(sprintf('Target route "%s" for alias "%s" does not exist.', $currentId, $name));
+                throw new RouteNotFoundException(\sprintf('Target route "%s" for alias "%s" does not exist.', $currentId, $name));
             }
 
             $compiledTarget = $target->compile();
@@ -109,11 +109,11 @@ EOF;
     {
         $routes = '';
         foreach ($this->getCompiledRoutes() as $name => $properties) {
-            $routes .= sprintf("\n    '%s' => %s,", $name, CompiledUrlMatcherDumper::export($properties));
+            $routes .= \sprintf("\n    '%s' => %s,", $name, CompiledUrlMatcherDumper::export($properties));
         }
 
         foreach ($this->getCompiledAliases() as $alias => $properties) {
-            $routes .= sprintf("\n    '%s' => %s,", $alias, CompiledUrlMatcherDumper::export($properties));
+            $routes .= \sprintf("\n    '%s' => %s,", $alias, CompiledUrlMatcherDumper::export($properties));
         }
 
         return $routes;
diff --git a/lib/symfony/routing/Generator/UrlGenerator.php b/lib/symfony/routing/Generator/UrlGenerator.php
index e3fb17e81..4c8f8f74c 100644
--- a/lib/symfony/routing/Generator/UrlGenerator.php
+++ b/lib/symfony/routing/Generator/UrlGenerator.php
@@ -83,7 +83,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%7C' => '|',
     ];
 
-    public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(RouteCollection $routes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->routes = $routes;
         $this->context = $context;
@@ -131,7 +131,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         }
 
         if (null === $route ??= $this->routes->get($name)) {
-            throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
+            throw new RouteNotFoundException(\sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
         }
 
         // the Route has a cache of its own and is not recompiled as long as it does not get modified
diff --git a/lib/symfony/routing/Loader/AttributeClassLoader.php b/lib/symfony/routing/Loader/AttributeClassLoader.php
index 679b0c845..6506feae1 100644
--- a/lib/symfony/routing/Loader/AttributeClassLoader.php
+++ b/lib/symfony/routing/Loader/AttributeClassLoader.php
@@ -94,7 +94,7 @@ abstract class AttributeClassLoader implements LoaderInterface
         } elseif ($env instanceof \Stringable || \is_scalar($env)) {
             $this->env = (string) $env;
         } else {
-            throw new \TypeError(__METHOD__.sprintf(': Parameter $env was expected to be a string or null, "%s" given.', get_debug_type($env)));
+            throw new \TypeError(__METHOD__.\sprintf(': Parameter $env was expected to be a string or null, "%s" given.', get_debug_type($env)));
         }
     }
 
@@ -111,15 +111,15 @@ abstract class AttributeClassLoader implements LoaderInterface
     /**
      * @throws \InvalidArgumentException When route can't be parsed
      */
-    public function load(mixed $class, string $type = null): RouteCollection
+    public function load(mixed $class, ?string $type = null): RouteCollection
     {
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
+            throw new \InvalidArgumentException(\sprintf('Class "%s" does not exist.', $class));
         }
 
         $class = new \ReflectionClass($class);
         if ($class->isAbstract()) {
-            throw new \InvalidArgumentException(sprintf('Attributes from class "%s" cannot be read as it is abstract.', $class->getName()));
+            throw new \InvalidArgumentException(\sprintf('Attributes from class "%s" cannot be read as it is abstract.', $class->getName()));
         }
 
         $this->hasDeprecatedAnnotations = false;
@@ -144,7 +144,7 @@ abstract class AttributeClassLoader implements LoaderInterface
 
                 if (1 === $collection->count() - \count($routeNamesBefore)) {
                     $newRouteName = current(array_diff(array_keys($collection->all()), $routeNamesBefore));
-                    if ($newRouteName !== $aliasName = sprintf('%s::%s', $class->name, $method->name)) {
+                    if ($newRouteName !== $aliasName = \sprintf('%s::%s', $class->name, $method->name)) {
                         $collection->addAlias($aliasName, $newRouteName);
                     }
                 }
@@ -162,7 +162,7 @@ abstract class AttributeClassLoader implements LoaderInterface
                     $collection->addAlias($class->name, $invokeRouteName);
                 }
 
-                if ($invokeRouteName !== $aliasName = sprintf('%s::__invoke', $class->name)) {
+                if ($invokeRouteName !== $aliasName = \sprintf('%s::__invoke', $class->name)) {
                     $collection->addAlias($aliasName, $invokeRouteName);
                 }
             }
@@ -195,7 +195,7 @@ abstract class AttributeClassLoader implements LoaderInterface
 
         foreach ($requirements as $placeholder => $requirement) {
             if (\is_int($placeholder)) {
-                throw new \InvalidArgumentException(sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" of route "%s" in "%s::%s()"?', $placeholder, $requirement, $name, $class->getName(), $method->getName()));
+                throw new \InvalidArgumentException(\sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" of route "%s" in "%s::%s()"?', $placeholder, $requirement, $name, $class->getName(), $method->getName()));
             }
         }
 
@@ -219,11 +219,11 @@ abstract class AttributeClassLoader implements LoaderInterface
                     $paths[$locale] = $prefix.$localePath;
                 }
             } elseif ($missing = array_diff_key($prefix, $path)) {
-                throw new \LogicException(sprintf('Route to "%s" is missing paths for locale(s) "%s".', $class->name.'::'.$method->name, implode('", "', array_keys($missing))));
+                throw new \LogicException(\sprintf('Route to "%s" is missing paths for locale(s) "%s".', $class->name.'::'.$method->name, implode('", "', array_keys($missing))));
             } else {
                 foreach ($path as $locale => $localePath) {
                     if (!isset($prefix[$locale])) {
-                        throw new \LogicException(sprintf('Route to "%s" with locale "%s" is missing a corresponding prefix in class "%s".', $method->name, $locale, $class->name));
+                        throw new \LogicException(\sprintf('Route to "%s" with locale "%s" is missing a corresponding prefix in class "%s".', $method->name, $locale, $class->name));
                     }
 
                     $paths[$locale] = $prefix[$locale].$localePath;
@@ -242,7 +242,7 @@ abstract class AttributeClassLoader implements LoaderInterface
                 continue;
             }
             foreach ($paths as $locale => $path) {
-                if (preg_match(sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {
+                if (preg_match(\sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {
                     if (\is_scalar($defaultValue = $param->getDefaultValue()) || null === $defaultValue) {
                         $defaults[$param->name] = $defaultValue;
                     } elseif ($defaultValue instanceof \BackedEnum) {
@@ -267,7 +267,7 @@ abstract class AttributeClassLoader implements LoaderInterface
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if ('annotation' === $type) {
             trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');
@@ -360,7 +360,7 @@ abstract class AttributeClassLoader implements LoaderInterface
 
             foreach ($globals['requirements'] as $placeholder => $requirement) {
                 if (\is_int($placeholder)) {
-                    throw new \InvalidArgumentException(sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" in "%s"?', $placeholder, $requirement, $class->getName()));
+                    throw new \InvalidArgumentException(\sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" in "%s"?', $placeholder, $requirement, $class->getName()));
                 }
             }
         }
diff --git a/lib/symfony/routing/Loader/AttributeDirectoryLoader.php b/lib/symfony/routing/Loader/AttributeDirectoryLoader.php
index e856bade2..a070937d3 100644
--- a/lib/symfony/routing/Loader/AttributeDirectoryLoader.php
+++ b/lib/symfony/routing/Loader/AttributeDirectoryLoader.php
@@ -26,7 +26,7 @@ class AttributeDirectoryLoader extends AttributeFileLoader
     /**
      * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed
      */
-    public function load(mixed $path, string $type = null): ?RouteCollection
+    public function load(mixed $path, ?string $type = null): ?RouteCollection
     {
         if (!is_dir($dir = $this->locator->locate($path))) {
             return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection();
@@ -61,7 +61,7 @@ class AttributeDirectoryLoader extends AttributeFileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
diff --git a/lib/symfony/routing/Loader/AttributeFileLoader.php b/lib/symfony/routing/Loader/AttributeFileLoader.php
index 195afac6f..8d522f473 100644
--- a/lib/symfony/routing/Loader/AttributeFileLoader.php
+++ b/lib/symfony/routing/Loader/AttributeFileLoader.php
@@ -43,7 +43,7 @@ class AttributeFileLoader extends FileLoader
      *
      * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
      */
-    public function load(mixed $file, string $type = null): ?RouteCollection
+    public function load(mixed $file, ?string $type = null): ?RouteCollection
     {
         $path = $this->locator->locate($file);
 
@@ -63,7 +63,7 @@ class AttributeFileLoader extends FileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if ('annotation' === $type) {
             trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');
@@ -82,7 +82,7 @@ class AttributeFileLoader extends FileLoader
         $tokens = token_get_all(file_get_contents($file));
 
         if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forgot to add the "<?php" start tag at the beginning of the file?', $file));
+            throw new \InvalidArgumentException(\sprintf('The file "%s" does not contain PHP code. Did you forget to add the "<?php" start tag at the beginning of the file?', $file));
         }
 
         $nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];
diff --git a/lib/symfony/routing/Loader/ClosureLoader.php b/lib/symfony/routing/Loader/ClosureLoader.php
index e079e78c2..dcc5ee333 100644
--- a/lib/symfony/routing/Loader/ClosureLoader.php
+++ b/lib/symfony/routing/Loader/ClosureLoader.php
@@ -26,12 +26,12 @@ class ClosureLoader extends Loader
     /**
      * Loads a Closure.
      */
-    public function load(mixed $closure, string $type = null): RouteCollection
+    public function load(mixed $closure, ?string $type = null): RouteCollection
     {
         return $closure($this->env);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return $resource instanceof \Closure && (!$type || 'closure' === $type);
     }
diff --git a/lib/symfony/routing/Loader/Configurator/CollectionConfigurator.php b/lib/symfony/routing/Loader/Configurator/CollectionConfigurator.php
index bc0946f0e..fe4cab4a2 100644
--- a/lib/symfony/routing/Loader/Configurator/CollectionConfigurator.php
+++ b/lib/symfony/routing/Loader/Configurator/CollectionConfigurator.php
@@ -28,7 +28,7 @@ class CollectionConfigurator
     private ?array $parentPrefixes;
     private string|array|null $host = null;
 
-    public function __construct(RouteCollection $parent, string $name, self $parentConfigurator = null, array $parentPrefixes = null)
+    public function __construct(RouteCollection $parent, string $name, ?self $parentConfigurator = null, ?array $parentPrefixes = null)
     {
         $this->parent = $parent;
         $this->name = $name;
@@ -38,15 +38,12 @@ class CollectionConfigurator
         $this->parentPrefixes = $parentPrefixes;
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
@@ -84,11 +81,11 @@ class CollectionConfigurator
             if (null === $this->parentPrefixes) {
                 // no-op
             } elseif ($missing = array_diff_key($this->parentPrefixes, $prefix)) {
-                throw new \LogicException(sprintf('Collection "%s" is missing prefixes for locale(s) "%s".', $this->name, implode('", "', array_keys($missing))));
+                throw new \LogicException(\sprintf('Collection "%s" is missing prefixes for locale(s) "%s".', $this->name, implode('", "', array_keys($missing))));
             } else {
                 foreach ($prefix as $locale => $localePrefix) {
                     if (!isset($this->parentPrefixes[$locale])) {
-                        throw new \LogicException(sprintf('Collection "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $this->name, $locale));
+                        throw new \LogicException(\sprintf('Collection "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $this->name, $locale));
                     }
 
                     $prefix[$locale] = $this->parentPrefixes[$locale].$localePrefix;
diff --git a/lib/symfony/routing/Loader/Configurator/ImportConfigurator.php b/lib/symfony/routing/Loader/Configurator/ImportConfigurator.php
index 9c92a7d72..ad0c6d131 100644
--- a/lib/symfony/routing/Loader/Configurator/ImportConfigurator.php
+++ b/lib/symfony/routing/Loader/Configurator/ImportConfigurator.php
@@ -30,15 +30,12 @@ class ImportConfigurator
         $this->route = $route;
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    /**
-     * @return void
-     */
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
diff --git a/lib/symfony/routing/Loader/Configurator/RouteConfigurator.php b/lib/symfony/routing/Loader/Configurator/RouteConfigurator.php
index 9407cc8ee..26a2e3857 100644
--- a/lib/symfony/routing/Loader/Configurator/RouteConfigurator.php
+++ b/lib/symfony/routing/Loader/Configurator/RouteConfigurator.php
@@ -24,7 +24,7 @@ class RouteConfigurator
 
     protected $parentConfigurator;
 
-    public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', CollectionConfigurator $parentConfigurator = null, array $prefixes = null)
+    public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', ?CollectionConfigurator $parentConfigurator = null, ?array $prefixes = null)
     {
         $this->collection = $collection;
         $this->route = $route;
@@ -42,7 +42,14 @@ class RouteConfigurator
      */
     final public function host(string|array $host): static
     {
+        $previousRoutes = clone $this->route;
         $this->addHost($this->route, $host);
+        foreach ($previousRoutes as $name => $route) {
+            if (!$this->route->get($name)) {
+                $this->collection->remove($name);
+            }
+        }
+        $this->collection->addCollection($this->route);
 
         return $this;
     }
diff --git a/lib/symfony/routing/Loader/Configurator/RoutingConfigurator.php b/lib/symfony/routing/Loader/Configurator/RoutingConfigurator.php
index 80f9330d5..fa88aa677 100644
--- a/lib/symfony/routing/Loader/Configurator/RoutingConfigurator.php
+++ b/lib/symfony/routing/Loader/Configurator/RoutingConfigurator.php
@@ -26,7 +26,7 @@ class RoutingConfigurator
     private string $file;
     private ?string $env;
 
-    public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, string $env = null)
+    public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, ?string $env = null)
     {
         $this->collection = $collection;
         $this->loader = $loader;
@@ -38,7 +38,7 @@ class RoutingConfigurator
     /**
      * @param string|string[]|null $exclude Glob patterns to exclude from the import
      */
-    final public function import(string|array $resource, string $type = null, bool $ignoreErrors = false, string|array $exclude = null): ImportConfigurator
+    final public function import(string|array $resource, ?string $type = null, bool $ignoreErrors = false, string|array|null $exclude = null): ImportConfigurator
     {
         $this->loader->setCurrentDir(\dirname($this->path));
 
diff --git a/lib/symfony/routing/Loader/Configurator/Traits/HostTrait.php b/lib/symfony/routing/Loader/Configurator/Traits/HostTrait.php
index d275f6c67..e584f356f 100644
--- a/lib/symfony/routing/Loader/Configurator/Traits/HostTrait.php
+++ b/lib/symfony/routing/Loader/Configurator/Traits/HostTrait.php
@@ -28,6 +28,7 @@ trait HostTrait
 
         foreach ($routes->all() as $name => $route) {
             if (null === $locale = $route->getDefault('_locale')) {
+                $priority = $routes->getPriority($name) ?? 0;
                 $routes->remove($name);
                 foreach ($hosts as $locale => $host) {
                     $localizedRoute = clone $route;
@@ -35,14 +36,14 @@ trait HostTrait
                     $localizedRoute->setRequirement('_locale', preg_quote($locale));
                     $localizedRoute->setDefault('_canonical_route', $name);
                     $localizedRoute->setHost($host);
-                    $routes->add($name.'.'.$locale, $localizedRoute);
+                    $routes->add($name.'.'.$locale, $localizedRoute, $priority);
                 }
             } elseif (!isset($hosts[$locale])) {
-                throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding host in its parent collection.', $name, $locale));
+                throw new \InvalidArgumentException(\sprintf('Route "%s" with locale "%s" is missing a corresponding host in its parent collection.', $name, $locale));
             } else {
                 $route->setHost($hosts[$locale]);
                 $route->setRequirement('_locale', preg_quote($locale));
-                $routes->add($name, $route);
+                $routes->add($name, $route, $routes->getPriority($name) ?? 0);
             }
         }
     }
diff --git a/lib/symfony/routing/Loader/Configurator/Traits/LocalizedRouteTrait.php b/lib/symfony/routing/Loader/Configurator/Traits/LocalizedRouteTrait.php
index c7c40e980..d90ef9d36 100644
--- a/lib/symfony/routing/Loader/Configurator/Traits/LocalizedRouteTrait.php
+++ b/lib/symfony/routing/Loader/Configurator/Traits/LocalizedRouteTrait.php
@@ -27,7 +27,7 @@ trait LocalizedRouteTrait
      *
      * @param string|array $path the path, or the localized paths of the route
      */
-    final protected function createLocalizedRoute(RouteCollection $collection, string $name, string|array $path, string $namePrefix = '', array $prefixes = null): RouteCollection
+    final protected function createLocalizedRoute(RouteCollection $collection, string $name, string|array $path, string $namePrefix = '', ?array $prefixes = null): RouteCollection
     {
         $paths = [];
 
@@ -37,11 +37,11 @@ trait LocalizedRouteTrait
             if (null === $prefixes) {
                 $paths = $path;
             } elseif ($missing = array_diff_key($prefixes, $path)) {
-                throw new \LogicException(sprintf('Route "%s" is missing routes for locale(s) "%s".', $name, implode('", "', array_keys($missing))));
+                throw new \LogicException(\sprintf('Route "%s" is missing routes for locale(s) "%s".', $name, implode('", "', array_keys($missing))));
             } else {
                 foreach ($path as $locale => $localePath) {
                     if (!isset($prefixes[$locale])) {
-                        throw new \LogicException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
+                        throw new \LogicException(\sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
                     }
 
                     $paths[$locale] = $prefixes[$locale].$localePath;
diff --git a/lib/symfony/routing/Loader/Configurator/Traits/PrefixTrait.php b/lib/symfony/routing/Loader/Configurator/Traits/PrefixTrait.php
index 58686380b..9f2284c5c 100644
--- a/lib/symfony/routing/Loader/Configurator/Traits/PrefixTrait.php
+++ b/lib/symfony/routing/Loader/Configurator/Traits/PrefixTrait.php
@@ -27,22 +27,33 @@ trait PrefixTrait
             foreach ($prefix as $locale => $localePrefix) {
                 $prefix[$locale] = trim(trim($localePrefix), '/');
             }
+            $aliases = [];
+            foreach ($routes->getAliases() as $name => $alias) {
+                $aliases[$alias->getId()][] = $name;
+            }
             foreach ($routes->all() as $name => $route) {
                 if (null === $locale = $route->getDefault('_locale')) {
+                    $priority = $routes->getPriority($name) ?? 0;
                     $routes->remove($name);
+                    foreach ($aliases[$name] ?? [] as $aliasName) {
+                        $routes->remove($aliasName);
+                    }
                     foreach ($prefix as $locale => $localePrefix) {
                         $localizedRoute = clone $route;
                         $localizedRoute->setDefault('_locale', $locale);
                         $localizedRoute->setRequirement('_locale', preg_quote($locale));
                         $localizedRoute->setDefault('_canonical_route', $name);
                         $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
-                        $routes->add($name.'.'.$locale, $localizedRoute);
+                        $routes->add($name.'.'.$locale, $localizedRoute, $priority);
+                        foreach ($aliases[$name] ?? [] as $aliasName) {
+                            $routes->addAlias($aliasName.'.'.$locale, $name.'.'.$locale);
+                        }
                     }
                 } elseif (!isset($prefix[$locale])) {
-                    throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
+                    throw new \InvalidArgumentException(\sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
                 } else {
                     $route->setPath($prefix[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
-                    $routes->add($name, $route);
+                    $routes->add($name, $route, $routes->getPriority($name) ?? 0);
                 }
             }
 
diff --git a/lib/symfony/routing/Loader/ContainerLoader.php b/lib/symfony/routing/Loader/ContainerLoader.php
index 716ec499a..af325be08 100644
--- a/lib/symfony/routing/Loader/ContainerLoader.php
+++ b/lib/symfony/routing/Loader/ContainerLoader.php
@@ -22,13 +22,13 @@ class ContainerLoader extends ObjectLoader
 {
     private ContainerInterface $container;
 
-    public function __construct(ContainerInterface $container, string $env = null)
+    public function __construct(ContainerInterface $container, ?string $env = null)
     {
         $this->container = $container;
         parent::__construct($env);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'service' === $type && \is_string($resource);
     }
diff --git a/lib/symfony/routing/Loader/DirectoryLoader.php b/lib/symfony/routing/Loader/DirectoryLoader.php
index 4ea7c6ba4..6c6c48e2e 100644
--- a/lib/symfony/routing/Loader/DirectoryLoader.php
+++ b/lib/symfony/routing/Loader/DirectoryLoader.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\RouteCollection;
 
 class DirectoryLoader extends FileLoader
 {
-    public function load(mixed $file, string $type = null): mixed
+    public function load(mixed $file, ?string $type = null): mixed
     {
         $path = $this->locator->locate($file);
 
@@ -43,7 +43,7 @@ class DirectoryLoader extends FileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         // only when type is forced to directory, not to conflict with AttributeLoader
 
diff --git a/lib/symfony/routing/Loader/GlobFileLoader.php b/lib/symfony/routing/Loader/GlobFileLoader.php
index d3974fc7d..65afa5a37 100644
--- a/lib/symfony/routing/Loader/GlobFileLoader.php
+++ b/lib/symfony/routing/Loader/GlobFileLoader.php
@@ -21,7 +21,7 @@ use Symfony\Component\Routing\RouteCollection;
  */
 class GlobFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         $collection = new RouteCollection();
 
@@ -34,7 +34,7 @@ class GlobFileLoader extends FileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'glob' === $type;
     }
diff --git a/lib/symfony/routing/Loader/ObjectLoader.php b/lib/symfony/routing/Loader/ObjectLoader.php
index a2a57068f..d4234c135 100644
--- a/lib/symfony/routing/Loader/ObjectLoader.php
+++ b/lib/symfony/routing/Loader/ObjectLoader.php
@@ -33,10 +33,10 @@ abstract class ObjectLoader extends Loader
     /**
      * Calls the object method that will load the routes.
      */
-    public function load(mixed $resource, string $type = null): RouteCollection
+    public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         if (!preg_match('/^[^\:]+(?:::(?:[^\:]+))?$/', $resource)) {
-            throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the %s route loader: use the format "object_id::method" or "object_id" if your object class has an "__invoke" method.', $resource, \is_string($type) ? '"'.$type.'"' : 'object'));
+            throw new \InvalidArgumentException(\sprintf('Invalid resource "%s" passed to the %s route loader: use the format "object_id::method" or "object_id" if your object class has an "__invoke" method.', $resource, \is_string($type) ? '"'.$type.'"' : 'object'));
         }
 
         $parts = explode('::', $resource);
@@ -45,11 +45,11 @@ abstract class ObjectLoader extends Loader
         $loaderObject = $this->getObject($parts[0]);
 
         if (!\is_object($loaderObject)) {
-            throw new \TypeError(sprintf('"%s:getObject()" must return an object: "%s" returned.', static::class, get_debug_type($loaderObject)));
+            throw new \TypeError(\sprintf('"%s:getObject()" must return an object: "%s" returned.', static::class, get_debug_type($loaderObject)));
         }
 
         if (!\is_callable([$loaderObject, $method])) {
-            throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s".', $method, get_debug_type($loaderObject), $resource));
+            throw new \BadMethodCallException(\sprintf('Method "%s" not found on "%s" when importing routing resource "%s".', $method, get_debug_type($loaderObject), $resource));
         }
 
         $routeCollection = $loaderObject->$method($this, $this->env);
@@ -57,7 +57,7 @@ abstract class ObjectLoader extends Loader
         if (!$routeCollection instanceof RouteCollection) {
             $type = get_debug_type($routeCollection);
 
-            throw new \LogicException(sprintf('The "%s::%s()" method must return a RouteCollection: "%s" returned.', get_debug_type($loaderObject), $method, $type));
+            throw new \LogicException(\sprintf('The "%s::%s()" method must return a RouteCollection: "%s" returned.', get_debug_type($loaderObject), $method, $type));
         }
 
         // make the object file tracked so that if it changes, the cache rebuilds
diff --git a/lib/symfony/routing/Loader/PhpFileLoader.php b/lib/symfony/routing/Loader/PhpFileLoader.php
index 6abee2e82..adf7eed3f 100644
--- a/lib/symfony/routing/Loader/PhpFileLoader.php
+++ b/lib/symfony/routing/Loader/PhpFileLoader.php
@@ -30,7 +30,7 @@ class PhpFileLoader extends FileLoader
     /**
      * Loads a PHP file.
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
         $this->setCurrentDir(\dirname($path));
@@ -54,7 +54,7 @@ class PhpFileLoader extends FileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'php' === $type);
     }
diff --git a/lib/symfony/routing/Loader/Psr4DirectoryLoader.php b/lib/symfony/routing/Loader/Psr4DirectoryLoader.php
index 059edc99e..bbf99418c 100644
--- a/lib/symfony/routing/Loader/Psr4DirectoryLoader.php
+++ b/lib/symfony/routing/Loader/Psr4DirectoryLoader.php
@@ -36,7 +36,7 @@ final class Psr4DirectoryLoader extends Loader implements DirectoryAwareLoaderIn
     /**
      * @param array{path: string, namespace: string} $resource
      */
-    public function load(mixed $resource, string $type = null): ?RouteCollection
+    public function load(mixed $resource, ?string $type = null): ?RouteCollection
     {
         $path = $this->locator->locate($resource['path'], $this->currentDirectory);
         if (!is_dir($path)) {
@@ -46,7 +46,7 @@ final class Psr4DirectoryLoader extends Loader implements DirectoryAwareLoaderIn
         return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'));
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return ('attribute' === $type || 'annotation' === $type) && \is_array($resource) && isset($resource['path'], $resource['namespace']);
     }
diff --git a/lib/symfony/routing/Loader/XmlFileLoader.php b/lib/symfony/routing/Loader/XmlFileLoader.php
index 24ec21bb5..5b41bd698 100644
--- a/lib/symfony/routing/Loader/XmlFileLoader.php
+++ b/lib/symfony/routing/Loader/XmlFileLoader.php
@@ -38,7 +38,7 @@ class XmlFileLoader extends FileLoader
      * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
      *                                   parsed because it does not validate against the scheme
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
 
@@ -90,11 +90,11 @@ class XmlFileLoader extends FileLoader
                 }
                 break;
             default:
-                throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "route" or "import".', $node->localName, $path));
+                throw new \InvalidArgumentException(\sprintf('Unknown tag "%s" used in file "%s". Expected "route" or "import".', $node->localName, $path));
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
     }
@@ -109,7 +109,7 @@ class XmlFileLoader extends FileLoader
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path)
     {
         if ('' === $id = $node->getAttribute('id')) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" attribute.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <route> element in file "%s" must have an "id" attribute.', $path));
         }
 
         if ('' !== $alias = $node->getAttribute('alias')) {
@@ -128,14 +128,14 @@ class XmlFileLoader extends FileLoader
         [$defaults, $requirements, $options, $condition, $paths, /* $prefixes */, $hosts] = $this->parseConfigs($node, $path);
 
         if (!$paths && '' === $node->getAttribute('path')) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have a "path" attribute or <path> child nodes.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <route> element in file "%s" must have a "path" attribute or <path> child nodes.', $path));
         }
 
         if ($paths && '' !== $node->getAttribute('path')) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must not have both a "path" attribute and <path> child nodes.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <route> element in file "%s" must not have both a "path" attribute and <path> child nodes.', $path));
         }
 
-        $routes = $this->createLocalizedRoute($collection, $id, $paths ?: $node->getAttribute('path'));
+        $routes = $this->createLocalizedRoute(new RouteCollection(), $id, $paths ?: $node->getAttribute('path'));
         $routes->addDefaults($defaults);
         $routes->addRequirements($requirements);
         $routes->addOptions($options);
@@ -146,6 +146,8 @@ class XmlFileLoader extends FileLoader
         if (null !== $hosts) {
             $this->addHost($routes, $hosts);
         }
+
+        $collection->addCollection($routes);
     }
 
     /**
@@ -167,7 +169,7 @@ class XmlFileLoader extends FileLoader
         }
 
         if (!$resource) {
-            throw new \InvalidArgumentException(sprintf('The <import> element in file "%s" must have a "resource" attribute or element.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <import> element in file "%s" must have a "resource" attribute or element.', $path));
         }
 
         $type = $node->getAttribute('type');
@@ -180,7 +182,7 @@ class XmlFileLoader extends FileLoader
         [$defaults, $requirements, $options, $condition, /* $paths */, $prefixes, $hosts] = $this->parseConfigs($node, $path);
 
         if ('' !== $prefix && $prefixes) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must not have both a "prefix" attribute and <prefix> child nodes.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <route> element in file "%s" must not have both a "prefix" attribute and <prefix> child nodes.', $path));
         }
 
         $exclude = [];
@@ -294,15 +296,15 @@ class XmlFileLoader extends FileLoader
                 case 'resource':
                     break;
                 default:
-                    throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "default", "requirement", "option" or "condition".', $n->localName, $path));
+                    throw new \InvalidArgumentException(\sprintf('Unknown tag "%s" used in file "%s". Expected "default", "requirement", "option" or "condition".', $n->localName, $path));
             }
         }
 
         if ($controller = $node->getAttribute('controller')) {
             if (isset($defaults['_controller'])) {
-                $name = $node->hasAttribute('id') ? sprintf('"%s".', $node->getAttribute('id')) : sprintf('the "%s" tag.', $node->tagName);
+                $name = $node->hasAttribute('id') ? \sprintf('"%s".', $node->getAttribute('id')) : \sprintf('the "%s" tag.', $node->tagName);
 
-                throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" attribute and the defaults key "_controller" for ', $path).$name);
+                throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify both the "controller" attribute and the defaults key "_controller" for ', $path).$name);
             }
 
             $defaults['_controller'] = $controller;
@@ -318,9 +320,9 @@ class XmlFileLoader extends FileLoader
         }
         if ($stateless = $node->getAttribute('stateless')) {
             if (isset($defaults['_stateless'])) {
-                $name = $node->hasAttribute('id') ? sprintf('"%s".', $node->getAttribute('id')) : sprintf('the "%s" tag.', $node->tagName);
+                $name = $node->hasAttribute('id') ? \sprintf('"%s".', $node->getAttribute('id')) : \sprintf('the "%s" tag.', $node->tagName);
 
-                throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "stateless" attribute and the defaults key "_stateless" for ', $path).$name);
+                throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify both the "stateless" attribute and the defaults key "_stateless" for ', $path).$name);
             }
 
             $defaults['_stateless'] = XmlUtils::phpize($stateless);
@@ -416,7 +418,7 @@ class XmlFileLoader extends FileLoader
 
                 return $map;
             default:
-                throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "bool", "int", "float", "string", "list", or "map".', $node->localName, $path));
+                throw new \InvalidArgumentException(\sprintf('Unknown tag "%s" used in file "%s". Expected "bool", "int", "float", "string", "list", or "map".', $node->localName, $path));
         }
     }
 
@@ -444,7 +446,7 @@ class XmlFileLoader extends FileLoader
                 continue;
             }
             if ('deprecated' !== $child->localName) {
-                throw new \InvalidArgumentException(sprintf('Invalid child element "%s" defined for alias "%s" in "%s".', $child->localName, $node->getAttribute('id'), $path));
+                throw new \InvalidArgumentException(\sprintf('Invalid child element "%s" defined for alias "%s" in "%s".', $child->localName, $node->getAttribute('id'), $path));
             }
 
             $deprecatedNode = $child;
@@ -455,10 +457,10 @@ class XmlFileLoader extends FileLoader
         }
 
         if (!$deprecatedNode->hasAttribute('package')) {
-            throw new \InvalidArgumentException(sprintf('The <deprecated> element in file "%s" must have a "package" attribute.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <deprecated> element in file "%s" must have a "package" attribute.', $path));
         }
         if (!$deprecatedNode->hasAttribute('version')) {
-            throw new \InvalidArgumentException(sprintf('The <deprecated> element in file "%s" must have a "version" attribute.', $path));
+            throw new \InvalidArgumentException(\sprintf('The <deprecated> element in file "%s" must have a "version" attribute.', $path));
         }
 
         return [
diff --git a/lib/symfony/routing/Loader/YamlFileLoader.php b/lib/symfony/routing/Loader/YamlFileLoader.php
index bde72c0eb..c1924ba65 100644
--- a/lib/symfony/routing/Loader/YamlFileLoader.php
+++ b/lib/symfony/routing/Loader/YamlFileLoader.php
@@ -41,16 +41,16 @@ class YamlFileLoader extends FileLoader
     /**
      * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
 
         if (!stream_is_local($path)) {
-            throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $path));
+            throw new \InvalidArgumentException(\sprintf('This is not a local file "%s".', $path));
         }
 
         if (!file_exists($path)) {
-            throw new \InvalidArgumentException(sprintf('File "%s" not found.', $path));
+            throw new \InvalidArgumentException(\sprintf('File "%s" not found.', $path));
         }
 
         $this->yamlParser ??= new YamlParser();
@@ -58,7 +58,7 @@ class YamlFileLoader extends FileLoader
         try {
             $parsedConfig = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
+            throw new \InvalidArgumentException(\sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
         }
 
         $collection = new RouteCollection();
@@ -71,7 +71,7 @@ class YamlFileLoader extends FileLoader
 
         // not an array
         if (!\is_array($parsedConfig)) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));
+            throw new \InvalidArgumentException(\sprintf('The file "%s" must contain a YAML array.', $path));
         }
 
         foreach ($parsedConfig as $name => $config) {
@@ -105,7 +105,7 @@ class YamlFileLoader extends FileLoader
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && \in_array(pathinfo($resource, \PATHINFO_EXTENSION), ['yml', 'yaml'], true) && (!$type || 'yaml' === $type);
     }
@@ -137,7 +137,7 @@ class YamlFileLoader extends FileLoader
 
         foreach ($requirements as $placeholder => $requirement) {
             if (\is_int($placeholder)) {
-                throw new \InvalidArgumentException(sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" of route "%s" in "%s"?', $placeholder, $requirement, $name, $path));
+                throw new \InvalidArgumentException(\sprintf('A placeholder name must be a string (%d given). Did you forget to specify the placeholder key for the requirement "%s" of route "%s" in "%s"?', $placeholder, $requirement, $name, $path));
             }
         }
 
@@ -157,7 +157,7 @@ class YamlFileLoader extends FileLoader
             $defaults['_stateless'] = $config['stateless'];
         }
 
-        $routes = $this->createLocalizedRoute($collection, $name, $config['path']);
+        $routes = $this->createLocalizedRoute(new RouteCollection(), $name, $config['path']);
         $routes->addDefaults($defaults);
         $routes->addRequirements($requirements);
         $routes->addOptions($options);
@@ -168,6 +168,8 @@ class YamlFileLoader extends FileLoader
         if (isset($config['host'])) {
             $this->addHost($routes, $config['host']);
         }
+
+        $collection->addCollection($routes);
     }
 
     /**
@@ -250,7 +252,7 @@ class YamlFileLoader extends FileLoader
     protected function validate(mixed $config, string $name, string $path)
     {
         if (!\is_array($config)) {
-            throw new \InvalidArgumentException(sprintf('The definition of "%s" in "%s" must be a YAML array.', $name, $path));
+            throw new \InvalidArgumentException(\sprintf('The definition of "%s" in "%s" must be a YAML array.', $name, $path));
         }
         if (isset($config['alias'])) {
             $this->validateAlias($config, $name, $path);
@@ -258,22 +260,22 @@ class YamlFileLoader extends FileLoader
             return;
         }
         if ($extraKeys = array_diff(array_keys($config), self::AVAILABLE_KEYS)) {
-            throw new \InvalidArgumentException(sprintf('The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".', $path, $name, implode('", "', $extraKeys), implode('", "', self::AVAILABLE_KEYS)));
+            throw new \InvalidArgumentException(\sprintf('The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".', $path, $name, implode('", "', $extraKeys), implode('", "', self::AVAILABLE_KEYS)));
         }
         if (isset($config['resource']) && isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "resource" key and the "path" key for "%s". Choose between an import and a route definition.', $path, $name));
+            throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify both the "resource" key and the "path" key for "%s". Choose between an import and a route definition.', $path, $name));
         }
         if (!isset($config['resource']) && isset($config['type'])) {
-            throw new \InvalidArgumentException(sprintf('The "type" key for the route definition "%s" in "%s" is unsupported. It is only available for imports in combination with the "resource" key.', $name, $path));
+            throw new \InvalidArgumentException(\sprintf('The "type" key for the route definition "%s" in "%s" is unsupported. It is only available for imports in combination with the "resource" key.', $name, $path));
         }
         if (!isset($config['resource']) && !isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf('You must define a "path" for the route "%s" in file "%s".', $name, $path));
+            throw new \InvalidArgumentException(\sprintf('You must define a "path" for the route "%s" in file "%s".', $name, $path));
         }
         if (isset($config['controller']) && isset($config['defaults']['_controller'])) {
-            throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" key and the defaults key "_controller" for "%s".', $path, $name));
+            throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify both the "controller" key and the defaults key "_controller" for "%s".', $path, $name));
         }
         if (isset($config['stateless']) && isset($config['defaults']['_stateless'])) {
-            throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "stateless" key and the defaults key "_stateless" for "%s".', $path, $name));
+            throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify both the "stateless" key and the defaults key "_stateless" for "%s".', $path, $name));
         }
     }
 
@@ -285,16 +287,16 @@ class YamlFileLoader extends FileLoader
     {
         foreach ($config as $key => $value) {
             if (!\in_array($key, ['alias', 'deprecated'], true)) {
-                throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify other keys than "alias" and "deprecated" for "%s".', $path, $name));
+                throw new \InvalidArgumentException(\sprintf('The routing file "%s" must not specify other keys than "alias" and "deprecated" for "%s".', $path, $name));
             }
 
             if ('deprecated' === $key) {
                 if (!isset($value['package'])) {
-                    throw new \InvalidArgumentException(sprintf('The routing file "%s" must specify the attribute "package" of the "deprecated" option for "%s".', $path, $name));
+                    throw new \InvalidArgumentException(\sprintf('The routing file "%s" must specify the attribute "package" of the "deprecated" option for "%s".', $path, $name));
                 }
 
                 if (!isset($value['version'])) {
-                    throw new \InvalidArgumentException(sprintf('The routing file "%s" must specify the attribute "version" of the "deprecated" option for "%s".', $path, $name));
+                    throw new \InvalidArgumentException(\sprintf('The routing file "%s" must specify the attribute "version" of the "deprecated" option for "%s".', $path, $name));
                 }
             }
         }
diff --git a/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
index a7639cd4c..f71264ce9 100644
--- a/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+++ b/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -137,7 +137,7 @@ EOF;
 
         $code .= '[ // $staticRoutes'."\n";
         foreach ($staticRoutes as $path => $routes) {
-            $code .= sprintf("    %s => [\n", self::export($path));
+            $code .= \sprintf("    %s => [\n", self::export($path));
             foreach ($routes as $route) {
                 $code .= vsprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", array_map([__CLASS__, 'export'], $route));
             }
@@ -145,11 +145,11 @@ EOF;
         }
         $code .= "],\n";
 
-        $code .= sprintf("[ // \$regexpList%s\n],\n", $regexpCode);
+        $code .= \sprintf("[ // \$regexpList%s\n],\n", $regexpCode);
 
         $code .= '[ // $dynamicRoutes'."\n";
         foreach ($dynamicRoutes as $path => $routes) {
-            $code .= sprintf("    %s => [\n", self::export($path));
+            $code .= \sprintf("    %s => [\n", self::export($path));
             foreach ($routes as $route) {
                 $code .= vsprintf("        [%s, %s, %s, %s, %s, %s, %s],\n", array_map([__CLASS__, 'export'], $route));
             }
@@ -222,7 +222,12 @@ EOF;
         foreach ($staticRoutes as $url => $routes) {
             $compiledRoutes[$url] = [];
             foreach ($routes as $name => [$route, $hasTrailingSlash]) {
-                $compiledRoutes[$url][] = $this->compileRoute($route, $name, (!$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex()) ?: null, $hasTrailingSlash, false, $conditions);
+                if ($route->compile()->getHostVariables()) {
+                    $host = $route->compile()->getHostRegex();
+                } elseif ($host = $route->getHost()) {
+                    $host = strtolower($host);
+                }
+                $compiledRoutes[$url][] = $this->compileRoute($route, $name, $host ?: null, $hasTrailingSlash, false, $conditions);
             }
         }
 
@@ -402,7 +407,7 @@ EOF;
 
             $state->mark += 3 + $state->markTail + \strlen($regex) - $prefixLen;
             $state->markTail = 2 + \strlen($state->mark);
-            $rx = sprintf('|%s(*:%s)', substr($regex, $prefixLen), $state->mark);
+            $rx = \sprintf('|%s(*:%s)', substr($regex, $prefixLen), $state->mark);
             $code .= "\n            .".self::export($rx);
             $state->regex .= $rx;
 
diff --git a/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherTrait.php b/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherTrait.php
index 50abf4587..5177c269a 100644
--- a/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherTrait.php
+++ b/lib/symfony/routing/Matcher/Dumper/CompiledUrlMatcherTrait.php
@@ -42,7 +42,7 @@ trait CompiledUrlMatcherTrait
             throw new MethodNotAllowedException(array_keys($allow));
         }
         if (!$this instanceof RedirectableUrlMatcherInterface) {
-            throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
+            throw new ResourceNotFoundException(\sprintf('No routes found for "%s".', $pathinfo));
         }
         if (!\in_array($this->context->getMethod(), ['HEAD', 'GET'], true)) {
             // no-op
@@ -57,7 +57,7 @@ trait CompiledUrlMatcherTrait
             } finally {
                 $this->context->setScheme($scheme);
             }
-        } elseif ('/' !== $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/') {
+        } elseif ('' !== $trimmedPathinfo = rtrim($pathinfo, '/')) {
             $pathinfo = $trimmedPathinfo === $pathinfo ? $pathinfo.'/' : $trimmedPathinfo;
             if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
                 return $this->redirect($pathinfo, $ret['_route']) + $ret;
@@ -67,14 +67,14 @@ trait CompiledUrlMatcherTrait
             }
         }
 
-        throw new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
+        throw new ResourceNotFoundException(\sprintf('No routes found for "%s".', $pathinfo));
     }
 
     private function doMatch(string $pathinfo, array &$allow = [], array &$allowSchemes = []): array
     {
         $allow = $allowSchemes = [];
-        $pathinfo = rawurldecode($pathinfo) ?: '/';
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $pathinfo = '' === ($pathinfo = rawurldecode($pathinfo)) ? '/' : $pathinfo;
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
         $context = $this->context;
         $requestMethod = $canonicalMethod = $context->getMethod();
 
diff --git a/lib/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php b/lib/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
index 43e9906e6..42ca799f6 100644
--- a/lib/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
+++ b/lib/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -198,6 +198,7 @@ class StaticPrefixCollection
 
     public static function handleError(int $type, string $msg): bool
     {
-        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');
+        return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length')
+            || str_contains($msg, 'Compilation failed: length of lookbehind assertion is not limited');
     }
 }
diff --git a/lib/symfony/routing/Matcher/ExpressionLanguageProvider.php b/lib/symfony/routing/Matcher/ExpressionLanguageProvider.php
index 3aeebe699..a910a07a2 100644
--- a/lib/symfony/routing/Matcher/ExpressionLanguageProvider.php
+++ b/lib/symfony/routing/Matcher/ExpressionLanguageProvider.php
@@ -36,7 +36,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
         foreach ($this->functions->getProvidedServices() as $function => $type) {
             $functions[] = new ExpressionFunction(
                 $function,
-                static fn (...$args) => sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args)),
+                static fn (...$args) => \sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args)),
                 fn ($values, ...$args) => $values['context']->getParameter('_functions')->get($function)(...$args)
             );
         }
diff --git a/lib/symfony/routing/Matcher/RedirectableUrlMatcher.php b/lib/symfony/routing/Matcher/RedirectableUrlMatcher.php
index 8d1ad4f90..3e7b78b5e 100644
--- a/lib/symfony/routing/Matcher/RedirectableUrlMatcher.php
+++ b/lib/symfony/routing/Matcher/RedirectableUrlMatcher.php
@@ -41,7 +41,7 @@ abstract class RedirectableUrlMatcher extends UrlMatcher implements Redirectable
                 } finally {
                     $this->context->setScheme($scheme);
                 }
-            } elseif ('/' === $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/') {
+            } elseif ('' === $trimmedPathinfo = rtrim($pathinfo, '/')) {
                 throw $e;
             } else {
                 try {
diff --git a/lib/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php b/lib/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php
index cd7e8c2c1..e4bcedda0 100644
--- a/lib/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php
+++ b/lib/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php
@@ -25,5 +25,5 @@ interface RedirectableUrlMatcherInterface
      * @param string      $route  The route name that matched
      * @param string|null $scheme The URL scheme (null to keep the current one)
      */
-    public function redirect(string $path, string $route, string $scheme = null): array;
+    public function redirect(string $path, string $route, ?string $scheme = null): array;
 }
diff --git a/lib/symfony/routing/Matcher/TraceableUrlMatcher.php b/lib/symfony/routing/Matcher/TraceableUrlMatcher.php
index 417f15641..8ff018309 100644
--- a/lib/symfony/routing/Matcher/TraceableUrlMatcher.php
+++ b/lib/symfony/routing/Matcher/TraceableUrlMatcher.php
@@ -63,7 +63,7 @@ class TraceableUrlMatcher extends UrlMatcher
             $method = 'GET';
         }
         $supportsTrailingSlash = 'GET' === $method && $this instanceof RedirectableUrlMatcherInterface;
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
 
         foreach ($routes as $name => $route) {
             $compiledRoute = $route->compile();
@@ -72,7 +72,7 @@ class TraceableUrlMatcher extends UrlMatcher
 
             // check the static prefix of the URL first. Only use the more expensive preg_match when it matches
             if ('' !== $staticPrefix && !str_starts_with($trimmedPathinfo, $staticPrefix)) {
-                $this->addTrace(sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
+                $this->addTrace(\sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
                 continue;
             }
             $regex = $compiledRoute->getRegex();
@@ -86,7 +86,7 @@ class TraceableUrlMatcher extends UrlMatcher
                 $r = new Route($route->getPath(), $route->getDefaults(), [], $route->getOptions());
                 $cr = $r->compile();
                 if (!preg_match($cr->getRegex(), $pathinfo)) {
-                    $this->addTrace(sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
+                    $this->addTrace(\sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
 
                     continue;
                 }
@@ -96,7 +96,7 @@ class TraceableUrlMatcher extends UrlMatcher
                     $cr = $r->compile();
 
                     if (\in_array($n, $cr->getVariables()) && !preg_match($cr->getRegex(), $pathinfo)) {
-                        $this->addTrace(sprintf('Requirement for "%s" does not match (%s)', $n, $regex), self::ROUTE_ALMOST_MATCHES, $name, $route);
+                        $this->addTrace(\sprintf('Requirement for "%s" does not match (%s)', $n, $regex), self::ROUTE_ALMOST_MATCHES, $name, $route);
 
                         continue 2;
                     }
@@ -117,7 +117,7 @@ class TraceableUrlMatcher extends UrlMatcher
 
             $hostMatches = [];
             if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) {
-                $this->addTrace(sprintf('Host "%s" does not match the requirement ("%s")', $this->context->getHost(), $route->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route);
+                $this->addTrace(\sprintf('Host "%s" does not match the requirement ("%s")', $this->context->getHost(), $route->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route);
                 continue;
             }
 
@@ -126,7 +126,7 @@ class TraceableUrlMatcher extends UrlMatcher
             $status = $this->handleRouteRequirements($pathinfo, $name, $route, $attributes);
 
             if (self::REQUIREMENT_MISMATCH === $status[0]) {
-                $this->addTrace(sprintf('Condition "%s" does not evaluate to "true"', $route->getCondition()), self::ROUTE_ALMOST_MATCHES, $name, $route);
+                $this->addTrace(\sprintf('Condition "%s" does not evaluate to "true"', $route->getCondition()), self::ROUTE_ALMOST_MATCHES, $name, $route);
                 continue;
             }
 
@@ -136,19 +136,19 @@ class TraceableUrlMatcher extends UrlMatcher
 
                     return $this->allow = $this->allowSchemes = [];
                 }
-                $this->addTrace(sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
+                $this->addTrace(\sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
                 continue;
             }
 
             if ($route->getSchemes() && !$route->hasScheme($this->context->getScheme())) {
                 $this->allowSchemes = array_merge($this->allowSchemes, $route->getSchemes());
-                $this->addTrace(sprintf('Scheme "%s" does not match any of the required schemes (%s)', $this->context->getScheme(), implode(', ', $route->getSchemes())), self::ROUTE_ALMOST_MATCHES, $name, $route);
+                $this->addTrace(\sprintf('Scheme "%s" does not match any of the required schemes (%s)', $this->context->getScheme(), implode(', ', $route->getSchemes())), self::ROUTE_ALMOST_MATCHES, $name, $route);
                 continue;
             }
 
             if ($requiredMethods && !\in_array($method, $requiredMethods)) {
                 $this->allow = array_merge($this->allow, $requiredMethods);
-                $this->addTrace(sprintf('Method "%s" does not match any of the required methods (%s)', $this->context->getMethod(), implode(', ', $requiredMethods)), self::ROUTE_ALMOST_MATCHES, $name, $route);
+                $this->addTrace(\sprintf('Method "%s" does not match any of the required methods (%s)', $this->context->getMethod(), implode(', ', $requiredMethods)), self::ROUTE_ALMOST_MATCHES, $name, $route);
                 continue;
             }
 
@@ -160,7 +160,7 @@ class TraceableUrlMatcher extends UrlMatcher
         return [];
     }
 
-    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null): void
+    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, ?string $name = null, ?Route $route = null): void
     {
         $this->traces[] = [
             'log' => $log,
diff --git a/lib/symfony/routing/Matcher/UrlMatcher.php b/lib/symfony/routing/Matcher/UrlMatcher.php
index 778d154ed..f3ab414f0 100644
--- a/lib/symfony/routing/Matcher/UrlMatcher.php
+++ b/lib/symfony/routing/Matcher/UrlMatcher.php
@@ -78,8 +78,9 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
     public function match(string $pathinfo): array
     {
         $this->allow = $this->allowSchemes = [];
+        $pathinfo = '' === ($pathinfo = rawurldecode($pathinfo)) ? '/' : $pathinfo;
 
-        if ($ret = $this->matchCollection(rawurldecode($pathinfo) ?: '/', $this->routes)) {
+        if ($ret = $this->matchCollection($pathinfo, $this->routes)) {
             return $ret;
         }
 
@@ -87,7 +88,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
             throw new NoConfigurationException();
         }
 
-        throw 0 < \count($this->allow) ? new MethodNotAllowedException(array_unique($this->allow)) : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
+        throw 0 < \count($this->allow) ? new MethodNotAllowedException(array_unique($this->allow)) : new ResourceNotFoundException(\sprintf('No routes found for "%s".', $pathinfo));
     }
 
     public function matchRequest(Request $request): array
@@ -125,7 +126,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
             $method = 'GET';
         }
         $supportsTrailingSlash = 'GET' === $method && $this instanceof RedirectableUrlMatcherInterface;
-        $trimmedPathinfo = rtrim($pathinfo, '/') ?: '/';
+        $trimmedPathinfo = '' === ($trimmedPathinfo = rtrim($pathinfo, '/')) ? '/' : $trimmedPathinfo;
 
         foreach ($routes as $name => $route) {
             $compiledRoute = $route->compile();
@@ -225,7 +226,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
             $routeParameters = func_get_arg(3);
 
             if (!\is_array($routeParameters)) {
-                throw new \TypeError(sprintf('"%s": Argument $routeParameters is expected to be an array, got "%s".', __METHOD__, get_debug_type($routeParameters)));
+                throw new \TypeError(\sprintf('"%s": Argument $routeParameters is expected to be an array, got "%s".', __METHOD__, get_debug_type($routeParameters)));
             }
         }
 
diff --git a/lib/symfony/routing/Requirement/EnumRequirement.php b/lib/symfony/routing/Requirement/EnumRequirement.php
index 3ab2ed332..acbd3bab0 100644
--- a/lib/symfony/routing/Requirement/EnumRequirement.php
+++ b/lib/symfony/routing/Requirement/EnumRequirement.php
@@ -26,7 +26,7 @@ final class EnumRequirement implements \Stringable
     {
         if (\is_string($cases)) {
             if (!is_subclass_of($cases, \BackedEnum::class, true)) {
-                throw new InvalidArgumentException(sprintf('"%s" is not a "BackedEnum" class.', $cases));
+                throw new InvalidArgumentException(\sprintf('"%s" is not a "BackedEnum" class.', $cases));
             }
 
             $cases = $cases::cases();
@@ -35,13 +35,13 @@ final class EnumRequirement implements \Stringable
 
             foreach ($cases as $case) {
                 if (!$case instanceof \BackedEnum) {
-                    throw new InvalidArgumentException(sprintf('Case must be a "BackedEnum" instance, "%s" given.', get_debug_type($case)));
+                    throw new InvalidArgumentException(\sprintf('Case must be a "BackedEnum" instance, "%s" given.', get_debug_type($case)));
                 }
 
                 $class ??= $case::class;
 
                 if (!$case instanceof $class) {
-                    throw new InvalidArgumentException(sprintf('"%s::%s" is not a case of "%s".', get_debug_type($case), $case->name, $class));
+                    throw new InvalidArgumentException(\sprintf('"%s::%s" is not a case of "%s".', get_debug_type($case), $case->name, $class));
                 }
             }
         }
diff --git a/lib/symfony/routing/Requirement/Requirement.php b/lib/symfony/routing/Requirement/Requirement.php
index 54ad86b61..dfbb801f2 100644
--- a/lib/symfony/routing/Requirement/Requirement.php
+++ b/lib/symfony/routing/Requirement/Requirement.php
@@ -23,7 +23,7 @@ enum Requirement
     public const POSITIVE_INT = '[1-9][0-9]*';
     public const UID_BASE32 = '[0-9A-HJKMNP-TV-Z]{26}';
     public const UID_BASE58 = '[1-9A-HJ-NP-Za-km-z]{22}';
-    public const UID_RFC4122 = '[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}';
+    public const UID_RFC4122 = '[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}'; // RFC 9562 obsoleted RFC 4122 but the format is the same
     public const ULID = '[0-7][0-9A-HJKMNP-TV-Z]{25}';
     public const UUID = '[0-9a-f]{8}-[0-9a-f]{4}-[13-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
     public const UUID_V1 = '[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
diff --git a/lib/symfony/routing/Route.php b/lib/symfony/routing/Route.php
index ac8d8bc6e..e34dcb75e 100644
--- a/lib/symfony/routing/Route.php
+++ b/lib/symfony/routing/Route.php
@@ -35,7 +35,7 @@ class Route implements \Serializable
      * Available options:
      *
      *  * compiler_class: A class name able to compile this route instance (RouteCompiler by default)
-     *  * utf8:           Whether UTF-8 matching is enforced ot not
+     *  * utf8:           Whether UTF-8 matching is enforced or not
      *
      * @param string                    $path         The path pattern to match
      * @param array                     $defaults     An array of default parameter values
@@ -445,7 +445,7 @@ class Route implements \Serializable
         }
 
         if ('' === $regex) {
-            throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" cannot be empty.', $key));
+            throw new \InvalidArgumentException(\sprintf('Routing requirement for "%s" cannot be empty.', $key));
         }
 
         return $regex;
diff --git a/lib/symfony/routing/RouteCollection.php b/lib/symfony/routing/RouteCollection.php
index 0a04387ce..a253bc56d 100644
--- a/lib/symfony/routing/RouteCollection.php
+++ b/lib/symfony/routing/RouteCollection.php
@@ -239,7 +239,13 @@ class RouteCollection implements \IteratorAggregate, \Countable
         }
 
         foreach ($this->aliases as $name => $alias) {
-            $prefixedAliases[$prefix.$name] = $alias->withId($prefix.$alias->getId());
+            $targetId = $alias->getId();
+
+            if (isset($this->routes[$targetId]) || isset($this->aliases[$targetId])) {
+                $targetId = $prefix.$targetId;
+            }
+
+            $prefixedAliases[$prefix.$name] = $alias->withId($targetId);
         }
 
         $this->routes = $prefixedRoutes;
@@ -387,7 +393,7 @@ class RouteCollection implements \IteratorAggregate, \Countable
     public function addAlias(string $name, string $alias): Alias
     {
         if ($name === $alias) {
-            throw new InvalidArgumentException(sprintf('Route alias "%s" can not reference itself.', $name));
+            throw new InvalidArgumentException(\sprintf('Route alias "%s" can not reference itself.', $name));
         }
 
         unset($this->routes[$name], $this->priorities[$name]);
@@ -407,4 +413,9 @@ class RouteCollection implements \IteratorAggregate, \Countable
     {
         return $this->aliases[$name] ?? null;
     }
+
+    public function getPriority(string $name): ?int
+    {
+        return $this->priorities[$name] ?? null;
+    }
 }
diff --git a/lib/symfony/routing/RouteCompiler.php b/lib/symfony/routing/RouteCompiler.php
index 330639f48..a96fb9ad9 100644
--- a/lib/symfony/routing/RouteCompiler.php
+++ b/lib/symfony/routing/RouteCompiler.php
@@ -75,7 +75,7 @@ class RouteCompiler implements RouteCompilerInterface
 
         foreach ($pathVariables as $pathParam) {
             if ('_fragment' === $pathParam) {
-                throw new \InvalidArgumentException(sprintf('Route pattern "%s" cannot contain "_fragment" as a path parameter.', $route->getPath()));
+                throw new \InvalidArgumentException(\sprintf('Route pattern "%s" cannot contain "_fragment" as a path parameter.', $route->getPath()));
             }
         }
 
@@ -107,10 +107,10 @@ class RouteCompiler implements RouteCompilerInterface
         $needsUtf8 = $route->getOption('utf8');
 
         if (!$needsUtf8 && $useUtf8 && preg_match('/[\x80-\xFF]/', $pattern)) {
-            throw new \LogicException(sprintf('Cannot use UTF-8 route patterns without setting the "utf8" option for route "%s".', $route->getPath()));
+            throw new \LogicException(\sprintf('Cannot use UTF-8 route patterns without setting the "utf8" option for route "%s".', $route->getPath()));
         }
         if (!$useUtf8 && $needsUtf8) {
-            throw new \LogicException(sprintf('Cannot mix UTF-8 requirements with non-UTF-8 pattern "%s".', $pattern));
+            throw new \LogicException(\sprintf('Cannot mix UTF-8 requirements with non-UTF-8 pattern "%s".', $pattern));
         }
 
         // Match all variables enclosed in "{}" and iterate over them. But we only want to match the innermost variable
@@ -136,14 +136,14 @@ class RouteCompiler implements RouteCompilerInterface
             // A PCRE subpattern name must start with a non-digit. Also a PHP variable cannot start with a digit so the
             // variable would not be usable as a Controller action argument.
             if (preg_match('/^\d/', $varName)) {
-                throw new \DomainException(sprintf('Variable name "%s" cannot start with a digit in route pattern "%s". Please use a different name.', $varName, $pattern));
+                throw new \DomainException(\sprintf('Variable name "%s" cannot start with a digit in route pattern "%s". Please use a different name.', $varName, $pattern));
             }
             if (\in_array($varName, $variables)) {
-                throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $pattern, $varName));
+                throw new \LogicException(\sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $pattern, $varName));
             }
 
             if (\strlen($varName) > self::VARIABLE_MAXIMUM_LENGTH) {
-                throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %d characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern));
+                throw new \DomainException(\sprintf('Variable name "%s" cannot be longer than %d characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern));
             }
 
             if ($isSeparator && $precedingText !== $precedingChar) {
@@ -163,7 +163,7 @@ class RouteCompiler implements RouteCompilerInterface
                 // Also even if {_format} was not optional the requirement prevents that {page} matches something that was originally
                 // part of {_format} when generating the URL, e.g. _format = 'mobile.html'.
                 $nextSeparator = self::findNextSeparator($followingPattern, $useUtf8);
-                $regexp = sprintf(
+                $regexp = \sprintf(
                     '[^%s%s]+',
                     preg_quote($defaultSeparator),
                     $defaultSeparator !== $nextSeparator && '' !== $nextSeparator ? preg_quote($nextSeparator) : ''
@@ -180,10 +180,10 @@ class RouteCompiler implements RouteCompilerInterface
                 if (!preg_match('//u', $regexp)) {
                     $useUtf8 = false;
                 } elseif (!$needsUtf8 && preg_match('/[\x80-\xFF]|(?<!\\\\)\\\\(?:\\\\\\\\)*+(?-i:X|[pP][\{CLMNPSZ]|x\{[A-Fa-f0-9]{3})/', $regexp)) {
-                    throw new \LogicException(sprintf('Cannot use UTF-8 route requirements without setting the "utf8" option for variable "%s" in pattern "%s".', $varName, $pattern));
+                    throw new \LogicException(\sprintf('Cannot use UTF-8 route requirements without setting the "utf8" option for variable "%s" in pattern "%s".', $varName, $pattern));
                 }
                 if (!$useUtf8 && $needsUtf8) {
-                    throw new \LogicException(sprintf('Cannot mix UTF-8 requirement with non-UTF-8 charset for variable "%s" in pattern "%s".', $varName, $pattern));
+                    throw new \LogicException(\sprintf('Cannot mix UTF-8 requirement with non-UTF-8 charset for variable "%s" in pattern "%s".', $varName, $pattern));
                 }
                 $regexp = self::transformCapturingGroupsToNonCapturings($regexp);
             }
@@ -296,9 +296,9 @@ class RouteCompiler implements RouteCompilerInterface
             // Variable tokens
             if (0 === $index && 0 === $firstOptional) {
                 // When the only token is an optional variable token, the separator is required
-                return sprintf('%s(?P<%s>%s)?', preg_quote($token[1]), $token[3], $token[2]);
+                return \sprintf('%s(?P<%s>%s)?', preg_quote($token[1]), $token[3], $token[2]);
             } else {
-                $regexp = sprintf('%s(?P<%s>%s)', preg_quote($token[1]), $token[3], $token[2]);
+                $regexp = \sprintf('%s(?P<%s>%s)', preg_quote($token[1]), $token[3], $token[2]);
                 if ($index >= $firstOptional) {
                     // Enclose each optional token in a subpattern to make it optional.
                     // "?:" means it is non-capturing, i.e. the portion of the subject string that
diff --git a/lib/symfony/routing/Router.php b/lib/symfony/routing/Router.php
index be3db21cc..95f6091d7 100644
--- a/lib/symfony/routing/Router.php
+++ b/lib/symfony/routing/Router.php
@@ -91,7 +91,7 @@ class Router implements RouterInterface, RequestMatcherInterface
 
     private static ?array $cache = [];
 
-    public function __construct(LoaderInterface $loader, mixed $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(LoaderInterface $loader, mixed $resource, array $options = [], ?RequestContext $context = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->loader = $loader;
         $this->resource = $resource;
@@ -144,7 +144,7 @@ class Router implements RouterInterface, RequestMatcherInterface
         }
 
         if ($invalid) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('", "', $invalid)));
+            throw new \InvalidArgumentException(\sprintf('The Router does not support the following options: "%s".', implode('", "', $invalid)));
         }
     }
 
@@ -158,7 +158,7 @@ class Router implements RouterInterface, RequestMatcherInterface
     public function setOption(string $key, mixed $value)
     {
         if (!\array_key_exists($key, $this->options)) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the "%s" option.', $key));
+            throw new \InvalidArgumentException(\sprintf('The Router does not support the "%s" option.', $key));
         }
 
         $this->options[$key] = $value;
@@ -172,7 +172,7 @@ class Router implements RouterInterface, RequestMatcherInterface
     public function getOption(string $key): mixed
     {
         if (!\array_key_exists($key, $this->options)) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the "%s" option.', $key));
+            throw new \InvalidArgumentException(\sprintf('The Router does not support the "%s" option.', $key));
         }
 
         return $this->options[$key];
@@ -272,6 +272,7 @@ class Router implements RouterInterface, RequestMatcherInterface
                 }
 
                 $cache->write($dumper->dump(), $this->getRouteCollection()->getResources());
+                unset(self::$cache[$cache->getPath()]);
             }
         );
 
@@ -301,6 +302,7 @@ class Router implements RouterInterface, RequestMatcherInterface
                     $dumper = $this->getGeneratorDumperInstance();
 
                     $cache->write($dumper->dump(), $this->getRouteCollection()->getResources());
+                    unset(self::$cache[$cache->getPath()]);
                 }
             );
 
diff --git a/lib/symfony/runtime/SymfonyRuntime.php b/lib/symfony/runtime/SymfonyRuntime.php
index ef8393620..a6e1cba73 100644
--- a/lib/symfony/runtime/SymfonyRuntime.php
+++ b/lib/symfony/runtime/SymfonyRuntime.php
@@ -70,6 +70,7 @@ class SymfonyRuntime extends GenericRuntime
     private readonly ConsoleOutput $output;
     private readonly Application $console;
     private readonly Command $command;
+    private readonly Request $request;
 
     /**
      * @param array {
@@ -131,7 +132,7 @@ class SymfonyRuntime extends GenericRuntime
     public function getRunner(?object $application): RunnerInterface
     {
         if ($application instanceof HttpKernelInterface) {
-            return new HttpKernelRunner($application, Request::createFromGlobals(), $this->options['debug'] ?? false);
+            return new HttpKernelRunner($application, $this->request ??= Request::createFromGlobals(), $this->options['debug'] ?? false);
         }
 
         if ($application instanceof Response) {
@@ -179,7 +180,7 @@ class SymfonyRuntime extends GenericRuntime
     protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         return match ($type) {
-            Request::class => Request::createFromGlobals(),
+            Request::class => $this->request ??= Request::createFromGlobals(),
             InputInterface::class => $this->getInput(),
             OutputInterface::class => $this->output ??= new ConsoleOutput(),
             Application::class => $this->console ??= new Application(),
diff --git a/lib/symfony/stopwatch/Section.php b/lib/symfony/stopwatch/Section.php
index 280036733..1fd2a8819 100644
--- a/lib/symfony/stopwatch/Section.php
+++ b/lib/symfony/stopwatch/Section.php
@@ -36,7 +36,7 @@ class Section
      * @param float|null $origin        Set the origin of the events in this section, use null to set their origin to their start time
      * @param bool       $morePrecision If true, time is stored as float to keep the original microsecond precision
      */
-    public function __construct(float $origin = null, bool $morePrecision = false)
+    public function __construct(?float $origin = null, bool $morePrecision = false)
     {
         $this->origin = $origin;
         $this->morePrecision = $morePrecision;
@@ -115,7 +115,7 @@ class Section
     public function stopEvent(string $name): StopwatchEvent
     {
         if (!isset($this->events[$name])) {
-            throw new \LogicException(sprintf('Event "%s" is not started.', $name));
+            throw new \LogicException(\sprintf('Event "%s" is not started.', $name));
         }
 
         return $this->events[$name]->stop();
@@ -139,7 +139,7 @@ class Section
     public function getEvent(string $name): StopwatchEvent
     {
         if (!isset($this->events[$name])) {
-            throw new \LogicException(sprintf('Event "%s" is not known.', $name));
+            throw new \LogicException(\sprintf('Event "%s" is not known.', $name));
         }
 
         return $this->events[$name];
diff --git a/lib/symfony/stopwatch/Stopwatch.php b/lib/symfony/stopwatch/Stopwatch.php
index 139d6651d..f3cfc6198 100644
--- a/lib/symfony/stopwatch/Stopwatch.php
+++ b/lib/symfony/stopwatch/Stopwatch.php
@@ -61,12 +61,12 @@ class Stopwatch implements ResetInterface
      *
      * @throws \LogicException When the section to re-open is not reachable
      */
-    public function openSection(string $id = null)
+    public function openSection(?string $id = null)
     {
         $current = end($this->activeSections);
 
         if (null !== $id && null === $current->get($id)) {
-            throw new \LogicException(sprintf('The section "%s" has been started at an other level and cannot be opened.', $id));
+            throw new \LogicException(\sprintf('The section "%s" has been started at an other level and cannot be opened.', $id));
         }
 
         $this->start('__section__.child', 'section');
@@ -100,7 +100,7 @@ class Stopwatch implements ResetInterface
     /**
      * Starts an event.
      */
-    public function start(string $name, string $category = null): StopwatchEvent
+    public function start(string $name, ?string $category = null): StopwatchEvent
     {
         return end($this->activeSections)->startEvent($name, $category);
     }
diff --git a/lib/symfony/stopwatch/StopwatchEvent.php b/lib/symfony/stopwatch/StopwatchEvent.php
index 3bca2fd61..c4c6c1e61 100644
--- a/lib/symfony/stopwatch/StopwatchEvent.php
+++ b/lib/symfony/stopwatch/StopwatchEvent.php
@@ -39,10 +39,8 @@ class StopwatchEvent
      * @param string|null $category      The event category or null to use the default
      * @param bool        $morePrecision If true, time is stored as float to keep the original microsecond precision
      * @param string|null $name          The event name or null to define the name as default
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
      */
-    public function __construct(float $origin, string $category = null, bool $morePrecision = false, string $name = null)
+    public function __construct(float $origin, ?string $category = null, bool $morePrecision = false, ?string $name = null)
     {
         $this->origin = $this->formatTime($origin);
         $this->category = \is_string($category) ? $category : 'default';
@@ -207,8 +205,6 @@ class StopwatchEvent
 
     /**
      * Formats a time.
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
      */
     private function formatTime(float $time): float
     {
@@ -225,6 +221,6 @@ class StopwatchEvent
 
     public function __toString(): string
     {
-        return sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());
+        return \sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());
     }
 }
diff --git a/lib/symfony/stopwatch/StopwatchPeriod.php b/lib/symfony/stopwatch/StopwatchPeriod.php
index 41e8dccb7..a9739b6a9 100644
--- a/lib/symfony/stopwatch/StopwatchPeriod.php
+++ b/lib/symfony/stopwatch/StopwatchPeriod.php
@@ -68,6 +68,6 @@ class StopwatchPeriod
 
     public function __toString(): string
     {
-        return sprintf('%.2F MiB - %d ms', $this->getMemory() / 1024 / 1024, $this->getDuration());
+        return \sprintf('%.2F MiB - %d ms', $this->getMemory() / 1024 / 1024, $this->getDuration());
     }
 }
diff --git a/lib/symfony/string/AbstractString.php b/lib/symfony/string/AbstractString.php
index 2190a29b1..45bcf0c03 100644
--- a/lib/symfony/string/AbstractString.php
+++ b/lib/symfony/string/AbstractString.php
@@ -263,7 +263,7 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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;
@@ -383,7 +383,7 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
         return '' === $this->string;
     }
 
-    abstract public function join(array $strings, string $lastGlue = null): static;
+    abstract public function join(array $strings, ?string $lastGlue = null): static;
 
     public function jsonSerialize(): string
     {
@@ -414,7 +414,7 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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;
@@ -429,16 +429,16 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
 
     abstract public function reverse(): static;
 
-    abstract public function slice(int $start = 0, int $length = null): static;
+    abstract public function slice(int $start = 0, ?int $length = null): static;
 
     abstract public function snake(): static;
 
-    abstract public function splice(string $replacement, int $start = 0, int $length = null): static;
+    abstract public function splice(string $replacement, int $start = 0, ?int $length = null): static;
 
     /**
      * @return static[]
      */
-    public function split(string $delimiter, int $limit = null, int $flags = null): array
+    public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array
     {
         if (null === $flags) {
             throw new \TypeError('Split behavior when $flags is null must be implemented by child classes.');
@@ -481,7 +481,7 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
     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) {
@@ -495,7 +495,7 @@ abstract class AbstractString implements \Stringable, \JsonSerializable
 
     abstract public function title(bool $allWords = false): static;
 
-    public function toByteString(string $toEncoding = null): ByteString
+    public function toByteString(?string $toEncoding = null): ByteString
     {
         $b = new ByteString();
 
diff --git a/lib/symfony/string/AbstractUnicodeString.php b/lib/symfony/string/AbstractUnicodeString.php
index df7265f3e..6ea79938f 100644
--- a/lib/symfony/string/AbstractUnicodeString.php
+++ b/lib/symfony/string/AbstractUnicodeString.php
@@ -124,7 +124,7 @@ abstract class AbstractUnicodeString extends AbstractString
                         }
 
                         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 @@ abstract class AbstractUnicodeString extends AbstractString
             } 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]);
+                $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));
-                    }
+                        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);
+                }
             }
         }
 
@@ -155,7 +161,7 @@ abstract class AbstractUnicodeString extends AbstractString
     public function camel(): static
     {
         $str = clone $this;
-        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) {
+        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?!\p{Lu})/u', static function ($m) {
             static $i = 0;
 
             return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
@@ -190,7 +196,7 @@ abstract class AbstractUnicodeString extends AbstractString
 
         if (!$compat || !\defined('Normalizer::NFKC_CF')) {
             $str->string = normalizer_normalize($str->string, $compat ? \Normalizer::NFKC : \Normalizer::NFC);
-            $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $this->string), 'UTF-8');
+            $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $str->string), 'UTF-8');
         } else {
             $str->string = normalizer_normalize($str->string, \Normalizer::NFKC_CF);
         }
@@ -198,7 +204,7 @@ abstract class AbstractUnicodeString extends AbstractString
         return $str;
     }
 
-    public function join(array $strings, string $lastGlue = null): static
+    public function join(array $strings, ?string $lastGlue = null): static
     {
         $str = clone $this;
 
diff --git a/lib/symfony/string/ByteString.php b/lib/symfony/string/ByteString.php
index f5050ddfb..e96a184ca 100644
--- a/lib/symfony/string/ByteString.php
+++ b/lib/symfony/string/ByteString.php
@@ -42,10 +42,10 @@ class ByteString extends AbstractString
      * Copyright (c) 2004-2020, Facebook, Inc. (https://www.facebook.com/)
      */
 
-    public static function fromRandom(int $length = 16, string $alphabet = null): self
+    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;
@@ -205,7 +205,7 @@ class ByteString extends AbstractString
         return '' === $this->string || preg_match('//u', $this->string);
     }
 
-    public function join(array $strings, string $lastGlue = null): static
+    public function join(array $strings, ?string $lastGlue = null): static
     {
         $str = clone $this;
 
@@ -332,7 +332,7 @@ class ByteString extends AbstractString
         return $str;
     }
 
-    public function slice(int $start = 0, int $length = null): 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);
@@ -348,7 +348,7 @@ class ByteString extends AbstractString
         return $str;
     }
 
-    public function splice(string $replacement, int $start = 0, int $length = null): static
+    public function splice(string $replacement, int $start = 0, ?int $length = null): static
     {
         $str = clone $this;
         $str->string = substr_replace($this->string, $replacement, $start, $length ?? \PHP_INT_MAX);
@@ -356,7 +356,7 @@ class ByteString extends AbstractString
         return $str;
     }
 
-    public function split(string $delimiter, int $limit = null, int $flags = null): array
+    public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array
     {
         if (1 > $limit ??= \PHP_INT_MAX) {
             throw new InvalidArgumentException('Split limit must be a positive integer.');
@@ -402,12 +402,12 @@ class ByteString extends AbstractString
         return $str;
     }
 
-    public function toUnicodeString(string $fromEncoding = null): UnicodeString
+    public function toUnicodeString(?string $fromEncoding = null): UnicodeString
     {
         return new UnicodeString($this->toCodePointString($fromEncoding)->string);
     }
 
-    public function toCodePointString(string $fromEncoding = null): CodePointString
+    public function toCodePointString(?string $fromEncoding = null): CodePointString
     {
         $u = new CodePointString();
 
@@ -436,7 +436,7 @@ class ByteString extends AbstractString
         }
 
         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/lib/symfony/string/CodePointString.php b/lib/symfony/string/CodePointString.php
index f5c900fb2..337bfc12a 100644
--- a/lib/symfony/string/CodePointString.php
+++ b/lib/symfony/string/CodePointString.php
@@ -186,7 +186,7 @@ class CodePointString extends AbstractUnicodeString
         return $str;
     }
 
-    public function slice(int $start = 0, int $length = null): static
+    public function slice(int $start = 0, ?int $length = null): static
     {
         $str = clone $this;
         $str->string = mb_substr($this->string, $start, $length, 'UTF-8');
@@ -194,7 +194,7 @@ class CodePointString extends AbstractUnicodeString
         return $str;
     }
 
-    public function splice(string $replacement, int $start = 0, int $length = null): static
+    public function splice(string $replacement, int $start = 0, ?int $length = null): static
     {
         if (!preg_match('//u', $replacement)) {
             throw new InvalidArgumentException('Invalid UTF-8 string.');
@@ -208,7 +208,7 @@ class CodePointString extends AbstractUnicodeString
         return $str;
     }
 
-    public function split(string $delimiter, int $limit = null, int $flags = null): array
+    public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array
     {
         if (1 > $limit ??= \PHP_INT_MAX) {
             throw new InvalidArgumentException('Split limit must be a positive integer.');
diff --git a/lib/symfony/string/Inflector/EnglishInflector.php b/lib/symfony/string/Inflector/EnglishInflector.php
index feea7f668..558366996 100644
--- a/lib/symfony/string/Inflector/EnglishInflector.php
+++ b/lib/symfony/string/Inflector/EnglishInflector.php
@@ -25,8 +25,48 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: singular suffix, normal
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['a', 1, true, true, ['on', 'um']],
+        // 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'],
+
+        // criteria (criterion)
+        ['airetirc', 8, true, true, 'criterion'],
+
+        // curricula (curriculum)
+        ['alucirruc', 9, true, true, 'curriculum'],
+
+        // quora (quorum)
+        ['arouq', 5, true, true, 'quorum'],
+
+        // genera (genus)
+        ['areneg', 6, true, true, 'genus'],
+
+        // media (medium)
+        ['aidem', 5, true, true, 'medium'],
+
+        // memoranda (memorandum)
+        ['adnaromem', 9, true, true, 'memorandum'],
+
+        // phenomena (phenomenon)
+        ['anemonehp', 9, true, true, 'phenomenon'],
+
+        // strata (stratum)
+        ['atarts', 6, true, true, 'stratum'],
 
         // nebulae (nebula)
         ['ea', 2, true, true, 'a'],
@@ -97,6 +137,9 @@ final class EnglishInflector implements InflectorInterface
         // statuses (status)
         ['sesutats', 8, true, true, 'status'],
 
+        // article (articles), ancle (ancles)
+        ['sel', 3, true, true, 'le'],
+
         // analyses (analysis), ellipses (ellipsis), fungi (fungus),
         // neuroses (neurosis), theses (thesis), emphases (emphasis),
         // oases (oasis), crises (crisis), houses (house), bases (base),
@@ -136,12 +179,15 @@ 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)
         ['se', 2, true, true, ['', 'e']],
 
-         // status (status)
+        // status (status)
         ['sutats', 6, true, true, 'status'],
 
         // tags (tag)
@@ -166,6 +212,18 @@ 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'],
+
         // criterion (criteria)
         ['airetirc', 8, false, false, 'criterion'],
 
@@ -235,7 +293,13 @@ final class EnglishInflector implements InflectorInterface
         // teeth (tooth)
         ['htoot', 5, true, true, 'teeth'],
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
+        // albums (album)
+        ['mubla', 5, true, true, 'albums'],
+
+        // quorums (quorum)
+        ['murouq', 6, true, true, ['quora', 'quorums']],
+
+        // bacteria (bacterium), curricula (curriculum), media (medium), memoranda (memorandum), phenomena (phenomenon), strata (stratum)
         ['mu', 2, true, true, 'a'],
 
         // men (man), women (woman)
@@ -244,20 +308,11 @@ final class EnglishInflector implements InflectorInterface
         // people (person)
         ['nosrep', 6, true, true, ['persons', 'people']],
 
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['noi', 3, true, true, 'ions'],
+        // criteria (criterion)
+        ['noiretirc', 9, true, true, 'criteria'],
 
-        // coupon (coupons)
-        ['nop', 3, true, true, 'pons'],
-
-        // seasons (season), treasons (treason), poisons (poison), lessons (lesson)
-        ['nos', 3, true, true, 'sons'],
-
-        // icons (icon)
-        ['noc', 3, true, true, 'cons'],
-
-        // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
-        ['no', 2, true, true, 'a'],
+        // phenomena (phenomenon)
+        ['nonemonehp', 10, true, true, 'phenomena'],
 
         // echoes (echo)
         ['ohce', 4, true, true, 'echoes'],
@@ -268,6 +323,9 @@ final class EnglishInflector implements InflectorInterface
         // atlases (atlas)
         ['salta', 5, true, true, 'atlases'],
 
+        // aliases (alias)
+        ['saila', 5, true, true, 'aliases'],
+
         // irises (iris)
         ['siri', 4, true, true, 'irises'],
 
@@ -288,12 +346,21 @@ final class EnglishInflector implements InflectorInterface
         // circuses (circus)
         ['suc', 3, true, true, 'cuses'],
 
+        // hippocampi (hippocampus)
+        ['supmacoppih', 11, false, false, 'hippocampi'],
+
+        // campuses (campus)
+        ['sup', 3, true, true, 'puses'],
+
         // status (status)
         ['sutats', 6, true, true, ['status', 'statuses']],
 
         // 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'],
 
@@ -315,14 +382,14 @@ final class EnglishInflector implements InflectorInterface
         // indices (index)
         ['xedni', 5, false, true, ['indicies', 'indexes']],
 
+        // fax (faxes, faxxes)
+        ['xaf', 3, true, true, ['faxes', 'faxxes']],
+
         // boxes (box)
         ['xo', 2, false, true, 'oxes'],
 
-        // indexes (index), matrixes (matrix)
-        ['x', 1, true, false, ['cies', 'xes']],
-
-        // appendices (appendix)
-        ['xi', 2, false, true, 'ices'],
+        // indexes (index), matrixes (matrix), appendices (appendix)
+        ['x', 1, true, false, ['ces', 'xes']],
 
         // babies (baby)
         ['y', 1, false, true, 'ies'],
@@ -384,6 +451,12 @@ final class EnglishInflector implements InflectorInterface
 
         // traffic
         'ciffart',
+
+        // aircraft
+        'tfarcria',
+
+        // hardware
+        'erawdrah',
     ];
 
     public function singularize(string $plural): array
diff --git a/lib/symfony/string/LazyString.php b/lib/symfony/string/LazyString.php
index 3128ebb36..b89ec4df1 100644
--- a/lib/symfony/string/LazyString.php
+++ b/lib/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();
@@ -39,7 +39,7 @@ class LazyString implements \Stringable, \JsonSerializable
                     $callback[1] ??= '__invoke';
                 }
                 $value = $callback(...$arguments);
-                $callback = self::getPrettyName($callback);
+                $callback = !\is_scalar($value) && !$value instanceof \Stringable ? self::getPrettyName($callback) : 'callable';
                 $arguments = null;
             }
 
@@ -94,7 +94,7 @@ class LazyString implements \Stringable, \JsonSerializable
                 $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;
@@ -129,7 +129,7 @@ class LazyString implements \Stringable, \JsonSerializable
         } elseif ($callback instanceof \Closure) {
             $r = new \ReflectionFunction($callback);
 
-            if (str_contains($r->name, '{closure}') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            if (str_contains($r->name, '{closure') || !$class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 return $r->name;
             }
 
diff --git a/lib/symfony/string/Resources/data/wcswidth_table_wide.php b/lib/symfony/string/Resources/data/wcswidth_table_wide.php
index 8314c8fd5..6a7509421 100644
--- a/lib/symfony/string/Resources/data/wcswidth_table_wide.php
+++ b/lib/symfony/string/Resources/data/wcswidth_table_wide.php
@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 15.1.0
- * Date: 2023-09-13T11:47:12+00:00
+ * Unicode version: 16.0.0
+ * Date: 2024-09-11T08:21:22+00:00
  */
 
 return [
@@ -44,6 +44,10 @@ return [
         9748,
         9749,
     ],
+    [
+        9776,
+        9783,
+    ],
     [
         9800,
         9811,
@@ -52,6 +56,10 @@ return [
         9855,
         9855,
     ],
+    [
+        9866,
+        9871,
+    ],
     [
         9875,
         9875,
@@ -394,7 +402,7 @@ return [
     ],
     [
         12736,
-        12771,
+        12773,
     ],
     [
         12783,
@@ -452,6 +460,10 @@ return [
         13312,
         19903,
     ],
+    [
+        19904,
+        19967,
+    ],
     [
         19968,
         40959,
@@ -836,6 +848,10 @@ return [
         101120,
         101589,
     ],
+    [
+        101631,
+        101631,
+    ],
     [
         101632,
         101640,
@@ -880,6 +896,14 @@ return [
         110960,
         111355,
     ],
+    [
+        119552,
+        119638,
+    ],
+    [
+        119648,
+        119670,
+    ],
     [
         126980,
         126980,
@@ -1054,23 +1078,19 @@ return [
     ],
     [
         129664,
-        129672,
+        129673,
     ],
     [
-        129680,
-        129725,
-    ],
-    [
-        129727,
-        129733,
+        129679,
+        129734,
     ],
     [
         129742,
-        129755,
+        129756,
     ],
     [
-        129760,
-        129768,
+        129759,
+        129769,
     ],
     [
         129776,
diff --git a/lib/symfony/string/Resources/data/wcswidth_table_zero.php b/lib/symfony/string/Resources/data/wcswidth_table_zero.php
index e5b26a215..fdd7f3c7e 100644
--- a/lib/symfony/string/Resources/data/wcswidth_table_zero.php
+++ b/lib/symfony/string/Resources/data/wcswidth_table_zero.php
@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 15.1.0
- * Date: 2023-09-13T11:47:13+00:00
+ * Unicode version: 16.0.0
+ * Date: 2024-09-11T08:21:22+00:00
  */
 
 return [
@@ -109,7 +109,7 @@ return [
         2139,
     ],
     [
-        2200,
+        2199,
         2207,
     ],
     [
@@ -916,12 +916,16 @@ return [
         68900,
         68903,
     ],
+    [
+        68969,
+        68973,
+    ],
     [
         69291,
         69292,
     ],
     [
-        69373,
+        69372,
         69375,
     ],
     [
@@ -1044,6 +1048,26 @@ return [
         70512,
         70516,
     ],
+    [
+        70587,
+        70592,
+    ],
+    [
+        70606,
+        70606,
+    ],
+    [
+        70608,
+        70608,
+    ],
+    [
+        70610,
+        70610,
+    ],
+    [
+        70625,
+        70626,
+    ],
     [
         70712,
         70719,
@@ -1122,6 +1146,10 @@ return [
     ],
     [
         71453,
+        71453,
+    ],
+    [
+        71455,
         71455,
     ],
     [
@@ -1276,6 +1304,10 @@ return [
         73538,
         73538,
     ],
+    [
+        73562,
+        73562,
+    ],
     [
         78912,
         78912,
@@ -1284,6 +1316,14 @@ return [
         78919,
         78933,
     ],
+    [
+        90398,
+        90409,
+    ],
+    [
+        90413,
+        90415,
+    ],
     [
         92912,
         92916,
@@ -1400,6 +1440,10 @@ return [
         124140,
         124143,
     ],
+    [
+        124398,
+        124399,
+    ],
     [
         125136,
         125142,
diff --git a/lib/symfony/string/Slugger/AsciiSlugger.php b/lib/symfony/string/Slugger/AsciiSlugger.php
index 6e550c61c..d4d4e942a 100644
--- a/lib/symfony/string/Slugger/AsciiSlugger.php
+++ b/lib/symfony/string/Slugger/AsciiSlugger.php
@@ -68,7 +68,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
      */
     private array $transliterators = [];
 
-    public function __construct(string $defaultLocale = null, array|\Closure $symbolsMap = null)
+    public function __construct(?string $defaultLocale = null, array|\Closure|null $symbolsMap = null)
     {
         $this->defaultLocale = $defaultLocale;
         $this->symbolsMap = $symbolsMap ?? $this->symbolsMap;
@@ -95,7 +95,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
     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/intl" package is not installed. Try running "composer require symfony/intl".', __METHOD__));
         }
 
         $new = clone $this;
@@ -104,7 +104,7 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
         return $new;
     }
 
-    public function slug(string $string, string $separator = '-', string $locale = null): AbstractUnicodeString
+    public function slug(string $string, string $separator = '-', ?string $locale = null): AbstractUnicodeString
     {
         $locale ??= $this->defaultLocale;
 
@@ -131,8 +131,8 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
 
         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/lib/symfony/string/Slugger/SluggerInterface.php b/lib/symfony/string/Slugger/SluggerInterface.php
index c679ed933..dd0d58102 100644
--- a/lib/symfony/string/Slugger/SluggerInterface.php
+++ b/lib/symfony/string/Slugger/SluggerInterface.php
@@ -23,5 +23,5 @@ interface SluggerInterface
     /**
      * Creates a slug for the given string and locale, using appropriate transliteration when needed.
      */
-    public function slug(string $string, string $separator = '-', string $locale = null): AbstractUnicodeString;
+    public function slug(string $string, string $separator = '-', ?string $locale = null): AbstractUnicodeString;
 }
diff --git a/lib/symfony/string/UnicodeString.php b/lib/symfony/string/UnicodeString.php
index b33e37b71..f416ee1b2 100644
--- a/lib/symfony/string/UnicodeString.php
+++ b/lib/symfony/string/UnicodeString.php
@@ -185,7 +185,7 @@ class UnicodeString extends AbstractUnicodeString
         return false === $i ? null : $i;
     }
 
-    public function join(array $strings, string $lastGlue = null): static
+    public function join(array $strings, ?string $lastGlue = null): static
     {
         $str = parent::join($strings, $lastGlue);
         normalizer_is_normalized($str->string) ?: $str->string = normalizer_normalize($str->string);
@@ -272,7 +272,7 @@ class UnicodeString extends AbstractUnicodeString
         return $str;
     }
 
-    public function slice(int $start = 0, int $length = null): static
+    public function slice(int $start = 0, ?int $length = null): static
     {
         $str = clone $this;
 
@@ -281,7 +281,7 @@ class UnicodeString extends AbstractUnicodeString
         return $str;
     }
 
-    public function splice(string $replacement, int $start = 0, int $length = null): static
+    public function splice(string $replacement, int $start = 0, ?int $length = null): static
     {
         $str = clone $this;
 
@@ -302,7 +302,7 @@ class UnicodeString extends AbstractUnicodeString
         return $str;
     }
 
-    public function split(string $delimiter, int $limit = null, int $flags = null): array
+    public function split(string $delimiter, ?int $limit = null, ?int $flags = null): array
     {
         if (1 > $limit ??= 2147483647) {
             throw new InvalidArgumentException('Split limit must be a positive integer.');
@@ -362,6 +362,44 @@ class UnicodeString extends AbstractUnicodeString
         return $prefix === grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES);
     }
 
+    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);
+    }
+
     /**
      * @return void
      */
diff --git a/lib/symfony/string/composer.json b/lib/symfony/string/composer.json
index 56c136882..1a2b41ec6 100644
--- a/lib/symfony/string/composer.json
+++ b/lib/symfony/string/composer.json
@@ -23,9 +23,8 @@
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "symfony/error-handler": "^5.4|^6.0|^7.0",
-        "symfony/intl": "^6.2|^7.0",
         "symfony/http-client": "^5.4|^6.0|^7.0",
+        "symfony/intl": "^6.2|^7.0",
         "symfony/translation-contracts": "^2.5|^3.0",
         "symfony/var-exporter": "^5.4|^6.0|^7.0"
     },
diff --git a/lib/symfony/translation-contracts/TranslatableInterface.php b/lib/symfony/translation-contracts/TranslatableInterface.php
index 47fd6fa02..8554697ec 100644
--- a/lib/symfony/translation-contracts/TranslatableInterface.php
+++ b/lib/symfony/translation-contracts/TranslatableInterface.php
@@ -16,5 +16,5 @@ namespace Symfony\Contracts\Translation;
  */
 interface TranslatableInterface
 {
-    public function trans(TranslatorInterface $translator, string $locale = null): string;
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string;
 }
diff --git a/lib/symfony/translation-contracts/TranslatorInterface.php b/lib/symfony/translation-contracts/TranslatorInterface.php
index 018db07eb..7fa69878f 100644
--- a/lib/symfony/translation-contracts/TranslatorInterface.php
+++ b/lib/symfony/translation-contracts/TranslatorInterface.php
@@ -59,7 +59,7 @@ interface TranslatorInterface
      *
      * @throws \InvalidArgumentException If the locale contains invalid characters
      */
-    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string;
+    public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string;
 
     /**
      * Returns the default locale.
diff --git a/lib/symfony/translation-contracts/TranslatorTrait.php b/lib/symfony/translation-contracts/TranslatorTrait.php
index e3b0adff0..afedd9928 100644
--- a/lib/symfony/translation-contracts/TranslatorTrait.php
+++ b/lib/symfony/translation-contracts/TranslatorTrait.php
@@ -35,12 +35,18 @@ trait TranslatorTrait
         return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
     }
 
-    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
+    public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
     {
         if (null === $id || '' === $id) {
             return '';
         }
 
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($this, $locale);
+            }
+        }
+
         if (!isset($parameters['%count%']) || !is_numeric($parameters['%count%'])) {
             return strtr($id, $parameters);
         }
@@ -111,7 +117,7 @@ EOF;
                 return strtr($standardRules[0], $parameters);
             }
 
-            $message = sprintf('Unable to choose a translation for "%s" with locale "%s" for value "%d". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").', $id, $locale, $number);
+            $message = \sprintf('Unable to choose a translation for "%s" with locale "%s" for value "%d". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").', $id, $locale, $number);
 
             if (class_exists(InvalidArgumentException::class)) {
                 throw new InvalidArgumentException($message);
diff --git a/lib/symfony/translation-contracts/composer.json b/lib/symfony/translation-contracts/composer.json
index 213b5cda8..b7220b84c 100644
--- a/lib/symfony/translation-contracts/composer.json
+++ b/lib/symfony/translation-contracts/composer.json
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.4-dev"
+            "dev-main": "3.6-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/lib/symfony/twig-bridge/AppVariable.php b/lib/symfony/twig-bridge/AppVariable.php
index ea178a27f..6a85421f0 100644
--- a/lib/symfony/twig-bridge/AppVariable.php
+++ b/lib/symfony/twig-bridge/AppVariable.php
@@ -176,7 +176,7 @@ class AppVariable
      *  * getFlashes('notice') returns a simple array with flash messages of that type
      *  * getFlashes(['notice', 'error']) returns a nested array of type => messages.
      */
-    public function getFlashes(string|array $types = null): array
+    public function getFlashes(string|array|null $types = null): array
     {
         try {
             if (null === $session = $this->getSession()) {
diff --git a/lib/symfony/twig-bridge/Command/DebugCommand.php b/lib/symfony/twig-bridge/Command/DebugCommand.php
index 31edd0a5b..493f063ef 100644
--- a/lib/symfony/twig-bridge/Command/DebugCommand.php
+++ b/lib/symfony/twig-bridge/Command/DebugCommand.php
@@ -48,7 +48,7 @@ class DebugCommand extends Command
 
     private ?FileLinkFormatter $fileLinkFormatter;
 
-    public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, FileLinkFormatter $fileLinkFormatter = null)
+    public function __construct(Environment $twig, ?string $projectDir = null, array $bundlesMetadata = [], ?string $twigDefaultPath = null, ?FileLinkFormatter $fileLinkFormatter = null)
     {
         parent::__construct();
 
@@ -68,7 +68,7 @@ class DebugCommand extends Command
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The template name'),
                 new InputOption('filter', null, InputOption::VALUE_REQUIRED, 'Show details for all entries matching this filter'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'text'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'text'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command outputs a list of twig functions,
@@ -101,13 +101,13 @@ EOF
         $filter = $input->getOption('filter');
 
         if (null !== $name && [] === $this->getFilesystemLoaders()) {
-            throw new InvalidArgumentException(sprintf('Argument "name" not supported, it requires the Twig loader "%s".', FilesystemLoader::class));
+            throw new InvalidArgumentException(\sprintf('Argument "name" not supported, it requires the Twig loader "%s".', FilesystemLoader::class));
         }
 
         match ($input->getOption('format')) {
             'text' => $name ? $this->displayPathsText($io, $name) : $this->displayGeneralText($io, $filter),
             'json' => $name ? $this->displayPathsJson($io, $name) : $this->displayGeneralJson($io, $filter),
-            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+            default => throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
 
         return 0;
@@ -132,7 +132,7 @@ EOF
         $io->section('Matched File');
         if ($file->valid()) {
             if ($fileLink = $this->getFileLink($file->key())) {
-                $io->block($file->current(), 'OK', sprintf('fg=black;bg=green;href=%s', $fileLink), ' ', true);
+                $io->block($file->current(), 'OK', \sprintf('fg=black;bg=green;href=%s', $fileLink), ' ', true);
             } else {
                 $io->success($file->current());
             }
@@ -142,9 +142,9 @@ EOF
                 $io->section('Overridden Files');
                 do {
                     if ($fileLink = $this->getFileLink($file->key())) {
-                        $io->text(sprintf('* <href=%s>%s</>', $fileLink, $file->current()));
+                        $io->text(\sprintf('* <href=%s>%s</>', $fileLink, $file->current()));
                     } else {
-                        $io->text(sprintf('* %s', $file->current()));
+                        $io->text(\sprintf('* %s', $file->current()));
                     }
                     $file->next();
                 } while ($file->valid());
@@ -169,7 +169,7 @@ EOF
                 }
             }
 
-            $this->error($io, sprintf('Template name "%s" not found', $name), $alternatives);
+            $this->error($io, \sprintf('Template name "%s" not found', $name), $alternatives);
         }
 
         $io->section('Configured Paths');
@@ -182,7 +182,7 @@ EOF
             if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {
                 $message = 'No template paths configured for your application';
             } else {
-                $message = sprintf('No template paths configured for "@%s" namespace', $namespace);
+                $message = \sprintf('No template paths configured for "@%s" namespace', $namespace);
                 foreach ($this->getFilesystemLoaders() as $loader) {
                     $namespaces = $loader->getNamespaces();
                     foreach ($this->findAlternatives($namespace, $namespaces) as $namespace) {
@@ -210,14 +210,14 @@ EOF
                 $data['overridden_files'] = $files;
             }
         } else {
-            $data['matched_file'] = sprintf('Template name "%s" not found', $name);
+            $data['matched_file'] = \sprintf('Template name "%s" not found', $name);
         }
         $data['loader_paths'] = $paths;
 
         $io->writeln(json_encode($data));
     }
 
-    private function displayGeneralText(SymfonyStyle $io, string $filter = null): void
+    private function displayGeneralText(SymfonyStyle $io, ?string $filter = null): void
     {
         $decorated = $io->isDecorated();
         $types = ['functions', 'filters', 'tests', 'globals'];
@@ -279,7 +279,7 @@ EOF
         $io->writeln($decorated ? OutputFormatter::escape($data) : $data);
     }
 
-    private function getLoaderPaths(string $name = null): array
+    private function getLoaderPaths(?string $name = null): array
     {
         $loaderPaths = [];
         foreach ($this->getFilesystemLoaders() as $loader) {
@@ -375,7 +375,7 @@ EOF
                 return '(unknown?)';
             }
         } catch (\UnexpectedValueException $e) {
-            return sprintf(' <error>%s</error>', $decorated ? OutputFormatter::escape($e->getMessage()) : $e->getMessage());
+            return \sprintf(' <error>%s</error>', $decorated ? OutputFormatter::escape($e->getMessage()) : $e->getMessage());
         }
 
         if ('globals' === $type) {
@@ -385,7 +385,7 @@ EOF
 
             $description = substr(@json_encode($meta), 0, 50);
 
-            return sprintf(' = %s', $decorated ? OutputFormatter::escape($description) : $description);
+            return \sprintf(' = %s', $decorated ? OutputFormatter::escape($description) : $description);
         }
 
         if ('functions' === $type) {
@@ -432,14 +432,14 @@ EOF
     {
         $messages = [];
         foreach ($wrongBundles as $path => $alternatives) {
-            $message = sprintf('Path "%s" not matching any bundle found', $path);
+            $message = \sprintf('Path "%s" not matching any bundle found', $path);
             if ($alternatives) {
                 if (1 === \count($alternatives)) {
-                    $message .= sprintf(", did you mean \"%s\"?\n", $alternatives[0]);
+                    $message .= \sprintf(", did you mean \"%s\"?\n", $alternatives[0]);
                 } else {
                     $message .= ", did you mean one of these:\n";
                     foreach ($alternatives as $bundle) {
-                        $message .= sprintf("  - %s\n", $bundle);
+                        $message .= \sprintf("  - %s\n", $bundle);
                     }
                 }
             }
@@ -492,7 +492,7 @@ EOF
     {
         if (isset($name[0]) && '@' === $name[0]) {
             if (false === ($pos = strpos($name, '/')) || $pos === \strlen($name) - 1) {
-                throw new InvalidArgumentException(sprintf('Malformed namespaced template name "%s" (expecting "@namespace/template_name").', $name));
+                throw new InvalidArgumentException(\sprintf('Malformed namespaced template name "%s" (expecting "@namespace/template_name").', $name));
             }
 
             $namespace = substr($name, 1, $pos - 1);
@@ -561,7 +561,7 @@ EOF
 
     private function isAbsolutePath(string $file): bool
     {
-        return strspn($file, '/\\', 0, 1) || (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && strspn($file, '/\\', 2, 1)) || null !== parse_url($file, \PHP_URL_SCHEME);
+        return strspn($file, '/\\', 0, 1) || (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && strspn($file, '/\\', 2, 1)) || parse_url($file, \PHP_URL_SCHEME);
     }
 
     /**
diff --git a/lib/symfony/twig-bridge/Command/LintCommand.php b/lib/symfony/twig-bridge/Command/LintCommand.php
index e059740a1..4dd6a22bc 100644
--- a/lib/symfony/twig-bridge/Command/LintCommand.php
+++ b/lib/symfony/twig-bridge/Command/LintCommand.php
@@ -54,7 +54,7 @@ class LintCommand extends Command
     protected function configure()
     {
         $this
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
             ->addOption('show-deprecations', null, InputOption::VALUE_NONE, 'Show deprecations as errors')
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
             ->setHelp(<<<'EOF'
@@ -151,7 +151,7 @@ EOF
             return Finder::create()->files()->in($filename)->name($this->namePatterns);
         }
 
-        throw new RuntimeException(sprintf('File or directory "%s" is not readable.', $filename));
+        throw new RuntimeException(\sprintf('File or directory "%s" is not readable.', $filename));
     }
 
     private function validate(string $template, string $file): array
@@ -178,7 +178,7 @@ EOF
             'txt' => $this->displayTxt($output, $io, $files),
             'json' => $this->displayJson($output, $files),
             'github' => $this->displayTxt($output, $io, $files, true),
-            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+            default => throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -189,7 +189,7 @@ EOF
 
         foreach ($filesInfo as $info) {
             if ($info['valid'] && $output->isVerbose()) {
-                $io->comment('<info>OK</info>'.($info['file'] ? sprintf(' in %s', $info['file']) : ''));
+                $io->comment('<info>OK</info>'.($info['file'] ? \sprintf(' in %s', $info['file']) : ''));
             } elseif (!$info['valid']) {
                 ++$errors;
                 $this->renderException($io, $info['template'], $info['exception'], $info['file'], $githubReporter);
@@ -197,9 +197,9 @@ EOF
         }
 
         if (0 === $errors) {
-            $io->success(sprintf('All %d Twig files contain valid syntax.', \count($filesInfo)));
+            $io->success(\sprintf('All %d Twig files contain valid syntax.', \count($filesInfo)));
         } else {
-            $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));
+            $io->warning(\sprintf('%d Twig files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));
         }
 
         return min($errors, 1);
@@ -224,35 +224,35 @@ EOF
         return min($errors, 1);
     }
 
-    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null): void
+    private function renderException(SymfonyStyle $output, string $template, Error $exception, ?string $file = null, ?GithubActionReporter $githubReporter = null): void
     {
         $line = $exception->getTemplateLine();
 
         $githubReporter?->error($exception->getRawMessage(), $file, $line <= 0 ? null : $line);
 
         if ($file) {
-            $output->text(sprintf('<error> ERROR </error> in %s (line %s)', $file, $line));
+            $output->text(\sprintf('<error> ERROR </error> in %s (line %s)', $file, $line));
         } else {
-            $output->text(sprintf('<error> ERROR </error> (line %s)', $line));
+            $output->text(\sprintf('<error> ERROR </error> (line %s)', $line));
         }
 
         // If the line is not known (this might happen for deprecations if we fail at detecting the line for instance),
         // we render the message without context, to ensure the message is displayed.
         if ($line <= 0) {
-            $output->text(sprintf('<error> >> %s</error> ', $exception->getRawMessage()));
+            $output->text(\sprintf('<error> >> %s</error> ', $exception->getRawMessage()));
 
             return;
         }
 
         foreach ($this->getContext($template, $line) as $lineNumber => $code) {
-            $output->text(sprintf(
+            $output->text(\sprintf(
                 '%s %-6s %s',
                 $lineNumber === $line ? '<error> >> </error>' : '    ',
                 $lineNumber,
                 $code
             ));
             if ($lineNumber === $line) {
-                $output->text(sprintf('<error> >> %s</error> ', $exception->getRawMessage()));
+                $output->text(\sprintf('<error> >> %s</error> ', $exception->getRawMessage()));
             }
         }
     }
diff --git a/lib/symfony/twig-bridge/DataCollector/TwigDataCollector.php b/lib/symfony/twig-bridge/DataCollector/TwigDataCollector.php
index e25158af2..592cc0647 100644
--- a/lib/symfony/twig-bridge/DataCollector/TwigDataCollector.php
+++ b/lib/symfony/twig-bridge/DataCollector/TwigDataCollector.php
@@ -32,13 +32,13 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf
     private ?Environment $twig;
     private array $computed;
 
-    public function __construct(Profile $profile, Environment $twig = null)
+    public function __construct(Profile $profile, ?Environment $twig = null)
     {
         $this->profile = $profile;
         $this->twig = $twig;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
     }
 
diff --git a/lib/symfony/twig-bridge/ErrorRenderer/TwigErrorRenderer.php b/lib/symfony/twig-bridge/ErrorRenderer/TwigErrorRenderer.php
index 9086c22d5..9bf6d44ee 100644
--- a/lib/symfony/twig-bridge/ErrorRenderer/TwigErrorRenderer.php
+++ b/lib/symfony/twig-bridge/ErrorRenderer/TwigErrorRenderer.php
@@ -32,7 +32,7 @@ class TwigErrorRenderer implements ErrorRendererInterface
     /**
      * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
      */
-    public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
+    public function __construct(Environment $twig, ?HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
     {
         $this->twig = $twig;
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
@@ -68,7 +68,7 @@ class TwigErrorRenderer implements ErrorRendererInterface
 
     private function findTemplate(int $statusCode): ?string
     {
-        $template = sprintf('@Twig/Exception/error%s.html.twig', $statusCode);
+        $template = \sprintf('@Twig/Exception/error%s.html.twig', $statusCode);
         if ($this->twig->getLoader()->exists($template)) {
             return $template;
         }
diff --git a/lib/symfony/twig-bridge/Extension/AssetExtension.php b/lib/symfony/twig-bridge/Extension/AssetExtension.php
index feb25ed5c..7a7aba0d6 100644
--- a/lib/symfony/twig-bridge/Extension/AssetExtension.php
+++ b/lib/symfony/twig-bridge/Extension/AssetExtension.php
@@ -43,7 +43,7 @@ final class AssetExtension extends AbstractExtension
      * If the package used to generate the path is an instance of
      * UrlPackage, you will always get a URL and not a path.
      */
-    public function getAssetUrl(string $path, string $packageName = null): string
+    public function getAssetUrl(string $path, ?string $packageName = null): string
     {
         return $this->packages->getUrl($path, $packageName);
     }
@@ -51,7 +51,7 @@ final class AssetExtension extends AbstractExtension
     /**
      * Returns the version of an asset.
      */
-    public function getAssetVersion(string $path, string $packageName = null): string
+    public function getAssetVersion(string $path, ?string $packageName = null): string
     {
         return $this->packages->getVersion($path, $packageName);
     }
diff --git a/lib/symfony/twig-bridge/Extension/CodeExtension.php b/lib/symfony/twig-bridge/Extension/CodeExtension.php
index cdeb69a5a..e0e6c8b8d 100644
--- a/lib/symfony/twig-bridge/Extension/CodeExtension.php
+++ b/lib/symfony/twig-bridge/Extension/CodeExtension.php
@@ -59,18 +59,18 @@ final class CodeExtension extends AbstractExtension
         $parts = explode('\\', $class);
         $short = array_pop($parts);
 
-        return sprintf('<abbr title="%s">%s</abbr>', $class, $short);
+        return \sprintf('<abbr title="%s">%s</abbr>', $class, $short);
     }
 
     public function abbrMethod(string $method): string
     {
         if (str_contains($method, '::')) {
             [$class, $method] = explode('::', $method, 2);
-            $result = sprintf('%s::%s()', $this->abbrClass($class), $method);
+            $result = \sprintf('%s::%s()', $this->abbrClass($class), $method);
         } elseif ('Closure' === $method) {
-            $result = sprintf('<abbr title="%s">%1$s</abbr>', $method);
+            $result = \sprintf('<abbr title="%s">%1$s</abbr>', $method);
         } else {
-            $result = sprintf('<abbr title="%s">%1$s</abbr>()', $method);
+            $result = \sprintf('<abbr title="%s">%1$s</abbr>()', $method);
         }
 
         return $result;
@@ -87,20 +87,22 @@ final class CodeExtension extends AbstractExtension
                 $item[1] = htmlspecialchars($item[1], \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
                 $parts = explode('\\', $item[1]);
                 $short = array_pop($parts);
-                $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
+                $formattedValue = \sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
+                $formattedValue = \sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';
             } elseif ('boolean' === $item[0]) {
                 $formattedValue = '<em>'.strtolower(htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)).'</em>';
             } elseif ('resource' === $item[0]) {
                 $formattedValue = '<em>resource</em>';
+            } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {
+                $formattedValue = '<em>binary string</em>';
             } else {
                 $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset));
             }
 
-            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $formattedValue);
+            $result[] = \is_int($key) ? $formattedValue : \sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $formattedValue);
         }
 
         return implode(', ', $result);
@@ -119,52 +121,98 @@ final class CodeExtension extends AbstractExtension
      */
     public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?string
     {
-        if (is_file($file) && is_readable($file)) {
-            // highlight_file could throw warnings
-            // see https://bugs.php.net/25725
-            $code = @highlight_file($file, true);
-            if (\PHP_VERSION_ID >= 80300) {
-                // remove main pre/code tags
-                $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
-                // split multiline code tags
-                $code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn ($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
-                // Convert spaces to html entities to preserve indentation when rendered
-                $code = str_replace(' ', '&nbsp;', $code);
-                $content = explode("\n", $code);
-            } else {
-                // remove main code/span tags
-                $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
-                // split multiline spans
-                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn ($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
-                $content = explode('<br />', $code);
-            }
-
-            $lines = [];
-            if (0 > $srcContext) {
-                $srcContext = \count($content);
-            }
-
-            for ($i = max($line - $srcContext, 1), $max = min($line + $srcContext, \count($content)); $i <= $max; ++$i) {
-                $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><a class="anchor" id="line'.$i.'"></a><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
-            }
-
-            return '<ol start="'.max($line - $srcContext, 1).'">'.implode("\n", $lines).'</ol>';
+        if (!is_file($file) || !is_readable($file)) {
+            return null;
         }
 
-        return null;
+        $contents = file_get_contents($file);
+
+        if (!str_contains($contents, '<?php') && !str_contains($contents, '<?=')) {
+            $lines = explode("\n", $contents);
+
+            if (0 > $srcContext) {
+                $srcContext = \count($lines);
+            }
+
+            return $this->formatFileExcerpt(
+                $this->extractExcerptLines($lines, $line, $srcContext),
+                $line,
+                $srcContext
+            );
+        }
+
+        // highlight_string could throw warnings
+        // see https://bugs.php.net/25725
+        $code = @highlight_string($contents, true);
+
+        if (\PHP_VERSION_ID >= 80300) {
+            // remove main pre/code tags
+            $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
+            // split multiline span tags
+            $code = preg_replace_callback(
+                '#<span ([^>]++)>((?:[^<\\n]*+\\n)++[^<]*+)</span>#',
+                static fn (array $m): string => "<span $m[1]>".str_replace("\n", "</span>\n<span $m[1]>", $m[2]).'</span>',
+                $code
+            );
+            $lines = explode("\n", $code);
+        } else {
+            // remove main code/span tags
+            $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
+            // split multiline spans
+            $code = preg_replace_callback(
+                '#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#',
+                static fn (array $m): string => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>',
+                $code
+            );
+            $lines = explode('<br />', $code);
+        }
+
+        if (0 > $srcContext) {
+            $srcContext = \count($lines);
+        }
+
+        return $this->formatFileExcerpt(
+            array_map(
+                self::fixCodeMarkup(...),
+                $this->extractExcerptLines($lines, $line, $srcContext),
+            ),
+            $line,
+            $srcContext
+        );
+    }
+
+    private function extractExcerptLines(array $lines, int $selectedLine, int $srcContext): array
+    {
+        return \array_slice(
+            $lines,
+            max($selectedLine - $srcContext, 0),
+            min($srcContext * 2 + 1, \count($lines) - $selectedLine + $srcContext),
+            true
+        );
+    }
+
+    private function formatFileExcerpt(array $lines, int $selectedLine, int $srcContext): string
+    {
+        $start = max($selectedLine - $srcContext, 1);
+
+        return "<ol start=\"{$start}\">".implode("\n", array_map(
+            static fn (string $line, int $num): string => '<li'.(++$num === $selectedLine ? ' class="selected"' : '')."><a class=\"anchor\" id=\"line{$num}\"></a><code>{$line}</code></li>",
+            $lines,
+            array_keys($lines),
+        )).'</ol>';
     }
 
     /**
      * Formats a file path.
      */
-    public function formatFile(string $file, int $line, string $text = null): string
+    public function formatFile(string $file, int $line, ?string $text = null): string
     {
         $file = trim($file);
 
         if (null === $text) {
             if (null !== $rel = $this->getFileRelative($file)) {
                 $rel = explode('/', htmlspecialchars($rel, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), 2);
-                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', htmlspecialchars($this->projectDir, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $rel[0], '/'.($rel[1] ?? ''));
+                $text = \sprintf('<abbr title="%s%2$s">%s</abbr>%s', htmlspecialchars($this->projectDir, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $rel[0], '/'.($rel[1] ?? ''));
             } else {
                 $text = htmlspecialchars($file, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
             }
@@ -177,7 +225,7 @@ final class CodeExtension extends AbstractExtension
         }
 
         if (false !== $link = $this->getFileLink($file, $line)) {
-            return sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', htmlspecialchars($link, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $text);
+            return \sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', htmlspecialchars($link, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $text);
         }
 
         return $text;
@@ -241,7 +289,7 @@ final class CodeExtension extends AbstractExtension
         // missing </span> tag at the end of line
         $opening = strpos($line, '<span');
         $closing = strpos($line, '</span>');
-        if (false !== $opening && (false === $closing || $closing > $opening)) {
+        if (false !== $opening && (false === $closing || $closing < $opening)) {
             $line .= '</span>';
         }
 
diff --git a/lib/symfony/twig-bridge/Extension/DumpExtension.php b/lib/symfony/twig-bridge/Extension/DumpExtension.php
index c84e1e751..1bf2beeed 100644
--- a/lib/symfony/twig-bridge/Extension/DumpExtension.php
+++ b/lib/symfony/twig-bridge/Extension/DumpExtension.php
@@ -29,7 +29,7 @@ final class DumpExtension extends AbstractExtension
     private ClonerInterface $cloner;
     private ?HtmlDumper $dumper;
 
-    public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
+    public function __construct(ClonerInterface $cloner, ?HtmlDumper $dumper = null)
     {
         $this->cloner = $cloner;
         $this->dumper = $dumper;
diff --git a/lib/symfony/twig-bridge/Extension/FormExtension.php b/lib/symfony/twig-bridge/Extension/FormExtension.php
index 827145963..e1abdca7e 100644
--- a/lib/symfony/twig-bridge/Extension/FormExtension.php
+++ b/lib/symfony/twig-bridge/Extension/FormExtension.php
@@ -19,6 +19,7 @@ use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
+use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
@@ -35,7 +36,7 @@ final class FormExtension extends AbstractExtension
 {
     private ?TranslatorInterface $translator;
 
-    public function __construct(TranslatorInterface $translator = null)
+    public function __construct(?TranslatorInterface $translator = null)
     {
         $this->translator = $translator;
     }
@@ -149,23 +150,26 @@ final class FormExtension extends AbstractExtension
     private function createFieldChoicesList(iterable $choices, string|false|null $translationDomain): iterable
     {
         foreach ($choices as $choice) {
-            $translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);
-
             if ($choice instanceof ChoiceGroupView) {
+                $translatableLabel = $this->createFieldTranslation($choice->label, [], $translationDomain);
                 yield $translatableLabel => $this->createFieldChoicesList($choice, $translationDomain);
 
                 continue;
             }
 
-            /* @var ChoiceView $choice */
+            /** @var ChoiceView $choice */
+            $translatableLabel = $this->createFieldTranslation($choice->label, $choice->labelTranslationParameters, $translationDomain);
             yield $translatableLabel => $choice->value;
         }
     }
 
-    private function createFieldTranslation(?string $value, array $parameters, string|false|null $domain): ?string
+    private function createFieldTranslation(TranslatableInterface|string|null $value, array $parameters, string|false|null $domain): ?string
     {
         if (!$this->translator || !$value || false === $domain) {
-            return $value;
+            return null !== $value ? (string) $value : null;
+        }
+        if ($value instanceof TranslatableInterface) {
+            return $value->trans($this->translator);
         }
 
         return $this->translator->trans($value, $parameters, $domain);
diff --git a/lib/symfony/twig-bridge/Extension/HtmlSanitizerExtension.php b/lib/symfony/twig-bridge/Extension/HtmlSanitizerExtension.php
index bec5ceb94..9549c2a36 100644
--- a/lib/symfony/twig-bridge/Extension/HtmlSanitizerExtension.php
+++ b/lib/symfony/twig-bridge/Extension/HtmlSanitizerExtension.php
@@ -33,7 +33,7 @@ final class HtmlSanitizerExtension extends AbstractExtension
         ];
     }
 
-    public function sanitize(string $html, string $sanitizer = null): string
+    public function sanitize(string $html, ?string $sanitizer = null): string
     {
         return $this->sanitizers->get($sanitizer ?? $this->defaultSanitizer)->sanitize($html);
     }
diff --git a/lib/symfony/twig-bridge/Extension/HttpKernelRuntime.php b/lib/symfony/twig-bridge/Extension/HttpKernelRuntime.php
index b059bf1aa..367b17cd3 100644
--- a/lib/symfony/twig-bridge/Extension/HttpKernelRuntime.php
+++ b/lib/symfony/twig-bridge/Extension/HttpKernelRuntime.php
@@ -25,7 +25,7 @@ final class HttpKernelRuntime
     private FragmentHandler $handler;
     private ?FragmentUriGeneratorInterface $fragmentUriGenerator;
 
-    public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterface $fragmentUriGenerator = null)
+    public function __construct(FragmentHandler $handler, ?FragmentUriGeneratorInterface $fragmentUriGenerator = null)
     {
         $this->handler = $handler;
         $this->fragmentUriGenerator = $fragmentUriGenerator;
@@ -57,7 +57,7 @@ final class HttpKernelRuntime
     public function generateFragmentUri(ControllerReference $controller, bool $absolute = false, bool $strict = true, bool $sign = true): string
     {
         if (null === $this->fragmentUriGenerator) {
-            throw new \LogicException(sprintf('An instance of "%s" must be provided to use "%s()".', FragmentUriGeneratorInterface::class, __METHOD__));
+            throw new \LogicException(\sprintf('An instance of "%s" must be provided to use "%s()".', FragmentUriGeneratorInterface::class, __METHOD__));
         }
 
         return $this->fragmentUriGenerator->generate($controller, null, $absolute, $strict, $sign);
diff --git a/lib/symfony/twig-bridge/Extension/LogoutUrlExtension.php b/lib/symfony/twig-bridge/Extension/LogoutUrlExtension.php
index abced287f..a576a6dd6 100644
--- a/lib/symfony/twig-bridge/Extension/LogoutUrlExtension.php
+++ b/lib/symfony/twig-bridge/Extension/LogoutUrlExtension.php
@@ -42,7 +42,7 @@ final class LogoutUrlExtension extends AbstractExtension
      *
      * @param string|null $key The firewall key or null to use the current firewall key
      */
-    public function getLogoutPath(string $key = null): string
+    public function getLogoutPath(?string $key = null): string
     {
         return $this->generator->getLogoutPath($key);
     }
@@ -52,7 +52,7 @@ final class LogoutUrlExtension extends AbstractExtension
      *
      * @param string|null $key The firewall key or null to use the current firewall key
      */
-    public function getLogoutUrl(string $key = null): string
+    public function getLogoutUrl(?string $key = null): string
     {
         return $this->generator->getLogoutUrl($key);
     }
diff --git a/lib/symfony/twig-bridge/Extension/ProfilerExtension.php b/lib/symfony/twig-bridge/Extension/ProfilerExtension.php
index f63aa41cf..ab56f22a1 100644
--- a/lib/symfony/twig-bridge/Extension/ProfilerExtension.php
+++ b/lib/symfony/twig-bridge/Extension/ProfilerExtension.php
@@ -28,7 +28,7 @@ final class ProfilerExtension extends BaseProfilerExtension
      */
     private \SplObjectStorage $events;
 
-    public function __construct(Profile $profile, Stopwatch $stopwatch = null)
+    public function __construct(Profile $profile, ?Stopwatch $stopwatch = null)
     {
         parent::__construct($profile);
 
diff --git a/lib/symfony/twig-bridge/Extension/SecurityExtension.php b/lib/symfony/twig-bridge/Extension/SecurityExtension.php
index 3c3881ad0..c94912e35 100644
--- a/lib/symfony/twig-bridge/Extension/SecurityExtension.php
+++ b/lib/symfony/twig-bridge/Extension/SecurityExtension.php
@@ -28,13 +28,13 @@ final class SecurityExtension extends AbstractExtension
     private ?AuthorizationCheckerInterface $securityChecker;
     private ?ImpersonateUrlGenerator $impersonateUrlGenerator;
 
-    public function __construct(AuthorizationCheckerInterface $securityChecker = null, ImpersonateUrlGenerator $impersonateUrlGenerator = null)
+    public function __construct(?AuthorizationCheckerInterface $securityChecker = null, ?ImpersonateUrlGenerator $impersonateUrlGenerator = null)
     {
         $this->securityChecker = $securityChecker;
         $this->impersonateUrlGenerator = $impersonateUrlGenerator;
     }
 
-    public function isGranted(mixed $role, mixed $object = null, string $field = null): bool
+    public function isGranted(mixed $role, mixed $object = null, ?string $field = null): bool
     {
         if (null === $this->securityChecker) {
             return false;
@@ -51,7 +51,7 @@ final class SecurityExtension extends AbstractExtension
         }
     }
 
-    public function getImpersonateExitUrl(string $exitTo = null): string
+    public function getImpersonateExitUrl(?string $exitTo = null): string
     {
         if (null === $this->impersonateUrlGenerator) {
             return '';
@@ -60,7 +60,7 @@ final class SecurityExtension extends AbstractExtension
         return $this->impersonateUrlGenerator->generateExitUrl($exitTo);
     }
 
-    public function getImpersonateExitPath(string $exitTo = null): string
+    public function getImpersonateExitPath(?string $exitTo = null): string
     {
         if (null === $this->impersonateUrlGenerator) {
             return '';
diff --git a/lib/symfony/twig-bridge/Extension/StopwatchExtension.php b/lib/symfony/twig-bridge/Extension/StopwatchExtension.php
index 972cd1acd..49df52cff 100644
--- a/lib/symfony/twig-bridge/Extension/StopwatchExtension.php
+++ b/lib/symfony/twig-bridge/Extension/StopwatchExtension.php
@@ -26,7 +26,7 @@ final class StopwatchExtension extends AbstractExtension
     private ?Stopwatch $stopwatch;
     private bool $enabled;
 
-    public function __construct(Stopwatch $stopwatch = null, bool $enabled = true)
+    public function __construct(?Stopwatch $stopwatch = null, bool $enabled = true)
     {
         $this->stopwatch = $stopwatch;
         $this->enabled = $enabled;
diff --git a/lib/symfony/twig-bridge/Extension/TranslationExtension.php b/lib/symfony/twig-bridge/Extension/TranslationExtension.php
index 67835e2b8..b6b93f727 100644
--- a/lib/symfony/twig-bridge/Extension/TranslationExtension.php
+++ b/lib/symfony/twig-bridge/Extension/TranslationExtension.php
@@ -37,7 +37,7 @@ final class TranslationExtension extends AbstractExtension
     private ?TranslatorInterface $translator;
     private ?TranslationNodeVisitor $translationNodeVisitor;
 
-    public function __construct(TranslatorInterface $translator = null, TranslationNodeVisitor $translationNodeVisitor = null)
+    public function __construct(?TranslatorInterface $translator = null, ?TranslationNodeVisitor $translationNodeVisitor = null)
     {
         $this->translator = $translator;
         $this->translationNodeVisitor = $translationNodeVisitor;
@@ -47,10 +47,10 @@ final class TranslationExtension extends AbstractExtension
     {
         if (null === $this->translator) {
             if (!interface_exists(TranslatorInterface::class)) {
-                throw new \LogicException(sprintf('You cannot use the "%s" if the Translation Contracts are not available. Try running "composer require symfony/translation".', __CLASS__));
+                throw new \LogicException(\sprintf('You cannot use the "%s" if the Translation Contracts are not available. Try running "composer require symfony/translation".', __CLASS__));
             }
 
-            $this->translator = new class() implements TranslatorInterface {
+            $this->translator = new class implements TranslatorInterface {
                 use TranslatorTrait;
             };
         }
@@ -96,11 +96,11 @@ final class TranslationExtension extends AbstractExtension
     /**
      * @param array|string $arguments Can be the locale as a string when $message is a TranslatableInterface
      */
-    public function trans(string|\Stringable|TranslatableInterface|null $message, array|string $arguments = [], string $domain = null, string $locale = null, int $count = null): string
+    public function trans(string|\Stringable|TranslatableInterface|null $message, array|string $arguments = [], ?string $domain = null, ?string $locale = null, ?int $count = null): string
     {
         if ($message instanceof TranslatableInterface) {
             if ([] !== $arguments && !\is_string($arguments)) {
-                throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be a locale passed as a string when the message is a "%s", "%s" given.', __METHOD__, TranslatableInterface::class, get_debug_type($arguments)));
+                throw new \TypeError(\sprintf('Argument 2 passed to "%s()" must be a locale passed as a string when the message is a "%s", "%s" given.', __METHOD__, TranslatableInterface::class, get_debug_type($arguments)));
             }
 
             if ($message instanceof TranslatableMessage && '' === $message->getMessage()) {
@@ -111,7 +111,7 @@ final class TranslationExtension extends AbstractExtension
         }
 
         if (!\is_array($arguments)) {
-            throw new \TypeError(sprintf('Unless the message is a "%s", argument 2 passed to "%s()" must be an array of parameters, "%s" given.', TranslatableInterface::class, __METHOD__, get_debug_type($arguments)));
+            throw new \TypeError(\sprintf('Unless the message is a "%s", argument 2 passed to "%s()" must be an array of parameters, "%s" given.', TranslatableInterface::class, __METHOD__, get_debug_type($arguments)));
         }
 
         if ('' === $message = (string) $message) {
@@ -125,10 +125,10 @@ final class TranslationExtension extends AbstractExtension
         return $this->getTranslator()->trans($message, $arguments, $domain, $locale);
     }
 
-    public function createTranslatable(string $message, array $parameters = [], string $domain = null): TranslatableMessage
+    public function createTranslatable(string $message, array $parameters = [], ?string $domain = null): TranslatableMessage
     {
         if (!class_exists(TranslatableMessage::class)) {
-            throw new \LogicException(sprintf('You cannot use the "%s" as the Translation Component is not installed. Try running "composer require symfony/translation".', __CLASS__));
+            throw new \LogicException(\sprintf('You cannot use the "%s" as the Translation Component is not installed. Try running "composer require symfony/translation".', __CLASS__));
         }
 
         return new TranslatableMessage($message, $parameters, $domain);
diff --git a/lib/symfony/twig-bridge/Extension/WebLinkExtension.php b/lib/symfony/twig-bridge/Extension/WebLinkExtension.php
index 11eca517c..c8640a4ea 100644
--- a/lib/symfony/twig-bridge/Extension/WebLinkExtension.php
+++ b/lib/symfony/twig-bridge/Extension/WebLinkExtension.php
@@ -46,7 +46,7 @@ final class WebLinkExtension extends AbstractExtension
     /**
      * Adds a "Link" HTTP header.
      *
-     * @param string $rel        The relation type (e.g. "preload", "prefetch", "prerender" or "dns-prefetch")
+     * @param string $rel        The relation type (e.g. "preload", "prefetch", or "dns-prefetch")
      * @param array  $attributes The attributes of this link (e.g. "['as' => true]", "['pr' => 0.5]")
      *
      * @return string The relation URI
@@ -117,7 +117,11 @@ final class WebLinkExtension extends AbstractExtension
     }
 
     /**
-     * Indicates to the client that it should prerender this resource .
+     * Indicates to the client that it should prerender this resource.
+     *
+     * This feature is deprecated and superseded by the Speculation Rules API.
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Attributes/rel/prerender
      *
      * @param array $attributes The attributes of this link (e.g. "['as' => true]", "['pr' => 0.5]")
      *
diff --git a/lib/symfony/twig-bridge/Extension/WorkflowExtension.php b/lib/symfony/twig-bridge/Extension/WorkflowExtension.php
index 661a063f9..b50130ccb 100644
--- a/lib/symfony/twig-bridge/Extension/WorkflowExtension.php
+++ b/lib/symfony/twig-bridge/Extension/WorkflowExtension.php
@@ -48,7 +48,7 @@ final class WorkflowExtension extends AbstractExtension
     /**
      * Returns true if the transition is enabled.
      */
-    public function canTransition(object $subject, string $transitionName, string $name = null): bool
+    public function canTransition(object $subject, string $transitionName, ?string $name = null): bool
     {
         return $this->workflowRegistry->get($subject, $name)->can($subject, $transitionName);
     }
@@ -58,12 +58,12 @@ final class WorkflowExtension extends AbstractExtension
      *
      * @return Transition[]
      */
-    public function getEnabledTransitions(object $subject, string $name = null): array
+    public function getEnabledTransitions(object $subject, ?string $name = null): array
     {
         return $this->workflowRegistry->get($subject, $name)->getEnabledTransitions($subject);
     }
 
-    public function getEnabledTransition(object $subject, string $transition, string $name = null): ?Transition
+    public function getEnabledTransition(object $subject, string $transition, ?string $name = null): ?Transition
     {
         return $this->workflowRegistry->get($subject, $name)->getEnabledTransition($subject, $transition);
     }
@@ -71,7 +71,7 @@ final class WorkflowExtension extends AbstractExtension
     /**
      * Returns true if the place is marked.
      */
-    public function hasMarkedPlace(object $subject, string $placeName, string $name = null): bool
+    public function hasMarkedPlace(object $subject, string $placeName, ?string $name = null): bool
     {
         return $this->workflowRegistry->get($subject, $name)->getMarking($subject)->has($placeName);
     }
@@ -81,7 +81,7 @@ final class WorkflowExtension extends AbstractExtension
      *
      * @return string[]|int[]
      */
-    public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, string $name = null): array
+    public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, ?string $name = null): array
     {
         $places = $this->workflowRegistry->get($subject, $name)->getMarking($subject)->getPlaces();
 
@@ -99,7 +99,7 @@ final class WorkflowExtension extends AbstractExtension
      *                                                Use a string (the place name) to get place metadata
      *                                                Use a Transition instance to get transition metadata
      */
-    public function getMetadata(object $subject, string $key, string|Transition $metadataSubject = null, string $name = null): mixed
+    public function getMetadata(object $subject, string $key, string|Transition|null $metadataSubject = null, ?string $name = null): mixed
     {
         return $this
             ->workflowRegistry
@@ -109,7 +109,7 @@ final class WorkflowExtension extends AbstractExtension
         ;
     }
 
-    public function buildTransitionBlockerList(object $subject, string $transitionName, string $name = null): TransitionBlockerList
+    public function buildTransitionBlockerList(object $subject, string $transitionName, ?string $name = null): TransitionBlockerList
     {
         $workflow = $this->workflowRegistry->get($subject, $name);
 
diff --git a/lib/symfony/twig-bridge/Form/TwigRendererEngine.php b/lib/symfony/twig-bridge/Form/TwigRendererEngine.php
index fbe8e0b3e..3bde82141 100644
--- a/lib/symfony/twig-bridge/Form/TwigRendererEngine.php
+++ b/lib/symfony/twig-bridge/Form/TwigRendererEngine.php
@@ -34,7 +34,7 @@ class TwigRendererEngine extends AbstractRendererEngine
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
-        $context = $this->environment->mergeGlobals($variables);
+        $context = $variables + $this->environment->getGlobals();
 
         ob_start();
 
@@ -71,6 +71,7 @@ class TwigRendererEngine extends AbstractRendererEngine
             // $this->resources[$cacheKey][$block] is not set. Since the themes are
             // already loaded, it can only be a non-existing block.
             $this->resources[$cacheKey][$blockName] = false;
+            $this->setResourceInheritability($cacheKey, $blockName, true);
 
             return false;
         }
@@ -108,8 +109,9 @@ class TwigRendererEngine extends AbstractRendererEngine
 
             // EAGER CACHE POPULATION (see doc comment)
             foreach ($this->resources[$parentCacheKey] as $nestedBlockName => $resource) {
-                if (!isset($this->resources[$cacheKey][$nestedBlockName])) {
+                if (!isset($this->resources[$cacheKey][$nestedBlockName]) && $this->isResourceInheritable($parentCacheKey, $nestedBlockName)) {
                     $this->resources[$cacheKey][$nestedBlockName] = $resource;
+                    $this->setResourceInheritability($cacheKey, $nestedBlockName, true);
                 }
             }
         }
@@ -119,6 +121,7 @@ class TwigRendererEngine extends AbstractRendererEngine
         if (!isset($this->resources[$cacheKey][$blockName])) {
             // Cache that we didn't find anything to speed up further accesses
             $this->resources[$cacheKey][$blockName] = false;
+            $this->setResourceInheritability($cacheKey, $blockName, true);
         }
 
         return false !== $this->resources[$cacheKey][$blockName];
@@ -151,7 +154,7 @@ class TwigRendererEngine extends AbstractRendererEngine
         // theme is a reference and we don't want to change it.
         $currentTheme = $theme;
 
-        $context = $this->environment->mergeGlobals([]);
+        $context = $this->environment->getGlobals();
 
         // The do loop takes care of template inheritance.
         // Add blocks from all templates in the inheritance tree, but avoid
@@ -162,6 +165,7 @@ class TwigRendererEngine extends AbstractRendererEngine
                     // The resource given back is the key to the bucket that
                     // contains this block.
                     $this->resources[$cacheKey][$block] = $blockData;
+                    $this->setResourceInheritability($cacheKey, $block, true);
                 }
             }
         } while (false !== $currentTheme = $currentTheme->getParent($context));
diff --git a/lib/symfony/twig-bridge/Mime/BodyRenderer.php b/lib/symfony/twig-bridge/Mime/BodyRenderer.php
index 18e0eb1f8..32e185866 100644
--- a/lib/symfony/twig-bridge/Mime/BodyRenderer.php
+++ b/lib/symfony/twig-bridge/Mime/BodyRenderer.php
@@ -31,7 +31,7 @@ final class BodyRenderer implements BodyRendererInterface
     private HtmlToTextConverterInterface $converter;
     private ?LocaleSwitcher $localeSwitcher = null;
 
-    public function __construct(Environment $twig, array $context = [], HtmlToTextConverterInterface $converter = null, LocaleSwitcher $localeSwitcher = null)
+    public function __construct(Environment $twig, array $context = [], ?HtmlToTextConverterInterface $converter = null, ?LocaleSwitcher $localeSwitcher = null)
     {
         $this->twig = $twig;
         $this->context = $context;
@@ -45,7 +45,7 @@ final class BodyRenderer implements BodyRendererInterface
             return;
         }
 
-        if (null === $message->getTextTemplate() && null === $message->getHtmlTemplate()) {
+        if ($message->isRendered()) {
             // email has already been rendered
             return;
         }
@@ -54,7 +54,7 @@ final class BodyRenderer implements BodyRendererInterface
             $messageContext = $message->getContext();
 
             if (isset($messageContext['email'])) {
-                throw new InvalidArgumentException(sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));
+                throw new InvalidArgumentException(\sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', get_debug_type($message)));
             }
 
             $vars = array_merge($this->context, $messageContext, [
diff --git a/lib/symfony/twig-bridge/Mime/NotificationEmail.php b/lib/symfony/twig-bridge/Mime/NotificationEmail.php
index 5bd54e644..4b4e1b262 100644
--- a/lib/symfony/twig-bridge/Mime/NotificationEmail.php
+++ b/lib/symfony/twig-bridge/Mime/NotificationEmail.php
@@ -42,7 +42,7 @@ class NotificationEmail extends TemplatedEmail
     ];
     private bool $rendered = false;
 
-    public function __construct(Headers $headers = null, AbstractPart $body = null)
+    public function __construct(?Headers $headers = null, ?AbstractPart $body = null)
     {
         $missingPackages = [];
         if (!class_exists(CssInlinerExtension::class)) {
@@ -54,7 +54,7 @@ class NotificationEmail extends TemplatedEmail
         }
 
         if ($missingPackages) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the "%s" Twig extension%s not available. Try running "%s".', static::class, implode('" and "', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', 'composer require '.implode(' ', array_keys($missingPackages))));
+            throw new \LogicException(\sprintf('You cannot use "%s" if the "%s" Twig extension%s not available. Try running "%s".', static::class, implode('" and "', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', 'composer require '.implode(' ', array_keys($missingPackages))));
         }
 
         parent::__construct($headers, $body);
@@ -63,7 +63,7 @@ class NotificationEmail extends TemplatedEmail
     /**
      * Creates a NotificationEmail instance that is appropriate to send to normal (non-admin) users.
      */
-    public static function asPublicEmail(Headers $headers = null, AbstractPart $body = null): self
+    public static function asPublicEmail(?Headers $headers = null, ?AbstractPart $body = null): self
     {
         $email = new static($headers, $body);
         $email->markAsPublic();
@@ -88,7 +88,7 @@ class NotificationEmail extends TemplatedEmail
     public function markdown(string $content): static
     {
         if (!class_exists(MarkdownExtension::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the Markdown Twig extension is not available. Try running "composer require twig/markdown-extra".', __METHOD__));
+            throw new \LogicException(\sprintf('You cannot use "%s" if the Markdown Twig extension is not available. Try running "composer require twig/markdown-extra".', __METHOD__));
         }
 
         $this->context['markdown'] = true;
@@ -174,6 +174,26 @@ class NotificationEmail extends TemplatedEmail
         return '@email/'.$this->theme.'/notification/body.html.twig';
     }
 
+    /**
+     * @return $this
+     */
+    public function context(array $context): static
+    {
+        $parentContext = [];
+
+        foreach ($context as $key => $value) {
+            if (\array_key_exists($key, $this->context)) {
+                $this->context[$key] = $value;
+            } else {
+                $parentContext[$key] = $value;
+            }
+        }
+
+        parent::context($parentContext);
+
+        return $this;
+    }
+
     public function getContext(): array
     {
         return array_merge($this->context, parent::getContext());
@@ -198,7 +218,7 @@ class NotificationEmail extends TemplatedEmail
         $importance = $this->context['importance'] ?? self::IMPORTANCE_LOW;
         $this->priority($this->determinePriority($importance));
         if ($this->context['importance']) {
-            $headers->setHeaderBody('Text', 'Subject', sprintf('[%s] %s', strtoupper($importance), $this->getSubject()));
+            $headers->setHeaderBody('Text', 'Subject', \sprintf('[%s] %s', strtoupper($importance), $this->getSubject()));
         }
 
         return $headers;
diff --git a/lib/symfony/twig-bridge/Mime/WrappedTemplatedEmail.php b/lib/symfony/twig-bridge/Mime/WrappedTemplatedEmail.php
index c4e0003fa..e72335a5e 100644
--- a/lib/symfony/twig-bridge/Mime/WrappedTemplatedEmail.php
+++ b/lib/symfony/twig-bridge/Mime/WrappedTemplatedEmail.php
@@ -43,7 +43,7 @@ final class WrappedTemplatedEmail
      * @param string|null $contentType The media type (i.e. MIME type) of the image file (e.g. 'image/png').
      *                                 Some email clients require this to display embedded images.
      */
-    public function image(string $image, string $contentType = null): string
+    public function image(string $image, ?string $contentType = null): string
     {
         $file = $this->twig->getLoader()->getSourceContext($image);
         $body = $file->getPath() ? new File($file->getPath()) : $file->getCode();
@@ -59,7 +59,7 @@ final class WrappedTemplatedEmail
      * @param string|null $contentType The media type (i.e. MIME type) of the file (e.g. 'application/pdf').
      *                                 Some email clients require this to display attached files.
      */
-    public function attach(string $file, string $name = null, string $contentType = null): void
+    public function attach(string $file, ?string $name = null, ?string $contentType = null): void
     {
         $file = $this->twig->getLoader()->getSourceContext($file);
         $body = $file->getPath() ? new File($file->getPath()) : $file->getCode();
diff --git a/lib/symfony/twig-bridge/Node/DumpNode.php b/lib/symfony/twig-bridge/Node/DumpNode.php
index 8ce2bd8c4..798430b26 100644
--- a/lib/symfony/twig-bridge/Node/DumpNode.php
+++ b/lib/symfony/twig-bridge/Node/DumpNode.php
@@ -11,29 +11,44 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
+use Twig\Node\Expression\Variable\LocalVariable;
 use Twig\Node\Node;
 
 /**
  * @author Julien Galenski <julien.galenski@gmail.com>
  */
+#[YieldReady]
 final class DumpNode extends Node
 {
-    private string $varPrefix;
+    private LocalVariable|string $varPrefix;
 
-    public function __construct(string $varPrefix, ?Node $values, int $lineno, string $tag = null)
+    public function __construct(LocalVariable|string $varPrefix, ?Node $values, int $lineno, ?string $tag = null)
     {
         $nodes = [];
         if (null !== $values) {
             $nodes['values'] = $values;
         }
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct($nodes, [], $lineno);
+        } else {
+            parent::__construct($nodes, [], $lineno, $tag);
+        }
+
         $this->varPrefix = $varPrefix;
     }
 
     public function compile(Compiler $compiler): void
     {
+        if ($this->varPrefix instanceof LocalVariable) {
+            $varPrefix = $this->varPrefix->getAttribute('name');
+        } else {
+            $varPrefix = $this->varPrefix;
+        }
+
         $compiler
             ->write("if (\$this->env->isDebug()) {\n")
             ->indent();
@@ -41,18 +56,18 @@ final class DumpNode extends Node
         if (!$this->hasNode('values')) {
             // remove embedded templates (macros) from the context
             $compiler
-                ->write(sprintf('$%svars = [];'."\n", $this->varPrefix))
-                ->write(sprintf('foreach ($context as $%1$skey => $%1$sval) {'."\n", $this->varPrefix))
+                ->write(\sprintf('$%svars = [];'."\n", $varPrefix))
+                ->write(\sprintf('foreach ($context as $%1$skey => $%1$sval) {'."\n", $varPrefix))
                 ->indent()
-                ->write(sprintf('if (!$%sval instanceof \Twig\Template) {'."\n", $this->varPrefix))
+                ->write(\sprintf('if (!$%sval instanceof \Twig\Template) {'."\n", $varPrefix))
                 ->indent()
-                ->write(sprintf('$%1$svars[$%1$skey] = $%1$sval;'."\n", $this->varPrefix))
+                ->write(\sprintf('$%1$svars[$%1$skey] = $%1$sval;'."\n", $varPrefix))
                 ->outdent()
                 ->write("}\n")
                 ->outdent()
                 ->write("}\n")
                 ->addDebugInfo($this)
-                ->write(sprintf('\Symfony\Component\VarDumper\VarDumper::dump($%svars);'."\n", $this->varPrefix));
+                ->write(\sprintf('\Symfony\Component\VarDumper\VarDumper::dump($%svars);'."\n", $varPrefix));
         } elseif (($values = $this->getNode('values')) && 1 === $values->count()) {
             $compiler
                 ->addDebugInfo($this)
diff --git a/lib/symfony/twig-bridge/Node/FormThemeNode.php b/lib/symfony/twig-bridge/Node/FormThemeNode.php
index e37311267..1d077097f 100644
--- a/lib/symfony/twig-bridge/Node/FormThemeNode.php
+++ b/lib/symfony/twig-bridge/Node/FormThemeNode.php
@@ -12,17 +12,24 @@
 namespace Symfony\Bridge\Twig\Node;
 
 use Symfony\Component\Form\FormRenderer;
+use Twig\Attribute\FirstClassTwigCallableReady;
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Node;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
+#[YieldReady]
 final class FormThemeNode extends Node
 {
-    public function __construct(Node $form, Node $resources, int $lineno, string $tag = null, bool $only = false)
+    public function __construct(Node $form, Node $resources, int $lineno, ?string $tag = null, bool $only = false)
     {
-        parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno);
+        } else {
+            parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void
diff --git a/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php b/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
index 9967639d1..fa8653c23 100644
--- a/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
+++ b/lib/symfony/twig-bridge/Node/SearchAndRenderBlockNode.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Twig\Node;
 
 use Twig\Compiler;
+use Twig\Extension\CoreExtension;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FunctionExpression;
@@ -50,7 +51,7 @@ final class SearchAndRenderBlockNode extends FunctionExpression
                         $labelIsExpression = false;
 
                         // Only insert the label into the array if it is not empty
-                        if (!twig_test_empty($label->getAttribute('value'))) {
+                        if (null !== $label->getAttribute('value') && false !== $label->getAttribute('value') && '' !== (string) $label->getAttribute('value')) {
                             $originalVariables = $variables;
                             $variables = new ArrayExpression([], $lineno);
                             $labelKey = new ConstantExpression('label', $lineno);
@@ -97,7 +98,12 @@ final class SearchAndRenderBlockNode extends FunctionExpression
 
                         // Check at runtime whether the label is empty.
                         // If not, add it to the array at runtime.
-                        $compiler->raw('(twig_test_empty($_label_ = ');
+                        if (method_exists(CoreExtension::class, 'testEmpty')) {
+                            $compiler->raw('(CoreExtension::testEmpty($_label_ = ');
+                        } else {
+                            $compiler->raw('(twig_test_empty($_label_ = ');
+                        }
+
                         $compiler->subcompile($label);
                         $compiler->raw(') ? [] : ["label" => $_label_])');
                     }
diff --git a/lib/symfony/twig-bridge/Node/StopwatchNode.php b/lib/symfony/twig-bridge/Node/StopwatchNode.php
index cfa4d8a19..024a487a2 100644
--- a/lib/symfony/twig-bridge/Node/StopwatchNode.php
+++ b/lib/symfony/twig-bridge/Node/StopwatchNode.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AssignNameExpression;
+use Twig\Node\Expression\Variable\LocalVariable;
 use Twig\Node\Node;
 
 /**
@@ -20,11 +23,23 @@ use Twig\Node\Node;
  *
  * @author Wouter J <wouter@wouterj.nl>
  */
+#[YieldReady]
 final class StopwatchNode extends Node
 {
-    public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, string $tag = null)
+    /**
+     * @param AssignNameExpression|LocalVariable $var
+     */
+    public function __construct(Node $name, Node $body, $var, int $lineno = 0, ?string $tag = null)
     {
-        parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
+        if (!$var instanceof AssignNameExpression && !$var instanceof LocalVariable) {
+            throw new \TypeError(\sprintf('Expected an instance of "%s" or "%s", but got "%s".', AssignNameExpression::class, LocalVariable::class, get_debug_type($var)));
+        }
+
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);
+        } else {
+            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void
diff --git a/lib/symfony/twig-bridge/Node/TransDefaultDomainNode.php b/lib/symfony/twig-bridge/Node/TransDefaultDomainNode.php
index df29f0a19..28cb6f1b4 100644
--- a/lib/symfony/twig-bridge/Node/TransDefaultDomainNode.php
+++ b/lib/symfony/twig-bridge/Node/TransDefaultDomainNode.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
@@ -18,11 +20,16 @@ use Twig\Node\Node;
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
+#[YieldReady]
 final class TransDefaultDomainNode extends Node
 {
-    public function __construct(AbstractExpression $expr, int $lineno = 0, string $tag = null)
+    public function __construct(AbstractExpression $expr, int $lineno = 0, ?string $tag = null)
     {
-        parent::__construct(['expr' => $expr], [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct(['expr' => $expr], [], $lineno);
+        } else {
+            parent::__construct(['expr' => $expr], [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void
diff --git a/lib/symfony/twig-bridge/Node/TransNode.php b/lib/symfony/twig-bridge/Node/TransNode.php
index 8a126ba56..c1080fec4 100644
--- a/lib/symfony/twig-bridge/Node/TransNode.php
+++ b/lib/symfony/twig-bridge/Node/TransNode.php
@@ -11,20 +11,24 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Twig\Attribute\FirstClassTwigCallableReady;
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\NameExpression;
+use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\Node;
 use Twig\Node\TextNode;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
+#[YieldReady]
 final class TransNode extends Node
 {
-    public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, int $lineno = 0, string $tag = null)
+    public function __construct(Node $body, ?Node $domain = null, ?AbstractExpression $count = null, ?AbstractExpression $vars = null, ?AbstractExpression $locale = null, int $lineno = 0, ?string $tag = null)
     {
         $nodes = ['body' => $body];
         if (null !== $domain) {
@@ -40,7 +44,11 @@ final class TransNode extends Node
             $nodes['locale'] = $locale;
         }
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        if (class_exists(FirstClassTwigCallableReady::class)) {
+            parent::__construct($nodes, [], $lineno);
+        } else {
+            parent::__construct($nodes, [], $lineno, $tag);
+        }
     }
 
     public function compile(Compiler $compiler): void
@@ -53,9 +61,10 @@ final class TransNode extends Node
             $vars = null;
         }
         [$msg, $defaults] = $this->compileString($this->getNode('body'), $defaults, (bool) $vars);
+        $display = class_exists(YieldReady::class) ? 'yield' : 'echo';
 
         $compiler
-            ->write('echo $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans(')
+            ->write($display.' $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans(')
             ->subcompile($msg)
         ;
 
@@ -118,7 +127,7 @@ final class TransNode extends Node
                 if ('count' === $var && $this->hasNode('count')) {
                     $vars->addElement($this->getNode('count'), $key);
                 } else {
-                    $varExpr = new NameExpression($var, $body->getTemplateLine());
+                    $varExpr = class_exists(ContextVariable::class) ? new ContextVariable($var, $body->getTemplateLine()) : new NameExpression($var, $body->getTemplateLine());
                     $varExpr->setAttribute('ignore_strict_check', $ignoreStrictCheck);
                     $vars->addElement($varExpr, $key);
                 }
diff --git a/lib/symfony/twig-bridge/NodeVisitor/Scope.php b/lib/symfony/twig-bridge/NodeVisitor/Scope.php
index efa354d03..66904b09b 100644
--- a/lib/symfony/twig-bridge/NodeVisitor/Scope.php
+++ b/lib/symfony/twig-bridge/NodeVisitor/Scope.php
@@ -20,7 +20,7 @@ class Scope
     private array $data = [];
     private bool $left = false;
 
-    public function __construct(self $parent = null)
+    public function __construct(?self $parent = null)
     {
         $this->parent = $parent;
     }
diff --git a/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
index d0e3337a9..7413f9032 100644
--- a/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
+++ b/lib/symfony/twig-bridge/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -15,20 +15,24 @@ use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
 use Symfony\Bridge\Twig\Node\TransNode;
 use Twig\Environment;
 use Twig\Node\BlockNode;
+use Twig\Node\EmptyNode;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\AssignNameExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Expression\NameExpression;
+use Twig\Node\Expression\Variable\AssignContextVariable;
+use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\ModuleNode;
 use Twig\Node\Node;
+use Twig\Node\Nodes;
 use Twig\Node\SetNode;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
+final class TranslationDefaultDomainNodeVisitor implements NodeVisitorInterface
 {
     private Scope $scope;
 
@@ -37,7 +41,7 @@ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
         $this->scope = new Scope();
     }
 
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->enter();
@@ -50,10 +54,14 @@ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
                 return $node;
             } else {
                 $var = $this->getVarName();
-                $name = new AssignNameExpression($var, $node->getTemplateLine());
-                $this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));
+                $name = class_exists(AssignContextVariable::class) ? new AssignContextVariable($var, $node->getTemplateLine()) : new AssignNameExpression($var, $node->getTemplateLine());
+                $this->scope->set('domain', class_exists(ContextVariable::class) ? new ContextVariable($var, $node->getTemplateLine()) : new NameExpression($var, $node->getTemplateLine()));
 
-                return new SetNode(false, new Node([$name]), new Node([$node->getNode('expr')]), $node->getTemplateLine());
+                if (class_exists(Nodes::class)) {
+                    return new SetNode(false, new Nodes([$name]), new Nodes([$node->getNode('expr')]), $node->getTemplateLine());
+                } else {
+                    return new SetNode(false, new Node([$name]), new Node([$node->getNode('expr')]), $node->getTemplateLine());
+                }
             }
         }
 
@@ -61,8 +69,14 @@ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
             return $node;
         }
 
-        if ($node instanceof FilterExpression && 'trans' === $node->getNode('filter')->getAttribute('value')) {
+        if ($node instanceof FilterExpression && 'trans' === ($node->hasAttribute('twig_callable') ? $node->getAttribute('twig_callable')->getName() : $node->getNode('filter')->getAttribute('value'))) {
             $arguments = $node->getNode('arguments');
+
+            if ($arguments instanceof EmptyNode) {
+                $arguments = new Nodes();
+                $node->setNode('arguments', $arguments);
+            }
+
             if ($this->isNamedArguments($arguments)) {
                 if (!$arguments->hasNode('domain') && !$arguments->hasNode(1)) {
                     $arguments->setNode('domain', $this->scope->get('domain'));
@@ -83,7 +97,7 @@ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
         return $node;
     }
 
-    protected function doLeaveNode(Node $node, Environment $env): ?Node
+    public function leaveNode(Node $node, Environment $env): ?Node
     {
         if ($node instanceof TransDefaultDomainNode) {
             return null;
@@ -114,6 +128,6 @@ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
 
     private function getVarName(): string
     {
-        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
+        return \sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
     }
 }
diff --git a/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php b/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
index d5e95040d..f2b8f197e 100644
--- a/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
+++ b/lib/symfony/twig-bridge/NodeVisitor/TranslationNodeVisitor.php
@@ -18,14 +18,14 @@ use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Expression\FunctionExpression;
 use Twig\Node\Node;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * TranslationNodeVisitor extracts translation messages.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-final class TranslationNodeVisitor extends AbstractNodeVisitor
+final class TranslationNodeVisitor implements NodeVisitorInterface
 {
     public const UNDEFINED_DOMAIN = '_undefined';
 
@@ -49,7 +49,7 @@ final class TranslationNodeVisitor extends AbstractNodeVisitor
         return $this->messages;
     }
 
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -57,7 +57,7 @@ final class TranslationNodeVisitor extends AbstractNodeVisitor
 
         if (
             $node instanceof FilterExpression
-            && 'trans' === $node->getNode('filter')->getAttribute('value')
+            && 'trans' === ($node->hasAttribute('twig_callable') ? $node->getAttribute('twig_callable')->getName() : $node->getNode('filter')->getAttribute('value'))
             && $node->getNode('node') instanceof ConstantExpression
         ) {
             // extract constant nodes with a trans filter
@@ -85,7 +85,7 @@ final class TranslationNodeVisitor extends AbstractNodeVisitor
             ];
         } elseif (
             $node instanceof FilterExpression
-            && 'trans' === $node->getNode('filter')->getAttribute('value')
+            && 'trans' === ($node->hasAttribute('twig_callable') ? $node->getAttribute('twig_callable')->getName() : $node->getNode('filter')->getAttribute('value'))
             && $node->getNode('node') instanceof ConcatBinary
             && $message = $this->getConcatValueFromNode($node->getNode('node'), null)
         ) {
@@ -98,7 +98,7 @@ final class TranslationNodeVisitor extends AbstractNodeVisitor
         return $node;
     }
 
-    protected function doLeaveNode(Node $node, Environment $env): ?Node
+    public function leaveNode(Node $node, Environment $env): ?Node
     {
         return $node;
     }
@@ -149,6 +149,22 @@ final class TranslationNodeVisitor extends AbstractNodeVisitor
             return $node->getAttribute('value');
         }
 
+        if (
+            $node instanceof FunctionExpression
+            && 'constant' === $node->getAttribute('name')
+        ) {
+            $nodeArguments = $node->getNode('arguments');
+            if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) {
+                $constantName = $nodeArguments->getIterator()->current()->getAttribute('value');
+                if (\defined($constantName)) {
+                    $value = \constant($constantName);
+                    if (\is_string($value)) {
+                        return $value;
+                    }
+                }
+            }
+        }
+
         return self::UNDEFINED_DOMAIN;
     }
 
diff --git a/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_5_layout.html.twig b/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_5_layout.html.twig
index cb5a60e07..17b28fc9a 100644
--- a/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_5_layout.html.twig
+++ b/lib/symfony/twig-bridge/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -361,12 +361,12 @@
 {# Help #}
 
 {%- block form_help -%}
-    {% set row_class = row_attr.class|default('') %}
-    {% set help_class = ' form-text' %}
-    {% if 'input-group' in row_class %}
+    {%- set row_class = row_attr.class|default('') -%}
+    {%- set help_class = ' form-text' -%}
+    {%- if 'input-group' in row_class -%}
         {#- Hack to properly display help with input group -#}
-        {% set help_class = ' input-group-text' %}
-    {% endif %}
+        {%- set help_class = ' input-group-text' -%}
+    {%- endif -%}
     {%- if help is not empty -%}
         {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ help_class ~ ' mb-0')|trim}) -%}
     {%- endif -%}
diff --git a/lib/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig b/lib/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig
index 29cfc2dc6..d43b40a07 100644
--- a/lib/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig
+++ b/lib/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig
@@ -14,7 +14,7 @@
         {# Attribute "required" is not supported #}
         {%- set required = false -%}
     {%- endif -%}
-    <input type="{{ type }}" {{ block('widget_attributes') }}{% if value is not empty %} value="{{ value }}"{% endif %}>
+    <input type="{{ type }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
 {%- endblock form_widget_simple -%}
 
 {%- block form_widget_compound -%}
@@ -85,17 +85,17 @@
                 {{- block('choice_widget_options') -}}
             </optgroup>
         {%- else -%}
-            <option value="{{ choice.value }}"{% if choice.attr %}{% with { attr: choice.attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if not render_preferred_choices|default(false) and choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice_translation_domain is same as(false) ? choice.label : choice.label|trans(choice.labelTranslationParameters, choice_translation_domain) }}</option>
+            <option value="{{ choice.value }}"{% if choice.attr %}{% with { attr: choice.attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if (not render_preferred_choices|default(false) or not (duplicate_preferred_choices ?? true)) and choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice_translation_domain is same as(false) ? choice.label : choice.label|trans(choice.labelTranslationParameters, choice_translation_domain) }}</option>
         {%- endif -%}
     {% endfor %}
 {%- endblock choice_widget_options -%}
 
 {%- block checkbox_widget -%}
-    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
+    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock checkbox_widget -%}
 
 {%- block radio_widget -%}
-    <input type="radio" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
+    <input type="radio" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock radio_widget -%}
 
 {%- block datetime_widget -%}
@@ -402,7 +402,7 @@
     {%- endif -%}
     <form{% if name != '' %} name="{{ name }}"{% endif %} method="{{ form_method|lower }}"{% if action != '' %} action="{{ action }}"{% endif %}{{ block('attributes') }}{% if multipart %} enctype="multipart/form-data"{% endif %}>
     {%- if form_method != method -%}
-        <input type="hidden" name="_method" value="{{ method }}">
+        <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
 {%- endblock form_start -%}
 
@@ -440,7 +440,7 @@
         {%- endif -%}
 
         {%- if form_method != method -%}
-            <input type="hidden" name="_method" value="{{ method }}">
+            <input type="hidden" name="_method" value="{{ method }}" />
         {%- endif -%}
     {% endif -%}
 {% endblock form_rest %}
diff --git a/lib/symfony/twig-bridge/Resources/views/Form/foundation_5_layout.html.twig b/lib/symfony/twig-bridge/Resources/views/Form/foundation_5_layout.html.twig
index 4040f9a79..78dbe0d86 100644
--- a/lib/symfony/twig-bridge/Resources/views/Form/foundation_5_layout.html.twig
+++ b/lib/symfony/twig-bridge/Resources/views/Form/foundation_5_layout.html.twig
@@ -269,7 +269,9 @@
     {% endif %}
     <label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
         {{ widget|raw }}
-        {{ translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}
+        {%- if label is not same as(false) -%}
+            {{- block('form_label_content') -}}
+        {%- endif -%}
     </label>
 {%- endblock checkbox_radio_label %}
 
diff --git a/lib/symfony/twig-bridge/TokenParser/DumpTokenParser.php b/lib/symfony/twig-bridge/TokenParser/DumpTokenParser.php
index d4996dbe9..9c12dc23d 100644
--- a/lib/symfony/twig-bridge/TokenParser/DumpTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/DumpTokenParser.php
@@ -12,7 +12,9 @@
 namespace Symfony\Bridge\Twig\TokenParser;
 
 use Symfony\Bridge\Twig\Node\DumpNode;
+use Twig\Node\Expression\Variable\LocalVariable;
 use Twig\Node\Node;
+use Twig\Node\Nodes;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -33,11 +35,26 @@ final class DumpTokenParser extends AbstractTokenParser
     {
         $values = null;
         if (!$this->parser->getStream()->test(Token::BLOCK_END_TYPE)) {
-            $values = $this->parser->getExpressionParser()->parseMultitargetExpression();
+            $values = method_exists($this->parser, 'parseExpression') ?
+                $this->parseMultitargetExpression() :
+                $this->parser->getExpressionParser()->parseMultitargetExpression();
         }
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
-        return new DumpNode($this->parser->getVarName(), $values, $token->getLine(), $this->getTag());
+        return new DumpNode(class_exists(LocalVariable::class) ? new LocalVariable(null, $token->getLine()) : $this->parser->getVarName(), $values, $token->getLine(), $this->getTag());
+    }
+
+    private function parseMultitargetExpression(): Node
+    {
+        $targets = [];
+        while (true) {
+            $targets[] = $this->parser->parseExpression();
+            if (!$this->parser->getStream()->nextIf(Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+        }
+
+        return new Nodes($targets);
     }
 
     public function getTag(): string
diff --git a/lib/symfony/twig-bridge/TokenParser/FormThemeTokenParser.php b/lib/symfony/twig-bridge/TokenParser/FormThemeTokenParser.php
index b95a2a05e..c5fc2311e 100644
--- a/lib/symfony/twig-bridge/TokenParser/FormThemeTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/FormThemeTokenParser.php
@@ -29,12 +29,16 @@ final class FormThemeTokenParser extends AbstractTokenParser
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
 
-        $form = $this->parser->getExpressionParser()->parseExpression();
+        $parseExpression = method_exists($this->parser, 'parseExpression')
+            ? $this->parser->parseExpression(...)
+            : $this->parser->getExpressionParser()->parseExpression(...);
+
+        $form = $parseExpression();
         $only = false;
 
         if ($this->parser->getStream()->test(Token::NAME_TYPE, 'with')) {
             $this->parser->getStream()->next();
-            $resources = $this->parser->getExpressionParser()->parseExpression();
+            $resources = $parseExpression();
 
             if ($this->parser->getStream()->nextIf(Token::NAME_TYPE, 'only')) {
                 $only = true;
@@ -42,7 +46,7 @@ final class FormThemeTokenParser extends AbstractTokenParser
         } else {
             $resources = new ArrayExpression([], $stream->getCurrent()->getLine());
             do {
-                $resources->addElement($this->parser->getExpressionParser()->parseExpression());
+                $resources->addElement($parseExpression());
             } while (!$stream->test(Token::BLOCK_END_TYPE));
         }
 
diff --git a/lib/symfony/twig-bridge/TokenParser/StopwatchTokenParser.php b/lib/symfony/twig-bridge/TokenParser/StopwatchTokenParser.php
index b332485d0..c478d9e6d 100644
--- a/lib/symfony/twig-bridge/TokenParser/StopwatchTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/StopwatchTokenParser.php
@@ -13,6 +13,7 @@ namespace Symfony\Bridge\Twig\TokenParser;
 
 use Symfony\Bridge\Twig\Node\StopwatchNode;
 use Twig\Node\Expression\AssignNameExpression;
+use Twig\Node\Expression\Variable\LocalVariable;
 use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
@@ -37,7 +38,9 @@ final class StopwatchTokenParser extends AbstractTokenParser
         $stream = $this->parser->getStream();
 
         // {% stopwatch 'bar' %}
-        $name = $this->parser->getExpressionParser()->parseExpression();
+        $name = method_exists($this->parser, 'parseExpression') ?
+            $this->parser->parseExpression() :
+            $this->parser->getExpressionParser()->parseExpression();
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
@@ -46,7 +49,7 @@ final class StopwatchTokenParser extends AbstractTokenParser
         $stream->expect(Token::BLOCK_END_TYPE);
 
         if ($this->stopwatchIsAvailable) {
-            return new StopwatchNode($name, $body, new AssignNameExpression($this->parser->getVarName(), $token->getLine()), $lineno, $this->getTag());
+            return new StopwatchNode($name, $body, class_exists(LocalVariable::class) ? new LocalVariable(null, $token->getLine()) : new AssignNameExpression($this->parser->getVarName(), $token->getLine()), $lineno, $this->getTag());
         }
 
         return $body;
diff --git a/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php b/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
index c6d850d07..a64a23328 100644
--- a/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/TransDefaultDomainTokenParser.php
@@ -25,7 +25,9 @@ final class TransDefaultDomainTokenParser extends AbstractTokenParser
 {
     public function parse(Token $token): Node
     {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+        $expr = method_exists($this->parser, 'parseExpression') ?
+            $this->parser->parseExpression() :
+            $this->parser->getExpressionParser()->parseExpression();
 
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
diff --git a/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php b/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
index e60263a4a..2d17c9da7 100644
--- a/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
+++ b/lib/symfony/twig-bridge/TokenParser/TransTokenParser.php
@@ -36,29 +36,33 @@ final class TransTokenParser extends AbstractTokenParser
         $vars = new ArrayExpression([], $lineno);
         $domain = null;
         $locale = null;
+        $parseExpression = method_exists($this->parser, 'parseExpression')
+            ? $this->parser->parseExpression(...)
+            : $this->parser->getExpressionParser()->parseExpression(...);
+
         if (!$stream->test(Token::BLOCK_END_TYPE)) {
             if ($stream->test('count')) {
                 // {% trans count 5 %}
                 $stream->next();
-                $count = $this->parser->getExpressionParser()->parseExpression();
+                $count = $parseExpression();
             }
 
             if ($stream->test('with')) {
                 // {% trans with vars %}
                 $stream->next();
-                $vars = $this->parser->getExpressionParser()->parseExpression();
+                $vars = $parseExpression();
             }
 
             if ($stream->test('from')) {
                 // {% trans from "messages" %}
                 $stream->next();
-                $domain = $this->parser->getExpressionParser()->parseExpression();
+                $domain = $parseExpression();
             }
 
             if ($stream->test('into')) {
                 // {% trans into "fr" %}
                 $stream->next();
-                $locale = $this->parser->getExpressionParser()->parseExpression();
+                $locale = $parseExpression();
             } elseif (!$stream->test(Token::BLOCK_END_TYPE)) {
                 throw new SyntaxError('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
diff --git a/lib/symfony/twig-bridge/UndefinedCallableHandler.php b/lib/symfony/twig-bridge/UndefinedCallableHandler.php
index ede634e19..c90fe51b7 100644
--- a/lib/symfony/twig-bridge/UndefinedCallableHandler.php
+++ b/lib/symfony/twig-bridge/UndefinedCallableHandler.php
@@ -108,7 +108,7 @@ class UndefinedCallableHandler
     private static function onUndefined(string $name, string $type, string $component): string
     {
         if (class_exists(FullStack::class) && isset(self::FULL_STACK_ENABLE[$component])) {
-            return sprintf('Did you forget to %s? Unknown %s "%s".', self::FULL_STACK_ENABLE[$component], $type, $name);
+            return \sprintf('Did you forget to %s? Unknown %s "%s".', self::FULL_STACK_ENABLE[$component], $type, $name);
         }
 
         $missingPackage = 'symfony/'.$component;
@@ -117,6 +117,6 @@ class UndefinedCallableHandler
             $missingPackage = 'symfony/twig-bundle';
         }
 
-        return sprintf('Did you forget to run "composer require %s"? Unknown %s "%s".', $missingPackage, $type, $name);
+        return \sprintf('Did you forget to run "composer require %s"? Unknown %s "%s".', $missingPackage, $type, $name);
     }
 }
diff --git a/lib/symfony/twig-bridge/composer.json b/lib/symfony/twig-bridge/composer.json
index 87c4e568e..1996595dc 100644
--- a/lib/symfony/twig-bridge/composer.json
+++ b/lib/symfony/twig-bridge/composer.json
@@ -29,7 +29,7 @@
         "symfony/asset-mapper": "^6.3|^7.0",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0",
         "symfony/finder": "^5.4|^6.0|^7.0",
-        "symfony/form": "^6.4|^7.0",
+        "symfony/form": "^6.4.32|~7.3.10|^7.4.4",
         "symfony/html-sanitizer": "^6.1|^7.0",
         "symfony/http-foundation": "^5.4|^6.0|^7.0",
         "symfony/http-kernel": "^6.4|^7.0",
@@ -44,7 +44,7 @@
         "symfony/security-core": "^5.4|^6.0|^7.0",
         "symfony/security-csrf": "^5.4|^6.0|^7.0",
         "symfony/security-http": "^5.4|^6.0|^7.0",
-        "symfony/serializer": "^6.4|^7.0",
+        "symfony/serializer": "^6.4.3|^7.0.3",
         "symfony/stopwatch": "^5.4|^6.0|^7.0",
         "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/expression-language": "^5.4|^6.0|^7.0",
@@ -58,7 +58,7 @@
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/console": "<5.4",
-        "symfony/form": "<6.3",
+        "symfony/form": "<6.4.32|>7,<7.3.10|>7.4,<7.4.4",
         "symfony/http-foundation": "<5.4",
         "symfony/http-kernel": "<6.4",
         "symfony/mime": "<6.2",
diff --git a/lib/symfony/twig-bundle/DependencyInjection/Configuration.php b/lib/symfony/twig-bundle/DependencyInjection/Configuration.php
index 4712b18a6..23eea7bd6 100644
--- a/lib/symfony/twig-bundle/DependencyInjection/Configuration.php
+++ b/lib/symfony/twig-bundle/DependencyInjection/Configuration.php
@@ -157,7 +157,7 @@ class Configuration implements ConfigurationInterface
                     ->normalizeKeys(false)
                     ->useAttributeAsKey('paths')
                     ->beforeNormalization()
-                        ->always()
+                        ->ifArray()
                         ->then(function ($paths) {
                             $normalized = [];
                             foreach ($paths as $path => $namespace) {
@@ -221,7 +221,7 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('mailer')
                     ->children()
                         ->scalarNode('html_to_text_converter')
-                            ->info(sprintf('A service implementing the "%s"', HtmlToTextConverterInterface::class))
+                            ->info(\sprintf('A service implementing the "%s"', HtmlToTextConverterInterface::class))
                             ->defaultNull()
                         ->end()
                     ->end()
diff --git a/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php b/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
index f9ec5083f..c27daf61d 100644
--- a/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
+++ b/lib/symfony/twig-bundle/DependencyInjection/TwigExtension.php
@@ -25,6 +25,7 @@ use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Service\ResetInterface;
+use Twig\Environment;
 use Twig\Extension\ExtensionInterface;
 use Twig\Extension\RuntimeExtensionInterface;
 use Twig\Loader\LoaderInterface;
@@ -45,6 +46,10 @@ class TwigExtension extends Extension
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('twig.php');
 
+        if (method_exists(Environment::class, 'resetGlobals')) {
+            $container->getDefinition('twig')->addTag('kernel.reset', ['method' => 'resetGlobals']);
+        }
+
         if ($container::willBeAvailable('symfony/form', Form::class, ['symfony/twig-bundle'])) {
             $loader->load('form.php');
 
diff --git a/lib/symfony/twig-bundle/Resources/config/twig.php b/lib/symfony/twig-bundle/Resources/config/twig.php
index 69d0aa2f0..0e1011d04 100644
--- a/lib/symfony/twig-bundle/Resources/config/twig.php
+++ b/lib/symfony/twig-bundle/Resources/config/twig.php
@@ -38,6 +38,7 @@ use Symfony\Bundle\TwigBundle\DependencyInjection\Configurator\EnvironmentConfig
 use Symfony\Bundle\TwigBundle\TemplateIterator;
 use Twig\Cache\FilesystemCache;
 use Twig\Environment;
+use Twig\ExpressionParser\Infix\BinaryOperatorExpressionParser;
 use Twig\Extension\CoreExtension;
 use Twig\Extension\DebugExtension;
 use Twig\Extension\EscaperExtension;
@@ -63,6 +64,7 @@ return static function (ContainerConfigurator $container) {
             ->tag('container.preload', ['class' => EscaperExtension::class])
             ->tag('container.preload', ['class' => OptimizerExtension::class])
             ->tag('container.preload', ['class' => StagingExtension::class])
+            ->tag('container.preload', ['class' => BinaryOperatorExpressionParser::class])
             ->tag('container.preload', ['class' => ExtensionSet::class])
             ->tag('container.preload', ['class' => Template::class])
             ->tag('container.preload', ['class' => TemplateWrapper::class])
diff --git a/lib/symfony/twig-bundle/TemplateIterator.php b/lib/symfony/twig-bundle/TemplateIterator.php
index 7242cfb0c..75f48558b 100644
--- a/lib/symfony/twig-bundle/TemplateIterator.php
+++ b/lib/symfony/twig-bundle/TemplateIterator.php
@@ -36,7 +36,7 @@ class TemplateIterator implements \IteratorAggregate
      * @param string|null $defaultPath  The directory where global templates can be stored
      * @param string[]    $namePatterns Pattern of file names
      */
-    public function __construct(KernelInterface $kernel, array $paths = [], string $defaultPath = null, array $namePatterns = [])
+    public function __construct(KernelInterface $kernel, array $paths = [], ?string $defaultPath = null, array $namePatterns = [])
     {
         $this->kernel = $kernel;
         $this->paths = $paths;
@@ -64,6 +64,12 @@ class TemplateIterator implements \IteratorAggregate
             if (null !== $this->defaultPath) {
                 $templates[] = $this->findTemplatesInDirectory($this->defaultPath.'/bundles/'.$bundle->getName(), $name);
             }
+
+            /*
+             * The bundle's own templates are also registered with the "!" prefix namespace - this matches
+             * @see \Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension::load()
+             */
+            $templates[] = $this->findTemplatesInDirectory($bundleTemplatesDir, '!'.$name);
         }
 
         foreach ($this->paths as $dir => $namespace) {
@@ -78,7 +84,7 @@ class TemplateIterator implements \IteratorAggregate
      *
      * @return string[]
      */
-    private function findTemplatesInDirectory(string $dir, string $namespace = null, array $excludeDirs = []): array
+    private function findTemplatesInDirectory(string $dir, ?string $namespace = null, array $excludeDirs = []): array
     {
         if (!is_dir($dir)) {
             return [];
diff --git a/lib/symfony/var-dumper/Caster/Caster.php b/lib/symfony/var-dumper/Caster/Caster.php
index d50a3dfad..d9577e7ae 100644
--- a/lib/symfony/var-dumper/Caster/Caster.php
+++ b/lib/symfony/var-dumper/Caster/Caster.php
@@ -47,7 +47,7 @@ class Caster
      *
      * @param bool $hasDebugInfo Whether the __debugInfo method exists on $obj or not
      */
-    public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, string $debugClass = null): array
+    public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, ?string $debugClass = null): array
     {
         if ($hasDebugInfo) {
             try {
diff --git a/lib/symfony/var-dumper/Caster/ClassStub.php b/lib/symfony/var-dumper/Caster/ClassStub.php
index 86b44dd2a..bf0d056ca 100644
--- a/lib/symfony/var-dumper/Caster/ClassStub.php
+++ b/lib/symfony/var-dumper/Caster/ClassStub.php
@@ -24,7 +24,7 @@ class ClassStub extends ConstStub
      * @param string   $identifier A PHP identifier, e.g. a class, method, interface, etc. name
      * @param callable $callable   The callable targeted by the identifier when it is ambiguous or not a real PHP identifier
      */
-    public function __construct(string $identifier, callable|array|string $callable = null)
+    public function __construct(string $identifier, callable|array|string|null $callable = null)
     {
         $this->value = $identifier;
 
@@ -56,7 +56,7 @@ class ClassStub extends ConstStub
             }
 
             if (str_contains($identifier, "@anonymous\0")) {
-                $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $identifier);
+                $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $identifier);
             }
 
             if (null !== $callable && $r instanceof \ReflectionFunctionAbstract) {
diff --git a/lib/symfony/var-dumper/Caster/ConstStub.php b/lib/symfony/var-dumper/Caster/ConstStub.php
index d7d1812bd..587c6c398 100644
--- a/lib/symfony/var-dumper/Caster/ConstStub.php
+++ b/lib/symfony/var-dumper/Caster/ConstStub.php
@@ -20,7 +20,7 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ConstStub extends Stub
 {
-    public function __construct(string $name, string|int|float $value = null)
+    public function __construct(string $name, string|int|float|null $value = null)
     {
         $this->class = $name;
         $this->value = 1 < \func_num_args() ? $value : $name;
diff --git a/lib/symfony/var-dumper/Caster/CutStub.php b/lib/symfony/var-dumper/Caster/CutStub.php
index 772399ef6..6870a9cd2 100644
--- a/lib/symfony/var-dumper/Caster/CutStub.php
+++ b/lib/symfony/var-dumper/Caster/CutStub.php
@@ -27,7 +27,7 @@ class CutStub extends Stub
         switch (\gettype($value)) {
             case 'object':
                 $this->type = self::TYPE_OBJECT;
-                $this->class = $value::class;
+                $this->class = get_debug_type($value);
 
                 if ($value instanceof \Closure) {
                     ReflectionCaster::castClosure($value, [], $this, true, Caster::EXCLUDE_VERBOSE);
diff --git a/lib/symfony/var-dumper/Caster/DOMCaster.php b/lib/symfony/var-dumper/Caster/DOMCaster.php
index d2d3fc129..4135fbfee 100644
--- a/lib/symfony/var-dumper/Caster/DOMCaster.php
+++ b/lib/symfony/var-dumper/Caster/DOMCaster.php
@@ -23,7 +23,7 @@ use Symfony\Component\VarDumper\Cloner\Stub;
 class DOMCaster
 {
     private const ERROR_CODES = [
-        \DOM_PHP_ERR => 'DOM_PHP_ERR',
+        0 => 'DOM_PHP_ERR',
         \DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
         \DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
         \DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
@@ -156,16 +156,12 @@ class DOMCaster
             'doctype' => $dom->doctype,
             'implementation' => $dom->implementation,
             'documentElement' => new CutStub($dom->documentElement),
-            'actualEncoding' => $dom->actualEncoding,
             'encoding' => $dom->encoding,
             'xmlEncoding' => $dom->xmlEncoding,
-            'standalone' => $dom->standalone,
             'xmlStandalone' => $dom->xmlStandalone,
-            'version' => $dom->version,
             'xmlVersion' => $dom->xmlVersion,
             'strictErrorChecking' => $dom->strictErrorChecking,
             'documentURI' => $dom->documentURI ? new LinkStub($dom->documentURI) : $dom->documentURI,
-            'config' => $dom->config,
             'formatOutput' => $dom->formatOutput,
             'validateOnParse' => $dom->validateOnParse,
             'resolveExternals' => $dom->resolveExternals,
@@ -277,9 +273,6 @@ class DOMCaster
             'publicId' => $dom->publicId,
             'systemId' => $dom->systemId,
             'notationName' => $dom->notationName,
-            'actualEncoding' => $dom->actualEncoding,
-            'encoding' => $dom->encoding,
-            'version' => $dom->version,
         ];
 
         return $a;
diff --git a/lib/symfony/var-dumper/Caster/DateCaster.php b/lib/symfony/var-dumper/Caster/DateCaster.php
index a0cbddb76..d98461d51 100644
--- a/lib/symfony/var-dumper/Caster/DateCaster.php
+++ b/lib/symfony/var-dumper/Caster/DateCaster.php
@@ -105,16 +105,16 @@ class DateCaster
         foreach (clone $p as $i => $d) {
             if (self::PERIOD_LIMIT === $i) {
                 $now = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-                $dates[] = sprintf('%s more', ($end = $p->getEndDate())
+                $dates[] = \sprintf('%s more', ($end = $p->getEndDate())
                     ? ceil(($end->format('U.u') - $d->format('U.u')) / ((int) $now->add($p->getDateInterval())->format('U.u') - (int) $now->format('U.u')))
                     : $p->recurrences - $i
                 );
                 break;
             }
-            $dates[] = sprintf('%s) %s', $i + 1, self::formatDateTime($d));
+            $dates[] = \sprintf('%s) %s', $i + 1, self::formatDateTime($d));
         }
 
-        $period = sprintf(
+        $period = \sprintf(
             'every %s, from %s%s %s',
             self::formatInterval($p->getDateInterval()),
             $p->include_start_date ? '[' : ']',
@@ -134,6 +134,6 @@ class DateCaster
 
     private static function formatSeconds(string $s, string $us): string
     {
-        return sprintf('%02d.%s', $s, 0 === ($len = \strlen($t = rtrim($us, '0'))) ? '0' : ($len <= 3 ? str_pad($t, 3, '0') : $us));
+        return \sprintf('%02d.%s', $s, 0 === ($len = \strlen($t = rtrim($us, '0'))) ? '0' : ($len <= 3 ? str_pad($t, 3, '0') : $us));
     }
 }
diff --git a/lib/symfony/var-dumper/Caster/ExceptionCaster.php b/lib/symfony/var-dumper/Caster/ExceptionCaster.php
index 02efb1b02..d2eef1249 100644
--- a/lib/symfony/var-dumper/Caster/ExceptionCaster.php
+++ b/lib/symfony/var-dumper/Caster/ExceptionCaster.php
@@ -42,7 +42,7 @@ class ExceptionCaster
         \E_USER_ERROR => 'E_USER_ERROR',
         \E_USER_WARNING => 'E_USER_WARNING',
         \E_USER_NOTICE => 'E_USER_NOTICE',
-        \E_STRICT => 'E_STRICT',
+        2048 => 'E_STRICT',
     ];
 
     private static array $framesCache = [];
@@ -192,7 +192,7 @@ class ExceptionCaster
             } else {
                 $label = substr_replace($prefix, "title=Stack level $j.", 2, 0).$lastCall;
             }
-            $a[substr_replace($label, sprintf('separator=%s&', $frame instanceof EnumStub ? ' ' : ':'), 2, 0)] = $frame;
+            $a[substr_replace($label, \sprintf('separator=%s&', $frame instanceof EnumStub ? ' ' : ':'), 2, 0)] = $frame;
 
             $lastCall = $call;
         }
@@ -240,7 +240,7 @@ class ExceptionCaster
                         if (isset($f['object'])) {
                             $template = $f['object'];
                         } elseif ((new \ReflectionClass($f['class']))->isInstantiable()) {
-                            $template = unserialize(sprintf('O:%d:"%s":0:{}', \strlen($f['class']), $f['class']));
+                            $template = unserialize(\sprintf('O:%d:"%s":0:{}', \strlen($f['class']), $f['class']));
                         }
                         if (null !== $template) {
                             $ellipsis = 0;
@@ -264,7 +264,7 @@ class ExceptionCaster
                             $ellipsis += 1 + \strlen($f['line']);
                         }
                     }
-                    $srcAttr .= sprintf('&separator= &file=%s&line=%d', rawurlencode($f['file']), $f['line']);
+                    $srcAttr .= \sprintf('&separator= &file=%s&line=%d', rawurlencode($f['file']), $f['line']);
                 } else {
                     $srcAttr .= '&separator=:';
                 }
@@ -295,7 +295,7 @@ class ExceptionCaster
     public static function castFlattenException(FlattenException $e, array $a, Stub $stub, bool $isNested)
     {
         if ($isNested) {
-            $k = sprintf(Caster::PATTERN_PRIVATE, FlattenException::class, 'traceAsString');
+            $k = \sprintf(Caster::PATTERN_PRIVATE, FlattenException::class, 'traceAsString');
             $a[$k] = new CutStub($a[$k]);
         }
 
@@ -323,7 +323,7 @@ class ExceptionCaster
         unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message']);
 
         if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
-            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']);
+            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)?[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']);
         }
 
         if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
@@ -411,7 +411,7 @@ class ExceptionCaster
                 }
             }
             $c->attr['lang'] = $lang;
-            $srcLines[sprintf("\0~separator=› &%d\0", $i + $line - $srcContext)] = $c;
+            $srcLines[\sprintf("\0~separator=› &%d\0", $i + $line - $srcContext)] = $c;
         }
 
         return new EnumStub($srcLines);
diff --git a/lib/symfony/var-dumper/Caster/FFICaster.php b/lib/symfony/var-dumper/Caster/FFICaster.php
index 7d90e7b57..973b69689 100644
--- a/lib/symfony/var-dumper/Caster/FFICaster.php
+++ b/lib/symfony/var-dumper/Caster/FFICaster.php
@@ -41,7 +41,7 @@ final class FFICaster
             $type = \FFI::typeof($data);
         }
 
-        $stub->class = sprintf('%s<%s> size %d align %d', ($data ?? $type)::class, $type->getName(), $type->getSize(), $type->getAlignment());
+        $stub->class = \sprintf('%s<%s> size %d align %d', ($data ?? $type)::class, $type->getName(), $type->getSize(), $type->getAlignment());
 
         return match ($type->getKind()) {
             CType::TYPE_FLOAT,
@@ -86,7 +86,7 @@ final class FFICaster
             CType::ABI_MS => '[ms]',
             CType::ABI_SYSV => '[sysv]',
             CType::ABI_VECTORCALL => '[vectorcall]',
-            default => '[unknown abi]'
+            default => '[unknown abi]',
         };
 
         $returnType = $type->getFuncReturnType();
@@ -97,7 +97,7 @@ final class FFICaster
         return [Caster::PREFIX_VIRTUAL.'returnType' => $returnType];
     }
 
-    private static function castFFIPointer(Stub $stub, CType $type, CData $data = null): array
+    private static function castFFIPointer(Stub $stub, CType $type, ?CData $data = null): array
     {
         $ptr = $type->getPointerType();
 
@@ -115,11 +115,21 @@ final class FFICaster
     private static function castFFIStringValue(CData $data): string|CutStub
     {
         $result = [];
+        $ffi = \FFI::cdef(<<<C
+            size_t zend_get_page_size(void);
+        C);
 
-        for ($i = 0; $i < self::MAX_STRING_LENGTH; ++$i) {
+        $pageSize = $ffi->zend_get_page_size();
+
+        // get cdata address
+        $start = $ffi->cast('uintptr_t', $ffi->cast('char*', $data))->cdata;
+        // accessing memory in the same page as $start is safe
+        $max = min(self::MAX_STRING_LENGTH, ($start | ($pageSize - 1)) - $start);
+
+        for ($i = 0; $i < $max; ++$i) {
             $result[$i] = $data[$i];
 
-            if ("\0" === $result[$i]) {
+            if ("\0" === $data[$i]) {
                 return implode('', $result);
             }
         }
@@ -132,7 +142,7 @@ final class FFICaster
         return $stub;
     }
 
-    private static function castFFIStructLike(CType $type, CData $data = null): array
+    private static function castFFIStructLike(CType $type, ?CData $data = null): array
     {
         $isUnion = ($type->getAttributes() & CType::ATTR_UNION) === CType::ATTR_UNION;
 
diff --git a/lib/symfony/var-dumper/Caster/LinkStub.php b/lib/symfony/var-dumper/Caster/LinkStub.php
index df95f8b0e..4930436df 100644
--- a/lib/symfony/var-dumper/Caster/LinkStub.php
+++ b/lib/symfony/var-dumper/Caster/LinkStub.php
@@ -23,7 +23,7 @@ class LinkStub extends ConstStub
     private static array $vendorRoots;
     private static array $composerRoots = [];
 
-    public function __construct(string $label, int $line = 0, string $href = null)
+    public function __construct(string $label, int $line = 0, ?string $href = null)
     {
         $this->value = $label;
 
diff --git a/lib/symfony/var-dumper/Caster/PgSqlCaster.php b/lib/symfony/var-dumper/Caster/PgSqlCaster.php
index 0d8b3d919..54228b524 100644
--- a/lib/symfony/var-dumper/Caster/PgSqlCaster.php
+++ b/lib/symfony/var-dumper/Caster/PgSqlCaster.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\VarDumper\Caster;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
- * Casts pqsql resources to array representation.
+ * Casts pgsql resources to array representation.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  *
@@ -140,11 +140,11 @@ class PgSqlCaster
         for ($i = 0; $i < $fields; ++$i) {
             $field = [
                 'name' => pg_field_name($result, $i),
-                'table' => sprintf('%s (OID: %s)', pg_field_table($result, $i), pg_field_table($result, $i, true)),
-                'type' => sprintf('%s (OID: %s)', pg_field_type($result, $i), pg_field_type_oid($result, $i)),
-                'nullable' => (bool) pg_field_is_null($result, $i),
+                'table' => \sprintf('%s (OID: %s)', pg_field_table($result, $i), pg_field_table($result, $i, true)),
+                'type' => \sprintf('%s (OID: %s)', pg_field_type($result, $i), pg_field_type_oid($result, $i)),
+                'nullable' => (bool) (\PHP_VERSION_ID >= 80300 ? pg_field_is_null($result, null, $i) : pg_field_is_null($result, $i)),
                 'storage' => pg_field_size($result, $i).' bytes',
-                'display' => pg_field_prtlen($result, $i).' chars',
+                'display' => (\PHP_VERSION_ID >= 80300 ? pg_field_prtlen($result, null, $i) : pg_field_prtlen($result, $i)).' chars',
             ];
             if (' (OID: )' === $field['table']) {
                 $field['table'] = null;
diff --git a/lib/symfony/var-dumper/Caster/ReflectionCaster.php b/lib/symfony/var-dumper/Caster/ReflectionCaster.php
index 4adb9bc9f..1bd156c24 100644
--- a/lib/symfony/var-dumper/Caster/ReflectionCaster.php
+++ b/lib/symfony/var-dumper/Caster/ReflectionCaster.php
@@ -45,7 +45,7 @@ class ReflectionCaster
 
         $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter);
 
-        if (!str_contains($c->name, '{closure}')) {
+        if (!str_contains($c->name, '{closure')) {
             $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name;
             unset($a[$prefix.'class']);
         }
@@ -89,13 +89,13 @@ class ReflectionCaster
         // Cannot create ReflectionGenerator based on a terminated Generator
         try {
             $reflectionGenerator = new \ReflectionGenerator($c);
+
+            return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
         } catch (\Exception) {
             $a[Caster::PREFIX_VIRTUAL.'closed'] = true;
 
             return $a;
         }
-
-        return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
     }
 
     /**
@@ -128,10 +128,16 @@ class ReflectionCaster
      */
     public static function castAttribute(\ReflectionAttribute $c, array $a, Stub $stub, bool $isNested)
     {
-        self::addMap($a, $c, [
+        $map = [
             'name' => 'getName',
             'arguments' => 'getArguments',
-        ]);
+        ];
+
+        if (\PHP_VERSION_ID >= 80400) {
+            unset($map['name']);
+        }
+
+        self::addMap($a, $c, $map);
 
         return $a;
     }
@@ -225,7 +231,7 @@ class ReflectionCaster
         if (isset($a[$prefix.'returnType'])) {
             $v = $a[$prefix.'returnType'];
             $v = $v instanceof \ReflectionNamedType ? $v->getName() : (string) $v;
-            $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && 'mixed' !== $v ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']);
+            $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && !\in_array($v, ['mixed', 'null'], true) ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']);
         }
         if (isset($a[$prefix.'class'])) {
             $a[$prefix.'class'] = new ClassStub($a[$prefix.'class']);
@@ -407,7 +413,7 @@ class ReflectionCaster
                     if (!$type instanceof \ReflectionNamedType) {
                         $signature .= $type.' ';
                     } else {
-                        if (!$param->isOptional() && $param->allowsNull() && 'mixed' !== $type->getName()) {
+                        if ($param->allowsNull() && !\in_array($type->getName(), ['mixed', 'null'], true)) {
                             $signature .= '?';
                         }
                         $signature .= substr(strrchr('\\'.$type->getName(), '\\'), 1).' ';
diff --git a/lib/symfony/var-dumper/Caster/SplCaster.php b/lib/symfony/var-dumper/Caster/SplCaster.php
index 814d824d1..f9c8a645e 100644
--- a/lib/symfony/var-dumper/Caster/SplCaster.php
+++ b/lib/symfony/var-dumper/Caster/SplCaster.php
@@ -141,7 +141,7 @@ class SplCaster
         }
 
         if (isset($a[$prefix.'perms'])) {
-            $a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
+            $a[$prefix.'perms'] = new ConstStub(\sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
         }
 
         static $mapDate = ['aTime', 'mTime', 'cTime'];
@@ -208,7 +208,7 @@ class SplCaster
             $storage[] = new EnumStub([
                 'object' => $obj,
                 'info' => $clone->getInfo(),
-             ]);
+            ]);
         }
 
         $a += [
@@ -249,7 +249,7 @@ class SplCaster
             $map[] = new EnumStub([
                 'object' => $obj,
                 'data' => $data,
-             ]);
+            ]);
         }
 
         $a += [
diff --git a/lib/symfony/var-dumper/Caster/SymfonyCaster.php b/lib/symfony/var-dumper/Caster/SymfonyCaster.php
index ebc00f90e..013b6c38c 100644
--- a/lib/symfony/var-dumper/Caster/SymfonyCaster.php
+++ b/lib/symfony/var-dumper/Caster/SymfonyCaster.php
@@ -54,7 +54,7 @@ class SymfonyCaster
      */
     public static function castHttpClient($client, array $a, Stub $stub, bool $isNested)
     {
-        $multiKey = sprintf("\0%s\0multi", $client::class);
+        $multiKey = \sprintf("\0%s\0multi", $client::class);
         if (isset($a[$multiKey])) {
             $a[$multiKey] = new CutStub($a[$multiKey]);
         }
@@ -90,12 +90,14 @@ class SymfonyCaster
 
         $instance = $a['realInstance'] ?? null;
 
-        $a = ['status' => new ConstStub(match ($a['status']) {
-            LazyObjectState::STATUS_INITIALIZED_FULL => 'INITIALIZED_FULL',
-            LazyObjectState::STATUS_INITIALIZED_PARTIAL => 'INITIALIZED_PARTIAL',
-            LazyObjectState::STATUS_UNINITIALIZED_FULL => 'UNINITIALIZED_FULL',
-            LazyObjectState::STATUS_UNINITIALIZED_PARTIAL => 'UNINITIALIZED_PARTIAL',
-        }, $a['status'])];
+        if (isset($a['status'])) { // forward-compat with Symfony 8
+            $a = ['status' => new ConstStub(match ($a['status']) {
+                LazyObjectState::STATUS_INITIALIZED_FULL => 'INITIALIZED_FULL',
+                LazyObjectState::STATUS_INITIALIZED_PARTIAL => 'INITIALIZED_PARTIAL',
+                LazyObjectState::STATUS_UNINITIALIZED_FULL => 'UNINITIALIZED_FULL',
+                LazyObjectState::STATUS_UNINITIALIZED_PARTIAL => 'UNINITIALIZED_PARTIAL',
+            }, $a['status'])];
+        }
 
         if ($instance) {
             $a['realInstance'] = $instance;
diff --git a/lib/symfony/var-dumper/Caster/TraceStub.php b/lib/symfony/var-dumper/Caster/TraceStub.php
index 5eea1c876..d215d8db0 100644
--- a/lib/symfony/var-dumper/Caster/TraceStub.php
+++ b/lib/symfony/var-dumper/Caster/TraceStub.php
@@ -25,7 +25,7 @@ class TraceStub extends Stub
     public $sliceLength;
     public $numberingOffset;
 
-    public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, int $sliceLength = null, int $numberingOffset = 0)
+    public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, ?int $sliceLength = null, int $numberingOffset = 0)
     {
         $this->value = $trace;
         $this->keepArgs = $keepArgs;
diff --git a/lib/symfony/var-dumper/Cloner/AbstractCloner.php b/lib/symfony/var-dumper/Cloner/AbstractCloner.php
index 6a746b88e..fc330bae2 100644
--- a/lib/symfony/var-dumper/Cloner/AbstractCloner.php
+++ b/lib/symfony/var-dumper/Cloner/AbstractCloner.php
@@ -219,7 +219,7 @@ abstract class AbstractCloner implements ClonerInterface
      *
      * @see addCasters
      */
-    public function __construct(array $casters = null)
+    public function __construct(?array $casters = null)
     {
         $this->addCasters($casters ?? static::$defaultCasters);
     }
diff --git a/lib/symfony/var-dumper/Cloner/Data.php b/lib/symfony/var-dumper/Cloner/Data.php
index 16f51b0c7..e5d776f5a 100644
--- a/lib/symfony/var-dumper/Cloner/Data.php
+++ b/lib/symfony/var-dumper/Cloner/Data.php
@@ -115,7 +115,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Stringable
     public function getIterator(): \Traversable
     {
         if (!\is_array($value = $this->getValue())) {
-            throw new \LogicException(sprintf('"%s" object holds non-iterable type "%s".', self::class, get_debug_type($value)));
+            throw new \LogicException(\sprintf('"%s" object holds non-iterable type "%s".', self::class, get_debug_type($value)));
         }
 
         yield from $value;
@@ -168,7 +168,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Stringable
             return (string) $value;
         }
 
-        return sprintf('%s (count=%d)', $this->getType(), \count($value));
+        return \sprintf('%s (count=%d)', $this->getType(), \count($value));
     }
 
     /**
@@ -298,7 +298,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Stringable
         if (!$item instanceof Stub) {
             $cursor->attr = [];
             $type = \gettype($item);
-            if ($item && 'array' === $type) {
+            if ('array' === $type && $item) {
                 $item = $this->getStub($item);
             }
         } elseif (Stub::TYPE_REF === $item->type) {
@@ -375,7 +375,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate, \Stringable
                     break;
 
                 default:
-                    throw new \RuntimeException(sprintf('Unexpected Stub type: "%s".', $item->type));
+                    throw new \RuntimeException(\sprintf('Unexpected Stub type: "%s".', $item->type));
             }
         } elseif ('array' === $type) {
             $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);
diff --git a/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php b/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php
deleted file mode 100644
index ed9db9884..000000000
--- a/lib/symfony/var-dumper/Cloner/Internal/NoDefault.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\VarDumper\Cloner\Internal;
-
-/**
- * Flags a typed property that has no default value.
- *
- * This dummy object is used to distinguish a property with a default value of null
- * from a property that is uninitialized by default.
- *
- * @internal
- */
-enum NoDefault
-{
-    case NoDefault;
-}
diff --git a/lib/symfony/var-dumper/Cloner/Stub.php b/lib/symfony/var-dumper/Cloner/Stub.php
index 0c2a4b9d0..406192128 100644
--- a/lib/symfony/var-dumper/Cloner/Stub.php
+++ b/lib/symfony/var-dumper/Cloner/Stub.php
@@ -40,29 +40,37 @@ class Stub
     public $position = 0;
     public $attr = [];
 
-    private static array $defaultProperties = [];
-
     /**
      * @internal
      */
-    public function __sleep(): array
+    protected static array $propertyDefaults = [];
+
+    public function __serialize(): array
     {
-        $properties = [];
+        static $noDefault = new \stdClass();
 
-        if (!isset(self::$defaultProperties[$c = static::class])) {
-            self::$defaultProperties[$c] = get_class_vars($c);
-
-            foreach ((new \ReflectionClass($c))->getStaticProperties() as $k => $v) {
-                unset(self::$defaultProperties[$c][$k]);
+        if (self::class === static::class) {
+            $data = [];
+            foreach ($this as $k => $v) {
+                $default = self::$propertyDefaults[$this::class][$k] ??= ($p = new \ReflectionProperty($this, $k))->hasDefaultValue() ? $p->getDefaultValue() : ($p->hasType() ? $noDefault : null);
+                if ($noDefault === $default || $default !== $v) {
+                    $data[$k] = $v;
+                }
             }
+
+            return $data;
         }
 
-        foreach (self::$defaultProperties[$c] as $k => $v) {
-            if ($this->$k !== $v) {
-                $properties[] = $k;
+        return \Closure::bind(function () use ($noDefault) {
+            $data = [];
+            foreach ($this as $k => $v) {
+                $default = self::$propertyDefaults[$this::class][$k] ??= ($p = new \ReflectionProperty($this, $k))->hasDefaultValue() ? $p->getDefaultValue() : ($p->hasType() ? $noDefault : null);
+                if ($noDefault === $default || $default !== $v) {
+                    $data[$k] = $v;
+                }
             }
-        }
 
-        return $properties;
+            return $data;
+        }, $this, $this::class)();
     }
 }
diff --git a/lib/symfony/var-dumper/Command/Descriptor/CliDescriptor.php b/lib/symfony/var-dumper/Command/Descriptor/CliDescriptor.php
index 4450fe986..ba9f8b941 100644
--- a/lib/symfony/var-dumper/Command/Descriptor/CliDescriptor.php
+++ b/lib/symfony/var-dumper/Command/Descriptor/CliDescriptor.php
@@ -47,7 +47,7 @@ class CliDescriptor implements DumpDescriptorInterface
         if (isset($context['request'])) {
             $request = $context['request'];
             $this->lastIdentifier = $request['identifier'];
-            $section = sprintf('%s %s', $request['method'], $request['uri']);
+            $section = \sprintf('%s %s', $request['method'], $request['uri']);
             if ($controller = $request['controller']) {
                 $rows[] = ['controller', rtrim($this->dumper->dump($controller, true), "\n")];
             }
@@ -62,9 +62,9 @@ class CliDescriptor implements DumpDescriptorInterface
 
         if (isset($context['source'])) {
             $source = $context['source'];
-            $sourceInfo = sprintf('%s on line %d', $source['name'], $source['line']);
+            $sourceInfo = \sprintf('%s on line %d', $source['name'], $source['line']);
             if ($fileLink = $source['file_link'] ?? null) {
-                $sourceInfo = sprintf('<href=%s>%s</>', $fileLink, $sourceInfo);
+                $sourceInfo = \sprintf('<href=%s>%s</>', $fileLink, $sourceInfo);
             }
             $rows[] = ['source', $sourceInfo];
             $file = $source['file_relative'] ?? $source['file'];
diff --git a/lib/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php b/lib/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php
index 98f150a5e..c5e2aab89 100644
--- a/lib/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php
+++ b/lib/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php
@@ -45,7 +45,7 @@ class HtmlDescriptor implements DumpDescriptorInterface
         if (isset($context['request'])) {
             $request = $context['request'];
             $controller = "<span class='dumped-tag'>{$this->dumper->dump($request['controller'], true, ['maxDepth' => 0])}</span>";
-            $title = sprintf('<code>%s</code> <a href="%s">%s</a>', $request['method'], $uri = $request['uri'], $uri);
+            $title = \sprintf('<code>%s</code> <a href="%s">%s</a>', $request['method'], $uri = $request['uri'], $uri);
             $dedupIdentifier = $request['identifier'];
         } elseif (isset($context['cli'])) {
             $title = '<code>$ </code>'.$context['cli']['command_line'];
@@ -58,9 +58,9 @@ class HtmlDescriptor implements DumpDescriptorInterface
         if (isset($context['source'])) {
             $source = $context['source'];
             $projectDir = $source['project_dir'] ?? null;
-            $sourceDescription = sprintf('%s on line %d', $source['name'], $source['line']);
+            $sourceDescription = \sprintf('%s on line %d', $source['name'], $source['line']);
             if (isset($source['file_link'])) {
-                $sourceDescription = sprintf('<a href="%s">%s</a>', $source['file_link'], $sourceDescription);
+                $sourceDescription = \sprintf('<a href="%s">%s</a>', $source['file_link'], $sourceDescription);
             }
         }
 
@@ -105,7 +105,7 @@ HTML
 
         $renderedTags = '';
         foreach ($tags as $key => $value) {
-            $renderedTags .= sprintf('<li><span class="badge">%s</span>%s</li>', $key, $value);
+            $renderedTags .= \sprintf('<li><span class="badge">%s</span>%s</li>', $key, $value);
         }
 
         return <<<HTML
diff --git a/lib/symfony/var-dumper/Command/ServerDumpCommand.php b/lib/symfony/var-dumper/Command/ServerDumpCommand.php
index b64a884b9..2218b477d 100644
--- a/lib/symfony/var-dumper/Command/ServerDumpCommand.php
+++ b/lib/symfony/var-dumper/Command/ServerDumpCommand.php
@@ -57,7 +57,7 @@ class ServerDumpCommand extends Command
     protected function configure(): void
     {
         $this
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format (%s)', implode(', ', $this->getAvailableFormats())), 'cli')
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format (%s)', implode(', ', $this->getAvailableFormats())), 'cli')
             ->setHelp(<<<'EOF'
 <info>%command.name%</info> starts a dump server that collects and displays
 dumps in a single place for debugging you application:
@@ -80,7 +80,7 @@ EOF
         $format = $input->getOption('format');
 
         if (!$descriptor = $this->descriptors[$format] ?? null) {
-            throw new InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
+            throw new InvalidArgumentException(\sprintf('Unsupported format "%s".', $format));
         }
 
         $errorIo = $io->getErrorStyle();
@@ -88,7 +88,7 @@ EOF
 
         $this->server->start();
 
-        $errorIo->success(sprintf('Server listening on %s', $this->server->getHost()));
+        $errorIo->success(\sprintf('Server listening on %s', $this->server->getHost()));
         $errorIo->comment('Quit the server with CONTROL-C.');
 
         $this->server->listen(function (Data $data, array $context, int $clientId) use ($descriptor, $io) {
diff --git a/lib/symfony/var-dumper/Dumper/AbstractDumper.php b/lib/symfony/var-dumper/Dumper/AbstractDumper.php
index 18f43d316..cf812be67 100644
--- a/lib/symfony/var-dumper/Dumper/AbstractDumper.php
+++ b/lib/symfony/var-dumper/Dumper/AbstractDumper.php
@@ -45,7 +45,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
      * @param string|null                   $charset The default character encoding to use for non-UTF8 strings
      * @param int                           $flags   A bit field of static::DUMP_* constants to fine tune dumps representation
      */
-    public function __construct($output = null, string $charset = null, int $flags = 0)
+    public function __construct($output = null, ?string $charset = null, int $flags = 0)
     {
         $this->flags = $flags;
         $this->setCharset($charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8');
@@ -188,17 +188,48 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
             return $s;
         }
 
-        if (!\function_exists('iconv')) {
-            throw new \RuntimeException('Unable to convert a non-UTF-8 string to UTF-8: required function iconv() does not exist. You should install ext-iconv or symfony/polyfill-iconv.');
+        if (\function_exists('iconv')) {
+            if (false !== $c = @iconv($this->charset, 'UTF-8', $s)) {
+                return $c;
+            }
+            if ('CP1252' !== $this->charset && false !== $c = @iconv('CP1252', 'UTF-8', $s)) {
+                return $c;
+            }
         }
 
-        if (false !== $c = @iconv($this->charset, 'UTF-8', $s)) {
-            return $c;
-        }
-        if ('CP1252' !== $this->charset && false !== $c = @iconv('CP1252', 'UTF-8', $s)) {
-            return $c;
+        $s .= $s;
+        $len = \strlen($s);
+        $mapCp1252 = false;
+
+        for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+            if ($s[$i] < "\x80") {
+                $s[$j] = $s[$i];
+            } elseif ($s[$i] < "\xC0") {
+                $s[$j] = "\xC2";
+                $s[++$j] = $s[$i];
+                if ($s[$i] < "\xA0") {
+                    $mapCp1252 = true;
+                }
+            } else {
+                $s[$j] = "\xC3";
+                $s[++$j] = \chr(\ord($s[$i]) - 64);
+            }
         }
 
-        return iconv('CP850', 'UTF-8', $s);
+        $s = substr($s, 0, $j);
+
+        if (!$mapCp1252) {
+            return $s;
+        }
+
+        return strtr($s, [
+            "\xC2\x80" => '€', "\xC2\x82" => '‚', "\xC2\x83" => 'ƒ', "\xC2\x84" => '„',
+            "\xC2\x85" => '…', "\xC2\x86" => '†', "\xC2\x87" => '‡', "\xC2\x88" => 'ˆ',
+            "\xC2\x89" => '‰', "\xC2\x8A" => 'Š', "\xC2\x8B" => '‹', "\xC2\x8C" => 'Œ',
+            "\xC2\x8D" => 'Ž', "\xC2\x91" => '‘', "\xC2\x92" => '’', "\xC2\x93" => '“',
+            "\xC2\x94" => '”', "\xC2\x95" => '•', "\xC2\x96" => '–', "\xC2\x97" => '—',
+            "\xC2\x98" => '˜', "\xC2\x99" => '™', "\xC2\x9A" => 'š', "\xC2\x9B" => '›',
+            "\xC2\x9C" => 'œ', "\xC2\x9E" => 'ž',
+        ]);
     }
 }
diff --git a/lib/symfony/var-dumper/Dumper/CliDumper.php b/lib/symfony/var-dumper/Dumper/CliDumper.php
index f93c2f5ad..6dc991c6a 100644
--- a/lib/symfony/var-dumper/Dumper/CliDumper.php
+++ b/lib/symfony/var-dumper/Dumper/CliDumper.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\VarDumper\Dumper;
 
+use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
 use Symfony\Component\VarDumper\Cloner\Cursor;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
@@ -63,7 +64,7 @@ class CliDumper extends AbstractDumper
 
     private bool $handlesHrefGracefully;
 
-    public function __construct($output = null, string $charset = null, int $flags = 0)
+    public function __construct($output = null, ?string $charset = null, int $flags = 0)
     {
         parent::__construct($output, $charset, $flags);
 
@@ -82,7 +83,7 @@ class CliDumper extends AbstractDumper
             ]);
         }
 
-        $this->displayOptions['fileLinkFormat'] = \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
+        $this->displayOptions['fileLinkFormat'] = class_exists(FileLinkFormatter::class) ? new FileLinkFormatter() : (\ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l');
     }
 
     /**
@@ -482,7 +483,7 @@ class CliDumper extends AbstractDumper
             $s = $startCchr;
             $c = $c[$i = 0];
             do {
-                $s .= $map[$c[$i]] ?? sprintf('\x%02X', \ord($c[$i]));
+                $s .= $map[$c[$i]] ?? \sprintf('\x%02X', \ord($c[$i]));
             } while (isset($c[++$i]));
 
             return $s.$endCchr;
@@ -577,8 +578,12 @@ class CliDumper extends AbstractDumper
      */
     protected function dumpLine(int $depth, bool $endOfValue = false)
     {
+        if (null === $this->colors) {
+            $this->colors = $this->supportsColors();
+        }
+
         if ($this->colors) {
-            $this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
+            $this->line = \sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
         }
         parent::dumpLine($depth);
     }
@@ -616,23 +621,34 @@ class CliDumper extends AbstractDumper
         }
 
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 
-        if ('Hyper' === getenv('TERM_PROGRAM')) {
+        // Detect msysgit/mingw and assume this is a tty because detection
+        // does not work correctly, see https://github.com/composer/composer/issues/9690
+        if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
+            return false;
+        }
+
+        if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($stream)) {
             return true;
         }
 
-        if (\DIRECTORY_SEPARATOR === '\\') {
-            return (\function_exists('sapi_windows_vt100_support')
-                && @sapi_windows_vt100_support($stream))
-                || false !== getenv('ANSICON')
-                || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM');
+        if ('Hyper' === getenv('TERM_PROGRAM')
+            || false !== getenv('COLORTERM')
+            || false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+        ) {
+            return true;
         }
 
-        return stream_isatty($stream);
+        if ('dumb' === $term = (string) getenv('TERM')) {
+            return false;
+        }
+
+        // See https://github.com/chalk/supports-color/blob/d4f413efaf8da045c5ab440ed418ef02dbb28bf1/index.js#L157
+        return preg_match('/^((screen|xterm|vt100|vt220|putty|rxvt|ansi|cygwin|linux).*)|(.*-256(color)?(-bce)?)$/', $term);
     }
 
     /**
@@ -650,7 +666,7 @@ class CliDumper extends AbstractDumper
             || 'Hyper' === getenv('TERM_PROGRAM');
 
         if (!$result) {
-            $version = sprintf(
+            $version = \sprintf(
                 '%s.%s.%s',
                 PHP_WINDOWS_VERSION_MAJOR,
                 PHP_WINDOWS_VERSION_MINOR,
diff --git a/lib/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php b/lib/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php
index 38f878971..292b1a410 100644
--- a/lib/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php
+++ b/lib/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php
@@ -26,7 +26,7 @@ final class CliContextProvider implements ContextProviderInterface
 
         return [
             'command_line' => $commandLine = implode(' ', $_SERVER['argv'] ?? []),
-            'identifier' => hash('crc32b', $commandLine.$_SERVER['REQUEST_TIME_FLOAT']),
+            'identifier' => hash('xxh128', $commandLine.'@'.$_SERVER['REQUEST_TIME_FLOAT']),
         ];
     }
 }
diff --git a/lib/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php b/lib/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php
index 69dff067b..341fd323e 100644
--- a/lib/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php
+++ b/lib/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php
@@ -45,7 +45,7 @@ final class RequestContextProvider implements ContextProviderInterface
             'uri' => $request->getUri(),
             'method' => $request->getMethod(),
             'controller' => $controller ? $this->cloner->cloneVar($controller) : $controller,
-            'identifier' => spl_object_hash($request),
+            'identifier' => hash('xxh128', spl_object_id($request).'@'.$_SERVER['REQUEST_TIME_FLOAT']),
         ];
     }
 }
diff --git a/lib/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php b/lib/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
index ab85bfa95..cadddfac4 100644
--- a/lib/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
+++ b/lib/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
@@ -31,7 +31,7 @@ final class SourceContextProvider implements ContextProviderInterface
     private ?string $projectDir;
     private FileLinkFormatter|LegacyFileLinkFormatter|null $fileLinkFormatter;
 
-    public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter|LegacyFileLinkFormatter $fileLinkFormatter = null, int $limit = 9)
+    public function __construct(?string $charset = null, ?string $projectDir = null, FileLinkFormatter|LegacyFileLinkFormatter|null $fileLinkFormatter = null, int $limit = 9)
     {
         $this->charset = $charset;
         $this->projectDir = $projectDir;
diff --git a/lib/symfony/var-dumper/Dumper/HtmlDumper.php b/lib/symfony/var-dumper/Dumper/HtmlDumper.php
index f276bfdd2..4fa892ea1 100644
--- a/lib/symfony/var-dumper/Dumper/HtmlDumper.php
+++ b/lib/symfony/var-dumper/Dumper/HtmlDumper.php
@@ -75,7 +75,7 @@ class HtmlDumper extends CliDumper
     ];
     private array $extraDisplayOptions = [];
 
-    public function __construct($output = null, string $charset = null, int $flags = 0)
+    public function __construct($output = null, ?string $charset = null, int $flags = 0)
     {
         AbstractDumper::__construct($output, $charset, $flags);
         $this->dumpId = 'sf-dump-'.mt_rand();
@@ -98,7 +98,7 @@ class HtmlDumper extends CliDumper
     public function setTheme(string $themeName)
     {
         if (!isset(static::$themes[$themeName])) {
-            throw new \InvalidArgumentException(sprintf('Theme "%s" does not exist in class "%s".', $themeName, static::class));
+            throw new \InvalidArgumentException(\sprintf('Theme "%s" does not exist in class "%s".', $themeName, static::class));
         }
 
         $this->setStyles(static::$themes[$themeName]);
@@ -663,7 +663,7 @@ pre.sf-dump:after {
    height: 0;
    clear: both;
 }
-pre.sf-dump span {
+pre.sf-dump .sf-dump-ellipsization {
     display: inline-flex;
 }
 pre.sf-dump a {
@@ -681,16 +681,12 @@ pre.sf-dump img {
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAHUlEQVQY02O8zAABilCaiQEN0EeA8QuUcX9g3QEAAjcC5piyhyEAAAAASUVORK5CYII=) #D3D3D3;
 }
 pre.sf-dump .sf-dump-ellipsis {
-    display: inline-block;
-    overflow: visible;
     text-overflow: ellipsis;
-    max-width: 5em;
     white-space: nowrap;
     overflow: hidden;
-    vertical-align: top;
 }
-pre.sf-dump .sf-dump-ellipsis+.sf-dump-ellipsis {
-    max-width: none;
+pre.sf-dump .sf-dump-ellipsis-tail {
+    flex-shrink: 0;
 }
 pre.sf-dump code {
     display:inline;
@@ -796,7 +792,7 @@ EOHTML
             $this->line .= $cursor->depth >= $this->displayOptions['maxDepth'] ? ' <samp class=sf-dump-compact>' : ' <samp class=sf-dump-expanded>';
             $this->endValue($cursor);
             $this->line .= $this->indentPad;
-            $this->line .= sprintf('<img src="data:%s;base64,%s" /></samp>', $cursor->attr['content-type'], base64_encode($cursor->attr['img-data']));
+            $this->line .= \sprintf('<img src="data:%s;base64,%s" /></samp>', $cursor->attr['content-type'], base64_encode($cursor->attr['img-data']));
             $this->endValue($cursor);
         } else {
             parent::dumpString($cursor, $str, $bin, $cut);
@@ -827,7 +823,7 @@ EOHTML
                 $r = Cursor::HASH_OBJECT !== $type ? 1 - (Cursor::HASH_RESOURCE !== $type) : 2;
                 $r .= $r && 0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->refIndex;
 
-                $this->line .= sprintf(' id=%s-ref%s', $this->dumpId, $r);
+                $this->line .= \sprintf(' id=%s-ref%s', $this->dumpId, $r);
             }
             $this->line .= $eol;
             $this->dumpLine($cursor->depth);
@@ -856,73 +852,82 @@ EOHTML
 
         if ('ref' === $style) {
             if (empty($attr['count'])) {
-                return sprintf('<a class=sf-dump-ref>%s</a>', $v);
+                return \sprintf('<a class=sf-dump-ref>%s</a>', $v);
             }
             $r = ('#' !== $v[0] ? 1 - ('@' !== $v[0]) : 2).substr($value, 1);
 
-            return sprintf('<a class=sf-dump-ref href=#%s-ref%s title="%d occurrences">%s</a>', $this->dumpId, $r, 1 + $attr['count'], $v);
+            return \sprintf('<a class=sf-dump-ref href=#%s-ref%s title="%d occurrences">%s</a>', $this->dumpId, $r, 1 + $attr['count'], $v);
         }
 
+        $dumpClasses = ['sf-dump-'.$style];
+        $dumpTitle = '';
+
         if ('const' === $style && isset($attr['value'])) {
-            $style .= sprintf(' title="%s"', esc(\is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
+            $dumpTitle = esc(\is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value']));
         } elseif ('public' === $style) {
-            $style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
+            $dumpTitle = empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property';
         } elseif ('str' === $style && 1 < $attr['length']) {
-            $style .= sprintf(' title="%d%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
+            $dumpTitle = \sprintf('%d%s characters', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
         } elseif ('note' === $style && 0 < ($attr['depth'] ?? 0) && false !== $c = strrpos($value, '\\')) {
-            $style .= ' title=""';
             $attr += [
                 'ellipsis' => \strlen($value) - $c,
                 'ellipsis-type' => 'note',
                 'ellipsis-tail' => 1,
             ];
         } elseif ('protected' === $style) {
-            $style .= ' title="Protected property"';
+            $dumpTitle = 'Protected property';
         } elseif ('meta' === $style && isset($attr['title'])) {
-            $style .= sprintf(' title="%s"', esc($this->utf8Encode($attr['title'])));
+            $dumpTitle = esc($this->utf8Encode($attr['title']));
         } elseif ('private' === $style) {
-            $style .= sprintf(' title="Private property defined in class:&#10;`%s`"', esc($this->utf8Encode($attr['class'])));
+            $dumpTitle = \sprintf('Private property defined in class:&#10;`%s`', esc($this->utf8Encode($attr['class'])));
         }
 
         if (isset($attr['ellipsis'])) {
-            $class = 'sf-dump-ellipsis';
+            $dumpClasses[] = 'sf-dump-ellipsization';
+            $ellipsisClass = 'sf-dump-ellipsis';
             if (isset($attr['ellipsis-type'])) {
-                $class = sprintf('"%s sf-dump-ellipsis-%s"', $class, $attr['ellipsis-type']);
+                $ellipsisClass .= ' sf-dump-ellipsis-'.$attr['ellipsis-type'];
             }
             $label = esc(substr($value, -$attr['ellipsis']));
-            $style = str_replace(' title="', " title=\"$v\n", $style);
-            $v = sprintf('<span class=%s>%s</span>', $class, substr($v, 0, -\strlen($label)));
+            $dumpTitle = $v."\n".$dumpTitle;
+            $v = \sprintf('<span class="%s">%s</span>', $ellipsisClass, substr($v, 0, -\strlen($label)));
 
             if (!empty($attr['ellipsis-tail'])) {
                 $tail = \strlen(esc(substr($value, -$attr['ellipsis'], $attr['ellipsis-tail'])));
-                $v .= sprintf('<span class=%s>%s</span>%s', $class, substr($label, 0, $tail), substr($label, $tail));
+                $v .= \sprintf('<span class="%s">%s</span><span class="sf-dump-ellipsis-tail">%s</span>', $ellipsisClass, substr($label, 0, $tail), substr($label, $tail));
             } else {
-                $v .= $label;
+                $v .= \sprintf('<span class="sf-dump-ellipsis-tail">%s</span>', $label);
             }
         }
 
         $map = static::$controlCharsMap;
-        $v = "<span class=sf-dump-{$style}>".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
-            $s = $b = '<span class="sf-dump-default';
-            $c = $c[$i = 0];
-            if ($ns = "\r" === $c[$i] || "\n" === $c[$i]) {
-                $s .= ' sf-dump-ns';
-            }
-            $s .= '">';
-            do {
-                if (("\r" === $c[$i] || "\n" === $c[$i]) !== $ns) {
-                    $s .= '</span>'.$b;
-                    if ($ns = !$ns) {
-                        $s .= ' sf-dump-ns';
-                    }
-                    $s .= '">';
+        $v = \sprintf(
+            '<span class=%s%s%1$s%s>%s</span>',
+            1 === \count($dumpClasses) ? '' : '"',
+            implode(' ', $dumpClasses),
+            $dumpTitle ? ' title="'.$dumpTitle.'"' : '',
+            preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
+                $s = $b = '<span class="sf-dump-default';
+                $c = $c[$i = 0];
+                if ($ns = "\r" === $c[$i] || "\n" === $c[$i]) {
+                    $s .= ' sf-dump-ns';
                 }
+                $s .= '">';
+                do {
+                    if (("\r" === $c[$i] || "\n" === $c[$i]) !== $ns) {
+                        $s .= '</span>'.$b;
+                        if ($ns = !$ns) {
+                            $s .= ' sf-dump-ns';
+                        }
+                        $s .= '">';
+                    }
 
-                $s .= $map[$c[$i]] ?? sprintf('\x%02X', \ord($c[$i]));
-            } while (isset($c[++$i]));
+                    $s .= $map[$c[$i]] ?? \sprintf('\x%02X', \ord($c[$i]));
+                } while (isset($c[++$i]));
 
-            return $s.'</span>';
-        }, $v).'</span>';
+                return $s.'</span>';
+            }, $v)
+        );
 
         if (!($attr['binary'] ?? false)) {
             $v = preg_replace_callback(static::$unicodeCharsRx, function ($c) {
@@ -938,10 +943,10 @@ EOHTML
                 $v .= '^';
             }
             $target = isset($attr['file']) ? '' : ' target="_blank"';
-            $v = sprintf('<a href="%s"%s rel="noopener noreferrer">%s</a>', esc($this->utf8Encode($attr['href'])), $target, $v);
+            $v = \sprintf('<a href="%s"%s rel="noopener noreferrer">%s</a>', esc($this->utf8Encode($attr['href'])), $target, $v);
         }
         if (isset($attr['lang'])) {
-            $v = sprintf('<code class="%s">%s</code>', esc($attr['lang']), $v);
+            $v = \sprintf('<code class="%s">%s</code>', esc($attr['lang']), $v);
         }
         if ('label' === $style) {
             $v .= ' ';
@@ -956,7 +961,7 @@ EOHTML
     protected function dumpLine(int $depth, bool $endOfValue = false)
     {
         if (-1 === $this->lastDepth) {
-            $this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
+            $this->line = \sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
         }
         if ($this->headerIsDumped !== ($this->outputStream ?? $this->lineDumper)) {
             $this->line = $this->getDumpHeader().$this->line;
@@ -968,7 +973,7 @@ EOHTML
                 $args[] = json_encode($this->extraDisplayOptions, \JSON_FORCE_OBJECT);
             }
             // Replace is for BC
-            $this->line .= sprintf(str_replace('"%s"', '%s', $this->dumpSuffix), implode(', ', $args));
+            $this->line .= \sprintf(str_replace('"%s"', '%s', $this->dumpSuffix), implode(', ', $args));
         }
         $this->lastDepth = $depth;
 
diff --git a/lib/symfony/var-dumper/Dumper/ServerDumper.php b/lib/symfony/var-dumper/Dumper/ServerDumper.php
index 98c214933..60fdd7ac3 100644
--- a/lib/symfony/var-dumper/Dumper/ServerDumper.php
+++ b/lib/symfony/var-dumper/Dumper/ServerDumper.php
@@ -30,7 +30,7 @@ class ServerDumper implements DataDumperInterface
      * @param DataDumperInterface|null   $wrappedDumper    A wrapped instance used whenever we failed contacting the server
      * @param ContextProviderInterface[] $contextProviders Context providers indexed by context name
      */
-    public function __construct(string $host, DataDumperInterface $wrappedDumper = null, array $contextProviders = [])
+    public function __construct(string $host, ?DataDumperInterface $wrappedDumper = null, array $contextProviders = [])
     {
         $this->connection = new Connection($host, $contextProviders);
         $this->wrappedDumper = $wrappedDumper;
diff --git a/lib/symfony/var-dumper/Resources/bin/var-dump-server b/lib/symfony/var-dumper/Resources/bin/var-dump-server
old mode 100644
new mode 100755
diff --git a/lib/symfony/var-dumper/Resources/functions/dump.php b/lib/symfony/var-dumper/Resources/functions/dump.php
index f2ff74c0c..95ef85c1c 100644
--- a/lib/symfony/var-dumper/Resources/functions/dump.php
+++ b/lib/symfony/var-dumper/Resources/functions/dump.php
@@ -45,7 +45,7 @@ if (!function_exists('dump')) {
 if (!function_exists('dd')) {
     function dd(mixed ...$vars): never
     {
-        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) && !headers_sent()) {
+        if (!in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) && !headers_sent()) {
             header('HTTP/1.1 500 Internal Server Error');
         }
 
diff --git a/lib/symfony/var-dumper/Server/DumpServer.php b/lib/symfony/var-dumper/Server/DumpServer.php
index 8df05a150..1948134b4 100644
--- a/lib/symfony/var-dumper/Server/DumpServer.php
+++ b/lib/symfony/var-dumper/Server/DumpServer.php
@@ -32,7 +32,7 @@ class DumpServer
      */
     private $socket;
 
-    public function __construct(string $host, LoggerInterface $logger = null)
+    public function __construct(string $host, ?LoggerInterface $logger = null)
     {
         if (!str_contains($host, '://')) {
             $host = 'tcp://'.$host;
@@ -45,7 +45,7 @@ class DumpServer
     public function start(): void
     {
         if (!$this->socket = stream_socket_server($this->host, $errno, $errstr)) {
-            throw new \RuntimeException(sprintf('Server start failed on "%s": ', $this->host).$errstr.' '.$errno);
+            throw new \RuntimeException(\sprintf('Server start failed on "%s": ', $this->host).$errstr.' '.$errno);
         }
     }
 
diff --git a/lib/symfony/var-dumper/VarDumper.php b/lib/symfony/var-dumper/VarDumper.php
index baff2115b..e1400f150 100644
--- a/lib/symfony/var-dumper/VarDumper.php
+++ b/lib/symfony/var-dumper/VarDumper.php
@@ -52,7 +52,7 @@ class VarDumper
         return (self::$handler)($var, $label);
     }
 
-    public static function setHandler(callable $callable = null): ?callable
+    public static function setHandler(?callable $callable = null): ?callable
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/var-dumper', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -96,7 +96,7 @@ class VarDumper
             $dumper = new ContextualizedDumper($dumper, [new SourceContextProvider()]);
         }
 
-        self::$handler = function ($var, string $label = null) use ($cloner, $dumper) {
+        self::$handler = function ($var, ?string $label = null) use ($cloner, $dumper) {
             $var = $cloner->cloneVar($var);
 
             if (null !== $label) {
diff --git a/lib/symfony/var-dumper/composer.json b/lib/symfony/var-dumper/composer.json
index e6166f86d..4863061c2 100644
--- a/lib/symfony/var-dumper/composer.json
+++ b/lib/symfony/var-dumper/composer.json
@@ -21,7 +21,6 @@
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "ext-iconv": "*",
         "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/error-handler": "^6.3|^7.0",
         "symfony/http-kernel": "^5.4|^6.0|^7.0",
diff --git a/lib/symfony/web-profiler-bundle/Controller/ExceptionPanelController.php b/lib/symfony/web-profiler-bundle/Controller/ExceptionPanelController.php
index 1e3168baf..a0704bb53 100644
--- a/lib/symfony/web-profiler-bundle/Controller/ExceptionPanelController.php
+++ b/lib/symfony/web-profiler-bundle/Controller/ExceptionPanelController.php
@@ -28,7 +28,7 @@ class ExceptionPanelController
     private HtmlErrorRenderer $errorRenderer;
     private ?Profiler $profiler;
 
-    public function __construct(HtmlErrorRenderer $errorRenderer, Profiler $profiler = null)
+    public function __construct(HtmlErrorRenderer $errorRenderer, ?Profiler $profiler = null)
     {
         $this->errorRenderer = $errorRenderer;
         $this->profiler = $profiler;
diff --git a/lib/symfony/web-profiler-bundle/Controller/ProfilerController.php b/lib/symfony/web-profiler-bundle/Controller/ProfilerController.php
index df36246cb..5a809f7c7 100644
--- a/lib/symfony/web-profiler-bundle/Controller/ProfilerController.php
+++ b/lib/symfony/web-profiler-bundle/Controller/ProfilerController.php
@@ -41,7 +41,7 @@ class ProfilerController
     private ?ContentSecurityPolicyHandler $cspHandler;
     private ?string $baseDir;
 
-    public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ContentSecurityPolicyHandler $cspHandler = null, string $baseDir = null)
+    public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null)
     {
         $this->generator = $generator;
         $this->profiler = $profiler;
@@ -105,7 +105,7 @@ class ProfilerController
         }
 
         if (!$profile->hasCollector($panel)) {
-            throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
+            throw new NotFoundHttpException(\sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
         }
 
         return $this->renderWithCspNonces($request, $this->getTemplateManager()->getName($profile, $panel), [
@@ -127,7 +127,7 @@ class ProfilerController
      *
      * @throws NotFoundHttpException
      */
-    public function toolbarAction(Request $request, string $token = null): Response
+    public function toolbarAction(Request $request, ?string $token = null): Response
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -180,7 +180,7 @@ class ProfilerController
         $this->cspHandler?->disableCsp();
 
         $session = null;
-        if ($request->attributes->getBoolean('_stateless') && $request->hasSession()) {
+        if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()) {
             $session = $request->getSession();
         }
 
@@ -343,12 +343,12 @@ class ProfilerController
     {
         $this->denyAccessIfProfilerDisabled();
         if ('JetBrainsMono' !== $fontName) {
-            throw new NotFoundHttpException(sprintf('Font file "%s.woff2" not found.', $fontName));
+            throw new NotFoundHttpException(\sprintf('Font file "%s.woff2" not found.', $fontName));
         }
 
         $fontFile = \dirname(__DIR__).'/Resources/fonts/'.$fontName.'.woff2';
         if (!is_file($fontFile) || !is_readable($fontFile)) {
-            throw new NotFoundHttpException(sprintf('Cannot read font file "%s".', $fontFile));
+            throw new NotFoundHttpException(\sprintf('Cannot read font file "%s".', $fontFile));
         }
 
         $this->profiler?->disable();
@@ -375,7 +375,7 @@ class ProfilerController
         $filename = $this->baseDir.\DIRECTORY_SEPARATOR.$file;
 
         if (preg_match("'(^|[/\\\\])\.'", $file) || !is_readable($filename)) {
-            throw new NotFoundHttpException(sprintf('The file "%s" cannot be opened.', $file));
+            throw new NotFoundHttpException(\sprintf('The file "%s" cannot be opened.', $file));
         }
 
         return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/open.html.twig', [
diff --git a/lib/symfony/web-profiler-bundle/Controller/RouterController.php b/lib/symfony/web-profiler-bundle/Controller/RouterController.php
index 04841e3cf..f4e46b0a0 100644
--- a/lib/symfony/web-profiler-bundle/Controller/RouterController.php
+++ b/lib/symfony/web-profiler-bundle/Controller/RouterController.php
@@ -40,7 +40,7 @@ class RouterController
      */
     private iterable $expressionLanguageProviders;
 
-    public function __construct(?Profiler $profiler, Environment $twig, UrlMatcherInterface $matcher = null, RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
+    public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
     {
         $this->profiler = $profiler;
         $this->twig = $twig;
@@ -83,10 +83,10 @@ class RouterController
      */
     private function getTraces(RequestDataCollector $request, string $method): array
     {
-        $traceRequest = Request::create(
-            $request->getPathInfo(),
-            $request->getRequestServer(true)->get('REQUEST_METHOD'),
-            \in_array($request->getMethod(), ['DELETE', 'PATCH', 'POST', 'PUT'], true) ? $request->getRequestRequest()->all() : $request->getRequestQuery()->all(),
+        $traceRequest = new Request(
+            $request->getRequestQuery()->all(),
+            $request->getRequestRequest()->all(),
+            $request->getRequestAttributes()->all(),
             $request->getRequestCookies(true)->all(),
             [],
             $request->getRequestServer(true)->all()
diff --git a/lib/symfony/web-profiler-bundle/Csp/ContentSecurityPolicyHandler.php b/lib/symfony/web-profiler-bundle/Csp/ContentSecurityPolicyHandler.php
index f7d8f5f15..c35265bc0 100644
--- a/lib/symfony/web-profiler-bundle/Csp/ContentSecurityPolicyHandler.php
+++ b/lib/symfony/web-profiler-bundle/Csp/ContentSecurityPolicyHandler.php
@@ -124,10 +124,10 @@ class ContentSecurityPolicyHandler
         $headers = $this->getCspHeaders($response);
 
         $types = [
-          'script-src' => 'csp_script_nonce',
-          'script-src-elem' => 'csp_script_nonce',
-          'style-src' => 'csp_style_nonce',
-          'style-src-elem' => 'csp_style_nonce',
+            'script-src' => 'csp_script_nonce',
+            'script-src-elem' => 'csp_script_nonce',
+            'style-src' => 'csp_style_nonce',
+            'style-src-elem' => 'csp_style_nonce',
         ];
 
         foreach ($headers as $header => $directives) {
@@ -152,7 +152,7 @@ class ContentSecurityPolicyHandler
                 if (!\in_array('\'unsafe-inline\'', $headers[$header][$type], true)) {
                     $headers[$header][$type][] = '\'unsafe-inline\'';
                 }
-                $headers[$header][$type][] = sprintf('\'nonce-%s\'', $nonces[$tokenName]);
+                $headers[$header][$type][] = \sprintf('\'nonce-%s\'', $nonces[$tokenName]);
             }
         }
 
@@ -180,7 +180,7 @@ class ContentSecurityPolicyHandler
      */
     private function generateCspHeader(array $directives): string
     {
-        return array_reduce(array_keys($directives), fn ($res, $name) => ('' !== $res ? $res.'; ' : '').sprintf('%s %s', $name, implode(' ', $directives[$name])), '');
+        return array_reduce(array_keys($directives), fn ($res, $name) => ('' !== $res ? $res.'; ' : '').\sprintf('%s %s', $name, implode(' ', $directives[$name])), '');
     }
 
     /**
diff --git a/lib/symfony/web-profiler-bundle/EventListener/WebDebugToolbarListener.php b/lib/symfony/web-profiler-bundle/EventListener/WebDebugToolbarListener.php
index 891ede6c9..4086938a3 100644
--- a/lib/symfony/web-profiler-bundle/EventListener/WebDebugToolbarListener.php
+++ b/lib/symfony/web-profiler-bundle/EventListener/WebDebugToolbarListener.php
@@ -48,7 +48,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface
     private ?ContentSecurityPolicyHandler $cspHandler;
     private ?DumpDataCollector $dumpDataCollector;
 
-    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null)
+    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, ?UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ?ContentSecurityPolicyHandler $cspHandler = null, ?DumpDataCollector $dumpDataCollector = null)
     {
         $this->twig = $twig;
         $this->urlGenerator = $urlGenerator;
@@ -67,7 +67,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface
     public function setMode(int $mode): void
     {
         if (self::DISABLED !== $mode && self::ENABLED !== $mode) {
-            throw new \InvalidArgumentException(sprintf('Invalid value provided for mode, use one of "%s::DISABLED" or "%s::ENABLED".', self::class, self::class));
+            throw new \InvalidArgumentException(\sprintf('Invalid value provided for mode, use one of "%s::DISABLED" or "%s::ENABLED".', self::class, self::class));
         }
 
         $this->mode = $mode;
@@ -107,7 +107,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface
             return;
         }
 
-        if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) {
+        if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat() && $response->headers->has('Location')) {
             if ($request->hasSession() && ($session = $request->getSession())->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) {
                 // keep current flashes for one more request if using AutoExpireFlashBag
                 $session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
diff --git a/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php b/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
index c75158c97..4a14881e0 100644
--- a/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
+++ b/lib/symfony/web-profiler-bundle/Profiler/TemplateManager.php
@@ -45,7 +45,7 @@ class TemplateManager
         $templates = $this->getNames($profile);
 
         if (!isset($templates[$panel])) {
-            throw new NotFoundHttpException(sprintf('Panel "%s" is not registered in profiler or is not present in viewed profile.', $panel));
+            throw new NotFoundHttpException(\sprintf('Panel "%s" is not registered in profiler or is not present in viewed profile.', $panel));
         }
 
         return $templates[$panel];
@@ -77,7 +77,7 @@ class TemplateManager
             }
 
             if (!$loader->exists($template.'.html.twig')) {
-                throw new \UnexpectedValueException(sprintf('The profiler template "%s.html.twig" for data collector "%s" does not exist.', $template, $name));
+                throw new \UnexpectedValueException(\sprintf('The profiler template "%s.html.twig" for data collector "%s" does not exist.', $template, $name));
             }
 
             $templates[$name] = $template.'.html.twig';
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Collector/form.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Collector/form.html.twig
index 727717fbb..37f00acac 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Collector/form.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Collector/form.html.twig
@@ -458,7 +458,7 @@
                 </div>
             </div>
 
-            <div class="tab {{ data.submitted_data ?? [] is empty ? 'disabled' }}">
+            <div class="tab {{ (data.submitted_data ?? []) is empty ? 'disabled' }}">
                 <h3 class="tab-title">Submitted Data</h3>
 
                 <div class="tab-content">
@@ -466,7 +466,7 @@
                 </div>
             </div>
 
-            <div class="tab {{ data.passed_options ?? [] is empty ? 'disabled' }}">
+            <div class="tab {{ (data.passed_options ?? []) is empty ? 'disabled' }}">
                 <h3 class="tab-title">Passed Options</h3>
 
                 <div class="tab-content">
@@ -474,7 +474,7 @@
                 </div>
             </div>
 
-            <div class="tab {{ data.resolved_options ?? [] is empty ? 'disabled' }}">
+            <div class="tab {{ (data.resolved_options ?? []) is empty ? 'disabled' }}">
                 <h3 class="tab-title">Resolved Options</h3>
 
                 <div class="tab-content">
@@ -482,7 +482,7 @@
                 </div>
             </div>
 
-            <div class="tab {{ data.view_vars ?? [] is empty ? 'disabled' }}">
+            <div class="tab {{ (data.view_vars ?? []) is empty ? 'disabled' }}">
                 <h3 class="tab-title">View Vars</h3>
 
                 <div class="tab-content">
@@ -646,8 +646,10 @@
                     <td>{{ profiler_dump(value) }}</td>
                     <td>
                         {# values can be stubs #}
-                        {% set option_value = value.value|default(value) %}
-                        {% set resolved_option_value = data.resolved_options[option].value|default(data.resolved_options[option]) %}
+                        {% set option_value = (value.value is defined) ? value.value : value %}
+                        {% set resolved_option_value = (data.resolved_options[option].value is defined)
+                            ? data.resolved_options[option].value
+                            : data.resolved_options[option] %}
                         {% if resolved_option_value == option_value %}
                             <em class="font-normal text-muted">same as passed value</em>
                         {% else %}
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Collector/mailer.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Collector/mailer.html.twig
index 386438b82..e220e73d4 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Collector/mailer.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Collector/mailer.html.twig
@@ -278,8 +278,24 @@
                             {% for event in collector.events.events(transport) %}
                                 <tr class="mailer-email-summary-table-row {{ loop.first ? 'active' }}" data-target="#email-{{ loop.index }}">
                                     <td>{{ loop.index }}</td>
-                                    <td>{{ event.message.getSubject() ?? '(No subject)' }}</td>
-                                    <td>{{ event.message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</td>
+                                    <td>
+                                        {% if event.message.subject is defined %}
+                                            {{ event.message.getSubject() ?? '(No subject)' }}
+                                        {% elseif event.message.headers.has('subject') %}
+                                            {{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }}
+                                        {% else %}
+                                            (No subject)
+                                        {% endif %}
+                                    </td>
+                                    <td>
+                                        {% if event.message.to is defined %}
+                                            {{ event.message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+                                        {% elseif event.message.headers.has('to') %}
+                                            {{ event.message.headers.get('to').bodyAsString()|default('(empty)') }}
+                                        {% else %}
+                                            (empty)
+                                        {% endif %}
+                                    </td>
                                     <td class="visually-hidden"><button class="mailer-email-summary-table-row-button" data-target="#email-{{ loop.index }}">View email details</button></td>
                                 </tr>
                             {% endfor %}
@@ -323,18 +339,42 @@
                     <div class="tab-content">
                         <div class="card-block">
                             <p class="mailer-message-subject">
-                                {{ message.getSubject() ?? '(No subject)' }}
+                                {% if message.subject is defined %}
+                                    {{ message.getSubject() ?? '(No subject)' }}
+                                {% elseif message.headers.has('subject') %}
+                                    {{ message.headers.get('subject').bodyAsString()|default('(No subject)') }}
+                                {% else %}
+                                    (No subject)
+                                {% endif %}
                             </p>
                             <div class="mailer-message-headers">
-                                <p><strong>From:</strong> {{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</p>
-                                <p><strong>To:</strong> {{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</p>
+                                <p>
+                                    <strong>From:</strong>
+                                    {% if message.from is defined %}
+                                        {{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+                                    {% elseif message.headers.has('from') %}
+                                        {{ message.headers.get('from').bodyAsString()|default('(empty)') }}
+                                    {% else %}
+                                        (empty)
+                                    {% endif %}
+                                </p>
+                                <p>
+                                    <strong>To:</strong>
+                                    {% if message.to is defined %}
+                                        {{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+                                    {% elseif message.headers.has('to') %}
+                                        {{ message.headers.get('to').bodyAsString()|default('(empty)') }}
+                                    {% else %}
+                                        (empty)
+                                    {% endif %}
+                                </p>
                                 {% for header in message.headers.all|filter(header => (header.name ?? '')|lower not in ['subject', 'from', 'to']) %}
                                     <p class="mailer-message-header-secondary">{{ header.toString }}</p>
                                 {% endfor %}
                             </div>
                         </div>
 
-                        {% if message.attachments %}
+                        {% if message.attachments is defined and message.attachments %}
                             <div class="card-block">
                                 {% set num_of_attachments = message.attachments|length %}
                                 {% set total_attachments_size_in_bytes = message.attachments|reduce((total_size, attachment) => total_size + attachment.body|length, 0) %}
@@ -364,9 +404,10 @@
                         {% endif %}
 
                         <div class="card-block">
-                            {% set textBody = message.textBody %}
-                            {% set htmlBody = message.htmlBody %}
                             <div class="sf-tabs sf-tabs-sm">
+                            {% if message.htmlBody is defined %}
+                                {% set textBody = message.textBody %}
+                                {% set htmlBody = message.htmlBody %}
                                 <div class="tab {{ not textBody ? 'disabled' }} {{ textBody ? 'active' }}">
                                     <h3 class="tab-title">Text content</h3>
                                     <div class="tab-content">
@@ -414,6 +455,23 @@
                                         {% endif %}
                                     </div>
                                 </div>
+                            {% else %}
+                                {% set body = message.body ? message.body.toString() : null %}
+                                <div class="tab {{ not body ? 'disabled' }} {{ body ? 'active' }}">
+                                    <h3 class="tab-title">Content</h3>
+                                    <div class="tab-content">
+                                        {% if body %}
+                                            <pre class="mailer-email-body prewrap" style="max-height: 600px">
+                                                {{- body }}
+                                            </pre>
+                                        {% else %}
+                                            <div class="mailer-empty-email-body">
+                                                <p>The body is empty.</p>
+                                            </div>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            {% endif %}
                             </div>
                         </div>
                     </div>
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Collector/notifier.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Collector/notifier.html.twig
index 3884c8e71..ed363f1d9 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Collector/notifier.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Collector/notifier.html.twig
@@ -134,11 +134,11 @@
                                                     <h3 class="tab-title">Notification</h3>
                                                     <div class="tab-content">
                                                         <pre class="prewrap" style="max-height: 600px">
-                                                            {{- 'Subject: ' ~ notification.getSubject() }}<br>
-                                                            {{- 'Content: ' ~ notification.getContent() }}<br>
-                                                            {{- 'Importance: ' ~ notification.getImportance() }}<br>
-                                                            {{- 'Emoji: ' ~ (notification.getEmoji() is empty ? '(empty)' : notification.getEmoji()) }}<br>
-                                                            {{- 'Exception: ' ~ notification.getException() ?? '(empty)' }}<br>
+                                                            {{- 'Subject: ' ~ notification.getSubject() }}<br/>
+                                                            {{- 'Content: ' ~ notification.getContent() }}<br/>
+                                                            {{- 'Importance: ' ~ notification.getImportance() }}<br/>
+                                                            {{- 'Emoji: ' ~ (notification.getEmoji() is empty ? '(empty)' : notification.getEmoji()) }}<br/>
+                                                            {{- 'Exception: ' ~ (notification.getException() ?? '(empty)') }}<br/>
                                                             {{- 'ExceptionAsString: ' ~ (notification.getExceptionAsString() is empty ? '(empty)' : notification.getExceptionAsString()) }}
                                                         </pre>
                                                     </div>
@@ -151,7 +151,7 @@
                                                             {%- if message.getOptions() is null %}
                                                                 {{- '(empty)' }}
                                                             {%- else %}
-                                                                {{- message.getOptions()|json_encode(constant('JSON_PRETTY_PRINT')) }}
+                                                                {{- message.getOptions().toArray()|json_encode(constant('JSON_PRETTY_PRINT')) }}
                                                             {%- endif %}
                                                         </pre>
                                                     </div>
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Collector/workflow.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Collector/workflow.html.twig
index 377b74f60..522d93da3 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Collector/workflow.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Collector/workflow.html.twig
@@ -60,6 +60,7 @@
         dialog table td {
             padding: .625em;
             text-align: center;
+            word-wrap: break-word;
         }
 
         dialog table th {
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base.html.twig
index 9c11fe919..1eaa87b97 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base.html.twig
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <meta charset="{{ _charset }}">
-        <meta name="robots" content="noindex,nofollow">
-        <meta name="viewport" content="width=device-width,initial-scale=1">
+        <meta charset="{{ _charset }}" />
+        <meta name="robots" content="noindex,nofollow" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
         <title>{% block title %}Symfony Profiler{% endblock %}</title>
 
         {% set request_collector = profile is defined ? profile.collectors.request|default(null) : null %}
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base_js.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base_js.html.twig
index 8a669a5c6..839ea59d3 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base_js.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/base_js.html.twig
@@ -75,7 +75,7 @@
                     }
 
                     tab.addEventListener('click', function(e) {
-                        const activeTab = e.target || e.srcElement;
+                        let activeTab = e.target || e.srcElement;
 
                         /* needed because when the tab contains HTML contents, user can click */
                         /* on any of those elements instead of their parent '<button>' element */
@@ -122,6 +122,12 @@
                 }
 
                 toggle.addEventListener('click', (e) => {
+                    const toggle = e.currentTarget;
+
+                    if (e.target.closest('a, .sf-toggle') !== toggle) {
+                        return;
+                    }
+
                     e.preventDefault();
 
                     if ('' !== window.getSelection().toString()) {
@@ -129,9 +135,6 @@
                         return;
                     }
 
-                    /* needed because when the toggle contains HTML contents, user can click */
-                    /* on any of those elements instead of their parent '.sf-toggle' element */
-                    const toggle = e.target.closest('.sf-toggle');
                     const element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
 
                     toggle.classList.toggle('sf-toggle-on');
@@ -154,14 +157,6 @@
                     toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
                 });
 
-                /* Prevents from disallowing clicks on links inside toggles */
-                const toggleLinks = toggle.querySelectorAll('a');
-                toggleLinks.forEach((toggleLink) => {
-                    toggleLink.addEventListener('click', (e) => {
-                        e.stopPropagation();
-                    });
-                });
-
                 toggle.setAttribute('data-processed', 'true');
             });
         }
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/open.css.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/open.css.twig
index af9f0a4ce..55589c294 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/open.css.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/open.css.twig
@@ -40,6 +40,7 @@
 #source .source-content ol li {
     margin: 0 0 2px 0;
     padding-left: 5px;
+    white-space: preserve nowrap;
 }
 #source .source-content ol li::marker {
     color: var(--color-muted);
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/results.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/results.html.twig
index d97de65c4..d4f6ff86d 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/results.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/results.html.twig
@@ -35,7 +35,9 @@
 {% endblock %}
 
 {% block sidebar_search_css_class %}{% endblock %}
-{% block sidebar_shortcuts_links %}{% endblock %}
+{% block sidebar_shortcuts_links %}
+    {{ parent() }}
+{% endblock %}
 
 {% block panel %}
     <div class="sf-tabs" data-processed="true">
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar.html.twig
index 7a77a9b18..565ec39bf 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar.html.twig
@@ -6,7 +6,7 @@
 </div>
 <div id="sfToolbarClearer-{{ token }}" class="sf-toolbar-clearer"></div>
 
-<div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset notranslate clear-fix" data-no-turbolink>
+<div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset notranslate clear-fix" data-no-turbolink data-turbo="false">
     {% for name, template in templates %}
         {% if block('toolbar', template) is defined %}
             {% with {
diff --git a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
index 47d004295..53e24f15e 100644
--- a/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/lib/symfony/web-profiler-bundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -413,11 +413,7 @@
                 renderAjaxRequests: renderAjaxRequests,
 
                 getSfwdt: function(token) {
-                    if (!this.sfwdt) {
-                        this.sfwdt = document.getElementById('sfwdt' + token);
-                    }
-
-                    return this.sfwdt;
+                    return document.getElementById('sfwdt' + token);
                 },
 
                 load: function(selector, url, onSuccess, onError, options) {
@@ -433,7 +429,7 @@
                                 var pending = pendingRequests;
                                 for (var i = 0; i < requestStack.length; i++) {
                                     startAjaxRequest(i);
-                                    if (requestStack[i].duration) {
+                                    if (requestStack[i].duration || requestStack[i].error) {
                                         finishAjaxRequest(i);
                                     }
                                 }
@@ -542,11 +538,16 @@
                         'sfwdt' + token,
                         '{{ url("_wdt", { "token": "xxxxxx" })|escape('js') }}'.replace(/xxxxxx/, newToken),
                         function(xhr, el) {
+                            var toolbarContent = document.getElementById('sfToolbarMainContent-' + newToken);
+
                             /* Do nothing in the edge case where the toolbar has already been replaced with a new one */
-                            if (!document.getElementById('sfToolbarMainContent-' + newToken)) {
+                            if (!toolbarContent) {
                                 return;
                             }
 
+                            /* Replace the ID, it has to match the new token */
+                            toolbarContent.parentElement.id = 'sfwdt' + newToken;
+
                             /* Evaluate in global scope scripts embedded inside the toolbar */
                             var i, scripts = [].slice.call(el.querySelectorAll('script'));
                             for (i = 0; i < scripts.length; ++i) {
diff --git a/lib/symfony/web-profiler-bundle/Twig/WebProfilerExtension.php b/lib/symfony/web-profiler-bundle/Twig/WebProfilerExtension.php
index 6df2a2472..014e326b9 100644
--- a/lib/symfony/web-profiler-bundle/Twig/WebProfilerExtension.php
+++ b/lib/symfony/web-profiler-bundle/Twig/WebProfilerExtension.php
@@ -17,6 +17,7 @@ use Twig\Environment;
 use Twig\Extension\EscaperExtension;
 use Twig\Extension\ProfilerExtension;
 use Twig\Profiler\Profile;
+use Twig\Runtime\EscaperRuntime;
 use Twig\TwigFunction;
 
 /**
@@ -37,7 +38,7 @@ class WebProfilerExtension extends ProfilerExtension
 
     private int $stackLevel = 0;
 
-    public function __construct(HtmlDumper $dumper = null)
+    public function __construct(?HtmlDumper $dumper = null)
     {
         $this->dumper = $dumper ?? new HtmlDumper();
         $this->dumper->setOutput($this->output = fopen('php://memory', 'r+'));
@@ -77,7 +78,7 @@ class WebProfilerExtension extends ProfilerExtension
         return str_replace("\n</pre", '</pre', rtrim($dump));
     }
 
-    public function dumpLog(Environment $env, string $message, Data $context = null): string
+    public function dumpLog(Environment $env, string $message, ?Data $context = null): string
     {
         $message = self::escape($env, $message);
         $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);
@@ -108,6 +109,12 @@ class WebProfilerExtension extends ProfilerExtension
 
     private static function escape(Environment $env, string $s): string
     {
+        // Twig 3.10 and above
+        if (class_exists(EscaperRuntime::class)) {
+            return $env->getRuntime(EscaperRuntime::class)->escape($s);
+        }
+
+        // Twig 3.9
         if (method_exists(EscaperExtension::class, 'escape')) {
             return EscaperExtension::escape($env, $s);
         }
diff --git a/lib/symfony/yaml/Command/LintCommand.php b/lib/symfony/yaml/Command/LintCommand.php
index 95352ac17..dccedcf0f 100644
--- a/lib/symfony/yaml/Command/LintCommand.php
+++ b/lib/symfony/yaml/Command/LintCommand.php
@@ -42,7 +42,7 @@ class LintCommand extends Command
     private ?\Closure $directoryIteratorProvider;
     private ?\Closure $isReadableProvider;
 
-    public function __construct(string $name = null, callable $directoryIteratorProvider = null, callable $isReadableProvider = null)
+    public function __construct(?string $name = null, ?callable $directoryIteratorProvider = null, ?callable $isReadableProvider = null)
     {
         parent::__construct($name);
 
@@ -57,7 +57,7 @@ class LintCommand extends Command
     {
         $this
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
             ->addOption('exclude', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Path(s) to exclude')
             ->addOption('parse-tags', null, InputOption::VALUE_NEGATABLE, 'Parse custom tags', null)
             ->setHelp(<<<EOF
@@ -114,7 +114,7 @@ EOF
         $filesInfo = [];
         foreach ($filenames as $filename) {
             if (!$this->isReadable($filename)) {
-                throw new RuntimeException(sprintf('File or directory "%s" is not readable.', $filename));
+                throw new RuntimeException(\sprintf('File or directory "%s" is not readable.', $filename));
             }
 
             foreach ($this->getFiles($filename) as $file) {
@@ -127,7 +127,7 @@ EOF
         return $this->display($io, $filesInfo);
     }
 
-    private function validate(string $content, int $flags, string $file = null): array
+    private function validate(string $content, int $flags, ?string $file = null): array
     {
         $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
             if (\E_USER_DEPRECATED === $level) {
@@ -154,7 +154,7 @@ EOF
             'txt' => $this->displayTxt($io, $files),
             'json' => $this->displayJson($io, $files),
             'github' => $this->displayTxt($io, $files, true),
-            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+            default => throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -170,11 +170,11 @@ EOF
 
         foreach ($filesInfo as $info) {
             if ($info['valid'] && $this->displayCorrectFiles) {
-                $io->comment('<info>OK</info>'.($info['file'] ? sprintf(' in %s', $info['file']) : ''));
+                $io->comment('<info>OK</info>'.($info['file'] ? \sprintf(' in %s', $info['file']) : ''));
             } elseif (!$info['valid']) {
                 ++$erroredFiles;
-                $io->text('<error> ERROR </error>'.($info['file'] ? sprintf(' in %s', $info['file']) : ''));
-                $io->text(sprintf('<error> >> %s</error>', $info['message']));
+                $io->text('<error> ERROR </error>'.($info['file'] ? \sprintf(' in %s', $info['file']) : ''));
+                $io->text(\sprintf('<error> >> %s</error>', $info['message']));
 
                 if (str_contains($info['message'], 'PARSE_CUSTOM_TAGS')) {
                     $suggestTagOption = true;
@@ -187,9 +187,9 @@ EOF
         }
 
         if (0 === $erroredFiles) {
-            $io->success(sprintf('All %d YAML files contain valid syntax.', $countFiles));
+            $io->success(\sprintf('All %d YAML files contain valid syntax.', $countFiles));
         } else {
-            $io->warning(sprintf('%d YAML files have valid syntax and %d contain errors.%s', $countFiles - $erroredFiles, $erroredFiles, $suggestTagOption ? ' Use the --parse-tags option if you want parse custom tags.' : ''));
+            $io->warning(\sprintf('%d YAML files have valid syntax and %d contain errors.%s', $countFiles - $erroredFiles, $erroredFiles, $suggestTagOption ? ' Use the --parse-tags option if you want parse custom tags.' : ''));
         }
 
         return min($erroredFiles, 1);
diff --git a/lib/symfony/yaml/Dumper.php b/lib/symfony/yaml/Dumper.php
index 04646c5cd..31a2f7588 100644
--- a/lib/symfony/yaml/Dumper.php
+++ b/lib/symfony/yaml/Dumper.php
@@ -81,13 +81,13 @@ class Dumper
                         $blockChompingIndicator = '-';
                     }
 
-                    $output .= sprintf('%s%s%s |%s%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', '', $blockIndentationIndicator, $blockChompingIndicator);
+                    $output .= \sprintf('%s%s%s |%s%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', '', $blockIndentationIndicator, $blockChompingIndicator);
 
                     foreach (explode("\n", $value) as $row) {
                         if ('' === $row) {
                             $output .= "\n";
                         } else {
-                            $output .= sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
+                            $output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
                         }
                     }
 
@@ -95,14 +95,14 @@ class Dumper
                 }
 
                 if ($value instanceof TaggedValue) {
-                    $output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
+                    $output .= \sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
 
                     if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
                         $blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
-                        $output .= sprintf(' |%s', $blockIndentationIndicator);
+                        $output .= \sprintf(' |%s', $blockIndentationIndicator);
 
                         foreach (explode("\n", $value->getValue()) as $row) {
-                            $output .= sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
+                            $output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
                         }
 
                         continue;
@@ -126,7 +126,7 @@ class Dumper
 
                 $willBeInlined = $inline - 1 <= 0 || !\is_array($value) && $dumpObjectAsInlineMap || empty($value);
 
-                $output .= sprintf('%s%s%s%s',
+                $output .= \sprintf('%s%s%s%s',
                     $prefix,
                     $dumpAsMap ? Inline::dump($key, $flags).':' : '-',
                     $willBeInlined ? ' ' : "\n",
@@ -140,14 +140,14 @@ class Dumper
 
     private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, int $flags, string $prefix): string
     {
-        $output = sprintf('%s!%s', $prefix ? $prefix.' ' : '', $value->getTag());
+        $output = \sprintf('%s!%s', $prefix ? $prefix.' ' : '', $value->getTag());
 
         if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
             $blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
-            $output .= sprintf(' |%s', $blockIndentationIndicator);
+            $output .= \sprintf(' |%s', $blockIndentationIndicator);
 
             foreach (explode("\n", $value->getValue()) as $row) {
-                $output .= sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
+                $output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
             }
 
             return $output;
diff --git a/lib/symfony/yaml/Escaper.php b/lib/symfony/yaml/Escaper.php
index e8090d8c6..c9dbed931 100644
--- a/lib/symfony/yaml/Escaper.php
+++ b/lib/symfony/yaml/Escaper.php
@@ -29,21 +29,21 @@ class Escaper
     // on the input arrays. This ordering of the characters avoids the use of strtr,
     // which performs more slowly.
     private const ESCAPEES = ['\\', '\\\\', '\\"', '"',
-                                     "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
-                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
-                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
-                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
-                                     "\x7f",
-                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
-                               ];
+        "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
+        "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
+        "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
+        "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
+        "\x7f",
+        "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
+    ];
     private const ESCAPED = ['\\\\', '\\"', '\\\\', '\\"',
-                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
-                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
-                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
-                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
-                                     '\\x7f',
-                                     '\\N', '\\_', '\\L', '\\P',
-                              ];
+        '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
+        '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
+        '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
+        '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
+        '\\x7f',
+        '\\N', '\\_', '\\L', '\\P',
+    ];
 
     /**
      * Determines if a PHP value would require double quoting in YAML.
@@ -62,7 +62,7 @@ class Escaper
      */
     public static function escapeWithDoubleQuotes(string $value): string
     {
-        return sprintf('"%s"', str_replace(self::ESCAPEES, self::ESCAPED, $value));
+        return \sprintf('"%s"', str_replace(self::ESCAPEES, self::ESCAPED, $value));
     }
 
     /**
@@ -90,6 +90,6 @@ class Escaper
      */
     public static function escapeWithSingleQuotes(string $value): string
     {
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+        return \sprintf("'%s'", str_replace('\'', '\'\'', $value));
     }
 }
diff --git a/lib/symfony/yaml/Exception/ParseException.php b/lib/symfony/yaml/Exception/ParseException.php
index c1a77ad15..35b948adb 100644
--- a/lib/symfony/yaml/Exception/ParseException.php
+++ b/lib/symfony/yaml/Exception/ParseException.php
@@ -29,7 +29,7 @@ class ParseException extends RuntimeException
      * @param string|null $snippet    The snippet of code near the problem
      * @param string|null $parsedFile The file name where the error occurred
      */
-    public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)
+    public function __construct(string $message, int $parsedLine = -1, ?string $snippet = null, ?string $parsedFile = null, ?\Throwable $previous = null)
     {
         $this->parsedFile = $parsedFile;
         $this->parsedLine = $parsedLine;
@@ -114,15 +114,15 @@ class ParseException extends RuntimeException
         }
 
         if (null !== $this->parsedFile) {
-            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE));
+            $this->message .= \sprintf(' in %s', json_encode($this->parsedFile, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE));
         }
 
         if ($this->parsedLine >= 0) {
-            $this->message .= sprintf(' at line %d', $this->parsedLine);
+            $this->message .= \sprintf(' at line %d', $this->parsedLine);
         }
 
         if ($this->snippet) {
-            $this->message .= sprintf(' (near "%s")', $this->snippet);
+            $this->message .= \sprintf(' (near "%s")', $this->snippet);
         }
 
         if ($dot) {
diff --git a/lib/symfony/yaml/Inline.php b/lib/symfony/yaml/Inline.php
index 382fa51c2..8feecea15 100644
--- a/lib/symfony/yaml/Inline.php
+++ b/lib/symfony/yaml/Inline.php
@@ -34,7 +34,7 @@ class Inline
     private static bool $objectForMap = false;
     private static bool $constantSupport = false;
 
-    public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null): void
+    public static function initialize(int $flags, ?int $parsedLineNumber = null, ?string $parsedFilename = null): void
     {
         self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
         self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
@@ -82,7 +82,7 @@ class Inline
 
         // some comments are allowed at the end
         if (preg_replace('/\s*#.*$/A', '', substr($value, $i))) {
-            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
+            throw new ParseException(\sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
         }
 
         if (null !== $tag && '' !== $tag) {
@@ -105,7 +105,7 @@ class Inline
         switch (true) {
             case \is_resource($value):
                 if (Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE & $flags) {
-                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
+                    throw new DumpException(\sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
                 }
 
                 return self::dumpNull($flags);
@@ -116,7 +116,7 @@ class Inline
                     default => 'Y-m-d\TH:i:s.uP',
                 });
             case $value instanceof \UnitEnum:
-                return sprintf('!php/const %s::%s', $value::class, $value->name);
+                return \sprintf('!php/const %s::%s', $value::class, $value->name);
             case \is_object($value):
                 if ($value instanceof TaggedValue) {
                     return '!'.$value->getTag().' '.self::dump($value->getValue(), $flags);
@@ -227,7 +227,7 @@ class Inline
                 $output[] = self::dump($val, $flags);
             }
 
-            return sprintf('[%s]', implode(', ', $output));
+            return \sprintf('[%s]', implode(', ', $output));
         }
 
         return self::dumpHashArray($value, $flags);
@@ -247,10 +247,10 @@ class Inline
                 $key = (string) $key;
             }
 
-            $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
+            $output[] = \sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
         }
 
-        return sprintf('{ %s }', implode(', ', $output));
+        return \sprintf('{ %s }', implode(', ', $output));
     }
 
     private static function dumpNull(int $flags): string
@@ -267,7 +267,7 @@ class Inline
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */
-    public static function parseScalar(string $scalar, int $flags = 0, array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [], bool &$isQuoted = null): mixed
+    public static function parseScalar(string $scalar, int $flags = 0, ?array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [], ?bool &$isQuoted = null): mixed
     {
         if (\in_array($scalar[$i], ['"', "'"], true)) {
             // quoted scalar
@@ -277,10 +277,10 @@ class Inline
             if (null !== $delimiters) {
                 $tmp = ltrim(substr($scalar, $i), " \n");
                 if ('' === $tmp) {
-                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                    throw new ParseException(\sprintf('Unexpected end of line, expected one of "%s".', implode('', $delimiters)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                 }
                 if (!\in_array($tmp[0], $delimiters)) {
-                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                    throw new ParseException(\sprintf('Unexpected characters (%s).', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                 }
             }
         } else {
@@ -300,12 +300,12 @@ class Inline
                 $i += \strlen($output);
                 $output = trim($output);
             } else {
-                throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+                throw new ParseException(\sprintf('Malformed inline YAML string: "%s".', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);
             }
 
             // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
             if ($output && ('@' === $output[0] || '`' === $output[0] || '|' === $output[0] || '>' === $output[0] || '%' === $output[0])) {
-                throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]), self::$parsedLineNumber + 1, $output, self::$parsedFilename);
+                throw new ParseException(\sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]), self::$parsedLineNumber + 1, $output, self::$parsedFilename);
             }
 
             if ($evaluate) {
@@ -324,7 +324,7 @@ class Inline
     private static function parseQuotedScalar(string $scalar, int &$i = 0): string
     {
         if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
-            throw new ParseException(sprintf('Malformed inline YAML string: "%s".', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+            throw new ParseException(\sprintf('Malformed inline YAML string: "%s".', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
         }
 
         $output = substr($match[0], 1, -1);
@@ -353,11 +353,18 @@ class Inline
         ++$i;
 
         // [foo, bar, ...]
+        $lastToken = null;
         while ($i < $len) {
             if (']' === $sequence[$i]) {
                 return $output;
             }
             if (',' === $sequence[$i] || ' ' === $sequence[$i]) {
+                if (',' === $sequence[$i] && (null === $lastToken || 'separator' === $lastToken)) {
+                    $output[] = null;
+                } elseif (',' === $sequence[$i]) {
+                    $lastToken = 'separator';
+                }
+
                 ++$i;
 
                 continue;
@@ -401,10 +408,11 @@ class Inline
 
             $output[] = $value;
 
+            $lastToken = 'value';
             ++$i;
         }
 
-        throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+        throw new ParseException(\sprintf('Malformed inline YAML string: "%s".', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename);
     }
 
     /**
@@ -445,7 +453,7 @@ class Inline
             }
 
             if ('!php/const' === $key || '!php/enum' === $key) {
-                $key .= ' '.self::parseScalar($mapping, $flags, [':'], $i, false);
+                $key .= ' '.self::parseScalar($mapping, $flags, ['(?<!:):(?!:)'], $i, false);
                 $key = self::evaluateScalar($key, $flags);
             }
 
@@ -496,7 +504,7 @@ class Inline
                                 $output[$key] = $value;
                             }
                         } elseif (isset($output[$key])) {
-                            throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
                         }
                         break;
                     case '{':
@@ -515,7 +523,7 @@ class Inline
                                 $output[$key] = $value;
                             }
                         } elseif (isset($output[$key])) {
-                            throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
                         }
                         break;
                     default:
@@ -538,7 +546,7 @@ class Inline
                                 $output[$key] = $value;
                             }
                         } elseif (isset($output[$key])) {
-                            throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), self::$parsedLineNumber + 1, $mapping);
                         }
                         --$i;
                 }
@@ -548,7 +556,7 @@ class Inline
             }
         }
 
-        throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+        throw new ParseException(\sprintf('Malformed inline YAML string: "%s".', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename);
     }
 
     /**
@@ -556,7 +564,7 @@ class Inline
      *
      * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
      */
-    private static function evaluateScalar(string $scalar, int $flags, array &$references = [], bool &$isQuotedString = null): mixed
+    private static function evaluateScalar(string $scalar, int $flags, array &$references = [], ?bool &$isQuotedString = null): mixed
     {
         $isQuotedString = false;
         $scalar = trim($scalar);
@@ -574,7 +582,7 @@ class Inline
             }
 
             if (!\array_key_exists($value, $references)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
+                throw new ParseException(\sprintf('Reference "%s" does not exist.', $value), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
             }
 
             return $references[$value];
@@ -629,10 +637,10 @@ class Inline
                                 return \constant($const);
                             }
 
-                            throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                            throw new ParseException(\sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                            throw new ParseException(\sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
                         return null;
@@ -648,25 +656,25 @@ class Inline
                                 $enum = substr($enum, 0, -7);
                             }
                             if (!\defined($enum)) {
-                                throw new ParseException(sprintf('The enum "%s" is not defined.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                                throw new ParseException(\sprintf('The enum "%s" is not defined.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                             }
 
                             $value = \constant($enum);
 
                             if (!$value instanceof \UnitEnum) {
-                                throw new ParseException(sprintf('The string "%s" is not the name of a valid enum.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                                throw new ParseException(\sprintf('The string "%s" is not the name of a valid enum.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                             }
                             if (!$useValue) {
                                 return $value;
                             }
                             if (!$value instanceof \BackedEnum) {
-                                throw new ParseException(sprintf('The enum "%s" defines no value next to its name.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                                throw new ParseException(\sprintf('The enum "%s" defines no value next to its name.', $enum), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                             }
 
                             return $value->value;
                         }
                         if (self::$exceptionOnInvalidType) {
-                            throw new ParseException(sprintf('The string "%s" could not be parsed as an enum. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+                            throw new ParseException(\sprintf('The string "%s" could not be parsed as an enum. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
                         return null;
@@ -676,7 +684,7 @@ class Inline
                         return self::evaluateBinaryScalar(substr($scalar, 9));
                 }
 
-                throw new ParseException(sprintf('The string "%s" could not be parsed as it uses an unsupported built-in tag.', $scalar), self::$parsedLineNumber, $scalar, self::$parsedFilename);
+                throw new ParseException(\sprintf('The string "%s" could not be parsed as it uses an unsupported built-in tag.', $scalar), self::$parsedLineNumber, $scalar, self::$parsedFilename);
             case preg_match('/^(?:\+|-)?0o(?P<value>[0-7_]++)$/', $scalar, $matches):
                 $value = str_replace('_', '', $matches['value']);
 
@@ -693,6 +701,10 @@ class Inline
                 switch (true) {
                     case ctype_digit($scalar):
                     case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
+                        if ($scalar < \PHP_INT_MIN || \PHP_INT_MAX < $scalar) {
+                            return $scalar;
+                        }
+
                         $cast = (int) $scalar;
 
                         return ($scalar === (string) $cast) ? $cast : $scalar;
@@ -709,8 +721,13 @@ class Inline
                     case Parser::preg_match('/^(-|\+)?[0-9][0-9_]*(\.[0-9_]+)?$/', $scalar):
                         return (float) str_replace('_', '', $scalar);
                     case Parser::preg_match(self::getTimestampRegex(), $scalar):
-                        // When no timezone is provided in the parsed date, YAML spec says we must assume UTC.
-                        $time = new \DateTimeImmutable($scalar, new \DateTimeZone('UTC'));
+                        try {
+                            // When no timezone is provided in the parsed date, YAML spec says we must assume UTC.
+                            $time = new \DateTimeImmutable($scalar, new \DateTimeZone('UTC'));
+                        } catch (\Exception $e) {
+                            // Some dates accepted by the regex are not valid dates.
+                            throw new ParseException(\sprintf('The date "%s" could not be parsed as it is an invalid date.', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename, $e);
+                        }
 
                         if (Yaml::PARSE_DATETIME & $flags) {
                             return $time;
@@ -724,7 +741,7 @@ class Inline
                             if (false !== $scalar = $time->getTimestamp()) {
                                 return $scalar;
                             }
-                        } catch (\ValueError) {
+                        } catch (\DateRangeError|\ValueError) {
                             // no-op
                         }
 
@@ -761,18 +778,18 @@ class Inline
 
         // Built-in tags
         if ('' !== $tag && '!' === $tag[0]) {
-            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
+            throw new ParseException(\sprintf('The built-in tag "!%s" is not implemented.', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
         }
 
         if ('' !== $tag && !isset($value[$i])) {
-            throw new ParseException(sprintf('Missing value for tag "%s".', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
+            throw new ParseException(\sprintf('Missing value for tag "%s".', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
         }
 
         if ('' === $tag || Yaml::PARSE_CUSTOM_TAGS & $flags) {
             return $tag;
         }
 
-        throw new ParseException(sprintf('Tags support is not enabled. Enable the "Yaml::PARSE_CUSTOM_TAGS" flag to use "!%s".', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
+        throw new ParseException(\sprintf('Tags support is not enabled. Enable the "Yaml::PARSE_CUSTOM_TAGS" flag to use "!%s".', $tag), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
     }
 
     public static function evaluateBinaryScalar(string $scalar): string
@@ -780,11 +797,11 @@ class Inline
         $parsedBinaryData = self::parseScalar(preg_replace('/\s/', '', $scalar));
 
         if (0 !== (\strlen($parsedBinaryData) % 4)) {
-            throw new ParseException(sprintf('The normalized base64 encoded data (data without whitespace characters) length must be a multiple of four (%d bytes given).', \strlen($parsedBinaryData)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+            throw new ParseException(\sprintf('The normalized base64 encoded data (data without whitespace characters) length must be a multiple of four (%d bytes given).', \strlen($parsedBinaryData)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
         }
 
         if (!Parser::preg_match('#^[A-Z0-9+/]+={0,2}$#i', $parsedBinaryData)) {
-            throw new ParseException(sprintf('The base64 encoded data (%s) contains invalid characters.', $parsedBinaryData), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+            throw new ParseException(\sprintf('The base64 encoded data (%s) contains invalid characters.', $parsedBinaryData), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
         }
 
         return base64_decode($parsedBinaryData, true);
diff --git a/lib/symfony/yaml/Parser.php b/lib/symfony/yaml/Parser.php
index 21bb7f8b6..744181f73 100644
--- a/lib/symfony/yaml/Parser.php
+++ b/lib/symfony/yaml/Parser.php
@@ -50,11 +50,11 @@ class Parser
     public function parseFile(string $filename, int $flags = 0): mixed
     {
         if (!is_file($filename)) {
-            throw new ParseException(sprintf('File "%s" does not exist.', $filename));
+            throw new ParseException(\sprintf('File "%s" does not exist.', $filename));
         }
 
         if (!is_readable($filename)) {
-            throw new ParseException(sprintf('File "%s" cannot be read.', $filename));
+            throw new ParseException(\sprintf('File "%s" cannot be read.', $filename));
         }
 
         $this->filename = $filename;
@@ -235,10 +235,10 @@ class Parser
                         $refName = substr(rtrim($values['value']), 1);
                         if (!\array_key_exists($refName, $this->refs)) {
                             if (false !== $pos = array_search($refName, $this->refsBeingParsed, true)) {
-                                throw new ParseException(sprintf('Circular reference [%s] detected for reference "%s".', implode(', ', array_merge(\array_slice($this->refsBeingParsed, $pos), [$refName])), $refName), $this->currentLineNb + 1, $this->currentLine, $this->filename);
+                                throw new ParseException(\sprintf('Circular reference [%s] detected for reference "%s".', implode(', ', array_merge(\array_slice($this->refsBeingParsed, $pos), [$refName])), $refName), $this->currentLineNb + 1, $this->currentLine, $this->filename);
                             }
 
-                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
+                            throw new ParseException(\sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
                         $refValue = $this->refs[$refName];
@@ -311,7 +311,7 @@ class Parser
                                 $data[$key] = null;
                             }
                         } else {
-                            throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
                     } else {
                         // remember the parsed line number here in case we need it to provide some contexts in error messages below
@@ -334,7 +334,7 @@ class Parser
                                 $data[$key] = $value;
                             }
                         } else {
-                            throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), $realCurrentLineNbKey + 1, $this->currentLine);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $realCurrentLineNbKey + 1, $this->currentLine);
                         }
                     }
                 } else {
@@ -344,7 +344,7 @@ class Parser
                     if ($allowOverwrite || !isset($data[$key])) {
                         $data[$key] = $value;
                     } else {
-                        throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                     }
                 }
                 if ($isRef) {
@@ -561,7 +561,7 @@ class Parser
      *
      * @throws ParseException When indentation problem are detected
      */
-    private function getNextEmbedBlock(int $indentation = null, bool $inSequence = false): string
+    private function getNextEmbedBlock(?int $indentation = null, bool $inSequence = false): string
     {
         $oldLineIndentation = $this->getCurrentLineIndentation();
 
@@ -638,12 +638,12 @@ class Parser
             }
 
             if ($this->isCurrentLineBlank()) {
-                $data[] = substr($this->currentLine, $newIndent);
+                $data[] = substr($this->currentLine, $newIndent ?? 0);
                 continue;
             }
 
             if ($indent >= $newIndent) {
-                $data[] = substr($this->currentLine, $newIndent);
+                $data[] = substr($this->currentLine, $newIndent ?? 0);
             } elseif ($this->isCurrentLineComment()) {
                 $data[] = $this->currentLine;
             } elseif (0 == $indent) {
@@ -711,10 +711,10 @@ class Parser
 
             if (!\array_key_exists($value, $this->refs)) {
                 if (false !== $pos = array_search($value, $this->refsBeingParsed, true)) {
-                    throw new ParseException(sprintf('Circular reference [%s] detected for reference "%s".', implode(', ', array_merge(\array_slice($this->refsBeingParsed, $pos), [$value])), $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
+                    throw new ParseException(\sprintf('Circular reference [%s] detected for reference "%s".', implode(', ', array_merge(\array_slice($this->refsBeingParsed, $pos), [$value])), $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
                 }
 
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
+                throw new ParseException(\sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
             }
 
             return $this->refs[$value];
@@ -754,7 +754,7 @@ class Parser
                     $parsedValue = Inline::parse($this->lexInlineQuotedString($cursor), $flags, $this->refs);
 
                     if (isset($this->currentLine[$cursor]) && preg_replace('/\s*(#.*)?$/A', '', substr($this->currentLine, $cursor))) {
-                        throw new ParseException(sprintf('Unexpected characters near "%s".', substr($this->currentLine, $cursor)));
+                        throw new ParseException(\sprintf('Unexpected characters near "%s".', substr($this->currentLine, $cursor)));
                     }
 
                     return $parsedValue;
@@ -769,6 +769,14 @@ class Parser
                             break;
                         }
 
+                        if ($this->isCurrentLineComment()) {
+                            break;
+                        }
+
+                        if ('mapping' === $context && str_contains($this->currentLine, ': ') && !$this->isCurrentLineComment()) {
+                            throw new ParseException('A colon cannot be used in an unquoted mapping value.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
+                        }
+
                         $lines[] = trim($this->currentLine);
                     }
 
@@ -839,7 +847,7 @@ class Parser
         }
 
         if ($indentation > 0) {
-            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
+            $pattern = \sprintf('/^ {%d}(.*)$/', $indentation);
 
             while (
                 $notEOF && (
@@ -1043,7 +1051,7 @@ class Parser
      *
      * @internal
      */
-    public static function preg_match(string $pattern, string $subject, array &$matches = null, int $flags = 0, int $offset = 0): int
+    public static function preg_match(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int
     {
         if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
             throw new ParseException(preg_last_error_msg());
@@ -1081,14 +1089,14 @@ class Parser
 
         // Built-in tags
         if ($tag && '!' === $tag[0]) {
-            throw new ParseException(sprintf('The built-in tag "!%s" is not implemented.', $tag), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
+            throw new ParseException(\sprintf('The built-in tag "!%s" is not implemented.', $tag), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
         }
 
         if (Yaml::PARSE_CUSTOM_TAGS & $flags) {
             return $tag;
         }
 
-        throw new ParseException(sprintf('Tags support is not enabled. You must use the flag "Yaml::PARSE_CUSTOM_TAGS" to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
+        throw new ParseException(\sprintf('Tags support is not enabled. You must use the flag "Yaml::PARSE_CUSTOM_TAGS" to use "%s".', $matches['tag']), $this->getRealCurrentLineNb() + 1, $value, $this->filename);
     }
 
     private function lexInlineQuotedString(int &$cursor = 0): string
@@ -1158,7 +1166,18 @@ class Parser
     private function lexUnquotedString(int &$cursor): string
     {
         $offset = $cursor;
-        $cursor += strcspn($this->currentLine, '[]{},: ', $cursor);
+
+        while ($cursor < \strlen($this->currentLine)) {
+            if (\in_array($this->currentLine[$cursor], ['[', ']', '{', '}', ',', ':'], true)) {
+                break;
+            }
+
+            if (\in_array($this->currentLine[$cursor], [' ', "\t"], true) && '#' === ($this->currentLine[$cursor + 1] ?? '')) {
+                break;
+            }
+
+            ++$cursor;
+        }
 
         if ($cursor === $offset) {
             throw new ParseException('Malformed unquoted YAML string.');
@@ -1167,17 +1186,17 @@ class Parser
         return substr($this->currentLine, $offset, $cursor - $offset);
     }
 
-    private function lexInlineMapping(int &$cursor = 0): string
+    private function lexInlineMapping(int &$cursor = 0, bool $consumeUntilEol = true): string
     {
-        return $this->lexInlineStructure($cursor, '}');
+        return $this->lexInlineStructure($cursor, '}', $consumeUntilEol);
     }
 
-    private function lexInlineSequence(int &$cursor = 0): string
+    private function lexInlineSequence(int &$cursor = 0, bool $consumeUntilEol = true): string
     {
-        return $this->lexInlineStructure($cursor, ']');
+        return $this->lexInlineStructure($cursor, ']', $consumeUntilEol);
     }
 
-    private function lexInlineStructure(int &$cursor, string $closingTag): string
+    private function lexInlineStructure(int &$cursor, string $closingTag, bool $consumeUntilEol = true): string
     {
         $value = $this->currentLine[$cursor];
         ++$cursor;
@@ -1197,15 +1216,19 @@ class Parser
                         ++$cursor;
                         break;
                     case '{':
-                        $value .= $this->lexInlineMapping($cursor);
+                        $value .= $this->lexInlineMapping($cursor, false);
                         break;
                     case '[':
-                        $value .= $this->lexInlineSequence($cursor);
+                        $value .= $this->lexInlineSequence($cursor, false);
                         break;
                     case $closingTag:
                         $value .= $this->currentLine[$cursor];
                         ++$cursor;
 
+                        if ($consumeUntilEol && isset($this->currentLine[$cursor]) && ($whitespaces = strspn($this->currentLine, ' ', $cursor) + $cursor) < \strlen($this->currentLine) && '#' !== $this->currentLine[$whitespaces]) {
+                            throw new ParseException(\sprintf('Unexpected token "%s".', trim(substr($this->currentLine, $cursor))));
+                        }
+
                         return $value;
                     case '#':
                         break 2;
@@ -1231,7 +1254,7 @@ class Parser
         $whitespacesConsumed = 0;
 
         do {
-            $whitespaceOnlyTokenLength = strspn($this->currentLine, ' ', $cursor);
+            $whitespaceOnlyTokenLength = strspn($this->currentLine, " \t", $cursor);
             $whitespacesConsumed += $whitespaceOnlyTokenLength;
             $cursor += $whitespaceOnlyTokenLength;
 
diff --git a/lib/symfony/yaml/Resources/bin/yaml-lint b/lib/symfony/yaml/Resources/bin/yaml-lint
old mode 100644
new mode 100755
diff --git a/lib/symfony/yaml/Unescaper.php b/lib/symfony/yaml/Unescaper.php
index 9e640ff24..1df0cf2ea 100644
--- a/lib/symfony/yaml/Unescaper.php
+++ b/lib/symfony/yaml/Unescaper.php
@@ -84,7 +84,7 @@ class Unescaper
             'x' => self::utf8chr(hexdec(substr($value, 2, 2))),
             'u' => self::utf8chr(hexdec(substr($value, 2, 4))),
             'U' => self::utf8chr(hexdec(substr($value, 2, 8))),
-            default => throw new ParseException(sprintf('Found unknown escape character "%s".', $value)),
+            default => throw new ParseException(\sprintf('Found unknown escape character "%s".', $value)),
         };
     }
 
diff --git a/lib/tecnickcom/tcpdf/CHANGELOG.TXT b/lib/tecnickcom/tcpdf/CHANGELOG.TXT
index 5d560d0a7..2394117a7 100644
--- a/lib/tecnickcom/tcpdf/CHANGELOG.TXT
+++ b/lib/tecnickcom/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,11 @@
+6.10.1 (2025-11-21)
+	- cI: Add 8.5 to CI matrix - PR #836
+	- Fix PHP 8.5 deprecation for xml_parser_free - PR #835
+	- Fix bad text-align from HTML source - PR #833
+	- Fix image on footer problems - PR #823
+	- Preserving percentage gradient decimals and correctly clamp coordinates - PR #815
+	- Enables compression for PDF/A - PR #820
+
 6.10.0 (2025-05-27)
 	- Embedded files support (Factur-X 1.07 / ZUGFeRD 2.3) #789
 
diff --git a/lib/tecnickcom/tcpdf/VERSION b/lib/tecnickcom/tcpdf/VERSION
index cf79bf90e..3094a4c66 100644
--- a/lib/tecnickcom/tcpdf/VERSION
+++ b/lib/tecnickcom/tcpdf/VERSION
@@ -1 +1 @@
-6.10.0
+6.10.1
diff --git a/lib/tecnickcom/tcpdf/composer.json b/lib/tecnickcom/tcpdf/composer.json
index 8d7791972..abf4d9b62 100644
--- a/lib/tecnickcom/tcpdf/composer.json
+++ b/lib/tecnickcom/tcpdf/composer.json
@@ -12,7 +12,7 @@
         "barcodes"
     ],
     "homepage": "http://www.tcpdf.org/",
-    "version": "6.10.0",
+    "version": "6.10.1",
     "license": "LGPL-3.0-or-later",
     "authors": [
         {
diff --git a/lib/tecnickcom/tcpdf/include/tcpdf_static.php b/lib/tecnickcom/tcpdf/include/tcpdf_static.php
index efadc9253..296e04ddf 100644
--- a/lib/tecnickcom/tcpdf/include/tcpdf_static.php
+++ b/lib/tecnickcom/tcpdf/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.10.0';
+	private static $tcpdf_version = '6.10.1';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/lib/tecnickcom/tcpdf/tcpdf.php b/lib/tecnickcom/tcpdf/tcpdf.php
index 42c425e98..2cbbc4d7f 100644
--- a/lib/tecnickcom/tcpdf/tcpdf.php
+++ b/lib/tecnickcom/tcpdf/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.10.0
+// Version     : 6.10.1
 // Begin       : 2002-08-03
-// Last Update : 2025-05-27
+// Last Update : 2025-11-21
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.10.0
+ * @version 6.10.1
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.10.0
+ * @version 6.10.1
  * @author Nicola Asuni - info@tecnick.com
  * @IgnoreAnnotation("protected")
  * @IgnoreAnnotation("public")
@@ -2910,9 +2910,7 @@ class TCPDF {
 		$this->compress = false;
 		if (function_exists('gzcompress')) {
 			if ($compress) {
-				if ( !$this->pdfa_mode) {
-					$this->compress = true;
-				}
+                $this->compress = true;
 			}
 		}
 	}
@@ -5001,11 +4999,10 @@ class TCPDF {
 					$filter = '';
 					if ($this->compress) {
 						$data = gzcompress($data);
-						$filter = ' /Filter /FlateDecode';
+						$filter .= ' /Filter /FlateDecode';
 					}
-
 					if ($this->pdfa_version == 3) {
-						$filter = ' /Subtype /text#2Fxml';
+						$filter .= ' /Subtype /text#2Fxml';
 					}
 
 					$stream = $this->_getrawstream($data, $filedata['n']);
@@ -6925,8 +6922,8 @@ class TCPDF {
 			// fallback to avoid division by zero
 			$h = $h == 0 ? 1 : $h;
 			$ratio_wh = ($w / $h);
-			if (($y + $h) > $this->PageBreakTrigger) {
-				$h = $this->PageBreakTrigger - $y;
+			if (($y + $h) > $this->PageBreakTrigger + $this->bMargin) {
+				$h = $this->PageBreakTrigger + $this->bMargin - $y;
 				$w = ($h * $ratio_wh);
 			}
 			if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
@@ -16918,7 +16915,7 @@ class TCPDF {
 							$dom[$key]['height'] = $dom[$key]['style']['height'];
 						}
 						// check for text alignment
-						if (isset($dom[$key]['style']['text-align'])) {
+						if (isset($dom[$key]['style']['text-align'][0])) {
 							$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align'][0]);
 						}
 						// check for CSS border properties
@@ -23268,8 +23265,11 @@ class TCPDF {
 			$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser));
 			$this->Error($error_message);
 		}
-		// free this XML parser
-		xml_parser_free($parser);
+		
+		// free this XML parser (does nothing in PHP >= 8.0)
+		if (function_exists('xml_parser_free') && PHP_VERSION_ID < 80000) {
+		    xml_parser_free($parser);
+		}
 
 		// >= PHP 7.0.0 "explicitly unset the reference to parser to avoid memory leaks"
 		unset($parser);
@@ -23500,7 +23500,8 @@ class TCPDF {
 				$gradient['coords'][4] /= $w;
 			} elseif ($gradient['mode'] == 'percentage') {
 				foreach($gradient['coords'] as $key => $val) {
-					$gradient['coords'][$key] = (intval($val) / 100);
+					$val = floatval($val) / 100;
+					$gradient['coords'][$key] = $val;
 					if ($val < 0) {
 						$gradient['coords'][$key] = 0;
 					} elseif ($val > 1) {
@@ -24737,7 +24738,7 @@ class TCPDF {
 	 */
 	protected function endSVGElementHandler($parser, $name) {
 		$name = $this->removeTagNamespace($name);
-		if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {;
+		if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {
 			if (end($this->svgdefs) !== FALSE) {
 				$last_svgdefs_id = key($this->svgdefs);
 				if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
diff --git a/lib/tecnickcom/tcpdf/tools/tcpdf_addfont.php b/lib/tecnickcom/tcpdf/tools/tcpdf_addfont.php
old mode 100755
new mode 100644
diff --git a/lib/thenetworg/oauth2-azure/README.md b/lib/thenetworg/oauth2-azure/README.md
index ef1546ac2..d0517b7bc 100644
--- a/lib/thenetworg/oauth2-azure/README.md
+++ b/lib/thenetworg/oauth2-azure/README.md
@@ -228,7 +228,9 @@ With version 1.2.0 you can now use this library to protect your API with Azure A
 ```php
 // Assuming you have already initialized the $provider
 
-// Obtain the accessToken - in this case, we are getting it from Authorization header
+// Obtain the accessToken - in this case, we are getting it from Authorization header.
+// If you're instead using a persisted access token you got from $provider->getAccessToken,
+// you'll have to feed its id token to validateAccessToken like so: $provider->validateAccessToken($accessTokenn->getIdToken());
 $headers = getallheaders();
 // Assuming you got the value of Authorization header as "Bearer [the_access_token]" we parse it
 $authorization = explode(' ', $headers['Authorization']);
diff --git a/lib/thenetworg/oauth2-azure/composer.json b/lib/thenetworg/oauth2-azure/composer.json
index 51cdafb5c..cbc79f90a 100644
--- a/lib/thenetworg/oauth2-azure/composer.json
+++ b/lib/thenetworg/oauth2-azure/composer.json
@@ -26,7 +26,7 @@
         "ext-openssl": "*",
         "php": "^7.1|^8.0",
         "league/oauth2-client": "~2.0",
-        "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0"
+        "firebase/php-jwt": "~3.0||~4.0||~5.0||~6.0||~7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/thenetworg/oauth2-azure/src/Grant/JwtBearer.php b/lib/thenetworg/oauth2-azure/src/Grant/JwtBearer.php
index c23772855..ec064e1ac 100644
--- a/lib/thenetworg/oauth2-azure/src/Grant/JwtBearer.php
+++ b/lib/thenetworg/oauth2-azure/src/Grant/JwtBearer.php
@@ -4,12 +4,12 @@ namespace TheNetworg\OAuth2\Client\Grant;
 
 class JwtBearer extends \League\OAuth2\Client\Grant\AbstractGrant
 {
-    protected function getName()
+    protected function getName(): string
     {
         return 'urn:ietf:params:oauth:grant-type:jwt-bearer';
     }
 
-    protected function getRequiredRequestParameters()
+    protected function getRequiredRequestParameters(): array
     {
         return [
             'requested_token_use',
diff --git a/lib/thenetworg/oauth2-azure/src/Provider/Azure.php b/lib/thenetworg/oauth2-azure/src/Provider/Azure.php
index bf9c7539d..756eda569 100644
--- a/lib/thenetworg/oauth2-azure/src/Provider/Azure.php
+++ b/lib/thenetworg/oauth2-azure/src/Provider/Azure.php
@@ -89,7 +89,7 @@ class Azure extends AbstractProvider
         if (!array_key_exists($version, $this->openIdConfiguration[$tenant])) {
             $versionInfix = $this->getVersionUriInfix($version);
 	          $openIdConfigurationUri = $this->urlLogin . $tenant . $versionInfix . '/.well-known/openid-configuration?appid=' . $this->clientId;
-            
+
             $factory = $this->getRequestFactory();
             $request = $factory->getRequestWithOptions(
                 'get',
@@ -161,6 +161,11 @@ class Azure extends AbstractProvider
                 $options['resource'] = $this->resource ? $this->resource : $this->urlAPI;
             }
         }
+
+        if (empty($options['scope'])) {
+            $options['scope'] = $this->getDefaultScopes();
+        }
+
         return parent::getAccessToken($grant, $options);
     }
 
@@ -324,7 +329,9 @@ class Azure extends AbstractProvider
         $logoutUri = $openIdConfiguration['end_session_endpoint'];
 
         if (!empty($post_logout_redirect_uri)) {
-            $logoutUri .= '?post_logout_redirect_uri=' . rawurlencode($post_logout_redirect_uri);
+            $query = parse_url($logoutUri, PHP_URL_QUERY);
+            $logoutUri .= $query ? '&' : '?';
+            $logoutUri .= 'post_logout_redirect_uri=' . rawurlencode($post_logout_redirect_uri);
         }
 
         return $logoutUri;
@@ -356,21 +363,21 @@ class Azure extends AbstractProvider
      */
     public function validateTokenClaims($tokenClaims) {
         if ($this->getClientId() != $tokenClaims['aud']) {
-            throw new \RuntimeException('The client_id / audience is invalid!');
+            throw new \RuntimeException('The audience claim of the token does not match the configured Client ID.');
         }
-        if ($tokenClaims['nbf'] > time() || $tokenClaims['exp'] < time()) {
+        if ($tokenClaims['nbf'] > time() + JWT::$leeway || $tokenClaims['exp'] < time() - JWT::$leeway) {
             // Additional validation is being performed in firebase/JWT itself
-            throw new \RuntimeException('The id_token is invalid!');
+            throw new \RuntimeException(sprintf('The token is not yet valid or has already expired. Verify whether your system clock is skewed, the current time is %s.', date('c')));
         }
 
-        if ('common' == $this->tenant) {
-            $this->tenant = $tokenClaims['tid'];
+        if ('common' === $this->tenant) {
+            $this->tenant = $tokenClaims['tid'] ?? null;
         }
 
         $version = array_key_exists('ver', $tokenClaims) ? $tokenClaims['ver'] : $this->defaultEndPointVersion;
         $tenant = $this->getTenantDetails($this->tenant, $version);
         if ($tokenClaims['iss'] != $tenant['issuer']) {
-            throw new \RuntimeException('Invalid token issuer (tokenClaims[iss]' . $tokenClaims['iss'] . ', tenant[issuer] ' . $tenant['issuer'] . ')!');
+            throw new \RuntimeException(sprintf('The token issuer "%s" does not match the tenant configuration of "%s".', $tokenClaims['iss'], $tenant['issuer']));
         }
     }
 
diff --git a/lib/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php b/lib/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php
index 337ae5125..9bfd294b0 100644
--- a/lib/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php
+++ b/lib/thenetworg/oauth2-azure/src/Provider/AzureResourceOwner.php
@@ -53,6 +53,16 @@ class AzureResourceOwner implements ResourceOwnerInterface
         return $this->claim('family_name');
     }
 
+    /**
+     * Retrieves preferred username of resource owner.
+     *
+     * @return string|null
+     */
+    public function getPreferredUsername()
+    {
+        return $this->claim('preferred_username');
+    }
+
     /**
      * Retrieves user principal name of resource owner.
      *
@@ -63,6 +73,16 @@ class AzureResourceOwner implements ResourceOwnerInterface
         return $this->claim('upn');
     }
 
+    /**
+     * Retrieves email of resource owner.
+     *
+     * @return string|null
+     */
+    public function getEmail()
+    {
+        return $this->claim('email');
+    }
+
     /**
      * Retrieves tenant id of resource owner.
      *
diff --git a/lib/twig/twig/CHANGELOG b/lib/twig/twig/CHANGELOG
index cf202b044..cf47a7604 100644
--- a/lib/twig/twig/CHANGELOG
+++ b/lib/twig/twig/CHANGELOG
@@ -1,3 +1,34 @@
+# 3.23.0 (2026-01-23)
+
+ * Add `=` assignment operator (allows to set variables in expression or to replace the short-form of the set tag)
+ * Add sequence, mapping, and object destructuring
+ * Add `?.` null-safe operator
+ * Add `===` and `!==` operators (equivalent to the `same as` and `not same as` tests)
+ * Fix opcache preload warning for unlinked anonymous class
+ * Fix spread operator behavior
+
+# 3.22.2 (2025-12-14)
+
+ * Fix "cycle" with non-countable ArrayAccess + Traversable objects
+ * Use "getShareDir" as an indicator of Symfony version in Symfony bundle
+ * Fix escaper compatibility with PHP 8.5
+
+# 3.22.1 (2025-11-16)
+
+ * Add support for Symfony 8
+
+# 3.22.0 (2025-10-29)
+
+ * Add support for two words test in guard tag
+ * Add `Environment::registerUndefinedTestCallback()`
+ * Fix compatibility with Symfony 8
+ * Fix accessing arrays with stringable objects as key
+ * Avoid errors when failing to guess the template info for an error
+ * Fix expression parser compatibility layer
+ * Fix compiling 'index' with repr (not string) in EmbedNode
+ * Update configuration keys + allow extra keys for CommonMark extensions
+ * Allow usage of other Markdown converters than CommonMark in LeagueMarkdown
+
 # 3.21.1 (2025-05-03)
 
  * Fix ExtensionSet usage of BinaryOperatorExpressionParser
@@ -44,6 +75,7 @@
 
 # 3.18.0 (2024-12-29)
 
+ * Support for invoking closures
  * Fix unary operator precedence change
  * Ignore `SyntaxError` exceptions from undefined handlers when using the `guard` tag
  * Add a way to stream template rendering (`TemplateWrapper::stream()` and `TemplateWrapper::streamBlock()`)
@@ -52,7 +84,6 @@
 
  * Fix the null coalescing operator when the test returns null
  * Fix the Elvis operator when used as '? :' instead of '?:'
- * Support for invoking closures
 
 # 3.17.0 (2024-12-10)
 
diff --git a/lib/twig/twig/phpstan-baseline.neon b/lib/twig/twig/phpstan-baseline.neon
deleted file mode 100644
index 131ed97b4..000000000
--- a/lib/twig/twig/phpstan-baseline.neon
+++ /dev/null
@@ -1,25 +0,0 @@
-parameters:
-	ignoreErrors:
-		- # The method is dynamically generated by the CheckSecurityNode
-			message: '#^Call to an undefined method Twig\\Template\:\:checkSecurity\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: src/Extension/CoreExtension.php
-
-		- # 2 parameters will be required
-			message: '#^Method Twig\\Node\\IncludeNode\:\:addGetTemplate\(\) invoked with 2 parameters, 1 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: src/Node/IncludeNode.php
-
-		- # int|string will be supported in 4.x
-			message: '#^PHPDoc tag @param for parameter $name with type int|string is not subtype of native type string\.$#'
-			identifier: parameter.phpDocType
-			count: 5
-			path: src/Node/Node.php
-
-		- # Adding 0 to the string representation of a number is valid and what we want here
-			message: '#^Binary operation "\+" between 0 and string results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Lexer.php
diff --git a/lib/twig/twig/phpstan.neon.dist b/lib/twig/twig/phpstan.neon.dist
deleted file mode 100644
index 6d94e4109..000000000
--- a/lib/twig/twig/phpstan.neon.dist
+++ /dev/null
@@ -1,9 +0,0 @@
-includes:
-    - phpstan-baseline.neon
-
-parameters:
-    level: 3
-    paths:
-        - src
-    excludePaths:
-        - src/Test
diff --git a/lib/twig/twig/splitsh.json b/lib/twig/twig/splitsh.json
new file mode 100644
index 000000000..f415dd8d4
--- /dev/null
+++ b/lib/twig/twig/splitsh.json
@@ -0,0 +1,15 @@
+{
+    "subtrees": {
+        "twig-extra-bundle": "extra/twig-extra-bundle",
+        "cache-extra": "extra/cache-extra",
+        "cssinliner-extra": "extra/cssinliner-extra",
+        "html-extra": "extra/html-extra",
+        "inky-extra": "extra/inky-extra",
+        "intl-extra": "extra/intl-extra",
+        "markdown-extra": "extra/markdown-extra",
+        "string-extra": "extra/string-extra"
+    },
+    "defaults": {
+        "git_constraint": "<1.8.2"
+    }
+}
diff --git a/lib/twig/twig/src/Attribute/AsTwigFilter.php b/lib/twig/twig/src/Attribute/AsTwigFilter.php
index 395531d86..09f8f01de 100644
--- a/lib/twig/twig/src/Attribute/AsTwigFilter.php
+++ b/lib/twig/twig/src/Attribute/AsTwigFilter.php
@@ -31,15 +31,15 @@ use Twig\TwigFilter;
 final class AsTwigFilter
 {
     /**
-     * @param non-empty-string $name The name of the filter in Twig.
-     * @param bool|null $needsCharset Whether the filter needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the filter needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the filter needs the context array passed as the first argument, or after the charset and the environment.
-     * @param string[]|null $isSafe List of formats in which you want the raw output to be printed unescaped.
-     * @param string|array|null $isSafeCallback Function called at compilation time to determine if the filter is safe.
-     * @param string|null $preEscape Some filters may need to work on input that is already escaped or safe
-     * @param string[]|null $preservesSafety Preserves the safety of the value that the filter is applied to.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the filter in Twig
+     * @param bool|null                   $needsCharset     Whether the filter needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the filter needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the filter needs the context array passed as the first argument, or after the charset and the environment
+     * @param string[]|null               $isSafe           List of formats in which you want the raw output to be printed unescaped
+     * @param string|array|null           $isSafeCallback   Function called at compilation time to determine if the filter is safe
+     * @param string|null                 $preEscape        Some filters may need to work on input that is already escaped or safe
+     * @param string[]|null               $preservesSafety  Preserves the safety of the value that the filter is applied to
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,
diff --git a/lib/twig/twig/src/Attribute/AsTwigFunction.php b/lib/twig/twig/src/Attribute/AsTwigFunction.php
index 9229d128e..d161f06f4 100644
--- a/lib/twig/twig/src/Attribute/AsTwigFunction.php
+++ b/lib/twig/twig/src/Attribute/AsTwigFunction.php
@@ -31,13 +31,13 @@ use Twig\TwigFunction;
 final class AsTwigFunction
 {
     /**
-     * @param non-empty-string $name The name of the function in Twig.
-     * @param bool|null $needsCharset Whether the function needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the function needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the function needs the context array passed as the first argument, or after the charset and the environment.
-     * @param string[]|null $isSafe List of formats in which you want the raw output to be printed unescaped.
-     * @param string|array|null $isSafeCallback Function called at compilation time to determine if the function is safe.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the function in Twig
+     * @param bool|null                   $needsCharset     Whether the function needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the function needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the function needs the context array passed as the first argument, or after the charset and the environment
+     * @param string[]|null               $isSafe           List of formats in which you want the raw output to be printed unescaped
+     * @param string|array|null           $isSafeCallback   Function called at compilation time to determine if the function is safe
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,
diff --git a/lib/twig/twig/src/Attribute/AsTwigTest.php b/lib/twig/twig/src/Attribute/AsTwigTest.php
index 40eddf83e..1ce2658b4 100644
--- a/lib/twig/twig/src/Attribute/AsTwigTest.php
+++ b/lib/twig/twig/src/Attribute/AsTwigTest.php
@@ -31,11 +31,11 @@ use Twig\TwigTest;
 final class AsTwigTest
 {
     /**
-     * @param non-empty-string $name The name of the test in Twig.
-     * @param bool|null $needsCharset Whether the test needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the test needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the test needs the context array passed as the first argument, or after the charset and the environment.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the test in Twig
+     * @param bool|null                   $needsCharset     Whether the test needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the test needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the test needs the context array passed as the first argument, or after the charset and the environment
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,
diff --git a/lib/twig/twig/src/Environment.php b/lib/twig/twig/src/Environment.php
index ff3f0c588..2af647611 100644
--- a/lib/twig/twig/src/Environment.php
+++ b/lib/twig/twig/src/Environment.php
@@ -43,11 +43,11 @@ use Twig\TokenParser\TokenParserInterface;
  */
 class Environment
 {
-    public const VERSION = '3.21.1';
-    public const VERSION_ID = 32101;
+    public const VERSION = '3.23.0';
+    public const VERSION_ID = 32300;
     public const MAJOR_VERSION = 3;
-    public const MINOR_VERSION = 21;
-    public const RELEASE_VERSION = 1;
+    public const MINOR_VERSION = 23;
+    public const RELEASE_VERSION = 0;
     public const EXTRA_VERSION = '';
 
     private $charset;
@@ -827,6 +827,14 @@ class Environment
         return $this->extensionSet->getTest($name);
     }
 
+    /**
+     * @param callable(string): (TwigTest|false) $callable
+     */
+    public function registerUndefinedTestCallback(callable $callable): void
+    {
+        $this->extensionSet->registerUndefinedTestCallback($callable);
+    }
+
     /**
      * @return void
      */
diff --git a/lib/twig/twig/src/Error/Error.php b/lib/twig/twig/src/Error/Error.php
index 015085e32..97ed2df99 100644
--- a/lib/twig/twig/src/Error/Error.php
+++ b/lib/twig/twig/src/Error/Error.php
@@ -148,6 +148,10 @@ class Error extends \Exception
             }
         }
 
+        if (null === $template) {
+            return; // Impossible to guess the info as the template was not found in the backtrace
+        }
+
         $r = new \ReflectionObject($template);
         $file = $r->getFileName();
 
@@ -158,7 +162,7 @@ class Error extends \Exception
 
         while ($e = array_pop($exceptions)) {
             $traces = $e->getTrace();
-            array_unshift($traces, ['file' => $e instanceof Error ? $e->phpFile : $e->getFile(), 'line' => $e instanceof Error ? $e->phpLine : $e->getLine()]);
+            array_unshift($traces, ['file' => $e instanceof self ? $e->phpFile : $e->getFile(), 'line' => $e instanceof self ? $e->phpLine : $e->getLine()]);
             while ($trace = array_shift($traces)) {
                 if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
                     continue;
diff --git a/lib/twig/twig/src/ExpressionParser.php b/lib/twig/twig/src/ExpressionParser.php
index 727cf7eba..3ba94d076 100644
--- a/lib/twig/twig/src/ExpressionParser.php
+++ b/lib/twig/twig/src/ExpressionParser.php
@@ -214,7 +214,7 @@ class ExpressionParser
     {
         trigger_deprecation('twig/twig', '3.19', \sprintf('The "%s()" method is deprecated, use "Twig\ExpressionParser\Infix\ArgumentsTrait::parseNamedArguments()" instead.', __METHOD__));
 
-        $parsePrimary = new \ReflectionMethod($this->parser, 'parsePrimary');
+        $parsePrimaryExpression = new \ReflectionMethod($this->parser, 'parsePrimaryExpression');
 
         $namedArguments = false;
         $definition = false;
@@ -263,7 +263,7 @@ class ExpressionParser
                 $name = $value->getAttribute('name');
 
                 if ($definition) {
-                    $value = $parsePrimary->invoke($this->parser);
+                    $value = $parsePrimaryExpression->invoke($this->parser);
 
                     if (!$this->checkConstantExpression($value)) {
                         throw new SyntaxError('A default value for an argument must be a constant (a boolean, a string, a number, a sequence, or a mapping).', $token->getLine(), $stream->getSourceContext());
diff --git a/lib/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php b/lib/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php
index 1c2ae49dd..96bde555d 100644
--- a/lib/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php
+++ b/lib/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php
@@ -13,6 +13,7 @@ namespace Twig\ExpressionParser\Infix;
 
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\Binary\SetBinary;
 use Twig\Node\Expression\Unary\SpreadUnary;
 use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\Expression\Variable\LocalVariable;
@@ -58,7 +59,10 @@ trait ArgumentsTrait
             }
 
             $name = null;
-            if (($token = $stream->nextIf(Token::OPERATOR_TYPE, '=')) || ($token = $stream->nextIf(Token::PUNCTUATION_TYPE, ':'))) {
+            if ($value instanceof SetBinary) {
+                $name = $value->getNode('left')->getAttribute('name');
+                $value = $value->getNode('right');
+            } elseif (($token = $stream->nextIf(Token::OPERATOR_TYPE, '=')) || ($token = $stream->nextIf(Token::PUNCTUATION_TYPE, ':'))) {
                 if (!$value instanceof ContextVariable) {
                     throw new SyntaxError(\sprintf('A parameter name must be a string, "%s" given.', $value::class), $token->getLine(), $stream->getSourceContext());
                 }
diff --git a/lib/twig/twig/src/ExpressionParser/Infix/AssignmentExpressionParser.php b/lib/twig/twig/src/ExpressionParser/Infix/AssignmentExpressionParser.php
new file mode 100644
index 000000000..fa8c4f2b0
--- /dev/null
+++ b/lib/twig/twig/src/ExpressionParser/Infix/AssignmentExpressionParser.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\ExpressionParser\Infix;
+
+use Twig\Error\SyntaxError;
+use Twig\ExpressionParser\InfixAssociativity;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\Binary\AbstractBinary;
+use Twig\Node\Expression\Binary\ObjectDestructuringSetBinary;
+use Twig\Node\Expression\Binary\SequenceDestructuringSetBinary;
+use Twig\Node\Expression\Binary\SetBinary;
+use Twig\Node\Expression\Variable\ContextVariable;
+use Twig\Parser;
+use Twig\Token;
+
+/**
+ * @internal
+ */
+class AssignmentExpressionParser extends BinaryOperatorExpressionParser
+{
+    public function __construct(
+        string $name,
+    ) {
+        parent::__construct(SetBinary::class, $name, 0, InfixAssociativity::Right);
+    }
+
+    /**
+     * @return AbstractBinary
+     */
+    public function parse(Parser $parser, AbstractExpression $left, Token $token): AbstractExpression
+    {
+        if (!$left instanceof ContextVariable && !$left instanceof ArrayExpression) {
+            throw new SyntaxError(\sprintf('Cannot assign to "%s", only variables can be assigned.', $left::class), $token->getLine(), $parser->getStream()->getSourceContext());
+        }
+        $right = $parser->parseExpression(InfixAssociativity::Left === $this->getAssociativity() ? $this->getPrecedence() + 1 : $this->getPrecedence());
+        $right = match ($this->getName()) {
+            '=' => $right,
+            default => throw new \LogicException(\sprintf('Unknown operator: %s.', $this->getName())),
+        };
+
+        if ($left instanceof ArrayExpression) {
+            if ($left->isSequence()) {
+                return new SequenceDestructuringSetBinary($left, $right, $token->getLine());
+            } else {
+                return new ObjectDestructuringSetBinary($left, $right, $token->getLine());
+            }
+        } else {
+            return new SetBinary($left, $right, $token->getLine());
+        }
+    }
+
+    public function getDescription(): string
+    {
+        return 'Assignment operator';
+    }
+}
diff --git a/lib/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php b/lib/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php
index 7d1cf5058..31418b585 100644
--- a/lib/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php
+++ b/lib/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php
@@ -37,6 +37,7 @@ final class DotExpressionParser extends AbstractExpressionParser implements Infi
 
     public function parse(Parser $parser, AbstractExpression $expr, Token $token): AbstractExpression
     {
+        $nullSafe = '?.' === $token->getValue();
         $stream = $parser->getStream();
         $token = $stream->getCurrent();
         $lineno = $token->getLine();
@@ -55,7 +56,7 @@ final class DotExpressionParser extends AbstractExpressionParser implements Infi
             ) {
                 $attribute = new ConstantExpression($token->getValue(), $token->getLine());
             } else {
-                throw new SyntaxError(\sprintf('Expected name or number, got value "%s" of type %s.', $token->getValue(), $token->toEnglish()), $token->getLine(), $stream->getSourceContext());
+                throw new SyntaxError(\sprintf('Expected name or number, got value "%s" of type "%s".', $token->getValue(), $token->toEnglish()), $token->getLine(), $stream->getSourceContext());
             }
         }
 
@@ -74,7 +75,7 @@ final class DotExpressionParser extends AbstractExpressionParser implements Infi
             return new MacroReferenceExpression(new TemplateVariable($expr->getAttribute('name'), $expr->getTemplateLine()), 'macro_'.$attribute->getAttribute('value'), $arguments, $expr->getTemplateLine());
         }
 
-        return new GetAttrExpression($expr, $attribute, $arguments, $type, $lineno);
+        return new GetAttrExpression($expr, $attribute, $arguments, $type, $lineno, $nullSafe);
     }
 
     public function getName(): string
@@ -82,6 +83,11 @@ final class DotExpressionParser extends AbstractExpressionParser implements Infi
         return '.';
     }
 
+    public function getAliases(): array
+    {
+        return ['?.'];
+    }
+
     public function getDescription(): string
     {
         return 'Get an attribute on a variable';
diff --git a/lib/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php b/lib/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php
index 8d0ac674c..4641ef815 100644
--- a/lib/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php
+++ b/lib/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php
@@ -11,12 +11,16 @@
 
 namespace Twig\ExpressionParser;
 
+use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Parser;
 use Twig\Token;
 
 interface InfixExpressionParserInterface extends ExpressionParserInterface
 {
+    /**
+     * @throws SyntaxError
+     */
     public function parse(Parser $parser, AbstractExpression $left, Token $token): AbstractExpression;
 
     public function getAssociativity(): InfixAssociativity;
diff --git a/lib/twig/twig/src/ExpressionParser/Prefix/LiteralExpressionParser.php b/lib/twig/twig/src/ExpressionParser/Prefix/LiteralExpressionParser.php
index d98c9adf1..da3805106 100644
--- a/lib/twig/twig/src/ExpressionParser/Prefix/LiteralExpressionParser.php
+++ b/lib/twig/twig/src/ExpressionParser/Prefix/LiteralExpressionParser.php
@@ -20,6 +20,7 @@ use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\Binary\ConcatBinary;
 use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\EmptyExpression;
 use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Parser;
 use Twig\Token;
@@ -100,10 +101,6 @@ final class LiteralExpressionParser extends AbstractExpressionParser implements
                     return new ContextVariable($token->getValue(), $token->getLine());
                 }
 
-                if ('=' === $token->getValue() && ('==' === $stream->look(-1)->getValue() || '!=' === $stream->look(-1)->getValue())) {
-                    throw new SyntaxError(\sprintf('Unexpected operator of value "%s". Did you try to use "===" or "!==" for strict comparison? Use "is same as(value)" instead.', $token->getValue()), $token->getLine(), $stream->getSourceContext());
-                }
-
                 // no break
             default:
                 throw new SyntaxError(\sprintf('Unexpected token "%s" of value "%s".', $token->toEnglish(), $token->getValue()), $token->getLine(), $stream->getSourceContext());
@@ -174,7 +171,12 @@ final class LiteralExpressionParser extends AbstractExpressionParser implements
             }
             $first = false;
 
-            $node->addElement($parser->parseExpression());
+            // Check for empty slots (comma with no expression)
+            if ($stream->test(Token::PUNCTUATION_TYPE, ',')) {
+                $node->addElement(new EmptyExpression($stream->getCurrent()->getLine()));
+            } else {
+                $node->addElement($parser->parseExpression());
+            }
         }
         $stream->expect(Token::PUNCTUATION_TYPE, ']', 'An opened sequence is not properly closed');
 
diff --git a/lib/twig/twig/src/ExpressionParser/Prefix/UnaryOperatorExpressionParser.php b/lib/twig/twig/src/ExpressionParser/Prefix/UnaryOperatorExpressionParser.php
index 35468940a..801390097 100644
--- a/lib/twig/twig/src/ExpressionParser/Prefix/UnaryOperatorExpressionParser.php
+++ b/lib/twig/twig/src/ExpressionParser/Prefix/UnaryOperatorExpressionParser.php
@@ -33,6 +33,7 @@ final class UnaryOperatorExpressionParser extends AbstractExpressionParser imple
         private ?PrecedenceChange $precedenceChange = null,
         private ?string $description = null,
         private array $aliases = [],
+        private ?int $operandPrecedence = null,
     ) {
     }
 
@@ -41,7 +42,7 @@ final class UnaryOperatorExpressionParser extends AbstractExpressionParser imple
      */
     public function parse(Parser $parser, Token $token): AbstractExpression
     {
-        return new ($this->nodeClass)($parser->parseExpression($this->precedence), $token->getLine());
+        return new ($this->nodeClass)($parser->parseExpression($this->operandPrecedence ?? $this->precedence), $token->getLine());
     }
 
     public function getName(): string
diff --git a/lib/twig/twig/src/ExpressionParser/PrefixExpressionParserInterface.php b/lib/twig/twig/src/ExpressionParser/PrefixExpressionParserInterface.php
index 587997c51..8e39dad37 100644
--- a/lib/twig/twig/src/ExpressionParser/PrefixExpressionParserInterface.php
+++ b/lib/twig/twig/src/ExpressionParser/PrefixExpressionParserInterface.php
@@ -11,11 +11,15 @@
 
 namespace Twig\ExpressionParser;
 
+use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Parser;
 use Twig\Token;
 
 interface PrefixExpressionParserInterface extends ExpressionParserInterface
 {
+    /**
+     * @throws SyntaxError
+     */
     public function parse(Parser $parser, Token $token): AbstractExpression;
 }
diff --git a/lib/twig/twig/src/Extension/AttributeExtension.php b/lib/twig/twig/src/Extension/AttributeExtension.php
index 44e4f3f6b..74fcbb857 100644
--- a/lib/twig/twig/src/Extension/AttributeExtension.php
+++ b/lib/twig/twig/src/Extension/AttributeExtension.php
@@ -104,7 +104,7 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFilter, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFilter, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $filters[$attribute->name] = $callable;
@@ -125,14 +125,13 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFunction, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFunction, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $functions[$attribute->name] = $callable;
             }
 
             foreach ($method->getAttributes(AsTwigTest::class) as $reflectionAttribute) {
-
                 /** @var AsTwigTest $attribute */
                 $attribute = $reflectionAttribute->newInstance();
 
@@ -145,7 +144,7 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigTest, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigTest, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $tests[$attribute->name] = $callable;
diff --git a/lib/twig/twig/src/Extension/CoreExtension.php b/lib/twig/twig/src/Extension/CoreExtension.php
index f7e4250ae..345f40666 100644
--- a/lib/twig/twig/src/Extension/CoreExtension.php
+++ b/lib/twig/twig/src/Extension/CoreExtension.php
@@ -17,6 +17,7 @@ use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
 use Twig\ExpressionParser\Infix\ArrowExpressionParser;
+use Twig\ExpressionParser\Infix\AssignmentExpressionParser;
 use Twig\ExpressionParser\Infix\BinaryOperatorExpressionParser;
 use Twig\ExpressionParser\Infix\ConditionalTernaryExpressionParser;
 use Twig\ExpressionParser\Infix\DotExpressionParser;
@@ -55,10 +56,12 @@ use Twig\Node\Expression\Binary\ModBinary;
 use Twig\Node\Expression\Binary\MulBinary;
 use Twig\Node\Expression\Binary\NotEqualBinary;
 use Twig\Node\Expression\Binary\NotInBinary;
+use Twig\Node\Expression\Binary\NotSameAsBinary;
 use Twig\Node\Expression\Binary\NullCoalesceBinary;
 use Twig\Node\Expression\Binary\OrBinary;
 use Twig\Node\Expression\Binary\PowerBinary;
 use Twig\Node\Expression\Binary\RangeBinary;
+use Twig\Node\Expression\Binary\SameAsBinary;
 use Twig\Node\Expression\Binary\SpaceshipBinary;
 use Twig\Node\Expression\Binary\StartsWithBinary;
 use Twig\Node\Expression\Binary\SubBinary;
@@ -333,7 +336,7 @@ final class CoreExtension extends AbstractExtension
         return [
             // unary operators
             new UnaryOperatorExpressionParser(NotUnary::class, 'not', 50, new PrecedenceChange('twig/twig', '3.15', 70)),
-            new UnaryOperatorExpressionParser(SpreadUnary::class, '...', 512, description: 'Spread operator'),
+            new UnaryOperatorExpressionParser(SpreadUnary::class, '...', 512, description: 'Spread operator', operandPrecedence: 0),
             new UnaryOperatorExpressionParser(NegUnary::class, '-', 500),
             new UnaryOperatorExpressionParser(PosUnary::class, '+', 500),
 
@@ -360,6 +363,8 @@ final class CoreExtension extends AbstractExtension
             new BinaryOperatorExpressionParser(EndsWithBinary::class, 'ends with', 20),
             new BinaryOperatorExpressionParser(HasSomeBinary::class, 'has some', 20),
             new BinaryOperatorExpressionParser(HasEveryBinary::class, 'has every', 20),
+            new BinaryOperatorExpressionParser(SameAsBinary::class, '===', 20),
+            new BinaryOperatorExpressionParser(NotSameAsBinary::class, '!==', 20),
             new BinaryOperatorExpressionParser(RangeBinary::class, '..', 25),
             new BinaryOperatorExpressionParser(AddBinary::class, '+', 30),
             new BinaryOperatorExpressionParser(SubBinary::class, '-', 30),
@@ -373,6 +378,9 @@ final class CoreExtension extends AbstractExtension
             // ternary operator
             new ConditionalTernaryExpressionParser(),
 
+            // assignment operator
+            new AssignmentExpressionParser('='),
+
             // Twig callables
             new IsExpressionParser(),
             new IsNotExpressionParser(),
@@ -417,10 +425,8 @@ final class CoreExtension extends AbstractExtension
 
                 trigger_deprecation('twig/twig', '3.12', 'Passing a non-countable sequence of values to "%s()" is deprecated.', __METHOD__);
 
-                return $values;
+                $values = self::toArray($values, false);
             }
-
-            $values = self::toArray($values, false);
         }
 
         if (!$count = \count($values)) {
@@ -1694,7 +1700,7 @@ final class CoreExtension extends AbstractExtension
             }
 
             if (match (true) {
-                \is_array($object) => \array_key_exists($arrayItem, $object),
+                \is_array($object) => \array_key_exists($arrayItem = (string) $arrayItem, $object),
                 $object instanceof \ArrayAccess => $object->offsetExists($arrayItem),
                 default => false,
             }) {
@@ -1715,9 +1721,13 @@ final class CoreExtension extends AbstractExtension
                 }
 
                 if ($object instanceof \ArrayAccess) {
-                    $message = \sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, $object::class);
+                    if (\is_object($arrayItem) || \is_array($arrayItem)) {
+                        $message = \sprintf('Key of type "%s" does not exist in ArrayAccess-able object of class "%s".', get_debug_type($arrayItem), get_debug_type($object));
+                    } else {
+                        $message = \sprintf('Key "%s" does not exist in ArrayAccess-able object of class "%s".', $arrayItem, get_debug_type($object));
+                    }
                 } elseif (\is_object($object)) {
-                    $message = \sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, $object::class);
+                    $message = \sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, get_debug_type($object));
                 } elseif (\is_array($object)) {
                     if (!$object) {
                         $message = \sprintf('Key "%s" does not exist as the sequence/mapping is empty.', $arrayItem);
@@ -1880,7 +1890,7 @@ final class CoreExtension extends AbstractExtension
                 return;
             }
 
-            throw new RuntimeError(\sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()"/"is%1$s()"/"has%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), $lineno, $source);
+            throw new RuntimeError(\sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()", "is%1$s()", "has%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), $lineno, $source);
         }
 
         if ($sandboxed) {
diff --git a/lib/twig/twig/src/Extension/ExtensionInterface.php b/lib/twig/twig/src/Extension/ExtensionInterface.php
index 44356f627..60ca35b4e 100644
--- a/lib/twig/twig/src/Extension/ExtensionInterface.php
+++ b/lib/twig/twig/src/Extension/ExtensionInterface.php
@@ -11,8 +11,11 @@
 
 namespace Twig\Extension;
 
+use Twig\ExpressionParser;
 use Twig\ExpressionParser\ExpressionParserInterface;
 use Twig\ExpressionParser\PrecedenceChange;
+use Twig\Node\Expression\Binary\AbstractBinary;
+use Twig\Node\Expression\Unary\AbstractUnary;
 use Twig\NodeVisitor\NodeVisitorInterface;
 use Twig\TokenParser\TokenParserInterface;
 use Twig\TwigFilter;
diff --git a/lib/twig/twig/src/ExtensionSet.php b/lib/twig/twig/src/ExtensionSet.php
index 85a98cf3c..7bb62fa78 100644
--- a/lib/twig/twig/src/ExtensionSet.php
+++ b/lib/twig/twig/src/ExtensionSet.php
@@ -27,6 +27,10 @@ use Twig\Node\Expression\AbstractExpression;
 use Twig\NodeVisitor\NodeVisitorInterface;
 use Twig\TokenParser\TokenParserInterface;
 
+// Help opcache.preload discover always-needed symbols
+// @see https://github.com/php/php-src/issues/10131
+class_exists(BinaryOperatorExpressionParser::class);
+
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
@@ -59,6 +63,8 @@ final class ExtensionSet
     private $functionCallbacks = [];
     /** @var array<callable(string): (TwigFilter|false)> */
     private $filterCallbacks = [];
+    /** @var array<callable(string): (TwigTest|false)> */
+    private $testCallbacks = [];
     /** @var array<callable(string): (TokenParserInterface|false)> */
     private $parserCallbacks = [];
     private $lastModified = 0;
@@ -410,9 +416,23 @@ final class ExtensionSet
             }
         }
 
+        foreach ($this->testCallbacks as $callback) {
+            if (false !== $test = $callback($name)) {
+                return $test;
+            }
+        }
+
         return null;
     }
 
+    /**
+     * @param callable(string): (TwigTest|false) $callable
+     */
+    public function registerUndefinedTestCallback(callable $callable): void
+    {
+        $this->testCallbacks[] = $callable;
+    }
+
     public function getExpressionParsers(): ExpressionParsers
     {
         if (!$this->initialized) {
diff --git a/lib/twig/twig/src/Lexer.php b/lib/twig/twig/src/Lexer.php
index 027771acc..508a79c02 100644
--- a/lib/twig/twig/src/Lexer.php
+++ b/lib/twig/twig/src/Lexer.php
@@ -525,7 +525,7 @@ class Lexer
 
     private function getOperatorRegex(): string
     {
-        $expressionParsers = ['='];
+        $expressionParsers = [];
         foreach ($this->env->getExpressionParsers() as $expressionParser) {
             $expressionParsers = array_merge($expressionParsers, [$expressionParser->getName()], $expressionParser->getAliases());
         }
diff --git a/lib/twig/twig/src/Node/EmbedNode.php b/lib/twig/twig/src/Node/EmbedNode.php
index fe4365b57..2de39ebb9 100644
--- a/lib/twig/twig/src/Node/EmbedNode.php
+++ b/lib/twig/twig/src/Node/EmbedNode.php
@@ -41,7 +41,7 @@ class EmbedNode extends IncludeNode
             ->raw(', ')
             ->repr($this->getTemplateLine())
             ->raw(', ')
-            ->string($this->getAttribute('index'))
+            ->repr($this->getAttribute('index'))
             ->raw(')')
         ;
         if ($this->getAttribute('ignore_missing')) {
diff --git a/lib/twig/twig/src/Node/Expression/ArrayExpression.php b/lib/twig/twig/src/Node/Expression/ArrayExpression.php
index b6f8a6ba4..f9f719dd9 100644
--- a/lib/twig/twig/src/Node/Expression/ArrayExpression.php
+++ b/lib/twig/twig/src/Node/Expression/ArrayExpression.php
@@ -12,6 +12,7 @@
 namespace Twig\Node\Expression;
 
 use Twig\Compiler;
+use Twig\Error\SyntaxError;
 use Twig\Node\Expression\Unary\SpreadUnary;
 use Twig\Node\Expression\Unary\StringCastUnary;
 use Twig\Node\Expression\Variable\ContextVariable;
@@ -60,6 +61,31 @@ class ArrayExpression extends AbstractExpression implements SupportDefinedTestIn
         return false;
     }
 
+    /**
+     * Checks if the array is a sequence (keys are sequential integers starting from 0).
+     *
+     * @internal
+     */
+    public function isSequence(): bool
+    {
+        foreach ($this->getKeyValuePairs() as $i => $pair) {
+            $key = $pair['key'];
+            if ($key instanceof TempNameExpression) {
+                $keyValue = $key->getAttribute('name');
+            } elseif ($key instanceof ConstantExpression) {
+                $keyValue = $key->getAttribute('value');
+            } else {
+                return false;
+            }
+
+            if ($keyValue !== $i) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public function addElement(AbstractExpression $value, ?AbstractExpression $key = null): void
     {
         if (null === $key) {
@@ -77,6 +103,13 @@ class ArrayExpression extends AbstractExpression implements SupportDefinedTestIn
             return;
         }
 
+        // Check for empty expressions which are only allowed in destructuring
+        foreach ($this->getKeyValuePairs() as $pair) {
+            if ($pair['value'] instanceof EmptyExpression) {
+                throw new SyntaxError('Empty array elements are only allowed in destructuring assignments.', $pair['value']->getTemplateLine(), $this->getSourceContext());
+            }
+        }
+
         $compiler->raw('[');
         $isSequence = true;
         foreach ($this->getKeyValuePairs() as $i => $pair) {
diff --git a/lib/twig/twig/src/Node/Expression/Binary/MatchesBinary.php b/lib/twig/twig/src/Node/Expression/Binary/MatchesBinary.php
index 32e8d34e4..569dfde05 100644
--- a/lib/twig/twig/src/Node/Expression/Binary/MatchesBinary.php
+++ b/lib/twig/twig/src/Node/Expression/Binary/MatchesBinary.php
@@ -13,8 +13,8 @@ namespace Twig\Node\Expression\Binary;
 
 use Twig\Compiler;
 use Twig\Error\SyntaxError;
-use Twig\Node\Expression\ReturnBoolInterface;
 use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\ReturnBoolInterface;
 use Twig\Node\Node;
 
 class MatchesBinary extends AbstractBinary implements ReturnBoolInterface
diff --git a/lib/twig/twig/src/Node/Expression/Binary/NotSameAsBinary.php b/lib/twig/twig/src/Node/Expression/Binary/NotSameAsBinary.php
new file mode 100644
index 000000000..ed28c19bb
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/Binary/NotSameAsBinary.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Node\Expression\ReturnBoolInterface;
+
+class NotSameAsBinary extends AbstractBinary implements ReturnBoolInterface
+{
+    public function operator(Compiler $compiler): Compiler
+    {
+        return $compiler->raw('!==');
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/Binary/ObjectDestructuringSetBinary.php b/lib/twig/twig/src/Node/Expression/Binary/ObjectDestructuringSetBinary.php
new file mode 100644
index 000000000..2c0853f65
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/Binary/ObjectDestructuringSetBinary.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Error\SyntaxError;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\Variable\ContextVariable;
+use Twig\Node\Node;
+
+/**
+ * @internal
+ */
+class ObjectDestructuringSetBinary extends AbstractBinary
+{
+    private array $properties = [];
+
+    /**
+     * @param ArrayExpression    $left  The array expression containing object/mapping destructuring properties
+     * @param AbstractExpression $right The expression providing values for assignment
+     */
+    public function __construct(Node $left, Node $right, int $lineno)
+    {
+        if (!$left instanceof ArrayExpression) {
+            throw new \LogicException('Left side must be ArrayExpression for object/mapping destructuring.');
+        }
+        foreach ($left->getKeyValuePairs() as $pair) {
+            if (!$pair['value'] instanceof ContextVariable) {
+                throw new SyntaxError(\sprintf('Cannot assign to "%s", only variables can be assigned in object/mapping destructuring.', $pair['value']::class), $lineno);
+            }
+            $this->properties[] = $pair['value']->getAttribute('name');
+        }
+
+        parent::__construct($left, $right, $lineno);
+    }
+
+    public function compile(Compiler $compiler): void
+    {
+        $compiler->addDebugInfo($this);
+        $compiler->raw('[');
+        foreach ($this->properties as $i => $property) {
+            if ($i) {
+                $compiler->raw(', ');
+            }
+            $compiler->raw('$context[')->repr($property)->raw(']');
+        }
+        $compiler->raw('] = [');
+        foreach ($this->properties as $i => $property) {
+            if ($i) {
+                $compiler->raw(', ');
+            }
+            $compiler->raw('CoreExtension::getAttribute($this->env, $this->source, ')->subcompile($this->getNode('right'))->raw(', ')->repr($property)->raw(', [], \\Twig\\Template::ANY_CALL, false, false, false, ')->repr($this->getNode('right')->getTemplateLine())->raw(')');
+        }
+        $compiler->raw(']');
+    }
+
+    public function operator(Compiler $compiler): Compiler
+    {
+        return $compiler->raw('=');
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/Binary/SameAsBinary.php b/lib/twig/twig/src/Node/Expression/Binary/SameAsBinary.php
new file mode 100644
index 000000000..b08a19072
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/Binary/SameAsBinary.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Node\Expression\ReturnBoolInterface;
+
+class SameAsBinary extends AbstractBinary implements ReturnBoolInterface
+{
+    public function operator(Compiler $compiler): Compiler
+    {
+        return $compiler->raw('===');
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/Binary/SequenceDestructuringSetBinary.php b/lib/twig/twig/src/Node/Expression/Binary/SequenceDestructuringSetBinary.php
new file mode 100644
index 000000000..a6a873c51
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/Binary/SequenceDestructuringSetBinary.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Error\SyntaxError;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\EmptyExpression;
+use Twig\Node\Expression\Variable\ContextVariable;
+use Twig\Node\Node;
+
+/**
+ * @internal
+ */
+class SequenceDestructuringSetBinary extends AbstractBinary
+{
+    private array $variables = [];
+
+    /**
+     * @param ArrayExpression    $left  The array expression containing variables to assign to
+     * @param AbstractExpression $right The expression providing values for assignment
+     */
+    public function __construct(Node $left, Node $right, int $lineno)
+    {
+        foreach ($left->getKeyValuePairs() as $pair) {
+            if ($pair['value'] instanceof EmptyExpression) {
+                $this->variables[] = null;
+            } elseif ($pair['value'] instanceof ContextVariable) {
+                $this->variables[] = $pair['value']->getAttribute('name');
+            } else {
+                throw new SyntaxError(\sprintf('Cannot assign to "%s", only variables can be assigned in sequence destructuring.', $pair['value']::class), $lineno);
+            }
+        }
+
+        parent::__construct($left, $right, $lineno);
+    }
+
+    public function compile(Compiler $compiler): void
+    {
+        $compiler->addDebugInfo($this);
+        $compiler->raw('[');
+        foreach ($this->variables as $i => $name) {
+            if ($i) {
+                $compiler->raw(', ');
+            }
+            if (null !== $name) {
+                $compiler->raw('$context[')->repr($name)->raw(']');
+            }
+        }
+        $compiler->raw('] = array_pad(')->subcompile($this->getNode('right'))->raw(', ')->repr(\count($this->variables))->raw(', null)');
+    }
+
+    public function operator(Compiler $compiler): Compiler
+    {
+        return $compiler->raw('=');
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/Binary/SetBinary.php b/lib/twig/twig/src/Node/Expression/Binary/SetBinary.php
new file mode 100644
index 000000000..7b3443298
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/Binary/SetBinary.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression\Binary;
+
+use Twig\Compiler;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Expression\Variable\AssignContextVariable;
+use Twig\Node\Expression\Variable\ContextVariable;
+use Twig\Node\Node;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SetBinary extends AbstractBinary
+{
+    /**
+     * @param ContextVariable    $left
+     * @param AbstractExpression $right
+     */
+    public function __construct(Node $left, Node $right, int $lineno)
+    {
+        $name = $left->getAttribute('name');
+        if (!\is_string($name)) {
+            throw new \LogicException('The "name" attribute must be a string.');
+        }
+        $left = new AssignContextVariable($name, $left->getTemplateLine());
+
+        parent::__construct($left, $right, $lineno);
+    }
+
+    public function operator(Compiler $compiler): Compiler
+    {
+        return $compiler->raw('=');
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/EmptyExpression.php b/lib/twig/twig/src/Node/Expression/EmptyExpression.php
new file mode 100644
index 000000000..768d1d64f
--- /dev/null
+++ b/lib/twig/twig/src/Node/Expression/EmptyExpression.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression;
+
+use Twig\Compiler;
+
+/**
+ * Represents an empty slot in an array.
+ *
+ * This is currently only used in destructuring contexts.
+ *
+ * @internal
+ */
+final class EmptyExpression extends AbstractExpression
+{
+    public function __construct(int $lineno)
+    {
+        parent::__construct([], [], $lineno);
+    }
+
+    public function compile(Compiler $compiler): void
+    {
+    }
+}
diff --git a/lib/twig/twig/src/Node/Expression/FunctionNode/EnumCasesFunction.php b/lib/twig/twig/src/Node/Expression/FunctionNode/EnumCasesFunction.php
index 7e5c25ff4..170d0a13b 100644
--- a/lib/twig/twig/src/Node/Expression/FunctionNode/EnumCasesFunction.php
+++ b/lib/twig/twig/src/Node/Expression/FunctionNode/EnumCasesFunction.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node\Expression\FunctionNode;
 
 use Twig\Compiler;
diff --git a/lib/twig/twig/src/Node/Expression/FunctionNode/EnumFunction.php b/lib/twig/twig/src/Node/Expression/FunctionNode/EnumFunction.php
index 1f8b0ecf1..af15b64f7 100644
--- a/lib/twig/twig/src/Node/Expression/FunctionNode/EnumFunction.php
+++ b/lib/twig/twig/src/Node/Expression/FunctionNode/EnumFunction.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node\Expression\FunctionNode;
 
 use Twig\Compiler;
diff --git a/lib/twig/twig/src/Node/Expression/GetAttrExpression.php b/lib/twig/twig/src/Node/Expression/GetAttrExpression.php
index 781c8af38..f207b092c 100644
--- a/lib/twig/twig/src/Node/Expression/GetAttrExpression.php
+++ b/lib/twig/twig/src/Node/Expression/GetAttrExpression.php
@@ -25,7 +25,7 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
     /**
      * @param ArrayExpression|NameExpression|null $arguments
      */
-    public function __construct(AbstractExpression $node, AbstractExpression $attribute, ?AbstractExpression $arguments, string $type, int $lineno)
+    public function __construct(AbstractExpression $node, AbstractExpression $attribute, ?AbstractExpression $arguments, string $type, int $lineno, bool $nullSafe = false)
     {
         $nodes = ['node' => $node, 'attribute' => $attribute];
         if (null !== $arguments) {
@@ -36,7 +36,7 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
             trigger_deprecation('twig/twig', '3.15', \sprintf('Not passing a "%s" instance as the "arguments" argument of the "%s" constructor is deprecated ("%s" given).', ArrayExpression::class, static::class, $arguments::class));
         }
 
-        parent::__construct($nodes, ['type' => $type, 'ignore_strict_check' => false, 'optimizable' => true], $lineno);
+        parent::__construct($nodes, ['type' => $type, 'ignore_strict_check' => false, 'optimizable' => !$nullSafe, 'null_safe' => $nullSafe], $lineno);
     }
 
     public function enableDefinedTest(): void
@@ -49,6 +49,8 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
     {
         $env = $compiler->getEnvironment();
         $arrayAccessSandbox = false;
+        $nullSafe = $this->getAttribute('null_safe');
+        $objectVar = null;
 
         // optimize array calls
         if (
@@ -93,14 +95,27 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
             ;
         }
 
-        $compiler->raw('CoreExtension::getAttribute($this->env, $this->source, ');
-
         if ($this->getAttribute('ignore_strict_check')) {
             $this->getNode('node')->setAttribute('ignore_strict_check', true);
         }
 
+        if ($nullSafe) {
+            $objectVar = '$'.$compiler->getVarName();
+            $compiler
+                ->raw('((null === ('.$objectVar.' = ')
+                ->subcompile($this->getNode('node'))
+                ->raw(')) ? null : ');
+        }
+
+        $compiler->raw('CoreExtension::getAttribute($this->env, $this->source, ');
+
+        if ($nullSafe) {
+            $compiler->raw($objectVar);
+        } else {
+            $compiler->subcompile($this->getNode('node'));
+        }
+
         $compiler
-            ->subcompile($this->getNode('node'))
             ->raw(', ')
             ->subcompile($this->getNode('attribute'))
         ;
@@ -123,14 +138,18 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
         if ($arrayAccessSandbox) {
             $compiler->raw(')');
         }
+
+        if ($nullSafe) {
+            $compiler->raw(')');
+        }
     }
 
-    private function changeIgnoreStrictCheck(GetAttrExpression $node): void
+    private function changeIgnoreStrictCheck(self $node): void
     {
         $node->setAttribute('optimizable', false);
         $node->setAttribute('ignore_strict_check', true);
 
-        if ($node->getNode('node') instanceof GetAttrExpression) {
+        if ($node->getNode('node') instanceof self) {
             $this->changeIgnoreStrictCheck($node->getNode('node'));
         }
     }
diff --git a/lib/twig/twig/src/Node/Expression/Test/DefinedTest.php b/lib/twig/twig/src/Node/Expression/Test/DefinedTest.php
index f17715bc6..d73502990 100644
--- a/lib/twig/twig/src/Node/Expression/Test/DefinedTest.php
+++ b/lib/twig/twig/src/Node/Expression/Test/DefinedTest.php
@@ -15,16 +15,8 @@ use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Compiler;
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\BlockReferenceExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\FunctionExpression;
-use Twig\Node\Expression\GetAttrExpression;
-use Twig\Node\Expression\MacroReferenceExpression;
-use Twig\Node\Expression\MethodCallExpression;
 use Twig\Node\Expression\SupportDefinedTestInterface;
 use Twig\Node\Expression\TestExpression;
-use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\Node;
 use Twig\TwigTest;
 
diff --git a/lib/twig/twig/src/Node/TypesNode.php b/lib/twig/twig/src/Node/TypesNode.php
index b5949848d..a18288083 100644
--- a/lib/twig/twig/src/Node/TypesNode.php
+++ b/lib/twig/twig/src/Node/TypesNode.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node;
 
 use Twig\Attribute\YieldReady;
diff --git a/lib/twig/twig/src/Parser.php b/lib/twig/twig/src/Parser.php
index 1937b7e15..af54f13b2 100644
--- a/lib/twig/twig/src/Parser.php
+++ b/lib/twig/twig/src/Parser.php
@@ -76,6 +76,9 @@ class Parser
         return \sprintf('__internal_parse_%d', $this->varNameSalt++);
     }
 
+    /**
+     * @throws SyntaxError
+     */
     public function parse(TokenStream $stream, $test = null, bool $dropNeedle = false): ModuleNode
     {
         $vars = get_object_vars($this);
@@ -158,6 +161,9 @@ class Parser
         }
     }
 
+    /**
+     * @throws SyntaxError
+     */
     public function subparse($test, bool $dropNeedle = false): Node
     {
         $lineno = $this->getCurrentToken()->getLine();
@@ -494,11 +500,26 @@ class Parser
             // try 2-words tests
             $name = $name.' '.$this->getCurrentToken()->getValue();
 
-            if ($test = $this->env->getTest($name)) {
-                $this->stream->next();
+            try {
+                $test = $this->env->getTest($name);
+            } catch (SyntaxError $e) {
+                if (!$this->shouldIgnoreUnknownTwigCallables()) {
+                    throw $e;
+                }
+
+                $test = null;
             }
+            $this->stream->next();
         } else {
-            $test = $this->env->getTest($name);
+            try {
+                $test = $this->env->getTest($name);
+            } catch (SyntaxError $e) {
+                if (!$this->shouldIgnoreUnknownTwigCallables()) {
+                    throw $e;
+                }
+
+                $test = null;
+            }
         }
 
         if (!$test) {
diff --git a/lib/twig/twig/src/Resources/debug.php b/lib/twig/twig/src/Resources/debug.php
index 104b4f4e0..a0392ff51 100644
--- a/lib/twig/twig/src/Resources/debug.php
+++ b/lib/twig/twig/src/Resources/debug.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
+ * This file is part of Twig.
  *
- * (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/twig/twig/src/Resources/string_loader.php b/lib/twig/twig/src/Resources/string_loader.php
index 8f0e6492a..c499e5ec2 100644
--- a/lib/twig/twig/src/Resources/string_loader.php
+++ b/lib/twig/twig/src/Resources/string_loader.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
+ * This file is part of Twig.
  *
- * (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/twig/twig/src/Runtime/EscaperRuntime.php b/lib/twig/twig/src/Runtime/EscaperRuntime.php
index 17ed76cc9..f686e19f0 100644
--- a/lib/twig/twig/src/Runtime/EscaperRuntime.php
+++ b/lib/twig/twig/src/Runtime/EscaperRuntime.php
@@ -17,7 +17,7 @@ use Twig\Markup;
 
 final class EscaperRuntime implements RuntimeExtensionInterface
 {
-    /** @var array<string, callable(string $string, string $charset): string> */
+    /** @var array<string, callable(string, string): string> */
     private $escapers = [];
 
     /** @internal */
@@ -140,6 +140,10 @@ final class EscaperRuntime implements RuntimeExtensionInterface
             case 'html':
                 // see https://www.php.net/htmlspecialchars
 
+                if ('UTF-8' === $charset) {
+                    return htmlspecialchars($string, \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
+                }
+
                 // Using a static variable to avoid initializing the array
                 // each time the function is called. Moving the declaration on the
                 // top of the function slow downs other escaping strategies.
@@ -195,7 +199,7 @@ final class EscaperRuntime implements RuntimeExtensionInterface
                     * Escape sequences supported only by JavaScript, not JSON, are omitted.
                     * \" is also supported but omitted, because the resulting string is not HTML safe.
                     */
-                    static $shortMap = [
+                    $short = match ($char) {
                         '\\' => '\\\\',
                         '/' => '\\/',
                         "\x08" => '\b',
@@ -203,10 +207,11 @@ final class EscaperRuntime implements RuntimeExtensionInterface
                         "\x0A" => '\n',
                         "\x0D" => '\r',
                         "\x09" => '\t',
-                    ];
+                        default => false,
+                    };
 
-                    if (isset($shortMap[$char])) {
-                        return $shortMap[$char];
+                    if ($short) {
+                        return $short;
                     }
 
                     $codepoint = mb_ord($char, 'UTF-8');
@@ -267,7 +272,7 @@ final class EscaperRuntime implements RuntimeExtensionInterface
                      * @license   https://framework.zend.com/license/new-bsd New BSD License
                      */
                     $chr = $matches[0];
-                    $ord = \ord($chr);
+                    $ord = \ord($chr[0]);
 
                     /*
                     * The following replaces characters undefined in HTML with the
@@ -288,18 +293,13 @@ final class EscaperRuntime implements RuntimeExtensionInterface
                         * entities that XML supports. Using HTML entities would result in this error:
                         *     XML Parsing Error: undefined entity
                         */
-                        static $entityMap = [
+                        return match ($ord) {
                             34 => '&quot;', /* quotation mark */
                             38 => '&amp;',  /* ampersand */
                             60 => '&lt;',   /* less-than sign */
                             62 => '&gt;',   /* greater-than sign */
-                        ];
-
-                        if (isset($entityMap[$ord])) {
-                            return $entityMap[$ord];
-                        }
-
-                        return \sprintf('&#x%02X;', $ord);
+                            default => \sprintf('&#x%02X;', $ord),
+                        };
                     }
 
                     /*
diff --git a/lib/twig/twig/src/Template.php b/lib/twig/twig/src/Template.php
index faf7aee1e..c37209287 100644
--- a/lib/twig/twig/src/Template.php
+++ b/lib/twig/twig/src/Template.php
@@ -270,7 +270,7 @@ abstract class Template
     /**
      * @param string|TemplateWrapper|array<string|TemplateWrapper> $template
      */
-    protected function load(string|TemplateWrapper|array $template, int $line, int|null $index = null): self
+    protected function load(string|TemplateWrapper|array $template, int $line, ?int $index = null): self
     {
         try {
             if (\is_array($template)) {
@@ -315,7 +315,7 @@ abstract class Template
      *
      * @deprecated since Twig 3.21 and will be removed in 4.0. Use Template::load() instead.
      */
-    protected function loadTemplate($template, $templateName = null, int|null $line = null, int|null $index = null): self|TemplateWrapper
+    protected function loadTemplate($template, $templateName = null, ?int $line = null, ?int $index = null): self|TemplateWrapper
     {
         trigger_deprecation('twig/twig', '3.21', 'The "%s" method is deprecated.', __METHOD__);
 
diff --git a/lib/twig/twig/src/TokenParser/GuardTokenParser.php b/lib/twig/twig/src/TokenParser/GuardTokenParser.php
index 656766af5..eb4886579 100644
--- a/lib/twig/twig/src/TokenParser/GuardTokenParser.php
+++ b/lib/twig/twig/src/TokenParser/GuardTokenParser.php
@@ -32,9 +32,15 @@ final class GuardTokenParser extends AbstractTokenParser
         $method = 'get'.$typeToken->getValue();
 
         $nameToken = $stream->expect(Token::NAME_TYPE);
+        $name = $nameToken->getValue();
+        if ('test' === $typeToken->getValue() && $stream->test(Token::NAME_TYPE)) {
+            // try 2-words tests
+            $name .= ' '.$stream->getCurrent()->getValue();
+            $stream->next();
+        }
 
         try {
-            $exists = null !== $this->parser->getEnvironment()->$method($nameToken->getValue());
+            $exists = null !== $this->parser->getEnvironment()->$method($name);
         } catch (SyntaxError) {
             $exists = false;
         }