Merge branch 'hotfix-3.6.10'

Author: Alexandre Guidet

Migrate/Command/AbstractEnvCommand.php

@@ -80,6 +80,7 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
         $dbname = ArrayUtil::get($conf['connection'], 'database');
         $username = ArrayUtil::get($conf['connection'], 'username');
         $password = ArrayUtil::get($conf['connection'], 'password');
+        $charset = ArrayUtil::get($conf['connection'], 'charset');
 
         $uri = $driver;
 
@@ -89,6 +90,7 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
             $uri .= ($dbname === null) ? '' : ":dbname=$dbname";
             $uri .= ($host === null) ? '' : ";host=$host";
             $uri .= ($port === null) ? '' : ";port=$port";
+            $uri .= ($charset === null) ? '' : ";charset=$charset";
         }
         $this->db = new \PDO(
             $uri,

Migrate/Command/AddEnvCommand.php

@@ -69,6 +69,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $dbUserPasswordQuestion = new Question("Please enter the database user password (if needed): ", "~");
         $dbUserPassword = $questions->ask($input, $output, $dbUserPasswordQuestion);
 
+        $dbCharsetQuestion = new Question("Please enter the database charset (if needed): ", "~");
+        $dbCharset = $questions->ask($input, $output, $dbCharsetQuestion);
+
         $changelogTableQuestion = new Question("Please enter the changelog table <info>(default changelog)</info>: ", "changelog");
         $changelogTable = $questions->ask($input, $output, $changelogTableQuestion);
 
@@ -82,6 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $confTemplate = str_replace('{USERNAME}', $dbUserName, $confTemplate);
         $confTemplate = str_replace('{PASSWORD}', $dbUserPassword, $confTemplate);
         $confTemplate = str_replace('{DATABASE}', $dbName, $confTemplate);
+        $confTemplate = str_replace('{CHARSET}', $dbCharset, $confTemplate);
         $confTemplate = str_replace('{CHANGELOG}', $changelogTable, $confTemplate);
         $confTemplate = str_replace('{EDITOR}', $defaultEditor, $confTemplate);
 

templates/env.yml.tpl

@@ -5,6 +5,7 @@ connection:
     username: {USERNAME}
     password: {PASSWORD}
     database: {DATABASE}
+    charset:  {CHARSET}
 
 changelog: {CHANGELOG}
 default_editor: {EDITOR}

tests/Command/AbstractCommandTester.php

@@ -47,7 +47,7 @@ public function createEnv()
 
         /* @var $question QuestionHelper */
         $question = $command->getHelper('question');
-        $question->setInputStream(InputStreamUtil::type("testing\n$driverKey\ntest.sqlite\n\n\n\n\nchangelog\nvim\n"));
+        $question->setInputStream(InputStreamUtil::type("testing\n$driverKey\ntest.sqlite\n\n\n\n\n\nchangelog\nvim\n"));
 
         $commandTester->execute(array('command' => $command->getName()));
     }

tests/Command/AddenvCommandTest.php

@@ -44,7 +44,7 @@ public function testExecute()
 
         /* @var $question QuestionHelper */
         $question = $command->getHelper('question');
-        $question->setInputStream(InputStreamUtil::type("testing\n$driverKey\nmigrate_test\nlocalhost\n5432\naguidet\naguidet\nchangelog\nvim\n"));
+        $question->setInputStream(InputStreamUtil::type("testing\n$driverKey\nmigrate_test\nlocalhost\n5432\naguidet\naguidet\nutf8\nchangelog\nvim\n"));
 
         $commandTester->execute(array('command' => $command->getName()));
 
@@ -62,6 +62,7 @@ public function testExecute()
     username: aguidet
     password: aguidet
     database: migrate_test
+    charset:  utf8
 
 changelog: changelog
 default_editor: vim