minor symfony#32626 [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion (janvt)

nicolas-grekas · nicolas-grekas · commit 945121748607 · 2019-07-23T13:18:12.000+02:00
This PR was squashed before being merged into the 4.2 branch (closes symfony#32626). 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. This PR should patch relatively well onto 4.* branches. See symfony#32617 Commits ------- 01aaece [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/RouterDebugCommandTest.php
@@ -17,7 +17,7 @@
 /**
  * @group functional
  */
-class RouterDebugCommandTest extends WebTestCase
+class RouterDebugCommandTest extends AbstractWebTestCase
 {
     private $application;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
@@ -18,7 +18,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\UnusedPrivateService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class TestServiceContainerTest extends WebTestCase
+class TestServiceContainerTest extends AbstractWebTestCase
 {
     public function testThatPrivateServicesAreUnavailableIfTestConfigIsDisabled()
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php
@@ -14,7 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
-class AbstractWebTestCase extends BaseWebTestCase
+abstract class AbstractWebTestCase extends BaseWebTestCase
 {
     public static function assertRedirect($response, $location)
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginLdapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginLdapTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpKernel\Kernel;
 
-class JsonLoginLdapTest extends WebTestCase
+class JsonLoginLdapTest extends AbstractWebTestCase
 {
     public function testKernelBoot()
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/MissingUserProviderTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/MissingUserProviderTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-class MissingUserProviderTest extends WebTestCase
+class MissingUserProviderTest extends AbstractWebTestCase
 {
     /**
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @group functional`
`19`	`19`	`*/`
`20`		`-class RouterDebugCommandTest extends WebTestCase`
	`20`	`+class RouterDebugCommandTest extends AbstractWebTestCase`
`21`	`21`	`{`
`22`	`22`	`private $application;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\UnusedPrivateService;`
`19`	`19`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`20`	`20`
`21`		`-class TestServiceContainerTest extends WebTestCase`
	`21`	`+class TestServiceContainerTest extends AbstractWebTestCase`
`22`	`22`	`{`
`23`	`23`	`public function testThatPrivateServicesAreUnavailableIfTestConfigIsDisabled()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;`
`15`	`15`	`use Symfony\Component\Filesystem\Filesystem;`
`16`	`16`
`17`		`-class AbstractWebTestCase extends BaseWebTestCase`
	`17`	`+abstract class AbstractWebTestCase extends BaseWebTestCase`
`18`	`18`	`{`
`19`	`19`	`public static function assertRedirect($response, $location)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpKernel\Kernel;`
`15`	`15`
`16`		`-class JsonLoginLdapTest extends WebTestCase`
	`16`	`+class JsonLoginLdapTest extends AbstractWebTestCase`
`17`	`17`	`{`
`18`	`18`	`public function testKernelBoot()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\SecurityBundle\Tests\Functional;`
`13`	`13`
`14`		`-class MissingUserProviderTest extends WebTestCase`
	`14`	`+class MissingUserProviderTest extends AbstractWebTestCase`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException`