Merge branch '2.3' into 2.7

Tobion · Tobion · commit 9ac658530d28 · 2015-12-15T02:31:17.000+01:00
diff --git a/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -26,7 +26,6 @@ public static function setUpBeforeClass()
     {
         ini_set('session.save_handler', 'files');
         ini_set('session.save_path', sys_get_temp_dir());
-        ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);
     }
 
     protected function setUp()

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ public static function setUpBeforeClass()`
`26`	`26`	`{`
`27`	`27`	`ini_set('session.save_handler', 'files');`
`28`	`28`	`ini_set('session.save_path', sys_get_temp_dir());`
`29`		`- ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`protected function setUp()`