Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 3fa9ee6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Update to PHPUnit namespaces remove translation data collector when not usable
2 parents 7d07869 + 6874fd5 commit 3fa9ee6

File tree

81 files changed

+165
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+165
-81
lines changed

‎Core/Tests/Authentication/AuthenticationProviderManagerTest.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\Core\Tests\Authentication;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
1516
use Symfony\Component\Security\Core\Exception\ProviderNotFoundException;
1617
use Symfony\Component\Security\Core\Exception\AuthenticationException;
1718
use Symfony\Component\Security\Core\Exception\AccountStatusException;
1819
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1920

20-
class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
21+
class AuthenticationProviderManagerTest extends TestCase
2122
{
2223
/**
2324
* @expectedException \InvalidArgumentException

‎Core/Tests/Authentication/AuthenticationTrustResolverTest.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\Core\Tests\Authentication;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
1516

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

‎Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.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\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider;
1516

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

‎Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.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\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
1516
use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;
1617
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
1718

18-
class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
19+
class DaoAuthenticationProviderTest extends TestCase
1920
{
2021
/**
2122
* @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException

‎Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.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\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider;
1516
use Symfony\Component\Security\Core\Exception\LockedException;
1617

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

‎Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.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\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider;
1516
use Symfony\Component\Security\Core\Exception\DisabledException;
1617
use Symfony\Component\Security\Core\Role\Role;
1718

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

‎Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.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\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Exception\AccountExpiredException;
1516
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
1617
use Symfony\Component\Security\Core\Exception\CredentialsExpiredException;
1718
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
1819
use Symfony\Component\Security\Core\Role\Role;
1920
use Symfony\Component\Security\Core\Role\SwitchUserRole;
2021

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

‎Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.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\Core\Tests\Authentication\RememberMe;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
1516
use Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider;
1617

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

‎Core/Tests/Authentication/RememberMe/PersistentTokenTest.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\Core\Tests\Authentication\RememberMe;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
1516

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

‎Core/Tests/Authentication/Token/AbstractTokenTest.php

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

1212
namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
1516
use Symfony\Component\Security\Core\Role\Role;
1617
use Symfony\Component\Security\Core\Role\SwitchUserRole;
@@ -57,7 +58,8 @@ public function getCredentials()
5758
}
5859
}
5960

60-
class AbstractTokenTest extends \PHPUnit_Framework_TestCase
61+
/** @noinspection PhpUndefinedClassInspection */
62+
class AbstractTokenTest extends TestCase
6163
{
6264
public function testGetUsername()
6365
{

‎Core/Tests/Authentication/Token/AnonymousTokenTest.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\Core\Tests\Authentication\Token;
1313

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

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

‎Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.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\Core\Tests\Authentication\Token;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
1516
use Symfony\Component\Security\Core\Role\Role;
1617

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

‎Core/Tests/Authentication/Token/RememberMeTokenTest.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\Core\Tests\Authentication\Token;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
1516
use Symfony\Component\Security\Core\Role\Role;
1617

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

‎Core/Tests/Authentication/Token/Storage/TokenStorageTest.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\Core\Tests\Authentication\Token\Storage;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
1516

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

‎Core/Tests/Authentication/Token/UsernamePasswordTokenTest.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\Core\Tests\Authentication\Token;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1516
use Symfony\Component\Security\Core\Role\Role;
1617

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

‎Core/Tests/Authorization/AccessDecisionManagerTest.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\Core\Tests\Authorization;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
1516
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1617

17-
class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
18+
class AccessDecisionManagerTest extends TestCase
1819
{
1920
/**
2021
* @group legacy

‎Core/Tests/Authorization/AuthorizationCheckerTest.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\Core\Tests\Authorization;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
1516
use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
1617

17-
class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase
18+
class AuthorizationCheckerTest extends TestCase
1819
{
1920
private $authenticationManager;
2021
private $accessDecisionManager;

‎Core/Tests/Authorization/ExpressionLanguageTest.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\Core\Tests\Authorization;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
1516
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
1617
use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
1718
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
1819
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1920
use Symfony\Component\Security\Core\User\User;
2021

21-
class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
22+
class ExpressionLanguageTest extends TestCase
2223
{
2324
/**
2425
* @dataProvider provider

‎Core/Tests/Authorization/Voter/AbstractVoterTest.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\Core\Tests\Authorization\Voter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1516

1617
/**
1718
* @group legacy
1819
*/
19-
class AbstractVoterTest extends \PHPUnit_Framework_TestCase
20+
class AbstractVoterTest extends TestCase
2021
{
2122
/**
2223
* @var TokenInterface

‎Core/Tests/Authorization/Voter/AuthenticatedVoterTest.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\Core\Tests\Authorization\Voter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
1516
use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
1617
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1718

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

‎Core/Tests/Authorization/Voter/ExpressionVoterTest.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\Core\Tests\Authorization\Voter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter;
1516
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1617
use Symfony\Component\Security\Core\Role\Role;
1718

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

‎Core/Tests/Authorization/Voter/RoleVoterTest.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\Core\Tests\Authorization\Voter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authorization\Voter\RoleVoter;
1516
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1617
use Symfony\Component\Security\Core\Role\Role;
1718

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

‎Core/Tests/Encoder/BCryptPasswordEncoderTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
1516

1617
/**
1718
* @author Elnur Abdurrakhimov <[email protected]>
1819
*/
19-
class BCryptPasswordEncoderTest extends \PHPUnit_Framework_TestCase
20+
class BCryptPasswordEncoderTest extends TestCase
2021
{
2122
const PASSWORD = 'password';
2223
const BYTES = '0123456789abcdef';

‎Core/Tests/Encoder/BasePasswordEncoderTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder;
1516

1617
class PasswordEncoder extends BasePasswordEncoder
@@ -24,7 +25,7 @@ public function isPasswordValid($encoded, $raw, $salt)
2425
}
2526
}
2627

27-
class BasePasswordEncoderTest extends \PHPUnit_Framework_TestCase
28+
class BasePasswordEncoderTest extends TestCase
2829
{
2930
public function testComparePassword()
3031
{

‎Core/Tests/Encoder/EncoderFactoryTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
1516
use Symfony\Component\Security\Core\Encoder\EncoderFactory;
1617
use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface;
1718
use Symfony\Component\Security\Core\User\User;
1819
use Symfony\Component\Security\Core\User\UserInterface;
1920

20-
class EncoderFactoryTest extends \PHPUnit_Framework_TestCase
21+
class EncoderFactoryTest extends TestCase
2122
{
2223
public function testGetEncoderWithMessageDigestEncoder()
2324
{

‎Core/Tests/Encoder/MessageDigestPasswordEncoderTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
1516

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

‎Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder;
1516

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

‎Core/Tests/Encoder/PlaintextPasswordEncoderTest.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\Core\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
1516

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

0 commit comments

Comments
 (0)