From 579034eb521a8aa4b7927f4857162aedf4fbc3d6 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 13 Dec 2019 21:09:02 +0100
Subject: [PATCH] Fix merge mistake

---
 src/SAML2/Assertion.php | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/SAML2/Assertion.php b/src/SAML2/Assertion.php
index 98c570faf..d20ac3914 100644
--- a/src/SAML2/Assertion.php
+++ b/src/SAML2/Assertion.php
@@ -1835,48 +1835,27 @@ private function addEncryptedAttributeStatement(DOMElement $root): void
             }
             $attributeElement = $attributeObj->toXML($attributeStatement);
 
-            foreach ($values as $value) {
-                if (is_string($value)) {
-                    $type = 'xs:string';
-                } elseif (is_int($value)) {
-                    $type = 'xs:integer';
-                } else {
-                    $type = null;
-                }
-
-                $attributeValue = $document2->createElementNS(Constants::NS_SAML, 'saml:AttributeValue');
-                $attribute->appendChild($attributeValue);
-                if ($type !== null) {
-                    $attributeValue->setAttributeNS(Constants::NS_XSI, 'xsi:type', $type);
-                }
-
-                if ($value instanceof DOMNodeList) {
-                    foreach ($value as $v) {
-                        $node = $document2->importNode($v, true);
-                        $attributeValue->appendChild($node);
-                    }
-                } else {
-                    $value = strval($value);
-                    $attributeValue->appendChild($document2->createTextNode($value));
-                }
-            }
-            /*Once the attribute nodes are built, they are encrypted*/
+            // Once the attribute nodes are built, they are encrypted
             $EncAssert = new XMLSecEnc();
             $EncAssert->setNode($attributeElement);
             $EncAssert->type = 'http://www.w3.org/2001/04/xmlenc#Element';
-            /*
+
+            /**
              * Attributes are encrypted with a session key and this one with
              * $EncryptionKey
              */
             $symmetricKey = new XMLSecurityKey(XMLSecurityKey::AES256_CBC);
             $symmetricKey->generateSessionKey();
+
             /** @psalm-suppress PossiblyNullArgument */
             $EncAssert->encryptKey($this->encryptionKey, $symmetricKey);
+
             /** @psalm-suppress UndefinedClass */
             $EncrNode = $EncAssert->encryptNode($symmetricKey);
 
             $EncAttribute = $document->createElementNS(Constants::NS_SAML, 'saml:EncryptedAttribute');
             $attributeStatement->appendChild($EncAttribute);
+
             /** @psalm-suppress InvalidArgument */
             $n = $document->importNode($EncrNode, true);
             $EncAttribute->appendChild($n);