Merge branch '4.1'

* 4.1: [Console] Fix typo in tests [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 Register the messenger data collector only when the profiler is enabled [Intl] Blacklist Eurozone and United Nations in Region Data Generator
symfony · Sep 15, 2018 · 5b08019 · 5b08019
2 parents 8ab7077 + ddde83c
commit 5b08019
Show file tree

Hide file tree

Showing 107 changed files with 34 additions and 209 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -52,5 +52,9 @@
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
             <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="285" />
         </service>
+
+        <service id="data_collector.messenger" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
+            <tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -34,17 +34,13 @@
             <argument type="service" id="validator" />
         </service>
 
-        <!-- Logging & Debug -->
+        <!-- Logging -->
         <service id="messenger.middleware.logging" class="Symfony\Component\Messenger\Middleware\LoggingMiddleware" abstract="true">
             <argument type="service" id="logger" />
 
             <tag name="monolog.logger" channel="messenger" />
         </service>
 
-        <service id="messenger.data_collector" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
-            <tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
-        </service>
-
         <!-- Discovery -->
         <service id="messenger.receiver_locator">
             <tag name="container.service_locator" />

diff --git a/src/Symfony/Component/Console/Command/Command.php b/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)
     {

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/Input/InputInterface.php b/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
      */

diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -783,7 +783,7 @@ public function testThrowsWhenTheCellInAnArray()
         $table->render();
     }
 
-    public function testColumnWith()
+    public function testColumnWidth()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
@@ -815,7 +815,7 @@ public function testColumnWith()
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
-    public function testColumnWiths()
+    public function testColumnWidths()
     {
         $table = new Table($output = $this->getOutputStream());
         $table

diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/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.',
+            ),
         );
     }
 

diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/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

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/af.json b/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",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/am.json b/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": "ኡዝቤኪስታን",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar.json b/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": "أوزبكستان",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/as.json b/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": "উজবেকিস্তান",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az.json b/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",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/be.json b/src/Symfony/Component/Intl/Resources/data/regions/be.json
@@ -72,7 +72,6 @@
         "ER": "Эрытрэя",
         "ES": "Іспанія",
         "ET": "Эфіопія",
-        "EZ": "Еўразона",
         "FI": "Фінляндыя",
         "FJ": "Фіджы",
         "FK": "Фалклендскія астравы",
@@ -237,7 +236,6 @@
         "UA": "Украіна",
         "UG": "Уганда",
         "UM": "Малыя Аддаленыя астравы ЗША",
-        "UN": "ААН",
         "US": "Злучаныя Штаты Амерыкі",
         "UY": "Уругвай",
         "UZ": "Узбекістан",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bg.json b/src/Symfony/Component/Intl/Resources/data/regions/bg.json
@@ -72,7 +72,6 @@
         "ER": "Еритрея",
         "ES": "Испания",
         "ET": "Етиопия",
-        "EZ": "Еврозона",
         "FI": "Финландия",
         "FJ": "Фиджи",
         "FK": "Фолклендски острови",
@@ -237,7 +236,6 @@
         "UA": "Украйна",
         "UG": "Уганда",
         "UM": "Отдалечени острови на САЩ",
-        "UN": "Организация на обединените нации",
         "US": "Съединени щати",
         "UY": "Уругвай",
         "UZ": "Узбекистан",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bn.json b/src/Symfony/Component/Intl/Resources/data/regions/bn.json
@@ -72,7 +72,6 @@
         "ER": "ইরিত্রিয়া",
         "ES": "স্পেন",
         "ET": "ইথিওপিয়া",
-        "EZ": "ইউরোজোন",
         "FI": "ফিনল্যান্ড",
         "FJ": "ফিজি",
         "FK": "ফকল্যান্ড দ্বীপপুঞ্জ",
@@ -237,7 +236,6 @@
         "UA": "ইউক্রেন",
         "UG": "উগান্ডা",
         "UM": "যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ",
-        "UN": "জাতিসংঘ",
         "US": "মার্কিন যুক্তরাষ্ট্র",
         "UY": "উরুগুয়ে",
         "UZ": "উজবেকিস্তান",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/br.json b/src/Symfony/Component/Intl/Resources/data/regions/br.json
@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Spagn",
         "ET": "Etiopia",
-        "EZ": "takad an euro",
         "FI": "Finland",
         "FJ": "Fidji",
         "FK": "Inizi Falkland",
@@ -237,7 +236,6 @@
         "UA": "Ukraina",
         "UG": "Ouganda",
         "UM": "Inizi diabell ar Stadoù-Unanet",
-        "UN": "Broadoù unanet",
         "US": "Stadoù-Unanet",
         "UY": "Uruguay",
         "UZ": "Ouzbekistan",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs.json b/src/Symfony/Component/Intl/Resources/data/regions/bs.json
@@ -72,7 +72,6 @@
         "ER": "Eritreja",
         "ES": "Španija",
         "ET": "Etiopija",
-        "EZ": "Eurozona",
         "FI": "Finska",
         "FJ": "Fidži",
         "FK": "Folklandska ostrva",
@@ -237,7 +236,6 @@
         "UA": "Ukrajina",
         "UG": "Uganda",
         "UM": "Američka Vanjska Ostrva",
-        "UN": "Ujedinjene Nacije",
         "US": "Sjedinjene Američke Države",
         "UY": "Urugvaj",
         "UZ": "Uzbekistan",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json
@@ -72,7 +72,6 @@
         "ER": "Еритреја",
         "ES": "Шпанија",
         "ET": "Етиопија",
-        "EZ": "Еурозона",
         "FI": "Финска",
         "FJ": "Фиџи",
         "FK": "Фокландска острва",
@@ -236,7 +235,6 @@
         "UA": "Украјина",
         "UG": "Уганда",
         "UM": "Мања удаљена острва САД",
-        "UN": "Уједињене нације",
         "US": "Сједињене Америчке Државе",
         "UY": "Уругвај",
         "UZ": "Узбекистан",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ca.json b/src/Symfony/Component/Intl/Resources/data/regions/ca.json
@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Espanya",
         "ET": "Etiòpia",
-        "EZ": "zona euro",
         "FI": "Finlàndia",
         "FJ": "Fiji",
         "FK": "Illes Malvines",
@@ -237,7 +236,6 @@
         "UA": "Ucraïna",
         "UG": "Uganda",
         "UM": "Illes Perifèriques Menors dels EUA",
-        "UN": "Nacions Unides",
         "US": "Estats Units",
         "UY": "Uruguai",
         "UZ": "Uzbekistan",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ce.json b/src/Symfony/Component/Intl/Resources/data/regions/ce.json
@@ -72,7 +72,6 @@
         "ER": "Эритрей",
         "ES": "Испани",
         "ET": "Эфиопи",
-        "EZ": "еврозона",
         "FI": "Финлянди",
         "FJ": "Фиджи",
         "FK": "Фолклендан гӀайренаш",
@@ -237,7 +236,6 @@
         "UA": "Украина",
         "UG": "Уганда",
         "UM": "АЦШн арахьара кегийн гӀайренаш",
-        "UN": "Вовшахкхетта Къаьмнийн Организаци",
         "US": "Цхьанатоьхна Штаташ",
         "UY": "Уругвай",
         "UZ": "Узбекистан",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cs.json b/src/Symfony/Component/Intl/Resources/data/regions/cs.json
@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Španělsko",
         "ET": "Etiopie",
-        "EZ": "eurozóna",
         "FI": "Finsko",
         "FJ": "Fidži",
         "FK": "Falklandské ostrovy",
@@ -237,7 +236,6 @@
         "UA": "Ukrajina",
         "UG": "Uganda",
         "UM": "Menší odlehlé ostrovy USA",
-        "UN": "Organizace spojených národů",
         "US": "Spojené státy",
         "UY": "Uruguay",
         "UZ": "Uzbekistán",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cy.json b/src/Symfony/Component/Intl/Resources/data/regions/cy.json
@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Sbaen",
         "ET": "Ethiopia",
-        "EZ": "Ardal yr Ewro",
         "FI": "Y Ffindir",
         "FJ": "Fiji",
         "FK": "Ynysoedd y Falkland\/Malvinas",
@@ -237,7 +236,6 @@
         "UA": "Wcráin",
         "UG": "Uganda",
         "UM": "Ynysoedd Pellennig UDA",
-        "UN": "y Cenhedloedd Unedig",
         "US": "Yr Unol Daleithiau",
         "UY": "Uruguay",
         "UZ": "Uzbekistan",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/da.json b/src/Symfony/Component/Intl/Resources/data/regions/da.json
@@ -72,7 +72,6 @@
         "ER": "Eritrea",
         "ES": "Spanien",
         "ET": "Etiopien",
-        "EZ": "eurozonen",
         "FI": "Finland",
         "FJ": "Fiji",
         "FK": "Falklandsøerne",
@@ -237,7 +236,6 @@
         "UA": "Ukraine",
         "UG": "Uganda",
         "UM": "Amerikanske oversøiske øer",
-        "UN": "De Forenede Nationer",
         "US": "USA",
         "UY": "Uruguay",
         "UZ": "Usbekistan",