Fix rebase issue

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);

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.");
         }
 

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(