diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Storage/DAV.php | 2 | ||||
| -rw-r--r-- | lib/private/Mail/Mailer.php | 2 | ||||
| -rw-r--r-- | lib/private/Share20/ProviderFactory.php | 8 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 50e0dd5271a..63ef1399a69 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -86,7 +86,7 @@ class DAV extends Common { */ public function __construct($params) { $this->statCache = new ArrayCache(); - $this->httpClientService = \OC::$server->getHTTPClientService(); + $this->httpClientService = \OC::$server->get(IClientService::class); if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { $host = $params['host']; //remove leading http[s], will be generated in createBaseUri() diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index c4e89df7304..041ab8b0ff7 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -38,7 +38,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 b7105c3ebca..e680a82c4aa 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -20,7 +20,9 @@ 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\Mail\IMailer; use OCP\Security\IHasher; use OCP\Share\IManager; use OCP\Share\IProviderFactory; @@ -78,7 +80,7 @@ class ProviderFactory implements IProviderFactory { $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->getURLGenerator(), @@ -115,7 +117,7 @@ class ProviderFactory implements IProviderFactory { ); $notifications = new Notifications( $addressHandler, - $this->serverContainer->getHTTPClientService(), + $this->serverContainer->get(IClientService::class), $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class), $this->serverContainer->getJobList(), \OC::$server->getCloudFederationProviderManager(), @@ -171,7 +173,7 @@ class ProviderFactory implements IProviderFactory { $this->serverContainer->get(IRootFolder::class), $this->serverContainer->getL10N('sharebymail'), $this->serverContainer->get(LoggerInterface::class), - $this->serverContainer->getMailer(), + $this->serverContainer->get(IMailer::class), $this->serverContainer->getURLGenerator(), $this->serverContainer->getActivityManager(), $settingsManager, diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 8be4c81c2cd..4b89b01469a 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -9,6 +9,7 @@ use bantu\IniGetWrapper\IniGetWrapper; use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager; use OC\Files\SetupManager; use OCP\Files\Template\ITemplateManager; +use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IGroupManager; use OCP\IURLGenerator; @@ -877,7 +878,7 @@ class OC_Util { // accessing the file via http $url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName); try { - $content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody(); + $content = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody(); } catch (\Exception $e) { $content = false; } @@ -889,7 +890,7 @@ class OC_Util { } try { - $fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody(); + $fallbackContent = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody(); } catch (\Exception $e) { $fallbackContent = false; } |