From 823f8ef802282a38551fa7e46200b29f94f53b89 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 10 Aug 2019 17:38:20 +0200
Subject: [PATCH] Fix rebase issue
---
lib/SimpleSAML/IdP.php | 5 +----
lib/SimpleSAML/Memcache.php | 4 +++-
lib/SimpleSAML/SessionHandlerPHP.php | 2 ++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index 9eecac8dd..d9c895ad8 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -70,6 +70,7 @@ class IdP
assert(is_string($id));
$this->id = $id;
+ $this->associationGroup = $id;
$metadata = MetaDataStorageHandler::getMetadataHandler();
$globalConfig = Configuration::getInstance();
@@ -101,10 +102,6 @@ class IdP
throw new \Exception("Protocol not implemented.");
}
- if ($this->associationGroup === null) {
- $this->associationGroup = $this->id;
- }
-
$auth = $this->config->getString('auth');
if (Auth\Source::getById($auth) !== null) {
$this->authSource = new Auth\Simple($auth);
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
index 35f862981..35bd85e48 100644
--- a/lib/SimpleSAML/Memcache.php
+++ b/lib/SimpleSAML/Memcache.php
@@ -322,7 +322,9 @@ class Memcache
throw new \Exception(
'Missing Memcached implementation. You must install either the Memcache or Memcached extension.'
);
- } elseif (strtolower($class) === '\memcache') {
+ }
+
+ if (self::$extension === '\memcache') {
Logger::warning("The use of PHP-extension memcache is deprecated. Please migrate to the memcached extension.");
}
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index a1bff138d..c1762da70 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -77,6 +77,7 @@ class SessionHandlerPHP extends SessionHandler
if (!headers_sent()) {
if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
+ /** @psalm-suppress InvalidArgument This annotation may be removed in Psalm >=3.0.15 */
session_set_cookie_params([
'lifetime' => $params['lifetime'],
'path' => $params['path'],
@@ -357,6 +358,7 @@ class SessionHandlerPHP extends SessionHandler
}
if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
+ /** @psalm-suppress InvalidArgument This annotation may be removed in Psalm >=3.0.15 */
session_set_cookie_params($cookieParams);
} else {
session_set_cookie_params(
--
GitLab