Skip to content

Commit e45c7a3

Browse files
nicolas-grekasnicolas-grekas
committed
minor symfony#32625 [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion (janvt)
This PR was squashed before being merged into the 3.4 branch (closes symfony#32625). Discussion ---------- [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion FrameworkBundle & SecurityBundle each had 2 classes called WebTestCase, one of which is only meant for internal tests. To avoid confusion the internal class has been renamed to AbstractWebTestCase and made abstract. | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no (or, yes, but internal class) | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#32577 | License | MIT This PR is to ease integration, as not all test classes are present in all currently maintained branches. See symfony#32617 Commits ------- 775d970 [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion
2 parents 90acd03 + 775d970 commit e45c7a3

31 files changed

+32
-32
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests;
1313

1414
use Symfony\Bundle\FrameworkBundle\Client;
15-
use Symfony\Bundle\FrameworkBundle\Tests\Functional\WebTestCase;
15+
use Symfony\Bundle\FrameworkBundle\Tests\Functional\AbstractWebTestCase;
1616
use Symfony\Component\HttpFoundation\Response;
1717

18-
class ClientTest extends WebTestCase
18+
class ClientTest extends AbstractWebTestCase
1919
{
2020
public function testRebootKernelBetweenRequests()
2121
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
1515
use Symfony\Component\Filesystem\Filesystem;
1616

17-
class WebTestCase extends BaseWebTestCase
17+
abstract class AbstractWebTestCase extends BaseWebTestCase
1818
{
1919
public static function assertRedirect($response, $location)
2020
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class AnnotatedControllerTest extends WebTestCase
14+
class AnnotatedControllerTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getRoutes

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
2121
use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
2222

23-
class AutowiringTypesTest extends WebTestCase
23+
class AutowiringTypesTest extends AbstractWebTestCase
2424
{
2525
public function testAnnotationReaderAutowiring()
2626
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* @group functional
2020
*/
21-
class CachePoolClearCommandTest extends WebTestCase
21+
class CachePoolClearCommandTest extends AbstractWebTestCase
2222
{
2323
protected function setUp()
2424
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Cache\Adapter\RedisAdapter;
1616
use Symfony\Component\Cache\Exception\InvalidArgumentException;
1717

18-
class CachePoolsTest extends WebTestCase
18+
class CachePoolsTest extends AbstractWebTestCase
1919
{
2020
public function testCachePools()
2121
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @group functional
2121
*/
22-
class ConfigDebugCommandTest extends WebTestCase
22+
class ConfigDebugCommandTest extends AbstractWebTestCase
2323
{
2424
private $application;
2525

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDumpReferenceCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @group functional
2121
*/
22-
class ConfigDumpReferenceCommandTest extends WebTestCase
22+
class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
2323
{
2424
private $application;
2525

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* @group functional
1919
*/
20-
class ContainerDebugCommandTest extends WebTestCase
20+
class ContainerDebugCommandTest extends AbstractWebTestCase
2121
{
2222
public function testDumpContainerIfNotExists()
2323
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDumpTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* Checks that the container compiles correctly when all the bundle features are enabled.
1616
*/
17-
class ContainerDumpTest extends WebTestCase
17+
class ContainerDumpTest extends AbstractWebTestCase
1818
{
1919
public function testContainerCompilationInDebug()
2020
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* @group functional
1919
*/
20-
class DebugAutowiringCommandTest extends WebTestCase
20+
class DebugAutowiringCommandTest extends AbstractWebTestCase
2121
{
2222
public function testBasicFunctionality()
2323
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class FragmentTest extends WebTestCase
14+
class FragmentTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class ProfilerTest extends WebTestCase
14+
class ProfilerTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\PropertyInfo\Type;
1515

16-
class PropertyInfoTest extends WebTestCase
16+
class PropertyInfoTest extends AbstractWebTestCase
1717
{
1818
public function testPhpDocPriority()
1919
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* @author Kévin Dunglas <dunglas@gmail.com>
1616
*/
17-
class SerializerTest extends WebTestCase
17+
class SerializerTest extends AbstractWebTestCase
1818
{
1919
public function testDeserializeArrayOfObject()
2020
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class SessionTest extends WebTestCase
14+
class SessionTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* Tests session attributes persist.

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class SubRequestsTest extends WebTestCase
14+
class SubRequestsTest extends AbstractWebTestCase
1515
{
1616
public function testStateAfterSubRequest()
1717
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php renamed to ‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
1515
use Symfony\Component\Filesystem\Filesystem;
1616

17-
class WebTestCase extends BaseWebTestCase
17+
class AbstractWebTestCase extends BaseWebTestCase
1818
{
1919
public static function assertRedirect($response, $location)
2020
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class AuthenticationCommencingTest extends WebTestCase
14+
class AuthenticationCommencingTest extends AbstractWebTestCase
1515
{
1616
public function testAuthenticationIsCommencingIfAccessDeniedExceptionIsWrapped()
1717
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/AutowiringTypesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
1515
use Symfony\Component\Security\Core\Authorization\TraceableAccessDecisionManager;
1616

17-
class AutowiringTypesTest extends WebTestCase
17+
class AutowiringTypesTest extends AbstractWebTestCase
1818
{
1919
public function testAccessDecisionManagerAutowiring()
2020
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class CsrfFormLoginTest extends WebTestCase
14+
class CsrfFormLoginTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPointBundle\Security\EntryPointStub;
1515

16-
class FirewallEntryPointTest extends WebTestCase
16+
class FirewallEntryPointTest extends AbstractWebTestCase
1717
{
1818
public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials()
1919
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class FormLoginTest extends WebTestCase
14+
class FormLoginTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* @author Kévin Dunglas <dunglas@gmail.com>
1818
*/
19-
class JsonLoginTest extends WebTestCase
19+
class JsonLoginTest extends AbstractWebTestCase
2020
{
2121
public function testDefaultJsonLoginSuccess()
2222
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class LocalizedRoutesAsPathTest extends WebTestCase
14+
class LocalizedRoutesAsPathTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getLocales

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class LogoutTest extends WebTestCase
14+
class LogoutTest extends AbstractWebTestCase
1515
{
1616
public function testSessionLessRememberMeLogout()
1717
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
class SecurityRoutingIntegrationTest extends WebTestCase
14+
class SecurityRoutingIntegrationTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1515
use Symfony\Component\Security\Core\User\User;
1616

17-
class SecurityTest extends WebTestCase
17+
class SecurityTest extends AbstractWebTestCase
1818
{
1919
public function testServiceIsFunctional()
2020
{

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* @requires extension pdo_sqlite
3636
* @group legacy
3737
*/
38-
class SetAclCommandTest extends WebTestCase
38+
class SetAclCommandTest extends AbstractWebTestCase
3939
{
4040
const OBJECT_CLASS = 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\Entity\Car';
4141
const SECURITY_CLASS = 'Symfony\Component\Security\Core\User\User';

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\HttpFoundation\JsonResponse;
1515
use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
1616

17-
class SwitchUserTest extends WebTestCase
17+
class SwitchUserTest extends AbstractWebTestCase
1818
{
1919
/**
2020
* @dataProvider getTestParameters

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Sarah Khalil <mkhalil.sarah@gmail.com>
2727
*/
28-
class UserPasswordEncoderCommandTest extends WebTestCase
28+
class UserPasswordEncoderCommandTest extends AbstractWebTestCase
2929
{
3030
/** @var CommandTester */
3131
private $passwordEncoderCommandTester;

0 commit comments

Comments
 (0)