Merge pull request #472 from nextcloud/fix/cleanup-php-app-query

Cleanup app init query
nextcloud · Apr 16, 2020 · 65fa6ee · 65fa6ee
2 parents b16ba3a + d8b59e3
commit 65fa6ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -23,4 +23,5 @@
 
 namespace OCA\Viewer\AppInfo;
 
-\OC::$server->query(\OCA\Viewer\AppInfo\Application::class);
+$app = \OC::$server->query(\OCA\Viewer\AppInfo\Application::class);
+$app->register();
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -35,10 +35,15 @@ class Application extends App {
 
 	public function __construct() {
 		parent::__construct(self::APP_ID);
-
-		// listen to sidebar loading event
+	}
+
+	public function register() {
 		$server = $this->getContainer()->getServer();
+
+		/** @var IEventDispatcher $eventDispatcher */
 		$eventDispatcher = $server->query(IEventDispatcher::class);
+
+		// Watch Viewer load event
 		$eventDispatcher->addServiceListener(LoadViewer::class, LoadViewerScript::class);
 	}
 }