Migrate away from OC_App and toward IAppManager. by come-nc · Pull Request #44025 · nextcloud/server

come-nc · 2024-03-06T11:01:07Z

Summary

Migrate away from OC_App and toward IAppManager.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

core/Command/App/Remove.php

lib/private/App/AppManager.php

 	private function getInstalledAppsValues(): array {
 		if (!$this->installedAppsCache) {
-			$values = $this->appConfig->getValues(false, 'enabled');
+			$values = $this->getAppConfig()->getValues(false, 'enabled');


lib/private/App/AppManager.php

 		//load the cache
 		if (count($this->appTypes) === 0) {
-			$this->appTypes = $this->appConfig->getValues(false, 'types') ?: [];
+			$this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];


ChristophWurst

To avoid some kaboom we might want to merge this after the 29 branch-off

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

…lled Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Also fixed AppTest Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

come-nc · 2024-04-22T10:22:24Z

Rebased and fixed conflicts

core/Command/App/GetPath.php

lib/private/App/AppManager.php


 		$this->installedAppsCache[$appId] = 'yes';
-		$this->appConfig->setValue($appId, 'enabled', 'yes');
+		$this->getAppConfig()->setValue($appId, 'enabled', 'yes');


lib/private/App/AppManager.php


 		$this->installedAppsCache[$appId] = json_encode($groupIds);
-		$this->appConfig->setValue($appId, 'enabled', json_encode($groupIds));
+		$this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));


lib/private/App/AppManager.php


 		if ($automaticDisabled) {
-			$previousSetting = $this->appConfig->getValue($appId, 'enabled', 'yes');
+			$previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');


lib/private/App/AppManager.php


 		unset($this->installedAppsCache[$appId]);
-		$this->appConfig->setValue($appId, 'enabled', 'no');
+		$this->getAppConfig()->setValue($appId, 'enabled', 'no');


lib/private/App/AppManager.php

 		foreach ($apps as $appId) {
 			$appInfo = $this->getAppInfo($appId);
-			$appDbVersion = $this->appConfig->getValue($appId, 'installed_version');
+			$appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');


core/Command/App/Update.php

…ones Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

come-nc · 2024-04-22T13:17:03Z

@nickvergessen Reverted both calls. We’ll need later to add a replacement for getAllApps.

But the maintenance:install command segfaults since today rebase. I can reproduce locally but have no idea what happens.
I tried reverting the IURLGenerator injection in the appmanager but it does not change anything.

nickvergessen · 2024-04-22T13:19:56Z

but have no idea what happens.

Circular dependencies in 99% of the cases

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

come-nc · 2024-04-22T13:52:16Z

but have no idea what happens.

Circular dependencies in 99% of the cases

Yes, it was urlgenerator injection causing trouble as suspected. At first I thought it was not because I had missed one place it was pulled from.
Fixed now, should be good.

joshtrichards · 2024-09-26T18:36:18Z

Related to open issue: #8505 :)

come-nc added the 2. developing Work in progress label Mar 6, 2024

come-nc self-assigned this Mar 6, 2024

come-nc force-pushed the fix/remove-oc-app-calls branch from 173f7f9 to f281499 Compare March 6, 2024 11:13

github-advanced-security bot found potential problems Mar 6, 2024

View reviewed changes

core/Command/App/Remove.php Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Mar 6, 2024

View reviewed changes

come-nc force-pushed the fix/remove-oc-app-calls branch from 01b858c to babdd5a Compare March 6, 2024 15:00

github-advanced-security bot found potential problems Mar 6, 2024

View reviewed changes

come-nc changed the title ~~Fix/remove oc app calls~~ Migrate away from OC_App and toward IAppManager. Mar 6, 2024

come-nc added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 6, 2024

come-nc marked this pull request as ready for review March 6, 2024 21:45

come-nc requested review from a team, ArtificialOwl, ChristophWurst, icewind1991, nfebe and nickvergessen and removed request for a team March 7, 2024 11:45

icewind1991 approved these changes Mar 7, 2024

View reviewed changes

come-nc force-pushed the fix/remove-oc-app-calls branch from 81bc004 to 3083a2e Compare March 7, 2024 13:33

ChristophWurst approved these changes Mar 7, 2024

View reviewed changes

come-nc added this to the Nextcloud 30 milestone Mar 7, 2024

skjnldsv approved these changes Mar 7, 2024

View reviewed changes

come-nc added 6 commits April 22, 2024 12:14

fix: Migrate away from OC_App toward the IAppManager

644036a

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: use DI to build main Application class in console.php

8c5f323

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Make sure that AppManager can be built before Nextcloud is insta…

0e7bac7

…lled Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Migrate a few more classes away from OC_App::getAppPath

733a818

Also fixed AppTest Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Fix tests following OC_App migrations to IAppManager

a0be3ff

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Fix RouterTest by adding IAppManager

1b5a0c3

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

come-nc force-pushed the fix/remove-oc-app-calls branch from 3083a2e to 1b5a0c3 Compare April 22, 2024 10:22

nickvergessen reviewed Apr 22, 2024

View reviewed changes

core/Command/App/GetPath.php Outdated Show resolved Hide resolved

github-advanced-security bot found potential problems Apr 22, 2024

View reviewed changes

nickvergessen reviewed Apr 22, 2024

View reviewed changes

core/Command/App/Update.php Outdated Show resolved Hide resolved

fix: Revert to OC_App in places where we need all apps even disabled …

61621ee

…ones Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

fix: Lazy load IURLGenerator from AppManager to avoid installation crash

ac1d868

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

come-nc merged commit 37c89f4 into master Apr 22, 2024

come-nc deleted the fix/remove-oc-app-calls branch April 22, 2024 14:41

blizzz mentioned this pull request Jul 24, 2024

30.0.0 beta 1 #46713

Merged

come-nc mentioned this pull request Sep 12, 2024

Migrate away from OC_App to IAppManager #47927

Merged

4 tasks

blizzz mentioned this pull request Sep 11, 2025

Bump to NC 30 nextcloud/univention-app#208

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Migrate away from OC_App and toward IAppManager.#44025

Migrate away from OC_App and toward IAppManager.#44025
come-nc merged 8 commits intomasterfrom
fix/remove-oc-app-calls

come-nc commented Mar 6, 2024 •

edited

Loading

Uh oh!

Uh oh!

Check notice

Check notice

ChristophWurst left a comment

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

nickvergessen commented Apr 22, 2024 •

edited

Loading

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

joshtrichards commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

come-nc commented Mar 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

Uh oh!

Check notice

Check notice

ChristophWurst left a comment

Choose a reason for hiding this comment

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

nickvergessen commented Apr 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

come-nc commented Apr 22, 2024

Uh oh!

joshtrichards commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

come-nc commented Mar 6, 2024 •

edited

Loading

nickvergessen commented Apr 22, 2024 •

edited

Loading