There's no active transaction

Author: simPod

.github/workflows/continuous-integration.yml

@@ -37,25 +37,12 @@ jobs:
         os:
           - "ubuntu-22.04"
         php-version:
-          - "7.4"
-          - "8.0"
-          - "8.1"
-          - "8.2"
           - "8.3"
-          - "8.4"
         dependencies:
           - "highest"
         extension:
           - "pdo_sqlite"
         include:
-          - os: "ubuntu-20.04"
-            php-version: "7.4"
-            dependencies: "lowest"
-            extension: "pdo_sqlite"
-          - os: "ubuntu-22.04"
-            php-version: "7.4"
-            dependencies: "highest"
-            extension: "sqlite3"
           - os: "ubuntu-22.04"
             php-version: "8.1"
             dependencies: "highest"
@@ -107,17 +94,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.2"
           - "8.3"
         oracle-version:
           - "21"
           - "23"
-        include:
-          - php-version: "8.4"
-            oracle-version: "23"
-          - php-version: "7.4"
-            oracle-version: "11"
 
     services:
       oracle:
@@ -168,17 +148,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.2"
           - "8.3"
         oracle-version:
           - "21"
           - "23"
-        include:
-          - php-version: "8.4"
-            oracle-version: "23"
-          - php-version: "7.4"
-            oracle-version: "11"
 
     services:
       oracle:
@@ -238,24 +211,12 @@ jobs:
           - "pgsql"
           - "pdo_pgsql"
         include:
-          - php-version: "8.2"
-            postgres-version: "16"
-            extension: "pgsql"
           - php-version: "8.3"
             postgres-version: "16"
             extension: "pgsql"
-          - php-version: "8.4"
-            postgres-version: "16"
-            extension: "pgsql"
-          - php-version: "8.2"
-            postgres-version: "16"
-            extension: "pdo_pgsql"
           - php-version: "8.3"
             postgres-version: "16"
             extension: "pdo_pgsql"
-          - php-version: "8.4"
-            postgres-version: "16"
-            extension: "pdo_pgsql"
 
     services:
       postgres:
@@ -487,22 +448,12 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.2"
           - "8.3"
-          - "8.4"
         extension:
           - "sqlsrv"
           - "pdo_sqlsrv"
         collation:
           - "Latin1_General_100_CI_AS_SC_UTF8"
-        include:
-          - collation: "Latin1_General_100_CS_AS_SC_UTF8"
-            php-version: "7.4"
-            extension: "sqlsrv"
-          - collation: "Latin1_General_100_CS_AS_SC_UTF8"
-            php-version: "7.4"
-            extension: "pdo_sqlsrv"
 
     services:
       mssql:
@@ -555,10 +506,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.2"
           - "8.3"
-          - "8.4"
 
     services:
       ibm_db2:

src/Connection.php

@@ -1283,16 +1283,39 @@ public function transactional(Closure $func)
 
         try {
             $res = $func($this);
-            $this->commit();
 
             $successful = true;
-
-            return $res;
         } finally {
             if (! $successful) {
                 $this->rollBack();
             }
         }
+
+        $this->commit();
+//        $successful = false;
+//        try {
+//            $this->commit();
+//
+//            $successful = true;
+//        } finally {
+//            if (! $successful) {
+//                $this->rollBack();
+//            }
+//        }
+
+        return $res;
+
+//        try {
+//            $res = $func($this);
+//        } catch (Throwable $e) {
+//            $this->rollBack();
+//
+//            throw $e;
+//        }
+//
+//        $this->commit();
+//
+//        return $res;
     }
 
     /**
@@ -1424,12 +1447,21 @@ public function commit()
 
         $connection = $this->getWrappedConnection();
 
-        if ($this->transactionNestingLevel === 1) {
-            $result = $this->doCommit($connection);
-        } elseif ($this->nestTransactionsWithSavepoints) {
-            $this->releaseSavepoint($this->_getNestedTransactionSavePointName());
+        try {
+            if ($this->transactionNestingLevel === 1) {
+                $result = $this->doCommit($connection);
+            } elseif ($this->nestTransactionsWithSavepoints) {
+                $this->releaseSavepoint($this->_getNestedTransactionSavePointName());
+            }
+        } finally {
+            $this->updateTransactionStateAfterCommit();
         }
 
+        return $result;
+    }
+
+    private function updateTransactionStateAfterCommit(): void
+    {
         --$this->transactionNestingLevel;
 
         $eventManager = $this->getEventManager();
@@ -1446,12 +1478,10 @@ public function commit()
         }
 
         if ($this->autoCommit !== false || $this->transactionNestingLevel !== 0) {
-            return $result;
+            return;
         }
 
         $this->beginTransaction();
-
-        return $result;
     }
 
     /**
@@ -1468,6 +1498,11 @@ private function doCommit(DriverConnection $connection)
         }
 
         $result = $connection->commit();
+//        try {
+//            $result = $connection->commit();
+//        } catch (Driver\Exception $e) {
+//            throw $this->convertExceptionDuringQuery($e, 'COMMIT');
+//        }
 
         if ($logger !== null) {
             $logger->stopQuery();

src/Driver/OCI8/Connection.php

@@ -142,7 +142,7 @@ public function beginTransaction(): bool
 
     public function commit(): bool
     {
-        if (! oci_commit($this->connection)) {
+        if (! @oci_commit($this->connection)) {
             throw Error::new($this->connection);
         }