From 5d764a34308260a6876c2248a635eb03c40d1128 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 31 Jul 2015 11:14:41 +0200
Subject: [PATCH] Fix build: given that username and password are optional for
some PDO drivers, do not enforce them to be set in the configuration. Use
null as a default value for them.
---
lib/SimpleSAML/Database.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Database.php b/lib/SimpleSAML/Database.php
index 4de2d2a3c..9dbc707d0 100644
--- a/lib/SimpleSAML/Database.php
+++ b/lib/SimpleSAML/Database.php
@@ -81,8 +81,8 @@ class Database
// Connect to the master
$this->dbMaster = $this->connect(
$config->getString('database.dsn'),
- $config->getString('database.username'),
- $config->getString('database.password'),
+ $config->getString('database.username', null),
+ $config->getString('database.password', null),
$driverOptions
);
@@ -119,8 +119,8 @@ class Database
$assembledConfig = array(
'master' => array(
'database.dsn' => $config->getString('database.dsn'),
- 'database.username' => $config->getString('database.username'),
- 'database.password' => $config->getString('database.password'),
+ 'database.username' => $config->getString('database.username', null),
+ 'database.password' => $config->getString('database.password', null),
'database.prefix' => $config->getString('database.prefix', ''),
'database.persistent' => $config->getBoolean('database.persistent', false),
),
--
GitLab