Remove use of ForwardCompatTrait

jderusse · jderusse · commit a05751e2680a · 2019-08-03T23:15:25.000+02:00
diff --git a/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
@@ -12,24 +12,21 @@
 namespace Symfony\Component\Security\Http\Tests\Authentication;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
 
 class DefaultAuthenticationFailureHandlerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $httpKernel;
     private $httpUtils;
     private $logger;
     private $request;
     private $session;
     private $exception;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->httpKernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $this->httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
diff --git a/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -22,8 +21,6 @@
 
 class SimpleAuthenticationHandlerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $successHandler;
 
     private $failureHandler;
@@ -36,7 +33,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
 
     private $response;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->successHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface')->getMock();
         $this->failureHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface')->getMock();
diff --git a/Tests/Firewall/AccessListenerTest.php b/Tests/Firewall/AccessListenerTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Http\Firewall\AccessListener;
 
 class AccessListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');
diff --git a/Tests/Firewall/BasicAuthenticationListenerTest.php b/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
@@ -22,8 +21,6 @@
 
 class BasicAuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testHandleWithValidUsernameAndPasswordServerParameters()
     {
         $request = new Request([], [], [], [], [], [
diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -35,8 +34,6 @@
 
 class ContextListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testItRequiresContextKey()
     {
         $this->expectException('InvalidArgumentException');
diff --git a/Tests/Firewall/DigestDataTest.php b/Tests/Firewall/DigestDataTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Http\Firewall\DigestData;
 
 /**
  * @group legacy
  */
 class DigestDataTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetResponse()
     {
         $digestAuth = new DigestData(
@@ -166,7 +163,7 @@ public function testIsNonceExpired()
         $this->assertFalse($digestAuth->isNonceExpired());
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         class_exists('Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener', true);
     }
diff --git a/Tests/Firewall/LogoutListenerTest.php b/Tests/Firewall/LogoutListenerTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Firewall\LogoutListener;
 
 class LogoutListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testHandleUnmatchedPath()
     {
         list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener();
diff --git a/Tests/Firewall/RememberMeListenerTest.php b/Tests/Firewall/RememberMeListenerTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Firewall\RememberMeListener;
 use Symfony\Component\Security\Http\SecurityEvents;
 
 class RememberMeListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
     {
         list($listener, $tokenStorage) = $this->getListener();
diff --git a/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener;
 
 class RemoteUserAuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetPreAuthenticatedData()
     {
         $serverVars = [
diff --git a/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
@@ -21,8 +20,6 @@
 
 class SimplePreAuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $authenticationManager;
     private $dispatcher;
     private $event;
@@ -96,7 +93,7 @@ public function testHandlecatchAuthenticationException()
         $listener->handle($this->event);
     }
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager')
             ->disableOriginalConstructor()
@@ -119,7 +116,7 @@ private function doSetUp()
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->authenticationManager = null;
         $this->dispatcher = null;
diff --git a/Tests/Firewall/SwitchUserListenerTest.php b/Tests/Firewall/SwitchUserListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -26,8 +25,6 @@
 
 class SwitchUserListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $tokenStorage;
 
     private $userProvider;
@@ -40,7 +37,7 @@ class SwitchUserListenerTest extends TestCase
 
     private $event;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->tokenStorage = new TokenStorage();
         $this->userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
diff --git a/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php b/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Tests\Http\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -27,8 +26,6 @@
 
 class UsernamePasswordFormAuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getUsernameForLength
      */
diff --git a/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php b/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Tests\Http\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -32,8 +31,6 @@
  */
 class UsernamePasswordJsonAuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var UsernamePasswordJsonAuthenticationListener
      */
diff --git a/Tests/Firewall/X509AuthenticationListenerTest.php b/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Firewall\X509AuthenticationListener;
 
 class X509AuthenticationListenerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider dataProviderGetPreAuthenticatedData
      */
diff --git a/Tests/HttpUtilsTest.php b/Tests/HttpUtilsTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -22,8 +21,6 @@
 
 class HttpUtilsTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testCreateRedirectResponseWithPath()
     {
         $utils = new HttpUtils($this->getUrlGenerator());
diff --git a/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php b/Tests/Logout/CsrfTokenClearingLogoutHandlerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Logout;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -22,13 +21,11 @@
 
 class CsrfTokenClearingLogoutHandlerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $session;
     private $csrfTokenStorage;
     private $csrfTokenClearingLogoutHandler;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->session = new Session(new MockArraySessionStorage());
         $this->csrfTokenStorage = new SessionTokenStorage($this->session, 'foo');
diff --git a/Tests/Logout/LogoutUrlGeneratorTest.php b/Tests/Logout/LogoutUrlGeneratorTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\Logout;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
@@ -26,14 +25,12 @@
  */
 class LogoutUrlGeneratorTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var TokenStorage */
     private $tokenStorage;
     /** @var LogoutUrlGenerator */
     private $generator;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $requestStack = $this->getMockBuilder(RequestStack::class)->getMock();
         $request = $this->getMockBuilder(Request::class)->getMock();
diff --git a/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Security\Http\Tests\RememberMe;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\RememberMe\AbstractRememberMeServices;
 use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
 
 class AbstractRememberMeServicesTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetRememberMeParameter()
     {
         $service = $this->getService(null, ['remember_me_parameter' => 'foo']);
diff --git a/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Tests\RememberMe;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -25,9 +24,7 @@
 
 class PersistentTokenBasedRememberMeServicesTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         try {
             random_bytes(1);
diff --git a/Tests/Session/SessionAuthenticationStrategyTest.php b/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Security\Http\Tests\Session;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
 
 class SessionAuthenticationStrategyTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testSessionIsNotChanged()
     {
         $request = $this->getRequest();

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Http\Firewall\AccessListener;`
`17`	`16`
`18`	`17`	`class AccessListenerTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ForwardCompatTestTrait;`
`21`		`-`
`22`	`19`	`public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()`
`23`	`20`	`{`
`24`	`21`	`$this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\HttpFoundation\Request;`
`17`	`16`	`use Symfony\Component\HttpFoundation\Response;`
`18`	`17`	`use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;`
`@@ -22,8 +21,6 @@`
`22`	`21`
`23`	`22`	`class BasicAuthenticationListenerTest extends TestCase`
`24`	`23`	`{`
`25`		`- use ForwardCompatTestTrait;`
`26`		`-`
`27`	`24`	`public function testHandleWithValidUsernameAndPasswordServerParameters()`
`28`	`25`	`{`
`29`	`26`	`$request = new Request([], [], [], [], [], [`
Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,13 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Security\Http\Firewall\DigestData;`
`17`	`16`
`18`	`17`	`/**`
`19`	`18`	`* @group legacy`
`20`	`19`	`*/`
`21`	`20`	`class DigestDataTest extends TestCase`
`22`	`21`	`{`
`23`		`- use ForwardCompatTestTrait;`
`24`		`-`
`25`	`22`	`public function testGetResponse()`
`26`	`23`	`{`
`27`	`24`	`$digestAuth = new DigestData(`
`@@ -166,7 +163,7 @@ public function testIsNonceExpired()`
`166`	`163`	`$this->assertFalse($digestAuth->isNonceExpired());`
`167`	`164`	`}`
`168`	`165`
`169`		`- private function doSetUp()`
	`166`	`+ protected function setUp()`
`170`	`167`	`{`
`171`	`168`	`class_exists('Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener', true);`
`172`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,12 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\HttpFoundation\Request;`
`17`	`16`	`use Symfony\Component\HttpFoundation\Response;`
`18`	`17`	`use Symfony\Component\Security\Http\Firewall\LogoutListener;`
`19`	`18`
`20`	`19`	`class LogoutListenerTest extends TestCase`
`21`	`20`	`{`
`22`		`- use ForwardCompatTestTrait;`
`23`		`-`
`24`	`21`	`public function testHandleUnmatchedPath()`
`25`	`22`	`{`
`26`	`23`	`list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener();`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,11 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\HttpFoundation\Request;`
`17`	`16`	`use Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener;`
`18`	`17`
`19`	`18`	`class RemoteUserAuthenticationListenerTest extends TestCase`
`20`	`19`	`{`
`21`		`- use ForwardCompatTestTrait;`
`22`		`-`
`23`	`20`	`public function testGetPreAuthenticatedData()`
`24`	`21`	`{`
`25`	`22`	`$serverVars = [`