Merge branch '3.0.x'

doctrine · Mar 26, 2020 · ff1501a · ff1501a
2 parents 7811e4e + 6162910
commit ff1501a
Show file tree

Hide file tree

Showing 492 changed files with 466 additions and 514 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -127,9 +127,9 @@ before_test:
 test_script:
  - ps: >-
  if ($env:db_version) {
- $env:phpunit_config = "tests\appveyor\$($env:db).$($env:db_version).$($env:driver).appveyor.xml"
+ $env:phpunit_config = "ci\appveyor\$($env:db).$($env:db_version).$($env:driver).appveyor.xml"
  } else {
- $env:phpunit_config = "tests\appveyor\$($env:db).$($env:driver).appveyor.xml"
+ $env:phpunit_config = "ci\appveyor\$($env:db).$($env:driver).appveyor.xml"
  }
 
  if ($env:coverage -eq "yes") {

diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
  - |
  if [[ -n "$IMAGE" ]]
  then
- bash ./tests/travis/docker-run-mysql-or-mariadb.sh
+ bash ./ci/travis/docker-run-mysql-or-mariadb.sh
  fi
 
 install:
@@ -30,9 +30,9 @@ install:
 script:
  - |
  if [ "x$COVERAGE" == "xyes" ]; then
- ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml --coverage-clover clover.xml
+ ./vendor/bin/phpunit --configuration ci/travis/$DB.travis.xml --coverage-clover clover.xml
  else
- ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
+ ./vendor/bin/phpunit --configuration ci/travis/$DB.travis.xml
  fi
 
 after_script:
@@ -117,36 +117,36 @@ jobs:
  addons:
  postgresql: "10"
  before_script:
- - bash ./tests/travis/install-postgres-10.sh
+ - bash ./ci/travis/install-postgres-10.sh
  - stage: Test
  php: 7.3
  env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
  sudo: required
  before_script:
- - bash ./tests/travis/install-postgres-11.sh
+ - bash ./ci/travis/install-postgres-11.sh
  - stage: Test
  php: 7.3
  env: DB=sqlsrv COVERAGE=yes
  sudo: required
  before_script:
- - bash ./tests/travis/install-sqlsrv-dependencies.sh
- - bash ./tests/travis/install-mssql-sqlsrv.sh
- - bash ./tests/travis/install-mssql.sh
+ - bash ./ci/travis/install-sqlsrv-dependencies.sh
+ - bash ./ci/travis/install-mssql-sqlsrv.sh
+ - bash ./ci/travis/install-mssql.sh
  - stage: Test
  php: 7.3
  env: DB=pdo_sqlsrv COVERAGE=yes
  sudo: required
  before_script:
- - bash ./tests/travis/install-sqlsrv-dependencies.sh
- - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
- - bash ./tests/travis/install-mssql.sh
+ - bash ./ci/travis/install-sqlsrv-dependencies.sh
+ - bash ./ci/travis/install-mssql-pdo_sqlsrv.sh
+ - bash ./ci/travis/install-mssql.sh
  - stage: Test
  php: 7.3
  env: DB=ibm_db2 COVERAGE=yes
  sudo: required
  before_script:
- - bash ./tests/travis/install-db2.sh
- - bash ./tests/travis/install-db2-ibm_db2.sh
+ - bash ./ci/travis/install-db2.sh
+ - bash ./ci/travis/install-db2-ibm_db2.sh
  - stage: Test
  php: 7.3
  env: DB=sqlite DEPENDENCIES=low
@@ -169,7 +169,7 @@ jobs:
  env: DB=pgsql POSTGRESQL_VERSION=11.0
  sudo: required
  before_script:
- - bash ./tests/travis/install-postgres-11.sh
+ - bash ./ci/travis/install-postgres-11.sh
  - stage: Test
  php: 7.4
  env: DB=sqlite
@@ -178,17 +178,17 @@ jobs:
  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
+ - 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
  sudo: required
  before_script:
- - bash ./tests/travis/install-sqlsrv-dependencies.sh
- - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
- - bash ./tests/travis/install-mssql.sh
+ - bash ./ci/travis/install-sqlsrv-dependencies.sh
+ - bash ./ci/travis/install-mssql-pdo_sqlsrv.sh
+ - bash ./ci/travis/install-mssql.sh
 
  - stage: Test
  php: nightly
@@ -207,7 +207,7 @@ jobs:
  env: DB=pgsql POSTGRESQL_VERSION=11.0
  sudo: required
  before_script:
- - bash ./tests/travis/install-postgres-11.sh
+ - bash ./ci/travis/install-postgres-11.sh
  - stage: Test
  php: nightly
  env: DB=sqlite
@@ -216,17 +216,17 @@ jobs:
  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
+ - bash ./ci/travis/install-sqlsrv-dependencies.sh
+ - bash ./ci/travis/install-mssql-sqlsrv.sh
+ - bash ./ci/travis/install-mssql.sh
  - stage: Test
  php: nightly
  env: DB=pdo_sqlsrv
  sudo: required
  before_script:
- - bash ./tests/travis/install-sqlsrv-dependencies.sh
- - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
- - bash ./tests/travis/install-mssql.sh
+ - bash ./ci/travis/install-sqlsrv-dependencies.sh
+ - bash ./ci/travis/install-mssql-pdo_sqlsrv.sh
+ - bash ./ci/travis/install-mssql.sh
 
  - stage: Test
  if: type = cron

diff --git a/...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml → ...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml b/...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml → ...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml → ...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml b/...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml → ...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml → ...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml → ...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml → ...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml b/...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml → ...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/continuousphp/bootstrap.php → ci/continuousphp/bootstrap.php b/tests/continuousphp/bootstrap.php → ci/continuousphp/bootstrap.php
diff --git a/tests/continuousphp/install-pdo-oci.sh → ci/continuousphp/install-pdo-oci.sh b/tests/continuousphp/install-pdo-oci.sh → ci/continuousphp/install-pdo-oci.sh
diff --git a/...tinuousphp/oci8.phpunit.continuousphp.xml → ...tinuousphp/oci8.phpunit.continuousphp.xml b/...tinuousphp/oci8.phpunit.continuousphp.xml → ...tinuousphp/oci8.phpunit.continuousphp.xml
@@ -29,13 +29,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/continuousphp/pdo-oci.phpunit.xml → ci/continuousphp/pdo-oci.phpunit.xml b/tests/continuousphp/pdo-oci.phpunit.xml → ci/continuousphp/pdo-oci.phpunit.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/docker-run-mysql-or-mariadb.sh → ci/travis/docker-run-mysql-or-mariadb.sh b/tests/travis/docker-run-mysql-or-mariadb.sh → ci/travis/docker-run-mysql-or-mariadb.sh
diff --git a/tests/travis/ibm_db2.travis.xml → ci/travis/ibm_db2.travis.xml b/tests/travis/ibm_db2.travis.xml → ci/travis/ibm_db2.travis.xml
@@ -27,13 +27,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/install-db2-ibm_db2.sh → ci/travis/install-db2-ibm_db2.sh b/tests/travis/install-db2-ibm_db2.sh → ci/travis/install-db2-ibm_db2.sh
diff --git a/tests/travis/install-db2.sh → ci/travis/install-db2.sh b/tests/travis/install-db2.sh → ci/travis/install-db2.sh
diff --git a/tests/travis/install-mariadb.sh → ci/travis/install-mariadb.sh b/tests/travis/install-mariadb.sh → ci/travis/install-mariadb.sh
diff --git a/tests/travis/install-mssql-pdo_sqlsrv.sh → ci/travis/install-mssql-pdo_sqlsrv.sh b/tests/travis/install-mssql-pdo_sqlsrv.sh → ci/travis/install-mssql-pdo_sqlsrv.sh
diff --git a/tests/travis/install-mssql-sqlsrv.sh → ci/travis/install-mssql-sqlsrv.sh b/tests/travis/install-mssql-sqlsrv.sh → ci/travis/install-mssql-sqlsrv.sh
diff --git a/tests/travis/install-mssql.sh → ci/travis/install-mssql.sh b/tests/travis/install-mssql.sh → ci/travis/install-mssql.sh
diff --git a/tests/travis/install-postgres-10.sh → ci/travis/install-postgres-10.sh b/tests/travis/install-postgres-10.sh → ci/travis/install-postgres-10.sh
diff --git a/tests/travis/install-postgres-11.sh → ci/travis/install-postgres-11.sh b/tests/travis/install-postgres-11.sh → ci/travis/install-postgres-11.sh
diff --git a/tests/travis/install-sqlsrv-dependencies.sh → ci/travis/install-sqlsrv-dependencies.sh b/tests/travis/install-sqlsrv-dependencies.sh → ci/travis/install-sqlsrv-dependencies.sh
diff --git a/tests/travis/mariadb.docker.travis.xml → ci/travis/mariadb.docker.travis.xml b/tests/travis/mariadb.docker.travis.xml → ci/travis/mariadb.docker.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/...s/travis/mariadb.mysqli.docker.travis.xml → ci/travis/mariadb.mysqli.docker.travis.xml b/...s/travis/mariadb.mysqli.docker.travis.xml → ci/travis/mariadb.mysqli.docker.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/mysql.docker.travis.xml → ci/travis/mysql.docker.travis.xml b/tests/travis/mysql.docker.travis.xml → ci/travis/mysql.docker.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/mysqli.docker.travis.xml → ci/travis/mysqli.docker.travis.xml b/tests/travis/mysqli.docker.travis.xml → ci/travis/mysqli.docker.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/pdo_sqlsrv.travis.xml → ci/travis/pdo_sqlsrv.travis.xml b/tests/travis/pdo_sqlsrv.travis.xml → ci/travis/pdo_sqlsrv.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/pgsql.travis.xml → ci/travis/pgsql.travis.xml b/tests/travis/pgsql.travis.xml → ci/travis/pgsql.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/sqlite.travis.xml → ci/travis/sqlite.travis.xml b/tests/travis/sqlite.travis.xml → ci/travis/sqlite.travis.xml
@@ -13,13 +13,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/tests/travis/sqlsrv.travis.xml → ci/travis/sqlsrv.travis.xml b/tests/travis/sqlsrv.travis.xml → ci/travis/sqlsrv.travis.xml
@@ -26,13 +26,13 @@
 
  <testsuites>
  <testsuite name="Doctrine DBAL Test Suite">
- <directory>../Doctrine/Tests/DBAL</directory>
+ <directory>../../tests</directory>
  </testsuite>
  </testsuites>
 
  <filter>
  <whitelist>
- <directory suffix=".php">../../lib/Doctrine</directory>
+ <directory suffix=".php">../../src</directory>
  </whitelist>
  </filter>
 

diff --git a/composer.json b/composer.json
@@ -56,10 +56,10 @@
  "sort-packages": true
  },
  "autoload": {
- "psr-4": { "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" }
+ "psr-4": { "Doctrine\\DBAL\\": "src" }
  },
  "autoload-dev": {
- "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
+ "psr-4": { "Doctrine\\DBAL\\Tests\\": "tests" }
  },
  "extra": {
  "branch-alias": {