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

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

apps/dav/lib/Avatars/RootCollection.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\DAV\Avatars;
 
+use OCP\IAvatarManager;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 
 class RootCollection extends AbstractPrincipalCollection {
@@ -21,7 +22,7 @@ class RootCollection extends AbstractPrincipalCollection {
 	 * @return AvatarHome
 	 */
 	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
+		$avatarManager = \OC::$server->get(IAvatarManager::class);
 		return new AvatarHome($principalInfo, $avatarManager);
 	}
 

apps/user_ldap/lib/Jobs/Sync.php

@@ -319,7 +319,7 @@ class Sync extends TimedJob {
 		if (isset($argument['avatarManager'])) {
 			$this->avatarManager = $argument['avatarManager'];
 		} else {
-			$this->avatarManager = \OC::$server->getAvatarManager();
+			$this->avatarManager = \OC::$server->get(IAvatarManager::class);
 		}
 
 		if (isset($argument['dbc'])) {

apps/user_ldap/tests/Integration/AbstractIntegrationTest.php

@@ -35,6 +35,7 @@ use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\LDAP;
 use OCA\User_LDAP\User\Manager;
 use OCA\User_LDAP\UserPluginManager;
+use OCP\IAvatarManager;
 use OCP\Share\IManager;
 use Psr\Log\LoggerInterface;
 
@@ -124,7 +125,7 @@ abstract class AbstractIntegrationTest {
 			\OC::$server->getConfig(),
 			new FilesystemHelper(),
 			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getAvatarManager(),
+			\OC::$server->get(IAvatarManager::class),
 			new \OCP\Image(),
 			\OC::$server->getUserManager(),
 			\OC::$server->getNotificationManager(),

apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php

@@ -35,6 +35,7 @@ use OCA\User_LDAP\User\Manager;
 use OCA\User_LDAP\User\User;
 use OCA\User_LDAP\User_LDAP;
 use OCA\User_LDAP\UserPluginManager;
+use OCP\IAvatarManager;
 use OCP\Image;
 use Psr\Log\LoggerInterface;
 
@@ -78,8 +79,8 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 		\OC_Util::setupFS($username);
 		\OC::$server->getUserFolder($username);
 		\OC::$server->getConfig()->deleteUserValue($username, 'user_ldap', User::USER_PREFKEY_LASTREFRESH);
-		if (\OC::$server->getAvatarManager()->getAvatar($username)->exists()) {
-			\OC::$server->getAvatarManager()->getAvatar($username)->remove();
+		if (\OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists()) {
+			\OC::$server->get(IAvatarManager::class)->getAvatar($username)->remove();
 		}
 
 		// finally attempt to get the avatar set
@@ -99,7 +100,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 
 		$this->execFetchTest($dn, $username, $image);
 
-		return \OC::$server->getAvatarManager()->getAvatar($username)->exists();
+		return \OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists();
 	}
 
 	/**
@@ -116,7 +117,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 
 		$this->execFetchTest($dn, $username, $image);
 
-		return !\OC::$server->getAvatarManager()->getAvatar($username)->exists();
+		return !\OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists();
 	}
 
 	/**
@@ -136,7 +137,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 			\OC::$server->getConfig(),
 			new FilesystemHelper(),
 			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->getAvatarManager(),
+			\OC::$server->get(IAvatarManager::class),
 			new Image(),
 			\OC::$server->getDatabaseConnection(),
 			\OC::$server->getUserManager(),

build/integration/features/bootstrap/RemoteContext.php

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 use Behat\Behat\Context\Context;
+use OCP\Http\Client\IClientService;
 use PHPUnit\Framework\Assert;
 
 require __DIR__ . '/../../vendor/autoload.php';
@@ -31,7 +32,7 @@ class RemoteContext implements Context {
 	}
 
 	protected function getApiClient() {
-		return new \OC\Remote\Api\OCS($this->remoteInstance, $this->credentails, \OC::$server->getHTTPClientService());
+		return new \OC\Remote\Api\OCS($this->remoteInstance, $this->credentails, \OC::$server->get(IClientService::class));
 	}
 
 	/**
@@ -47,7 +48,7 @@ class RemoteContext implements Context {
 		}
 		$this->lastException = null;
 		try {
-			$this->remoteInstance = new \OC\Remote\Instance($baseUri, \OC::$server->getMemCacheFactory()->createLocal(), \OC::$server->getHTTPClientService());
+			$this->remoteInstance = new \OC\Remote\Instance($baseUri, \OC::$server->getMemCacheFactory()->createLocal(), \OC::$server->get(IClientService::class));
 			// trigger the status request
 			$this->remoteInstance->getProtocol();
 		} catch (\Exception $e) {

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()

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'));

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,

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;
 		}

lib/public/Contacts/IManager.php

@@ -35,7 +35,7 @@ interface IManager {
 	 *  Following function shows how to search for contacts for the name and the email address.
 	 *
 	 *		public static function getMatchingRecipient($term) {
-	 *			$cm = \OC::$server->getContactsManager();
+	 *			$cm = \OCP\Server::get(\OCP\Contacts\IManager::class);
 	 *			// The API is not active -> nothing to do
 	 *			if (!$cm->isEnabled()) {
 	 *				return array();

lib/public/Mail/IMailer.php

@@ -14,7 +14,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']);

lib/public/Util.php

@@ -14,6 +14,7 @@ use bantu\IniGetWrapper\IniGetWrapper;
 use OC\AppScriptDependency;
 use OC\AppScriptSort;
 use OC\Security\CSRF\CsrfTokenManager;
+use OCP\Mail\IMailer;
 use OCP\Share\IManager;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Log\LoggerInterface;
@@ -303,7 +304,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;
 		}

tests/lib/InstallerTest.php

@@ -51,7 +51,7 @@ class InstallerTest extends TestCase {
 		$config->setSystemValue('appstoreenabled', true);
 		$installer = new Installer(
 			\OC::$server->get(AppFetcher::class),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			$config,
@@ -74,7 +74,7 @@ class InstallerTest extends TestCase {
 	protected function tearDown(): void {
 		$installer = new Installer(
 			\OC::$server->get(AppFetcher::class),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			\OC::$server->getConfig(),
@@ -98,7 +98,7 @@ class InstallerTest extends TestCase {
 		// Install app
 		$installer = new Installer(
 			\OC::$server->get(AppFetcher::class),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			\OC::$server->getConfig(),