diff --git a/.appveyor.yml b/.appveyor.yml index 2257d2b6e91..c222e8ab67a 100644 --- 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 index dc9079c2eb2..a57c5985fca 100644 --- 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/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml similarity index 91% rename from tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml rename to ci/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml index ef358c2d3be..68a2ba24b06 100644 --- a/tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml +++ b/ci/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml similarity index 91% rename from tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml rename to ci/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml index 68b1f31daea..d56d72be311 100644 --- a/tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml +++ b/ci/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml similarity index 91% rename from tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml rename to ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml index 4ed53022628..cecf9bb9ddf 100644 --- a/tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml +++ b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml similarity index 91% rename from tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml rename to ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml index 86702637719..47ef859bfa3 100644 --- a/tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml +++ b/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/continuousphp/bootstrap.php b/ci/continuousphp/bootstrap.php similarity index 100% rename from tests/continuousphp/bootstrap.php rename to ci/continuousphp/bootstrap.php diff --git a/tests/continuousphp/install-pdo-oci.sh b/ci/continuousphp/install-pdo-oci.sh similarity index 100% rename from tests/continuousphp/install-pdo-oci.sh rename to ci/continuousphp/install-pdo-oci.sh diff --git a/tests/continuousphp/oci8.phpunit.continuousphp.xml b/ci/continuousphp/oci8.phpunit.continuousphp.xml similarity index 92% rename from tests/continuousphp/oci8.phpunit.continuousphp.xml rename to ci/continuousphp/oci8.phpunit.continuousphp.xml index 4a2de468240..d0ab353ab2c 100644 --- a/tests/continuousphp/oci8.phpunit.continuousphp.xml +++ b/ci/continuousphp/oci8.phpunit.continuousphp.xml @@ -29,13 +29,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/continuousphp/pdo-oci.phpunit.xml b/ci/continuousphp/pdo-oci.phpunit.xml similarity index 91% rename from tests/continuousphp/pdo-oci.phpunit.xml rename to ci/continuousphp/pdo-oci.phpunit.xml index b25e0c02745..8ac8462cb22 100644 --- a/tests/continuousphp/pdo-oci.phpunit.xml +++ b/ci/continuousphp/pdo-oci.phpunit.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/docker-run-mysql-or-mariadb.sh b/ci/travis/docker-run-mysql-or-mariadb.sh similarity index 100% rename from tests/travis/docker-run-mysql-or-mariadb.sh rename to ci/travis/docker-run-mysql-or-mariadb.sh diff --git a/tests/travis/ibm_db2.travis.xml b/ci/travis/ibm_db2.travis.xml similarity index 92% rename from tests/travis/ibm_db2.travis.xml rename to ci/travis/ibm_db2.travis.xml index e841a8ce252..6dfa55f0692 100644 --- a/tests/travis/ibm_db2.travis.xml +++ b/ci/travis/ibm_db2.travis.xml @@ -27,13 +27,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/install-db2-ibm_db2.sh b/ci/travis/install-db2-ibm_db2.sh similarity index 100% rename from tests/travis/install-db2-ibm_db2.sh rename to ci/travis/install-db2-ibm_db2.sh diff --git a/tests/travis/install-db2.sh b/ci/travis/install-db2.sh similarity index 100% rename from tests/travis/install-db2.sh rename to ci/travis/install-db2.sh diff --git a/tests/travis/install-mariadb.sh b/ci/travis/install-mariadb.sh similarity index 100% rename from tests/travis/install-mariadb.sh rename to ci/travis/install-mariadb.sh diff --git a/tests/travis/install-mssql-pdo_sqlsrv.sh b/ci/travis/install-mssql-pdo_sqlsrv.sh similarity index 100% rename from tests/travis/install-mssql-pdo_sqlsrv.sh rename to ci/travis/install-mssql-pdo_sqlsrv.sh diff --git a/tests/travis/install-mssql-sqlsrv.sh b/ci/travis/install-mssql-sqlsrv.sh similarity index 100% rename from tests/travis/install-mssql-sqlsrv.sh rename to ci/travis/install-mssql-sqlsrv.sh diff --git a/tests/travis/install-mssql.sh b/ci/travis/install-mssql.sh similarity index 100% rename from tests/travis/install-mssql.sh rename to ci/travis/install-mssql.sh diff --git a/tests/travis/install-postgres-10.sh b/ci/travis/install-postgres-10.sh similarity index 100% rename from tests/travis/install-postgres-10.sh rename to ci/travis/install-postgres-10.sh diff --git a/tests/travis/install-postgres-11.sh b/ci/travis/install-postgres-11.sh similarity index 100% rename from tests/travis/install-postgres-11.sh rename to ci/travis/install-postgres-11.sh diff --git a/tests/travis/install-sqlsrv-dependencies.sh b/ci/travis/install-sqlsrv-dependencies.sh similarity index 100% rename from tests/travis/install-sqlsrv-dependencies.sh rename to ci/travis/install-sqlsrv-dependencies.sh diff --git a/tests/travis/mariadb.docker.travis.xml b/ci/travis/mariadb.docker.travis.xml similarity index 91% rename from tests/travis/mariadb.docker.travis.xml rename to ci/travis/mariadb.docker.travis.xml index fa6617c0948..81fb561579f 100644 --- a/tests/travis/mariadb.docker.travis.xml +++ b/ci/travis/mariadb.docker.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/mariadb.mysqli.docker.travis.xml b/ci/travis/mariadb.mysqli.docker.travis.xml similarity index 91% rename from tests/travis/mariadb.mysqli.docker.travis.xml rename to ci/travis/mariadb.mysqli.docker.travis.xml index 679415d7a18..041968f6495 100644 --- a/tests/travis/mariadb.mysqli.docker.travis.xml +++ b/ci/travis/mariadb.mysqli.docker.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/mysql.docker.travis.xml b/ci/travis/mysql.docker.travis.xml similarity index 91% rename from tests/travis/mysql.docker.travis.xml rename to ci/travis/mysql.docker.travis.xml index fa6617c0948..81fb561579f 100644 --- a/tests/travis/mysql.docker.travis.xml +++ b/ci/travis/mysql.docker.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/mysqli.docker.travis.xml b/ci/travis/mysqli.docker.travis.xml similarity index 91% rename from tests/travis/mysqli.docker.travis.xml rename to ci/travis/mysqli.docker.travis.xml index 679415d7a18..041968f6495 100644 --- a/tests/travis/mysqli.docker.travis.xml +++ b/ci/travis/mysqli.docker.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/pdo_sqlsrv.travis.xml b/ci/travis/pdo_sqlsrv.travis.xml similarity index 91% rename from tests/travis/pdo_sqlsrv.travis.xml rename to ci/travis/pdo_sqlsrv.travis.xml index 07f947600ea..7e1ed6bce32 100644 --- a/tests/travis/pdo_sqlsrv.travis.xml +++ b/ci/travis/pdo_sqlsrv.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/pgsql.travis.xml b/ci/travis/pgsql.travis.xml similarity index 91% rename from tests/travis/pgsql.travis.xml rename to ci/travis/pgsql.travis.xml index 5215f2e6f1b..1b9d2bd1f15 100644 --- a/tests/travis/pgsql.travis.xml +++ b/ci/travis/pgsql.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/sqlite.travis.xml b/ci/travis/sqlite.travis.xml similarity index 85% rename from tests/travis/sqlite.travis.xml rename to ci/travis/sqlite.travis.xml index c6e3e291fce..53d21079d49 100644 --- a/tests/travis/sqlite.travis.xml +++ b/ci/travis/sqlite.travis.xml @@ -13,13 +13,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/tests/travis/sqlsrv.travis.xml b/ci/travis/sqlsrv.travis.xml similarity index 91% rename from tests/travis/sqlsrv.travis.xml rename to ci/travis/sqlsrv.travis.xml index 6c642e58e9a..b9cde16d4f8 100644 --- a/tests/travis/sqlsrv.travis.xml +++ b/ci/travis/sqlsrv.travis.xml @@ -26,13 +26,13 @@ - ../Doctrine/Tests/DBAL + ../../tests - ../../lib/Doctrine + ../../src diff --git a/composer.json b/composer.json index dd4d399c55d..e14f7664ee3 100644 --- a/composer.json +++ b/composer.json @@ -55,10 +55,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": { diff --git a/docs/en/reference/caching.rst b/docs/en/reference/caching.rst index 5a2daf0b317..faf6f16b870 100644 --- a/docs/en/reference/caching.rst +++ b/docs/en/reference/caching.rst @@ -47,4 +47,4 @@ object is closed: .. warning:: - When using the cache layer not all fetch modes are supported. See the code of the `ResultCacheStatement `_ for details. + When using the cache layer not all fetch modes are supported. See the code of the `ResultCacheStatement `_ for details. diff --git a/docs/en/reference/supporting-other-databases.rst b/docs/en/reference/supporting-other-databases.rst index 797fe76401d..ac326ab3b2e 100644 --- a/docs/en/reference/supporting-other-databases.rst +++ b/docs/en/reference/supporting-other-databases.rst @@ -15,12 +15,12 @@ For an already supported platform but unsupported driver you only need to implement the first three interfaces, since the SQL Generation and Schema Management is already supported by the respective platform and schema instances. You can also make use of -several Abstract Unittests in the ``\Doctrine\Tests\DBAL`` package +several Abstract Unittests in the ``\Doctrine\DBAL\Tests`` package to check if your platform behaves like all the others which is necessary for SchemaTool support, namely: -- ``\Doctrine\Tests\DBAL\Platforms\AbstractPlatformTestCase`` -- ``\Doctrine\Tests\DBAL\Functional\Schema\AbstractSchemaManagerTestCase`` +- ``\Doctrine\DBAL\Tests\Platforms\AbstractPlatformTestCase`` +- ``\Doctrine\DBAL\Tests\Functional\Schema\AbstractSchemaManagerTestCase`` We would be very happy if any support for new databases would be contributed back to Doctrine to make it an even better product. diff --git a/phpcs.xml.dist b/phpcs.xml.dist index a60da30be43..7bd9101458d 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -10,7 +10,7 @@ bin - lib + src tests @@ -22,11 +22,11 @@ - */lib/* + */src/* - */lib/* + */src/* @@ -38,51 +38,51 @@ - lib/Doctrine/DBAL/Events.php + src/Events.php - tests/Doctrine/Tests/DBAL/Tools/TestAsset/* + tests/Tools/TestAsset/* - lib/Doctrine/DBAL/Platforms/AbstractPlatform.php - lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php - tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php + src/Platforms/AbstractPlatform.php + src/Schema/AbstractSchemaManager.php + tests/Platforms/AbstractPlatformTestCase.php - lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php + src/Driver/SQLSrv/SQLSrvStatement.php - lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php + src/Driver/SQLSrv/SQLSrvStatement.php - tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php - tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php + tests/Platforms/OraclePlatformTest.php + tests/SQLParserUtilsTest.php - lib/Doctrine/DBAL/Schema/Comparator.php + src/Schema/Comparator.php - lib/Doctrine/DBAL/Types/ArrayType.php - lib/Doctrine/DBAL/Types/ObjectType.php - tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php + src/Types/ArrayType.php + src/Types/ObjectType.php + tests/Driver/Mysqli/MysqliConnectionTest.php - lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php + src/Driver/SQLSrv/SQLSrvStatement.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 0f126260dba..9cf5137d3f7 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,7 +1,7 @@ parameters: level: 7 paths: - - %currentWorkingDirectory%/lib + - %currentWorkingDirectory%/src autoload_files: - %currentWorkingDirectory%/tests/phpstan-polyfill.php reportUnmatchedIgnoredErrors: false diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f62532ed9f9..ac13dc4fdda 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -44,22 +44,22 @@ - ./tests/Doctrine/Tests/DBAL - ./tests/Doctrine/Tests/DBAL/Performance + ./tests + ./tests/Performance - ./tests/Doctrine/Tests/DBAL/Performance + ./tests/Performance - lib/Doctrine + src - + diff --git a/lib/Doctrine/DBAL/Cache/ArrayStatement.php b/src/Cache/ArrayStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Cache/ArrayStatement.php rename to src/Cache/ArrayStatement.php diff --git a/lib/Doctrine/DBAL/Cache/CacheException.php b/src/Cache/CacheException.php similarity index 100% rename from lib/Doctrine/DBAL/Cache/CacheException.php rename to src/Cache/CacheException.php diff --git a/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php b/src/Cache/QueryCacheProfile.php similarity index 100% rename from lib/Doctrine/DBAL/Cache/QueryCacheProfile.php rename to src/Cache/QueryCacheProfile.php diff --git a/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php b/src/Cache/ResultCacheStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Cache/ResultCacheStatement.php rename to src/Cache/ResultCacheStatement.php diff --git a/lib/Doctrine/DBAL/ColumnCase.php b/src/ColumnCase.php similarity index 100% rename from lib/Doctrine/DBAL/ColumnCase.php rename to src/ColumnCase.php diff --git a/lib/Doctrine/DBAL/Configuration.php b/src/Configuration.php similarity index 100% rename from lib/Doctrine/DBAL/Configuration.php rename to src/Configuration.php diff --git a/lib/Doctrine/DBAL/Connection.php b/src/Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Connection.php rename to src/Connection.php diff --git a/lib/Doctrine/DBAL/ConnectionException.php b/src/ConnectionException.php similarity index 100% rename from lib/Doctrine/DBAL/ConnectionException.php rename to src/ConnectionException.php diff --git a/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php b/src/Connections/MasterSlaveConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php rename to src/Connections/MasterSlaveConnection.php diff --git a/lib/Doctrine/DBAL/DBALException.php b/src/DBALException.php similarity index 100% rename from lib/Doctrine/DBAL/DBALException.php rename to src/DBALException.php diff --git a/lib/Doctrine/DBAL/Driver.php b/src/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver.php rename to src/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractDB2Driver.php b/src/Driver/AbstractDB2Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractDB2Driver.php rename to src/Driver/AbstractDB2Driver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractDriverException.php b/src/Driver/AbstractDriverException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractDriverException.php rename to src/Driver/AbstractDriverException.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php b/src/Driver/AbstractMySQLDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php rename to src/Driver/AbstractMySQLDriver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php b/src/Driver/AbstractOracleDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php rename to src/Driver/AbstractOracleDriver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractOracleDriver/EasyConnectString.php b/src/Driver/AbstractOracleDriver/EasyConnectString.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractOracleDriver/EasyConnectString.php rename to src/Driver/AbstractOracleDriver/EasyConnectString.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php b/src/Driver/AbstractPostgreSQLDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php rename to src/Driver/AbstractPostgreSQLDriver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php b/src/Driver/AbstractSQLAnywhereDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php rename to src/Driver/AbstractSQLAnywhereDriver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php b/src/Driver/AbstractSQLServerDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php rename to src/Driver/AbstractSQLServerDriver.php diff --git a/lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php b/src/Driver/AbstractSQLiteDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php rename to src/Driver/AbstractSQLiteDriver.php diff --git a/lib/Doctrine/DBAL/Driver/Connection.php b/src/Driver/Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Connection.php rename to src/Driver/Connection.php diff --git a/lib/Doctrine/DBAL/Driver/DriverException.php b/src/Driver/DriverException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/DriverException.php rename to src/Driver/DriverException.php diff --git a/lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php b/src/Driver/ExceptionConverterDriver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php rename to src/Driver/ExceptionConverterDriver.php diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php b/src/Driver/IBMDB2/DB2Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php rename to src/Driver/IBMDB2/DB2Connection.php diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php b/src/Driver/IBMDB2/DB2Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php rename to src/Driver/IBMDB2/DB2Driver.php diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php b/src/Driver/IBMDB2/DB2Exception.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php rename to src/Driver/IBMDB2/DB2Exception.php diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php b/src/Driver/IBMDB2/DB2Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php rename to src/Driver/IBMDB2/DB2Statement.php diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/Driver.php b/src/Driver/Mysqli/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Mysqli/Driver.php rename to src/Driver/Mysqli/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php b/src/Driver/Mysqli/MysqliConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php rename to src/Driver/Mysqli/MysqliConnection.php diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php b/src/Driver/Mysqli/MysqliException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php rename to src/Driver/Mysqli/MysqliException.php diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/src/Driver/Mysqli/MysqliStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php rename to src/Driver/Mysqli/MysqliStatement.php diff --git a/lib/Doctrine/DBAL/Driver/OCI8/Driver.php b/src/Driver/OCI8/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/OCI8/Driver.php rename to src/Driver/OCI8/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php b/src/Driver/OCI8/OCI8Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php rename to src/Driver/OCI8/OCI8Connection.php diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php b/src/Driver/OCI8/OCI8Exception.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php rename to src/Driver/OCI8/OCI8Exception.php diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/src/Driver/OCI8/OCI8Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php rename to src/Driver/OCI8/OCI8Statement.php diff --git a/lib/Doctrine/DBAL/Driver/PDOConnection.php b/src/Driver/PDOConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOConnection.php rename to src/Driver/PDOConnection.php diff --git a/lib/Doctrine/DBAL/Driver/PDOException.php b/src/Driver/PDOException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOException.php rename to src/Driver/PDOException.php diff --git a/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php b/src/Driver/PDOMySql/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php rename to src/Driver/PDOMySql/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php b/src/Driver/PDOOracle/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php rename to src/Driver/PDOOracle/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php b/src/Driver/PDOPgSql/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php rename to src/Driver/PDOPgSql/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php b/src/Driver/PDOSqlite/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php rename to src/Driver/PDOSqlite/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/src/Driver/PDOSqlsrv/Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php rename to src/Driver/PDOSqlsrv/Connection.php diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php b/src/Driver/PDOSqlsrv/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php rename to src/Driver/PDOSqlsrv/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Statement.php b/src/Driver/PDOSqlsrv/Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOSqlsrv/Statement.php rename to src/Driver/PDOSqlsrv/Statement.php diff --git a/lib/Doctrine/DBAL/Driver/PDOStatement.php b/src/Driver/PDOStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PDOStatement.php rename to src/Driver/PDOStatement.php diff --git a/lib/Doctrine/DBAL/Driver/PingableConnection.php b/src/Driver/PingableConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/PingableConnection.php rename to src/Driver/PingableConnection.php diff --git a/lib/Doctrine/DBAL/Driver/ResultStatement.php b/src/Driver/ResultStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/ResultStatement.php rename to src/Driver/ResultStatement.php diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php b/src/Driver/SQLAnywhere/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php rename to src/Driver/SQLAnywhere/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php b/src/Driver/SQLAnywhere/SQLAnywhereConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php rename to src/Driver/SQLAnywhere/SQLAnywhereConnection.php diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php b/src/Driver/SQLAnywhere/SQLAnywhereException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php rename to src/Driver/SQLAnywhere/SQLAnywhereException.php diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php b/src/Driver/SQLAnywhere/SQLAnywhereStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php rename to src/Driver/SQLAnywhere/SQLAnywhereStatement.php diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php b/src/Driver/SQLSrv/Driver.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php rename to src/Driver/SQLSrv/Driver.php diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/LastInsertId.php b/src/Driver/SQLSrv/LastInsertId.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLSrv/LastInsertId.php rename to src/Driver/SQLSrv/LastInsertId.php diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/src/Driver/SQLSrv/SQLSrvConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php rename to src/Driver/SQLSrv/SQLSrvConnection.php diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php b/src/Driver/SQLSrv/SQLSrvException.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php rename to src/Driver/SQLSrv/SQLSrvException.php diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/src/Driver/SQLSrv/SQLSrvStatement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php rename to src/Driver/SQLSrv/SQLSrvStatement.php diff --git a/lib/Doctrine/DBAL/Driver/ServerInfoAwareConnection.php b/src/Driver/ServerInfoAwareConnection.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/ServerInfoAwareConnection.php rename to src/Driver/ServerInfoAwareConnection.php diff --git a/lib/Doctrine/DBAL/Driver/Statement.php b/src/Driver/Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/Statement.php rename to src/Driver/Statement.php diff --git a/lib/Doctrine/DBAL/Driver/StatementIterator.php b/src/Driver/StatementIterator.php similarity index 100% rename from lib/Doctrine/DBAL/Driver/StatementIterator.php rename to src/Driver/StatementIterator.php diff --git a/lib/Doctrine/DBAL/DriverManager.php b/src/DriverManager.php similarity index 100% rename from lib/Doctrine/DBAL/DriverManager.php rename to src/DriverManager.php diff --git a/lib/Doctrine/DBAL/Event/ConnectionEventArgs.php b/src/Event/ConnectionEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/ConnectionEventArgs.php rename to src/Event/ConnectionEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/Listeners/MysqlSessionInit.php b/src/Event/Listeners/MysqlSessionInit.php similarity index 100% rename from lib/Doctrine/DBAL/Event/Listeners/MysqlSessionInit.php rename to src/Event/Listeners/MysqlSessionInit.php diff --git a/lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php b/src/Event/Listeners/OracleSessionInit.php similarity index 100% rename from lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php rename to src/Event/Listeners/OracleSessionInit.php diff --git a/lib/Doctrine/DBAL/Event/Listeners/SQLSessionInit.php b/src/Event/Listeners/SQLSessionInit.php similarity index 100% rename from lib/Doctrine/DBAL/Event/Listeners/SQLSessionInit.php rename to src/Event/Listeners/SQLSessionInit.php diff --git a/lib/Doctrine/DBAL/Event/SchemaAlterTableAddColumnEventArgs.php b/src/Event/SchemaAlterTableAddColumnEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaAlterTableAddColumnEventArgs.php rename to src/Event/SchemaAlterTableAddColumnEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaAlterTableChangeColumnEventArgs.php b/src/Event/SchemaAlterTableChangeColumnEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaAlterTableChangeColumnEventArgs.php rename to src/Event/SchemaAlterTableChangeColumnEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaAlterTableEventArgs.php b/src/Event/SchemaAlterTableEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaAlterTableEventArgs.php rename to src/Event/SchemaAlterTableEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaAlterTableRemoveColumnEventArgs.php b/src/Event/SchemaAlterTableRemoveColumnEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaAlterTableRemoveColumnEventArgs.php rename to src/Event/SchemaAlterTableRemoveColumnEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaAlterTableRenameColumnEventArgs.php b/src/Event/SchemaAlterTableRenameColumnEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaAlterTableRenameColumnEventArgs.php rename to src/Event/SchemaAlterTableRenameColumnEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaColumnDefinitionEventArgs.php b/src/Event/SchemaColumnDefinitionEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaColumnDefinitionEventArgs.php rename to src/Event/SchemaColumnDefinitionEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaCreateTableColumnEventArgs.php b/src/Event/SchemaCreateTableColumnEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaCreateTableColumnEventArgs.php rename to src/Event/SchemaCreateTableColumnEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaCreateTableEventArgs.php b/src/Event/SchemaCreateTableEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaCreateTableEventArgs.php rename to src/Event/SchemaCreateTableEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaDropTableEventArgs.php b/src/Event/SchemaDropTableEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaDropTableEventArgs.php rename to src/Event/SchemaDropTableEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaEventArgs.php b/src/Event/SchemaEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaEventArgs.php rename to src/Event/SchemaEventArgs.php diff --git a/lib/Doctrine/DBAL/Event/SchemaIndexDefinitionEventArgs.php b/src/Event/SchemaIndexDefinitionEventArgs.php similarity index 100% rename from lib/Doctrine/DBAL/Event/SchemaIndexDefinitionEventArgs.php rename to src/Event/SchemaIndexDefinitionEventArgs.php diff --git a/lib/Doctrine/DBAL/Events.php b/src/Events.php similarity index 100% rename from lib/Doctrine/DBAL/Events.php rename to src/Events.php diff --git a/lib/Doctrine/DBAL/Exception/ConnectionException.php b/src/Exception/ConnectionException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/ConnectionException.php rename to src/Exception/ConnectionException.php diff --git a/lib/Doctrine/DBAL/Exception/ConstraintViolationException.php b/src/Exception/ConstraintViolationException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/ConstraintViolationException.php rename to src/Exception/ConstraintViolationException.php diff --git a/lib/Doctrine/DBAL/Exception/DatabaseObjectExistsException.php b/src/Exception/DatabaseObjectExistsException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/DatabaseObjectExistsException.php rename to src/Exception/DatabaseObjectExistsException.php diff --git a/lib/Doctrine/DBAL/Exception/DatabaseObjectNotFoundException.php b/src/Exception/DatabaseObjectNotFoundException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/DatabaseObjectNotFoundException.php rename to src/Exception/DatabaseObjectNotFoundException.php diff --git a/lib/Doctrine/DBAL/Exception/DeadlockException.php b/src/Exception/DeadlockException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/DeadlockException.php rename to src/Exception/DeadlockException.php diff --git a/lib/Doctrine/DBAL/Exception/DriverException.php b/src/Exception/DriverException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/DriverException.php rename to src/Exception/DriverException.php diff --git a/lib/Doctrine/DBAL/Exception/ForeignKeyConstraintViolationException.php b/src/Exception/ForeignKeyConstraintViolationException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/ForeignKeyConstraintViolationException.php rename to src/Exception/ForeignKeyConstraintViolationException.php diff --git a/lib/Doctrine/DBAL/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/InvalidArgumentException.php rename to src/Exception/InvalidArgumentException.php diff --git a/lib/Doctrine/DBAL/Exception/InvalidFieldNameException.php b/src/Exception/InvalidFieldNameException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/InvalidFieldNameException.php rename to src/Exception/InvalidFieldNameException.php diff --git a/lib/Doctrine/DBAL/Exception/LockWaitTimeoutException.php b/src/Exception/LockWaitTimeoutException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/LockWaitTimeoutException.php rename to src/Exception/LockWaitTimeoutException.php diff --git a/lib/Doctrine/DBAL/Exception/NonUniqueFieldNameException.php b/src/Exception/NonUniqueFieldNameException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/NonUniqueFieldNameException.php rename to src/Exception/NonUniqueFieldNameException.php diff --git a/lib/Doctrine/DBAL/Exception/NotNullConstraintViolationException.php b/src/Exception/NotNullConstraintViolationException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/NotNullConstraintViolationException.php rename to src/Exception/NotNullConstraintViolationException.php diff --git a/lib/Doctrine/DBAL/Exception/ReadOnlyException.php b/src/Exception/ReadOnlyException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/ReadOnlyException.php rename to src/Exception/ReadOnlyException.php diff --git a/lib/Doctrine/DBAL/Exception/RetryableException.php b/src/Exception/RetryableException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/RetryableException.php rename to src/Exception/RetryableException.php diff --git a/lib/Doctrine/DBAL/Exception/ServerException.php b/src/Exception/ServerException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/ServerException.php rename to src/Exception/ServerException.php diff --git a/lib/Doctrine/DBAL/Exception/SyntaxErrorException.php b/src/Exception/SyntaxErrorException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/SyntaxErrorException.php rename to src/Exception/SyntaxErrorException.php diff --git a/lib/Doctrine/DBAL/Exception/TableExistsException.php b/src/Exception/TableExistsException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/TableExistsException.php rename to src/Exception/TableExistsException.php diff --git a/lib/Doctrine/DBAL/Exception/TableNotFoundException.php b/src/Exception/TableNotFoundException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/TableNotFoundException.php rename to src/Exception/TableNotFoundException.php diff --git a/lib/Doctrine/DBAL/Exception/UniqueConstraintViolationException.php b/src/Exception/UniqueConstraintViolationException.php similarity index 100% rename from lib/Doctrine/DBAL/Exception/UniqueConstraintViolationException.php rename to src/Exception/UniqueConstraintViolationException.php diff --git a/lib/Doctrine/DBAL/FetchMode.php b/src/FetchMode.php similarity index 100% rename from lib/Doctrine/DBAL/FetchMode.php rename to src/FetchMode.php diff --git a/lib/Doctrine/DBAL/Id/TableGenerator.php b/src/Id/TableGenerator.php similarity index 100% rename from lib/Doctrine/DBAL/Id/TableGenerator.php rename to src/Id/TableGenerator.php diff --git a/lib/Doctrine/DBAL/Id/TableGeneratorSchemaVisitor.php b/src/Id/TableGeneratorSchemaVisitor.php similarity index 100% rename from lib/Doctrine/DBAL/Id/TableGeneratorSchemaVisitor.php rename to src/Id/TableGeneratorSchemaVisitor.php diff --git a/lib/Doctrine/DBAL/LockMode.php b/src/LockMode.php similarity index 100% rename from lib/Doctrine/DBAL/LockMode.php rename to src/LockMode.php diff --git a/lib/Doctrine/DBAL/Logging/DebugStack.php b/src/Logging/DebugStack.php similarity index 100% rename from lib/Doctrine/DBAL/Logging/DebugStack.php rename to src/Logging/DebugStack.php diff --git a/lib/Doctrine/DBAL/Logging/EchoSQLLogger.php b/src/Logging/EchoSQLLogger.php similarity index 100% rename from lib/Doctrine/DBAL/Logging/EchoSQLLogger.php rename to src/Logging/EchoSQLLogger.php diff --git a/lib/Doctrine/DBAL/Logging/LoggerChain.php b/src/Logging/LoggerChain.php similarity index 100% rename from lib/Doctrine/DBAL/Logging/LoggerChain.php rename to src/Logging/LoggerChain.php diff --git a/lib/Doctrine/DBAL/Logging/SQLLogger.php b/src/Logging/SQLLogger.php similarity index 100% rename from lib/Doctrine/DBAL/Logging/SQLLogger.php rename to src/Logging/SQLLogger.php diff --git a/lib/Doctrine/DBAL/ParameterType.php b/src/ParameterType.php similarity index 100% rename from lib/Doctrine/DBAL/ParameterType.php rename to src/ParameterType.php diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/src/Platforms/AbstractPlatform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/AbstractPlatform.php rename to src/Platforms/AbstractPlatform.php diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/src/Platforms/DB2Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/DB2Platform.php rename to src/Platforms/DB2Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/DateIntervalUnit.php b/src/Platforms/DateIntervalUnit.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/DateIntervalUnit.php rename to src/Platforms/DateIntervalUnit.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php b/src/Platforms/Keywords/DB2Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php rename to src/Platforms/Keywords/DB2Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php b/src/Platforms/Keywords/KeywordList.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php rename to src/Platforms/Keywords/KeywordList.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/MariaDb102Keywords.php b/src/Platforms/Keywords/MariaDb102Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/MariaDb102Keywords.php rename to src/Platforms/Keywords/MariaDb102Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/MySQL57Keywords.php b/src/Platforms/Keywords/MySQL57Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/MySQL57Keywords.php rename to src/Platforms/Keywords/MySQL57Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/MySQL80Keywords.php b/src/Platforms/Keywords/MySQL80Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/MySQL80Keywords.php rename to src/Platforms/Keywords/MySQL80Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php b/src/Platforms/Keywords/MySQLKeywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php rename to src/Platforms/Keywords/MySQLKeywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php b/src/Platforms/Keywords/OracleKeywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php rename to src/Platforms/Keywords/OracleKeywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL100Keywords.php b/src/Platforms/Keywords/PostgreSQL100Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL100Keywords.php rename to src/Platforms/Keywords/PostgreSQL100Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL94Keywords.php b/src/Platforms/Keywords/PostgreSQL94Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL94Keywords.php rename to src/Platforms/Keywords/PostgreSQL94Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php b/src/Platforms/Keywords/ReservedKeywordsValidator.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php rename to src/Platforms/Keywords/ReservedKeywordsValidator.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php b/src/Platforms/Keywords/SQLAnywhereKeywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/SQLAnywhereKeywords.php rename to src/Platforms/Keywords/SQLAnywhereKeywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLServer2012Keywords.php b/src/Platforms/Keywords/SQLServer2012Keywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/SQLServer2012Keywords.php rename to src/Platforms/Keywords/SQLServer2012Keywords.php diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php b/src/Platforms/Keywords/SQLiteKeywords.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php rename to src/Platforms/Keywords/SQLiteKeywords.php diff --git a/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php b/src/Platforms/MariaDb1027Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php rename to src/Platforms/MariaDb1027Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php b/src/Platforms/MySQL57Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/MySQL57Platform.php rename to src/Platforms/MySQL57Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/MySQL80Platform.php b/src/Platforms/MySQL80Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/MySQL80Platform.php rename to src/Platforms/MySQL80Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/src/Platforms/MySqlPlatform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/MySqlPlatform.php rename to src/Platforms/MySqlPlatform.php diff --git a/lib/Doctrine/DBAL/Platforms/OraclePlatform.php b/src/Platforms/OraclePlatform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/OraclePlatform.php rename to src/Platforms/OraclePlatform.php diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSQL100Platform.php b/src/Platforms/PostgreSQL100Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/PostgreSQL100Platform.php rename to src/Platforms/PostgreSQL100Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSQL94Platform.php b/src/Platforms/PostgreSQL94Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/PostgreSQL94Platform.php rename to src/Platforms/PostgreSQL94Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/SQLAnywhere16Platform.php b/src/Platforms/SQLAnywhere16Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/SQLAnywhere16Platform.php rename to src/Platforms/SQLAnywhere16Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/SQLServer2012Platform.php b/src/Platforms/SQLServer2012Platform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/SQLServer2012Platform.php rename to src/Platforms/SQLServer2012Platform.php diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/src/Platforms/SqlitePlatform.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/SqlitePlatform.php rename to src/Platforms/SqlitePlatform.php diff --git a/lib/Doctrine/DBAL/Platforms/TrimMode.php b/src/Platforms/TrimMode.php similarity index 100% rename from lib/Doctrine/DBAL/Platforms/TrimMode.php rename to src/Platforms/TrimMode.php diff --git a/lib/Doctrine/DBAL/Portability/Connection.php b/src/Portability/Connection.php similarity index 100% rename from lib/Doctrine/DBAL/Portability/Connection.php rename to src/Portability/Connection.php diff --git a/lib/Doctrine/DBAL/Portability/Statement.php b/src/Portability/Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Portability/Statement.php rename to src/Portability/Statement.php diff --git a/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php b/src/Query/Expression/CompositeExpression.php similarity index 100% rename from lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php rename to src/Query/Expression/CompositeExpression.php diff --git a/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php b/src/Query/Expression/ExpressionBuilder.php similarity index 100% rename from lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php rename to src/Query/Expression/ExpressionBuilder.php diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/src/Query/QueryBuilder.php similarity index 100% rename from lib/Doctrine/DBAL/Query/QueryBuilder.php rename to src/Query/QueryBuilder.php diff --git a/lib/Doctrine/DBAL/Query/QueryException.php b/src/Query/QueryException.php similarity index 100% rename from lib/Doctrine/DBAL/Query/QueryException.php rename to src/Query/QueryException.php diff --git a/lib/Doctrine/DBAL/SQLParserUtils.php b/src/SQLParserUtils.php similarity index 100% rename from lib/Doctrine/DBAL/SQLParserUtils.php rename to src/SQLParserUtils.php diff --git a/lib/Doctrine/DBAL/SQLParserUtilsException.php b/src/SQLParserUtilsException.php similarity index 100% rename from lib/Doctrine/DBAL/SQLParserUtilsException.php rename to src/SQLParserUtilsException.php diff --git a/lib/Doctrine/DBAL/Schema/AbstractAsset.php b/src/Schema/AbstractAsset.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/AbstractAsset.php rename to src/Schema/AbstractAsset.php diff --git a/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php rename to src/Schema/AbstractSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/Column.php b/src/Schema/Column.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Column.php rename to src/Schema/Column.php diff --git a/lib/Doctrine/DBAL/Schema/ColumnDiff.php b/src/Schema/ColumnDiff.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/ColumnDiff.php rename to src/Schema/ColumnDiff.php diff --git a/lib/Doctrine/DBAL/Schema/Comparator.php b/src/Schema/Comparator.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Comparator.php rename to src/Schema/Comparator.php diff --git a/lib/Doctrine/DBAL/Schema/Constraint.php b/src/Schema/Constraint.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Constraint.php rename to src/Schema/Constraint.php diff --git a/lib/Doctrine/DBAL/Schema/DB2SchemaManager.php b/src/Schema/DB2SchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/DB2SchemaManager.php rename to src/Schema/DB2SchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php b/src/Schema/ForeignKeyConstraint.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php rename to src/Schema/ForeignKeyConstraint.php diff --git a/lib/Doctrine/DBAL/Schema/Identifier.php b/src/Schema/Identifier.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Identifier.php rename to src/Schema/Identifier.php diff --git a/lib/Doctrine/DBAL/Schema/Index.php b/src/Schema/Index.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Index.php rename to src/Schema/Index.php diff --git a/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php b/src/Schema/MySqlSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php rename to src/Schema/MySqlSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php b/src/Schema/OracleSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/OracleSchemaManager.php rename to src/Schema/OracleSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php b/src/Schema/PostgreSqlSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php rename to src/Schema/PostgreSqlSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/SQLAnywhereSchemaManager.php b/src/Schema/SQLAnywhereSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SQLAnywhereSchemaManager.php rename to src/Schema/SQLAnywhereSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php b/src/Schema/SQLServerSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php rename to src/Schema/SQLServerSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/Schema.php b/src/Schema/Schema.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Schema.php rename to src/Schema/Schema.php diff --git a/lib/Doctrine/DBAL/Schema/SchemaConfig.php b/src/Schema/SchemaConfig.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SchemaConfig.php rename to src/Schema/SchemaConfig.php diff --git a/lib/Doctrine/DBAL/Schema/SchemaDiff.php b/src/Schema/SchemaDiff.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SchemaDiff.php rename to src/Schema/SchemaDiff.php diff --git a/lib/Doctrine/DBAL/Schema/SchemaException.php b/src/Schema/SchemaException.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SchemaException.php rename to src/Schema/SchemaException.php diff --git a/lib/Doctrine/DBAL/Schema/Sequence.php b/src/Schema/Sequence.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Sequence.php rename to src/Schema/Sequence.php diff --git a/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php b/src/Schema/SqliteSchemaManager.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php rename to src/Schema/SqliteSchemaManager.php diff --git a/lib/Doctrine/DBAL/Schema/Synchronizer/AbstractSchemaSynchronizer.php b/src/Schema/Synchronizer/AbstractSchemaSynchronizer.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Synchronizer/AbstractSchemaSynchronizer.php rename to src/Schema/Synchronizer/AbstractSchemaSynchronizer.php diff --git a/lib/Doctrine/DBAL/Schema/Synchronizer/SchemaSynchronizer.php b/src/Schema/Synchronizer/SchemaSynchronizer.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Synchronizer/SchemaSynchronizer.php rename to src/Schema/Synchronizer/SchemaSynchronizer.php diff --git a/lib/Doctrine/DBAL/Schema/Synchronizer/SingleDatabaseSynchronizer.php b/src/Schema/Synchronizer/SingleDatabaseSynchronizer.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Synchronizer/SingleDatabaseSynchronizer.php rename to src/Schema/Synchronizer/SingleDatabaseSynchronizer.php diff --git a/lib/Doctrine/DBAL/Schema/Table.php b/src/Schema/Table.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Table.php rename to src/Schema/Table.php diff --git a/lib/Doctrine/DBAL/Schema/TableDiff.php b/src/Schema/TableDiff.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/TableDiff.php rename to src/Schema/TableDiff.php diff --git a/lib/Doctrine/DBAL/Schema/View.php b/src/Schema/View.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/View.php rename to src/Schema/View.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/AbstractVisitor.php b/src/Schema/Visitor/AbstractVisitor.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/AbstractVisitor.php rename to src/Schema/Visitor/AbstractVisitor.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php b/src/Schema/Visitor/CreateSchemaSqlCollector.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php rename to src/Schema/Visitor/CreateSchemaSqlCollector.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php b/src/Schema/Visitor/DropSchemaSqlCollector.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php rename to src/Schema/Visitor/DropSchemaSqlCollector.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/Graphviz.php b/src/Schema/Visitor/Graphviz.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/Graphviz.php rename to src/Schema/Visitor/Graphviz.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/NamespaceVisitor.php b/src/Schema/Visitor/NamespaceVisitor.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/NamespaceVisitor.php rename to src/Schema/Visitor/NamespaceVisitor.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/RemoveNamespacedAssets.php b/src/Schema/Visitor/RemoveNamespacedAssets.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/RemoveNamespacedAssets.php rename to src/Schema/Visitor/RemoveNamespacedAssets.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/SchemaDiffVisitor.php b/src/Schema/Visitor/SchemaDiffVisitor.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/SchemaDiffVisitor.php rename to src/Schema/Visitor/SchemaDiffVisitor.php diff --git a/lib/Doctrine/DBAL/Schema/Visitor/Visitor.php b/src/Schema/Visitor/Visitor.php similarity index 100% rename from lib/Doctrine/DBAL/Schema/Visitor/Visitor.php rename to src/Schema/Visitor/Visitor.php diff --git a/lib/Doctrine/DBAL/Statement.php b/src/Statement.php similarity index 100% rename from lib/Doctrine/DBAL/Statement.php rename to src/Statement.php diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php b/src/Tools/Console/Command/ReservedWordsCommand.php similarity index 100% rename from lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php rename to src/Tools/Console/Command/ReservedWordsCommand.php diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php b/src/Tools/Console/Command/RunSqlCommand.php similarity index 100% rename from lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php rename to src/Tools/Console/Command/RunSqlCommand.php diff --git a/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php b/src/Tools/Console/ConsoleRunner.php similarity index 100% rename from lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php rename to src/Tools/Console/ConsoleRunner.php diff --git a/lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php b/src/Tools/Console/Helper/ConnectionHelper.php similarity index 100% rename from lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php rename to src/Tools/Console/Helper/ConnectionHelper.php diff --git a/lib/Doctrine/DBAL/Tools/Dumper.php b/src/Tools/Dumper.php similarity index 100% rename from lib/Doctrine/DBAL/Tools/Dumper.php rename to src/Tools/Dumper.php diff --git a/lib/Doctrine/DBAL/TransactionIsolationLevel.php b/src/TransactionIsolationLevel.php similarity index 100% rename from lib/Doctrine/DBAL/TransactionIsolationLevel.php rename to src/TransactionIsolationLevel.php diff --git a/lib/Doctrine/DBAL/Types/ArrayType.php b/src/Types/ArrayType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/ArrayType.php rename to src/Types/ArrayType.php diff --git a/lib/Doctrine/DBAL/Types/BigIntType.php b/src/Types/BigIntType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/BigIntType.php rename to src/Types/BigIntType.php diff --git a/lib/Doctrine/DBAL/Types/BinaryType.php b/src/Types/BinaryType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/BinaryType.php rename to src/Types/BinaryType.php diff --git a/lib/Doctrine/DBAL/Types/BlobType.php b/src/Types/BlobType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/BlobType.php rename to src/Types/BlobType.php diff --git a/lib/Doctrine/DBAL/Types/BooleanType.php b/src/Types/BooleanType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/BooleanType.php rename to src/Types/BooleanType.php diff --git a/lib/Doctrine/DBAL/Types/ConversionException.php b/src/Types/ConversionException.php similarity index 100% rename from lib/Doctrine/DBAL/Types/ConversionException.php rename to src/Types/ConversionException.php diff --git a/lib/Doctrine/DBAL/Types/DateImmutableType.php b/src/Types/DateImmutableType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateImmutableType.php rename to src/Types/DateImmutableType.php diff --git a/lib/Doctrine/DBAL/Types/DateIntervalType.php b/src/Types/DateIntervalType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateIntervalType.php rename to src/Types/DateIntervalType.php diff --git a/lib/Doctrine/DBAL/Types/DateTimeImmutableType.php b/src/Types/DateTimeImmutableType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateTimeImmutableType.php rename to src/Types/DateTimeImmutableType.php diff --git a/lib/Doctrine/DBAL/Types/DateTimeType.php b/src/Types/DateTimeType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateTimeType.php rename to src/Types/DateTimeType.php diff --git a/lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php b/src/Types/DateTimeTzImmutableType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php rename to src/Types/DateTimeTzImmutableType.php diff --git a/lib/Doctrine/DBAL/Types/DateTimeTzType.php b/src/Types/DateTimeTzType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateTimeTzType.php rename to src/Types/DateTimeTzType.php diff --git a/lib/Doctrine/DBAL/Types/DateType.php b/src/Types/DateType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DateType.php rename to src/Types/DateType.php diff --git a/lib/Doctrine/DBAL/Types/DecimalType.php b/src/Types/DecimalType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/DecimalType.php rename to src/Types/DecimalType.php diff --git a/lib/Doctrine/DBAL/Types/FloatType.php b/src/Types/FloatType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/FloatType.php rename to src/Types/FloatType.php diff --git a/lib/Doctrine/DBAL/Types/GuidType.php b/src/Types/GuidType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/GuidType.php rename to src/Types/GuidType.php diff --git a/lib/Doctrine/DBAL/Types/IntegerType.php b/src/Types/IntegerType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/IntegerType.php rename to src/Types/IntegerType.php diff --git a/lib/Doctrine/DBAL/Types/JsonArrayType.php b/src/Types/JsonArrayType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/JsonArrayType.php rename to src/Types/JsonArrayType.php diff --git a/lib/Doctrine/DBAL/Types/JsonType.php b/src/Types/JsonType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/JsonType.php rename to src/Types/JsonType.php diff --git a/lib/Doctrine/DBAL/Types/ObjectType.php b/src/Types/ObjectType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/ObjectType.php rename to src/Types/ObjectType.php diff --git a/lib/Doctrine/DBAL/Types/PhpDateTimeMappingType.php b/src/Types/PhpDateTimeMappingType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/PhpDateTimeMappingType.php rename to src/Types/PhpDateTimeMappingType.php diff --git a/lib/Doctrine/DBAL/Types/PhpIntegerMappingType.php b/src/Types/PhpIntegerMappingType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/PhpIntegerMappingType.php rename to src/Types/PhpIntegerMappingType.php diff --git a/lib/Doctrine/DBAL/Types/SimpleArrayType.php b/src/Types/SimpleArrayType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/SimpleArrayType.php rename to src/Types/SimpleArrayType.php diff --git a/lib/Doctrine/DBAL/Types/SmallIntType.php b/src/Types/SmallIntType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/SmallIntType.php rename to src/Types/SmallIntType.php diff --git a/lib/Doctrine/DBAL/Types/StringType.php b/src/Types/StringType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/StringType.php rename to src/Types/StringType.php diff --git a/lib/Doctrine/DBAL/Types/TextType.php b/src/Types/TextType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/TextType.php rename to src/Types/TextType.php diff --git a/lib/Doctrine/DBAL/Types/TimeImmutableType.php b/src/Types/TimeImmutableType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/TimeImmutableType.php rename to src/Types/TimeImmutableType.php diff --git a/lib/Doctrine/DBAL/Types/TimeType.php b/src/Types/TimeType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/TimeType.php rename to src/Types/TimeType.php diff --git a/lib/Doctrine/DBAL/Types/Type.php b/src/Types/Type.php similarity index 100% rename from lib/Doctrine/DBAL/Types/Type.php rename to src/Types/Type.php diff --git a/lib/Doctrine/DBAL/Types/TypeRegistry.php b/src/Types/TypeRegistry.php similarity index 100% rename from lib/Doctrine/DBAL/Types/TypeRegistry.php rename to src/Types/TypeRegistry.php diff --git a/lib/Doctrine/DBAL/Types/Types.php b/src/Types/Types.php similarity index 100% rename from lib/Doctrine/DBAL/Types/Types.php rename to src/Types/Types.php diff --git a/lib/Doctrine/DBAL/Types/VarDateTimeImmutableType.php b/src/Types/VarDateTimeImmutableType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/VarDateTimeImmutableType.php rename to src/Types/VarDateTimeImmutableType.php diff --git a/lib/Doctrine/DBAL/Types/VarDateTimeType.php b/src/Types/VarDateTimeType.php similarity index 100% rename from lib/Doctrine/DBAL/Types/VarDateTimeType.php rename to src/Types/VarDateTimeType.php diff --git a/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php b/src/VersionAwarePlatformDriver.php similarity index 100% rename from lib/Doctrine/DBAL/VersionAwarePlatformDriver.php rename to src/VersionAwarePlatformDriver.php diff --git a/tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php b/tests/Cache/QueryCacheProfileTest.php similarity index 97% rename from tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php rename to tests/Cache/QueryCacheProfileTest.php index 217b27d1f2f..a35f17de8e3 100644 --- a/tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php +++ b/tests/Cache/QueryCacheProfileTest.php @@ -1,13 +1,13 @@ getName()); - } - - /** - * {@inheritDoc} - */ - public function requiresSQLCommentHint(AbstractPlatform $platform) - { - return true; - } -} diff --git a/tests/Doctrine/Tests/DBAL/Driver/AbstractDB2DriverTest.php b/tests/Driver/AbstractDB2DriverTest.php similarity index 95% rename from tests/Doctrine/Tests/DBAL/Driver/AbstractDB2DriverTest.php rename to tests/Driver/AbstractDB2DriverTest.php index 7038f5f8340..9a475801fcf 100644 --- a/tests/Doctrine/Tests/DBAL/Driver/AbstractDB2DriverTest.php +++ b/tests/Driver/AbstractDB2DriverTest.php @@ -1,6 +1,6 @@ > diff --git a/tests/Doctrine/Tests/DBAL/Functional/Platform/DateExpressionTest.php b/tests/Functional/Platform/DateExpressionTest.php similarity index 91% rename from tests/Doctrine/Tests/DBAL/Functional/Platform/DateExpressionTest.php rename to tests/Functional/Platform/DateExpressionTest.php index 5c1789e192d..0f14ac4daa2 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/Platform/DateExpressionTest.php +++ b/tests/Functional/Platform/DateExpressionTest.php @@ -1,13 +1,13 @@ > */ private $expectedResult = [['test_int' => 100, 'test_string' => 'foo'], ['test_int' => 200, 'test_string' => 'bar'], ['test_int' => 300, 'test_string' => 'baz']]; diff --git a/tests/Doctrine/Tests/DBAL/Functional/Schema/ComparatorTest.php b/tests/Functional/Schema/ComparatorTest.php similarity index 89% rename from tests/Doctrine/Tests/DBAL/Functional/Schema/ComparatorTest.php rename to tests/Functional/Schema/ComparatorTest.php index 13503e3187b..23f182ba6b1 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/Schema/ComparatorTest.php +++ b/tests/Functional/Schema/ComparatorTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Doctrine\Tests\DBAL\Functional\Schema; +namespace Doctrine\DBAL\Tests\Functional\Schema; use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Table; -use Doctrine\Tests\DbalFunctionalTestCase; +use Doctrine\DBAL\Tests\FunctionalTestCase; -class ComparatorTest extends DbalFunctionalTestCase +class ComparatorTest extends FunctionalTestCase { /** @var AbstractSchemaManager */ private $schemaManager; diff --git a/tests/Doctrine/Tests/DBAL/Functional/Schema/Db2SchemaManagerTest.php b/tests/Functional/Schema/Db2SchemaManagerTest.php similarity index 95% rename from tests/Doctrine/Tests/DBAL/Functional/Schema/Db2SchemaManagerTest.php rename to tests/Functional/Schema/Db2SchemaManagerTest.php index 330198e9ca9..09326cf505b 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/Schema/Db2SchemaManagerTest.php +++ b/tests/Functional/Schema/Db2SchemaManagerTest.php @@ -1,6 +1,6 @@ resetSharedConn(); - Type::addType('point', MySqlPointType::class); + Type::addType('point', PointType::class); } public function testSwitchPrimaryKeyColumns() : void diff --git a/tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php b/tests/Functional/Schema/OracleSchemaManagerTest.php similarity index 99% rename from tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php rename to tests/Functional/Schema/OracleSchemaManagerTest.php index b2363b639f0..d1a4447459c 100644 --- a/tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php +++ b/tests/Functional/Schema/OracleSchemaManagerTest.php @@ -1,12 +1,12 @@ platform->registerDoctrineTypeMapping('foo', 'my_commented'); + $type = Type::getType('array'); + $this->platform->registerDoctrineTypeMapping('foo', 'array'); self::assertTrue($this->platform->isCommentedDoctrineType($type)); } diff --git a/tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSQLPlatformTestCase.php b/tests/Platforms/AbstractPostgreSQLPlatformTestCase.php similarity index 99% rename from tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSQLPlatformTestCase.php rename to tests/Platforms/AbstractPostgreSQLPlatformTestCase.php index 9e48b82bfd9..2654ec321a8 100644 --- a/tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSQLPlatformTestCase.php +++ b/tests/Platforms/AbstractPostgreSQLPlatformTestCase.php @@ -1,6 +1,6 @@ 4, 'childProtectedAttribute:protected' => 5, - 'childPrivateAttribute:Doctrine\Tests\DBAL\Tools\TestAsset\ChildClass:private' => 6, + 'childPrivateAttribute:Doctrine\DBAL\Tests\Tools\TestAsset\ChildClass:private' => 6, 'parentPublicAttribute' => 1, 'parentProtectedAttribute:protected' => 2, - 'parentPrivateAttribute:Doctrine\Tests\DBAL\Tools\TestAsset\ParentClass:private' => 3, + 'parentPrivateAttribute:Doctrine\DBAL\Tests\Tools\TestAsset\ParentClass:private' => 3, ], ], 'same-attributes' => [ @@ -132,8 +132,8 @@ public static function provideAttributesCases() : iterable [ 'parentPublicAttribute' => 4, 'parentProtectedAttribute:protected' => 5, - 'parentPrivateAttribute:Doctrine\Tests\DBAL\Tools\TestAsset\ChildWithSameAttributesClass:private' => 6, - 'parentPrivateAttribute:Doctrine\Tests\DBAL\Tools\TestAsset\ParentClass:private' => 3, + 'parentPrivateAttribute:Doctrine\DBAL\Tests\Tools\TestAsset\ChildWithSameAttributesClass:private' => 6, + 'parentPrivateAttribute:Doctrine\DBAL\Tests\Tools\TestAsset\ParentClass:private' => 3, ], ], ]; diff --git a/tests/Doctrine/Tests/DBAL/Tools/TestAsset/ChildClass.php b/tests/Tools/TestAsset/ChildClass.php similarity index 83% rename from tests/Doctrine/Tests/DBAL/Tools/TestAsset/ChildClass.php rename to tests/Tools/TestAsset/ChildClass.php index 19e7020c340..4069481c2fd 100644 --- a/tests/Doctrine/Tests/DBAL/Tools/TestAsset/ChildClass.php +++ b/tests/Tools/TestAsset/ChildClass.php @@ -1,6 +1,6 @@