Merge branch 'hotfix/244'

Close #244

Author: weierophinney

CHANGELOG.md

@@ -22,7 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#244](https://github.com/zendframework/zend-expressive-skeleton/pull/244)
+  fixes an issue with installer prompts when symfony/console v4 is installed
+  globally.
 
 ## 3.0.1 - 2018-03-19
 

composer.json

@@ -94,8 +94,10 @@
         "expressive": "expressive --ansi",
         "check": [
             "@cs-check",
-            "@test"
+            "@test",
+            "@analyze"
         ],
+        "analyze": "phpstan analyze -l max -c ./phpstan.installer.neon ./src ./config",
         "clear-config-cache": "php bin/clear-config-cache.php",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",

src/ExpressiveInstaller/OptionalPackages.php

@@ -251,7 +251,7 @@ public function requestInstallType() : string
         ];
 
         while (true) {
-            $answer = $this->io->ask($query, '2');
+            $answer = $this->io->ask(implode($query), '2');
 
             switch (true) {
                 case ($answer === '1'):
@@ -621,7 +621,7 @@ private function askQuestion(array $question, $defaultOption)
 
         while (true) {
             // Ask for user input
-            $answer = $this->io->ask($ask, (string) $defaultOption);
+            $answer = $this->io->ask(implode($ask), (string) $defaultOption);
 
             // Handle none of the options
             if ($answer === 'n' && $question['required'] !== true) {

test/ExpressiveInstallerTest/PromptForOptionalPackagesTest.php

@@ -90,8 +90,16 @@ public function testPromptForOptionalPackage(
 
     public static function assertPromptText($expected, $argument)
     {
-        $argument = is_array($argument) ? array_shift($argument) : $argument;
-        $message = sprintf('Expected prompt not received: "%s"', $expected);
-        self::assertThat(false !== strpos($argument, $expected), self::isTrue(), $message);
+        self::assertInternalType(
+            'string',
+            $argument,
+            'Questions must be a string since symfony/console:4.0'
+        );
+
+        self::assertThat(
+            false !== strpos($argument, $expected),
+            self::isTrue(),
+            sprintf('Expected prompt not received: "%s"', $expected)
+        );
     }
 }

test/ExpressiveInstallerTest/RequestInstallTypeTest.php

@@ -78,7 +78,11 @@ public function testWillContinueToPromptUntilValidAnswerPresented()
 
     public static function assertQueryPrompt($value)
     {
-        $value = is_array($value) ? array_shift($value) : $value;
+        self::assertInternalType(
+            'string',
+            $value,
+            'Questions must be a string since symfony/console:4.0'
+        );
 
         self::assertThat(
             false !== strpos($value, 'What type of installation would you like?'),