Commit 328d8a53 authored by Benjamin Eberlei's avatar Benjamin Eberlei

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

parent 2f3377c0
...@@ -4,3 +4,4 @@ reports/ ...@@ -4,3 +4,4 @@ reports/
dist/ dist/
download/ download/
lib/Doctrine/Common/ lib/Doctrine/Common/
vendor/
...@@ -16,7 +16,7 @@ before_script: ...@@ -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' = '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' = '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" - 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 script: phpunit --configuration tests/travis/$DB.travis.xml
...@@ -13,7 +13,13 @@ ...@@ -13,7 +13,13 @@
], ],
"require": { "require": {
"php": ">=5.3.2", "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": { "autoload": {
"psr-0": { "Doctrine\\DBAL\\": "lib/" } "psr-0": { "Doctrine\\DBAL\\": "lib/" }
......
This diff is collapsed.
...@@ -6,17 +6,8 @@ namespace Doctrine\Tests; ...@@ -6,17 +6,8 @@ namespace Doctrine\Tests;
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
require_once __DIR__ . '/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php'; require_once __DIR__ . '/../../../vendor/autoload.php';
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib');
$classLoader->register();
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', __DIR__ . '/../../../lib');
$classLoader->register();
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Tests', __DIR__ . '/../../'); $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Tests', __DIR__ . '/../../');
$classLoader->register(); $classLoader->register();
$classLoader = new \Doctrine\Common\ClassLoader('Symfony', __DIR__ . "/../../../lib/vendor");
$classLoader->register();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment