Merge branch '2.6' into 2.7

* 2.6:
  [2.6] cleanup deprecated uses
  [2.5] cleanup deprecated uses

Conflicts:
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php

Author: fabpot

Tests/TokenParser/RenderTokenParserTest.php renamed to Tests/TokenParser/LegacyRenderTokenParserTest.php

@@ -15,8 +15,13 @@
 use Symfony\Bundle\TwigBundle\TokenParser\RenderTokenParser;
 use Symfony\Bundle\TwigBundle\Node\RenderNode;
 
-class RenderTokenParserTest extends TestCase
+class LegacyRenderTokenParserTest extends TestCase
 {
+    public function setUp()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+    }
+
     /**
      * @dataProvider getTestsForRender
      */