Merge branch '2.6' into 2.7

* 2.6:
  Changed visibility of setUp() and tearDown to protected

Author: nicolas-grekas

Tests/Authorization/AuthorizationCheckerTest.php

@@ -21,7 +21,7 @@ class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase
     private $authorizationChecker;
     private $tokenStorage;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
         $this->accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface');

Tests/LegacySecurityContextTest.php

@@ -21,7 +21,7 @@ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase
     private $authorizationChecker;
     private $securityContext;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);