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

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

@@ -69,6 +69,7 @@
         }
     </style>
 
+    {% if collector.dumpsCount %}
         <ul class="alt">
             {% for dump in collector.getDumps('html') %}
             <li class="sf-dump sf-reset">
@@ -93,4 +94,9 @@
             </li>
             {% endfor %}
         </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 %}