symfony
diff --git a/‎src/Symfony/Component/Console/Input/ArgvInput.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Input/ArgvInput.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Console/Input/ArgvInput.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Input/ArgvInput.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
+5Lines changed: 5 additions & 0 deletions
@@ -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]);
 
@@ -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.',
+            ),
         );
     }