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

Fix: Update ConvertType.php to read correct DB params #46908

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions core/Command/Db/ConvertType.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,6 @@
}

protected function execute(InputInterface $input, OutputInterface $output): int {
// WARNING:
// Leave in place until #45257 is addressed to prevent data loss (hopefully in time for the next maintenance release)
//
throw new \InvalidArgumentException(
'This command is temporarily disabled (until the next maintenance release).'
);

$this->validateInput($input, $output);
$this->readPassword($input, $output);

Expand Down Expand Up @@ -226,7 +219,7 @@

protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
$type = $input->getArgument('type');
$connectionParams = $this->connectionFactory->createConnectionParams();
$connectionParams = $this->connectionFactory->createDefaultConnectionParams($type);

Check failure on line 222 in core/Command/Db/ConvertType.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedMethod

core/Command/Db/ConvertType.php:222:49: UndefinedMethod: Method OC\DB\ConnectionFactory::createDefaultConnectionParams does not exist (see https://psalm.dev/022)
Fixed Show fixed Hide fixed
$connectionParams = array_merge($connectionParams, [
'host' => $input->getArgument('hostname'),
'user' => $input->getArgument('username'),
Expand Down
Loading