Permalink
Browse files

Change DBAL testing setup to work with Composer, keep the submodules …

…for BC
  • Loading branch information...
1 parent 2f3377c commit 328d8a5387be1fc365f3bba27327023afdee30c5 @beberlei beberlei committed Jan 13, 2013
Showing with 407 additions and 12 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 .travis.yml
  3. +7 −1 composer.json
  4. +397 −0 composer.lock
  5. +1 −10 tests/Doctrine/Tests/TestInit.php
View
@@ -4,3 +4,4 @@ reports/
dist/
download/
lib/Doctrine/Common/
+vendor/
View
@@ -16,7 +16,7 @@ before_script:
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database doctrine_tests_tmp;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi"
- sh -c "if [ '$DB' = 'mysqli' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi"
- - git submodule update --init
+ - composer --prefer-source --dev install
script: phpunit --configuration tests/travis/$DB.travis.xml
View
@@ -13,7 +13,13 @@
],
"require": {
"php": ">=5.3.2",
- "doctrine/common": ">=2.3-dev,<2.5-dev"
+ "doctrine/common": "2.4.x-dev"
+ },
+ "require-dev": {
+ "symfony/console": "2.*"
+ },
+ "suggest": {
+ "symfony/console": "For helpful console commands such as SQL execution and import of files."
},
"autoload": {
"psr-0": { "Doctrine\\DBAL\\": "lib/" }
Oops, something went wrong.

0 comments on commit 328d8a5

Please sign in to comment.