Refactor OC\Server::getHTTPClientService

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
nextcloud · Aug 30, 2023 · 4536029 · 4536029
1 parent 9d1547f
commit 4536029
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/build/integration/features/bootstrap/RemoteContext.php b/build/integration/features/bootstrap/RemoteContext.php
@@ -23,6 +23,7 @@
  *
  */
 use Behat\Behat\Context\Context;
+use OCP\Http\Client\IClientService;
 use PHPUnit\Framework\Assert;
 
 require __DIR__ . '/../../vendor/autoload.php';
@@ -50,7 +51,7 @@ public function __construct($remote) {
 	}
 
 	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));
 	}
 
 	/**
@@ -66,7 +67,7 @@ public function selectRemoteInstance($remoteServer) {
 		}
 		$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) {

diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
@@ -116,7 +116,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/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
@@ -43,6 +43,7 @@
 use OCA\Talk\Share\RoomShareProvider;
 use OCP\Defaults;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Http\Client\IClientService;
 use OCP\IServerContainer;
 use OCP\Share\IManager;
 use OCP\Share\IProviderFactory;
@@ -137,7 +138,7 @@ protected function federatedShareProvider() {
 			);
 			$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(),

diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
@@ -67,6 +67,7 @@
 use bantu\IniGetWrapper\IniGetWrapper;
 use OC\Files\SetupManager;
 use OCP\Files\Template\ITemplateManager;
+use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IURLGenerator;
@@ -942,7 +943,7 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
 		// 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;
 		}
@@ -954,7 +955,7 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
 		}
 
 		try {
-			$fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+			$fallbackContent = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody();
 		} catch (\Exception $e) {
 			$fallbackContent = false;
 		}

diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
@@ -52,7 +52,7 @@ protected function setUp(): void {
 		$config->setSystemValue('appstoreenabled', true);
 		$installer = new Installer(
 			\OC::$server->getAppFetcher(),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			$config,
@@ -75,7 +75,7 @@ protected function getInstaller() {
 	protected function tearDown(): void {
 		$installer = new Installer(
 			\OC::$server->getAppFetcher(),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			\OC::$server->getConfig(),
@@ -99,7 +99,7 @@ public function testInstallApp() {
 		// Install app
 		$installer = new Installer(
 			\OC::$server->getAppFetcher(),
-			\OC::$server->getHTTPClientService(),
+			\OC::$server->get(IClientService::class),
 			\OC::$server->getTempManager(),
 			\OC::$server->get(LoggerInterface::class),
 			\OC::$server->getConfig(),