Skip to content

Commit eb5aee5

Browse files
Merge branch '2.8' into 3.2
* 2.8: Update to PHPUnit namespaces Minor typo fix messsagesData -> messagesData remove translation data collector when not usable
2 parents bd2250a + e9e8d44 commit eb5aee5

33 files changed

+66
-33
lines changed

Tests/AccessMapTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\AccessMap;
1516

16-
class AccessMapTest extends \PHPUnit_Framework_TestCase
17+
class AccessMapTest extends TestCase
1718
{
1819
public function testReturnsFirstMatchedPattern()
1920
{

Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Authentication;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
1516
use Symfony\Component\Security\Core\Security;
1617
use Symfony\Component\HttpFoundation\Response;
1718
use Symfony\Component\HttpKernel\HttpKernelInterface;
1819

19-
class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCase
20+
class DefaultAuthenticationFailureHandlerTest extends TestCase
2021
{
2122
private $httpKernel;
2223
private $httpUtils;

Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Authentication;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler;
1617

17-
class DefaultAuthenticationSuccessHandlerTest extends \PHPUnit_Framework_TestCase
18+
class DefaultAuthenticationSuccessHandlerTest extends TestCase
1819
{
1920
private $httpUtils = null;
2021

Tests/Authentication/SimpleAuthenticationHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
1617
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1718
use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
1819
use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
1920
use Symfony\Component\Security\Http\Authentication\SimpleAuthenticationHandler;
2021

21-
class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
22+
class SimpleAuthenticationHandlerTest extends TestCase
2223
{
2324
private $successHandler;
2425

Tests/EntryPoint/BasicAuthenticationEntryPointTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\EntryPoint;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint;
1516
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1617

17-
class BasicAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
18+
class BasicAuthenticationEntryPointTest extends TestCase
1819
{
1920
public function testStart()
2021
{

Tests/EntryPoint/DigestAuthenticationEntryPointTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\EntryPoint;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint;
1516
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1617
use Symfony\Component\Security\Core\Exception\NonceExpiredException;
1718

18-
class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
19+
class DigestAuthenticationEntryPointTest extends TestCase
1920
{
2021
public function testStart()
2122
{

Tests/EntryPoint/FormAuthenticationEntryPointTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\EntryPoint;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint;
1617
use Symfony\Component\HttpKernel\HttpKernelInterface;
1718

18-
class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
19+
class FormAuthenticationEntryPointTest extends TestCase
1920
{
2021
public function testStart()
2122
{

Tests/EntryPoint/RetryAuthenticationEntryPointTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\EntryPoint;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint;
1516
use Symfony\Component\HttpFoundation\Request;
1617

17-
class RetryAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
18+
class RetryAuthenticationEntryPointTest extends TestCase
1819
{
1920
/**
2021
* @dataProvider dataForStart

Tests/Firewall/AbstractPreAuthenticatedListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
1617
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1718
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1819

19-
class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
20+
class AbstractPreAuthenticatedListenerTest extends TestCase
2021
{
2122
public function testHandleWithValidValues()
2223
{

Tests/Firewall/AccessListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\Firewall\AccessListener;
1516

16-
class AccessListenerTest extends \PHPUnit_Framework_TestCase
17+
class AccessListenerTest extends TestCase
1718
{
1819
/**
1920
* @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException

Tests/Firewall/AnonymousAuthenticationListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
1516
use Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener;
1617

17-
class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
18+
class AnonymousAuthenticationListenerTest extends TestCase
1819
{
1920
public function testHandleWithTokenStorageHavingAToken()
2021
{

Tests/Firewall/BasicAuthenticationListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
1617
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1718
use Symfony\Component\HttpFoundation\Response;
1819
use Symfony\Component\Security\Http\Firewall\BasicAuthenticationListener;
1920
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
2021

21-
class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
22+
class BasicAuthenticationListenerTest extends TestCase
2223
{
2324
public function testHandleWithValidUsernameAndPasswordServerParameters()
2425
{

Tests/Firewall/ChannelListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\Firewall\ChannelListener;
1516
use Symfony\Component\HttpFoundation\Response;
1617

17-
class ChannelListenerTest extends \PHPUnit_Framework_TestCase
18+
class ChannelListenerTest extends TestCase
1819
{
1920
public function testHandleWithNotSecuredRequestAndHttpChannel()
2021
{

Tests/Firewall/ContextListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\HttpFoundation\Response;
1617
use Symfony\Component\HttpFoundation\Session\Session;
@@ -24,7 +25,7 @@
2425
use Symfony\Component\Security\Http\Firewall\ContextListener;
2526
use Symfony\Component\EventDispatcher\EventDispatcher;
2627

27-
class ContextListenerTest extends \PHPUnit_Framework_TestCase
28+
class ContextListenerTest extends TestCase
2829
{
2930
/**
3031
* @expectedException \InvalidArgumentException

Tests/Firewall/DigestDataTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\Firewall\DigestData;
1516

16-
class DigestDataTest extends \PHPUnit_Framework_TestCase
17+
class DigestDataTest extends TestCase
1718
{
1819
public function testGetResponse()
1920
{

Tests/Firewall/ExceptionListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\HttpFoundation\Response;
1617
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -24,7 +25,7 @@
2425
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
2526
use Symfony\Component\Security\Http\HttpUtils;
2627

27-
class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
28+
class ExceptionListenerTest extends TestCase
2829
{
2930
/**
3031
* @dataProvider getAuthenticationExceptionProvider

Tests/Firewall/LogoutListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\HttpFoundation\Response;
1617
use Symfony\Component\Security\Http\Firewall\LogoutListener;
1718

18-
class LogoutListenerTest extends \PHPUnit_Framework_TestCase
19+
class LogoutListenerTest extends TestCase
1920
{
2021
public function testHandleUnmatchedPath()
2122
{

Tests/Firewall/RememberMeListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1516
use Symfony\Component\Security\Http\Firewall\RememberMeListener;
1617
use Symfony\Component\HttpFoundation\Request;
1718
use Symfony\Component\Security\Http\SecurityEvents;
1819

19-
class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
20+
class RememberMeListenerTest extends TestCase
2021
{
2122
public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
2223
{

Tests/Firewall/RemoteUserAuthenticationListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener;
1617

17-
class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
18+
class RemoteUserAuthenticationListenerTest extends TestCase
1819
{
1920
public function testGetPreAuthenticatedData()
2021
{

Tests/Firewall/SimplePreAuthenticationListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1617
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
1718
use Symfony\Component\Security\Http\Firewall\SimplePreAuthenticationListener;
1819
use Symfony\Component\Security\Http\SecurityEvents;
1920

20-
class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
21+
class SimplePreAuthenticationListenerTest extends TestCase
2122
{
2223
private $authenticationManager;
2324
private $dispatcher;

Tests/Firewall/SwitchUserListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\Event\SwitchUserEvent;
1516
use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
1617
use Symfony\Component\Security\Http\SecurityEvents;
1718

18-
class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
19+
class SwitchUserListenerTest extends TestCase
1920
{
2021
private $tokenStorage;
2122

Tests/Firewall/X509AuthenticationListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Security\Http\Firewall\X509AuthenticationListener;
1617

17-
class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
18+
class X509AuthenticationListenerTest extends TestCase
1819
{
1920
/**
2021
* @dataProvider dataProviderGetPreAuthenticatedData

Tests/FirewallMapTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Http\FirewallMap;
1516
use Symfony\Component\HttpFoundation\Request;
1617

17-
class FirewallMapTest extends \PHPUnit_Framework_TestCase
18+
class FirewallMapTest extends TestCase
1819
{
1920
public function testGetListeners()
2021
{

Tests/FirewallTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
1617
use Symfony\Component\HttpKernel\HttpKernelInterface;
1718
use Symfony\Component\Security\Http\Firewall;
1819

19-
class FirewallTest extends \PHPUnit_Framework_TestCase
20+
class FirewallTest extends TestCase
2021
{
2122
public function testOnKernelRequestRegistersExceptionListener()
2223
{

Tests/HttpUtilsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
1617
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
1718
use Symfony\Component\Security\Core\Security;
1819
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
1920
use Symfony\Component\Security\Http\HttpUtils;
2021

21-
class HttpUtilsTest extends \PHPUnit_Framework_TestCase
22+
class HttpUtilsTest extends TestCase
2223
{
2324
public function testCreateRedirectResponseWithPath()
2425
{

Tests/Logout/CookieClearingLogoutHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Logout;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
1617
use Symfony\Component\HttpFoundation\Request;
1718
use Symfony\Component\Security\Http\Logout\CookieClearingLogoutHandler;
1819

19-
class CookieClearingLogoutHandlerTest extends \PHPUnit_Framework_TestCase
20+
class CookieClearingLogoutHandlerTest extends TestCase
2021
{
2122
public function testLogout()
2223
{

Tests/Logout/DefaultLogoutSuccessHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Logout;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler;
1617

17-
class DefaultLogoutSuccessHandlerTest extends \PHPUnit_Framework_TestCase
18+
class DefaultLogoutSuccessHandlerTest extends TestCase
1819
{
1920
public function testLogout()
2021
{

Tests/Logout/SessionLogoutHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Security\Http\Tests\Logout;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Response;
1516
use Symfony\Component\Security\Http\Logout\SessionLogoutHandler;
1617

17-
class SessionLogoutHandlerTest extends \PHPUnit_Framework_TestCase
18+
class SessionLogoutHandlerTest extends TestCase
1819
{
1920
public function testLogout()
2021
{

0 commit comments

Comments
 (0)