Merge remote-tracking branch 'origin/3.0.x' into 3.1.x

docs/en/reference/configuration.rst

@@ -221,7 +221,7 @@ All or Nothing Transaction
 
 .. note::
 
-    This is only works if your database supports transactions for DDL statements.
+    This only works if your database supports transactions for DDL statements.
 
 When using the ``all_or_nothing`` option, multiple migrations ran at the same time will be wrapped in a single
 transaction. If one migration fails, all migrations will be rolled back

docs/en/reference/migration-classes.rst

@@ -67,6 +67,16 @@ Override this method if you want to disable transactions in a migration. It defa
         return false;
     }
 
+.. note::
+
+    Some database platforms like MySQL or Oracle do not support DDL
+    statements in transactions and may or may not implicitly commit the
+    transaction opened by this library as soon as they encounter such a
+    statement, and before running it. Make sure to read the manual of
+    your database platform to know what is actually happening.
+    ``isTransactional()`` does not guarantee that statements are wrapped
+    in a single transaction.
+
 getDescription
 ~~~~~~~~~~~~~~
 

lib/Doctrine/Migrations/DbalMigrator.php

@@ -8,6 +8,7 @@
 use Doctrine\Migrations\Metadata\MigrationPlanList;
 use Doctrine\Migrations\Query\Query;
 use Doctrine\Migrations\Tools\BytesFormatter;
+use Doctrine\Migrations\Tools\TransactionHelper;
 use Doctrine\Migrations\Version\Executor;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -82,7 +83,7 @@ private function executeMigrations(
         }
 
         if ($allOrNothing) {
-            $this->connection->commit();
+            TransactionHelper::commitIfInTransaction($this->connection);
         }
 
         return $sql;

lib/Doctrine/Migrations/Event/Listeners/AutoCommitListener.php

@@ -7,6 +7,7 @@
 use Doctrine\Common\EventSubscriber;
 use Doctrine\Migrations\Event\MigrationsEventArgs;
 use Doctrine\Migrations\Events;
+use Doctrine\Migrations\Tools\TransactionHelper;
 
 /**
  * Listens for `onMigrationsMigrated` and, if the connection has autocommit
@@ -25,7 +26,7 @@ public function onMigrationsMigrated(MigrationsEventArgs $args): void
             return;
         }
 
-        $conn->commit();
+        TransactionHelper::commitIfInTransaction($conn);
     }
 
     /** {@inheritdoc} */

lib/Doctrine/Migrations/Tools/TransactionHelper.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Migrations\Tools;
+
+use Doctrine\DBAL\Connection;
+use PDO;
+
+/**
+ * @internal
+ */
+final class TransactionHelper
+{
+    public static function commitIfInTransaction(Connection $connection): void
+    {
+        $wrappedConnection = $connection->getWrappedConnection();
+
+        // Attempt to commit while no transaction is running results in exception since PHP 8 + pdo_mysql combination
+        if ($wrappedConnection instanceof PDO && ! $wrappedConnection->inTransaction()) {
+            return;
+        }
+
+        $connection->commit();
+    }
+}

lib/Doctrine/Migrations/Version/DbalExecutor.php

@@ -18,6 +18,7 @@
 use Doctrine\Migrations\Provider\SchemaDiffProvider;
 use Doctrine\Migrations\Query\Query;
 use Doctrine\Migrations\Tools\BytesFormatter;
+use Doctrine\Migrations\Tools\TransactionHelper;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -212,8 +213,7 @@ private function executeMigration(
         }
 
         if ($migration->isTransactional()) {
-            //commit only if running in transactional mode
-            $this->connection->commit();
+            TransactionHelper::commitIfInTransaction($this->connection);
         }
 
         $plan->markAsExecuted($result);