Skip to content

Commit 1aa9141

Browse files
committed
Merge branch '4.4.x' into 4.5.x
* 4.4.x: Reuse test skip condition in tearDown() Bump PHPUnit version (#7298)
2 parents c304c55 + 09e50f0 commit 1aa9141

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": "11.5.23",
46+
"phpunit/phpunit": "11.5.50",
4747
"slevomat/coding-standard": "8.27.1",
4848
"squizlabs/php_codesniffer": "4.0.1",
4949
"symfony/cache": "^6.3.8|^7.0|^8.0",

tests/Functional/Driver/PgSQL/ResultTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ protected function setUp(): void
3535

3636
protected function tearDown(): void
3737
{
38-
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test');
39-
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test2');
38+
if (TestUtil::isDriverOneOf('pgsql')) {
39+
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test');
40+
$this->connection->executeStatement('DROP TABLE IF EXISTS types_test2');
41+
}
4042

4143
parent::tearDown();
4244
}

tests/Functional/ForeignKeyExceptionTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ protected function tearDown(): void
7777
{
7878
parent::tearDown();
7979

80+
$driver = $this->connection->getDriver();
81+
82+
if ($driver instanceof IBMDB2\Driver || $driver instanceof AbstractSQLServerDriver) {
83+
return;
84+
}
85+
8086
$schemaManager = $this->connection->createSchemaManager();
8187

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

0 commit comments

Comments
 (0)