From 279e734da13d87d30a190eb442bbf35a378696b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2019 14:03:10 +0100 Subject: - update to 4.4.0 - add ErrorHandler component - drop dependency on fig/link-util - raise dependency on symfony/contracts 1.1.8 - raise dependency on doctrine/doctrine-bundle 1.5 - raise dependency on monolog/monolog 1.25.1 - allow twig 3 (review #1774967) - allow doctrine-bundle 2 (review #1775102) - add dependency on sodium extension - add dependency on guzzlehttp/promises --- .../Component/Mailer/Bridge/Amazon/composer.json | 6 +++--- .../Component/Mailer/Bridge/Google/composer.json | 6 +++--- .../Mailer/Bridge/Mailchimp/composer.json | 6 +++--- .../Component/Mailer/Bridge/Mailgun/composer.json | 6 +++--- .../Component/Mailer/Bridge/Postmark/composer.json | 6 +++--- .../Component/Mailer/Bridge/Sendgrid/composer.json | 6 +++--- src/Symfony/Component/Mailer/composer.json | 24 ++++++++++++++-------- 7 files changed, 33 insertions(+), 27 deletions(-) (limited to 'src/Symfony/Component/Mailer') diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json index bda7c65..b0fd9da 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Amazon\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/Bridge/Google/composer.json b/src/Symfony/Component/Mailer/Bridge/Google/composer.json index bca36a6..ea7fd9a 100644 --- a/src/Symfony/Component/Mailer/Bridge/Google/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Google/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Google\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json index 5134ec8..569d39f 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3.3" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailchimp\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json index 6fc40d9..af7fa9b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3.3" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json index 8534c36..572c27b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3.3" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json index b8248ed..bd7fae7 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": "^7.1.3", - "symfony/mailer": "^4.3.4" + "symfony/mailer": "^4.4|^5.0" }, "require-dev": { - "symfony/http-client": "^4.3" + "symfony/http-client": "^4.3|^5.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sendgrid\\": "" }, @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json index 53198d3..f78cb2a 100644 --- a/src/Symfony/Component/Mailer/composer.json +++ b/src/Symfony/Component/Mailer/composer.json @@ -20,16 +20,22 @@ "egulias/email-validator": "^2.1.10", "psr/log": "~1.0", "symfony/event-dispatcher": "^4.3", - "symfony/mime": "^4.3.3" + "symfony/mime": "^4.4|^5.0", + "symfony/service-contracts": "^1.1|^2" }, "require-dev": { - "symfony/amazon-mailer": "^4.3", - "symfony/google-mailer": "^4.3", - "symfony/http-client-contracts": "^1.1", - "symfony/mailgun-mailer": "^4.3.3", - "symfony/mailchimp-mailer": "^4.3.3", - "symfony/postmark-mailer": "^4.3.3", - "symfony/sendgrid-mailer": "^4.3.3" + "symfony/amazon-mailer": "^4.4|^5.0", + "symfony/google-mailer": "^4.4|^5.0", + "symfony/http-client-contracts": "^1.1|^2", + "symfony/mailgun-mailer": "^4.4|^5.0", + "symfony/mailchimp-mailer": "^4.4|^5.0", + "symfony/messenger": "^4.4|^5.0", + "symfony/postmark-mailer": "^4.4|^5.0", + "symfony/sendgrid-mailer": "^4.4|^5.0" + }, + "conflict": { + "symfony/http-kernel": "<4.4", + "symfony/sendgrid-mailer": "<4.4" }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\": "" }, @@ -40,7 +46,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } } } -- cgit