14
14
use PhpPlatform \Config \SettingsCache ;
15
15
use PhpPlatform \JSONCache \Cache ;
16
16
use PhpPlatform \Errors \ErrorHandler ;
17
- use PhpPlatform \Persist \TransactionManager ;
18
17
19
18
abstract class ModelTest extends DBUnitTestcase{
20
19
@@ -91,13 +90,15 @@ public static function setUpBeforeClass(){
91
90
$ cacheObj ->reset ();
92
91
}
93
92
94
- MockSettings::setSettings ('php-platform/persist ' , "dbHost " , $ host );
95
- MockSettings::setSettings ('php-platform/persist ' , "dbPort " , $ port );
96
- MockSettings::setSettings ('php-platform/persist ' , "dbName " , self ::$ _databaseName );
97
- MockSettings::setSettings ('php-platform/persist ' , "dbUsername " , $ username );
98
- MockSettings::setSettings ('php-platform/persist ' , "dbPassword " , $ password );
99
- MockSettings::setSettings ('php-platform/persist ' , "outputDateTimeFormat " , "%Y-%m-%d %H:%i:%S " );
100
-
93
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.host " , $ host );
94
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.port " , $ port );
95
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.dbname " , self ::$ _databaseName );
96
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.username " , $ username );
97
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.password " , $ password );
98
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.outputDateFormat " , "%Y-%m-%d " );
99
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.outputTimeFormat " , "%H:%i:%S " );
100
+ MockSettings::setSettings ('php-platform/persist ' , "mysql.outputDateTimeFormat " , "%Y-%m-%d %H:%i:%S " );
101
+
101
102
$ logFile = getenv ('sqlLogFile ' );
102
103
if ($ logFile ){
103
104
MockSettings::setSettings ('php-platform/persist ' , "sqlLogFile " , $ logFile );
@@ -120,12 +121,6 @@ public static function setUpBeforeClass(){
120
121
121
122
public static function tearDownAfterClass (){
122
123
123
- $ transaction = TransactionManager::$ transaction ;
124
- while ($ transaction != null ){
125
- TransactionManager::abortTransaction ();
126
- $ transaction = TransactionManager::$ transaction ;
127
- }
128
-
129
124
// create pdo without database
130
125
$ _pdo = new PDO ('mysql:host= ' .self ::$ _connectionParams ['host ' ].';port= ' .self ::$ _connectionParams ['port ' ], self ::$ _connectionParams ['username ' ],self ::$ _connectionParams ['password ' ]);
131
126
0 commit comments