Merge branch '3.3' into 3.4

* 3.3:
  [Intl] Update ICU data to 60.1
  [YAML] Allow to parse custom tags when linting yaml files
  [HttpKernel][Debug] Remove noise from stack frames of deprecations
  [Validator] Fix Costa Rica IBAN format
  [Bridge/ProxyManager] Remove direct reference to value holder property
  [Validator] Add Belarus IBAN format
  [FrameworkBundle] Specifically inject the debug dispatcher in the collector
  [WebserverBundle] fixed the bug that caused that the webserver would …
  update the pull request template
  [Stopwatch] minor fix

Author: fabpot

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 3.4 or master / 2.7, 2.8 or 3.3 <!-- see comment below -->
+| Branch?       | master / 2.7, 2.8, 3.3, or 3.4 <!-- see comment below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
 | BC breaks?    | yes/no
@@ -13,8 +13,7 @@
 <!--
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
-- Features and deprecations must be submitted against the 3.4,
-  legacy code removals go to the master branch.
+- Features and deprecations must be submitted against the master branch.
 - Please fill in this template according to the PR you're about to submit.
 - Replace this comment by a description of what your PR is solving.
 -->

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

@@ -94,7 +94,11 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
      */
     public function getProxyCode(Definition $definition)
     {
-        return $this->classGenerator->generate($this->generateProxyClass($definition));
+        return preg_replace(
+            '/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',
+            '$1 && ($1->__invoke(\$$2, $3, $1) || 1) && $this->$2 = \$$2;',
+            $this->classGenerator->generate($this->generateProxyClass($definition))
+        );
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

@@ -27,7 +27,7 @@
 
         <service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector">
             <tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="290" />
-            <argument type="service" id="event_dispatcher" on-invalid="ignore" />
+            <argument type="service" id="debug.event_dispatcher" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector">

src/Symfony/Component/Debug/ErrorHandler.php

@@ -718,7 +718,7 @@ private function cleanTrace($backtrace, $type, $file, $line, $throw)
         }
         if (!($throw || $this->scopedErrors & $type)) {
             for ($i = 0; isset($lightTrace[$i]); ++$i) {
-                unset($lightTrace[$i]['args']);
+                unset($lightTrace[$i]['args'], $lightTrace[$i]['object']);
             }
         }
 

src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php

@@ -86,7 +86,7 @@ public function configure(Event $event = null)
                         $handler->screamAt($levels);
                     }
                     if ($this->scope) {
-                        $handler->scopeAt($this->levels);
+                        $handler->scopeAt($levels & ~E_USER_DEPRECATED & ~E_DEPRECATED);
                     } else {
                         $handler->scopeAt(0, true);
                     }

src/Symfony/Component/Intl/Intl.php

@@ -234,7 +234,7 @@ public static function getIcuDataVersion()
      */
     public static function getIcuStubVersion()
     {
-        return '58.2';
+        return '60.1';
     }
 
     /**

src/Symfony/Component/Intl/Resources/bin/icu.ini

@@ -15,3 +15,4 @@
 57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
 58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
 59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
+60 = http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source

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

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.32.59",
+    "Version": "2.1.37.5",
     "Names": {
         "AED": [
             "AED",
@@ -121,6 +121,10 @@
             "CLP",
             "Chileense peso"
         ],
+        "CNH": [
+            "CNH",
+            "Chinese joean"
+        ],
         "CNY": [
             "CN¥",
             "Sjinese joean renminbi"

src/Symfony/Component/Intl/Resources/data/currencies/ak.json

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.31.33",
+    "Version": "2.1.37.1",
     "Names": {
         "AED": [
             "AED",

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

@@ -1,9 +1,9 @@
 {
-    "Version": "2.1.32.59",
+    "Version": "2.1.37.5",
     "Names": {
         "AED": [
             "AED",
-            "የተባበሩት የአረብ ኤምረትስ ዲርሀም"
+            "የተባበሩት የአረብ ኤምሬትስ ድርሀም"
         ],
         "AFN": [
             "AFN",
@@ -121,6 +121,10 @@
             "CLP",
             "የቺሊ ፔሶ"
         ],
+        "CNH": [
+            "የቻይና ዩዋን",
+            "የቻይና ዩዋን (የውጭ ምንዛሪ)"
+        ],
         "CNY": [
             "CN¥",
             "የቻይና የን"
@@ -235,15 +239,15 @@
         ],
         "HRK": [
             "HRK",
-            "የክሮሽያ ኩና"
+            "HRK"
         ],
         "HTG": [
             "HTG",
             "የሃያቲ ጓርዴ"
         ],
         "HUF": [
             "HUF",
-            "የሁንጋሪ ፎሪንት"
+            "የሃንጋሪያን ፎሪንት"
         ],
         "IDR": [
             "IDR",
@@ -531,7 +535,7 @@
         ],
         "STD": [
             "STD",
-            "የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ"
+            "የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ"
         ],
         "SYP": [
             "SYP",