nextcloud / server

lib/public/Files/Config/IRootMountProvider.php

Indentation +7 added lines, -7 removed lines

@@ -31,11 +31,11 @@
  * @since 20.0.0
  */
 interface IRootMountProvider {
-	/**
-	 * Get all root mountpoints of this provider
-	 *
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 20.0.0
-	 */
-	public function getRootMounts(IStorageFactory $loader): array;
+    /**
+     * Get all root mountpoints of this provider
+     *
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 20.0.0
+     */
+    public function getRootMounts(IStorageFactory $loader): array;
 }

lib/public/WorkflowEngine/IRuleMatcher.php

Indentation +47 added lines, -47 removed lines

@@ -36,56 +36,56 @@
  * @since 18.0.0
  */
 interface IRuleMatcher extends IFileCheck {
-	/**
-	 * This method is left for backwards compatibility and easier porting of
-	 * apps. Please use 'getFlows' instead (and setOperation if you implement
-	 * an IComplexOperation).
-	 *
-	 * @since 18.0.0
-	 * @deprecated 18.0.0
-	 */
-	public function getMatchingOperations(string $class, bool $returnFirstMatchingOperationOnly = true): array;
+    /**
+     * This method is left for backwards compatibility and easier porting of
+     * apps. Please use 'getFlows' instead (and setOperation if you implement
+     * an IComplexOperation).
+     *
+     * @since 18.0.0
+     * @deprecated 18.0.0
+     */
+    public function getMatchingOperations(string $class, bool $returnFirstMatchingOperationOnly = true): array;
 
-	/**
-	 * @throws RuntimeException
-	 * @since 18.0.0
-	 */
-	public function getFlows(bool $returnFirstMatchingOperationOnly = true): array;
+    /**
+     * @throws RuntimeException
+     * @since 18.0.0
+     */
+    public function getFlows(bool $returnFirstMatchingOperationOnly = true): array;
 
-	/**
-	 * this method can only be called once and is typically called by the
-	 * Flow engine, unless for IComplexOperations.
-	 *
-	 * @throws RuntimeException
-	 * @since 18.0.0
-	 */
-	public function setOperation(IOperation $operation): void;
+    /**
+     * this method can only be called once and is typically called by the
+     * Flow engine, unless for IComplexOperations.
+     *
+     * @throws RuntimeException
+     * @since 18.0.0
+     */
+    public function setOperation(IOperation $operation): void;
 
-	/**
-	 * this method can only be called once and is typically called by the
-	 * Flow engine, unless for IComplexOperations.
-	 *
-	 * @throws RuntimeException
-	 * @since 18.0.0
-	 */
-	public function setEntity(IEntity $entity): void;
+    /**
+     * this method can only be called once and is typically called by the
+     * Flow engine, unless for IComplexOperations.
+     *
+     * @throws RuntimeException
+     * @since 18.0.0
+     */
+    public function setEntity(IEntity $entity): void;
 
-	/**
-	 * returns the entity which might provide more information, depending on
-	 * the interfaces it implements
-	 *
-	 * @return IEntity
-	 * @since 18.0.0
-	 */
-	public function getEntity(): IEntity;
+    /**
+     * returns the entity which might provide more information, depending on
+     * the interfaces it implements
+     *
+     * @return IEntity
+     * @since 18.0.0
+     */
+    public function getEntity(): IEntity;
 
-	/**
-	 * this method can be called once to set the event name that is currently
-	 * being processed. The workflow engine takes care of this usually, only an
-	 * IComplexOperation might want to make use of it.
-	 *
-	 * @throws RuntimeException
-	 * @since 20.0.0
-	 */
-	public function setEventName(string $eventName): void;
+    /**
+     * this method can be called once to set the event name that is currently
+     * being processed. The workflow engine takes care of this usually, only an
+     * IComplexOperation might want to make use of it.
+     *
+     * @throws RuntimeException
+     * @since 20.0.0
+     */
+    public function setEventName(string $eventName): void;
 }

apps/user_status/lib/Migration/Version0002Date20200902144824.php

Indentation +18 added lines, -18 removed lines

@@ -36,22 +36,22 @@
  */
 class Version0002Date20200902144824 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 20.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$statusTable = $schema->getTable('user_status');
-
-		$statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
-		$statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 20.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $statusTable = $schema->getTable('user_status');
+
+        $statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
+        $statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
+
+        return $schema;
+    }
 }

lib/private/Files/Cache/NullWatcher.php

Indentation +19 added lines, -19 removed lines

@@ -24,30 +24,30 @@
 namespace OC\Files\Cache;
 
 class NullWatcher extends Watcher {
-	private $policy;
+    private $policy;
 
-	public function __construct() {
-	}
+    public function __construct() {
+    }
 
-	public function setPolicy($policy) {
-		$this->policy = $policy;
-	}
+    public function setPolicy($policy) {
+        $this->policy = $policy;
+    }
 
-	public function getPolicy() {
-		return $this->policy;
-	}
+    public function getPolicy() {
+        return $this->policy;
+    }
 
-	public function checkUpdate($path, $cachedEntry = null) {
-		return false;
-	}
+    public function checkUpdate($path, $cachedEntry = null) {
+        return false;
+    }
 
-	public function update($path, $cachedData) {
-	}
+    public function update($path, $cachedData) {
+    }
 
-	public function needsUpdate($path, $cachedData) {
-		return false;
-	}
+    public function needsUpdate($path, $cachedData) {
+        return false;
+    }
 
-	public function cleanFolder($path) {
-	}
+    public function cleanFolder($path) {
+    }
 }

core/Command/L10n/CreateJs.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 		$jsTrans = [];
 		foreach ($translations as $id => $val) {
 			if (is_array($val)) {
-				$val = '[ ' . implode(',', $val) . ']';
+				$val = '[ '.implode(',', $val).']';
 			}
 			$jsTrans[] = "\"$id\" : \"$val\"";
 		}

Indentation +137 added lines, -137 removed lines

@@ -22,141 +22,141 @@
 use UnexpectedValueException;
 
 class CreateJs extends Command implements CompletionAwareInterface {
-	public function __construct(
-		protected IAppManager $appManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('l10n:createjs')
-			->setDescription('Create javascript translation files for a given app')
-			->addArgument(
-				'app',
-				InputOption::VALUE_REQUIRED,
-				'name of the app'
-			)
-			->addArgument(
-				'lang',
-				InputOption::VALUE_OPTIONAL,
-				'name of the language'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$app = $input->getArgument('app');
-		$lang = $input->getArgument('lang');
-
-		$path = $this->appManager->getAppPath($app);
-		$languages = $lang;
-		if (empty($lang)) {
-			$languages = $this->getAllLanguages($path);
-		}
-
-		foreach ($languages as $lang) {
-			$this->writeFiles($app, $path, $lang, $output);
-		}
-		return 0;
-	}
-
-	private function getAllLanguages($path) {
-		$result = [];
-		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if ($fileInfo->isDot()) {
-				continue;
-			}
-			if ($fileInfo->isDir()) {
-				continue;
-			}
-			if ($fileInfo->getExtension() !== 'php') {
-				continue;
-			}
-			$result[] = substr($fileInfo->getBasename(), 0, -4);
-		}
-
-		return $result;
-	}
-
-	private function writeFiles($app, $path, $lang, OutputInterface $output) {
-		[$translations, $plurals] = $this->loadTranslations($path, $lang);
-		$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
-		$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
-	}
-
-	private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.js";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
-		$jsTrans = [];
-		foreach ($translations as $id => $val) {
-			if (is_array($val)) {
-				$val = '[ ' . implode(',', $val) . ']';
-			}
-			$jsTrans[] = "\"$id\" : \"$val\"";
-		}
-		$content .= implode(",\n    ", $jsTrans);
-		$content .= "\n},\n\"$plurals\");\n";
-
-		file_put_contents($jsFile, $content);
-		$output->writeln("Javascript translation file generated: $jsFile");
-	}
-
-	private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.json";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = ['translations' => $translations, 'pluralForm' => $plurals];
-		file_put_contents($jsFile, json_encode($content));
-		$output->writeln("Json translation file generated: $jsFile");
-	}
-
-	private function loadTranslations($path, $lang) {
-		$phpFile = "$path/l10n/$lang.php";
-		$TRANSLATIONS = [];
-		$PLURAL_FORMS = '';
-		if (!file_exists($phpFile)) {
-			throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
-		}
-		require $phpFile;
-
-		return [$TRANSLATIONS, $PLURAL_FORMS];
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return $this->appManager->getAllAppsInAppsFolders();
-		} elseif ($argumentName === 'lang') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			try {
-				return $this->getAllLanguages($this->appManager->getAppPath($appName));
-			} catch (AppPathNotFoundException) {
-				return [];
-			}
-		}
-		return [];
-	}
+    public function __construct(
+        protected IAppManager $appManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('l10n:createjs')
+            ->setDescription('Create javascript translation files for a given app')
+            ->addArgument(
+                'app',
+                InputOption::VALUE_REQUIRED,
+                'name of the app'
+            )
+            ->addArgument(
+                'lang',
+                InputOption::VALUE_OPTIONAL,
+                'name of the language'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $app = $input->getArgument('app');
+        $lang = $input->getArgument('lang');
+
+        $path = $this->appManager->getAppPath($app);
+        $languages = $lang;
+        if (empty($lang)) {
+            $languages = $this->getAllLanguages($path);
+        }
+
+        foreach ($languages as $lang) {
+            $this->writeFiles($app, $path, $lang, $output);
+        }
+        return 0;
+    }
+
+    private function getAllLanguages($path) {
+        $result = [];
+        foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            if ($fileInfo->isDir()) {
+                continue;
+            }
+            if ($fileInfo->getExtension() !== 'php') {
+                continue;
+            }
+            $result[] = substr($fileInfo->getBasename(), 0, -4);
+        }
+
+        return $result;
+    }
+
+    private function writeFiles($app, $path, $lang, OutputInterface $output) {
+        [$translations, $plurals] = $this->loadTranslations($path, $lang);
+        $this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
+        $this->writeJsonFile($path, $lang, $output, $translations, $plurals);
+    }
+
+    private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.js";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+        $jsTrans = [];
+        foreach ($translations as $id => $val) {
+            if (is_array($val)) {
+                $val = '[ ' . implode(',', $val) . ']';
+            }
+            $jsTrans[] = "\"$id\" : \"$val\"";
+        }
+        $content .= implode(",\n    ", $jsTrans);
+        $content .= "\n},\n\"$plurals\");\n";
+
+        file_put_contents($jsFile, $content);
+        $output->writeln("Javascript translation file generated: $jsFile");
+    }
+
+    private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.json";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = ['translations' => $translations, 'pluralForm' => $plurals];
+        file_put_contents($jsFile, json_encode($content));
+        $output->writeln("Json translation file generated: $jsFile");
+    }
+
+    private function loadTranslations($path, $lang) {
+        $phpFile = "$path/l10n/$lang.php";
+        $TRANSLATIONS = [];
+        $PLURAL_FORMS = '';
+        if (!file_exists($phpFile)) {
+            throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
+        }
+        require $phpFile;
+
+        return [$TRANSLATIONS, $PLURAL_FORMS];
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return $this->appManager->getAllAppsInAppsFolders();
+        } elseif ($argumentName === 'lang') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            try {
+                return $this->getAllLanguages($this->appManager->getAppPath($appName));
+            } catch (AppPathNotFoundException) {
+                return [];
+            }
+        }
+        return [];
+    }
 }

apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 		}
 
 		$providers = $this->registry->getProviderStates($user);
-		$state2fa = array_reduce($providers, function (bool $carry, bool $state) {
+		$state2fa = array_reduce($providers, function(bool $carry, bool $state) {
 			return $carry || $state;
 		}, false);
 

Indentation +46 added lines, -46 removed lines

@@ -17,61 +17,61 @@
 
 class RememberBackupCodesJob extends TimedJob {
 
-	public function __construct(
-		private IRegistry $registry,
-		private IUserManager $userManager,
-		ITimeFactory $timeFactory,
-		private IManager $notificationManager,
-		private IJobList $jobList,
-	) {
-		parent::__construct($timeFactory);
-		$this->time = $timeFactory;
+    public function __construct(
+        private IRegistry $registry,
+        private IUserManager $userManager,
+        ITimeFactory $timeFactory,
+        private IManager $notificationManager,
+        private IJobList $jobList,
+    ) {
+        parent::__construct($timeFactory);
+        $this->time = $timeFactory;
 
-		$this->setInterval(60 * 60 * 24 * 14);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+        $this->setInterval(60 * 60 * 24 * 14);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		$uid = $argument['uid'];
-		$user = $this->userManager->get($uid);
+    protected function run($argument) {
+        $uid = $argument['uid'];
+        $user = $this->userManager->get($uid);
 
-		if ($user === null) {
-			// We can't run with an invalid user
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
+        if ($user === null) {
+            // We can't run with an invalid user
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
 
-		$providers = $this->registry->getProviderStates($user);
-		$state2fa = array_reduce($providers, function (bool $carry, bool $state) {
-			return $carry || $state;
-		}, false);
+        $providers = $this->registry->getProviderStates($user);
+        $state2fa = array_reduce($providers, function (bool $carry, bool $state) {
+            return $carry || $state;
+        }, false);
 
-		/*
+        /*
 		 * If no provider is active or if the backup codes are already generate
 		 * we can remove the job
 		 */
-		if ($state2fa === false || (isset($providers['backup_codes']) && $providers['backup_codes'] === true)) {
-			// Backup codes already generated lets remove this job
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
+        if ($state2fa === false || (isset($providers['backup_codes']) && $providers['backup_codes'] === true)) {
+            // Backup codes already generated lets remove this job
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
 
-		$date = new \DateTime();
-		$date->setTimestamp($this->time->getTime());
+        $date = new \DateTime();
+        $date->setTimestamp($this->time->getTime());
 
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('twofactor_backupcodes')
-			->setUser($user->getUID())
-			->setObject('create', 'codes')
-			->setSubject('create_backupcodes');
-		$this->notificationManager->markProcessed($notification);
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('twofactor_backupcodes')
+            ->setUser($user->getUID())
+            ->setObject('create', 'codes')
+            ->setSubject('create_backupcodes');
+        $this->notificationManager->markProcessed($notification);
 
-		if (!$user->isEnabled()) {
-			// Don't recreate a notification for a user that can not read it
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
-		$notification->setDateTime($date);
-		$this->notificationManager->notify($notification);
-	}
+        if (!$user->isEnabled()) {
+            // Don't recreate a notification for a user that can not read it
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
+        $notification->setDateTime($date);
+        $this->notificationManager->notify($notification);
+    }
 }

lib/private/OCS/DiscoveryService.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 	public function discover(string $remote, string $service, bool $skipCache = false): array {
 		// Check the cache first
 		if ($skipCache === false) {
-			$cacheData = $this->cache->get($remote . '#' . $service);
+			$cacheData = $this->cache->get($remote.'#'.$service);
 			if ($cacheData) {
 				$data = json_decode($cacheData, true);
 				if (\is_array($data)) {
@@ -82,7 +82,7 @@ 
 
 		// query the remote server for available services
 		try {
-			$response = $this->client->get($remote . '/ocs-provider/', [
+			$response = $this->client->get($remote.'/ocs-provider/', [
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);
@@ -97,7 +97,7 @@ 
 		}
 
 		// Write into cache
-		$this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60 * 60 * 24);
+		$this->cache->set($remote.'#'.$service, json_encode($discoveredServices), 60 * 60 * 24);
 		return $discoveredServices;
 	}
 
@@ -130,6 +130,6 @@ 
 	 * @return bool
 	 */
 	protected function isSafeUrl(string $url): bool {
-		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
+		return (bool) preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
 	}
 }

Indentation +83 added lines, -83 removed lines

@@ -16,98 +16,98 @@
 use OCP\OCS\IDiscoveryService;
 
 class DiscoveryService implements IDiscoveryService {
-	/** @var ICache */
-	private ICache $cache;
+    /** @var ICache */
+    private ICache $cache;
 
-	/** @var IClient */
-	private IClient $client;
+    /** @var IClient */
+    private IClient $client;
 
-	/**
-	 * @param ICacheFactory $cacheFactory
-	 * @param IClientService $clientService
-	 */
-	public function __construct(ICacheFactory $cacheFactory,
-		IClientService $clientService,
-	) {
-		$this->cache = $cacheFactory->createDistributed('ocs-discovery');
-		$this->client = $clientService->newClient();
-	}
+    /**
+     * @param ICacheFactory $cacheFactory
+     * @param IClientService $clientService
+     */
+    public function __construct(ICacheFactory $cacheFactory,
+        IClientService $clientService,
+    ) {
+        $this->cache = $cacheFactory->createDistributed('ocs-discovery');
+        $this->client = $clientService->newClient();
+    }
 
 
-	/**
-	 * Discover OCS end-points
-	 *
-	 * If no valid discovery data is found the defaults are returned
-	 *
-	 * @param string $remote
-	 * @param string $service the service you want to discover
-	 * @param bool $skipCache We won't check if the data is in the cache. This is useful if a background job is updating the status
-	 * @return array
-	 */
-	public function discover(string $remote, string $service, bool $skipCache = false): array {
-		// Check the cache first
-		if ($skipCache === false) {
-			$cacheData = $this->cache->get($remote . '#' . $service);
-			if ($cacheData) {
-				$data = json_decode($cacheData, true);
-				if (\is_array($data)) {
-					return $data;
-				}
-			}
-		}
+    /**
+     * Discover OCS end-points
+     *
+     * If no valid discovery data is found the defaults are returned
+     *
+     * @param string $remote
+     * @param string $service the service you want to discover
+     * @param bool $skipCache We won't check if the data is in the cache. This is useful if a background job is updating the status
+     * @return array
+     */
+    public function discover(string $remote, string $service, bool $skipCache = false): array {
+        // Check the cache first
+        if ($skipCache === false) {
+            $cacheData = $this->cache->get($remote . '#' . $service);
+            if ($cacheData) {
+                $data = json_decode($cacheData, true);
+                if (\is_array($data)) {
+                    return $data;
+                }
+            }
+        }
 
-		$discoveredServices = [];
+        $discoveredServices = [];
 
-		// query the remote server for available services
-		try {
-			$response = $this->client->get($remote . '/ocs-provider/', [
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			]);
-			if ($response->getStatusCode() === Http::STATUS_OK) {
-				$decodedServices = json_decode($response->getBody(), true);
-				if (\is_array($decodedServices)) {
-					$discoveredServices = $this->getEndpoints($decodedServices, $service);
-				}
-			}
-		} catch (\Exception $e) {
-			// if we couldn't discover the service or any end-points we return a empty array
-		}
+        // query the remote server for available services
+        try {
+            $response = $this->client->get($remote . '/ocs-provider/', [
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ]);
+            if ($response->getStatusCode() === Http::STATUS_OK) {
+                $decodedServices = json_decode($response->getBody(), true);
+                if (\is_array($decodedServices)) {
+                    $discoveredServices = $this->getEndpoints($decodedServices, $service);
+                }
+            }
+        } catch (\Exception $e) {
+            // if we couldn't discover the service or any end-points we return a empty array
+        }
 
-		// Write into cache
-		$this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60 * 60 * 24);
-		return $discoveredServices;
-	}
+        // Write into cache
+        $this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60 * 60 * 24);
+        return $discoveredServices;
+    }
 
-	/**
-	 * get requested end-points from the requested service
-	 *
-	 * @param array $decodedServices
-	 * @param string $service
-	 * @return array
-	 */
-	protected function getEndpoints(array $decodedServices, string $service): array {
-		$discoveredServices = [];
+    /**
+     * get requested end-points from the requested service
+     *
+     * @param array $decodedServices
+     * @param string $service
+     * @return array
+     */
+    protected function getEndpoints(array $decodedServices, string $service): array {
+        $discoveredServices = [];
 
-		if (isset($decodedServices['services'][$service]['endpoints'])) {
-			foreach ($decodedServices['services'][$service]['endpoints'] as $endpoint => $url) {
-				if ($this->isSafeUrl($url)) {
-					$discoveredServices[$endpoint] = $url;
-				}
-			}
-		}
+        if (isset($decodedServices['services'][$service]['endpoints'])) {
+            foreach ($decodedServices['services'][$service]['endpoints'] as $endpoint => $url) {
+                if ($this->isSafeUrl($url)) {
+                    $discoveredServices[$endpoint] = $url;
+                }
+            }
+        }
 
-		return $discoveredServices;
-	}
+        return $discoveredServices;
+    }
 
-	/**
-	 * Returns whether the specified URL includes only safe characters, if not
-	 * returns false
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	protected function isSafeUrl(string $url): bool {
-		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
-	}
+    /**
+     * Returns whether the specified URL includes only safe characters, if not
+     * returns false
+     *
+     * @param string $url
+     * @return bool
+     */
+    protected function isSafeUrl(string $url): bool {
+        return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
+    }
 }

lib/private/User/Backend.php

Spacing +9 added lines, -9 removed lines

@@ -39,14 +39,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+	public const CREATE_USER = 1; // 1 << 0
+	public const SET_PASSWORD = 16; // 1 << 4
+	public const CHECK_PASSWORD = 256; // 1 << 8
+	public const GET_HOME = 4096; // 1 << 12
+	public const GET_DISPLAYNAME = 65536; // 1 << 16
+	public const SET_DISPLAYNAME = 1048576; // 1 << 20
+	public const PROVIDE_AVATAR = 16777216; // 1 << 24
+	public const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = [
 		self::CREATE_USER => 'createUser',
@@ -86,7 +86,7 @@ 
 	 * compared with self::CREATE_USER etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

Indentation +120 added lines, -120 removed lines

@@ -14,136 +14,136 @@
  * capabilities.
  */
 abstract class Backend implements UserInterface {
-	/**
-	 * error code for functions not provided by the user backend
-	 */
-	public const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the user backend
+     */
+    public const NOT_IMPLEMENTED = -501;
 
-	/**
-	 * actions that user backends can define
-	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+    /**
+     * actions that user backends can define
+     */
+    public const CREATE_USER = 1;			// 1 << 0
+    public const SET_PASSWORD = 16;			// 1 << 4
+    public const CHECK_PASSWORD = 256;			// 1 << 8
+    public const GET_HOME = 4096;			// 1 << 12
+    public const GET_DISPLAYNAME = 65536;		// 1 << 16
+    public const SET_DISPLAYNAME = 1048576;		// 1 << 20
+    public const PROVIDE_AVATAR = 16777216;		// 1 << 24
+    public const COUNT_USERS = 268435456;	// 1 << 28
 
-	protected $possibleActions = [
-		self::CREATE_USER => 'createUser',
-		self::SET_PASSWORD => 'setPassword',
-		self::CHECK_PASSWORD => 'checkPassword',
-		self::GET_HOME => 'getHome',
-		self::GET_DISPLAYNAME => 'getDisplayName',
-		self::SET_DISPLAYNAME => 'setDisplayName',
-		self::PROVIDE_AVATAR => 'canChangeAvatar',
-		self::COUNT_USERS => 'countUsers',
-	];
+    protected $possibleActions = [
+        self::CREATE_USER => 'createUser',
+        self::SET_PASSWORD => 'setPassword',
+        self::CHECK_PASSWORD => 'checkPassword',
+        self::GET_HOME => 'getHome',
+        self::GET_DISPLAYNAME => 'getDisplayName',
+        self::SET_DISPLAYNAME => 'setDisplayName',
+        self::PROVIDE_AVATAR => 'canChangeAvatar',
+        self::COUNT_USERS => 'countUsers',
+    ];
 
-	/**
-	 * Get all supported actions
-	 * @return int bitwise-or'ed actions
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with self::CREATE_USER etc.
-	 */
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach ($this->possibleActions as $action => $methodName) {
-			if (method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach ($this->possibleActions as $action => $methodName) {
+            if (method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with self::CREATE_USER etc.
-	 */
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser($uid) {
-		return false;
-	}
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser($uid) {
+        return false;
+    }
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		return [];
-	}
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        return [];
+    }
 
-	/**
-	 * check if a user exists
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function userExists($uid) {
-		return false;
-	}
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        return false;
+    }
 
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return string|boolean
-	 */
-	public function getHome(string $uid) {
-		return false;
-	}
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return string|boolean
+     */
+    public function getHome(string $uid) {
+        return false;
+    }
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		return $uid;
-	}
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        return $uid;
+    }
 
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = [];
-		$users = $this->getUsers($search, $limit, $offset);
-		foreach ($users as $user) {
-			$displayNames[$user] = $user;
-		}
-		return $displayNames;
-	}
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = [];
+        $users = $this->getUsers($search, $limit, $offset);
+        foreach ($users as $user) {
+            $displayNames[$user] = $user;
+        }
+        return $displayNames;
+    }
 
-	/**
-	 * Check if a user list is available or not
-	 * @return boolean if users can be listed or not
-	 */
-	public function hasUserListings() {
-		return false;
-	}
+    /**
+     * Check if a user list is available or not
+     * @return boolean if users can be listed or not
+     */
+    public function hasUserListings() {
+        return false;
+    }
 }

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],

Indentation +59 added lines, -59 removed lines

@@ -13,76 +13,76 @@
 use OCP\AppFramework\Middleware;
 
 class SameSiteCookieMiddleware extends Middleware {
-	/** @var Request */
-	private $request;
+    /** @var Request */
+    private $request;
 
-	/** @var ControllerMethodReflector */
-	private $reflector;
+    /** @var ControllerMethodReflector */
+    private $reflector;
 
-	public function __construct(Request $request,
-		ControllerMethodReflector $reflector) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-	}
+    public function __construct(Request $request,
+        ControllerMethodReflector $reflector) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+    }
 
-	public function beforeController($controller, $methodName) {
-		$requestUri = $this->request->getScriptName();
-		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript) - 1];
+    public function beforeController($controller, $methodName) {
+        $requestUri = $this->request->getScriptName();
+        $processingScript = explode('/', $requestUri);
+        $processingScript = $processingScript[count($processingScript) - 1];
 
-		if ($processingScript !== 'index.php') {
-			return;
-		}
+        if ($processingScript !== 'index.php') {
+            return;
+        }
 
-		$noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
-		if ($noSSC) {
-			return;
-		}
+        $noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
+        if ($noSSC) {
+            return;
+        }
 
-		if (!$this->request->passesLaxCookieCheck()) {
-			throw new LaxSameSiteCookieFailedException();
-		}
-	}
+        if (!$this->request->passesLaxCookieCheck()) {
+            throw new LaxSameSiteCookieFailedException();
+        }
+    }
 
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof LaxSameSiteCookieFailedException) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_FOUND);
-			$response->addHeader('Location', $this->request->getRequestUri());
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof LaxSameSiteCookieFailedException) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_FOUND);
+            $response->addHeader('Location', $this->request->getRequestUri());
 
-			$this->setSameSiteCookie();
+            $this->setSameSiteCookie();
 
-			return $response;
-		}
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
-	protected function setSameSiteCookie() {
-		$cookieParams = $this->request->getCookieParams();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
+    protected function setSameSiteCookie() {
+        $cookieParams = $this->request->getCookieParams();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
 
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
 
-		foreach ($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
+        foreach ($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
 }