Merge branch '2.8' into 3.2

nicolas-grekas · nicolas-grekas · commit eb5aee56fd2d · 2017-02-18T18:28:00.000+01:00
* 2.8:
  Update to PHPUnit namespaces
  Minor typo fix messsagesData -&gt; messagesData
  remove translation data collector when not usable
diff --git a/Tests/AccessMapTest.php b/Tests/AccessMapTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Security\Http\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\AccessMap;
 
-class AccessMapTest extends \PHPUnit_Framework_TestCase
+class AccessMapTest extends TestCase
 {
     public function testReturnsFirstMatchedPattern()
     {
diff --git a/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Http\Tests\Authentication;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
-class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCase
+class DefaultAuthenticationFailureHandlerTest extends TestCase
 {
     private $httpKernel;
     private $httpUtils;
diff --git a/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php b/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Authentication;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler;
 
-class DefaultAuthenticationSuccessHandlerTest extends \PHPUnit_Framework_TestCase
+class DefaultAuthenticationSuccessHandlerTest extends TestCase
 {
     private $httpUtils = null;
 
diff --git a/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Security\Http\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\SimpleAuthenticationHandler;
 
-class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
+class SimpleAuthenticationHandlerTest extends TestCase
 {
     private $successHandler;
 
diff --git a/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php b/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
-class BasicAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
+class BasicAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
     {
diff --git a/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php b/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\NonceExpiredException;
 
-class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
+class DigestAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
     {
diff --git a/Tests/EntryPoint/FormAuthenticationEntryPointTest.php b/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
-class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
+class FormAuthenticationEntryPointTest extends TestCase
 {
     public function testStart()
     {
diff --git a/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php b/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\EntryPoint;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint;
 use Symfony\Component\HttpFoundation\Request;
 
-class RetryAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
+class RetryAuthenticationEntryPointTest extends TestCase
 {
     /**
      * @dataProvider dataForStart
diff --git a/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php b/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
-class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
+class AbstractPreAuthenticatedListenerTest extends TestCase
 {
     public function testHandleWithValidValues()
     {
diff --git a/Tests/Firewall/AccessListenerTest.php b/Tests/Firewall/AccessListenerTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Firewall\AccessListener;
 
-class AccessListenerTest extends \PHPUnit_Framework_TestCase
+class AccessListenerTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
diff --git a/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener;
 
-class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
+class AnonymousAuthenticationListenerTest extends TestCase
 {
     public function testHandleWithTokenStorageHavingAToken()
     {
diff --git a/Tests/Firewall/BasicAuthenticationListenerTest.php b/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Firewall\BasicAuthenticationListener;
 use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
 
-class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
+class BasicAuthenticationListenerTest extends TestCase
 {
     public function testHandleWithValidUsernameAndPasswordServerParameters()
     {
diff --git a/Tests/Firewall/ChannelListenerTest.php b/Tests/Firewall/ChannelListenerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Firewall\ChannelListener;
 use Symfony\Component\HttpFoundation\Response;
 
-class ChannelListenerTest extends \PHPUnit_Framework_TestCase
+class ChannelListenerTest extends TestCase
 {
     public function testHandleWithNotSecuredRequestAndHttpChannel()
     {
diff --git a/Tests/Firewall/ContextListenerTest.php b/Tests/Firewall/ContextListenerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -24,7 +25,7 @@
 use Symfony\Component\Security\Http\Firewall\ContextListener;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-class ContextListenerTest extends \PHPUnit_Framework_TestCase
+class ContextListenerTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException
diff --git a/Tests/Firewall/DigestDataTest.php b/Tests/Firewall/DigestDataTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Firewall\DigestData;
 
-class DigestDataTest extends \PHPUnit_Framework_TestCase
+class DigestDataTest extends TestCase
 {
     public function testGetResponse()
     {
diff --git a/Tests/Firewall/ExceptionListenerTest.php b/Tests/Firewall/ExceptionListenerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -24,7 +25,7 @@
 use Symfony\Component\Security\Http\Firewall\ExceptionListener;
 use Symfony\Component\Security\Http\HttpUtils;
 
-class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
+class ExceptionListenerTest extends TestCase
 {
     /**
      * @dataProvider getAuthenticationExceptionProvider
diff --git a/Tests/Firewall/LogoutListenerTest.php b/Tests/Firewall/LogoutListenerTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Firewall\LogoutListener;
 
-class LogoutListenerTest extends \PHPUnit_Framework_TestCase
+class LogoutListenerTest extends TestCase
 {
     public function testHandleUnmatchedPath()
     {
diff --git a/Tests/Firewall/RememberMeListenerTest.php b/Tests/Firewall/RememberMeListenerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Firewall\RememberMeListener;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\SecurityEvents;
 
-class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
+class RememberMeListenerTest extends TestCase
 {
     public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
     {
diff --git a/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener;
 
-class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
+class RemoteUserAuthenticationListenerTest extends TestCase
 {
     public function testGetPreAuthenticatedData()
     {
diff --git a/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Component\Security\Http\Firewall\SimplePreAuthenticationListener;
 use Symfony\Component\Security\Http\SecurityEvents;
 
-class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
+class SimplePreAuthenticationListenerTest extends TestCase
 {
     private $authenticationManager;
     private $dispatcher;
diff --git a/Tests/Firewall/SwitchUserListenerTest.php b/Tests/Firewall/SwitchUserListenerTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\Event\SwitchUserEvent;
 use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
 use Symfony\Component\Security\Http\SecurityEvents;
 
-class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
+class SwitchUserListenerTest extends TestCase
 {
     private $tokenStorage;
 
diff --git a/Tests/Firewall/X509AuthenticationListenerTest.php b/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Firewall;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Firewall\X509AuthenticationListener;
 
-class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
+class X509AuthenticationListenerTest extends TestCase
 {
     /**
      * @dataProvider dataProviderGetPreAuthenticatedData
diff --git a/Tests/FirewallMapTest.php b/Tests/FirewallMapTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Http\FirewallMap;
 use Symfony\Component\HttpFoundation\Request;
 
-class FirewallMapTest extends \PHPUnit_Framework_TestCase
+class FirewallMapTest extends TestCase
 {
     public function testGetListeners()
     {
diff --git a/Tests/FirewallTest.php b/Tests/FirewallTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Http\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Http\Firewall;
 
-class FirewallTest extends \PHPUnit_Framework_TestCase
+class FirewallTest extends TestCase
 {
     public function testOnKernelRequestRegistersExceptionListener()
     {
diff --git a/Tests/HttpUtilsTest.php b/Tests/HttpUtilsTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Security\Http\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\HttpUtils;
 
-class HttpUtilsTest extends \PHPUnit_Framework_TestCase
+class HttpUtilsTest extends TestCase
 {
     public function testCreateRedirectResponseWithPath()
     {
diff --git a/Tests/Logout/CookieClearingLogoutHandlerTest.php b/Tests/Logout/CookieClearingLogoutHandlerTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Security\Http\Tests\Logout;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Logout\CookieClearingLogoutHandler;
 
-class CookieClearingLogoutHandlerTest extends \PHPUnit_Framework_TestCase
+class CookieClearingLogoutHandlerTest extends TestCase
 {
     public function testLogout()
     {
diff --git a/Tests/Logout/DefaultLogoutSuccessHandlerTest.php b/Tests/Logout/DefaultLogoutSuccessHandlerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Logout;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler;
 
-class DefaultLogoutSuccessHandlerTest extends \PHPUnit_Framework_TestCase
+class DefaultLogoutSuccessHandlerTest extends TestCase
 {
     public function testLogout()
     {
diff --git a/Tests/Logout/SessionLogoutHandlerTest.php b/Tests/Logout/SessionLogoutHandlerTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Security\Http\Tests\Logout;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Logout\SessionLogoutHandler;
 
-class SessionLogoutHandlerTest extends \PHPUnit_Framework_TestCase
+class SessionLogoutHandlerTest extends TestCase
 {
     public function testLogout()
     {
diff --git a/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Tests/RememberMe/AbstractRememberMeServicesTest.php
diff --git a/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
diff --git a/Tests/RememberMe/ResponseListenerTest.php b/Tests/RememberMe/ResponseListenerTest.php
diff --git a/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
diff --git a/Tests/Session/SessionAuthenticationStrategyTest.php b/Tests/Session/SessionAuthenticationStrategyTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Security\Http\AccessMap;`
`15`	`16`
`16`		`-class AccessMapTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class AccessMapTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`public function testReturnsFirstMatchedPattern()`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Authentication;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\HttpFoundation\Response;`
`15`	`16`	`use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler;`
`16`	`17`
`17`		`-class DefaultAuthenticationSuccessHandlerTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class DefaultAuthenticationSuccessHandlerTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`private $httpUtils = null;`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\EntryPoint;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;`
`15`	`16`	`use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`16`	`17`	`use Symfony\Component\Security\Core\Exception\NonceExpiredException;`
`17`	`18`
`18`		`-class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class DigestAuthenticationEntryPointTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`public function testStart()`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\HttpFoundation\Request;`
`15`	`16`	`use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;`
`16`	`17`	`use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;`
`17`	`18`	`use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`18`	`19`
`19`		`-class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class AbstractPreAuthenticatedListenerTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`public function testHandleWithValidValues()`
`22`	`23`	`{`