From ff1086c43ffd97dd80bb21ea8356b1eda8bac4b4 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 18 Aug 2018 11:54:39 +0200
Subject: [PATCH] Remove references to long-deprecated `session.handler`
config-setting
---
config-templates/config.php | 2 --
docs/simplesamlphp-artifact-idp.md | 2 +-
lib/SimpleSAML/SessionHandler.php | 2 +-
lib/SimpleSAML/Store.php | 3 ---
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index f358b1bb9..7921d6dae 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -1054,8 +1054,6 @@ $config = array(
* - 'redis': Key-value datastore, based on redis.
*
* The default datastore is 'phpsession'.
- *
- * (This option replaces the old 'session.handler'-option.)
*/
'store.type' => 'phpsession',
diff --git a/docs/simplesamlphp-artifact-idp.md b/docs/simplesamlphp-artifact-idp.md
index 4db281c49..b07985a85 100644
--- a/docs/simplesamlphp-artifact-idp.md
+++ b/docs/simplesamlphp-artifact-idp.md
@@ -26,7 +26,7 @@ The default configuration on Debian is for the memcache server to be accessible
Once the memcache server is configured, you can configure simplesamlphp to use it to store sessions.
-You can do this by setting the `session.handler` option in `config.php` to `memcache`.
+You can do this by setting the `store.type` option in `config.php` to `memcache`.
If you are running memcache on a different server than the IdP, you must also change the `memcache_store.servers` option in `config.php`.
diff --git a/lib/SimpleSAML/SessionHandler.php b/lib/SimpleSAML/SessionHandler.php
index 945a75d6a..25f4ab580 100644
--- a/lib/SimpleSAML/SessionHandler.php
+++ b/lib/SimpleSAML/SessionHandler.php
@@ -123,7 +123,7 @@ abstract class SessionHandler
* Initialize the session handler.
*
* This function creates an instance of the session handler which is
- * selected in the 'session.handler' configuration directive. If no
+ * selected in the 'store.type' configuration directive. If no
* session handler is selected, then we will fall back to the default
* PHP session handler.
*/
diff --git a/lib/SimpleSAML/Store.php b/lib/SimpleSAML/Store.php
index 3beb66eba..1d2b0691f 100644
--- a/lib/SimpleSAML/Store.php
+++ b/lib/SimpleSAML/Store.php
@@ -36,9 +36,6 @@ abstract class Store
$config = Configuration::getInstance();
$storeType = $config->getString('store.type', null);
- if ($storeType === null) {
- $storeType = $config->getString('session.handler', 'phpsession');
- }
switch ($storeType) {
case 'phpsession':
--
GitLab