diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' into 3.3

Browse Source 
* 3.2:
  [Routing] remove an unused routing fixture
  [WebProfilerBundle] Fix sub-requests display in time profiler panel
  [PhpUnitBridge] add a changelog file
This commit is contained in:
Nicolas Grekas 2017-05-24 13:35:23 +02:00
commit feaf5c987e
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/PhpUnit/CHANGELOG.md
View File

@ -8,3 +8,9 @@ CHANGELOG
deprecated, use the `@group legacy` notation instead
* using the `Legacy` prefix in class names to mark a test as legacy is deprecated,
use the `@group legacy` notation instead
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

4
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
View File

@ -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>

9
src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
View File

@ -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>

2
src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
View File

@ -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) {