Make SQL options optional in examples.

docs/simplesamlphp-customauth.md

@@ -273,9 +273,11 @@ The class follows:
                 throw new Exception('Missing or invalid password option in config.');
             }
             $this->password = $config['password'];
-            $this->options = $config['options'];
-            if (!is_array($config['options])) {
-                throw new Exception('Missing or invalid options option in config.');
+            if (isset($config['options']) {
+                if (!is_array($config['options])) {
+                    throw new Exception('Missing or invalid options option in config.');
+                }
+                $this->options = $config['options'];
             }
         }
 

modules/consent/lib/Consent/Store/Database.php

@@ -485,7 +485,7 @@ class sspmod_consent_Consent_Store_Database extends sspmod_consent_Store
             $driver_options[PDO::ATTR_TIMEOUT] = $this->_timeout;
         }
         if (isset($this->_options)) {
-            array_merge($driver_options, $this->_options);
+            $this->_options = array_merge($driver_options, $this->_options);
         } else {
             $this->_options = $driver_options;
         }

modules/sqlauth/lib/Auth/Source/SQL.php

@@ -74,8 +74,10 @@ class sspmod_sqlauth_Auth_Source_SQL extends sspmod_core_Auth_UserPassBase {
 		$this->dsn = $config['dsn'];
 		$this->username = $config['username'];
 		$this->password = $config['password'];
-		$this->options = $config['options'];
 		$this->query = $config['query'];
+                if (isset($config['options'])) {
+                    $this->options = $config['options'];
+                }
 	}