From bcf1456ce2c09f12ce8e4bd3e5d6a271188add2d Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 16 Nov 2021 06:33:09 +1000
Subject: [PATCH] Issue #3249233 by longwave: Update 9.3's Symfony 5 components
to 5.4
---
composer.json | 4 +-
composer.lock | 85 ++++++++++---------
.../Metapackage/CoreRecommended/composer.json | 6 +-
.../Metapackage/DevDependencies/composer.json | 4 +-
.../PinnedDevDependencies/composer.json | 4 +-
core/composer.json | 2 +-
.../Template/ComposerProjectTemplatesTest.php | 2 +-
7 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/composer.json b/composer.json
index c137ad2ab4c9..5d938d7dd81f 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.3.0",
- "symfony/var-dumper": "^5.3.0",
+ "symfony/phpunit-bridge": "^5.4@beta",
+ "symfony/var-dumper": "^5.4@beta",
"symfony/error-handler": "^4.4",
"justinrainbow/json-schema": "^5.2",
"symfony/filesystem": "^4.4",
diff --git a/composer.lock b/composer.lock
index f3807eadf349..0065a3881d77 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": "8d45389b3d0ae61b9494521b92723562",
+ "content-hash": "ecbf82b278efeb981800307d22242bf8",
"packages": [
{
"name": "asm89/stack-cors",
@@ -535,7 +535,7 @@
"dist": {
"type": "path",
"url": "core",
- "reference": "1349b63771ae6c0b66e9d870c692bf7f51024171"
+ "reference": "60f96b86b97f28bf6a18f9a7e392f56caea5eba3"
},
"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.3.0",
+ "symfony/mime": "^5.4@beta",
"symfony/polyfill-iconv": "^1.0",
"symfony/polyfill-php80": "^1.16",
"symfony/process": "^4.4",
@@ -1425,16 +1425,16 @@
},
{
"name": "laminas/laminas-stdlib",
- "version": "3.6.0",
+ "version": "3.6.1",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
- "reference": "c53d8537f108fac3fae652677a19735db730ba46"
+ "reference": "db581851a092246ad99e12d4fddf105184924c71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/c53d8537f108fac3fae652677a19735db730ba46",
- "reference": "c53d8537f108fac3fae652677a19735db730ba46",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/db581851a092246ad99e12d4fddf105184924c71",
+ "reference": "db581851a092246ad99e12d4fddf105184924c71",
"shasum": ""
},
"require": {
@@ -1480,7 +1480,7 @@
"type": "community_bridge"
}
],
- "time": "2021-09-02T16:11:32+00:00"
+ "time": "2021-11-10T11:33:52+00:00"
},
{
"name": "masterminds/html5",
@@ -2999,16 +2999,16 @@
},
{
"name": "symfony/mime",
- "version": "v5.3.8",
+ "version": "v5.4.0-BETA1",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "a756033d0a7e53db389618653ae991eba5a19a11"
+ "reference": "d75d8cd9aa5ad257ed1b958f042c7a2d7cf505d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11",
- "reference": "a756033d0a7e53db389618653ae991eba5a19a11",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/d75d8cd9aa5ad257ed1b958f042c7a2d7cf505d5",
+ "reference": "d75d8cd9aa5ad257ed1b958f042c7a2d7cf505d5",
"shasum": ""
},
"require": {
@@ -3027,10 +3027,10 @@
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
- "symfony/dependency-injection": "^4.4|^5.0",
- "symfony/property-access": "^4.4|^5.1",
- "symfony/property-info": "^4.4|^5.1",
- "symfony/serializer": "^5.2"
+ "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+ "symfony/property-access": "^4.4|^5.1|^6.0",
+ "symfony/property-info": "^4.4|^5.1|^6.0",
+ "symfony/serializer": "^5.2|^6.0"
},
"type": "library",
"autoload": {
@@ -3062,7 +3062,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v5.3.8"
+ "source": "https://github.com/symfony/mime/tree/v5.4.0-BETA1"
},
"funding": [
{
@@ -3078,7 +3078,7 @@
"type": "tidelift"
}
],
- "time": "2021-09-10T12:30:38+00:00"
+ "time": "2021-11-04T16:48:04+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4260,16 +4260,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.3.10",
+ "version": "v5.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "875432adb5f5570fff21036fd22aee244636b7d1"
+ "reference": "8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/875432adb5f5570fff21036fd22aee244636b7d1",
- "reference": "875432adb5f5570fff21036fd22aee244636b7d1",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d",
+ "reference": "8dcd0b137b3fb45df7df6f06f0ef6a9fad7f587d",
"shasum": ""
},
"require": {
@@ -4283,8 +4283,9 @@
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^4.4|^5.0",
- "symfony/process": "^4.4|^5.0",
+ "symfony/console": "^4.4|^5.0|^6.0",
+ "symfony/process": "^4.4|^5.0|^6.0",
+ "symfony/uid": "^5.1|^6.0",
"twig/twig": "^2.13|^3.0.4"
},
"suggest": {
@@ -4328,7 +4329,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.3.10"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.0-BETA2"
},
"funding": [
{
@@ -4344,7 +4345,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-26T09:30:15+00:00"
+ "time": "2021-11-12T11:42:37+00:00"
},
{
"name": "symfony/yaml",
@@ -6603,16 +6604,16 @@
},
{
"name": "sebastian/exporter",
- "version": "3.1.3",
+ "version": "3.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
+ "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
- "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
+ "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
"shasum": ""
},
"require": {
@@ -6621,7 +6622,7 @@
},
"require-dev": {
"ext-mbstring": "*",
- "phpunit/phpunit": "^6.0"
+ "phpunit/phpunit": "^8.5"
},
"type": "library",
"extra": {
@@ -6668,7 +6669,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
},
"funding": [
{
@@ -6676,7 +6677,7 @@
"type": "github"
}
],
- "time": "2020-11-30T07:47:53+00:00"
+ "time": "2021-11-11T13:51:24+00:00"
},
{
"name": "sebastian/global-state",
@@ -7709,16 +7710,16 @@
},
{
"name": "symfony/phpunit-bridge",
- "version": "v5.3.10",
+ "version": "v5.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "325aaf6302501ed3673cffbd3ba88db5949de8ae"
+ "reference": "0f925f6512356879d79954a5442dca83658ae279"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/325aaf6302501ed3673cffbd3ba88db5949de8ae",
- "reference": "325aaf6302501ed3673cffbd3ba88db5949de8ae",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0f925f6512356879d79954a5442dca83658ae279",
+ "reference": "0f925f6512356879d79954a5442dca83658ae279",
"shasum": ""
},
"require": {
@@ -7729,7 +7730,7 @@
"phpunit/phpunit": "<7.5|9.1.2"
},
"require-dev": {
- "symfony/error-handler": "^4.4|^5.0"
+ "symfony/error-handler": "^4.4|^5.0|^6.0"
},
"suggest": {
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@@ -7772,7 +7773,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.3.10"
+ "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0-BETA2"
},
"funding": [
{
@@ -7788,7 +7789,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-28T19:22:18+00:00"
+ "time": "2021-11-12T11:42:37+00:00"
},
{
"name": "theseer/tokenizer",
@@ -7904,7 +7905,9 @@
"stability-flags": {
"drupal/core": 20,
"drupal/core-project-message": 20,
- "drupal/core-vendor-hardening": 20
+ "drupal/core-vendor-hardening": 20,
+ "symfony/phpunit-bridge": 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 32c62cf90196..56e3446aa27e 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -20,7 +20,7 @@
"laminas/laminas-diactoros": "2.8.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.15.0",
- "laminas/laminas-stdlib": "3.6.0",
+ "laminas/laminas-stdlib": "3.6.1",
"masterminds/html5": "2.7.5",
"pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
@@ -44,7 +44,7 @@
"symfony/http-client-contracts": "v2.4.0",
"symfony/http-foundation": "v4.4.33",
"symfony/http-kernel": "v4.4.33",
- "symfony/mime": "v5.3.8",
+ "symfony/mime": "v5.4.0-BETA1",
"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.32",
"symfony/translation-contracts": "v2.4.0",
"symfony/validator": "v4.4.33",
- "symfony/var-dumper": "v5.3.10",
+ "symfony/var-dumper": "v5.4.0-BETA2",
"symfony/yaml": "v4.4.29",
"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 32b5862971c2..49f481167a66 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.3.0",
- "symfony/var-dumper": "^5.3.0"
+ "symfony/phpunit-bridge": "^5.4@beta",
+ "symfony/var-dumper": "^5.4@beta"
}
}
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 6da700701af9..9c1dadf72e63 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -40,7 +40,7 @@
"sebastian/comparator": "3.0.3",
"sebastian/diff": "3.0.3",
"sebastian/environment": "4.2.4",
- "sebastian/exporter": "3.1.3",
+ "sebastian/exporter": "3.1.4",
"sebastian/global-state": "3.0.1",
"sebastian/object-enumerator": "3.0.4",
"sebastian/object-reflector": "1.1.2",
@@ -58,7 +58,7 @@
"symfony/filesystem": "v4.4.27",
"symfony/finder": "v4.4.30",
"symfony/lock": "v4.4.33",
- "symfony/phpunit-bridge": "v5.3.10",
+ "symfony/phpunit-bridge": "v5.4.0-BETA2",
"theseer/tokenizer": "1.2.1",
"webmozart/assert": "1.10.0"
}
diff --git a/core/composer.json b/core/composer.json
index 2566db7afb71..d83b166ca13d 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.3.0",
+ "symfony/mime": "^5.4@beta",
"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 5b341db41319..53a5c2308c3c 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 = 'stable';
+ protected const MINIMUM_STABILITY = 'beta';
/**
* The order of stability strings from least stable to most stable.
--
GitLab