From 53beb854000b5ed802bfe2a3d96d05bc75c83617 Mon Sep 17 00:00:00 2001
From: effulgentsia <alex.bronstein@acquia.com>
Date: Fri, 20 Oct 2023 09:52:48 -0700
Subject: [PATCH] Issue #3165762 followup by longwave, smustgrave, Spokje: Move
symfony/mailer dependency from drupal/drupal to drupal/core
---
composer.json | 1 -
composer.lock | 167 +++++++++---------
.../Metapackage/CoreRecommended/composer.json | 1 +
.../Metapackage/DevDependencies/composer.json | 1 -
.../PinnedDevDependencies/composer.json | 1 -
core/composer.json | 1 +
6 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/composer.json b/composer.json
index 3242b5e5fee5..e551ea3eafc2 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,6 @@
"symfony/filesystem": "^6.3",
"symfony/finder": "^6.3",
"symfony/lock": "^6.3",
- "symfony/mailer": "^6.3",
"symfony/phpunit-bridge": "^6.3",
"symfony/var-dumper": "^6.3"
},
diff --git a/composer.lock b/composer.lock
index 45f224e5e158..a90d9b028ff8 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": "93842a6c87cec9f144cd50dab29818e7",
+ "content-hash": "1f03bd567e9e6a240f6bec2e76b7f448",
"packages": [
{
"name": "asm89/stack-cors",
@@ -495,7 +495,7 @@
"dist": {
"type": "path",
"url": "core",
- "reference": "d8c2e380c13d2892038560c5591ef07ac31c6add"
+ "reference": "3a9276de9f8ff93b084de753bb992181bfdaf99c"
},
"require": {
"asm89/stack-cors": "^2.1",
@@ -529,6 +529,7 @@
"symfony/event-dispatcher": "^6.3",
"symfony/http-foundation": "^6.3",
"symfony/http-kernel": "^6.3",
+ "symfony/mailer": "^6.3",
"symfony/mime": "^6.3",
"symfony/polyfill-iconv": "^1.26",
"symfony/process": "^6.3",
@@ -2588,6 +2589,86 @@
],
"time": "2023-05-30T19:03:32+00:00"
},
+ {
+ "name": "symfony/mailer",
+ "version": "v6.3.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/mailer.git",
+ "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06",
+ "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06",
+ "shasum": ""
+ },
+ "require": {
+ "egulias/email-validator": "^2.1.10|^3|^4",
+ "php": ">=8.1",
+ "psr/event-dispatcher": "^1",
+ "psr/log": "^1|^2|^3",
+ "symfony/event-dispatcher": "^5.4|^6.0",
+ "symfony/mime": "^6.2",
+ "symfony/service-contracts": "^2.5|^3"
+ },
+ "conflict": {
+ "symfony/http-client-contracts": "<2.5",
+ "symfony/http-kernel": "<5.4",
+ "symfony/messenger": "<6.2",
+ "symfony/mime": "<6.2",
+ "symfony/twig-bridge": "<6.2.1"
+ },
+ "require-dev": {
+ "symfony/console": "^5.4|^6.0",
+ "symfony/http-client": "^5.4|^6.0",
+ "symfony/messenger": "^6.2",
+ "symfony/twig-bridge": "^6.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Mailer\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Helps sending emails",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/mailer/tree/v6.3.5"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-09-06T09:47:15+00:00"
+ },
{
"name": "symfony/mime",
"version": "v6.3.0",
@@ -9138,86 +9219,6 @@
],
"time": "2023-04-21T12:19:45+00:00"
},
- {
- "name": "symfony/mailer",
- "version": "v6.3.5",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/mailer.git",
- "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06",
- "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06",
- "shasum": ""
- },
- "require": {
- "egulias/email-validator": "^2.1.10|^3|^4",
- "php": ">=8.1",
- "psr/event-dispatcher": "^1",
- "psr/log": "^1|^2|^3",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/mime": "^6.2",
- "symfony/service-contracts": "^2.5|^3"
- },
- "conflict": {
- "symfony/http-client-contracts": "<2.5",
- "symfony/http-kernel": "<5.4",
- "symfony/messenger": "<6.2",
- "symfony/mime": "<6.2",
- "symfony/twig-bridge": "<6.2.1"
- },
- "require-dev": {
- "symfony/console": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/messenger": "^6.2",
- "symfony/twig-bridge": "^6.2"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Mailer\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Helps sending emails",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/mailer/tree/v6.3.5"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-09-06T09:47:15+00:00"
- },
{
"name": "symfony/phpunit-bridge",
"version": "v6.3.0",
@@ -9547,5 +9548,5 @@
"platform-overrides": {
"php": "8.1.0"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 11ffb3642430..865b1dbeb902 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -39,6 +39,7 @@
"symfony/event-dispatcher-contracts": "~v3.3.0",
"symfony/http-foundation": "~v6.3.0",
"symfony/http-kernel": "~v6.3.0",
+ "symfony/mailer": "~v6.3.5",
"symfony/mime": "~v6.3.0",
"symfony/polyfill-ctype": "~v1.27.0",
"symfony/polyfill-iconv": "~v1.27.0",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index d67c501890ac..0dae0f6f6013 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -33,7 +33,6 @@
"symfony/filesystem": "^6.3",
"symfony/finder": "^6.3",
"symfony/lock": "^6.3",
- "symfony/mailer": "^6.3",
"symfony/phpunit-bridge": "^6.3",
"symfony/var-dumper": "^6.3"
}
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 35e44726d472..7b3931e62c46 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -86,7 +86,6 @@
"symfony/filesystem": "v6.3.0",
"symfony/finder": "v6.3.0",
"symfony/lock": "v6.3.0",
- "symfony/mailer": "v6.3.5",
"symfony/phpunit-bridge": "v6.3.0",
"symfony/polyfill-php82": "v1.27.0",
"theseer/tokenizer": "1.2.1",
diff --git a/core/composer.json b/core/composer.json
index 47cf2763b385..99b4b860c660 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -23,6 +23,7 @@
"symfony/event-dispatcher": "^6.3",
"symfony/http-foundation": "^6.3",
"symfony/http-kernel": "^6.3",
+ "symfony/mailer": "^6.3",
"symfony/mime": "^6.3",
"symfony/routing": "^6.3",
"symfony/serializer": "^6.3",
--
GitLab