nextcloud / server

core/Command/Maintenance/Mimetype/UpdateJS.php

Indentation +80 added lines, -80 removed lines

@@ -32,82 +32,82 @@ 
 
 class UpdateJS extends Command {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-js')
-			->setDescription('Update mimetypelist.js');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// Fetch all the aliases
-		$aliases = $this->mimetypeDetector->getAllAliases();
-
-		// Remove comments
-		$keys = array_filter(array_keys($aliases), function($k) {
-			return $k[0] === '_';
-		});
-		foreach($keys as $key) {
-			unset($aliases[$key]);
-		}
-
-		// Fetch all files
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
-
-		$files = [];
-		foreach($dir as $fileInfo) {
-			if ($fileInfo->isFile()) {
-				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-				$files[] = $file;
-			}
-		}
-
-		//Remove duplicates
-		$files = array_values(array_unique($files));
-		sort($files);
-
-		// Fetch all themes!
-		$themes = [];
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
-			//Valid theme dir
-			if ($dir->isFile() || $dir->isDot()) {
-				continue;
-			}
-
-			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
-			// Check if this theme has its own filetype icons
-			if (!file_exists($themeDir)) {
-				continue;
-			}
-
-			$themes[$theme] = [];
-			// Fetch all the theme icons!
-			$themeIt = new \DirectoryIterator($themeDir);
-			foreach ($themeIt as $fileInfo) {
-				if ($fileInfo->isFile()) {
-					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-					$themes[$theme][] = $file;
-				}
-			}
-
-			//Remove Duplicates
-			$themes[$theme] = array_values(array_unique($themes[$theme]));
-			sort($themes[$theme]);
-		}
-
-		//Generate the JS
-		$js = '/**
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
+
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-js')
+            ->setDescription('Update mimetypelist.js');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // Fetch all the aliases
+        $aliases = $this->mimetypeDetector->getAllAliases();
+
+        // Remove comments
+        $keys = array_filter(array_keys($aliases), function($k) {
+            return $k[0] === '_';
+        });
+        foreach($keys as $key) {
+            unset($aliases[$key]);
+        }
+
+        // Fetch all files
+        $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
+
+        $files = [];
+        foreach($dir as $fileInfo) {
+            if ($fileInfo->isFile()) {
+                $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                $files[] = $file;
+            }
+        }
+
+        //Remove duplicates
+        $files = array_values(array_unique($files));
+        sort($files);
+
+        // Fetch all themes!
+        $themes = [];
+        $dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
+        foreach($dirs as $dir) {
+            //Valid theme dir
+            if ($dir->isFile() || $dir->isDot()) {
+                continue;
+            }
+
+            $theme = $dir->getFilename();
+            $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+            // Check if this theme has its own filetype icons
+            if (!file_exists($themeDir)) {
+                continue;
+            }
+
+            $themes[$theme] = [];
+            // Fetch all the theme icons!
+            $themeIt = new \DirectoryIterator($themeDir);
+            foreach ($themeIt as $fileInfo) {
+                if ($fileInfo->isFile()) {
+                    $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                    $themes[$theme][] = $file;
+                }
+            }
+
+            //Remove Duplicates
+            $themes[$theme] = array_values(array_unique($themes[$theme]));
+            sort($themes[$theme]);
+        }
+
+        //Generate the JS
+        $js = '/**
 * This file is automatically generated
 * DO NOT EDIT MANUALLY!
 *
@@ -122,9 +122,9 @@ 
 };
 ';
 
-		//Output the JS
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
+        //Output the JS
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
 
-		$output->writeln('<info>mimetypelist.js is updated');
-	}
+        $output->writeln('<info>mimetypelist.js is updated');
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			unset($aliases[$key]);
 		}
 
@@ -64,7 +64,7 @@ 
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
-		foreach($dir as $fileInfo) {
+		foreach ($dir as $fileInfo) {
 			if ($fileInfo->isFile()) {
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 				$files[] = $file;
@@ -78,14 +78,14 @@ 
 		// Fetch all themes!
 		$themes = [];
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
 				continue;
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -116,9 +116,9 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';
 

core/Command/App/GetPath.php

Indentation +40 added lines, -40 removed lines

@@ -29,48 +29,48 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetPath extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('app:getpath')
-			->setDescription('Get an absolute path to the app directory')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-		;
-	}
+        $this
+            ->setName('app:getpath')
+            ->setDescription('Get an absolute path to the app directory')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface  $input  An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$path = \OC_App::getAppPath($appName);
-		if ($path !== false) {
-			$output->writeln($path);
-			return 0;
-		}
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface  $input  An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $path = \OC_App::getAppPath($appName);
+        if ($path !== false) {
+            $output->writeln($path);
+            return 0;
+        }
 
-		// App not found, exit with non-zero
-		return 1;
-	}
+        // App not found, exit with non-zero
+        return 1;
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

core/Command/Encryption/ShowKeyStorageRoot.php

Indentation +25 added lines, -25 removed lines

@@ -30,30 +30,30 @@
 
 class ShowKeyStorageRoot extends Command{
 
-	/** @var Util  */
-	protected $util;
-
-	/**
-	 * @param Util $util
-	 */
-	public function __construct(Util $util) {
-		parent::__construct();
-		$this->util = $util;
-	}
-
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('encryption:show-key-storage-root')
-			->setDescription('Show current key storage root');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$currentRoot = $this->util->getKeyStorageRoot();
-
-		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
-
-		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
-	}
+    /** @var Util  */
+    protected $util;
+
+    /**
+     * @param Util $util
+     */
+    public function __construct(Util $util) {
+        parent::__construct();
+        $this->util = $util;
+    }
+
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('encryption:show-key-storage-root')
+            ->setDescription('Show current key storage root');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $currentRoot = $this->util->getKeyStorageRoot();
+
+        $rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
+
+        $output->writeln("Current key storage root:  <info>$rootDescription</info>");
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ShowKeyStorageRoot extends Command{
+class ShowKeyStorageRoot extends Command {
 
 	/** @var Util  */
 	protected $util;

core/Command/Encryption/Enable.php

Indentation +41 added lines, -41 removed lines

@@ -29,51 +29,51 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Enable extends Command {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct(IConfig $config, IManager $encryptionManager) {
-		parent::__construct();
+    /**
+     * @param IConfig $config
+     * @param IManager $encryptionManager
+     */
+    public function __construct(IConfig $config, IManager $encryptionManager) {
+        parent::__construct();
 
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-	}
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:enable')
-			->setDescription('Enable encryption')
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:enable')
+            ->setDescription('Enable encryption')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
-			$output->writeln('Encryption is already enabled');
-		} else {
-			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-			$output->writeln('<info>Encryption enabled</info>');
-		}
-		$output->writeln('');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
+            $output->writeln('Encryption is already enabled');
+        } else {
+            $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+            $output->writeln('<info>Encryption enabled</info>');
+        }
+        $output->writeln('');
 
-		$modules = $this->encryptionManager->getEncryptionModules();
-		if (empty($modules)) {
-			$output->writeln('<error>No encryption module is loaded</error>');
-		} else {
-			$defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null);
-			if ($defaultModule === null) {
-				$output->writeln('<error>No default module is set</error>');
-			} else if (!isset($modules[$defaultModule])) {
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
-			} else {
-				$output->writeln('Default module: ' . $defaultModule);
-			}
-		}
-	}
+        $modules = $this->encryptionManager->getEncryptionModules();
+        if (empty($modules)) {
+            $output->writeln('<error>No encryption module is loaded</error>');
+        } else {
+            $defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null);
+            if ($defaultModule === null) {
+                $output->writeln('<error>No default module is set</error>');
+            } else if (!isset($modules[$defaultModule])) {
+                $output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
+            } else {
+                $output->writeln('Default module: ' . $defaultModule);
+            }
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -70,9 +70,9 @@
 			if ($defaultModule === null) {
 				$output->writeln('<error>No default module is set</error>');
 			} else if (!isset($modules[$defaultModule])) {
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
+				$output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>');
 			} else {
-				$output->writeln('Default module: ' . $defaultModule);
+				$output->writeln('Default module: '.$defaultModule);
 			}
 		}
 	}

core/Command/Encryption/Disable.php

Indentation +23 added lines, -23 removed lines

@@ -28,30 +28,30 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Disable extends Command {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:disable')
-			->setDescription('Disable encryption')
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:disable')
+            ->setDescription('Disable encryption')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
-			$output->writeln('Encryption is already disabled');
-		} else {
-			$this->config->setAppValue('core', 'encryption_enabled', 'no');
-			$output->writeln('<info>Encryption disabled</info>');
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
+            $output->writeln('Encryption is already disabled');
+        } else {
+            $this->config->setAppValue('core', 'encryption_enabled', 'no');
+            $output->writeln('<info>Encryption disabled</info>');
+        }
+    }
 }

core/Command/Encryption/ListModules.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 				if (!$item['default']) {
 					$item = $item['displayName'];
 				} else {
-					$item = $item['displayName'] . ' [default*]';
+					$item = $item['displayName'].' [default*]';
 				}
 			});
 		}

Indentation +56 added lines, -56 removed lines

@@ -29,69 +29,69 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListModules extends Base {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IConfig $config
-	) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-	}
+    /**
+     * @param IManager $encryptionManager
+     * @param IConfig $config
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IConfig $config
+    ) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:list-modules')
-			->setDescription('List all available encryption modules')
-		;
-	}
+        $this
+            ->setName('encryption:list-modules')
+            ->setDescription('List all available encryption modules')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln("Maintenance mode must be disabled when listing modules");
-			$output->writeln("in order to list the relevant encryption modules correctly.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln("Maintenance mode must be disabled when listing modules");
+            $output->writeln("in order to list the relevant encryption modules correctly.");
+            return;
+        }
 
-		$encryptionModules = $this->encryptionManager->getEncryptionModules();
-		$defaultEncryptionModuleId = $this->encryptionManager->getDefaultEncryptionModuleId();
+        $encryptionModules = $this->encryptionManager->getEncryptionModules();
+        $defaultEncryptionModuleId = $this->encryptionManager->getDefaultEncryptionModuleId();
 
-		$encModules = array();
-		foreach ($encryptionModules as $module) {
-			$encModules[$module['id']]['displayName'] = $module['displayName'];
-			$encModules[$module['id']]['default'] = $module['id'] === $defaultEncryptionModuleId;
-		}
-		$this->writeModuleList($input, $output, $encModules);
-	}
+        $encModules = array();
+        foreach ($encryptionModules as $module) {
+            $encModules[$module['id']]['displayName'] = $module['displayName'];
+            $encModules[$module['id']]['default'] = $module['id'] === $defaultEncryptionModuleId;
+        }
+        $this->writeModuleList($input, $output, $encModules);
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 */
-	protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
-		if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-			array_walk($items, function(&$item) {
-				if (!$item['default']) {
-					$item = $item['displayName'];
-				} else {
-					$item = $item['displayName'] . ' [default*]';
-				}
-			});
-		}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     */
+    protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
+        if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
+            array_walk($items, function(&$item) {
+                if (!$item['default']) {
+                    $item = $item['displayName'];
+                } else {
+                    $item = $item['displayName'] . ' [default*]';
+                }
+            });
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, $items);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $items);
+    }
 }

core/Command/Encryption/Status.php

Indentation +22 added lines, -22 removed lines

@@ -28,30 +28,30 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Status extends Base {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/**
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct(IManager $encryptionManager) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-	}
+    /**
+     * @param IManager $encryptionManager
+     */
+    public function __construct(IManager $encryptionManager) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:status')
-			->setDescription('Lists the current status of encryption')
-		;
-	}
+        $this
+            ->setName('encryption:status')
+            ->setDescription('Lists the current status of encryption')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->writeArrayInOutputFormat($input, $output, [
-			'enabled' => $this->encryptionManager->isEnabled(),
-			'defaultModule' => $this->encryptionManager->getDefaultEncryptionModuleId(),
-		]);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->writeArrayInOutputFormat($input, $output, [
+            'enabled' => $this->encryptionManager->isEnabled(),
+            'defaultModule' => $this->encryptionManager->getDefaultEncryptionModuleId(),
+        ]);
+    }
 }

core/Command/Encryption/SetDefaultModule.php

Spacing +3 added lines, -3 removed lines

@@ -59,11 +59,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 		}
 	}
 }

Indentation +44 added lines, -44 removed lines

@@ -31,55 +31,55 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetDefaultModule extends Command {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IConfig $config
-	) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-	}
+    /**
+     * @param IManager $encryptionManager
+     * @param IConfig $config
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IConfig $config
+    ) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:set-default-module')
-			->setDescription('Set the encryption default module')
-			->addArgument(
-				'module',
-				InputArgument::REQUIRED,
-				'ID of the encryption module that should be used'
-			)
-		;
-	}
+        $this
+            ->setName('encryption:set-default-module')
+            ->setDescription('Set the encryption default module')
+            ->addArgument(
+                'module',
+                InputArgument::REQUIRED,
+                'ID of the encryption module that should be used'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln("Maintenance mode must be disabled when setting default module,");
-			$output->writeln("in order to load the relevant encryption modules correctly.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln("Maintenance mode must be disabled when setting default module,");
+            $output->writeln("in order to load the relevant encryption modules correctly.");
+            return;
+        }
 
-		$moduleId = $input->getArgument('module');
+        $moduleId = $input->getArgument('module');
 
-		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
-		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
-		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
-		}
-	}
+        if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
+            $output->writeln('"' . $moduleId . '"" is already the default module');
+        } else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
+            $output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+        } else {
+            $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+        }
+    }
 }

core/Command/Group/ListCommand.php

Indentation +50 added lines, -50 removed lines

@@ -34,58 +34,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IGroupManager $groupManager) {
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:list')
-			->setDescription('list configured groups')
-			->addOption(
-				'limit',
-				'l',
-				InputOption::VALUE_OPTIONAL,
-				'Number of groups to retrieve',
-				500
-			)->addOption(
-				'offset',
-				'o',
-				InputOption::VALUE_OPTIONAL,
-				'Offset for retrieving groups',
-				0
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:list')
+            ->setDescription('list configured groups')
+            ->addOption(
+                'limit',
+                'l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of groups to retrieve',
+                500
+            )->addOption(
+                'offset',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                'Offset for retrieving groups',
+                0
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+        $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
+    }
 
-	/**
-	 * @param IGroup[] $groups
-	 * @return array
-	 */
-	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
-			return $group->getGID();
-		}, $groups);
-		$values = array_map(function (IGroup $group) {
-			return array_keys($group->getUsers());
-		}, $groups);
-		return array_combine($keys, $values);
-	}
+    /**
+     * @param IGroup[] $groups
+     * @return array
+     */
+    private function formatGroups(array $groups) {
+        $keys = array_map(function (IGroup $group) {
+            return $group->getGID();
+        }, $groups);
+        $values = array_map(function (IGroup $group) {
+            return array_keys($group->getUsers());
+        }, $groups);
+        return array_combine($keys, $values);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
 	}
 
@@ -80,10 +80,10 @@ 
 	 * @return array
 	 */
 	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
+		$keys = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
-		$values = array_map(function (IGroup $group) {
+		$values = array_map(function(IGroup $group) {
 			return array_keys($group->getUsers());
 		}, $groups);
 		return array_combine($keys, $values);