From: John Molakvoæ <skjnldsv@users.noreply.github.com>
Date: Thu, 30 May 2024 15:52:14 +0000 (+0200)
Subject: Merge branch 'master' into refactor/OC-Server-getL10NFactory
X-Git-Tag: v30.0.0beta1~405^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d9199fb8879482e5c7615a57daed24dd0d761f6;p=nextcloud-server.git

Merge branch 'master' into refactor/OC-Server-getL10NFactory

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
---

4d9199fb8879482e5c7615a57daed24dd0d761f6
diff --cc lib/private/Share20/ProviderFactory.php
index 99af6da04a6,e680a82c4aa..fde63a4c394
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@@ -20,8 -20,9 +20,10 @@@ use OCP\Defaults
  use OCP\EventDispatcher\IEventDispatcher;
  use OCP\Federation\ICloudFederationFactory;
  use OCP\Files\IRootFolder;
+ use OCP\Http\Client\IClientService;
  use OCP\IServerContainer;
 +use OCP\L10N\IFactory;
+ use OCP\Mail\IMailer;
  use OCP\Security\IHasher;
  use OCP\Share\IManager;
  use OCP\Share\IProviderFactory;
@@@ -79,9 -80,9 +81,9 @@@ class ProviderFactory implements IProvi
  				$this->serverContainer->getUserManager(),
  				$this->serverContainer->getGroupManager(),
  				$this->serverContainer->get(IRootFolder::class),
- 				$this->serverContainer->getMailer(),
+ 				$this->serverContainer->get(IMailer::class),
  				$this->serverContainer->query(Defaults::class),
 -				$this->serverContainer->getL10NFactory(),
 +				$this->serverContainer->get(IFactory::class),
  				$this->serverContainer->getURLGenerator(),
  				$this->serverContainer->query(ITimeFactory::class),
  			);
diff --cc lib/public/Util.php
index 20b4fe9c20d,885e2facc53..179d4066c9b
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@@ -13,7 -13,7 +13,8 @@@ namespace OCP
  use bantu\IniGetWrapper\IniGetWrapper;
  use OC\AppScriptDependency;
  use OC\AppScriptSort;
 +use OCP\L10N\IFactory;
+ use OCP\Mail\IMailer;
  use OCP\Share\IManager;
  use Psr\Container\ContainerExceptionInterface;
  use Psr\Log\LoggerInterface;