From 52941ca4e2a8342a7568088f6e05b9646a30f6bb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 5 Sep 2021 23:23:56 +0200
Subject: [PATCH] Fix Psalm-issues

---
 lib/SimpleSAML/SessionHandlerPHP.php      | 2 +-
 tests/lib/SimpleSAML/Utils/CryptoTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index ca947bdb2..1f6b22f8f 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -50,7 +50,7 @@ class SessionHandlerPHP extends SessionHandler
         $config = Configuration::getInstance();
         $this->cookie_name = $config->getString(
             'session.phpsession.cookiename',
-            ini_get('session.name') ?? 'PHPSESSID'
+            ini_get('session.name') ?: 'PHPSESSID'
         );
 
         if (session_status() === PHP_SESSION_ACTIVE) {
diff --git a/tests/lib/SimpleSAML/Utils/CryptoTest.php b/tests/lib/SimpleSAML/Utils/CryptoTest.php
index cdf104162..a30917a22 100644
--- a/tests/lib/SimpleSAML/Utils/CryptoTest.php
+++ b/tests/lib/SimpleSAML/Utils/CryptoTest.php
@@ -33,6 +33,9 @@ class CryptoTest extends TestCase
     /** @var string */
     protected string $certdir;
 
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $config;
+
     /** @var \SimpleSAML\Utils\Crypto */
     protected $cryptoUtils;
 
-- 
GitLab