upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Merge pull request #40111 from summersab/refactor/OC-Server-getAppFetcher

Browse source
This commit is contained in:
John Molakvoæ 2024-02-23 18:59:43 +01:00 committed by GitHub
commit 0348ad5e0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/Updater.php
View file

@ -41,6 +41,7 @@ declare(strict_types=1);
namespace OC;
use OC\App\AppManager;
use OC\App\AppStore\Fetcher\AppFetcher;
use OC\DB\Connection;
use OC\DB\MigrationService;
use OC\DB\MigratorExecuteSqlEvent;
@ -273,7 +274,7 @@ class Updater extends BasicEmitter {
$this->doAppUpgrade();
// Update the appfetchers version so it downloads the correct list from the appstore
\OC::$server->getAppFetcher()->setVersion($currentVersion);
\OC::$server->get(AppFetcher::class)->setVersion($currentVersion);
/** @var AppManager $appManager */
$appManager = \OC::$server->getAppManager();

6
tests/lib/InstallerTest.php
View file

@ -51,7 +51,7 @@ class InstallerTest extends TestCase {
$this->appstore = $config->setSystemValue('appstoreenabled', true);
$config->setSystemValue('appstoreenabled', true);
$installer = new Installer(
\OC::$server->getAppFetcher(),
\OC::$server->get(AppFetcher::class),
\OC::$server->getHTTPClientService(),
\OC::$server->getTempManager(),
\OC::$server->get(LoggerInterface::class),
@ -74,7 +74,7 @@ class InstallerTest extends TestCase {
protected function tearDown(): void {
$installer = new Installer(
\OC::$server->getAppFetcher(),
\OC::$server->get(AppFetcher::class),
\OC::$server->getHTTPClientService(),
\OC::$server->getTempManager(),
\OC::$server->get(LoggerInterface::class),
@ -98,7 +98,7 @@ class InstallerTest extends TestCase {
// Install app
$installer = new Installer(
\OC::$server->getAppFetcher(),
\OC::$server->get(AppFetcher::class),
\OC::$server->getHTTPClientService(),
\OC::$server->getTempManager(),
\OC::$server->get(LoggerInterface::class),