Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3963' into PR_2025_06_12_muntianu

Author: katmoon

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -4225,7 +4225,10 @@ public function dropTrigger($triggerName, $schemaName = null)
     public function __destruct()
     {
         if ($this->_transactionLevel > 0) {
-            trigger_error('Some transactions have not been committed or rolled back', E_USER_ERROR);
+            while ($this->_transactionLevel) {
+                $this->rollBack();
+            }
+            $this->logger->log('Some transactions have not been committed or rolled back');
         }
     }
 

lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,6 +15,7 @@
 use Magento\Framework\DB\SelectFactory;
 use Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use Magento\Framework\Setup\SchemaListener;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\StringUtils;
@@ -55,6 +56,11 @@ class MysqlTest extends TestCase
      */
     private $connection;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
     /**
      * Setup
      */
@@ -741,10 +747,11 @@ private function getMysqlPdoAdapterMock(array $methods): MockObject
 
         $string = $this->createMock(StringUtils::class);
         $dateTime = $this->createMock(DateTime::class);
-        $logger = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
         $selectFactory = $this->getMockBuilder(SelectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $dtoFactoriesTable = $this->createMock(DtoFactoriesTable::class);
 
         $adapterMock = $this->getMockBuilder(PdoMysqlAdapter::class)
             ->onlyMethods(
@@ -753,14 +760,15 @@ private function getMysqlPdoAdapterMock(array $methods): MockObject
                 [
                     'string' => $string,
                     'dateTime' => $dateTime,
-                    'logger' => $logger,
+                    'logger' => $this->logger,
                     'selectFactory' => $selectFactory,
                     'config' => [
                         'dbname' => 'not_exists',
                         'username' => 'not_valid',
                         'password' => 'not_valid',
                     ],
                     'serializer' => $this->serializerMock,
+                    'dtoFactoriesTable' => $dtoFactoriesTable,
                 ]
             )
             ->getMock();
@@ -1067,4 +1075,15 @@ public static function exceptionDataProvider(): array
             [new \Exception()],
         ];
     }
+
+    public function testDestruct(): void
+    {
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect', '_rollBack']);
+        $this->addConnectionMock($adapter);
+        $adapter->expects($this->once())->method('_rollBack');
+        $this->logger->expects($this->once())->method('log');
+        $adapter->beginTransaction();
+        $adapter->__destruct();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
+    }
 }