nextcloud / server

build/rector.php

Indentation +78 added lines, -78 removed lines

@@ -21,82 +21,82 @@ 
 $nextcloudDir = dirname(__DIR__);
 
 class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface {
-	private array $namespacePrefixes = [
-		'OC',
-		'OCA',
-		'OCP',
-	];
-	private array $skippedClassNames = [
-		'Backend',
-		'Connection',
-		'Exception',
-		'IManager',
-		'IProvider',
-		'Manager',
-		'Plugin',
-		'Provider',
-	];
-	public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
-		if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
-			// Skip common class names to avoid confusion
-			return true;
-		}
-		foreach ($this->namespacePrefixes as $prefix) {
-			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
-				// Import Nextcloud namespaces
-				return false;
-			}
-		}
-		// Skip everything else
-		return true;
-	}
+    private array $namespacePrefixes = [
+        'OC',
+        'OCA',
+        'OCP',
+    ];
+    private array $skippedClassNames = [
+        'Backend',
+        'Connection',
+        'Exception',
+        'IManager',
+        'IProvider',
+        'Manager',
+        'Plugin',
+        'Provider',
+    ];
+    public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
+        if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
+            // Skip common class names to avoid confusion
+            return true;
+        }
+        foreach ($this->namespacePrefixes as $prefix) {
+            if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
+                // Import Nextcloud namespaces
+                return false;
+            }
+        }
+        // Skip everything else
+        return true;
+    }
 }
 
 $config = RectorConfig::configure()
-	->withPaths([
-		$nextcloudDir . '/apps',
-		$nextcloudDir . '/core',
-		$nextcloudDir . '/ocs',
-		$nextcloudDir . '/ocs-provider',
-		$nextcloudDir . '/console.php',
-		$nextcloudDir . '/cron.php',
-		$nextcloudDir . '/index.php',
-		$nextcloudDir . '/occ',
-		$nextcloudDir . '/public.php',
-		$nextcloudDir . '/remote.php',
-		$nextcloudDir . '/status.php',
-		$nextcloudDir . '/version.php',
-		$nextcloudDir . '/lib/private/Share20/ProviderFactory.php',
-		$nextcloudDir . '/tests',
-		// $nextcloudDir . '/config',
-		// $nextcloudDir . '/lib',
-		// $nextcloudDir . '/themes',
-	])
-	->withSkip([
-		$nextcloudDir . '/apps/*/3rdparty/*',
-		$nextcloudDir . '/apps/*/build/stubs/*',
-		$nextcloudDir . '/apps/*/composer/*',
-		$nextcloudDir . '/apps/*/config/*',
-		// The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
-		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
-		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
-	])
-	// uncomment to reach your current PHP version
-	// ->withPhpSets()
-	->withImportNames(importShortClasses:false)
-	->withTypeCoverageLevel(0)
-	->withRules([
-		UseSpecificWillMethodRector::class,
-		StaticDataProviderClassMethodRector::class,
-		DataProviderAnnotationToAttributeRector::class,
-	])
-	->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
-		'inline_public' => true,
-		'rename_property' => true,
-	])
-	->withSets([
-		NextcloudSets::NEXTCLOUD_27,
-	]);
+    ->withPaths([
+        $nextcloudDir . '/apps',
+        $nextcloudDir . '/core',
+        $nextcloudDir . '/ocs',
+        $nextcloudDir . '/ocs-provider',
+        $nextcloudDir . '/console.php',
+        $nextcloudDir . '/cron.php',
+        $nextcloudDir . '/index.php',
+        $nextcloudDir . '/occ',
+        $nextcloudDir . '/public.php',
+        $nextcloudDir . '/remote.php',
+        $nextcloudDir . '/status.php',
+        $nextcloudDir . '/version.php',
+        $nextcloudDir . '/lib/private/Share20/ProviderFactory.php',
+        $nextcloudDir . '/tests',
+        // $nextcloudDir . '/config',
+        // $nextcloudDir . '/lib',
+        // $nextcloudDir . '/themes',
+    ])
+    ->withSkip([
+        $nextcloudDir . '/apps/*/3rdparty/*',
+        $nextcloudDir . '/apps/*/build/stubs/*',
+        $nextcloudDir . '/apps/*/composer/*',
+        $nextcloudDir . '/apps/*/config/*',
+        // The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
+        $nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
+        $nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
+    ])
+    // uncomment to reach your current PHP version
+    // ->withPhpSets()
+    ->withImportNames(importShortClasses:false)
+    ->withTypeCoverageLevel(0)
+    ->withRules([
+        UseSpecificWillMethodRector::class,
+        StaticDataProviderClassMethodRector::class,
+        DataProviderAnnotationToAttributeRector::class,
+    ])
+    ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
+        'inline_public' => true,
+        'rename_property' => true,
+    ])
+    ->withSets([
+        NextcloudSets::NEXTCLOUD_27,
+    ]);
 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
@@ -108,11 +108,11 @@ 
 $ignoredEntries = array_values($ignoredEntries);
 
 foreach ($ignoredEntries as $ignoredEntry) {
-	if (str_ends_with($ignoredEntry, '/')) {
-		$config->withSkip([$ignoredEntry . '*']);
-	} else {
-		$config->withSkip([$ignoredEntry . '/*']);
-	}
+    if (str_ends_with($ignoredEntry, '/')) {
+        $config->withSkip([$ignoredEntry . '*']);
+    } else {
+        $config->withSkip([$ignoredEntry . '/*']);
+    }
 }
 
 return $config;

Spacing +24 added lines, -24 removed lines

@@ -42,7 +42,7 @@ 
 			return true;
 		}
 		foreach ($this->namespacePrefixes as $prefix) {
-			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
+			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix.'\\')) {
 				// Import Nextcloud namespaces
 				return false;
 			}
@@ -54,32 +54,32 @@ 
 
 $config = RectorConfig::configure()
 	->withPaths([
-		$nextcloudDir . '/apps',
-		$nextcloudDir . '/core',
-		$nextcloudDir . '/ocs',
-		$nextcloudDir . '/ocs-provider',
-		$nextcloudDir . '/console.php',
-		$nextcloudDir . '/cron.php',
-		$nextcloudDir . '/index.php',
-		$nextcloudDir . '/occ',
-		$nextcloudDir . '/public.php',
-		$nextcloudDir . '/remote.php',
-		$nextcloudDir . '/status.php',
-		$nextcloudDir . '/version.php',
-		$nextcloudDir . '/lib/private/Share20/ProviderFactory.php',
-		$nextcloudDir . '/tests',
+		$nextcloudDir.'/apps',
+		$nextcloudDir.'/core',
+		$nextcloudDir.'/ocs',
+		$nextcloudDir.'/ocs-provider',
+		$nextcloudDir.'/console.php',
+		$nextcloudDir.'/cron.php',
+		$nextcloudDir.'/index.php',
+		$nextcloudDir.'/occ',
+		$nextcloudDir.'/public.php',
+		$nextcloudDir.'/remote.php',
+		$nextcloudDir.'/status.php',
+		$nextcloudDir.'/version.php',
+		$nextcloudDir.'/lib/private/Share20/ProviderFactory.php',
+		$nextcloudDir.'/tests',
 		// $nextcloudDir . '/config',
 		// $nextcloudDir . '/lib',
 		// $nextcloudDir . '/themes',
 	])
 	->withSkip([
-		$nextcloudDir . '/apps/*/3rdparty/*',
-		$nextcloudDir . '/apps/*/build/stubs/*',
-		$nextcloudDir . '/apps/*/composer/*',
-		$nextcloudDir . '/apps/*/config/*',
+		$nextcloudDir.'/apps/*/3rdparty/*',
+		$nextcloudDir.'/apps/*/build/stubs/*',
+		$nextcloudDir.'/apps/*/composer/*',
+		$nextcloudDir.'/apps/*/config/*',
 		// The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
-		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
-		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
+		$nextcloudDir.'/tests/lib/AppFramework/Middleware/Mock/*',
+		$nextcloudDir.'/tests/lib/AppFramework/Middleware/Security/Mock/*',
 	])
 	// uncomment to reach your current PHP version
 	// ->withPhpSets()
@@ -101,7 +101,7 @@ 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
 /* Ignore all files ignored by git */
-$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg($nextcloudDir));
+$ignoredEntries = shell_exec('git status --porcelain --ignored '.escapeshellarg($nextcloudDir));
 $ignoredEntries = explode("\n", $ignoredEntries);
 $ignoredEntries = array_filter($ignoredEntries, static fn (string $line) => str_starts_with($line, '!! '));
 $ignoredEntries = array_map(static fn (string $line) => substr($line, 3), $ignoredEntries);
@@ -109,9 +109,9 @@ 
 
 foreach ($ignoredEntries as $ignoredEntry) {
 	if (str_ends_with($ignoredEntry, '/')) {
-		$config->withSkip([$ignoredEntry . '*']);
+		$config->withSkip([$ignoredEntry.'*']);
 	} else {
-		$config->withSkip([$ignoredEntry . '/*']);
+		$config->withSkip([$ignoredEntry.'/*']);
 	}
 }
 

core/Command/Base.php

Indentation +221 added lines, -221 removed lines

@@ -19,225 +19,225 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Base extends Command implements CompletionAwareInterface {
-	public const OUTPUT_FORMAT_PLAIN = 'plain';
-	public const OUTPUT_FORMAT_JSON = 'json';
-	public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
-
-	protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
-	private bool $php_pcntl_signal = false;
-	private bool $interrupted = false;
-
-	protected function configure() {
-		// Some of our commands do not extend this class; and some of those that do do not call parent::configure()
-		$defaultHelp = 'More extensive and thorough documentation may be found at ' . Server::get(Defaults::class)->getDocBaseUrl() . PHP_EOL;
-		$this
-			->setHelp($defaultHelp)
-			->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			)
-		;
-	}
-
-	protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, iterable $items, string $prefix = '  - '): void {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$items = (is_array($items) ? $items : iterator_to_array($items));
-				$output->writeln(json_encode($items));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$items = (is_array($items) ? $items : iterator_to_array($items));
-				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
-				break;
-			default:
-				foreach ($items as $key => $item) {
-					if (is_iterable($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
-						continue;
-					}
-					if (!is_int($key) || get_class($this) === ListCommand::class) {
-						$value = $this->valueToString($item);
-						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
-						} else {
-							$output->writeln($prefix . $key);
-						}
-					} else {
-						$output->writeln($prefix . $this->valueToString($item));
-					}
-				}
-				break;
-		}
-	}
-
-	protected function writeTableInOutputFormat(InputInterface $input, OutputInterface $output, array $items): void {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($items));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
-				break;
-			default:
-				$table = new Table($output);
-				$table->setRows($items);
-				if (!empty($items) && is_string(array_key_first(reset($items)))) {
-					$table->setHeaders(array_keys(reset($items)));
-				}
-				$table->render();
-				break;
-		}
-	}
-
-	protected function writeStreamingTableInOutputFormat(InputInterface $input, OutputInterface $output, \Iterator $items, int $tableGroupSize): void {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$this->writeStreamingJsonArray($input, $output, $items);
-				break;
-			default:
-				foreach ($this->chunkIterator($items, $tableGroupSize) as $chunk) {
-					$this->writeTableInOutputFormat($input, $output, $chunk);
-				}
-				break;
-		}
-	}
-
-	protected function writeStreamingJsonArray(InputInterface $input, OutputInterface $output, \Iterator $items): void {
-		$first = true;
-		$outputType = $input->getOption('output');
-
-		$output->writeln('[');
-		foreach ($items as $item) {
-			if (!$first) {
-				$output->writeln(',');
-			}
-			if ($outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-				$output->write(json_encode($item, JSON_PRETTY_PRINT));
-			} else {
-				$output->write(json_encode($item));
-			}
-			$first = false;
-		}
-		$output->writeln("\n]");
-	}
-
-	public function chunkIterator(\Iterator $iterator, int $count): \Iterator {
-		$chunk = [];
-
-		for ($i = 0; $iterator->valid(); $i++) {
-			$chunk[] = $iterator->current();
-			$iterator->next();
-			if (count($chunk) == $count) {
-				// Got a full chunk, yield and start a new one
-				yield $chunk;
-				$chunk = [];
-			}
-		}
-
-		if (count($chunk)) {
-			// Yield the last chunk even if incomplete
-			yield $chunk;
-		}
-	}
-
-
-	/**
-	 * @param mixed $item
-	 */
-	protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
-		if (is_array($item)) {
-			$this->writeArrayInOutputFormat($input, $output, $item, '');
-			return;
-		}
-
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($item));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($item, JSON_PRETTY_PRINT));
-				break;
-			default:
-				$output->writeln($this->valueToString($item, false));
-				break;
-		}
-	}
-
-	protected function valueToString($value, bool $returnNull = true): ?string {
-		if ($value === false) {
-			return 'false';
-		} elseif ($value === true) {
-			return 'true';
-		} elseif ($value === null) {
-			return $returnNull ? null : 'null';
-		} if ($value instanceof \UnitEnum) {
-			return $value->value;
-		} else {
-			return $value;
-		}
-	}
-
-	/**
-	 * Throw InterruptedException when interrupted by user
-	 *
-	 * @throws InterruptedException
-	 */
-	protected function abortIfInterrupted() {
-		if ($this->php_pcntl_signal === false) {
-			return;
-		}
-
-		pcntl_signal_dispatch();
-
-		if ($this->interrupted === true) {
-			throw new InterruptedException('Command interrupted by user');
-		}
-	}
-
-	/**
-	 * Changes the status of the command to "interrupted" if ctrl-c has been pressed
-	 *
-	 * Gives a chance to the command to properly terminate what it's doing
-	 */
-	public function cancelOperation(): void {
-		$this->interrupted = true;
-	}
-
-	public function run(InputInterface $input, OutputInterface $output): int {
-		// check if the php pcntl_signal functions are accessible
-		$this->php_pcntl_signal = function_exists('pcntl_signal');
-		if ($this->php_pcntl_signal) {
-			// Collect interrupts and notify the running command
-			pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
-			pcntl_signal(SIGINT, [$this, 'cancelOperation']);
-		}
-
-		return parent::run($input, $output);
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'output') {
-			return ['plain', 'json', 'json_pretty'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    public const OUTPUT_FORMAT_PLAIN = 'plain';
+    public const OUTPUT_FORMAT_JSON = 'json';
+    public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
+
+    protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
+    private bool $php_pcntl_signal = false;
+    private bool $interrupted = false;
+
+    protected function configure() {
+        // Some of our commands do not extend this class; and some of those that do do not call parent::configure()
+        $defaultHelp = 'More extensive and thorough documentation may be found at ' . Server::get(Defaults::class)->getDocBaseUrl() . PHP_EOL;
+        $this
+            ->setHelp($defaultHelp)
+            ->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            )
+        ;
+    }
+
+    protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, iterable $items, string $prefix = '  - '): void {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $items = (is_array($items) ? $items : iterator_to_array($items));
+                $output->writeln(json_encode($items));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $items = (is_array($items) ? $items : iterator_to_array($items));
+                $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                break;
+            default:
+                foreach ($items as $key => $item) {
+                    if (is_iterable($item)) {
+                        $output->writeln($prefix . $key . ':');
+                        $this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+                        continue;
+                    }
+                    if (!is_int($key) || get_class($this) === ListCommand::class) {
+                        $value = $this->valueToString($item);
+                        if (!is_null($value)) {
+                            $output->writeln($prefix . $key . ': ' . $value);
+                        } else {
+                            $output->writeln($prefix . $key);
+                        }
+                    } else {
+                        $output->writeln($prefix . $this->valueToString($item));
+                    }
+                }
+                break;
+        }
+    }
+
+    protected function writeTableInOutputFormat(InputInterface $input, OutputInterface $output, array $items): void {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($items));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                break;
+            default:
+                $table = new Table($output);
+                $table->setRows($items);
+                if (!empty($items) && is_string(array_key_first(reset($items)))) {
+                    $table->setHeaders(array_keys(reset($items)));
+                }
+                $table->render();
+                break;
+        }
+    }
+
+    protected function writeStreamingTableInOutputFormat(InputInterface $input, OutputInterface $output, \Iterator $items, int $tableGroupSize): void {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $this->writeStreamingJsonArray($input, $output, $items);
+                break;
+            default:
+                foreach ($this->chunkIterator($items, $tableGroupSize) as $chunk) {
+                    $this->writeTableInOutputFormat($input, $output, $chunk);
+                }
+                break;
+        }
+    }
+
+    protected function writeStreamingJsonArray(InputInterface $input, OutputInterface $output, \Iterator $items): void {
+        $first = true;
+        $outputType = $input->getOption('output');
+
+        $output->writeln('[');
+        foreach ($items as $item) {
+            if (!$first) {
+                $output->writeln(',');
+            }
+            if ($outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+                $output->write(json_encode($item, JSON_PRETTY_PRINT));
+            } else {
+                $output->write(json_encode($item));
+            }
+            $first = false;
+        }
+        $output->writeln("\n]");
+    }
+
+    public function chunkIterator(\Iterator $iterator, int $count): \Iterator {
+        $chunk = [];
+
+        for ($i = 0; $iterator->valid(); $i++) {
+            $chunk[] = $iterator->current();
+            $iterator->next();
+            if (count($chunk) == $count) {
+                // Got a full chunk, yield and start a new one
+                yield $chunk;
+                $chunk = [];
+            }
+        }
+
+        if (count($chunk)) {
+            // Yield the last chunk even if incomplete
+            yield $chunk;
+        }
+    }
+
+
+    /**
+     * @param mixed $item
+     */
+    protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
+        if (is_array($item)) {
+            $this->writeArrayInOutputFormat($input, $output, $item, '');
+            return;
+        }
+
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($item));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($item, JSON_PRETTY_PRINT));
+                break;
+            default:
+                $output->writeln($this->valueToString($item, false));
+                break;
+        }
+    }
+
+    protected function valueToString($value, bool $returnNull = true): ?string {
+        if ($value === false) {
+            return 'false';
+        } elseif ($value === true) {
+            return 'true';
+        } elseif ($value === null) {
+            return $returnNull ? null : 'null';
+        } if ($value instanceof \UnitEnum) {
+            return $value->value;
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Throw InterruptedException when interrupted by user
+     *
+     * @throws InterruptedException
+     */
+    protected function abortIfInterrupted() {
+        if ($this->php_pcntl_signal === false) {
+            return;
+        }
+
+        pcntl_signal_dispatch();
+
+        if ($this->interrupted === true) {
+            throw new InterruptedException('Command interrupted by user');
+        }
+    }
+
+    /**
+     * Changes the status of the command to "interrupted" if ctrl-c has been pressed
+     *
+     * Gives a chance to the command to properly terminate what it's doing
+     */
+    public function cancelOperation(): void {
+        $this->interrupted = true;
+    }
+
+    public function run(InputInterface $input, OutputInterface $output): int {
+        // check if the php pcntl_signal functions are accessible
+        $this->php_pcntl_signal = function_exists('pcntl_signal');
+        if ($this->php_pcntl_signal) {
+            // Collect interrupts and notify the running command
+            pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
+            pcntl_signal(SIGINT, [$this, 'cancelOperation']);
+        }
+
+        return parent::run($input, $output);
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'output') {
+            return ['plain', 'json', 'json_pretty'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 
 	protected function configure() {
 		// Some of our commands do not extend this class; and some of those that do do not call parent::configure()
-		$defaultHelp = 'More extensive and thorough documentation may be found at ' . Server::get(Defaults::class)->getDocBaseUrl() . PHP_EOL;
+		$defaultHelp = 'More extensive and thorough documentation may be found at '.Server::get(Defaults::class)->getDocBaseUrl().PHP_EOL;
 		$this
 			->setHelp($defaultHelp)
 			->addOption(
@@ -55,19 +55,19 @@ 
 			default:
 				foreach ($items as $key => $item) {
 					if (is_iterable($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+						$output->writeln($prefix.$key.':');
+						$this->writeArrayInOutputFormat($input, $output, $item, '  '.$prefix);
 						continue;
 					}
 					if (!is_int($key) || get_class($this) === ListCommand::class) {
 						$value = $this->valueToString($item);
 						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
+							$output->writeln($prefix.$key.': '.$value);
 						} else {
-							$output->writeln($prefix . $key);
+							$output->writeln($prefix.$key);
 						}
 					} else {
-						$output->writeln($prefix . $this->valueToString($item));
+						$output->writeln($prefix.$this->valueToString($item));
 					}
 				}
 				break;

core/Controller/TwoFactorChallengeController.php

Indentation +204 added lines, -204 removed lines

@@ -31,232 +31,232 @@
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class TwoFactorChallengeController extends Controller {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private Manager $twoFactorManager,
-		private IUserSession $userSession,
-		private ISession $session,
-		private IURLGenerator $urlGenerator,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private Manager $twoFactorManager,
+        private IUserSession $userSession,
+        private ISession $session,
+        private IURLGenerator $urlGenerator,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getLogoutUrl() {
-		return OC_User::getLogoutUrl($this->urlGenerator);
-	}
+    /**
+     * @return string
+     */
+    protected function getLogoutUrl() {
+        return OC_User::getLogoutUrl($this->urlGenerator);
+    }
 
-	/**
-	 * @param IProvider[] $providers
-	 */
-	private function splitProvidersAndBackupCodes(array $providers): array {
-		$regular = [];
-		$backup = null;
-		foreach ($providers as $provider) {
-			if ($provider->getId() === 'backup_codes') {
-				$backup = $provider;
-			} else {
-				$regular[] = $provider;
-			}
-		}
+    /**
+     * @param IProvider[] $providers
+     */
+    private function splitProvidersAndBackupCodes(array $providers): array {
+        $regular = [];
+        $backup = null;
+        foreach ($providers as $provider) {
+            if ($provider->getId() === 'backup_codes') {
+                $backup = $provider;
+            } else {
+                $regular[] = $provider;
+            }
+        }
 
-		return [$regular, $backup];
-	}
+        return [$regular, $backup];
+    }
 
-	/**
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 * @param string $redirect_url
-	 * @return StandaloneTemplateResponse
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'GET', url: '/login/selectchallenge')]
-	public function selectChallenge($redirect_url) {
-		$user = $this->userSession->getUser();
-		$providerSet = $this->twoFactorManager->getProviderSet($user);
-		$allProviders = $providerSet->getProviders();
-		[$providers, $backupProvider] = $this->splitProvidersAndBackupCodes($allProviders);
-		$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
+    /**
+     * @TwoFactorSetUpDoneRequired
+     *
+     * @param string $redirect_url
+     * @return StandaloneTemplateResponse
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'GET', url: '/login/selectchallenge')]
+    public function selectChallenge($redirect_url) {
+        $user = $this->userSession->getUser();
+        $providerSet = $this->twoFactorManager->getProviderSet($user);
+        $allProviders = $providerSet->getProviders();
+        [$providers, $backupProvider] = $this->splitProvidersAndBackupCodes($allProviders);
+        $setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$data = [
-			'providers' => $providers,
-			'backupProvider' => $backupProvider,
-			'providerMissing' => $providerSet->isProviderMissing(),
-			'redirect_url' => $redirect_url,
-			'logout_url' => $this->getLogoutUrl(),
-			'hasSetupProviders' => !empty($setupProviders),
-		];
-		Util::addScript('core', 'twofactor-request-token');
-		return new StandaloneTemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest');
-	}
+        $data = [
+            'providers' => $providers,
+            'backupProvider' => $backupProvider,
+            'providerMissing' => $providerSet->isProviderMissing(),
+            'redirect_url' => $redirect_url,
+            'logout_url' => $this->getLogoutUrl(),
+            'hasSetupProviders' => !empty($setupProviders),
+        ];
+        Util::addScript('core', 'twofactor-request-token');
+        return new StandaloneTemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest');
+    }
 
-	/**
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 * @param string $challengeProviderId
-	 * @param string $redirect_url
-	 * @return StandaloneTemplateResponse|RedirectResponse
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'GET', url: '/login/challenge/{challengeProviderId}')]
-	public function showChallenge($challengeProviderId, $redirect_url) {
-		$user = $this->userSession->getUser();
-		$providerSet = $this->twoFactorManager->getProviderSet($user);
-		$provider = $providerSet->getProvider($challengeProviderId);
+    /**
+     * @TwoFactorSetUpDoneRequired
+     *
+     * @param string $challengeProviderId
+     * @param string $redirect_url
+     * @return StandaloneTemplateResponse|RedirectResponse
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'GET', url: '/login/challenge/{challengeProviderId}')]
+    public function showChallenge($challengeProviderId, $redirect_url) {
+        $user = $this->userSession->getUser();
+        $providerSet = $this->twoFactorManager->getProviderSet($user);
+        $provider = $providerSet->getProvider($challengeProviderId);
 
-		if (is_null($provider)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+        if (is_null($provider)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		$backupProvider = $providerSet->getProvider('backup_codes');
-		if (!is_null($backupProvider) && $backupProvider->getId() === $provider->getId()) {
-			// Don't show the backup provider link if we're already showing that provider's challenge
-			$backupProvider = null;
-		}
+        $backupProvider = $providerSet->getProvider('backup_codes');
+        if (!is_null($backupProvider) && $backupProvider->getId() === $provider->getId()) {
+            // Don't show the backup provider link if we're already showing that provider's challenge
+            $backupProvider = null;
+        }
 
-		$errorMessage = '';
-		$error = false;
-		if ($this->session->exists('two_factor_auth_error')) {
-			$this->session->remove('two_factor_auth_error');
-			$error = true;
-			$errorMessage = $this->session->get('two_factor_auth_error_message');
-			$this->session->remove('two_factor_auth_error_message');
-		}
-		$tmpl = $provider->getTemplate($user);
-		$tmpl->assign('redirect_url', $redirect_url);
-		$data = [
-			'error' => $error,
-			'error_message' => $errorMessage,
-			'provider' => $provider,
-			'backupProvider' => $backupProvider,
-			'logout_url' => $this->getLogoutUrl(),
-			'redirect_url' => $redirect_url,
-			'template' => $tmpl->fetchPage(),
-		];
-		$response = new StandaloneTemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
-		if ($provider instanceof IProvidesCustomCSP) {
-			$response->setContentSecurityPolicy($provider->getCSP());
-		}
-		Util::addScript('core', 'twofactor-request-token');
-		return $response;
-	}
+        $errorMessage = '';
+        $error = false;
+        if ($this->session->exists('two_factor_auth_error')) {
+            $this->session->remove('two_factor_auth_error');
+            $error = true;
+            $errorMessage = $this->session->get('two_factor_auth_error_message');
+            $this->session->remove('two_factor_auth_error_message');
+        }
+        $tmpl = $provider->getTemplate($user);
+        $tmpl->assign('redirect_url', $redirect_url);
+        $data = [
+            'error' => $error,
+            'error_message' => $errorMessage,
+            'provider' => $provider,
+            'backupProvider' => $backupProvider,
+            'logout_url' => $this->getLogoutUrl(),
+            'redirect_url' => $redirect_url,
+            'template' => $tmpl->fetchPage(),
+        ];
+        $response = new StandaloneTemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
+        if ($provider instanceof IProvidesCustomCSP) {
+            $response->setContentSecurityPolicy($provider->getCSP());
+        }
+        Util::addScript('core', 'twofactor-request-token');
+        return $response;
+    }
 
-	/**
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 *
-	 * @param string $challengeProviderId
-	 * @param string $challenge
-	 * @param string $redirect_url
-	 * @return RedirectResponse
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'POST', url: '/login/challenge/{challengeProviderId}')]
-	#[UserRateLimit(limit: 5, period: 100)]
-	public function solveChallenge($challengeProviderId, $challenge, $redirect_url = null) {
-		$user = $this->userSession->getUser();
-		$provider = $this->twoFactorManager->getProvider($user, $challengeProviderId);
-		if (is_null($provider)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+    /**
+     * @TwoFactorSetUpDoneRequired
+     *
+     *
+     * @param string $challengeProviderId
+     * @param string $challenge
+     * @param string $redirect_url
+     * @return RedirectResponse
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'POST', url: '/login/challenge/{challengeProviderId}')]
+    #[UserRateLimit(limit: 5, period: 100)]
+    public function solveChallenge($challengeProviderId, $challenge, $redirect_url = null) {
+        $user = $this->userSession->getUser();
+        $provider = $this->twoFactorManager->getProvider($user, $challengeProviderId);
+        if (is_null($provider)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		try {
-			if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
-				if (!is_null($redirect_url)) {
-					return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
-				}
-				return new RedirectResponse($this->urlGenerator->linkToDefaultPageUrl());
-			}
-		} catch (TwoFactorException $e) {
-			/*
+        try {
+            if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
+                if (!is_null($redirect_url)) {
+                    return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
+                }
+                return new RedirectResponse($this->urlGenerator->linkToDefaultPageUrl());
+            }
+        } catch (TwoFactorException $e) {
+            /*
 			 * The 2FA App threw an TwoFactorException. Now we display more
 			 * information to the user. The exception text is stored in the
 			 * session to be used in showChallenge()
 			 */
-			$this->session->set('two_factor_auth_error_message', $e->getMessage());
-		}
+            $this->session->set('two_factor_auth_error_message', $e->getMessage());
+        }
 
-		$ip = $this->request->getRemoteAddress();
-		$uid = $user->getUID();
-		$this->logger->warning("Two-factor challenge failed: $uid (Remote IP: $ip)");
-		$this->session->set('two_factor_auth_error', true);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
-			'challengeProviderId' => $provider->getId(),
-			'redirect_url' => $redirect_url,
-		]));
-	}
+        $ip = $this->request->getRemoteAddress();
+        $uid = $user->getUID();
+        $this->logger->warning("Two-factor challenge failed: $uid (Remote IP: $ip)");
+        $this->session->set('two_factor_auth_error', true);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
+            'challengeProviderId' => $provider->getId(),
+            'redirect_url' => $redirect_url,
+        ]));
+    }
 
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge')]
-	public function setupProviders(?string $redirect_url = null): StandaloneTemplateResponse {
-		$user = $this->userSession->getUser();
-		$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge')]
+    public function setupProviders(?string $redirect_url = null): StandaloneTemplateResponse {
+        $user = $this->userSession->getUser();
+        $setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$data = [
-			'providers' => $setupProviders,
-			'logout_url' => $this->getLogoutUrl(),
-			'redirect_url' => $redirect_url,
-		];
+        $data = [
+            'providers' => $setupProviders,
+            'logout_url' => $this->getLogoutUrl(),
+            'redirect_url' => $redirect_url,
+        ];
 
-		Util::addScript('core', 'twofactor-request-token');
-		return new StandaloneTemplateResponse($this->appName, 'twofactorsetupselection', $data, 'guest');
-	}
+        Util::addScript('core', 'twofactor-request-token');
+        return new StandaloneTemplateResponse($this->appName, 'twofactorsetupselection', $data, 'guest');
+    }
 
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge/{providerId}')]
-	public function setupProvider(string $providerId, ?string $redirect_url = null) {
-		$user = $this->userSession->getUser();
-		$providers = $this->twoFactorManager->getLoginSetupProviders($user);
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge/{providerId}')]
+    public function setupProvider(string $providerId, ?string $redirect_url = null) {
+        $user = $this->userSession->getUser();
+        $providers = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$provider = null;
-		foreach ($providers as $p) {
-			if ($p->getId() === $providerId) {
-				$provider = $p;
-				break;
-			}
-		}
+        $provider = null;
+        foreach ($providers as $p) {
+            if ($p->getId() === $providerId) {
+                $provider = $p;
+                break;
+            }
+        }
 
-		if ($provider === null) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+        if ($provider === null) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		/** @var IActivatableAtLogin $provider */
-		$tmpl = $provider->getLoginSetup($user)->getBody();
-		$data = [
-			'provider' => $provider,
-			'logout_url' => $this->getLogoutUrl(),
-			'redirect_url' => $redirect_url,
-			'template' => $tmpl->fetchPage(),
-		];
-		$response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupchallenge', $data, 'guest');
-		Util::addScript('core', 'twofactor-request-token');
-		return $response;
-	}
+        /** @var IActivatableAtLogin $provider */
+        $tmpl = $provider->getLoginSetup($user)->getBody();
+        $data = [
+            'provider' => $provider,
+            'logout_url' => $this->getLogoutUrl(),
+            'redirect_url' => $redirect_url,
+            'template' => $tmpl->fetchPage(),
+        ];
+        $response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupchallenge', $data, 'guest');
+        Util::addScript('core', 'twofactor-request-token');
+        return $response;
+    }
 
-	/**
-	 * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'POST', url: 'login/setupchallenge/{providerId}')]
-	public function confirmProviderSetup(string $providerId, ?string $redirect_url = null) {
-		return new RedirectResponse($this->urlGenerator->linkToRoute(
-			'core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $providerId,
-				'redirect_url' => $redirect_url,
-			]
-		));
-	}
+    /**
+     * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'POST', url: 'login/setupchallenge/{providerId}')]
+    public function confirmProviderSetup(string $providerId, ?string $redirect_url = null) {
+        return new RedirectResponse($this->urlGenerator->linkToRoute(
+            'core.TwoFactorChallenge.showChallenge',
+            [
+                'challengeProviderId' => $providerId,
+                'redirect_url' => $redirect_url,
+            ]
+        ));
+    }
 }

apps/settings/lib/Controller/AuthorizedGroupController.php

Indentation +41 added lines, -41 removed lines

@@ -15,49 +15,49 @@
 use OCP\IRequest;
 
 class AuthorizedGroupController extends Controller {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private AuthorizedGroupService $authorizedGroupService,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private AuthorizedGroupService $authorizedGroupService,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @throws NotFoundException
-	 * @throws Exception
-	 */
-	public function saveSettings(array $newGroups, string $class): DataResponse {
-		$currentGroups = $this->authorizedGroupService->findExistingGroupsForClass($class);
+    /**
+     * @throws NotFoundException
+     * @throws Exception
+     */
+    public function saveSettings(array $newGroups, string $class): DataResponse {
+        $currentGroups = $this->authorizedGroupService->findExistingGroupsForClass($class);
 
-		foreach ($currentGroups as $group) {
-			/** @var AuthorizedGroup $group */
-			$removed = true;
-			foreach ($newGroups as $groupData) {
-				if ($groupData['gid'] === $group->getGroupId()) {
-					$removed = false;
-					break;
-				}
-			}
-			if ($removed) {
-				$this->authorizedGroupService->delete($group->getId());
-			}
-		}
+        foreach ($currentGroups as $group) {
+            /** @var AuthorizedGroup $group */
+            $removed = true;
+            foreach ($newGroups as $groupData) {
+                if ($groupData['gid'] === $group->getGroupId()) {
+                    $removed = false;
+                    break;
+                }
+            }
+            if ($removed) {
+                $this->authorizedGroupService->delete($group->getId());
+            }
+        }
 
-		foreach ($newGroups as $groupData) {
-			$added = true;
-			foreach ($currentGroups as $group) {
-				/** @var AuthorizedGroup $group */
-				if ($groupData['gid'] === $group->getGroupId()) {
-					$added = false;
-					break;
-				}
-			}
-			if ($added) {
-				$this->authorizedGroupService->create($groupData['gid'], $class);
-			}
-		}
+        foreach ($newGroups as $groupData) {
+            $added = true;
+            foreach ($currentGroups as $group) {
+                /** @var AuthorizedGroup $group */
+                if ($groupData['gid'] === $group->getGroupId()) {
+                    $added = false;
+                    break;
+                }
+            }
+            if ($added) {
+                $this->authorizedGroupService->create($groupData['gid'], $class);
+            }
+        }
 
-		return new DataResponse(['valid' => true]);
-	}
+        return new DataResponse(['valid' => true]);
+    }
 }

apps/settings/lib/Controller/CheckSetupController.php

Indentation +93 added lines, -93 removed lines

@@ -27,59 +27,59 @@ 
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class CheckSetupController extends Controller {
-	/** @var Checker */
-	private $checker;
-
-	public function __construct(
-		$appName,
-		IRequest $request,
-		private IConfig $config,
-		private IURLGenerator $urlGenerator,
-		private IL10N $l10n,
-		Checker $checker,
-		private LoggerInterface $logger,
-		private ISetupCheckManager $setupCheckManager,
-	) {
-		parent::__construct($appName, $request);
-		$this->checker = $checker;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	#[NoCSRFRequired]
-	#[NoAdminRequired]
-	public function setupCheckManager(): DataResponse {
-		return new DataResponse($this->setupCheckManager->runAll());
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	#[NoCSRFRequired]
-	#[AuthorizedAdminSetting(settings: Overview::class)]
-	public function rescanFailedIntegrityCheck(): RedirectResponse {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview'])
-		);
-	}
-
-	#[NoCSRFRequired]
-	#[AuthorizedAdminSetting(settings: Overview::class)]
-	public function getFailedIntegrityCheckFiles(): DataDisplayResponse {
-		if (!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if ($completeResults === null) {
-			return new DataDisplayResponse('Integrity checker has not been run. Integrity information not available.');
-		}
-
-		if (!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var Checker */
+    private $checker;
+
+    public function __construct(
+        $appName,
+        IRequest $request,
+        private IConfig $config,
+        private IURLGenerator $urlGenerator,
+        private IL10N $l10n,
+        Checker $checker,
+        private LoggerInterface $logger,
+        private ISetupCheckManager $setupCheckManager,
+    ) {
+        parent::__construct($appName, $request);
+        $this->checker = $checker;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    #[NoCSRFRequired]
+    #[NoAdminRequired]
+    public function setupCheckManager(): DataResponse {
+        return new DataResponse($this->setupCheckManager->runAll());
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    #[NoCSRFRequired]
+    #[AuthorizedAdminSetting(settings: Overview::class)]
+    public function rescanFailedIntegrityCheck(): RedirectResponse {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview'])
+        );
+    }
+
+    #[NoCSRFRequired]
+    #[AuthorizedAdminSetting(settings: Overview::class)]
+    public function getFailedIntegrityCheckFiles(): DataDisplayResponse {
+        if (!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if ($completeResults === null) {
+            return new DataDisplayResponse('Integrity checker has not been run. Integrity information not available.');
+        }
+
+        if (!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -88,47 +88,47 @@ 
 Results
 =======
 ';
-			foreach ($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach ($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if ($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach ($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach ($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if ($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		return new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	#[AuthorizedAdminSetting(settings: Overview::class)]
-	public function check() {
-		return new DataResponse($this->setupCheckManager->runAll());
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        return new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+    }
+
+    /**
+     * @return DataResponse
+     */
+    #[AuthorizedAdminSetting(settings: Overview::class)]
+    public function check() {
+        return new DataResponse($this->setupCheckManager->runAll());
+    }
 }

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

Indentation +115 added lines, -115 removed lines

@@ -23,119 +23,119 @@
 use Psr\Log\LoggerInterface;
 
 class ExpireTrash extends TimedJob {
-	public const TOGGLE_CONFIG_KEY_NAME = 'background_job_expire_trash';
-	public const OFFSET_CONFIG_KEY_NAME = 'background_job_expire_trash_offset';
-	private const THIRTY_MINUTES = 30 * 60;
-	private const USER_BATCH_SIZE = 10;
-
-	public function __construct(
-		private IAppConfig $appConfig,
-		private IUserManager $userManager,
-		private Expiration $expiration,
-		private LoggerInterface $logger,
-		private SetupManager $setupManager,
-		private ILockingProvider $lockingProvider,
-		ITimeFactory $time,
-	) {
-		parent::__construct($time);
-		$this->setInterval(self::THIRTY_MINUTES);
-	}
-
-	protected function run($argument) {
-		$backgroundJob = $this->appConfig->getValueBool(Application::APP_ID, self::TOGGLE_CONFIG_KEY_NAME, true);
-		if (!$backgroundJob) {
-			return;
-		}
-
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
-
-		$startTime = time();
-
-		// Process users in batches of 10, but don't run for more than 30 minutes
-		while (time() < $startTime + self::THIRTY_MINUTES) {
-			$offset = $this->getNextOffset();
-			$users = $this->userManager->getSeenUsers($offset, self::USER_BATCH_SIZE);
-			$count = 0;
-
-			foreach ($users as $user) {
-				$uid = $user->getUID();
-				$count++;
-
-				try {
-					if ($this->setupFS($user)) {
-						$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-						Trashbin::deleteExpiredFiles($dirContent, $uid);
-					}
-				} catch (\Throwable $e) {
-					$this->logger->error('Error while expiring trashbin for user ' . $uid, ['exception' => $e]);
-				} finally {
-					$this->setupManager->tearDown();
-				}
-			}
-
-			// If the last batch was not full it means that we reached the end of the user list.
-			if ($count < self::USER_BATCH_SIZE) {
-				$this->resetOffset();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Act on behalf on trash item owner
-	 */
-	protected function setupFS(IUser $user): bool {
-		$this->setupManager->setupForUser($user);
-
-		// Check if this user has a trashbin directory
-		$view = new View('/' . $user->getUID());
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
-
-		return true;
-	}
-
-	private function getNextOffset(): int {
-		return $this->runMutexOperation(function () {
-			$this->appConfig->clearCache();
-
-			$offset = $this->appConfig->getValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
-			$this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, $offset + self::USER_BATCH_SIZE);
-
-			return $offset;
-		});
-
-	}
-
-	private function resetOffset() {
-		$this->runMutexOperation(function (): void {
-			$this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
-		});
-	}
-
-	private function runMutexOperation($operation): mixed {
-		$acquired = false;
-
-		while ($acquired === false) {
-			try {
-				$this->lockingProvider->acquireLock(self::OFFSET_CONFIG_KEY_NAME, ILockingProvider::LOCK_EXCLUSIVE, 'Expire trashbin background job offset');
-				$acquired = true;
-			} catch (LockedException $e) {
-				// wait a bit and try again
-				usleep(100000);
-			}
-		}
-
-		try {
-			$result = $operation();
-		} finally {
-			$this->lockingProvider->releaseLock(self::OFFSET_CONFIG_KEY_NAME, ILockingProvider::LOCK_EXCLUSIVE);
-		}
-
-		return $result;
-	}
+    public const TOGGLE_CONFIG_KEY_NAME = 'background_job_expire_trash';
+    public const OFFSET_CONFIG_KEY_NAME = 'background_job_expire_trash_offset';
+    private const THIRTY_MINUTES = 30 * 60;
+    private const USER_BATCH_SIZE = 10;
+
+    public function __construct(
+        private IAppConfig $appConfig,
+        private IUserManager $userManager,
+        private Expiration $expiration,
+        private LoggerInterface $logger,
+        private SetupManager $setupManager,
+        private ILockingProvider $lockingProvider,
+        ITimeFactory $time,
+    ) {
+        parent::__construct($time);
+        $this->setInterval(self::THIRTY_MINUTES);
+    }
+
+    protected function run($argument) {
+        $backgroundJob = $this->appConfig->getValueBool(Application::APP_ID, self::TOGGLE_CONFIG_KEY_NAME, true);
+        if (!$backgroundJob) {
+            return;
+        }
+
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
+
+        $startTime = time();
+
+        // Process users in batches of 10, but don't run for more than 30 minutes
+        while (time() < $startTime + self::THIRTY_MINUTES) {
+            $offset = $this->getNextOffset();
+            $users = $this->userManager->getSeenUsers($offset, self::USER_BATCH_SIZE);
+            $count = 0;
+
+            foreach ($users as $user) {
+                $uid = $user->getUID();
+                $count++;
+
+                try {
+                    if ($this->setupFS($user)) {
+                        $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+                        Trashbin::deleteExpiredFiles($dirContent, $uid);
+                    }
+                } catch (\Throwable $e) {
+                    $this->logger->error('Error while expiring trashbin for user ' . $uid, ['exception' => $e]);
+                } finally {
+                    $this->setupManager->tearDown();
+                }
+            }
+
+            // If the last batch was not full it means that we reached the end of the user list.
+            if ($count < self::USER_BATCH_SIZE) {
+                $this->resetOffset();
+                break;
+            }
+        }
+    }
+
+    /**
+     * Act on behalf on trash item owner
+     */
+    protected function setupFS(IUser $user): bool {
+        $this->setupManager->setupForUser($user);
+
+        // Check if this user has a trashbin directory
+        $view = new View('/' . $user->getUID());
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function getNextOffset(): int {
+        return $this->runMutexOperation(function () {
+            $this->appConfig->clearCache();
+
+            $offset = $this->appConfig->getValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
+            $this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, $offset + self::USER_BATCH_SIZE);
+
+            return $offset;
+        });
+
+    }
+
+    private function resetOffset() {
+        $this->runMutexOperation(function (): void {
+            $this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
+        });
+    }
+
+    private function runMutexOperation($operation): mixed {
+        $acquired = false;
+
+        while ($acquired === false) {
+            try {
+                $this->lockingProvider->acquireLock(self::OFFSET_CONFIG_KEY_NAME, ILockingProvider::LOCK_EXCLUSIVE, 'Expire trashbin background job offset');
+                $acquired = true;
+            } catch (LockedException $e) {
+                // wait a bit and try again
+                usleep(100000);
+            }
+        }
+
+        try {
+            $result = $operation();
+        } finally {
+            $this->lockingProvider->releaseLock(self::OFFSET_CONFIG_KEY_NAME, ILockingProvider::LOCK_EXCLUSIVE);
+        }
+
+        return $result;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
 						Trashbin::deleteExpiredFiles($dirContent, $uid);
 					}
 				} catch (\Throwable $e) {
-					$this->logger->error('Error while expiring trashbin for user ' . $uid, ['exception' => $e]);
+					$this->logger->error('Error while expiring trashbin for user '.$uid, ['exception' => $e]);
 				} finally {
 					$this->setupManager->tearDown();
 				}
@@ -91,7 +91,7 @@ 
 		$this->setupManager->setupForUser($user);
 
 		// Check if this user has a trashbin directory
-		$view = new View('/' . $user->getUID());
+		$view = new View('/'.$user->getUID());
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}
@@ -100,7 +100,7 @@ 
 	}
 
 	private function getNextOffset(): int {
-		return $this->runMutexOperation(function () {
+		return $this->runMutexOperation(function() {
 			$this->appConfig->clearCache();
 
 			$offset = $this->appConfig->getValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
@@ -112,7 +112,7 @@ 
 	}
 
 	private function resetOffset() {
-		$this->runMutexOperation(function (): void {
+		$this->runMutexOperation(function(): void {
 			$this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
 		});
 	}

apps/files_trashbin/tests/Command/ExpireTrashTest.php

Indentation +121 added lines, -121 removed lines

@@ -29,126 +29,126 @@
  * @package OCA\Files_Trashbin\Tests\Command
  */
 class ExpireTrashTest extends TestCase {
-	private Expiration $expiration;
-	private Node $userFolder;
-	private IConfig $config;
-	private IUserManager $userManager;
-	private IUser $user;
-	private ITimeFactory $timeFactory;
+    private Expiration $expiration;
+    private Node $userFolder;
+    private IConfig $config;
+    private IUserManager $userManager;
+    private IUser $user;
+    private ITimeFactory $timeFactory;
 
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = Server::get(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->expiration = Server::get(Expiration::class);
-		$this->invokePrivate($this->expiration, 'timeFactory', [$this->timeFactory]);
-
-		$userId = self::getUniqueID('user');
-		$this->userManager = Server::get(IUserManager::class);
-		$this->user = $this->userManager->createUser($userId, $userId);
-
-		$this->loginAsUser($userId);
-		$this->userFolder = Server::get(IRootFolder::class)->getUserFolder($userId);
-	}
-
-	protected function tearDown(): void {
-		$this->logout();
-
-		if (isset($this->user)) {
-			$this->user->delete();
-		}
-
-		$this->invokePrivate($this->expiration, 'timeFactory', [Server::get(ITimeFactory::class)]);
-		parent::tearDown();
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('retentionObligationProvider')]
-	public function testRetentionObligation(string $obligation, string $quota, int $elapsed, int $fileSize, bool $shouldExpire): void {
-		$this->config->setSystemValues(['trashbin_retention_obligation' => $obligation]);
-		$this->expiration->setRetentionObligation($obligation);
-
-		$this->user->setQuota($quota);
-
-		$bytes = 'ABCDEFGHIKLMNOPQRSTUVWXYZ';
-
-		$file = 'foo.txt';
-		$this->userFolder->newFile($file, substr($bytes, 0, $fileSize));
-
-		$filemtime = $this->userFolder->get($file)->getMTime();
-		$this->timeFactory->expects($this->any())
-			->method('getTime')
-			->willReturn($filemtime + $elapsed);
-		$this->userFolder->get($file)->delete();
-		$this->userFolder->getStorage()
-			->getCache()
-			->put('files_trashbin', ['size' => $fileSize, 'unencrypted_size' => $fileSize]);
-
-		$userId = $this->user->getUID();
-		$trashFiles = Helper::getTrashFiles('/', $userId);
-		$this->assertEquals(1, count($trashFiles));
-
-		$outputInterface = $this->createMock(OutputInterface::class);
-		$inputInterface = $this->createMock(InputInterface::class);
-		$inputInterface->expects($this->any())
-			->method('getArgument')
-			->with('user_id')
-			->willReturn([$userId]);
-
-		$command = new ExpireTrash(
-			Server::get(LoggerInterface::class),
-			Server::get(IUserManager::class),
-			$this->expiration
-		);
-
-		$this->invokePrivate($command, 'execute', [$inputInterface, $outputInterface]);
-
-		$trashFiles = Helper::getTrashFiles('/', $userId);
-		$this->assertEquals($shouldExpire ? 0 : 1, count($trashFiles));
-	}
-
-	public static function retentionObligationProvider(): array {
-		$hour = 3600; // 60 * 60
-
-		$oneDay = 24 * $hour;
-		$fiveDays = 24 * 5 * $hour;
-		$tenDays = 24 * 10 * $hour;
-		$elevenDays = 24 * 11 * $hour;
-
-		return [
-			['disabled', '20 B', 0, 1, false],
-
-			['auto', '20 B', 0, 5, false],
-			['auto', '20 B', 0, 21, true],
-
-			['0, auto', '20 B', 0, 21, true],
-			['0, auto', '20 B', $oneDay, 5, false],
-			['0, auto', '20 B', $oneDay, 19, true],
-			['0, auto', '20 B', 0, 19, true],
-
-			['auto, 0', '20 B', $oneDay, 19, true],
-			['auto, 0', '20 B', $oneDay, 21, true],
-			['auto, 0', '20 B', 0, 5, false],
-			['auto, 0', '20 B', 0, 19, true],
-
-			['1, auto', '20 B', 0, 5, false],
-			['1, auto', '20 B', $fiveDays, 5, false],
-			['1, auto', '20 B', $fiveDays, 21, true],
-
-			['auto, 1', '20 B', 0, 21, true],
-			['auto, 1', '20 B', 0, 5, false],
-			['auto, 1', '20 B', $fiveDays, 5, true],
-			['auto, 1', '20 B', $oneDay, 5, false],
-
-			['2, 10', '20 B', $fiveDays, 5, false],
-			['2, 10', '20 B', $fiveDays, 20, true],
-			['2, 10', '20 B', $elevenDays, 5, true],
-
-			['10, 2', '20 B', $fiveDays, 5, false],
-			['10, 2', '20 B', $fiveDays, 21, false],
-			['10, 2', '20 B', $tenDays, 5, false],
-			['10, 2', '20 B', $elevenDays, 5, true]
-		];
-	}
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = Server::get(IConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->expiration = Server::get(Expiration::class);
+        $this->invokePrivate($this->expiration, 'timeFactory', [$this->timeFactory]);
+
+        $userId = self::getUniqueID('user');
+        $this->userManager = Server::get(IUserManager::class);
+        $this->user = $this->userManager->createUser($userId, $userId);
+
+        $this->loginAsUser($userId);
+        $this->userFolder = Server::get(IRootFolder::class)->getUserFolder($userId);
+    }
+
+    protected function tearDown(): void {
+        $this->logout();
+
+        if (isset($this->user)) {
+            $this->user->delete();
+        }
+
+        $this->invokePrivate($this->expiration, 'timeFactory', [Server::get(ITimeFactory::class)]);
+        parent::tearDown();
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('retentionObligationProvider')]
+    public function testRetentionObligation(string $obligation, string $quota, int $elapsed, int $fileSize, bool $shouldExpire): void {
+        $this->config->setSystemValues(['trashbin_retention_obligation' => $obligation]);
+        $this->expiration->setRetentionObligation($obligation);
+
+        $this->user->setQuota($quota);
+
+        $bytes = 'ABCDEFGHIKLMNOPQRSTUVWXYZ';
+
+        $file = 'foo.txt';
+        $this->userFolder->newFile($file, substr($bytes, 0, $fileSize));
+
+        $filemtime = $this->userFolder->get($file)->getMTime();
+        $this->timeFactory->expects($this->any())
+            ->method('getTime')
+            ->willReturn($filemtime + $elapsed);
+        $this->userFolder->get($file)->delete();
+        $this->userFolder->getStorage()
+            ->getCache()
+            ->put('files_trashbin', ['size' => $fileSize, 'unencrypted_size' => $fileSize]);
+
+        $userId = $this->user->getUID();
+        $trashFiles = Helper::getTrashFiles('/', $userId);
+        $this->assertEquals(1, count($trashFiles));
+
+        $outputInterface = $this->createMock(OutputInterface::class);
+        $inputInterface = $this->createMock(InputInterface::class);
+        $inputInterface->expects($this->any())
+            ->method('getArgument')
+            ->with('user_id')
+            ->willReturn([$userId]);
+
+        $command = new ExpireTrash(
+            Server::get(LoggerInterface::class),
+            Server::get(IUserManager::class),
+            $this->expiration
+        );
+
+        $this->invokePrivate($command, 'execute', [$inputInterface, $outputInterface]);
+
+        $trashFiles = Helper::getTrashFiles('/', $userId);
+        $this->assertEquals($shouldExpire ? 0 : 1, count($trashFiles));
+    }
+
+    public static function retentionObligationProvider(): array {
+        $hour = 3600; // 60 * 60
+
+        $oneDay = 24 * $hour;
+        $fiveDays = 24 * 5 * $hour;
+        $tenDays = 24 * 10 * $hour;
+        $elevenDays = 24 * 11 * $hour;
+
+        return [
+            ['disabled', '20 B', 0, 1, false],
+
+            ['auto', '20 B', 0, 5, false],
+            ['auto', '20 B', 0, 21, true],
+
+            ['0, auto', '20 B', 0, 21, true],
+            ['0, auto', '20 B', $oneDay, 5, false],
+            ['0, auto', '20 B', $oneDay, 19, true],
+            ['0, auto', '20 B', 0, 19, true],
+
+            ['auto, 0', '20 B', $oneDay, 19, true],
+            ['auto, 0', '20 B', $oneDay, 21, true],
+            ['auto, 0', '20 B', 0, 5, false],
+            ['auto, 0', '20 B', 0, 19, true],
+
+            ['1, auto', '20 B', 0, 5, false],
+            ['1, auto', '20 B', $fiveDays, 5, false],
+            ['1, auto', '20 B', $fiveDays, 21, true],
+
+            ['auto, 1', '20 B', 0, 21, true],
+            ['auto, 1', '20 B', 0, 5, false],
+            ['auto, 1', '20 B', $fiveDays, 5, true],
+            ['auto, 1', '20 B', $oneDay, 5, false],
+
+            ['2, 10', '20 B', $fiveDays, 5, false],
+            ['2, 10', '20 B', $fiveDays, 20, true],
+            ['2, 10', '20 B', $elevenDays, 5, true],
+
+            ['10, 2', '20 B', $fiveDays, 5, false],
+            ['10, 2', '20 B', $fiveDays, 21, false],
+            ['10, 2', '20 B', $tenDays, 5, false],
+            ['10, 2', '20 B', $elevenDays, 5, true]
+        ];
+    }
 }

apps/comments/lib/Search/Result.php

Indentation +82 added lines, -82 removed lines

@@ -14,96 +14,96 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
 
-	/**
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(
-		string $search,
-		IComment $comment,
-		/**
-		 * @deprecated 20.0.0
-		 */
-		public string $authorName,
-		string $path,
-		/**
-		 * @deprecated 20.0.0
-		 */
-		public int $fileId,
-	) {
-		parent::__construct(
-			$comment->getId(),
-			$comment->getMessage()
-			/* @todo , [link to file] */
-		);
+    /**
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(
+        string $search,
+        IComment $comment,
+        /**
+         * @deprecated 20.0.0
+         */
+        public string $authorName,
+        string $path,
+        /**
+         * @deprecated 20.0.0
+         */
+        public int $fileId,
+    ) {
+        parent::__construct(
+            $comment->getId(),
+            $comment->getMessage()
+            /* @todo , [link to file] */
+        );
 
-		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
-		$this->authorId = $comment->getActorId();
-		$this->fileName = basename($path);
-		$this->path = $this->getVisiblePath($path);
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @throws NotFoundException
+     */
+    protected function getVisiblePath(string $path): string {
+        $segments = explode('/', trim($path, '/'), 3);
 
-		if (!isset($segments[2])) {
-			throw new NotFoundException('Path not inside visible section');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        return $segments[2];
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getRelevantMessagePart(string $message, string $search): string {
-		$start = mb_stripos($message, $search);
-		if ($start === false) {
-			throw new NotFoundException('Comment section not found');
-		}
+    /**
+     * @throws NotFoundException
+     */
+    protected function getRelevantMessagePart(string $message, string $search): string {
+        $start = mb_stripos($message, $search);
+        if ($start === false) {
+            throw new NotFoundException('Comment section not found');
+        }
 
-		$end = $start + mb_strlen($search);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        if ($start <= 25) {
+            $start = 0;
+            $prefix = '';
+        } else {
+            $start -= 25;
+            $prefix = '…';
+        }
 
-		if ((mb_strlen($message) - $end) <= 25) {
-			$end = mb_strlen($message);
-			$suffix = '';
-		} else {
-			$end += 25;
-			$suffix = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/federation/lib/Controller/SettingsController.php

Indentation +90 added lines, -90 removed lines

@@ -21,105 +21,105 @@
 use Psr\Log\LoggerInterface;
 
 class SettingsController extends OCSController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IL10N $l,
-		private TrustedServers $trustedServers,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IL10N $l,
+        private TrustedServers $trustedServers,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
 
-	/**
-	 * Add server to the list of trusted Nextcloud servers
-	 *
-	 * @param string $url The URL of the server to add
-	 * @return DataResponse<Http::STATUS_OK, array{id: int, message: string, url: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND|Http::STATUS_CONFLICT, array{message: string}, array{}>
-	 *
-	 * 200: Server added successfully
-	 * 404: Server not found at the given URL
-	 * 409: Server is already in the list of trusted servers
-	 */
-	#[AuthorizedAdminSetting(settings: Admin::class)]
-	#[ApiRoute(verb: 'POST', url: '/trusted-servers')]
-	public function addServer(string $url): DataResponse {
-		$this->checkServer(trim($url));
+    /**
+     * Add server to the list of trusted Nextcloud servers
+     *
+     * @param string $url The URL of the server to add
+     * @return DataResponse<Http::STATUS_OK, array{id: int, message: string, url: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND|Http::STATUS_CONFLICT, array{message: string}, array{}>
+     *
+     * 200: Server added successfully
+     * 404: Server not found at the given URL
+     * 409: Server is already in the list of trusted servers
+     */
+    #[AuthorizedAdminSetting(settings: Admin::class)]
+    #[ApiRoute(verb: 'POST', url: '/trusted-servers')]
+    public function addServer(string $url): DataResponse {
+        $this->checkServer(trim($url));
 
-		// Add the server to the list of trusted servers, all is well
-		$id = $this->trustedServers->addServer(trim($url));
-		return new DataResponse([
-			'url' => $url,
-			'id' => $id,
-			'message' => $this->l->t('Added to the list of trusted servers')
-		]);
-	}
+        // Add the server to the list of trusted servers, all is well
+        $id = $this->trustedServers->addServer(trim($url));
+        return new DataResponse([
+            'url' => $url,
+            'id' => $id,
+            'message' => $this->l->t('Added to the list of trusted servers')
+        ]);
+    }
 
-	/**
-	 * Add server to the list of trusted Nextcloud servers
-	 *
-	 * @param int $id The ID of the trusted server to remove
-	 * @return DataResponse<Http::STATUS_OK, array{id: int}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{message: string}, array{}>
-	 *
-	 * 200: Server removed successfully
-	 * 404: Server not found at the given ID
-	 */
-	#[AuthorizedAdminSetting(settings: Admin::class)]
-	#[ApiRoute(verb: 'DELETE', url: '/trusted-servers/{id}', requirements: ['id' => '\d+'])]
-	public function removeServer(int $id): DataResponse {
-		try {
-			$this->trustedServers->getServer($id);
-		} catch (\Exception $e) {
-			throw new OCSNotFoundException($this->l->t('No server found with ID: %s', [$id]));
-		}
+    /**
+     * Add server to the list of trusted Nextcloud servers
+     *
+     * @param int $id The ID of the trusted server to remove
+     * @return DataResponse<Http::STATUS_OK, array{id: int}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{message: string}, array{}>
+     *
+     * 200: Server removed successfully
+     * 404: Server not found at the given ID
+     */
+    #[AuthorizedAdminSetting(settings: Admin::class)]
+    #[ApiRoute(verb: 'DELETE', url: '/trusted-servers/{id}', requirements: ['id' => '\d+'])]
+    public function removeServer(int $id): DataResponse {
+        try {
+            $this->trustedServers->getServer($id);
+        } catch (\Exception $e) {
+            throw new OCSNotFoundException($this->l->t('No server found with ID: %s', [$id]));
+        }
 
-		try {
-			$this->trustedServers->removeServer($id);
-			return new DataResponse(['id' => $id]);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['e' => $e]);
-			throw new OCSException($this->l->t('Could not remove server'), Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
+        try {
+            $this->trustedServers->removeServer($id);
+            return new DataResponse(['id' => $id]);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['e' => $e]);
+            throw new OCSException($this->l->t('Could not remove server'), Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
 
-	/**
-	 * List all trusted servers
-	 *
-	 * @return DataResponse<Http::STATUS_OK, list<array{id: int, status: int, url: string}>, array{}>
-	 *
-	 * 200: List of trusted servers
-	 */
-	#[AuthorizedAdminSetting(settings: Admin::class)]
-	#[ApiRoute(verb: 'GET', url: '/trusted-servers')]
-	public function getServers(): DataResponse {
-		$servers = $this->trustedServers->getServers();
+    /**
+     * List all trusted servers
+     *
+     * @return DataResponse<Http::STATUS_OK, list<array{id: int, status: int, url: string}>, array{}>
+     *
+     * 200: List of trusted servers
+     */
+    #[AuthorizedAdminSetting(settings: Admin::class)]
+    #[ApiRoute(verb: 'GET', url: '/trusted-servers')]
+    public function getServers(): DataResponse {
+        $servers = $this->trustedServers->getServers();
 
-		// obfuscate the shared secret
-		$servers = array_map(function ($server) {
-			return [
-				'url' => $server['url'],
-				'id' => $server['id'],
-				'status' => $server['status'],
-			];
-		}, $servers);
+        // obfuscate the shared secret
+        $servers = array_map(function ($server) {
+            return [
+                'url' => $server['url'],
+                'id' => $server['id'],
+                'status' => $server['status'],
+            ];
+        }, $servers);
 
-		// return the list of trusted servers
-		return new DataResponse($servers);
-	}
+        // return the list of trusted servers
+        return new DataResponse($servers);
+    }
 
 
-	/**
-	 * Check if the server should be added to the list of trusted servers or not.
-	 */
-	#[AuthorizedAdminSetting(settings: Admin::class)]
-	protected function checkServer(string $url): void {
-		if ($this->trustedServers->isTrustedServer($url) === true) {
-			throw new OCSException($this->l->t('Server is already in the list of trusted servers.'), Http::STATUS_CONFLICT);
-		}
+    /**
+     * Check if the server should be added to the list of trusted servers or not.
+     */
+    #[AuthorizedAdminSetting(settings: Admin::class)]
+    protected function checkServer(string $url): void {
+        if ($this->trustedServers->isTrustedServer($url) === true) {
+            throw new OCSException($this->l->t('Server is already in the list of trusted servers.'), Http::STATUS_CONFLICT);
+        }
 
-		if ($this->trustedServers->isNextcloudServer($url) === false) {
-			throw new OCSNotFoundException($this->l->t('No server to federate with found'));
-		}
-	}
+        if ($this->trustedServers->isNextcloudServer($url) === false) {
+            throw new OCSNotFoundException($this->l->t('No server to federate with found'));
+        }
+    }
 }