Skip to content

Commit

Permalink
Merge branch '3.5.x' into 4.0.x
Browse files Browse the repository at this point in the history
* 3.5.x:
  Enable testReturnsDatabaseNameWithoutDatabaseNameParameter for SQLite
  Bump dev dependencies
  • Loading branch information
derrabus committed Oct 10, 2022
2 parents a8a2650 + f96b1e8 commit c0cdf49
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -41,15 +41,15 @@
"require-dev": {
"doctrine/coding-standard": "10.0.0",
"jetbrains/phpstorm-stubs": "2022.2",
"phpstan/phpstan": "1.8.6",
"phpstan/phpstan": "1.8.8",
"phpstan/phpstan-phpunit": "1.1.1",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "9.5.24",
"phpunit/phpunit": "9.5.25",
"psalm/plugin-phpunit": "0.17.0",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4.30|^5.4|^6.0",
"vimeo/psalm": "4.27.0"
"vimeo/psalm": "4.28.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/Driver/PDO/SQLite/DriverTest.php
Expand Up @@ -23,9 +23,9 @@ protected function setUp(): void
self::markTestSkipped('This test requires the pdo_sqlite driver.');
}

public function testReturnsDatabaseNameWithoutDatabaseNameParameter(): void
protected static function getDatabaseNameForConnectionWithoutDatabaseNameParameter(): ?string
{
self::markTestSkipped('SQLite does not support the concept of a database.');
return 'main';
}

protected function createDriver(): DriverInterface
Expand Down

0 comments on commit c0cdf49

Please sign in to comment.