diff --git a/bin/initMDSPdo.php b/bin/initMDSPdo.php
index e1e1bd88881c3a9e81c6257cdf55570f969d4995..ff6d08e71cd50216805e29fcf918282c573af1d4 100755
--- a/bin/initMDSPdo.php
+++ b/bin/initMDSPdo.php
@@ -18,7 +18,7 @@ foreach ($config['metadata.sources'] as $source) {
$metadataStorageHandler = new SimpleSAML_Metadata_MetaDataStorageHandlerPdo($source);
$result = $metadataStorageHandler->initDatabase();
- if ($result === FALSE) {
+ if ($result === false) {
echo "Failed to intialize metadata database.". PHP_EOL;
} else {
echo "Successfully initialized metadata database.". PHP_EOL;
diff --git a/lib/SimpleSAML/Database.php b/lib/SimpleSAML/Database.php
index 2e338f1bedd047c240c8beb65f2062cedf90d551..db38d6d9d6c84dff565ab230b21ca4e0f53730db 100644
--- a/lib/SimpleSAML/Database.php
+++ b/lib/SimpleSAML/Database.php
@@ -18,7 +18,8 @@ namespace SimpleSAML;
* @package SimpleSAMLphp
*/
-class Database {
+class Database
+{
/**
* This variable holds the instance of the session - Singleton approach.
@@ -47,7 +48,8 @@ class Database {
* @param object $altConfig Optional: Instance of a SimpleSAML_Configuration class
* @return SimpleSAML_Database The shared database connection.
*/
- public static function getInstance($altConfig = null) {
+ public static function getInstance($altConfig = null)
+ {
$config = ($altConfig)? $altConfig : \SimpleSAML_Configuration::getInstance();
$instanceId = self::generateInstanceId($config);
@@ -66,7 +68,8 @@ class Database {
*
* @param object $config Instance of the SimpleSAML_Configuration class
*/
- private function __construct($config) {
+ private function __construct($config)
+ {
$driverOptions = array();
if ($config->getBoolean('database.persistent', TRUE)) {
$driverOptions = array(\PDO::ATTR_PERSISTENT => TRUE);
@@ -94,7 +97,8 @@ class Database {
*
* @return string $instanceId
*/
- private static function generateInstanceId($config){
+ private static function generateInstanceId($config)
+ {
$assembledConfig = array(
'master' => array(
'database.dsn' => $config->getValue('database.dsn'),
@@ -119,13 +123,14 @@ class Database {
*
* @return PDO object
*/
- private function connect($dsn, $username, $password, $options){
- try{
+ private function connect($dsn, $username, $password, $options)
+ {
+ try {
$db = new \PDO($dsn, $username, $password, $options);
$db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
return $db;
- } catch(\PDOException $e){
+ } catch(\PDOException $e) {
throw new \Exception("Database error: ". $e->getMessage());
}
}
@@ -137,7 +142,8 @@ class Database {
*
* @return PDO object
*/
- private function getSlave(){
+ private function getSlave()
+ {
if (count($this->dbSlaves) > 0) {
$slaveId = rand(0,count($this->dbSlaves)-1);
return $this->dbSlaves[$slaveId];
@@ -153,7 +159,8 @@ class Database {
* @param $table Table to apply prefix,if configured
* @return string Table with configured prefix
*/
- public function applyPrefix($table){
+ public function applyPrefix($table)
+ {
return $this->tablePrefix . $table;
}
@@ -166,19 +173,19 @@ class Database {
*
* @return PDO statement object
*/
- private function query($db, $stmt, $params){
+ private function query($db, $stmt, $params)
+ {
assert('is_object($db)');
assert('is_string($stmt)');
assert('is_array($params)');
- try{
+ try {
$query = $db->prepare($stmt);
foreach ($params as $param => $value) {
- if(is_array($value)){
+ if (is_array($value)) {
$query->bindValue(":$param", $value[0], ($value[1])? $value[1] : \PDO::PARAM_STR);
- }
- else{
+ } else {
$query->bindValue(":$param", $value, \PDO::PARAM_STR);
}
}
@@ -186,7 +193,7 @@ class Database {
$query->execute();
return $query;
- } catch (\PDOException $e){
+ } catch (\PDOException $e) {
throw new \Exception("Database error: ". $e->getMessage());
}
}
@@ -201,15 +208,16 @@ class Database {
*
* @return PDO statement object
*/
- private function exec($db, $stmt){
+ private function exec($db, $stmt)
+ {
assert('is_object($db)');
assert('is_string($stmt)');
- try{
+ try {
$query = $db->exec($stmt);
return $query;
- } catch (\PDOException $e){
+ } catch (\PDOException $e) {
throw new \Exception("Database error: ". $e->getMessage());
}
}
@@ -222,7 +230,8 @@ class Database {
*
* @return PDO statement object
*/
- public function write($stmt, $params = array()){
+ public function write($stmt, $params = array())
+ {
$db = $this->dbMaster;
if (is_array($params)) {
@@ -241,7 +250,8 @@ class Database {
*
* @return PDO statement object
*/
- public function read($stmt, $params = array()){
+ public function read($stmt, $params = array())
+ {
$db = $this->getSlave();
return $this->query($db, $stmt, $params);
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index 5414279bf74d2224e01213a59b245d4efb058704..e493c5b773ffaefb07dc6bde0126568a09bb0614 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -93,10 +93,10 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
}
$stmt = $this->db->read("SELECT entity_id, entity_data FROM $tableName");
- if($stmt->execute()) {
+ if ($stmt->execute()) {
$metadata = array();
- while($d = $stmt->fetch()) {
+ while ($d = $stmt->fetch()) {
$metadata[$d['entity_id']] = json_decode($d['entity_data'], TRUE);
}
@@ -116,12 +116,12 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
public function getMetadataSet($set) {
assert('is_string($set)');
- if(array_key_exists($set, $this->cachedMetadata)) {
+ if (array_key_exists($set, $this->cachedMetadata)) {
return $this->cachedMetadata[$set];
}
$metadataSet = $this->load($set);
- if($metadataSet === NULL) {
+ if ($metadataSet === NULL) {
$metadataSet = array();
}
@@ -192,8 +192,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
if($retrivedEntityIDs !== FALSE && count($retrivedEntityIDs) > 0){
$stmt = $this->db->write("UPDATE $tableName SET entity_data = :entity_data WHERE entity_id = :entity_id", $params);
- }
- else{
+ } else {
$stmt = $this->db->write("INSERT INTO $tableName (entity_id, entity_data) VALUES (:entity_id, :entity_data)", $params);
}
@@ -223,4 +222,4 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/SimpleSAML/DatabaseTest.php b/tests/SimpleSAML/DatabaseTest.php
index 6e6cb25b8ff9c289bbb41b163fdd2ff40ff88681..6a69e3fd8d70d94d5d285f328de0ba3f6ed20f96 100644
--- a/tests/SimpleSAML/DatabaseTest.php
+++ b/tests/SimpleSAML/DatabaseTest.php
@@ -20,7 +20,8 @@ class SimpleSAML_DatabaseTest extends PHPUnit_Framework_TestCase
* Make protected functions available for testing
* @requires PHP 5.3.2
*/
- protected static function getMethod($getMethod) {
+ protected static function getMethod($getMethod)
+ {
$class = new ReflectionClass('SimpleSAML\Database');
$method = $class->getMethod($getMethod);
$method->setAccessible(true);
@@ -242,4 +243,4 @@ class SimpleSAML_DatabaseTest extends PHPUnit_Framework_TestCase
unset($this->config);
unset($this->db);
}
-}
\ No newline at end of file
+}