Use DDF and Chunk from xml-common library

Author: tvdijen

composer.json

@@ -16,6 +16,7 @@
 
         "psr/log": "^2.0 || ^3.0",
         "robrichards/xmlseclibs": "^3.1.4",
+        "simplesamlphp/xml-common": "^2.7",
         "webmozart/assert": "^2.0"
     },
     "require-dev": {
@@ -42,7 +43,8 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "simplesamlphp/composer-xmlprovider-installer": true
         }
     }
 }

src/SAML2/Assertion.php

@@ -11,10 +11,11 @@
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use SAML2\Exception\RuntimeException;
 use SAML2\Utilities\Temporal;
-use SAML2\XML\Chunk;
 use SAML2\XML\saml\Issuer;
 use SAML2\XML\saml\NameID;
 use SAML2\XML\saml\SubjectConfirmation;
+use SimpleSAML\XML\Chunk;
+use SimpleSAML\XML\DOMDocumentFactory;
 use Webmozart\Assert\Assert;
 
 /**
@@ -143,7 +144,7 @@ class Assertion extends SignedElement
      * See:
      * @url http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      *
-     * @var \SAML2\XML\Chunk|null
+     * @var \SimpleSAML\XML\Chunk|null
      */
     private $authnContextDecl = null;
 
@@ -1123,7 +1124,7 @@ public function setSignatureMethod(?string $signatureMethod = null): void
     /**
      * Set the authentication context declaration.
      *
-     * @param \SAML2\XML\Chunk $authnContextDecl
+     * @param \SimpleSAML\XML\Chunk $authnContextDecl
      * @throws \Exception
      */
     public function setAuthnContextDecl(Chunk $authnContextDecl): void
@@ -1144,7 +1145,7 @@ public function setAuthnContextDecl(Chunk $authnContextDecl): void
      * See:
      * @url http://docs.oasis-open.org/security/saml/v2.0/saml-authn-context-2.0-os.pdf
      *
-     * @return \SAML2\XML\Chunk|null
+     * @return \SimpleSAML\XML\Chunk|null
      */
     public function getAuthnContextDecl(): ?Chunk
     {

src/SAML2/DOMDocumentFactory.php

@@ -9,6 +9,7 @@
 use Exception;
 use RobRichards\XMLSecLibs\XMLSecEnc;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
+use SimpleSAML\XML\DOMDocumentFactory;
 
 /**
  * Class handling encrypted assertions.

src/SAML2/EncryptedAssertion.php

@@ -7,6 +7,7 @@
 use DOMDocument;
 use DOMElement;
 use Exception;
+use SimpleSAML\XML\DOMDocumentFactory;
 use Webmozart\Assert\Assert;
 
 /**

src/SAML2/HTTPPost.php

@@ -6,6 +6,7 @@
 
 use Exception;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
+use SimpleSAML\XML\DOMDocumentFactory;
 use Webmozart\Assert\Assert;
 
 /**

src/SAML2/HTTPRedirect.php

@@ -9,6 +9,7 @@
 use RobRichards\XMLSecLibs\XMLSecEnc;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use SAML2\XML\saml\NameID;
+use SimpleSAML\XML\DOMDocumentFactory;
 
 /**
  * Class for SAML 2 logout request messages.

src/SAML2/LogoutRequest.php

@@ -8,9 +8,10 @@
 use Exception;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use SAML2\Utilities\Temporal;
-use SAML2\XML\Chunk;
 use SAML2\XML\saml\Issuer;
 use SAML2\XML\samlp\Extensions;
+use SimpleSAML\XML\Chunk;
+use SimpleSAML\XML\DOMDocumentFactory;
 
 /**
  * Base class for all SAML 2 messages.
@@ -575,7 +576,7 @@ public static function fromXML(DOMElement $xml): Message
     /**
      * Retrieve the Extensions.
      *
-     * @return \SAML2\XML\Chunk[]
+     * @return \SimpleSAML\XML\Chunk[]
      */
     public function getExtensions(): array
     {
@@ -597,7 +598,7 @@ public function setExtensions(array $extensions): void
     /**
      * Add an Extension.
      *
-     * @param \SAML2\XML\Chunk $extension The Extensions
+     * @param \SimpleSAML\XML\Chunk $extension The Extensions
      */
     public function addExtension(Chunk $extension): void
     {

src/SAML2/Message.php

@@ -7,6 +7,7 @@
 use DOMDocument;
 use SAML2\Exception\Protocol\UnsupportedBindingException;
 use SAML2\XML\ecp\Response as ECPResponse;
+use SimpleSAML\XML\DOMDocumentFactory;
 
 /**
  * Class which implements the SOAP binding.

src/SAML2/SOAP.php

@@ -12,6 +12,7 @@
 use SAML2\Exception\InvalidArgumentException;
 use SAML2\Exception\UnparseableXmlException;
 use SimpleSAML\Configuration;
+use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\Utils\Config;
 use SimpleSAML\Utils\Crypto;
 //use SoapClient as BuiltinSoapClient;