Permalink
Browse files

Updated Travis-CI configuration to test using both Zend\Db and Doctri…

…neORM
  • Loading branch information...
1 parent 6b48c5f commit e7f1886c4770bf8ad7043dce4d66c3f9fb920a26 @adamlundrigan adamlundrigan committed Oct 25, 2012
@@ -2,11 +2,14 @@
return array(
'modules' => array(
'Application',
+ 'DoctrineModule',
+ 'DoctrineORMModule',
'ZfcBase',
'ZfcUser',
+ 'ZfcUserDoctrineORM',
'CdliTwoStageSignup',
),
- 'module_listener_options' => array(
+ 'module_listener_options' => array(
'config_glob_paths' => array(
'config/autoload/{,*.}{global,local}.php',
),
@@ -9,13 +9,11 @@
"homepage": "http://framework.zend.com/",
"require": {
"php": ">=5.3.3",
- "zendframework/zendframework": "dev-master",
+ "zendframework/zendframework": "2.*",
"zf-commons/zfc-base": "dev-master",
- "zf-commons/zfc-user": "dev-master"
+ "zf-commons/zfc-user": "dev-master",
+ "zf-commons/zfc-user-doctrine-orm": "dev-master",
+ "doctrine/doctrine-orm-module": "dev-master"
},
- "autoload": {
- "psr-0": {
- "Application": "module/Application/src"
- }
- }
+ "minimum-stability": "dev"
}
@@ -3,6 +3,8 @@
'cdli-twostagesignup-test' => array(
'database_schema_up' => 'schema_up.mysql.sql',
'database_schema_down' => 'schema_down.sql',
+ 'enable_zend_db_tests' => true,
+ 'enable_doctrine_orm_tests' => true,
),
'service_manager' => array(
'factories' => array(
@@ -18,4 +20,18 @@
},
),
),
+ 'doctrine' => array(
+ 'connection' => array(
+ 'orm_default' => array(
+ 'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver',
+ 'params' => array(
+ 'host' => 'localhost',
+ 'port' => '3306',
+ 'user' => 'root',
+ 'password' => '',
+ 'dbname' => 'travis_test',
+ )
+ )
+ )
+ ),
);
@@ -4,6 +4,8 @@
'cdli-twostagesignup-test' => array(
'database_schema_up' => 'schema_up.sqlite.sql',
'database_schema_down' => 'schema_down.sql',
+ 'enable_zend_db_tests' => true,
+ 'enable_doctrine_orm_tests' => true,
),
'service_manager' => array(
'factories' => array(
@@ -15,4 +17,14 @@
},
),
),
+ 'doctrine' => array(
+ 'connection' => array(
+ 'orm_default' => array(
+ 'driverClass' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver',
+ 'params' => array(
+ 'memory' => true,
+ )
+ )
+ )
+ ),
);

0 comments on commit e7f1886

Please sign in to comment.