Fix some template related psalm errors

Author: kelunik

src/CommandResult.php

@@ -6,7 +6,7 @@
 use Amp\Sql\Result;
 
 /**
- * @template TResult extends Result
+ * @template TResult of Result
  * @implements Result<never>
  */
 final class CommandResult implements Result, \IteratorAggregate

src/ConnectionPool.php

@@ -18,11 +18,11 @@
 use function Amp\async;
 
 /**
- * @template TConfig extends SqlConfig
- * @template TLink extends Link
- * @template TResult extends Result
- * @template TStatement extends Statement
- * @template TTransaction extends Transaction
+ * @template TConfig of SqlConfig
+ * @template TLink of Link
+ * @template TResult of Result
+ * @template TStatement of Statement
+ * @template TTransaction of Transaction
  *
  * @implements Pool<TResult, TStatement, TTransaction>
  */
@@ -34,7 +34,7 @@ abstract class ConnectionPool implements Pool
     /** @var \SplQueue<TLink> */
     private readonly \SplQueue $idle;
 
-    /** @var \SplObjectStorage<TLink> */
+    /** @var \SplObjectStorage<TLink, null> */
     private readonly \SplObjectStorage $connections;
 
     /** @var Future<TLink>|null */
@@ -180,6 +180,7 @@ public function close(): void
 
         foreach ($this->connections as $connection) {
             // Avoid first class callable syntax to avoid psalm crash
+            /** @psalm-suppress MissingClosureReturnType */
             async(fn () => $connection->close())->ignore();
         }
 

src/PooledResult.php

@@ -8,8 +8,8 @@
 use function Amp\async;
 
 /**
- * @template TResult extends Result
- * @implements TResult
+ * @template TFieldValue
+ * @implements Result<TFieldValue>
  */
 abstract class PooledResult implements Result, \IteratorAggregate
 {
@@ -18,11 +18,11 @@ abstract class PooledResult implements Result, \IteratorAggregate
     /** @var null|\Closure():void */
     private ?\Closure $release;
 
-    /** @var Future<TResult|null>|null */
+    /** @var Future<Result<TFieldValue>|null>|null */
     private ?Future $next = null;
 
     /**
-     * @param TResult $result Result object created by pooled connection or statement.
+     * @param Result<TFieldValue> $result Result object created by pooled connection or statement.
      * @param \Closure():void $release Callable to be invoked when the result set is destroyed.
      */
     public function __construct(Result $result, \Closure $release)
@@ -37,10 +37,10 @@ public function __destruct()
     }
 
     /**
-     * @param TResult $result
+     * @param Result<TFieldValue> $result
      * @param \Closure():void $release
      *
-     * @return TResult
+     * @return Result<TFieldValue>
      */
     abstract protected function newInstanceFrom(Result $result, \Closure $release): Result;
 
@@ -75,7 +75,7 @@ public function getColumnCount(): ?int
     }
 
     /**
-     * @return TResult|null
+     * @return Result<TFieldValue>|null
      */
     public function getNextResult(): ?Result
     {

src/PooledStatement.php

@@ -7,8 +7,8 @@
 use Revolt\EventLoop;
 
 /**
- * @template TResult extends Result
- * @template TStatement extends Statement
+ * @template TResult of Result
+ * @template TStatement of Statement
  *
  * @implements Statement<TResult>
  */

src/PooledTransaction.php

@@ -8,9 +8,9 @@
 use Amp\Sql\TransactionIsolation;
 
 /**
- * @template TResult extends Result
- * @template TStatement extends Statement
- * @template TTransaction extends Transaction
+ * @template TResult of Result
+ * @template TStatement of Statement
+ * @template TTransaction of Transaction
  *
  * @implements Transaction<TResult, TStatement>
  */

src/RetrySqlConnector.php

@@ -10,8 +10,8 @@
 use Amp\Sql\SqlConnector;
 
 /**
- * @template TConfig extends SqlConfig
- * @template TLink extends Link
+ * @template TConfig of SqlConfig
+ * @template TLink of Link
  * @implements SqlConnector<TConfig, TLink>
  */
 final class RetrySqlConnector implements SqlConnector

src/StatementPool.php

@@ -10,8 +10,8 @@
 use Revolt\EventLoop;
 
 /**
- * @template TResult extends Result
- * @template TStatement extends Statement
+ * @template TResult of Result
+ * @template TStatement of Statement
  * @implements Statement<TResult>
  */
 abstract class StatementPool implements Statement