Merge branch '3.6.x' into 3.7.x

* 3.6.x:
  Run tests against Postgres 16 (#6154)
  PHPStan 1.10.34, PHPUnit 9.6.12 (#6151)
  Bump CI workflows (#6152)
  Fix invalid SQL in the document
  docs: link to the testing guidelines in CONTRIBUTING.md
  Document `driverOptions` for SQL Server connections (#6140)

.github/workflows/coding-standards.yml

@@ -25,4 +25,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"

.github/workflows/continuous-integration.yml

@@ -62,7 +62,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -130,7 +130,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -188,7 +188,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -226,21 +226,22 @@ jobs:
         postgres-version:
           - "9.4"
           - "15"
+          - "16"
         extension:
           - "pgsql"
           - "pdo_pgsql"
         include:
           - php-version: "8.2"
-            postgres-version: "15"
+            postgres-version: "16"
             extension: "pgsql"
           - php-version: "8.3"
-            postgres-version: "15"
+            postgres-version: "16"
             extension: "pgsql"
           - php-version: "8.2"
-            postgres-version: "15"
+            postgres-version: "16"
             extension: "pdo_pgsql"
           - php-version: "8.3"
-            postgres-version: "15"
+            postgres-version: "16"
             extension: "pdo_pgsql"
 
     services:
@@ -257,7 +258,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -339,7 +340,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -426,7 +427,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -496,7 +497,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -556,7 +557,7 @@ jobs:
         run: "docker exec ${{ job.services.ibm_db2.id }} su - db2inst1 -c 'db2 -t CONNECT TO doctrine; db2 -t CREATE USER TEMPORARY TABLESPACE doctrine_tbsp PAGESIZE 4 K;'"
 
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -600,7 +601,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -633,7 +634,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 

.github/workflows/release-on-milestone-closed.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Release"
         uses: "laminas/[email protected]"

.github/workflows/static-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -64,7 +64,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

CONTRIBUTING.md

@@ -1,4 +1,6 @@
+This repository has [guidelines specific to testing][testing guidelines], and
 Doctrine has [general contributing guidelines][contributor workflow], make
-sure you follow them.
+sure you follow both.
 
 [contributor workflow]: https://www.doctrine-project.org/contribute/index.html
+[testing guidelines]: https://www.doctrine-project.org/projects/doctrine-dbal/en/stable/reference/testing.html

composer.json

@@ -43,9 +43,9 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.1",
-        "phpstan/phpstan": "1.10.32",
+        "phpstan/phpstan": "1.10.34",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "9.6.11",
+        "phpunit/phpunit": "9.6.12",
         "psalm/plugin-phpunit": "0.18.4",
         "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.7.2",

docs/en/reference/configuration.rst

@@ -330,6 +330,7 @@ pdo_sqlsrv / sqlsrv
 -  ``host`` (string): Hostname of the database to connect to.
 -  ``port`` (integer): Port of the database to connect to.
 -  ``dbname`` (string): Name of the database/schema to connect to.
+-  ``driverOptions`` (array): Any supported options found on `https://learn.microsoft.com/en-us/sql/connect/php/connection-options`
 
 ibm_db2
 ^^^^^^^

docs/en/reference/data-retrieval-and-manipulation.rst

@@ -540,4 +540,4 @@ given data.
 
     <?php
     $conn->update('user', ['username' => 'jwage'], ['id' => 1]);
-    // UPDATE user (username) VALUES (?) WHERE id = ? (jwage, 1)
+    // UPDATE user SET username = ? WHERE id = ? (jwage, 1)