Skip to content

Commit 114c0eb

Browse files
come-nccome-nc
committed
Remove unused properties from CheckSetupControllerTest
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 46a4f95 commit 114c0eb

File tree

2 files changed

+1
-54
lines changed

2 files changed

+1
-54
lines changed

‎apps/settings/lib/Controller/CheckSetupController.php‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,20 @@
4747

4848
use DirectoryIterator;
4949
use GuzzleHttp\Exception\ClientException;
50-
use OC;
5150
use OC\AppFramework\Http;
5251
use OC\IntegrityCheck\Checker;
53-
use OCP\App\IAppManager;
5452
use OCP\AppFramework\Controller;
5553
use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI;
5654
use OCP\AppFramework\Http\DataDisplayResponse;
5755
use OCP\AppFramework\Http\DataResponse;
5856
use OCP\AppFramework\Http\RedirectResponse;
59-
use OCP\EventDispatcher\IEventDispatcher;
6057
use OCP\Http\Client\IClientService;
6158
use OCP\IConfig;
6259
use OCP\IDateTimeFormatter;
6360
use OCP\IL10N;
6461
use OCP\IRequest;
65-
use OCP\IServerContainer;
6662
use OCP\ITempManager;
6763
use OCP\IURLGenerator;
68-
use OCP\Lock\ILockingProvider;
6964
use OCP\Notification\IManager;
7065
use OCP\SetupCheck\ISetupCheckManager;
7166
use Psr\Log\LoggerInterface;
@@ -84,20 +79,12 @@ class CheckSetupController extends Controller {
8479
private $checker;
8580
/** @var LoggerInterface */
8681
private $logger;
87-
/** @var IEventDispatcher */
88-
private $dispatcher;
89-
/** @var ILockingProvider */
90-
private $lockingProvider;
9182
/** @var IDateTimeFormatter */
9283
private $dateTimeFormatter;
9384
/** @var ITempManager */
9485
private $tempManager;
9586
/** @var IManager */
9687
private $manager;
97-
/** @var IAppManager */
98-
private $appManager;
99-
/** @var IServerContainer */
100-
private $serverContainer;
10188
private ISetupCheckManager $setupCheckManager;
10289

10390
public function __construct($AppName,
@@ -108,13 +95,9 @@ public function __construct($AppName,
10895
IL10N $l10n,
10996
Checker $checker,
11097
LoggerInterface $logger,
111-
IEventDispatcher $dispatcher,
112-
ILockingProvider $lockingProvider,
11398
IDateTimeFormatter $dateTimeFormatter,
11499
ITempManager $tempManager,
115100
IManager $manager,
116-
IAppManager $appManager,
117-
IServerContainer $serverContainer,
118101
ISetupCheckManager $setupCheckManager,
119102
) {
120103
parent::__construct($AppName, $request);
@@ -124,13 +107,9 @@ public function __construct($AppName,
124107
$this->l10n = $l10n;
125108
$this->checker = $checker;
126109
$this->logger = $logger;
127-
$this->dispatcher = $dispatcher;
128-
$this->lockingProvider = $lockingProvider;
129110
$this->dateTimeFormatter = $dateTimeFormatter;
130111
$this->tempManager = $tempManager;
131112
$this->manager = $manager;
132-
$this->appManager = $appManager;
133-
$this->serverContainer = $serverContainer;
134113
$this->setupCheckManager = $setupCheckManager;
135114
}
136115

@@ -374,7 +353,7 @@ protected function getAppDirsWithDifferentOwner(): array {
374353
$currentUser = posix_getuid();
375354
$appDirsWithDifferentOwner = [[]];
376355

377-
foreach (OC::$APPSROOTS as $appRoot) {
356+
foreach (\OC::$APPSROOTS as $appRoot) {
378357
if ($appRoot['writable'] === true) {
379358
$appDirsWithDifferentOwner[] = $this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot);
380359
}

‎apps/settings/tests/Controller/CheckSetupControllerTest.php‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,17 @@
3737
use OC;
3838
use OC\IntegrityCheck\Checker;
3939
use OCA\Settings\Controller\CheckSetupController;
40-
use OCP\App\IAppManager;
4140
use OCP\AppFramework\Http;
4241
use OCP\AppFramework\Http\DataDisplayResponse;
4342
use OCP\AppFramework\Http\DataResponse;
4443
use OCP\AppFramework\Http\RedirectResponse;
45-
use OCP\EventDispatcher\IEventDispatcher;
4644
use OCP\Http\Client\IClientService;
4745
use OCP\IConfig;
4846
use OCP\IDateTimeFormatter;
4947
use OCP\IL10N;
5048
use OCP\IRequest;
51-
use OCP\IServerContainer;
5249
use OCP\ITempManager;
5350
use OCP\IURLGenerator;
54-
use OCP\Lock\ILockingProvider;
5551
use OCP\Notification\IManager;
5652
use OCP\SetupCheck\ISetupCheckManager;
5753
use PHPUnit\Framework\MockObject\MockObject;
@@ -82,20 +78,12 @@ class CheckSetupControllerTest extends TestCase {
8278
private $logger;
8379
/** @var Checker|\PHPUnit\Framework\MockObject\MockObject */
8480
private $checker;
85-
/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
86-
private $dispatcher;
87-
/** @var ILockingProvider|\PHPUnit\Framework\MockObject\MockObject */
88-
private $lockingProvider;
8981
/** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */
9082
private $dateTimeFormatter;
9183
/** @var ITempManager|\PHPUnit\Framework\MockObject\MockObject */
9284
private $tempManager;
9385
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
9486
private $notificationManager;
95-
/** @var IAppManager|MockObject */
96-
private $appManager;
97-
/** @var IServerContainer|MockObject */
98-
private $serverContainer;
9987
/** @var ISetupCheckManager|MockObject */
10088
private $setupCheckManager;
10189

@@ -124,16 +112,12 @@ protected function setUp(): void {
124112
->willReturnCallback(function ($message, array $replace) {
125113
return vsprintf($message, $replace);
126114
});
127-
$this->dispatcher = $this->createMock(IEventDispatcher::class);
128115
$this->checker = $this->getMockBuilder('\OC\IntegrityCheck\Checker')
129116
->disableOriginalConstructor()->getMock();
130117
$this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
131-
$this->lockingProvider = $this->getMockBuilder(ILockingProvider::class)->getMock();
132118
$this->dateTimeFormatter = $this->getMockBuilder(IDateTimeFormatter::class)->getMock();
133119
$this->tempManager = $this->getMockBuilder(ITempManager::class)->getMock();
134120
$this->notificationManager = $this->getMockBuilder(IManager::class)->getMock();
135-
$this->appManager = $this->createMock(IAppManager::class);
136-
$this->serverContainer = $this->createMock(IServerContainer::class);
137121
$this->setupCheckManager = $this->createMock(ISetupCheckManager::class);
138122
$this->checkSetupController = $this->getMockBuilder(CheckSetupController::class)
139123
->setConstructorArgs([
@@ -145,13 +129,9 @@ protected function setUp(): void {
145129
$this->l10n,
146130
$this->checker,
147131
$this->logger,
148-
$this->dispatcher,
149-
$this->lockingProvider,
150132
$this->dateTimeFormatter,
151133
$this->tempManager,
152134
$this->notificationManager,
153-
$this->appManager,
154-
$this->serverContainer,
155135
$this->setupCheckManager,
156136
])
157137
->setMethods([
@@ -316,13 +296,9 @@ public function testGetCurlVersion() {
316296
$this->l10n,
317297
$this->checker,
318298
$this->logger,
319-
$this->dispatcher,
320-
$this->lockingProvider,
321299
$this->dateTimeFormatter,
322300
$this->tempManager,
323301
$this->notificationManager,
324-
$this->appManager,
325-
$this->serverContainer,
326302
$this->setupCheckManager,
327303
])
328304
->setMethods(null)->getMock();
@@ -1039,13 +1015,9 @@ public function testIsMysqlUsedWithoutUTF8MB4(string $db, bool $useUTF8MB4, bool
10391015
$this->l10n,
10401016
$this->checker,
10411017
$this->logger,
1042-
$this->dispatcher,
1043-
$this->lockingProvider,
10441018
$this->dateTimeFormatter,
10451019
$this->tempManager,
10461020
$this->notificationManager,
1047-
$this->appManager,
1048-
$this->serverContainer,
10491021
$this->setupCheckManager,
10501022
);
10511023

@@ -1089,13 +1061,9 @@ public function testIsEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(string $m
10891061
$this->l10n,
10901062
$this->checker,
10911063
$this->logger,
1092-
$this->dispatcher,
1093-
$this->lockingProvider,
10941064
$this->dateTimeFormatter,
10951065
$this->tempManager,
10961066
$this->notificationManager,
1097-
$this->appManager,
1098-
$this->serverContainer,
10991067
$this->setupCheckManager,
11001068
);
11011069

0 commit comments

Comments
 (0)