nextcloud / server

build/rector.php

Indentation +75 added lines, -75 removed lines

@@ -21,79 +21,79 @@ 
 $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/*',
-	])
-	// 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_25,
-	]);
+    ->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/*',
+    ])
+    // 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_25,
+    ]);
 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
@@ -105,11 +105,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;

core/ajax/update.php

Indentation +104 added lines, -104 removed lines

@@ -31,7 +31,7 @@ 
 use Psr\Log\LoggerInterface;
 
 if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 
 require_once '../../lib/base.php';
@@ -46,117 +46,117 @@ 
 $eventSource->send('success', $l->t('Preparing update'));
 
 if (Util::needUpgrade()) {
-	$config = Server::get(SystemConfig::class);
-	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', $l->t('Please use the command line updater because updating via browser is disabled in your config.php.'));
-		$eventSource->close();
-		exit();
-	}
+    $config = Server::get(SystemConfig::class);
+    if ($config->getValue('upgrade.disable-web', false)) {
+        $eventSource->send('failure', $l->t('Please use the command line updater because updating via browser is disabled in your config.php.'));
+        $eventSource->close();
+        exit();
+    }
 
-	// if a user is currently logged in, their session must be ignored to
-	// avoid side effects
-	\OC_User::setIncognitoMode(true);
+    // if a user is currently logged in, their session must be ignored to
+    // avoid side effects
+    \OC_User::setIncognitoMode(true);
 
-	$config = Server::get(IConfig::class);
-	$updater = new Updater(
-		Server::get(ServerVersion::class),
-		$config,
-		Server::get(IAppConfig::class),
-		Server::get(Checker::class),
-		Server::get(LoggerInterface::class),
-		Server::get(Installer::class)
-	);
-	$incompatibleApps = [];
-	$incompatibleOverwrites = $config->getSystemValue('app_install_overwrite', []);
+    $config = Server::get(IConfig::class);
+    $updater = new Updater(
+        Server::get(ServerVersion::class),
+        $config,
+        Server::get(IAppConfig::class),
+        Server::get(Checker::class),
+        Server::get(LoggerInterface::class),
+        Server::get(Installer::class)
+    );
+    $incompatibleApps = [];
+    $incompatibleOverwrites = $config->getSystemValue('app_install_overwrite', []);
 
-	/** @var IEventDispatcher $dispatcher */
-	$dispatcher = Server::get(IEventDispatcher::class);
-	$dispatcher->addListener(
-		MigratorExecuteSqlEvent::class,
-		function (MigratorExecuteSqlEvent $event) use ($eventSource, $l): void {
-			$eventSource->send('success', $l->t('[%d / %d]: %s', [$event->getCurrentStep(), $event->getMaxStep(), $event->getSql()]));
-		}
-	);
-	$feedBack = new FeedBackHandler($eventSource, $l);
-	$dispatcher->addListener(RepairStartEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairAdvanceEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairFinishEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairStepEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairInfoEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairWarningEvent::class, [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener(RepairErrorEvent::class, [$feedBack, 'handleRepairFeedback']);
+    /** @var IEventDispatcher $dispatcher */
+    $dispatcher = Server::get(IEventDispatcher::class);
+    $dispatcher->addListener(
+        MigratorExecuteSqlEvent::class,
+        function (MigratorExecuteSqlEvent $event) use ($eventSource, $l): void {
+            $eventSource->send('success', $l->t('[%d / %d]: %s', [$event->getCurrentStep(), $event->getMaxStep(), $event->getSql()]));
+        }
+    );
+    $feedBack = new FeedBackHandler($eventSource, $l);
+    $dispatcher->addListener(RepairStartEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairAdvanceEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairFinishEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairStepEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairInfoEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairWarningEvent::class, [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener(RepairErrorEvent::class, [$feedBack, 'handleRepairFeedback']);
 
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Turned on maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Turned off maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Maintenance mode is kept active'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Updating database schema'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Updated database'));
-	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Update app "%s" from App Store', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
-	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites): void {
-		if (!in_array($app, $incompatibleOverwrites)) {
-			$incompatibleApps[] = $app;
-		}
-	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config): void {
-		$eventSource->send('failure', $message);
-		$eventSource->close();
-		$config->setSystemValue('maintenance', false);
-	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Set log level to debug'));
-	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Reset log level'));
-	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Starting code integrity check'));
-	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l): void {
-		$eventSource->send('success', $l->t('Finished code integrity check'));
-	});
+    $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Turned on maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Turned off maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Maintenance mode is kept active'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Updating database schema'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Updated database'));
+    });
+    $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Update app "%s" from App Store', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
+    });
+    $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites): void {
+        if (!in_array($app, $incompatibleOverwrites)) {
+            $incompatibleApps[] = $app;
+        }
+    });
+    $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config): void {
+        $eventSource->send('failure', $message);
+        $eventSource->close();
+        $config->setSystemValue('maintenance', false);
+    });
+    $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Set log level to debug'));
+    });
+    $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Reset log level'));
+    });
+    $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Starting code integrity check'));
+    });
+    $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l): void {
+        $eventSource->send('success', $l->t('Finished code integrity check'));
+    });
 
-	try {
-		$updater->upgrade();
-	} catch (\Exception $e) {
-		Server::get(LoggerInterface::class)->error(
-			$e->getMessage(),
-			[
-				'exception' => $e,
-				'app' => 'update',
-			]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
-		$eventSource->close();
-		exit();
-	}
+    try {
+        $updater->upgrade();
+    } catch (\Exception $e) {
+        Server::get(LoggerInterface::class)->error(
+            $e->getMessage(),
+            [
+                'exception' => $e,
+                'app' => 'update',
+            ]);
+        $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+        $eventSource->close();
+        exit();
+    }
 
-	$disabledApps = [];
-	foreach ($incompatibleApps as $app) {
-		$disabledApps[$app] = $l->t('%s (incompatible)', [$app]);
-	}
+    $disabledApps = [];
+    foreach ($incompatibleApps as $app) {
+        $disabledApps[$app] = $l->t('%s (incompatible)', [$app]);
+    }
 
-	if (!empty($disabledApps)) {
-		$eventSource->send('notice', $l->t('The following apps have been disabled: %s', [implode(', ', $disabledApps)]));
-	}
+    if (!empty($disabledApps)) {
+        $eventSource->send('notice', $l->t('The following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+    }
 } else {
-	$eventSource->send('notice', $l->t('Already up to date'));
+    $eventSource->send('notice', $l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

apps/settings/tests/UserMigration/AccountMigratorTest.php

Indentation +135 added lines, -135 removed lines

@@ -27,139 +27,139 @@
  * @group DB
  */
 class AccountMigratorTest extends TestCase {
-	private IUserManager $userManager;
-	private IAvatarManager $avatarManager;
-	private AccountMigrator $migrator;
-	private IImportSource&MockObject $importSource;
-	private IExportDestination&MockObject $exportDestination;
-	private OutputInterface&MockObject $output;
-
-	private const ASSETS_DIR = __DIR__ . '/assets/';
-
-	private const REGEX_ACCOUNT_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
-
-	private const REGEX_AVATAR_FILE = '/^' . Application::APP_ID . '\/' . 'avatar\.(jpg|png)' . '$/';
-
-	private const REGEX_CONFIG_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$app = new App(Application::APP_ID);
-		$container = $app->getContainer();
-		$container->get(IConfig::class)->setSystemValue('has_internet_connection', false);
-
-		$this->userManager = $container->get(IUserManager::class);
-		$this->avatarManager = $container->get(IAvatarManager::class);
-		$this->migrator = $container->get(AccountMigrator::class);
-
-		$this->importSource = $this->createMock(IImportSource::class);
-		$this->exportDestination = $this->createMock(IExportDestination::class);
-		$this->output = $this->createMock(OutputInterface::class);
-	}
-
-	protected function tearDown(): void {
-		Server::get(IConfig::class)->setSystemValue('has_internet_connection', true);
-		parent::tearDown();
-	}
-
-	public static function dataImportExportAccount(): array {
-		return array_map(
-			static function (string $filename): array {
-				$dataPath = static::ASSETS_DIR . $filename;
-				// For each account json file there is an avatar image and a config json file with the same basename
-				$basename = pathinfo($filename, PATHINFO_FILENAME);
-				$avatarPath = static::ASSETS_DIR . (file_exists(static::ASSETS_DIR . "$basename.jpg") ? "$basename.jpg" : "$basename.png");
-				$configPath = static::ASSETS_DIR . "$basename-config." . pathinfo($filename, PATHINFO_EXTENSION);
-				return [
-					UUIDUtil::getUUID(),
-					json_decode(file_get_contents($dataPath), true, 512, JSON_THROW_ON_ERROR),
-					$avatarPath,
-					json_decode(file_get_contents($configPath), true, 512, JSON_THROW_ON_ERROR),
-				];
-			},
-			array_filter(
-				scandir(static::ASSETS_DIR),
-				fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === 'json' && mb_strpos(pathinfo($filename, PATHINFO_FILENAME), 'config') === false,
-			),
-		);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataImportExportAccount')]
-	public function testImportExportAccount(string $userId, array $importData, string $avatarPath, array $importConfig): void {
-		$user = $this->userManager->createUser($userId, 'topsecretpassword');
-		$avatarExt = pathinfo($avatarPath, PATHINFO_EXTENSION);
-		$exportData = $importData;
-		$exportConfig = $importConfig;
-		// Verification status of email will be set to in progress on import so we set the export data to reflect that
-		$exportData[IAccountManager::PROPERTY_EMAIL]['verified'] = IAccountManager::VERIFICATION_IN_PROGRESS;
-
-		$this->importSource
-			->expects($this->once())
-			->method('getMigratorVersion')
-			->with($this->migrator->getId())
-			->willReturn(1);
-
-		$calls = [
-			[static::REGEX_ACCOUNT_FILE, json_encode($importData)],
-			[static::REGEX_CONFIG_FILE, json_encode($importConfig)],
-		];
-		$this->importSource
-			->expects($this->exactly(2))
-			->method('getFileContents')
-			->willReturnCallback(function ($path) use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertMatchesRegularExpression($expected[0], $path);
-				return $expected[1];
-			});
-
-		$this->importSource
-			->expects($this->once())
-			->method('getFolderListing')
-			->with(Application::APP_ID . '/')
-			->willReturn(["avatar.$avatarExt"]);
-
-		$this->importSource
-			->expects($this->once())
-			->method('getFileAsStream')
-			->with($this->matchesRegularExpression(static::REGEX_AVATAR_FILE))
-			->willReturn(fopen($avatarPath, 'r'));
-
-		$this->migrator->import($user, $this->importSource, $this->output);
-
-		$importedAvatar = $this->avatarManager->getAvatar($user->getUID());
-		$this->assertTrue($importedAvatar->isCustomAvatar());
-
-		/**
-		 * Avatar images are re-encoded on import therefore JPEG images which use lossy compression cannot be checked for equality
-		 * @see https://github.com/nextcloud/server/blob/9644b7e505dc90a1e683f77ad38dc6dc4e90fa2f/lib/private/legacy/OC_Image.php#L383-L390
-		 */
-
-		if ($avatarExt !== 'jpg') {
-			$this->assertStringEqualsFile(
-				$avatarPath,
-				$importedAvatar->getFile(-1)->getContent(),
-			);
-		}
-
-		$calls = [
-			[static::REGEX_ACCOUNT_FILE, new JsonMatches(json_encode($importData))],
-			[static::REGEX_CONFIG_FILE,new JsonMatches(json_encode($importConfig))],
-		];
-		$this->exportDestination
-			->expects($this->exactly(2))
-			->method('addFileContents')
-			->willReturnCallback(function ($path) use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertMatchesRegularExpression($expected[0], $path);
-				return $expected[1];
-			});
-
-		$this->exportDestination
-			->expects($this->once())
-			->method('addFileAsStream')
-			->with($this->matchesRegularExpression(static::REGEX_AVATAR_FILE), $this->isType('resource'));
-
-		$this->migrator->export($user, $this->exportDestination, $this->output);
-	}
+    private IUserManager $userManager;
+    private IAvatarManager $avatarManager;
+    private AccountMigrator $migrator;
+    private IImportSource&MockObject $importSource;
+    private IExportDestination&MockObject $exportDestination;
+    private OutputInterface&MockObject $output;
+
+    private const ASSETS_DIR = __DIR__ . '/assets/';
+
+    private const REGEX_ACCOUNT_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
+
+    private const REGEX_AVATAR_FILE = '/^' . Application::APP_ID . '\/' . 'avatar\.(jpg|png)' . '$/';
+
+    private const REGEX_CONFIG_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $app = new App(Application::APP_ID);
+        $container = $app->getContainer();
+        $container->get(IConfig::class)->setSystemValue('has_internet_connection', false);
+
+        $this->userManager = $container->get(IUserManager::class);
+        $this->avatarManager = $container->get(IAvatarManager::class);
+        $this->migrator = $container->get(AccountMigrator::class);
+
+        $this->importSource = $this->createMock(IImportSource::class);
+        $this->exportDestination = $this->createMock(IExportDestination::class);
+        $this->output = $this->createMock(OutputInterface::class);
+    }
+
+    protected function tearDown(): void {
+        Server::get(IConfig::class)->setSystemValue('has_internet_connection', true);
+        parent::tearDown();
+    }
+
+    public static function dataImportExportAccount(): array {
+        return array_map(
+            static function (string $filename): array {
+                $dataPath = static::ASSETS_DIR . $filename;
+                // For each account json file there is an avatar image and a config json file with the same basename
+                $basename = pathinfo($filename, PATHINFO_FILENAME);
+                $avatarPath = static::ASSETS_DIR . (file_exists(static::ASSETS_DIR . "$basename.jpg") ? "$basename.jpg" : "$basename.png");
+                $configPath = static::ASSETS_DIR . "$basename-config." . pathinfo($filename, PATHINFO_EXTENSION);
+                return [
+                    UUIDUtil::getUUID(),
+                    json_decode(file_get_contents($dataPath), true, 512, JSON_THROW_ON_ERROR),
+                    $avatarPath,
+                    json_decode(file_get_contents($configPath), true, 512, JSON_THROW_ON_ERROR),
+                ];
+            },
+            array_filter(
+                scandir(static::ASSETS_DIR),
+                fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === 'json' && mb_strpos(pathinfo($filename, PATHINFO_FILENAME), 'config') === false,
+            ),
+        );
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataImportExportAccount')]
+    public function testImportExportAccount(string $userId, array $importData, string $avatarPath, array $importConfig): void {
+        $user = $this->userManager->createUser($userId, 'topsecretpassword');
+        $avatarExt = pathinfo($avatarPath, PATHINFO_EXTENSION);
+        $exportData = $importData;
+        $exportConfig = $importConfig;
+        // Verification status of email will be set to in progress on import so we set the export data to reflect that
+        $exportData[IAccountManager::PROPERTY_EMAIL]['verified'] = IAccountManager::VERIFICATION_IN_PROGRESS;
+
+        $this->importSource
+            ->expects($this->once())
+            ->method('getMigratorVersion')
+            ->with($this->migrator->getId())
+            ->willReturn(1);
+
+        $calls = [
+            [static::REGEX_ACCOUNT_FILE, json_encode($importData)],
+            [static::REGEX_CONFIG_FILE, json_encode($importConfig)],
+        ];
+        $this->importSource
+            ->expects($this->exactly(2))
+            ->method('getFileContents')
+            ->willReturnCallback(function ($path) use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertMatchesRegularExpression($expected[0], $path);
+                return $expected[1];
+            });
+
+        $this->importSource
+            ->expects($this->once())
+            ->method('getFolderListing')
+            ->with(Application::APP_ID . '/')
+            ->willReturn(["avatar.$avatarExt"]);
+
+        $this->importSource
+            ->expects($this->once())
+            ->method('getFileAsStream')
+            ->with($this->matchesRegularExpression(static::REGEX_AVATAR_FILE))
+            ->willReturn(fopen($avatarPath, 'r'));
+
+        $this->migrator->import($user, $this->importSource, $this->output);
+
+        $importedAvatar = $this->avatarManager->getAvatar($user->getUID());
+        $this->assertTrue($importedAvatar->isCustomAvatar());
+
+        /**
+         * Avatar images are re-encoded on import therefore JPEG images which use lossy compression cannot be checked for equality
+         * @see https://github.com/nextcloud/server/blob/9644b7e505dc90a1e683f77ad38dc6dc4e90fa2f/lib/private/legacy/OC_Image.php#L383-L390
+         */
+
+        if ($avatarExt !== 'jpg') {
+            $this->assertStringEqualsFile(
+                $avatarPath,
+                $importedAvatar->getFile(-1)->getContent(),
+            );
+        }
+
+        $calls = [
+            [static::REGEX_ACCOUNT_FILE, new JsonMatches(json_encode($importData))],
+            [static::REGEX_CONFIG_FILE,new JsonMatches(json_encode($importConfig))],
+        ];
+        $this->exportDestination
+            ->expects($this->exactly(2))
+            ->method('addFileContents')
+            ->willReturnCallback(function ($path) use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertMatchesRegularExpression($expected[0], $path);
+                return $expected[1];
+            });
+
+        $this->exportDestination
+            ->expects($this->once())
+            ->method('addFileAsStream')
+            ->with($this->matchesRegularExpression(static::REGEX_AVATAR_FILE), $this->isType('resource'));
+
+        $this->migrator->export($user, $this->exportDestination, $this->output);
+    }
 }

apps/settings/tests/AppInfo/ApplicationTest.php

Indentation +32 added lines, -32 removed lines

@@ -28,36 +28,36 @@
  * @group DB
  */
 class ApplicationTest extends TestCase {
-	protected Application $app;
-	protected IAppContainer $container;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->app = new Application();
-		$this->container = $this->app->getContainer();
-	}
-
-	public function testContainerAppName(): void {
-		$this->app = new Application();
-		$this->assertEquals('settings', $this->container->getAppName());
-	}
-
-	public static function dataContainerQuery(): array {
-		return [
-			[AdminSettingsController::class, Controller::class],
-			[AppSettingsController::class, Controller::class],
-			[AuthSettingsController::class, Controller::class],
-			[CheckSetupController::class, Controller::class],
-			[LogSettingsController::class, Controller::class],
-			[MailSettingsController::class, Controller::class],
-			[UsersController::class, Controller::class],
-
-			[SubadminMiddleware::class, Middleware::class],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataContainerQuery')]
-	public function testContainerQuery(string $service, string $expected): void {
-		$this->assertTrue($this->container->query($service) instanceof $expected);
-	}
+    protected Application $app;
+    protected IAppContainer $container;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->app = new Application();
+        $this->container = $this->app->getContainer();
+    }
+
+    public function testContainerAppName(): void {
+        $this->app = new Application();
+        $this->assertEquals('settings', $this->container->getAppName());
+    }
+
+    public static function dataContainerQuery(): array {
+        return [
+            [AdminSettingsController::class, Controller::class],
+            [AppSettingsController::class, Controller::class],
+            [AuthSettingsController::class, Controller::class],
+            [CheckSetupController::class, Controller::class],
+            [LogSettingsController::class, Controller::class],
+            [MailSettingsController::class, Controller::class],
+            [UsersController::class, Controller::class],
+
+            [SubadminMiddleware::class, Middleware::class],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataContainerQuery')]
+    public function testContainerQuery(string $service, string $expected): void {
+        $this->assertTrue($this->container->query($service) instanceof $expected);
+    }
 }

apps/settings/tests/SetupChecks/ForwardedForHeadersTest.php

Indentation +90 added lines, -90 removed lines

@@ -17,103 +17,103 @@
 use Test\TestCase;
 
 class ForwardedForHeadersTest extends TestCase {
-	private IL10N $l10n;
-	private IConfig $config;
-	private IURLGenerator $urlGenerator;
-	private IRequest $request;
-	private ForwardedForHeaders $check;
+    private IL10N $l10n;
+    private IConfig $config;
+    private IURLGenerator $urlGenerator;
+    private IRequest $request;
+    private ForwardedForHeaders $check;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
-				return vsprintf($message, $replace);
-			});
-		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
-		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
-		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
-		$this->check = new ForwardedForHeaders(
-			$this->l10n,
-			$this->config,
-			$this->urlGenerator,
-			$this->request,
-		);
-	}
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+        $this->config = $this->getMockBuilder(IConfig::class)->getMock();
+        $this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
+        $this->request = $this->getMockBuilder(IRequest::class)->getMock();
+        $this->check = new ForwardedForHeaders(
+            $this->l10n,
+            $this->config,
+            $this->urlGenerator,
+            $this->request,
+        );
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataForwardedForHeadersWorking')]
-	public function testForwardedForHeadersWorking(array $trustedProxies, string $remoteAddrNotForwarded, string $remoteAddr, string $result): void {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('trusted_proxies', [])
-			->willReturn($trustedProxies);
-		$this->request->expects($this->atLeastOnce())
-			->method('getHeader')
-			->willReturnMap([
-				['REMOTE_ADDR', $remoteAddrNotForwarded],
-				['X-Forwarded-Host', '']
-			]);
-		$this->request->expects($this->any())
-			->method('getRemoteAddress')
-			->willReturn($remoteAddr);
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataForwardedForHeadersWorking')]
+    public function testForwardedForHeadersWorking(array $trustedProxies, string $remoteAddrNotForwarded, string $remoteAddr, string $result): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValue')
+            ->with('trusted_proxies', [])
+            ->willReturn($trustedProxies);
+        $this->request->expects($this->atLeastOnce())
+            ->method('getHeader')
+            ->willReturnMap([
+                ['REMOTE_ADDR', $remoteAddrNotForwarded],
+                ['X-Forwarded-Host', '']
+            ]);
+        $this->request->expects($this->any())
+            ->method('getRemoteAddress')
+            ->willReturn($remoteAddr);
 
-		$this->assertEquals(
-			$result,
-			$this->check->run()->getSeverity()
-		);
-	}
+        $this->assertEquals(
+            $result,
+            $this->check->run()->getSeverity()
+        );
+    }
 
-	public static function dataForwardedForHeadersWorking(): array {
-		return [
-			// description => trusted proxies, getHeader('REMOTE_ADDR'), getRemoteAddr, expected result
-			'no trusted proxies' => [[], '2.2.2.2', '2.2.2.2', SetupResult::SUCCESS],
-			'trusted proxy, remote addr not trusted proxy' => [['1.1.1.1'], '2.2.2.2', '2.2.2.2', SetupResult::SUCCESS],
-			'trusted proxy, remote addr is trusted proxy, x-forwarded-for working' => [['1.1.1.1'], '1.1.1.1', '2.2.2.2', SetupResult::SUCCESS],
-			'trusted proxy, remote addr is trusted proxy, x-forwarded-for not set' => [['1.1.1.1'], '1.1.1.1', '1.1.1.1', SetupResult::WARNING],
-		];
-	}
+    public static function dataForwardedForHeadersWorking(): array {
+        return [
+            // description => trusted proxies, getHeader('REMOTE_ADDR'), getRemoteAddr, expected result
+            'no trusted proxies' => [[], '2.2.2.2', '2.2.2.2', SetupResult::SUCCESS],
+            'trusted proxy, remote addr not trusted proxy' => [['1.1.1.1'], '2.2.2.2', '2.2.2.2', SetupResult::SUCCESS],
+            'trusted proxy, remote addr is trusted proxy, x-forwarded-for working' => [['1.1.1.1'], '1.1.1.1', '2.2.2.2', SetupResult::SUCCESS],
+            'trusted proxy, remote addr is trusted proxy, x-forwarded-for not set' => [['1.1.1.1'], '1.1.1.1', '1.1.1.1', SetupResult::WARNING],
+        ];
+    }
 
-	public function testForwardedHostPresentButTrustedProxiesNotAnArray(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('trusted_proxies', [])
-			->willReturn('1.1.1.1');
-		$this->request->expects($this->atLeastOnce())
-			->method('getHeader')
-			->willReturnMap([
-				['REMOTE_ADDR', '1.1.1.1'],
-				['X-Forwarded-Host', 'nextcloud.test']
-			]);
-		$this->request->expects($this->any())
-			->method('getRemoteAddress')
-			->willReturn('1.1.1.1');
+    public function testForwardedHostPresentButTrustedProxiesNotAnArray(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValue')
+            ->with('trusted_proxies', [])
+            ->willReturn('1.1.1.1');
+        $this->request->expects($this->atLeastOnce())
+            ->method('getHeader')
+            ->willReturnMap([
+                ['REMOTE_ADDR', '1.1.1.1'],
+                ['X-Forwarded-Host', 'nextcloud.test']
+            ]);
+        $this->request->expects($this->any())
+            ->method('getRemoteAddress')
+            ->willReturn('1.1.1.1');
 
-		$this->assertEquals(
-			SetupResult::ERROR,
-			$this->check->run()->getSeverity()
-		);
-	}
+        $this->assertEquals(
+            SetupResult::ERROR,
+            $this->check->run()->getSeverity()
+        );
+    }
 
-	public function testForwardedHostPresentButTrustedProxiesEmpty(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('trusted_proxies', [])
-			->willReturn([]);
-		$this->request->expects($this->atLeastOnce())
-			->method('getHeader')
-			->willReturnMap([
-				['REMOTE_ADDR', '1.1.1.1'],
-				['X-Forwarded-Host', 'nextcloud.test']
-			]);
-		$this->request->expects($this->any())
-			->method('getRemoteAddress')
-			->willReturn('1.1.1.1');
+    public function testForwardedHostPresentButTrustedProxiesEmpty(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValue')
+            ->with('trusted_proxies', [])
+            ->willReturn([]);
+        $this->request->expects($this->atLeastOnce())
+            ->method('getHeader')
+            ->willReturnMap([
+                ['REMOTE_ADDR', '1.1.1.1'],
+                ['X-Forwarded-Host', 'nextcloud.test']
+            ]);
+        $this->request->expects($this->any())
+            ->method('getRemoteAddress')
+            ->willReturn('1.1.1.1');
 
-		$this->assertEquals(
-			SetupResult::ERROR,
-			$this->check->run()->getSeverity()
-		);
-	}
+        $this->assertEquals(
+            SetupResult::ERROR,
+            $this->check->run()->getSeverity()
+        );
+    }
 }

apps/settings/tests/SetupChecks/LoggingLevelTest.php

Indentation +45 added lines, -45 removed lines

@@ -19,58 +19,58 @@
 use Test\TestCase;
 
 class LoggingLevelTest extends TestCase {
-	private IL10N&MockObject $l10n;
-	private IConfig&MockObject $config;
-	private IURLGenerator&MockObject $urlGenerator;
+    private IL10N&MockObject $l10n;
+    private IConfig&MockObject $config;
+    private IURLGenerator&MockObject $urlGenerator;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
-				return vsprintf($message, $replace);
-			});
-		$this->config = $this->createMock(IConfig::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-	}
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+        $this->config = $this->createMock(IConfig::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+    }
 
-	public static function dataRun(): array {
-		return [
-			[ILogger::INFO, SetupResult::SUCCESS],
-			[ILogger::WARN, SetupResult::SUCCESS],
-			[ILogger::ERROR, SetupResult::SUCCESS],
-			[ILogger::FATAL, SetupResult::SUCCESS],
+    public static function dataRun(): array {
+        return [
+            [ILogger::INFO, SetupResult::SUCCESS],
+            [ILogger::WARN, SetupResult::SUCCESS],
+            [ILogger::ERROR, SetupResult::SUCCESS],
+            [ILogger::FATAL, SetupResult::SUCCESS],
 
-			// Debug is valid but will result in an warning
-			[ILogger::DEBUG, SetupResult::WARNING],
+            // Debug is valid but will result in an warning
+            [ILogger::DEBUG, SetupResult::WARNING],
 
-			// negative - invalid range
-			[-1, SetupResult::ERROR],
-			// string value instead of number
-			['1', SetupResult::ERROR],
-			// random string value
-			['error', SetupResult::ERROR],
-			// PSR logger value
-			[LogLevel::ALERT, SetupResult::ERROR],
-			// out of range
-			[ILogger::FATAL + 1, SetupResult::ERROR],
-		];
-	}
+            // negative - invalid range
+            [-1, SetupResult::ERROR],
+            // string value instead of number
+            ['1', SetupResult::ERROR],
+            // random string value
+            ['error', SetupResult::ERROR],
+            // PSR logger value
+            [LogLevel::ALERT, SetupResult::ERROR],
+            // out of range
+            [ILogger::FATAL + 1, SetupResult::ERROR],
+        ];
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataRun')]
-	public function testRun(string|int $value, string $expected): void {
-		$this->urlGenerator->method('linkToDocs')->willReturn('admin-logging');
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataRun')]
+    public function testRun(string|int $value, string $expected): void {
+        $this->urlGenerator->method('linkToDocs')->willReturn('admin-logging');
 
-		$this->config->expects(self::once())
-			->method('getSystemValue')
-			->with('loglevel', ILogger::WARN)
-			->willReturn($value);
+        $this->config->expects(self::once())
+            ->method('getSystemValue')
+            ->with('loglevel', ILogger::WARN)
+            ->willReturn($value);
 
-		$check = new LoggingLevel($this->l10n, $this->config, $this->urlGenerator);
+        $check = new LoggingLevel($this->l10n, $this->config, $this->urlGenerator);
 
-		$result = $check->run();
-		$this->assertEquals($expected, $result->getSeverity());
-	}
+        $result = $check->run();
+        $this->assertEquals($expected, $result->getSeverity());
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->l10n->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
+			->willReturnCallback(function($message, array $replace) {
 				return vsprintf($message, $replace);
 			});
 		$this->config = $this->createMock(IConfig::class);
@@ -60,7 +60,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataRun')]
-	public function testRun(string|int $value, string $expected): void {
+	public function testRun(string | int $value, string $expected): void {
 		$this->urlGenerator->method('linkToDocs')->willReturn('admin-logging');
 
 		$this->config->expects(self::once())

apps/settings/tests/SetupChecks/DataDirectoryProtectedTest.php

Indentation +94 added lines, -94 removed lines

@@ -20,98 +20,98 @@
 use Test\TestCase;
 
 class DataDirectoryProtectedTest extends TestCase {
-	private IL10N&MockObject $l10n;
-	private IConfig&MockObject $config;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IClientService&MockObject $clientService;
-	private LoggerInterface&MockObject $logger;
-	private DataDirectoryProtected&MockObject $setupcheck;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
-				return vsprintf($message, $replace);
-			});
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->setupcheck = $this->getMockBuilder(DataDirectoryProtected::class)
-			->onlyMethods(['runRequest'])
-			->setConstructorArgs([
-				$this->l10n,
-				$this->config,
-				$this->urlGenerator,
-				$this->clientService,
-				$this->logger,
-			])
-			->getMock();
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestStatusCode')]
-	public function testStatusCode(array $status, string $expected, bool $hasBody): void {
-		$responses = array_map(function ($state) use ($hasBody) {
-			$response = $this->createMock(IResponse::class);
-			$response->expects($this->any())->method('getStatusCode')->willReturn($state);
-			$response->expects(($this->atMost(1)))->method('getBody')->willReturn($hasBody ? '# Nextcloud data directory' : 'something else');
-			return $response;
-		}, $status);
-
-		$this->setupcheck
-			->expects($this->once())
-			->method('runRequest')
-			->will($this->generate($responses));
-
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueString')
-			->willReturn('');
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals($expected, $result->getSeverity());
-	}
-
-	public static function dataTestStatusCode(): array {
-		return [
-			'success: forbidden access' => [[403], SetupResult::SUCCESS, true],
-			'success: forbidden access with redirect' => [[200], SetupResult::SUCCESS, false],
-			'error: can access' => [[200], SetupResult::ERROR, true],
-			'error: one forbidden one can access' => [[403, 200], SetupResult::ERROR, true],
-			'warning: connection issue' => [[], SetupResult::WARNING, true],
-		];
-	}
-
-	public function testNoResponse(): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->any())->method('getStatusCode')->willReturn(200);
-
-		$this->setupcheck
-			->expects($this->once())
-			->method('runRequest')
-			->will($this->generate([]));
-
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueString')
-			->willReturn('');
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
-	}
-
-	/**
-	 * Helper function creates a nicer interface for mocking Generator behavior
-	 */
-	protected function generate(array $yield_values) {
-		return $this->returnCallback(function () use ($yield_values) {
-			yield from $yield_values;
-		});
-	}
+    private IL10N&MockObject $l10n;
+    private IConfig&MockObject $config;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IClientService&MockObject $clientService;
+    private LoggerInterface&MockObject $logger;
+    private DataDirectoryProtected&MockObject $setupcheck;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->setupcheck = $this->getMockBuilder(DataDirectoryProtected::class)
+            ->onlyMethods(['runRequest'])
+            ->setConstructorArgs([
+                $this->l10n,
+                $this->config,
+                $this->urlGenerator,
+                $this->clientService,
+                $this->logger,
+            ])
+            ->getMock();
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestStatusCode')]
+    public function testStatusCode(array $status, string $expected, bool $hasBody): void {
+        $responses = array_map(function ($state) use ($hasBody) {
+            $response = $this->createMock(IResponse::class);
+            $response->expects($this->any())->method('getStatusCode')->willReturn($state);
+            $response->expects(($this->atMost(1)))->method('getBody')->willReturn($hasBody ? '# Nextcloud data directory' : 'something else');
+            return $response;
+        }, $status);
+
+        $this->setupcheck
+            ->expects($this->once())
+            ->method('runRequest')
+            ->will($this->generate($responses));
+
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueString')
+            ->willReturn('');
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals($expected, $result->getSeverity());
+    }
+
+    public static function dataTestStatusCode(): array {
+        return [
+            'success: forbidden access' => [[403], SetupResult::SUCCESS, true],
+            'success: forbidden access with redirect' => [[200], SetupResult::SUCCESS, false],
+            'error: can access' => [[200], SetupResult::ERROR, true],
+            'error: one forbidden one can access' => [[403, 200], SetupResult::ERROR, true],
+            'warning: connection issue' => [[], SetupResult::WARNING, true],
+        ];
+    }
+
+    public function testNoResponse(): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->any())->method('getStatusCode')->willReturn(200);
+
+        $this->setupcheck
+            ->expects($this->once())
+            ->method('runRequest')
+            ->will($this->generate([]));
+
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueString')
+            ->willReturn('');
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
+    }
+
+    /**
+     * Helper function creates a nicer interface for mocking Generator behavior
+     */
+    protected function generate(array $yield_values) {
+        return $this->returnCallback(function () use ($yield_values) {
+            yield from $yield_values;
+        });
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->l10n->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
+			->willReturnCallback(function($message, array $replace) {
 				return vsprintf($message, $replace);
 			});
 
@@ -56,7 +56,7 @@ 
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestStatusCode')]
 	public function testStatusCode(array $status, string $expected, bool $hasBody): void {
-		$responses = array_map(function ($state) use ($hasBody) {
+		$responses = array_map(function($state) use ($hasBody) {
 			$response = $this->createMock(IResponse::class);
 			$response->expects($this->any())->method('getStatusCode')->willReturn($state);
 			$response->expects(($this->atMost(1)))->method('getBody')->willReturn($hasBody ? '# Nextcloud data directory' : 'something else');
@@ -110,7 +110,7 @@ 
 	 * Helper function creates a nicer interface for mocking Generator behavior
 	 */
 	protected function generate(array $yield_values) {
-		return $this->returnCallback(function () use ($yield_values) {
+		return $this->returnCallback(function() use ($yield_values) {
 			yield from $yield_values;
 		});
 	}

apps/settings/tests/SetupChecks/SecurityHeadersTest.php

Indentation +173 added lines, -173 removed lines

@@ -20,177 +20,177 @@
 use Test\TestCase;
 
 class SecurityHeadersTest extends TestCase {
-	private IL10N&MockObject $l10n;
-	private IConfig&MockObject $config;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IClientService&MockObject $clientService;
-	private LoggerInterface&MockObject $logger;
-	private SecurityHeaders&MockObject $setupcheck;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
-				return vsprintf($message, $replace);
-			});
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->setupcheck = $this->getMockBuilder(SecurityHeaders::class)
-			->onlyMethods(['runRequest'])
-			->setConstructorArgs([
-				$this->l10n,
-				$this->config,
-				$this->urlGenerator,
-				$this->clientService,
-				$this->logger,
-			])
-			->getMock();
-	}
-
-	public function testInvalidStatusCode(): void {
-		$this->setupResponse(500, []);
-
-		$result = $this->setupcheck->run();
-		$this->assertMatchesRegularExpression('/^Could not check that your web server serves security headers correctly/', $result->getDescription());
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-	}
-
-	public function testAllHeadersMissing(): void {
-		$this->setupResponse(200, []);
-
-		$result = $this->setupcheck->run();
-		$this->assertMatchesRegularExpression('/^Some headers are not set correctly on your instance/', $result->getDescription());
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-	}
-
-	public function testSomeHeadersMissing(): void {
-		$this->setupResponse(
-			200,
-			[
-				'X-Robots-Tag' => 'noindex, nofollow',
-				'X-Frame-Options' => 'SAMEORIGIN',
-				'Strict-Transport-Security' => 'max-age=15768000;preload',
-				'X-Permitted-Cross-Domain-Policies' => 'none',
-				'Referrer-Policy' => 'no-referrer',
-			]
-		);
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(
-			"Some headers are not set correctly on your instance\n- The `X-Content-Type-Options` HTTP header is not set to `nosniff`. This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly.\n",
-			$result->getDescription()
-		);
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-	}
-
-	public static function dataSuccess(): array {
-		return [
-			// description => modifiedHeaders
-			'basic' => [[]],
-			'no-space-in-x-robots' => [['X-Robots-Tag' => 'noindex,nofollow']],
-			'strict-origin-when-cross-origin' => [['Referrer-Policy' => 'strict-origin-when-cross-origin']],
-			'referrer-no-referrer-when-downgrade' => [['Referrer-Policy' => 'no-referrer-when-downgrade']],
-			'referrer-strict-origin' => [['Referrer-Policy' => 'strict-origin']],
-			'referrer-strict-origin-when-cross-origin' => [['Referrer-Policy' => 'strict-origin-when-cross-origin']],
-			'referrer-same-origin' => [['Referrer-Policy' => 'same-origin']],
-			'hsts-minimum' => [['Strict-Transport-Security' => 'max-age=15552000']],
-			'hsts-include-subdomains' => [['Strict-Transport-Security' => 'max-age=99999999; includeSubDomains']],
-			'hsts-include-subdomains-preload' => [['Strict-Transport-Security' => 'max-age=99999999; preload; includeSubDomains']],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSuccess')]
-	public function testSuccess(array $headers): void {
-		$headers = array_merge(
-			[
-				'X-Content-Type-Options' => 'nosniff',
-				'X-Robots-Tag' => 'noindex, nofollow',
-				'X-Frame-Options' => 'SAMEORIGIN',
-				'Strict-Transport-Security' => 'max-age=15768000',
-				'X-Permitted-Cross-Domain-Policies' => 'none',
-				'Referrer-Policy' => 'no-referrer',
-			],
-			$headers
-		);
-		$this->setupResponse(
-			200,
-			$headers
-		);
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(
-			'Your server is correctly configured to send security headers.',
-			$result->getDescription()
-		);
-		$this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
-	}
-
-	public static function dataFailure(): array {
-		return [
-			// description => modifiedHeaders
-			'x-robots-none' => [['X-Robots-Tag' => 'none'], "- The `X-Robots-Tag` HTTP header is not set to `noindex,nofollow`. This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly.\n"],
-			'referrer-origin' => [['Referrer-Policy' => 'origin'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
-			'referrer-origin-when-cross-origin' => [['Referrer-Policy' => 'origin-when-cross-origin'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
-			'referrer-unsafe-url' => [['Referrer-Policy' => 'unsafe-url'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
-			'hsts-missing' => [['Strict-Transport-Security' => ''], "- The `Strict-Transport-Security` HTTP header is not set (should be at least `15552000` seconds). For enhanced security, it is recommended to enable HSTS.\n"],
-			'hsts-too-low' => [['Strict-Transport-Security' => 'max-age=15551999'], "- The `Strict-Transport-Security` HTTP header is not set to at least `15552000` seconds (current value: `15551999`). For enhanced security, it is recommended to use a long HSTS policy.\n"],
-			'hsts-malformed' => [['Strict-Transport-Security' => 'iAmABogusHeader342'], "- The `Strict-Transport-Security` HTTP header is malformed: `iAmABogusHeader342`. For enhanced security, it is recommended to enable HSTS.\n"],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataFailure')]
-	public function testFailure(array $headers, string $msg): void {
-		$headers = array_merge(
-			[
-				'X-Content-Type-Options' => 'nosniff',
-				'X-Robots-Tag' => 'noindex, nofollow',
-				'X-Frame-Options' => 'SAMEORIGIN',
-				'Strict-Transport-Security' => 'max-age=15768000',
-				'X-Permitted-Cross-Domain-Policies' => 'none',
-				'Referrer-Policy' => 'no-referrer',
-			],
-			$headers
-		);
-		$this->setupResponse(
-			200,
-			$headers
-		);
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(
-			'Some headers are not set correctly on your instance' . "\n$msg",
-			$result->getDescription()
-		);
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-	}
-
-	protected function setupResponse(int $statuscode, array $headers): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statuscode);
-		$response->expects($this->any())->method('getHeader')
-			->willReturnCallback(
-				fn (string $header): string => $headers[$header] ?? ''
-			);
-
-		$this->setupcheck
-			->expects($this->atLeastOnce())
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response]));
-	}
-
-	/**
-	 * Helper function creates a nicer interface for mocking Generator behavior
-	 */
-	protected function generate(array $yield_values) {
-		return $this->returnCallback(function () use ($yield_values) {
-			yield from $yield_values;
-		});
-	}
+    private IL10N&MockObject $l10n;
+    private IConfig&MockObject $config;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IClientService&MockObject $clientService;
+    private LoggerInterface&MockObject $logger;
+    private SecurityHeaders&MockObject $setupcheck;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->setupcheck = $this->getMockBuilder(SecurityHeaders::class)
+            ->onlyMethods(['runRequest'])
+            ->setConstructorArgs([
+                $this->l10n,
+                $this->config,
+                $this->urlGenerator,
+                $this->clientService,
+                $this->logger,
+            ])
+            ->getMock();
+    }
+
+    public function testInvalidStatusCode(): void {
+        $this->setupResponse(500, []);
+
+        $result = $this->setupcheck->run();
+        $this->assertMatchesRegularExpression('/^Could not check that your web server serves security headers correctly/', $result->getDescription());
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+    }
+
+    public function testAllHeadersMissing(): void {
+        $this->setupResponse(200, []);
+
+        $result = $this->setupcheck->run();
+        $this->assertMatchesRegularExpression('/^Some headers are not set correctly on your instance/', $result->getDescription());
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+    }
+
+    public function testSomeHeadersMissing(): void {
+        $this->setupResponse(
+            200,
+            [
+                'X-Robots-Tag' => 'noindex, nofollow',
+                'X-Frame-Options' => 'SAMEORIGIN',
+                'Strict-Transport-Security' => 'max-age=15768000;preload',
+                'X-Permitted-Cross-Domain-Policies' => 'none',
+                'Referrer-Policy' => 'no-referrer',
+            ]
+        );
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(
+            "Some headers are not set correctly on your instance\n- The `X-Content-Type-Options` HTTP header is not set to `nosniff`. This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly.\n",
+            $result->getDescription()
+        );
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+    }
+
+    public static function dataSuccess(): array {
+        return [
+            // description => modifiedHeaders
+            'basic' => [[]],
+            'no-space-in-x-robots' => [['X-Robots-Tag' => 'noindex,nofollow']],
+            'strict-origin-when-cross-origin' => [['Referrer-Policy' => 'strict-origin-when-cross-origin']],
+            'referrer-no-referrer-when-downgrade' => [['Referrer-Policy' => 'no-referrer-when-downgrade']],
+            'referrer-strict-origin' => [['Referrer-Policy' => 'strict-origin']],
+            'referrer-strict-origin-when-cross-origin' => [['Referrer-Policy' => 'strict-origin-when-cross-origin']],
+            'referrer-same-origin' => [['Referrer-Policy' => 'same-origin']],
+            'hsts-minimum' => [['Strict-Transport-Security' => 'max-age=15552000']],
+            'hsts-include-subdomains' => [['Strict-Transport-Security' => 'max-age=99999999; includeSubDomains']],
+            'hsts-include-subdomains-preload' => [['Strict-Transport-Security' => 'max-age=99999999; preload; includeSubDomains']],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSuccess')]
+    public function testSuccess(array $headers): void {
+        $headers = array_merge(
+            [
+                'X-Content-Type-Options' => 'nosniff',
+                'X-Robots-Tag' => 'noindex, nofollow',
+                'X-Frame-Options' => 'SAMEORIGIN',
+                'Strict-Transport-Security' => 'max-age=15768000',
+                'X-Permitted-Cross-Domain-Policies' => 'none',
+                'Referrer-Policy' => 'no-referrer',
+            ],
+            $headers
+        );
+        $this->setupResponse(
+            200,
+            $headers
+        );
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(
+            'Your server is correctly configured to send security headers.',
+            $result->getDescription()
+        );
+        $this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
+    }
+
+    public static function dataFailure(): array {
+        return [
+            // description => modifiedHeaders
+            'x-robots-none' => [['X-Robots-Tag' => 'none'], "- The `X-Robots-Tag` HTTP header is not set to `noindex,nofollow`. This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly.\n"],
+            'referrer-origin' => [['Referrer-Policy' => 'origin'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
+            'referrer-origin-when-cross-origin' => [['Referrer-Policy' => 'origin-when-cross-origin'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
+            'referrer-unsafe-url' => [['Referrer-Policy' => 'unsafe-url'], "- The `Referrer-Policy` HTTP header is not set to `no-referrer`, `no-referrer-when-downgrade`, `strict-origin`, `strict-origin-when-cross-origin` or `same-origin`. This can leak referer information. See the {w3c-recommendation}.\n"],
+            'hsts-missing' => [['Strict-Transport-Security' => ''], "- The `Strict-Transport-Security` HTTP header is not set (should be at least `15552000` seconds). For enhanced security, it is recommended to enable HSTS.\n"],
+            'hsts-too-low' => [['Strict-Transport-Security' => 'max-age=15551999'], "- The `Strict-Transport-Security` HTTP header is not set to at least `15552000` seconds (current value: `15551999`). For enhanced security, it is recommended to use a long HSTS policy.\n"],
+            'hsts-malformed' => [['Strict-Transport-Security' => 'iAmABogusHeader342'], "- The `Strict-Transport-Security` HTTP header is malformed: `iAmABogusHeader342`. For enhanced security, it is recommended to enable HSTS.\n"],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataFailure')]
+    public function testFailure(array $headers, string $msg): void {
+        $headers = array_merge(
+            [
+                'X-Content-Type-Options' => 'nosniff',
+                'X-Robots-Tag' => 'noindex, nofollow',
+                'X-Frame-Options' => 'SAMEORIGIN',
+                'Strict-Transport-Security' => 'max-age=15768000',
+                'X-Permitted-Cross-Domain-Policies' => 'none',
+                'Referrer-Policy' => 'no-referrer',
+            ],
+            $headers
+        );
+        $this->setupResponse(
+            200,
+            $headers
+        );
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(
+            'Some headers are not set correctly on your instance' . "\n$msg",
+            $result->getDescription()
+        );
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+    }
+
+    protected function setupResponse(int $statuscode, array $headers): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statuscode);
+        $response->expects($this->any())->method('getHeader')
+            ->willReturnCallback(
+                fn (string $header): string => $headers[$header] ?? ''
+            );
+
+        $this->setupcheck
+            ->expects($this->atLeastOnce())
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response]));
+    }
+
+    /**
+     * Helper function creates a nicer interface for mocking Generator behavior
+     */
+    protected function generate(array $yield_values) {
+        return $this->returnCallback(function () use ($yield_values) {
+            yield from $yield_values;
+        });
+    }
 }

apps/settings/tests/SetupChecks/WellKnownUrlsTest.php

Indentation +192 added lines, -192 removed lines

@@ -20,196 +20,196 @@
 use Test\TestCase;
 
 class WellKnownUrlsTest extends TestCase {
-	private IL10N&MockObject $l10n;
-	private IConfig&MockObject $config;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IClientService&MockObject $clientService;
-	private LoggerInterface&MockObject $logger;
-	private WellKnownUrls&MockObject $setupcheck;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		/** @var IL10N&MockObject */
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->l10n->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($message, array $replace) {
-				return vsprintf($message, $replace);
-			});
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->setupcheck = $this->getMockBuilder(WellKnownUrls::class)
-			->onlyMethods(['runRequest'])
-			->setConstructorArgs([
-				$this->l10n,
-				$this->config,
-				$this->urlGenerator,
-				$this->clientService,
-				$this->logger,
-			])
-			->getMock();
-	}
-
-	/**
-	 * Test that the SetupCheck is skipped if the system config is set
-	 */
-	public function testDisabled(): void {
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('check_for_working_wellknown_setup')
-			->willReturn(false);
-
-		$this->setupcheck
-			->expects($this->never())
-			->method('runRequest');
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::INFO, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/check was skipped/', $result->getDescription());
-	}
-
-	/**
-	 * Test what happens if the local server could not be reached (no response from the requests)
-	 */
-	public function testNoResponse(): void {
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('check_for_working_wellknown_setup')
-			->willReturn(true);
-
-		$this->setupcheck
-			->expects($this->once())
-			->method('runRequest')
-			->will($this->generate([]));
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::INFO, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
-	}
-
-	/**
-	 * Test responses
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestResponses')]
-	public function testResponses($responses, string $expectedSeverity): void {
-		$this->config
-			->expects($this->once())
-			->method('getSystemValueBool')
-			->with('check_for_working_wellknown_setup')
-			->willReturn(true);
-
-		$this->setupcheck
-			->expects($this->atLeastOnce())
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls(...$responses);
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals($expectedSeverity, $result->getSeverity());
-	}
-
-	public function dataTestResponses(): array {
-		$createResponse = function (int $statuscode, array $header = []): IResponse&MockObject {
-			$response = $this->createMock(IResponse::class);
-			$response->expects($this->any())
-				->method('getStatusCode')
-				->willReturn($statuscode);
-			$response->expects($this->any())
-				->method('getHeader')
-				->willReturnCallback(fn ($name) => $header[$name] ?? '');
-			return $response;
-		};
-
-		$wellKnownHeader = ['X-NEXTCLOUD-WELL-KNOWN' => 'yes'];
-
-		return [
-			'expected codes' => [
-				[
-					$this->generate([$createResponse(200, $wellKnownHeader)]),
-					$this->generate([$createResponse(200, $wellKnownHeader)]),
-					$this->generate([$createResponse(207)]),
-					$this->generate([$createResponse(207)]),
-				],
-				SetupResult::SUCCESS,
-			],
-			'late response with expected codes' => [
-				[
-					$this->generate([$createResponse(404), $createResponse(200, $wellKnownHeader)]),
-					$this->generate([$createResponse(404), $createResponse(200, $wellKnownHeader)]),
-					$this->generate([$createResponse(404), $createResponse(207)]),
-					$this->generate([$createResponse(404), $createResponse(207)]),
-				],
-				SetupResult::SUCCESS,
-			],
-			'working but disabled webfinger' => [
-				[
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(207)]),
-					$this->generate([$createResponse(207)]),
-				],
-				SetupResult::SUCCESS,
-			],
-			'unauthorized webdav but with correct configured redirect' => [
-				[
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(401, ['X-Guzzle-Redirect-History' => 'https://example.com,https://example.com/remote.php/dav/'])]),
-					$this->generate([$createResponse(401, ['X-Guzzle-Redirect-History' => 'https://example.com/remote.php/dav/'])]),
-				],
-				SetupResult::SUCCESS,
-			],
-			'not configured path' => [
-				[
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(404)]),
-				],
-				SetupResult::WARNING,
-			],
-			'Invalid webfinger' => [
-				[
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(207)]),
-					$this->generate([$createResponse(207)]),
-				],
-				SetupResult::WARNING,
-			],
-			'Invalid nodeinfo' => [
-				[
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(207)]),
-					$this->generate([$createResponse(207)]),
-				],
-				SetupResult::WARNING,
-			],
-			'Invalid caldav' => [
-				[
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(404, $wellKnownHeader)]),
-					$this->generate([$createResponse(404)]),
-					$this->generate([$createResponse(207)]),
-				],
-				SetupResult::WARNING,
-			],
-		];
-	}
-
-	/**
-	 * Helper function creates a nicer interface for mocking Generator behavior
-	 */
-	protected function generate(array $yield_values) {
-		return $this->returnCallback(function () use ($yield_values) {
-			yield from $yield_values;
-		});
-	}
+    private IL10N&MockObject $l10n;
+    private IConfig&MockObject $config;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IClientService&MockObject $clientService;
+    private LoggerInterface&MockObject $logger;
+    private WellKnownUrls&MockObject $setupcheck;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        /** @var IL10N&MockObject */
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->setupcheck = $this->getMockBuilder(WellKnownUrls::class)
+            ->onlyMethods(['runRequest'])
+            ->setConstructorArgs([
+                $this->l10n,
+                $this->config,
+                $this->urlGenerator,
+                $this->clientService,
+                $this->logger,
+            ])
+            ->getMock();
+    }
+
+    /**
+     * Test that the SetupCheck is skipped if the system config is set
+     */
+    public function testDisabled(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('check_for_working_wellknown_setup')
+            ->willReturn(false);
+
+        $this->setupcheck
+            ->expects($this->never())
+            ->method('runRequest');
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::INFO, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/check was skipped/', $result->getDescription());
+    }
+
+    /**
+     * Test what happens if the local server could not be reached (no response from the requests)
+     */
+    public function testNoResponse(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('check_for_working_wellknown_setup')
+            ->willReturn(true);
+
+        $this->setupcheck
+            ->expects($this->once())
+            ->method('runRequest')
+            ->will($this->generate([]));
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::INFO, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
+    }
+
+    /**
+     * Test responses
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestResponses')]
+    public function testResponses($responses, string $expectedSeverity): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('check_for_working_wellknown_setup')
+            ->willReturn(true);
+
+        $this->setupcheck
+            ->expects($this->atLeastOnce())
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls(...$responses);
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals($expectedSeverity, $result->getSeverity());
+    }
+
+    public function dataTestResponses(): array {
+        $createResponse = function (int $statuscode, array $header = []): IResponse&MockObject {
+            $response = $this->createMock(IResponse::class);
+            $response->expects($this->any())
+                ->method('getStatusCode')
+                ->willReturn($statuscode);
+            $response->expects($this->any())
+                ->method('getHeader')
+                ->willReturnCallback(fn ($name) => $header[$name] ?? '');
+            return $response;
+        };
+
+        $wellKnownHeader = ['X-NEXTCLOUD-WELL-KNOWN' => 'yes'];
+
+        return [
+            'expected codes' => [
+                [
+                    $this->generate([$createResponse(200, $wellKnownHeader)]),
+                    $this->generate([$createResponse(200, $wellKnownHeader)]),
+                    $this->generate([$createResponse(207)]),
+                    $this->generate([$createResponse(207)]),
+                ],
+                SetupResult::SUCCESS,
+            ],
+            'late response with expected codes' => [
+                [
+                    $this->generate([$createResponse(404), $createResponse(200, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404), $createResponse(200, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404), $createResponse(207)]),
+                    $this->generate([$createResponse(404), $createResponse(207)]),
+                ],
+                SetupResult::SUCCESS,
+            ],
+            'working but disabled webfinger' => [
+                [
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(207)]),
+                    $this->generate([$createResponse(207)]),
+                ],
+                SetupResult::SUCCESS,
+            ],
+            'unauthorized webdav but with correct configured redirect' => [
+                [
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(401, ['X-Guzzle-Redirect-History' => 'https://example.com,https://example.com/remote.php/dav/'])]),
+                    $this->generate([$createResponse(401, ['X-Guzzle-Redirect-History' => 'https://example.com/remote.php/dav/'])]),
+                ],
+                SetupResult::SUCCESS,
+            ],
+            'not configured path' => [
+                [
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(404)]),
+                ],
+                SetupResult::WARNING,
+            ],
+            'Invalid webfinger' => [
+                [
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(207)]),
+                    $this->generate([$createResponse(207)]),
+                ],
+                SetupResult::WARNING,
+            ],
+            'Invalid nodeinfo' => [
+                [
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(207)]),
+                    $this->generate([$createResponse(207)]),
+                ],
+                SetupResult::WARNING,
+            ],
+            'Invalid caldav' => [
+                [
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404, $wellKnownHeader)]),
+                    $this->generate([$createResponse(404)]),
+                    $this->generate([$createResponse(207)]),
+                ],
+                SetupResult::WARNING,
+            ],
+        ];
+    }
+
+    /**
+     * Helper function creates a nicer interface for mocking Generator behavior
+     */
+    protected function generate(array $yield_values) {
+        return $this->returnCallback(function () use ($yield_values) {
+            yield from $yield_values;
+        });
+    }
 }