Fix test of timeout PDOException: Packets out of order

.github/workflows/ansi-mode.yml

@@ -84,7 +84,7 @@ jobs:
         run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit with code coverage.
-        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always
+        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
         uses: codecov/codecov-action@v3

.github/workflows/build-mariadb.yml

@@ -90,7 +90,7 @@ jobs:
         run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit with code coverage.
-        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always
+        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
         uses: codecov/codecov-action@v3

.github/workflows/build.yml

@@ -85,7 +85,7 @@ jobs:
         run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit with code coverage.
-        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always
+        run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
         uses: codecov/codecov-action@v3

CHANGELOG.md

@@ -8,6 +8,8 @@
 - Chg #339: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)
 - Enh #342: Add JSON overlaps condition builder (@Tigrov)
 - Enh #344: Update `bit` type according to main PR yiisoft/db#860 (@Tigrov)
+- Enh #347: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov)
+- Bug #349, #352: Restore connection if closed by connection timeout (@Tigrov)
 - Enh #347, #353: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov)
 - Bug #349: Restore connection if closed by connection timeout (@Tigrov)
 

src/Command.php

@@ -48,9 +48,12 @@ protected function queryInternal(int $queryMode): mixed
         try {
             return parent::queryInternal($queryMode);
         } catch (IntegrityException $e) {
-            if (str_starts_with($e->getMessage(), 'SQLSTATE[HY000]: General error: 2006 ')) {
-                $this->db->close();
+            if (
+                str_starts_with($e->getMessage(), 'SQLSTATE[HY000]: General error: 2006 ')
+                && $this->db->getTransaction() === null
+            ) {
                 $this->cancel();
+                $this->db->close();
 
                 return parent::queryInternal($queryMode);
             }

src/Connection.php

@@ -4,8 +4,8 @@
 
 namespace Yiisoft\Db\Mysql;
 
-use Exception;
 use Psr\Log\LogLevel;
+use Throwable;
 use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;
 use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
@@ -30,8 +30,8 @@ public function close(): void
 
             // Solution for close connections {@link https://stackoverflow.com/questions/18277233/pdo-closing-connection}
             try {
-                $this->pdo->query('KILL CONNECTION_ID()');
-            } catch (Exception) {
+                $this->pdo->exec('KILL CONNECTION_ID()');
+            } catch (Throwable) {
             }
 
             $this->pdo = null;

tests/ConnectionTest.php

@@ -8,6 +8,7 @@
 use Throwable;
 use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\Exception;
+use Yiisoft\Db\Exception\IntegrityException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
@@ -132,12 +133,27 @@ public function testRestartConnectionOnTimeout(): void
 
         $db->createCommand('SET SESSION wait_timeout = 1')->execute();
 
-        sleep(1);
+        sleep(2);
 
-        $result = $db->createCommand("SELECT '1'")->queryScalar();
+        $result = $db->createCommand('SELECT 1')->queryScalar();
 
         $this->assertSame('1', $result);
 
         $db->close();
     }
+
+    public function testNotRestartConnectionOnTimeoutInTransaction(): void
+    {
+        $db = $this->getConnection();
+        $db->beginTransaction();
+
+        $db->createCommand('SET SESSION wait_timeout = 1')->execute();
+
+        sleep(2);
+
+        $this->expectException(IntegrityException::class);
+        $this->expectExceptionMessage('SQLSTATE[HY000]: General error: 2006 MySQL server has gone away');
+
+        $db->createCommand('SELECT 1')->queryScalar();
+    }
 }