mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow installing/updating of apps again 

The Guzzle API changed. We shall now use sink

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2021-01-12 10:10:08 +01:00
parent c8cbb73c05
commit 9b58a027e3
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Installer.php
View File

@ -286,7 +286,7 @@ class Installer {
$tempFile = $this->tempManager->getTemporaryFile('.tar.gz'); $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
$timeout = $this->isCLI ? 0 : 120; $timeout = $this->isCLI ? 0 : 120;
$client = $this->clientService->newClient(); $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 // Check if the signature actually matches the downloaded content
$certificate = openssl_get_publickey($app['certificate']); $certificate = openssl_get_publickey($app['certificate']);

10
tests/lib/InstallerTest.php
View File

@ -348,7 +348,7 @@ u/spPSSVhaun5BA1FlphB2TkgnzlCmxJa63nFY045e/Jq+IKMcqqZl/092gbI2EQ
$client $client
->expects($this->once()) ->expects($this->once())
->method('get') ->method('get')
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]); ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
->method('newClient') ->method('newClient')
@ -432,7 +432,7 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
$client $client
->expects($this->once()) ->expects($this->once())
->method('get') ->method('get')
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]); ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
->method('newClient') ->method('newClient')
@ -515,7 +515,7 @@ YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
$client $client
->expects($this->once()) ->expects($this->once())
->method('get') ->method('get')
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]); ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
$this->clientService $this->clientService
->expects($this->once()) ->expects($this->once())
->method('newClient') ->method('newClient')
@ -594,7 +594,7 @@ MPLX6f5V9tCJtlH6ztmEcDROfvuVc0U3rEhqx2hphoyo+MZrPFpdcJL8KkIdMKbY
$client $client
->expects($this->once()) ->expects($this->once())
->method('get') ->method('get')
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]); ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
$this->clientService $this->clientService
->expects($this->at(0)) ->expects($this->at(0))
->method('newClient') ->method('newClient')
@ -680,7 +680,7 @@ JXhrdaWDZ8fzpUjugrtC3qslsqL0dzgU37anS3HwrT8=',
$client $client
->expects($this->once()) ->expects($this->once())
->method('get') ->method('get')
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]); ->with('https://example.com', ['sink' => $realTmpFile, 'timeout' => 120]);
$this->clientService $this->clientService
->expects($this->at(1)) ->expects($this->at(1))
->method('newClient') ->method('newClient')