Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable27] Handle errors in encryption:migrate-key-storage-format #44556

Closed
wants to merge 1 commit into from

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 28, 2024

Backport of #44555

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested a review from come-nc March 28, 2024 16:34
@backportbot backportbot bot added this to the Nextcloud 27.1.9 milestone Mar 28, 2024
…e to other files

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the backport/44555/stable27 branch from 8152294 to 15c83d2 Compare March 28, 2024 16:44
}

private function traverseKeys(string $folder, ?string $uid) {
private function traverseKeys(string $folder, ?string $uid, OutputInterface $output) {

Check notice

Code scanning / Psalm

MissingReturnType Note

Method OC\Core\Command\Encryption\MigrateKeyStorage::traverseKeys does not have a return type, expecting void
@@ -133,12 +138,12 @@
}
}

private function traverseFileKeys(string $folder) {
private function traverseFileKeys(string $folder, OutputInterface $output) {

Check notice

Code scanning / Psalm

MissingReturnType Note

Method OC\Core\Command\Encryption\MigrateKeyStorage::traverseFileKeys does not have a return type, expecting void
@@ -220,16 +230,16 @@
* @param string $user
* @throws \Exception
*/
protected function updateUserKeys(string $root, string $user) {
protected function updateUserKeys(string $root, string $user, OutputInterface $output) {

Check notice

Code scanning / Psalm

MissingReturnType Note

Method OC\Core\Command\Encryption\MigrateKeyStorage::updateUserKeys does not have a return type, expecting void
@solracsf solracsf added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 2, 2024
@blizzz blizzz removed this from the Nextcloud 27.1.11 milestone Jun 25, 2024
@come-nc come-nc closed this Dec 4, 2024
@skjnldsv skjnldsv deleted the backport/44555/stable27 branch December 19, 2024 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants