nextcloud / server

apps/sharebymail/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -27,40 +27,40 @@
 
 class Admin implements ISettings {
 
-	/** @var SettingsManager */
-	private $settingsManager;
+    /** @var SettingsManager */
+    private $settingsManager;
 
-	public function __construct(SettingsManager $settingsManager) {
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(SettingsManager $settingsManager) {
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
-			'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
+            'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
+        ];
 
-		return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
 }

apps/sharebymail/templates/settings-admin.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 	<p>
 		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) {
-	p('checked');
+    p('checked');
 } ?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
 		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) {
-	p('checked');
+    p('checked');
 } ?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 		$container = $this->getContainer();
 		$server = $container->getServer();
 
-		$container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(NewUserMailHelper::class, function(SimpleContainer $c) use ($server) {
 			return new NewUserMailHelper(
 				$server->query(Defaults::class),
 				$server->getURLGenerator(),
@@ -30,7 +30,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserManager()->get($c['UserId']);
 			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
 			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;

Indentation +29 added lines, -29 removed lines

@@ -37,35 +37,35 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
-			return new NewUserMailHelper(
-				$server->query(Defaults::class),
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
-			return new ProvisioningApiMiddleware(
-				$c->query(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$container->registerMiddleWare('ProvisioningApiMiddleware');
-	}
+        $container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
+            return new NewUserMailHelper(
+                $server->query(Defaults::class),
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserManager()->get($c['UserId']);
+            $isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
+            $isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+            return new ProvisioningApiMiddleware(
+                $c->query(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $container->registerMiddleWare('ProvisioningApiMiddleware');
+    }
 }

apps/files_versions/lib/Command/ExpireVersions.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 		} else {
 			$p = new ProgressBar($output);
 			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
 				$p->advance();
 				$this->expireVersionsForUser($user);
 			});
@@ -116,7 +116,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

Indentation +78 added lines, -78 removed lines

@@ -36,92 +36,92 @@
 
 class ExpireVersions extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param Expiration $expiration
-	 */
-	public function __construct(IUserManager $userManager,
-								Expiration $expiration) {
-		parent::__construct();
+    /**
+     * @param IUserManager $userManager
+     * @param Expiration $expiration
+     */
+    public function __construct(IUserManager $userManager,
+                                Expiration $expiration) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:expire')
+            ->setDescription('Expires the users file versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireVersionsForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
-				$p->advance();
-				$this->expireVersionsForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireVersionsForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+                $p->advance();
+                $this->expireVersionsForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	public function expireVersionsForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		Storage::expireOlderThanMaxForUser($uid);
-	}
+    public function expireVersionsForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        Storage::expireOlderThanMaxForUser($uid);
+    }
 
-	/**
-	 * Act on behalf on versions item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on versions item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a version directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_versions/lib/Command/CleanUp.php

Indentation +67 added lines, -67 removed lines

@@ -32,81 +32,81 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IRootFolder */
-	protected $rootFolder;
+    /** @var IRootFolder */
+    protected $rootFolder;
 
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     */
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:cleanup')
-			->setDescription('Delete versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:cleanup')
+            ->setDescription('Delete versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
+            );
+    }
 
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Delete versions of   <info>$user</info>");
-					$this->deleteVersions($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$output->writeln('Delete all versions');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Delete versions of   <info>$user</info>");
+                    $this->deleteVersions($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $output->writeln('Delete all versions');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
 
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
 
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
 
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$output->writeln("   <info>$user</info>");
-						$this->deleteVersions($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $output->writeln("   <info>$user</info>");
+                        $this->deleteVersions($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
 
 
-	/**
-	 * delete versions for the given user
-	 *
-	 * @param string $user
-	 */
-	protected function deleteVersions($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
-		}
-	}
+    /**
+     * delete versions for the given user
+     *
+     * @param string $user
+     */
+    protected function deleteVersions($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -105,8 +105,8 @@
 	protected function deleteVersions($user) {
 		\OC_Util::tearDownFS();
 		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
+		if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) {
+			$this->rootFolder->get('/'.$user.'/files_versions')->delete();
 		}
 	}
 }

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 			return;
 		}
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
+		$this->userManager->callForSeenUsers(function(IUser $user) {
 			$uid = $user->getUID();
 			if (!$this->setupFS($uid)) {
 				return;
@@ -85,7 +85,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

Indentation +43 added lines, -43 removed lines

@@ -31,56 +31,56 @@
 use OCP\IUserManager;
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
-	public const ITEMS_PER_SESSION = 1000;
+    public const ITEMS_PER_SESSION = 1000;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IUserManager $userManager, Expiration $expiration) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IUserManager $userManager, Expiration $expiration) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		$this->expiration = $expiration;
-		$this->userManager = $userManager;
-	}
+        $this->expiration = $expiration;
+        $this->userManager = $userManager;
+    }
 
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

core/Command/Integrity/SignCore.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 			$this->checker->writeCoreSignature($x509, $rsa, $path);
 			$output->writeln('Successfully signed "core"');
 		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 		return 0;

Indentation +57 added lines, -57 removed lines

@@ -38,69 +38,69 @@
  * @package OC\Core\Command\Integrity
  */
 class SignCore extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-core')
-			->setDescription('Sign core using a private key.')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-core')
+            ->setDescription('Sign core using a private key.')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		$path = $input->getOption('path');
-		if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
-			$output->writeln('--privateKey, --certificate and --path are required.');
-			return null;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        $path = $input->getOption('path');
+        if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
+            $output->writeln('--privateKey, --certificate and --path are required.');
+            return null;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if ($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return null;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return null;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return null;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return null;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
 
-		try {
-			$this->checker->writeCoreSignature($x509, $rsa, $path);
-			$output->writeln('Successfully signed "core"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        try {
+            $this->checker->writeCoreSignature($x509, $rsa, $path);
+            $output->writeln('Successfully signed "core"');
+        } catch (\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/Integrity/SignApp.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
 			$output->writeln('This command requires the --path, --privateKey and --certificate.');
 			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
+			$output->writeln('For more information please consult the documentation: '.$documentationUrl);
 			return null;
 		}
 
@@ -107,7 +107,7 @@ 
 			$this->checker->writeAppSignature($path, $x509, $rsa);
 			$output->writeln('Successfully signed "'.$path.'"');
 		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 		return 0;

Indentation +65 added lines, -65 removed lines

@@ -39,76 +39,76 @@
  * @package OC\Core\Command\Integrity
  */
 class SignApp extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper,
-								IURLGenerator $urlGenerator) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-app')
-			->setDescription('Signs an app using a private key.')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-app')
+            ->setDescription('Signs an app using a private key.')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getOption('path');
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
-			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
-			$output->writeln('This command requires the --path, --privateKey and --certificate.');
-			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
-			return null;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getOption('path');
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
+            $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
+            $output->writeln('This command requires the --path, --privateKey and --certificate.');
+            $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
+            $output->writeln('For more information please consult the documentation: '. $documentationUrl);
+            return null;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if ($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return null;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return null;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return null;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return null;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
-		try {
-			$this->checker->writeAppSignature($path, $x509, $rsa);
-			$output->writeln('Successfully signed "'.$path.'"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
+        try {
+            $this->checker->writeAppSignature($path, $x509, $rsa);
+            $output->writeln('Successfully signed "'.$path.'"');
+        } catch (\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }