nextcloud / server

lib/private/Console/Application.php

Indentation +173 added lines, -173 removed lines

@@ -47,187 +47,187 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application {
-	/** @var IConfig */
-	private $config;
-	private SymfonyApplication $application;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IRequest */
-	private $request;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var MemoryInfo */
-	private $memoryInfo;
+    /** @var IConfig */
+    private $config;
+    private SymfonyApplication $application;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IRequest */
+    private $request;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var MemoryInfo */
+    private $memoryInfo;
 
-	public function __construct(IConfig $config,
-								EventDispatcherInterface $dispatcher,
-								IRequest $request,
-								LoggerInterface $logger,
-								MemoryInfo $memoryInfo) {
-		$defaults = \OC::$server->getThemingDefaults();
-		$this->config = $config;
-		$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
-		$this->dispatcher = $dispatcher;
-		$this->request = $request;
-		$this->logger = $logger;
-		$this->memoryInfo = $memoryInfo;
-	}
+    public function __construct(IConfig $config,
+                                EventDispatcherInterface $dispatcher,
+                                IRequest $request,
+                                LoggerInterface $logger,
+                                MemoryInfo $memoryInfo) {
+        $defaults = \OC::$server->getThemingDefaults();
+        $this->config = $config;
+        $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
+        $this->dispatcher = $dispatcher;
+        $this->request = $request;
+        $this->logger = $logger;
+        $this->memoryInfo = $memoryInfo;
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param ConsoleOutputInterface $output
-	 * @throws \Exception
-	 */
-	public function loadCommands(
-		InputInterface $input,
-		ConsoleOutputInterface $output
-	) {
-		// $application is required to be defined in the register_command scripts
-		$application = $this->application;
-		$inputDefinition = $application->getDefinition();
-		$inputDefinition->addOption(
-			new InputOption(
-				'no-warnings',
-				null,
-				InputOption::VALUE_NONE,
-				'Skip global warnings, show command output only',
-				null
-			)
-		);
-		try {
-			$input->bind($inputDefinition);
-		} catch (\RuntimeException $e) {
-			//expected if there are extra options
-		}
-		if ($input->getOption('no-warnings')) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-		}
+    /**
+     * @param InputInterface $input
+     * @param ConsoleOutputInterface $output
+     * @throws \Exception
+     */
+    public function loadCommands(
+        InputInterface $input,
+        ConsoleOutputInterface $output
+    ) {
+        // $application is required to be defined in the register_command scripts
+        $application = $this->application;
+        $inputDefinition = $application->getDefinition();
+        $inputDefinition->addOption(
+            new InputOption(
+                'no-warnings',
+                null,
+                InputOption::VALUE_NONE,
+                'Skip global warnings, show command output only',
+                null
+            )
+        );
+        try {
+            $input->bind($inputDefinition);
+        } catch (\RuntimeException $e) {
+            //expected if there are extra options
+        }
+        if ($input->getOption('no-warnings')) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
+        }
 
-		if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
-			$output->getErrorOutput()->writeln(
-				'<comment>The current PHP memory limit ' .
-				'is below the recommended value of 512MB.</comment>'
-			);
-		}
+        if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
+            $output->getErrorOutput()->writeln(
+                '<comment>The current PHP memory limit ' .
+                'is below the recommended value of 512MB.</comment>'
+            );
+        }
 
-		try {
-			require_once __DIR__ . '/../../../core/register_command.php';
-			if ($this->config->getSystemValueBool('installed', false)) {
-				if (\OCP\Util::needUpgrade()) {
-					throw new NeedsUpdateException();
-				} elseif ($this->config->getSystemValueBool('maintenance')) {
-					$this->writeMaintenanceModeInfo($input, $output);
-				} else {
-					OC_App::loadApps();
-					$appManager = \OCP\Server::get(IAppManager::class);
-					foreach ($appManager->getInstalledApps() as $app) {
-						$appPath = \OC_App::getAppPath($app);
-						if ($appPath === false) {
-							continue;
-						}
-						// load commands using info.xml
-						$info = $appManager->getAppInfo($app);
-						if (isset($info['commands'])) {
-							$this->loadCommandsFromInfoXml($info['commands']);
-						}
-						// load from register_command.php
-						\OC_App::registerAutoloading($app, $appPath);
-						$file = $appPath . '/appinfo/register_command.php';
-						if (file_exists($file)) {
-							try {
-								require $file;
-							} catch (\Exception $e) {
-								$this->logger->error($e->getMessage(), [
-									'exception' => $e,
-								]);
-							}
-						}
-					}
-				}
-			} elseif ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
-				$errorOutput = $output->getErrorOutput();
-				$errorOutput->writeln("Nextcloud is not installed - only a limited number of commands are available");
-			}
-		} catch (NeedsUpdateException $e) {
-			if ($input->getArgument('command') !== '_completion') {
-				$errorOutput = $output->getErrorOutput();
-				$errorOutput->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
-				$errorOutput->writeln("You may use your browser or the occ upgrade command to do the upgrade");
-			}
-		}
+        try {
+            require_once __DIR__ . '/../../../core/register_command.php';
+            if ($this->config->getSystemValueBool('installed', false)) {
+                if (\OCP\Util::needUpgrade()) {
+                    throw new NeedsUpdateException();
+                } elseif ($this->config->getSystemValueBool('maintenance')) {
+                    $this->writeMaintenanceModeInfo($input, $output);
+                } else {
+                    OC_App::loadApps();
+                    $appManager = \OCP\Server::get(IAppManager::class);
+                    foreach ($appManager->getInstalledApps() as $app) {
+                        $appPath = \OC_App::getAppPath($app);
+                        if ($appPath === false) {
+                            continue;
+                        }
+                        // load commands using info.xml
+                        $info = $appManager->getAppInfo($app);
+                        if (isset($info['commands'])) {
+                            $this->loadCommandsFromInfoXml($info['commands']);
+                        }
+                        // load from register_command.php
+                        \OC_App::registerAutoloading($app, $appPath);
+                        $file = $appPath . '/appinfo/register_command.php';
+                        if (file_exists($file)) {
+                            try {
+                                require $file;
+                            } catch (\Exception $e) {
+                                $this->logger->error($e->getMessage(), [
+                                    'exception' => $e,
+                                ]);
+                            }
+                        }
+                    }
+                }
+            } elseif ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') {
+                $errorOutput = $output->getErrorOutput();
+                $errorOutput->writeln("Nextcloud is not installed - only a limited number of commands are available");
+            }
+        } catch (NeedsUpdateException $e) {
+            if ($input->getArgument('command') !== '_completion') {
+                $errorOutput = $output->getErrorOutput();
+                $errorOutput->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
+                $errorOutput->writeln("You may use your browser or the occ upgrade command to do the upgrade");
+            }
+        }
 
-		if ($input->getFirstArgument() !== 'check') {
-			$errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
-			if (!empty($errors)) {
-				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
-					$output->writeln('');
-				}
-				throw new \Exception("Environment not properly prepared.");
-			}
-		}
-	}
+        if ($input->getFirstArgument() !== 'check') {
+            $errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
+            if (!empty($errors)) {
+                foreach ($errors as $error) {
+                    $output->writeln((string)$error['error']);
+                    $output->writeln((string)$error['hint']);
+                    $output->writeln('');
+                }
+                throw new \Exception("Environment not properly prepared.");
+            }
+        }
+    }
 
-	/**
-	 * Write a maintenance mode info.
-	 * The commands "_completion" and "maintenance:mode" are excluded.
-	 *
-	 * @param InputInterface $input The input implementation for reading inputs.
-	 * @param ConsoleOutputInterface $output The output implementation
-	 * for writing outputs.
-	 * @return void
-	 */
-	private function writeMaintenanceModeInfo(InputInterface $input, ConsoleOutputInterface $output): void {
-		if ($input->getArgument('command') !== '_completion'
-			&& $input->getArgument('command') !== 'maintenance:mode'
-			&& $input->getArgument('command') !== 'status') {
-			$errOutput = $output->getErrorOutput();
-			$errOutput->writeln('<comment>Nextcloud is in maintenance mode, no apps are loaded.</comment>');
-			$errOutput->writeln('<comment>Commands provided by apps are unavailable.</comment>');
-		}
-	}
+    /**
+     * Write a maintenance mode info.
+     * The commands "_completion" and "maintenance:mode" are excluded.
+     *
+     * @param InputInterface $input The input implementation for reading inputs.
+     * @param ConsoleOutputInterface $output The output implementation
+     * for writing outputs.
+     * @return void
+     */
+    private function writeMaintenanceModeInfo(InputInterface $input, ConsoleOutputInterface $output): void {
+        if ($input->getArgument('command') !== '_completion'
+            && $input->getArgument('command') !== 'maintenance:mode'
+            && $input->getArgument('command') !== 'status') {
+            $errOutput = $output->getErrorOutput();
+            $errOutput->writeln('<comment>Nextcloud is in maintenance mode, no apps are loaded.</comment>');
+            $errOutput->writeln('<comment>Commands provided by apps are unavailable.</comment>');
+        }
+    }
 
-	/**
-	 * 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);
-	}
+    /**
+     * 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);
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
-			ConsoleEvent::EVENT_RUN,
-			$this->request->server['argv']
-		));
-		return $this->application->run($input, $output);
-	}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null) {
+        $this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
+            ConsoleEvent::EVENT_RUN,
+            $this->request->server['argv']
+        ));
+        return $this->application->run($input, $output);
+    }
 
-	private function loadCommandsFromInfoXml($commands) {
-		foreach ($commands as $command) {
-			try {
-				$c = \OC::$server->query($command);
-			} catch (QueryException $e) {
-				if (class_exists($command)) {
-					try {
-						$c = new $command();
-					} catch (\ArgumentCountError $e2) {
-						throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
-					}
-				} else {
-					throw new \Exception("Console command '$command' is unknown and could not be loaded");
-				}
-			}
+    private function loadCommandsFromInfoXml($commands) {
+        foreach ($commands as $command) {
+            try {
+                $c = \OC::$server->query($command);
+            } catch (QueryException $e) {
+                if (class_exists($command)) {
+                    try {
+                        $c = new $command();
+                    } catch (\ArgumentCountError $e2) {
+                        throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
+                    }
+                } else {
+                    throw new \Exception("Console command '$command' is unknown and could not be loaded");
+                }
+            }
 
-			$this->application->add($c);
-		}
-	}
+            $this->application->add($c);
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -105,13 +105,13 @@ 
 
 		if ($this->memoryInfo->isMemoryLimitSufficient() === false) {
 			$output->getErrorOutput()->writeln(
-				'<comment>The current PHP memory limit ' .
+				'<comment>The current PHP memory limit '.
 				'is below the recommended value of 512MB.</comment>'
 			);
 		}
 
 		try {
-			require_once __DIR__ . '/../../../core/register_command.php';
+			require_once __DIR__.'/../../../core/register_command.php';
 			if ($this->config->getSystemValueBool('installed', false)) {
 				if (\OCP\Util::needUpgrade()) {
 					throw new NeedsUpdateException();
@@ -132,7 +132,7 @@ 
 						}
 						// load from register_command.php
 						\OC_App::registerAutoloading($app, $appPath);
-						$file = $appPath . '/appinfo/register_command.php';
+						$file = $appPath.'/appinfo/register_command.php';
 						if (file_exists($file)) {
 							try {
 								require $file;
@@ -160,8 +160,8 @@ 
 			$errors = \OC_Util::checkServer(\OC::$server->getSystemConfig());
 			if (!empty($errors)) {
 				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
+					$output->writeln((string) $error['error']);
+					$output->writeln((string) $error['hint']);
 					$output->writeln('');
 				}
 				throw new \Exception("Environment not properly prepared.");
@@ -220,7 +220,7 @@ 
 					try {
 						$c = new $command();
 					} catch (\ArgumentCountError $e2) {
-						throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e);
+						throw new \Exception("Failed to construct console command '$command': ".$e->getMessage(), 0, $e);
 					}
 				} else {
 					throw new \Exception("Console command '$command' is unknown and could not be loaded");