Skip to content

Migrate away from OC_App and toward IAppManager. #44025

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
Apr 22, 2024
Merged

Migrate away from OC_App and toward IAppManager. #44025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
644036a
fix: Migrate away from OC_App toward the IAppManager
come-nc Mar 6, 2024
8c5f323
fix: use DI to build main Application class in console.php
come-nc Mar 6, 2024
0e7bac7
fix: Make sure that AppManager can be built before Nextcloud is insta…
come-nc Mar 6, 2024
733a818
fix: Migrate a few more classes away from OC_App::getAppPath
come-nc Mar 6, 2024
a0be3ff
fix: Fix tests following OC_App migrations to IAppManager
come-nc Mar 6, 2024
1b5a0c3
fix: Fix RouterTest by adding IAppManager
come-nc Mar 6, 2024
61621ee
fix: Revert to OC_App in places where we need all apps even disabled …
come-nc Apr 22, 2024
ac1d868
fix: Lazy load IURLGenerator from AppManager to avoid installation crash
come-nc Apr 22, 2024
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: use DI to build main Application class in console.php 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Apr 22, 2024
commit 8c5f32320a3ceeb9aac86bb2340d0919adf37993
14 changes: 5 additions & 9 deletions console.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
Expand Down Expand Up @@ -57,7 +60,7 @@ function exceptionHandler($exception) {
exit(1);
}

$config = \OC::$server->getConfig();
$config = \OCP\Server::get(\OCP\IConfig::class);
set_exception_handler('exceptionHandler');

if (!function_exists('posix_getuid')) {
Expand Down Expand Up @@ -102,14 +105,7 @@ function exceptionHandler($exception) {
echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;
}

$application = new Application(
$config,
\OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class),
\OC::$server->getRequest(),
\OC::$server->get(\Psr\Log\LoggerInterface::class),
\OC::$server->query(\OC\MemoryInfo::class),
\OCP\Server::get(\OCP\App\IAppManager::class),
);
$application = \OCP\Server::get(Application::class);
$application->loadCommands(new ArgvInput(), new ConsoleOutput());
$application->run();
} catch (Exception $ex) {
Expand Down
2 changes: 1 addition & 1 deletion core/Command/App/Remove.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public function completeOptionValues($optionName, CompletionContext $context): a
*/
public function completeArgumentValues($argumentName, CompletionContext $context): array {
if ($argumentName === 'app-id') {
return $this->appManager->getInstalledApps();
return $this->manager->getInstalledApps();
}
return [];
}
Expand Down