Merge branch '3.9.x' into 3.10.x

* 3.9.x:
  Bump dev tools (#7002)
  fix(PgSQL): Allow to pass IPv6 address in URI notation for postgres (#6344)
  Run tests on MySQL 9.3 instead of 9.1 (#7001)
  CI MariaDB: add 11.8 (#6991)

Author: derrabus

.github/workflows/continuous-integration.yml

@@ -134,6 +134,7 @@ jobs:
           - "10.6"  # LTS (Jul 2026) We have code specific to 10.6.0-10.10.0
           - "10.11" # LTS (Feb 2028) We have code specific to ^10.10
           - "11.4"  # LTS (May 2029)
+          - "11.8"  # LTS (Jun 2028)
         extension:
           - "mysqli"
           - "pdo_mysql"
@@ -162,7 +163,7 @@ jobs:
         mysql-version:
           - "5.7"
           - "8.0" # We have code specific to ^8.0
-          - "9.1"
+          - "9.3"
         extension:
           - "mysqli"
           - "pdo_mysql"

composer.json

@@ -43,11 +43,11 @@
         "doctrine/coding-standard": "13.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.1",
-        "phpstan/phpstan": "2.1.1",
+        "phpstan/phpstan": "2.1.17",
         "phpstan/phpstan-strict-rules": "^2",
-        "phpunit/phpunit": "9.6.22",
+        "phpunit/phpunit": "9.6.23",
         "slevomat/coding-standard": "8.16.2",
-        "squizlabs/php_codesniffer": "3.12.0",
+        "squizlabs/php_codesniffer": "3.13.1",
         "symfony/cache": "^5.4|^6.0|^7.0",
         "symfony/console": "^4.4|^5.4|^6.0|^7.0"
     },

src/Driver/PgSQL/Driver.php

@@ -15,6 +15,7 @@
 use function func_get_args;
 use function implode;
 use function pg_connect;
+use function preg_match;
 use function restore_error_handler;
 use function set_error_handler;
 use function sprintf;
@@ -64,9 +65,18 @@ private function constructConnectionString(
         #[SensitiveParameter]
         array $params
     ): string {
+        // pg_connect used by Doctrine DBAL does not support [...] notation,
+        // but requires the host address in plain form like `aa:bb:99...`
+        $matches = [];
+        if (isset($params['host']) && preg_match('/^\[(.+)\]$/', $params['host'], $matches) === 1) {
+            $params['hostaddr'] = $matches[1];
+            unset($params['host']);
+        }
+
         $components = array_filter(
             [
                 'host' => $params['host'] ?? null,
+                'hostaddr' => $params['hostaddr'] ?? null,
                 'port' => $params['port'] ?? null,
                 'dbname' => $params['dbname'] ?? 'postgres',
                 'user' => $params['user'] ?? null,

tests/Driver/PgSQL/DriverTest.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\PgSQL;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\PgSQL\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractPostgreSQLDriverTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
+
+use function in_array;
+
+class DriverTest extends AbstractPostgreSQLDriverTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (isset($GLOBALS['db_driver']) && $GLOBALS['db_driver'] === 'pgsql') {
+            return;
+        }
+
+        self::markTestSkipped('Test enabled only when using pgsql specific phpunit.xml');
+    }
+
+    /**
+     * Ensure we can handle URI notation for IPv6 addresses
+     */
+    public function testConnectionIPv6(): void
+    {
+        if (! in_array($GLOBALS['db_host'], ['localhost', '127.0.0.1', '[::1]'], true)) {
+            // We cannot assume that every contributor runs the same setup as our CI
+            self::markTestSkipped('This test only works if there is a Postgres server listening on localhost.');
+        }
+
+        self::expectNotToPerformAssertions();
+
+        $params         = TestUtil::getConnectionParams();
+        $params['host'] = '[::1]';
+
+        $this->driver->connect($params);
+    }
+
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}