Allow installing/updating of apps again

The Guzzle API changed. We shall now use sink Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Jan 12, 2021 · 9b58a02 · 9b58a02
1 parent c8cbb73
commit 9b58a02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
@@ -286,7 +286,7 @@ public function downloadApp($appId, $allowUnstable = false) {
 				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
 				$timeout = $this->isCLI ? 0 : 120;
 				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['save_to' => $tempFile, 'timeout' => $timeout]);
+				$client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);

diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
@@ -348,7 +348,7 @@ public function testDownloadAppWithInvalidSignature() {
 		$client
 			->expects($this->once())
 			->method('get')
-			->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
+			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
 		$this->clientService
 			->expects($this->once())
 			->method('newClient')
@@ -432,7 +432,7 @@ public function testDownloadAppWithMoreThanOneFolderDownloaded() {
 		$client
 			->expects($this->once())
 			->method('get')
-			->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
+			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
 		$this->clientService
 			->expects($this->once())
 			->method('newClient')
@@ -515,7 +515,7 @@ public function testDownloadAppWithMismatchingIdentifier() {
 		$client
 			->expects($this->once())
 			->method('get')
-			->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
+			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
 		$this->clientService
 			->expects($this->once())
 			->method('newClient')
@@ -594,7 +594,7 @@ public function testDownloadAppSuccessful() {
 		$client
 			->expects($this->once())
 			->method('get')
-			->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
+			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
 		$this->clientService
 			->expects($this->at(0))
 			->method('newClient')
@@ -680,7 +680,7 @@ public function testDownloadAppWithDowngrade() {
 		$client
 			->expects($this->once())
 			->method('get')
-			->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
+			->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
 		$this->clientService
 			->expects($this->at(1))
 			->method('newClient')