From e5455db84f668c1e69944283eedf01cb940895a7 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Sun, 21 May 2017 19:48:19 +0200
Subject: [PATCH 1/3] [PhpUnitBridge] add a changelog file

---
 src/Symfony/Bridge/PhpUnit/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/Symfony/Bridge/PhpUnit/CHANGELOG.md

diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
new file mode 100644
index 0000000000..950b238911
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -0,0 +1,8 @@
+CHANGELOG
+=========
+
+3.1.0
+-----
+
+ * passing a numerically indexed array to the constructor of the `SymfonyTestsListenerTrait`
+   is deprecated, pass an array of namespaces indexed by the mocked feature instead

From d715cc4a27e23d3468f16c2c57deb336f3ad323d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 23 May 2017 15:50:11 +0200
Subject: [PATCH 2/3] [WebProfilerBundle] Fix sub-requests display in time
 profiler panel

---
 .../Resources/views/Collector/time.html.twig                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index ea73c8bde7..28e3a3c838 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -107,8 +107,8 @@
     </form>
 
     {% if profile.parent %}
-        <h3>
-            Sub-Request {{ profile.getcollector('request').requestattributes.get('_controller') }}
+        <h3 class="dump-inline">
+            Sub-Request {{ profiler_dump(profile.getcollector('request').requestattributes.get('_controller')) }}
             <small>
                 {{ collector.events.__section__.duration }} ms
                 <a class="newline" href="{{ path('_profiler', { token: profile.parent.token, panel: 'time' }) }}">Return to parent request</a>

From 6f672211292d47d4b34629b8f4d7768c831e80bd Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 23 May 2017 23:58:11 +0200
Subject: [PATCH 3/3] [Routing] remove an unused routing fixture

This was initially removed in #13361 and accidentally added again
in #11394.
---
 .../Component/Routing/Tests/Fixtures/validpattern.xml    | 9 ---------
 .../Component/Routing/Tests/Loader/XmlFileLoaderTest.php | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
index e8d07350b7..dbc72e46dd 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
@@ -11,14 +11,5 @@
         <condition>context.getMethod() == "GET"</condition>
     </route>
 
-    <route id="blog_show_legacy" path="/blog/{slug}" host="{locale}.example.com">
-        <default key="_controller">MyBundle:Blog:show</default>
-        <requirement key="_method">GET|POST|put|OpTiOnS</requirement>
-        <requirement key="_scheme">hTTps</requirement>
-        <requirement key="locale">\w+</requirement>
-        <option key="compiler_class">RouteCompiler</option>
-        <condition>context.getMethod() == "GET"</condition>
-    </route>
-
     <route id="blog_show_inherited" path="/blog/{slug}" />
 </routes>
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index e8e24fde58..d24ec79a79 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -70,7 +70,7 @@ class XmlFileLoaderTest extends TestCase
         $routeCollection = $loader->load('validresource.xml');
         $routes = $routeCollection->all();
 
-        $this->assertCount(3, $routes, 'Two routes are loaded');
+        $this->assertCount(2, $routes, 'Two routes are loaded');
         $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
 
         foreach ($routes as $route) {