From b2474de4d1def833ba91faf1ec8654b73a55bbfc Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 4 Mar 2019 14:35:17 +0100
Subject: [PATCH] Supress warning on absent NameIDFormat
---
modules/saml/lib/IdP/SAML2.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index bce1bf077..3d4d255b4 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -1194,17 +1194,17 @@ class SAML2
$a->setAttributes($attributes);
}
+ $nameIdFormat = null;
+
// generate the NameID for the assertion
if (isset($state['saml:NameIDFormat'])) {
$nameIdFormat = $state['saml:NameIDFormat'];
- } else {
- $nameIdFormat = null;
}
if ($nameIdFormat === null || !isset($state['saml:NameID'][$nameIdFormat])) {
// either not set in request, or not set to a format we supply. Fall back to old generation method
$nameIdFormat = current($spMetadata->getArrayizeString('NameIDFormat', []));
- if ($nameIdFormat === null) {
+ if ($nameIdFormat === false) {
$nameIdFormat = current($idpMetadata->getArrayizeString('NameIDFormat', [\SAML2\Constants::NAMEID_TRANSIENT]));
}
}
--
GitLab