diff --git a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
index 71f0082725..5ba9af9fe7 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
+++ b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
@@ -69,28 +69,34 @@
}
-
- {% for dump in collector.getDumps('html') %}
- -
- in
- {% if dump.line %}
- {% set link = dump.file|file_link(dump.line) %}
- {% if link %}
- {{ dump.name }}
+ {% if collector.dumpsCount %}
+
+ {% for dump in collector.getDumps('html') %}
+ -
+ in
+ {% if dump.line %}
+ {% set link = dump.file|file_link(dump.line) %}
+ {% if link %}
+ {{ dump.name }}
+ {% else %}
+ {{ dump.name }}
+ {% endif %}
{% else %}
- {{ dump.name }}
+ {{ dump.name }}
{% endif %}
- {% else %}
- {{ dump.name }}
- {% endif %}
- line {{ dump.line }}:
- ▶
-
- {% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
-
+ line {{ dump.line }}:
+ ▶
+
+ {% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
+
- {{ dump.data|raw }}
-
- {% endfor %}
-
+ {{ dump.data|raw }}
+
+ {% endfor %}
+
+ {% else %}
+
+ No dumped variable
+
+ {% endif %}
{% endblock %}
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 38e7bd6b78..9961d1381a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -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",
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
index 1920b6008b..f97c60b9e4 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
@@ -1,7 +1,7 @@
{% extends 'TwigBundle::layout.html.twig' %}
{% block head %}
-
+
{% endblock %}
{% block title %}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
index b4a4a341fa..8567728c0b 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -110,10 +110,7 @@ class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->request))
;
- $this->logger = $this->getMockBuilder('Symfony\Bridge\Monolog\Logger')
- ->disableOriginalConstructor()
- ->getMock()
- ;
+ $this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->securityContext = $this->getMockBuilder('Symfony\Component\Security\Core\SecurityContext')
->disableOriginalConstructor()
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
similarity index 57%
rename from src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml
rename to src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
index c8c1e887be..6e95aaf721 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.xml
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
@@ -1,17 +1,17 @@
-
+ xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd">
-
-
+ group1
+ group2
-
+ group2
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serializer.yml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
similarity index 100%
rename from src/Symfony/Component/Serializer/Tests/Fixtures/serializer.yml
rename to src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
index f45a2f0eeb..35888626e0 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -25,7 +25,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serializer.xml');
+ $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');
$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
}
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 6eec425563..ec6434cf1d 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -25,7 +25,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serializer.yml');
+ $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');
$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
}