Manually merge 2.11.x into 3.0.x

.scrutinizer.yml

@@ -21,7 +21,7 @@ before_commands:
 tools:
     external_code_coverage:
         timeout: 3600
-        runs: 26 # 21x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
+        runs: 28 # 23x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
 
 filter:
     excluded_paths:

.travis.yml

@@ -14,7 +14,11 @@ before_install:
     fi
 
 before_script:
-  - if [[ "$DB" == "mysql" || "$DB" == "mysqli" || "$DB" == *"mariadb"* ]]; then mysql < tests/travis/create-mysql-schema.sql; fi;
+  - |
+    if [[ -n "$IMAGE" ]]
+    then
+        bash ./tests/travis/docker-run-mysql-or-mariadb.sh
+    fi
 
 install:
   - |
@@ -57,230 +61,167 @@ jobs:
 
     - stage: Test
       php: 7.3
-      env: DB=mysql.docker MYSQL_VERSION=8.0
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+      env: DB=mysql.docker IMAGE=mysql:5.7 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=mysqli.docker MYSQL_VERSION=8.0
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+      env: DB=mysql.docker IMAGE=mysql:8.0 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=mariadb MARIADB_VERSION=10.3
-      addons:
-        mariadb: 10.3
+      env: DB=mysqli.docker IMAGE=mysql:5.7 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=mariadb.mysqli MARIADB_VERSION=10.3
-      addons:
-        mariadb: 10.3
+      env: DB=mysqli.docker IMAGE=mysql:8.0 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=pgsql POSTGRESQL_VERSION=11.0
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-postgres-11.sh
+      env: DB=mariadb.docker IMAGE=mariadb:10.0 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=sqlite
+      env: DB=mariadb.docker IMAGE=mariadb:10.1 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=sqlsrv
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-sqlsrv-dependencies.sh
-        - bash ./tests/travis/install-mssql-sqlsrv.sh
-        - bash ./tests/travis/install-mssql.sh
+      env: DB=mariadb.docker IMAGE=mariadb:10.2 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=pdo_sqlsrv
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-sqlsrv-dependencies.sh
-        - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
-        - bash ./tests/travis/install-mssql.sh
+      env: DB=mariadb.docker IMAGE=mariadb:10.3 COVERAGE=yes
     - stage: Test
       php: 7.3
-      env: DB=sqlite DEPENDENCIES=low
-      install:
-        - travis_retry composer update --prefer-dist --prefer-lowest
-    - stage: Test
-      php: 7.4
-      env: DB=mysql COVERAGE=yes
-      services:
-        - mysql
-    - stage: Test
-      php: 7.4
-      env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes
-      sudo: required
-      before_script:
-        - bash ./tests/travis/install-mysql-5.7.sh
-    - stage: Test
-      php: 7.4
-      env: DB=mysql.docker MYSQL_VERSION=8.0 COVERAGE=yes
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0 COVERAGE=yes
     - stage: Test
-      php: 7.4
-      env: DB=mysqli COVERAGE=yes
-      services:
-        - mysql
+      php: 7.3
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1 COVERAGE=yes
     - stage: Test
-      php: 7.4
-      env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes
-      sudo: required
-      before_script:
-        - bash ./tests/travis/install-mysql-5.7.sh
+      php: 7.3
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2 COVERAGE=yes
     - stage: Test
-      php: 7.4
-      env: DB=mysqli.docker MYSQL_VERSION=8.0 COVERAGE=yes
-      sudo: required
-      services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+      php: 7.3
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3 COVERAGE=yes
     - stage: Test
-      php: 7.4
-      env: DB=mariadb.docker MARIADB_VERSION=10.1 COVERAGE=yes
+      dist: trusty
+      php: 7.3
+      env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
       services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mariadb.sh
-    - stage: Test
-      php: 7.4
-      env: DB=mariadb MARIADB_VERSION=10.2 COVERAGE=yes
+        - postgresql
       addons:
-        mariadb: 10.2
+        postgresql: "9.2"
     - stage: Test
-      php: 7.4
-      env: DB=mariadb MARIADB_VERSION=10.3 COVERAGE=yes
-      addons:
-        mariadb: 10.3
-    - stage: Test
-      php: 7.4
-      env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.1 COVERAGE=yes
+      dist: trusty
+      php: 7.3
+      env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes
       services:
-        - docker
-      before_script:
-        - bash ./tests/travis/install-mariadb.sh
-    - stage: Test
-      php: 7.4
-      env: DB=mariadb.mysqli MARIADB_VERSION=10.2 COVERAGE=yes
+        - postgresql
       addons:
-        mariadb: 10.2
+        postgresql: "9.3"
     - stage: Test
-      php: 7.4
-      env: DB=mariadb.mysqli MARIADB_VERSION=10.3 COVERAGE=yes
-      addons:
-        mariadb: 10.3
-    - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
       addons:
         postgresql: "9.4"
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.5 COVERAGE=yes
       addons:
         postgresql: "9.5"
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes
       addons:
         postgresql: "9.6"
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes
       sudo: required
       addons:
         postgresql: "10"
       before_script:
         - bash ./tests/travis/install-postgres-10.sh
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-postgres-11.sh
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=sqlsrv COVERAGE=yes
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
         - bash ./tests/travis/install-mssql-sqlsrv.sh
         - bash ./tests/travis/install-mssql.sh
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=pdo_sqlsrv COVERAGE=yes
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
         - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
         - bash ./tests/travis/install-mssql.sh
     - stage: Test
-      php: 7.4
+      php: 7.3
       env: DB=ibm_db2 COVERAGE=yes
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-db2.sh
         - bash ./tests/travis/install-db2-ibm_db2.sh
     - stage: Test
-      php: nightly
-      env: DB=mysql.docker MYSQL_VERSION=8.0
+      php: 7.3
+      env: DB=sqlite DEPENDENCIES=low
+      install:
+        - travis_retry composer update --prefer-dist --prefer-lowest
+    - 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=mariadb.docker IMAGE=mariadb:10.3
+    - stage: Test
+      php: 7.4
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
+    - stage: Test
+      php: 7.4
+      env: DB=pgsql POSTGRESQL_VERSION=11.0
       sudo: required
-      services:
-        - docker
       before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+        - bash ./tests/travis/install-postgres-11.sh
     - stage: Test
-      php: nightly
-      env: DB=mysqli.docker MYSQL_VERSION=8.0
+      php: 7.4
+      env: DB=sqlite
+    - stage: Test
+      php: 7.4
+      env: DB=sqlsrv
+      sudo: required
+      before_script:
+        - bash ./tests/travis/install-sqlsrv-dependencies.sh
+        - bash ./tests/travis/install-mssql-sqlsrv.sh
+        - bash ./tests/travis/install-mssql.sh
+    - stage: Test
+      php: 7.4
+      env: DB=pdo_sqlsrv
       sudo: required
-      services:
-        - docker
       before_script:
-        - bash ./tests/travis/install-mysql-8.0.sh
+        - bash ./tests/travis/install-sqlsrv-dependencies.sh
+        - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
+        - bash ./tests/travis/install-mssql.sh
+
     - stage: Test
       php: nightly
-      env: DB=mariadb MARIADB_VERSION=10.3
-      addons:
-        mariadb: 10.3
+      env: DB=mysql.docker IMAGE=mysql:8.0
     - stage: Test
       php: nightly
-      env: DB=mariadb.mysqli MARIADB_VERSION=10.3
-      addons:
-        mariadb: 10.3
+      env: DB=mysqli.docker IMAGE=mysql:8.0
+    - stage: Test
+      php: nightly
+      env: DB=mariadb.docker IMAGE=mariadb:10.3
+    - stage: Test
+      php: nightly
+      env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
     - stage: Test
       php: nightly
       env: DB=pgsql POSTGRESQL_VERSION=11.0
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-postgres-11.sh
     - stage: Test
@@ -290,8 +231,6 @@ jobs:
       php: nightly
       env: DB=sqlsrv
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
         - bash ./tests/travis/install-mssql-sqlsrv.sh
@@ -300,8 +239,6 @@ jobs:
       php: nightly
       env: DB=pdo_sqlsrv
       sudo: required
-      services:
-        - docker
       before_script:
         - bash ./tests/travis/install-sqlsrv-dependencies.sh
         - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh

README.md

@@ -1,12 +1,12 @@
 # Doctrine DBAL
 
-| [Master][Master] | [2.9][2.9] | [Develop][develop] |
-|:----------------:|:----------:|:------------------:|
-| [![Build status][Master image]][Master] | [![Build status][2.9 image]][2.9] | [![Build status][develop image]][develop] |
-| [![Build Status][ContinuousPHP image]][ContinuousPHP] | [![Build Status][ContinuousPHP 2.9 image]][ContinuousPHP] | [![Build Status][ContinuousPHP develop image]][ContinuousPHP] |
-| [![Code Coverage][Coverage image]][Scrutinizer Master] | [![Code Coverage][Coverage 2.9 image]][Scrutinizer 2.9] | [![Code Coverage][Coverage develop image]][Scrutinizer develop] |
-| [![Code Quality][Quality image]][Scrutinizer Master] | [![Code Quality][Quality 2.9 image]][Scrutinizer 2.9] | [![Code Quality][Quality develop image]][Scrutinizer develop] |
-| [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.9 image]][AppVeyor 2.9] | [![AppVeyor][AppVeyor develop image]][AppVeyor develop] |
+| [Master][Master] | [2.10][2.10] |
+|:----------------:|:----------:|
+| [![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]][Scrutinizer Master] | [![Code Coverage][Coverage 2.10 image]][Scrutinizer 2.10] |
+| [![Code Quality][Quality image]][Scrutinizer Master] | [![Code Quality][Quality 2.10 image]][Scrutinizer 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.
 
@@ -26,21 +26,11 @@ Powerful database abstraction layer with many features for database schema intro
   [AppVeyor master image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/master?svg=true
   [ContinuousPHP]: https://continuousphp.com/git-hub/doctrine/dbal
 
-  [2.9 image]: https://img.shields.io/travis/doctrine/dbal/2.9.svg?style=flat-square
-  [Coverage 2.9 image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/dbal/2.9.svg?style=flat-square
-  [Quality 2.9 image]: https://img.shields.io/scrutinizer/g/doctrine/dbal/2.9.svg?style=flat-square
-  [ContinuousPHP 2.9 image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/2.9.svg?style=flat-square
-  [2.9]: https://github.com/doctrine/dbal/tree/2.9
-  [Scrutinizer 2.9]: https://scrutinizer-ci.com/g/doctrine/dbal/?branch=2.9
-  [AppVeyor 2.9]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.9
-  [AppVeyor 2.9 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.9?svg=true
-
-  [develop]: https://github.com/doctrine/dbal/tree/develop
-  [develop image]: https://img.shields.io/travis/doctrine/dbal/develop.svg?style=flat-square
-  [Coverage develop image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/dbal/develop.svg?style=flat-square
-  [Quality develop image]: https://img.shields.io/scrutinizer/g/doctrine/dbal/develop.svg?style=flat-square
-  [ContinuousPHP develop image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/develop.svg?style=flat-square
-  [develop]: https://github.com/doctrine/dbal/tree/develop
-  [Scrutinizer develop]: https://scrutinizer-ci.com/g/doctrine/dbal/?branch=develop
-  [AppVeyor develop]: https://ci.appveyor.com/project/doctrine/dbal/branch/develop
-  [AppVeyor develop image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/develop?svg=true
+  [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
+  [Coverage 2.10 image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/dbal/2.10.x.svg?style=flat-square
+  [Quality 2.10 image]: https://img.shields.io/scrutinizer/g/doctrine/dbal/2.10.x.svg?style=flat-square
+  [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
+  [Scrutinizer 2.10]: https://scrutinizer-ci.com/g/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