From 38a6e2c0fb0da3a50d24e1af3628041ae00d01d4 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Tue, 30 Nov 2021 05:41:22 +0000 Subject: [PATCH] Issue #3251768 by longwave: Update Symfony 5 dependencies to 5.4.0 (cherry picked from commit d21e5db7389d3b9c3d2fa629e36953142ba90567) --- composer.json | 4 +- composer.lock | 38 +++++++++---------- .../Metapackage/CoreRecommended/composer.json | 4 +- .../Metapackage/DevDependencies/composer.json | 4 +- .../PinnedDevDependencies/composer.json | 2 +- core/composer.json | 2 +- .../Template/ComposerProjectTemplatesTest.php | 2 +- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 5d938d7dd81..89628d08273 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "phpunit/phpunit": "^8.5.14 || ^9", "phpspec/prophecy": "^1.12", "symfony/css-selector": "^4.4", - "symfony/phpunit-bridge": "^5.4@beta", - "symfony/var-dumper": "^5.4@beta", + "symfony/phpunit-bridge": "^5.4", + "symfony/var-dumper": "^5.4", "symfony/error-handler": "^4.4", "justinrainbow/json-schema": "^5.2", "symfony/filesystem": "^4.4", diff --git a/composer.lock b/composer.lock index 03b213fc7a8..62ac0d2be5f 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": "ecbf82b278efeb981800307d22242bf8", + "content-hash": "562b32f689c2ece1649aeb3c21d6bd11", "packages": [ { "name": "asm89/stack-cors", @@ -535,7 +535,7 @@ "dist": { "type": "path", "url": "core", - "reference": "7a98829a05bab8c01cf51eb9885417ba39848606" + "reference": "5f80d6033e50a621512a12ca2cb2afe9b257f1c1" }, "require": { "asm89/stack-cors": "^1.1", @@ -570,7 +570,7 @@ "symfony/event-dispatcher": "^4.4", "symfony/http-foundation": "^4.4.7", "symfony/http-kernel": "^4.4", - "symfony/mime": "^5.4@beta", + "symfony/mime": "^5.4", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-php80": "^1.16", "symfony/process": "^4.4", @@ -2999,7 +2999,7 @@ }, { "name": "symfony/mime", - "version": "v5.4.0-RC1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -3062,7 +3062,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.0-RC1" + "source": "https://github.com/symfony/mime/tree/v5.4.0" }, "funding": [ { @@ -4264,16 +4264,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.0-RC1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d" + "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d", - "reference": "8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89ab66eaef230c9cd1992de2e9a1b26652b127b9", + "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9", "shasum": "" }, "require": { @@ -4333,7 +4333,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.0-RC1" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.0" }, "funding": [ { @@ -4349,7 +4349,7 @@ "type": "tidelift" } ], - "time": "2021-11-12T11:42:37+00:00" + "time": "2021-11-29T15:30:56+00:00" }, { "name": "symfony/yaml", @@ -7716,16 +7716,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.0-RC1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "abc162ab677ce0e6a2763c4016a2502077f1477c" + "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/abc162ab677ce0e6a2763c4016a2502077f1477c", - "reference": "abc162ab677ce0e6a2763c4016a2502077f1477c", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c", + "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c", "shasum": "" }, "require": { @@ -7779,7 +7779,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0-RC1" + "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0" }, "funding": [ { @@ -7795,7 +7795,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2021-11-29T15:30:56+00:00" }, { "name": "theseer/tokenizer", @@ -7911,9 +7911,7 @@ "stability-flags": { "drupal/core": 20, "drupal/core-project-message": 20, - "drupal/core-vendor-hardening": 20, - "symfony/phpunit-bridge": 10, - "symfony/var-dumper": 10 + "drupal/core-vendor-hardening": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 4bf1b955dd1..1a2f515a455 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -44,7 +44,7 @@ "symfony/http-client-contracts": "v2.5.0", "symfony/http-foundation": "v4.4.34", "symfony/http-kernel": "v4.4.35", - "symfony/mime": "v5.4.0-RC1", + "symfony/mime": "v5.4.0", "symfony/polyfill-ctype": "v1.23.0", "symfony/polyfill-iconv": "v1.23.0", "symfony/polyfill-intl-idn": "v1.23.0", @@ -59,7 +59,7 @@ "symfony/translation": "v4.4.34", "symfony/translation-contracts": "v2.5.0", "symfony/validator": "v4.4.35", - "symfony/var-dumper": "v5.4.0-RC1", + "symfony/var-dumper": "v5.4.0", "symfony/yaml": "v4.4.34", "twig/twig": "v2.14.7", "typo3/phar-stream-wrapper": "v3.1.7" diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index 49f481167a6..4204d15a54a 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -25,7 +25,7 @@ "symfony/filesystem": "^4.4", "symfony/finder": "^4.4", "symfony/lock": "^4.4", - "symfony/phpunit-bridge": "^5.4@beta", - "symfony/var-dumper": "^5.4@beta" + "symfony/phpunit-bridge": "^5.4", + "symfony/var-dumper": "^5.4" } } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 56ac0a0800f..019a9f5b0ba 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -58,7 +58,7 @@ "symfony/filesystem": "v4.4.27", "symfony/finder": "v4.4.30", "symfony/lock": "v4.4.33", - "symfony/phpunit-bridge": "v5.4.0-RC1", + "symfony/phpunit-bridge": "v5.4.0", "theseer/tokenizer": "1.2.1", "webmozart/assert": "1.10.0" } diff --git a/core/composer.json b/core/composer.json index eedac0241d4..2d32788decc 100644 --- a/core/composer.json +++ b/core/composer.json @@ -23,7 +23,7 @@ "symfony/event-dispatcher": "^4.4", "symfony/http-foundation": "^4.4.7", "symfony/http-kernel": "^4.4", - "symfony/mime": "^5.4@beta", + "symfony/mime": "^5.4", "symfony/routing": "^4.4", "symfony/serializer": "^4.4", "symfony/translation": "^4.4", diff --git a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php index 0b5fd13d1ae..4ee3e9158ff 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 BuildTestBase { * * @see https://getcomposer.org/doc/04-schema.md#minimum-stability */ - protected const MINIMUM_STABILITY = 'RC'; + protected const MINIMUM_STABILITY = 'stable'; /** * The order of stability strings from least stable to most stable.