Add toArray/fromArray to md:Organization

tvdijen · tvdijen · commit 95b17cdd5f70 · 2023-05-16T12:43:01.000+02:00
diff --git a/src/SAML2/XML/md/Organization.php b/src/SAML2/XML/md/Organization.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\md;
 
+use DOMDocument;
 use DOMElement;
 use Exception;
 use SimpleSAML\Assert\Assert;
@@ -14,6 +15,9 @@
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\Utils as XMLUtils;
 
+use function array_key_exists;
+use function array_merge;
+
 /**
  * Class representing SAML 2 Organization element.
  *
@@ -161,4 +165,100 @@ public function toXML(DOMElement $parent = null): DOMElement
 
         return $e;
     }
+
+
+    /**
+     * Create a class from an array
+     *
+     * @param array $data
+     * @return self
+     */
+    public static function fromArray(array $data): static
+    {
+        $orgNames = [];
+        if (array_key_exists('OrganizationName', $data)) {
+            Assert::count($data['OrganizationName'], 1);
+            $orgNames[] = OrganizationName::fromArray($data['OrganizationName']);
+        }
+
+        $orgDisplayNames = [];
+        if (array_key_exists('OrganizationDisplayName', $data)) {
+            Assert::count($data['OrganizationDisplayName'], 1);
+            $orgDisplayNames[] = OrganizationDisplayName::fromArray($data['OrganizationDisplayName']);
+        }
+
+        $orgURLs = [];
+        if (array_key_exists('OrganizationURL', $data)) {
+            Assert::count($data['OrganizationURL'], 1);
+            $orgURLs[] = OrganizationURL::fromArray($data['OrganizationURL']);
+        }
+
+        $Extensions = $data['Extensions'] ?? null;
+
+        // Anything after this should be (namespaced) attributes
+        unset(
+            $data['OrganizationName'],
+            $data['OrganizationDisplayName'],
+            $data['OrganizationURL'],
+            $data['Extensions'],
+        );
+
+        $attributes = [];
+        foreach ($data as $ns => $attribute) {
+            $name = array_key_first($attribute);
+            $value = $attribute[$name];
+
+            $doc = new DOMDocument('1.0', 'UTF-8');
+            $elt = $doc->createElement("placeholder");
+            $elt->setAttributeNS($ns, $name, $value);
+
+            $attributes[] = $elt->getAttributeNode($name);
+        }
+
+        return new static(
+            $orgNames,
+            $orgDisplayNames,
+            $orgURLs,
+            $Extensions,
+            $attributes,
+        );
+    }
+
+
+    /**
+     * Create an array from this class
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $data = [
+            'OrganizationName' => [],
+            'OrganizationDisplayName' => [],
+            'OrganizationURL' => [],
+            'Extensions' => $this->getExtensions(),
+        ];
+
+        foreach ($this->getOrganizationName() as $orgName) {
+            $data['OrganizationName'] = array_merge($data['OrganizationName'], $orgName->toArray());
+        }
+
+        foreach ($this->getOrganizationDisplayName() as $orgDisplayName) {
+            $data['OrganizationDisplayName'] = array_merge(
+                $data['OrganizationDisplayName'],
+                $orgDisplayName->toArray(),
+            );
+        }
+
+        foreach ($this->getOrganizationURL() as $orgURL) {
+            $data['OrganizationURL'] = array_merge($data['OrganizationURL'], $orgURL->toArray());
+        }
+
+        /** @psalm-suppress PossiblyNullReference */
+        foreach ($this->getAttributesNS() as $a) {
+            $data[$a['namespaceURI']] = [$a['qualifiedName'] => $a['value']];
+        }
+
+        return $data;
+    }
 }
diff --git a/tests/SAML2/XML/md/OrganizationTest.php b/tests/SAML2/XML/md/OrganizationTest.php
@@ -14,6 +14,7 @@
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Exception\MissingElementException;
+use SimpleSAML\XML\TestUtils\ArrayizableElementTestTrait;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
@@ -29,6 +30,7 @@
  */
 final class OrganizationTest extends TestCase
 {
+    use ArrayizableElementTestTrait;
     use SchemaValidationTestTrait;
     use SerializableElementTestTrait;
 
@@ -41,6 +43,14 @@ protected function setUp(): void
 
         $this->testedClass = Organization::class;
 
+        $this->arrayRepresentation = [
+            'OrganizationName' => ['en' => 'SSP'],
+            'OrganizationDisplayName' => ['en' => 'SimpleSAMLphp'],
+            'OrganizationURL' => ['en' => 'https://simplesamlphp.org'],
+            'Extensions' => null,
+            'urn:test:something' => ['test:attr' => 'value'],
+        ];
+
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
             dirname(__FILE__, 4) . '/resources/xml/md_Organization.xml',
         );
