diff --git a/composer.json b/composer.json index bb34273aca0..e7ae4c65ce6 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^6.3.8", "symfony/console": "^5.4|^6.3", - "vimeo/psalm": "5.15.0" + "vimeo/psalm": "5.16.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 0e2bf6c434c..79a99e8ae25 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -101,10 +101,8 @@ parameters: - '~^Method Doctrine\\DBAL\\Driver\\IBMDB2\\Connection\:\:exec\(\) should return int but returns int<0, max>\|false\.$~' - '~^Method Doctrine\\DBAL\\Driver\\IBMDB2\\Result\:\:rowCount\(\) should return int but returns int<0, max>\|false\.$~' - # TODO - - - message: '~^Property Doctrine\\DBAL\\Platforms\\AbstractPlatform\:\:\$disableTypeComments is never read, only written\.$~' - path: src/Platforms/AbstractPlatform.php + # Required for Psalm compatibility + - '~^Property Doctrine\\DBAL\\Tests\\Types\\BaseDateTypeTestCase\:\:\$currentTimezone \(non-empty-string\) does not accept string\.$~' includes: - vendor/phpstan/phpstan-phpunit/extension.neon - vendor/phpstan/phpstan-phpunit/rules.neon diff --git a/tests/Types/BaseDateTypeTestCase.php b/tests/Types/BaseDateTypeTestCase.php index d4a6a1e2c32..108d1a6c0e2 100644 --- a/tests/Types/BaseDateTypeTestCase.php +++ b/tests/Types/BaseDateTypeTestCase.php @@ -19,6 +19,8 @@ abstract class BaseDateTypeTestCase extends TestCase { protected AbstractPlatform&MockObject $platform; protected Type $type; + + /** @var non-empty-string */ private string $currentTimezone; protected function setUp(): void