upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

AppFetcher: Distinguish between fileName and endpointName

Browse source 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>

(cherry picked from commit 2f89f5fd13)
This commit is contained in:
Georg Ehrke 2020-01-09 17:29:00 +01:00
parent fbc5301143
commit 921e1feaef
No known key found for this signature in database
GPG key ID: 9D98FD9380A1CB43
4 changed files with 1868 additions and 1782 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/App/AppStore/Fetcher/AppFetcher.php
View file

@ -66,6 +66,7 @@ class AppFetcher extends Fetcher {
);
$this->fileName = 'apps.json';
$this->endpointName = 'apps.json';
$this->compareVersion = $compareVersion;
$this->ignoreMaxVersion = true;
}

1
lib/private/App/AppStore/Fetcher/CategoryFetcher.php
View file

@ -53,5 +53,6 @@ class CategoryFetcher extends Fetcher {
$logger
);
$this->fileName = 'categories.json';
$this->endpointName = 'categories.json';
}
}

4
lib/private/App/AppStore/Fetcher/Fetcher.php
View file

@ -54,6 +54,8 @@ abstract class Fetcher {
/** @var string */
protected $fileName;
/** @var string */
protected $endpointName;
/** @var string */
protected $version;
/** @var string */
protected $channel;
@ -218,6 +220,6 @@ abstract class Fetcher {
}
protected function getEndpoint(): string {
return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->fileName;
return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
}
}

3644
tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
View file

File diff suppressed because one or more lines are too long