nextcloud / server

tests/Core/Service/LoginFlowV2ServiceUnitTest.php

Indentation +342 added lines, -342 removed lines

@@ -32,417 +32,417 @@
  */
 class LoginFlowV2ServiceUnitTest extends TestCase {
 
-	private LoginFlowV2Service $subjectUnderTest;
-
-	private IConfig&MockObject $config;
-	private ICrypto&MockObject $crypto;
-	private LoggerInterface&MockObject $logger;
-	private LoginFlowV2Mapper&MockObject $mapper;
-	private ISecureRandom&MockObject $secureRandom;
-	private ITimeFactory&MockObject $timeFactory;
-	private IProvider&MockObject $tokenProvider;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->setupSubjectUnderTest();
-	}
-
-	/**
-	 * Setup subject under test with mocked constructor arguments.
-	 *
-	 * Code was moved to separate function to keep setUp function small and clear.
-	 */
-	private function setupSubjectUnderTest(): void {
-		$this->config = $this->createMock(IConfig::class);
-		$this->crypto = $this->createMock(ICrypto::class);
-		$this->mapper = $this->createMock(LoginFlowV2Mapper::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->tokenProvider = $this->createMock(IProvider::class);
-		$this->secureRandom = $this->createMock(ISecureRandom::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-
-		$this->subjectUnderTest = new LoginFlowV2Service(
-			$this->mapper,
-			$this->secureRandom,
-			$this->timeFactory,
-			$this->config,
-			$this->crypto,
-			$this->logger,
-			$this->tokenProvider
-		);
-	}
-
-	/**
-	 * Generates for a given password required OpenSSL parts.
-	 *
-	 * @return array Array contains encrypted password, private key and public key.
-	 */
-	private function getOpenSSLEncryptedPublicAndPrivateKey(string $appPassword): array {
-		// Create the private and public key
-		$res = openssl_pkey_new([
-			'digest_alg' => 'md5', // take fast algorithm for testing purposes
-			'private_key_bits' => 512,
-			'private_key_type' => OPENSSL_KEYTYPE_RSA,
-		]);
-
-		// Extract the private key from $res
-		openssl_pkey_export($res, $privateKey);
-
-		// Extract the public key from $res
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
-
-		// Encrypt the data to $encrypted using the public key
-		openssl_public_encrypt($appPassword, $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
-
-		return [$encrypted, $privateKey, $publicKey];
-	}
-
-	/*
+    private LoginFlowV2Service $subjectUnderTest;
+
+    private IConfig&MockObject $config;
+    private ICrypto&MockObject $crypto;
+    private LoggerInterface&MockObject $logger;
+    private LoginFlowV2Mapper&MockObject $mapper;
+    private ISecureRandom&MockObject $secureRandom;
+    private ITimeFactory&MockObject $timeFactory;
+    private IProvider&MockObject $tokenProvider;
+
+    public function setUp(): void {
+        parent::setUp();
+
+        $this->setupSubjectUnderTest();
+    }
+
+    /**
+     * Setup subject under test with mocked constructor arguments.
+     *
+     * Code was moved to separate function to keep setUp function small and clear.
+     */
+    private function setupSubjectUnderTest(): void {
+        $this->config = $this->createMock(IConfig::class);
+        $this->crypto = $this->createMock(ICrypto::class);
+        $this->mapper = $this->createMock(LoginFlowV2Mapper::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->tokenProvider = $this->createMock(IProvider::class);
+        $this->secureRandom = $this->createMock(ISecureRandom::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+
+        $this->subjectUnderTest = new LoginFlowV2Service(
+            $this->mapper,
+            $this->secureRandom,
+            $this->timeFactory,
+            $this->config,
+            $this->crypto,
+            $this->logger,
+            $this->tokenProvider
+        );
+    }
+
+    /**
+     * Generates for a given password required OpenSSL parts.
+     *
+     * @return array Array contains encrypted password, private key and public key.
+     */
+    private function getOpenSSLEncryptedPublicAndPrivateKey(string $appPassword): array {
+        // Create the private and public key
+        $res = openssl_pkey_new([
+            'digest_alg' => 'md5', // take fast algorithm for testing purposes
+            'private_key_bits' => 512,
+            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+        ]);
+
+        // Extract the private key from $res
+        openssl_pkey_export($res, $privateKey);
+
+        // Extract the public key from $res
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
+
+        // Encrypt the data to $encrypted using the public key
+        openssl_public_encrypt($appPassword, $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
+
+        return [$encrypted, $privateKey, $publicKey];
+    }
+
+    /*
 	 * Tests for poll
 	 */
-	public function testPollPrivateKeyCouldNotBeDecrypted(): void {
-		$this->expectException(LoginFlowV2NotFoundException::class);
-		$this->expectExceptionMessage('Apptoken could not be decrypted');
+    public function testPollPrivateKeyCouldNotBeDecrypted(): void {
+        $this->expectException(LoginFlowV2NotFoundException::class);
+        $this->expectExceptionMessage('Apptoken could not be decrypted');
 
-		$this->crypto->expects($this->once())
-			->method('decrypt')
-			->willThrowException(new \Exception('HMAC mismatch'));
+        $this->crypto->expects($this->once())
+            ->method('decrypt')
+            ->willThrowException(new \Exception('HMAC mismatch'));
 
-		/*
+        /*
 		 * Cannot be mocked, because functions like getLoginName are magic functions.
 		 * To be able to set internal properties, we have to use the real class here.
 		 */
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setLoginName('test');
-		$loginFlowV2->setServer('test');
-		$loginFlowV2->setAppPassword('test');
-		$loginFlowV2->setPrivateKey('test');
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setLoginName('test');
+        $loginFlowV2->setServer('test');
+        $loginFlowV2->setAppPassword('test');
+        $loginFlowV2->setPrivateKey('test');
 
-		$this->mapper->expects($this->once())
-			->method('getByPollToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByPollToken')
+            ->willReturn($loginFlowV2);
 
-		$this->subjectUnderTest->poll('');
-	}
+        $this->subjectUnderTest->poll('');
+    }
 
-	public function testPollApptokenCouldNotBeDecrypted(): void {
-		$this->expectException(LoginFlowV2NotFoundException::class);
-		$this->expectExceptionMessage('Apptoken could not be decrypted');
+    public function testPollApptokenCouldNotBeDecrypted(): void {
+        $this->expectException(LoginFlowV2NotFoundException::class);
+        $this->expectExceptionMessage('Apptoken could not be decrypted');
 
-		/*
+        /*
 		 * Cannot be mocked, because functions like getLoginName are magic functions.
 		 * To be able to set internal properties, we have to use the real class here.
 		 */
-		[$encrypted, $privateKey,] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test');
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setLoginName('test');
-		$loginFlowV2->setServer('test');
-		$loginFlowV2->setAppPassword('broken#' . $encrypted);
-		$loginFlowV2->setPrivateKey('encrypted(test)');
+        [$encrypted, $privateKey,] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test');
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setLoginName('test');
+        $loginFlowV2->setServer('test');
+        $loginFlowV2->setAppPassword('broken#' . $encrypted);
+        $loginFlowV2->setPrivateKey('encrypted(test)');
 
-		$this->crypto->expects($this->once())
-			->method('decrypt')
-			->willReturn($privateKey);
+        $this->crypto->expects($this->once())
+            ->method('decrypt')
+            ->willReturn($privateKey);
 
-		$this->mapper->expects($this->once())
-			->method('getByPollToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByPollToken')
+            ->willReturn($loginFlowV2);
 
-		$this->subjectUnderTest->poll('test');
-	}
+        $this->subjectUnderTest->poll('test');
+    }
 
-	public function testPollInvalidToken(): void {
-		$this->expectException(LoginFlowV2NotFoundException::class);
-		$this->expectExceptionMessage('Invalid token');
+    public function testPollInvalidToken(): void {
+        $this->expectException(LoginFlowV2NotFoundException::class);
+        $this->expectExceptionMessage('Invalid token');
 
-		$this->mapper->expects($this->once())
-			->method('getByPollToken')
-			->willThrowException(new DoesNotExistException(''));
+        $this->mapper->expects($this->once())
+            ->method('getByPollToken')
+            ->willThrowException(new DoesNotExistException(''));
 
-		$this->subjectUnderTest->poll('');
-	}
+        $this->subjectUnderTest->poll('');
+    }
 
-	public function testPollTokenNotYetReady(): void {
-		$this->expectException(LoginFlowV2NotFoundException::class);
-		$this->expectExceptionMessage('Token not yet ready');
+    public function testPollTokenNotYetReady(): void {
+        $this->expectException(LoginFlowV2NotFoundException::class);
+        $this->expectExceptionMessage('Token not yet ready');
 
-		$this->subjectUnderTest->poll('');
-	}
+        $this->subjectUnderTest->poll('');
+    }
 
-	public function testPollRemoveDataFromDb(): void {
-		[$encrypted, $privateKey] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test_pass');
+    public function testPollRemoveDataFromDb(): void {
+        [$encrypted, $privateKey] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test_pass');
 
-		$this->crypto->expects($this->once())
-			->method('decrypt')
-			->willReturn($privateKey);
+        $this->crypto->expects($this->once())
+            ->method('decrypt')
+            ->willReturn($privateKey);
 
-		/*
+        /*
 		 * Cannot be mocked, because functions like getLoginName are magic functions.
 		 * To be able to set internal properties, we have to use the real class here.
 		 */
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setLoginName('test_login');
-		$loginFlowV2->setServer('test_server');
-		$loginFlowV2->setAppPassword(base64_encode($encrypted));
-		$loginFlowV2->setPrivateKey($privateKey);
-
-		$this->mapper->expects($this->once())
-			->method('delete')
-			->with($this->equalTo($loginFlowV2));
-
-		$this->mapper->expects($this->once())
-			->method('getByPollToken')
-			->willReturn($loginFlowV2);
-
-		$credentials = $this->subjectUnderTest->poll('');
-
-		$this->assertTrue($credentials instanceof LoginFlowV2Credentials);
-		$this->assertEquals(
-			[
-				'server' => 'test_server',
-				'loginName' => 'test_login',
-				'appPassword' => 'test_pass',
-			],
-			$credentials->jsonSerialize()
-		);
-	}
-
-	/*
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setLoginName('test_login');
+        $loginFlowV2->setServer('test_server');
+        $loginFlowV2->setAppPassword(base64_encode($encrypted));
+        $loginFlowV2->setPrivateKey($privateKey);
+
+        $this->mapper->expects($this->once())
+            ->method('delete')
+            ->with($this->equalTo($loginFlowV2));
+
+        $this->mapper->expects($this->once())
+            ->method('getByPollToken')
+            ->willReturn($loginFlowV2);
+
+        $credentials = $this->subjectUnderTest->poll('');
+
+        $this->assertTrue($credentials instanceof LoginFlowV2Credentials);
+        $this->assertEquals(
+            [
+                'server' => 'test_server',
+                'loginName' => 'test_login',
+                'appPassword' => 'test_pass',
+            ],
+            $credentials->jsonSerialize()
+        );
+    }
+
+    /*
 	 * Tests for getByLoginToken
 	 */
 
-	public function testGetByLoginToken(): void {
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setLoginName('test_login');
-		$loginFlowV2->setServer('test_server');
-		$loginFlowV2->setAppPassword('test');
+    public function testGetByLoginToken(): void {
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setLoginName('test_login');
+        $loginFlowV2->setServer('test_server');
+        $loginFlowV2->setAppPassword('test');
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willReturn($loginFlowV2);
 
-		$result = $this->subjectUnderTest->getByLoginToken('test_token');
+        $result = $this->subjectUnderTest->getByLoginToken('test_token');
 
-		$this->assertTrue($result instanceof LoginFlowV2);
-		$this->assertEquals('test_server', $result->getServer());
-		$this->assertEquals('test_login', $result->getLoginName());
-		$this->assertEquals('test', $result->getAppPassword());
-	}
+        $this->assertTrue($result instanceof LoginFlowV2);
+        $this->assertEquals('test_server', $result->getServer());
+        $this->assertEquals('test_login', $result->getLoginName());
+        $this->assertEquals('test', $result->getAppPassword());
+    }
 
-	public function testGetByLoginTokenLoginTokenInvalid(): void {
-		$this->expectException(LoginFlowV2NotFoundException::class);
-		$this->expectExceptionMessage('Login token invalid');
+    public function testGetByLoginTokenLoginTokenInvalid(): void {
+        $this->expectException(LoginFlowV2NotFoundException::class);
+        $this->expectExceptionMessage('Login token invalid');
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willThrowException(new DoesNotExistException(''));
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willThrowException(new DoesNotExistException(''));
 
-		$this->subjectUnderTest->getByLoginToken('test_token');
-	}
+        $this->subjectUnderTest->getByLoginToken('test_token');
+    }
 
-	public function testGetByLoginTokenClientForbidden() {
-		$this->expectException(LoginFlowV2ClientForbiddenException::class);
-		$this->expectExceptionMessage('Client not allowed');
+    public function testGetByLoginTokenClientForbidden() {
+        $this->expectException(LoginFlowV2ClientForbiddenException::class);
+        $this->expectExceptionMessage('Client not allowed');
 
-		$allowedClients = [
-			'/Custom Allowed Client/i'
-		];
+        $allowedClients = [
+            '/Custom Allowed Client/i'
+        ];
 
-		$this->config->expects($this->exactly(1))
-			->method('getSystemValue')
-			->willReturnCallback(function ($key) use ($allowedClients) {
-				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
-				return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
-			});
+        $this->config->expects($this->exactly(1))
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key) use ($allowedClients) {
+                // Note: \OCP\IConfig::getSystemValue returns either an array or string.
+                return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
+            });
 
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setClientName('Rogue Curl Client/1.0');
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setClientName('Rogue Curl Client/1.0');
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willReturn($loginFlowV2);
 
-		$this->subjectUnderTest->getByLoginToken('test_token');
-	}
+        $this->subjectUnderTest->getByLoginToken('test_token');
+    }
 
-	public function testGetByLoginTokenClientAllowed() {
-		$allowedClients = [
-			'/Foo Allowed Client/i',
-			'/Custom Allowed Client/i'
-		];
+    public function testGetByLoginTokenClientAllowed() {
+        $allowedClients = [
+            '/Foo Allowed Client/i',
+            '/Custom Allowed Client/i'
+        ];
 
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setClientName('Custom Allowed Client Curl Client/1.0');
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setClientName('Custom Allowed Client Curl Client/1.0');
 
-		$this->config->expects($this->exactly(1))
-			->method('getSystemValue')
-			->willReturnCallback(function ($key) use ($allowedClients) {
-				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
-				return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
-			});
+        $this->config->expects($this->exactly(1))
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key) use ($allowedClients) {
+                // Note: \OCP\IConfig::getSystemValue returns either an array or string.
+                return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
+            });
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willReturn($loginFlowV2);
 
-		$result = $this->subjectUnderTest->getByLoginToken('test_token');
+        $result = $this->subjectUnderTest->getByLoginToken('test_token');
 
-		$this->assertTrue($result instanceof LoginFlowV2);
-		$this->assertEquals('Custom Allowed Client Curl Client/1.0', $result->getClientName());
-	}
+        $this->assertTrue($result instanceof LoginFlowV2);
+        $this->assertEquals('Custom Allowed Client Curl Client/1.0', $result->getClientName());
+    }
 
-	/*
+    /*
 	 * Tests for startLoginFlow
 	 */
 
-	public function testStartLoginFlow(): void {
-		$loginFlowV2 = new LoginFlowV2();
+    public function testStartLoginFlow(): void {
+        $loginFlowV2 = new LoginFlowV2();
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willReturn($loginFlowV2);
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willReturn($loginFlowV2);
 
-		$this->mapper->expects($this->once())
-			->method('update');
+        $this->mapper->expects($this->once())
+            ->method('update');
 
-		$this->assertTrue($this->subjectUnderTest->startLoginFlow('test_token'));
-	}
+        $this->assertTrue($this->subjectUnderTest->startLoginFlow('test_token'));
+    }
 
-	public function testStartLoginFlowDoesNotExistException(): void {
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willThrowException(new DoesNotExistException(''));
+    public function testStartLoginFlowDoesNotExistException(): void {
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willThrowException(new DoesNotExistException(''));
 
-		$this->assertFalse($this->subjectUnderTest->startLoginFlow('test_token'));
-	}
+        $this->assertFalse($this->subjectUnderTest->startLoginFlow('test_token'));
+    }
 
-	/**
-	 * If an exception not of type DoesNotExistException is thrown,
-	 * it is expected that it is not being handled by startLoginFlow.
-	 */
-	public function testStartLoginFlowException(): void {
-		$this->expectException(Exception::class);
+    /**
+     * If an exception not of type DoesNotExistException is thrown,
+     * it is expected that it is not being handled by startLoginFlow.
+     */
+    public function testStartLoginFlowException(): void {
+        $this->expectException(Exception::class);
 
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willThrowException(new Exception(''));
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willThrowException(new Exception(''));
 
-		$this->subjectUnderTest->startLoginFlow('test_token');
-	}
+        $this->subjectUnderTest->startLoginFlow('test_token');
+    }
 
-	/*
+    /*
 	 * Tests for flowDone
 	 */
 
-	public function testFlowDone(): void {
-		[,, $publicKey] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test_pass');
-
-		$loginFlowV2 = new LoginFlowV2();
-		$loginFlowV2->setPublicKey($publicKey);
-		$loginFlowV2->setClientName('client_name');
-
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willReturn($loginFlowV2);
-
-		$this->mapper->expects($this->once())
-			->method('update');
-
-		$this->secureRandom->expects($this->once())
-			->method('generate')
-			->with(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS)
-			->willReturn('test_pass');
-
-		// session token
-		$sessionToken = $this->getMockBuilder(IToken::class)->disableOriginalConstructor()->getMock();
-		$sessionToken->expects($this->once())
-			->method('getLoginName')
-			->willReturn('login_name');
-
-		$this->tokenProvider->expects($this->once())
-			->method('getPassword')
-			->willReturn('test_pass');
-
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->willReturn($sessionToken);
-
-		$this->tokenProvider->expects($this->once())
-			->method('generateToken')
-			->with(
-				'test_pass',
-				'user_id',
-				'login_name',
-				'test_pass',
-				'client_name',
-				IToken::PERMANENT_TOKEN,
-				IToken::DO_NOT_REMEMBER
-			);
-
-		$result = $this->subjectUnderTest->flowDone(
-			'login_token',
-			'session_id',
-			'server',
-			'user_id'
-		);
-		$this->assertTrue($result);
-
-		// app password is encrypted and must look like:
-		// ZACZOOzxTpKz4+KXL5kZ/gCK0xvkaVi/8yzupAn6Ui6+5qCSKvfPKGgeDRKs0sivvSLzk/XSp811SZCZmH0Y3g==
-		$this->assertMatchesRegularExpression('/[a-zA-Z\/0-9+=]+/', $loginFlowV2->getAppPassword());
-
-		$this->assertEquals('server', $loginFlowV2->getServer());
-	}
-
-	public function testFlowDoneDoesNotExistException(): void {
-		$this->mapper->expects($this->once())
-			->method('getByLoginToken')
-			->willThrowException(new DoesNotExistException(''));
-
-		$result = $this->subjectUnderTest->flowDone(
-			'login_token',
-			'session_id',
-			'server',
-			'user_id'
-		);
-		$this->assertFalse($result);
-	}
-
-	public function testFlowDonePasswordlessTokenException(): void {
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->willThrowException(new InvalidTokenException(''));
-
-		$result = $this->subjectUnderTest->flowDone(
-			'login_token',
-			'session_id',
-			'server',
-			'user_id'
-		);
-		$this->assertFalse($result);
-	}
-
-	/*
+    public function testFlowDone(): void {
+        [,, $publicKey] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test_pass');
+
+        $loginFlowV2 = new LoginFlowV2();
+        $loginFlowV2->setPublicKey($publicKey);
+        $loginFlowV2->setClientName('client_name');
+
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willReturn($loginFlowV2);
+
+        $this->mapper->expects($this->once())
+            ->method('update');
+
+        $this->secureRandom->expects($this->once())
+            ->method('generate')
+            ->with(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS)
+            ->willReturn('test_pass');
+
+        // session token
+        $sessionToken = $this->getMockBuilder(IToken::class)->disableOriginalConstructor()->getMock();
+        $sessionToken->expects($this->once())
+            ->method('getLoginName')
+            ->willReturn('login_name');
+
+        $this->tokenProvider->expects($this->once())
+            ->method('getPassword')
+            ->willReturn('test_pass');
+
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->willReturn($sessionToken);
+
+        $this->tokenProvider->expects($this->once())
+            ->method('generateToken')
+            ->with(
+                'test_pass',
+                'user_id',
+                'login_name',
+                'test_pass',
+                'client_name',
+                IToken::PERMANENT_TOKEN,
+                IToken::DO_NOT_REMEMBER
+            );
+
+        $result = $this->subjectUnderTest->flowDone(
+            'login_token',
+            'session_id',
+            'server',
+            'user_id'
+        );
+        $this->assertTrue($result);
+
+        // app password is encrypted and must look like:
+        // ZACZOOzxTpKz4+KXL5kZ/gCK0xvkaVi/8yzupAn6Ui6+5qCSKvfPKGgeDRKs0sivvSLzk/XSp811SZCZmH0Y3g==
+        $this->assertMatchesRegularExpression('/[a-zA-Z\/0-9+=]+/', $loginFlowV2->getAppPassword());
+
+        $this->assertEquals('server', $loginFlowV2->getServer());
+    }
+
+    public function testFlowDoneDoesNotExistException(): void {
+        $this->mapper->expects($this->once())
+            ->method('getByLoginToken')
+            ->willThrowException(new DoesNotExistException(''));
+
+        $result = $this->subjectUnderTest->flowDone(
+            'login_token',
+            'session_id',
+            'server',
+            'user_id'
+        );
+        $this->assertFalse($result);
+    }
+
+    public function testFlowDonePasswordlessTokenException(): void {
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->willThrowException(new InvalidTokenException(''));
+
+        $result = $this->subjectUnderTest->flowDone(
+            'login_token',
+            'session_id',
+            'server',
+            'user_id'
+        );
+        $this->assertFalse($result);
+    }
+
+    /*
 	 * Tests for createTokens
 	 */
 
-	public function testCreateTokens(): void {
-		$this->config->expects($this->exactly(2))
-			->method('getSystemValue')
-			->willReturnCallback(function ($key) {
-				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
-				return $key == 'openssl' ? [] : '';
-			});
+    public function testCreateTokens(): void {
+        $this->config->expects($this->exactly(2))
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key) {
+                // Note: \OCP\IConfig::getSystemValue returns either an array or string.
+                return $key == 'openssl' ? [] : '';
+            });
 
-		$this->mapper->expects($this->once())
-			->method('insert');
+        $this->mapper->expects($this->once())
+            ->method('insert');
 
-		$this->secureRandom->expects($this->exactly(2))
-			->method('generate');
+        $this->secureRandom->expects($this->exactly(2))
+            ->method('generate');
 
-		$token = $this->subjectUnderTest->createTokens('user_agent');
-		$this->assertTrue($token instanceof LoginFlowV2Tokens);
-	}
+        $token = $this->subjectUnderTest->createTokens('user_agent');
+        $this->assertTrue($token instanceof LoginFlowV2Tokens);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -135,11 +135,11 @@ 
 		 * Cannot be mocked, because functions like getLoginName are magic functions.
 		 * To be able to set internal properties, we have to use the real class here.
 		 */
-		[$encrypted, $privateKey,] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test');
+		[$encrypted, $privateKey, ] = $this->getOpenSSLEncryptedPublicAndPrivateKey('test');
 		$loginFlowV2 = new LoginFlowV2();
 		$loginFlowV2->setLoginName('test');
 		$loginFlowV2->setServer('test');
-		$loginFlowV2->setAppPassword('broken#' . $encrypted);
+		$loginFlowV2->setAppPassword('broken#'.$encrypted);
 		$loginFlowV2->setPrivateKey('encrypted(test)');
 
 		$this->crypto->expects($this->once())
@@ -252,7 +252,7 @@ 
 
 		$this->config->expects($this->exactly(1))
 			->method('getSystemValue')
-			->willReturnCallback(function ($key) use ($allowedClients) {
+			->willReturnCallback(function($key) use ($allowedClients) {
 				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
 				return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
 			});
@@ -278,7 +278,7 @@ 
 
 		$this->config->expects($this->exactly(1))
 			->method('getSystemValue')
-			->willReturnCallback(function ($key) use ($allowedClients) {
+			->willReturnCallback(function($key) use ($allowedClients) {
 				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
 				return $key == 'core.login_flow_v2.allowed_user_agents' ? $allowedClients : '';
 			});
@@ -352,7 +352,7 @@ 
 
 		$this->secureRandom->expects($this->once())
 			->method('generate')
-			->with(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS)
+			->with(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS)
 			->willReturn('test_pass');
 
 		// session token
@@ -431,7 +431,7 @@ 
 	public function testCreateTokens(): void {
 		$this->config->expects($this->exactly(2))
 			->method('getSystemValue')
-			->willReturnCallback(function ($key) {
+			->willReturnCallback(function($key) {
 				// Note: \OCP\IConfig::getSystemValue returns either an array or string.
 				return $key == 'openssl' ? [] : '';
 			});

tests/lib/Memcache/CasTraitTest.php

Indentation +45 added lines, -45 removed lines

@@ -13,55 +13,55 @@
 
 #[\PHPUnit\Framework\Attributes\Group('Memcache')]
 class CasTraitTest extends TestCase {
-	/**
-	 * @return \OC\Memcache\CasTrait
-	 */
-	private function getCache() {
-		$sourceCache = new ArrayCache();
-		$mock = $this->getMockBuilder(CasTraitTestClass::class)->onlyMethods([
-			'set',
-			'get',
-			'add',
-			'remove',
-		])->getMock();
+    /**
+     * @return \OC\Memcache\CasTrait
+     */
+    private function getCache() {
+        $sourceCache = new ArrayCache();
+        $mock = $this->getMockBuilder(CasTraitTestClass::class)->onlyMethods([
+            'set',
+            'get',
+            'add',
+            'remove',
+        ])->getMock();
 
-		$mock->expects($this->any())
-			->method('set')
-			->willReturnCallback(function ($key, $value, $ttl) use ($sourceCache) {
-				return $sourceCache->set($key, $value, $ttl);
-			});
+        $mock->expects($this->any())
+            ->method('set')
+            ->willReturnCallback(function ($key, $value, $ttl) use ($sourceCache) {
+                return $sourceCache->set($key, $value, $ttl);
+            });
 
-		$mock->expects($this->any())
-			->method('get')
-			->willReturnCallback(function ($key) use ($sourceCache) {
-				return $sourceCache->get($key);
-			});
+        $mock->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function ($key) use ($sourceCache) {
+                return $sourceCache->get($key);
+            });
 
-		$mock->expects($this->any())
-			->method('add')
-			->willReturnCallback(function ($key, $value, $ttl) use ($sourceCache) {
-				return $sourceCache->add($key, $value, $ttl);
-			});
+        $mock->expects($this->any())
+            ->method('add')
+            ->willReturnCallback(function ($key, $value, $ttl) use ($sourceCache) {
+                return $sourceCache->add($key, $value, $ttl);
+            });
 
-		$mock->expects($this->any())
-			->method('remove')
-			->willReturnCallback(function ($key) use ($sourceCache) {
-				return $sourceCache->remove($key);
-			});
-		return $mock;
-	}
+        $mock->expects($this->any())
+            ->method('remove')
+            ->willReturnCallback(function ($key) use ($sourceCache) {
+                return $sourceCache->remove($key);
+            });
+        return $mock;
+    }
 
-	public function testCasNotChanged(): void {
-		$cache = $this->getCache();
-		$cache->set('foo', 'bar');
-		$this->assertTrue($cache->cas('foo', 'bar', 'asd'));
-		$this->assertEquals('asd', $cache->get('foo'));
-	}
+    public function testCasNotChanged(): void {
+        $cache = $this->getCache();
+        $cache->set('foo', 'bar');
+        $this->assertTrue($cache->cas('foo', 'bar', 'asd'));
+        $this->assertEquals('asd', $cache->get('foo'));
+    }
 
-	public function testCasChanged(): void {
-		$cache = $this->getCache();
-		$cache->set('foo', 'bar1');
-		$this->assertFalse($cache->cas('foo', 'bar', 'asd'));
-		$this->assertEquals('bar1', $cache->get('foo'));
-	}
+    public function testCasChanged(): void {
+        $cache = $this->getCache();
+        $cache->set('foo', 'bar1');
+        $this->assertFalse($cache->cas('foo', 'bar', 'asd'));
+        $this->assertEquals('bar1', $cache->get('foo'));
+    }
 }

tests/lib/Memcache/CasTraitTestClass.php

Indentation +10 added lines, -10 removed lines

@@ -10,15 +10,15 @@
 use OC\Memcache\CASTrait;
 
 class CasTraitTestClass {
-	use CASTrait;
+    use CASTrait;
 
-	// abstract methods from Memcache
-	public function set($key, $value, $ttl = 0) {
-	}
-	public function get($key) {
-	}
-	public function add($key, $value, $ttl = 0) {
-	}
-	public function remove($key) {
-	}
+    // abstract methods from Memcache
+    public function set($key, $value, $ttl = 0) {
+    }
+    public function get($key) {
+    }
+    public function add($key, $value, $ttl = 0) {
+    }
+    public function remove($key) {
+    }
 }

tests/lib/MemoryInfoTest.php

Indentation +59 added lines, -59 removed lines

@@ -16,71 +16,71 @@
  * This class provides tests for the MemoryInfo class.
  */
 class MemoryInfoTest extends TestCase {
-	/**
-	 * The "memory_limit" value before tests.
-	 */
-	private string $iniSettingBeforeTest;
+    /**
+     * The "memory_limit" value before tests.
+     */
+    private string $iniSettingBeforeTest;
 
-	#[\PHPUnit\Framework\Attributes\BeforeClass()]
-	public function backupMemoryInfoIniSetting() {
-		$this->iniSettingBeforeTest = ini_get('memory_limit');
-	}
+    #[\PHPUnit\Framework\Attributes\BeforeClass()]
+    public function backupMemoryInfoIniSetting() {
+        $this->iniSettingBeforeTest = ini_get('memory_limit');
+    }
 
-	#[\PHPUnit\Framework\Attributes\AfterClass()]
-	public function restoreMemoryInfoIniSetting() {
-		ini_set('memory_limit', $this->iniSettingBeforeTest);
-	}
+    #[\PHPUnit\Framework\Attributes\AfterClass()]
+    public function restoreMemoryInfoIniSetting() {
+        ini_set('memory_limit', $this->iniSettingBeforeTest);
+    }
 
-	public static function getMemoryLimitTestData(): array {
-		return [
-			'unlimited' => ['-1', -1,],
-			'524288000 bytes' => ['524288000', 524288000,],
-			'500M' => ['500M', 524288000,],
-			'512000K' => ['512000K', 524288000,],
-			'2G' => ['2G', 2147483648,],
-		];
-	}
+    public static function getMemoryLimitTestData(): array {
+        return [
+            'unlimited' => ['-1', -1,],
+            '524288000 bytes' => ['524288000', 524288000,],
+            '500M' => ['500M', 524288000,],
+            '512000K' => ['512000K', 524288000,],
+            '2G' => ['2G', 2147483648,],
+        ];
+    }
 
-	/**
-	 * Tests that getMemoryLimit works as expected.
-	 *
-	 * @param string $iniValue The "memory_limit" ini data.
-	 * @param int|float $expected The expected detected memory limit.
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('getMemoryLimitTestData')]
-	public function testMemoryLimit(string $iniValue, int|float $expected): void {
-		ini_set('memory_limit', $iniValue);
-		$memoryInfo = new MemoryInfo();
-		self::assertEquals($expected, $memoryInfo->getMemoryLimit());
-	}
+    /**
+     * Tests that getMemoryLimit works as expected.
+     *
+     * @param string $iniValue The "memory_limit" ini data.
+     * @param int|float $expected The expected detected memory limit.
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('getMemoryLimitTestData')]
+    public function testMemoryLimit(string $iniValue, int|float $expected): void {
+        ini_set('memory_limit', $iniValue);
+        $memoryInfo = new MemoryInfo();
+        self::assertEquals($expected, $memoryInfo->getMemoryLimit());
+    }
 
-	public static function getSufficientMemoryTestData(): array {
-		return [
-			'unlimited' => [-1, true,],
-			'512M' => [512 * 1024 * 1024, true,],
-			'1G' => [1024 * 1024 * 1024, true,],
-			'256M' => [256 * 1024 * 1024, false,],
-		];
-	}
+    public static function getSufficientMemoryTestData(): array {
+        return [
+            'unlimited' => [-1, true,],
+            '512M' => [512 * 1024 * 1024, true,],
+            '1G' => [1024 * 1024 * 1024, true,],
+            '256M' => [256 * 1024 * 1024, false,],
+        ];
+    }
 
-	/**
-	 * Tests that isMemoryLimitSufficient returns the correct values.
-	 *
-	 * @param int $memoryLimit The memory limit
-	 * @param bool $expected If the memory limit is sufficient.
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('getSufficientMemoryTestData')]
-	public function testIsMemoryLimitSufficient(int $memoryLimit, bool $expected): void {
-		/* @var MemoryInfo|MockObject $memoryInfo */
-		$memoryInfo = $this->getMockBuilder(MemoryInfo::class)
-			->onlyMethods(['getMemoryLimit',])
-			->getMock();
+    /**
+     * Tests that isMemoryLimitSufficient returns the correct values.
+     *
+     * @param int $memoryLimit The memory limit
+     * @param bool $expected If the memory limit is sufficient.
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('getSufficientMemoryTestData')]
+    public function testIsMemoryLimitSufficient(int $memoryLimit, bool $expected): void {
+        /* @var MemoryInfo|MockObject $memoryInfo */
+        $memoryInfo = $this->getMockBuilder(MemoryInfo::class)
+            ->onlyMethods(['getMemoryLimit',])
+            ->getMock();
 
-		$memoryInfo
-			->method('getMemoryLimit')
-			->willReturn($memoryLimit);
+        $memoryInfo
+            ->method('getMemoryLimit')
+            ->willReturn($memoryLimit);
 
-		$isMemoryLimitSufficient = $memoryInfo->isMemoryLimitSufficient();
-		self::assertEquals($expected, $isMemoryLimitSufficient);
-	}
+        $isMemoryLimitSufficient = $memoryInfo->isMemoryLimitSufficient();
+        self::assertEquals($expected, $isMemoryLimitSufficient);
+    }
 }

tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php

Indentation +203 added lines, -203 removed lines

@@ -20,207 +20,207 @@
 
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class PartitionedQueryBuilderTest extends TestCase {
-	private IDBConnection $connection;
-	private ShardConnectionManager $shardConnectionManager;
-	private AutoIncrementHandler $autoIncrementHandler;
-
-	protected function setUp(): void {
-		if (PHP_INT_SIZE < 8) {
-			$this->markTestSkipped('Test requires 64bit');
-			return;
-		}
-		$this->connection = Server::get(IDBConnection::class);
-		$this->shardConnectionManager = Server::get(ShardConnectionManager::class);
-		$this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
-
-		$this->setupFileCache();
-	}
-
-	protected function tearDown(): void {
-		// PHP unit also runs tearDown when the test is skipped, but we only initialized when using 64bit
-		// see https://github.com/sebastianbergmann/phpunit/issues/6394
-		if (PHP_INT_SIZE >= 8) {
-			$this->cleanupDb();
-		}
-		parent::tearDown();
-	}
-
-
-	private function getQueryBuilder(): PartitionedQueryBuilder {
-		$builder = $this->connection->getQueryBuilder();
-		if ($builder instanceof PartitionedQueryBuilder) {
-			return $builder;
-		} else {
-			return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
-		}
-	}
-
-	private function setupFileCache(): void {
-		$this->cleanupDb();
-		$query = $this->getQueryBuilder();
-		$query->insert('storages')
-			->values([
-				'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'id' => $query->createNamedParameter('test1'),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('file1'),
-				'path_hash' => $query->createNamedParameter(md5('file1')),
-			]);
-		$query->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache_extended')
-			->hintShardKey('storage', 1001001)
-			->values([
-				'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('mounts')
-			->values([
-				'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'user_id' => $query->createNamedParameter('partitioned_test'),
-				'mount_point' => $query->createNamedParameter('/mount/point'),
-				'mount_provider_class' => $query->createNamedParameter('test'),
-				'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-	}
-
-	private function cleanupDb(): void {
-		$query = $this->getQueryBuilder();
-		$query->delete('storages')
-			->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache_extended')
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('mounts')
-			->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
-		$query->executeStatement();
-	}
-
-	public function testSimpleOnlyPartitionQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('path')
-			->from('filecache')
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testSimplePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiTablePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
-
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['upload_time'], 1234);
-	}
-
-	public function testPartitionedQueryFromSplit(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		$query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_id', 'path', 'm.mount_provider_class')
-			->from('filecache', 'f')
-			->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
-		$query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiJoinPartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->selectAlias('s.id', 'storage_string_id')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(3, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['storage_string_id'], 'test1');
-	}
+    private IDBConnection $connection;
+    private ShardConnectionManager $shardConnectionManager;
+    private AutoIncrementHandler $autoIncrementHandler;
+
+    protected function setUp(): void {
+        if (PHP_INT_SIZE < 8) {
+            $this->markTestSkipped('Test requires 64bit');
+            return;
+        }
+        $this->connection = Server::get(IDBConnection::class);
+        $this->shardConnectionManager = Server::get(ShardConnectionManager::class);
+        $this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
+
+        $this->setupFileCache();
+    }
+
+    protected function tearDown(): void {
+        // PHP unit also runs tearDown when the test is skipped, but we only initialized when using 64bit
+        // see https://github.com/sebastianbergmann/phpunit/issues/6394
+        if (PHP_INT_SIZE >= 8) {
+            $this->cleanupDb();
+        }
+        parent::tearDown();
+    }
+
+
+    private function getQueryBuilder(): PartitionedQueryBuilder {
+        $builder = $this->connection->getQueryBuilder();
+        if ($builder instanceof PartitionedQueryBuilder) {
+            return $builder;
+        } else {
+            return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
+        }
+    }
+
+    private function setupFileCache(): void {
+        $this->cleanupDb();
+        $query = $this->getQueryBuilder();
+        $query->insert('storages')
+            ->values([
+                'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'id' => $query->createNamedParameter('test1'),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('file1'),
+                'path_hash' => $query->createNamedParameter(md5('file1')),
+            ]);
+        $query->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache_extended')
+            ->hintShardKey('storage', 1001001)
+            ->values([
+                'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('mounts')
+            ->values([
+                'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'user_id' => $query->createNamedParameter('partitioned_test'),
+                'mount_point' => $query->createNamedParameter('/mount/point'),
+                'mount_provider_class' => $query->createNamedParameter('test'),
+                'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+    }
+
+    private function cleanupDb(): void {
+        $query = $this->getQueryBuilder();
+        $query->delete('storages')
+            ->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache_extended')
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('mounts')
+            ->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
+        $query->executeStatement();
+    }
+
+    public function testSimpleOnlyPartitionQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('path')
+            ->from('filecache')
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testSimplePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiTablePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
+
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['upload_time'], 1234);
+    }
+
+    public function testPartitionedQueryFromSplit(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        $query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_id', 'path', 'm.mount_provider_class')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
+        $query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiJoinPartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->selectAlias('s.id', 'storage_string_id')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(3, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['storage_string_id'], 'test1');
+    }
 }

tests/lib/Preview/PreviewServiceTest.php

Indentation +40 added lines, -40 removed lines

@@ -20,44 +20,44 @@
 #[CoversClass(PreviewService::class)]
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class PreviewServiceTest extends TestCase {
-	private PreviewService $previewService;
-	private PreviewMapper $previewMapper;
-	private IGenerator $snowflakeGenerator;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->previewService = Server::get(PreviewService::class);
-		$this->previewMapper = Server::get(PreviewMapper::class);
-		$this->snowflakeGenerator = Server::get(IGenerator::class);
-		$this->previewService->deleteAll();
-	}
-
-	public function tearDown(): void {
-		$this->previewService->deleteAll();
-		parent::tearDown();
-	}
-
-	public function testGetAvailableFileIds(): void {
-		foreach (range(1, 20) as $i) {
-			$preview = new Preview();
-			$preview->setId($this->snowflakeGenerator->nextId());
-			$preview->setFileId($i % 10);
-			$preview->setStorageId(1);
-			$preview->setWidth($i);
-			$preview->setHeight($i);
-			$preview->setMax(true);
-			$preview->setSourceMimeType('image/jpeg');
-			$preview->setCropped(true);
-			$preview->setEncrypted(false);
-			$preview->setMimetype('image/jpeg');
-			$preview->setEtag('abc');
-			$preview->setMtime((new \DateTime())->getTimestamp());
-			$preview->setSize(0);
-			$this->previewMapper->insert($preview);
-		}
-
-		$files = iterator_to_array($this->previewService->getAvailableFileIds());
-		$this->assertCount(1, $files);
-		$this->assertCount(10, $files[0]['fileIds']);
-	}
+    private PreviewService $previewService;
+    private PreviewMapper $previewMapper;
+    private IGenerator $snowflakeGenerator;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->previewService = Server::get(PreviewService::class);
+        $this->previewMapper = Server::get(PreviewMapper::class);
+        $this->snowflakeGenerator = Server::get(IGenerator::class);
+        $this->previewService->deleteAll();
+    }
+
+    public function tearDown(): void {
+        $this->previewService->deleteAll();
+        parent::tearDown();
+    }
+
+    public function testGetAvailableFileIds(): void {
+        foreach (range(1, 20) as $i) {
+            $preview = new Preview();
+            $preview->setId($this->snowflakeGenerator->nextId());
+            $preview->setFileId($i % 10);
+            $preview->setStorageId(1);
+            $preview->setWidth($i);
+            $preview->setHeight($i);
+            $preview->setMax(true);
+            $preview->setSourceMimeType('image/jpeg');
+            $preview->setCropped(true);
+            $preview->setEncrypted(false);
+            $preview->setMimetype('image/jpeg');
+            $preview->setEtag('abc');
+            $preview->setMtime((new \DateTime())->getTimestamp());
+            $preview->setSize(0);
+            $this->previewMapper->insert($preview);
+        }
+
+        $files = iterator_to_array($this->previewService->getAvailableFileIds());
+        $this->assertCount(1, $files);
+        $this->assertCount(10, $files[0]['fileIds']);
+    }
 }

tests/lib/Preview/PreviewMapperTest.php

Indentation +78 added lines, -78 removed lines

@@ -19,82 +19,82 @@
 
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class PreviewMapperTest extends TestCase {
-	private PreviewMapper $previewMapper;
-	private IDBConnection $connection;
-	private IGenerator $snowflake;
-
-	public function setUp(): void {
-		parent::setUp();
-		$this->previewMapper = Server::get(PreviewMapper::class);
-		$this->connection = Server::get(IDBConnection::class);
-		$this->snowflake = Server::get(IGenerator::class);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preview_locations')->executeStatement();
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preview_versions')->executeStatement();
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('previews')->executeStatement();
-	}
-
-	public function tearDown(): void {
-		$this->previewMapper->deleteAll();
-		parent::tearDown();
-	}
-
-	public function testGetAvailablePreviews(): void {
-		// Empty
-		$this->assertEquals([], $this->previewMapper->getAvailablePreviews([]));
-
-		// No preview available
-		$this->assertEquals([42 => []], $this->previewMapper->getAvailablePreviews([42]));
-
-		$this->createPreviewForFileId(42);
-		$previews = $this->previewMapper->getAvailablePreviews([42]);
-		$this->assertNotEmpty($previews[42]);
-		$this->assertNull($previews[42][0]->getLocationId());
-		$this->assertNull($previews[42][0]->getBucketName());
-		$this->assertNull($previews[42][0]->getObjectStoreName());
-
-		$this->createPreviewForFileId(43, 2);
-		$previews = $this->previewMapper->getAvailablePreviews([43]);
-		$this->assertNotEmpty($previews[43]);
-		$this->assertEquals('preview-2', $previews[43][0]->getBucketName());
-		$this->assertEquals('default', $previews[43][0]->getObjectStoreName());
-	}
-
-	private function createPreviewForFileId(int $fileId, ?int $bucket = null): void {
-		$locationId = null;
-		if ($bucket) {
-			$qb = $this->connection->getQueryBuilder();
-			$locationId = $this->snowflake->nextId();
-			$qb->insert('preview_locations')
-				->values([
-					'id' => $locationId,
-					'bucket_name' => $qb->createNamedParameter('preview-' . $bucket),
-					'object_store_name' => $qb->createNamedParameter('default'),
-				]);
-			$qb->executeStatement();
-		}
-		$preview = new Preview();
-		$preview->setId($this->snowflake->nextId());
-		$preview->setFileId($fileId);
-		$preview->setStorageId(1);
-		$preview->setCropped(true);
-		$preview->setMax(true);
-		$preview->setWidth(100);
-		$preview->setSourceMimeType('image/jpeg');
-		$preview->setHeight(100);
-		$preview->setSize(100);
-		$preview->setMtime(time());
-		$preview->setMimetype('image/jpeg');
-		$preview->setEtag('abcdefg');
-
-		if ($locationId !== null) {
-			$preview->setLocationId($locationId);
-		}
-		$this->previewMapper->insert($preview);
-	}
+    private PreviewMapper $previewMapper;
+    private IDBConnection $connection;
+    private IGenerator $snowflake;
+
+    public function setUp(): void {
+        parent::setUp();
+        $this->previewMapper = Server::get(PreviewMapper::class);
+        $this->connection = Server::get(IDBConnection::class);
+        $this->snowflake = Server::get(IGenerator::class);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preview_locations')->executeStatement();
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preview_versions')->executeStatement();
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('previews')->executeStatement();
+    }
+
+    public function tearDown(): void {
+        $this->previewMapper->deleteAll();
+        parent::tearDown();
+    }
+
+    public function testGetAvailablePreviews(): void {
+        // Empty
+        $this->assertEquals([], $this->previewMapper->getAvailablePreviews([]));
+
+        // No preview available
+        $this->assertEquals([42 => []], $this->previewMapper->getAvailablePreviews([42]));
+
+        $this->createPreviewForFileId(42);
+        $previews = $this->previewMapper->getAvailablePreviews([42]);
+        $this->assertNotEmpty($previews[42]);
+        $this->assertNull($previews[42][0]->getLocationId());
+        $this->assertNull($previews[42][0]->getBucketName());
+        $this->assertNull($previews[42][0]->getObjectStoreName());
+
+        $this->createPreviewForFileId(43, 2);
+        $previews = $this->previewMapper->getAvailablePreviews([43]);
+        $this->assertNotEmpty($previews[43]);
+        $this->assertEquals('preview-2', $previews[43][0]->getBucketName());
+        $this->assertEquals('default', $previews[43][0]->getObjectStoreName());
+    }
+
+    private function createPreviewForFileId(int $fileId, ?int $bucket = null): void {
+        $locationId = null;
+        if ($bucket) {
+            $qb = $this->connection->getQueryBuilder();
+            $locationId = $this->snowflake->nextId();
+            $qb->insert('preview_locations')
+                ->values([
+                    'id' => $locationId,
+                    'bucket_name' => $qb->createNamedParameter('preview-' . $bucket),
+                    'object_store_name' => $qb->createNamedParameter('default'),
+                ]);
+            $qb->executeStatement();
+        }
+        $preview = new Preview();
+        $preview->setId($this->snowflake->nextId());
+        $preview->setFileId($fileId);
+        $preview->setStorageId(1);
+        $preview->setCropped(true);
+        $preview->setMax(true);
+        $preview->setWidth(100);
+        $preview->setSourceMimeType('image/jpeg');
+        $preview->setHeight(100);
+        $preview->setSize(100);
+        $preview->setMtime(time());
+        $preview->setMimetype('image/jpeg');
+        $preview->setEtag('abcdefg');
+
+        if ($locationId !== null) {
+            $preview->setLocationId($locationId);
+        }
+        $this->previewMapper->insert($preview);
+    }
 }

tests/lib/Traits/ClientServiceTrait.php

Indentation +82 added lines, -82 removed lines

@@ -13,94 +13,94 @@
 use PHPUnit\Framework\MockObject\Rule\AnyInvokedCount;
 
 trait ClientServiceTrait {
-	/** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
-	private $clientService;
-	/** @var IClient|\PHPUnit\Framework\MockObject\MockObject */
-	private $client;
-	private $expectedGetRequests = [];
-	private $expectedPostRequests = [];
+    /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
+    private $clientService;
+    /** @var IClient|\PHPUnit\Framework\MockObject\MockObject */
+    private $client;
+    private $expectedGetRequests = [];
+    private $expectedPostRequests = [];
 
-	/**
-	 * Wrapper to be forward compatible to phpunit 5.4+
-	 *
-	 * @param string $originalClassName
-	 * @return \PHPUnit\Framework\MockObject\MockObject
-	 */
-	abstract protected function createMock(string $originalClassName);
+    /**
+     * Wrapper to be forward compatible to phpunit 5.4+
+     *
+     * @param string $originalClassName
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
+    abstract protected function createMock(string $originalClassName);
 
-	/**
-	 * Returns a matcher that matches when the method is executed
-	 * zero or more times.
-	 *
-	 * @since Method available since Release 3.0.0
-	 * @since 33.0.0 - non static and hard typed return type due to phpunit upgrade to v11
-	 */
-	abstract public function any(): AnyInvokedCount;
+    /**
+     * Returns a matcher that matches when the method is executed
+     * zero or more times.
+     *
+     * @since Method available since Release 3.0.0
+     * @since 33.0.0 - non static and hard typed return type due to phpunit upgrade to v11
+     */
+    abstract public function any(): AnyInvokedCount;
 
-	protected function setUpClientServiceTrait() {
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->client = $this->createMock(IClient::class);
-		$this->clientService->expects($this->any())
-			->method('newClient')
-			->willReturn($this->client);
-		$this->client->expects($this->any())
-			->method('get')
-			->willReturnCallback(function ($url) {
-				if (!isset($this->expectedGetRequests[$url])) {
-					throw new \Exception('unexpected request: ' . $url);
-				}
-				$result = $this->expectedGetRequests[$url];
+    protected function setUpClientServiceTrait() {
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->client = $this->createMock(IClient::class);
+        $this->clientService->expects($this->any())
+            ->method('newClient')
+            ->willReturn($this->client);
+        $this->client->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function ($url) {
+                if (!isset($this->expectedGetRequests[$url])) {
+                    throw new \Exception('unexpected request: ' . $url);
+                }
+                $result = $this->expectedGetRequests[$url];
 
-				if ($result instanceof \Exception) {
-					throw $result;
-				} else {
-					$response = $this->createMock(IResponse::class);
-					$response->expects($this->any())
-						->method('getBody')
-						->willReturn($result);
-					return $response;
-				}
-			});
-		$this->client->expects($this->any())
-			->method('post')
-			->willReturnCallback(function ($url) {
-				if (!isset($this->expectedPostRequests[$url])) {
-					throw new \Exception('unexpected request: ' . $url);
-				}
-				$result = $this->expectedPostRequests[$url];
+                if ($result instanceof \Exception) {
+                    throw $result;
+                } else {
+                    $response = $this->createMock(IResponse::class);
+                    $response->expects($this->any())
+                        ->method('getBody')
+                        ->willReturn($result);
+                    return $response;
+                }
+            });
+        $this->client->expects($this->any())
+            ->method('post')
+            ->willReturnCallback(function ($url) {
+                if (!isset($this->expectedPostRequests[$url])) {
+                    throw new \Exception('unexpected request: ' . $url);
+                }
+                $result = $this->expectedPostRequests[$url];
 
-				if ($result instanceof \Exception) {
-					throw $result;
-				} else {
-					$response = $this->createMock(IResponse::class);
-					$response->expects($this->any())
-						->method('getBody')
-						->willReturn($result);
-					return $response;
-				}
-			});
-	}
+                if ($result instanceof \Exception) {
+                    throw $result;
+                } else {
+                    $response = $this->createMock(IResponse::class);
+                    $response->expects($this->any())
+                        ->method('getBody')
+                        ->willReturn($result);
+                    return $response;
+                }
+            });
+    }
 
-	/**
-	 * @param string $url
-	 * @param string|\Exception $result
-	 */
-	protected function expectGetRequest($url, $result) {
-		$this->expectedGetRequests[$url] = $result;
-	}
+    /**
+     * @param string $url
+     * @param string|\Exception $result
+     */
+    protected function expectGetRequest($url, $result) {
+        $this->expectedGetRequests[$url] = $result;
+    }
 
-	/**
-	 * @param string $url
-	 * @param string|\Exception $result
-	 */
-	protected function expectPostRequest($url, $result) {
-		$this->expectedPostRequests[$url] = $result;
-	}
+    /**
+     * @param string $url
+     * @param string|\Exception $result
+     */
+    protected function expectPostRequest($url, $result) {
+        $this->expectedPostRequests[$url] = $result;
+    }
 
-	/**
-	 * @return IClientService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	protected function getClientService() {
-		return $this->clientService;
-	}
+    /**
+     * @return IClientService|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected function getClientService() {
+        return $this->clientService;
+    }
 }

tests/lib/Avatar/GuestAvatarTest.php

Indentation +37 added lines, -37 removed lines

@@ -22,44 +22,44 @@
  * @package Test\Avatar
  */
 class GuestAvatarTest extends TestCase {
-	/**
-	 * @var GuestAvatar
-	 */
-	private $guestAvatar;
+    /**
+     * @var GuestAvatar
+     */
+    private $guestAvatar;
 
-	/**
-	 * Setups a guest avatar instance for tests.
-	 */
-	#[\PHPUnit\Framework\Attributes\Before()]
-	public function setupGuestAvatar(): void {
-		/* @var MockObject|LoggerInterface $logger */
-		$logger = $this->createMock(LoggerInterface::class);
-		$config = $this->createMock(IConfig::class);
-		$this->guestAvatar = new GuestAvatar('einstein', $config, $logger);
-	}
+    /**
+     * Setups a guest avatar instance for tests.
+     */
+    #[\PHPUnit\Framework\Attributes\Before()]
+    public function setupGuestAvatar(): void {
+        /* @var MockObject|LoggerInterface $logger */
+        $logger = $this->createMock(LoggerInterface::class);
+        $config = $this->createMock(IConfig::class);
+        $this->guestAvatar = new GuestAvatar('einstein', $config, $logger);
+    }
 
-	/**
-	 * Asserts that testGet() returns the expected avatar.
-	 *
-	 * For the test a static name "einstein" is used and
-	 * the generated image is compared with an expected one.
-	 */
-	public function testGet(): void {
-		$this->markTestSkipped('TODO: Disable because fails on drone');
-		$avatar = $this->guestAvatar->getFile(32);
-		self::assertInstanceOf(InMemoryFile::class, $avatar);
-		$expectedFile = file_get_contents(
-			__DIR__ . '/../../data/guest_avatar_einstein_32.png'
-		);
-		self::assertEquals(trim($expectedFile), trim($avatar->getContent()));
-	}
+    /**
+     * Asserts that testGet() returns the expected avatar.
+     *
+     * For the test a static name "einstein" is used and
+     * the generated image is compared with an expected one.
+     */
+    public function testGet(): void {
+        $this->markTestSkipped('TODO: Disable because fails on drone');
+        $avatar = $this->guestAvatar->getFile(32);
+        self::assertInstanceOf(InMemoryFile::class, $avatar);
+        $expectedFile = file_get_contents(
+            __DIR__ . '/../../data/guest_avatar_einstein_32.png'
+        );
+        self::assertEquals(trim($expectedFile), trim($avatar->getContent()));
+    }
 
-	/**
-	 * Asserts that "testIsCustomAvatar" returns false for guests.
-	 *
-	 * @return void
-	 */
-	public function testIsCustomAvatar(): void {
-		self::assertFalse($this->guestAvatar->isCustomAvatar());
-	}
+    /**
+     * Asserts that "testIsCustomAvatar" returns false for guests.
+     *
+     * @return void
+     */
+    public function testIsCustomAvatar(): void {
+        self::assertFalse($this->guestAvatar->isCustomAvatar());
+    }
 }