Merge pull request #3681 from nextcloud/fix/socialavatars/fix-http-cl…

…ient-usage fix(socialavatars): Fix HTTP client usage
nextcloud · Nov 30, 2023 · 8e016e9 · 8e016e9
2 parents 8a6cd9d + 687ab6b
commit 8e016e9
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 23 deletions.
diff --git a/lib/Service/Social/DiasporaProvider.php b/lib/Service/Social/DiasporaProvider.php
@@ -23,10 +23,11 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class DiasporaProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var bool */
@@ -36,7 +37,7 @@ class DiasporaProvider implements ISocialProvider {
 	public $name = 'diaspora';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->looping = false;
 	}
 

diff --git a/lib/Service/Social/FacebookProvider.php b/lib/Service/Social/FacebookProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class FacebookProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'facebook';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**

diff --git a/lib/Service/Social/InstagramProvider.php b/lib/Service/Social/InstagramProvider.php
@@ -27,11 +27,12 @@
 use GuzzleHttp\RequestOptions;
 use OC\AppFramework\Http\Request;
 use OCA\Contacts\AppInfo\Application;
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use Psr\Log\LoggerInterface;
 
 class InstagramProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var LoggerInterface */
@@ -42,7 +43,7 @@ class InstagramProvider implements ISocialProvider {
 
 	public function __construct(IClientService $httpClient,
 								LoggerInterface $logger) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->logger = $logger;
 	}
 

diff --git a/lib/Service/Social/MastodonProvider.php b/lib/Service/Social/MastodonProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class MastodonProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'mastodon';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**

diff --git a/lib/Service/Social/TelegramProvider.php b/lib/Service/Social/TelegramProvider.php
@@ -26,11 +26,12 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\RequestOptions;
 use OCA\Contacts\AppInfo\Application;
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use Psr\Log\LoggerInterface;
 
 class TelegramProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var LoggerInterface */
@@ -41,7 +42,7 @@ class TelegramProvider implements ISocialProvider {
 
 	public function __construct(IClientService $httpClient,
 								LoggerInterface $logger) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->logger = $logger;
 	}
 

diff --git a/lib/Service/Social/XingProvider.php b/lib/Service/Social/XingProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class XingProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'xing';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**

diff --git a/lib/Service/SocialApiService.php b/lib/Service/SocialApiService.php
@@ -218,7 +218,7 @@ public function updateContact(string $addressbookId, string $contactId, ?string
 
 			foreach ($urls as $url) {
 				try {
-					$httpResult = $this->clientService->NewClient()->get($url);
+					$httpResult = $this->clientService->newClient()->get($url);
 					$socialdata = $httpResult->getBody();
 					$imageType = $httpResult->getHeader('content-type');
 					if (isset($socialdata) && isset($imageType)) {

diff --git a/tests/unit/Service/Social/DiasporaProviderTest.php b/tests/unit/Service/Social/DiasporaProviderTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
 		$this->client = $this->createMock(IClient::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new DiasporaProvider(

diff --git a/tests/unit/Service/Social/FacebookProviderTest.php b/tests/unit/Service/Social/FacebookProviderTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
 		$this->client = $this->createMock(IClient::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new FacebookProvider(

diff --git a/tests/unit/Service/Social/InstagramProviderTest.php b/tests/unit/Service/Social/InstagramProviderTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void {
 		$this->logger = $this->createMock(LoggerInterface::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new InstagramProvider(

diff --git a/tests/unit/Service/Social/MastodonProviderTest.php b/tests/unit/Service/Social/MastodonProviderTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
 		$this->client = $this->createMock(IClient::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new MastodonProvider(

diff --git a/tests/unit/Service/Social/TelegramProviderTest.php b/tests/unit/Service/Social/TelegramProviderTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void {
 		$this->client = $this->createMock(IClient::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new TelegramProvider(

diff --git a/tests/unit/Service/Social/XingProviderTest.php b/tests/unit/Service/Social/XingProviderTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
 		$this->client = $this->createMock(IClient::class);
 
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($this->client);
 
 		$this->provider = new XingProvider(

diff --git a/tests/unit/Service/SocialApiServiceTest.php b/tests/unit/Service/SocialApiServiceTest.php
@@ -176,7 +176,7 @@ public function testUpdateContactWithoutNetwork($addressbooks, $providers, $body
 			->method('get')
 			->willReturn($response);
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($client);
 		$this->imageResizer
 			->expects($body ? $this->once() : $this->never())
@@ -237,7 +237,7 @@ public function testUpdateContactWithNetworkVersion3() {
 			->method('get')
 			->willReturn($response);
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($client);
 		$this->imageResizer
 			->expects($this->once())
@@ -310,7 +310,7 @@ public function testUpdateContactWithNetworkVersion4() {
 			->method('get')
 			->willReturn($response);
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($client);
 		$this->imageResizer
 			->expects($this->once())
@@ -438,7 +438,7 @@ protected function setupAddressbooks() {
 			->method('get')
 			->willReturn($validResponse);
 		$this->clientService
-			->method('NewClient')
+			->method('newClient')
 			->willReturn($client);
 		$this->imageResizer
 			->method('resizeImage')