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

11e8ed4e · Grégoire Paris · ecff8519 · 0ad4c165 · 11e8ed4e · ecff8519
Unverified Commit 11e8ed4e authored Jun 07, 2020 by Grégoire Paris
Showing with 43 additions and 55 deletions

.appveyor.yml .appveyor.yml +9 -6

.coveralls.yml .coveralls.yml +0 -2

.travis.yml .travis.yml +27 -40

README.md README.md +5 -5

AbstractMySQLDriver.php lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php +2 -2

No files found.
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -74,15 +74,14 @@ install:
          $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip"
          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/xdebug/stable.txt").Content
-          $source = "https://xdebug.org/files/php_xdebug-$($DLLVersion)-$($env:php)-vc15-nts-x86_64.dll"
-          $destination = "c:\tools\php\ext\php_xdebug.dll"
-          Invoke-WebRequest $source -OutFile $destination
+          $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
+          7z x -y pcov.zip > $null
          Remove-Item c:\tools\php\* -include .zip
          cd c:\tools\php
          Add-Content php.ini "`nextension=php_sqlsrv.dll"
          Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
-          Add-Content php.ini "`nzend_extension=php_xdebug.dll"
+          Add-Content php.ini "`nextension=php_pcov.dll"
          Add-Content php.ini "`n"

          # download Composer
@@ -123,8 +122,12 @@ test_script:
        $env:phpunit_config = "tests\appveyor\$($env:db).$($env:driver).appveyor.xml"
      }

-      vendor\bin\phpunit -c $($env:phpunit_config)
+      vendor\bin\phpunit -c $($env:phpunit_config) --coverage-clover clover.xml

      if ($LastExitCode -ne 0) {
        $host.SetShouldExit($LastExitCode)
      }
+
+after_test:
+  - appveyor DownloadFile https://codecov.io/bash -FileName codecov.sh
+  - bash codecov.sh -f clover.xml
--- a/.coveralls.yml
+++ b/.coveralls.yml
-coverage_clover: clover.xml
-json_path: /tmp/coveralls-upload.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,7 @@ cache:

 before_install:
  - phpenv config-rm xdebug.ini || true
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-      pecl install pcov-1.0.0
-      wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.2.0/php-coveralls.phar --output-document="${HOME}/bin/coveralls"
-      chmod +x ${HOME}/bin/coveralls
-    fi
+  - pecl install pcov

 before_script:
  - |
@@ -26,25 +21,17 @@ install:
  - travis_retry composer -n install --prefer-dist

 script:
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-       ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml --coverage-clover clover.xml
-    else
-       ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
-    fi
+  - ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml --coverage-clover clover.xml

-after_script:
-  - |
-    if [ "x$COVERAGE" == "xyes" ]; then
-      travis_retry coveralls -v
-    fi
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

 jobs:
  include:

    - stage: Smoke Testing
      php: 7.3
-      env: DB=sqlite COVERAGE=yes
+      env: DB=sqlite

    - stage: Test
      php: 7.2
@@ -85,44 +72,44 @@ jobs:
        - bash ./tests/travis/install-mssql.sh
    - stage: Test
      php: 7.3
-      env: DB=mysql.docker IMAGE=mysql:5.7 COVERAGE=yes
+      env: DB=mysql.docker IMAGE=mysql:5.7
    - stage: Test
      php: 7.3
-      env: DB=mysql.docker IMAGE=mysql:8.0 COVERAGE=yes
+      env: DB=mysql.docker IMAGE=mysql:8.0
    - stage: Test
      php: 7.3
-      env: DB=mysqli.docker IMAGE=mysql:5.7 COVERAGE=yes
+      env: DB=mysqli.docker IMAGE=mysql:5.7
    - stage: Test
      php: 7.3
-      env: DB=mysqli.docker IMAGE=mysql:8.0 COVERAGE=yes
+      env: DB=mysqli.docker IMAGE=mysql:8.0
    - stage: Test
      php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.0 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.0
    - stage: Test
      php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.1 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.1
    - stage: Test
      php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.2 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.2
    - stage: Test
      php: 7.3
-      env: DB=mariadb.docker IMAGE=mariadb:10.3 COVERAGE=yes
+      env: DB=mariadb.docker IMAGE=mariadb:10.3
    - stage: Test
      php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0
    - stage: Test
      php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1
    - stage: Test
      php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2
    - stage: Test
      php: 7.3
-      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3 COVERAGE=yes
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
    - stage: Test
      dist: trusty
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.2
      services:
        - postgresql
      addons:
@@ -130,29 +117,29 @@ jobs:
    - stage: Test
      dist: trusty
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.3
      services:
        - postgresql
      addons:
        postgresql: "9.3"
    - stage: Test
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.4
      addons:
        postgresql: "9.4"
    - stage: Test
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.5 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
      addons:
        postgresql: "9.5"
    - stage: Test
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=9.6
      addons:
        postgresql: "9.6"
    - stage: Test
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=10.0
      sudo: required
      addons:
        postgresql: "10"
@@ -160,13 +147,13 @@ jobs:
        - bash ./tests/travis/install-postgres-10.sh
    - stage: Test
      php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
+      env: DB=pgsql POSTGRESQL_VERSION=11.0
      sudo: required
      before_script:
        - bash ./tests/travis/install-postgres-11.sh
    - stage: Test
      php: 7.3
-      env: DB=sqlsrv COVERAGE=yes
+      env: DB=sqlsrv
      sudo: required
      before_script:
        - bash ./tests/travis/install-sqlsrv-dependencies.sh
@@ -174,7 +161,7 @@ jobs:
        - bash ./tests/travis/install-mssql.sh
    - stage: Test
      php: 7.3
-      env: DB=pdo_sqlsrv COVERAGE=yes
+      env: DB=pdo_sqlsrv
      sudo: required
      before_script:
        - bash ./tests/travis/install-sqlsrv-dependencies.sh
@@ -182,7 +169,7 @@ jobs:
        - bash ./tests/travis/install-mssql.sh
    - stage: Test
      php: 7.3
-      env: DB=ibm_db2 COVERAGE=yes
+      env: DB=ibm_db2
      sudo: required
      before_script:
        - bash ./tests/travis/install-db2.sh

--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 |:----------------:|:----------:|
 | [![Build status][Master image]][Master] | [![Build status][2.10 image]][2.10] |
 | [![Build Status][ContinuousPHP image]][ContinuousPHP] | [![Build Status][ContinuousPHP 2.10 image]][ContinuousPHP] |
-| [![Code Coverage][Coverage image]][Coveralls Master] | [![Code Coverage][Coverage 2.10 image]][Coveralls 2.10] |
+| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] |
 | [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.10 image]][AppVeyor 2.10] |

 Powerful database abstraction layer with many features for database schema introspection, schema management and PDO abstraction.
@@ -16,18 +16,18 @@ Powerful database abstraction layer with many features for database schema intro
 * [Issue Tracker](https://github.com/doctrine/dbal/issues)

  [Master image]: https://img.shields.io/travis/doctrine/dbal/master.svg?style=flat-square
-  [Coverage image]: https://coveralls.io/repos/github/doctrine/dbal/badge.svg?branch=master
+  [Coverage image]: https://codecov.io/gh/doctrine/dbal/branch/master/graph/badge.svg
  [ContinuousPHP image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/master.svg?style=flat-square
  [Master]: https://travis-ci.org/doctrine/dbal
-  [Coveralls Master]: https://coveralls.io/github/doctrine/dbal?branch=master
+  [CodeCov Master]: https://codecov.io/gh/doctrine/dbal/branch/master
  [AppVeyor master]: https://ci.appveyor.com/project/doctrine/dbal/branch/master
  [AppVeyor master image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/master?svg=true
  [ContinuousPHP]: https://continuousphp.com/git-hub/doctrine/dbal

  [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
-  [Coverage 2.10 image]: https://coveralls.io/repos/github/doctrine/dbal/badge.svg?branch=2.10.x
+  [Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg
  [ContinuousPHP 2.10 image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/2.10.x.svg?style=flat-square
  [2.10]: https://github.com/doctrine/dbal/tree/2.10.x
-  [Coveralls 2.10]: https://coveralls.io/github/doctrine/dbal?branch=2.10.x
+  [CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x
  [AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x
  [AppVeyor 2.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.10.x?svg=true
--- a/lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
+++ b/lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
@@ -25,8 +25,8 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
    /**
     * {@inheritdoc}
     *
-     * @link http://dev.mysql.com/doc/refman/5.7/en/error-messages-client.html
-     * @link http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html
+     * @link https://dev.mysql.com/doc/refman/8.0/en/client-error-reference.html
+     * @link https://dev.mysql.com/doc/refman/8.0/en/server-error-reference.html
     */
    public function convertException($message, DriverException $exception)
    {