Reworked classes in Doctrine\Tests namespace

Removed the `Dbal` prefix from the class names and moved them to the `Doctrine\Tests\DBAL` namespace.
parent 3efdd0ef
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</filter> </filter>
<listeners> <listeners>
<listener class="Doctrine\Tests\DbalPerformanceTestListener"/> <listener class="Doctrine\Tests\DBAL\PerformanceTestListener"/>
</listeners> </listeners>
<groups> <groups>
......
...@@ -5,13 +5,13 @@ namespace Doctrine\Tests\DBAL\Driver\Mysqli; ...@@ -5,13 +5,13 @@ namespace Doctrine\Tests\DBAL\Driver\Mysqli;
use Doctrine\DBAL\Driver\Mysqli\MysqliConnection; use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
use Doctrine\DBAL\Driver\Mysqli\MysqliException; use Doctrine\DBAL\Driver\Mysqli\MysqliException;
use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use function extension_loaded; use function extension_loaded;
use function restore_error_handler; use function restore_error_handler;
use function set_error_handler; use function set_error_handler;
class MysqliConnectionTest extends DbalFunctionalTestCase class MysqliConnectionTest extends FunctionalTestCase
{ {
/** /**
* The mysqli driver connection mock under test. * The mysqli driver connection mock under test.
......
...@@ -8,7 +8,7 @@ use Doctrine\DBAL\FetchMode; ...@@ -8,7 +8,7 @@ use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function fopen; use function fopen;
use function str_repeat; use function str_repeat;
use function stream_get_contents; use function stream_get_contents;
...@@ -16,7 +16,7 @@ use function stream_get_contents; ...@@ -16,7 +16,7 @@ use function stream_get_contents;
/** /**
* @group DBAL-6 * @group DBAL-6
*/ */
class BlobTest extends DbalFunctionalTestCase class BlobTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -12,8 +12,8 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; ...@@ -12,8 +12,8 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Platforms\SQLServer2012Platform; use Doctrine\DBAL\Platforms\SQLServer2012Platform;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Doctrine\Tests\TestUtil; use Doctrine\Tests\DBAL\TestUtil;
use Error; use Error;
use Exception; use Exception;
use PDO; use PDO;
...@@ -23,7 +23,7 @@ use function file_exists; ...@@ -23,7 +23,7 @@ use function file_exists;
use function in_array; use function in_array;
use function unlink; use function unlink;
class ConnectionTest extends DbalFunctionalTestCase class ConnectionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -17,7 +17,7 @@ use Doctrine\DBAL\Platforms\TrimMode; ...@@ -17,7 +17,7 @@ use Doctrine\DBAL\Platforms\TrimMode;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Statement; use Doctrine\DBAL\Statement;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use PDO; use PDO;
use const CASE_LOWER; use const CASE_LOWER;
use const PHP_EOL; use const PHP_EOL;
...@@ -33,7 +33,7 @@ use function property_exists; ...@@ -33,7 +33,7 @@ use function property_exists;
use function sprintf; use function sprintf;
use function strtotime; use function strtotime;
class DataAccessTest extends DbalFunctionalTestCase class DataAccessTest extends FunctionalTestCase
{ {
/** @var bool */ /** @var bool */
private static $generated = false; private static $generated = false;
......
...@@ -5,9 +5,9 @@ namespace Doctrine\Tests\DBAL\Functional\Driver; ...@@ -5,9 +5,9 @@ namespace Doctrine\Tests\DBAL\Functional\Driver;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver; use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Driver\Connection as DriverConnection; use Doctrine\DBAL\Driver\Connection as DriverConnection;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
abstract class AbstractDriverTest extends DbalFunctionalTestCase abstract class AbstractDriverTest extends FunctionalTestCase
{ {
/** /**
* The driver instance under test. * The driver instance under test.
......
...@@ -5,10 +5,10 @@ declare(strict_types=1); ...@@ -5,10 +5,10 @@ declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Functional\Driver\IBMDB2; namespace Doctrine\Tests\DBAL\Functional\Driver\IBMDB2;
use Doctrine\DBAL\Driver\IBMDB2\DB2Driver; use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class DB2StatementTest extends DbalFunctionalTestCase class DB2StatementTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -5,11 +5,11 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\Mysqli; ...@@ -5,11 +5,11 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\Mysqli;
use Doctrine\DBAL\Driver\Mysqli\Driver; use Doctrine\DBAL\Driver\Mysqli\Driver;
use Doctrine\DBAL\Driver\Mysqli\MysqliConnection; use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
use Doctrine\DBAL\Driver\Mysqli\MysqliException; use Doctrine\DBAL\Driver\Mysqli\MysqliException;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use const MYSQLI_OPT_CONNECT_TIMEOUT; use const MYSQLI_OPT_CONNECT_TIMEOUT;
use function extension_loaded; use function extension_loaded;
class ConnectionTest extends DbalFunctionalTestCase class ConnectionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -5,10 +5,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\OCI8; ...@@ -5,10 +5,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\OCI8;
use Doctrine\DBAL\Driver\OCI8\Driver; use Doctrine\DBAL\Driver\OCI8\Driver;
use Doctrine\DBAL\Driver\OCI8\OCI8Connection; use Doctrine\DBAL\Driver\OCI8\OCI8Connection;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class OCI8ConnectionTest extends DbalFunctionalTestCase class OCI8ConnectionTest extends FunctionalTestCase
{ {
/** @var OCI8Connection */ /** @var OCI8Connection */
protected $driverConnection; protected $driverConnection;
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
namespace Doctrine\Tests\DBAL\Functional\Driver\OCI8; namespace Doctrine\Tests\DBAL\Functional\Driver\OCI8;
use Doctrine\DBAL\Driver\OCI8\Driver; use Doctrine\DBAL\Driver\OCI8\Driver;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class StatementTest extends DbalFunctionalTestCase class StatementTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -7,7 +7,7 @@ use Doctrine\DBAL\Driver\PDOException; ...@@ -7,7 +7,7 @@ use Doctrine\DBAL\Driver\PDOException;
use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver; use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver;
use Doctrine\DBAL\Driver\PDOPgSql\Driver as PDOPgSQLDriver; use Doctrine\DBAL\Driver\PDOPgSql\Driver as PDOPgSQLDriver;
use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as PDOSQLSRVDriver; use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as PDOSQLSRVDriver;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use PDO; use PDO;
use function get_class; use function get_class;
use function sprintf; use function sprintf;
...@@ -15,7 +15,7 @@ use function sprintf; ...@@ -15,7 +15,7 @@ use function sprintf;
/** /**
* @requires extension pdo * @requires extension pdo
*/ */
class PDOConnectionTest extends DbalFunctionalTestCase class PDOConnectionTest extends FunctionalTestCase
{ {
/** /**
* The PDO driver connection under test. * The PDO driver connection under test.
......
...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connection; ...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver as DriverInterface; use Doctrine\DBAL\Driver as DriverInterface;
use Doctrine\DBAL\Driver\PDOPgSql\Driver; use Doctrine\DBAL\Driver\PDOPgSql\Driver;
use Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest; use Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest;
use Doctrine\Tests\TestUtil; use Doctrine\Tests\DBAL\TestUtil;
use function array_key_exists; use function array_key_exists;
use function extension_loaded; use function extension_loaded;
use function microtime; use function microtime;
......
...@@ -5,10 +5,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver; ...@@ -5,10 +5,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\FetchMode; use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class PDOPgsqlConnectionTest extends DbalFunctionalTestCase class PDOPgsqlConnectionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere;
use Doctrine\DBAL\Driver\SQLAnywhere\Driver; use Doctrine\DBAL\Driver\SQLAnywhere\Driver;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class ConnectionTest extends DbalFunctionalTestCase class ConnectionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere;
use Doctrine\DBAL\Driver\SQLAnywhere\Driver; use Doctrine\DBAL\Driver\SQLAnywhere\Driver;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class StatementTest extends DbalFunctionalTestCase class StatementTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLSrv; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\SQLSrv;
use Doctrine\DBAL\Driver\SQLSrv\Driver; use Doctrine\DBAL\Driver\SQLSrv\Driver;
use Doctrine\DBAL\Driver\SQLSrv\SQLSrvException; use Doctrine\DBAL\Driver\SQLSrv\SQLSrvException;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function extension_loaded; use function extension_loaded;
class StatementTest extends DbalFunctionalTestCase class StatementTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -11,7 +11,7 @@ use Doctrine\DBAL\Platforms\PostgreSQL94Platform; ...@@ -11,7 +11,7 @@ use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
use const PHP_OS; use const PHP_OS;
use function array_merge; use function array_merge;
...@@ -27,7 +27,7 @@ use function touch; ...@@ -27,7 +27,7 @@ use function touch;
use function unlink; use function unlink;
use function version_compare; use function version_compare;
class ExceptionTest extends DbalFunctionalTestCase class ExceptionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
namespace Doctrine\Tests\DBAL\Functional; namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function sprintf; use function sprintf;
final class LikeWildcardsEscapingTest extends DbalFunctionalTestCase final class LikeWildcardsEscapingTest extends FunctionalTestCase
{ {
public function testFetchLikeExpressionResult() : void public function testFetchLikeExpressionResult() : void
{ {
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
namespace Doctrine\Tests\DBAL\Functional; namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\DBAL\Logging\SQLLogger; use Doctrine\DBAL\Logging\SQLLogger;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
class LoggingTest extends DbalFunctionalTestCase class LoggingTest extends FunctionalTestCase
{ {
public function testLogExecuteQuery() : void public function testLogExecuteQuery() : void
{ {
......
...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connections\MasterSlaveConnection; ...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connections\MasterSlaveConnection;
use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
use const CASE_LOWER; use const CASE_LOWER;
use function array_change_key_case; use function array_change_key_case;
...@@ -18,7 +18,7 @@ use function substr; ...@@ -18,7 +18,7 @@ use function substr;
/** /**
* @group DBAL-20 * @group DBAL-20
*/ */
class MasterSlaveConnectionTest extends DbalFunctionalTestCase class MasterSlaveConnectionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
namespace Doctrine\Tests\DBAL\Functional; namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use const CASE_LOWER; use const CASE_LOWER;
use function array_change_key_case; use function array_change_key_case;
use function count; use function count;
class ModifyLimitQueryTest extends DbalFunctionalTestCase class ModifyLimitQueryTest extends FunctionalTestCase
{ {
/** @var bool */ /** @var bool */
private static $tableCreated = false; private static $tableCreated = false;
......
...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connection; ...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Connection;
use Doctrine\DBAL\FetchMode; use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
use const CASE_LOWER; use const CASE_LOWER;
use function array_change_key_case; use function array_change_key_case;
...@@ -14,7 +14,7 @@ use function array_change_key_case; ...@@ -14,7 +14,7 @@ use function array_change_key_case;
/** /**
* @group DDC-1372 * @group DDC-1372
*/ */
class NamedParametersTest extends DbalFunctionalTestCase class NamedParametersTest extends FunctionalTestCase
{ {
/** /**
* @return iterable<int, array<int, mixed>> * @return iterable<int, array<int, mixed>>
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Platform; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Platform;
use DateTimeImmutable; use DateTimeImmutable;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function sprintf; use function sprintf;
class DateExpressionTest extends DbalFunctionalTestCase class DateExpressionTest extends FunctionalTestCase
{ {
/** /**
* @dataProvider differenceProvider * @dataProvider differenceProvider
......
...@@ -10,10 +10,10 @@ use Doctrine\DBAL\Platforms\MySqlPlatform; ...@@ -10,10 +10,10 @@ use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function sprintf; use function sprintf;
class DefaultExpressionTest extends DbalFunctionalTestCase class DefaultExpressionTest extends FunctionalTestCase
{ {
public function testCurrentDate() : void public function testCurrentDate() : void
{ {
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Platform; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional\Platform;
use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Comparator;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function in_array; use function in_array;
final class NewPrimaryKeyWithNewAutoIncrementColumnTest extends DbalFunctionalTestCase final class NewPrimaryKeyWithNewAutoIncrementColumnTest extends FunctionalTestCase
{ {
/** /**
* {@inheritDoc} * {@inheritDoc}
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
namespace Doctrine\Tests\DBAL\Functional\Platform; namespace Doctrine\Tests\DBAL\Functional\Platform;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
class QuotingTest extends DbalFunctionalTestCase class QuotingTest extends FunctionalTestCase
{ {
/** /**
* @dataProvider stringLiteralProvider * @dataProvider stringLiteralProvider
......
...@@ -8,14 +8,14 @@ use Doctrine\DBAL\DriverManager; ...@@ -8,14 +8,14 @@ use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\FetchMode; use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\Portability\Connection as ConnectionPortability; use Doctrine\DBAL\Portability\Connection as ConnectionPortability;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
use function strlen; use function strlen;
/** /**
* @group DBAL-56 * @group DBAL-56
*/ */
class PortabilityTest extends DbalFunctionalTestCase class PortabilityTest extends FunctionalTestCase
{ {
/** @var Connection */ /** @var Connection */
private $portableConnection; private $portableConnection;
......
...@@ -8,7 +8,7 @@ use Doctrine\DBAL\Driver\ResultStatement; ...@@ -8,7 +8,7 @@ use Doctrine\DBAL\Driver\ResultStatement;
use Doctrine\DBAL\FetchMode; use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Logging\DebugStack;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use const CASE_LOWER; use const CASE_LOWER;
use function array_change_key_case; use function array_change_key_case;
use function array_merge; use function array_merge;
...@@ -19,7 +19,7 @@ use function is_array; ...@@ -19,7 +19,7 @@ use function is_array;
/** /**
* @group DDC-217 * @group DDC-217
*/ */
class ResultCacheTest extends DbalFunctionalTestCase class ResultCacheTest extends FunctionalTestCase
{ {
/** @var array<int, array<int, int|string>> */ /** @var array<int, array<int, int|string>> */
private $expectedResult = [['test_int' => 100, 'test_string' => 'foo'], ['test_int' => 200, 'test_string' => 'bar'], ['test_int' => 300, 'test_string' => 'baz']]; private $expectedResult = [['test_int' => 100, 'test_string' => 'foo'], ['test_int' => 200, 'test_string' => 'bar'], ['test_int' => 300, 'test_string' => 'baz']];
......
...@@ -7,9 +7,9 @@ namespace Doctrine\Tests\DBAL\Functional\Schema; ...@@ -7,9 +7,9 @@ namespace Doctrine\Tests\DBAL\Functional\Schema;
use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\AbstractSchemaManager;
use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Comparator;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
class ComparatorTest extends DbalFunctionalTestCase class ComparatorTest extends FunctionalTestCase
{ {
/** @var AbstractSchemaManager */ /** @var AbstractSchemaManager */
private $schemaManager; private $schemaManager;
......
...@@ -5,10 +5,10 @@ declare(strict_types=1); ...@@ -5,10 +5,10 @@ declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Functional\Schema; namespace Doctrine\Tests\DBAL\Functional\Schema;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function sprintf; use function sprintf;
class DefaultValueTest extends DbalFunctionalTestCase class DefaultValueTest extends FunctionalTestCase
{ {
/** @var bool */ /** @var bool */
private static $initialized = false; private static $initialized = false;
......
...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Schema; ...@@ -6,7 +6,7 @@ use Doctrine\DBAL\Schema;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\BinaryType; use Doctrine\DBAL\Types\BinaryType;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\Tests\TestUtil; use Doctrine\Tests\DBAL\TestUtil;
use function array_map; use function array_map;
class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
......
...@@ -29,7 +29,7 @@ use Doctrine\DBAL\Types\ObjectType; ...@@ -29,7 +29,7 @@ use Doctrine\DBAL\Types\ObjectType;
use Doctrine\DBAL\Types\StringType; use Doctrine\DBAL\Types\StringType;
use Doctrine\DBAL\Types\TextType; use Doctrine\DBAL\Types\TextType;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function array_filter; use function array_filter;
use function array_keys; use function array_keys;
use function array_map; use function array_map;
...@@ -47,7 +47,7 @@ use function strlen; ...@@ -47,7 +47,7 @@ use function strlen;
use function strtolower; use function strtolower;
use function substr; use function substr;
abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase abstract class SchemaManagerFunctionalTestCase extends FunctionalTestCase
{ {
/** @var AbstractSchemaManager */ /** @var AbstractSchemaManager */
protected $schemaManager; protected $schemaManager;
......
...@@ -8,11 +8,11 @@ use Doctrine\DBAL\FetchMode; ...@@ -8,11 +8,11 @@ use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function base64_decode; use function base64_decode;
use function stream_get_contents; use function stream_get_contents;
class StatementTest extends DbalFunctionalTestCase class StatementTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -5,13 +5,13 @@ namespace Doctrine\Tests\DBAL\Functional; ...@@ -5,13 +5,13 @@ namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\DBAL\Id\TableGenerator; use Doctrine\DBAL\Id\TableGenerator;
use Doctrine\DBAL\Id\TableGeneratorSchemaVisitor; use Doctrine\DBAL\Id\TableGeneratorSchemaVisitor;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
/** /**
* @group DDC-450 * @group DDC-450
*/ */
class TableGeneratorTest extends DbalFunctionalTestCase class TableGeneratorTest extends FunctionalTestCase
{ {
/** @var TableGenerator */ /** @var TableGenerator */
private $generator; private $generator;
......
...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional; ...@@ -4,10 +4,10 @@ namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
class TemporaryTableTest extends DbalFunctionalTestCase class TemporaryTableTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
namespace Doctrine\Tests\DBAL\Functional\Ticket; namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
/** /**
* @group DBAL-168 * @group DBAL-168
*/ */
class DBAL168Test extends DbalFunctionalTestCase class DBAL168Test extends FunctionalTestCase
{ {
public function testDomainsTable() : void public function testDomainsTable() : void
{ {
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
namespace Doctrine\Tests\DBAL\Functional\Ticket; namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
/** /**
* @group DBAL-202 * @group DBAL-202
*/ */
class DBAL202Test extends DbalFunctionalTestCase class DBAL202Test extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Doctrine\Tests\DBAL\Functional\Ticket; namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function in_array; use function in_array;
use function preg_match; use function preg_match;
/** /**
* @group DBAL-421 * @group DBAL-421
*/ */
class DBAL421Test extends DbalFunctionalTestCase class DBAL421Test extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -4,12 +4,12 @@ namespace Doctrine\Tests\DBAL\Functional\Ticket; ...@@ -4,12 +4,12 @@ namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Comparator;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
/** /**
* @group DBAL-510 * @group DBAL-510
*/ */
class DBAL510Test extends DbalFunctionalTestCase class DBAL510Test extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -4,14 +4,14 @@ namespace Doctrine\Tests\DBAL\Functional\Ticket; ...@@ -4,14 +4,14 @@ namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\DBAL\DBALException; use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use PDO; use PDO;
use function in_array; use function in_array;
/** /**
* @group DBAL-630 * @group DBAL-630
*/ */
class DBAL630Test extends DbalFunctionalTestCase class DBAL630Test extends FunctionalTestCase
{ {
/** @var bool */ /** @var bool */
private $running = false; private $running = false;
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
namespace Doctrine\Tests\DBAL\Functional\Ticket; namespace Doctrine\Tests\DBAL\Functional\Ticket;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function in_array; use function in_array;
/** /**
* @group DBAL-752 * @group DBAL-752
*/ */
class DBAL752Test extends DbalFunctionalTestCase class DBAL752Test extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
namespace Doctrine\Tests\DBAL\Functional; namespace Doctrine\Tests\DBAL\Functional;
use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function sleep; use function sleep;
class TransactionTest extends DbalFunctionalTestCase class TransactionTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -6,11 +6,11 @@ use DateTime; ...@@ -6,11 +6,11 @@ use DateTime;
use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver; use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use stdClass; use stdClass;
use function str_repeat; use function str_repeat;
class TypeConversionTest extends DbalFunctionalTestCase class TypeConversionTest extends FunctionalTestCase
{ {
/** @var int */ /** @var int */
private static $typeCounter = 0; private static $typeCounter = 0;
......
...@@ -8,13 +8,13 @@ use Doctrine\DBAL\Driver\IBMDB2\DB2Driver; ...@@ -8,13 +8,13 @@ use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver; use Doctrine\DBAL\Driver\PDOOracle\Driver as PDOOracleDriver;
use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use function is_resource; use function is_resource;
use function random_bytes; use function random_bytes;
use function str_replace; use function str_replace;
use function stream_get_contents; use function stream_get_contents;
class BinaryTest extends DbalFunctionalTestCase class BinaryTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
...@@ -8,12 +8,12 @@ use Doctrine\DBAL\ParameterType; ...@@ -8,12 +8,12 @@ use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Schema\Sequence; use Doctrine\DBAL\Schema\Sequence;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalFunctionalTestCase; use Doctrine\Tests\DBAL\FunctionalTestCase;
use Throwable; use Throwable;
use function array_filter; use function array_filter;
use function strtolower; use function strtolower;
class WriteTest extends DbalFunctionalTestCase class WriteTest extends FunctionalTestCase
{ {
protected function setUp() : void protected function setUp() : void
{ {
......
<?php <?php
namespace Doctrine\Tests; namespace Doctrine\Tests\DBAL;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Logging\DebugStack;
...@@ -19,7 +19,7 @@ use function is_scalar; ...@@ -19,7 +19,7 @@ use function is_scalar;
use function strpos; use function strpos;
use function var_export; use function var_export;
abstract class DbalFunctionalTestCase extends TestCase abstract class FunctionalTestCase extends TestCase
{ {
/** /**
* Shared connection when a TestCase is run alone (outside of it's functional suite) * Shared connection when a TestCase is run alone (outside of it's functional suite)
......
...@@ -5,12 +5,12 @@ namespace Doctrine\Tests\DBAL\Performance; ...@@ -5,12 +5,12 @@ namespace Doctrine\Tests\DBAL\Performance;
use DateTime; use DateTime;
use Doctrine\DBAL\DBALException; use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalPerformanceTestCase; use Doctrine\Tests\DBAL\PerformanceTestCase;
/** /**
* @group performance * @group performance
*/ */
class TypeConversionPerformanceTest extends DbalPerformanceTestCase class TypeConversionPerformanceTest extends PerformanceTestCase
{ {
/** /**
* @throws DBALException * @throws DBALException
......
<?php <?php
namespace Doctrine\Tests; namespace Doctrine\Tests\DBAL;
use function microtime; use function microtime;
...@@ -11,7 +11,7 @@ use function microtime; ...@@ -11,7 +11,7 @@ use function microtime;
* and stopTiming at the end of all tests. Tests that do not start or stop * and stopTiming at the end of all tests. Tests that do not start or stop
* timing will fail. * timing will fail.
*/ */
abstract class DbalPerformanceTestCase extends DbalFunctionalTestCase abstract class PerformanceTestCase extends FunctionalTestCase
{ {
/** /**
* time the test started * time the test started
......
<?php <?php
namespace Doctrine\Tests; namespace Doctrine\Tests\DBAL;
use PHPUnit\Framework\Test; use PHPUnit\Framework\Test;
use PHPUnit\Framework\TestListener; use PHPUnit\Framework\TestListener;
...@@ -12,7 +12,7 @@ use function str_replace; ...@@ -12,7 +12,7 @@ use function str_replace;
/** /**
* Listener for collecting and reporting results of performance tests * Listener for collecting and reporting results of performance tests
*/ */
class DbalPerformanceTestListener implements TestListener class PerformanceTestListener implements TestListener
{ {
use TestListenerDefaultImplementation; use TestListenerDefaultImplementation;
...@@ -25,7 +25,7 @@ class DbalPerformanceTestListener implements TestListener ...@@ -25,7 +25,7 @@ class DbalPerformanceTestListener implements TestListener
public function endTest(Test $test, float $time) : void public function endTest(Test $test, float $time) : void
{ {
// This listener only applies to performance tests. // This listener only applies to performance tests.
if (! ($test instanceof DbalPerformanceTestCase)) { if (! ($test instanceof PerformanceTestCase)) {
return; return;
} }
......
<?php <?php
namespace Doctrine\Tests; namespace Doctrine\Tests\DBAL;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment