Move beginTransaction back to Link and extend Link in Transaction

Author: trowski

src/Connection.php

@@ -5,7 +5,7 @@
 /**
  * @template TConfig of SqlConfig
  * @template TResult of Result
- * @template TStatement of Statement
+ * @template TStatement of Statement<TResult>
  * @template TTransaction of Transaction
  *
  * @extends Link<TResult, TStatement, TTransaction>
@@ -16,4 +16,11 @@ interface Connection extends Link
      * @return TConfig The configuration used to create this connection.
      */
     public function getConfig(): SqlConfig;
+
+    /**
+     * Sets the transaction isolation level for transactions began on this link.
+     *
+     * @see Link::beginTransaction()
+     */
+    public function setTransactionIsolation(TransactionIsolation $isolation): void;
 }

src/Executor.php

@@ -5,7 +5,6 @@
 /**
  * @template TResult of Result
  * @template TStatement of Statement
- * @template TTransaction of Transaction
  */
 interface Executor extends TransientResource
 {
@@ -42,11 +41,4 @@ public function prepare(string $sql): Statement;
      * @throws QueryError If the operation fails due to an error in the query (such as a syntax error).
      */
     public function execute(string $sql, array $params = []): Result;
-
-    /**
-     * Starts a transaction, returning an object where all queries are executed on a single connection.
-     *
-     * @return TTransaction
-     */
-    public function beginTransaction(): Transaction;
 }

src/Link.php

@@ -4,17 +4,17 @@
 
 /**
  * @template TResult of Result
- * @template TStatement of Statement
+ * @template TStatement of Statement<TResult>
  * @template TTransaction of Transaction
  *
- * @extends Executor<TResult, TStatement, TTransaction>
+ * @extends Executor<TResult, TStatement>
  */
 interface Link extends Executor
 {
     /**
-     * Sets the transaction isolation level for transactions began on this link.
+     * Starts a transaction, returning an object where all queries are executed on a single connection.
      *
-     * @see Executor::beginTransaction()
+     * @return TTransaction
      */
-    public function setTransactionIsolation(TransactionIsolation $isolation): void;
+    public function beginTransaction(): Transaction;
 }

src/Transaction.php

@@ -6,9 +6,10 @@
  * @template TResult of Result
  * @template TStatement of Statement<TResult>
  * @template TTransaction of Transaction
- * @extends Executor<TResult, TStatement, TTransaction>
+ *
+ * @extends Link<TResult, TStatement, TTransaction>
  */
-interface Transaction extends Executor
+interface Transaction extends Link
 {
     public function getIsolationLevel(): TransactionIsolation;