diff --git a/composer.json b/composer.json index 6db2ddef2fc..cbbef47ec58 100644 --- a/composer.json +++ b/composer.json @@ -27,16 +27,16 @@ "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8.11", - "symfony/css-selector": "^6.2@beta", - "symfony/phpunit-bridge": "^6.2@beta", - "symfony/var-dumper": "^6.2@beta", - "symfony/error-handler": "^6.2@beta", + "symfony/css-selector": "^6.2@RC", + "symfony/phpunit-bridge": "^6.2@RC", + "symfony/var-dumper": "^6.2@RC", + "symfony/error-handler": "^6.2@RC", "justinrainbow/json-schema": "^5.2", - "symfony/filesystem": "^6.2@beta", - "symfony/finder": "^6.2@beta", - "symfony/lock": "^6.2@beta", - "symfony/browser-kit": "^6.2@beta", - "symfony/dom-crawler": "^6.2@beta" + "symfony/filesystem": "^6.2@RC", + "symfony/finder": "^6.2@RC", + "symfony/lock": "^6.2@RC", + "symfony/browser-kit": "^6.2@RC", + "symfony/dom-crawler": "^6.2@RC" }, "replace": { "symfony/polyfill-php72": "*", diff --git a/composer.lock b/composer.lock index b08cbc9ede8..8a82a056451 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": "ef033ef4a1da6243f950b37a7e6b7267", + "content-hash": "3ff4c0eee56feed7113d52f6274f3a80", "packages": [ { "name": "asm89/stack-cors", @@ -443,7 +443,7 @@ "dist": { "type": "path", "url": "core", - "reference": "7f3a4442b8f97a22b50998a09c3d0d0a56725fc0" + "reference": "2e2c0e07632321dd19cebcc3fc765339020b22b0" }, "require": { "asm89/stack-cors": "^2.1", @@ -470,19 +470,19 @@ "pear/archive_tar": "^1.4.14", "php": ">=8.1.0", "psr/log": "^3.0", - "symfony/console": "^6.2@beta", - "symfony/dependency-injection": "^6.2@beta", - "symfony/event-dispatcher": "^6.2@beta", - "symfony/http-foundation": "^6.2@beta", - "symfony/http-kernel": "^6.2@beta", - "symfony/mime": "^6.2@beta", + "symfony/console": "^6.2@RC", + "symfony/dependency-injection": "^6.2@RC", + "symfony/event-dispatcher": "^6.2@RC", + "symfony/http-foundation": "^6.2@RC", + "symfony/http-kernel": "^6.2@RC", + "symfony/mime": "^6.2@RC", "symfony/polyfill-iconv": "^1.26", - "symfony/process": "^6.2@beta", + "symfony/process": "^6.2@RC", "symfony/psr-http-message-bridge": "^2.1", - "symfony/routing": "^6.2@beta", - "symfony/serializer": "^6.2@beta", - "symfony/validator": "^6.2@beta", - "symfony/yaml": "^6.2@beta", + "symfony/routing": "^6.2@RC", + "symfony/serializer": "^6.2@RC", + "symfony/validator": "^6.2@RC", + "symfony/yaml": "^6.2@RC", "twig/twig": "^3.4.3" }, "conflict": { @@ -1772,16 +1772,16 @@ }, { "name": "symfony/console", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1aab3877cc61fef7799e206e6f15c4c55431c97e" + "reference": "42af19c215b34d1f619a499ca2b2ba549af19490" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1aab3877cc61fef7799e206e6f15c4c55431c97e", - "reference": "1aab3877cc61fef7799e206e6f15c4c55431c97e", + "url": "https://api.github.com/repos/symfony/console/zipball/42af19c215b34d1f619a499ca2b2ba549af19490", + "reference": "42af19c215b34d1f619a499ca2b2ba549af19490", "shasum": "" }, "require": { @@ -1848,7 +1848,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/console/tree/v6.2.0-RC1" }, "funding": [ { @@ -1864,20 +1864,20 @@ "type": "tidelift" } ], - "time": "2022-11-19T14:35:57+00:00" + "time": "2022-11-20T18:39:20+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "c801a397733a15b10b5cdd1c7a2e21e111651b08" + "reference": "bb328032f400961be5db5aed87fac9742b506f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c801a397733a15b10b5cdd1c7a2e21e111651b08", - "reference": "c801a397733a15b10b5cdd1c7a2e21e111651b08", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bb328032f400961be5db5aed87fac9742b506f80", + "reference": "bb328032f400961be5db5aed87fac9742b506f80", "shasum": "" }, "require": { @@ -1936,7 +1936,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/dependency-injection/tree/v6.2.0-RC1" }, "funding": [ { @@ -1952,7 +1952,7 @@ "type": "tidelift" } ], - "time": "2022-11-04T07:42:34+00:00" + "time": "2022-11-25T07:37:13+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2023,7 +2023,7 @@ }, { "name": "symfony/error-handler", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -2074,7 +2074,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/error-handler/tree/v6.2.0-RC1" }, "funding": [ { @@ -2094,7 +2094,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -2157,7 +2157,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.0-RC1" }, "funding": [ { @@ -2256,16 +2256,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "0a16914416be11e2c9c739b3647959a64813704e" + "reference": "edc56ed49a2955383d59e9b7043fd3bbc26f1854" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0a16914416be11e2c9c739b3647959a64813704e", - "reference": "0a16914416be11e2c9c739b3647959a64813704e", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/edc56ed49a2955383d59e9b7043fd3bbc26f1854", + "reference": "edc56ed49a2955383d59e9b7043fd3bbc26f1854", "shasum": "" }, "require": { @@ -2314,7 +2314,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.2.0-BETA3" + "source": "https://github.com/symfony/http-foundation/tree/v6.2.0-RC1" }, "funding": [ { @@ -2330,20 +2330,20 @@ "type": "tidelift" } ], - "time": "2022-11-07T08:07:50+00:00" + "time": "2022-11-21T16:03:04+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "0c6dff149ac84b4217251d3acb83f3a648624644" + "reference": "74aef2fce3af211cced5ec6425123bbcebd81da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0c6dff149ac84b4217251d3acb83f3a648624644", - "reference": "0c6dff149ac84b4217251d3acb83f3a648624644", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/74aef2fce3af211cced5ec6425123bbcebd81da6", + "reference": "74aef2fce3af211cced5ec6425123bbcebd81da6", "shasum": "" }, "require": { @@ -2425,7 +2425,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/http-kernel/tree/v6.2.0-RC1" }, "funding": [ { @@ -2441,11 +2441,11 @@ "type": "tidelift" } ], - "time": "2022-11-19T16:12:11+00:00" + "time": "2022-11-25T10:37:29+00:00" }, { "name": "symfony/mime", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -2508,7 +2508,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/mime/tree/v6.2.0-RC1" }, "funding": [ { @@ -3028,7 +3028,7 @@ }, { "name": "symfony/process", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -3069,7 +3069,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/process/tree/v6.2.0-RC1" }, "funding": [ { @@ -3177,7 +3177,7 @@ }, { "name": "symfony/routing", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -3245,7 +3245,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/routing/tree/v6.2.0-RC1" }, "funding": [ { @@ -3265,7 +3265,7 @@ }, { "name": "symfony/serializer", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", @@ -3346,7 +3346,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/v6.2.0-BETA3" + "source": "https://github.com/symfony/serializer/tree/v6.2.0-RC1" }, "funding": [ { @@ -3617,16 +3617,16 @@ }, { "name": "symfony/validator", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "a0af554bd40c4919e6fa963f2fe2db550aeb4f40" + "reference": "0f74ad1cab71f5899dca8233db774a50f8656de0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/a0af554bd40c4919e6fa963f2fe2db550aeb4f40", - "reference": "a0af554bd40c4919e6fa963f2fe2db550aeb4f40", + "url": "https://api.github.com/repos/symfony/validator/zipball/0f74ad1cab71f5899dca8233db774a50f8656de0", + "reference": "0f74ad1cab71f5899dca8233db774a50f8656de0", "shasum": "" }, "require": { @@ -3705,7 +3705,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/validator/tree/v6.2.0-RC1" }, "funding": [ { @@ -3721,11 +3721,11 @@ "type": "tidelift" } ], - "time": "2022-11-09T13:47:29+00:00" + "time": "2022-11-25T08:42:40+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -3793,7 +3793,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.0-RC1" }, "funding": [ { @@ -3813,16 +3813,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "9fc43ea2cf5114c40bd2bf3140bdda98c76d565f" + "reference": "0437f26ca0c648071cc15ddacd26152cc65f4cd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/9fc43ea2cf5114c40bd2bf3140bdda98c76d565f", - "reference": "9fc43ea2cf5114c40bd2bf3140bdda98c76d565f", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0437f26ca0c648071cc15ddacd26152cc65f4cd6", + "reference": "0437f26ca0c648071cc15ddacd26152cc65f4cd6", "shasum": "" }, "require": { @@ -3867,7 +3867,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/var-exporter/tree/v6.2.0-RC1" }, "funding": [ { @@ -3883,11 +3883,11 @@ "type": "tidelift" } ], - "time": "2022-11-13T14:45:12+00:00" + "time": "2022-11-25T08:33:31+00:00" }, { "name": "symfony/yaml", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -3941,7 +3941,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/yaml/tree/v6.2.0-RC1" }, "funding": [ { @@ -7731,7 +7731,7 @@ }, { "name": "symfony/browser-kit", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -7782,7 +7782,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/v6.2.0-BETA3" + "source": "https://github.com/symfony/browser-kit/tree/v6.2.0-RC1" }, "funding": [ { @@ -7802,7 +7802,7 @@ }, { "name": "symfony/css-selector", - "version": "v6.2.0-BETA1", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -7847,7 +7847,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.2.0-BETA1" + "source": "https://github.com/symfony/css-selector/tree/v6.2.0-RC1" }, "funding": [ { @@ -7867,7 +7867,7 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -7917,7 +7917,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/dom-crawler/tree/v6.2.0-RC1" }, "funding": [ { @@ -7937,16 +7937,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.2.0-BETA1", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ccff5f36c85e6b4cf8a1be196273f06dd87930bd" + "reference": "50b2523c874605cf3d4acf7a9e2b30b6a440a016" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ccff5f36c85e6b4cf8a1be196273f06dd87930bd", - "reference": "ccff5f36c85e6b4cf8a1be196273f06dd87930bd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/50b2523c874605cf3d4acf7a9e2b30b6a440a016", + "reference": "50b2523c874605cf3d4acf7a9e2b30b6a440a016", "shasum": "" }, "require": { @@ -7980,7 +7980,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.2.0-BETA1" + "source": "https://github.com/symfony/filesystem/tree/v6.2.0-RC1" }, "funding": [ { @@ -7996,11 +7996,11 @@ "type": "tidelift" } ], - "time": "2022-09-21T20:30:19+00:00" + "time": "2022-11-20T13:01:27+00:00" }, { "name": "symfony/finder", - "version": "v6.2.0-BETA1", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -8044,7 +8044,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.2.0-BETA1" + "source": "https://github.com/symfony/finder/tree/v6.2.0-RC1" }, "funding": [ { @@ -8064,7 +8064,7 @@ }, { "name": "symfony/lock", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", @@ -8122,7 +8122,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/lock/tree/v6.2.0-RC1" }, "funding": [ { @@ -8142,16 +8142,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.2.0-BETA3", + "version": "v6.2.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "099fc6c8bbd5bf0cecc42374c8713a1783601f74" + "reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/099fc6c8bbd5bf0cecc42374c8713a1783601f74", - "reference": "099fc6c8bbd5bf0cecc42374c8713a1783601f74", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1bd3b17db6d2ec284efbdc916600e880d6d858df", + "reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df", "shasum": "" }, "require": { @@ -8205,7 +8205,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.0-BETA3" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.0-RC1" }, "funding": [ { @@ -8221,7 +8221,7 @@ "type": "tidelift" } ], - "time": "2022-11-14T10:13:36+00:00" + "time": "2022-11-18T19:08:09+00:00" }, { "name": "theseer/tokenizer", @@ -8382,15 +8382,15 @@ "drupal/core": 20, "drupal/core-project-message": 20, "drupal/core-vendor-hardening": 20, - "symfony/css-selector": 10, - "symfony/phpunit-bridge": 10, - "symfony/var-dumper": 10, - "symfony/error-handler": 10, - "symfony/filesystem": 10, - "symfony/finder": 10, - "symfony/lock": 10, - "symfony/browser-kit": 10, - "symfony/dom-crawler": 10 + "symfony/css-selector": 5, + "symfony/phpunit-bridge": 5, + "symfony/var-dumper": 5, + "symfony/error-handler": 5, + "symfony/filesystem": 5, + "symfony/finder": 5, + "symfony/lock": 5, + "symfony/browser-kit": 5, + "symfony/dom-crawler": 5 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/composer/Composer.php b/composer/Composer.php index 448e5d8ad38..68222ae3e6c 100644 --- a/composer/Composer.php +++ b/composer/Composer.php @@ -79,13 +79,6 @@ class Composer { protected static function setTemplateProjectStability(string $root, string $version): void { $stability = VersionParser::parseStability($version); - // Drupal 10.0.0-RC1 is being released before Symfony 6.2.0-RC1, so - // temporarily set the stability to beta instead of RC. - // @todo Remove this after Symfony 6.2.0-RC1 is released. - if (str_starts_with($version, '10.0.0-') && ($stability === 'RC')) { - $stability = 'beta'; - } - $templateProjectPaths = static::composerSubprojectPaths($root, 'Template'); foreach ($templateProjectPaths as $path) { $dir = dirname($path); diff --git a/composer/Generator/ComponentGenerator.php b/composer/Generator/ComponentGenerator.php index dc521d954c7..c82468cbe7b 100644 --- a/composer/Generator/ComponentGenerator.php +++ b/composer/Generator/ComponentGenerator.php @@ -150,13 +150,6 @@ class ComponentGenerator { $stability = VersionParser::parseStability(\Drupal::VERSION); - // Drupal 10.0.0-RC1 is being released before Symfony 6.2.0-RC1, so - // temporarily set the stability to beta instead of RC. - // @todo Remove this after Symfony 6.2.0-RC1 is released. - if (str_starts_with(\Drupal::VERSION, '10.0.0-') && ($stability === 'RC')) { - $stability = 'beta'; - } - // List of packages which we didn't find in either core requirement. $not_in_core = []; diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 06354afa03b..438e7d0c8ac 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -29,32 +29,32 @@ "psr/http-message": "~1.0.1", "psr/log": "~3.0.0", "ralouphie/getallheaders": "~3.0.3", - "symfony/console": "~v6.2.0-BETA3", - "symfony/dependency-injection": "~v6.2.0-BETA3", + "symfony/console": "~v6.2.0-RC1", + "symfony/dependency-injection": "~v6.2.0-RC1", "symfony/deprecation-contracts": "~v3.1.1", - "symfony/error-handler": "~v6.2.0-BETA3", - "symfony/event-dispatcher": "~v6.2.0-BETA3", + "symfony/error-handler": "~v6.2.0-RC1", + "symfony/event-dispatcher": "~v6.2.0-RC1", "symfony/event-dispatcher-contracts": "~v3.1.1", - "symfony/http-foundation": "~v6.2.0-BETA3", - "symfony/http-kernel": "~v6.2.0-BETA3", - "symfony/mime": "~v6.2.0-BETA3", + "symfony/http-foundation": "~v6.2.0-RC1", + "symfony/http-kernel": "~v6.2.0-RC1", + "symfony/mime": "~v6.2.0-RC1", "symfony/polyfill-ctype": "~v1.27.0", "symfony/polyfill-iconv": "~v1.27.0", "symfony/polyfill-intl-grapheme": "~v1.27.0", "symfony/polyfill-intl-idn": "~v1.27.0", "symfony/polyfill-intl-normalizer": "~v1.27.0", "symfony/polyfill-mbstring": "~v1.27.0", - "symfony/process": "~v6.2.0-BETA3", + "symfony/process": "~v6.2.0-RC1", "symfony/psr-http-message-bridge": "~v2.1.3", - "symfony/routing": "~v6.2.0-BETA3", - "symfony/serializer": "~v6.2.0-BETA3", + "symfony/routing": "~v6.2.0-RC1", + "symfony/serializer": "~v6.2.0-RC1", "symfony/service-contracts": "~v3.1.1", "symfony/string": "~v6.1.7", "symfony/translation-contracts": "~v3.1.1", - "symfony/validator": "~v6.2.0-BETA3", - "symfony/var-dumper": "~v6.2.0-BETA3", - "symfony/var-exporter": "~v6.2.0-BETA3", - "symfony/yaml": "~v6.2.0-BETA3", + "symfony/validator": "~v6.2.0-RC1", + "symfony/var-dumper": "~v6.2.0-RC1", + "symfony/var-exporter": "~v6.2.0-RC1", + "symfony/yaml": "~v6.2.0-RC1", "twig/twig": "~v3.4.3" } } diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index f19961dc8d5..5ccf4028879 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -20,14 +20,14 @@ "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8.11", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^6.2@beta", - "symfony/css-selector": "^6.2@beta", - "symfony/dom-crawler": "^6.2@beta", - "symfony/error-handler": "^6.2@beta", - "symfony/filesystem": "^6.2@beta", - "symfony/finder": "^6.2@beta", - "symfony/lock": "^6.2@beta", - "symfony/phpunit-bridge": "^6.2@beta", - "symfony/var-dumper": "^6.2@beta" + "symfony/browser-kit": "^6.2@RC", + "symfony/css-selector": "^6.2@RC", + "symfony/dom-crawler": "^6.2@RC", + "symfony/error-handler": "^6.2@RC", + "symfony/filesystem": "^6.2@RC", + "symfony/finder": "^6.2@RC", + "symfony/lock": "^6.2@RC", + "symfony/phpunit-bridge": "^6.2@RC", + "symfony/var-dumper": "^6.2@RC" } } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 9735f5f4227..443f8d28aad 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -66,13 +66,13 @@ "sirbrillig/phpcs-variable-analysis": "v2.11.9", "slevomat/coding-standard": "8.6.2", "squizlabs/php_codesniffer": "3.7.1", - "symfony/browser-kit": "v6.2.0-BETA3", - "symfony/css-selector": "v6.2.0-BETA1", - "symfony/dom-crawler": "v6.2.0-BETA3", - "symfony/filesystem": "v6.2.0-BETA1", - "symfony/finder": "v6.2.0-BETA1", - "symfony/lock": "v6.2.0-BETA3", - "symfony/phpunit-bridge": "v6.2.0-BETA3", + "symfony/browser-kit": "v6.2.0-RC1", + "symfony/css-selector": "v6.2.0-RC1", + "symfony/dom-crawler": "v6.2.0-RC1", + "symfony/filesystem": "v6.2.0-RC1", + "symfony/finder": "v6.2.0-RC1", + "symfony/lock": "v6.2.0-RC1", + "symfony/phpunit-bridge": "v6.2.0-RC1", "theseer/tokenizer": "1.2.1", "webflo/drupal-finder": "1.2.2", "webmozart/assert": "1.11.0" diff --git a/core/composer.json b/core/composer.json index 621fe433634..af8412a8b54 100644 --- a/core/composer.json +++ b/core/composer.json @@ -18,18 +18,18 @@ "ext-tokenizer": "*", "ext-xml": "*", "php": ">=8.1.0", - "symfony/console": "^6.2@beta", - "symfony/dependency-injection": "^6.2@beta", - "symfony/event-dispatcher": "^6.2@beta", - "symfony/http-foundation": "^6.2@beta", - "symfony/http-kernel": "^6.2@beta", - "symfony/mime": "^6.2@beta", - "symfony/routing": "^6.2@beta", - "symfony/serializer": "^6.2@beta", - "symfony/validator": "^6.2@beta", - "symfony/process": "^6.2@beta", + "symfony/console": "^6.2@RC", + "symfony/dependency-injection": "^6.2@RC", + "symfony/event-dispatcher": "^6.2@RC", + "symfony/http-foundation": "^6.2@RC", + "symfony/http-kernel": "^6.2@RC", + "symfony/mime": "^6.2@RC", + "symfony/routing": "^6.2@RC", + "symfony/serializer": "^6.2@RC", + "symfony/validator": "^6.2@RC", + "symfony/process": "^6.2@RC", "symfony/polyfill-iconv": "^1.26", - "symfony/yaml": "^6.2@beta", + "symfony/yaml": "^6.2@RC", "twig/twig": "^3.4.3", "doctrine/annotations": "^1.13", "guzzlehttp/guzzle": "^7.5", diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index 59235e5de50..4eede4a7b71 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -14,7 +14,7 @@ }, "require": { "php": ">=8.1.0", - "symfony/dependency-injection": "^6.2@beta", + "symfony/dependency-injection": "^6.2@RC", "symfony/service-contracts": "v3.1.1" }, "suggest": { diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json index 98890cca7dd..6d970908a51 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.1.0", - "symfony/dependency-injection": "^6.2@beta", - "symfony/event-dispatcher": "^6.2@beta", + "symfony/dependency-injection": "^6.2@RC", + "symfony/event-dispatcher": "^6.2@RC", "symfony/event-dispatcher-contracts": "v3.1.1" }, "autoload": { diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json index 52773647812..6a77b9da928 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.1.0", - "symfony/http-foundation": "^6.2@beta" + "symfony/http-foundation": "^6.2@RC" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json index 7102f0953e5..e4f4cb69e48 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.1.0", - "symfony/validator": "^6.2@beta" + "symfony/validator": "^6.2@RC" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json index 67f2798921c..baf6653a9e6 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.1.0", - "symfony/yaml": "^6.2@beta" + "symfony/yaml": "^6.2@RC" }, "autoload": { "psr-4": { diff --git a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php index f24a2b53e3e..da9d4a2c546 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 = 'beta'; + protected const MINIMUM_STABILITY = 'RC'; /** * The order of stability strings from least stable to most stable. @@ -86,19 +86,10 @@ class ComposerProjectTemplatesTest extends ComposerBuildTestBase { * Make sure that static::MINIMUM_STABILITY is sufficiently strict. */ public function testMinimumStabilityStrictness() { - $minimum_minimum_stability = $this->getCoreStability(); - - // Drupal 10.0.0-RC1 is being released before Symfony 6.2.0-RC1, so - // temporarily set minimum_minimum_stability to beta instead of RC. - // @todo Remove this after Symfony 6.2.0-RC1 is released. - if (str_starts_with(\Drupal::VERSION, '10.0.0-') && ($minimum_minimum_stability === 'RC')) { - $minimum_minimum_stability = 'beta'; - } - // Ensure that static::MINIMUM_STABILITY is not less stable than the // current core stability. For example, if we've already released a beta on // the branch, ensure that we no longer allow alpha dependencies. - $this->assertGreaterThanOrEqual(array_search($minimum_minimum_stability, static::STABILITY_ORDER), array_search(static::MINIMUM_STABILITY, static::STABILITY_ORDER)); + $this->assertGreaterThanOrEqual(array_search($this->getCoreStability(), static::STABILITY_ORDER), array_search(static::MINIMUM_STABILITY, static::STABILITY_ORDER)); // Ensure that static::MINIMUM_STABILITY is the same as the least stable // dependency.