From 76dc41ea180adbd5649bda49fd5fe9b92f051863 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 29 Aug 2025 14:29:50 +0200 Subject: [PATCH] fix(psalm): Fix ParamNameMismatch with IRepairStep::run Signed-off-by: Carl Schwan --- build/psalm-baseline.xml | 33 ------------------ lib/private/Repair/RepairInvalidShares.php | 14 ++++---- lib/private/Repair/RepairMimeTypes.php | 40 +++++++++++----------- 3 files changed, 27 insertions(+), 60 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 8a5693f55a6..4f74562719b 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -885,11 +885,6 @@ - - - - - @@ -897,11 +892,6 @@ - - - - - @@ -2884,9 +2874,6 @@ - - - @@ -4137,31 +4124,11 @@ - - - - - - - - - - userToNotify]]> - - - - - - - - - - diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php index 9553f25ee70..627ecf6659d 100644 --- a/lib/private/Repair/RepairInvalidShares.php +++ b/lib/private/Repair/RepairInvalidShares.php @@ -31,7 +31,7 @@ class RepairInvalidShares implements IRepairStep { /** * Adjust file share permissions */ - private function adjustFileSharePermissions(IOutput $out) { + private function adjustFileSharePermissions(IOutput $output): void { $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE; $builder = $this->connection->getQueryBuilder(); @@ -44,14 +44,14 @@ class RepairInvalidShares implements IRepairStep { $updatedEntries = $builder->executeStatement(); if ($updatedEntries > 0) { - $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares'); + $output->info('Fixed file share permissions for ' . $updatedEntries . ' shares'); } } /** * Remove shares where the parent share does not exist anymore */ - private function removeSharesNonExistingParent(IOutput $out) { + private function removeSharesNonExistingParent(IOutput $output): void { $deletedEntries = 0; $query = $this->connection->getQueryBuilder(); @@ -80,16 +80,16 @@ class RepairInvalidShares implements IRepairStep { } if ($deletedEntries) { - $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist'); + $output->info('Removed ' . $deletedEntries . ' shares where the parent did not exist'); } } - public function run(IOutput $out) { + public function run(IOutput $output) { $ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0'); if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) { - $this->adjustFileSharePermissions($out); + $this->adjustFileSharePermissions($output); } - $this->removeSharesNonExistingParent($out); + $this->removeSharesNonExistingParent($output); } } diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 3c9720b9e91..ecffe4bcda4 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -382,7 +382,7 @@ class RepairMimeTypes implements IRepairStep { * * @throws Exception */ - public function run(IOutput $out): void { + public function run(IOutput $output): void { $serverVersion = $this->config->getSystemValueString('version', '0.0.0'); $mimeTypeVersion = $this->getMimeTypeVersion(); @@ -391,79 +391,79 @@ class RepairMimeTypes implements IRepairStep { // PLEASE ALSO KEEP THE LIST SORTED BY VERSION NUMBER if (version_compare($mimeTypeVersion, '12.0.0.14', '<') && $this->introduceImageTypes()) { - $out->info('Fixed image mime types'); + $output->info('Fixed image mime types'); } if (version_compare($mimeTypeVersion, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) { - $out->info('Fixed windows program mime types'); + $output->info('Fixed windows program mime types'); } if (version_compare($mimeTypeVersion, '13.0.0.0', '<') && $this->introduceLocationTypes()) { - $out->info('Fixed geospatial mime types'); + $output->info('Fixed geospatial mime types'); } if (version_compare($mimeTypeVersion, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) { - $out->info('Fixed internet-shortcut mime types'); + $output->info('Fixed internet-shortcut mime types'); } if (version_compare($mimeTypeVersion, '13.0.0.6', '<') && $this->introduceStreamingTypes()) { - $out->info('Fixed streaming mime types'); + $output->info('Fixed streaming mime types'); } if (version_compare($mimeTypeVersion, '14.0.0.8', '<') && $this->introduceVisioTypes()) { - $out->info('Fixed visio mime types'); + $output->info('Fixed visio mime types'); } if (version_compare($mimeTypeVersion, '14.0.0.10', '<') && $this->introduceComicbookTypes()) { - $out->info('Fixed comicbook mime types'); + $output->info('Fixed comicbook mime types'); } if (version_compare($mimeTypeVersion, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) { - $out->info('Fixed OpenDocument template mime types'); + $output->info('Fixed OpenDocument template mime types'); } if (version_compare($mimeTypeVersion, '21.0.0.7', '<') && $this->introduceOrgModeType()) { - $out->info('Fixed orgmode mime types'); + $output->info('Fixed orgmode mime types'); } if (version_compare($mimeTypeVersion, '23.0.0.2', '<') && $this->introduceFlatOpenDocumentType()) { - $out->info('Fixed Flat OpenDocument mime types'); + $output->info('Fixed Flat OpenDocument mime types'); } if (version_compare($mimeTypeVersion, '25.0.0.2', '<') && $this->introduceOnlyofficeFormType()) { - $out->info('Fixed ONLYOFFICE Forms OpenXML mime types'); + $output->info('Fixed ONLYOFFICE Forms OpenXML mime types'); } if (version_compare($mimeTypeVersion, '26.0.0.1', '<') && $this->introduceAsciidocType()) { - $out->info('Fixed AsciiDoc mime types'); + $output->info('Fixed AsciiDoc mime types'); } if (version_compare($mimeTypeVersion, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) { - $out->info('Fixed Enhanced Metafile Format mime types'); + $output->info('Fixed Enhanced Metafile Format mime types'); } if (version_compare($mimeTypeVersion, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) { - $out->info('Fixed eml and msg mime type'); + $output->info('Fixed eml and msg mime type'); } if (version_compare($mimeTypeVersion, '29.0.0.6', '<') && $this->introduceAacAudioType()) { - $out->info('Fixed aac mime type'); + $output->info('Fixed aac mime type'); } if (version_compare($mimeTypeVersion, '29.0.0.10', '<') && $this->introduceReStructuredTextFormatType()) { - $out->info('Fixed ReStructured Text mime type'); + $output->info('Fixed ReStructured Text mime type'); } if (version_compare($mimeTypeVersion, '30.0.0.0', '<') && $this->introduceExcalidrawType()) { - $out->info('Fixed Excalidraw mime type'); + $output->info('Fixed Excalidraw mime type'); } if (version_compare($mimeTypeVersion, '31.0.0.0', '<') && $this->introduceZstType()) { - $out->info('Fixed zst mime type'); + $output->info('Fixed zst mime type'); } if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceMusicxmlType()) { - $out->info('Fixed musicxml mime type'); + $output->info('Fixed musicxml mime type'); } if (!$this->dryRun) {