nextcloud / server

core/Command/Config/System/SetConfig.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 			$this->systemConfig->setValue($configName, $configValue['value']);
 		}
 
-		$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
+		$output->writeln('<info>System config value '.implode(' => ', $configNames).' set to '.$configValue['readable-value'].'</info>');
 		return 0;
 	}
 
@@ -116,7 +116,7 @@ 
 				}
 				return [
 					'value' => (int) $value,
-					'readable-value' => 'integer ' . (int) $value,
+					'readable-value' => 'integer '.(int) $value,
 				];
 
 			case 'double':
@@ -126,7 +126,7 @@ 
 				}
 				return [
 					'value' => (double) $value,
-					'readable-value' => 'double ' . (double) $value,
+					'readable-value' => 'double '.(double) $value,
 				];
 
 			case 'boolean':
@@ -136,13 +136,13 @@ 
 					case 'true':
 						return [
 							'value' => true,
-							'readable-value' => 'boolean ' . $value,
+							'readable-value' => 'boolean '.$value,
 						];
 
 					case 'false':
 						return [
 							'value' => false,
-							'readable-value' => 'boolean ' . $value,
+							'readable-value' => 'boolean '.$value,
 						];
 
 					default:
@@ -159,7 +159,7 @@ 
 				$value = (string) $value;
 				return [
 					'value' => $value,
-					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
+					'readable-value' => ($value === '') ? 'empty string' : 'string '.$value,
 				];
 
 			default:

Indentation +170 added lines, -170 removed lines

@@ -32,174 +32,174 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct($systemConfig);
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:system:set')
-			->setDescription('Set a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config parameter, specify multiple for array parameter'
-			)
-			->addOption(
-				'type',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Value type [string, integer, double, boolean]',
-				'string'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
-		$configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
-		$updateOnly = $input->getOption('update-only');
-
-		if (count($configNames) > 1) {
-			$existingValue = $this->systemConfig->getValue($configName);
-
-			$newValue = $this->mergeArrayValue(
-				array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
-			);
-
-			$this->systemConfig->setValue($configName, $newValue);
-		} else {
-			if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-
-			$this->systemConfig->setValue($configName, $configValue['value']);
-		}
-
-		$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
-		return 0;
-	}
-
-	/**
-	 * @param string $value
-	 * @param string $type
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	protected function castValue($value, $type) {
-		switch ($type) {
-			case 'integer':
-			case 'int':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (int) $value,
-					'readable-value' => 'integer ' . (int) $value,
-				];
-
-			case 'double':
-			case 'float':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (double) $value,
-					'readable-value' => 'double ' . (double) $value,
-				];
-
-			case 'boolean':
-			case 'bool':
-				$value = strtolower($value);
-				switch ($value) {
-					case 'true':
-						return [
-							'value' => true,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					case 'false':
-						return [
-							'value' => false,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					default:
-						throw new \InvalidArgumentException('Unable to parse value as boolean');
-				}
-
-				// no break
-			case 'null':
-				return [
-					'value' => null,
-					'readable-value' => 'null',
-				];
-
-			case 'string':
-				$value = (string) $value;
-				return [
-					'value' => $value,
-					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
-				];
-
-			default:
-				throw new \InvalidArgumentException('Invalid type');
-		}
-	}
-
-	/**
-	 * @param array $configNames
-	 * @param mixed $existingValues
-	 * @param mixed $value
-	 * @param bool $updateOnly
-	 * @return array merged value
-	 * @throws \UnexpectedValueException
-	 */
-	protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
-		$configName = array_shift($configNames);
-		if (!is_array($existingValues)) {
-			$existingValues = [];
-		}
-		if (!empty($configNames)) {
-			if (isset($existingValues[$configName])) {
-				$existingValue = $existingValues[$configName];
-			} else {
-				$existingValue = [];
-			}
-			$existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
-		} else {
-			if (!isset($existingValues[$configName]) && $updateOnly) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-			$existingValues[$configName] = $value;
-		}
-		return $existingValues;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'type') {
-			return ['string', 'integer', 'double', 'boolean'];
-		}
-		return parent::completeOptionValues($optionName, $context);
-	}
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct($systemConfig);
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:system:set')
+            ->setDescription('Set a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config parameter, specify multiple for array parameter'
+            )
+            ->addOption(
+                'type',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Value type [string, integer, double, boolean]',
+                'string'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
+        $configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
+        $updateOnly = $input->getOption('update-only');
+
+        if (count($configNames) > 1) {
+            $existingValue = $this->systemConfig->getValue($configName);
+
+            $newValue = $this->mergeArrayValue(
+                array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
+            );
+
+            $this->systemConfig->setValue($configName, $newValue);
+        } else {
+            if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+
+            $this->systemConfig->setValue($configName, $configValue['value']);
+        }
+
+        $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
+        return 0;
+    }
+
+    /**
+     * @param string $value
+     * @param string $type
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    protected function castValue($value, $type) {
+        switch ($type) {
+            case 'integer':
+            case 'int':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (int) $value,
+                    'readable-value' => 'integer ' . (int) $value,
+                ];
+
+            case 'double':
+            case 'float':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (double) $value,
+                    'readable-value' => 'double ' . (double) $value,
+                ];
+
+            case 'boolean':
+            case 'bool':
+                $value = strtolower($value);
+                switch ($value) {
+                    case 'true':
+                        return [
+                            'value' => true,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    case 'false':
+                        return [
+                            'value' => false,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    default:
+                        throw new \InvalidArgumentException('Unable to parse value as boolean');
+                }
+
+                // no break
+            case 'null':
+                return [
+                    'value' => null,
+                    'readable-value' => 'null',
+                ];
+
+            case 'string':
+                $value = (string) $value;
+                return [
+                    'value' => $value,
+                    'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
+                ];
+
+            default:
+                throw new \InvalidArgumentException('Invalid type');
+        }
+    }
+
+    /**
+     * @param array $configNames
+     * @param mixed $existingValues
+     * @param mixed $value
+     * @param bool $updateOnly
+     * @return array merged value
+     * @throws \UnexpectedValueException
+     */
+    protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
+        $configName = array_shift($configNames);
+        if (!is_array($existingValues)) {
+            $existingValues = [];
+        }
+        if (!empty($configNames)) {
+            if (isset($existingValues[$configName])) {
+                $existingValue = $existingValues[$configName];
+            } else {
+                $existingValue = [];
+            }
+            $existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
+        } else {
+            if (!isset($existingValues[$configName]) && $updateOnly) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+            $existingValues[$configName] = $value;
+        }
+        return $existingValues;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'type') {
+            return ['string', 'integer', 'double', 'boolean'];
+        }
+        return parent::completeOptionValues($optionName, $context);
+    }
 }

core/Command/Config/App/DeleteConfig.php

Spacing +2 added lines, -2 removed lines

@@ -70,12 +70,12 @@
 		$configName = $input->getArgument('name');
 
 		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
-			$output->writeln('<error>Config ' . $configName . ' of app ' . $appName . ' could not be deleted because it did not exist</error>');
+			$output->writeln('<error>Config '.$configName.' of app '.$appName.' could not be deleted because it did not exist</error>');
 			return 1;
 		}
 
 		$this->config->deleteAppValue($appName, $configName);
-		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
+		$output->writeln('<info>Config value '.$configName.' of app '.$appName.' deleted</info>');
 		return 0;
 	}
 }

Indentation +42 added lines, -42 removed lines

@@ -28,52 +28,52 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	protected IConfig $config;
+    protected IConfig $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:delete')
-			->setDescription('Delete an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to delete'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:delete')
+            ->setDescription('Delete an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to delete'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the config exists before deleting it'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
-			$output->writeln('<error>Config ' . $configName . ' of app ' . $appName . ' could not be deleted because it did not exist</error>');
-			return 1;
-		}
+        if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
+            $output->writeln('<error>Config ' . $configName . ' of app ' . $appName . ' could not be deleted because it did not exist</error>');
+            return 1;
+        }
 
-		$this->config->deleteAppValue($appName, $configName);
-		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
-		return 0;
-	}
+        $this->config->deleteAppValue($appName, $configName);
+        $output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
+        return 0;
+    }
 }

core/Command/Config/App/SetConfig.php

Spacing +2 added lines, -2 removed lines

@@ -76,14 +76,14 @@
 		$configName = $input->getArgument('name');
 
 		if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
-			$output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
+			$output->writeln('<comment>Config value '.$configName.' for app '.$appName.' not updated, as it has not been set before.</comment>');
 			return 1;
 		}
 
 		$configValue = $input->getOption('value');
 		$this->config->setAppValue($appName, $configName, $configValue);
 
-		$output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
+		$output->writeln('<info>Config value '.$configName.' for app '.$appName.' set to '.$configValue.'</info>');
 		return 0;
 	}
 }

Indentation +46 added lines, -46 removed lines

@@ -28,57 +28,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	protected IConfig $config;
+    protected IConfig $config;
 
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:set')
-			->setDescription('Set an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to set'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:set')
+            ->setDescription('Set an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to set'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
-			$output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
-			return 1;
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
+            $output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
+            return 1;
+        }
 
-		$configValue = $input->getOption('value');
-		$this->config->setAppValue($appName, $configName, $configValue);
+        $configValue = $input->getOption('value');
+        $this->config->setAppValue($appName, $configName, $configValue);
 
-		$output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
-		return 0;
-	}
+        $output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
+        return 0;
+    }
 }

apps/files_external/lib/Command/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

Indentation +50 added lines, -50 removed lines

@@ -37,62 +37,62 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	protected GlobalStoragesService $globalService;
-	protected UserStoragesService $userService;
-	protected IUserSession $userSession;
-	protected IUserManager $userManager;
+    protected GlobalStoragesService $globalService;
+    protected UserStoragesService $userService;
+    protected IUserSession $userSession;
+    protected IUserManager $userManager;
 
-	public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('files_external:delete')
-			->setDescription('Delete an external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'yes',
-				'y',
-				InputOption::VALUE_NONE,
-				'Skip confirmation'
-			);
-		parent::configure();
-	}
+    protected function configure(): void {
+        $this
+            ->setName('files_external:delete')
+            ->setDescription('Delete an external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'yes',
+                'y',
+                InputOption::VALUE_NONE,
+                'Skip confirmation'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$noConfirm = $input->getOption('yes');
+        $noConfirm = $input->getOption('yes');
 
-		if (!$noConfirm) {
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listCommand->listMounts(null, [$mount], $listInput, $output);
+        if (!$noConfirm) {
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listCommand->listMounts(null, [$mount], $listInput, $output);
 
-			$questionHelper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
+            $questionHelper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
-			if (!$questionHelper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
+            if (!$questionHelper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
 
-		$this->globalService->removeStorage($mountId);
-		return 0;
-	}
+        $this->globalService->removeStorage($mountId);
+        return 0;
+    }
 }

lib/private/Repair/RepairInvalidShares.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 
 		$updatedEntries = $builder->execute();
 		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$out->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		}
 
 		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

Indentation +85 added lines, -85 removed lines

@@ -33,89 +33,89 @@
  * Repairs shares with invalid data
  */
 class RepairInvalidShares implements IRepairStep {
-	public const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    public const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

lib/private/Share20/ProviderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -241,7 +241,7 @@ 
 
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

Indentation +322 added lines, -322 removed lines

@@ -57,335 +57,335 @@
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider */
-	private $shareByCircleProvider = null;
-	/** @var bool */
-	private $circlesAreNotAvailable = false;
-	/** @var \OCA\Talk\Share\RoomShareProvider */
-	private $roomShareProvider = null;
-
-	private $registeredShareProviders = [];
-
-	private $shareProviders = [];
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	public function registerProvider(string $shareProviderClass): void {
-		$this->registeredShareProviders[] = $shareProviderClass;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getL10NFactory(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getConfig()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider */
+    private $shareByCircleProvider = null;
+    /** @var bool */
+    private $circlesAreNotAvailable = false;
+    /** @var \OCA\Talk\Share\RoomShareProvider */
+    private $roomShareProvider = null;
+
+    private $registeredShareProviders = [];
+
+    private $shareProviders = [];
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    public function registerProvider(string $shareProviderClass): void {
+        $this->registeredShareProviders[] = $shareProviderClass;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getL10NFactory(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getConfig()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilesharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory(),
-				$this->serverContainer->query(IEventDispatcher::class)
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager(),
-				$this->serverContainer->getGlobalScaleConfig(),
-				$this->serverContainer->getCloudFederationProviderManager()
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilesharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory(),
+                $this->serverContainer->query(IEventDispatcher::class)
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager(),
+                $this->serverContainer->getGlobalScaleConfig(),
+                $this->serverContainer->getCloudFederationProviderManager()
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getHasher(),
-				$this->serverContainer->get(IEventDispatcher::class),
-				$this->serverContainer->get(IManager::class)
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function getShareByCircleProvider() {
-		if ($this->circlesAreNotAvailable) {
-			return null;
-		}
-
-		if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
-			!class_exists('\OCA\Circles\ShareByCircleProvider')
-		) {
-			$this->circlesAreNotAvailable = true;
-			return null;
-		}
-
-		if ($this->shareByCircleProvider === null) {
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-	/**
-	 * Create the room share provider
-	 *
-	 * @return RoomShareProvider
-	 */
-	protected function getRoomShareProvider() {
-		if ($this->roomShareProvider === null) {
-			/*
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager,
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getHasher(),
+                $this->serverContainer->get(IEventDispatcher::class),
+                $this->serverContainer->get(IManager::class)
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function getShareByCircleProvider() {
+        if ($this->circlesAreNotAvailable) {
+            return null;
+        }
+
+        if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+            !class_exists('\OCA\Circles\ShareByCircleProvider')
+        ) {
+            $this->circlesAreNotAvailable = true;
+            return null;
+        }
+
+        if ($this->shareByCircleProvider === null) {
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+    /**
+     * Create the room share provider
+     *
+     * @return RoomShareProvider
+     */
+    protected function getRoomShareProvider() {
+        if ($this->roomShareProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('spreed')) {
-				return null;
-			}
-
-			try {
-				/**
-				 * @psalm-suppress UndefinedClass
-				 */
-				$this->roomShareProvider = $this->serverContainer->get(RoomShareProvider::class);
-			} catch (\Throwable $e) {
-				$this->serverContainer->get(LoggerInterface::class)->error(
-					$e->getMessage(),
-					['exception' => $e]
-				);
-				return null;
-			}
-		}
-
-		return $this->roomShareProvider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if (isset($this->shareProviders[$id])) {
-			return $this->shareProviders[$id];
-		}
-
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} elseif ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} elseif ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} elseif ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		} elseif ($id === 'ocRoomShare') {
-			$provider = $this->getRoomShareProvider();
-		}
-
-		foreach ($this->registeredShareProviders as $shareProvider) {
-			try {
-				/** @var IShareProvider $instance */
-				$instance = $this->serverContainer->get($shareProvider);
-				$this->shareProviders[$instance->identifier()] = $instance;
-			} catch (\Throwable $e) {
-				$this->serverContainer->get(LoggerInterface::class)->error(
-					$e->getMessage(),
-					['exception' => $e]
-				);
-			}
-		}
-
-		if (isset($this->shareProviders[$id])) {
-			$provider = $this->shareProviders[$id];
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === IShare::TYPE_USER ||
-			$shareType === IShare::TYPE_GROUP ||
-			$shareType === IShare::TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} elseif ($shareType === IShare::TYPE_REMOTE || $shareType === IShare::TYPE_REMOTE_GROUP) {
-			$provider = $this->federatedShareProvider();
-		} elseif ($shareType === IShare::TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} elseif ($shareType === IShare::TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		} elseif ($shareType === IShare::TYPE_ROOM) {
-			$provider = $this->getRoomShareProvider();
-		} elseif ($shareType === IShare::TYPE_DECK) {
-			$provider = $this->getProvider('deck');
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-		$roomShare = $this->getRoomShareProvider();
-		if ($roomShare !== null) {
-			$shares[] = $roomShare;
-		}
-
-		foreach ($this->registeredShareProviders as $shareProvider) {
-			try {
-				/** @var IShareProvider $instance */
-				$instance = $this->serverContainer->get($shareProvider);
-			} catch (\Throwable $e) {
-				$this->serverContainer->get(LoggerInterface::class)->error(
-					$e->getMessage(),
-					['exception' => $e]
-				);
-				continue;
-			}
-
-			if (!isset($this->shareProviders[$instance->identifier()])) {
-				$this->shareProviders[$instance->identifier()] = $instance;
-			}
-			$shares[] = $this->shareProviders[$instance->identifier()];
-		}
-
-
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('spreed')) {
+                return null;
+            }
+
+            try {
+                /**
+                 * @psalm-suppress UndefinedClass
+                 */
+                $this->roomShareProvider = $this->serverContainer->get(RoomShareProvider::class);
+            } catch (\Throwable $e) {
+                $this->serverContainer->get(LoggerInterface::class)->error(
+                    $e->getMessage(),
+                    ['exception' => $e]
+                );
+                return null;
+            }
+        }
+
+        return $this->roomShareProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if (isset($this->shareProviders[$id])) {
+            return $this->shareProviders[$id];
+        }
+
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } elseif ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } elseif ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } elseif ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        } elseif ($id === 'ocRoomShare') {
+            $provider = $this->getRoomShareProvider();
+        }
+
+        foreach ($this->registeredShareProviders as $shareProvider) {
+            try {
+                /** @var IShareProvider $instance */
+                $instance = $this->serverContainer->get($shareProvider);
+                $this->shareProviders[$instance->identifier()] = $instance;
+            } catch (\Throwable $e) {
+                $this->serverContainer->get(LoggerInterface::class)->error(
+                    $e->getMessage(),
+                    ['exception' => $e]
+                );
+            }
+        }
+
+        if (isset($this->shareProviders[$id])) {
+            $provider = $this->shareProviders[$id];
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === IShare::TYPE_USER ||
+            $shareType === IShare::TYPE_GROUP ||
+            $shareType === IShare::TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } elseif ($shareType === IShare::TYPE_REMOTE || $shareType === IShare::TYPE_REMOTE_GROUP) {
+            $provider = $this->federatedShareProvider();
+        } elseif ($shareType === IShare::TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } elseif ($shareType === IShare::TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        } elseif ($shareType === IShare::TYPE_ROOM) {
+            $provider = $this->getRoomShareProvider();
+        } elseif ($shareType === IShare::TYPE_DECK) {
+            $provider = $this->getProvider('deck');
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+        $roomShare = $this->getRoomShareProvider();
+        if ($roomShare !== null) {
+            $shares[] = $roomShare;
+        }
+
+        foreach ($this->registeredShareProviders as $shareProvider) {
+            try {
+                /** @var IShareProvider $instance */
+                $instance = $this->serverContainer->get($shareProvider);
+            } catch (\Throwable $e) {
+                $this->serverContainer->get(LoggerInterface::class)->error(
+                    $e->getMessage(),
+                    ['exception' => $e]
+                );
+                continue;
+            }
+
+            if (!isset($this->shareProviders[$instance->identifier()])) {
+                $this->shareProviders[$instance->identifier()] = $instance;
+            }
+            $shares[] = $this->shareProviders[$instance->identifier()];
+        }
+
+
+
+        return $shares;
+    }
 }

lib/private/Migration/ConsoleOutput.php

Indentation +46 added lines, -46 removed lines

@@ -37,57 +37,57 @@
  */
 class ConsoleOutput implements IOutput {
 
-	/** @var OutputInterface */
-	private $output;
+    /** @var OutputInterface */
+    private $output;
 
-	/** @var ProgressBar */
-	private $progressBar;
+    /** @var ProgressBar */
+    private $progressBar;
 
-	public function __construct(OutputInterface $output) {
-		$this->output = $output;
-	}
+    public function __construct(OutputInterface $output) {
+        $this->output = $output;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		$this->output->writeln("<info>$message</info>");
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        $this->output->writeln("<info>$message</info>");
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		$this->output->writeln("<comment>$message</comment>");
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        $this->output->writeln("<comment>$message</comment>");
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar->finish();
-		}
-		$this->progressBar = new ProgressBar($this->output);
-		$this->progressBar->start($max);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar->finish();
+        }
+        $this->progressBar = new ProgressBar($this->output);
+        $this->progressBar->start($max);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar = new ProgressBar($this->output);
-			$this->progressBar->start();
-		}
-		$this->progressBar->advance($step);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar = new ProgressBar($this->output);
+            $this->progressBar->start();
+        }
+        $this->progressBar->advance($step);
+    }
 
-	public function finishProgress() {
-		if (is_null($this->progressBar)) {
-			return;
-		}
-		$this->progressBar->finish();
-	}
+    public function finishProgress() {
+        if (is_null($this->progressBar)) {
+            return;
+        }
+        $this->progressBar->finish();
+    }
 }

apps/dav/lib/Avatars/RootCollection.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return AvatarHome
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
-		return new AvatarHome($principalInfo, $avatarManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return AvatarHome
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        $avatarManager = \OC::$server->getAvatarManager();
+        return new AvatarHome($principalInfo, $avatarManager);
+    }
 
-	public function getName() {
-		return 'avatars';
-	}
+    public function getName() {
+        return 'avatars';
+    }
 
 }