From 11e98e2de6f0dd20c5a1b8a09d1497ce078a9392 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 9 Dec 2015 06:50:47 +0100 Subject: [PATCH] Fix PHPDoc and check if path does exists Mutes another security warning of some static scanners. --- lib/private/console/application.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/private/console/application.php b/lib/private/console/application.php index 55c817d497..c46e6d60de 100644 --- a/lib/private/console/application.php +++ b/lib/private/console/application.php @@ -48,16 +48,20 @@ class Application { /** * @param OutputInterface $output + * @throws \Exception */ public function loadCommands(OutputInterface $output) { // $application is required to be defined in the register_command scripts $application = $this->application; - require_once \OC::$SERVERROOT . '/core/register_command.php'; + require_once __DIR__ . '/../../../core/register_command.php'; if ($this->config->getSystemValue('installed', false)) { if (!\OCP\Util::needUpgrade()) { OC_App::loadApps(); foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) { $appPath = \OC_App::getAppPath($app); + if($appPath === false) { + continue; + } \OC::$loader->addValidRoot($appPath); $file = $appPath . '/appinfo/register_command.php'; if (file_exists($file)) { @@ -85,6 +89,11 @@ class Application { } } + /** + * Sets whether to automatically exit after a command execution or not. + * + * @param bool $boolean Whether to automatically exit after a command execution or not + */ public function setAutoExit($boolean) { $this->application->setAutoExit($boolean); }