8000 Merge branch '2.6' into 2.7 · symfony/symfony@c1c5cd5 · GitHub
[go: up one dir, main page]
Skip to content

Commit c1c5cd5

Browse files
nicolas-grekasnicolas-grekas
committed
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
2 parents 9280c62 + 667c8c7 commit c1c5cd5

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

‎src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,34 @@
6969
}
7070
</style>
7171

72-
<ul class="alt">
73-
{% for dump in collector.getDumps('html') %}
74-
<li class="sf-dump sf-reset">
75-
in
76-
{% if dump.line %}
77-
{% set link = dump.file|file_link(dump.line) %}
78-
{% if link %}
79-
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
72+
{% if collector.dumpsCount %}
73+
<ul class="alt">
74+
{% for dump in collector.getDumps('html') %}
75+
<li class="sf-dump sf-reset">
76+
in
77+
{% if dump.line %}
78+
{% set link = dump.file|file_link(dump.line) %}
79+
{% if link %}
80+
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
81+
{% else %}
82+
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
83+
{% endif %}
8084
{% else %}
81-
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
85+
{{ dump.name }}
8286
{% endif %}
83-
{% else %}
84-
{{ dump.name }}
85-
{% endif %}
86-
line {{ dump.line }}:
87-
<a onclick="Sfdump.toggle(this)">▶</a>
88-
<span class="sf-dump-compact">
89-
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
90-
</span>
87+
line {{ dump.line }}:
88+
<a onclick="Sfdump.toggle(this)">▶</a>
89+
<span class="sf-dump-compact">
90+
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
91+
</span>
9192

92-
{{ dump.data|raw }}
93-
</li>
94-
{% endfor %}
95-
</ul>
93+
{{ dump.data|raw }}
94+
</li>
95+
{% endfor %}
96+
</ul>
97+
{% else %}
98+
<p>
99+
<em>No dumped variable</em>
100+
</p>
101+
{% endif %}
96102
{% endblock %}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/dependency-injection" : "~2.5,>=2.5.3",
20+
"symfony/dependency-injection" : "~2.6,>=2.6.2",
2121
"symfony/config" : "~2.4",
2222
"symfony/event-dispatcher": "~2.5",
2323
"symfony/http-foundation": "~2.4,>=2.4.9",

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends 'TwigBundle::layout.html.twig' %}
22

33
{% block head %}
4-
<link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
4+
<link href="{{ asset('bundles/framework/css/exception.css', absolute=true) }}" rel="stylesheet" type="text/css" media="all" />
55
{% endblock %}
66

77
{% block title %}

0 commit comments

Comments
 (0)
0