Skip to content

Commit b3fb3aa

Browse files
committed
Merge branch '4.5.x' into 5.0.x
* 4.5.x: Reuse test skip condition in tearDown() Bump PHPUnit version (#7298)
2 parents 7b088c8 + 1aa9141 commit b3fb3aa

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"phpstan/phpstan": "2.1.30",
4444
"phpstan/phpstan-phpunit": "2.0.7",
4545
"phpstan/phpstan-strict-rules": "^2",
46-
"phpunit/phpunit": "12.3.0",
46+
"phpunit/phpunit": "12.5.8",
4747
"slevomat/coding-standard": "8.27.1",
4848
"squizlabs/php_codesniffer": "4.0.1",
4949
"symfony/cache": "^7.4|^8.0",

tests/Functional/Driver/PgSQL/ResultTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ protected function setUp(): void
3838
#[Override]
3939
protected function tearDown(): void
4040
{
41-
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test');
42-
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test2');
41+
if (TestUtil::isDriverOneOf('pgsql')) {
42+
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test');
43+
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test2');
44+
}
4345

4446
parent::tearDown();
4547
}

tests/Functional/ForeignKeyExceptionTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ protected function tearDown(): void
8080
{
8181
parent::tearDown();
8282

83+
$driver = $this->connection->getDriver();
84+
85+
if ($driver instanceof IBMDB2\Driver || $driver instanceof AbstractSQLServerDriver) {
86+
return;
87+
}
88+
8389
$schemaManager = $this->connection->createSchemaManager();
8490

8591
$schemaManager->dropTable('owning_table');

0 commit comments

Comments
 (0)