Merge tag '2.13.8' into 2.13.99

Release [2.13.8](https://github.com/doctrine/dbal/milestone/104) 2.13.8 ====== - Total issues resolved: **1** - Total pull requests resolved: **9** - Total contributors: **3** CI,SQL Server ------------- - [5303: Run workflow on AppVeyor only if certain files changed](doctrine#5303) thanks to @morozov Dependencies,Static Analysis ---------------------------- - [5300: Psalm 4.22.0, PHPUnit 9.5.16](doctrine#5300) thanks to @derrabus Bug,PHP,mysqli -------------- - [5296: Fix PHP 8.1 deprecation on `mysqli::real&doctrine#95;connect()` calls](doctrine#5296) thanks to @iammati Error Handling,Static Analysis,mysqli ------------------------------------- - [5269: Run static analysis jobs on PHP 8.1](doctrine#5269) thanks to @morozov Static Analysis --------------- - [5262: PHPStan 1.4.6, Psalm 4.20.0, PHPUnit 9.5.13](doctrine#5262) thanks to @derrabus - [5178: PHPStan 1.4.0](doctrine#5178) thanks to @derrabus CI -- - [5238: Run PHP 7.4 on AppVeyor](doctrine#5238) thanks to @derrabus Documentation ------------- - [5187: Update README for release 3.3](doctrine#5187) thanks to @derrabus Connections,Reserved Keywords,Static Analysis --------------------------------------------- - [5166: Enforce consistent constructor in dynamically instantiated classes](doctrine#5166) thanks to @morozov
tzkoshi · Mar 16, 2022 · 6166415 · 6166415
2 parents b8f752e + dc9b3c3
commit 6166415
Show file tree

Hide file tree

Showing 140 changed files with 1,295 additions and 810 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,6 +6,14 @@ platform:
 clone_folder: C:\projects\dbal
 clone_depth: 2
 
+only_commits:
+  files:
+    - .appveyor.yml
+    - ci\appveyor\
+    - composer.*
+    - lib\
+    - tests\
+
 cache:
   - C:\ProgramData\chocolatey\bin -> .appveyor.yml
   - C:\ProgramData\chocolatey\lib -> .appveyor.yml
@@ -20,19 +28,19 @@ environment:
   - db: mssql
     driver: sqlsrv
     db_version: sql2008r2sp2
-    php: 7.3
+    php: 7.4
   - db: mssql
     driver: sqlsrv
     db_version: sql2012sp1
-    php: 7.3
+    php: 7.4
   - db: mssql
     driver: sqlsrv
     db_version: sql2017
-    php: 7.3
+    php: 7.4
   - db: mssql
     driver: pdo_sqlsrv
     db_version: sql2017
-    php: 7.3
+    php: 7.4
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;C:\tools\composer;%PATH%
@@ -44,7 +52,7 @@ install:
     - ps: |
         # Check if installation is cached
         if (!(Test-Path c:\tools\php)) {
-          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version 7.3.12
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version 7.4.27
           # install sqlite
           appveyor-retry cinst -y sqlite
           Get-ChildItem -Path c:\tools\php
@@ -75,7 +83,7 @@ install:
           Invoke-WebRequest $source -OutFile $destination
           7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip > $null
           $DLLVersion = (Invoke-WebRequest "https://pecl.php.net/rest/r/pcov/stable.txt").Content
-          Invoke-WebRequest https://windows.php.net/downloads/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-7.3-nts-vc15-$($env:platform).zip -OutFile pcov.zip
+          Invoke-WebRequest https://windows.php.net/downloads/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-$($env:php)-nts-vc15-$($env:platform).zip -OutFile pcov.zip
           7z x -y pcov.zip > $null
           Remove-Item c:\tools\php\* -include .zip
           cd c:\tools\php

diff --git a/.gitattributes b/.gitattributes
@@ -9,6 +9,7 @@
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /psalm.xml.dist export-ignore
+/psalm-strict.xml export-ignore
 /run-all.sh export-ignore
 /SECURITY.md export-ignore
 /tests export-ignore

diff --git a/.github/ISSUE_TEMPLATE/BC_Break.md b/.github/ISSUE_TEMPLATE/BC_Break.md
diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
@@ -9,7 +9,6 @@ about: Something is broken? 🔨
 
 |    Q        |   A
 |------------ | ------
-| BC Break    | yes/no
 | Version     | x.y.z
 
 #### Summary

diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
@@ -11,7 +11,6 @@ about: You have a neat idea that should be implemented? 🎩
 |------------ | ------
 | New Feature | yes
 | RFC         | yes/no
-| BC Break    | yes/no
 
 #### Summary
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,6 @@
 |      Q       |   A
 |------------- | -----------
 | Type         | bug/feature/improvement
-| BC Break     | yes/no
 | Fixed issues | <!-- use #NUM format to reference an issue -->
 
 #### Summary

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -4,34 +4,25 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - lib/**
+      - phpcs.xml.dist
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - lib/**
+      - phpcs.xml.dist
+      - tests/**
 
 jobs:
   coding-standards:
     name: "Coding Standards"
-    runs-on: "ubuntu-20.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php-version }}"
-          tools: "cs2pr"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-
-      # https://github.com/doctrine/.github/issues/3
-      - name: "Run PHP_CodeSniffer"
-        run: "vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.1.1"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -5,9 +5,23 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - lib/**
+      - phpunit.xml.dist
+      - tests/**
   push:
     branches:
       - "*.x"
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - ci/**
+      - composer.*
+      - lib/**
+      - phpunit.xml.dist
+      - tests/**
   schedule:
     - cron: "42 3 * * *"
 
@@ -25,6 +39,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         dependencies:
           - "highest"
         include:
@@ -95,13 +110,25 @@ jobs:
       matrix:
         php-version:
           - "7.4"
-          - "8.0"
+          - "8.1"
+        oracle-version:
+          - "21"
+        include:
+          - php-version: "7.4"
+            oracle-version: "11"
 
     services:
       oracle:
-        image: "wnameless/oracle-xe-11g-r2"
+        image: gvenzl/oracle-xe:${{ matrix.oracle-version }}
+        env:
+          ORACLE_PASSWORD: oracle
         ports:
           - "1521:1521"
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 20s
+          --health-timeout 10s
+          --health-retries 10
 
     steps:
       - name: "Checkout"
@@ -138,13 +165,25 @@ jobs:
       matrix:
         php-version:
           - "7.4"
-          - "8.0"
+          - "8.1"
+        oracle-version:
+          - "21"
+        include:
+          - php-version: "7.4"
+            oracle-version: "11"
 
     services:
       oracle:
-        image: "wnameless/oracle-xe-11g-r2"
+        image: gvenzl/oracle-xe:${{ matrix.oracle-version }}
+        env:
+          ORACLE_PASSWORD: oracle
         ports:
           - "1521:1521"
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 20s
+          --health-timeout 10s
+          --health-retries 10
 
     steps:
       - name: "Checkout"
@@ -185,9 +224,10 @@ jobs:
           - "9.2"
           - "9.4"
           - "13"
+          - "14"
         include:
-          - php-version: "8.0"
-            postgres-version: "13"
+          - php-version: "8.1"
+            postgres-version: "14"
 
     services:
       postgres:
@@ -243,10 +283,10 @@ jobs:
           - "mysqli"
           - "pdo_mysql"
         include:
-          - php-version: "8.0"
+          - php-version: "8.1"
             mariadb-version: "10.5"
             extension: "mysqli"
-          - php-version: "8.0"
+          - php-version: "8.1"
             mariadb-version: "10.5"
             extension: "pdo_mysql"
 
@@ -289,7 +329,6 @@ jobs:
           name: "${{ github.job }}-${{ matrix.mariadb-version }}-${{ matrix.extension }}-${{ matrix.php-version }}.coverage"
           path: "coverage.xml"
 
-
   phpunit-mysql:
     name: "PHPUnit with MySQL"
     runs-on: "ubuntu-20.04"
@@ -327,12 +366,12 @@ jobs:
             php-version: "7.4"
             mysql-version: "8.0"
             extension: "mysqli"
-          - php-version: "8.0"
+          - php-version: "8.1"
             mysql-version: "8.0"
             extension: "mysqli"
             custom-entrypoint: >-
               --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
-          - php-version: "8.0"
+          - php-version: "8.1"
             mysql-version: "8.0"
             extension: "pdo_mysql"
             custom-entrypoint: >-
@@ -391,7 +430,7 @@ jobs:
         php-version:
           - "7.3"
           - "7.4"
-          - "8.0"
+          - "8.1"
         extension:
           - "sqlsrv"
           - "pdo_sqlsrv"
@@ -407,7 +446,7 @@ jobs:
 
     services:
       mssql:
-        image: "microsoft/mssql-server-linux:2017-latest"
+        image: "mcr.microsoft.com/mssql/server:2017-latest"
         env:
           ACCEPT_EULA: "Y"
           SA_PASSWORD: "Doctrine2018"
@@ -432,7 +471,7 @@ jobs:
           coverage: "pcov"
           ini-values: "zend.assertions=1"
           tools: "pecl"
-          extensions: "${{ matrix.extension }}-5.9.0preview1"
+          extensions: "${{ matrix.extension }}-5.10.0beta1"
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
@@ -504,7 +543,6 @@ jobs:
           name: "${{ github.job }}-${{ matrix.php-version }}.coverage"
           path: "coverage.xml"
 
-
   development-deps:
     name: "PHPUnit with SQLite and development dependencies"
     runs-on: "ubuntu-20.04"

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -23,23 +23,3 @@ jobs:
           "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@1.0.1"
-        with:
-          command-name: "laminas:automatic-releases:create-merge-up-pull-request"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}