DatabaseExtension: better detection of single/multiple definitions

dg · dg · commit cadc1a6236f7 · 2015-11-13T13:23:38.000+01:00
diff --git a/src/Bridges/DatabaseDI/DatabaseExtension.php b/src/Bridges/DatabaseDI/DatabaseExtension.php
@@ -40,8 +40,11 @@ public function __construct($debugMode = FALSE)
 	public function loadConfiguration()
 	{
 		$configs = $this->getConfig();
-		if (isset($configs['dsn'])) {
-			$configs = ['default' => $configs];
+		foreach ($configs as $k => $v) {
+			if (is_scalar($v)) {
+				$configs = ['default' => $configs];
+				break;
+			}
 		}
 
 		$defaults = $this->databaseDefaults;

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,11 @@ public function __construct($debugMode = FALSE)`
`40`	`40`	`public function loadConfiguration()`
`41`	`41`	`{`
`42`	`42`	`$configs = $this->getConfig();`
`43`		`- if (isset($configs['dsn'])) {`
`44`		`- $configs = ['default' => $configs];`
	`43`	`+ foreach ($configs as $k => $v) {`
	`44`	`+ if (is_scalar($v)) {`
	`45`	`+ $configs = ['default' => $configs];`
	`46`	`+ break;`
	`47`	`+ }`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`$defaults = $this->databaseDefaults;`