bug #41174 [Console] Fix Windows code page support (orkan)

nicolas-grekas · nicolas-grekas · commit 2289c32bb49c · 2021-05-11T17:45:39.000+02:00
This PR was submitted for the 5.x branch but it was merged into the 5.2 branch instead. Discussion ---------- [Console] Fix Windows code page support My previous PR #41113 was corrected by `@nicolas`-grekas on 3bac7fe. He introduced logical changes in the code which resulted in incorrect behaviour. The basic idea was to restore the I/O codepage as soon as you get console input. And you have to do this even if `fgets()` returns **false**, because otherwise you'll leave the changed codepage for the rest of the script execution - and that's bad! Commits ------- 044b585 [Console] Fix Windows code page support
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);
@@ -533,7 +533,7 @@ private function readInput($inputStream, Question $question)
     }
 
     /**
-     * Set console I/O to the host code page.
+     * Sets console I/O to the host code page.
      *
      * @return int Previous code page in IBM/EBCDIC format
      */
@@ -550,13 +550,20 @@ private function setIOCodepage(): int
     }
 
     /**
-     * Set console I/O to the specified code page and convert the user input.
+     * Sets console I/O to the specified code page and converts the user input.
+     *
+     * @param string|false $input
+     *
+     * @return string|false
      */
-    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) {
             sapi_windows_cp_set($cp);
-            $input = sapi_windows_cp_conv(sapi_windows_cp_get('oem'), $cp, $input);
+
+            if (false !== $input && '' !== $input) {
+                $input = sapi_windows_cp_conv(sapi_windows_cp_get('oem'), $cp, $input);
+            }
         }
 
         return $input;
