nextcloud / server

build/rector-strict.php

Indentation +21 added lines, -21 removed lines

@@ -8,24 +8,24 @@
 $nextcloudDir = dirname(__DIR__);
 
 return (require __DIR__ . '/rector-shared.php')
-	->withPaths([
-		$nextcloudDir . '/build/rector-strict.php',
-		// TODO: Add more files. The entry above is just there to stop rector from complaining about the fact that it ran without checking any files.
-	])
-	->withPreparedSets(
-		deadCode: true,
-		codeQuality: true,
-		codingStyle: true,
-		typeDeclarations: true,
-		typeDeclarationDocblocks: true,
-		privatization: true,
-		instanceOf: true,
-		earlyReturn: true,
-		rectorPreset: true,
-		phpunitCodeQuality: true,
-		doctrineCodeQuality: true,
-		symfonyCodeQuality: true,
-		symfonyConfigs: true,
-	)->withPhpSets(
-		php82: true,
-	);
+    ->withPaths([
+        $nextcloudDir . '/build/rector-strict.php',
+        // TODO: Add more files. The entry above is just there to stop rector from complaining about the fact that it ran without checking any files.
+    ])
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        typeDeclarationDocblocks: true,
+        privatization: true,
+        instanceOf: true,
+        earlyReturn: true,
+        rectorPreset: true,
+        phpunitCodeQuality: true,
+        doctrineCodeQuality: true,
+        symfonyCodeQuality: true,
+        symfonyConfigs: true,
+    )->withPhpSets(
+        php82: true,
+    );

Spacing +2 added lines, -2 removed lines

@@ -7,9 +7,9 @@
 
 $nextcloudDir = dirname(__DIR__);
 
-return (require __DIR__ . '/rector-shared.php')
+return (require __DIR__.'/rector-shared.php')
 	->withPaths([
-		$nextcloudDir . '/build/rector-strict.php',
+		$nextcloudDir.'/build/rector-strict.php',
 		// TODO: Add more files. The entry above is just there to stop rector from complaining about the fact that it ran without checking any files.
 	])
 	->withPreparedSets(

build/rector-shared.php

Indentation +54 added lines, -54 removed lines

@@ -19,58 +19,58 @@ 
 $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()
-	->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)
-	->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
-		'inline_public' => true,
-		'rename_property' => true,
-	])
-	->withSets([
-		NextcloudSets::NEXTCLOUD_27,
-		PHPUnitSetList::PHPUNIT_100,
-	]);
+    ->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)
+    ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
+        'inline_public' => true,
+        'rename_property' => true,
+    ])
+    ->withSets([
+        NextcloudSets::NEXTCLOUD_27,
+        PHPUnitSetList::PHPUNIT_100,
+    ]);
 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
@@ -82,11 +82,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 +10 added lines, -10 removed lines

@@ -40,7 +40,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;
 			}
@@ -52,13 +52,13 @@ 
 
 $config = RectorConfig::configure()
 	->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()
@@ -75,7 +75,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);
@@ -83,9 +83,9 @@ 
 
 foreach ($ignoredEntries as $ignoredEntry) {
 	if (str_ends_with($ignoredEntry, '/')) {
-		$config->withSkip([$ignoredEntry . '*']);
+		$config->withSkip([$ignoredEntry.'*']);
 	} else {
-		$config->withSkip([$ignoredEntry . '/*']);
+		$config->withSkip([$ignoredEntry.'/*']);
 	}
 }
 

build/files-checker.php

Indentation +92 added lines, -92 removed lines

@@ -7,95 +7,95 @@ 
  */
 
 $expectedFiles = [
-	'.',
-	'..',
-	'.devcontainer',
-	'.editorconfig',
-	'.envrc',
-	'.git',
-	'.git-blame-ignore-revs',
-	'.gitattributes',
-	'.github',
-	'.gitignore',
-	'.gitmodules',
-	'.htaccess',
-	'.idea',
-	'.jshintrc',
-	'.mailmap',
-	'.nextcloudignore',
-	'.npmignore',
-	'.php-cs-fixer.dist.php',
-	'.pre-commit-config.yaml',
-	'.tag',
-	'.tx',
-	'.user.ini',
-	'__mocks__',
-	'__tests__',
-	'3rdparty',
-	'AUTHORS',
-	'CHANGELOG.md',
-	'CODE_OF_CONDUCT.md',
-	'COPYING',
-	'COPYING-README',
-	'DESIGN.md',
-	'Makefile',
-	'README.md',
-	'REUSE.toml',
-	'SECURITY.md',
-	'apps',
-	'autotest-checkers.sh',
-	'autotest-external.sh',
-	'autotest.sh',
-	'build',
-	'codecov.yml',
-	'composer.json',
-	'composer.lock',
-	'config',
-	'console.php',
-	'contribute',
-	'core',
-	'cron.php',
-	'custom.d.ts',
-	'cypress.config.ts',
-	'cypress',
-	'dist',
-	'eslint.config.js',
-	'flake.lock',
-	'flake.nix',
-	'index.html',
-	'index.php',
-	'lib',
-	'LICENSES',
-	'occ',
-	'ocs',
-	'ocs-provider',
-	'openapi.json',
-	'package-lock.json',
-	'package.json',
-	'psalm-ncu.xml',
-	'psalm-ocp.xml',
-	'psalm-strict.xml',
-	'psalm.xml',
-	'public.php',
-	'remote.php',
-	'resources',
-	'robots.txt',
-	'status.php',
-	'stylelint.config.js',
-	'tests',
-	'themes',
-	'tsconfig.json',
-	'vendor-bin',
-	'version.php',
-	'vite.config.ts',
-	'vitest.config.ts',
-	'window.d.ts',
+    '.',
+    '..',
+    '.devcontainer',
+    '.editorconfig',
+    '.envrc',
+    '.git',
+    '.git-blame-ignore-revs',
+    '.gitattributes',
+    '.github',
+    '.gitignore',
+    '.gitmodules',
+    '.htaccess',
+    '.idea',
+    '.jshintrc',
+    '.mailmap',
+    '.nextcloudignore',
+    '.npmignore',
+    '.php-cs-fixer.dist.php',
+    '.pre-commit-config.yaml',
+    '.tag',
+    '.tx',
+    '.user.ini',
+    '__mocks__',
+    '__tests__',
+    '3rdparty',
+    'AUTHORS',
+    'CHANGELOG.md',
+    'CODE_OF_CONDUCT.md',
+    'COPYING',
+    'COPYING-README',
+    'DESIGN.md',
+    'Makefile',
+    'README.md',
+    'REUSE.toml',
+    'SECURITY.md',
+    'apps',
+    'autotest-checkers.sh',
+    'autotest-external.sh',
+    'autotest.sh',
+    'build',
+    'codecov.yml',
+    'composer.json',
+    'composer.lock',
+    'config',
+    'console.php',
+    'contribute',
+    'core',
+    'cron.php',
+    'custom.d.ts',
+    'cypress.config.ts',
+    'cypress',
+    'dist',
+    'eslint.config.js',
+    'flake.lock',
+    'flake.nix',
+    'index.html',
+    'index.php',
+    'lib',
+    'LICENSES',
+    'occ',
+    'ocs',
+    'ocs-provider',
+    'openapi.json',
+    'package-lock.json',
+    'package.json',
+    'psalm-ncu.xml',
+    'psalm-ocp.xml',
+    'psalm-strict.xml',
+    'psalm.xml',
+    'public.php',
+    'remote.php',
+    'resources',
+    'robots.txt',
+    'status.php',
+    'stylelint.config.js',
+    'tests',
+    'themes',
+    'tsconfig.json',
+    'vendor-bin',
+    'version.php',
+    'vite.config.ts',
+    'vitest.config.ts',
+    'window.d.ts',
 ];
 $actualFiles = [];
 
 $files = new \DirectoryIterator(__DIR__ . '/..');
 foreach ($files as $file) {
-	$actualFiles[] = $file->getFilename();
+    $actualFiles[] = $file->getFilename();
 }
 
 $additionalFiles = array_diff($actualFiles, $expectedFiles);
@@ -103,19 +103,19 @@ 
 
 $failed = false;
 if (count($additionalFiles) > 0) {
-	echo sprintf('ERROR: There were %d additional files:', count($additionalFiles)) . PHP_EOL;
-	echo implode(PHP_EOL, $additionalFiles) . PHP_EOL;
-	$failed = true;
+    echo sprintf('ERROR: There were %d additional files:', count($additionalFiles)) . PHP_EOL;
+    echo implode(PHP_EOL, $additionalFiles) . PHP_EOL;
+    $failed = true;
 }
 if (count($missingFiles) > 0) {
-	echo sprintf('ERROR: There were %d missing files:', count($missingFiles)) . PHP_EOL;
-	echo implode(PHP_EOL, $missingFiles) . PHP_EOL;
-	$failed = true;
+    echo sprintf('ERROR: There were %d missing files:', count($missingFiles)) . PHP_EOL;
+    echo implode(PHP_EOL, $missingFiles) . PHP_EOL;
+    $failed = true;
 }
 
 if ($failed) {
-	echo 'ERROR: Please remove or add those files again or inform the release team about those now files to be included or excluded from the release tar ball.' . PHP_EOL;
-	exit(1);
+    echo 'ERROR: Please remove or add those files again or inform the release team about those now files to be included or excluded from the release tar ball.' . PHP_EOL;
+    exit(1);
 }
 
 echo 'OK: all expected files are present and no additional files are there.' . PHP_EOL;

build/rector.php

Indentation +21 added lines, -21 removed lines

@@ -10,24 +10,24 @@
 $nextcloudDir = dirname(__DIR__);
 
 return (require 'rector-shared.php')
-	->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 . '/lib/private/Template',
-		$nextcloudDir . '/tests',
-		// $nextcloudDir . '/config',
-		// $nextcloudDir . '/lib',
-		// $nextcloudDir . '/themes',
-	])
-	->withTypeCoverageLevel(0);
+    ->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 . '/lib/private/Template',
+        $nextcloudDir . '/tests',
+        // $nextcloudDir . '/config',
+        // $nextcloudDir . '/lib',
+        // $nextcloudDir . '/themes',
+    ])
+    ->withTypeCoverageLevel(0);

Spacing +15 added lines, -15 removed lines

@@ -11,21 +11,21 @@
 
 return (require 'rector-shared.php')
 	->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 . '/lib/private/Template',
-		$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.'/lib/private/Template',
+		$nextcloudDir.'/tests',
 		// $nextcloudDir . '/config',
 		// $nextcloudDir . '/lib',
 		// $nextcloudDir . '/themes',