Merge branch '2.6' into 2.7

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

4 files changed, 4 insertions, 4 deletions

diff --git a/Core/Tests/Authorization/AuthorizationCheckerTest.php b/Core/Tests/Authorization/AuthorizationCheckerTest.php
index 64de6ef..aafc12f 100644
--- a/Core/Tests/Authorization/AuthorizationCheckerTest.php
+++ b/Core/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');
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php
index 4d1adf8..83abac1 100644
--- a/Core/Tests/LegacySecurityContextTest.php
+++ b/Core/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);
 
diff --git a/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
index 97167c9..6e79b07 100644
--- a/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
+++ b/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -31,7 +31,7 @@ class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
 
     private $response;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->successHandler = $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface');
         $this->failureHandler = $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface');
diff --git a/Tests/Core/Authentication/Voter/AbstractVoterTest.php b/Tests/Core/Authentication/Voter/AbstractVoterTest.php
index 955b610..c5e9466 100644
--- a/Tests/Core/Authentication/Voter/AbstractVoterTest.php
+++ b/Tests/Core/Authentication/Voter/AbstractVoterTest.php
@@ -25,7 +25,7 @@ class AbstractVoterTest extends \PHPUnit_Framework_TestCase
 
     private $token;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->voter = new VoterFixture();