Merge remote-tracking branch 'origin/2.11.x' into 3.0.x

.github/workflows/coding-standards.yml

@@ -0,0 +1,38 @@
+name: "Coding Standards"
+
+on: ["pull_request", "push"]
+
+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: "Cache dependencies installed with Composer"
+ uses: "actions/cache@v2"
+ with:
+ path: "~/.composer/cache"
+ key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
+ restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+
+ - name: "Install dependencies with Composer"
+ run: "composer install --no-interaction --no-progress --no-suggest"
+
+ # https://github.com/doctrine/.github/issues/3
+ - name: "Run PHP_CodeSniffer"
+ run: "vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr"

.github/workflows/continuous-integration.yml

@@ -69,39 +69,6 @@ jobs:
  - name: "Run a static analysis with vimeo/psalm"
  run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=4"
 
- coding-standards:
- name: "Coding Standards"
- runs-on: "ubuntu-latest"
-
- 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: "Cache dependencies installed with composer"
- uses: "actions/cache@v1"
- with:
- path: "~/.composer/cache"
- key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
- restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
- - name: "Install dependencies with composer"
- run: "composer install --no-interaction --no-progress --no-suggest"
-
- - name: "Run squizlabs/php_codesniffer"
- run: "vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr"
-
  phpunit-oci8:
  name: "PHPUnit on OCI8"
  runs-on: "ubuntu-latest"

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

@@ -0,0 +1,45 @@
+name: "Automatic Releases"
+
+on:
+ milestone:
+ types:
+ - "closed"
+
+jobs:
+ release:
+ name: "Git tag, release & create merge-up PR"
+ runs-on: "ubuntu-20.04"
+
+ steps:
+ - name: "Checkout"
+ uses: "actions/checkout@v2"
+
+ - name: "Release"
+ uses: "laminas/automatic-releases@1.0.1"
+ with:
+ command-name: "laminas:automatic-releases:release"
+ 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 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 }}

.travis.yml

@@ -129,9 +129,6 @@ jobs:
  - stage: Test
  php: 7.4
  env: DB=mysql.docker IMAGE=mysql:8.0
- - stage: Test
- php: 7.4
- env: DB=mysqli.docker IMAGE=mysql:8.0
  - stage: Test
  php: 7.4
  env: DB=mysqli-tls.docker IMAGE=mysql:8.0 TLS=yes
@@ -152,15 +149,15 @@ jobs:
  env: DB=sqlite
  - stage: Test
  php: 7.4
- env: DB=sqlsrv
+ env: DB=sqlsrv MSSQL_COLLATION=Latin1_General_100_CS_AS
  sudo: required
  before_script:
  - bash ./ci/travis/install-sqlsrv-dependencies.sh
  - bash ./ci/travis/install-mssql-sqlsrv.sh
  - bash ./ci/travis/install-mssql.sh
  - stage: Test
  php: 7.4
- env: DB=pdo_sqlsrv
+ env: DB=pdo_sqlsrv MSSQL_COLLATION=Latin1_General_100_CS_AS
  sudo: required
  before_script:
  - bash ./ci/travis/install-sqlsrv-dependencies.sh

UPGRADE.md

@@ -449,6 +449,10 @@ The non-interface methods of driver-level classes have been marked internal:
 - `OCI8Connection::getExecuteMode()`
 - `OCI8Statement::convertPositionalToNamedPlaceholders()`
 
+## Deprecated `DBALException`
+
+The `Doctrine\DBAL\DBALException` class has been deprecated in favor of `Doctrine\DBAL\Exception`.
+
 ## Inconsistently and ambiguously named driver-level classes are deprecated
 
 The following classes under the `Driver` namespace have been deprecated in favor of their consistently named counterparts:

ci/travis/install-mssql.sh

@@ -8,6 +8,7 @@ sudo docker pull microsoft/mssql-server-linux:2017-latest
 sudo docker run \
  -e 'ACCEPT_EULA=Y' \
  -e 'SA_PASSWORD=Doctrine2018' \
+ -e "MSSQL_COLLATION=${MSSQL_COLLATION:-Latin1_General_100_CI_AS}" \
  -p 127.0.0.1:1433:1433 \
  --name mssql \
  -d \

composer.json

@@ -40,7 +40,7 @@
  "doctrine/coding-standard": "^8.1",
  "jetbrains/phpstorm-stubs": "^2019.1",
  "nikic/php-parser": "^4.4",
- "phpstan/phpstan": "^0.12.31",
+ "phpstan/phpstan": "^0.12.40",
  "phpstan/phpstan-strict-rules": "^0.12.2",
  "phpunit/phpunit": "^9.3",
  "psalm/plugin-phpunit": "^0.10.0",

docs/en/reference/types.rst

@@ -157,6 +157,13 @@ or ``null`` if no data is present.
  This can lead to type inconsistencies when reverse engineering the
  type from the database.
 
+ascii_string
+++++++++++++
+
+Similar to the ``string`` type but for binding non-unicode data. This type
+should be used with database vendors where a binding type mismatch
+can trigger an implicit cast and lead to performance problems.
+
 text
 ++++
 
@@ -583,6 +590,9 @@ Please also notice the mapping specific footnotes for additional information.
 | | | | +----------------------------------------------------------+
 | | | | | ``NCHAR(n)`` [4]_ |
 +-------------------+---------------+--------------------------+---------+----------------------------------------------------------+
+| **ascii_string** | ``string`` | **SQL Server** | | ``VARCHAR(n)`` |
+| | | | | ``CHAR(n)`` |
++-------------------+---------------+--------------------------+---------+----------------------------------------------------------+
 | **text** | ``string`` | **MySQL** | *all* | ``TINYTEXT`` [16]_ |
 | | | | +----------------------------------------------------------+
 | | | | | ``TEXT`` [17]_ |

phpstan.neon.dist

@@ -34,24 +34,11 @@ parameters:
  message: '~^Call to function in_array\(\) with arguments Doctrine\\DBAL\\Schema\\Column, array<string> and true will always evaluate to false\.$~'
  path: %currentWorkingDirectory%/src/Schema/Table.php
 
- # https://github.com/phpstan/phpstan/issues/3133
- -
- message: '~^Cannot cast array<string>\|bool\|string\|null to int\.$~'
- path: %currentWorkingDirectory%/src/Tools/Console/Command/RunSqlCommand.php
-
  # Requires a release of https://github.com/JetBrains/phpstorm-stubs/pull/553
  -
  message: '~^Call to function assert\(\) with true will always evaluate to true\.$~'
  path: %currentWorkingDirectory%/src/Driver/PDO/Connection.php
 
- # Requires a release of https://github.com/JetBrains/phpstorm-stubs/pull/553
- -
- message: '~^Strict comparison using !== between int and false will always evaluate to true\.$~'
- path: %currentWorkingDirectory%/src/Driver/PDO/Connection.php
-
- # False Positive
- - '~Strict comparison using === between 1 and 2 will always evaluate to false~'
-
  # Needs Generics
  - '~Method Doctrine\\DBAL\\Schema\\SchemaDiff::getNewTablesSortedByDependencies\(\) should return array<Doctrine\\DBAL\\Schema\\Table> but returns array<object>.~'