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

Merge branch '2.6' into 2.7

Browse Source 
* 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:
Nicolas Grekas 2014-12-25 11:29:16 +01:00
commit c1c5cd58b7
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
View File

@ -69,28 +69,34 @@
}
</style>
<ul class="alt">
{% for dump in collector.getDumps('html') %}
<li class="sf-dump sf-reset">
in
{% if dump.line %}
{% set link = dump.file|file_link(dump.line) %}
{% if link %}
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
{% if collector.dumpsCount %}
<ul class="alt">
{% for dump in collector.getDumps('html') %}
<li class="sf-dump sf-reset">
in
{% if dump.line %}
{% set link = dump.file|file_link(dump.line) %}
{% if link %}
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
{% else %}
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
{% endif %}
{% else %}
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
{{ dump.name }}
{% endif %}
{% else %}
{{ dump.name }}
{% endif %}
line {{ dump.line }}:
<a onclick="Sfdump.toggle(this)">▶</a>
<span class="sf-dump-compact">
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
</span>
line {{ dump.line }}:
<a onclick="Sfdump.toggle(this)">▶</a>
<span class="sf-dump-compact">
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
</span>
{{ dump.data|raw }}
</li>
{% endfor %}
</ul>
{{ dump.data|raw }}
</li>
{% endfor %}
</ul>
{% else %}
<p>
<em>No dumped variable</em>
</p>
{% endif %}
{% endblock %}

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -17,7 +17,7 @@
],
"require": {
"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/event-dispatcher": "~2.5",
"symfony/http-foundation": "~2.4,>=2.4.9",

2
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
View File

@ -1,7 +1,7 @@
{% extends 'TwigBundle::layout.html.twig' %}
{% 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 %}
{% block title %}