Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flatten source and test directory structure #3915

Merged
merged 8 commits into from
Mar 26, 2020
Merged

Flatten source and test directory structure #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
936e7e3
Moved library classes from lib/Doctrine/DBAL to src/
morozov Mar 21, 2020
2f548d6
Got rid of the DbalTestCase class
morozov Mar 21, 2020
deb2f69
Replaced the mock CommentedType with ArrayType
morozov Mar 21, 2020
3efdd0e
Moved the MySQL Point type into the schema manager test namespace
morozov Mar 21, 2020
5002034
Reworked classes in Doctrine\Tests namespace
morozov Mar 21, 2020
07fdd4a
Moved CI-related files from tests/ to ci/
morozov Mar 21, 2020
f2d089b
Moved test classes from tests/Doctrine/Tests/DBAL to tests/
morozov Mar 21, 2020
9ba851e
Renamed the Doctrine\Tests\DBAL namespace to Doctrine\DBAL\Tests
morozov Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
54 changes: 27 additions & 27 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml → ...or/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml → ...eyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml → ...yor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml → ...ppveyor/mssql.sql2017.sqlsrv.appveyor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
0 tests/continuousphp/bootstrap.php → ci/continuousphp/bootstrap.php
View file
Open in desktop
File renamed without changes.
0 tests/continuousphp/install-pdo-oci.sh → ci/continuousphp/install-pdo-oci.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tinuousphp/oci8.phpunit.continuousphp.xml → ...tinuousphp/oci8.phpunit.continuousphp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/continuousphp/pdo-oci.phpunit.xml → ci/continuousphp/pdo-oci.phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
0 tests/travis/docker-run-mysql-or-mariadb.sh → ci/travis/docker-run-mysql-or-mariadb.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/travis/ibm_db2.travis.xml → ci/travis/ibm_db2.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
0 tests/travis/install-db2-ibm_db2.sh → ci/travis/install-db2-ibm_db2.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-db2.sh → ci/travis/install-db2.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-mariadb.sh → ci/travis/install-mariadb.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-mssql-pdo_sqlsrv.sh → ci/travis/install-mssql-pdo_sqlsrv.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-mssql-sqlsrv.sh → ci/travis/install-mssql-sqlsrv.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-mssql.sh → ci/travis/install-mssql.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-postgres-10.sh → ci/travis/install-postgres-10.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-postgres-11.sh → ci/travis/install-postgres-11.sh
View file
Open in desktop
File renamed without changes.
0 tests/travis/install-sqlsrv-dependencies.sh → ci/travis/install-sqlsrv-dependencies.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/travis/mariadb.docker.travis.xml → ci/travis/mariadb.docker.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...s/travis/mariadb.mysqli.docker.travis.xml → ci/travis/mariadb.mysqli.docker.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/mysql.docker.travis.xml → ci/travis/mysql.docker.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/mysqli.docker.travis.xml → ci/travis/mysqli.docker.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/pdo_sqlsrv.travis.xml → ci/travis/pdo_sqlsrv.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/pgsql.travis.xml → ci/travis/pgsql.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/sqlite.travis.xml → ci/travis/sqlite.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/travis/sqlsrv.travis.xml → ci/travis/sqlsrv.travis.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading