Improve psalm types + Improve tests

CHANGELOG.md

@@ -162,7 +162,7 @@
 - Enh #1065: Allow to use table name as a column prefix in update queries (@Tigrov)
 - Enh #1068: Quote string values as column names when join condition is an associative array (@Tigrov)
 - Chg #1070: Change "IndexBy" closure signature to `Closure(array|object):int|string` (@vjik)
-- Enh #1072, #1077, #1078, #1079, #1080, #1085, #1087: Improve psalm types (@vjik)
+- Enh #1072, #1077, #1078, #1079, #1080, #1085, #1087, #1096: Improve psalm types (@vjik)
 - New #1074: Add `ConnectionProvider` class (@Tigrov)
 - Chg #1075: Rename `Query::$join` property to `$joins` (@vjik)
 - New #1076: Allow to use expressions as table name or condition in "join" query methods (@vjik)

src/Schema/Column/AbstractColumnFactory.php

@@ -227,7 +227,6 @@ protected function columnDefinitionParser(): ColumnDefinitionParser
     }
 
     /**
-     * @psalm-param ColumnType::* $type
      * @psalm-param ColumnInfo $info
      * @psalm-return class-string<ColumnInterface>
      */
@@ -291,8 +290,6 @@ protected function isDbType(string $dbType): bool
 
     /**
      * Checks if the column type is a pseudo-type.
-     *
-     * @psalm-assert-if-true PseudoType::* $pseudoType
      */
     protected function isPseudoType(string $pseudoType): bool
     {
@@ -309,8 +306,6 @@ protected function isPseudoType(string $pseudoType): bool
 
     /**
      * Checks if the column type is an abstract type.
-     *
-     * @psalm-assert-if-true ColumnType::* $type
      */
     protected function isType(string $type): bool
     {

src/Schema/Column/ColumnFactoryInterface.php

@@ -73,7 +73,6 @@ public function fromDefinition(string $definition, array $info = []): ColumnInte
      * @param string $pseudoType The pseudo-type.
      * @param array $info The column information. The set of parameters may be different for a specific DBMS.
      *
-     * @psalm-param PseudoType::* $pseudoType
      * @psalm-param ColumnInfo $info
      */
     public function fromPseudoType(string $pseudoType, array $info = []): ColumnInterface;
@@ -84,7 +83,6 @@ public function fromPseudoType(string $pseudoType, array $info = []): ColumnInte
      * @param string $type The abstract database type.
      * @param array $info The column information. The set of parameters may be different for a specific DBMS.
      *
-     * @psalm-param ColumnType::* $type
      * @psalm-param ColumnInfo $info
      */
     public function fromType(string $type, array $info = []): ColumnInterface;

src/Schema/Column/ColumnInterface.php

@@ -6,6 +6,7 @@
 
 use Yiisoft\Db\Constant\ColumnType;
 use Yiisoft\Db\Constraint\ForeignKey;
+use Yiisoft\Db\Exception\NotSupportedException;
 
 /**
  * This interface defines a set of methods that must be implemented by a class that represents a database table column.
@@ -86,6 +87,8 @@ public function dbType(?string $dbType): static;
      * directly in your code.
      *
      * If the value is `null` or an {@see Expression}, there will be no conversion.
+     *
+     * @throws NotSupportedException
      */
     public function dbTypecast(mixed $value): mixed;
 
@@ -291,6 +294,8 @@ public function null(): static;
 
     /**
      * Converts the input value after retrieval from the database.
+     *
+     * @throws NotSupportedException
      */
     public function phpTypecast(mixed $value): mixed;
 

tests/AbstractCommandTest.php

@@ -5,29 +5,18 @@
 namespace Yiisoft\Db\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Throwable;
 use Yiisoft\Db\Expression\Value\Param;
-use Yiisoft\Db\Exception\Exception;
-use Yiisoft\Db\Exception\InvalidConfigException;
-use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Profiler\Context\CommandContext;
 use Yiisoft\Db\Profiler\ContextInterface;
 use Yiisoft\Db\Profiler\ProfilerInterface;
 use Yiisoft\Db\Tests\Support\TestTrait;
 
-/**
- * @psalm-suppress RedundantCondition
- */
 abstract class AbstractCommandTest extends TestCase
 {
     use TestTrait;
 
     protected string $upsertTestCharCast = '';
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testAutoQuoting(): void
     {
         $db = $this->getConnection();
@@ -47,10 +36,6 @@ public function testAutoQuoting(): void
         );
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testConstruct(): void
     {
         $db = $this->getConnection();
@@ -68,10 +53,6 @@ public function testConstruct(): void
         $this->assertSame([':name' => 'John Doe'], $command->getParams());
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testGetParams(): void
     {
         $db = $this->getConnection();
@@ -103,19 +84,14 @@ public function testGetParams(): void
         $this->assertContainsOnlyInstancesOf(Param::class, $bindedValues);
         $this->assertCount(3, $bindedValues);
         $this->assertEquals($param, $bindedValues['int']);
+
+        $db->close();
     }
 
     /**
-     * Test command getRawSql.
-     *
      * @dataProvider \Yiisoft\Db\Tests\Provider\CommandProvider::rawSql
      *
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws NotSupportedException
-     * @throws \Exception
-     *
-     * {@see https://github.com/yiisoft/yii2/issues/8592}
+     * @see https://github.com/yiisoft/yii2/issues/8592
      */
     public function testGetRawSql(string $sql, array $params, string $expectedRawSql): void
     {
@@ -124,12 +100,10 @@ public function testGetRawSql(string $sql, array $params, string $expectedRawSql
         $command = $db->createCommand($sql, $params);
 
         $this->assertSame($expectedRawSql, $command->getRawSql());
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testGetSetSql(): void
     {
         $db = $this->getConnection();
@@ -145,12 +119,10 @@ public function testGetSetSql(): void
         SQL;
         $command->setSql($sql2);
         $this->assertSame($sql2, $command->getSql());
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testPrepareCancel(): void
     {
         $db = $this->getConnection(true);
@@ -171,13 +143,10 @@ public function testPrepareCancel(): void
         $command->cancel();
 
         $this->assertNull($command->getPdoStatement());
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws \Exception
-     */
     public function testSetRawSql(): void
     {
         $db = $this->getConnection();
@@ -190,12 +159,10 @@ public function testSetRawSql(): void
         );
 
         $this->assertSame('SELECT 123', $command->getRawSql());
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testSetSql(): void
     {
         $db = $this->getConnection();
@@ -208,14 +175,10 @@ public function testSetSql(): void
         );
 
         $this->assertSame('SELECT 123', $command->getSql());
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws Throwable
-     * @throws \PHPUnit\Framework\MockObject\Exception
-     */
     public function testProfiler(?string $sql = null): void
     {
         $sql ??= 'SELECT 123';
@@ -233,14 +196,10 @@ public function testProfiler(?string $sql = null): void
         $db->setProfiler($profiler);
 
         $db->createCommand($sql)->execute();
+
+        $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws Throwable
-     * @throws \PHPUnit\Framework\MockObject\Exception
-     */
     public function testProfilerData(?string $sql = null): void
     {
         $sql ??= 'SELECT 123';
@@ -271,5 +230,7 @@ public function end(string $token, ContextInterface|array $context = []): void
         $db->setProfiler($profiler);
 
         $db->createCommand($sql)->execute();
+
+        $db->close();
     }
 }

tests/AbstractQueryBuilderTest.php

@@ -37,9 +37,6 @@
 use function PHPUnit\Framework\assertEmpty;
 use function PHPUnit\Framework\assertSame;
 
-/**
- * @psalm-suppress PropertyNotSetInConstructor
- */
 abstract class AbstractQueryBuilderTest extends TestCase
 {
     use TestTrait;
@@ -142,9 +139,6 @@ public function testAddDefaultValue(): void
 
     /**
      * @dataProvider \Yiisoft\Db\Tests\Provider\QueryBuilderProvider::addForeignKey
-     *
-     * @throws Exception
-     * @throws InvalidArgumentException
      */
     public function testAddForeignKey(
         string $name,

tests/AbstractQueryGetTableAliasTest.php

@@ -14,9 +14,6 @@ abstract class AbstractQueryGetTableAliasTest extends TestCase
 {
     use TestTrait;
 
-    /**
-     * @throws InvalidArgumentException
-     */
     public function testAliasesFromString(): void
     {
         $db = $this->getConnection();
@@ -25,6 +22,8 @@ public function testAliasesFromString(): void
         $query->from('profile AS \'prf\', user "usr", service srv, order, [a b] [c d], {{something}} AS myalias');
         $tables = $query->getTablesUsedInFrom();
 
+        $db->close();
+
         $this->assertSame(
             [
                 '{{prf}}' => '{{profile}}',

tests/AbstractQueryTest.php

@@ -786,6 +786,8 @@ public function testColumnWithIndexBy(): void
             ->where(['id' => null]);
 
         $this->assertSame([], $query->column());
+
+        $db->close();
     }
 
     /**
@@ -853,5 +855,7 @@ public function testResultCallback(): void
         $query->resultCallback(null);
 
         $this->assertNull($query->getResultCallback());
+
+        $db->close();
     }
 }

tests/AbstractSchemaTest.php

@@ -23,6 +23,8 @@ public function testGetDefaultSchema(): void
 
         $schema = $db->getSchema();
 
+        $db->close();
+
         $this->assertSame('', $schema->getDefaultSchema());
     }
 
@@ -44,6 +46,8 @@ public function testGetDataType(): void
 
         $schema = $db->getSchema();
 
+        $db->close();
+
         foreach ($values as $value) {
             $this->assertSame(
                 $value[1],
@@ -62,6 +66,8 @@ public function testRefresh(): void
         $schema = $db->getSchema();
         $schema->refresh();
 
+        $db->close();
+
         $this->assertSame([], Assert::getPropertyValue($schema, 'tableMetadata'));
         $this->assertSame([], Assert::getPropertyValue($schema, 'tableNames'));
     }

tests/Common/CommonBatchQueryResultTest.php

@@ -128,6 +128,8 @@ public function testBatchWithoutDbParameter(): void
         $query = $query->from('customer')->orderBy('id')->limit(3);
         $customers = $this->getAllRowsFromBatch($query->batch(2));
 
+        $db->close();
+
         $this->assertCount(3, $customers);
         $this->assertEquals('user1', $customers[0]['name']);
         $this->assertEquals('user2', $customers[1]['name']);
@@ -161,6 +163,8 @@ public function testBatchQueryResultWithoutPopulate(): void
 
         $customers = $this->getAllRowsFromBatch($batchQueryResult);
 
+        $db->close();
+
         $this->assertCount(3, $customers);
         $this->assertEquals('user1', $customers[0]['name']);
         $this->assertEquals('user2', $customers[1]['name']);

tests/Common/CommonQueryBuilderTest.php

@@ -245,6 +245,8 @@ public function testMultiOperandFunctionBuilder(
             sort($result, SORT_NATURAL);
         }
 
+        $db->close();
+
         $this->assertEquals($expectedResult, $result);
     }