mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107-test

Browse Source
This commit is contained in:
Cameron
2019-02-12 11:58:28 -08:00
parent 4ad79e3de0 d69217d6f0
commit cc1493833d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107

Submodule e107 updated: 08f7a5d766...f5f2212b54

4
tests/_support/Helper/E107Base.php
View File

@@ -10,7 +10,7 @@ use Codeception\Lib\ModuleContainer;
abstract class E107Base extends Base
{
const APP_PATH_E107_CONFIG = APP_PATH."/e107_config.php";
public $e107_mySQLprefix = 'e107_';
const E107_MYSQL_PREFIX = 'e107_';
protected $preparer = null;
public function __construct(ModuleContainer $moduleContainer, $config = null)
@@ -49,7 +49,7 @@ abstract class E107Base extends Base
$e107_config['mySQLuser'] = $db->_getDbUsername();
$e107_config['mySQLpassword'] = $db->_getDbPassword();
$e107_config['mySQLdefaultdb'] = $db->_getDbName();
$e107_config['mySQLprefix'] = $this->e107_mySQLprefix;
$e107_config['mySQLprefix'] = self::E107_MYSQL_PREFIX;
$e107_config_contents = $twig->render('e107_config.php', $e107_config);
file_put_contents(self::APP_PATH_E107_CONFIG, $e107_config_contents);

5
tests/unit/e_db_pdoTest.php
View File

@@ -119,7 +119,8 @@
$result = $this->db->database($this->dbConfig['mySQLdefaultdb'], MPREFIX, true);
$this->assertTrue($result);
$this->assertEquals("`e107_tests`.e107_", $this->db->mySQLPrefix);
$this->assertEquals("`".$this->dbConfig["mySQLdefaultdb"]."`.".\Helper\Unit::E107_MYSQL_PREFIX,
$this->db->mySQLPrefix);
@@ -197,7 +198,7 @@
'dblog_user_id' => '1',
);
$this->assertEquals($data, $expected);
$this->assertEquals($expected, $data);
}