Psalm 5.21.1 (doctrine#6294)

morozov · Feb 4, 2024 · d928827 · d928827
1 parent ac75c3c
commit d928827
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "squizlabs/php_codesniffer": "3.8.1",
         "symfony/cache": "^6.3.8|^7.0",
         "symfony/console": "^5.4|^6.3|^7.0",
-        "vimeo/psalm": "5.16.0"
+        "vimeo/psalm": "5.21.1"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/src/Driver/OCI8/Driver.php b/src/Driver/OCI8/Driver.php
@@ -34,8 +34,10 @@ public function connect(
 
         $connectionString = $this->getEasyConnectString($params);
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         $persistent = ! empty($params['persistent']);
-        $exclusive  = ! empty($params['driverOptions']['exclusive']);
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
+        $exclusive = ! empty($params['driverOptions']['exclusive']);
 
         if ($persistent && $exclusive) {
             throw InvalidConfiguration::forPersistentAndExclusive();

diff --git a/src/Platforms/SQLitePlatform.php b/src/Platforms/SQLitePlatform.php
@@ -772,6 +772,7 @@ private function getSimpleAlterTableSQL(TableDiff $diff): array|false
 
             $type = $definition['type'];
 
+            /** @psalm-suppress RiskyTruthyFalsyComparison */
             switch (true) {
                 case isset($definition['columnDefinition']) || $definition['autoincrement'] || $definition['unique']:
                 case $type instanceof Types\DateTimeType && $definition['default'] === $this->getCurrentTimestampSQL():

diff --git a/tests/Functional/Driver/OCI8/ResultTest.php b/tests/Functional/Driver/OCI8/ResultTest.php
@@ -87,6 +87,7 @@ public function testTruncatedFetch(
             // after the initial prefetch that caches locally the first X results
             $this->createOrReplacePipelinedFunction($expectedTotalRowCount + 10);
 
+            /** @var callable|null $previous */
             $previous = null;
             $previous = set_error_handler(static function (int $errno, string $errstr) use (&$previous): bool {
                 if (str_contains($errstr, 'ORA-04061')) {

diff --git a/tests/Functional/ExceptionTest.php b/tests/Functional/ExceptionTest.php
@@ -87,6 +87,7 @@ public function testInvalidFieldNameException(): void
         $this->expectException(Exception\InvalidFieldNameException::class);
 
         // prevent the PHPUnit error handler from handling the warning that db2_bind_param() may trigger
+        /** @var callable|null $previous */
         $previous = null;
         $previous = set_error_handler(static function (int $errno) use (&$previous): bool {
             if (($errno & ~E_WARNING) === 0) {

diff --git a/tests/Functional/TransactionTest.php b/tests/Functional/TransactionTest.php
@@ -58,6 +58,7 @@ private function expectConnectionLoss(callable $scenario): void
         $this->expectException(ConnectionLost::class);
 
         // prevent the PHPUnit error handler from handling the "MySQL server has gone away" warning
+        /** @var callable|null $previous */
         $previous = null;
         $previous = set_error_handler(static function (int $errno) use (&$previous): bool {
             if (($errno & ~E_WARNING) === 0) {