Merge branch '2.6' into 2.7
* 2.6: [2.6] silence deprecation notices in new components [2.5] silence deprecation notices in new components [VarDumper] Minor fix for the uniformity [TwigBundle] added missing absolute URL in Twig exceptions Conflicts: src/Symfony/Bundle/DebugBundle/phpunit.xml.dist src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist src/Symfony/Component/Security/Acl/phpunit.xml.dist src/Symfony/Component/Security/Core/phpunit.xml.dist src/Symfony/Component/Security/Csrf/phpunit.xml.dist src/Symfony/Component/Security/Http/phpunit.xml.dist src/Symfony/Component/VarDumper/phpunit.xml.dist
This commit is contained in:
commit
c1c5cd58b7
@ -69,6 +69,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
{% if collector.dumpsCount %}
|
||||||
<ul class="alt">
|
<ul class="alt">
|
||||||
{% for dump in collector.getDumps('html') %}
|
{% for dump in collector.getDumps('html') %}
|
||||||
<li class="sf-dump sf-reset">
|
<li class="sf-dump sf-reset">
|
||||||
@ -93,4 +94,9 @@
|
|||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
{% else %}
|
||||||
|
<p>
|
||||||
|
<em>No dumped variable</em>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"symfony/dependency-injection" : "~2.5,>=2.5.3",
|
"symfony/dependency-injection" : "~2.6,>=2.6.2",
|
||||||
"symfony/config" : "~2.4",
|
"symfony/config" : "~2.4",
|
||||||
"symfony/event-dispatcher": "~2.5",
|
"symfony/event-dispatcher": "~2.5",
|
||||||
"symfony/http-foundation": "~2.4,>=2.4.9",
|
"symfony/http-foundation": "~2.4,>=2.4.9",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% extends 'TwigBundle::layout.html.twig' %}
|
{% extends 'TwigBundle::layout.html.twig' %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
|
<link href="{{ asset('bundles/framework/css/exception.css', absolute=true) }}" rel="stylesheet" type="text/css" media="all" />
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
|
Reference in New Issue
Block a user