Merge branch '2.8' into 3.4

* 2.8:
  [Console] Correct Command::initialize() and InputInterface::bind() phpdoc regarding thrown exceptions
  [Console] fixed corrupt error output for unknown multibyte short option
  [Console] fixed PHPDoc for setArgument/setOption in InputInterface
  [Intl] Blacklist Eurozone and United Nations in Region Data Generator

Author: Robin Chalas

src/Symfony/Component/Console/Command/Command.php

@@ -173,10 +173,14 @@ protected function interact(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * Initializes the command just after the input has been validated.
+     * Initializes the command after the input has been bound and before the input
+     * is validated.
      *
      * This is mainly useful when a lot of commands extends one main command
      * where some things need to be initialized based on the input arguments and options.
+     *
+     * @see InputInterface::bind()
+     * @see InputInterface::validate()
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {

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]);

src/Symfony/Component/Console/Input/InputInterface.php

@@ -61,6 +61,8 @@ public function getParameterOption($values, $default = false, $onlyParams = fals
 
     /**
      * Binds the current Input instance with the given arguments and options.
+     *
+     * @throws RuntimeException
      */
     public function bind(InputDefinition $definition);
 
@@ -92,8 +94,8 @@ public function getArgument($name);
     /**
      * Sets an argument value by name.
      *
-     * @param string $name  The argument name
-     * @param string $value The argument value
+     * @param string          $name  The argument name
+     * @param string|string[] $value The argument value
      *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
@@ -129,8 +131,8 @@ public function getOption($name);
     /**
      * Sets an option value by name.
      *
-     * @param string      $name  The option name
-     * @param string|bool $value The option value
+     * @param string               $name  The option name
+     * @param string|string[]|bool $value The option value
      *
      * @throws InvalidArgumentException When option given doesn't exist
      */

src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php

@@ -246,6 +246,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.',
+            ),
         );
     }
 

src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php

@@ -34,6 +34,8 @@ class RegionDataGenerator extends AbstractDataGenerator
     const BOUVET_ISLAND_ID = 'BV';
     const HEARD_MCDONALD_ISLANDS_ID = 'HM';
     const CLIPPERTON_ISLAND_ID = 'CP';
+    const EUROZONE_ID = 'EZ';
+    const UNITED_NATIONS_ID = 'UN';
 
     /**
      * Regions excluded from generation.
@@ -43,6 +45,8 @@ class RegionDataGenerator extends AbstractDataGenerator
         // Look like countries, but are sub-continents
         self::OUTLYING_OCEANIA_REGION_ID => true,
         self::EUROPEAN_UNION_ID => true,
+        self::EUROZONE_ID => true,
+        self::UNITED_NATIONS_ID => true,
         // No longer exists
         self::NETHERLANDS_ANTILLES_ID => true,
         // Uninhabited islands

src/Symfony/Component/Intl/Resources/data/regions/af.json

@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Spanje",
         "ET": "Ethiopië",
-        "EZ": "Eurosone",
         "FI": "Finland",
         "FJ": "Fidji",
         "FK": "Falklandeilande",
@@ -237,7 +236,6 @@
         "UA": "Oekraïne",
         "UG": "Uganda",
         "UM": "Klein afgeleë eilande van die VSA",
-        "UN": "Verenigde Nasies",
         "US": "Verenigde State van Amerika",
         "UY": "Uruguay",
         "UZ": "Oesbekistan",

src/Symfony/Component/Intl/Resources/data/regions/am.json

@@ -72,7 +72,6 @@
         "ER": "ኤርትራ",
         "ES": "ስፔን",
         "ET": "ኢትዮጵያ",
-        "EZ": "የአውሮፓ ዞን",
         "FI": "ፊንላንድ",
         "FJ": "ፊጂ",
         "FK": "የፎክላንድ ደሴቶች",
@@ -237,7 +236,6 @@
         "UA": "ዩክሬን",
         "UG": "ዩጋንዳ",
         "UM": "የዩ ኤስ ጠረፍ ላይ ያሉ ደሴቶች",
-        "UN": "የተባበሩት መንግስታት",
         "US": "ዩናይትድ ስቴትስ",
         "UY": "ኡራጓይ",
         "UZ": "ኡዝቤኪስታን",

src/Symfony/Component/Intl/Resources/data/regions/ar.json

@@ -72,7 +72,6 @@
         "ER": "إريتريا",
         "ES": "إسبانيا",
         "ET": "إثيوبيا",
-        "EZ": "منطقة اليورو",
         "FI": "فنلندا",
         "FJ": "فيجي",
         "FK": "جزر فوكلاند",
@@ -237,7 +236,6 @@
         "UA": "أوكرانيا",
         "UG": "أوغندا",
         "UM": "جزر الولايات المتحدة النائية",
-        "UN": "الأمم المتحدة",
         "US": "الولايات المتحدة",
         "UY": "أورغواي",
         "UZ": "أوزبكستان",

src/Symfony/Component/Intl/Resources/data/regions/as.json

@@ -72,7 +72,6 @@
         "ER": "এৰিত্ৰিয়া",
         "ES": "স্পেইন",
         "ET": "ইথিঅ’পিয়া",
-        "EZ": "ইউৰোজ’ন",
         "FI": "ফিনলেণ্ড",
         "FJ": "ফিজি",
         "FK": "ফকলেণ্ড দ্বীপপুঞ্জ",
@@ -237,7 +236,6 @@
         "UA": "ইউক্ৰেইন",
         "UG": "উগাণ্ডা",
         "UM": "ইউ. এছ. আউটলায়িং দ্বীপপুঞ্জ",
-        "UN": "ৰাষ্ট্ৰসংঘ",
         "US": "মাৰ্কিন যুক্তৰাষ্ট্ৰ",
         "UY": "উৰুগুৱে",
         "UZ": "উজবেকিস্তান",

src/Symfony/Component/Intl/Resources/data/regions/az.json

@@ -72,7 +72,6 @@
         "ER": "Eritreya",
         "ES": "İspaniya",
         "ET": "Efiopiya",
-        "EZ": "Avrozona",
         "FI": "Finlandiya",
         "FJ": "Fici",
         "FK": "Folklend adaları",
@@ -237,7 +236,6 @@
         "UA": "Ukrayna",
         "UG": "Uqanda",
         "UM": "ABŞ-a bağlı kiçik adacıqlar",
-        "UN": "Birləşmiş Millətlər Təşkilatı",
         "US": "Amerika Birləşmiş Ştatları",
         "UY": "Uruqvay",
         "UZ": "Özbəkistan",