nextcloud / server

lib/private/App/CodeChecker/InfoChecker.php

Indentation +70 added lines, -70 removed lines

@@ -29,82 +29,82 @@
 
 class InfoChecker extends BasicEmitter {
 
-	/** @var string[] */
-	private $shippedApps;
+    /** @var string[] */
+    private $shippedApps;
 
-	/** @var string[] */
-	private $alwaysEnabled;
+    /** @var string[] */
+    private $alwaysEnabled;
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 * @throws \RuntimeException
-	 */
-	public function analyse($appId): array {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
+    /**
+     * @param string $appId
+     * @return array
+     * @throws \RuntimeException
+     */
+    public function analyse($appId): array {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
 
-		$xml = new \DOMDocument();
-		$xml->load($appPath . '/appinfo/info.xml');
+        $xml = new \DOMDocument();
+        $xml->load($appPath . '/appinfo/info.xml');
 
-		$schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
-		try {
-			if ($this->isShipped($appId)) {
-				// Shipped apps are allowed to have the public and default_enabled tags
-				$schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
-			}
-		} catch (\Exception $e) {
-			// Assume it is not shipped
-		}
+        $schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
+        try {
+            if ($this->isShipped($appId)) {
+                // Shipped apps are allowed to have the public and default_enabled tags
+                $schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
+            }
+        } catch (\Exception $e) {
+            // Assume it is not shipped
+        }
 
-		$errors = [];
-		if (!$xml->schemaValidate($schema)) {
-			foreach (libxml_get_errors() as $error) {
-				$errors[] = [
-					'type' => 'parseError',
-					'field' => $error->message,
-				];
-				$this->emit('InfoChecker', 'parseError', [$error->message]);
-			}
-		}
+        $errors = [];
+        if (!$xml->schemaValidate($schema)) {
+            foreach (libxml_get_errors() as $error) {
+                $errors[] = [
+                    'type' => 'parseError',
+                    'field' => $error->message,
+                ];
+                $this->emit('InfoChecker', 'parseError', [$error->message]);
+            }
+        }
 
-		return $errors;
-	}
+        return $errors;
+    }
 
-	/**
-	 * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync.
-	 * This method is copied, so the code checker works even when Nextcloud is
-	 * not installed yet. The AppManager requires a database connection, which
-	 * fails in that case.
-	 *
-	 * @param string $appId
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function isShipped(string $appId): bool {
-		$this->loadShippedJson();
-		return \in_array($appId, $this->shippedApps, true);
-	}
+    /**
+     * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync.
+     * This method is copied, so the code checker works even when Nextcloud is
+     * not installed yet. The AppManager requires a database connection, which
+     * fails in that case.
+     *
+     * @param string $appId
+     * @return bool
+     * @throws \Exception
+     */
+    protected function isShipped(string $appId): bool {
+        $this->loadShippedJson();
+        return \in_array($appId, $this->shippedApps, true);
+    }
 
-	/**
-	 * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync
-	 * This method is copied, so the code checker works even when Nextcloud is
-	 * not installed yet. The AppManager requires a database connection, which
-	 * fails in that case.
-	 *
-	 * @throws \Exception
-	 */
-	protected function loadShippedJson() {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-		}
-	}
+    /**
+     * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync
+     * This method is copied, so the code checker works even when Nextcloud is
+     * not installed yet. The AppManager requires a database connection, which
+     * fails in that case.
+     *
+     * @throws \Exception
+     */
+    protected function loadShippedJson() {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+        }
+    }
 }

core/Command/App/CheckCode.php

Indentation +163 added lines, -163 removed lines

@@ -44,167 +44,167 @@
 
 class CheckCode extends Command implements CompletionAwareInterface  {
 
-	protected $checkers = [
-		'private' => PrivateCheck::class,
-		'deprecation' => DeprecationCheck::class,
-		'strong-comparison' => StrongComparisonCheck::class,
-	];
-
-	protected function configure() {
-		$this
-			->setName('app:check-code')
-			->setDescription('check code to be compliant')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'check the specified app'
-			)
-			->addOption(
-				'checker',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'enable the specified checker(s)',
-				[ 'private', 'deprecation', 'strong-comparison' ]
-			)
-			->addOption(
-				'--skip-checkers',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the the code checkers to only check info.xml, language and database schema'
-			)
-			->addOption(
-				'--skip-validate-info',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the info.xml/version check'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
-
-		$checkList = new EmptyCheck();
-		foreach ($input->getOption('checker') as $checker) {
-			if (!isset($this->checkers[$checker])) {
-				throw new \InvalidArgumentException('Invalid checker: '.$checker);
-			}
-			$checkerClass = $this->checkers[$checker];
-			$checkList = new $checkerClass($checkList);
-		}
-
-		$codeChecker = new CodeChecker($checkList, !$input->getOption('skip-validate-info'));
-
-		$codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
-			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$output->writeln("<info>Analysing {$params}</info>");
-			}
-		});
-		$codeChecker->listen('CodeChecker', 'analyseFileFinished', function($filename, $errors) use ($output) {
-			$count = count($errors);
-
-			// show filename if the verbosity is low, but there are errors in a file
-			if($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
-				$output->writeln("<info>Analysing {$filename}</info>");
-			}
-
-			// show error count if there are errors present or the verbosity is high
-			if($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$output->writeln(" {$count} errors");
-			}
-			usort($errors, function($a, $b) {
-				return $a['line'] >$b['line'];
-			});
-
-			foreach($errors as $p) {
-				$line = sprintf("%' 4d", $p['line']);
-				$output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
-			}
-		});
-		$errors = [];
-		if(!$input->getOption('skip-checkers')) {
-			$errors = $codeChecker->analyse($appId);
-		}
-
-		if(!$input->getOption('skip-validate-info')) {
-			$infoChecker = new InfoChecker();
-			$infoChecker->listen('InfoChecker', 'parseError', function($error) use ($output) {
-				$output->writeln("<error>Invalid appinfo.xml file found: $error</error>");
-			});
-
-			$infoErrors = $infoChecker->analyse($appId);
-
-			$errors = array_merge($errors, $infoErrors);
-
-			$languageParser = new LanguageParseChecker();
-			$languageErrors = $languageParser->analyse($appId);
-
-			foreach ($languageErrors as $languageError) {
-				$output->writeln("<error>$languageError</error>");
-			}
-
-			$errors = array_merge($errors, $languageErrors);
-
-			$databaseSchema = new DatabaseSchemaChecker();
-			$schemaErrors = $databaseSchema->analyse($appId);
-
-			foreach ($schemaErrors['errors'] as $schemaError) {
-				$output->writeln("<error>$schemaError</error>");
-			}
-			foreach ($schemaErrors['warnings'] as $schemaWarning) {
-				$output->writeln("<comment>$schemaWarning</comment>");
-			}
-
-			$errors = array_merge($errors, $schemaErrors['errors']);
-		}
-
-		$this->analyseUpdateFile($appId, $output);
-
-		if (empty($errors)) {
-			$output->writeln('<info>App is compliant - awesome job!</info>');
-			return 0;
-		} else {
-			$output->writeln('<error>App is not compliant</error>');
-			return 101;
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @param $output
-	 */
-	private function analyseUpdateFile($appId, OutputInterface $output) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		$updatePhp = $appPath . '/appinfo/update.php';
-		if (file_exists($updatePhp)) {
-			$output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'checker') {
-			return ['private', 'deprecation', 'strong-comparison'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    protected $checkers = [
+        'private' => PrivateCheck::class,
+        'deprecation' => DeprecationCheck::class,
+        'strong-comparison' => StrongComparisonCheck::class,
+    ];
+
+    protected function configure() {
+        $this
+            ->setName('app:check-code')
+            ->setDescription('check code to be compliant')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'check the specified app'
+            )
+            ->addOption(
+                'checker',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'enable the specified checker(s)',
+                [ 'private', 'deprecation', 'strong-comparison' ]
+            )
+            ->addOption(
+                '--skip-checkers',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the the code checkers to only check info.xml, language and database schema'
+            )
+            ->addOption(
+                '--skip-validate-info',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the info.xml/version check'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
+
+        $checkList = new EmptyCheck();
+        foreach ($input->getOption('checker') as $checker) {
+            if (!isset($this->checkers[$checker])) {
+                throw new \InvalidArgumentException('Invalid checker: '.$checker);
+            }
+            $checkerClass = $this->checkers[$checker];
+            $checkList = new $checkerClass($checkList);
+        }
+
+        $codeChecker = new CodeChecker($checkList, !$input->getOption('skip-validate-info'));
+
+        $codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
+            if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $output->writeln("<info>Analysing {$params}</info>");
+            }
+        });
+        $codeChecker->listen('CodeChecker', 'analyseFileFinished', function($filename, $errors) use ($output) {
+            $count = count($errors);
+
+            // show filename if the verbosity is low, but there are errors in a file
+            if($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+                $output->writeln("<info>Analysing {$filename}</info>");
+            }
+
+            // show error count if there are errors present or the verbosity is high
+            if($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $output->writeln(" {$count} errors");
+            }
+            usort($errors, function($a, $b) {
+                return $a['line'] >$b['line'];
+            });
+
+            foreach($errors as $p) {
+                $line = sprintf("%' 4d", $p['line']);
+                $output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
+            }
+        });
+        $errors = [];
+        if(!$input->getOption('skip-checkers')) {
+            $errors = $codeChecker->analyse($appId);
+        }
+
+        if(!$input->getOption('skip-validate-info')) {
+            $infoChecker = new InfoChecker();
+            $infoChecker->listen('InfoChecker', 'parseError', function($error) use ($output) {
+                $output->writeln("<error>Invalid appinfo.xml file found: $error</error>");
+            });
+
+            $infoErrors = $infoChecker->analyse($appId);
+
+            $errors = array_merge($errors, $infoErrors);
+
+            $languageParser = new LanguageParseChecker();
+            $languageErrors = $languageParser->analyse($appId);
+
+            foreach ($languageErrors as $languageError) {
+                $output->writeln("<error>$languageError</error>");
+            }
+
+            $errors = array_merge($errors, $languageErrors);
+
+            $databaseSchema = new DatabaseSchemaChecker();
+            $schemaErrors = $databaseSchema->analyse($appId);
+
+            foreach ($schemaErrors['errors'] as $schemaError) {
+                $output->writeln("<error>$schemaError</error>");
+            }
+            foreach ($schemaErrors['warnings'] as $schemaWarning) {
+                $output->writeln("<comment>$schemaWarning</comment>");
+            }
+
+            $errors = array_merge($errors, $schemaErrors['errors']);
+        }
+
+        $this->analyseUpdateFile($appId, $output);
+
+        if (empty($errors)) {
+            $output->writeln('<info>App is compliant - awesome job!</info>');
+            return 0;
+        } else {
+            $output->writeln('<error>App is not compliant</error>');
+            return 101;
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @param $output
+     */
+    private function analyseUpdateFile($appId, OutputInterface $output) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        $updatePhp = $appPath . '/appinfo/update.php';
+        if (file_exists($updatePhp)) {
+            $output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'checker') {
+            return ['private', 'deprecation', 'strong-comparison'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

apps/files_external/lib/Lib/PersonalMount.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
  * Person mount points can be moved by the user
  */
 class PersonalMount extends ExternalMountPoint implements MoveableMount {
-	/** @var UserStoragesService */
-	protected $storagesService;
+    /** @var UserStoragesService */
+    protected $storagesService;
 
-	/** @var int */
-	protected $numericStorageId;
+    /** @var int */
+    protected $numericStorageId;
 
-	/**
-	 * @param UserStoragesService $storagesService
-	 * @param int $storageId
-	 * @param \OCP\Files\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 */
-	public function __construct(
-		UserStoragesService $storagesService,
-		$storageId,
-		$storage,
-		$mountpoint,
-		$arguments = null,
-		$loader = null,
-		$mountOptions = null
-	) {
-		parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
-		$this->storagesService = $storagesService;
-		$this->numericStorageId = $storageId;
-	}
+    /**
+     * @param UserStoragesService $storagesService
+     * @param int $storageId
+     * @param \OCP\Files\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     */
+    public function __construct(
+        UserStoragesService $storagesService,
+        $storageId,
+        $storage,
+        $mountpoint,
+        $arguments = null,
+        $loader = null,
+        $mountOptions = null
+    ) {
+        parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
+        $this->storagesService = $storagesService;
+        $this->numericStorageId = $storageId;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$storage = $this->storagesService->getStorage($this->numericStorageId);
-		// remove "/$user/files" prefix
-		$targetParts = explode('/', trim($target, '/'), 3);
-		$storage->setMountPoint($targetParts[2]);
-		$this->storagesService->updateStorage($storage);
-		$this->setMountPoint($target);
-		return true;
-	}
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $storage = $this->storagesService->getStorage($this->numericStorageId);
+        // remove "/$user/files" prefix
+        $targetParts = explode('/', trim($target, '/'), 3);
+        $storage->setMountPoint($targetParts[2]);
+        $this->storagesService->updateStorage($storage);
+        $this->setMountPoint($target);
+        return true;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$this->storagesService->removeStorage($this->numericStorageId);
-		return true;
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $this->storagesService->removeStorage($this->numericStorageId);
+        return true;
+    }
 }

lib/private/AppFramework/Middleware/MiddlewareDispatcher.php

Indentation +123 added lines, -123 removed lines

@@ -38,128 +38,128 @@
  */
 class MiddlewareDispatcher {
 
-	/**
-	 * @var array array containing all the middlewares
-	 */
-	private $middlewares;
-
-	/**
-	 * @var int counter which tells us what middlware was executed once an
-	 *                  exception occurs
-	 */
-	private $middlewareCounter;
-
-
-	/**
-	 * Constructor
-	 */
-	public function __construct(){
-		$this->middlewares = [];
-		$this->middlewareCounter = 0;
-	}
-
-
-	/**
-	 * Adds a new middleware
-	 * @param Middleware $middleWare the middleware which will be added
-	 */
-	public function registerMiddleware(Middleware $middleWare){
-		$this->middlewares[] = $middleWare;
-	}
-
-
-	/**
-	 * returns an array with all middleware elements
-	 * @return array the middlewares
-	 */
-	public function getMiddlewares(): array {
-		return $this->middlewares;
-	}
-
-
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 */
-	public function beforeController(Controller $controller, string $methodName){
-		// we need to count so that we know which middlewares we have to ask in
-		// case there is an exception
-		$middlewareCount = \count($this->middlewares);
-		for($i = 0; $i < $middlewareCount; $i++){
-			$this->middlewareCounter++;
-			$middleware = $this->middlewares[$i];
-			$middleware->beforeController($controller, $methodName);
-		}
-	}
-
-
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is asked
-	 * in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                            the controller
-	 * @param \Exception $exception the thrown exception
-	 * @return Response a Response object if the middleware can handle the
-	 * exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 */
-	public function afterException(Controller $controller, string $methodName, \Exception $exception): Response {
-		for($i=$this->middlewareCounter-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			try {
-				return $middleware->afterException($controller, $methodName, $exception);
-			} catch(\Exception $exception){
-				continue;
-			}
-		}
-		throw $exception;
-	}
-
-
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                            the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 */
-	public function afterController(Controller $controller, string $methodName, Response $response): Response {
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			$response = $middleware->afterController($controller, $methodName, $response);
-		}
-		return $response;
-	}
-
-
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 */
-	public function beforeOutput(Controller $controller, string $methodName, string $output): string {
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			$output = $middleware->beforeOutput($controller, $methodName, $output);
-		}
-		return $output;
-	}
+    /**
+     * @var array array containing all the middlewares
+     */
+    private $middlewares;
+
+    /**
+     * @var int counter which tells us what middlware was executed once an
+     *                  exception occurs
+     */
+    private $middlewareCounter;
+
+
+    /**
+     * Constructor
+     */
+    public function __construct(){
+        $this->middlewares = [];
+        $this->middlewareCounter = 0;
+    }
+
+
+    /**
+     * Adds a new middleware
+     * @param Middleware $middleWare the middleware which will be added
+     */
+    public function registerMiddleware(Middleware $middleWare){
+        $this->middlewares[] = $middleWare;
+    }
+
+
+    /**
+     * returns an array with all middleware elements
+     * @return array the middlewares
+     */
+    public function getMiddlewares(): array {
+        return $this->middlewares;
+    }
+
+
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     */
+    public function beforeController(Controller $controller, string $methodName){
+        // we need to count so that we know which middlewares we have to ask in
+        // case there is an exception
+        $middlewareCount = \count($this->middlewares);
+        for($i = 0; $i < $middlewareCount; $i++){
+            $this->middlewareCounter++;
+            $middleware = $this->middlewares[$i];
+            $middleware->beforeController($controller, $methodName);
+        }
+    }
+
+
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is asked
+     * in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                            the controller
+     * @param \Exception $exception the thrown exception
+     * @return Response a Response object if the middleware can handle the
+     * exception
+     * @throws \Exception the passed in exception if it can't handle it
+     */
+    public function afterException(Controller $controller, string $methodName, \Exception $exception): Response {
+        for($i=$this->middlewareCounter-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            try {
+                return $middleware->afterException($controller, $methodName, $exception);
+            } catch(\Exception $exception){
+                continue;
+            }
+        }
+        throw $exception;
+    }
+
+
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                            the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     */
+    public function afterController(Controller $controller, string $methodName, Response $response): Response {
+        for($i= \count($this->middlewares)-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            $response = $middleware->afterController($controller, $methodName, $response);
+        }
+        return $response;
+    }
+
+
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     */
+    public function beforeOutput(Controller $controller, string $methodName, string $output): string {
+        for($i= \count($this->middlewares)-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            $output = $middleware->beforeOutput($controller, $methodName, $output);
+        }
+        return $output;
+    }
 
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Indentation +36 added lines, -36 removed lines

@@ -25,45 +25,45 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
+        if($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php

Indentation +16 added lines, -16 removed lines

@@ -30,21 +30,21 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class EnvironmentHelper {
-	/**
-	 * Provides \OC::$SERVERROOT
-	 *
-	 * @return string
-	 */
-	public function getServerRoot(): string {
-		return rtrim(\OC::$SERVERROOT, '/');
-	}
+    /**
+     * Provides \OC::$SERVERROOT
+     *
+     * @return string
+     */
+    public function getServerRoot(): string {
+        return rtrim(\OC::$SERVERROOT, '/');
+    }
 
-	/**
-	 * Provides \OC_Util::getChannel()
-	 *
-	 * @return string
-	 */
-	public function getChannel(): string {
-		return \OC_Util::getChannel();
-	}
+    /**
+     * Provides \OC_Util::getChannel()
+     *
+     * @return string
+     */
+    public function getChannel(): string {
+        return \OC_Util::getChannel();
+    }
 }

lib/private/IntegrityCheck/Helpers/FileAccessHelper.php

Indentation +49 added lines, -49 removed lines

@@ -31,57 +31,57 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class FileAccessHelper {
-	/**
-	 * Wrapper around file_get_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @return string|false
-	 */
-	public function file_get_contents(string $filename) {
-		return file_get_contents($filename);
-	}
+    /**
+     * Wrapper around file_get_contents($filename, $data)
+     *
+     * @param string $filename
+     * @return string|false
+     */
+    public function file_get_contents(string $filename) {
+        return file_get_contents($filename);
+    }
 
-	/**
-	 * Wrapper around file_exists($filename)
-	 *
-	 * @param string $filename
-	 * @return bool
-	 */
-	public function file_exists(string $filename): bool {
-		return file_exists($filename);
-	}
+    /**
+     * Wrapper around file_exists($filename)
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists(string $filename): bool {
+        return file_exists($filename);
+    }
 
-	/**
-	 * Wrapper around file_put_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function file_put_contents(string $filename, string $data): int {
-		$bytesWritten = @file_put_contents($filename, $data);
-		if ($bytesWritten === false || $bytesWritten !== \strlen($data)){
-			throw new \Exception('Failed to write into ' . $filename);
-		}
-		return $bytesWritten;
-	}
+    /**
+     * Wrapper around file_put_contents($filename, $data)
+     *
+     * @param string $filename
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function file_put_contents(string $filename, string $data): int {
+        $bytesWritten = @file_put_contents($filename, $data);
+        if ($bytesWritten === false || $bytesWritten !== \strlen($data)){
+            throw new \Exception('Failed to write into ' . $filename);
+        }
+        return $bytesWritten;
+    }
 
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_writable(string $path): bool {
-		return is_writable($path);
-	}
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function is_writable(string $path): bool {
+        return is_writable($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function assertDirectoryExists(string $path) {
-		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
-		}
-	}
+    /**
+     * @param string $path
+     * @throws \Exception
+     */
+    public function assertDirectoryExists(string $path) {
+        if (!is_dir($path)) {
+            throw new \Exception('Directory ' . $path . ' does not exist.');
+        }
+    }
 }

lib/private/IntegrityCheck/Helpers/AppLocator.php

Indentation +22 added lines, -22 removed lines

@@ -31,28 +31,28 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class AppLocator {
-	/**
-	 * Provides \OC_App::getAppPath($appId)
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws \Exception If the app cannot be found
-	 */
-	public function getAppPath(string $appId): string {
-		$path = \OC_App::getAppPath($appId);
-		if($path === false) {
+    /**
+     * Provides \OC_App::getAppPath($appId)
+     *
+     * @param string $appId
+     * @return string
+     * @throws \Exception If the app cannot be found
+     */
+    public function getAppPath(string $appId): string {
+        $path = \OC_App::getAppPath($appId);
+        if($path === false) {
 
-			throw new \Exception('App not found');
-		}
-		return $path;
-	}
+            throw new \Exception('App not found');
+        }
+        return $path;
+    }
 
-	/**
-	 * Providers \OC_App::getAllApps()
-	 *
-	 * @return array
-	 */
-	public function getAllApps(): array {
-		return \OC_App::getAllApps();
-	}
+    /**
+     * Providers \OC_App::getAllApps()
+     *
+     * @return array
+     */
+    public function getAllApps(): array {
+        return \OC_App::getAllApps();
+    }
 }

lib/public/SystemTag/MapperEvent.php

Indentation +53 added lines, -53 removed lines

@@ -33,63 +33,63 @@
  */
 class MapperEvent extends Event {
 
-	const EVENT_ASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::assignTags';
-	const EVENT_UNASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::unassignTags';
+    const EVENT_ASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::assignTags';
+    const EVENT_UNASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::unassignTags';
 
-	/** @var string */
-	protected $event;
-	/** @var string */
-	protected $objectType;
-	/** @var string */
-	protected $objectId;
-	/** @var int[] */
-	protected $tags;
+    /** @var string */
+    protected $event;
+    /** @var string */
+    protected $objectType;
+    /** @var string */
+    protected $objectId;
+    /** @var int[] */
+    protected $tags;
 
-	/**
-	 * DispatcherEvent constructor.
-	 *
-	 * @param string $event
-	 * @param string $objectType
-	 * @param string $objectId
-	 * @param int[] $tags
-	 * @since 9.0.0
-	 */
-	public function __construct(string $event, string $objectType, string $objectId, array $tags) {
-		$this->event = $event;
-		$this->objectType = $objectType;
-		$this->objectId = $objectId;
-		$this->tags = $tags;
-	}
+    /**
+     * DispatcherEvent constructor.
+     *
+     * @param string $event
+     * @param string $objectType
+     * @param string $objectId
+     * @param int[] $tags
+     * @since 9.0.0
+     */
+    public function __construct(string $event, string $objectType, string $objectId, array $tags) {
+        $this->event = $event;
+        $this->objectType = $objectType;
+        $this->objectId = $objectId;
+        $this->tags = $tags;
+    }
 
-	/**
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getEvent(): string {
-		return $this->event;
-	}
+    /**
+     * @return string
+     * @since 9.0.0
+     */
+    public function getEvent(): string {
+        return $this->event;
+    }
 
-	/**
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectType(): string {
-		return $this->objectType;
-	}
+    /**
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectType(): string {
+        return $this->objectType;
+    }
 
-	/**
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectId(): string {
-		return $this->objectId;
-	}
+    /**
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectId(): string {
+        return $this->objectId;
+    }
 
-	/**
-	 * @return int[]
-	 * @since 9.0.0
-	 */
-	public function getTags(): array {
-		return $this->tags;
-	}
+    /**
+     * @return int[]
+     * @since 9.0.0
+     */
+    public function getTags(): array {
+        return $this->tags;
+    }
 }