Skip to content

Add OC_App::getAppVersions replacement in IAppManager #51676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 8 commits into from
Mar 31, 2025
Merged

Add OC_App::getAppVersions replacement in IAppManager #51676

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32c1e3e
feat: Add a replacement for OC_App::getAppVersions is IAppManager
come-nc Mar 24, 2025
4b099bd
chore: Replace calls to OC_App::getAppVersions with app manager
come-nc Mar 24, 2025
0a027c3
chore: Cleanup Server.php a bit and remove OC_App usage
come-nc Mar 24, 2025
8caa1a7
fix: Do not try to load IAppManager too soon
come-nc Mar 24, 2025
49cf5ba
fix: Put back OC_App::getAppVersions in Server.php
come-nc Mar 25, 2025
34d7a95
chore(tests): Adapt TemplateLayoutTest to constructor change
come-nc Mar 25, 2025
1ae3e8e
chore(tests): Adapt updatenotification tests to constructor change
come-nc Mar 25, 2025
c7037d7
fix: Move getAppInstalledVersions to AppConfig so that it can be used…
come-nc Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Do not try to load IAppManager too soon 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Mar 25, 2025
commit 8caa1a70e95449708f53e5f8882225e82304a27c
5 changes: 2 additions & 3 deletions lib/private/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,14 +604,13 @@ public function __construct($webRoot, \OC\Config $config) {
$config = $c->get(SystemConfig::class);
/** @var ServerVersion $serverVersion */
$serverVersion = $c->get(ServerVersion::class);
$appManager = $c->get(IAppManager::class);

if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
$logQuery = $config->getValue('log_query');
$prefixClosure = function () use ($logQuery, $serverVersion, $appManager): ?string {
$prefixClosure = function () use ($logQuery, $serverVersion): ?string {
if (!$logQuery) {
try {
$v = $appManager->getAppInstalledVersions();
$v = \OCP\Server::get(IAppManager::class)->getAppVersions();
} catch (\Doctrine\DBAL\Exception $e) {
// Database service probably unavailable
// Probably related to https://github.com/nextcloud/server/issues/37424
Expand Down