Fixup some types

amphp · Dec 3, 2023 · 4c53678 · 4c53678
1 parent 9f9a21a
commit 4c53678
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/DefaultPostgresConnector.php b/src/DefaultPostgresConnector.php
@@ -3,13 +3,12 @@
 namespace Amp\Postgres;
 
 use Amp\Cancellation;
-use Amp\Postgres\Internal\PostgresHandleConnection;
 use Amp\Sql\SqlConfig;
 use Amp\Sql\SqlConnector;
 use Amp\Sql\SqlException;
 
 /**
- * @implements SqlConnector<PostgresConfig, PostgresHandleConnection>
+ * @implements SqlConnector<PostgresConfig, PostgresConnection>
  */
 final class DefaultPostgresConnector implements SqlConnector
 {
@@ -18,7 +17,7 @@ final class DefaultPostgresConnector implements SqlConnector
      *
      * @throws \Error If neither ext-pgsql nor pecl-pq is loaded.
      */
-    public function connect(SqlConfig $config, ?Cancellation $cancellation = null): PostgresHandleConnection
+    public function connect(SqlConfig $config, ?Cancellation $cancellation = null): PostgresConnection
     {
         if (!$config instanceof PostgresConfig) {
             throw new \TypeError(\sprintf("Must provide an instance of %s to Postgres connectors", PostgresConfig::class));

diff --git a/src/Internal/PostgresNestedTransaction.php b/src/Internal/PostgresNestedTransaction.php
@@ -5,8 +5,8 @@
 use Amp\Postgres\PostgresResult;
 use Amp\Postgres\PostgresStatement;
 use Amp\Postgres\PostgresTransaction;
+use Amp\Sql\Common\NestableTransactionExecutor;
 use Amp\Sql\Common\NestedTransaction;
-use Amp\Sql\Executor;
 use Amp\Sql\Transaction;
 
 /**
@@ -40,11 +40,11 @@ protected function getTransaction(): PostgresTransaction
 
     protected function createNestedTransaction(
         Transaction $transaction,
-        Executor $executor,
+        NestableTransactionExecutor $executor,
         string $identifier,
         \Closure $release,
-    ): Transaction {
-        return new PostgresNestedTransaction($transaction, $executor, $identifier, $release);
+    ): PostgresTransaction {
+        return new self($transaction, $executor, $identifier, $release);
     }
 
     public function prepare(string $sql): PostgresStatement

diff --git a/src/PostgresConnectionPool.php b/src/PostgresConnectionPool.php
@@ -3,7 +3,6 @@
 namespace Amp\Postgres;
 
 use Amp\Future;
-use Amp\Postgres\Internal\PostgresHandleConnection;
 use Amp\Sql\Common\ConnectionPool;
 use Amp\Sql\Result;
 use Amp\Sql\SqlConnector;
@@ -12,11 +11,11 @@
 use function Amp\async;
 
 /**
- * @extends ConnectionPool<PostgresConfig, PostgresResult, PostgresStatement, PostgresTransaction, PostgresHandleConnection>
+ * @extends ConnectionPool<PostgresConfig, PostgresResult, PostgresStatement, PostgresTransaction, PostgresConnection>
  */
 final class PostgresConnectionPool extends ConnectionPool implements PostgresConnection
 {
-    /** @var Future<PostgresHandleConnection>|null Connection used for notification listening. */
+    /** @var Future<PostgresConnection>|null Connection used for notification listening. */
     private Future|null $listeningConnection = null;
 
     /** @var int Number of listeners on listening connection. */
@@ -26,7 +25,7 @@ final class PostgresConnectionPool extends ConnectionPool implements PostgresCon
      * @param positive-int $maxConnections
      * @param positive-int $idleTimeout
      * @param bool $resetConnections True to automatically execute DISCARD ALL on a connection before use.
-     * @param SqlConnector<PostgresConfig, PostgresHandleConnection>|null $connector
+     * @param SqlConnector<PostgresConfig, PostgresConnection>|null $connector
      */
     public function __construct(
         PostgresConfig $config,
@@ -64,7 +63,7 @@ protected function createTransaction(Transaction $transaction, \Closure $release
         return new Internal\PostgresPooledTransaction($transaction, $release);
     }
 
-    protected function pop(): PostgresHandleConnection
+    protected function pop(): PostgresConnection
     {
         $connection = parent::pop();