Merge pull request #39242 from joshtrichards/db-convert-type-mysql-socket-no-pw

1 files changed, 19 insertions, 1 deletions

diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index 592285a8309..031d5a83d12 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -142,10 +142,13 @@ class ConvertType extends Command implements CompletionAwareInterface {
 		if ($input->isInteractive()) {
 			/** @var QuestionHelper $helper */
 			$helper = $this->getHelper('question');
-			$question = new Question('What is the database password?');
+			$question = new Question('What is the database password (press <enter> for none)? ');
 			$question->setHidden(true);
 			$question->setHiddenFallback(false);
 			$password = $helper->ask($input, $output, $question);
+			if ($password === null) {
+				$password = ''; // possibly unnecessary
+			}
 			$input->setOption('password', $password);
 			return;
 		}
@@ -233,9 +236,24 @@ class ConvertType extends Command implements CompletionAwareInterface {
 			'password' => $input->getOption('password'),
 			'dbname' => $input->getArgument('database'),
 		]);
+
+		// parse port
 		if ($input->getOption('port')) {
 			$connectionParams['port'] = $input->getOption('port');
 		}
+
+		// parse hostname for unix socket
+		if (preg_match('/^(.+)(:(\d+|[^:]+))?$/', $input->getOption('hostname'), $matches)) {
+			$connectionParams['host'] = $matches[1];
+			if (isset($matches[3])) {
+				if (is_numeric($matches[3])) {
+					$connectionParams['port'] = $matches[3];
+				} else {
+					$connectionParams['unix_socket'] = $matches[3];
+				}
+			}
+		}
+
 		return $this->connectionFactory->getConnection($type, $connectionParams);
 	}