mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21456 from nextcloud/fix/bootstrap-appphp-order 

Load the app.php before running apps' boot method
This commit is contained in:
Christoph Wurst 2020-06-17 18:44:37 +02:00 committed by GitHub
parent 38cbd17e0a 5bc8510b3b
commit e64e2d66a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/legacy/OC_App.php
View File

@ -149,9 +149,6 @@ class OC_App {
// in case someone calls loadApp() directly // in case someone calls loadApp() directly
self::registerAutoloading($app, $appPath); self::registerAutoloading($app, $appPath);
/** @var \OC\AppFramework\Bootstrap\Coordinator $coordinator */
$coordinator = \OC::$server->query(\OC\AppFramework\Bootstrap\Coordinator::class);
$coordinator->bootApp($app);
if (is_file($appPath . '/appinfo/app.php')) { if (is_file($appPath . '/appinfo/app.php')) {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app); \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
try { try {
@ -176,6 +173,10 @@ class OC_App {
\OC::$server->getEventLogger()->end('load_app_' . $app); \OC::$server->getEventLogger()->end('load_app_' . $app);
} }
/** @var \OC\AppFramework\Bootstrap\Coordinator $coordinator */
$coordinator = \OC::$server->query(\OC\AppFramework\Bootstrap\Coordinator::class);
$coordinator->bootApp($app);
$info = self::getAppInfo($app); $info = self::getAppInfo($app);
if (!empty($info['activity']['filters'])) { if (!empty($info['activity']['filters'])) {
foreach ($info['activity']['filters'] as $filter) { foreach ($info['activity']['filters'] as $filter) {

7
lib/public/AppFramework/Bootstrap/IBootstrap.php
View File

@ -38,6 +38,13 @@ interface IBootstrap {
public function register(IRegistrationContext $context): void; public function register(IRegistrationContext $context): void;
/** /**
* Boot the application
*
* At this stage you can assume that all services are registered and the DI
* container(s) are ready to be queried.
*
* This is also the state where an optional `appinfo/app.php` was loaded.
*
* @param IBootContext $context * @param IBootContext $context
* *
* @since 20.0.0 * @since 20.0.0