upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-21 18:11:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

chore: Improve typing in core/Command/Encryption/MigrateKeyStorage.php

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2024-03-28 17:26:38 +01:00 committed by Côme Chilliet
parent 416c8ead40
commit 6dfa09f36d
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/Command/Encryption/MigrateKeyStorage.php
View file

@ -30,7 +30,7 @@ class MigrateKeyStorage extends Command {
parent::__construct();
}
protected function configure() {
protected function configure(): void {
parent::configure();
$this
->setName('encryption:migrate-key-storage-format')
@ -50,9 +50,6 @@ class MigrateKeyStorage extends Command {
/**
* Move keys to new key storage root
*
* @param string $root
* @param OutputInterface $output
* @return bool
* @throws \Exception
*/
protected function updateKeys(string $root, OutputInterface $output): bool {
@ -75,7 +72,7 @@ class MigrateKeyStorage extends Command {
$this->traverseKeys($root . '/files_encryption', null);
}
private function traverseKeys(string $folder, ?string $uid) {
private function traverseKeys(string $folder, ?string $uid): void {
$listing = $this->rootView->getDirectoryContent($folder);
foreach ($listing as $node) {
@ -109,14 +106,14 @@ class MigrateKeyStorage extends Command {
}
}
private function traverseFileKeys(string $folder) {
private function traverseFileKeys(string $folder): void {
$listing = $this->rootView->getDirectoryContent($folder);
foreach ($listing as $node) {
if ($node['mimetype'] === 'httpd/unix-directory') {
$this->traverseFileKeys($folder . '/' . $node['name']);
} else {
$endsWith = function ($haystack, $needle) {
$endsWith = function (string $haystack, string $needle): bool {
$length = strlen($needle);
if ($length === 0) {
return true;
@ -154,10 +151,8 @@ class MigrateKeyStorage extends Command {
/**
* setup file system for the given user
*
* @param string $uid
*/
protected function setupUserFS($uid) {
protected function setupUserFS(string $uid): void {
\OC_Util::tearDownFS();
\OC_Util::setupFS($uid);
}
@ -165,11 +160,8 @@ class MigrateKeyStorage extends Command {
/**
* iterate over each user and move the keys to the new storage
*
* @param string $root
* @param OutputInterface $output
*/
protected function updateUsersKeys(string $root, OutputInterface $output) {
protected function updateUsersKeys(string $root, OutputInterface $output): void {
$progress = new ProgressBar($output);
$progress->start();
@ -192,11 +184,9 @@ class MigrateKeyStorage extends Command {
/**
* move user encryption folder to new root folder
*
* @param string $root
* @param string $user
* @throws \Exception
*/
protected function updateUserKeys(string $root, string $user) {
protected function updateUserKeys(string $root, string $user): void {
if ($this->userManager->userExists($user)) {
$source = $root . '/' . $user . '/files_encryption/OC_DEFAULT_MODULE';
if ($this->rootView->is_dir($source)) {