From 12ec8f0ed045a7254b5bd3e057e3502f2a36d65a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 16 Jun 2023 20:13:42 +0200
Subject: [PATCH] Migrate samlp:Scoping + sub-elements to new interface

---
 modules/saml/src/IdP/SAML2.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/saml/src/IdP/SAML2.php b/modules/saml/src/IdP/SAML2.php
index b83b2626e..677c26ca9 100644
--- a/modules/saml/src/IdP/SAML2.php
+++ b/modules/saml/src/IdP/SAML2.php
@@ -24,8 +24,8 @@ use Symfony\Bridge\PsrHttpMessage\Factory\{HttpFoundationFactory, PsrHttpFactory
 use Symfony\Component\HttpFoundation\{Request, Response};
 
 use function array_key_exists;
-use function array_map;
 use function array_merge;
+use function array_pop;
 use function array_unique;
 use function array_unshift;
 use function base64_encode;
@@ -435,7 +435,9 @@ class SAML2
 
             $RequesterID = $scoping->getRequesterID();
             if ($RequesterID !== null) {
-                $RequesterID = array_map('strval', $RequesterID);
+                foreach ($scoping->getRequesterID() as $k => $rid) {
+                    $RequesterID[$k] = array_pop($rid->toArray());
+                }
             }
 
             $forceAuthn = $request->getForceAuthn();
-- 
GitLab