From 69cb431ec647aa5516944ddb8496d36f6d0aba0d Mon Sep 17 00:00:00 2001 From: patrick1100 <90774296+patrick1100@users.noreply.github.com> Date: Mon, 28 Aug 2023 13:31:39 +0200 Subject: [PATCH 1/6] Document `driverOptions` for SQL Server connections (#6140) | Q | A |------------- | ----------- | Type | improvement | Fixed issues | none #### Summary Add missing information about driverOptions parameter for sqlsrv connections --- docs/en/reference/configuration.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/reference/configuration.rst b/docs/en/reference/configuration.rst index ebdf3b1e8fa..efbb104008f 100644 --- a/docs/en/reference/configuration.rst +++ b/docs/en/reference/configuration.rst @@ -316,6 +316,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 ^^^^^^^ From 646dd895eca86e4c1cd52d99f7b4520534a4f4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 5 Sep 2023 16:12:31 +0200 Subject: [PATCH 2/6] docs: link to the testing guidelines in CONTRIBUTING.md I often remember about these guidelines, and have a hard time finding them every time. --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2555ebbd46..31b6eff1f10 100644 --- a/CONTRIBUTING.md +++ b/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 From ce6507b17fc1ecef3367ba86cc58053210cbc3bd Mon Sep 17 00:00:00 2001 From: Takuya Aramaki Date: Fri, 8 Sep 2023 19:14:16 +0900 Subject: [PATCH 3/6] Fix invalid SQL in the document --- docs/en/reference/data-retrieval-and-manipulation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/reference/data-retrieval-and-manipulation.rst b/docs/en/reference/data-retrieval-and-manipulation.rst index 43f1da683aa..2041bcfd0aa 100644 --- a/docs/en/reference/data-retrieval-and-manipulation.rst +++ b/docs/en/reference/data-retrieval-and-manipulation.rst @@ -538,4 +538,4 @@ given data. update('user', ['username' => 'jwage'], ['id' => 1]); - // UPDATE user (username) VALUES (?) WHERE id = ? (jwage, 1) + // UPDATE user SET username = ? WHERE id = ? (jwage, 1) From 993f284402c48c9827bfd566aaabcf115fef3143 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 14 Sep 2023 14:23:25 +0200 Subject: [PATCH 4/6] Bump CI workflows (#6152) --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 20 +++++++++---------- .../workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index b90ffc7b305..249a050542e 100644 --- a/.github/workflows/coding-standards.yml +++ b/.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" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 486c8ddd9b7..61c868adbe1 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.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 @@ -257,7 +257,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 @@ -337,7 +337,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 @@ -424,7 +424,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 @@ -494,7 +494,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 @@ -554,7 +554,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 @@ -598,7 +598,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: "Install PHP" uses: "shivammathur/setup-php@v2" @@ -631,7 +631,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" with: fetch-depth: 2 diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index c02383e0257..4c1e99c4c7c 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.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/automatic-releases@1.24.0" diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 409a24d2e2e..9b1999f3f88 100644 --- a/.github/workflows/static-analysis.yml +++ b/.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 From 8e79bee7130f889851d1a7d05ce25a116946f285 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 14 Sep 2023 15:00:57 +0200 Subject: [PATCH 5/6] PHPStan 1.10.34, PHPUnit 9.6.12 (#6151) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index df35e706433..2294bf10fea 100644 --- a/composer.json +++ b/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", From d39bc5d9b989f8a80efd53a4a4d47ad25406e611 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 18 Sep 2023 09:07:06 +0200 Subject: [PATCH 6/6] Run tests against Postgres 16 (#6154) | Q | A |------------- | ----------- | Type | improvement | Fixed issues | N/A #### Summary see https://www.postgresql.org/about/news/postgresql-16-released-2715/ --- .github/workflows/continuous-integration.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 61c868adbe1..2b960c0b2b2 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -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: