From 9b58a027e3312d14ee3cd724841ae32af481d03c Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 12 Jan 2021 10:10:08 +0100
Subject: [PATCH] Allow installing/updating of apps again
The Guzzle API changed. We shall now use sink
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/Installer.php | 2 +-
tests/lib/InstallerTest.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index e0eb8e9de18..6dfc9a5f0bb 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -286,7 +286,7 @@ class Installer {
$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
index 58602a7cf58..2626e047c74 100644
--- a/tests/lib/InstallerTest.php
+++ b/tests/lib/InstallerTest.php
@@ -348,7 +348,7 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
$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 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
$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 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
$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 @@ MPLX6f5V9tCJtlH6ztmEcDROfvuVc0U3rEhqx2hphoyo+MZrPFpdcJL8KkIdMKbY
$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 @@ JXhrdaWDZ8fzpUjugrtC3qslsqL0dzgU37anS3HwrT8=',
$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')
--
GitLab