nextcloud / server

apps/comments/appinfo/routes.php

Indentation +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+    ]
 ];

apps/files_external/lib/Lib/FrontendDefinitionTrait.php

Indentation +124 added lines, -124 removed lines

@@ -31,129 +31,129 @@
  */
 trait FrontendDefinitionTrait {
 
-	/** @var string human-readable mechanism name */
-	private $text;
-
-	/** @var DefinitionParameter[] parameters for mechanism */
-	private $parameters = [];
-
-	/** @var string[] custom JS */
-	private $customJs = [];
-
-	/**
-	 * @return string
-	 */
-	public function getText() {
-		return $this->text;
-	}
-
-	/**
-	 * @param string $text
-	 * @return $this
-	 */
-	public function setText($text) {
-		$this->text = $text;
-		return $this;
-	}
-
-	/**
-	 * @param FrontendDefinitionTrait $a
-	 * @param FrontendDefinitionTrait $b
-	 * @return int
-	 */
-	public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
-		return strcmp($a->getText(), $b->getText());
-	}
-
-	/**
-	 * @return DefinitionParameter[]
-	 */
-	public function getParameters() {
-		return $this->parameters;
-	}
-
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return self
-	 */
-	public function addParameters(array $parameters) {
-		foreach ($parameters as $parameter) {
-			$this->addParameter($parameter);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param DefinitionParameter $parameter
-	 * @return self
-	 */
-	public function addParameter(DefinitionParameter $parameter) {
-		$this->parameters[$parameter->getName()] = $parameter;
-		return $this;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getCustomJs() {
-		return $this->customJs;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 */
-	public function addCustomJs($custom) {
-		$this->customJs[] = $custom;
-		return $this;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 * @deprecated 9.1.0, use addCustomJs() instead
-	 */
-	public function setCustomJs($custom) {
-		$this->customJs = [$custom];
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerializeDefinition() {
-		$configuration = [];
-		foreach ($this->getParameters() as $parameter) {
-			$configuration[$parameter->getName()] = $parameter;
-		}
-
-		$data = [
-			'name' => $this->getText(),
-			'configuration' => $configuration,
-			'custom' => $this->getCustomJs(),
-		];
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorageDefinition(StorageConfig $storage) {
-		foreach ($this->getParameters() as $name => $parameter) {
-			$value = $storage->getBackendOption($name);
-			if (!is_null($value) || !$parameter->isOptional()) {
-				if (!$parameter->validateValue($value)) {
-					return false;
-				}
-				$storage->setBackendOption($name, $value);
-			}
-		}
-		return true;
-	}
+    /** @var string human-readable mechanism name */
+    private $text;
+
+    /** @var DefinitionParameter[] parameters for mechanism */
+    private $parameters = [];
+
+    /** @var string[] custom JS */
+    private $customJs = [];
+
+    /**
+     * @return string
+     */
+    public function getText() {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     * @return $this
+     */
+    public function setText($text) {
+        $this->text = $text;
+        return $this;
+    }
+
+    /**
+     * @param FrontendDefinitionTrait $a
+     * @param FrontendDefinitionTrait $b
+     * @return int
+     */
+    public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
+        return strcmp($a->getText(), $b->getText());
+    }
+
+    /**
+     * @return DefinitionParameter[]
+     */
+    public function getParameters() {
+        return $this->parameters;
+    }
+
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return self
+     */
+    public function addParameters(array $parameters) {
+        foreach ($parameters as $parameter) {
+            $this->addParameter($parameter);
+        }
+        return $this;
+    }
+
+    /**
+     * @param DefinitionParameter $parameter
+     * @return self
+     */
+    public function addParameter(DefinitionParameter $parameter) {
+        $this->parameters[$parameter->getName()] = $parameter;
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getCustomJs() {
+        return $this->customJs;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     */
+    public function addCustomJs($custom) {
+        $this->customJs[] = $custom;
+        return $this;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     * @deprecated 9.1.0, use addCustomJs() instead
+     */
+    public function setCustomJs($custom) {
+        $this->customJs = [$custom];
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerializeDefinition() {
+        $configuration = [];
+        foreach ($this->getParameters() as $parameter) {
+            $configuration[$parameter->getName()] = $parameter;
+        }
+
+        $data = [
+            'name' => $this->getText(),
+            'configuration' => $configuration,
+            'custom' => $this->getCustomJs(),
+        ];
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorageDefinition(StorageConfig $storage) {
+        foreach ($this->getParameters() as $name => $parameter) {
+            $value = $storage->getBackendOption($name);
+            if (!is_null($value) || !$parameter->isOptional()) {
+                if (!$parameter->validateValue($value)) {
+                    return false;
+                }
+                $storage->setBackendOption($name, $value);
+            }
+        }
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php

Indentation +11 added lines, -11 removed lines

@@ -29,15 +29,15 @@
  * Authentication mechanism or backend has insufficient data
  */
 class InsufficientDataForMeaningfulAnswerException extends StorageNotAvailableException {
-	/**
-	 * StorageNotAvailableException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 6.0.0
-	 */
-	public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * StorageNotAvailableException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 6.0.0
+     */
+    public function __construct($message = '', $code = self::STATUS_INDETERMINATE, \Exception $previous = null) {
+        parent::__construct($message, $code, $previous);
+    }
 }

apps/files_external/lib/Lib/IdentifierTrait.php

Indentation +62 added lines, -62 removed lines

@@ -28,76 +28,76 @@
  */
 trait IdentifierTrait {
 
-	/** @var string */
-	protected $identifier;
+    /** @var string */
+    protected $identifier;
 
-	/** @var string[] */
-	protected $identifierAliases = [];
+    /** @var string[] */
+    protected $identifierAliases = [];
 
-	/** @var IdentifierTrait */
-	protected $deprecateTo = null;
+    /** @var IdentifierTrait */
+    protected $deprecateTo = null;
 
-	/**
-	 * @return string
-	 */
-	public function getIdentifier() {
-		return $this->identifier;
-	}
+    /**
+     * @return string
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
 
-	/**
-	 * @param string $identifier
-	 * @return $this
-	 */
-	public function setIdentifier($identifier) {
-		$this->identifier = $identifier;
-		$this->identifierAliases[] = $identifier;
-		return $this;
-	}
+    /**
+     * @param string $identifier
+     * @return $this
+     */
+    public function setIdentifier($identifier) {
+        $this->identifier = $identifier;
+        $this->identifierAliases[] = $identifier;
+        return $this;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getIdentifierAliases() {
-		return $this->identifierAliases;
-	}
+    /**
+     * @return string[]
+     */
+    public function getIdentifierAliases() {
+        return $this->identifierAliases;
+    }
 
-	/**
-	 * @param string $alias
-	 * @return $this
-	 */
-	public function addIdentifierAlias($alias) {
-		$this->identifierAliases[] = $alias;
-		return $this;
-	}
+    /**
+     * @param string $alias
+     * @return $this
+     */
+    public function addIdentifierAlias($alias) {
+        $this->identifierAliases[] = $alias;
+        return $this;
+    }
 
-	/**
-	 * @return object|null
-	 */
-	public function getDeprecateTo() {
-		return $this->deprecateTo;
-	}
+    /**
+     * @return object|null
+     */
+    public function getDeprecateTo() {
+        return $this->deprecateTo;
+    }
 
-	/**
-	 * @param object $destinationObject
-	 * @return self
-	 */
-	public function deprecateTo($destinationObject) {
-		$this->deprecateTo = $destinationObject;
-		return $this;
-	}
+    /**
+     * @param object $destinationObject
+     * @return self
+     */
+    public function deprecateTo($destinationObject) {
+        $this->deprecateTo = $destinationObject;
+        return $this;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function jsonSerializeIdentifier() {
-		$data = [
-			'identifier' => $this->identifier,
-			'identifierAliases' => $this->identifierAliases,
-		];
-		if ($this->deprecateTo) {
-			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
-		}
-		return $data;
-	}
+    /**
+     * @return array
+     */
+    public function jsonSerializeIdentifier() {
+        $data = [
+            'identifier' => $this->identifier,
+            'identifierAliases' => $this->identifierAliases,
+        ];
+        if ($this->deprecateTo) {
+            $data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+        }
+        return $data;
+    }
 
 }

apps/files_external/lib/Command/Create.php

Spacing +9 added lines, -9 removed lines

@@ -128,32 +128,32 @@ 
 		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
 
 		if (!Filesystem::isValidPath($mountPoint)) {
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
+			$output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>');
 			return 1;
 		}
 		if (is_null($storageBackend)) {
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		if (is_null($authBackend)) {
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
 		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
+			$output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>');
 			return 1;
 		}
 
 		$config = [];
 		foreach ($configInput as $configOption) {
 			if (!strpos($configOption, '=')) {
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+				$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
 				return 1;
 			}
 			list($key, $value) = explode('=', $configOption, 2);
 			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
+				$output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>');
 				return 1;
 			}
 			$config[$key] = $value;
@@ -167,7 +167,7 @@ 
 
 		if ($user) {
 			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
+				$output->writeln('<error>User "'.$user.'" not found</error>');
 				return 1;
 			}
 			$mount->setApplicableUsers([$user]);
@@ -178,9 +178,9 @@ 
 		} else {
 			$this->getStorageService($user)->addStorage($mount);
 			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+				$output->writeln('<info>Storage created with id '.$mount->getId().'</info>');
 			} else {
-				$output->writeln((string)$mount->getId());
+				$output->writeln((string) $mount->getId());
 			}
 		}
 		return 0;

Indentation +178 added lines, -178 removed lines

@@ -44,182 +44,182 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Create extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var BackendService */
-	private $backendService;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserManager $userManager,
-						 IUserSession $userSession,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:create')
-			->setDescription('Create a new mount configuration')
-			->addOption(
-				'user',
-				'',
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configuration for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'mount_point',
-				InputArgument::REQUIRED,
-				'mount point for the new mount'
-			)
-			->addArgument(
-				'storage_backend',
-				InputArgument::REQUIRED,
-				'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addArgument(
-				'authentication_backend',
-				InputArgument::REQUIRED,
-				'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Mount configuration option in key=value format'
-			)
-			->addOption(
-				'dry',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t save the created mount, only list the new mount'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getOption('user');
-		$mountPoint = $input->getArgument('mount_point');
-		$storageIdentifier = $input->getArgument('storage_backend');
-		$authIdentifier = $input->getArgument('authentication_backend');
-		$configInput = $input->getOption('config');
-
-		$storageBackend = $this->backendService->getBackend($storageIdentifier);
-		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
-
-		if (!Filesystem::isValidPath($mountPoint)) {
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
-			return 1;
-		}
-		if (is_null($storageBackend)) {
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
-			return 404;
-		}
-		if (is_null($authBackend)) {
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
-			return 404;
-		}
-		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
-		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
-			return 1;
-		}
-
-		$config = [];
-		foreach ($configInput as $configOption) {
-			if (!strpos($configOption, '=')) {
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
-				return 1;
-			}
-			list($key, $value) = explode('=', $configOption, 2);
-			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
-				return 1;
-			}
-			$config[$key] = $value;
-		}
-
-		$mount = new StorageConfig();
-		$mount->setMountPoint($mountPoint);
-		$mount->setBackend($storageBackend);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($config);
-
-		if ($user) {
-			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
-				return 1;
-			}
-			$mount->setApplicableUsers([$user]);
-		}
-
-		if ($input->getOption('dry')) {
-			$this->showMount($user, $mount, $input, $output);
-		} else {
-			$this->getStorageService($user)->addStorage($mount);
-			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
-			} else {
-				$output->writeln((string)$mount->getId());
-			}
-		}
-		return 0;
-	}
-
-	private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
-		$params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
-		foreach ($params as $param) {
-			/** @var DefinitionParameter $param */
-			if ($param->getName() === $key) {
-				if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
-					$value = ($value === 'true');
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
-		$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-		$listInput = new ArrayInput([], $listCommand->getDefinition());
-		$listInput->setOption('output', $input->getOption('output'));
-		$listInput->setOption('show-password', true);
-		$listCommand->listMounts($user, [$mount], $listInput, $output);
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var BackendService */
+    private $backendService;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserManager $userManager,
+                            IUserSession $userSession,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:create')
+            ->setDescription('Create a new mount configuration')
+            ->addOption(
+                'user',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configuration for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'mount_point',
+                InputArgument::REQUIRED,
+                'mount point for the new mount'
+            )
+            ->addArgument(
+                'storage_backend',
+                InputArgument::REQUIRED,
+                'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addArgument(
+                'authentication_backend',
+                InputArgument::REQUIRED,
+                'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Mount configuration option in key=value format'
+            )
+            ->addOption(
+                'dry',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t save the created mount, only list the new mount'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getOption('user');
+        $mountPoint = $input->getArgument('mount_point');
+        $storageIdentifier = $input->getArgument('storage_backend');
+        $authIdentifier = $input->getArgument('authentication_backend');
+        $configInput = $input->getOption('config');
+
+        $storageBackend = $this->backendService->getBackend($storageIdentifier);
+        $authBackend = $this->backendService->getAuthMechanism($authIdentifier);
+
+        if (!Filesystem::isValidPath($mountPoint)) {
+            $output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
+            return 1;
+        }
+        if (is_null($storageBackend)) {
+            $output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+            return 404;
+        }
+        if (is_null($authBackend)) {
+            $output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+            return 404;
+        }
+        $supportedSchemes = array_keys($storageBackend->getAuthSchemes());
+        if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
+            $output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
+            return 1;
+        }
+
+        $config = [];
+        foreach ($configInput as $configOption) {
+            if (!strpos($configOption, '=')) {
+                $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+                return 1;
+            }
+            list($key, $value) = explode('=', $configOption, 2);
+            if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
+                $output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
+                return 1;
+            }
+            $config[$key] = $value;
+        }
+
+        $mount = new StorageConfig();
+        $mount->setMountPoint($mountPoint);
+        $mount->setBackend($storageBackend);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($config);
+
+        if ($user) {
+            if (!$this->userManager->userExists($user)) {
+                $output->writeln('<error>User "' . $user . '" not found</error>');
+                return 1;
+            }
+            $mount->setApplicableUsers([$user]);
+        }
+
+        if ($input->getOption('dry')) {
+            $this->showMount($user, $mount, $input, $output);
+        } else {
+            $this->getStorageService($user)->addStorage($mount);
+            if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
+                $output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+            } else {
+                $output->writeln((string)$mount->getId());
+            }
+        }
+        return 0;
+    }
+
+    private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
+        $params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
+        foreach ($params as $param) {
+            /** @var DefinitionParameter $param */
+            if ($param->getName() === $key) {
+                if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
+                    $value = ($value === 'true');
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
+        $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+        $listInput = new ArrayInput([], $listCommand->getDefinition());
+        $listInput->setOption('output', $input->getOption('output'));
+        $listInput->setOption('show-password', true);
+        $listCommand->listMounts($user, [$mount], $listInput, $output);
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

apps/testing/appinfo/routes.php

Indentation +57 added lines, -57 removed lines

@@ -21,62 +21,62 @@
  */
 
 return [
-	'routes' => [
-		[
-			'name' => 'RateLimitTest#userAndAnonProtected',
-			'url' => '/userAndAnonProtected',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'RateLimitTest#onlyAnonProtected',
-			'url' => '/anonProtected',
-			'verb' => 'GET',
-		],
-	],
+    'routes' => [
+        [
+            'name' => 'RateLimitTest#userAndAnonProtected',
+            'url' => '/userAndAnonProtected',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'RateLimitTest#onlyAnonProtected',
+            'url' => '/anonProtected',
+            'verb' => 'GET',
+        ],
+    ],
 
-	'ocs' => [
-		[
-			'name' => 'Config#setAppValue',
-			'url'  => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Config#deleteAppValue',
-			'url'  => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#isLockingEnabled',
-			'url'  => '/api/v1/lockprovisioning',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#isLocked',
-			'url'  => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#acquireLock',
-			'url'  => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Locking#changeLock',
-			'url'  => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'Locking#releaseLock',
-			'url'  => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#releaseAll',
-			'url'  => '/api/v1/lockprovisioning/{type}',
-			'verb' => 'DELETE',
-			'defaults' => [
-				'type' => null
-			]
-		],
-	],
+    'ocs' => [
+        [
+            'name' => 'Config#setAppValue',
+            'url'  => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Config#deleteAppValue',
+            'url'  => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#isLockingEnabled',
+            'url'  => '/api/v1/lockprovisioning',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#isLocked',
+            'url'  => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#acquireLock',
+            'url'  => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Locking#changeLock',
+            'url'  => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'Locking#releaseLock',
+            'url'  => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#releaseAll',
+            'url'  => '/api/v1/lockprovisioning/{type}',
+            'verb' => 'DELETE',
+            'defaults' => [
+                'type' => null
+            ]
+        ],
+    ],
 ];

lib/public/Route/IRouter.php

Indentation +79 added lines, -79 removed lines

@@ -36,91 +36,91 @@
  */
 interface IRouter {
 
-	/**
-	 * Get the files to load the routes from
-	 *
-	 * @return string[]
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getRoutingFiles();
+    /**
+     * Get the files to load the routes from
+     *
+     * @return string[]
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getRoutingFiles();
 
-	/**
-	 * @return string
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getCacheKey();
+    /**
+     * @return string
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getCacheKey();
 
-	/**
-	 * Loads the routes
-	 *
-	 * @param null|string $app
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function loadRoutes($app = null);
+    /**
+     * Loads the routes
+     *
+     * @param null|string $app
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function loadRoutes($app = null);
 
-	/**
-	 * Sets the collection to use for adding routes
-	 *
-	 * @param string $name Name of the collection to use.
-	 * @return void
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function useCollection($name);
+    /**
+     * Sets the collection to use for adding routes
+     *
+     * @param string $name Name of the collection to use.
+     * @return void
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function useCollection($name);
 
-	/**
-	 * returns the current collection name in use for adding routes
-	 *
-	 * @return string the collection name
-	 * @since 8.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getCurrentCollection();
+    /**
+     * returns the current collection name in use for adding routes
+     *
+     * @return string the collection name
+     * @since 8.0.0
+     * @deprecated 9.0.0
+     */
+    public function getCurrentCollection();
 
-	/**
-	 * Create a \OCP\Route\IRoute.
-	 *
-	 * @param string $name Name of the route to create.
-	 * @param string $pattern The pattern to match
-	 * @param array $defaults An array of default parameter values
-	 * @param array $requirements An array of requirements for parameters (regexes)
-	 * @return \OCP\Route\IRoute
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function create($name, $pattern, array $defaults = [], array $requirements = []);
+    /**
+     * Create a \OCP\Route\IRoute.
+     *
+     * @param string $name Name of the route to create.
+     * @param string $pattern The pattern to match
+     * @param array $defaults An array of default parameter values
+     * @param array $requirements An array of requirements for parameters (regexes)
+     * @return \OCP\Route\IRoute
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function create($name, $pattern, array $defaults = [], array $requirements = []);
 
-	/**
-	 * Find the route matching $url.
-	 *
-	 * @param string $url The url to find
-	 * @throws \Exception
-	 * @return void
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function match($url);
+    /**
+     * Find the route matching $url.
+     *
+     * @param string $url The url to find
+     * @throws \Exception
+     * @return void
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function match($url);
 
-	/**
-	 * Get the url generator
-	 *
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function getGenerator();
+    /**
+     * Get the url generator
+     *
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function getGenerator();
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 * @since 7.0.0
-	 * @deprecated 9.0.0
-	 */
-	public function generate($name, $parameters = [], $absolute = false);
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     * @since 7.0.0
+     * @deprecated 9.0.0
+     */
+    public function generate($name, $parameters = [], $absolute = false);
 }

lib/public/DB/QueryBuilder/ICompositeExpression.php

Indentation +32 added lines, -32 removed lines

@@ -28,39 +28,39 @@
  * @since 8.2.0
  */
 interface ICompositeExpression {
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function addMultiple(array $parts = []);
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function addMultiple(array $parts = []);
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function add($part);
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function add($part);
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function count();
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function count();
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType();
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType();
 }

lib/public/AppFramework/Middleware.php

Indentation +57 added lines, -57 removed lines

@@ -42,67 +42,67 @@
 abstract class Middleware {
 
 
-	/**
-	 * 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
-	 * @since 6.0.0
-	 */
-	public function beforeController($controller, $methodName) {
-	}
+    /**
+     * 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
+     * @since 6.0.0
+     */
+    public function 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
-	 * @throws \Exception the passed in exception if it can't handle it
-	 * @return Response a Response object in case that the exception was handled
-	 * @since 6.0.0
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		throw $exception;
-	}
+    /**
+     * 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
+     * @throws \Exception the passed in exception if it can't handle it
+     * @return Response a Response object in case that the exception was handled
+     * @since 6.0.0
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        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
-	 * @since 6.0.0
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		return $response;
-	}
+    /**
+     * 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
+     * @since 6.0.0
+     */
+    public function afterController($controller, $methodName, Response $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
-	 * @since 6.0.0
-	 */
-	public function beforeOutput($controller, $methodName, $output) {
-		return $output;
-	}
+    /**
+     * 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
+     * @since 6.0.0
+     */
+    public function beforeOutput($controller, $methodName, $output) {
+        return $output;
+    }
 }