Merge pull request #6585 from greg0ire/4.2.x

Merge 2161a70 up into 4.2.x

.appveyor.yml

@@ -122,4 +122,5 @@ test_script:
 
 after_test:
   - appveyor DownloadFile https://codecov.io/bash -FileName codecov.sh
-  - bash codecov.sh -f clover.xml
+  - SET upload_name=appveyor-%db%-%db_version%-%driver%-php-%php%
+  - bash codecov.sh -f clover.xml -n %upload_name%

.github/workflows/continuous-integration.yml

@@ -654,5 +654,6 @@ jobs:
         with:
           directory: reports
           fail_ci_if_error: true
+          name: github-action
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

tests/ConnectionTest.php

@@ -160,6 +160,57 @@ public function testConnectStartsTransactionInNoAutoCommitMode(): void
         self::assertTrue($conn->isTransactionActive());
     }
 
+    public function testTransactionIsNotActiveAfterTransactionalInAutoCommitMode(): void
+    {
+        $driverMock = self::createStub(Driver::class);
+        $driverMock
+            ->method('connect')
+            ->willReturn(
+                self::createStub(DriverConnection::class),
+            );
+
+        $conn = new Connection([], $driverMock);
+
+        $conn->setAutoCommit(true);
+
+        self::assertFalse($conn->isTransactionActive());
+
+        $conn->transactional(static function (Connection $connection): void {
+        });
+
+        self::assertFalse($conn->isTransactionActive());
+    }
+
+    public function testTransactionIsActiveAfterTransactionalInNoAutoCommitMode(): void
+    {
+        $platformMock = $this->createMock(AbstractPlatform::class);
+        $platformMock
+            ->method('supportsSavepoints')
+            ->willReturn(true);
+
+        $driverMock = $this->createMock(Driver::class);
+        $driverMock
+            ->method('connect')
+            ->willReturn(
+                self::createStub(DriverConnection::class),
+            );
+
+        $driverMock
+            ->method('getDatabasePlatform')
+            ->willReturn(
+                $platformMock,
+            );
+
+        $conn = new Connection([], $driverMock);
+
+        $conn->setAutoCommit(false);
+
+        $conn->transactional(static function (Connection $connection): void {
+        });
+
+        self::assertTrue($conn->isTransactionActive());
+    }
+
     public function testCommitStartsTransactionInNoAutoCommitMode(): void
     {
         $driver = self::createStub(Driver::class);