github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-25 09:42:10 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Deps: Updated custom symfony/mailer package

Browse Source 
Done during #4903 work
This commit is contained in:
Dan Brown 2024-03-17 16:32:59 +00:00
parent 2345fd4677
commit b4b84f81a0
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -39,7 +39,7 @@
"socialiteproviders/okta": "^4.2", "socialiteproviders/okta": "^4.2",
"socialiteproviders/twitch": "^5.3", "socialiteproviders/twitch": "^5.3",
"ssddanbrown/htmldiff": "^1.0.2", "ssddanbrown/htmldiff": "^1.0.2",
"ssddanbrown/symfony-mailer": "6.0.x-dev" "ssddanbrown/symfony-mailer": "6.4.x-dev"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.21", "fakerphp/faker": "^1.21",

35
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e05f9f4344c239682f6a9fbab0f87cf0", "content-hash": "ccfc07d0ecc580962915a0457f0466a7",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -5643,38 +5643,43 @@
}, },
{ {
"name": "ssddanbrown/symfony-mailer", "name": "ssddanbrown/symfony-mailer",
"version": "6.0.x-dev", "version": "6.4.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ssddanbrown/symfony-mailer.git", "url": "https://github.com/ssddanbrown/symfony-mailer.git",
"reference": "2219dcdc5f58e4f382ce8f1e6942d16982aa3012" "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/2219dcdc5f58e4f382ce8f1e6942d16982aa3012", "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/0497d6eb2734fe22b9550f88ae6526611c9df7ae",
"reference": "2219dcdc5f58e4f382ce8f1e6942d16982aa3012", "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"egulias/email-validator": "^2.1.10|^3|^4", "egulias/email-validator": "^2.1.10|^3|^4",
"php": ">=8.0.2", "php": ">=8.1",
"psr/event-dispatcher": "^1", "psr/event-dispatcher": "^1",
"psr/log": "^1|^2|^3", "psr/log": "^1|^2|^3",
"symfony/event-dispatcher": "^5.4|^6.0", "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
"symfony/mime": "^5.4|^6.0", "symfony/mime": "^6.2|^7.0",
"symfony/service-contracts": "^1.1|^2|^3" "symfony/service-contracts": "^2.5|^3"
}, },
"conflict": { "conflict": {
"symfony/http-kernel": "<5.4" "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"
}, },
"replace": { "replace": {
"symfony/mailer": "^6.0" "symfony/mailer": "^6.0"
}, },
"require-dev": { "require-dev": {
"symfony/http-client-contracts": "^1.1|^2|^3", "symfony/console": "^5.4|^6.0|^7.0",
"symfony/messenger": "^5.4|^6.0" "symfony/http-client": "^5.4|^6.0|^7.0",
"symfony/messenger": "^6.2|^7.0",
"symfony/twig-bridge": "^6.2|^7.0"
}, },
"default-branch": true,
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -5705,9 +5710,9 @@
"description": "Helps sending emails", "description": "Helps sending emails",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/ssddanbrown/symfony-mailer/tree/6.0" "source": "https://github.com/ssddanbrown/symfony-mailer/tree/6.4"
}, },
"time": "2023-07-04T14:10:33+00:00" "time": "2024-03-17T16:25:21+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",

2
tests/Unit/ConfigTest.php
View File

@ -132,7 +132,7 @@ class ConfigTest extends TestCase
public function test_smtp_scheme_and_certain_port_forces_tls_usage() public function test_smtp_scheme_and_certain_port_forces_tls_usage()
{ {
$isMailTlsRequired = function () { $isMailTlsRequired = function () {
/** @var \BookStack\App\Mail\EsmtpTransport $transport */ /** @var EsmtpTransport $transport */
$transport = Mail::mailer('smtp')->getSymfonyTransport(); $transport = Mail::mailer('smtp')->getSymfonyTransport();
Mail::purge('smtp'); Mail::purge('smtp');
return $transport->getTlsRequirement(); return $transport->getTlsRequirement();