nextcloud / server

apps/settings/tests/UserMigration/AccountMigratorTest.php

Indentation +137 added lines, -137 removed lines

@@ -27,141 +27,141 @@
  * @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,
-			),
-		);
-	}
-
-	/**
-	 * @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,
+            ),
+        );
+    }
+
+    /**
+     * @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);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -34,13 +34,13 @@ 
 	private IExportDestination&MockObject $exportDestination;
 	private OutputInterface&MockObject $output;
 
-	private const ASSETS_DIR = __DIR__ . '/assets/';
+	private const ASSETS_DIR = __DIR__.'/assets/';
 
-	private const REGEX_ACCOUNT_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
+	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_AVATAR_FILE = '/^'.Application::APP_ID.'\/'.'avatar\.(jpg|png)'.'$/';
 
-	private const REGEX_CONFIG_FILE = '/^' . Application::APP_ID . '\/' . '[a-z]+\.json' . '$/';
+	private const REGEX_CONFIG_FILE = '/^'.Application::APP_ID.'\/'.'[a-z]+\.json'.'$/';
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -65,12 +65,12 @@ 
 
 	public static function dataImportExportAccount(): array {
 		return array_map(
-			static function (string $filename): array {
-				$dataPath = static::ASSETS_DIR . $filename;
+			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);
+				$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),
@@ -109,7 +109,7 @@ 
 		$this->importSource
 			->expects($this->exactly(2))
 			->method('getFileContents')
-			->willReturnCallback(function ($path) use (&$calls) {
+			->willReturnCallback(function($path) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertMatchesRegularExpression($expected[0], $path);
 				return $expected[1];
@@ -118,7 +118,7 @@ 
 		$this->importSource
 			->expects($this->once())
 			->method('getFolderListing')
-			->with(Application::APP_ID . '/')
+			->with(Application::APP_ID.'/')
 			->willReturn(["avatar.$avatarExt"]);
 
 		$this->importSource
@@ -146,12 +146,12 @@ 
 
 		$calls = [
 			[static::REGEX_ACCOUNT_FILE, new JsonMatches(json_encode($importData))],
-			[static::REGEX_CONFIG_FILE,new JsonMatches(json_encode($importConfig))],
+			[static::REGEX_CONFIG_FILE, new JsonMatches(json_encode($importConfig))],
 		];
 		$this->exportDestination
 			->expects($this->exactly(2))
 			->method('addFileContents')
-			->willReturnCallback(function ($path) use (&$calls) {
+			->willReturnCallback(function($path) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertMatchesRegularExpression($expected[0], $path);
 				return $expected[1];

apps/settings/tests/AppInfo/ApplicationTest.php

Indentation +29 added lines, -29 removed lines

@@ -28,38 +28,38 @@
  * @group DB
  */
 class ApplicationTest extends TestCase {
-	protected Application $app;
-	protected IAppContainer $container;
+    protected Application $app;
+    protected IAppContainer $container;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->app = new Application();
-		$this->container = $this->app->getContainer();
-	}
+    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 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],
+    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],
-		];
-	}
+            [SubadminMiddleware::class, Middleware::class],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataContainerQuery
-	 */
-	public function testContainerQuery(string $service, string $expected): void {
-		$this->assertTrue($this->container->query($service) instanceof $expected);
-	}
+    /**
+     * @dataProvider dataContainerQuery
+     */
+    public function testContainerQuery(string $service, string $expected): void {
+        $this->assertTrue($this->container->query($service) instanceof $expected);
+    }
 }

apps/settings/tests/SetupChecks/OcxProvicersTest.php

Indentation +128 added lines, -128 removed lines

@@ -20,132 +20,132 @@
 use Test\TestCase;
 
 class OcxProvicersTest extends TestCase {
-	private IL10N|MockObject $l10n;
-	private IConfig|MockObject $config;
-	private IURLGenerator|MockObject $urlGenerator;
-	private IClientService|MockObject $clientService;
-	private LoggerInterface|MockObject $logger;
-	private OcxProviders|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(OcxProviders::class)
-			->onlyMethods(['runRequest'])
-			->setConstructorArgs([
-				$this->l10n,
-				$this->config,
-				$this->urlGenerator,
-				$this->clientService,
-				$this->logger,
-			])
-			->getMock();
-	}
-
-	public function testSuccess(): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->any())->method('getStatusCode')->willReturn(200);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([$response]));
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
-	}
-
-	public function testLateSuccess(): void {
-		$response1 = $this->createMock(IResponse::class);
-		$response1->expects($this->exactly(3))->method('getStatusCode')->willReturnOnConsecutiveCalls(404, 500, 200);
-		$response2 = $this->createMock(IResponse::class);
-		$response2->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(200);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response1, $response1, $response1]), $this->generate([$response2])); // only one response out of two
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
-	}
-
-	public function testNoResponse(): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->any())->method('getStatusCode')->willReturn(200);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([]), $this->generate([])); // No responses
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
-	}
-
-	public function testPartialResponse(): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->any())->method('getStatusCode')->willReturn(200);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([])); // only one response out of two
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
-	}
-
-	public function testInvalidResponse(): void {
-		$response = $this->createMock(IResponse::class);
-		$response->expects($this->any())->method('getStatusCode')->willReturn(404);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([$response])); // only one response out of two
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Your web server is not properly set up/', $result->getDescription());
-	}
-
-	public function testPartialInvalidResponse(): void {
-		$response1 = $this->createMock(IResponse::class);
-		$response1->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(200);
-		$response2 = $this->createMock(IResponse::class);
-		$response2->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(404);
-
-		$this->setupcheck
-			->expects($this->exactly(2))
-			->method('runRequest')
-			->willReturnOnConsecutiveCalls($this->generate([$response1]), $this->generate([$response2]));
-
-		$result = $this->setupcheck->run();
-		$this->assertEquals(SetupResult::WARNING, $result->getSeverity());
-		$this->assertMatchesRegularExpression('/^Your web server is not properly set up/', $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 OcxProviders|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(OcxProviders::class)
+            ->onlyMethods(['runRequest'])
+            ->setConstructorArgs([
+                $this->l10n,
+                $this->config,
+                $this->urlGenerator,
+                $this->clientService,
+                $this->logger,
+            ])
+            ->getMock();
+    }
+
+    public function testSuccess(): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->any())->method('getStatusCode')->willReturn(200);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([$response]));
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
+    }
+
+    public function testLateSuccess(): void {
+        $response1 = $this->createMock(IResponse::class);
+        $response1->expects($this->exactly(3))->method('getStatusCode')->willReturnOnConsecutiveCalls(404, 500, 200);
+        $response2 = $this->createMock(IResponse::class);
+        $response2->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(200);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response1, $response1, $response1]), $this->generate([$response2])); // only one response out of two
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::SUCCESS, $result->getSeverity());
+    }
+
+    public function testNoResponse(): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->any())->method('getStatusCode')->willReturn(200);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([]), $this->generate([])); // No responses
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
+    }
+
+    public function testPartialResponse(): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->any())->method('getStatusCode')->willReturn(200);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([])); // only one response out of two
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Could not check/', $result->getDescription());
+    }
+
+    public function testInvalidResponse(): void {
+        $response = $this->createMock(IResponse::class);
+        $response->expects($this->any())->method('getStatusCode')->willReturn(404);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response]), $this->generate([$response])); // only one response out of two
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Your web server is not properly set up/', $result->getDescription());
+    }
+
+    public function testPartialInvalidResponse(): void {
+        $response1 = $this->createMock(IResponse::class);
+        $response1->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(200);
+        $response2 = $this->createMock(IResponse::class);
+        $response2->expects($this->any())->method('getStatusCode')->willReturnOnConsecutiveCalls(404);
+
+        $this->setupcheck
+            ->expects($this->exactly(2))
+            ->method('runRequest')
+            ->willReturnOnConsecutiveCalls($this->generate([$response1]), $this->generate([$response2]));
+
+        $result = $this->setupcheck->run();
+        $this->assertEquals(SetupResult::WARNING, $result->getSeverity());
+        $this->assertMatchesRegularExpression('/^Your web server is not properly set up/', $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 +8 added lines, -8 removed lines

@@ -20,12 +20,12 @@ 
 use Test\TestCase;
 
 class OcxProvicersTest extends TestCase {
-	private IL10N|MockObject $l10n;
-	private IConfig|MockObject $config;
-	private IURLGenerator|MockObject $urlGenerator;
-	private IClientService|MockObject $clientService;
-	private LoggerInterface|MockObject $logger;
-	private OcxProviders|MockObject $setupcheck;
+	private IL10N | MockObject $l10n;
+	private IConfig | MockObject $config;
+	private IURLGenerator | MockObject $urlGenerator;
+	private IClientService | MockObject $clientService;
+	private LoggerInterface | MockObject $logger;
+	private OcxProviders | MockObject $setupcheck;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -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);
 			});
 
@@ -144,7 +144,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/ForwardedForHeadersTest.php

Indentation +92 added lines, -92 removed lines

@@ -17,105 +17,105 @@
 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,
+        );
+    }
 
-	/**
-	 * @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);
+    /**
+     * @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()
+        );
+    }
 }

Spacing +1 added lines, -1 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->getMockBuilder(IConfig::class)->getMock();

apps/settings/tests/SetupChecks/PhpOutputBufferingTest.php

Indentation +16 added lines, -16 removed lines

@@ -15,27 +15,27 @@
 use Test\TestCase;
 
 class PhpOutputBufferingTest extends TestCase {
-	/** @var IL10N|MockObject */
-	private $l10n;
+    /** @var IL10N|MockObject */
+    private $l10n;
 
-	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->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+    }
 
-	/*
+    /*
 	 * output_buffer is PHP_INI_PERDIR and cannot changed at runtime.
 	 * Run this test with -d output_buffering=1 to validate the fail case.
 	 */
 
-	public function testPass(): void {
-		$check = new PhpOutputBuffering($this->l10n);
-		$this->assertEquals(SetupResult::SUCCESS, $check->run()->getSeverity());
-	}
+    public function testPass(): void {
+        $check = new PhpOutputBuffering($this->l10n);
+        $this->assertEquals(SetupResult::SUCCESS, $check->run()->getSeverity());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,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);
 			});
 	}

apps/settings/tests/SetupChecks/SupportedDatabaseTest.php

Indentation +28 added lines, -28 removed lines

@@ -20,32 +20,32 @@
  * @group DB
  */
 class SupportedDatabaseTest extends TestCase {
-	private IL10N $l10n;
-	private IUrlGenerator $urlGenerator;
-	private IDBConnection $connection;
-
-	private SupportedDatabase $check;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->connection = Server::get(IDBConnection::class);
-
-		$this->check = new SupportedDatabase(
-			$this->l10n,
-			$this->urlGenerator,
-			Server::get(IDBConnection::class)
-		);
-	}
-
-	public function testPass(): void {
-		if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE) {
-			/** SQlite always gets a warning */
-			$this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
-		} else {
-			$this->assertContains($this->check->run()->getSeverity(), [SetupResult::SUCCESS, SetupResult::INFO]);
-		}
-	}
+    private IL10N $l10n;
+    private IUrlGenerator $urlGenerator;
+    private IDBConnection $connection;
+
+    private SupportedDatabase $check;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->connection = Server::get(IDBConnection::class);
+
+        $this->check = new SupportedDatabase(
+            $this->l10n,
+            $this->urlGenerator,
+            Server::get(IDBConnection::class)
+        );
+    }
+
+    public function testPass(): void {
+        if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE) {
+            /** SQlite always gets a warning */
+            $this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
+        } else {
+            $this->assertContains($this->check->run()->getSeverity(), [SetupResult::SUCCESS, SetupResult::INFO]);
+        }
+    }
 }

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],
+        ];
+    }
 
-	/** @dataProvider dataRun */
-	public function testRun(string|int $value, string $expected): void {
-		$this->urlGenerator->method('linkToDocs')->willReturn('admin-logging');
+    /** @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 @@ 
 	}
 
 	/** @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 +96 added lines, -96 removed lines

@@ -20,100 +20,100 @@
 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();
-	}
-
-	/**
-	 * @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();
+    }
+
+    /**
+     * @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);
 			});
 
@@ -58,7 +58,7 @@ 
 	 * @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');
@@ -112,7 +112,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/AppDirsWithDifferentOwnerTest.php

Indentation +80 added lines, -80 removed lines

@@ -13,90 +13,90 @@
 use Test\TestCase;
 
 class AppDirsWithDifferentOwnerTest extends TestCase {
-	private IL10N $l10n;
-	private AppDirsWithDifferentOwner $check;
+    private IL10N $l10n;
+    private AppDirsWithDifferentOwner $check;
 
-	/**
-	 * Holds a list of directories created during tests.
-	 *
-	 * @var array
-	 */
-	private $dirsToRemove = [];
+    /**
+     * Holds a list of directories created during tests.
+     *
+     * @var array
+     */
+    private $dirsToRemove = [];
 
-	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->check = new AppDirsWithDifferentOwner(
-			$this->l10n,
-		);
-	}
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->l10n->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($message, array $replace) {
+                return vsprintf($message, $replace);
+            });
+        $this->check = new AppDirsWithDifferentOwner(
+            $this->l10n,
+        );
+    }
 
-	/**
-	 * Setups a temp directory and some subdirectories.
-	 * Then calls the 'getAppDirsWithDifferentOwner' method.
-	 * The result is expected to be empty since
-	 * there are no directories with different owners than the current user.
-	 *
-	 * @return void
-	 */
-	public function testAppDirectoryOwnersOk(): void {
-		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
-		mkdir($tempDir);
-		mkdir($tempDir . DIRECTORY_SEPARATOR . 'app1');
-		mkdir($tempDir . DIRECTORY_SEPARATOR . 'app2');
-		$this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app1';
-		$this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app2';
-		$this->dirsToRemove[] = $tempDir;
-		\OC::$APPSROOTS = [
-			[
-				'path' => $tempDir,
-				'url' => '/apps',
-				'writable' => true,
-			],
-		];
-		$this->assertSame(
-			[],
-			$this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
-		);
-	}
+    /**
+     * Setups a temp directory and some subdirectories.
+     * Then calls the 'getAppDirsWithDifferentOwner' method.
+     * The result is expected to be empty since
+     * there are no directories with different owners than the current user.
+     *
+     * @return void
+     */
+    public function testAppDirectoryOwnersOk(): void {
+        $tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
+        mkdir($tempDir);
+        mkdir($tempDir . DIRECTORY_SEPARATOR . 'app1');
+        mkdir($tempDir . DIRECTORY_SEPARATOR . 'app2');
+        $this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app1';
+        $this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app2';
+        $this->dirsToRemove[] = $tempDir;
+        \OC::$APPSROOTS = [
+            [
+                'path' => $tempDir,
+                'url' => '/apps',
+                'writable' => true,
+            ],
+        ];
+        $this->assertSame(
+            [],
+            $this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
+        );
+    }
 
-	/**
-	 * Calls the check for a none existing app root that is marked as not writable.
-	 * It's expected that no error happens since the check shouldn't apply.
-	 *
-	 * @return void
-	 */
-	public function testAppDirectoryOwnersNotWritable(): void {
-		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
-		\OC::$APPSROOTS = [
-			[
-				'path' => $tempDir,
-				'url' => '/apps',
-				'writable' => false,
-			],
-		];
-		$this->assertSame(
-			[],
-			$this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
-		);
-	}
+    /**
+     * Calls the check for a none existing app root that is marked as not writable.
+     * It's expected that no error happens since the check shouldn't apply.
+     *
+     * @return void
+     */
+    public function testAppDirectoryOwnersNotWritable(): void {
+        $tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
+        \OC::$APPSROOTS = [
+            [
+                'path' => $tempDir,
+                'url' => '/apps',
+                'writable' => false,
+            ],
+        ];
+        $this->assertSame(
+            [],
+            $this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
+        );
+    }
 
-	/**
-	 * Removes directories created during tests.
-	 *
-	 * @after
-	 * @return void
-	 */
-	public function removeTestDirectories() {
-		foreach ($this->dirsToRemove as $dirToRemove) {
-			rmdir($dirToRemove);
-		}
-		$this->dirsToRemove = [];
-	}
+    /**
+     * Removes directories created during tests.
+     *
+     * @after
+     * @return void
+     */
+    public function removeTestDirectories() {
+        foreach ($this->dirsToRemove as $dirToRemove) {
+            rmdir($dirToRemove);
+        }
+        $this->dirsToRemove = [];
+    }
 }

Spacing +7 added lines, -7 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->check = new AppDirsWithDifferentOwner(
@@ -46,12 +46,12 @@ 
 	 * @return void
 	 */
 	public function testAppDirectoryOwnersOk(): void {
-		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
+		$tempDir = tempnam(sys_get_temp_dir(), 'apps').'dir';
 		mkdir($tempDir);
-		mkdir($tempDir . DIRECTORY_SEPARATOR . 'app1');
-		mkdir($tempDir . DIRECTORY_SEPARATOR . 'app2');
-		$this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app1';
-		$this->dirsToRemove[] = $tempDir . DIRECTORY_SEPARATOR . 'app2';
+		mkdir($tempDir.DIRECTORY_SEPARATOR.'app1');
+		mkdir($tempDir.DIRECTORY_SEPARATOR.'app2');
+		$this->dirsToRemove[] = $tempDir.DIRECTORY_SEPARATOR.'app1';
+		$this->dirsToRemove[] = $tempDir.DIRECTORY_SEPARATOR.'app2';
 		$this->dirsToRemove[] = $tempDir;
 		\OC::$APPSROOTS = [
 			[
@@ -73,7 +73,7 @@ 
 	 * @return void
 	 */
 	public function testAppDirectoryOwnersNotWritable(): void {
-		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
+		$tempDir = tempnam(sys_get_temp_dir(), 'apps').'dir';
 		\OC::$APPSROOTS = [
 			[
 				'path' => $tempDir,