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

Commit f333cb2

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7'
* 2.7: [Security/Http] fix mock logger in test [Serializer] Fix XmlFileLoader test [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
2 parents 602ba22 + c1c5cd5 commit f333cb2

File tree

8 files changed

+37
-34
lines changed

8 files changed

+37
-34
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
" 67E6 ;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 %}

‎src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ public function setUp()
110110
->will($this->returnValue($this->request))
111111
;
112112

113-
$this->logger = $this->getMockBuilder('Symfony\Bridge\Monolog\Logger')
114-
->disableOriginalConstructor()
115-
->getMock()
116-
;
113+
$this->logger = $this->getMock('Psr\Log\LoggerInterface');
117114

118115
$this->securityContext = $this->getMockBuilder('Symfony\Component\Security\Core\SecurityContext')
119116
->disableOriginalConstructor()

‎src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml renamed to ‎src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" ?>
22

3-
<serializer xmlns="http://symfony.com/schema/dic/serializer"
3+
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/dic/serializer http://symfony.com/schema/dic/constraint-mapping/serializer-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd">
66

77
<class name="Symfony\Component\Serializer\Tests\Fixtures\GroupDummy">
88
<attribute name="foo">
9-
<group name="group1" />
10-
<group name="group2" />
9+
<group>group1</group>
10+
<group>group2</group>
1111
</attribute>
1212

1313
<attribute name="bar">
14-
<group name="group2" />
14+
<group>group2</group>
1515
</attribute>
1616
</class>
1717

‎src/Symfony/Component/Serializer/Tests/Fixtures/serializer.yml renamed to ‎src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml

File renamed without changes.

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
2525

2626
public function setUp()
2727
{
28-
$this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serializer.xml');
28+
$this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');
2929
$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
3030
}
3131

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
2525

2626
public function setUp()
2727
{
28-
$this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serializer.yml');
28+
$this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');
2929
$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
3030
}
3131

0 commit comments

Comments
 (0)
0