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

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

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

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",

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

@@ -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 %}

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')
+        $this->logger = $this->getMock('Psr\Log\LoggerInterface');
-            ->disableOriginalConstructor()
-            ->getMock()
-        ;
 
         $this->securityContext = $this->getMockBuilder('Symfony\Component\Security\Core\SecurityContext')
             ->disableOriginalConstructor()

src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
 
-<serializer xmlns="http://symfony.com/schema/dic/serializer"
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer http://symfony.com/schema/dic/constraint-mapping/serializer-1.0.xsd">
+                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd">
 
     <class name="Symfony\Component\Serializer\Tests\Fixtures\GroupDummy">
         <attribute name="foo">
-            <group name="group1" />
+            <group>group1</group>
-            <group name="group2" />
+            <group>group2</group>
         </attribute>
 
         <attribute name="bar">
-            <group name="group2" />
+            <group>group2</group>
         </attribute>
     </class>
 

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');
     }
 

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');
     }