From e39157a2add9041503902323ea43c322047a4d0e Mon Sep 17 00:00:00 2001 From: catch <6915-catch@users.noreply.drupalcode.org> Date: Thu, 31 Oct 2024 09:05:10 +0000 Subject: [PATCH] Issue #3483978 by spokje, longwave, andypost: Update to Symfony 7.2.0-BETA1 --- composer.json | 12 +- composer.lock | 365 +++++++++--------- .../Metapackage/CoreRecommended/composer.json | 42 +- .../Metapackage/DevDependencies/composer.json | 12 +- .../PinnedDevDependencies/composer.json | 8 +- core/.deprecation-ignore.txt | 4 + .../scaffold/files/default.services.yml | 17 - core/composer.json | 30 +- core/core.services.yml | 2 - .../DependencyInjection/composer.json | 2 +- .../Component/EventDispatcher/composer.json | 4 +- .../Component/HttpFoundation/composer.json | 2 +- .../lib/Drupal/Component/Plugin/composer.json | 2 +- .../Component/Serialization/composer.json | 2 +- core/lib/Drupal/Core/CoreServiceProvider.php | 11 + .../Core/Session/SessionConfiguration.php | 9 +- .../Template/ComposerProjectTemplatesTest.php | 2 +- .../Core/Session/SessionConfigurationTest.php | 34 +- sites/default/default.services.yml | 17 - 19 files changed, 268 insertions(+), 309 deletions(-) diff --git a/composer.json b/composer.json index 65e858ab2afa..37ddea959623 100644 --- a/composer.json +++ b/composer.json @@ -34,12 +34,12 @@ "phpstan/phpstan": "^1.12.4", "phpstan/phpstan-phpunit": "^1.3.16", "phpunit/phpunit": "^10.5.19", - "symfony/browser-kit": "^7.1", - "symfony/css-selector": "^7.1", - "symfony/dom-crawler": "^7.1", - "symfony/error-handler": "^7.1", - "symfony/lock": "^7.1", - "symfony/var-dumper": "^7.1" + "symfony/browser-kit": "^7.2@beta", + "symfony/css-selector": "^7.2@beta", + "symfony/dom-crawler": "^7.2@beta", + "symfony/error-handler": "^7.2@beta", + "symfony/lock": "^7.2@beta", + "symfony/var-dumper": "^7.2@beta" }, "replace": { "symfony/polyfill-php72": "*", diff --git a/composer.lock b/composer.lock index 3343f4b56fba..6c1bb6d0e6d8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "78fd9a29eb1b32ffb5e39b80a8cb2f7d", + "content-hash": "104086943ee98f64d5bcac7860b72b1c", "packages": [ { "name": "asm89/stack-cors", @@ -496,7 +496,7 @@ "dist": { "type": "path", "url": "core", - "reference": "c5a5d4ac5312bd6c16d1e8505b20ba640837b7a0" + "reference": "a80d15b02550e098781320bd2fc6210beab8ed88" }, "require": { "asm89/stack-cors": "^2.1", @@ -529,22 +529,22 @@ "psr/log": "^3.0", "revolt/event-loop": "^1.0", "sebastian/diff": "^4|^5", - "symfony/console": "^7.1", - "symfony/dependency-injection": "^7.1", - "symfony/event-dispatcher": "^7.1", - "symfony/filesystem": "^7.1", - "symfony/finder": "^7.1", - "symfony/http-foundation": "^7.1", - "symfony/http-kernel": "^7.1", - "symfony/mailer": "^7.1", - "symfony/mime": "^7.1", + "symfony/console": "^7.2@beta", + "symfony/dependency-injection": "^7.2@beta", + "symfony/event-dispatcher": "^7.2@beta", + "symfony/filesystem": "^7.2@beta", + "symfony/finder": "^7.2@beta", + "symfony/http-foundation": "^7.2@beta", + "symfony/http-kernel": "^7.2@beta", + "symfony/mailer": "^7.2@beta", + "symfony/mime": "^7.2@beta", "symfony/polyfill-iconv": "^1.26", - "symfony/process": "^7.1", - "symfony/psr-http-message-bridge": "^7.1", - "symfony/routing": "^7.1", - "symfony/serializer": "^7.1", - "symfony/validator": "^7.1", - "symfony/yaml": "^7.1", + "symfony/process": "^7.2@beta", + "symfony/psr-http-message-bridge": "^7.2@beta", + "symfony/routing": "^7.2@beta", + "symfony/serializer": "^7.2@beta", + "symfony/validator": "^7.2@beta", + "symfony/yaml": "^7.2@beta", "twig/twig": "^3.14.0" }, "conflict": { @@ -2082,16 +2082,16 @@ }, { "name": "symfony/console", - "version": "v7.1.5", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee" + "reference": "de74db6d7c9f4ecabf7b4a1a20655e021b034001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee", - "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee", + "url": "https://api.github.com/repos/symfony/console/zipball/de74db6d7c9f4ecabf7b4a1a20655e021b034001", + "reference": "de74db6d7c9f4ecabf7b4a1a20655e021b034001", "shasum": "" }, "require": { @@ -2155,7 +2155,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.5" + "source": "https://github.com/symfony/console/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2171,20 +2171,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:28:38+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "symfony/dependency-injection", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8126f0be4ff984e4db0140e60917900a53facb49" + "reference": "6d5c6520d1984bc67af228dd6519e03e58661d7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8126f0be4ff984e4db0140e60917900a53facb49", - "reference": "8126f0be4ff984e4db0140e60917900a53facb49", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6d5c6520d1984bc67af228dd6519e03e58661d7f", + "reference": "6d5c6520d1984bc67af228dd6519e03e58661d7f", "shasum": "" }, "require": { @@ -2235,7 +2235,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v7.1.3" + "source": "https://github.com/symfony/dependency-injection/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2251,7 +2251,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T07:35:39+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2322,16 +2322,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "432bb369952795c61ca1def65e078c4a80dad13c" + "reference": "ad57ca04868ca877e7919c56d20bdfa8024b54d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/432bb369952795c61ca1def65e078c4a80dad13c", - "reference": "432bb369952795c61ca1def65e078c4a80dad13c", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/ad57ca04868ca877e7919c56d20bdfa8024b54d6", + "reference": "ad57ca04868ca877e7919c56d20bdfa8024b54d6", "shasum": "" }, "require": { @@ -2377,7 +2377,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.1.3" + "source": "https://github.com/symfony/error-handler/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2393,20 +2393,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T13:02:51+00:00" + "time": "2024-10-14T08:54:27+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7" + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", - "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1", + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1", "shasum": "" }, "require": { @@ -2457,7 +2457,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2473,7 +2473,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2553,16 +2553,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.1.5", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a" + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a", - "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", "shasum": "" }, "require": { @@ -2599,7 +2599,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.1.5" + "source": "https://github.com/symfony/filesystem/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2615,20 +2615,20 @@ "type": "tidelift" } ], - "time": "2024-09-17T09:16:35+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/finder", - "version": "v7.1.4", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", - "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", + "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", "shasum": "" }, "require": { @@ -2663,7 +2663,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.4" + "source": "https://github.com/symfony/finder/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2679,24 +2679,25 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:28:19+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a" + "reference": "735b8519a8bcbf603d3af0430fb1be5c8822af13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f602d5c17d1fa02f8019ace2687d9d136b7f4a1a", - "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/735b8519a8bcbf603d3af0430fb1be5c8822af13", + "reference": "735b8519a8bcbf603d3af0430fb1be5c8822af13", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/polyfill-mbstring": "~1.1", "symfony/polyfill-php83": "^1.27" }, @@ -2740,7 +2741,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.1.3" + "source": "https://github.com/symfony/http-foundation/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2756,20 +2757,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186" + "reference": "1d5619199df507f9f03584ae9141924cc148050e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db9702f3a04cc471ec8c70e881825db26ac5f186", - "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1d5619199df507f9f03584ae9141924cc148050e", + "reference": "1d5619199df507f9f03584ae9141924cc148050e", "shasum": "" }, "require": { @@ -2798,7 +2799,7 @@ "symfony/twig-bridge": "<6.4", "symfony/validator": "<6.4", "symfony/var-dumper": "<6.4", - "twig/twig": "<3.0.4" + "twig/twig": "<3.12" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" @@ -2826,7 +2827,7 @@ "symfony/validator": "^6.4|^7.0", "symfony/var-dumper": "^6.4|^7.0", "symfony/var-exporter": "^6.4|^7.0", - "twig/twig": "^3.0.4" + "twig/twig": "^3.12" }, "type": "library", "autoload": { @@ -2854,7 +2855,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.1.3" + "source": "https://github.com/symfony/http-kernel/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2870,20 +2871,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T14:58:15+00:00" + "time": "2024-10-27T15:21:58+00:00" }, { "name": "symfony/mailer", - "version": "v7.1.2", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee" + "reference": "a305f46bb8bd635620dcdcec485b2f52aa1345d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee", - "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee", + "url": "https://api.github.com/repos/symfony/mailer/zipball/a305f46bb8bd635620dcdcec485b2f52aa1345d7", + "reference": "a305f46bb8bd635620dcdcec485b2f52aa1345d7", "shasum": "" }, "require": { @@ -2892,7 +2893,7 @@ "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/mime": "^6.4|^7.0", + "symfony/mime": "^7.2", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -2934,7 +2935,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.1.2" + "source": "https://github.com/symfony/mailer/tree/v7.2.0-BETA1" }, "funding": [ { @@ -2950,20 +2951,20 @@ "type": "tidelift" } ], - "time": "2024-06-28T08:00:31+00:00" + "time": "2024-10-06T12:00:20+00:00" }, { "name": "symfony/mime", - "version": "v7.1.2", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc" + "reference": "e57faea55d255c31b0899f0130c7d9da65fa2ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc", - "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc", + "url": "https://api.github.com/repos/symfony/mime/zipball/e57faea55d255c31b0899f0130c7d9da65fa2ec7", + "reference": "e57faea55d255c31b0899f0130c7d9da65fa2ec7", "shasum": "" }, "require": { @@ -3018,7 +3019,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.1.2" + "source": "https://github.com/symfony/mime/tree/v7.2.0-BETA1" }, "funding": [ { @@ -3034,7 +3035,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T10:03:55+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3117,20 +3118,20 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c027e6a3c6aee334663ec21f5852e89738abc805" + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c027e6a3c6aee334663ec21f5852e89738abc805", - "reference": "c027e6a3c6aee334663ec21f5852e89738abc805", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956", + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-iconv": "*" @@ -3177,7 +3178,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0" }, "funding": [ { @@ -3193,7 +3194,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -3275,22 +3276,21 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -3339,7 +3339,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -3355,7 +3355,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -3520,16 +3520,16 @@ }, { "name": "symfony/process", - "version": "v7.1.5", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5c03ee6369281177f07f7c68252a280beccba847" + "reference": "2ad775b9f17c8c9c1fe457750ce191e0f7c1fbff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847", - "reference": "5c03ee6369281177f07f7c68252a280beccba847", + "url": "https://api.github.com/repos/symfony/process/zipball/2ad775b9f17c8c9c1fe457750ce191e0f7c1fbff", + "reference": "2ad775b9f17c8c9c1fe457750ce191e0f7c1fbff", "shasum": "" }, "require": { @@ -3561,7 +3561,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.5" + "source": "https://github.com/symfony/process/tree/v7.2.0-BETA1" }, "funding": [ { @@ -3577,20 +3577,20 @@ "type": "tidelift" } ], - "time": "2024-09-19T21:48:23+00:00" + "time": "2024-09-26T08:57:56+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "1365d10f5476f74a27cf9c2d1eee70c069019db0" + "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/1365d10f5476f74a27cf9c2d1eee70c069019db0", - "reference": "1365d10f5476f74a27cf9c2d1eee70c069019db0", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/03f2f72319e7acaf2a9f6fcbe30ef17eec51594f", + "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f", "shasum": "" }, "require": { @@ -3644,7 +3644,7 @@ "psr-7" ], "support": { - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.1.3" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.2.0-BETA1" }, "funding": [ { @@ -3660,20 +3660,20 @@ "type": "tidelift" } ], - "time": "2024-07-17T06:10:24+00:00" + "time": "2024-09-26T08:57:56+00:00" }, { "name": "symfony/routing", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0" + "reference": "b9f47730638e96d6ff26f84bd4a7e89073d15634" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8a908a3f22d5a1b5d297578c2ceb41b02fa916d0", - "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0", + "url": "https://api.github.com/repos/symfony/routing/zipball/b9f47730638e96d6ff26f84bd4a7e89073d15634", + "reference": "b9f47730638e96d6ff26f84bd4a7e89073d15634", "shasum": "" }, "require": { @@ -3725,7 +3725,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.1.3" + "source": "https://github.com/symfony/routing/tree/v7.2.0-BETA1" }, "funding": [ { @@ -3741,20 +3741,20 @@ "type": "tidelift" } ], - "time": "2024-07-17T06:10:24+00:00" + "time": "2024-10-03T12:20:01+00:00" }, { "name": "symfony/serializer", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09" + "reference": "56bcd41f8e8792b15ca363b730e26c7c536a7873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09", - "reference": "0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09", + "url": "https://api.github.com/repos/symfony/serializer/zipball/56bcd41f8e8792b15ca363b730e26c7c536a7873", + "reference": "56bcd41f8e8792b15ca363b730e26c7c536a7873", "shasum": "" }, "require": { @@ -3768,17 +3768,19 @@ "symfony/dependency-injection": "<6.4", "symfony/property-access": "<6.4", "symfony/property-info": "<6.4", + "symfony/type-info": "<7.1.5", "symfony/uid": "<6.4", "symfony/validator": "<6.4", "symfony/yaml": "<6.4" }, "require-dev": { "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", + "phpstan/phpdoc-parser": "^1.0", "seld/jsonlint": "^1.10", "symfony/cache": "^6.4|^7.0", "symfony/config": "^6.4|^7.0", "symfony/console": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dependency-injection": "^7.2", "symfony/error-handler": "^6.4|^7.0", "symfony/filesystem": "^6.4|^7.0", "symfony/form": "^6.4|^7.0", @@ -3789,7 +3791,7 @@ "symfony/property-access": "^6.4|^7.0", "symfony/property-info": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3", - "symfony/type-info": "^7.1", + "symfony/type-info": "^7.1.5", "symfony/uid": "^6.4|^7.0", "symfony/validator": "^6.4|^7.0", "symfony/var-dumper": "^6.4|^7.0", @@ -3822,7 +3824,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v7.1.3" + "source": "https://github.com/symfony/serializer/tree/v7.2.0-BETA1" }, "funding": [ { @@ -3838,7 +3840,7 @@ "type": "tidelift" } ], - "time": "2024-07-17T06:10:24+00:00" + "time": "2024-10-22T19:37:21+00:00" }, { "name": "symfony/service-contracts", @@ -3925,16 +3927,16 @@ }, { "name": "symfony/string", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306" + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306", - "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306", + "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", "shasum": "" }, "require": { @@ -3992,7 +3994,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.5" + "source": "https://github.com/symfony/string/tree/v7.1.6" }, "funding": [ { @@ -4008,7 +4010,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:28:38+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/translation-contracts", @@ -4090,16 +4092,16 @@ }, { "name": "symfony/validator", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "ba711a6cfc008544dad059abb3c1d997f1472237" + "reference": "8392b9bafbfed3c166a979ac0bd8a3186abb8e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/ba711a6cfc008544dad059abb3c1d997f1472237", - "reference": "ba711a6cfc008544dad059abb3c1d997f1472237", + "url": "https://api.github.com/repos/symfony/validator/zipball/8392b9bafbfed3c166a979ac0bd8a3186abb8e75", + "reference": "8392b9bafbfed3c166a979ac0bd8a3186abb8e75", "shasum": "" }, "require": { @@ -4167,7 +4169,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v7.1.3" + "source": "https://github.com/symfony/validator/tree/v7.2.0-BETA1" }, "funding": [ { @@ -4183,20 +4185,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.1.3", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f" + "reference": "b86ce1b5bb196cfb3796856979167271d3989c7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/86af4617cca75a6e28598f49ae0690f3b9d4591f", - "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b86ce1b5bb196cfb3796856979167271d3989c7c", + "reference": "b86ce1b5bb196cfb3796856979167271d3989c7c", "shasum": "" }, "require": { @@ -4212,7 +4214,7 @@ "symfony/http-kernel": "^6.4|^7.0", "symfony/process": "^6.4|^7.0", "symfony/uid": "^6.4|^7.0", - "twig/twig": "^3.0.4" + "twig/twig": "^3.12" }, "bin": [ "Resources/bin/var-dump-server" @@ -4250,7 +4252,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.1.3" + "source": "https://github.com/symfony/var-dumper/tree/v7.2.0-BETA1" }, "funding": [ { @@ -4266,20 +4268,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-10-23T08:11:15+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.1.2", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "b80a669a2264609f07f1667f891dbfca25eba44c" + "reference": "90173ef89c40e7c8c616653241048705f84130ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c", - "reference": "b80a669a2264609f07f1667f891dbfca25eba44c", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/90173ef89c40e7c8c616653241048705f84130ef", + "reference": "90173ef89c40e7c8c616653241048705f84130ef", "shasum": "" }, "require": { @@ -4326,7 +4328,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.1.2" + "source": "https://github.com/symfony/var-exporter/tree/v7.1.6" }, "funding": [ { @@ -4342,24 +4344,25 @@ "type": "tidelift" } ], - "time": "2024-06-28T08:00:31+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/yaml", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "fa34c77015aa6720469db7003567b9f772492bf2" + "reference": "099581e99f557e9f16b43c5916c26380b54abb22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2", - "reference": "fa34c77015aa6720469db7003567b9f772492bf2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/099581e99f557e9f16b43c5916c26380b54abb22", + "reference": "099581e99f557e9f16b43c5916c26380b54abb22", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -4397,7 +4400,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.1.1" + "source": "https://github.com/symfony/yaml/tree/v7.2.0-BETA1" }, "funding": [ { @@ -4413,7 +4416,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "twig/twig", @@ -9049,16 +9052,16 @@ }, { "name": "symfony/browser-kit", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "9c13742e3175b5815e272b981876ae329bec2040" + "reference": "8d64d17e198082f8f198d023a6b634e7b5fdda94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9c13742e3175b5815e272b981876ae329bec2040", - "reference": "9c13742e3175b5815e272b981876ae329bec2040", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/8d64d17e198082f8f198d023a6b634e7b5fdda94", + "reference": "8d64d17e198082f8f198d023a6b634e7b5fdda94", "shasum": "" }, "require": { @@ -9097,7 +9100,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v7.1.1" + "source": "https://github.com/symfony/browser-kit/tree/v7.2.0-BETA1" }, "funding": [ { @@ -9113,20 +9116,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/css-selector", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4" + "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4", - "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2", + "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2", "shasum": "" }, "require": { @@ -9162,7 +9165,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.1.1" + "source": "https://github.com/symfony/css-selector/tree/v7.2.0-BETA1" }, "funding": [ { @@ -9178,20 +9181,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/dom-crawler", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "01ce8174447f1f1dd33a5854b01beef79061d9fa" + "reference": "3e838f9095f53f2b98287a361c1cdb68bbd3aa7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/01ce8174447f1f1dd33a5854b01beef79061d9fa", - "reference": "01ce8174447f1f1dd33a5854b01beef79061d9fa", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3e838f9095f53f2b98287a361c1cdb68bbd3aa7b", + "reference": "3e838f9095f53f2b98287a361c1cdb68bbd3aa7b", "shasum": "" }, "require": { @@ -9229,7 +9232,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v7.1.1" + "source": "https://github.com/symfony/dom-crawler/tree/v7.2.0-BETA1" }, "funding": [ { @@ -9245,20 +9248,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-10-25T15:15:23+00:00" }, { "name": "symfony/lock", - "version": "v7.1.1", + "version": "v7.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "1f8c941f1270dee046e09a826bcdd3b2ebada45e" + "reference": "07212a5994a30e3667e95e5b16b2dda0685aff84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/1f8c941f1270dee046e09a826bcdd3b2ebada45e", - "reference": "1f8c941f1270dee046e09a826bcdd3b2ebada45e", + "url": "https://api.github.com/repos/symfony/lock/zipball/07212a5994a30e3667e95e5b16b2dda0685aff84", + "reference": "07212a5994a30e3667e95e5b16b2dda0685aff84", "shasum": "" }, "require": { @@ -9307,7 +9310,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v7.1.1" + "source": "https://github.com/symfony/lock/tree/v7.2.0-BETA1" }, "funding": [ { @@ -9323,7 +9326,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-10-25T15:34:29+00:00" }, { "name": "theseer/tokenizer", @@ -9485,7 +9488,13 @@ "stability-flags": { "drupal/core": 20, "drupal/core-project-message": 20, - "drupal/core-vendor-hardening": 20 + "drupal/core-vendor-hardening": 20, + "symfony/browser-kit": 10, + "symfony/css-selector": 10, + "symfony/dom-crawler": 10, + "symfony/error-handler": 10, + "symfony/lock": 10, + "symfony/var-dumper": 10 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index e2cc7f37e584..c22cecf1a85d 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -33,35 +33,35 @@ "ralouphie/getallheaders": "~3.0.3", "revolt/event-loop": "~v1.0.6", "sebastian/diff": "~5.1.1", - "symfony/console": "~v7.1.5", - "symfony/dependency-injection": "~v7.1.3", + "symfony/console": "~v7.2.0-BETA1", + "symfony/dependency-injection": "~v7.2.0-BETA1", "symfony/deprecation-contracts": "~v3.5.0", - "symfony/error-handler": "~v7.1.3", - "symfony/event-dispatcher": "~v7.1.1", + "symfony/error-handler": "~v7.2.0-BETA1", + "symfony/event-dispatcher": "~v7.2.0-BETA1", "symfony/event-dispatcher-contracts": "~v3.5.0", - "symfony/filesystem": "~v7.1.5", - "symfony/finder": "~v7.1.4", - "symfony/http-foundation": "~v7.1.3", - "symfony/http-kernel": "~v7.1.3", - "symfony/mailer": "~v7.1.2", - "symfony/mime": "~v7.1.2", + "symfony/filesystem": "~v7.2.0-BETA1", + "symfony/finder": "~v7.2.0-BETA1", + "symfony/http-foundation": "~v7.2.0-BETA1", + "symfony/http-kernel": "~v7.2.0-BETA1", + "symfony/mailer": "~v7.2.0-BETA1", + "symfony/mime": "~v7.2.0-BETA1", "symfony/polyfill-ctype": "~v1.31.0", - "symfony/polyfill-iconv": "~v1.30.0", + "symfony/polyfill-iconv": "~v1.31.0", "symfony/polyfill-intl-grapheme": "~v1.31.0", - "symfony/polyfill-intl-idn": "~v1.30.0", + "symfony/polyfill-intl-idn": "~v1.31.0", "symfony/polyfill-intl-normalizer": "~v1.31.0", "symfony/polyfill-mbstring": "~v1.31.0", - "symfony/process": "~v7.1.5", - "symfony/psr-http-message-bridge": "~v7.1.3", - "symfony/routing": "~v7.1.3", - "symfony/serializer": "~v7.1.3", + "symfony/process": "~v7.2.0-BETA1", + "symfony/psr-http-message-bridge": "~v7.2.0-BETA1", + "symfony/routing": "~v7.2.0-BETA1", + "symfony/serializer": "~v7.2.0-BETA1", "symfony/service-contracts": "~v3.5.0", - "symfony/string": "~v7.1.5", + "symfony/string": "~v7.1.6", "symfony/translation-contracts": "~v3.5.0", - "symfony/validator": "~v7.1.3", - "symfony/var-dumper": "~v7.1.3", - "symfony/var-exporter": "~v7.1.2", - "symfony/yaml": "~v7.1.1", + "symfony/validator": "~v7.2.0-BETA1", + "symfony/var-dumper": "~v7.2.0-BETA1", + "symfony/var-exporter": "~v7.1.6", + "symfony/yaml": "~v7.2.0-BETA1", "twig/twig": "~v3.14.0" } } diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index f9b4f4d99521..c79fc3b1f373 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -26,11 +26,11 @@ "phpstan/phpstan": "^1.12.4", "phpstan/phpstan-phpunit": "^1.3.16", "phpunit/phpunit": "^10.5.19", - "symfony/browser-kit": "^7.1", - "symfony/css-selector": "^7.1", - "symfony/dom-crawler": "^7.1", - "symfony/error-handler": "^7.1", - "symfony/lock": "^7.1", - "symfony/var-dumper": "^7.1" + "symfony/browser-kit": "^7.2@beta", + "symfony/css-selector": "^7.2@beta", + "symfony/dom-crawler": "^7.2@beta", + "symfony/error-handler": "^7.2@beta", + "symfony/lock": "^7.2@beta", + "symfony/var-dumper": "^7.2@beta" } } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 8680102902ef..4d4761d34ada 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -79,10 +79,10 @@ "sirbrillig/phpcs-variable-analysis": "v2.11.19", "slevomat/coding-standard": "8.15.0", "squizlabs/php_codesniffer": "3.10.2", - "symfony/browser-kit": "v7.1.1", - "symfony/css-selector": "v7.1.1", - "symfony/dom-crawler": "v7.1.1", - "symfony/lock": "v7.1.1", + "symfony/browser-kit": "v7.2.0-BETA1", + "symfony/css-selector": "v7.2.0-BETA1", + "symfony/dom-crawler": "v7.2.0-BETA1", + "symfony/lock": "v7.2.0-BETA1", "theseer/tokenizer": "1.2.3", "webflo/drupal-finder": "1.3.1", "webmozart/assert": "1.11.0" diff --git a/core/.deprecation-ignore.txt b/core/.deprecation-ignore.txt index d62f81789b3b..8bf5c29373cc 100644 --- a/core/.deprecation-ignore.txt +++ b/core/.deprecation-ignore.txt @@ -31,3 +31,7 @@ # Twig 3. %Since twig/twig 3.12: Twig Filter "spaceless" is deprecated% + +# Symfony 7.2 +%Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_length" option is deprecated and will be ignored in Symfony 8.0.% +%Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_bits_per_character" option is deprecated and will be ignored in Symfony 8.0.% diff --git a/core/assets/scaffold/files/default.services.yml b/core/assets/scaffold/files/default.services.yml index ba416885b93d..1243d0600898 100644 --- a/core/assets/scaffold/files/default.services.yml +++ b/core/assets/scaffold/files/default.services.yml @@ -51,23 +51,6 @@ parameters: # information. # @default no value cookie_samesite: Lax - # - # Set the session ID string length. The length can be between 22 to 256. The - # PHP recommended value is 48. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 48 - sid_length: 48 - # - # Set the number of bits in encoded session ID character. The possible - # values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", - # ","). The PHP recommended value is 6. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 6 - sid_bits_per_character: 6 # By default, Drupal generates a session cookie name based on the full # domain name. Set the name_suffix to a short random string to ensure this # session cookie name is unique on different installations on the same diff --git a/core/composer.json b/core/composer.json index d8b918d3f8d4..55a7948c1e34 100644 --- a/core/composer.json +++ b/core/composer.json @@ -19,21 +19,21 @@ "ext-xml": "*", "ext-zlib": "*", "php": ">=8.3.0", - "symfony/console": "^7.1", - "symfony/dependency-injection": "^7.1", - "symfony/event-dispatcher": "^7.1", - "symfony/filesystem": "^7.1", - "symfony/finder": "^7.1", - "symfony/http-foundation": "^7.1", - "symfony/http-kernel": "^7.1", - "symfony/mailer": "^7.1", - "symfony/mime": "^7.1", - "symfony/routing": "^7.1", - "symfony/serializer": "^7.1", - "symfony/validator": "^7.1", - "symfony/process": "^7.1", + "symfony/console": "^7.2@beta", + "symfony/dependency-injection": "^7.2@beta", + "symfony/event-dispatcher": "^7.2@beta", + "symfony/filesystem": "^7.2@beta", + "symfony/finder": "^7.2@beta", + "symfony/http-foundation": "^7.2@beta", + "symfony/http-kernel": "^7.2@beta", + "symfony/mailer": "^7.2@beta", + "symfony/mime": "^7.2@beta", + "symfony/routing": "^7.2@beta", + "symfony/serializer": "^7.2@beta", + "symfony/validator": "^7.2@beta", + "symfony/process": "^7.2@beta", "symfony/polyfill-iconv": "^1.26", - "symfony/yaml": "^7.1", + "symfony/yaml": "^7.2@beta", "revolt/event-loop": "^1.0", "twig/twig": "^3.14.0", "doctrine/annotations": "^2.0", @@ -42,7 +42,7 @@ "guzzlehttp/psr7": "^2.4.5", "egulias/email-validator": "^3.2.1|^4.0", "masterminds/html5": "^2.7", - "symfony/psr-http-message-bridge": "^7.1", + "symfony/psr-http-message-bridge": "^7.2@beta", "composer-runtime-api": "^2.1", "composer/semver": "^3.3", "asm89/stack-cors": "^2.1", diff --git a/core/core.services.yml b/core/core.services.yml index 0ecb95d3cb27..78f26e4ac51f 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -15,8 +15,6 @@ parameters: gc_maxlifetime: 200000 cookie_lifetime: 2000000 cookie_samesite: Lax - sid_length: 48 - sid_bits_per_character: 6 name_suffix: '' twig.config: debug: false diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index bc9edd4e8a2c..4dfe0f4b6522 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -14,7 +14,7 @@ }, "require": { "php": ">=8.3.0", - "symfony/dependency-injection": "^7.1", + "symfony/dependency-injection": "^7.2@beta", "symfony/service-contracts": "v3.5.0" }, "suggest": { diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json index a4a011470b50..6f9c7217d536 100644 --- a/core/lib/Drupal/Component/EventDispatcher/composer.json +++ b/core/lib/Drupal/Component/EventDispatcher/composer.json @@ -8,8 +8,8 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.3.0", - "symfony/dependency-injection": "^7.1", - "symfony/event-dispatcher": "^7.1", + "symfony/dependency-injection": "^7.2@beta", + "symfony/event-dispatcher": "^7.2@beta", "symfony/event-dispatcher-contracts": "v3.5.0" }, "autoload": { diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json index 20e011f744f3..8c694b5f103e 100644 --- a/core/lib/Drupal/Component/HttpFoundation/composer.json +++ b/core/lib/Drupal/Component/HttpFoundation/composer.json @@ -8,7 +8,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.3.0", - "symfony/http-foundation": "^7.1" + "symfony/http-foundation": "^7.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json index 56c34c6f1f19..6aabee9f7f54 100644 --- a/core/lib/Drupal/Component/Plugin/composer.json +++ b/core/lib/Drupal/Component/Plugin/composer.json @@ -10,7 +10,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.3.0", - "symfony/validator": "^7.1" + "symfony/validator": "^7.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json index f5e45290297d..f5cd0469b713 100644 --- a/core/lib/Drupal/Component/Serialization/composer.json +++ b/core/lib/Drupal/Component/Serialization/composer.json @@ -8,7 +8,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.3.0", - "symfony/yaml": "^7.1" + "symfony/yaml": "^7.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index eac20b25be40..959ca643c44f 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -120,6 +120,17 @@ public function register(ContainerBuilder $container) { $container->registerForAutoconfiguration(ModuleUninstallValidatorInterface::class) ->addTag('module_install.uninstall_validator'); + + // Deprecated parameters. + if ($container->hasParameter('session.storage.options')) { + $session_storage_options = $container->getParameter('session.storage.options'); + if (array_key_exists('sid_length', $session_storage_options)) { + @trigger_error('The "sid_length" parameter is deprecated in drupal:11.1.0 and will be removed in drupal:12.0.0. This setting should be removed from the settings file, since its usage has been removed. See https://www.drupal.org/node/3469305', E_USER_DEPRECATED); + } + if (array_key_exists('sid_bits_per_character', $session_storage_options)) { + @trigger_error('The "sid_bits_per_character" parameter is deprecated in drupal:11.1.0 and will be removed in drupal:12.0.0. This setting should be removed from the settings file, since its usage has been removed. See https://www.drupal.org/node/3469305', E_USER_DEPRECATED); + } + } } /** diff --git a/core/lib/Drupal/Core/Session/SessionConfiguration.php b/core/lib/Drupal/Core/Session/SessionConfiguration.php index 1d98facb2db8..9f127db61a9a 100644 --- a/core/lib/Drupal/Core/Session/SessionConfiguration.php +++ b/core/lib/Drupal/Core/Session/SessionConfiguration.php @@ -25,12 +25,9 @@ class SessionConfiguration implements SessionConfigurationInterface { * @see https://www.php.net/manual/session.security.ini.php */ public function __construct($options = []) { - // Provide sensible defaults for sid_length, sid_bits_per_character and - // name_suffix. + // Provide sensible defaults for name_suffix. // @see core/assets/scaffold/files/default.services.yml $this->options = $options + [ - 'sid_length' => 48, - 'sid_bits_per_character' => 6, 'name_suffix' => '', ]; } @@ -58,10 +55,6 @@ public function getOptions(Request $request) { // Set the session cookie name. $options['name'] = $this->getName($request); - if (\PHP_VERSION_ID >= 80400) { - // See https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character - unset($options['sid_length'], $options['sid_bits_per_character']); - } return $options; } diff --git a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php index 68a1d9a83bfa..d444f5f72fb6 100644 --- a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php +++ b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php @@ -32,7 +32,7 @@ class ComposerProjectTemplatesTest extends ComposerBuildTestBase { * * @see https://getcomposer.org/doc/04-schema.md#minimum-stability */ - protected const MINIMUM_STABILITY = 'RC'; + protected const MINIMUM_STABILITY = 'beta'; /** * The order of stability strings from least stable to most stable. diff --git a/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php b/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php index dfb5922a9f85..a68788cc4773 100644 --- a/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php +++ b/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php @@ -263,37 +263,15 @@ public static function providerTestEnforcedSessionName() { * Tests constructor's default settings. * * @covers ::__construct - * - * @dataProvider providerTestConstructorDefaultSettings */ - public function testConstructorDefaultSettings(array $options, int $expected_sid_length, int $expected_sid_bits_per_character, string $expected_name_suffix): void { - $config = $this->createSessionConfiguration($options); + public function testConstructorDefaultSettings(): void { + $config = $this->createSessionConfiguration([]); $options = $config->getOptions(Request::createFromGlobals()); - if (\PHP_VERSION_ID >= 80400) { - $this->assertArrayNotHasKey('sid_length', $options); - $this->assertArrayNotHasKey('sid_bits_per_character', $options); - } - else { - $this->assertSame($expected_sid_length, $options['sid_length']); - $this->assertSame($expected_sid_bits_per_character, $options['sid_bits_per_character']); - } - $this->assertSame($expected_name_suffix, $options['name_suffix']); - } + $this->assertSame('', $options['name_suffix']); - /** - * Data provider for the constructor test. - * - * @return array - * Test data - */ - public static function providerTestConstructorDefaultSettings() { - return [ - [[], 48, 6, ''], - [['sid_length' => 100], 100, 6, ''], - [['sid_bits_per_character' => 5], 48, 5, ''], - [['name_suffix' => 'some-suffix'], 48, 6, 'some-suffix'], - [['sid_length' => 100, 'sid_bits_per_character' => 5, 'name_suffix' => 'some-suffix'], 100, 5, 'some-suffix'], - ]; + $config = $this->createSessionConfiguration(['name_suffix' => 'some-suffix']); + $options = $config->getOptions(Request::createFromGlobals()); + $this->assertSame('some-suffix', $options['name_suffix']); } } diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml index ba416885b93d..1243d0600898 100644 --- a/sites/default/default.services.yml +++ b/sites/default/default.services.yml @@ -51,23 +51,6 @@ parameters: # information. # @default no value cookie_samesite: Lax - # - # Set the session ID string length. The length can be between 22 to 256. The - # PHP recommended value is 48. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 48 - sid_length: 48 - # - # Set the number of bits in encoded session ID character. The possible - # values are '4' (0-9, a-f), '5' (0-9, a-v), and '6' (0-9, a-z, A-Z, "-", - # ","). The PHP recommended value is 6. See - # https://www.php.net/manual/session.security.ini.php for more information. - # This value should be kept in sync with - # \Drupal\Core\Session\SessionConfiguration::__construct() - # @default 6 - sid_bits_per_character: 6 # By default, Drupal generates a session cookie name based on the full # domain name. Set the name_suffix to a short random string to ensure this # session cookie name is unique on different installations on the same -- GitLab