Merge pull request #7825 from nextcloud/add-type-hinting-for-ICrypto-decrypt

Adds type hinting for scalar types in ICrypto->decrypt

lib/private/Security/Crypto.php

@@ -108,7 +108,7 @@ class Crypto implements ICrypto {
 	 * @return string plaintext
 	 * @throws \Exception If the HMAC does not match
 	 */
-	public function decrypt($authenticatedCiphertext, $password = '') {
+	public function decrypt(string $authenticatedCiphertext, string $password = ''): string {
 		if($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}

lib/public/Security/ICrypto.php

@@ -61,5 +61,5 @@ interface ICrypto {
 	 * @throws \Exception If the HMAC does not match
 	 * @since 8.0.0
 	 */
-	public function decrypt($authenticatedCiphertext, $password = '');
+	public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
 }

tests/Core/Controller/LostControllerTest.php

@@ -653,14 +653,14 @@ class LostControllerTest extends \Test\TestCase {
 	public function testIsSetPasswordWithoutTokenFailing() {
 		$this->config->method('getUserValue')
 			->with('ValidTokenUser', 'core', 'lostpassword', null)
-			->will($this->returnValue(null));
+			->willReturn('aValidtoken');
 		$this->userManager->method('get')
 			->with('ValidTokenUser')
 			->willReturn($this->existingUser);
 
 		$this->crypto->method('decrypt')
 			->with(
-				$this->equalTo(''),
+				$this->equalTo('aValidtoken'),
 				$this->equalTo('test@example.comSECRET')
 			)->willThrowException(new \Exception());