[Console] Fix Windows code page support

orkan · orkan · commit 48ffffc00a8f · 2021-05-11T15:45:56.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -512,7 +512,7 @@ private function readInput($inputStream, Question $question)
             $cp = $this->setIOCodepage();
             $ret = fgets($inputStream, 4096);
 
-            return false !== $ret ? $this->resetIOCodepage($cp, $ret) : false;
+            return $this->resetIOCodepage($cp, $ret);
         }
 
         $multiLineStreamReader = $this->cloneInputStream($inputStream);
@@ -552,11 +552,18 @@ private function setIOCodepage(): int
     /**
      * Set console I/O to the specified code page and convert the user input.
      */
-    private function resetIOCodepage(int $cp, string $input): string
+    private function resetIOCodepage(int $cp, $input)
     {
-        if (\function_exists('sapi_windows_cp_set') && 0 < $cp) {
+        if (0 === $cp) {
+            return $input;
+        }
+
+        if (\function_exists('sapi_windows_cp_set')) {
             sapi_windows_cp_set($cp);
-            $input = sapi_windows_cp_conv(sapi_windows_cp_get('oem'), $cp, $input);
+
+            if (!empty($input)) {
+                $input = sapi_windows_cp_conv(sapi_windows_cp_get('oem'), $cp, $input);
+            }
         }
 
         return $input;
