Skip to content

Commit 1d50cf3

Browse files
provokateurinprovokateurin
authored
Merge pull request #54742 from nextcloud/carl/ParamNameMismatch
2 parents bdce9c3 + 76dc41e commit 1d50cf3

File tree

8 files changed

+37
-70
lines changed

8 files changed

+37
-70
lines changed

‎apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public function __construct(
2626
parent::__construct($timeFactory);
2727
}
2828

29-
public function run($arguments) {
30-
$offset = (int)$arguments['offset'];
31-
$stopAt = (int)$arguments['stopAt'];
29+
public function run($argument) {
30+
$offset = (int)$argument['offset'];
31+
$stopAt = (int)$argument['stopAt'];
3232

3333
$this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
3434

‎apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public function __construct(
2727
parent::__construct($timeFactory);
2828
}
2929

30-
public function run($arguments) {
31-
$offset = $arguments['offset'];
32-
$stopAt = $arguments['stopAt'];
30+
public function run($argument) {
31+
$offset = $argument['offset'];
32+
$stopAt = $argument['stopAt'];
3333

3434
$this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
3535

‎build/psalm-baseline.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -885,23 +885,13 @@
885885
<code><![CDATA[setAppValue]]></code>
886886
</DeprecatedMethod>
887887
</file>
888-
<file src="apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php">
889-
<ParamNameMismatch>
890-
<code><![CDATA[$arguments]]></code>
891-
</ParamNameMismatch>
892-
</file>
893888
<file src="apps/dav/lib/Migration/BuildSocialSearchIndex.php">
894889
<DeprecatedMethod>
895890
<code><![CDATA[execute]]></code>
896891
<code><![CDATA[getAppValue]]></code>
897892
<code><![CDATA[setAppValue]]></code>
898893
</DeprecatedMethod>
899894
</file>
900-
<file src="apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php">
901-
<ParamNameMismatch>
902-
<code><![CDATA[$arguments]]></code>
903-
</ParamNameMismatch>
904-
</file>
905895
<file src="apps/dav/lib/Migration/ChunkCleanup.php">
906896
<DeprecatedMethod>
907897
<code><![CDATA[getAppValue]]></code>
@@ -2884,9 +2874,6 @@
28842874
<code><![CDATA[deleteAppValue]]></code>
28852875
<code><![CDATA[setAppValue]]></code>
28862876
</DeprecatedMethod>
2887-
<ParamNameMismatch>
2888-
<code><![CDATA[$arguments]]></code>
2889-
</ParamNameMismatch>
28902877
</file>
28912878
<file src="core/Command/App/ListApps.php">
28922879
<LessSpecificImplementedReturnType>
@@ -4137,31 +4124,11 @@
41374124
<code><![CDATA[false]]></code>
41384125
</InvalidArgument>
41394126
</file>
4140-
<file src="lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php">
4141-
<ParamNameMismatch>
4142-
<code><![CDATA[$arguments]]></code>
4143-
</ParamNameMismatch>
4144-
</file>
4145-
<file src="lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php">
4146-
<ParamNameMismatch>
4147-
<code><![CDATA[$arguments]]></code>
4148-
</ParamNameMismatch>
4149-
</file>
41504127
<file src="lib/private/Repair/RemoveLinkShares.php">
41514128
<InvalidPropertyAssignmentValue>
41524129
<code><![CDATA[$this->userToNotify]]></code>
41534130
</InvalidPropertyAssignmentValue>
41544131
</file>
4155-
<file src="lib/private/Repair/RepairInvalidShares.php">
4156-
<ParamNameMismatch>
4157-
<code><![CDATA[$out]]></code>
4158-
</ParamNameMismatch>
4159-
</file>
4160-
<file src="lib/private/Repair/RepairMimeTypes.php">
4161-
<ParamNameMismatch>
4162-
<code><![CDATA[$out]]></code>
4163-
</ParamNameMismatch>
4164-
</file>
41654132
<file src="lib/private/Route/Router.php">
41664133
<InvalidNullableReturnType>
41674134
<code><![CDATA[string]]></code>

‎core/BackgroundJobs/CheckForUserCertificates.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(
3030
/**
3131
* Checks all user directories for old user uploaded certificates
3232
*/
33-
public function run($arguments): void {
33+
public function run($argument): void {
3434
$uploadList = [];
3535
$this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void {
3636
$userId = $user->getUID();

‎lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function __construct(
2929
parent::__construct($timeFactory);
3030
}
3131

32-
public function run($arguments) {
33-
$uid = $arguments['uid'];
32+
public function run($argument): void {
33+
$uid = $argument['uid'];
3434
if (!$this->userManager->userExists($uid)) {
3535
$this->logger->info('User no longer exists, skip user ' . $uid);
3636
return;

‎lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(
3636
}
3737
}
3838

39-
public function run($arguments) {
39+
public function run($argument) {
4040
$this->logger->info('Started migrating avatars to AppData folder');
4141
$this->moveAvatars();
4242
$this->logger->info('All avatars migrated to AppData folder');

‎lib/private/Repair/RepairInvalidShares.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getName() {
3131
/**
3232
* Adjust file share permissions
3333
*/
34-
private function adjustFileSharePermissions(IOutput $out) {
34+
private function adjustFileSharePermissions(IOutput $output): void {
3535
$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
3636
$builder = $this->connection->getQueryBuilder();
3737

@@ -44,14 +44,14 @@ private function adjustFileSharePermissions(IOutput $out) {
4444

4545
$updatedEntries = $builder->executeStatement();
4646
if ($updatedEntries > 0) {
47-
$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
47+
$output->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
4848
}
4949
}
5050

5151
/**
5252
* Remove shares where the parent share does not exist anymore
5353
*/
54-
private function removeSharesNonExistingParent(IOutput $out) {
54+
private function removeSharesNonExistingParent(IOutput $output): void {
5555
$deletedEntries = 0;
5656

5757
$query = $this->connection->getQueryBuilder();
@@ -80,16 +80,16 @@ private function removeSharesNonExistingParent(IOutput $out) {
8080
}
8181

8282
if ($deletedEntries) {
83-
$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
83+
$output->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
8484
}
8585
}
8686

87-
public function run(IOutput $out) {
87+
public function run(IOutput $output) {
8888
$ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
8989
if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
90-
$this->adjustFileSharePermissions($out);
90+
$this->adjustFileSharePermissions($output);
9191
}
9292

93-
$this->removeSharesNonExistingParent($out);
93+
$this->removeSharesNonExistingParent($output);
9494
}
9595
}

‎lib/private/Repair/RepairMimeTypes.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ private function getMimeTypeVersion(): string {
394394
*
395395
* @throws Exception
396396
*/
397-
public function run(IOutput $out): void {
397+
public function run(IOutput $output): void {
398398
$serverVersion = $this->config->getSystemValueString('version', '0.0.0');
399399
$mimeTypeVersion = $this->getMimeTypeVersion();
400400

@@ -403,79 +403,79 @@ public function run(IOutput $out): void {
403403
// PLEASE ALSO KEEP THE LIST SORTED BY VERSION NUMBER
404404

405405
if (version_compare($mimeTypeVersion, '12.0.0.14', '<') && $this->introduceImageTypes()) {
406-
$out->info('Fixed image mime types');
406+
$output->info('Fixed image mime types');
407407
}
408408

409409
if (version_compare($mimeTypeVersion, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
410-
$out->info('Fixed windows program mime types');
410+
$output->info('Fixed windows program mime types');
411411
}
412412

413413
if (version_compare($mimeTypeVersion, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
414-
$out->info('Fixed geospatial mime types');
414+
$output->info('Fixed geospatial mime types');
415415
}
416416

417417
if (version_compare($mimeTypeVersion, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
418-
$out->info('Fixed internet-shortcut mime types');
418+
$output->info('Fixed internet-shortcut mime types');
419419
}
420420

421421
if (version_compare($mimeTypeVersion, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
422-
$out->info('Fixed streaming mime types');
422+
$output->info('Fixed streaming mime types');
423423
}
424424

425425
if (version_compare($mimeTypeVersion, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
426-
$out->info('Fixed visio mime types');
426+
$output->info('Fixed visio mime types');
427427
}
428428

429429
if (version_compare($mimeTypeVersion, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
430-
$out->info('Fixed comicbook mime types');
430+
$output->info('Fixed comicbook mime types');
431431
}
432432

433433
if (version_compare($mimeTypeVersion, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
434-
$out->info('Fixed OpenDocument template mime types');
434+
$output->info('Fixed OpenDocument template mime types');
435435
}
436436

437437
if (version_compare($mimeTypeVersion, '21.0.0.7', '<') && $this->introduceOrgModeType()) {
438-
$out->info('Fixed orgmode mime types');
438+
$output->info('Fixed orgmode mime types');
439439
}
440440

441441
if (version_compare($mimeTypeVersion, '23.0.0.2', '<') && $this->introduceFlatOpenDocumentType()) {
442-
$out->info('Fixed Flat OpenDocument mime types');
442+
$output->info('Fixed Flat OpenDocument mime types');
443443
}
444444

445445
if (version_compare($mimeTypeVersion, '25.0.0.2', '<') && $this->introduceOnlyofficeFormType()) {
446-
$out->info('Fixed ONLYOFFICE Forms OpenXML mime types');
446+
$output->info('Fixed ONLYOFFICE Forms OpenXML mime types');
447447
}
448448

449449
if (version_compare($mimeTypeVersion, '26.0.0.1', '<') && $this->introduceAsciidocType()) {
450-
$out->info('Fixed AsciiDoc mime types');
450+
$output->info('Fixed AsciiDoc mime types');
451451
}
452452

453453
if (version_compare($mimeTypeVersion, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) {
454-
$out->info('Fixed Enhanced Metafile Format mime types');
454+
$output->info('Fixed Enhanced Metafile Format mime types');
455455
}
456456

457457
if (version_compare($mimeTypeVersion, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
458-
$out->info('Fixed eml and msg mime type');
458+
$output->info('Fixed eml and msg mime type');
459459
}
460460

461461
if (version_compare($mimeTypeVersion, '29.0.0.6', '<') && $this->introduceAacAudioType()) {
462-
$out->info('Fixed aac mime type');
462+
$output->info('Fixed aac mime type');
463463
}
464464

465465
if (version_compare($mimeTypeVersion, '29.0.0.10', '<') && $this->introduceReStructuredTextFormatType()) {
466-
$out->info('Fixed ReStructured Text mime type');
466+
$output->info('Fixed ReStructured Text mime type');
467467
}
468468

469469
if (version_compare($mimeTypeVersion, '30.0.0.0', '<') && $this->introduceExcalidrawType()) {
470-
$out->info('Fixed Excalidraw mime type');
470+
$output->info('Fixed Excalidraw mime type');
471471
}
472472

473473
if (version_compare($mimeTypeVersion, '31.0.0.0', '<') && $this->introduceZstType()) {
474-
$out->info('Fixed zst mime type');
474+
$output->info('Fixed zst mime type');
475475
}
476476

477477
if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceMusicxmlType()) {
478-
$out->info('Fixed musicxml mime type');
478+
$output->info('Fixed musicxml mime type');
479479
}
480480

481481
if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceTextType()) {

0 commit comments

Comments
 (0)