diff --git a/composer.lock b/composer.lock
index d2d5c710b..cb66e47e4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1207,22 +1207,27 @@
},
{
"name": "psr/container",
- "version": "1.1.2",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": ""
},
"require": {
"php": ">=7.4.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
@@ -1249,9 +1254,9 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.2"
+ "source": "https://github.com/php-fig/container/tree/2.0.2"
},
- "time": "2021-11-05T16:50:12+00:00"
+ "time": "2021-11-05T16:47:00+00:00"
},
{
"name": "psr/event-dispatcher",
@@ -1465,16 +1470,16 @@
},
{
"name": "psr/log",
- "version": "3.0.0",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
"shasum": ""
},
"require": {
@@ -1509,9 +1514,9 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/3.0.0"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
- "time": "2021-07-14T16:46:02+00:00"
+ "time": "2024-09-11T13:17:53+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -1747,16 +1752,16 @@
},
{
"name": "symfony/cache",
- "version": "v6.4.2",
+ "version": "v6.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978"
+ "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/14a75869bbb41cb35bc5d9d322473928c6f3f978",
- "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
+ "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
"shasum": ""
},
"require": {
@@ -1823,7 +1828,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v6.4.2"
+ "source": "https://github.com/symfony/cache/tree/v6.4.12"
},
"funding": [
{
@@ -1839,20 +1844,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-29T15:34:34+00:00"
+ "time": "2024-09-16T16:01:33+00:00"
},
{
"name": "symfony/cache-contracts",
- "version": "v3.4.0",
+ "version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
- "reference": "1d74b127da04ffa87aa940abe15446fa89653778"
+ "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778",
- "reference": "1d74b127da04ffa87aa940abe15446fa89653778",
+ "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868",
+ "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868",
"shasum": ""
},
"require": {
@@ -1861,12 +1866,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": {
@@ -1899,7 +1904,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0"
+ "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -1915,7 +1920,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-25T12:52:38+00:00"
+ "time": "2025-03-13T15:25:07+00:00"
},
{
"name": "symfony/config",
@@ -2885,16 +2890,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v6.4.14",
+ "version": "v6.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "ba020a321a95519303a3f09ec2824d34d601c388"
+ "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388",
- "reference": "ba020a321a95519303a3f09ec2824d34d601c388",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88",
+ "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88",
"shasum": ""
},
"require": {
@@ -2904,12 +2909,12 @@
"symfony/polyfill-php83": "^1.27"
},
"conflict": {
- "symfony/cache": "<6.3"
+ "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
},
"require-dev": {
"doctrine/dbal": "^2.13.1|^3|^4",
"predis/predis": "^1.1|^2.0",
- "symfony/cache": "^6.3|^7.0",
+ "symfony/cache": "^6.4.12|^7.1.5",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/expression-language": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
@@ -2942,7 +2947,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.14"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.4.29"
},
"funding": [
{
@@ -2953,12 +2958,16 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2024-11-05T16:39:55+00:00"
+ "time": "2025-11-08T16:40:12+00:00"
},
{
"name": "symfony/http-kernel",
@@ -3667,17 +3676,17 @@
"time": "2024-12-23T08:48:59+00:00"
},
{
- "name": "symfony/polyfill-php80",
+ "name": "symfony/polyfill-php83",
"version": "v1.33.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+ "url": "https://github.com/symfony/polyfill-php83.git",
+ "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
- "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+ "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+ "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
"shasum": ""
},
"require": {
@@ -3690,94 +3699,6 @@
"name": "symfony/polyfill"
}
},
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://github.com/nicolas-grekas",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2025-01-02T08:10:11+00:00"
- },
- {
- "name": "symfony/polyfill-php83",
- "version": "v1.28.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php83.git",
- "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
- "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1",
- "symfony/polyfill-php80": "^1.14"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
"autoload": {
"files": [
"bootstrap.php"
@@ -3812,7 +3733,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
},
"funding": [
{
@@ -3823,12 +3744,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-08-16T06:22:46+00:00"
+ "time": "2025-07-08T02:45:35+00:00"
},
{
"name": "symfony/routing",
@@ -3998,16 +3923,16 @@
},
{
"name": "symfony/service-contracts",
- "version": "v3.6.0",
+ "version": "v3.6.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
- "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
"shasum": ""
},
"require": {
@@ -4061,7 +3986,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
},
"funding": [
{
@@ -4072,12 +3997,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": "2025-04-25T09:37:31+00:00"
+ "time": "2025-07-15T11:30:57+00:00"
},
{
"name": "symfony/string",
@@ -4523,16 +4452,16 @@
},
{
"name": "symfony/var-exporter",
- "version": "v6.4.2",
+ "version": "v6.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e"
+ "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5fe9a0021b8d35e67d914716ec8de50716a68e7e",
- "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/466fcac5fa2e871f83d31173f80e9c2684743bfc",
+ "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc",
"shasum": ""
},
"require": {
@@ -4540,6 +4469,8 @@
"symfony/deprecation-contracts": "^2.5|^3"
},
"require-dev": {
+ "symfony/property-access": "^6.4|^7.0",
+ "symfony/serializer": "^6.4|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"type": "library",
@@ -4578,7 +4509,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v6.4.2"
+ "source": "https://github.com/symfony/var-exporter/tree/v6.4.26"
},
"funding": [
{
@@ -4589,12 +4520,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-27T08:18:35+00:00"
+ "time": "2025-09-11T09:57:09+00:00"
},
{
"name": "symfony/yaml",
@@ -5118,5 +5053,5 @@
"platform-overrides": {
"php": "8.1.0"
},
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.9.0"
}
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index d98cfc88e..36fce16ba 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -29,7 +29,6 @@ return array(
'AsyncSendEmail' => $baseDir . '/core/asynctask.class.inc.php',
'AsyncSendNewsroom' => $baseDir . '/core/asynctask.class.inc.php',
'AsyncTask' => $baseDir . '/core/asynctask.class.inc.php',
- 'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
'AttributeApplicationLanguage' => $baseDir . '/core/attributedef.class.inc.php',
'AttributeArchiveDate' => $baseDir . '/core/attributedef.class.inc.php',
'AttributeArchiveFlag' => $baseDir . '/core/attributedef.class.inc.php',
@@ -1222,7 +1221,6 @@ return array(
'PhpParser\\Parser\\Tokens' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
'PhpParser\\PrettyPrinterAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
'PhpParser\\PrettyPrinter\\Standard' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
- 'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
'PluginInstanciationManager' => $baseDir . '/core/plugininstanciationmanager.class.inc.php',
'PluginManager' => $baseDir . '/core/pluginmanager.class.inc.php',
'PortalDispatcher' => $baseDir . '/application/portaldispatcher.class.inc.php',
@@ -1420,7 +1418,6 @@ return array(
'StimulusInternal' => $baseDir . '/core/stimulus.class.inc.php',
'StimulusUserAction' => $baseDir . '/core/stimulus.class.inc.php',
'Str' => $baseDir . '/core/MyHelpers.class.inc.php',
- 'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
'Symfony\\Bridge\\Twig\\AppVariable' => $vendorDir . '/symfony/twig-bridge/AppVariable.php',
'Symfony\\Bridge\\Twig\\Attribute\\Template' => $vendorDir . '/symfony/twig-bridge/Attribute/Template.php',
'Symfony\\Bridge\\Twig\\Command\\DebugCommand' => $vendorDir . '/symfony/twig-bridge/Command/DebugCommand.php',
@@ -1662,19 +1659,6 @@ return array(
'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\\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',
@@ -2278,6 +2262,17 @@ return array(
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => $vendorDir . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
'Symfony\\Component\\HttpFoundation\\StreamedJsonResponse' => $vendorDir . '/symfony/http-foundation/StreamedJsonResponse.php',
'Symfony\\Component\\HttpFoundation\\StreamedResponse' => $vendorDir . '/symfony/http-foundation/StreamedResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\RequestAttributeValueSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/RequestAttributeValueSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseCookieValueSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseFormatSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseFormatSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasCookie' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHasCookie.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasHeader' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHasHeader.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderLocationSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHeaderLocationSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseHeaderSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsRedirected' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsRedirected.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsSuccessful' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsSuccessful.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsUnprocessable' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseIsUnprocessable.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseStatusCodeSame' => $vendorDir . '/symfony/http-foundation/Test/Constraint/ResponseStatusCodeSame.php',
'Symfony\\Component\\HttpFoundation\\UriSigner' => $vendorDir . '/symfony/http-foundation/UriSigner.php',
'Symfony\\Component\\HttpFoundation\\UrlHelper' => $vendorDir . '/symfony/http-foundation/UrlHelper.php',
'Symfony\\Component\\HttpKernel\\Attribute\\AsController' => $vendorDir . '/symfony/http-kernel/Attribute/AsController.php',
@@ -2794,8 +2789,6 @@ return array(
'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
- 'Symfony\\Polyfill\\Php80\\Php80' => $vendorDir . '/symfony/polyfill-php80/Php80.php',
- 'Symfony\\Polyfill\\Php80\\PhpToken' => $vendorDir . '/symfony/polyfill-php80/PhpToken.php',
'Symfony\\Polyfill\\Php83\\Php83' => $vendorDir . '/symfony/polyfill-php83/Php83.php',
'Symfony\\Runtime\\Symfony\\Component\\Console\\ApplicationRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/ApplicationRuntime.php',
'Symfony\\Runtime\\Symfony\\Component\\Console\\Command\\CommandRuntime' => $vendorDir . '/symfony/runtime/Internal/Console/Command/CommandRuntime.php',
@@ -3102,7 +3095,6 @@ return array(
'URLButtonItem' => $baseDir . '/application/applicationextension.inc.php',
'URLPopupMenuItem' => $baseDir . '/application/applicationextension.inc.php',
'UnaryExpression' => $baseDir . '/core/oql/expression.class.inc.php',
- 'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
'UnknownClassOqlException' => $baseDir . '/core/oql/oqlinterpreter.class.inc.php',
'User' => $baseDir . '/core/userrights.class.inc.php',
'UserDashboard' => $baseDir . '/application/user.dashboard.class.inc.php',
@@ -3110,7 +3102,6 @@ return array(
'UserRightException' => $baseDir . '/application/exceptions/UserRightException.php',
'UserRights' => $baseDir . '/core/userrights.class.inc.php',
'UserRightsAddOnAPI' => $baseDir . '/core/userrights.class.inc.php',
- 'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
'ValueSetDefinition' => $baseDir . '/core/valuesetdef.class.inc.php',
'ValueSetEnum' => $baseDir . '/core/valuesetdef.class.inc.php',
'ValueSetEnumClasses' => $baseDir . '/core/valuesetdef.class.inc.php',
diff --git a/lib/composer/autoload_files.php b/lib/composer/autoload_files.php
index 2ddea1d64..982b4f47c 100644
--- a/lib/composer/autoload_files.php
+++ b/lib/composer/autoload_files.php
@@ -9,7 +9,6 @@ return array(
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
- 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php
index 7acbed6bf..6816f3d26 100644
--- a/lib/composer/autoload_psr4.php
+++ b/lib/composer/autoload_psr4.php
@@ -10,7 +10,6 @@ return array(
'TheNetworg\\OAuth2\\Client\\' => array($vendorDir . '/thenetworg/oauth2-azure/src'),
'Symfony\\Runtime\\Symfony\\Component\\' => array($vendorDir . '/symfony/runtime/Internal'),
'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'),
- 'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 4b1fc5b95..df8208e05 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -10,7 +10,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
- 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
'662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
'667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
@@ -28,16 +27,15 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
);
public static $prefixLengthsPsr4 = array (
- 'T' =>
+ 'T' =>
array (
'Twig\\' => 5,
'TheNetworg\\OAuth2\\Client\\' => 25,
),
- 'S' =>
+ 'S' =>
array (
'Symfony\\Runtime\\Symfony\\Component\\' => 34,
'Symfony\\Polyfill\\Php83\\' => 23,
- 'Symfony\\Polyfill\\Php80\\' => 23,
'Symfony\\Polyfill\\Mbstring\\' => 26,
'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33,
'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
@@ -77,7 +75,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'ScssPhp\\ScssPhp\\' => 16,
'Sabberworm\\CSS\\' => 15,
),
- 'P' =>
+ 'P' =>
array (
'Psr\\Log\\' => 8,
'Psr\\Http\\Message\\' => 17,
@@ -88,278 +86,274 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'PhpParser\\' => 10,
'Pelago\\Emogrifier\\' => 18,
),
- 'L' =>
+ 'L' =>
array (
'League\\OAuth2\\Client\\' => 21,
),
- 'G' =>
+ 'G' =>
array (
'GuzzleHttp\\Psr7\\' => 16,
'GuzzleHttp\\Promise\\' => 19,
'GuzzleHttp\\' => 11,
),
- 'F' =>
+ 'F' =>
array (
'Firebase\\JWT\\' => 13,
),
- 'E' =>
+ 'E' =>
array (
'Egulias\\EmailValidator\\' => 23,
),
- 'D' =>
+ 'D' =>
array (
'Doctrine\\Common\\Lexer\\' => 22,
),
);
public static $prefixDirsPsr4 = array (
- 'Twig\\' =>
+ 'Twig\\' =>
array (
0 => __DIR__ . '/..' . '/twig/twig/src',
),
- 'TheNetworg\\OAuth2\\Client\\' =>
+ 'TheNetworg\\OAuth2\\Client\\' =>
array (
0 => __DIR__ . '/..' . '/thenetworg/oauth2-azure/src',
),
- 'Symfony\\Runtime\\Symfony\\Component\\' =>
+ 'Symfony\\Runtime\\Symfony\\Component\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/runtime/Internal',
),
- 'Symfony\\Polyfill\\Php83\\' =>
+ 'Symfony\\Polyfill\\Php83\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-php83',
),
- 'Symfony\\Polyfill\\Php80\\' =>
- array (
- 0 => __DIR__ . '/..' . '/symfony/polyfill-php80',
- ),
- 'Symfony\\Polyfill\\Mbstring\\' =>
+ 'Symfony\\Polyfill\\Mbstring\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
),
- 'Symfony\\Polyfill\\Intl\\Normalizer\\' =>
+ 'Symfony\\Polyfill\\Intl\\Normalizer\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer',
),
- 'Symfony\\Polyfill\\Intl\\Idn\\' =>
+ 'Symfony\\Polyfill\\Intl\\Idn\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-intl-idn',
),
- 'Symfony\\Polyfill\\Intl\\Grapheme\\' =>
+ 'Symfony\\Polyfill\\Intl\\Grapheme\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme',
),
- 'Symfony\\Polyfill\\Ctype\\' =>
+ 'Symfony\\Polyfill\\Ctype\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
),
- 'Symfony\\Contracts\\Translation\\' =>
+ 'Symfony\\Contracts\\Translation\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/translation-contracts',
),
- 'Symfony\\Contracts\\Service\\' =>
+ 'Symfony\\Contracts\\Service\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/service-contracts',
),
- 'Symfony\\Contracts\\EventDispatcher\\' =>
+ 'Symfony\\Contracts\\EventDispatcher\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/event-dispatcher-contracts',
),
- 'Symfony\\Contracts\\Cache\\' =>
+ 'Symfony\\Contracts\\Cache\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/cache-contracts',
),
- 'Symfony\\Component\\Yaml\\' =>
+ 'Symfony\\Component\\Yaml\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/yaml',
),
- 'Symfony\\Component\\VarExporter\\' =>
+ 'Symfony\\Component\\VarExporter\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/var-exporter',
),
- 'Symfony\\Component\\VarDumper\\' =>
+ 'Symfony\\Component\\VarDumper\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/var-dumper',
),
- 'Symfony\\Component\\String\\' =>
+ 'Symfony\\Component\\String\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/string',
),
- 'Symfony\\Component\\Stopwatch\\' =>
+ 'Symfony\\Component\\Stopwatch\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/stopwatch',
),
- 'Symfony\\Component\\Runtime\\' =>
+ 'Symfony\\Component\\Runtime\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/runtime',
),
- 'Symfony\\Component\\Routing\\' =>
+ 'Symfony\\Component\\Routing\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/routing',
),
- 'Symfony\\Component\\Mime\\' =>
+ 'Symfony\\Component\\Mime\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/mime',
),
- 'Symfony\\Component\\Mailer\\' =>
+ 'Symfony\\Component\\Mailer\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/mailer',
),
- 'Symfony\\Component\\HttpKernel\\' =>
+ 'Symfony\\Component\\HttpKernel\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/http-kernel',
),
- 'Symfony\\Component\\HttpFoundation\\' =>
+ 'Symfony\\Component\\HttpFoundation\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/http-foundation',
),
- 'Symfony\\Component\\Finder\\' =>
+ 'Symfony\\Component\\Finder\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/finder',
),
- 'Symfony\\Component\\Filesystem\\' =>
+ 'Symfony\\Component\\Filesystem\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/filesystem',
),
- 'Symfony\\Component\\EventDispatcher\\' =>
+ 'Symfony\\Component\\EventDispatcher\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
),
- 'Symfony\\Component\\ErrorHandler\\' =>
+ 'Symfony\\Component\\ErrorHandler\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/error-handler',
),
- 'Symfony\\Component\\Dotenv\\' =>
+ 'Symfony\\Component\\Dotenv\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/dotenv',
),
- 'Symfony\\Component\\DependencyInjection\\' =>
+ 'Symfony\\Component\\DependencyInjection\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/dependency-injection',
),
- 'Symfony\\Component\\CssSelector\\' =>
+ 'Symfony\\Component\\CssSelector\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/css-selector',
),
- 'Symfony\\Component\\Console\\' =>
+ 'Symfony\\Component\\Console\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/console',
),
- 'Symfony\\Component\\Config\\' =>
+ 'Symfony\\Component\\Config\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/config',
),
- 'Symfony\\Component\\Cache\\' =>
+ 'Symfony\\Component\\Cache\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/cache',
),
- 'Symfony\\Bundle\\WebProfilerBundle\\' =>
+ 'Symfony\\Bundle\\WebProfilerBundle\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/web-profiler-bundle',
),
- 'Symfony\\Bundle\\TwigBundle\\' =>
+ 'Symfony\\Bundle\\TwigBundle\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/twig-bundle',
),
- 'Symfony\\Bundle\\FrameworkBundle\\' =>
+ 'Symfony\\Bundle\\FrameworkBundle\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/framework-bundle',
),
- 'Symfony\\Bundle\\DebugBundle\\' =>
+ 'Symfony\\Bundle\\DebugBundle\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/debug-bundle',
),
- 'Symfony\\Bridge\\Twig\\' =>
+ 'Symfony\\Bridge\\Twig\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/twig-bridge',
),
- 'Soundasleep\\' =>
+ 'Soundasleep\\' =>
array (
0 => __DIR__ . '/..' . '/soundasleep/html2text/src',
),
- 'ScssPhp\\ScssPhp\\' =>
+ 'ScssPhp\\ScssPhp\\' =>
array (
0 => __DIR__ . '/..' . '/scssphp/scssphp/src',
),
- 'Sabberworm\\CSS\\' =>
+ 'Sabberworm\\CSS\\' =>
array (
0 => __DIR__ . '/..' . '/sabberworm/php-css-parser/src',
),
- 'Psr\\Log\\' =>
+ 'Psr\\Log\\' =>
array (
0 => __DIR__ . '/..' . '/psr/log/src',
),
- 'Psr\\Http\\Message\\' =>
+ 'Psr\\Http\\Message\\' =>
array (
0 => __DIR__ . '/..' . '/psr/http-factory/src',
1 => __DIR__ . '/..' . '/psr/http-message/src',
),
- 'Psr\\Http\\Client\\' =>
+ 'Psr\\Http\\Client\\' =>
array (
0 => __DIR__ . '/..' . '/psr/http-client/src',
),
- 'Psr\\EventDispatcher\\' =>
+ 'Psr\\EventDispatcher\\' =>
array (
0 => __DIR__ . '/..' . '/psr/event-dispatcher/src',
),
- 'Psr\\Container\\' =>
+ 'Psr\\Container\\' =>
array (
0 => __DIR__ . '/..' . '/psr/container/src',
),
- 'Psr\\Cache\\' =>
+ 'Psr\\Cache\\' =>
array (
0 => __DIR__ . '/..' . '/psr/cache/src',
),
- 'PhpParser\\' =>
+ 'PhpParser\\' =>
array (
0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
),
- 'Pelago\\Emogrifier\\' =>
+ 'Pelago\\Emogrifier\\' =>
array (
0 => __DIR__ . '/..' . '/pelago/emogrifier/src',
),
- 'League\\OAuth2\\Client\\' =>
+ 'League\\OAuth2\\Client\\' =>
array (
0 => __DIR__ . '/..' . '/league/oauth2-google/src',
1 => __DIR__ . '/..' . '/league/oauth2-client/src',
),
- 'GuzzleHttp\\Psr7\\' =>
+ 'GuzzleHttp\\Psr7\\' =>
array (
0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',
),
- 'GuzzleHttp\\Promise\\' =>
+ 'GuzzleHttp\\Promise\\' =>
array (
0 => __DIR__ . '/..' . '/guzzlehttp/promises/src',
),
- 'GuzzleHttp\\' =>
+ 'GuzzleHttp\\' =>
array (
0 => __DIR__ . '/..' . '/guzzlehttp/guzzle/src',
),
- 'Firebase\\JWT\\' =>
+ 'Firebase\\JWT\\' =>
array (
0 => __DIR__ . '/..' . '/firebase/php-jwt/src',
),
- 'Egulias\\EmailValidator\\' =>
+ 'Egulias\\EmailValidator\\' =>
array (
0 => __DIR__ . '/..' . '/egulias/email-validator/src',
),
- 'Doctrine\\Common\\Lexer\\' =>
+ 'Doctrine\\Common\\Lexer\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/lexer/src',
),
);
public static $prefixesPsr0 = array (
- 'C' =>
+ 'C' =>
array (
- 'Console' =>
+ 'Console' =>
array (
0 => __DIR__ . '/..' . '/pear/console_getopt',
),
),
- 'A' =>
+ 'A' =>
array (
- 'Archive_Tar' =>
+ 'Archive_Tar' =>
array (
0 => __DIR__ . '/..' . '/pear/archive_tar',
),
@@ -394,7 +388,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'AsyncSendEmail' => __DIR__ . '/../..' . '/core/asynctask.class.inc.php',
'AsyncSendNewsroom' => __DIR__ . '/../..' . '/core/asynctask.class.inc.php',
'AsyncTask' => __DIR__ . '/../..' . '/core/asynctask.class.inc.php',
- 'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
'AttributeApplicationLanguage' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php',
'AttributeArchiveDate' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php',
'AttributeArchiveFlag' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php',
@@ -1587,7 +1580,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'PhpParser\\Parser\\Tokens' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
'PhpParser\\PrettyPrinterAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
'PhpParser\\PrettyPrinter\\Standard' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
- 'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
'PluginInstanciationManager' => __DIR__ . '/../..' . '/core/plugininstanciationmanager.class.inc.php',
'PluginManager' => __DIR__ . '/../..' . '/core/pluginmanager.class.inc.php',
'PortalDispatcher' => __DIR__ . '/../..' . '/application/portaldispatcher.class.inc.php',
@@ -1785,7 +1777,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'StimulusInternal' => __DIR__ . '/../..' . '/core/stimulus.class.inc.php',
'StimulusUserAction' => __DIR__ . '/../..' . '/core/stimulus.class.inc.php',
'Str' => __DIR__ . '/../..' . '/core/MyHelpers.class.inc.php',
- 'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
'Symfony\\Bridge\\Twig\\AppVariable' => __DIR__ . '/..' . '/symfony/twig-bridge/AppVariable.php',
'Symfony\\Bridge\\Twig\\Attribute\\Template' => __DIR__ . '/..' . '/symfony/twig-bridge/Attribute/Template.php',
'Symfony\\Bridge\\Twig\\Command\\DebugCommand' => __DIR__ . '/..' . '/symfony/twig-bridge/Command/DebugCommand.php',
@@ -2027,19 +2018,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'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\\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',
@@ -2643,6 +2621,17 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
'Symfony\\Component\\HttpFoundation\\StreamedJsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedJsonResponse.php',
'Symfony\\Component\\HttpFoundation\\StreamedResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\RequestAttributeValueSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/RequestAttributeValueSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseCookieValueSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseFormatSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseFormatSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasCookie' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHasCookie.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHasHeader' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHasHeader.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderLocationSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHeaderLocationSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseHeaderSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseHeaderSame.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsRedirected' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsRedirected.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsSuccessful' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsSuccessful.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseIsUnprocessable' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseIsUnprocessable.php',
+ 'Symfony\\Component\\HttpFoundation\\Test\\Constraint\\ResponseStatusCodeSame' => __DIR__ . '/..' . '/symfony/http-foundation/Test/Constraint/ResponseStatusCodeSame.php',
'Symfony\\Component\\HttpFoundation\\UriSigner' => __DIR__ . '/..' . '/symfony/http-foundation/UriSigner.php',
'Symfony\\Component\\HttpFoundation\\UrlHelper' => __DIR__ . '/..' . '/symfony/http-foundation/UrlHelper.php',
'Symfony\\Component\\HttpKernel\\Attribute\\AsController' => __DIR__ . '/..' . '/symfony/http-kernel/Attribute/AsController.php',
@@ -3159,8 +3148,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
- 'Symfony\\Polyfill\\Php80\\Php80' => __DIR__ . '/..' . '/symfony/polyfill-php80/Php80.php',
- 'Symfony\\Polyfill\\Php80\\PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/PhpToken.php',
'Symfony\\Polyfill\\Php83\\Php83' => __DIR__ . '/..' . '/symfony/polyfill-php83/Php83.php',
'Symfony\\Runtime\\Symfony\\Component\\Console\\ApplicationRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/ApplicationRuntime.php',
'Symfony\\Runtime\\Symfony\\Component\\Console\\Command\\CommandRuntime' => __DIR__ . '/..' . '/symfony/runtime/Internal/Console/Command/CommandRuntime.php',
@@ -3467,7 +3454,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'URLButtonItem' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'URLPopupMenuItem' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
'UnaryExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
- 'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
'UnknownClassOqlException' => __DIR__ . '/../..' . '/core/oql/oqlinterpreter.class.inc.php',
'User' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
'UserDashboard' => __DIR__ . '/../..' . '/application/user.dashboard.class.inc.php',
@@ -3475,7 +3461,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'UserRightException' => __DIR__ . '/../..' . '/application/exceptions/UserRightException.php',
'UserRights' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
'UserRightsAddOnAPI' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
- 'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
'ValueSetDefinition' => __DIR__ . '/../..' . '/core/valuesetdef.class.inc.php',
'ValueSetEnum' => __DIR__ . '/../..' . '/core/valuesetdef.class.inc.php',
'ValueSetEnumClasses' => __DIR__ . '/../..' . '/core/valuesetdef.class.inc.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 7b246762b..c59aaf010 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -1252,24 +1252,29 @@
},
{
"name": "psr/container",
- "version": "1.1.2",
- "version_normalized": "1.1.2.0",
+ "version": "2.0.2",
+ "version_normalized": "2.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+ "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": ""
},
"require": {
"php": ">=7.4.0"
},
- "time": "2021-11-05T16:50:12+00:00",
+ "time": "2021-11-05T16:47:00+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -1297,7 +1302,7 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.2"
+ "source": "https://github.com/php-fig/container/tree/2.0.2"
},
"install-path": "../psr/container"
},
@@ -1525,23 +1530,23 @@
},
{
"name": "psr/log",
- "version": "3.0.0",
- "version_normalized": "3.0.0.0",
+ "version": "3.0.2",
+ "version_normalized": "3.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
- "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
"shasum": ""
},
"require": {
"php": ">=8.0.0"
},
- "time": "2021-07-14T16:46:02+00:00",
+ "time": "2024-09-11T13:17:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1572,7 +1577,7 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/3.0.0"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
"install-path": "../psr/log"
},
@@ -1822,17 +1827,17 @@
},
{
"name": "symfony/cache",
- "version": "v6.4.2",
- "version_normalized": "6.4.2.0",
+ "version": "v6.4.12",
+ "version_normalized": "6.4.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978"
+ "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/14a75869bbb41cb35bc5d9d322473928c6f3f978",
- "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
+ "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
"shasum": ""
},
"require": {
@@ -1866,7 +1871,7 @@
"symfony/messenger": "^5.4|^6.0|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
- "time": "2023-12-29T15:34:34+00:00",
+ "time": "2024-09-16T16:01:33+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1901,7 +1906,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v6.4.2"
+ "source": "https://github.com/symfony/cache/tree/v6.4.12"
},
"funding": [
{
@@ -1921,32 +1926,32 @@
},
{
"name": "symfony/cache-contracts",
- "version": "v3.4.0",
- "version_normalized": "3.4.0.0",
+ "version": "v3.6.0",
+ "version_normalized": "3.6.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
- "reference": "1d74b127da04ffa87aa940abe15446fa89653778"
+ "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778",
- "reference": "1d74b127da04ffa87aa940abe15446fa89653778",
+ "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868",
+ "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868",
"shasum": ""
},
"require": {
"php": ">=8.1",
"psr/cache": "^3.0"
},
- "time": "2023-09-25T12:52:38+00:00",
+ "time": "2025-03-13T15:25:07+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",
@@ -1980,7 +1985,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0"
+ "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -3079,17 +3084,17 @@
},
{
"name": "symfony/http-foundation",
- "version": "v6.4.14",
- "version_normalized": "6.4.14.0",
+ "version": "v6.4.29",
+ "version_normalized": "6.4.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "ba020a321a95519303a3f09ec2824d34d601c388"
+ "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388",
- "reference": "ba020a321a95519303a3f09ec2824d34d601c388",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88",
+ "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88",
"shasum": ""
},
"require": {
@@ -3099,19 +3104,19 @@
"symfony/polyfill-php83": "^1.27"
},
"conflict": {
- "symfony/cache": "<6.3"
+ "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
},
"require-dev": {
"doctrine/dbal": "^2.13.1|^3|^4",
"predis/predis": "^1.1|^2.0",
- "symfony/cache": "^6.3|^7.0",
+ "symfony/cache": "^6.4.12|^7.1.5",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/expression-language": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
"symfony/mime": "^5.4|^6.0|^7.0",
"symfony/rate-limiter": "^5.4|^6.0|^7.0"
},
- "time": "2024-11-05T16:39:55+00:00",
+ "time": "2025-11-08T16:40:12+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -3139,7 +3144,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.14"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.4.29"
},
"funding": [
{
@@ -3150,6 +3155,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"
@@ -3888,24 +3897,24 @@
"install-path": "../symfony/polyfill-mbstring"
},
{
- "name": "symfony/polyfill-php80",
+ "name": "symfony/polyfill-php83",
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+ "url": "https://github.com/symfony/polyfill-php83.git",
+ "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
- "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+ "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+ "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
- "time": "2025-01-02T08:10:11+00:00",
+ "time": "2025-07-08T02:45:35+00:00",
"type": "library",
"extra": {
"thanks": {
@@ -3914,97 +3923,6 @@
}
},
"installation-source": "dist",
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://github.com/nicolas-grekas",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "install-path": "../symfony/polyfill-php80"
- },
- {
- "name": "symfony/polyfill-php83",
- "version": "v1.28.0",
- "version_normalized": "1.28.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php83.git",
- "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
- "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1",
- "symfony/polyfill-php80": "^1.14"
- },
- "time": "2023-08-16T06:22:46+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "installation-source": "dist",
"autoload": {
"files": [
"bootstrap.php"
@@ -4039,7 +3957,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
},
"funding": [
{
@@ -4050,6 +3968,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"
@@ -4231,17 +4153,17 @@
},
{
"name": "symfony/service-contracts",
- "version": "v3.6.0",
- "version_normalized": "3.6.0.0",
+ "version": "v3.6.1",
+ "version_normalized": "3.6.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
- "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
+ "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
"shasum": ""
},
"require": {
@@ -4252,7 +4174,7 @@
"conflict": {
"ext-psr": "<1.1|>=2"
},
- "time": "2025-04-25T09:37:31+00:00",
+ "time": "2025-07-15T11:30:57+00:00",
"type": "library",
"extra": {
"thanks": {
@@ -4297,7 +4219,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
},
"funding": [
{
@@ -4308,6 +4230,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"
@@ -4839,17 +4765,17 @@
},
{
"name": "symfony/var-exporter",
- "version": "v6.4.2",
- "version_normalized": "6.4.2.0",
+ "version": "v6.4.26",
+ "version_normalized": "6.4.26.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e"
+ "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5fe9a0021b8d35e67d914716ec8de50716a68e7e",
- "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/466fcac5fa2e871f83d31173f80e9c2684743bfc",
+ "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc",
"shasum": ""
},
"require": {
@@ -4857,9 +4783,11 @@
"symfony/deprecation-contracts": "^2.5|^3"
},
"require-dev": {
+ "symfony/property-access": "^6.4|^7.0",
+ "symfony/serializer": "^6.4|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
- "time": "2023-12-27T08:18:35+00:00",
+ "time": "2025-09-11T09:57:09+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -4897,7 +4825,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v6.4.2"
+ "source": "https://github.com/symfony/var-exporter/tree/v6.4.26"
},
"funding": [
{
@@ -4908,6 +4836,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"
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 1a90038dd..f7908990c 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'combodo/itop',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => 'c88ba664db4ec5622838a0ee00768e3bc3381d4e',
+ 'reference' => 'd5706fcbef58868cb8bd6ee6f3af133ca4fdab3e',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -22,7 +22,7 @@
'combodo/itop' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => 'c88ba664db4ec5622838a0ee00768e3bc3381d4e',
+ 'reference' => 'd5706fcbef58868cb8bd6ee6f3af133ca4fdab3e',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -179,9 +179,9 @@
),
),
'psr/container' => array(
- 'pretty_version' => '1.1.2',
- 'version' => '1.1.2.0',
- 'reference' => '513e0666f7216c7459170d56df27dfcefe1689ea',
+ 'pretty_version' => '2.0.2',
+ 'version' => '2.0.2.0',
+ 'reference' => 'c71ecc56dfe541dbd90c5360474fbc405f8d5963',
'type' => 'library',
'install_path' => __DIR__ . '/../psr/container',
'aliases' => array(),
@@ -254,9 +254,9 @@
),
),
'psr/log' => array(
- 'pretty_version' => '3.0.0',
- 'version' => '3.0.0.0',
- 'reference' => 'fe5ea303b0887d5caefd3d431c3e61ad47037001',
+ 'pretty_version' => '3.0.2',
+ 'version' => '3.0.2.0',
+ 'reference' => 'f16e1d5863e37f8d8c2a01719f5b34baa2b714d3',
'type' => 'library',
'install_path' => __DIR__ . '/../psr/log',
'aliases' => array(),
@@ -317,18 +317,18 @@
'dev_requirement' => false,
),
'symfony/cache' => array(
- 'pretty_version' => 'v6.4.2',
- 'version' => '6.4.2.0',
- 'reference' => '14a75869bbb41cb35bc5d9d322473928c6f3f978',
+ 'pretty_version' => 'v6.4.12',
+ 'version' => '6.4.12.0',
+ 'reference' => 'a463451b7f6ac4a47b98dbfc78ec2d3560c759d8',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/cache',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/cache-contracts' => array(
- 'pretty_version' => 'v3.4.0',
- 'version' => '3.4.0.0',
- 'reference' => '1d74b127da04ffa87aa940abe15446fa89653778',
+ 'pretty_version' => 'v3.6.0',
+ 'version' => '3.6.0.0',
+ 'reference' => '5d68a57d66910405e5c0b63d6f0af941e66fc868',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/cache-contracts',
'aliases' => array(),
@@ -464,9 +464,9 @@
'dev_requirement' => false,
),
'symfony/http-foundation' => array(
- 'pretty_version' => 'v6.4.14',
- 'version' => '6.4.14.0',
- 'reference' => 'ba020a321a95519303a3f09ec2824d34d601c388',
+ 'pretty_version' => 'v6.4.29',
+ 'version' => '6.4.29.0',
+ 'reference' => 'b03d11e015552a315714c127d8d1e0f9e970ec88',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/http-foundation',
'aliases' => array(),
@@ -544,19 +544,10 @@
'aliases' => array(),
'dev_requirement' => false,
),
- 'symfony/polyfill-php80' => array(
+ 'symfony/polyfill-php83' => array(
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
- 'reference' => '0cc9dd0f17f61d8131e7df6b84bd344899fe2608',
- 'type' => 'library',
- 'install_path' => __DIR__ . '/../symfony/polyfill-php80',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
- 'symfony/polyfill-php83' => array(
- 'pretty_version' => 'v1.28.0',
- 'version' => '1.28.0.0',
- 'reference' => 'b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11',
+ 'reference' => '17f6f9a6b1735c0f163024d959f700cfbc5155e5',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php83',
'aliases' => array(),
@@ -581,9 +572,9 @@
'dev_requirement' => false,
),
'symfony/service-contracts' => array(
- 'pretty_version' => 'v3.6.0',
- 'version' => '3.6.0.0',
- 'reference' => 'f021b05a130d35510bd6b25fe9053c2a8a15d5d4',
+ 'pretty_version' => 'v3.6.1',
+ 'version' => '3.6.1.0',
+ 'reference' => '45112560a3ba2d715666a509a0bc9521d10b6c43',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/service-contracts',
'aliases' => array(),
@@ -650,9 +641,9 @@
'dev_requirement' => false,
),
'symfony/var-exporter' => array(
- 'pretty_version' => 'v6.4.2',
- 'version' => '6.4.2.0',
- 'reference' => '5fe9a0021b8d35e67d914716ec8de50716a68e7e',
+ 'pretty_version' => 'v6.4.26',
+ 'version' => '6.4.26.0',
+ 'reference' => '466fcac5fa2e871f83d31173f80e9c2684743bfc',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-exporter',
'aliases' => array(),
diff --git a/lib/psr/container/composer.json b/lib/psr/container/composer.json
index 017f41ea6..baf6cd1a0 100644
--- a/lib/psr/container/composer.json
+++ b/lib/psr/container/composer.json
@@ -18,5 +18,10 @@
"psr-4": {
"Psr\\Container\\": "src/"
}
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
}
}
diff --git a/lib/psr/container/src/ContainerInterface.php b/lib/psr/container/src/ContainerInterface.php
index cf8e7fd33..b2cad4015 100644
--- a/lib/psr/container/src/ContainerInterface.php
+++ b/lib/psr/container/src/ContainerInterface.php
@@ -32,5 +32,5 @@ interface ContainerInterface
*
* @return bool
*/
- public function has(string $id);
+ public function has(string $id): bool;
}
diff --git a/lib/psr/log/src/LoggerAwareInterface.php b/lib/psr/log/src/LoggerAwareInterface.php
index cc46a9514..062187057 100644
--- a/lib/psr/log/src/LoggerAwareInterface.php
+++ b/lib/psr/log/src/LoggerAwareInterface.php
@@ -9,10 +9,6 @@ interface LoggerAwareInterface
{
/**
* Sets a logger instance on the object.
- *
- * @param LoggerInterface $logger
- *
- * @return void
*/
public function setLogger(LoggerInterface $logger): void;
}
diff --git a/lib/psr/log/src/LoggerAwareTrait.php b/lib/psr/log/src/LoggerAwareTrait.php
index 4fb57a292..85104dbc1 100644
--- a/lib/psr/log/src/LoggerAwareTrait.php
+++ b/lib/psr/log/src/LoggerAwareTrait.php
@@ -9,15 +9,11 @@ trait LoggerAwareTrait
{
/**
* The logger instance.
- *
- * @var LoggerInterface|null
*/
protected ?LoggerInterface $logger = null;
/**
* Sets a logger.
- *
- * @param LoggerInterface $logger
*/
public function setLogger(LoggerInterface $logger): void
{
diff --git a/lib/psr/log/src/LoggerInterface.php b/lib/psr/log/src/LoggerInterface.php
index b3a24b5f7..cb4cf648b 100644
--- a/lib/psr/log/src/LoggerInterface.php
+++ b/lib/psr/log/src/LoggerInterface.php
@@ -22,10 +22,7 @@ interface LoggerInterface
/**
* System is unusable.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function emergency(string|\Stringable $message, array $context = []): void;
@@ -35,10 +32,7 @@ interface LoggerInterface
* Example: Entire website down, database unavailable, etc. This should
* trigger the SMS alerts and wake you up.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function alert(string|\Stringable $message, array $context = []): void;
@@ -47,10 +41,7 @@ interface LoggerInterface
*
* Example: Application component unavailable, unexpected exception.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function critical(string|\Stringable $message, array $context = []): void;
@@ -58,10 +49,7 @@ interface LoggerInterface
* Runtime errors that do not require immediate action but should typically
* be logged and monitored.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function error(string|\Stringable $message, array $context = []): void;
@@ -71,20 +59,14 @@ interface LoggerInterface
* Example: Use of deprecated APIs, poor use of an API, undesirable things
* that are not necessarily wrong.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function warning(string|\Stringable $message, array $context = []): void;
/**
* Normal but significant events.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function notice(string|\Stringable $message, array $context = []): void;
@@ -93,32 +75,23 @@ interface LoggerInterface
*
* Example: User logs in, SQL logs.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function info(string|\Stringable $message, array $context = []): void;
/**
* Detailed debug information.
*
- * @param string|\Stringable $message
* @param mixed[] $context
- *
- * @return void
*/
public function debug(string|\Stringable $message, array $context = []): void;
/**
* Logs with an arbitrary level.
*
- * @param mixed $level
- * @param string|\Stringable $message
+ * @param mixed $level
* @param mixed[] $context
*
- * @return void
- *
* @throws \Psr\Log\InvalidArgumentException
*/
public function log($level, string|\Stringable $message, array $context = []): void;
diff --git a/lib/psr/log/src/LoggerTrait.php b/lib/psr/log/src/LoggerTrait.php
index 9c8733f95..a5d9980b6 100644
--- a/lib/psr/log/src/LoggerTrait.php
+++ b/lib/psr/log/src/LoggerTrait.php
@@ -14,11 +14,6 @@ trait LoggerTrait
{
/**
* System is unusable.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function emergency(string|\Stringable $message, array $context = []): void
{
@@ -30,11 +25,6 @@ trait LoggerTrait
*
* Example: Entire website down, database unavailable, etc. This should
* trigger the SMS alerts and wake you up.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function alert(string|\Stringable $message, array $context = []): void
{
@@ -45,11 +35,6 @@ trait LoggerTrait
* Critical conditions.
*
* Example: Application component unavailable, unexpected exception.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function critical(string|\Stringable $message, array $context = []): void
{
@@ -59,11 +44,6 @@ trait LoggerTrait
/**
* Runtime errors that do not require immediate action but should typically
* be logged and monitored.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function error(string|\Stringable $message, array $context = []): void
{
@@ -75,11 +55,6 @@ trait LoggerTrait
*
* Example: Use of deprecated APIs, poor use of an API, undesirable things
* that are not necessarily wrong.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function warning(string|\Stringable $message, array $context = []): void
{
@@ -88,11 +63,6 @@ trait LoggerTrait
/**
* Normal but significant events.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function notice(string|\Stringable $message, array $context = []): void
{
@@ -103,11 +73,6 @@ trait LoggerTrait
* Interesting events.
*
* Example: User logs in, SQL logs.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function info(string|\Stringable $message, array $context = []): void
{
@@ -116,11 +81,6 @@ trait LoggerTrait
/**
* Detailed debug information.
- *
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
*/
public function debug(string|\Stringable $message, array $context = []): void
{
@@ -130,11 +90,7 @@ trait LoggerTrait
/**
* Logs with an arbitrary level.
*
- * @param mixed $level
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
+ * @param mixed $level
*
* @throws \Psr\Log\InvalidArgumentException
*/
diff --git a/lib/psr/log/src/NullLogger.php b/lib/psr/log/src/NullLogger.php
index c1cc3c069..de0561e2a 100644
--- a/lib/psr/log/src/NullLogger.php
+++ b/lib/psr/log/src/NullLogger.php
@@ -15,11 +15,7 @@ class NullLogger extends AbstractLogger
/**
* Logs with an arbitrary level.
*
- * @param mixed $level
- * @param string|\Stringable $message
- * @param array $context
- *
- * @return void
+ * @param mixed[] $context
*
* @throws \Psr\Log\InvalidArgumentException
*/
diff --git a/lib/symfony/cache-contracts/CacheInterface.php b/lib/symfony/cache-contracts/CacheInterface.php
index a4fcea731..3e4aaf65c 100644
--- a/lib/symfony/cache-contracts/CacheInterface.php
+++ b/lib/symfony/cache-contracts/CacheInterface.php
@@ -44,7 +44,7 @@ interface CacheInterface
*
* @throws InvalidArgumentException When $key is not valid or when $beta is negative
*/
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed;
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed;
/**
* Removes an item from the pool.
diff --git a/lib/symfony/cache-contracts/CacheTrait.php b/lib/symfony/cache-contracts/CacheTrait.php
index 8a4b0bda8..4c5449b9d 100644
--- a/lib/symfony/cache-contracts/CacheTrait.php
+++ b/lib/symfony/cache-contracts/CacheTrait.php
@@ -25,7 +25,7 @@ class_exists(InvalidArgumentException::class);
*/
trait CacheTrait
{
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
return $this->doGet($this, $key, $callback, $beta, $metadata);
}
@@ -35,10 +35,10 @@ trait CacheTrait
return $this->deleteItem($key);
}
- private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null): mixed
+ private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, ?array &$metadata = null, ?LoggerInterface $logger = null): mixed
{
if (0 > $beta ??= 1.0) {
- throw new class(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException {};
+ throw new class(\sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException {};
}
$item = $pool->getItem($key);
@@ -54,7 +54,7 @@ trait CacheTrait
$item->expiresAt(null);
$logger?->info('Item "{key}" elected for early recomputation {delta}s before its expiration', [
'key' => $key,
- 'delta' => sprintf('%.1f', $expiry - $now),
+ 'delta' => \sprintf('%.1f', $expiry - $now),
]);
}
}
diff --git a/lib/symfony/cache-contracts/composer.json b/lib/symfony/cache-contracts/composer.json
index f80d0b559..b713c2901 100644
--- a/lib/symfony/cache-contracts/composer.json
+++ b/lib/symfony/cache-contracts/composer.json
@@ -25,7 +25,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/cache/Adapter/AbstractAdapter.php b/lib/symfony/cache/Adapter/AbstractAdapter.php
index ed90f4716..7525fe039 100644
--- a/lib/symfony/cache/Adapter/AbstractAdapter.php
+++ b/lib/symfony/cache/Adapter/AbstractAdapter.php
@@ -86,7 +86,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
*
* Using ApcuAdapter makes system caches compatible with read-only filesystems.
*/
- public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null): AdapterInterface
+ public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, ?LoggerInterface $logger = null): AdapterInterface
{
$opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
if (null !== $logger) {
diff --git a/lib/symfony/cache/Adapter/ApcuAdapter.php b/lib/symfony/cache/Adapter/ApcuAdapter.php
index 3dc93fd54..2eddb49a7 100644
--- a/lib/symfony/cache/Adapter/ApcuAdapter.php
+++ b/lib/symfony/cache/Adapter/ApcuAdapter.php
@@ -25,7 +25,7 @@ class ApcuAdapter extends AbstractAdapter
/**
* @throws CacheException if APCu is not enabled
*/
- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null, MarshallerInterface $marshaller = null)
+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $version = null, ?MarshallerInterface $marshaller = null)
{
if (!static::isSupported()) {
throw new CacheException('APCu is not enabled.');
diff --git a/lib/symfony/cache/Adapter/ArrayAdapter.php b/lib/symfony/cache/Adapter/ArrayAdapter.php
index 1100c7734..660a52646 100644
--- a/lib/symfony/cache/Adapter/ArrayAdapter.php
+++ b/lib/symfony/cache/Adapter/ArrayAdapter.php
@@ -74,7 +74,7 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
);
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
$item = $this->getItem($key);
$metadata = $item->getMetadata();
diff --git a/lib/symfony/cache/Adapter/ChainAdapter.php b/lib/symfony/cache/Adapter/ChainAdapter.php
index 8c2e7e111..221b1fb5d 100644
--- a/lib/symfony/cache/Adapter/ChainAdapter.php
+++ b/lib/symfony/cache/Adapter/ChainAdapter.php
@@ -88,7 +88,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
);
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
$doSave = true;
$callback = static function (CacheItem $item, bool &$save) use ($callback, &$doSave) {
@@ -98,7 +98,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
return $value;
};
- $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$doSave, &$metadata) {
+ $wrap = function (?CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$doSave, &$metadata) {
static $lastItem;
static $i = 0;
$adapter = $this->adapters[$i];
diff --git a/lib/symfony/cache/Adapter/CouchbaseBucketAdapter.php b/lib/symfony/cache/Adapter/CouchbaseBucketAdapter.php
index f8cb92dbf..18136da17 100644
--- a/lib/symfony/cache/Adapter/CouchbaseBucketAdapter.php
+++ b/lib/symfony/cache/Adapter/CouchbaseBucketAdapter.php
@@ -39,7 +39,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter
private \CouchbaseBucket $bucket;
private MarshallerInterface $marshaller;
- public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+ public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
{
if (!static::isSupported()) {
throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');
diff --git a/lib/symfony/cache/Adapter/CouchbaseCollectionAdapter.php b/lib/symfony/cache/Adapter/CouchbaseCollectionAdapter.php
index b5bb603e3..a1cfb0843 100644
--- a/lib/symfony/cache/Adapter/CouchbaseCollectionAdapter.php
+++ b/lib/symfony/cache/Adapter/CouchbaseCollectionAdapter.php
@@ -32,7 +32,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter
private Collection $connection;
private MarshallerInterface $marshaller;
- public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+ public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
{
if (!static::isSupported()) {
throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');
@@ -183,7 +183,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter
}
$upsertOptions = new UpsertOptions();
- $upsertOptions->expiry(\DateTimeImmutable::createFromFormat('U', time() + $lifetime));
+ $upsertOptions->expiry($lifetime);
$ko = [];
foreach ($values as $key => $value) {
diff --git a/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php b/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
index a92e6d420..9d02be3aa 100644
--- a/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
+++ b/lib/symfony/cache/Adapter/DoctrineDbalAdapter.php
@@ -59,7 +59,7 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface
*
* @throws InvalidArgumentException When namespace contains invalid characters
*/
- public function __construct(Connection|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+ 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]));
diff --git a/lib/symfony/cache/Adapter/FilesystemAdapter.php b/lib/symfony/cache/Adapter/FilesystemAdapter.php
index 7185dd487..13daa568c 100644
--- a/lib/symfony/cache/Adapter/FilesystemAdapter.php
+++ b/lib/symfony/cache/Adapter/FilesystemAdapter.php
@@ -20,7 +20,7 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface
{
use FilesystemTrait;
- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
{
$this->marshaller = $marshaller ?? new DefaultMarshaller();
parent::__construct('', $defaultLifetime);
diff --git a/lib/symfony/cache/Adapter/FilesystemTagAwareAdapter.php b/lib/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
index e78536794..80edee433 100644
--- a/lib/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
@@ -35,7 +35,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
*/
private const TAG_FOLDER = 'tags';
- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, ?MarshallerInterface $marshaller = null)
{
$this->marshaller = new TagAwareMarshaller($marshaller);
parent::__construct('', $defaultLifetime);
diff --git a/lib/symfony/cache/Adapter/MemcachedAdapter.php b/lib/symfony/cache/Adapter/MemcachedAdapter.php
index 23fc94d45..0efa152ee 100644
--- a/lib/symfony/cache/Adapter/MemcachedAdapter.php
+++ b/lib/symfony/cache/Adapter/MemcachedAdapter.php
@@ -45,7 +45,7 @@ class MemcachedAdapter extends AbstractAdapter
*
* Using a MemcachedAdapter as a pure items store is fine.
*/
- public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+ public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
{
if (!static::isSupported()) {
throw new CacheException('Memcached > 3.1.5 is required.');
@@ -114,6 +114,8 @@ class MemcachedAdapter extends AbstractAdapter
$params = preg_replace_callback('#^memcached:(//)?(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
if (!empty($m[2])) {
[$username, $password] = explode(':', $m[2], 2) + [1 => null];
+ $username = rawurldecode($username);
+ $password = null !== $password ? rawurldecode($password) : null;
}
return 'file:'.($m[1] ?? '');
diff --git a/lib/symfony/cache/Adapter/NullAdapter.php b/lib/symfony/cache/Adapter/NullAdapter.php
index 07c7af816..d5d2ef6b4 100644
--- a/lib/symfony/cache/Adapter/NullAdapter.php
+++ b/lib/symfony/cache/Adapter/NullAdapter.php
@@ -37,7 +37,7 @@ class NullAdapter implements AdapterInterface, CacheInterface
);
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
$save = true;
diff --git a/lib/symfony/cache/Adapter/PdoAdapter.php b/lib/symfony/cache/Adapter/PdoAdapter.php
index 815c622b0..c79b73959 100644
--- a/lib/symfony/cache/Adapter/PdoAdapter.php
+++ b/lib/symfony/cache/Adapter/PdoAdapter.php
@@ -54,7 +54,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
* @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
* @throws InvalidArgumentException When namespace contains invalid characters
*/
- public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+ 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));
@@ -374,10 +374,10 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
private function isTableMissing(\PDOException $exception): bool
{
$driver = $this->getDriver();
- $code = $exception->getCode();
+ [$sqlState, $code] = $exception->errorInfo ?? [null, $exception->getCode()];
return match ($driver) {
- 'pgsql' => '42P01' === $code,
+ 'pgsql' => '42P01' === $sqlState,
'sqlite' => str_contains($exception->getMessage(), 'no such table:'),
'oci' => 942 === $code,
'sqlsrv' => 208 === $code,
diff --git a/lib/symfony/cache/Adapter/PhpArrayAdapter.php b/lib/symfony/cache/Adapter/PhpArrayAdapter.php
index f6decd848..0cda1cce8 100644
--- a/lib/symfony/cache/Adapter/PhpArrayAdapter.php
+++ b/lib/symfony/cache/Adapter/PhpArrayAdapter.php
@@ -78,7 +78,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
return new static($file, $fallbackPool);
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
if (!isset($this->values)) {
$this->initialize();
diff --git a/lib/symfony/cache/Adapter/PhpFilesAdapter.php b/lib/symfony/cache/Adapter/PhpFilesAdapter.php
index 41ea8604c..e550276df 100644
--- a/lib/symfony/cache/Adapter/PhpFilesAdapter.php
+++ b/lib/symfony/cache/Adapter/PhpFilesAdapter.php
@@ -43,7 +43,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
*
* @throws CacheException if OPcache is not enabled
*/
- public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
+ public function __construct(string $namespace = '', int $defaultLifetime = 0, ?string $directory = null, bool $appendOnly = false)
{
$this->appendOnly = $appendOnly;
self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
diff --git a/lib/symfony/cache/Adapter/ProxyAdapter.php b/lib/symfony/cache/Adapter/ProxyAdapter.php
index 88fccde4a..c022dd5fa 100644
--- a/lib/symfony/cache/Adapter/ProxyAdapter.php
+++ b/lib/symfony/cache/Adapter/ProxyAdapter.php
@@ -80,7 +80,7 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
);
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
if (!$this->pool instanceof CacheInterface) {
return $this->doGet($this, $key, $callback, $beta, $metadata);
diff --git a/lib/symfony/cache/Adapter/RedisAdapter.php b/lib/symfony/cache/Adapter/RedisAdapter.php
index d8e37b1d7..e33f2f65f 100644
--- a/lib/symfony/cache/Adapter/RedisAdapter.php
+++ b/lib/symfony/cache/Adapter/RedisAdapter.php
@@ -18,7 +18,7 @@ class RedisAdapter extends AbstractAdapter
{
use RedisTrait;
- public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|\Relay\Relay $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+ public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|\Relay\Relay $redis, string $namespace = '', int $defaultLifetime = 0, ?MarshallerInterface $marshaller = null)
{
$this->init($redis, $namespace, $defaultLifetime, $marshaller);
}
diff --git a/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php b/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
index a3ef9f109..a44ef986d 100644
--- a/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/RedisTagAwareAdapter.php
@@ -60,7 +60,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
private string $redisEvictionPolicy;
private string $namespace;
- public function __construct(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+ 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())));
diff --git a/lib/symfony/cache/Adapter/TagAwareAdapter.php b/lib/symfony/cache/Adapter/TagAwareAdapter.php
index 187539acc..539ef1697 100644
--- a/lib/symfony/cache/Adapter/TagAwareAdapter.php
+++ b/lib/symfony/cache/Adapter/TagAwareAdapter.php
@@ -51,7 +51,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
private static \Closure $getTagsByKey;
private static \Closure $saveTags;
- public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
+ public function __construct(AdapterInterface $itemsPool, ?AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
{
$this->pool = $itemsPool;
$this->tags = $tagsPool ?? $itemsPool;
@@ -146,8 +146,6 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
foreach ($keys as $key) {
if ('' !== $key && \is_string($key)) {
$commit = $commit || isset($this->deferred[$key]);
- $key = static::TAGS_PREFIX.$key;
- $tagKeys[$key] = $key; // BC with pools populated before v6.1
}
}
@@ -156,7 +154,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
}
try {
- $items = $this->pool->getItems($tagKeys + $keys);
+ $items = $this->pool->getItems($keys);
} catch (InvalidArgumentException $e) {
$this->pool->getItems($keys); // Should throw an exception
@@ -166,18 +164,24 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
$bufferedItems = $itemTags = [];
foreach ($items as $key => $item) {
- if (isset($tagKeys[$key])) { // BC with pools populated before v6.1
- if ($item->isHit()) {
- $itemTags[substr($key, \strlen(static::TAGS_PREFIX))] = $item->get() ?: [];
- }
- continue;
- }
-
if (null !== $tags = $item->getMetadata()[CacheItem::METADATA_TAGS] ?? null) {
$itemTags[$key] = $tags;
}
$bufferedItems[$key] = $item;
+
+ if (null === $tags) {
+ $key = "\0tags\0".$key;
+ $tagKeys[$key] = $key; // BC with pools populated before v6.1
+ }
+ }
+
+ if ($tagKeys) {
+ foreach ($this->pool->getItems($tagKeys) as $key => $item) {
+ if ($item->isHit()) {
+ $itemTags[substr($key, \strlen("\0tags\0"))] = $item->get() ?: [];
+ }
+ }
}
$tagVersions = $this->getTagVersions($itemTags, false);
@@ -222,7 +226,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
{
foreach ($keys as $key) {
if ('' !== $key && \is_string($key)) {
- $keys[] = static::TAGS_PREFIX.$key; // BC with pools populated before v6.1
+ $keys[] = "\0tags\0".$key; // BC with pools populated before v6.1
}
}
diff --git a/lib/symfony/cache/Adapter/TraceableAdapter.php b/lib/symfony/cache/Adapter/TraceableAdapter.php
index 118b00909..8569fa283 100644
--- a/lib/symfony/cache/Adapter/TraceableAdapter.php
+++ b/lib/symfony/cache/Adapter/TraceableAdapter.php
@@ -35,7 +35,7 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
$this->pool = $pool;
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ 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));
diff --git a/lib/symfony/cache/DataCollector/CacheDataCollector.php b/lib/symfony/cache/DataCollector/CacheDataCollector.php
index 08ab8816c..b9bcdaf13 100644
--- a/lib/symfony/cache/DataCollector/CacheDataCollector.php
+++ b/lib/symfony/cache/DataCollector/CacheDataCollector.php
@@ -36,7 +36,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
$this->instances[$name] = $instance;
}
- public function collect(Request $request, Response $response, \Throwable $exception = null): void
+ public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
{
$empty = ['calls' => [], 'adapters' => [], 'config' => [], 'options' => [], 'statistics' => []];
$this->data = ['instances' => $empty, 'total' => $empty];
diff --git a/lib/symfony/cache/DependencyInjection/CachePoolPass.php b/lib/symfony/cache/DependencyInjection/CachePoolPass.php
index 9c280abbe..f6622f27b 100644
--- a/lib/symfony/cache/DependencyInjection/CachePoolPass.php
+++ b/lib/symfony/cache/DependencyInjection/CachePoolPass.php
@@ -181,11 +181,11 @@ class CachePoolPass implements CompilerPassInterface
$container->removeDefinition('cache.early_expiration_handler');
}
- $notAliasedCacheClearerId = $aliasedCacheClearerId = 'cache.global_clearer';
- while ($container->hasAlias('cache.global_clearer')) {
- $aliasedCacheClearerId = (string) $container->getAlias('cache.global_clearer');
+ $notAliasedCacheClearerId = 'cache.global_clearer';
+ while ($container->hasAlias($notAliasedCacheClearerId)) {
+ $notAliasedCacheClearerId = (string) $container->getAlias($notAliasedCacheClearerId);
}
- if ($container->hasDefinition($aliasedCacheClearerId)) {
+ if ($container->hasDefinition($notAliasedCacheClearerId)) {
$clearers[$notAliasedCacheClearerId] = $allPools;
}
diff --git a/lib/symfony/cache/LockRegistry.php b/lib/symfony/cache/LockRegistry.php
index 4b750cb44..c5c5fde89 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): mixed
{
if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
// disable locking on Windows by default
diff --git a/lib/symfony/cache/Marshaller/DefaultMarshaller.php b/lib/symfony/cache/Marshaller/DefaultMarshaller.php
index 973b137ae..34bbeb893 100644
--- a/lib/symfony/cache/Marshaller/DefaultMarshaller.php
+++ b/lib/symfony/cache/Marshaller/DefaultMarshaller.php
@@ -23,7 +23,7 @@ class DefaultMarshaller implements MarshallerInterface
private bool $useIgbinarySerialize = true;
private bool $throwOnSerializationFailure = false;
- public function __construct(bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)
+ public function __construct(?bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)
{
if (null === $useIgbinarySerialize) {
$useIgbinarySerialize = \extension_loaded('igbinary') && version_compare('3.1.6', phpversion('igbinary'), '<=');
diff --git a/lib/symfony/cache/Marshaller/SodiumMarshaller.php b/lib/symfony/cache/Marshaller/SodiumMarshaller.php
index ee64c949a..49eb716a6 100644
--- a/lib/symfony/cache/Marshaller/SodiumMarshaller.php
+++ b/lib/symfony/cache/Marshaller/SodiumMarshaller.php
@@ -29,7 +29,7 @@ class SodiumMarshaller implements MarshallerInterface
* more rotating keys can be provided to decrypt values;
* each key must be generated using sodium_crypto_box_keypair()
*/
- public function __construct(array $decryptionKeys, MarshallerInterface $marshaller = null)
+ public function __construct(array $decryptionKeys, ?MarshallerInterface $marshaller = null)
{
if (!self::isSupported()) {
throw new CacheException('The "sodium" PHP extension is not loaded.');
diff --git a/lib/symfony/cache/Marshaller/TagAwareMarshaller.php b/lib/symfony/cache/Marshaller/TagAwareMarshaller.php
index f5c2867af..825f32cc0 100644
--- a/lib/symfony/cache/Marshaller/TagAwareMarshaller.php
+++ b/lib/symfony/cache/Marshaller/TagAwareMarshaller.php
@@ -20,7 +20,7 @@ class TagAwareMarshaller implements MarshallerInterface
{
private MarshallerInterface $marshaller;
- public function __construct(MarshallerInterface $marshaller = null)
+ public function __construct(?MarshallerInterface $marshaller = null)
{
$this->marshaller = $marshaller ?? new DefaultMarshaller();
}
diff --git a/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php b/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
index db2dd97d8..8fe0f2515 100644
--- a/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
+++ b/lib/symfony/cache/Messenger/EarlyExpirationDispatcher.php
@@ -27,7 +27,7 @@ class EarlyExpirationDispatcher
private ReverseContainer $reverseContainer;
private ?\Closure $callbackWrapper;
- public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, callable $callbackWrapper = null)
+ public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, ?callable $callbackWrapper = null)
{
$this->bus = $bus;
$this->reverseContainer = $reverseContainer;
@@ -37,7 +37,7 @@ 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)
{
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
diff --git a/lib/symfony/cache/Traits/ContractsTrait.php b/lib/symfony/cache/Traits/ContractsTrait.php
index 083ce1f9d..8d830f0ab 100644
--- a/lib/symfony/cache/Traits/ContractsTrait.php
+++ b/lib/symfony/cache/Traits/ContractsTrait.php
@@ -59,7 +59,7 @@ trait ContractsTrait
return $previousWrapper;
}
- private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null): mixed
+ 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));
diff --git a/lib/symfony/cache/Traits/FilesystemCommonTrait.php b/lib/symfony/cache/Traits/FilesystemCommonTrait.php
index 8772c30d5..3b976b66f 100644
--- a/lib/symfony/cache/Traits/FilesystemCommonTrait.php
+++ b/lib/symfony/cache/Traits/FilesystemCommonTrait.php
@@ -85,7 +85,7 @@ trait FilesystemCommonTrait
return @unlink($file);
}
- private function write(string $file, string $data, int $expiresAt = null): bool
+ private function write(string $file, string $data, ?int $expiresAt = null): bool
{
$unlink = false;
set_error_handler(static fn ($type, $message, $file, $line) => throw new \ErrorException($message, 0, $type, $file, $line));
@@ -109,8 +109,13 @@ trait FilesystemCommonTrait
touch($tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
}
- $success = rename($tmp, $file);
- $unlink = !$success;
+ if ('\\' === \DIRECTORY_SEPARATOR) {
+ $success = copy($tmp, $file);
+ $unlink = true;
+ } else {
+ $success = rename($tmp, $file);
+ $unlink = !$success;
+ }
return $success;
} finally {
@@ -122,7 +127,7 @@ trait FilesystemCommonTrait
}
}
- private function getFile(string $id, bool $mkdir = false, string $directory = null): string
+ private function getFile(string $id, bool $mkdir = false, ?string $directory = null): string
{
// Use xxh128 to favor speed over security, which is not an issue here
$hash = str_replace('/', '-', base64_encode(hash('xxh128', static::class.$id, true)));
diff --git a/lib/symfony/cache/Traits/Redis5Proxy.php b/lib/symfony/cache/Traits/Redis5Proxy.php
index 06130cc33..0b2794ee1 100644
--- a/lib/symfony/cache/Traits/Redis5Proxy.php
+++ b/lib/symfony/cache/Traits/Redis5Proxy.php
@@ -81,7 +81,7 @@ class Redis5Proxy extends \Redis implements ResetInterface, LazyObjectInterface
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->append(...\func_get_args());
}
- public function auth($auth)
+ public function auth(#[\SensitiveParameter] $auth)
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->auth(...\func_get_args());
}
diff --git a/lib/symfony/cache/Traits/Redis6Proxy.php b/lib/symfony/cache/Traits/Redis6Proxy.php
index 0680404fc..c841d4269 100644
--- a/lib/symfony/cache/Traits/Redis6Proxy.php
+++ b/lib/symfony/cache/Traits/Redis6Proxy.php
@@ -25,6 +25,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
*/
class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
{
+ use Redis6ProxyTrait;
use LazyProxyTrait {
resetLazyObject as reset;
}
@@ -226,11 +227,6 @@ class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->discard(...\func_get_args());
}
- public function dump($key): \Redis|string
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dump(...\func_get_args());
- }
-
public function echo($str): \Redis|false|string
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->echo(...\func_get_args());
@@ -511,16 +507,6 @@ class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hMset(...\func_get_args());
}
- public function hRandField($key, $options = null): \Redis|array|string
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hRandField(...\func_get_args());
- }
-
- public function hSet($key, $member, $value): \Redis|false|int
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hSet(...\func_get_args());
- }
-
public function hSetNx($key, $field, $value): \Redis|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hSetNx(...\func_get_args());
@@ -651,11 +637,6 @@ class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ltrim(...\func_get_args());
}
- public function mget($keys): \Redis|array
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->mget(...\func_get_args());
- }
-
public function migrate($host, $port, $key, $dstdb, $timeout, $copy = false, $replace = false, #[\SensitiveParameter] $credentials = null): \Redis|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->migrate(...\func_get_args());
@@ -866,11 +847,6 @@ class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sPop(...\func_get_args());
}
- public function sRandMember($key, $count = 0): \Redis|array|false|string
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sRandMember(...\func_get_args());
- }
-
public function sUnion($key, ...$other_keys): \Redis|array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sUnion(...\func_get_args());
diff --git a/lib/symfony/cache/Traits/RedisCluster5Proxy.php b/lib/symfony/cache/Traits/RedisCluster5Proxy.php
index da23e0f88..511c53dd7 100644
--- a/lib/symfony/cache/Traits/RedisCluster5Proxy.php
+++ b/lib/symfony/cache/Traits/RedisCluster5Proxy.php
@@ -31,7 +31,7 @@ class RedisCluster5Proxy extends \RedisCluster implements ResetInterface, LazyOb
private const LAZY_OBJECT_PROPERTY_SCOPES = [];
- public function __construct($name, $seeds = null, $timeout = null, $read_timeout = null, $persistent = null, $auth = null)
+ public function __construct($name, $seeds = null, $timeout = null, $read_timeout = null, $persistent = null, #[\SensitiveParameter] $auth = null)
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->__construct(...\func_get_args());
}
diff --git a/lib/symfony/cache/Traits/RedisCluster6Proxy.php b/lib/symfony/cache/Traits/RedisCluster6Proxy.php
index fafc4acf2..c19aa1620 100644
--- a/lib/symfony/cache/Traits/RedisCluster6Proxy.php
+++ b/lib/symfony/cache/Traits/RedisCluster6Proxy.php
@@ -25,6 +25,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
*/
class RedisCluster6Proxy extends \RedisCluster implements ResetInterface, LazyObjectInterface
{
+ use RedisCluster6ProxyTrait;
use LazyProxyTrait {
resetLazyObject as reset;
}
@@ -656,11 +657,6 @@ class RedisCluster6Proxy extends \RedisCluster implements ResetInterface, LazyOb
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pttl(...\func_get_args());
}
- public function publish($channel, $message): \RedisCluster|bool
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->publish(...\func_get_args());
- }
-
public function pubsub($key_or_address, ...$values): mixed
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pubsub(...\func_get_args());
diff --git a/lib/symfony/cache/Traits/RedisTrait.php b/lib/symfony/cache/Traits/RedisTrait.php
index 4928db07f..2a1fa3921 100644
--- a/lib/symfony/cache/Traits/RedisTrait.php
+++ b/lib/symfony/cache/Traits/RedisTrait.php
@@ -149,10 +149,10 @@ trait RedisTrait
if (isset($params['host']) || isset($params['path'])) {
if (!isset($params['dbindex']) && isset($params['path'])) {
if (preg_match('#/(\d+)?$#', $params['path'], $m)) {
- $params['dbindex'] = $m[1] ?? '0';
+ $params['dbindex'] = $m[1] ?? $query['dbindex'] ?? '0';
$params['path'] = substr($params['path'], 0, -\strlen($m[0]));
} elseif (isset($params['host'])) {
- throw new InvalidArgumentException('Invalid Redis DSN: query parameter "dbindex" must be a number.');
+ throw new InvalidArgumentException('Invalid Redis DSN: parameter "dbindex" must be a number.');
}
}
@@ -167,6 +167,10 @@ trait RedisTrait
throw new InvalidArgumentException('Invalid Redis DSN: missing host.');
}
+ if (isset($params['dbindex'], $query['dbindex']) && $params['dbindex'] !== $query['dbindex']) {
+ throw new InvalidArgumentException('Invalid Redis DSN: path and query "dbindex" parameters mismatch.');
+ }
+
$params += $query + $options + self::$defaultConnectionOptions;
if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class) && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
@@ -228,10 +232,10 @@ trait RedisTrait
$options = [
'host' => $host,
'port' => $port,
- 'connectTimeout' => $params['timeout'],
+ 'connectTimeout' => (float) $params['timeout'],
'persistent' => $params['persistent_id'],
- 'retryInterval' => $params['retry_interval'],
- 'readTimeout' => $params['read_timeout'],
+ 'retryInterval' => (int) $params['retry_interval'],
+ 'readTimeout' => (float) $params['read_timeout'],
];
if ($passAuth) {
@@ -260,6 +264,22 @@ trait RedisTrait
$extra = [
'stream' => $params['ssl'] ?? null,
];
+ $booleanStreamOptions = [
+ 'allow_self_signed',
+ 'capture_peer_cert',
+ 'capture_peer_cert_chain',
+ 'disable_compression',
+ 'SNI_enabled',
+ 'verify_peer',
+ 'verify_peer_name',
+ ];
+
+ foreach ($extra['stream'] ?? [] as $streamOption => $value) {
+ if (\in_array($streamOption, $booleanStreamOptions, true) && \is_string($value)) {
+ $extra['stream'][$streamOption] = filter_var($value, \FILTER_VALIDATE_BOOL);
+ }
+ }
+
if (isset($params['auth'])) {
$extra['auth'] = $params['auth'];
}
@@ -277,7 +297,10 @@ trait RedisTrait
}
if ((null !== $auth && !$redis->auth($auth))
- || ($params['dbindex'] && !$redis->select($params['dbindex']))
+ // 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.'.');
@@ -498,7 +521,7 @@ trait RedisTrait
}
$this->doDelete($keys);
}
- } while ($cursor = (int) $cursor);
+ } while ($cursor);
}
return $cleared;
@@ -563,7 +586,7 @@ trait RedisTrait
return $failed;
}
- private function pipeline(\Closure $generator, object $redis = null): \Generator
+ private function pipeline(\Closure $generator, ?object $redis = null): \Generator
{
$ids = [];
$redis ??= $this->redis;
diff --git a/lib/symfony/cache/Traits/Relay/BgsaveTrait.php b/lib/symfony/cache/Traits/Relay/BgsaveTrait.php
deleted file mode 100644
index 367f82f7b..000000000
--- a/lib/symfony/cache/Traits/Relay/BgsaveTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index a271a9d10..000000000
--- a/lib/symfony/cache/Traits/Relay/CopyTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 1abf0455b..000000000
--- a/lib/symfony/cache/Traits/Relay/FtTrait.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 88ed1e9d3..000000000
--- a/lib/symfony/cache/Traits/Relay/GeosearchTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index d0643c339..000000000
--- a/lib/symfony/cache/Traits/Relay/GetWithMetaTrait.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 4522d20b5..000000000
--- a/lib/symfony/cache/Traits/Relay/GetrangeTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index a7cb8fff0..000000000
--- a/lib/symfony/cache/Traits/Relay/HsetTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 8055e2e92..000000000
--- a/lib/symfony/cache/Traits/Relay/IsTrackedTrait.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 358e52f61..000000000
--- a/lib/symfony/cache/Traits/Relay/MoveTrait.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 0b7409045..000000000
--- a/lib/symfony/cache/Traits/Relay/NullableReturnTrait.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 340db8af7..000000000
--- a/lib/symfony/cache/Traits/Relay/PfcountTrait.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * 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
deleted file mode 100644
index 289d8faa0..000000000
--- a/lib/symfony/cache/Traits/Relay/Relay11Trait.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *
- * 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/SwapdbTrait.php b/lib/symfony/cache/Traits/Relay/SwapdbTrait.php
deleted file mode 100644
index 8ae0a079d..000000000
--- a/lib/symfony/cache/Traits/Relay/SwapdbTrait.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- *
- * 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 c55206ead..96d7d19b4 100644
--- a/lib/symfony/cache/Traits/RelayProxy.php
+++ b/lib/symfony/cache/Traits/RelayProxy.php
@@ -28,6 +28,7 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
use LazyProxyTrait {
resetLazyObject as reset;
}
+ use RelayProxyTrait;
private const LAZY_OBJECT_PROPERTY_SCOPES = [];
@@ -236,12 +237,12 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->info(...\func_get_args());
}
- public function flushdb($async = false): \Relay\Relay|bool
+ public function flushdb($sync = null): \Relay\Relay|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushdb(...\func_get_args());
}
- public function flushall($async = false): \Relay\Relay|bool
+ public function flushall($sync = null): \Relay\Relay|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushall(...\func_get_args());
}
@@ -276,6 +277,11 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->replicaof(...\func_get_args());
}
+ public function waitaof($numlocal, $numremote, $timeout): \Relay\Relay|array|false
+ {
+ return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->waitaof(...\func_get_args());
+ }
+
public function restore($key, $ttl, $value, $options = null): \Relay\Relay|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->restore(...\func_get_args());
@@ -286,11 +292,6 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->migrate(...\func_get_args());
}
- public function copy($src, $dst, $options = null): \Relay\Relay|false|int
- {
- return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
- }
-
public function echo($arg): \Relay\Relay|bool|string
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->echo(...\func_get_args());
@@ -326,6 +327,11 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lastsave(...\func_get_args());
}
+ public function lcs($key1, $key2, $options = null): mixed
+ {
+ 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());
diff --git a/lib/symfony/cache/Traits/RelayProxyTrait.php b/lib/symfony/cache/Traits/RelayProxyTrait.php
index c35b5fa01..a1d252b96 100644
--- a/lib/symfony/cache/Traits/RelayProxyTrait.php
+++ b/lib/symfony/cache/Traits/RelayProxyTrait.php
@@ -17,6 +17,11 @@ 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());
@@ -143,5 +148,9 @@ 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/http-foundation/BinaryFileResponse.php b/lib/symfony/http-foundation/BinaryFileResponse.php
index 41a244b81..9cd86879b 100644
--- a/lib/symfony/http-foundation/BinaryFileResponse.php
+++ b/lib/symfony/http-foundation/BinaryFileResponse.php
@@ -163,7 +163,7 @@ class BinaryFileResponse extends Response
for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) {
$char = mb_substr($filename, $i, 1, $encoding);
- if ('%' === $char || \ord($char) < 32 || \ord($char) > 126) {
+ if ('%' === $char || \ord($char[0]) < 32 || \ord($char[0]) > 126) {
$filenameFallback .= '_';
} else {
$filenameFallback .= $char;
@@ -229,7 +229,7 @@ class BinaryFileResponse extends Response
$path = $location.substr($path, \strlen($pathPrefix));
// Only set X-Accel-Redirect header if a valid URI can be produced
// as nginx does not serve arbitrary file paths.
- $this->headers->set($type, $path);
+ $this->headers->set($type, rawurlencode($path));
$this->maxlen = 0;
break;
}
@@ -259,13 +259,13 @@ class BinaryFileResponse extends Response
$end = min($end, $fileSize - 1);
if ($start < 0 || $start > $end) {
$this->setStatusCode(416);
- $this->headers->set('Content-Range', sprintf('bytes */%s', $fileSize));
+ $this->headers->set('Content-Range', \sprintf('bytes */%s', $fileSize));
} elseif ($end - $start < $fileSize - 1) {
$this->maxlen = $end < $fileSize ? $end - $start + 1 : -1;
$this->offset = $start;
$this->setStatusCode(206);
- $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $fileSize));
+ $this->headers->set('Content-Range', \sprintf('bytes %s-%s/%s', $start, $end, $fileSize));
$this->headers->set('Content-Length', $end - $start + 1);
}
}
diff --git a/lib/symfony/http-foundation/Cookie.php b/lib/symfony/http-foundation/Cookie.php
index 4a3b73608..05c6c62d5 100644
--- a/lib/symfony/http-foundation/Cookie.php
+++ b/lib/symfony/http-foundation/Cookie.php
@@ -101,7 +101,7 @@ class Cookie
{
// from PHP source code
if ($raw && false !== strpbrk($name, self::RESERVED_CHARS_LIST)) {
- throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
+ throw new \InvalidArgumentException(\sprintf('The cookie name "%s" contains invalid characters.', $name));
}
if (empty($name)) {
@@ -211,7 +211,7 @@ class Cookie
public function withRaw(bool $raw = true): static
{
if ($raw && false !== strpbrk($this->name, self::RESERVED_CHARS_LIST)) {
- throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $this->name));
+ throw new \InvalidArgumentException(\sprintf('The cookie name "%s" contains invalid characters.', $this->name));
}
$cookie = clone $this;
diff --git a/lib/symfony/http-foundation/File/Exception/AccessDeniedException.php b/lib/symfony/http-foundation/File/Exception/AccessDeniedException.php
index 136d2a9f5..79ab0fce3 100644
--- a/lib/symfony/http-foundation/File/Exception/AccessDeniedException.php
+++ b/lib/symfony/http-foundation/File/Exception/AccessDeniedException.php
@@ -20,6 +20,6 @@ class AccessDeniedException extends FileException
{
public function __construct(string $path)
{
- parent::__construct(sprintf('The file %s could not be accessed', $path));
+ parent::__construct(\sprintf('The file %s could not be accessed', $path));
}
}
diff --git a/lib/symfony/http-foundation/File/Exception/FileNotFoundException.php b/lib/symfony/http-foundation/File/Exception/FileNotFoundException.php
index 31bdf68fe..3a5eb039b 100644
--- a/lib/symfony/http-foundation/File/Exception/FileNotFoundException.php
+++ b/lib/symfony/http-foundation/File/Exception/FileNotFoundException.php
@@ -20,6 +20,6 @@ class FileNotFoundException extends FileException
{
public function __construct(string $path)
{
- parent::__construct(sprintf('The file "%s" does not exist', $path));
+ parent::__construct(\sprintf('The file "%s" does not exist', $path));
}
}
diff --git a/lib/symfony/http-foundation/File/Exception/UnexpectedTypeException.php b/lib/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
index 905bd5962..09b1c7e18 100644
--- a/lib/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
+++ b/lib/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
@@ -15,6 +15,6 @@ class UnexpectedTypeException extends FileException
{
public function __construct(mixed $value, string $expectedType)
{
- parent::__construct(sprintf('Expected argument of type %s, %s given', $expectedType, get_debug_type($value)));
+ parent::__construct(\sprintf('Expected argument of type %s, %s given', $expectedType, get_debug_type($value)));
}
}
diff --git a/lib/symfony/http-foundation/File/File.php b/lib/symfony/http-foundation/File/File.php
index 34ca5a537..c369ecbfb 100644
--- a/lib/symfony/http-foundation/File/File.php
+++ b/lib/symfony/http-foundation/File/File.php
@@ -93,7 +93,7 @@ class File extends \SplFileInfo
restore_error_handler();
}
if (!$renamed) {
- throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
+ throw new FileException(\sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
}
@chmod($target, 0666 & ~umask());
@@ -106,7 +106,7 @@ class File extends \SplFileInfo
$content = file_get_contents($this->getPathname());
if (false === $content) {
- throw new FileException(sprintf('Could not get the content of the file "%s".', $this->getPathname()));
+ throw new FileException(\sprintf('Could not get the content of the file "%s".', $this->getPathname()));
}
return $content;
@@ -116,10 +116,10 @@ class File extends \SplFileInfo
{
if (!is_dir($directory)) {
if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) {
- throw new FileException(sprintf('Unable to create the "%s" directory.', $directory));
+ throw new FileException(\sprintf('Unable to create the "%s" directory.', $directory));
}
} elseif (!is_writable($directory)) {
- throw new FileException(sprintf('Unable to write in the "%s" directory.', $directory));
+ throw new FileException(\sprintf('Unable to write in the "%s" directory.', $directory));
}
$target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
diff --git a/lib/symfony/http-foundation/File/UploadedFile.php b/lib/symfony/http-foundation/File/UploadedFile.php
index f475d028d..85aab2872 100644
--- a/lib/symfony/http-foundation/File/UploadedFile.php
+++ b/lib/symfony/http-foundation/File/UploadedFile.php
@@ -174,7 +174,7 @@ class UploadedFile extends File
restore_error_handler();
}
if (!$moved) {
- throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
+ throw new FileException(\sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
}
@chmod($target, 0666 & ~umask());
@@ -264,6 +264,6 @@ class UploadedFile extends File
$maxFilesize = \UPLOAD_ERR_INI_SIZE === $errorCode ? self::getMaxFilesize() / 1024 : 0;
$message = $errors[$errorCode] ?? 'The file "%s" was not uploaded due to an unknown error.';
- return sprintf($message, $this->getClientOriginalName(), $maxFilesize);
+ return \sprintf($message, $this->getClientOriginalName(), $maxFilesize);
}
}
diff --git a/lib/symfony/http-foundation/HeaderBag.php b/lib/symfony/http-foundation/HeaderBag.php
index 4dd777f16..e8072addd 100644
--- a/lib/symfony/http-foundation/HeaderBag.php
+++ b/lib/symfony/http-foundation/HeaderBag.php
@@ -51,7 +51,7 @@ class HeaderBag implements \IteratorAggregate, \Countable, \Stringable
foreach ($headers as $name => $values) {
$name = ucwords($name, '-');
foreach ($values as $value) {
- $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
+ $content .= \sprintf("%-{$max}s %s\r\n", $name.':', $value);
}
}
@@ -204,7 +204,7 @@ class HeaderBag implements \IteratorAggregate, \Countable, \Stringable
}
if (false === $date = \DateTimeImmutable::createFromFormat(\DATE_RFC2822, $value)) {
- throw new \RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
+ throw new \RuntimeException(\sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
}
return $date;
diff --git a/lib/symfony/http-foundation/HeaderUtils.php b/lib/symfony/http-foundation/HeaderUtils.php
index 110896e17..ad47f2204 100644
--- a/lib/symfony/http-foundation/HeaderUtils.php
+++ b/lib/symfony/http-foundation/HeaderUtils.php
@@ -165,7 +165,7 @@ class HeaderUtils
public static function makeDisposition(string $disposition, string $filename, string $filenameFallback = ''): string
{
if (!\in_array($disposition, [self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE])) {
- throw new \InvalidArgumentException(sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
+ throw new \InvalidArgumentException(\sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
}
if ('' === $filenameFallback) {
diff --git a/lib/symfony/http-foundation/InputBag.php b/lib/symfony/http-foundation/InputBag.php
index 5acf35fec..08b927571 100644
--- a/lib/symfony/http-foundation/InputBag.php
+++ b/lib/symfony/http-foundation/InputBag.php
@@ -29,13 +29,13 @@ final class InputBag extends ParameterBag
public function get(string $key, mixed $default = null): string|int|float|bool|null
{
if (null !== $default && !\is_scalar($default) && !$default instanceof \Stringable) {
- throw new \InvalidArgumentException(sprintf('Expected a scalar value as a 2nd argument to "%s()", "%s" given.', __METHOD__, get_debug_type($default)));
+ throw new \InvalidArgumentException(\sprintf('Expected a scalar value as a 2nd argument to "%s()", "%s" given.', __METHOD__, get_debug_type($default)));
}
$value = parent::get($key, $this);
if (null !== $value && $this !== $value && !\is_scalar($value) && !$value instanceof \Stringable) {
- throw new BadRequestException(sprintf('Input value "%s" contains a non-scalar value.', $key));
+ throw new BadRequestException(\sprintf('Input value "%s" contains a non-scalar value.', $key));
}
return $this === $value ? $default : $value;
@@ -68,7 +68,7 @@ final class InputBag extends ParameterBag
public function set(string $key, mixed $value): void
{
if (null !== $value && !\is_scalar($value) && !\is_array($value) && !$value instanceof \Stringable) {
- throw new \InvalidArgumentException(sprintf('Expected a scalar, or an array as a 2nd argument to "%s()", "%s" given.', __METHOD__, get_debug_type($value)));
+ throw new \InvalidArgumentException(\sprintf('Expected a scalar, or an array as a 2nd argument to "%s()", "%s" given.', __METHOD__, get_debug_type($value)));
}
$this->parameters[$key] = $value;
@@ -112,11 +112,11 @@ final class InputBag extends ParameterBag
}
if (\is_array($value) && !(($options['flags'] ?? 0) & (\FILTER_REQUIRE_ARRAY | \FILTER_FORCE_ARRAY))) {
- throw new BadRequestException(sprintf('Input value "%s" contains an array, but "FILTER_REQUIRE_ARRAY" or "FILTER_FORCE_ARRAY" flags were not set.', $key));
+ throw new BadRequestException(\sprintf('Input value "%s" contains an array, but "FILTER_REQUIRE_ARRAY" or "FILTER_FORCE_ARRAY" flags were not set.', $key));
}
if ((\FILTER_CALLBACK & $filter) && !(($options['options'] ?? null) instanceof \Closure)) {
- throw new \InvalidArgumentException(sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
+ throw new \InvalidArgumentException(\sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
}
$options['flags'] ??= 0;
diff --git a/lib/symfony/http-foundation/IpUtils.php b/lib/symfony/http-foundation/IpUtils.php
index ceab620c2..8b52d2a9d 100644
--- a/lib/symfony/http-foundation/IpUtils.php
+++ b/lib/symfony/http-foundation/IpUtils.php
@@ -102,7 +102,7 @@ class IpUtils
return self::setCacheResult($cacheKey, false);
}
- return self::setCacheResult($cacheKey, 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask));
+ return self::setCacheResult($cacheKey, 0 === substr_compare(\sprintf('%032b', ip2long($requestIp)), \sprintf('%032b', ip2long($address)), 0, $netmask));
}
/**
@@ -182,6 +182,16 @@ class IpUtils
*/
public static function anonymize(string $ip): string
{
+ /*
+ * If the IP contains a % symbol, then it is a local-link address with scoping according to RFC 4007
+ * In that case, we only care about the part before the % symbol, as the following functions, can only work with
+ * the IP address itself. As the scope can leak information (containing interface name), we do not want to
+ * include it in our anonymized IP data.
+ */
+ if (str_contains($ip, '%')) {
+ $ip = substr($ip, 0, strpos($ip, '%'));
+ }
+
$wrappedIPv6 = false;
if (str_starts_with($ip, '[') && str_ends_with($ip, ']')) {
$wrappedIPv6 = true;
diff --git a/lib/symfony/http-foundation/JsonResponse.php b/lib/symfony/http-foundation/JsonResponse.php
index 93c5751f2..616bccfee 100644
--- a/lib/symfony/http-foundation/JsonResponse.php
+++ b/lib/symfony/http-foundation/JsonResponse.php
@@ -41,7 +41,7 @@ class JsonResponse extends Response
parent::__construct('', $status, $headers);
if ($json && !\is_string($data) && !is_numeric($data) && !\is_callable([$data, '__toString'])) {
- throw new \TypeError(sprintf('"%s": If $json is set to true, argument $data must be a string or object implementing __toString(), "%s" given.', __METHOD__, get_debug_type($data)));
+ throw new \TypeError(\sprintf('"%s": If $json is set to true, argument $data must be a string or object implementing __toString(), "%s" given.', __METHOD__, get_debug_type($data)));
}
$data ??= new \ArrayObject();
@@ -176,7 +176,7 @@ class JsonResponse extends Response
// Not using application/javascript for compatibility reasons with older browsers.
$this->headers->set('Content-Type', 'text/javascript');
- return $this->setContent(sprintf('/**/%s(%s);', $this->callback, $this->data));
+ return $this->setContent(\sprintf('/**/%s(%s);', $this->callback, $this->data));
}
// Only set the header when there is none or when it equals 'text/javascript' (from a previous update with callback)
diff --git a/lib/symfony/http-foundation/ParameterBag.php b/lib/symfony/http-foundation/ParameterBag.php
index 48fa4b233..2bd8cb15f 100644
--- a/lib/symfony/http-foundation/ParameterBag.php
+++ b/lib/symfony/http-foundation/ParameterBag.php
@@ -45,7 +45,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
}
if (!\is_array($value = $this->parameters[$key] ?? [])) {
- throw new BadRequestException(sprintf('Unexpected value for parameter "%s": expecting "array", got "%s".', $key, get_debug_type($value)));
+ throw new BadRequestException(\sprintf('Unexpected value for parameter "%s": expecting "array", got "%s".', $key, get_debug_type($value)));
}
return $value;
@@ -141,7 +141,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
{
$value = $this->get($key, $default);
if (!\is_scalar($value) && !$value instanceof \Stringable) {
- throw new UnexpectedValueException(sprintf('Parameter value "%s" cannot be converted to "string".', $key));
+ throw new UnexpectedValueException(\sprintf('Parameter value "%s" cannot be converted to "string".', $key));
}
return (string) $value;
@@ -185,7 +185,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
try {
return $class::from($value);
} catch (\ValueError|\TypeError $e) {
- throw new UnexpectedValueException(sprintf('Parameter "%s" cannot be converted to enum: %s.', $key, $e->getMessage()), $e->getCode(), $e);
+ throw new UnexpectedValueException(\sprintf('Parameter "%s" cannot be converted to enum: %s.', $key, $e->getMessage()), $e->getCode(), $e);
}
}
@@ -212,11 +212,11 @@ class ParameterBag implements \IteratorAggregate, \Countable
}
if (\is_object($value) && !$value instanceof \Stringable) {
- throw new UnexpectedValueException(sprintf('Parameter value "%s" cannot be filtered.', $key));
+ throw new UnexpectedValueException(\sprintf('Parameter value "%s" cannot be filtered.', $key));
}
if ((\FILTER_CALLBACK & $filter) && !(($options['options'] ?? null) instanceof \Closure)) {
- throw new \InvalidArgumentException(sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
+ throw new \InvalidArgumentException(\sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
}
$options['flags'] ??= 0;
diff --git a/lib/symfony/http-foundation/RedirectResponse.php b/lib/symfony/http-foundation/RedirectResponse.php
index 408629e36..220dcf616 100644
--- a/lib/symfony/http-foundation/RedirectResponse.php
+++ b/lib/symfony/http-foundation/RedirectResponse.php
@@ -39,7 +39,7 @@ class RedirectResponse extends Response
$this->setTargetUrl($url);
if (!$this->isRedirect()) {
- throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
+ throw new \InvalidArgumentException(\sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
}
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
@@ -71,7 +71,7 @@ class RedirectResponse extends Response
$this->targetUrl = $url;
$this->setContent(
- sprintf('
+ \sprintf('
diff --git a/lib/symfony/http-foundation/Request.php b/lib/symfony/http-foundation/Request.php
index c45170e3f..a66312c8e 100644
--- a/lib/symfony/http-foundation/Request.php
+++ b/lib/symfony/http-foundation/Request.php
@@ -351,16 +351,21 @@ class Request
$server['PATH_INFO'] = '';
$server['REQUEST_METHOD'] = strtoupper($method);
- if (false === ($components = parse_url($uri)) && '/' === ($uri[0] ?? '')) {
- trigger_deprecation('symfony/http-foundation', '6.3', 'Calling "%s()" with an invalid URI is deprecated.', __METHOD__);
- $components = parse_url($uri.'#');
- unset($components['fragment']);
+ if (($i = strcspn($uri, ':/?#')) && ':' === ($uri[$i] ?? null) && (strspn($uri, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-.') !== $i || strcspn($uri, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'))) {
+ throw new BadRequestException('Invalid URI: Scheme is malformed.');
}
-
- if (false === $components) {
+ if (false === $components = parse_url(\strlen($uri) !== strcspn($uri, '?#') ? $uri : $uri.'#')) {
throw new BadRequestException('Invalid URI.');
}
+ $part = ($components['user'] ?? '').':'.($components['pass'] ?? '');
+
+ if (':' !== $part && \strlen($part) !== strcspn($part, '[]')) {
+ throw new BadRequestException('Invalid URI: Userinfo is malformed.');
+ }
+ if (($part = $components['host'] ?? '') && !self::isHostValid($part)) {
+ throw new BadRequestException('Invalid URI: Host is malformed.');
+ }
if (false !== ($i = strpos($uri, '\\')) && $i < strcspn($uri, '?#')) {
throw new BadRequestException('Invalid URI: A URI cannot contain a backslash.');
}
@@ -543,7 +548,7 @@ class Request
}
return
- sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+ \sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
$this->headers.
$cookieHeader."\r\n".
$content;
@@ -644,7 +649,7 @@ class Request
*/
public static function setTrustedHosts(array $hostPatterns)
{
- self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
+ self::$trustedHostPatterns = array_map(fn ($hostPattern) => \sprintf('{%s}i', $hostPattern), $hostPatterns);
// we need to reset trusted hosts on trusted host patterns change
self::$trustedHosts = [];
}
@@ -1157,16 +1162,14 @@ class Request
// host is lowercase as per RFC 952/2181
$host = strtolower(preg_replace('/:\d+$/', '', trim($host)));
- // as the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
- // check that it does not contain forbidden characters (see RFC 952 and RFC 2181)
- // use preg_replace() instead of preg_match() to prevent DoS attacks with long host names
- if ($host && '' !== preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $host)) {
+ // the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
+ if ($host && !self::isHostValid($host)) {
if (!$this->isHostValid) {
return '';
}
$this->isHostValid = false;
- throw new SuspiciousOperationException(sprintf('Invalid Host "%s".', $host));
+ throw new SuspiciousOperationException(\sprintf('Invalid Host "%s".', $host));
}
if (\count(self::$trustedHostPatterns) > 0) {
@@ -1189,7 +1192,7 @@ class Request
}
$this->isHostValid = false;
- throw new SuspiciousOperationException(sprintf('Untrusted Host "%s".', $host));
+ throw new SuspiciousOperationException(\sprintf('Untrusted Host "%s".', $host));
}
return $host;
@@ -1304,15 +1307,22 @@ class Request
static::initializeFormats();
}
+ $exactFormat = null;
+ $canonicalFormat = null;
+
foreach (static::$formats as $format => $mimeTypes) {
- if (\in_array($mimeType, (array) $mimeTypes)) {
- return $format;
+ if (\in_array($mimeType, $mimeTypes, true)) {
+ $exactFormat = $format;
}
- if (null !== $canonicalMimeType && \in_array($canonicalMimeType, (array) $mimeTypes)) {
- return $format;
+ if (null !== $canonicalMimeType && \in_array($canonicalMimeType, $mimeTypes, true)) {
+ $canonicalFormat = $format;
}
}
+ if ($format = $exactFormat ?? $canonicalFormat) {
+ return $format;
+ }
+
return null;
}
@@ -1329,7 +1339,7 @@ class Request
static::initializeFormats();
}
- static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : [$mimeTypes];
+ static::$formats[$format ?? ''] = (array) $mimeTypes;
}
/**
@@ -1472,7 +1482,7 @@ class Request
public function getProtocolVersion(): ?string
{
if ($this->isFromTrustedProxy()) {
- preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via') ?? '', $matches);
+ preg_match('~^(HTTP/)?([1-9]\.[0-9])\b~', $this->headers->get('Via') ?? '', $matches);
if ($matches) {
return 'HTTP/'.$matches[2];
@@ -1551,7 +1561,7 @@ class Request
}
if (!\is_array($content)) {
- throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned.', get_debug_type($content)));
+ throw new JsonException(\sprintf('JSON content was expected to decode to an array, "%s" returned.', get_debug_type($content)));
}
return new InputBag($content);
@@ -1577,7 +1587,7 @@ class Request
}
if (!\is_array($content)) {
- throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned.', get_debug_type($content)));
+ throw new JsonException(\sprintf('JSON content was expected to decode to an array, "%s" returned.', get_debug_type($content)));
}
return $content;
@@ -1923,9 +1933,8 @@ class Request
}
$pathInfo = substr($requestUri, \strlen($baseUrl));
- if (false === $pathInfo || '' === $pathInfo) {
- // If substr() returns false then PATH_INFO is set to an empty string
- return '/';
+ if (false === $pathInfo || '' === $pathInfo || '/' !== $pathInfo[0]) {
+ return '/'.$pathInfo;
}
return $pathInfo;
@@ -1984,7 +1993,7 @@ class Request
$len = \strlen($prefix);
- if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
+ if (preg_match(\sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
return $match[0];
}
@@ -2076,7 +2085,7 @@ class Request
}
$this->isForwardedValid = false;
- throw new ConflictingHeadersException(sprintf('The request has both a trusted "%s" header and a trusted "%s" header, conflicting with each other. You should either configure your proxy to remove one of them, or configure your project to distrust the offending one.', self::TRUSTED_HEADERS[self::HEADER_FORWARDED], self::TRUSTED_HEADERS[$type]));
+ throw new ConflictingHeadersException(\sprintf('The request has both a trusted "%s" header and a trusted "%s" header, conflicting with each other. You should either configure your proxy to remove one of them, or configure your project to distrust the offending one.', self::TRUSTED_HEADERS[self::HEADER_FORWARDED], self::TRUSTED_HEADERS[$type]));
}
private function normalizeAndFilterClientIps(array $clientIps, string $ip): array
@@ -2134,4 +2143,21 @@ class Request
return $this->isIisRewrite;
}
+
+ /**
+ * See https://url.spec.whatwg.org/.
+ */
+ private static function isHostValid(string $host): bool
+ {
+ if ('[' === $host[0]) {
+ return ']' === $host[-1] && filter_var(substr($host, 1, -1), \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6);
+ }
+
+ if (preg_match('/\.[0-9]++\.?$/D', $host)) {
+ return null !== filter_var($host, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4 | \FILTER_NULL_ON_FAILURE);
+ }
+
+ // use preg_replace() instead of preg_match() to prevent DoS attacks with long host names
+ return '' === preg_replace('/[-a-zA-Z0-9_]++\.?/', '', $host);
+ }
}
diff --git a/lib/symfony/http-foundation/RequestStack.php b/lib/symfony/http-foundation/RequestStack.php
index 5aa8ba793..ca61eef29 100644
--- a/lib/symfony/http-foundation/RequestStack.php
+++ b/lib/symfony/http-foundation/RequestStack.php
@@ -106,4 +106,11 @@ class RequestStack
throw new SessionNotFoundException();
}
+
+ public function resetRequestFormats(): void
+ {
+ static $resetRequestFormats;
+ $resetRequestFormats ??= \Closure::bind(static fn () => self::$formats = null, null, Request::class);
+ $resetRequestFormats();
+ }
}
diff --git a/lib/symfony/http-foundation/Response.php b/lib/symfony/http-foundation/Response.php
index a43e7a9ac..e476e29d1 100644
--- a/lib/symfony/http-foundation/Response.php
+++ b/lib/symfony/http-foundation/Response.php
@@ -241,7 +241,7 @@ class Response
public function __toString(): string
{
return
- sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
+ \sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
$this->headers."\r\n".
$this->getContent();
}
@@ -393,7 +393,7 @@ class Response
$statusCode ??= $this->statusCode;
// status
- header(sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
+ header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
return $this;
}
@@ -499,7 +499,7 @@ class Response
{
$this->statusCode = $code;
if ($this->isInvalid()) {
- throw new \InvalidArgumentException(sprintf('The HTTP status code "%s" is not valid.', $code));
+ throw new \InvalidArgumentException(\sprintf('The HTTP status code "%s" is not valid.', $code));
}
if (null === $text) {
@@ -1011,7 +1011,7 @@ class Response
public function setCache(array $options): static
{
if ($diff = array_diff(array_keys($options), array_keys(self::HTTP_RESPONSE_CACHE_CONTROL_DIRECTIVES))) {
- throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
+ throw new \InvalidArgumentException(\sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
}
if (isset($options['etag'])) {
diff --git a/lib/symfony/http-foundation/ResponseHeaderBag.php b/lib/symfony/http-foundation/ResponseHeaderBag.php
index 376357d01..562f75c9a 100644
--- a/lib/symfony/http-foundation/ResponseHeaderBag.php
+++ b/lib/symfony/http-foundation/ResponseHeaderBag.php
@@ -174,7 +174,7 @@ class ResponseHeaderBag extends HeaderBag
*/
public function setCookie(Cookie $cookie)
{
- $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
+ $this->cookies[$cookie->getDomain() ?? ''][$cookie->getPath()][$cookie->getName()] = $cookie;
$this->headerNames['set-cookie'] = 'Set-Cookie';
}
@@ -187,13 +187,13 @@ class ResponseHeaderBag extends HeaderBag
{
$path ??= '/';
- unset($this->cookies[$domain][$path][$name]);
+ unset($this->cookies[$domain ?? ''][$path][$name]);
- if (empty($this->cookies[$domain][$path])) {
- unset($this->cookies[$domain][$path]);
+ if (empty($this->cookies[$domain ?? ''][$path])) {
+ unset($this->cookies[$domain ?? ''][$path]);
- if (empty($this->cookies[$domain])) {
- unset($this->cookies[$domain]);
+ if (empty($this->cookies[$domain ?? ''])) {
+ unset($this->cookies[$domain ?? '']);
}
}
@@ -212,7 +212,7 @@ class ResponseHeaderBag extends HeaderBag
public function getCookies(string $format = self::COOKIES_FLAT): array
{
if (!\in_array($format, [self::COOKIES_FLAT, self::COOKIES_ARRAY])) {
- throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', [self::COOKIES_FLAT, self::COOKIES_ARRAY])));
+ throw new \InvalidArgumentException(\sprintf('Format "%s" invalid (%s).', $format, implode(', ', [self::COOKIES_FLAT, self::COOKIES_ARRAY])));
}
if (self::COOKIES_ARRAY === $format) {
@@ -240,7 +240,7 @@ class ResponseHeaderBag extends HeaderBag
*/
public function clearCookie(string $name, ?string $path = '/', ?string $domain = null, bool $secure = false, bool $httpOnly = true, ?string $sameSite = null /* , bool $partitioned = false */)
{
- $partitioned = 6 < \func_num_args() ? \func_get_arg(6) : false;
+ $partitioned = 6 < \func_num_args() ? func_get_arg(6) : false;
$this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite, $partitioned));
}
diff --git a/lib/symfony/http-foundation/Session/SessionUtils.php b/lib/symfony/http-foundation/Session/SessionUtils.php
index 504c5848e..57aa565ff 100644
--- a/lib/symfony/http-foundation/Session/SessionUtils.php
+++ b/lib/symfony/http-foundation/Session/SessionUtils.php
@@ -28,8 +28,8 @@ final class SessionUtils
public static function popSessionCookie(string $sessionName, #[\SensitiveParameter] string $sessionId): ?string
{
$sessionCookie = null;
- $sessionCookiePrefix = sprintf(' %s=', urlencode($sessionName));
- $sessionCookieWithId = sprintf('%s%s;', $sessionCookiePrefix, urlencode($sessionId));
+ $sessionCookiePrefix = \sprintf(' %s=', urlencode($sessionName));
+ $sessionCookieWithId = \sprintf('%s%s;', $sessionCookiePrefix, urlencode($sessionId));
$otherCookies = [];
foreach (headers_list() as $h) {
if (0 !== stripos($h, 'Set-Cookie:')) {
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
index 288c24232..fd8562377 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -32,7 +32,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
{
$this->sessionName = $sessionName;
if (!headers_sent() && !\ini_get('session.cache_limiter') && '0' !== \ini_get('session.cache_limiter')) {
- header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) \ini_get('session.cache_expire')));
+ header(\sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) \ini_get('session.cache_expire')));
}
return true;
@@ -88,7 +88,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
{
if (!headers_sent() && filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOL)) {
if (!isset($this->sessionName)) {
- throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
+ throw new \LogicException(\sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
}
$cookie = SessionUtils::popSessionCookie($this->sessionName, $sessionId);
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/IdentityMarshaller.php b/lib/symfony/http-foundation/Session/Storage/Handler/IdentityMarshaller.php
index 411a8d1f0..70ac76248 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/IdentityMarshaller.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/IdentityMarshaller.php
@@ -22,7 +22,7 @@ class IdentityMarshaller implements MarshallerInterface
{
foreach ($values as $key => $value) {
if (!\is_string($value)) {
- throw new \LogicException(sprintf('%s accepts only string as data.', __METHOD__));
+ throw new \LogicException(\sprintf('%s accepts only string as data.', __METHOD__));
}
}
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 91a023ddb..9647f42bb 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -47,7 +47,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
$this->memcached = $memcached;
if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime', 'ttl'])) {
- throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
+ throw new \InvalidArgumentException(\sprintf('The following options are not supported "%s".', implode(', ', $diff)));
}
$this->ttl = $options['expiretime'] ?? $options['ttl'] ?? null;
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
index f8c6151a4..284cd869d 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -34,7 +34,7 @@ class NativeFileSessionHandler extends \SessionHandler
if ($count = substr_count($savePath, ';')) {
if ($count > 2) {
- throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'.', $savePath));
+ throw new \InvalidArgumentException(\sprintf('Invalid argument $savePath \'%s\'.', $savePath));
}
// characters after last ';' are the path
@@ -42,7 +42,7 @@ class NativeFileSessionHandler extends \SessionHandler
}
if ($baseDir && !is_dir($baseDir) && !@mkdir($baseDir, 0777, true) && !is_dir($baseDir)) {
- throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));
+ throw new \RuntimeException(\sprintf('Session Storage was not able to create directory "%s".', $baseDir));
}
if ($savePath !== \ini_get('session.save_path')) {
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 9cee76ddf..48c219a7a 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -155,7 +155,7 @@ class PdoSessionHandler extends AbstractSessionHandler
{
if ($pdoOrDsn instanceof \PDO) {
if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->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->pdo = $pdoOrDsn;
@@ -216,13 +216,13 @@ class PdoSessionHandler extends AbstractSessionHandler
$table->addColumn($this->timeCol, Types::INTEGER)->setNotnull(true);
break;
case 'sqlsrv':
- $table->addColumn($this->idCol, Types::TEXT)->setLength(128)->setNotnull(true);
+ $table->addColumn($this->idCol, Types::STRING)->setLength(128)->setNotnull(true);
$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);
break;
default:
- throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
+ throw new \DomainException(\sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
}
$table->setPrimaryKey([$this->idCol]);
$table->addIndex([$this->lifetimeCol], $this->lifetimeCol.'_idx');
@@ -257,7 +257,7 @@ class PdoSessionHandler extends AbstractSessionHandler
'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)",
'sqlsrv' => "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol VARBINARY(MAX) NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)",
- default => throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver)),
+ default => throw new \DomainException(\sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver)),
};
try {
@@ -538,7 +538,7 @@ class PdoSessionHandler extends AbstractSessionHandler
return $dsn;
default:
- throw new \InvalidArgumentException(sprintf('The scheme "%s" is not supported by the PdoSessionHandler URL configuration. Pass a PDO DSN directly.', $params['scheme']));
+ throw new \InvalidArgumentException(\sprintf('The scheme "%s" is not supported by the PdoSessionHandler URL configuration. Pass a PDO DSN directly.', $params['scheme']));
}
}
@@ -734,7 +734,7 @@ class PdoSessionHandler extends AbstractSessionHandler
case 'sqlite':
throw new \DomainException('SQLite does not support advisory locks.');
default:
- throw new \DomainException(sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
+ throw new \DomainException(\sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
}
}
@@ -776,7 +776,7 @@ class PdoSessionHandler extends AbstractSessionHandler
// we already locked when starting transaction
break;
default:
- throw new \DomainException(sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
+ throw new \DomainException(\sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
}
}
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
index b696eee4b..78cd4e7c2 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -44,7 +44,7 @@ class RedisSessionHandler extends AbstractSessionHandler
array $options = [],
) {
if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) {
- throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
+ throw new \InvalidArgumentException(\sprintf('The following options are not supported "%s".', implode(', ', $diff)));
}
$this->prefix = $options['prefix'] ?? 'sf_s';
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php b/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
index ff5b70d81..43a9eb84e 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -49,7 +49,7 @@ class SessionHandlerFactory
return new PdoSessionHandler($connection);
case !\is_string($connection):
- throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', get_debug_type($connection)));
+ throw new \InvalidArgumentException(\sprintf('Unsupported Connection: "%s".', get_debug_type($connection)));
case str_starts_with($connection, 'file://'):
$savePath = substr($connection, 7);
@@ -94,6 +94,6 @@ class SessionHandlerFactory
return new PdoSessionHandler($connection, $options);
}
- throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', $connection));
+ throw new \InvalidArgumentException(\sprintf('Unsupported Connection: "%s".', $connection));
}
}
diff --git a/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php b/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
index 1f8668744..38afc1257 100644
--- a/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
+++ b/lib/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
@@ -24,7 +24,7 @@ class StrictSessionHandler extends AbstractSessionHandler
public function __construct(\SessionHandlerInterface $handler)
{
if ($handler instanceof \SessionUpdateTimestampHandlerInterface) {
- throw new \LogicException(sprintf('"%s" is already an instance of "SessionUpdateTimestampHandlerInterface", you cannot wrap it with "%s".', get_debug_type($handler), self::class));
+ throw new \LogicException(\sprintf('"%s" is already an instance of "SessionUpdateTimestampHandlerInterface", you cannot wrap it with "%s".', get_debug_type($handler), self::class));
}
$this->handler = $handler;
diff --git a/lib/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/lib/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
index f02793d3e..65ab34f91 100644
--- a/lib/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ b/lib/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
@@ -174,7 +174,7 @@ class MockArraySessionStorage implements SessionStorageInterface
public function getBag(string $name): SessionBagInterface
{
if (!isset($this->bags[$name])) {
- throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
+ throw new \InvalidArgumentException(\sprintf('The SessionBagInterface "%s" is not registered.', $name));
}
if (!$this->started) {
diff --git a/lib/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php b/lib/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
index ef6d9d8f8..84c2c4363 100644
--- a/lib/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
+++ b/lib/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
@@ -35,7 +35,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
$savePath ??= sys_get_temp_dir();
if (!is_dir($savePath) && !@mkdir($savePath, 0777, true) && !is_dir($savePath)) {
- throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $savePath));
+ throw new \RuntimeException(\sprintf('Session Storage was not able to create directory "%s".', $savePath));
}
$this->savePath = $savePath;
diff --git a/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index f63de5740..c8801cc25 100644
--- a/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/lib/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -129,7 +129,7 @@ class NativeSessionStorage implements SessionStorageInterface
}
if (filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOL) && headers_sent($file, $line)) {
- throw new \RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
+ throw new \RuntimeException(\sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
}
$sessionId = $_COOKIE[session_name()] ?? null;
@@ -139,7 +139,7 @@ class NativeSessionStorage implements SessionStorageInterface
* ---------- Part 1
*
* The part `[a-zA-Z0-9,-]` is related to the PHP ini directive `session.sid_bits_per_character` defined as 6.
- * See https://www.php.net/manual/en/session.configuration.php#ini.session.sid-bits-per-character.
+ * See https://php.net/session.configuration#ini.session.sid-bits-per-character
* Allowed values are integers such as:
* - 4 for range `a-f0-9`
* - 5 for range `a-v0-9`
@@ -148,7 +148,7 @@ class NativeSessionStorage implements SessionStorageInterface
* ---------- Part 2
*
* The part `{22,250}` is related to the PHP ini directive `session.sid_length`.
- * See https://www.php.net/manual/en/session.configuration.php#ini.session.sid-length.
+ * See https://php.net/session.configuration#ini.session.sid-length
* Allowed values are integers between 22 and 256, but we use 250 for the max.
*
* Where does the 250 come from?
@@ -249,7 +249,7 @@ class NativeSessionStorage implements SessionStorageInterface
$previousHandler = set_error_handler(function ($type, $msg, $file, $line) use (&$previousHandler) {
if (\E_WARNING === $type && str_starts_with($msg, 'session_write_close():')) {
$handler = $this->saveHandler instanceof SessionHandlerProxy ? $this->saveHandler->getHandler() : $this->saveHandler;
- $msg = sprintf('session_write_close(): Failed to write session data with "%s" handler', $handler::class);
+ $msg = \sprintf('session_write_close(): Failed to write session data with "%s" handler', $handler::class);
}
return $previousHandler ? $previousHandler($type, $msg, $file, $line) : false;
@@ -302,7 +302,7 @@ class NativeSessionStorage implements SessionStorageInterface
public function getBag(string $name): SessionBagInterface
{
if (!isset($this->bags[$name])) {
- throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
+ throw new \InvalidArgumentException(\sprintf('The SessionBagInterface "%s" is not registered.', $name));
}
if (!$this->started && $this->saveHandler->isActive()) {
diff --git a/lib/symfony/http-foundation/composer.json b/lib/symfony/http-foundation/composer.json
index be85696e5..732a011e9 100644
--- a/lib/symfony/http-foundation/composer.json
+++ b/lib/symfony/http-foundation/composer.json
@@ -24,7 +24,7 @@
"require-dev": {
"doctrine/dbal": "^2.13.1|^3|^4",
"predis/predis": "^1.1|^2.0",
- "symfony/cache": "^6.3|^7.0",
+ "symfony/cache": "^6.4.12|^7.1.5",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
"symfony/mime": "^5.4|^6.0|^7.0",
@@ -32,7 +32,7 @@
"symfony/rate-limiter": "^5.4|^6.0|^7.0"
},
"conflict": {
- "symfony/cache": "<6.3"
+ "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
diff --git a/lib/symfony/polyfill-php80/LICENSE b/lib/symfony/polyfill-php80/LICENSE
deleted file mode 100644
index 0ed3a2465..000000000
--- a/lib/symfony/polyfill-php80/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2020-present Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/symfony/polyfill-php80/Php80.php b/lib/symfony/polyfill-php80/Php80.php
deleted file mode 100644
index 362dd1a95..000000000
--- a/lib/symfony/polyfill-php80/Php80.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php80;
-
-/**
- * @author Ion Bazan
- * @author Nico Oelgart
- * @author Nicolas Grekas
- *
- * @internal
- */
-final class Php80
-{
- public static function fdiv(float $dividend, float $divisor): float
- {
- return @($dividend / $divisor);
- }
-
- public static function get_debug_type($value): string
- {
- switch (true) {
- case null === $value: return 'null';
- case \is_bool($value): return 'bool';
- case \is_string($value): return 'string';
- case \is_array($value): return 'array';
- case \is_int($value): return 'int';
- case \is_float($value): return 'float';
- case \is_object($value): break;
- case $value instanceof \__PHP_Incomplete_Class: return '__PHP_Incomplete_Class';
- default:
- if (null === $type = @get_resource_type($value)) {
- return 'unknown';
- }
-
- if ('Unknown' === $type) {
- $type = 'closed';
- }
-
- return "resource ($type)";
- }
-
- $class = \get_class($value);
-
- if (false === strpos($class, '@')) {
- return $class;
- }
-
- return (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous';
- }
-
- public static function get_resource_id($res): int
- {
- if (!\is_resource($res) && null === @get_resource_type($res)) {
- throw new \TypeError(sprintf('Argument 1 passed to get_resource_id() must be of the type resource, %s given', get_debug_type($res)));
- }
-
- return (int) $res;
- }
-
- public static function preg_last_error_msg(): string
- {
- switch (preg_last_error()) {
- case \PREG_INTERNAL_ERROR:
- return 'Internal error';
- case \PREG_BAD_UTF8_ERROR:
- return 'Malformed UTF-8 characters, possibly incorrectly encoded';
- case \PREG_BAD_UTF8_OFFSET_ERROR:
- return 'The offset did not correspond to the beginning of a valid UTF-8 code point';
- case \PREG_BACKTRACK_LIMIT_ERROR:
- return 'Backtrack limit exhausted';
- case \PREG_RECURSION_LIMIT_ERROR:
- return 'Recursion limit exhausted';
- case \PREG_JIT_STACKLIMIT_ERROR:
- return 'JIT stack limit exhausted';
- case \PREG_NO_ERROR:
- return 'No error';
- default:
- return 'Unknown error';
- }
- }
-
- public static function str_contains(string $haystack, string $needle): bool
- {
- return '' === $needle || false !== strpos($haystack, $needle);
- }
-
- public static function str_starts_with(string $haystack, string $needle): bool
- {
- return 0 === strncmp($haystack, $needle, \strlen($needle));
- }
-
- public static function str_ends_with(string $haystack, string $needle): bool
- {
- if ('' === $needle || $needle === $haystack) {
- return true;
- }
-
- if ('' === $haystack) {
- return false;
- }
-
- $needleLength = \strlen($needle);
-
- return $needleLength <= \strlen($haystack) && 0 === substr_compare($haystack, $needle, -$needleLength);
- }
-}
diff --git a/lib/symfony/polyfill-php80/PhpToken.php b/lib/symfony/polyfill-php80/PhpToken.php
deleted file mode 100644
index cd78c4ccc..000000000
--- a/lib/symfony/polyfill-php80/PhpToken.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php80;
-
-/**
- * @author Fedonyuk Anton
- *
- * @internal
- */
-class PhpToken implements \Stringable
-{
- /**
- * @var int
- */
- public $id;
-
- /**
- * @var string
- */
- public $text;
-
- /**
- * @var -1|positive-int
- */
- public $line;
-
- /**
- * @var int
- */
- public $pos;
-
- /**
- * @param -1|positive-int $line
- */
- public function __construct(int $id, string $text, int $line = -1, int $position = -1)
- {
- $this->id = $id;
- $this->text = $text;
- $this->line = $line;
- $this->pos = $position;
- }
-
- public function getTokenName(): ?string
- {
- if ('UNKNOWN' === $name = token_name($this->id)) {
- $name = \strlen($this->text) > 1 || \ord($this->text) < 32 ? null : $this->text;
- }
-
- return $name;
- }
-
- /**
- * @param int|string|array $kind
- */
- public function is($kind): bool
- {
- foreach ((array) $kind as $value) {
- if (\in_array($value, [$this->id, $this->text], true)) {
- return true;
- }
- }
-
- return false;
- }
-
- public function isIgnorable(): bool
- {
- return \in_array($this->id, [\T_WHITESPACE, \T_COMMENT, \T_DOC_COMMENT, \T_OPEN_TAG], true);
- }
-
- public function __toString(): string
- {
- return (string) $this->text;
- }
-
- /**
- * @return list
- */
- public static function tokenize(string $code, int $flags = 0): array
- {
- $line = 1;
- $position = 0;
- $tokens = token_get_all($code, $flags);
- foreach ($tokens as $index => $token) {
- if (\is_string($token)) {
- $id = \ord($token);
- $text = $token;
- } else {
- [$id, $text, $line] = $token;
- }
- $tokens[$index] = new static($id, $text, $line, $position);
- $position += \strlen($text);
- }
-
- return $tokens;
- }
-}
diff --git a/lib/symfony/polyfill-php80/README.md b/lib/symfony/polyfill-php80/README.md
deleted file mode 100644
index 3816c559d..000000000
--- a/lib/symfony/polyfill-php80/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Symfony Polyfill / Php80
-========================
-
-This component provides features added to PHP 8.0 core:
-
-- [`Stringable`](https://php.net/stringable) interface
-- [`fdiv`](https://php.net/fdiv)
-- [`ValueError`](https://php.net/valueerror) class
-- [`UnhandledMatchError`](https://php.net/unhandledmatcherror) class
-- `FILTER_VALIDATE_BOOL` constant
-- [`get_debug_type`](https://php.net/get_debug_type)
-- [`PhpToken`](https://php.net/phptoken) class
-- [`preg_last_error_msg`](https://php.net/preg_last_error_msg)
-- [`str_contains`](https://php.net/str_contains)
-- [`str_starts_with`](https://php.net/str_starts_with)
-- [`str_ends_with`](https://php.net/str_ends_with)
-- [`get_resource_id`](https://php.net/get_resource_id)
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-php80/Resources/stubs/Attribute.php b/lib/symfony/polyfill-php80/Resources/stubs/Attribute.php
deleted file mode 100644
index 2b955423f..000000000
--- a/lib/symfony/polyfill-php80/Resources/stubs/Attribute.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#[Attribute(Attribute::TARGET_CLASS)]
-final class Attribute
-{
- public const TARGET_CLASS = 1;
- public const TARGET_FUNCTION = 2;
- public const TARGET_METHOD = 4;
- public const TARGET_PROPERTY = 8;
- public const TARGET_CLASS_CONSTANT = 16;
- public const TARGET_PARAMETER = 32;
- public const TARGET_ALL = 63;
- public const IS_REPEATABLE = 64;
-
- /** @var int */
- public $flags;
-
- public function __construct(int $flags = self::TARGET_ALL)
- {
- $this->flags = $flags;
- }
-}
diff --git a/lib/symfony/polyfill-php80/Resources/stubs/PhpToken.php b/lib/symfony/polyfill-php80/Resources/stubs/PhpToken.php
deleted file mode 100644
index bd1212f6e..000000000
--- a/lib/symfony/polyfill-php80/Resources/stubs/PhpToken.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000 && extension_loaded('tokenizer')) {
- class PhpToken extends Symfony\Polyfill\Php80\PhpToken
- {
- }
-}
diff --git a/lib/symfony/polyfill-php80/Resources/stubs/Stringable.php b/lib/symfony/polyfill-php80/Resources/stubs/Stringable.php
deleted file mode 100644
index 7c62d7508..000000000
--- a/lib/symfony/polyfill-php80/Resources/stubs/Stringable.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
- interface Stringable
- {
- /**
- * @return string
- */
- public function __toString();
- }
-}
diff --git a/lib/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/lib/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
deleted file mode 100644
index 01c6c6c8a..000000000
--- a/lib/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
- class UnhandledMatchError extends Error
- {
- }
-}
diff --git a/lib/symfony/polyfill-php80/Resources/stubs/ValueError.php b/lib/symfony/polyfill-php80/Resources/stubs/ValueError.php
deleted file mode 100644
index 783dbc28c..000000000
--- a/lib/symfony/polyfill-php80/Resources/stubs/ValueError.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
- class ValueError extends Error
- {
- }
-}
diff --git a/lib/symfony/polyfill-php80/bootstrap.php b/lib/symfony/polyfill-php80/bootstrap.php
deleted file mode 100644
index e5f7dbc1a..000000000
--- a/lib/symfony/polyfill-php80/bootstrap.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php80 as p;
-
-if (\PHP_VERSION_ID >= 80000) {
- return;
-}
-
-if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) {
- define('FILTER_VALIDATE_BOOL', \FILTER_VALIDATE_BOOLEAN);
-}
-
-if (!function_exists('fdiv')) {
- function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $num2); }
-}
-if (!function_exists('preg_last_error_msg')) {
- function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
-}
-if (!function_exists('str_contains')) {
- function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_starts_with')) {
- function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_ends_with')) {
- function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('get_debug_type')) {
- function get_debug_type($value): string { return p\Php80::get_debug_type($value); }
-}
-if (!function_exists('get_resource_id')) {
- function get_resource_id($resource): int { return p\Php80::get_resource_id($resource); }
-}
diff --git a/lib/symfony/polyfill-php80/composer.json b/lib/symfony/polyfill-php80/composer.json
deleted file mode 100644
index a503b039a..000000000
--- a/lib/symfony/polyfill-php80/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "symfony/polyfill-php80",
- "type": "library",
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
- "keywords": ["polyfill", "shim", "compatibility", "portable"],
- "homepage": "https://symfony.com",
- "license": "MIT",
- "authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "require": {
- "php": ">=7.2"
- },
- "autoload": {
- "psr-4": { "Symfony\\Polyfill\\Php80\\": "" },
- "files": [ "bootstrap.php" ],
- "classmap": [ "Resources/stubs" ]
- },
- "minimum-stability": "dev",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- }
-}
diff --git a/lib/symfony/polyfill-php83/Php83.php b/lib/symfony/polyfill-php83/Php83.php
index 23a9cf389..8b7ee4c70 100644
--- a/lib/symfony/polyfill-php83/Php83.php
+++ b/lib/symfony/polyfill-php83/Php83.php
@@ -13,6 +13,7 @@ namespace Symfony\Polyfill\Php83;
/**
* @author Ion Bazan
+ * @author Pierre Ambroise
*
* @internal
*/
@@ -34,12 +35,12 @@ final class Php83
throw new \ValueError(sprintf('json_validate(): Argument #2 ($depth) must be less than %d', self::JSON_MAX_DEPTH));
}
- json_decode($json, null, $depth, $flags);
+ json_decode($json, true, $depth, $flags);
return \JSON_ERROR_NONE === json_last_error();
}
- public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, string $encoding = null): string
+ public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, ?string $encoding = null): string
{
if (!\in_array($pad_type, [\STR_PAD_RIGHT, \STR_PAD_LEFT, \STR_PAD_BOTH], true)) {
throw new \ValueError('mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH');
@@ -82,4 +83,115 @@ final class Php83
return mb_substr(str_repeat($pad_string, $leftPaddingLength), 0, $leftPaddingLength, $encoding).$string.mb_substr(str_repeat($pad_string, $rightPaddingLength), 0, $rightPaddingLength, $encoding);
}
}
+
+ public static function str_increment(string $string): string
+ {
+ if ('' === $string) {
+ throw new \ValueError('str_increment(): Argument #1 ($string) cannot be empty');
+ }
+
+ if (!preg_match('/^[a-zA-Z0-9]+$/', $string)) {
+ throw new \ValueError('str_increment(): Argument #1 ($string) must be composed only of alphanumeric ASCII characters');
+ }
+
+ if (is_numeric($string)) {
+ $offset = stripos($string, 'e');
+ if (false !== $offset) {
+ $char = $string[$offset];
+ ++$char;
+ $string[$offset] = $char;
+ ++$string;
+
+ switch ($string[$offset]) {
+ case 'f':
+ $string[$offset] = 'e';
+ break;
+ case 'F':
+ $string[$offset] = 'E';
+ break;
+ case 'g':
+ $string[$offset] = 'f';
+ break;
+ case 'G':
+ $string[$offset] = 'F';
+ break;
+ }
+
+ return $string;
+ }
+ }
+
+ return ++$string;
+ }
+
+ public static function str_decrement(string $string): string
+ {
+ if ('' === $string) {
+ throw new \ValueError('str_decrement(): Argument #1 ($string) cannot be empty');
+ }
+
+ if (!preg_match('/^[a-zA-Z0-9]+$/', $string)) {
+ throw new \ValueError('str_decrement(): Argument #1 ($string) must be composed only of alphanumeric ASCII characters');
+ }
+
+ if (preg_match('/\A(?:0[aA0]?|[aA])\z/', $string)) {
+ throw new \ValueError(sprintf('str_decrement(): Argument #1 ($string) "%s" is out of decrement range', $string));
+ }
+
+ if (!\in_array(substr($string, -1), ['A', 'a', '0'], true)) {
+ return implode('', \array_slice(str_split($string), 0, -1)).\chr(\ord(substr($string, -1)) - 1);
+ }
+
+ $carry = '';
+ $decremented = '';
+
+ for ($i = \strlen($string) - 1; $i >= 0; --$i) {
+ $char = $string[$i];
+
+ switch ($char) {
+ case 'A':
+ if ('' !== $carry) {
+ $decremented = $carry.$decremented;
+ $carry = '';
+ }
+ $carry = 'Z';
+
+ break;
+ case 'a':
+ if ('' !== $carry) {
+ $decremented = $carry.$decremented;
+ $carry = '';
+ }
+ $carry = 'z';
+
+ break;
+ case '0':
+ if ('' !== $carry) {
+ $decremented = $carry.$decremented;
+ $carry = '';
+ }
+ $carry = '9';
+
+ break;
+ case '1':
+ if ('' !== $carry) {
+ $decremented = $carry.$decremented;
+ $carry = '';
+ }
+
+ break;
+ default:
+ if ('' !== $carry) {
+ $decremented = $carry.$decremented;
+ $carry = '';
+ }
+
+ if (!\in_array($char, ['A', 'a', '0'], true)) {
+ $decremented = \chr(\ord($char) - 1).$decremented;
+ }
+ }
+ }
+
+ return $decremented;
+ }
}
diff --git a/lib/symfony/polyfill-php83/README.md b/lib/symfony/polyfill-php83/README.md
index 92516e7a4..f29877681 100644
--- a/lib/symfony/polyfill-php83/README.md
+++ b/lib/symfony/polyfill-php83/README.md
@@ -9,7 +9,9 @@ This component provides features added to PHP 8.3 core:
- [`ldap_exop_sync`](https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures)
- [`ldap_connect_wallet`](https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures)
- [`stream_context_set_options`](https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures)
+- [`str_increment` and `str_decrement`](https://wiki.php.net/rfc/saner-inc-dec-operators)
- [`Date*Exception/Error classes`](https://wiki.php.net/rfc/datetime-exceptions)
+- [`SQLite3Exception`](https://wiki.php.net/rfc/sqlite3_exceptions)
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-php83/bootstrap.php b/lib/symfony/polyfill-php83/bootstrap.php
index b5beb71a6..a92799cb3 100644
--- a/lib/symfony/polyfill-php83/bootstrap.php
+++ b/lib/symfony/polyfill-php83/bootstrap.php
@@ -19,20 +19,30 @@ if (!function_exists('json_validate')) {
function json_validate(string $json, int $depth = 512, int $flags = 0): bool { return p\Php83::json_validate($json, $depth, $flags); }
}
-if (!function_exists('mb_str_pad') && function_exists('mb_substr')) {
- function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Php83::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+if (extension_loaded('mbstring')) {
+ if (!function_exists('mb_str_pad')) {
+ function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Php83::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+ }
}
if (!function_exists('stream_context_set_options')) {
function stream_context_set_options($context, array $options): bool { return stream_context_set_option($context, $options); }
}
+if (!function_exists('str_increment')) {
+ function str_increment(string $string): string { return p\Php83::str_increment($string); }
+}
+
+if (!function_exists('str_decrement')) {
+ function str_decrement(string $string): string { return p\Php83::str_decrement($string); }
+}
+
if (\PHP_VERSION_ID >= 80100) {
return require __DIR__.'/bootstrap81.php';
}
if (!function_exists('ldap_exop_sync') && function_exists('ldap_exop')) {
- function ldap_exop_sync($ldap, string $request_oid, string $request_data = null, array $controls = null, &$response_data = null, &$response_oid = null): bool { return ldap_exop($ldap, $request_oid, $request_data, $controls, $response_data, $response_oid); }
+ function ldap_exop_sync($ldap, string $request_oid, ?string $request_data = null, ?array $controls = null, &$response_data = null, &$response_oid = null): bool { return ldap_exop($ldap, $request_oid, $request_data, $controls, $response_data, $response_oid); }
}
if (!function_exists('ldap_connect_wallet') && function_exists('ldap_connect')) {
diff --git a/lib/symfony/polyfill-php83/bootstrap81.php b/lib/symfony/polyfill-php83/bootstrap81.php
index 63a4f7800..68395b439 100644
--- a/lib/symfony/polyfill-php83/bootstrap81.php
+++ b/lib/symfony/polyfill-php83/bootstrap81.php
@@ -14,7 +14,7 @@ if (\PHP_VERSION_ID >= 80300) {
}
if (!function_exists('ldap_exop_sync') && function_exists('ldap_exop')) {
- function ldap_exop_sync(\LDAP\Connection $ldap, string $request_oid, string $request_data = null, array $controls = null, &$response_data = null, &$response_oid = null): bool { return ldap_exop($ldap, $request_oid, $request_data, $controls, $response_data, $response_oid); }
+ function ldap_exop_sync(\LDAP\Connection $ldap, string $request_oid, ?string $request_data = null, ?array $controls = null, &$response_data = null, &$response_oid = null): bool { return ldap_exop($ldap, $request_oid, $request_data, $controls, $response_data, $response_oid); }
}
if (!function_exists('ldap_connect_wallet') && function_exists('ldap_connect')) {
diff --git a/lib/symfony/polyfill-php83/composer.json b/lib/symfony/polyfill-php83/composer.json
index 51c81b16a..a8b8ba707 100644
--- a/lib/symfony/polyfill-php83/composer.json
+++ b/lib/symfony/polyfill-php83/composer.json
@@ -16,8 +16,7 @@
}
],
"require": {
- "php": ">=7.1",
- "symfony/polyfill-php80": "^1.14"
+ "php": ">=7.2"
},
"autoload": {
"psr-4": { "Symfony\\Polyfill\\Php83\\": "" },
@@ -26,9 +25,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/service-contracts/ServiceSubscriberTrait.php b/lib/symfony/service-contracts/ServiceSubscriberTrait.php
index ed4cec044..58ea7c549 100644
--- a/lib/symfony/service-contracts/ServiceSubscriberTrait.php
+++ b/lib/symfony/service-contracts/ServiceSubscriberTrait.php
@@ -53,7 +53,7 @@ trait ServiceSubscriberTrait
throw new \LogicException(\sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
}
- /* @var SubscribedService $attribute */
+ /** @var SubscribedService $attribute */
$attribute = $attribute->newInstance();
$attribute->key ??= self::class.'::'.$method->name;
$attribute->type ??= $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
diff --git a/lib/symfony/var-exporter/Exception/ClassNotFoundException.php b/lib/symfony/var-exporter/Exception/ClassNotFoundException.php
index 4cebe44b0..2acecc470 100644
--- a/lib/symfony/var-exporter/Exception/ClassNotFoundException.php
+++ b/lib/symfony/var-exporter/Exception/ClassNotFoundException.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\VarExporter\Exception;
class ClassNotFoundException extends \Exception implements ExceptionInterface
{
- public function __construct(string $class, \Throwable $previous = null)
+ public function __construct(string $class, ?\Throwable $previous = null)
{
- parent::__construct(sprintf('Class "%s" not found.', $class), 0, $previous);
+ parent::__construct(\sprintf('Class "%s" not found.', $class), 0, $previous);
}
}
diff --git a/lib/symfony/var-exporter/Exception/NotInstantiableTypeException.php b/lib/symfony/var-exporter/Exception/NotInstantiableTypeException.php
index 771ee612d..bc2bcaa20 100644
--- a/lib/symfony/var-exporter/Exception/NotInstantiableTypeException.php
+++ b/lib/symfony/var-exporter/Exception/NotInstantiableTypeException.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\VarExporter\Exception;
class NotInstantiableTypeException extends \Exception implements ExceptionInterface
{
- public function __construct(string $type, \Throwable $previous = null)
+ public function __construct(string $type, ?\Throwable $previous = null)
{
- parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
+ parent::__construct(\sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
}
}
diff --git a/lib/symfony/var-exporter/Hydrator.php b/lib/symfony/var-exporter/Hydrator.php
index 5f456fb3c..b718921d9 100644
--- a/lib/symfony/var-exporter/Hydrator.php
+++ b/lib/symfony/var-exporter/Hydrator.php
@@ -61,8 +61,8 @@ final class Hydrator
$propertyScopes = InternalHydrator::$propertyScopes[$class] ??= InternalHydrator::getPropertyScopes($class);
foreach ($properties as $name => &$value) {
- [$scope, $name, $readonlyScope] = $propertyScopes[$name] ?? [$class, $name, $class];
- $scopedProperties[$readonlyScope ?? $scope][$name] = &$value;
+ [$scope, $name, $writeScope] = $propertyScopes[$name] ?? [$class, $name, $class];
+ $scopedProperties[$writeScope ?? $scope][$name] = &$value;
}
unset($value);
}
diff --git a/lib/symfony/var-exporter/Internal/Exporter.php b/lib/symfony/var-exporter/Internal/Exporter.php
index ec711e1ed..13141a494 100644
--- a/lib/symfony/var-exporter/Internal/Exporter.php
+++ b/lib/symfony/var-exporter/Internal/Exporter.php
@@ -76,32 +76,23 @@ class Exporter
$class = $value::class;
$reflector = Registry::$reflectors[$class] ??= Registry::getClassReflector($class);
$properties = [];
+ $sleep = null;
+ $proto = Registry::$prototypes[$class];
if ($reflector->hasMethod('__serialize')) {
if (!$reflector->getMethod('__serialize')->isPublic()) {
- throw new \Error(sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class));
+ throw new \Error(\sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class));
}
- if (!\is_array($serializeProperties = $value->__serialize())) {
+ if (!\is_array($arrayValue = $value->__serialize())) {
throw new \TypeError($class.'::__serialize() must return an array');
}
if ($reflector->hasMethod('__unserialize')) {
- $properties = $serializeProperties;
- } else {
- foreach ($serializeProperties as $n => $v) {
- $c = $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
- $properties[$c][$n] = $v;
- }
+ $properties = $arrayValue;
+ goto prepare_value;
}
-
- goto prepare_value;
- }
-
- $sleep = null;
- $proto = Registry::$prototypes[$class];
-
- if (($value instanceof \ArrayIterator || $value instanceof \ArrayObject) && null !== $proto) {
+ } elseif (($value instanceof \ArrayIterator || $value instanceof \ArrayObject) && null !== $proto) {
// ArrayIterator and ArrayObject need special care because their "flags"
// option changes the behavior of the (array) casting operator.
[$arrayValue, $properties] = self::getArrayObjectProperties($value, $proto);
@@ -117,10 +108,7 @@ class Exporter
}
$properties = ['SplObjectStorage' => ["\0" => $properties]];
$arrayValue = (array) $value;
- } elseif ($value instanceof \Serializable
- || $value instanceof \__PHP_Incomplete_Class
- || \PHP_VERSION_ID < 80200 && $value instanceof \DatePeriod
- ) {
+ } elseif ($value instanceof \Serializable || $value instanceof \__PHP_Incomplete_Class || \PHP_VERSION_ID < 80200 && $value instanceof \DatePeriod) {
++$objectsCount;
$objectsPool[$value] = [$id = \count($objectsPool), serialize($value), [], 0];
$value = new Reference($id);
@@ -144,15 +132,15 @@ class Exporter
$i = 0;
$n = (string) $name;
if ('' === $n || "\0" !== $n[0]) {
- $c = $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+ $parent = $reflector;
+ do {
+ $p = $parent->hasProperty($n) ? $parent->getProperty($n) : null;
+ } while (!$p && $parent = $parent->getParentClass());
+
+ $c = $p && (!$p->isPublic() || (\PHP_VERSION_ID >= 80400 ? $p->isProtectedSet() || $p->isPrivateSet() : $p->isReadOnly())) ? $p->class : 'stdClass';
} elseif ('*' === $n[1]) {
$n = substr($n, 3);
$c = $reflector->getProperty($n)->class;
- if ('Error' === $c) {
- $c = 'TypeError';
- } elseif ('Exception' === $c) {
- $c = 'ErrorException';
- }
} else {
$i = strpos($n, "\0", 2);
$c = substr($n, 1, $i - 1);
@@ -165,13 +153,19 @@ class Exporter
}
unset($sleep[$name], $sleep[$n]);
}
- if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
+ if ("\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
$properties[$c][$n] = $v;
+ } elseif (!\array_key_exists($name, $proto) || $proto[$name] !== $v) {
+ $properties[match ($c) {
+ 'Error' => 'TypeError',
+ 'Exception' => 'ErrorException',
+ default => $c,
+ }][$n] = $v;
}
}
if ($sleep) {
foreach ($sleep as $n => $v) {
- trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
+ trigger_error(\sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
}
}
if (method_exists($class, '__unserialize')) {
@@ -224,10 +218,10 @@ class Exporter
$subIndent = $indent.' ';
if (\is_string($value)) {
- $code = sprintf("'%s'", addcslashes($value, "'\\"));
+ $code = \sprintf("'%s'", addcslashes($value, "'\\"));
$code = preg_replace_callback("/((?:[\\0\\r\\n]|\u{202A}|\u{202B}|\u{202D}|\u{202E}|\u{2066}|\u{2067}|\u{2068}|\u{202C}|\u{2069})++)(.)/", function ($m) use ($subIndent) {
- $m[1] = sprintf('\'."%s".\'', str_replace(
+ $m[1] = \sprintf('\'."%s".\'', str_replace(
["\0", "\r", "\n", "\u{202A}", "\u{202B}", "\u{202D}", "\u{202E}", "\u{2066}", "\u{2067}", "\u{2068}", "\u{202C}", "\u{2069}", '\n\\'],
['\0', '\r', '\n', '\u{202A}', '\u{202B}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}', '\u{202C}', '\u{2069}', '\n"'."\n".$subIndent.'."\\'],
$m[1]
@@ -285,7 +279,7 @@ class Exporter
return self::exportHydrator($value, $indent, $subIndent);
}
- throw new \UnexpectedValueException(sprintf('Cannot export value of type "%s".', get_debug_type($value)));
+ throw new \UnexpectedValueException(\sprintf('Cannot export value of type "%s".', get_debug_type($value)));
}
private static function exportRegistry(Registry $value, string $indent, string $subIndent): string
diff --git a/lib/symfony/var-exporter/Internal/Hydrator.php b/lib/symfony/var-exporter/Internal/Hydrator.php
index d792aa5e9..ebbceed05 100644
--- a/lib/symfony/var-exporter/Internal/Hydrator.php
+++ b/lib/symfony/var-exporter/Internal/Hydrator.php
@@ -20,6 +20,9 @@ use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
*/
class Hydrator
{
+ public const PROPERTY_HAS_HOOKS = 1;
+ public const PROPERTY_NOT_BY_REF = 2;
+
public static array $hydrators = [];
public static array $simpleHydrators = [];
public static array $propertyScopes = [];
@@ -70,11 +73,11 @@ class Hydrator
return $baseHydrator;
case 'ErrorException':
- return $baseHydrator->bindTo(null, new class() extends \ErrorException {
+ return $baseHydrator->bindTo(null, new class extends \ErrorException {
});
case 'TypeError':
- return $baseHydrator->bindTo(null, new class() extends \Error {
+ return $baseHydrator->bindTo(null, new class extends \Error {
});
case 'SplObjectStorage':
@@ -83,7 +86,7 @@ class Hydrator
if ("\0" === $name) {
foreach ($values as $i => $v) {
for ($j = 0; $j < \count($v); ++$j) {
- $objects[$i]->attach($v[$j], $v[++$j]);
+ $objects[$i][$v[$j]] = $v[++$j];
}
}
continue;
@@ -156,13 +159,16 @@ class Hydrator
public static function getSimpleHydrator($class)
{
$baseHydrator = self::$simpleHydrators['stdClass'] ??= (function ($properties, $object) {
- $readonly = (array) $this;
+ $notByRef = (array) $this;
foreach ($properties as $name => &$value) {
- $object->$name = $value;
-
- if (!($readonly[$name] ?? false)) {
+ if (!$noRef = $notByRef[$name] ?? false) {
+ $object->$name = $value;
$object->$name = &$value;
+ } elseif (true !== $noRef) {
+ $noRef($object, $value);
+ } else {
+ $object->$name = $value;
}
}
})->bindTo(new \stdClass());
@@ -172,11 +178,11 @@ class Hydrator
return $baseHydrator;
case 'ErrorException':
- return $baseHydrator->bindTo(new \stdClass(), new class() extends \ErrorException {
+ return $baseHydrator->bindTo(new \stdClass(), new class extends \ErrorException {
});
case 'TypeError':
- return $baseHydrator->bindTo(new \stdClass(), new class() extends \Error {
+ return $baseHydrator->bindTo(new \stdClass(), new class extends \Error {
});
case 'SplObjectStorage':
@@ -188,7 +194,7 @@ class Hydrator
continue;
}
for ($i = 0; $i < \count($value); ++$i) {
- $object->attach($value[$i], $value[++$i]);
+ $object[$value[$i]] = $value[++$i];
}
}
};
@@ -217,14 +223,19 @@ class Hydrator
}
if (!$classReflector->isInternal()) {
- $readonly = new \stdClass();
- foreach ($classReflector->getProperties(\ReflectionProperty::IS_READONLY) as $propertyReflector) {
- if ($class === $propertyReflector->class) {
- $readonly->{$propertyReflector->name} = true;
+ $notByRef = new \stdClass();
+ foreach ($classReflector->getProperties() as $propertyReflector) {
+ if ($propertyReflector->isStatic()) {
+ continue;
+ }
+ if (\PHP_VERSION_ID >= 80400 && !$propertyReflector->isAbstract() && $propertyReflector->getHooks()) {
+ $notByRef->{$propertyReflector->name} = $propertyReflector->setRawValue(...);
+ } elseif ($propertyReflector->isReadOnly()) {
+ $notByRef->{$propertyReflector->name} = true;
}
}
- return $baseHydrator->bindTo($readonly, $class);
+ return $baseHydrator->bindTo($notByRef, $class);
}
if ($classReflector->name !== $class) {
@@ -269,12 +280,23 @@ class Hydrator
continue;
}
$name = $property->name;
+ $access = ($flags << 2) | ($flags & \ReflectionProperty::IS_READONLY ? self::PROPERTY_NOT_BY_REF : 0);
+
+ if (\PHP_VERSION_ID >= 80400 && !$property->isAbstract() && $h = $property->getHooks()) {
+ $access |= self::PROPERTY_HAS_HOOKS | (isset($h['get']) && !$h['get']->returnsReference() ? self::PROPERTY_NOT_BY_REF : 0);
+ }
if (\ReflectionProperty::IS_PRIVATE & $flags) {
- $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $class : null, $property];
+ $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, null, $access, $property];
+
continue;
}
- $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $property->class : null, $property];
+
+ $propertyScopes[$name] = [$class, $name, null, $access, $property];
+
+ if ($flags & (\PHP_VERSION_ID >= 80400 ? \ReflectionProperty::IS_PRIVATE_SET : \ReflectionProperty::IS_READONLY)) {
+ $propertyScopes[$name][2] = $property->class;
+ }
if (\ReflectionProperty::IS_PROTECTED & $flags) {
$propertyScopes["\0*\0$name"] = $propertyScopes[$name];
@@ -285,12 +307,20 @@ class Hydrator
$class = $r->name;
foreach ($r->getProperties(\ReflectionProperty::IS_PRIVATE) as $property) {
- if (!$property->isStatic()) {
- $name = $property->name;
- $readonlyScope = $property->isReadOnly() ? $class : null;
- $propertyScopes["\0$class\0$name"] = [$class, $name, $readonlyScope, $property];
- $propertyScopes[$name] ??= [$class, $name, $readonlyScope, $property];
+ $flags = $property->getModifiers();
+
+ if (\ReflectionProperty::IS_STATIC & $flags) {
+ continue;
}
+ $name = $property->name;
+ $access = ($flags << 2) | ($flags & \ReflectionProperty::IS_READONLY ? self::PROPERTY_NOT_BY_REF : 0);
+
+ if (\PHP_VERSION_ID >= 80400 && $h = $property->getHooks()) {
+ $access |= self::PROPERTY_HAS_HOOKS | (isset($h['get']) && !$h['get']->returnsReference() ? self::PROPERTY_NOT_BY_REF : 0);
+ }
+
+ $propertyScopes["\0$class\0$name"] = [$class, $name, null, $access, $property];
+ $propertyScopes[$name] ??= $propertyScopes["\0$class\0$name"];
}
}
diff --git a/lib/symfony/var-exporter/Internal/LazyObjectRegistry.php b/lib/symfony/var-exporter/Internal/LazyObjectRegistry.php
index fddc6fb3b..d096be886 100644
--- a/lib/symfony/var-exporter/Internal/LazyObjectRegistry.php
+++ b/lib/symfony/var-exporter/Internal/LazyObjectRegistry.php
@@ -50,6 +50,7 @@ class LazyObjectRegistry
public static function getClassResetters($class)
{
$classProperties = [];
+ $hookedProperties = [];
if ((self::$classReflectors[$class] ??= new \ReflectionClass($class))->isInternal()) {
$propertyScopes = [];
@@ -57,11 +58,17 @@ class LazyObjectRegistry
$propertyScopes = Hydrator::$propertyScopes[$class] ??= Hydrator::getPropertyScopes($class);
}
- foreach ($propertyScopes as $key => [$scope, $name, $readonlyScope]) {
+ foreach ($propertyScopes as $key => [$scope, $name, $writeScope, $access]) {
$propertyScopes[$k = "\0$scope\0$name"] ?? $propertyScopes[$k = "\0*\0$name"] ?? $k = $name;
- if ($k === $key && "\0$class\0lazyObjectState" !== $k) {
- $classProperties[$readonlyScope ?? $scope][$name] = $key;
+ if ($k !== $key || "\0$class\0lazyObjectState" === $k) {
+ continue;
+ }
+
+ if ($access & Hydrator::PROPERTY_HAS_HOOKS) {
+ $hookedProperties[$k] = true;
+ } else {
+ $classProperties[$writeScope ?? $scope][$name] = $key;
}
}
@@ -76,9 +83,13 @@ class LazyObjectRegistry
}, null, $scope);
}
- $resetters[] = static function ($instance, $skippedProperties, $onlyProperties = null) {
+ $resetters[] = static function ($instance, $skippedProperties, $onlyProperties = null) use ($hookedProperties) {
foreach ((array) $instance as $name => $value) {
- if ("\0" !== ($name[0] ?? '') && !\array_key_exists($name, $skippedProperties) && (null === $onlyProperties || \array_key_exists($name, $onlyProperties))) {
+ if ("\0" !== ($name[0] ?? '')
+ && !\array_key_exists($name, $skippedProperties)
+ && (null === $onlyProperties || \array_key_exists($name, $onlyProperties))
+ && !isset($hookedProperties[$name])
+ ) {
unset($instance->$name);
}
}
@@ -90,8 +101,8 @@ class LazyObjectRegistry
public static function getClassAccessors($class)
{
return \Closure::bind(static fn () => [
- 'get' => static function &($instance, $name, $readonly) {
- if (!$readonly) {
+ 'get' => static function &($instance, $name, $notByRef) {
+ if (!$notByRef) {
return $instance->$name;
}
$value = $instance->$name;
@@ -127,9 +138,9 @@ class LazyObjectRegistry
return $methods;
}
- public static function getScope($propertyScopes, $class, $property, $readonlyScope = null)
+ public static function getScopeForRead($propertyScopes, $class, $property)
{
- if (null === $readonlyScope && !isset($propertyScopes[$k = "\0$class\0$property"]) && !isset($propertyScopes[$k = "\0*\0$property"])) {
+ if (!isset($propertyScopes[$k = "\0$class\0$property"]) && !isset($propertyScopes[$k = "\0*\0$property"])) {
return null;
}
$frame = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, 3)[2];
@@ -137,7 +148,27 @@ class LazyObjectRegistry
if (\ReflectionProperty::class === $scope = $frame['class'] ?? \Closure::class) {
$scope = $frame['object']->class;
}
- if (null === $readonlyScope && '*' === $k[1] && ($class === $scope || (is_subclass_of($class, $scope) && !isset($propertyScopes["\0$scope\0$property"])))) {
+ if ('*' === $k[1] && ($class === $scope || (is_subclass_of($class, $scope) && !isset($propertyScopes["\0$scope\0$property"])))) {
+ return null;
+ }
+
+ return $scope;
+ }
+
+ public static function getScopeForWrite($propertyScopes, $class, $property, $flags)
+ {
+ if (!($flags & (\ReflectionProperty::IS_PRIVATE | \ReflectionProperty::IS_PROTECTED | \ReflectionProperty::IS_READONLY | (\PHP_VERSION_ID >= 80400 ? \ReflectionProperty::IS_PRIVATE_SET | \ReflectionProperty::IS_PROTECTED_SET : 0)))) {
+ return null;
+ }
+ $frame = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, 3)[2];
+
+ if (\ReflectionProperty::class === $scope = $frame['class'] ?? \Closure::class) {
+ $scope = $frame['object']->class;
+ }
+ if ($flags & (\ReflectionProperty::IS_PRIVATE | (\PHP_VERSION_ID >= 80400 ? \ReflectionProperty::IS_PRIVATE_SET : \ReflectionProperty::IS_READONLY))) {
+ return $scope;
+ }
+ if ($flags & (\ReflectionProperty::IS_PROTECTED | (\PHP_VERSION_ID >= 80400 ? \ReflectionProperty::IS_PROTECTED_SET : 0)) && ($class === $scope || (is_subclass_of($class, $scope) && !isset($propertyScopes["\0$scope\0$property"])))) {
return null;
}
diff --git a/lib/symfony/var-exporter/Internal/LazyObjectState.php b/lib/symfony/var-exporter/Internal/LazyObjectState.php
index f47dea4d8..619555e44 100644
--- a/lib/symfony/var-exporter/Internal/LazyObjectState.php
+++ b/lib/symfony/var-exporter/Internal/LazyObjectState.php
@@ -45,7 +45,7 @@ class LazyObjectState
$this->status = \is_array($initializer) ? self::STATUS_UNINITIALIZED_PARTIAL : self::STATUS_UNINITIALIZED_FULL;
}
- public function initialize($instance, $propertyName, $propertyScope)
+ public function initialize($instance, $propertyName, $writeScope)
{
if (self::STATUS_INITIALIZED_FULL === $this->status) {
return self::STATUS_INITIALIZED_FULL;
@@ -53,13 +53,13 @@ class LazyObjectState
if (\is_array($this->initializer)) {
$class = $instance::class;
- $propertyScope ??= $class;
+ $writeScope ??= $class;
$propertyScopes = Hydrator::$propertyScopes[$class];
- $propertyScopes[$k = "\0$propertyScope\0$propertyName"] ?? $propertyScopes[$k = "\0*\0$propertyName"] ?? $k = $propertyName;
+ $propertyScopes[$k = "\0$writeScope\0$propertyName"] ?? $propertyScopes[$k = "\0*\0$propertyName"] ?? $k = $propertyName;
if ($initializer = $this->initializer[$k] ?? null) {
- $value = $initializer(...[$instance, $propertyName, $propertyScope, LazyObjectRegistry::$defaultProperties[$class][$k] ?? null]);
- $accessor = LazyObjectRegistry::$classAccessors[$propertyScope] ??= LazyObjectRegistry::getClassAccessors($propertyScope);
+ $value = $initializer(...[$instance, $propertyName, $writeScope, LazyObjectRegistry::$defaultProperties[$class][$k] ?? null]);
+ $accessor = LazyObjectRegistry::$classAccessors[$writeScope] ??= LazyObjectRegistry::getClassAccessors($writeScope);
$accessor['set']($instance, $propertyName, $value);
return $this->status = self::STATUS_INITIALIZED_PARTIAL;
@@ -67,12 +67,12 @@ class LazyObjectState
if ($initializer = $this->initializer["\0"] ?? null) {
if (!\is_array($values = $initializer($instance, LazyObjectRegistry::$defaultProperties[$class]))) {
- throw new \TypeError(sprintf('The lazy-initializer defined for instance of "%s" must return an array, got "%s".', $class, get_debug_type($values)));
+ throw new \TypeError(\sprintf('The lazy-initializer defined for instance of "%s" must return an array, got "%s".', $class, get_debug_type($values)));
}
$properties = (array) $instance;
foreach ($values as $key => $value) {
- if (!\array_key_exists($key, $properties) && [$scope, $name, $readonlyScope] = $propertyScopes[$key] ?? null) {
- $scope = $readonlyScope ?? ('*' !== $scope ? $scope : $class);
+ if (!\array_key_exists($key, $properties) && [$scope, $name, $writeScope] = $propertyScopes[$key] ?? null) {
+ $scope = $writeScope ?? $scope;
$accessor = LazyObjectRegistry::$classAccessors[$scope] ??= LazyObjectRegistry::getClassAccessors($scope);
$accessor['set']($instance, $name, $value);
@@ -116,10 +116,10 @@ class LazyObjectState
$properties = (array) $instance;
$onlyProperties = \is_array($this->initializer) ? $this->initializer : null;
- foreach ($propertyScopes as $key => [$scope, $name, $readonlyScope]) {
+ foreach ($propertyScopes as $key => [$scope, $name, , $access]) {
$propertyScopes[$k = "\0$scope\0$name"] ?? $propertyScopes[$k = "\0*\0$name"] ?? $k = $name;
- if ($k === $key && (null !== $readonlyScope || !\array_key_exists($k, $properties))) {
+ if ($k === $key && ($access & Hydrator::PROPERTY_HAS_HOOKS || ($access >> 2) & \ReflectionProperty::IS_READONLY || !\array_key_exists($k, $properties))) {
$skippedProperties[$k] = true;
}
}
diff --git a/lib/symfony/var-exporter/Internal/LazyObjectTrait.php b/lib/symfony/var-exporter/Internal/LazyObjectTrait.php
index cccdf6cff..4a6f232af 100644
--- a/lib/symfony/var-exporter/Internal/LazyObjectTrait.php
+++ b/lib/symfony/var-exporter/Internal/LazyObjectTrait.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\VarExporter\Internal;
+use Symfony\Component\Serializer\Attribute\Ignore;
+
if (\PHP_VERSION_ID >= 80300) {
/**
* @internal
*/
trait LazyObjectTrait
{
+ #[Ignore]
private readonly LazyObjectState $lazyObjectState;
}
} else {
@@ -25,6 +28,7 @@ if (\PHP_VERSION_ID >= 80300) {
*/
trait LazyObjectTrait
{
+ #[Ignore]
private LazyObjectState $lazyObjectState;
}
}
diff --git a/lib/symfony/var-exporter/LazyGhostTrait.php b/lib/symfony/var-exporter/LazyGhostTrait.php
index 26f7bc2cd..79d8a0fae 100644
--- a/lib/symfony/var-exporter/LazyGhostTrait.php
+++ b/lib/symfony/var-exporter/LazyGhostTrait.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\VarExporter;
+use Symfony\Component\Serializer\Attribute\Ignore;
use Symfony\Component\VarExporter\Internal\Hydrator;
use Symfony\Component\VarExporter\Internal\LazyObjectRegistry as Registry;
use Symfony\Component\VarExporter\Internal\LazyObjectState;
@@ -31,7 +32,7 @@ trait LazyGhostTrait
* that the initializer doesn't initialize, if any
* @param static|null $instance
*/
- public static function createLazyGhost(\Closure|array $initializer, array $skippedProperties = null, object $instance = null): static
+ public static function createLazyGhost(\Closure|array $initializer, ?array $skippedProperties = null, ?object $instance = null): static
{
if (\is_array($initializer)) {
trigger_deprecation('symfony/var-exporter', '6.4', 'Per-property lazy-initializers are deprecated and won\'t be supported anymore in 7.0, use an object initializer instead.');
@@ -61,6 +62,7 @@ trait LazyGhostTrait
*
* @param $partial Whether partially initialized objects should be considered as initialized
*/
+ #[Ignore]
public function isLazyObjectInitialized(bool $partial = false): bool
{
if (!$state = $this->lazyObjectState ?? null) {
@@ -111,14 +113,14 @@ trait LazyGhostTrait
$properties = (array) $this;
$propertyScopes = Hydrator::$propertyScopes[$class] ??= Hydrator::getPropertyScopes($class);
foreach ($state->initializer as $key => $initializer) {
- if (\array_key_exists($key, $properties) || ![$scope, $name, $readonlyScope] = $propertyScopes[$key] ?? null) {
+ if (\array_key_exists($key, $properties) || ![$scope, $name, $writeScope] = $propertyScopes[$key] ?? null) {
continue;
}
- $scope = $readonlyScope ?? ('*' !== $scope ? $scope : $class);
+ $scope = $writeScope ?? $scope;
if (null === $values) {
if (!\is_array($values = ($state->initializer["\0"])($this, Registry::$defaultProperties[$class]))) {
- throw new \TypeError(sprintf('The lazy-initializer defined for instance of "%s" must return an array, got "%s".', $class, get_debug_type($values)));
+ throw new \TypeError(\sprintf('The lazy-initializer defined for instance of "%s" must return an array, got "%s".', $class, get_debug_type($values)));
}
if (\array_key_exists($key, $properties = (array) $this)) {
@@ -158,22 +160,28 @@ trait LazyGhostTrait
{
$propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
$scope = null;
+ $notByRef = 0;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForRead($propertyScopes, $class, $name);
$state = $this->lazyObjectState ?? null;
if ($state && (null === $scope || isset($propertyScopes["\0$scope\0$name"]))) {
+ $notByRef = $access & Hydrator::PROPERTY_NOT_BY_REF;
+
if (LazyObjectState::STATUS_INITIALIZED_FULL === $state->status) {
// Work around php/php-src#12695
$property = null === $scope ? $name : "\0$scope\0$name";
- $property = $propertyScopes[$property][3]
- ?? Hydrator::$propertyScopes[$this::class][$property][3] = new \ReflectionProperty($scope ?? $class, $name);
+ $property = $propertyScopes[$property][4]
+ ?? Hydrator::$propertyScopes[$this::class][$property][4] = new \ReflectionProperty($scope ?? $class, $name);
} else {
$property = null;
}
+ if (\PHP_VERSION_ID >= 80400 && !$notByRef && ($access >> 2) & \ReflectionProperty::IS_PRIVATE_SET) {
+ $scope ??= $writeScope;
+ }
- if ($property?->isInitialized($this) ?? LazyObjectState::STATUS_UNINITIALIZED_PARTIAL !== $state->initialize($this, $name, $readonlyScope ?? $scope)) {
+ if ($property?->isInitialized($this) ?? LazyObjectState::STATUS_UNINITIALIZED_PARTIAL !== $state->initialize($this, $name, $writeScope ?? $scope)) {
goto get_in_scope;
}
}
@@ -190,14 +198,14 @@ trait LazyGhostTrait
if (null === $class) {
$frame = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
- trigger_error(sprintf('Undefined property: %s::$%s in %s on line %s', $this::class, $name, $frame['file'], $frame['line']), \E_USER_NOTICE);
+ trigger_error(\sprintf('Undefined property: %s::$%s in %s on line %s', $this::class, $name, $frame['file'], $frame['line']), \E_USER_NOTICE);
}
get_in_scope:
try {
if (null === $scope) {
- if (null === $readonlyScope) {
+ if (!$notByRef) {
return $this->$name;
}
$value = $this->$name;
@@ -206,7 +214,7 @@ trait LazyGhostTrait
}
$accessor = Registry::$classAccessors[$scope] ??= Registry::getClassAccessors($scope);
- return $accessor['get']($this, $name, null !== $readonlyScope);
+ return $accessor['get']($this, $name, $notByRef);
} catch (\Error $e) {
if (\Error::class !== $e::class || !str_starts_with($e->getMessage(), 'Cannot access uninitialized non-nullable property')) {
throw $e;
@@ -221,8 +229,12 @@ trait LazyGhostTrait
$accessor['set']($this, $name, []);
- return $accessor['get']($this, $name, null !== $readonlyScope);
+ return $accessor['get']($this, $name, $notByRef);
} catch (\Error) {
+ if (preg_match('/^Cannot access uninitialized non-nullable property ([^ ]++) by reference$/', $e->getMessage(), $matches)) {
+ throw new \Error('Typed property '.$matches[1].' must not be accessed before initialization', $e->getCode(), $e->getPrevious());
+ }
+
throw $e;
}
}
@@ -233,15 +245,15 @@ trait LazyGhostTrait
$propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
$scope = null;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name, $readonlyScope);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForWrite($propertyScopes, $class, $name, $access >> 2);
$state = $this->lazyObjectState ?? null;
- if ($state && ($readonlyScope === $scope || isset($propertyScopes["\0$scope\0$name"]))
+ if ($state && ($writeScope === $scope || isset($propertyScopes["\0$scope\0$name"]))
&& LazyObjectState::STATUS_INITIALIZED_FULL !== $state->status
) {
if (LazyObjectState::STATUS_UNINITIALIZED_FULL === $state->status) {
- $state->initialize($this, $name, $readonlyScope ?? $scope);
+ $state->initialize($this, $name, $writeScope ?? $scope);
}
goto set_in_scope;
}
@@ -268,13 +280,13 @@ trait LazyGhostTrait
$propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
$scope = null;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name);
+ if ([$class, , $writeScope] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForRead($propertyScopes, $class, $name);
$state = $this->lazyObjectState ?? null;
if ($state && (null === $scope || isset($propertyScopes["\0$scope\0$name"]))
&& LazyObjectState::STATUS_INITIALIZED_FULL !== $state->status
- && LazyObjectState::STATUS_UNINITIALIZED_PARTIAL !== $state->initialize($this, $name, $readonlyScope ?? $scope)
+ && LazyObjectState::STATUS_UNINITIALIZED_PARTIAL !== $state->initialize($this, $name, $writeScope ?? $scope)
) {
goto isset_in_scope;
}
@@ -299,15 +311,15 @@ trait LazyGhostTrait
$propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
$scope = null;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name, $readonlyScope);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForWrite($propertyScopes, $class, $name, $access >> 2);
$state = $this->lazyObjectState ?? null;
- if ($state && ($readonlyScope === $scope || isset($propertyScopes["\0$scope\0$name"]))
+ if ($state && ($writeScope === $scope || isset($propertyScopes["\0$scope\0$name"]))
&& LazyObjectState::STATUS_INITIALIZED_FULL !== $state->status
) {
if (LazyObjectState::STATUS_UNINITIALIZED_FULL === $state->status) {
- $state->initialize($this, $name, $readonlyScope ?? $scope);
+ $state->initialize($this, $name, $writeScope ?? $scope);
}
goto unset_in_scope;
}
@@ -363,7 +375,7 @@ trait LazyGhostTrait
$value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$class\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
if (null === $k) {
- trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);
+ trigger_error(\sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);
} else {
$data[$k] = $value;
}
@@ -385,6 +397,7 @@ trait LazyGhostTrait
}
}
+ #[Ignore]
private function setLazyObjectAsInitialized(bool $initialized): void
{
$state = $this->lazyObjectState ?? null;
diff --git a/lib/symfony/var-exporter/LazyProxyTrait.php b/lib/symfony/var-exporter/LazyProxyTrait.php
index d683ec3f1..af009ae9a 100644
--- a/lib/symfony/var-exporter/LazyProxyTrait.php
+++ b/lib/symfony/var-exporter/LazyProxyTrait.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\VarExporter;
+use Symfony\Component\Serializer\Attribute\Ignore;
use Symfony\Component\VarExporter\Hydrator as PublicHydrator;
use Symfony\Component\VarExporter\Internal\Hydrator;
use Symfony\Component\VarExporter\Internal\LazyObjectRegistry as Registry;
@@ -27,7 +28,7 @@ trait LazyProxyTrait
* @param \Closure():object $initializer Returns the proxied object
* @param static|null $instance
*/
- public static function createLazyProxy(\Closure $initializer, object $instance = null): static
+ public static function createLazyProxy(\Closure $initializer, ?object $instance = null): static
{
if (self::class !== $class = $instance ? $instance::class : static::class) {
$skippedProperties = ["\0".self::class."\0lazyObjectState" => true];
@@ -50,6 +51,7 @@ trait LazyProxyTrait
*
* @param $partial Whether partially initialized objects should be considered as initialized
*/
+ #[Ignore]
public function isLazyObjectInitialized(bool $partial = false): bool
{
return !isset($this->lazyObjectState) || isset($this->lazyObjectState->realInstance) || Registry::$noInitializerState === $this->lazyObjectState->initializer;
@@ -86,14 +88,19 @@ trait LazyProxyTrait
$propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
$scope = null;
$instance = $this;
+ $notByRef = 0;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $notByRef = $access & Hydrator::PROPERTY_NOT_BY_REF;
+ $scope = Registry::getScopeForRead($propertyScopes, $class, $name);
if (null === $scope || isset($propertyScopes["\0$scope\0$name"])) {
if ($state = $this->lazyObjectState ?? null) {
$instance = $state->realInstance ??= ($state->initializer)();
}
+ if (\PHP_VERSION_ID >= 80400 && !$notByRef && ($access >> 2) & \ReflectionProperty::IS_PRIVATE_SET) {
+ $scope ??= $writeScope;
+ }
$parent = 2;
goto get_in_scope;
}
@@ -113,14 +120,15 @@ trait LazyProxyTrait
if (!$parent && null === $class && !\array_key_exists($name, (array) $instance)) {
$frame = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
- trigger_error(sprintf('Undefined property: %s::$%s in %s on line %s', $instance::class, $name, $frame['file'], $frame['line']), \E_USER_NOTICE);
+ trigger_error(\sprintf('Undefined property: %s::$%s in %s on line %s', $instance::class, $name, $frame['file'], $frame['line']), \E_USER_NOTICE);
}
get_in_scope:
+ $notByRef = $notByRef || 1 === $parent;
try {
if (null === $scope) {
- if (null === $readonlyScope && 1 !== $parent) {
+ if (!$notByRef) {
return $instance->$name;
}
$value = $instance->$name;
@@ -129,7 +137,7 @@ trait LazyProxyTrait
}
$accessor = Registry::$classAccessors[$scope] ??= Registry::getClassAccessors($scope);
- return $accessor['get']($instance, $name, null !== $readonlyScope || 1 === $parent);
+ return $accessor['get']($instance, $name, $notByRef);
} catch (\Error $e) {
if (\Error::class !== $e::class || !str_starts_with($e->getMessage(), 'Cannot access uninitialized non-nullable property')) {
throw $e;
@@ -144,7 +152,7 @@ trait LazyProxyTrait
$accessor['set']($instance, $name, []);
- return $accessor['get']($instance, $name, null !== $readonlyScope || 1 === $parent);
+ return $accessor['get']($instance, $name, $notByRef);
} catch (\Error) {
throw $e;
}
@@ -157,10 +165,10 @@ trait LazyProxyTrait
$scope = null;
$instance = $this;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name, $readonlyScope);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForWrite($propertyScopes, $class, $name, $access >> 2);
- if ($readonlyScope === $scope || isset($propertyScopes["\0$scope\0$name"])) {
+ if ($writeScope === $scope || isset($propertyScopes["\0$scope\0$name"])) {
if ($state = $this->lazyObjectState ?? null) {
$instance = $state->realInstance ??= ($state->initializer)();
}
@@ -193,7 +201,7 @@ trait LazyProxyTrait
$instance = $this;
if ([$class] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name);
+ $scope = Registry::getScopeForRead($propertyScopes, $class, $name);
if (null === $scope || isset($propertyScopes["\0$scope\0$name"])) {
if ($state = $this->lazyObjectState ?? null) {
@@ -225,10 +233,10 @@ trait LazyProxyTrait
$scope = null;
$instance = $this;
- if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
- $scope = Registry::getScope($propertyScopes, $class, $name, $readonlyScope);
+ if ([$class, , $writeScope, $access] = $propertyScopes[$name] ?? null) {
+ $scope = Registry::getScopeForWrite($propertyScopes, $class, $name, $access >> 2);
- if ($readonlyScope === $scope || isset($propertyScopes["\0$scope\0$name"])) {
+ if ($writeScope === $scope || isset($propertyScopes["\0$scope\0$name"])) {
if ($state = $this->lazyObjectState ?? null) {
$instance = $state->realInstance ??= ($state->initializer)();
}
@@ -298,7 +306,7 @@ trait LazyProxyTrait
$value = $properties[$k = $name] ?? $properties[$k = "\0*\0$name"] ?? $properties[$k = "\0$class\0$name"] ?? $properties[$k = "\0$scope\0$name"] ?? $k = null;
if (null === $k) {
- trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);
+ trigger_error(\sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $name), \E_USER_NOTICE);
} else {
$data[$k] = $value;
}
diff --git a/lib/symfony/var-exporter/ProxyHelper.php b/lib/symfony/var-exporter/ProxyHelper.php
index 71530fd55..56fd00e08 100644
--- a/lib/symfony/var-exporter/ProxyHelper.php
+++ b/lib/symfony/var-exporter/ProxyHelper.php
@@ -28,19 +28,19 @@ final class ProxyHelper
public static function generateLazyGhost(\ReflectionClass $class): string
{
if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class->isReadOnly()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is readonly.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost with PHP < 8.3: class "%s" is readonly.', $class->name));
}
if ($class->isFinal()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is final.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: class "%s" is final.', $class->name));
}
- if ($class->isInterface() || $class->isAbstract()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: "%s" is not a concrete class.', $class->name));
+ if ($class->isInterface() || $class->isAbstract() || $class->isTrait()) {
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: "%s" is not a concrete class.', $class->name));
}
if (\stdClass::class !== $class->name && $class->isInternal()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is internal.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: class "%s" is internal.', $class->name));
}
if ($class->hasMethod('__get') && 'mixed' !== (self::exportType($class->getMethod('__get')) ?? 'mixed')) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: return type of method "%s::__get()" should be "mixed".', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: return type of method "%s::__get()" should be "mixed".', $class->name));
}
static $traitMethods;
@@ -48,17 +48,58 @@ final class ProxyHelper
foreach ($traitMethods as $method) {
if ($class->hasMethod($method->name) && $class->getMethod($method->name)->isFinal()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: method "%s::%s()" is final.', $class->name, $method->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: method "%s::%s()" is final.', $class->name, $method->name));
}
}
$parent = $class;
while ($parent = $parent->getParentClass()) {
if (\stdClass::class !== $parent->name && $parent->isInternal()) {
- throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" extends "%s" which is internal.', $class->name, $parent->name));
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: class "%s" extends "%s" which is internal.', $class->name, $parent->name));
}
}
- $propertyScopes = self::exportPropertyScopes($class->name);
+
+ $hooks = '';
+ $propertyScopes = Hydrator::$propertyScopes[$class->name] ??= Hydrator::getPropertyScopes($class->name);
+ foreach ($propertyScopes as $key => [$scope, $name, , $access]) {
+ $propertyScopes[$k = "\0$scope\0$name"] ?? $propertyScopes[$k = "\0*\0$name"] ?? $k = $name;
+ $flags = $access >> 2;
+
+ if ($k !== $key || !($access & Hydrator::PROPERTY_HAS_HOOKS) || $flags & \ReflectionProperty::IS_VIRTUAL) {
+ continue;
+ }
+
+ if ($flags & (\ReflectionProperty::IS_FINAL | \ReflectionProperty::IS_PRIVATE)) {
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: property "%s::$%s" is final or private(set).', $class->name, $name));
+ }
+
+ $p = $propertyScopes[$k][4] ?? Hydrator::$propertyScopes[$class->name][$k][4] = new \ReflectionProperty($scope, $name);
+
+ $type = self::exportType($p);
+ $hooks .= "\n "
+ .($p->isProtected() ? 'protected' : 'public')
+ .($p->isProtectedSet() ? ' protected(set)' : '')
+ ." {$type} \${$name}"
+ .($p->hasDefaultValue() ? ' = '.VarExporter::export($p->getDefaultValue()) : '')
+ ." {\n";
+
+ foreach ($p->getHooks() as $hook => $method) {
+ if ('get' === $hook) {
+ $ref = ($method->returnsReference() ? '&' : '');
+ $hooks .= " {$ref}get { \$this->initializeLazyObject(); return parent::\${$name}::get(); }\n";
+ } elseif ('set' === $hook) {
+ $parameters = self::exportParameters($method, true);
+ $arg = '$'.$method->getParameters()[0]->name;
+ $hooks .= " set({$parameters}) { \$this->initializeLazyObject(); parent::\${$name}::set({$arg}); }\n";
+ } else {
+ throw new LogicException(\sprintf('Cannot generate lazy ghost: hook "%s::%s()" is not supported.', $class->name, $method->name));
+ }
+ }
+
+ $hooks .= " }\n";
+ }
+
+ $propertyScopes = self::exportPropertyScopes($class->name, $propertyScopes);
return <<name} implements \Symfony\Component\VarExporter\LazyObjectInterface
@@ -66,7 +107,7 @@ final class ProxyHelper
use \Symfony\Component\VarExporter\LazyGhostTrait;
private const LAZY_OBJECT_PROPERTY_SCOPES = {$propertyScopes};
- }
+ {$hooks}}
// Help opcache.preload discover always-needed symbols
class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
@@ -86,23 +127,113 @@ final class ProxyHelper
public static function generateLazyProxy(?\ReflectionClass $class, array $interfaces = []): string
{
if (!class_exists($class?->name ?? \stdClass::class, false)) {
- throw new LogicException(sprintf('Cannot generate lazy proxy: "%s" is not a class.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: "%s" is not a class.', $class->name));
}
if ($class?->isFinal()) {
- throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is final.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: class "%s" is final.', $class->name));
}
if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class?->isReadOnly()) {
- throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is readonly.', $class->name));
+ throw new LogicException(\sprintf('Cannot generate lazy proxy with PHP < 8.3: class "%s" is readonly.', $class->name));
+ }
+
+ $propertyScopes = $class ? Hydrator::$propertyScopes[$class->name] ??= Hydrator::getPropertyScopes($class->name) : [];
+ $abstractProperties = [];
+ $hookedProperties = [];
+ if (\PHP_VERSION_ID >= 80400 && $class) {
+ foreach ($propertyScopes as $key => [$scope, $name, , $access]) {
+ $propertyScopes[$k = "\0$scope\0$name"] ?? $propertyScopes[$k = "\0*\0$name"] ?? $k = $name;
+ $flags = $access >> 2;
+
+ if ($k !== $key) {
+ continue;
+ }
+
+ if ($flags & \ReflectionProperty::IS_ABSTRACT) {
+ $abstractProperties[$name] = $propertyScopes[$k][4] ?? Hydrator::$propertyScopes[$class->name][$k][4] = new \ReflectionProperty($scope, $name);
+ continue;
+ }
+ $abstractProperties[$name] = false;
+
+ if (!($access & Hydrator::PROPERTY_HAS_HOOKS) || $flags & \ReflectionProperty::IS_VIRTUAL) {
+ continue;
+ }
+
+ if ($flags & (\ReflectionProperty::IS_FINAL | \ReflectionProperty::IS_PRIVATE)) {
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: property "%s::$%s" is final or private(set).', $class->name, $name));
+ }
+
+ $p = $propertyScopes[$k][4] ?? Hydrator::$propertyScopes[$class->name][$k][4] = new \ReflectionProperty($scope, $name);
+ $hookedProperties[$name] = [$p, $p->getHooks()];
+ }
}
$methodReflectors = [$class?->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) ?? []];
foreach ($interfaces as $interface) {
if (!$interface->isInterface()) {
- throw new LogicException(sprintf('Cannot generate lazy proxy: "%s" is not an interface.', $interface->name));
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: "%s" is not an interface.', $interface->name));
}
$methodReflectors[] = $interface->getMethods();
+
+ if (\PHP_VERSION_ID >= 80400) {
+ foreach ($interface->getProperties() as $p) {
+ $abstractProperties[$p->name] ??= $p;
+ $hookedProperties[$p->name] ??= [$p, []];
+ $hookedProperties[$p->name][1] += $p->getHooks();
+ }
+ }
+ }
+
+ $hooks = '';
+
+ foreach (array_filter($abstractProperties) as $name => $p) {
+ $type = self::exportType($p);
+ $hooks .= "\n "
+ .($p->isProtected() ? 'protected' : 'public')
+ .($p->isProtectedSet() ? ' protected(set)' : '')
+ ." {$type} \${$name};\n";
+ }
+
+ foreach ($hookedProperties as $name => [$p, $methods]) {
+ $type = self::exportType($p);
+ $hooks .= "\n "
+ .($p->isProtected() ? 'protected' : 'public')
+ .($p->isProtectedSet() ? ' protected(set)' : '')
+ ." {$type} \${$name} {\n";
+
+ foreach ($methods as $hook => $method) {
+ if ('get' === $hook) {
+ $ref = ($method->returnsReference() ? '&' : '');
+ $hooks .= <<lazyObjectState)) {
+ return (\$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)())->{$p->name};
+ }
+
+ return parent::\${$p->name}::get();
+ }
+
+ EOPHP;
+ } elseif ('set' === $hook) {
+ $parameters = self::exportParameters($method, true);
+ $arg = '$'.$method->getParameters()[0]->name;
+ $hooks .= <<lazyObjectState)) {
+ \$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)();
+ \$this->lazyObjectState->realInstance->{$p->name} = {$arg};
+ }
+
+ parent::\${$p->name}::set({$arg});
+ }
+
+ EOPHP;
+ } else {
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: hook "%s::%s()" is not supported.', $class->name, $method->name));
+ }
+ }
+
+ $hooks .= " }\n";
}
- $methodReflectors = array_merge(...$methodReflectors);
$extendsInternalClass = false;
if ($parent = $class) {
@@ -112,6 +243,7 @@ final class ProxyHelper
}
$methodsHaveToBeProxied = $extendsInternalClass;
$methods = [];
+ $methodReflectors = array_merge(...$methodReflectors);
foreach ($methodReflectors as $method) {
if ('__get' !== strtolower($method->name) || 'mixed' === ($type = self::exportType($method) ?? 'mixed')) {
@@ -134,7 +266,7 @@ final class ProxyHelper
}
if ($method->isFinal()) {
if ($extendsInternalClass || $methodsHaveToBeProxied || method_exists(LazyProxyTrait::class, $method->name)) {
- throw new LogicException(sprintf('Cannot generate lazy proxy: method "%s::%s()" is final.', $class->name, $method->name));
+ throw new LogicException(\sprintf('Cannot generate lazy proxy: method "%s::%s()" is final.', $class->name, $method->name));
}
continue;
}
@@ -195,15 +327,40 @@ final class ProxyHelper
$methods = ['initializeLazyObject' => implode('', $body).' }'] + $methods;
}
$body = $methods ? "\n".implode("\n\n", $methods)."\n" : '';
- $propertyScopes = $class ? self::exportPropertyScopes($class->name) : '[]';
+ $propertyScopes = $class ? self::exportPropertyScopes($class->name, $propertyScopes) : '[]';
+
+ if (
+ $class?->hasMethod('__unserialize')
+ && !$class->getMethod('__unserialize')->getParameters()[0]->getType()
+ ) {
+ // fix contravariance type problem when $class declares a `__unserialize()` method without typehint.
+ $lazyProxyTraitStatement = <<__doUnserialize(\$data);
+ }
+
+ EOPHP;
+ } else {
+ $lazyProxyTraitStatement = <<class : $function->getNamespaceName().'\\';
+ $namespace = substr($namespace, 0, strrpos($namespace, '\\') ?: 0);
foreach ($function->getParameters() as $param) {
$parameters[] = ($param->getAttributes(\SensitiveParameter::class) ? '#[\SensitiveParameter] ' : '')
.($withParameterTypes && $param->hasType() ? self::exportType($param).' ' : '')
.($param->isPassedByReference() ? '&' : '')
.($param->isVariadic() ? '...' : '').'$'.$param->name
- .($param->isOptional() && !$param->isVariadic() ? ' = '.self::exportDefault($param) : '');
+ .($param->isOptional() && !$param->isVariadic() ? ' = '.self::exportDefault($param, $namespace) : '');
if ($param->isPassedByReference()) {
$byRefIndex = 1 + $param->getPosition();
}
@@ -237,12 +396,19 @@ final class ProxyHelper
$args = substr($args, 0, -2);
} else {
$args = explode(', ', $args, 1 + $byRefIndex);
- $args[$byRefIndex] = sprintf('...\array_slice(\func_get_args(), %d)', $byRefIndex);
+ $args[$byRefIndex] = \sprintf('...\array_slice(\func_get_args(), %d)', $byRefIndex);
$args = implode(', ', $args);
}
+ return implode(', ', $parameters);
+ }
+
+ public static function exportSignature(\ReflectionFunctionAbstract $function, bool $withParameterTypes = true, ?string &$args = null): string
+ {
+ $parameters = self::exportParameters($function, $withParameterTypes, $args);
+
$signature = 'function '.($function->returnsReference() ? '&' : '')
- .($function->isClosure() ? '' : $function->name).'('.implode(', ', $parameters).')';
+ .($function->isClosure() ? '' : $function->name).'('.$parameters.')';
if ($function instanceof \ReflectionMethod) {
$signature = ($function->isPublic() ? 'public ' : ($function->isProtected() ? 'protected ' : 'private '))
@@ -270,7 +436,7 @@ final class ProxyHelper
return $signature;
}
- public static function exportType(\ReflectionFunctionAbstract|\ReflectionProperty|\ReflectionParameter $owner, bool $noBuiltin = false, \ReflectionType $type = null): ?string
+ public static function exportType(\ReflectionFunctionAbstract|\ReflectionProperty|\ReflectionParameter $owner, bool $noBuiltin = false, ?\ReflectionType $type = null): ?string
{
if (!$type ??= $owner instanceof \ReflectionFunctionAbstract ? $owner->getReturnType() : $owner->getType()) {
return null;
@@ -311,19 +477,20 @@ final class ProxyHelper
return '';
}
if (null === $glue) {
- return (!$noBuiltin && $type->allowsNull() && 'mixed' !== $name ? '?' : '').$types[0];
+ $defaultNull = $owner instanceof \ReflectionParameter && 'NULL' === rtrim(substr(explode('$'.$owner->name.' = ', (string) $owner, 2)[1] ?? '', 0, -2));
+
+ return (!$noBuiltin && ($type->allowsNull() || $defaultNull) && !\in_array($name, ['mixed', 'null'], true) ? '?' : '').$types[0];
}
sort($types);
return implode($glue, $types);
}
- private static function exportPropertyScopes(string $parent): string
+ private static function exportPropertyScopes(string $parent, array $propertyScopes): string
{
- $propertyScopes = Hydrator::$propertyScopes[$parent] ??= Hydrator::getPropertyScopes($parent);
uksort($propertyScopes, 'strnatcmp');
foreach ($propertyScopes as $k => $v) {
- unset($propertyScopes[$k][3]);
+ unset($propertyScopes[$k][4]);
}
$propertyScopes = VarExporter::export($propertyScopes);
$propertyScopes = str_replace(VarExporter::export($parent), 'parent::class', $propertyScopes);
@@ -333,7 +500,7 @@ final class ProxyHelper
return $propertyScopes;
}
- private static function exportDefault(\ReflectionParameter $param): string
+ private static function exportDefault(\ReflectionParameter $param, $namespace): string
{
$default = rtrim(substr(explode('$'.$param->name.' = ', (string) $param, 2)[1] ?? '', 0, -2));
@@ -347,7 +514,7 @@ final class ProxyHelper
$regexp = "/(\"(?:[^\"\\\\]*+(?:\\\\.)*+)*+\"|'(?:[^'\\\\]*+(?:\\\\.)*+)*+')/";
$parts = preg_split($regexp, $default, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
- $regexp = '/([\[\( ]|^)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z0-9_\x7f-\xff]++)*+)(?!: )/';
+ $regexp = '/([\[\( ]|^)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z0-9_\x7f-\xff]++)*+)(\(?)(?!: )/';
$callback = (false !== strpbrk($default, "\\:('") && $class = $param->getDeclaringClass())
? fn ($m) => $m[1].match ($m[2]) {
'new', 'false', 'true', 'null' => $m[2],
@@ -355,13 +522,13 @@ final class ProxyHelper
'self' => '\\'.$class->name,
'namespace\\parent',
'parent' => ($parent = $class->getParentClass()) ? '\\'.$parent->name : 'parent',
- default => '\\'.$m[2],
- }
+ default => self::exportSymbol($m[2], '(' !== $m[3], $namespace),
+ }.$m[3]
: fn ($m) => $m[1].match ($m[2]) {
'new', 'false', 'true', 'null', 'self', 'parent' => $m[2],
'NULL' => 'null',
- default => '\\'.$m[2],
- };
+ default => self::exportSymbol($m[2], '(' !== $m[3], $namespace),
+ }.$m[3];
return implode('', array_map(fn ($part) => match ($part[0]) {
'"' => $part, // for internal classes only
@@ -369,4 +536,18 @@ final class ProxyHelper
default => preg_replace_callback($regexp, $callback, $part),
}, $parts));
}
+
+ private static function exportSymbol(string $symbol, bool $mightBeRootConst, string $namespace): string
+ {
+ if (!$mightBeRootConst
+ || false === ($ns = strrpos($symbol, '\\'))
+ || substr($symbol, 0, $ns) !== $namespace
+ || \defined($symbol)
+ || !\defined(substr($symbol, $ns + 1))
+ ) {
+ return '\\'.$symbol;
+ }
+
+ return '\\'.substr($symbol, $ns + 1);
+ }
}
diff --git a/lib/symfony/var-exporter/VarExporter.php b/lib/symfony/var-exporter/VarExporter.php
index b5ce3ae9e..22e9b5152 100644
--- a/lib/symfony/var-exporter/VarExporter.php
+++ b/lib/symfony/var-exporter/VarExporter.php
@@ -37,7 +37,7 @@ final class VarExporter
*
* @throws ExceptionInterface When the provided value cannot be serialized
*/
- public static function export(mixed $value, bool &$isStaticValue = null, array &$foundClasses = []): string
+ public static function export(mixed $value, ?bool &$isStaticValue = null, array &$foundClasses = []): string
{
$isStaticValue = true;
diff --git a/lib/symfony/var-exporter/composer.json b/lib/symfony/var-exporter/composer.json
index 3498d15cc..e7b0fb039 100644
--- a/lib/symfony/var-exporter/composer.json
+++ b/lib/symfony/var-exporter/composer.json
@@ -20,6 +20,8 @@
"symfony/deprecation-contracts": "^2.5|^3"
},
"require-dev": {
+ "symfony/property-access": "^6.4|^7.0",
+ "symfony/serializer": "^6.4|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"autoload": {