Skip to content

Commit d0758fe

Browse files
susnuxsusnux
committed
test(encryption): adjust test code for PHPUnit 10 deprecations
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 9422b6d commit d0758fe

15 files changed

+266
-369
lines changed

‎apps/encryption/tests/Command/FixEncryptedVersionTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2019 ownCloud GmbH
@@ -16,6 +18,7 @@
1618
use OCP\ITempManager;
1719
use OCP\IUserManager;
1820
use OCP\Server;
21+
use PHPUnit\Framework\MockObject\MockObject;
1922
use Psr\Log\LoggerInterface;
2023
use Symfony\Component\Console\Tester\CommandTester;
2124
use Test\TestCase;
@@ -34,16 +37,13 @@ class FixEncryptedVersionTest extends TestCase {
3437
use EncryptionTrait;
3538
use UserTrait;
3639

37-
private $userId;
40+
private string $userId;
3841

39-
/** @var FixEncryptedVersion */
40-
private $fixEncryptedVersion;
42+
private FixEncryptedVersion $fixEncryptedVersion;
4143

42-
/** @var CommandTester */
43-
private $commandTester;
44+
private CommandTester $commandTester;
4445

45-
/** @var Util|\PHPUnit\Framework\MockObject\MockObject */
46-
protected $util;
46+
protected Util&MockObject $util;
4747

4848
public function setUp(): void {
4949
parent::setUp();

‎apps/encryption/tests/Command/TestEnableMasterKey.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.

‎apps/encryption/tests/Controller/RecoveryControllerTest.php‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -13,26 +15,23 @@
1315
use OCP\IConfig;
1416
use OCP\IL10N;
1517
use OCP\IRequest;
18+
use PHPUnit\Framework\MockObject\MockObject;
1619
use Test\TestCase;
1720

1821
class RecoveryControllerTest extends TestCase {
19-
/** @var RecoveryController */
20-
private $controller;
21-
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
22-
private $requestMock;
23-
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
24-
private $configMock;
25-
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
26-
private $l10nMock;
27-
/** @var Recovery|\PHPUnit\Framework\MockObject\MockObject */
28-
private $recoveryMock;
29-
30-
public function adminRecoveryProvider() {
22+
protected RecoveryController $controller;
23+
24+
protected IRequest&MockObject $requestMock;
25+
protected IConfig&MockObject $configMock;
26+
protected IL10N&MockObject $l10nMock;
27+
protected Recovery&MockObject $recoveryMock;
28+
29+
public static function adminRecoveryProvider(): array {
3130
return [
3231
['test', 'test', '1', 'Recovery key successfully enabled', Http::STATUS_OK],
3332
['', 'test', '1', 'Missing recovery key password', Http::STATUS_BAD_REQUEST],
3433
['test', '', '1', 'Please repeat the recovery key password', Http::STATUS_BAD_REQUEST],
35-
['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
34+
['test', 'something that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
3635
['test', 'test', '0', 'Recovery key successfully disabled', Http::STATUS_OK],
3736
];
3837
}
@@ -63,7 +62,7 @@ public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecove
6362
$this->assertEquals($expectedStatus, $response->getStatus());
6463
}
6564

66-
public function changeRecoveryPasswordProvider() {
65+
public static function changeRecoveryPasswordProvider(): array {
6766
return [
6867
['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', Http::STATUS_BAD_REQUEST],
6968
['test', 'test', 'oldtest', 'Password successfully changed.', Http::STATUS_OK],
@@ -98,7 +97,7 @@ public function testChangeRecoveryPassword($password, $confirmPassword, $oldPass
9897
$this->assertEquals($expectedStatus, $response->getStatus());
9998
}
10099

101-
public function userSetRecoveryProvider() {
100+
public static function userSetRecoveryProvider(): array {
102101
return [
103102
['1', 'Recovery Key enabled', Http::STATUS_OK],
104103
['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]

‎apps/encryption/tests/Controller/SettingsControllerTest.php‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -24,37 +26,18 @@
2426

2527
class SettingsControllerTest extends TestCase {
2628

27-
/** @var SettingsController */
28-
private $controller;
29-
30-
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
31-
private $requestMock;
32-
33-
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
34-
private $l10nMock;
35-
36-
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
37-
private $userManagerMock;
38-
39-
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
40-
private $userSessionMock;
41-
42-
/** @var KeyManager|\PHPUnit\Framework\MockObject\MockObject */
43-
private $keyManagerMock;
29+
protected SettingsController $controller;
4430

45-
/** @var Crypt|\PHPUnit\Framework\MockObject\MockObject */
46-
private $cryptMock;
47-
48-
/** @var Session|\PHPUnit\Framework\MockObject\MockObject */
49-
private $sessionMock;
50-
/** @var MockObject|IUser */
51-
private $user;
52-
53-
/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
54-
private $ocSessionMock;
55-
56-
/** @var Util|\PHPUnit\Framework\MockObject\MockObject */
57-
private $utilMock;
31+
protected IRequest&MockObject $requestMock;
32+
protected IL10N&MockObject $l10nMock;
33+
protected IUserManager&MockObject $userManagerMock;
34+
protected IUserSession&MockObject $userSessionMock;
35+
protected KeyManager&MockObject $keyManagerMock;
36+
protected Crypt&MockObject $cryptMock;
37+
protected Session&MockObject $sessionMock;
38+
protected IUser&MockObject $user;
39+
protected ISession&MockObject $ocSessionMock;
40+
protected Util&MockObject $utilMock;
5841

5942
protected function setUp(): void {
6043
parent::setUp();
@@ -171,21 +154,17 @@ public function testUpdatePrivateKeyPassword(): void {
171154
$newPassword = 'new';
172155

173156
$this->ocSessionMock->expects($this->once())
174-
->method('get')->with('loginname')->willReturn('testUser');
157+
->method('get')
158+
->with('loginname')
159+
->willReturn('testUser');
175160

176161
$this->userManagerMock
177162
->expects($this->exactly(2))
178163
->method('checkPassword')
179-
->withConsecutive(
180-
['testUserUid', 'new'],
181-
['testUser', 'new'],
182-
)
183-
->willReturnOnConsecutiveCalls(
184-
false,
185-
true,
186-
);
187-
188-
164+
->willReturnMap([
165+
['testUserUid', 'new', false],
166+
['testUser', 'new', true],
167+
]);
189168

190169
$this->cryptMock
191170
->expects($this->once())

‎apps/encryption/tests/Controller/StatusControllerTest.php‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,24 +14,17 @@
1214
use OCP\Encryption\IManager;
1315
use OCP\IL10N;
1416
use OCP\IRequest;
17+
use PHPUnit\Framework\MockObject\MockObject;
1518
use Test\TestCase;
1619

1720
class StatusControllerTest extends TestCase {
1821

19-
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
20-
private $requestMock;
21-
22-
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
23-
private $l10nMock;
24-
25-
/** @var Session|\PHPUnit\Framework\MockObject\MockObject */
26-
protected $sessionMock;
27-
28-
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
29-
protected $encryptionManagerMock;
22+
protected IRequest&MockObject $requestMock;
23+
protected IL10N&MockObject $l10nMock;
24+
protected Session&MockObject $sessionMock;
25+
protected IManager&MockObject $encryptionManagerMock;
3026

31-
/** @var StatusController */
32-
protected $controller;
27+
protected StatusController $controller;
3328

3429
protected function setUp(): void {
3530
parent::setUp();
@@ -68,7 +63,7 @@ public function testGetStatus($status, $expectedStatus): void {
6863
$this->assertSame($expectedStatus, $data['status']);
6964
}
7065

71-
public function dataTestGetStatus() {
66+
public static function dataTestGetStatus(): array {
7267
return [
7368
[Session::INIT_EXECUTED, 'interactionNeeded'],
7469
[Session::INIT_SUCCESSFUL, 'success'],

0 commit comments

Comments
 (0)