projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #19445 from demeritcowboy/why2
[civicrm-core.git]
/
Civi
/
Test.php
diff --git
a/Civi/Test.php
b/Civi/Test.php
index 50d6ebf31c4a39ee1d97fa1071b29516757eec2d..cf9c841ab7981ccd8fdab426209df134aaf77d4e 100644
(file)
--- a/
Civi/Test.php
+++ b/
Civi/Test.php
@@
-59,7
+59,8
@@
class Test {
public static function dsn($part = NULL) {
if (!isset(self::$singletons['dsn'])) {
require_once "DB.php";
public static function dsn($part = NULL) {
if (!isset(self::$singletons['dsn'])) {
require_once "DB.php";
- self::$singletons['dsn'] = \DB::parseDSN(CIVICRM_DSN);
+ $dsn = \CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+ self::$singletons['dsn'] = \DB::parseDSN($dsn);
}
if ($part === NULL) {
}
if ($part === NULL) {
@@
-100,12
+101,12
@@
class Test {
/**
* Create a builder for the headless environment.
*
/**
* Create a builder for the headless environment.
*
- * @return \Civi\Test\CiviEnvBuilder
- *
- * @code
+ * ```
* \Civi\Test::headless()->apply();
* \Civi\Test::headless()->sqlFile('ex.sql')->apply();
* \Civi\Test::headless()->apply();
* \Civi\Test::headless()->sqlFile('ex.sql')->apply();
- * @endCode
+ * ```
+ *
+ * @return \Civi\Test\CiviEnvBuilder
*/
public static function headless() {
$civiRoot = dirname(__DIR__);
*/
public static function headless() {
$civiRoot = dirname(__DIR__);
@@
-130,12
+131,12
@@
class Test {
/**
* Create a builder for end-to-end testing on the live environment.
*
/**
* Create a builder for end-to-end testing on the live environment.
*
- * @return \Civi\Test\CiviEnvBuilder
- *
- * @code
+ * ```
* \Civi\Test::e2e()->apply();
* \Civi\Test::e2e()->install('foo.bar')->apply();
* \Civi\Test::e2e()->apply();
* \Civi\Test::e2e()->install('foo.bar')->apply();
- * @endCode
+ * ```
+ *
+ * @return \Civi\Test\CiviEnvBuilder
*/
public static function e2e() {
$builder = new \Civi\Test\CiviEnvBuilder('CiviEnvBuilder');
*/
public static function e2e() {
$builder = new \Civi\Test\CiviEnvBuilder('CiviEnvBuilder');