From 7292a8d8fe7e4cf8667194f4af587f6923a0f884 Mon Sep 17 00:00:00 2001
From: Andrew Summers <18727110+summersab@users.noreply.github.com>
Date: Tue, 29 Aug 2023 18:19:21 -0500
Subject: [PATCH 1/2] Refactor `OC\Server::getMailer`

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
---
 lib/private/Mail/Mailer.php             | 2 +-
 lib/private/Share20/ProviderFactory.php | 5 +++--
 lib/public/Mail/IMailer.php             | 2 +-
 lib/public/Util.php                     | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index 9b7b3cf117b..e4c3467f854 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -65,7 +65,7 @@ use Symfony\Component\Mime\Exception\RfcComplianceException;
  *
  * Example usage:
  *
- * 	$mailer = \OC::$server->getMailer();
+ * 	$mailer = \OC::$server->get(\OCP\Mail\IMailer::class);
  * 	$message = $mailer->createMessage();
  * 	$message->setSubject('Your Subject');
  * 	$message->setFrom(array('cloud@domain.org' => 'ownCloud Notifier'));
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 8c01d660915..ff6d9b0eacd 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -44,6 +44,7 @@ use OCA\Talk\Share\RoomShareProvider;
 use OCP\Defaults;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IServerContainer;
+use OCP\Mail\IMailer;
 use OCP\Share\IManager;
 use OCP\Share\IProviderFactory;
 use OCP\Share\IShare;
@@ -100,7 +101,7 @@ class ProviderFactory implements IProviderFactory {
 				$this->serverContainer->getUserManager(),
 				$this->serverContainer->getGroupManager(),
 				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getMailer(),
+				$this->serverContainer->get(IMailer::class),
 				$this->serverContainer->query(Defaults::class),
 				$this->serverContainer->getL10NFactory(),
 				$this->serverContainer->getURLGenerator(),
@@ -193,7 +194,7 @@ class ProviderFactory implements IProviderFactory {
 				$this->serverContainer->getLazyRootFolder(),
 				$this->serverContainer->getL10N('sharebymail'),
 				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
+				$this->serverContainer->get(IMailer::class),
 				$this->serverContainer->getURLGenerator(),
 				$this->serverContainer->getActivityManager(),
 				$settingsManager,
diff --git a/lib/public/Mail/IMailer.php b/lib/public/Mail/IMailer.php
index 94044f7c720..8f4410bb3d5 100644
--- a/lib/public/Mail/IMailer.php
+++ b/lib/public/Mail/IMailer.php
@@ -33,7 +33,7 @@ namespace OCP\Mail;
  *
  * Example usage:
  *
- * 	$mailer = \OC::$server->getMailer();
+ * 	$mailer = \OC::$server->get(\OCP\Mail\IMailer::class);
  * 	$message = $mailer->createMessage();
  * 	$message->setSubject('Your Subject');
  * 	$message->setFrom(['cloud@domain.org' => 'Nextcloud Notifier']);
diff --git a/lib/public/Util.php b/lib/public/Util.php
index bff8038b3dd..12f76104a3f 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -48,6 +48,7 @@ namespace OCP;
 
 use OC\AppScriptDependency;
 use OC\AppScriptSort;
+use OCP\Mail\IMailer;
 use bantu\IniGetWrapper\IniGetWrapper;
 use Psr\Container\ContainerExceptionInterface;
 
@@ -326,7 +327,7 @@ class Util {
 		$host_name = $config->getSystemValueString('mail_domain', $host_name);
 		$defaultEmailAddress = $user_part.'@'.$host_name;
 
-		$mailer = \OC::$server->getMailer();
+		$mailer = \OC::$server->get(IMailer::class);
 		if ($mailer->validateMailAddress($defaultEmailAddress)) {
 			return $defaultEmailAddress;
 		}

From 98666298c8d1ba8605c43ff70034073fe993c9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Thu, 30 May 2024 14:27:44 +0200
Subject: [PATCH 2/2] chore: fix duplicate php import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
---
 lib/public/Util.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/public/Util.php b/lib/public/Util.php
index 2ccc2105ab5..885e2facc53 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -14,7 +14,6 @@ use bantu\IniGetWrapper\IniGetWrapper;
 use OC\AppScriptDependency;
 use OC\AppScriptSort;
 use OCP\Mail\IMailer;
-use bantu\IniGetWrapper\IniGetWrapper;
 use OCP\Share\IManager;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Log\LoggerInterface;