From 3b4b2f4da588ace2368f3fd55b2c779b6cbfd97e Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Tue, 13 Jun 2023 10:15:49 -0700 Subject: [PATCH] Rename abstract test case classes PHPUnit 10 no longer ignores abstract classes that end with Test. --- psalm.xml.dist | 6 +++--- ...B2DriverTest.php => AbstractDB2DriverTestCase.php} | 11 ++--------- ...tractDriverTest.php => AbstractDriverTestCase.php} | 2 +- ...DriverTest.php => AbstractMySQLDriverTestCase.php} | 11 ++--------- ...riverTest.php => AbstractOracleDriverTestCase.php} | 11 ++--------- ...rTest.php => AbstractPostgreSQLDriverTestCase.php} | 11 ++--------- ...erTest.php => AbstractSQLServerDriverTestCase.php} | 4 ++-- ...riverTest.php => AbstractSQLiteDriverTestCase.php} | 11 ++--------- .../IBMDB2/{DB2DriverTest.php => DriverTest.php} | 4 ++-- tests/Driver/Mysqli/DriverTest.php | 4 ++-- tests/Driver/OCI8/DriverTest.php | 4 ++-- tests/Driver/PDO/MySQL/DriverTest.php | 4 ++-- tests/Driver/PDO/OCI/DriverTest.php | 4 ++-- tests/Driver/PDO/PgSQL/DriverTest.php | 4 ++-- tests/Driver/PDO/SQLSrv/DriverTest.php | 4 ++-- tests/Driver/PDO/SQLite/DriverTest.php | 4 ++-- tests/Driver/SQLSrv/DriverTest.php | 4 ++-- ...tractDriverTest.php => AbstractDriverTestCase.php} | 2 +- ...rTest.php => AbstractPostgreSQLDriverTestCase.php} | 2 +- tests/Functional/Driver/IBMDB2/DriverTest.php | 4 ++-- tests/Functional/Driver/Mysqli/DriverTest.php | 4 ++-- tests/Functional/Driver/OCI8/DriverTest.php | 4 ++-- tests/Functional/Driver/PDO/MySQL/DriverTest.php | 4 ++-- tests/Functional/Driver/PDO/OCI/DriverTest.php | 4 ++-- tests/Functional/Driver/PDO/PgSQL/DriverTest.php | 4 ++-- tests/Functional/Driver/PDO/SQLSrv/DriverTest.php | 4 ++-- tests/Functional/Driver/PDO/SQLite/DriverTest.php | 4 ++-- tests/Functional/Driver/PgSQL/DriverTest.php | 4 ++-- tests/Functional/Driver/SQLSrv/DriverTest.php | 4 ++-- tests/Functional/Driver/SQLite3/DriverTest.php | 4 ++-- tests/Platforms/MySQL/ComparatorTest.php | 4 ++-- tests/Platforms/SQLServer/ComparatorTest.php | 4 ++-- tests/Platforms/SQLite/ComparatorTest.php | 4 ++-- ...paratorTest.php => AbstractComparatorTestCase.php} | 2 +- 34 files changed, 65 insertions(+), 100 deletions(-) rename tests/Driver/{AbstractDB2DriverTest.php => AbstractDB2DriverTestCase.php} (84%) rename tests/Driver/{AbstractDriverTest.php => AbstractDriverTestCase.php} (98%) rename tests/Driver/{AbstractMySQLDriverTest.php => AbstractMySQLDriverTestCase.php} (91%) rename tests/Driver/{AbstractOracleDriverTest.php => AbstractOracleDriverTestCase.php} (71%) rename tests/Driver/{AbstractPostgreSQLDriverTest.php => AbstractPostgreSQLDriverTestCase.php} (79%) rename tests/Driver/{AbstractSQLServerDriverTest.php => AbstractSQLServerDriverTestCase.php} (90%) rename tests/Driver/{AbstractSQLiteDriverTest.php => AbstractSQLiteDriverTestCase.php} (71%) rename tests/Driver/IBMDB2/{DB2DriverTest.php => DriverTest.php} (68%) rename tests/Functional/Driver/{AbstractDriverTest.php => AbstractDriverTestCase.php} (96%) rename tests/Functional/Driver/{AbstractPostgreSQLDriverTest.php => AbstractPostgreSQLDriverTestCase.php} (94%) rename tests/Schema/{ComparatorTest.php => AbstractComparatorTestCase.php} (99%) diff --git a/psalm.xml.dist b/psalm.xml.dist index 90796496934..126e4a28837 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -134,7 +134,7 @@ - + @@ -747,8 +747,8 @@ or breaking API changes. --> - - + + diff --git a/tests/Driver/AbstractDB2DriverTest.php b/tests/Driver/AbstractDB2DriverTestCase.php similarity index 84% rename from tests/Driver/AbstractDB2DriverTest.php rename to tests/Driver/AbstractDB2DriverTestCase.php index 44dcd20ec37..99053d9eda4 100644 --- a/tests/Driver/AbstractDB2DriverTest.php +++ b/tests/Driver/AbstractDB2DriverTestCase.php @@ -3,8 +3,6 @@ namespace Doctrine\DBAL\Tests\Driver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Driver\AbstractDB2Driver; use Doctrine\DBAL\Driver\API\ExceptionConverter as ExceptionConverterInterface; use Doctrine\DBAL\Driver\API\IBMDB2\ExceptionConverter; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -13,14 +11,9 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\DB2SchemaManager; -/** @extends AbstractDriverTest */ -class AbstractDB2DriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractDB2DriverTestCase extends AbstractDriverTestCase { - protected function createDriver(): Driver - { - return $this->getMockForAbstractClass(AbstractDB2Driver::class); - } - protected function createPlatform(): AbstractPlatform { return new DB2Platform(); diff --git a/tests/Driver/AbstractDriverTest.php b/tests/Driver/AbstractDriverTestCase.php similarity index 98% rename from tests/Driver/AbstractDriverTest.php rename to tests/Driver/AbstractDriverTestCase.php index 868d472761d..74b8770ee47 100644 --- a/tests/Driver/AbstractDriverTest.php +++ b/tests/Driver/AbstractDriverTestCase.php @@ -18,7 +18,7 @@ use function sprintf; /** @template P of AbstractPlatform */ -abstract class AbstractDriverTest extends TestCase +abstract class AbstractDriverTestCase extends TestCase { use VerifyDeprecations; diff --git a/tests/Driver/AbstractMySQLDriverTest.php b/tests/Driver/AbstractMySQLDriverTestCase.php similarity index 91% rename from tests/Driver/AbstractMySQLDriverTest.php rename to tests/Driver/AbstractMySQLDriverTestCase.php index 1ca96a6fe3d..2ea677dc20e 100644 --- a/tests/Driver/AbstractMySQLDriverTest.php +++ b/tests/Driver/AbstractMySQLDriverTestCase.php @@ -3,8 +3,6 @@ namespace Doctrine\DBAL\Tests\Driver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Driver\AbstractMySQLDriver; use Doctrine\DBAL\Driver\API\ExceptionConverter; use Doctrine\DBAL\Driver\API\MySQL; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -16,14 +14,9 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\MySQLSchemaManager; -/** @extends AbstractDriverTest */ -class AbstractMySQLDriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractMySQLDriverTestCase extends AbstractDriverTestCase { - protected function createDriver(): Driver - { - return $this->getMockForAbstractClass(AbstractMySQLDriver::class); - } - protected function createPlatform(): AbstractPlatform { return new MySQLPlatform(); diff --git a/tests/Driver/AbstractOracleDriverTest.php b/tests/Driver/AbstractOracleDriverTestCase.php similarity index 71% rename from tests/Driver/AbstractOracleDriverTest.php rename to tests/Driver/AbstractOracleDriverTestCase.php index 7fabbfb86b0..eb5ae98832b 100644 --- a/tests/Driver/AbstractOracleDriverTest.php +++ b/tests/Driver/AbstractOracleDriverTestCase.php @@ -3,8 +3,6 @@ namespace Doctrine\DBAL\Tests\Driver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Driver\AbstractOracleDriver; use Doctrine\DBAL\Driver\API\ExceptionConverter; use Doctrine\DBAL\Driver\API\OCI; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -12,14 +10,9 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\OracleSchemaManager; -/** @extends AbstractDriverTest */ -class AbstractOracleDriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractOracleDriverTestCase extends AbstractDriverTestCase { - protected function createDriver(): Driver - { - return $this->getMockForAbstractClass(AbstractOracleDriver::class); - } - protected function createPlatform(): AbstractPlatform { return new OraclePlatform(); diff --git a/tests/Driver/AbstractPostgreSQLDriverTest.php b/tests/Driver/AbstractPostgreSQLDriverTestCase.php similarity index 79% rename from tests/Driver/AbstractPostgreSQLDriverTest.php rename to tests/Driver/AbstractPostgreSQLDriverTestCase.php index 39e1f0267a1..3a526c71f6f 100644 --- a/tests/Driver/AbstractPostgreSQLDriverTest.php +++ b/tests/Driver/AbstractPostgreSQLDriverTestCase.php @@ -3,8 +3,6 @@ namespace Doctrine\DBAL\Tests\Driver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver; use Doctrine\DBAL\Driver\API\ExceptionConverter; use Doctrine\DBAL\Driver\API\PostgreSQL; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -14,14 +12,9 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\PostgreSQLSchemaManager; -/** @extends AbstractDriverTest */ -class AbstractPostgreSQLDriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractPostgreSQLDriverTestCase extends AbstractDriverTestCase { - protected function createDriver(): Driver - { - return $this->getMockForAbstractClass(AbstractPostgreSQLDriver::class); - } - protected function createPlatform(): AbstractPlatform { return new PostgreSQL94Platform(); diff --git a/tests/Driver/AbstractSQLServerDriverTest.php b/tests/Driver/AbstractSQLServerDriverTestCase.php similarity index 90% rename from tests/Driver/AbstractSQLServerDriverTest.php rename to tests/Driver/AbstractSQLServerDriverTestCase.php index ac4442110de..4d0fc7c7fd3 100644 --- a/tests/Driver/AbstractSQLServerDriverTest.php +++ b/tests/Driver/AbstractSQLServerDriverTestCase.php @@ -12,8 +12,8 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\SQLServerSchemaManager; -/** @extends AbstractDriverTest */ -abstract class AbstractSQLServerDriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractSQLServerDriverTestCase extends AbstractDriverTestCase { protected function createPlatform(): AbstractPlatform { diff --git a/tests/Driver/AbstractSQLiteDriverTest.php b/tests/Driver/AbstractSQLiteDriverTestCase.php similarity index 71% rename from tests/Driver/AbstractSQLiteDriverTest.php rename to tests/Driver/AbstractSQLiteDriverTestCase.php index dbbc4665569..3c288c56b75 100644 --- a/tests/Driver/AbstractSQLiteDriverTest.php +++ b/tests/Driver/AbstractSQLiteDriverTestCase.php @@ -3,8 +3,6 @@ namespace Doctrine\DBAL\Tests\Driver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Driver\AbstractSQLiteDriver; use Doctrine\DBAL\Driver\API\ExceptionConverter; use Doctrine\DBAL\Driver\API\SQLite; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -12,14 +10,9 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\SqliteSchemaManager; -/** @extends AbstractDriverTest */ -class AbstractSQLiteDriverTest extends AbstractDriverTest +/** @extends AbstractDriverTestCase */ +abstract class AbstractSQLiteDriverTestCase extends AbstractDriverTestCase { - protected function createDriver(): Driver - { - return $this->getMockForAbstractClass(AbstractSQLiteDriver::class); - } - protected function createPlatform(): AbstractPlatform { return new SqlitePlatform(); diff --git a/tests/Driver/IBMDB2/DB2DriverTest.php b/tests/Driver/IBMDB2/DriverTest.php similarity index 68% rename from tests/Driver/IBMDB2/DB2DriverTest.php rename to tests/Driver/IBMDB2/DriverTest.php index 565db698969..2331cb78728 100644 --- a/tests/Driver/IBMDB2/DB2DriverTest.php +++ b/tests/Driver/IBMDB2/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\IBMDB2\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTestCase; -class DB2DriverTest extends AbstractDB2DriverTest +class DriverTest extends AbstractDB2DriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/Mysqli/DriverTest.php b/tests/Driver/Mysqli/DriverTest.php index 2dccd281dc7..bf812bfd342 100644 --- a/tests/Driver/Mysqli/DriverTest.php +++ b/tests/Driver/Mysqli/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\Mysqli\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase; -class DriverTest extends AbstractMySQLDriverTest +class DriverTest extends AbstractMySQLDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/OCI8/DriverTest.php b/tests/Driver/OCI8/DriverTest.php index 3c1172d77cc..15edf41789b 100644 --- a/tests/Driver/OCI8/DriverTest.php +++ b/tests/Driver/OCI8/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\OCI8\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase; -class DriverTest extends AbstractOracleDriverTest +class DriverTest extends AbstractOracleDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/PDO/MySQL/DriverTest.php b/tests/Driver/PDO/MySQL/DriverTest.php index f059e1e6514..c6bff707dee 100644 --- a/tests/Driver/PDO/MySQL/DriverTest.php +++ b/tests/Driver/PDO/MySQL/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\MySQL\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase; -class DriverTest extends AbstractMySQLDriverTest +class DriverTest extends AbstractMySQLDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/PDO/OCI/DriverTest.php b/tests/Driver/PDO/OCI/DriverTest.php index da55ba0ea89..ba14f2a0236 100644 --- a/tests/Driver/PDO/OCI/DriverTest.php +++ b/tests/Driver/PDO/OCI/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\OCI\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase; -class DriverTest extends AbstractOracleDriverTest +class DriverTest extends AbstractOracleDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/PDO/PgSQL/DriverTest.php b/tests/Driver/PDO/PgSQL/DriverTest.php index 0932b3cdb95..f5b615f5b05 100644 --- a/tests/Driver/PDO/PgSQL/DriverTest.php +++ b/tests/Driver/PDO/PgSQL/DriverTest.php @@ -6,12 +6,12 @@ use Doctrine\DBAL\Driver\Connection; use Doctrine\DBAL\Driver\PDO; use Doctrine\DBAL\Driver\PDO\PgSQL\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractPostgreSQLDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractPostgreSQLDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; use function array_merge; -class DriverTest extends AbstractPostgreSQLDriverTest +class DriverTest extends AbstractPostgreSQLDriverTestCase { protected function setUp(): void { diff --git a/tests/Driver/PDO/SQLSrv/DriverTest.php b/tests/Driver/PDO/SQLSrv/DriverTest.php index 306ea0d1e0a..b232c89f75e 100644 --- a/tests/Driver/PDO/SQLSrv/DriverTest.php +++ b/tests/Driver/PDO/SQLSrv/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\SQLSrv\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTestCase; -class DriverTest extends AbstractSQLServerDriverTest +class DriverTest extends AbstractSQLServerDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/PDO/SQLite/DriverTest.php b/tests/Driver/PDO/SQLite/DriverTest.php index 562e075a772..f3e1fc9096c 100644 --- a/tests/Driver/PDO/SQLite/DriverTest.php +++ b/tests/Driver/PDO/SQLite/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\SQLite\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractSQLiteDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractSQLiteDriverTestCase; -class DriverTest extends AbstractSQLiteDriverTest +class DriverTest extends AbstractSQLiteDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Driver/SQLSrv/DriverTest.php b/tests/Driver/SQLSrv/DriverTest.php index a8a24d3aa10..86a658e4c29 100644 --- a/tests/Driver/SQLSrv/DriverTest.php +++ b/tests/Driver/SQLSrv/DriverTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\SQLSrv\Driver; -use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTest; +use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTestCase; -class DriverTest extends AbstractSQLServerDriverTest +class DriverTest extends AbstractSQLServerDriverTestCase { protected function createDriver(): DriverInterface { diff --git a/tests/Functional/Driver/AbstractDriverTest.php b/tests/Functional/Driver/AbstractDriverTestCase.php similarity index 96% rename from tests/Functional/Driver/AbstractDriverTest.php rename to tests/Functional/Driver/AbstractDriverTestCase.php index 88e6111dd03..d9a0490c721 100644 --- a/tests/Functional/Driver/AbstractDriverTest.php +++ b/tests/Functional/Driver/AbstractDriverTestCase.php @@ -8,7 +8,7 @@ use Doctrine\DBAL\Tests\FunctionalTestCase; use PHPUnit\Framework\Constraint\IsType; -abstract class AbstractDriverTest extends FunctionalTestCase +abstract class AbstractDriverTestCase extends FunctionalTestCase { /** * The driver instance under test. diff --git a/tests/Functional/Driver/AbstractPostgreSQLDriverTest.php b/tests/Functional/Driver/AbstractPostgreSQLDriverTestCase.php similarity index 94% rename from tests/Functional/Driver/AbstractPostgreSQLDriverTest.php rename to tests/Functional/Driver/AbstractPostgreSQLDriverTestCase.php index b9f7dcb3eae..9548a65da06 100644 --- a/tests/Functional/Driver/AbstractPostgreSQLDriverTest.php +++ b/tests/Functional/Driver/AbstractPostgreSQLDriverTestCase.php @@ -10,7 +10,7 @@ use function microtime; use function sprintf; -abstract class AbstractPostgreSQLDriverTest extends AbstractDriverTest +abstract class AbstractPostgreSQLDriverTestCase extends AbstractDriverTestCase { public function testConnectsWithApplicationNameParameter(): void { diff --git a/tests/Functional/Driver/IBMDB2/DriverTest.php b/tests/Functional/Driver/IBMDB2/DriverTest.php index cab75b31729..5716dc851d7 100644 --- a/tests/Functional/Driver/IBMDB2/DriverTest.php +++ b/tests/Functional/Driver/IBMDB2/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\IBMDB2\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension ibm_db2 */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/Mysqli/DriverTest.php b/tests/Functional/Driver/Mysqli/DriverTest.php index 174a12d8628..17fba95583b 100644 --- a/tests/Functional/Driver/Mysqli/DriverTest.php +++ b/tests/Functional/Driver/Mysqli/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\Mysqli\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension mysqli */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/OCI8/DriverTest.php b/tests/Functional/Driver/OCI8/DriverTest.php index e8ff5e23edb..9b3e1b4fee5 100644 --- a/tests/Functional/Driver/OCI8/DriverTest.php +++ b/tests/Functional/Driver/OCI8/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\OCI8\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension oci8 */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/PDO/MySQL/DriverTest.php b/tests/Functional/Driver/PDO/MySQL/DriverTest.php index 7cb2ed52d1c..936e77c7001 100644 --- a/tests/Functional/Driver/PDO/MySQL/DriverTest.php +++ b/tests/Functional/Driver/PDO/MySQL/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\MySQL\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension pdo_mysql */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/PDO/OCI/DriverTest.php b/tests/Functional/Driver/PDO/OCI/DriverTest.php index 00e2c148a63..f0d847e5c52 100644 --- a/tests/Functional/Driver/PDO/OCI/DriverTest.php +++ b/tests/Functional/Driver/PDO/OCI/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\OCI\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension pdo_oci */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/PDO/PgSQL/DriverTest.php b/tests/Functional/Driver/PDO/PgSQL/DriverTest.php index eb42d0f7ce0..bd3089cd007 100644 --- a/tests/Functional/Driver/PDO/PgSQL/DriverTest.php +++ b/tests/Functional/Driver/PDO/PgSQL/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\PDO\PgSQL\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension pdo_pgsql */ -class DriverTest extends AbstractPostgreSQLDriverTest +class DriverTest extends AbstractPostgreSQLDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php index 46bf7d5a315..28a11b67af7 100644 --- a/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php +++ b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php @@ -5,14 +5,14 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\SQLSrv\Connection; use Doctrine\DBAL\Driver\PDO\SQLSrv\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; use PDO; use function array_merge; /** @requires extension pdo_sqlsrv */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/PDO/SQLite/DriverTest.php b/tests/Functional/Driver/PDO/SQLite/DriverTest.php index b14f66e535b..5ebf7716b4b 100644 --- a/tests/Functional/Driver/PDO/SQLite/DriverTest.php +++ b/tests/Functional/Driver/PDO/SQLite/DriverTest.php @@ -5,12 +5,12 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\PDO\SQLite\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; use Doctrine\Deprecations\PHPUnit\VerifyDeprecations; /** @requires extension pdo_sqlite */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { use VerifyDeprecations; diff --git a/tests/Functional/Driver/PgSQL/DriverTest.php b/tests/Functional/Driver/PgSQL/DriverTest.php index 76ddb18ee79..3a7968ff56b 100644 --- a/tests/Functional/Driver/PgSQL/DriverTest.php +++ b/tests/Functional/Driver/PgSQL/DriverTest.php @@ -5,11 +5,11 @@ namespace Doctrine\DBAL\Tests\Functional\Driver\PgSQL; use Doctrine\DBAL\Driver\PgSQL\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension pgsql */ -class DriverTest extends AbstractPostgreSQLDriverTest +class DriverTest extends AbstractPostgreSQLDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/SQLSrv/DriverTest.php b/tests/Functional/Driver/SQLSrv/DriverTest.php index 54bf07fb437..8e96326af57 100644 --- a/tests/Functional/Driver/SQLSrv/DriverTest.php +++ b/tests/Functional/Driver/SQLSrv/DriverTest.php @@ -4,11 +4,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\SQLSrv\Driver; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension sqlsrv */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Functional/Driver/SQLite3/DriverTest.php b/tests/Functional/Driver/SQLite3/DriverTest.php index d3c16034c98..d3cd116970c 100644 --- a/tests/Functional/Driver/SQLite3/DriverTest.php +++ b/tests/Functional/Driver/SQLite3/DriverTest.php @@ -6,11 +6,11 @@ use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver\SQLite3\Driver; use Doctrine\DBAL\Exception\DriverException; -use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest; +use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase; use Doctrine\DBAL\Tests\TestUtil; /** @requires extension sqlite3 */ -class DriverTest extends AbstractDriverTest +class DriverTest extends AbstractDriverTestCase { protected function setUp(): void { diff --git a/tests/Platforms/MySQL/ComparatorTest.php b/tests/Platforms/MySQL/ComparatorTest.php index 1aac8883ec2..68352524781 100644 --- a/tests/Platforms/MySQL/ComparatorTest.php +++ b/tests/Platforms/MySQL/ComparatorTest.php @@ -5,9 +5,9 @@ use Doctrine\DBAL\Platforms\MySQL\CollationMetadataProvider; use Doctrine\DBAL\Platforms\MySQL\Comparator; use Doctrine\DBAL\Platforms\MySQLPlatform; -use Doctrine\DBAL\Tests\Schema\ComparatorTest as BaseComparatorTest; +use Doctrine\DBAL\Tests\Schema\AbstractComparatorTestCase; -class ComparatorTest extends BaseComparatorTest +class ComparatorTest extends AbstractComparatorTestCase { protected function setUp(): void { diff --git a/tests/Platforms/SQLServer/ComparatorTest.php b/tests/Platforms/SQLServer/ComparatorTest.php index bdf14519037..4670d654ad0 100644 --- a/tests/Platforms/SQLServer/ComparatorTest.php +++ b/tests/Platforms/SQLServer/ComparatorTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Platforms\SQLServer\Comparator; use Doctrine\DBAL\Platforms\SQLServer2012Platform; -use Doctrine\DBAL\Tests\Schema\ComparatorTest as BaseComparatorTest; +use Doctrine\DBAL\Tests\Schema\AbstractComparatorTestCase; -class ComparatorTest extends BaseComparatorTest +class ComparatorTest extends AbstractComparatorTestCase { protected function setUp(): void { diff --git a/tests/Platforms/SQLite/ComparatorTest.php b/tests/Platforms/SQLite/ComparatorTest.php index 76f1621114b..767e6c02287 100644 --- a/tests/Platforms/SQLite/ComparatorTest.php +++ b/tests/Platforms/SQLite/ComparatorTest.php @@ -4,9 +4,9 @@ use Doctrine\DBAL\Platforms\SQLite\Comparator; use Doctrine\DBAL\Platforms\SqlitePlatform; -use Doctrine\DBAL\Tests\Schema\ComparatorTest as BaseComparatorTest; +use Doctrine\DBAL\Tests\Schema\AbstractComparatorTestCase; -class ComparatorTest extends BaseComparatorTest +class ComparatorTest extends AbstractComparatorTestCase { protected function setUp(): void { diff --git a/tests/Schema/ComparatorTest.php b/tests/Schema/AbstractComparatorTestCase.php similarity index 99% rename from tests/Schema/ComparatorTest.php rename to tests/Schema/AbstractComparatorTestCase.php index 8e17c8395f0..a087202628f 100644 --- a/tests/Schema/ComparatorTest.php +++ b/tests/Schema/AbstractComparatorTestCase.php @@ -21,7 +21,7 @@ use function array_keys; use function get_class; -class ComparatorTest extends TestCase +class AbstractComparatorTestCase extends TestCase { use VerifyDeprecations;