From d2a319029c3f4caef6465481eb8a9774759280b3 Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair3149@users.noreply.github.com>
Date: Tue, 22 Oct 2024 01:56:45 -0400
Subject: [PATCH] Switch to SymfonyMailer (#18)

* Update LocalSettings.php

* Delete config/swiftmailer-extension.json

* Update composer.local.json

* Update Dockerfile
---
 Dockerfile                        |  4 +---
 composer.local.json               | 12 ++++++------
 config/LocalSettings.php          |  2 +-
 config/swiftmailer-extension.json | 32 -------------------------------
 4 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 config/swiftmailer-extension.json

diff --git a/Dockerfile b/Dockerfile
index b95b78b..443541a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -165,13 +165,11 @@ RUN set -eux; \
 	mv /var/www/mediawiki/extensions/Webauthn /var/www/mediawiki/extensions/WebAuthn; \
 	mv /var/www/mediawiki/skins/citizen /var/www/mediawiki/skins/Citizen; \
 	mv /var/www/mediawiki/extensions/Twocolconflict /var/www/mediawiki/extensions/TwoColConflict; \
-	mv /var/www/mediawiki/extensions/Swiftmailer /var/www/mediawiki/extensions/SwiftMailer; \
+	mv /var/www/mediawiki/extensions/Symfonymailer /var/www/mediawiki/extensions/SymfonyMailer; \
 	mv /var/www/mediawiki/extensions/Pageviewinfo /var/www/mediawiki/extensions/PageViewInfo; \
 	mv /var/www/mediawiki/extensions/Floatingui /var/www/mediawiki/extensions/FloatingUI; \
 	\
 	cp /var/www/mediawiki/extensions/PictureHtmlSupport/includes/ThumbnailImage.php /var/www/mediawiki/includes/media/ThumbnailImage.php; \
 	chown -R www-data:www-data /var/www
 
-COPY ./config/swiftmailer-extension.json /var/www/mediawiki/extensions/SwiftMailer/extension.json
-
 CMD ["php-fpm"]
diff --git a/composer.local.json b/composer.local.json
index 500442e..a9add12 100644
--- a/composer.local.json
+++ b/composer.local.json
@@ -42,7 +42,7 @@
                 "starcitizenwiki/embedvideo": "dev-develop",
                 "universal-omega/dynamic-page-list3": "dev-master",
                 "edwardspec/mediawiki-aws-s3": "v0.13.0",
-                "mediawiki/swiftmailer": "1.39.0",
+                "mediawiki/symfonymailer": "1.39.0",
                 "mediawiki/semantic-media-wiki": "dev-master",
                 "mediawiki/semantic-extra-special-properties": "~3.0",
                 "mediawiki/semantic-result-formats": "dev-master",
@@ -64,7 +64,7 @@
                                 "extensions/OATHAuth/composer.json",
                                 "extensions/TemplateStyles/composer.json",
                                 "extensions/AWS/composer.json",
-                                "extensions/Swiftmailer/composer.json",
+                                "extensions/SymfonyMailer/composer.json",
                                 "extensions/Apiunto/composer.json",
                                 "extensions/PageViewInfo/composer.json"
                         ]
@@ -635,17 +635,17 @@
                 {
                         "type": "package",
                         "package": {
-                                "name": "mediawiki/swiftmailer",
+                                "name": "mediawiki/symfonymailer",
                                 "type": "mediawiki-extension",
                                 "version": "1.39.0",
                                 "dist": {
-                                        "url": "https://github.com/wikimedia/mediawiki-extensions-SwiftMailer/archive/REL1_39.zip",
+                                        "url": "https://github.com/StarCitizenWiki/mediawiki-extensions-SymfonyMailer/archive/master.zip",
                                         "type": "zip"
                                 },
                                 "source": {
                                         "type": "git",
-                                        "url": "https://github.com/wikimedia/mediawiki-extensions-SwiftMailer.git",
-                                        "reference": "main"
+                                        "url": "https://github.com/StarCitizenWiki/mediawiki-extensions-SymfonyMailer.git",
+                                        "reference": "master"
                                 }
                         }
                 },
diff --git a/config/LocalSettings.php b/config/LocalSettings.php
index 9251b06..dd68d02 100644
--- a/config/LocalSettings.php
+++ b/config/LocalSettings.php
@@ -297,7 +297,7 @@
 wfLoadExtension( 'SemanticScribunto' );
 wfLoadExtension( 'Scribunto' );
 wfLoadExtension( 'ShortDescription' );
-wfLoadExtension( 'SwiftMailer' );
+wfLoadExtension( 'SymfonyMailer' );
 wfLoadExtension( 'SyntaxHighlight_GeSHi' );
 wfLoadExtension( 'TabberNeue' );
 wfLoadExtension( 'TemplateData' );
diff --git a/config/swiftmailer-extension.json b/config/swiftmailer-extension.json
deleted file mode 100644
index ec6ba63..0000000
--- a/config/swiftmailer-extension.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"name": "SwiftMailer",
-	"version": "1.1",
-	"author": [
-		"Tony Thomas"
-	],
-	"url": "https://www.mediawiki.org/wiki/Extension:SwiftMailer",
-	"descriptionmsg": "swiftmailer-desc",
-	"license-name": "GPL-2.0-or-later",
-	"type": "other",
-	"requires": {
-		"MediaWiki": ">= 1.29.0"
-	},
-	"MessagesDirs": {
-		"SwiftMailer": [
-			"i18n"
-		]
-	},
-	"AutoloadClasses": {
-		"SwiftMailerHooks": "SwiftMailerHooks.php"
-	},
-	"Hooks": {
-		"AlternateUserMailer": "SwiftMailerHooks::onAlternateUserMailer"
-	},
-	"config": {
-		"SMTPAuthenticationMethod": {
-			"value": "tls"
-		}
-	},
-	"load_composer_autoloader": true,
-	"manifest_version": 2
-}
\ No newline at end of file