bug #28393 [Console] fixed corrupt error output for unknown multibyte short option (downace)

Robin Chalas · Robin Chalas · commit 0417d6caad59 · 2018-09-10T10:47:57.000+02:00
This PR was squashed before being merged into the 2.8 branch (closes #28393). Discussion ---------- [Console] fixed corrupt error output for unknown multibyte short option | Q | A | ------------- | --- | Branch? | 2.8  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #28320  | License | MIT | Doc PR | -  [Console] Fixed #28320 by using mb_substr instead of index access  Commits ------- 0f86156 [Console] fixed corrupt error output for unknown multibyte short option
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -121,7 +121,8 @@ private function parseShortOptionSet($name)
         $len = \strlen($name);
         for ($i = 0; $i < $len; ++$i) {
             if (!$this->definition->hasShortcut($name[$i])) {
-                throw new RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
+                $encoding = mb_detect_encoding($name, null, true);
+                throw new RuntimeException(sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding)));
             }
 
             $option = $this->definition->getOptionForShortcut($name[$i]);
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -228,6 +228,11 @@ public function provideInvalidInput()
                 new InputDefinition(array(new InputArgument('number'))),
                 'The "-1" option does not exist.',
             ),
+            array(
+                array('cli.php', '-fЩ'),
+                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+                'The "-Щ" option does not exist.',
+            ),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,8 @@ private function parseShortOptionSet($name)`
`121`	`121`	`$len = \strlen($name);`
`122`	`122`	`for ($i = 0; $i < $len; ++$i) {`
`123`	`123`	`if (!$this->definition->hasShortcut($name[$i])) {`
`124`		`- throw new RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));`
	`124`	`+ $encoding = mb_detect_encoding($name, null, true);`
	`125`	`+ throw new RuntimeException(sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding)));`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`$option = $this->definition->getOptionForShortcut($name[$i]);`