Set more specific result type in Connection methods (#324)

vjik · web-flow · commit 953a1c53d57f · 2024-10-20T11:41:53.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Enh #320: Update according changes in `ColumnSchemaInterface` (@Tigrov)
 - New #322: Add `ColumnDefinitionBuilder` class (@Tigrov)
 - Enh #323: Refactor `Dsn` class (@Tigrov)
+- Enh #324: Set more specific result type in `Connection` methods `createCommand()` and `createTransaction()` (@vjik)
 
 ## 1.2.0 March 21, 2024
 
diff --git a/composer.json b/composer.json
@@ -47,7 +47,6 @@
         "vimeo/psalm": "^5.25",
         "yiisoft/aliases": "^2.0",
         "yiisoft/cache-file": "^3.1",
-        "yiisoft/json": "^1.0",
         "yiisoft/var-dumper": "^1.5"
     },
     "autoload": {
diff --git a/src/Connection.php b/src/Connection.php
@@ -5,12 +5,10 @@
 namespace Yiisoft\Db\Sqlite;
 
 use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;
-use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\Quoter;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
-use Yiisoft\Db\Transaction\TransactionInterface;
 
 use function str_starts_with;
 
@@ -34,7 +32,7 @@ public function __clone()
         }
     }
 
-    public function createCommand(string $sql = null, array $params = []): PdoCommandInterface
+    public function createCommand(string $sql = null, array $params = []): Command
     {
         $command = new Command($this);
 
@@ -53,7 +51,7 @@ public function createCommand(string $sql = null, array $params = []): PdoComman
         return $command->bindValues($params);
     }
 
-    public function createTransaction(): TransactionInterface
+    public function createTransaction(): Transaction
     {
         return new Transaction($this);
     }

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,10 @@`
`5`	`5`	`namespace Yiisoft\Db\Sqlite;`
`6`	`6`
`7`	`7`	`use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;`
`8`		`-use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;`
`9`	`8`	`use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;`
`10`	`9`	`use Yiisoft\Db\Schema\Quoter;`
`11`	`10`	`use Yiisoft\Db\Schema\QuoterInterface;`
`12`	`11`	`use Yiisoft\Db\Schema\SchemaInterface;`
`13`		`-use Yiisoft\Db\Transaction\TransactionInterface;`
`14`	`12`
`15`	`13`	`use function str_starts_with;`
`16`	`14`
`@@ -34,7 +32,7 @@ public function __clone()`
`34`	`32`	`}`
`35`	`33`	`}`
`36`	`34`
`37`		`- public function createCommand(string $sql = null, array $params = []): PdoCommandInterface`
	`35`	`+ public function createCommand(string $sql = null, array $params = []): Command`
`38`	`36`	`{`
`39`	`37`	`$command = new Command($this);`
`40`	`38`
`@@ -53,7 +51,7 @@ public function createCommand(string $sql = null, array $params = []): PdoComman`
`53`	`51`	`return $command->bindValues($params);`
`54`	`52`	`}`
`55`	`53`
`56`		`- public function createTransaction(): TransactionInterface`
	`54`	`+ public function createTransaction(): Transaction`
`57`	`55`	`{`
`58`	`56`	`return new Transaction($this);`
`59`	`57`	`}`