Fix parsing of Organization

Author: tvdijen

src/IdP/MetadataBuilder.php

@@ -24,6 +24,9 @@
 use SimpleSAML\SAML2\XML\md\Extensions;
 use SimpleSAML\SAML2\XML\md\KeyDescriptor;
 use SimpleSAML\SAML2\XML\md\Organization;
+use SimpleSAML\SAML2\XML\md\OrganizationDisplayName;
+use SimpleSAML\SAML2\XML\md\OrganizationName;
+use SimpleSAML\SAML2\XML\md\OrganizationURL;
 use SimpleSAML\SAML2\XML\mdattr\EntityAttributes;
 use SimpleSAML\SAML2\XML\mdrpi\RegistrationInfo;
 use SimpleSAML\SAML2\XML\mdui\DiscoHints;
@@ -165,12 +168,15 @@ private function getOrganization(): ?Organization
 
         try {
             $org = Organization::fromArray([
-                'OrganizationName' => $arrayUtils->arrayize($this->metadata->getArray('OrganizationName'), 'en'),
-                'OrganizationDisplayName' => $arrayUtils->arrayize(
-                    $this->metadata->getArray('OrganizationDisplayName'),
-                    'en',
+                'OrganizationName' => OrganizationName::fromArray(
+                    $arrayUtils->arrayize($this->metadata->getArray('OrganizationName'), 'en'),
+                ),
+                'OrganizationDisplayName' => OrganizationDisplayName::fromArray(
+                    $arrayUtils->arrayize($this->metadata->getArray('OrganizationDisplayName'), 'en'),
+                ),
+                'OrganizationURL' => OrganizationURL::fromArray(
+                    $arrayUtils->arrayize($this->metadata->getArray('OrganizationURL'), 'en'),
                 ),
-                'OrganizationURL' => $arrayUtils->arrayize($this->metadata->getArray('OrganizationURL'), 'en'),
             ]);
         } catch (ArrayValidationException $e) {
             Logger::error('Federation: invalid content found in contact: ' . $e->getMessage());