Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set min versions of swiftmailer to 5.4.13 and 6.2.5 and updated swiftmailer submodule #331

Merged
merged 7 commits into from
Feb 27, 2024
+3 −3
Merged

Set min versions of swiftmailer to 5.4.13 and 6.2.5 and updated swiftmailer submodule #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4bdf61
Removed git submodule approach
thirsch Feb 27, 2024
88f2943
Set min versions of swiftmailer to 5.4.13 and 6.2.5
thirsch Feb 27, 2024
bc6d159
Installing doctrine1 using composer.
thirsch Feb 27, 2024
c2cc6df
Revert "Installing doctrine1 using composer."
thirsch Feb 27, 2024
65d1b30
Revert "Removed git submodule approach"
thirsch Feb 27, 2024
8daa493
Changed submodule to FriendsOfSymfony1/swiftmailer
thirsch Feb 27, 2024
493b54d
Updated swiftmailer submodule
thirsch Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "lib/vendor/swiftmailer"]
path = lib/vendor/swiftmailer
url = https://github.com/swiftmailer/swiftmailer.git
url = https://github.com/FriendsOfSymfony1/swiftmailer.git
branch = 5.x
[submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"require": {
"php" : "^7.4 || ^8.1",
"swiftmailer/swiftmailer": "^5.2 || ^6.0"
"friendsofsymfony1/swiftmailer": "^5.4.13 || ^6.2.5"
},
"require-dev": {
"psr/log": "*"
Expand Down
2 changes: 1 addition & 1 deletion lib/vendor/swiftmailer
Open in desktop
Submodule swiftmailer updated 7 files
+5 −0 CHANGES
+1 −1 VERSION
+0 −5 composer.json
+10 −0 lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+5 −0 lib/classes/Swift/KeyCache/DiskKeyCache.php
+6 −0 lib/classes/Swift/Mime/SimpleMimeEntity.php
+10 −0 lib/classes/Swift/Transport/AbstractSmtpTransport.php