fixed generic of connection::transaction (#994)

kikara · vjik · xepozz · web-flow · commit 8f6bd18f45b4 · 2025-06-25T14:35:34.000+03:00
Co-authored-by: Sergei Predvoditelev &lt;sergei@predvoditelev.ru&gt;
Co-authored-by: Dmitrii Derepko &lt;xepozz@list.ru&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -101,6 +101,7 @@
 - New #984: Add `createQuery()` and `select()` methods to `ConnectionInterface` (@Tigrov)
 - Chg #985: Rename `insertWithReturningPks()` to `insertReturningPks()` in `CommandInterface` and `DMLQueryBuilderInterface` (@Tigrov)
 - Enh #992: Add optional type casting to `DataReaderInterface` using columns (@Tigrov)
+- Enh #991: Improve types in `ConnectionInterface::transaction()` (@kikara) 
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/Connection/AbstractConnection.php b/src/Connection/AbstractConnection.php
@@ -93,7 +93,6 @@ public function transaction(Closure $closure, ?string $isolationLevel = null): m
         $level = $transaction->getLevel();
 
         try {
-            /** @psalm-var mixed $result */
             $result = $closure($this);
 
             if ($transaction->isActive() && $transaction->getLevel() === $level) {
diff --git a/src/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
@@ -258,7 +258,9 @@ public function setTablePrefix(string $value): void;
      *
      * @return mixed Result of callback function.
      *
-     * @psalm-param Closure(ConnectionInterface):mixed|Closure(ConnectionInterface):void $closure
+     * @psalm-template Result
+     * @psalm-param Closure(ConnectionInterface): Result $closure
+     * @psalm-return Result
      */
     public function transaction(Closure $closure, ?string $isolationLevel = null): mixed;
 }

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,9 @@ public function setTablePrefix(string $value): void;`
`258`	`258`	`*`
`259`	`259`	`* @return mixed Result of callback function.`
`260`	`260`	`*`
`261`		`- * @psalm-param Closure(ConnectionInterface):mixed\|Closure(ConnectionInterface):void $closure`
	`261`	`+ * @psalm-template Result`
	`262`	`+ * @psalm-param Closure(ConnectionInterface): Result $closure`
	`263`	`+ * @psalm-return Result`
`262`	`264`	`*/`
`263`	`265`	`public function transaction(Closure $closure, ?string $isolationLevel = null): mixed;`
`264`	`266`	`}`