From 9b58abcee33ff9628805b1970b7e4d737b36fe3b Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Mon, 8 Jun 2026 23:28:18 +0200 Subject: [PATCH] Migrate DOM-classes to PHP 8.4's new DOM-API --- composer.json | 12 +++++----- src/Utils/XPath.php | 11 ++++----- .../wst_200502/AbstractAuthenticatorType.php | 6 ++--- .../wst_200502/AbstractBinaryExchangeType.php | 6 ++--- .../wst_200502/AbstractBinarySecretType.php | 9 +++----- .../wst_200502/AbstractCancelTargetType.php | 12 +++------- src/XML/wst_200502/AbstractClaimsType.php | 9 +++----- src/XML/wst_200502/AbstractDelegateToType.php | 6 ++--- src/XML/wst_200502/AbstractEncryptionType.php | 12 +++------- src/XML/wst_200502/AbstractEntropyType.php | 6 ++--- .../AbstractKeyExchangeTokenType.php | 6 ++--- src/XML/wst_200502/AbstractLifetimeType.php | 6 ++--- src/XML/wst_200502/AbstractOnBehalfOfType.php | 6 ++--- .../wst_200502/AbstractParticipantType.php | 6 ++--- .../wst_200502/AbstractParticipantsType.php | 6 ++--- .../AbstractProofEncryptionType.php | 6 ++--- .../wst_200502/AbstractRenewTargetType.php | 6 ++--- src/XML/wst_200502/AbstractRenewingType.php | 6 ++--- ...estSecurityTokenResponseCollectionType.php | 6 ++--- ...stractRequestSecurityTokenResponseType.php | 6 ++--- .../AbstractRequestSecurityTokenType.php | 6 ++--- .../AbstractRequestedProofTokenType.php | 6 ++--- .../AbstractRequestedReferenceType.php | 6 ++--- .../AbstractRequestedSecurityTokenType.php | 6 ++--- .../wst_200502/AbstractSignChallengeType.php | 6 ++--- src/XML/wst_200502/AbstractStatusType.php | 6 ++--- src/XML/wst_200502/AbstractUseKeyType.php | 6 ++--- src/XML/wst_200502/AllowPostdating.php | 6 ++--- src/XML/wst_200502/RequestKET.php | 6 ++--- .../wst_200502/RequestedTokenCancelled.php | 6 ++--- .../wst_200512/AbstractAuthenticatorType.php | 9 +++----- .../wst_200512/AbstractBinaryExchangeType.php | 6 ++--- .../wst_200512/AbstractBinarySecretType.php | 6 ++--- .../wst_200512/AbstractCancelTargetType.php | 6 ++--- src/XML/wst_200512/AbstractClaimsType.php | 6 ++--- src/XML/wst_200512/AbstractDelegateToType.php | 12 +++------- src/XML/wst_200512/AbstractEncryptionType.php | 6 ++--- src/XML/wst_200512/AbstractEntropyType.php | 6 ++--- .../AbstractKeyExchangeTokenType.php | 6 ++--- src/XML/wst_200512/AbstractLifetimeType.php | 6 ++--- src/XML/wst_200512/AbstractOnBehalfOfType.php | 6 ++--- .../wst_200512/AbstractParticipantType.php | 6 ++--- .../wst_200512/AbstractParticipantsType.php | 6 ++--- .../AbstractProofEncryptionType.php | 6 ++--- .../wst_200512/AbstractRenewTargetType.php | 6 ++--- src/XML/wst_200512/AbstractRenewingType.php | 6 ++--- ...ractRequestSecurityTokenCollectionType.php | 6 ++--- ...estSecurityTokenResponseCollectionType.php | 6 ++--- ...stractRequestSecurityTokenResponseType.php | 6 ++--- .../AbstractRequestSecurityTokenType.php | 6 ++--- .../AbstractRequestedProofTokenType.php | 6 ++--- .../AbstractRequestedReferenceType.php | 6 ++--- .../AbstractRequestedSecurityTokenType.php | 6 ++--- .../wst_200512/AbstractSignChallengeType.php | 6 ++--- src/XML/wst_200512/AbstractStatusType.php | 6 ++--- src/XML/wst_200512/AbstractUseKeyType.php | 6 ++--- .../wst_200512/AbstractValidateTargetType.php | 6 ++--- src/XML/wst_200512/AllowPostdating.php | 6 ++--- src/XML/wst_200512/RequestKET.php | 6 ++--- .../wst_200512/RequestedTokenCancelled.php | 6 ++--- .../XML/wst_200502/AllowPostdatingTest.php | 9 ++++---- .../XML/wst_200502/AuthenticationTypeTest.php | 9 ++++---- .../XML/wst_200502/AuthenticatorTest.php | 9 ++++---- .../XML/wst_200502/BinaryExchangeTest.php | 9 ++++---- .../Trust/XML/wst_200502/BinarySecretTest.php | 9 ++++---- .../Trust/XML/wst_200502/CancelTargetTest.php | 9 ++++---- .../CanonicalizationAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200502/ChallengeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/ClaimsTest.php | 9 ++++---- tests/Trust/XML/wst_200502/CodeTest.php | 9 ++++---- .../Trust/XML/wst_200502/CombinedHashTest.php | 9 ++++---- .../wst_200502/ComputedKeyAlgorithmTest.php | 9 ++++---- .../Trust/XML/wst_200502/ComputedKeyTest.php | 9 ++++---- .../Trust/XML/wst_200502/DelegatableTest.php | 9 ++++---- tests/Trust/XML/wst_200502/DelegateToTest.php | 9 ++++---- .../Trust/XML/wst_200502/EncryptWithTest.php | 9 ++++---- .../wst_200502/EncryptionAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200502/EncryptionTest.php | 9 ++++---- tests/Trust/XML/wst_200502/EntropyTest.php | 9 ++++---- .../Trust/XML/wst_200502/ForwardableTest.php | 9 ++++---- .../Trust/XML/wst_200502/IssuedTokensTest.php | 9 ++++---- tests/Trust/XML/wst_200502/IssuerTest.php | 23 ++++++++++--------- .../XML/wst_200502/KeyExchangeTokenTest.php | 9 ++++---- tests/Trust/XML/wst_200502/KeySizeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/KeyTypeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/LifetimeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/OnBehalfOfTest.php | 9 ++++---- .../Trust/XML/wst_200502/ParticipantTest.php | 9 ++++---- .../Trust/XML/wst_200502/ParticipantsTest.php | 9 ++++---- tests/Trust/XML/wst_200502/PrimaryTest.php | 9 ++++---- .../XML/wst_200502/ProofEncryptionTest.php | 9 ++++---- tests/Trust/XML/wst_200502/ReasonTest.php | 9 ++++---- .../Trust/XML/wst_200502/RenewTargetTest.php | 9 ++++---- tests/Trust/XML/wst_200502/RenewingTest.php | 9 ++++---- tests/Trust/XML/wst_200502/RequestKETTest.php | 18 ++++----------- ...estSecurityTokenResponseCollectionTest.php | 9 ++++---- .../RequestSecurityTokenResponseTest.php | 9 ++++---- .../wst_200502/RequestSecurityTokenTest.php | 9 ++++---- .../Trust/XML/wst_200502/RequestTypeTest.php | 9 ++++---- .../RequestedAttachedReferenceTest.php | 9 ++++---- .../wst_200502/RequestedProofTokenTest.php | 9 ++++---- .../wst_200502/RequestedSecurityTokenTest.php | 9 ++++---- .../RequestedTokenCancelledTest.php | 18 ++++----------- .../RequestedUnattachedReferenceTest.php | 9 ++++---- .../wst_200502/SignChallengeResponseTest.php | 9 ++++---- .../XML/wst_200502/SignChallengeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/SignWithTest.php | 9 ++++---- .../XML/wst_200502/SignatureAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200502/StatusTest.php | 9 ++++---- tests/Trust/XML/wst_200502/TokenTypeTest.php | 9 ++++---- tests/Trust/XML/wst_200502/UseKeyTest.php | 9 ++++---- .../XML/wst_200512/AllowPostdatingTest.php | 9 ++++---- .../XML/wst_200512/AuthenticationTypeTest.php | 9 ++++---- .../XML/wst_200512/AuthenticatorTest.php | 9 ++++---- .../XML/wst_200512/BinaryExchangeTest.php | 9 ++++---- .../Trust/XML/wst_200512/BinarySecretTest.php | 9 ++++---- .../Trust/XML/wst_200512/CancelTargetTest.php | 9 ++++---- .../CanonicalizationAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200512/ChallengeTest.php | 9 ++++---- tests/Trust/XML/wst_200512/ClaimsTest.php | 9 ++++---- tests/Trust/XML/wst_200512/CodeTest.php | 9 ++++---- .../Trust/XML/wst_200512/CombinedHashTest.php | 9 ++++---- .../wst_200512/ComputedKeyAlgorithmTest.php | 9 ++++---- .../Trust/XML/wst_200512/ComputedKeyTest.php | 9 ++++---- .../Trust/XML/wst_200512/DelegatableTest.php | 9 ++++---- tests/Trust/XML/wst_200512/DelegateToTest.php | 9 ++++---- .../Trust/XML/wst_200512/EncryptWithTest.php | 9 ++++---- .../wst_200512/EncryptionAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200512/EncryptionTest.php | 9 ++++---- tests/Trust/XML/wst_200512/EntropyTest.php | 9 ++++---- .../Trust/XML/wst_200512/ForwardableTest.php | 9 ++++---- .../Trust/XML/wst_200512/IssuedTokensTest.php | 9 ++++---- tests/Trust/XML/wst_200512/IssuerTest.php | 23 ++++++++++--------- .../XML/wst_200512/KeyExchangeTokenTest.php | 9 ++++---- tests/Trust/XML/wst_200512/KeySizeTest.php | 9 ++++---- tests/Trust/XML/wst_200512/KeyTypeTest.php | 9 ++++---- .../XML/wst_200512/KeyWrapAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200512/LifetimeTest.php | 9 ++++---- tests/Trust/XML/wst_200512/OnBehalfOfTest.php | 9 ++++---- .../Trust/XML/wst_200512/ParticipantTest.php | 9 ++++---- .../Trust/XML/wst_200512/ParticipantsTest.php | 9 ++++---- tests/Trust/XML/wst_200512/PrimaryTest.php | 9 ++++---- .../XML/wst_200512/ProofEncryptionTest.php | 9 ++++---- tests/Trust/XML/wst_200512/ReasonTest.php | 9 ++++---- .../Trust/XML/wst_200512/RenewTargetTest.php | 9 ++++---- tests/Trust/XML/wst_200512/RenewingTest.php | 9 ++++---- tests/Trust/XML/wst_200512/RequestKETTest.php | 18 ++++----------- .../RequestSecurityTokenCollectionTest.php | 9 ++++---- ...estSecurityTokenResponseCollectionTest.php | 9 ++++---- .../RequestSecurityTokenResponseTest.php | 9 ++++---- .../wst_200512/RequestSecurityTokenTest.php | 9 ++++---- .../Trust/XML/wst_200512/RequestTypeTest.php | 9 ++++---- .../RequestedAttachedReferenceTest.php | 9 ++++---- .../wst_200512/RequestedProofTokenTest.php | 9 ++++---- .../wst_200512/RequestedSecurityTokenTest.php | 9 ++++---- .../RequestedTokenCancelledTest.php | 18 ++++----------- .../RequestedUnattachedReferenceTest.php | 9 ++++---- .../wst_200512/SignChallengeResponseTest.php | 9 ++++---- .../XML/wst_200512/SignChallengeTest.php | 9 ++++---- tests/Trust/XML/wst_200512/SignWithTest.php | 9 ++++---- .../XML/wst_200512/SignatureAlgorithmTest.php | 9 ++++---- tests/Trust/XML/wst_200512/StatusTest.php | 9 ++++---- tests/Trust/XML/wst_200512/TokenTypeTest.php | 9 ++++---- tests/Trust/XML/wst_200512/UseKeyTest.php | 9 ++++---- .../XML/wst_200512/ValidateTargetTest.php | 9 ++++---- .../xml/wst/200502/Authenticator.xml | 4 ++-- .../resources/xml/wst/200502/CancelTarget.xml | 4 ++-- tests/resources/xml/wst/200502/Claims.xml | 4 ++-- tests/resources/xml/wst/200502/DelegateTo.xml | 4 ++-- tests/resources/xml/wst/200502/Encryption.xml | 4 ++-- tests/resources/xml/wst/200502/Entropy.xml | 4 ++-- .../resources/xml/wst/200502/IssuedTokens.xml | 4 ++-- .../xml/wst/200502/KeyExchangeToken.xml | 4 ++-- tests/resources/xml/wst/200502/OnBehalfOf.xml | 4 ++-- .../resources/xml/wst/200502/Participant.xml | 4 ++-- .../resources/xml/wst/200502/Participants.xml | 8 +++---- tests/resources/xml/wst/200502/Primary.xml | 4 ++-- .../xml/wst/200502/ProofEncryption.xml | 4 ++-- .../resources/xml/wst/200502/RenewTarget.xml | 4 ++-- .../xml/wst/200502/RequestSecurityToken.xml | 4 ++-- .../200502/RequestSecurityTokenResponse.xml | 4 ++-- ...RequestSecurityTokenResponseCollection.xml | 4 ++-- .../wst/200502/RequestedAttachedReference.xml | 4 ++-- .../xml/wst/200502/RequestedProofToken.xml | 4 ++-- .../xml/wst/200502/RequestedSecurityToken.xml | 4 ++-- .../200502/RequestedUnattachedReference.xml | 4 ++-- .../xml/wst/200502/SignChallenge.xml | 4 ++-- .../xml/wst/200502/SignChallengeResponse.xml | 4 ++-- tests/resources/xml/wst/200502/UseKey.xml | 4 ++-- .../xml/wst/200512/Authenticator.xml | 4 ++-- .../resources/xml/wst/200512/CancelTarget.xml | 4 ++-- tests/resources/xml/wst/200512/Claims.xml | 4 ++-- tests/resources/xml/wst/200512/DelegateTo.xml | 4 ++-- tests/resources/xml/wst/200512/Encryption.xml | 4 ++-- tests/resources/xml/wst/200512/Entropy.xml | 4 ++-- .../resources/xml/wst/200512/IssuedTokens.xml | 4 ++-- .../xml/wst/200512/KeyExchangeToken.xml | 4 ++-- tests/resources/xml/wst/200512/OnBehalfOf.xml | 4 ++-- .../resources/xml/wst/200512/Participant.xml | 4 ++-- .../resources/xml/wst/200512/Participants.xml | 8 +++---- tests/resources/xml/wst/200512/Primary.xml | 4 ++-- .../xml/wst/200512/ProofEncryption.xml | 4 ++-- .../resources/xml/wst/200512/RenewTarget.xml | 4 ++-- .../xml/wst/200512/RequestSecurityToken.xml | 4 ++-- .../200512/RequestSecurityTokenCollection.xml | 10 ++++---- .../200512/RequestSecurityTokenResponse.xml | 4 ++-- ...RequestSecurityTokenResponseCollection.xml | 4 ++-- .../wst/200512/RequestedAttachedReference.xml | 4 ++-- .../xml/wst/200512/RequestedProofToken.xml | 4 ++-- .../xml/wst/200512/RequestedSecurityToken.xml | 4 ++-- .../200512/RequestedUnattachedReference.xml | 4 ++-- .../xml/wst/200512/SignChallenge.xml | 4 ++-- .../xml/wst/200512/SignChallengeResponse.xml | 4 ++-- tests/resources/xml/wst/200512/UseKey.xml | 4 ++-- .../xml/wst/200512/ValidateTarget.xml | 4 ++-- 215 files changed, 827 insertions(+), 794 deletions(-) diff --git a/composer.json b/composer.json index cd00eb0..11f19cd 100644 --- a/composer.json +++ b/composer.json @@ -15,15 +15,15 @@ "ext-spl": "*", "simplesamlphp/assert": "~2.0", - "simplesamlphp/xml-common": "~2.8", - "simplesamlphp/xml-security": "~2.3", - "simplesamlphp/xml-ws-addressing": "~1.3", - "simplesamlphp/xml-ws-policy": "~1.3", - "simplesamlphp/xml-wss-core": "~1.4" + "simplesamlphp/xml-common": "dev-feature/dom-migration-php84", + "simplesamlphp/xml-security": "dev-feature/dom-migration-php84", + "simplesamlphp/xml-ws-addressing": "dev-feature/dom-migration-php84", + "simplesamlphp/xml-ws-policy": "dev-feature/dom-migration-php84", + "simplesamlphp/xml-wss-core": "dev-feature/dom-migration-php84" }, "require-dev": { "simplesamlphp/simplesamlphp-test-framework": "~1.11", - "simplesamlphp/xml-soap": "^2.3" + "simplesamlphp/xml-soap": "dev-feature/dom-migration-php84" }, "autoload": { "psr-4": { diff --git a/src/Utils/XPath.php b/src/Utils/XPath.php index e46669a..966245c 100644 --- a/src/Utils/XPath.php +++ b/src/Utils/XPath.php @@ -4,8 +4,7 @@ namespace SimpleSAML\WebServices\Trust\Utils; -use DOMNode; -use DOMXPath; +use Dom; use SimpleSAML\WebServices\Trust\Constants as C; /** @@ -16,15 +15,15 @@ class XPath extends \SimpleSAML\XPath\XPath { /* - * Get a DOMXPath object that can be used to search for WS-Trust elements. + * Get a Dom\XPath object that can be used to search for WS-Trust elements. * - * @param \DOMNode $node The document to associate to the DOMXPath object. + * @param \Dom\Node $node The document to associate to the DOMXPath object. * @param bool $autoregister Whether to auto-register all namespaces used in the document * - * @return \DOMXPath A DOMXPath object ready to use in the given document, with several + * @return \Dom\XPath A Dom\XPath object ready to use in the given document, with several * ws-related namespaces already registered. */ - public static function getXPath(DOMNode $node, bool $autoregister = false): DOMXPath + public static function getXPath(Dom\Node $node, bool $autoregister = false): Dom\XPath { $xp = parent::getXPath($node, $autoregister); diff --git a/src/XML/wst_200502/AbstractAuthenticatorType.php b/src/XML/wst_200502/AbstractAuthenticatorType.php index 491770b..d1715c7 100644 --- a/src/XML/wst_200502/AbstractAuthenticatorType.php +++ b/src/XML/wst_200502/AbstractAuthenticatorType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -65,7 +65,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -82,7 +82,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this AuthenticatorType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractBinaryExchangeType.php b/src/XML/wst_200502/AbstractBinaryExchangeType.php index 14bbfed..1485ab8 100644 --- a/src/XML/wst_200502/AbstractBinaryExchangeType.php +++ b/src/XML/wst_200502/AbstractBinaryExchangeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\TypedTextContentTrait; @@ -75,7 +75,7 @@ public function getEncodingType(): AnyURIValue * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -92,7 +92,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); $e->textContent = $this->getContent()->getValue(); diff --git a/src/XML/wst_200502/AbstractBinarySecretType.php b/src/XML/wst_200502/AbstractBinarySecretType.php index 06c98b5..f37a9eb 100644 --- a/src/XML/wst_200502/AbstractBinarySecretType.php +++ b/src/XML/wst_200502/AbstractBinarySecretType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\TypedTextContentTrait; @@ -61,7 +61,7 @@ public function getType(): ?AnyURIListValue * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -76,11 +76,8 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. - * - * @param \DOMElement|null $parent The element we should append this element to. - * @return \DOMElement */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); $e->textContent = $this->getContent()->getValue(); diff --git a/src/XML/wst_200502/AbstractCancelTargetType.php b/src/XML/wst_200502/AbstractCancelTargetType.php index 3f69e91..f9308a5 100644 --- a/src/XML/wst_200502/AbstractCancelTargetType.php +++ b/src/XML/wst_200502/AbstractCancelTargetType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -42,13 +42,10 @@ final public function __construct( /** * Create an instance of this object from its XML representation. * - * @param \DOMElement $xml - * @return static - * * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -65,11 +62,8 @@ public static function fromXML(DOMElement $xml): static /** * Add this CancelTargetType to an XML element. - * - * @param \DOMElement|null $parent The element we should append this username token to. - * @return \DOMElement */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractClaimsType.php b/src/XML/wst_200502/AbstractClaimsType.php index 6b56bc2..f960579 100644 --- a/src/XML/wst_200502/AbstractClaimsType.php +++ b/src/XML/wst_200502/AbstractClaimsType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -73,7 +73,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -88,11 +88,8 @@ public static function fromXML(DOMElement $xml): static /** * Add this ClaimsType to an XML element. - * - * @param \DOMElement|null $parent The element we should append this element to. - * @return \DOMElement */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractDelegateToType.php b/src/XML/wst_200502/AbstractDelegateToType.php index d99e88a..5667c28 100644 --- a/src/XML/wst_200502/AbstractDelegateToType.php +++ b/src/XML/wst_200502/AbstractDelegateToType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this DelegateToType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractEncryptionType.php b/src/XML/wst_200502/AbstractEncryptionType.php index ba85136..ea81b4c 100644 --- a/src/XML/wst_200502/AbstractEncryptionType.php +++ b/src/XML/wst_200502/AbstractEncryptionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -42,13 +42,10 @@ final public function __construct( /** * Create an instance of this object from its XML representation. * - * @param \DOMElement $xml - * @return static - * * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -65,11 +62,8 @@ public static function fromXML(DOMElement $xml): static /** * Add this EncryptionType to an XML element. - * - * @param \DOMElement|null $parent The element we should append this username token to. - * @return \DOMElement */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractEntropyType.php b/src/XML/wst_200502/AbstractEntropyType.php index c0b426f..a7561f6 100644 --- a/src/XML/wst_200502/AbstractEntropyType.php +++ b/src/XML/wst_200502/AbstractEntropyType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -60,7 +60,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -75,7 +75,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this EntropyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php index 112328d..d861525 100644 --- a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php +++ b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -53,7 +53,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -67,7 +67,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this KeyExchangeTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractLifetimeType.php b/src/XML/wst_200502/AbstractLifetimeType.php index 26cb524..fe1ba1a 100644 --- a/src/XML/wst_200502/AbstractLifetimeType.php +++ b/src/XML/wst_200502/AbstractLifetimeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Security\XML\wsu\Created; use SimpleSAML\WebServices\Security\XML\wsu\Expires; use SimpleSAML\WebServices\Trust\Assert\Assert; @@ -65,7 +65,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -87,7 +87,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this LifetimeType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractOnBehalfOfType.php b/src/XML/wst_200502/AbstractOnBehalfOfType.php index 88d1799..6083049 100644 --- a/src/XML/wst_200502/AbstractOnBehalfOfType.php +++ b/src/XML/wst_200502/AbstractOnBehalfOfType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this OnBehalfOfType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractParticipantType.php b/src/XML/wst_200502/AbstractParticipantType.php index b7ab976..a488215 100644 --- a/src/XML/wst_200502/AbstractParticipantType.php +++ b/src/XML/wst_200502/AbstractParticipantType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ParticipantType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractParticipantsType.php b/src/XML/wst_200502/AbstractParticipantsType.php index 1ac2fce..bd770ef 100644 --- a/src/XML/wst_200502/AbstractParticipantsType.php +++ b/src/XML/wst_200502/AbstractParticipantsType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -76,7 +76,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -95,7 +95,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ParticipantsType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractProofEncryptionType.php b/src/XML/wst_200502/AbstractProofEncryptionType.php index 34beaf8..1a4b98b 100644 --- a/src/XML/wst_200502/AbstractProofEncryptionType.php +++ b/src/XML/wst_200502/AbstractProofEncryptionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ProofEncryptionType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRenewTargetType.php b/src/XML/wst_200502/AbstractRenewTargetType.php index b1cf992..c89f9d2 100644 --- a/src/XML/wst_200502/AbstractRenewTargetType.php +++ b/src/XML/wst_200502/AbstractRenewTargetType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RenewTargetType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRenewingType.php b/src/XML/wst_200502/AbstractRenewingType.php index 076cb8f..b516a73 100644 --- a/src/XML/wst_200502/AbstractRenewingType.php +++ b/src/XML/wst_200502/AbstractRenewingType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; use SimpleSAML\XMLSchema\Type\BooleanValue; @@ -63,7 +63,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -78,7 +78,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php index f6351d1..c9782b7 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -61,7 +61,7 @@ public function getRequestSecurityTokenResponse(): array * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -76,7 +76,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php index d2c25fe..1b41238 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -73,7 +73,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestSecurityTokenResponseType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php index 7208b54..b465367 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -75,7 +75,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -91,7 +91,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestSecurityTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestedProofTokenType.php b/src/XML/wst_200502/AbstractRequestedProofTokenType.php index e71d5f7..5253eef 100644 --- a/src/XML/wst_200502/AbstractRequestedProofTokenType.php +++ b/src/XML/wst_200502/AbstractRequestedProofTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedProofTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestedReferenceType.php b/src/XML/wst_200502/AbstractRequestedReferenceType.php index 1313812..41162fe 100644 --- a/src/XML/wst_200502/AbstractRequestedReferenceType.php +++ b/src/XML/wst_200502/AbstractRequestedReferenceType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Security\XML\wsse\SecurityTokenReference; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -46,7 +46,7 @@ public function getSecurityTokenReference(): SecurityTokenReference * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -64,7 +64,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedReferenceType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php index 40f4e60..03f4358 100644 --- a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php +++ b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedSecurityTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractSignChallengeType.php b/src/XML/wst_200502/AbstractSignChallengeType.php index 04a2840..5e81390 100644 --- a/src/XML/wst_200502/AbstractSignChallengeType.php +++ b/src/XML/wst_200502/AbstractSignChallengeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -79,7 +79,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -98,7 +98,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this SignChallengeType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractStatusType.php b/src/XML/wst_200502/AbstractStatusType.php index 7359051..94c6d4c 100644 --- a/src/XML/wst_200502/AbstractStatusType.php +++ b/src/XML/wst_200502/AbstractStatusType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; use SimpleSAML\XMLSchema\Exception\MissingElementException; @@ -54,7 +54,7 @@ public function getReason(): ?Reason * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -77,7 +77,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AbstractUseKeyType.php b/src/XML/wst_200502/AbstractUseKeyType.php index 5dd2f0f..d6133c2 100644 --- a/src/XML/wst_200502/AbstractUseKeyType.php +++ b/src/XML/wst_200502/AbstractUseKeyType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -68,7 +68,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -86,7 +86,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200502/AllowPostdating.php b/src/XML/wst_200502/AllowPostdating.php index 58ca4cd..02818ce 100644 --- a/src/XML/wst_200502/AllowPostdating.php +++ b/src/XML/wst_200502/AllowPostdating.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class AllowPostdating extends AbstractWstElement implements SchemaValidata * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/src/XML/wst_200502/RequestKET.php b/src/XML/wst_200502/RequestKET.php index 59f175f..4388d5f 100644 --- a/src/XML/wst_200502/RequestKET.php +++ b/src/XML/wst_200502/RequestKET.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class RequestKET extends AbstractWstElement implements SchemaValidatableEl * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/src/XML/wst_200502/RequestedTokenCancelled.php b/src/XML/wst_200502/RequestedTokenCancelled.php index 5fe343f..d52b777 100644 --- a/src/XML/wst_200502/RequestedTokenCancelled.php +++ b/src/XML/wst_200502/RequestedTokenCancelled.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class RequestedTokenCancelled extends AbstractWstElement implements Schema * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/src/XML/wst_200512/AbstractAuthenticatorType.php b/src/XML/wst_200512/AbstractAuthenticatorType.php index c7d9deb..61f0605 100644 --- a/src/XML/wst_200512/AbstractAuthenticatorType.php +++ b/src/XML/wst_200512/AbstractAuthenticatorType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -62,13 +62,10 @@ public function isEmptyElement(): bool /** * Create an instance of this object from its XML representation. * - * @param \DOMElement $xml - * @return static - * * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -85,7 +82,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this AuthenticatorType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractBinaryExchangeType.php b/src/XML/wst_200512/AbstractBinaryExchangeType.php index a872c2d..2ccaf51 100644 --- a/src/XML/wst_200512/AbstractBinaryExchangeType.php +++ b/src/XML/wst_200512/AbstractBinaryExchangeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\TypedTextContentTrait; @@ -75,7 +75,7 @@ public function getEncodingType(): AnyURIValue * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -92,7 +92,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); $e->textContent = $this->getContent()->getValue(); diff --git a/src/XML/wst_200512/AbstractBinarySecretType.php b/src/XML/wst_200512/AbstractBinarySecretType.php index 23935ac..7b7af86 100644 --- a/src/XML/wst_200512/AbstractBinarySecretType.php +++ b/src/XML/wst_200512/AbstractBinarySecretType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\TypedTextContentTrait; @@ -61,7 +61,7 @@ public function getType(): ?AnyURIValue * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -77,7 +77,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); $e->textContent = $this->getContent()->getValue(); diff --git a/src/XML/wst_200512/AbstractCancelTargetType.php b/src/XML/wst_200512/AbstractCancelTargetType.php index 9bfa2da..010136b 100644 --- a/src/XML/wst_200512/AbstractCancelTargetType.php +++ b/src/XML/wst_200512/AbstractCancelTargetType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this CancelTargetType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractClaimsType.php b/src/XML/wst_200512/AbstractClaimsType.php index a0f8480..21f1783 100644 --- a/src/XML/wst_200512/AbstractClaimsType.php +++ b/src/XML/wst_200512/AbstractClaimsType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -73,7 +73,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ClaimsType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractDelegateToType.php b/src/XML/wst_200512/AbstractDelegateToType.php index 4254393..aa6dc6b 100644 --- a/src/XML/wst_200512/AbstractDelegateToType.php +++ b/src/XML/wst_200512/AbstractDelegateToType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -42,13 +42,10 @@ final public function __construct( /** * Create an instance of this object from its XML representation. * - * @param \DOMElement $xml - * @return static - * * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -65,11 +62,8 @@ public static function fromXML(DOMElement $xml): static /** * Add this DelegateToType to an XML element. - * - * @param \DOMElement|null $parent The element we should append this username token to. - * @return \DOMElement */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractEncryptionType.php b/src/XML/wst_200512/AbstractEncryptionType.php index 4500b2d..af60007 100644 --- a/src/XML/wst_200512/AbstractEncryptionType.php +++ b/src/XML/wst_200512/AbstractEncryptionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this EncryptionType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractEntropyType.php b/src/XML/wst_200512/AbstractEntropyType.php index dd2aa57..28a73b5 100644 --- a/src/XML/wst_200512/AbstractEntropyType.php +++ b/src/XML/wst_200512/AbstractEntropyType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -60,7 +60,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -75,7 +75,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this EntropyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php index 9dc8354..2728e84 100644 --- a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php +++ b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -51,7 +51,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -65,7 +65,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this KeyExchangeTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractLifetimeType.php b/src/XML/wst_200512/AbstractLifetimeType.php index 204a026..b3eb546 100644 --- a/src/XML/wst_200512/AbstractLifetimeType.php +++ b/src/XML/wst_200512/AbstractLifetimeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Security\XML\wsu\Created; use SimpleSAML\WebServices\Security\XML\wsu\Expires; use SimpleSAML\WebServices\Trust\Assert\Assert; @@ -65,7 +65,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -87,7 +87,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this LifetimeType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractOnBehalfOfType.php b/src/XML/wst_200512/AbstractOnBehalfOfType.php index 88d1e4f..ff2c6e8 100644 --- a/src/XML/wst_200512/AbstractOnBehalfOfType.php +++ b/src/XML/wst_200512/AbstractOnBehalfOfType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this OnBehalfOfType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractParticipantType.php b/src/XML/wst_200512/AbstractParticipantType.php index cff047d..36073a5 100644 --- a/src/XML/wst_200512/AbstractParticipantType.php +++ b/src/XML/wst_200512/AbstractParticipantType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ParticipantType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractParticipantsType.php b/src/XML/wst_200512/AbstractParticipantsType.php index 0b6be06..f234cb5 100644 --- a/src/XML/wst_200512/AbstractParticipantsType.php +++ b/src/XML/wst_200512/AbstractParticipantsType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -76,7 +76,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -95,7 +95,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ParticipantsType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractProofEncryptionType.php b/src/XML/wst_200512/AbstractProofEncryptionType.php index db3cd4d..ee9b2cc 100644 --- a/src/XML/wst_200512/AbstractProofEncryptionType.php +++ b/src/XML/wst_200512/AbstractProofEncryptionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ProofEncryptionType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRenewTargetType.php b/src/XML/wst_200512/AbstractRenewTargetType.php index d94541c..de8f0ef 100644 --- a/src/XML/wst_200512/AbstractRenewTargetType.php +++ b/src/XML/wst_200512/AbstractRenewTargetType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RenewTargetType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRenewingType.php b/src/XML/wst_200512/AbstractRenewingType.php index 7bdfae8..f46cb03 100644 --- a/src/XML/wst_200512/AbstractRenewingType.php +++ b/src/XML/wst_200512/AbstractRenewingType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; use SimpleSAML\XMLSchema\Type\BooleanValue; @@ -63,7 +63,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -78,7 +78,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php index 270f265..52a8f1f 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; use SimpleSAML\XMLSchema\Exception\MissingElementException; @@ -49,7 +49,7 @@ public function getRequestSecurityToken(): array * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php index 02ee75f..299dd69 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -62,7 +62,7 @@ public function getRequestSecurityTokenResponse(): array * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -77,7 +77,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = $this->instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php index c39f339..5a6e3a4 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -73,7 +73,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestSecurityTokenResponseType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php index ae2f928..f24fd3d 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -75,7 +75,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -91,7 +91,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestSecurityTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestedProofTokenType.php b/src/XML/wst_200512/AbstractRequestedProofTokenType.php index de55eb4..44b84d2 100644 --- a/src/XML/wst_200512/AbstractRequestedProofTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedProofTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedProofTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestedReferenceType.php b/src/XML/wst_200512/AbstractRequestedReferenceType.php index e5de465..8b68337 100644 --- a/src/XML/wst_200512/AbstractRequestedReferenceType.php +++ b/src/XML/wst_200512/AbstractRequestedReferenceType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Security\XML\wsse\SecurityTokenReference; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; @@ -46,7 +46,7 @@ public function getSecurityTokenReference(): SecurityTokenReference * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -62,7 +62,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedReferenceType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php index bb1b4d5..c68ad33 100644 --- a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -61,7 +61,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this RequestedSecurityTokenType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractSignChallengeType.php b/src/XML/wst_200512/AbstractSignChallengeType.php index 51ec9bf..ef6cd36 100644 --- a/src/XML/wst_200512/AbstractSignChallengeType.php +++ b/src/XML/wst_200512/AbstractSignChallengeType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; @@ -79,7 +79,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -98,7 +98,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this SignChallengeType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractStatusType.php b/src/XML/wst_200512/AbstractStatusType.php index 29d490f..b213279 100644 --- a/src/XML/wst_200512/AbstractStatusType.php +++ b/src/XML/wst_200512/AbstractStatusType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException; use SimpleSAML\XMLSchema\Exception\MissingElementException; @@ -54,7 +54,7 @@ public function getReason(): ?Reason * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -77,7 +77,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractUseKeyType.php b/src/XML/wst_200512/AbstractUseKeyType.php index 0cd9a70..d54080b 100644 --- a/src/XML/wst_200512/AbstractUseKeyType.php +++ b/src/XML/wst_200512/AbstractUseKeyType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -68,7 +68,7 @@ public function isEmptyElement(): bool * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -86,7 +86,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this UseKeyType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AbstractValidateTargetType.php b/src/XML/wst_200512/AbstractValidateTargetType.php index e22b6c1..ba1345f 100644 --- a/src/XML/wst_200512/AbstractValidateTargetType.php +++ b/src/XML/wst_200512/AbstractValidateTargetType.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\SerializableElementInterface; @@ -45,7 +45,7 @@ final public function __construct( * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * if the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -63,7 +63,7 @@ public static function fromXML(DOMElement $xml): static /** * Add this ValidateTargetType to an XML element. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { $e = parent::instantiateParentElement($parent); diff --git a/src/XML/wst_200512/AllowPostdating.php b/src/XML/wst_200512/AllowPostdating.php index e44e5bb..b1b453a 100644 --- a/src/XML/wst_200512/AllowPostdating.php +++ b/src/XML/wst_200512/AllowPostdating.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class AllowPostdating extends AbstractWstElement implements SchemaValidata * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/src/XML/wst_200512/RequestKET.php b/src/XML/wst_200512/RequestKET.php index 942c433..00ca33d 100644 --- a/src/XML/wst_200512/RequestKET.php +++ b/src/XML/wst_200512/RequestKET.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class RequestKET extends AbstractWstElement implements SchemaValidatableEl * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/src/XML/wst_200512/RequestedTokenCancelled.php b/src/XML/wst_200512/RequestedTokenCancelled.php index d202f8f..5bf941f 100644 --- a/src/XML/wst_200512/RequestedTokenCancelled.php +++ b/src/XML/wst_200512/RequestedTokenCancelled.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use SimpleSAML\WebServices\Trust\Assert\Assert; use SimpleSAML\XML\SchemaValidatableElementInterface; use SimpleSAML\XML\SchemaValidatableElementTrait; @@ -26,7 +26,7 @@ final class RequestedTokenCancelled extends AbstractWstElement implements Schema * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException * If the qualified name of the supplied element is wrong */ - public static function fromXML(DOMElement $xml): static + public static function fromXML(Dom\Element $xml): static { Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class); Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class); @@ -38,7 +38,7 @@ public static function fromXML(DOMElement $xml): static /** * Convert this element to XML. */ - public function toXML(?DOMElement $parent = null): DOMElement + public function toXML(?Dom\Element $parent = null): Dom\Element { return $this->instantiateParentElement($parent); } diff --git a/tests/Trust/XML/wst_200502/AllowPostdatingTest.php b/tests/Trust/XML/wst_200502/AllowPostdatingTest.php index 0bbb357..a741632 100644 --- a/tests/Trust/XML/wst_200502/AllowPostdatingTest.php +++ b/tests/Trust/XML/wst_200502/AllowPostdatingTest.php @@ -51,10 +51,11 @@ public function testMarshalling(): void { $allowPostdating = new AllowPostdating(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($allowPostdating), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($allowPostdating); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/AuthenticationTypeTest.php b/tests/Trust/XML/wst_200502/AuthenticationTypeTest.php index c5a1dde..c3c0247 100644 --- a/tests/Trust/XML/wst_200502/AuthenticationTypeTest.php +++ b/tests/Trust/XML/wst_200502/AuthenticationTypeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $authenticationType = AuthenticationType::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($authenticationType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($authenticationType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/AuthenticatorTest.php b/tests/Trust/XML/wst_200502/AuthenticatorTest.php index bc1abe6..65ff4f7 100644 --- a/tests/Trust/XML/wst_200502/AuthenticatorTest.php +++ b/tests/Trust/XML/wst_200502/AuthenticatorTest.php @@ -64,10 +64,11 @@ public function testMarshalling(): void $combinedHash = CombinedHash::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='); $authenticator = new Authenticator($combinedHash, [$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($authenticator), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($authenticator); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/BinaryExchangeTest.php b/tests/Trust/XML/wst_200502/BinaryExchangeTest.php index 4e0db9a..972b865 100644 --- a/tests/Trust/XML/wst_200502/BinaryExchangeTest.php +++ b/tests/Trust/XML/wst_200502/BinaryExchangeTest.php @@ -63,9 +63,10 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($binaryExchange), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($binaryExchange); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/BinarySecretTest.php b/tests/Trust/XML/wst_200502/BinarySecretTest.php index da51fa9..d3f886a 100644 --- a/tests/Trust/XML/wst_200502/BinarySecretTest.php +++ b/tests/Trust/XML/wst_200502/BinarySecretTest.php @@ -65,9 +65,10 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($binarySecret), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($binarySecret); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/CancelTargetTest.php b/tests/Trust/XML/wst_200502/CancelTargetTest.php index 6610101..f2b8e0e 100644 --- a/tests/Trust/XML/wst_200502/CancelTargetTest.php +++ b/tests/Trust/XML/wst_200502/CancelTargetTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $cancelTarget = new CancelTarget($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($cancelTarget), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($cancelTarget); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/CanonicalizationAlgorithmTest.php b/tests/Trust/XML/wst_200502/CanonicalizationAlgorithmTest.php index 4e999f1..15429d9 100644 --- a/tests/Trust/XML/wst_200502/CanonicalizationAlgorithmTest.php +++ b/tests/Trust/XML/wst_200502/CanonicalizationAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $canonicalizationAlgorithm = CanonicalizationAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($canonicalizationAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($canonicalizationAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ChallengeTest.php b/tests/Trust/XML/wst_200502/ChallengeTest.php index 88f8ccb..4c5202a 100644 --- a/tests/Trust/XML/wst_200502/ChallengeTest.php +++ b/tests/Trust/XML/wst_200502/ChallengeTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $challenge = Challenge::fromString('accepted'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($challenge), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($challenge); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ClaimsTest.php b/tests/Trust/XML/wst_200502/ClaimsTest.php index 8a955bf..9b8d7c5 100644 --- a/tests/Trust/XML/wst_200502/ClaimsTest.php +++ b/tests/Trust/XML/wst_200502/ClaimsTest.php @@ -66,10 +66,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $claims = new Claims(AnyURIValue::fromString(C::NAMESPACE), [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($claims), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($claims); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/CodeTest.php b/tests/Trust/XML/wst_200502/CodeTest.php index 9076185..da36909 100644 --- a/tests/Trust/XML/wst_200502/CodeTest.php +++ b/tests/Trust/XML/wst_200502/CodeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $code = Code::fromString(StatusCodeEnum::Invalid->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($code), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($code); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/CombinedHashTest.php b/tests/Trust/XML/wst_200502/CombinedHashTest.php index 4359a96..56b0fff 100644 --- a/tests/Trust/XML/wst_200502/CombinedHashTest.php +++ b/tests/Trust/XML/wst_200502/CombinedHashTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $combinedHash = CombinedHash::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($combinedHash), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($combinedHash); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ComputedKeyAlgorithmTest.php b/tests/Trust/XML/wst_200502/ComputedKeyAlgorithmTest.php index 4c3c958..0041cb3 100644 --- a/tests/Trust/XML/wst_200502/ComputedKeyAlgorithmTest.php +++ b/tests/Trust/XML/wst_200502/ComputedKeyAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $computedKeyAlgorithm = ComputedKeyAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($computedKeyAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($computedKeyAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ComputedKeyTest.php b/tests/Trust/XML/wst_200502/ComputedKeyTest.php index 28c8470..eedc687 100644 --- a/tests/Trust/XML/wst_200502/ComputedKeyTest.php +++ b/tests/Trust/XML/wst_200502/ComputedKeyTest.php @@ -54,9 +54,10 @@ public function testMarshalling(): void { $computedKey = ComputedKey::fromString(ComputedKeyEnum::PSHA1->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($computedKey), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($computedKey); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/DelegatableTest.php b/tests/Trust/XML/wst_200502/DelegatableTest.php index fe7035a..380bc47 100644 --- a/tests/Trust/XML/wst_200502/DelegatableTest.php +++ b/tests/Trust/XML/wst_200502/DelegatableTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $delegatable = Delegatable::fromString('true'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($delegatable), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($delegatable); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/DelegateToTest.php b/tests/Trust/XML/wst_200502/DelegateToTest.php index f627768..a81e592 100644 --- a/tests/Trust/XML/wst_200502/DelegateToTest.php +++ b/tests/Trust/XML/wst_200502/DelegateToTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $delegateTo = new DelegateTo($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($delegateTo), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($delegateTo); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/EncryptWithTest.php b/tests/Trust/XML/wst_200502/EncryptWithTest.php index c4436ab..c66322d 100644 --- a/tests/Trust/XML/wst_200502/EncryptWithTest.php +++ b/tests/Trust/XML/wst_200502/EncryptWithTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $encryptWith = EncryptWith::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryptWith), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryptWith); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/EncryptionAlgorithmTest.php b/tests/Trust/XML/wst_200502/EncryptionAlgorithmTest.php index 9219fca..bcd08a2 100644 --- a/tests/Trust/XML/wst_200502/EncryptionAlgorithmTest.php +++ b/tests/Trust/XML/wst_200502/EncryptionAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $encryptionAlgorithm = EncryptionAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryptionAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryptionAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/EncryptionTest.php b/tests/Trust/XML/wst_200502/EncryptionTest.php index 086fd86..598d61e 100644 --- a/tests/Trust/XML/wst_200502/EncryptionTest.php +++ b/tests/Trust/XML/wst_200502/EncryptionTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $encryption = new Encryption($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryption), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryption); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/EntropyTest.php b/tests/Trust/XML/wst_200502/EntropyTest.php index e048e99..cf30212 100644 --- a/tests/Trust/XML/wst_200502/EntropyTest.php +++ b/tests/Trust/XML/wst_200502/EntropyTest.php @@ -66,10 +66,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $entropy = new Entropy([$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($entropy), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($entropy); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/ForwardableTest.php b/tests/Trust/XML/wst_200502/ForwardableTest.php index a3d4d30..911a1f2 100644 --- a/tests/Trust/XML/wst_200502/ForwardableTest.php +++ b/tests/Trust/XML/wst_200502/ForwardableTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $forwardable = Forwardable::fromString('true'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($forwardable), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($forwardable); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/IssuedTokensTest.php b/tests/Trust/XML/wst_200502/IssuedTokensTest.php index 0bfd968..a10a72f 100644 --- a/tests/Trust/XML/wst_200502/IssuedTokensTest.php +++ b/tests/Trust/XML/wst_200502/IssuedTokensTest.php @@ -77,9 +77,10 @@ public function testMarshalling(): void [$attr2], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($issuedTokens), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($issuedTokens); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/IssuerTest.php b/tests/Trust/XML/wst_200502/IssuerTest.php index ff6347d..8f730d8 100644 --- a/tests/Trust/XML/wst_200502/IssuerTest.php +++ b/tests/Trust/XML/wst_200502/IssuerTest.php @@ -4,7 +4,7 @@ namespace SimpleSAML\Test\WebServices\Trust\XML\wst_200502; -use DOMElement; +use Dom; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; @@ -33,14 +33,14 @@ final class IssuerTest extends TestCase use SerializableElementTestTrait; - /** @var \DOMElement $referenceParametersContent */ - protected static DOMElement $referenceParametersContent; + /** @var \Dom\Element $referenceParametersContent */ + protected static Dom\Element $referenceParametersContent; - /** @var \DOMElement $metadataContent */ - protected static DOMElement $metadataContent; + /** @var \Dom\Element $metadataContent */ + protected static Dom\Element $metadataContent; - /** @var \DOMElement $customContent */ - protected static DOMElement $customContent; + /** @var \Dom\Element $customContent */ + protected static Dom\Element $customContent; /** @@ -87,9 +87,10 @@ public function testMarshalling(): void [$attr4], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($issuer), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($issuer); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/KeyExchangeTokenTest.php b/tests/Trust/XML/wst_200502/KeyExchangeTokenTest.php index 7b2fcc6..0e7f275 100644 --- a/tests/Trust/XML/wst_200502/KeyExchangeTokenTest.php +++ b/tests/Trust/XML/wst_200502/KeyExchangeTokenTest.php @@ -62,10 +62,11 @@ public function testMarshalling(): void $keyExchangeToken = new KeyExchangeToken([$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keyExchangeToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keyExchangeToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/KeySizeTest.php b/tests/Trust/XML/wst_200502/KeySizeTest.php index 5373c34..8c44045 100644 --- a/tests/Trust/XML/wst_200502/KeySizeTest.php +++ b/tests/Trust/XML/wst_200502/KeySizeTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $keySize = KeySize::fromString('4096'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keySize), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keySize); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/KeyTypeTest.php b/tests/Trust/XML/wst_200502/KeyTypeTest.php index 2676aa9..4f9ef60 100644 --- a/tests/Trust/XML/wst_200502/KeyTypeTest.php +++ b/tests/Trust/XML/wst_200502/KeyTypeTest.php @@ -54,9 +54,10 @@ public function testMarshalling(): void { $keyType = KeyType::fromString(KeyTypeEnum::PublicKey->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keyType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keyType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/LifetimeTest.php b/tests/Trust/XML/wst_200502/LifetimeTest.php index c55079e..8470705 100644 --- a/tests/Trust/XML/wst_200502/LifetimeTest.php +++ b/tests/Trust/XML/wst_200502/LifetimeTest.php @@ -58,10 +58,11 @@ public function testMarshalling(): void $expires = new Expires(DateTimeValue::fromString('2001-10-13T09:00:00Z')); $lifetime = new Lifetime($created, $expires); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($lifetime), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($lifetime); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/OnBehalfOfTest.php b/tests/Trust/XML/wst_200502/OnBehalfOfTest.php index f4febd0..b0436f8 100644 --- a/tests/Trust/XML/wst_200502/OnBehalfOfTest.php +++ b/tests/Trust/XML/wst_200502/OnBehalfOfTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $onBehalfOf = new OnBehalfOf($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($onBehalfOf), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($onBehalfOf); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ParticipantTest.php b/tests/Trust/XML/wst_200502/ParticipantTest.php index 32d6395..27981f4 100644 --- a/tests/Trust/XML/wst_200502/ParticipantTest.php +++ b/tests/Trust/XML/wst_200502/ParticipantTest.php @@ -60,9 +60,10 @@ public function testMarshalling(): void $participant = new Participant($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($participant), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($participant); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ParticipantsTest.php b/tests/Trust/XML/wst_200502/ParticipantsTest.php index 8b4eca3..48aea79 100644 --- a/tests/Trust/XML/wst_200502/ParticipantsTest.php +++ b/tests/Trust/XML/wst_200502/ParticipantsTest.php @@ -67,10 +67,11 @@ public function testMarshalling(): void $participant = new Participant($msgId); $participants = new Participants($primary, [$participant], [$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($participants), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($participants); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/PrimaryTest.php b/tests/Trust/XML/wst_200502/PrimaryTest.php index fea344f..a05e121 100644 --- a/tests/Trust/XML/wst_200502/PrimaryTest.php +++ b/tests/Trust/XML/wst_200502/PrimaryTest.php @@ -60,9 +60,10 @@ public function testMarshalling(): void $primary = new Primary($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($primary), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($primary); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ProofEncryptionTest.php b/tests/Trust/XML/wst_200502/ProofEncryptionTest.php index 2bac284..b760bd4 100644 --- a/tests/Trust/XML/wst_200502/ProofEncryptionTest.php +++ b/tests/Trust/XML/wst_200502/ProofEncryptionTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $proofEncryption = new ProofEncryption($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($proofEncryption), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($proofEncryption); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/ReasonTest.php b/tests/Trust/XML/wst_200502/ReasonTest.php index 235cd58..f3f3ea0 100644 --- a/tests/Trust/XML/wst_200502/ReasonTest.php +++ b/tests/Trust/XML/wst_200502/ReasonTest.php @@ -49,9 +49,10 @@ public function testMarshalling(): void { $reason = Reason::fromString('phpunit'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($reason), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($reason); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RenewTargetTest.php b/tests/Trust/XML/wst_200502/RenewTargetTest.php index 7f939cb..d240d60 100644 --- a/tests/Trust/XML/wst_200502/RenewTargetTest.php +++ b/tests/Trust/XML/wst_200502/RenewTargetTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $renewTarget = new RenewTarget($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($renewTarget), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($renewTarget); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RenewingTest.php b/tests/Trust/XML/wst_200502/RenewingTest.php index c27ad23..2af8656 100644 --- a/tests/Trust/XML/wst_200502/RenewingTest.php +++ b/tests/Trust/XML/wst_200502/RenewingTest.php @@ -54,10 +54,11 @@ public function testMarshalling(): void { $renewing = new Renewing(BooleanValue::fromBoolean(true), BooleanValue::fromBoolean(false)); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($renewing), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($renewing); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/RequestKETTest.php b/tests/Trust/XML/wst_200502/RequestKETTest.php index 60fc386..25e4d11 100644 --- a/tests/Trust/XML/wst_200502/RequestKETTest.php +++ b/tests/Trust/XML/wst_200502/RequestKETTest.php @@ -51,21 +51,11 @@ public function testMarshalling(): void { $requestKET = new RequestKET(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestKET), - ); - } + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestKET); - - /** - * Test creating an empty RequestKET object from scratch. - * - * NOTE: This element is empty per definition! - */ - public function testMarshallingEmpty(): void - { - $requestKET = new RequestKET(); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); $this->assertFalse($requestKET->isEmptyElement()); } } diff --git a/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php b/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php index 75065c1..f72322f 100644 --- a/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php +++ b/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php @@ -77,9 +77,10 @@ public function testMarshalling(): void [$attr2], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityTokenResponseCollection), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityTokenResponseCollection); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseTest.php b/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseTest.php index e911ece..96b4b0f 100644 --- a/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseTest.php +++ b/tests/Trust/XML/wst_200502/RequestSecurityTokenResponseTest.php @@ -70,10 +70,11 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityTokenResponse), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityTokenResponse); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/RequestSecurityTokenTest.php b/tests/Trust/XML/wst_200502/RequestSecurityTokenTest.php index 165ff8d..7749382 100644 --- a/tests/Trust/XML/wst_200502/RequestSecurityTokenTest.php +++ b/tests/Trust/XML/wst_200502/RequestSecurityTokenTest.php @@ -70,10 +70,11 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/RequestTypeTest.php b/tests/Trust/XML/wst_200502/RequestTypeTest.php index 2c0d6f3..7502298 100644 --- a/tests/Trust/XML/wst_200502/RequestTypeTest.php +++ b/tests/Trust/XML/wst_200502/RequestTypeTest.php @@ -54,9 +54,10 @@ public function testMarshalling(): void { $requestType = RequestType::fromString(RequestTypeEnum::Issue->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RequestedAttachedReferenceTest.php b/tests/Trust/XML/wst_200502/RequestedAttachedReferenceTest.php index 3122bc2..7872c0b 100644 --- a/tests/Trust/XML/wst_200502/RequestedAttachedReferenceTest.php +++ b/tests/Trust/XML/wst_200502/RequestedAttachedReferenceTest.php @@ -71,9 +71,10 @@ public function testMarshalling(): void $requestedAttachedReference = new RequestedAttachedReference($securityTokenReference); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedAttachedReference), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedAttachedReference); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RequestedProofTokenTest.php b/tests/Trust/XML/wst_200502/RequestedProofTokenTest.php index 837b42f..2d5d5a4 100644 --- a/tests/Trust/XML/wst_200502/RequestedProofTokenTest.php +++ b/tests/Trust/XML/wst_200502/RequestedProofTokenTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $requestedProofToken = new RequestedProofToken($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedProofToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedProofToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RequestedSecurityTokenTest.php b/tests/Trust/XML/wst_200502/RequestedSecurityTokenTest.php index bb58ed4..e80c42e 100644 --- a/tests/Trust/XML/wst_200502/RequestedSecurityTokenTest.php +++ b/tests/Trust/XML/wst_200502/RequestedSecurityTokenTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $requestedSecurityToken = new RequestedSecurityToken($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedSecurityToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedSecurityToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/RequestedTokenCancelledTest.php b/tests/Trust/XML/wst_200502/RequestedTokenCancelledTest.php index 56c75ed..5c2151f 100644 --- a/tests/Trust/XML/wst_200502/RequestedTokenCancelledTest.php +++ b/tests/Trust/XML/wst_200502/RequestedTokenCancelledTest.php @@ -51,21 +51,11 @@ public function testMarshalling(): void { $requestedTokenCancelled = new RequestedTokenCancelled(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedTokenCancelled), - ); - } + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedTokenCancelled); - - /** - * Test creating an empty RequestedTokenCancelled object from scratch. - * - * NOTE: This element is empty per definition! - */ - public function testMarshallingEmpty(): void - { - $requestedTokenCancelled = new RequestedTokenCancelled(); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); $this->assertFalse($requestedTokenCancelled->isEmptyElement()); } } diff --git a/tests/Trust/XML/wst_200502/RequestedUnattachedReferenceTest.php b/tests/Trust/XML/wst_200502/RequestedUnattachedReferenceTest.php index 32faa1e..2d7c5b2 100644 --- a/tests/Trust/XML/wst_200502/RequestedUnattachedReferenceTest.php +++ b/tests/Trust/XML/wst_200502/RequestedUnattachedReferenceTest.php @@ -71,9 +71,10 @@ public function testMarshalling(): void $requestedUnattachedReference = new RequestedUnattachedReference($securityTokenReference); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedUnattachedReference), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedUnattachedReference); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/SignChallengeResponseTest.php b/tests/Trust/XML/wst_200502/SignChallengeResponseTest.php index c5043dd..19a6fc9 100644 --- a/tests/Trust/XML/wst_200502/SignChallengeResponseTest.php +++ b/tests/Trust/XML/wst_200502/SignChallengeResponseTest.php @@ -69,9 +69,10 @@ public function testMarshalling(): void $signChallengeResponse = new SignChallengeResponse($challenge, [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signChallengeResponse), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signChallengeResponse); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/SignChallengeTest.php b/tests/Trust/XML/wst_200502/SignChallengeTest.php index d092e68..16a16a3 100644 --- a/tests/Trust/XML/wst_200502/SignChallengeTest.php +++ b/tests/Trust/XML/wst_200502/SignChallengeTest.php @@ -68,10 +68,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $signChallenge = new SignChallenge($challenge, [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signChallenge), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signChallenge); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200502/SignWithTest.php b/tests/Trust/XML/wst_200502/SignWithTest.php index 8c3fefc..4064312 100644 --- a/tests/Trust/XML/wst_200502/SignWithTest.php +++ b/tests/Trust/XML/wst_200502/SignWithTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $signWith = SignWith::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signWith), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signWith); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/SignatureAlgorithmTest.php b/tests/Trust/XML/wst_200502/SignatureAlgorithmTest.php index c7a532e..a09729b 100644 --- a/tests/Trust/XML/wst_200502/SignatureAlgorithmTest.php +++ b/tests/Trust/XML/wst_200502/SignatureAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $signatureAlgorithm = SignatureAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signatureAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signatureAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/StatusTest.php b/tests/Trust/XML/wst_200502/StatusTest.php index 6372602..eabcc2d 100644 --- a/tests/Trust/XML/wst_200502/StatusTest.php +++ b/tests/Trust/XML/wst_200502/StatusTest.php @@ -58,9 +58,10 @@ public function testMarshalling(): void $reason = Reason::fromString('phpunit'); $status = new Status($code, $reason); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($status), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($status); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/TokenTypeTest.php b/tests/Trust/XML/wst_200502/TokenTypeTest.php index 5c22fb4..1d4fb57 100644 --- a/tests/Trust/XML/wst_200502/TokenTypeTest.php +++ b/tests/Trust/XML/wst_200502/TokenTypeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $tokenType = TokenType::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($tokenType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($tokenType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200502/UseKeyTest.php b/tests/Trust/XML/wst_200502/UseKeyTest.php index 72e83bc..faf4aa8 100644 --- a/tests/Trust/XML/wst_200502/UseKeyTest.php +++ b/tests/Trust/XML/wst_200502/UseKeyTest.php @@ -63,10 +63,11 @@ public function testMarshalling(): void $useKey = new UseKey($msgId, AnyURIValue::fromString(C::NAMESPACE)); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($useKey), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($useKey); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/AllowPostdatingTest.php b/tests/Trust/XML/wst_200512/AllowPostdatingTest.php index e642991..aa9388f 100644 --- a/tests/Trust/XML/wst_200512/AllowPostdatingTest.php +++ b/tests/Trust/XML/wst_200512/AllowPostdatingTest.php @@ -51,10 +51,11 @@ public function testMarshalling(): void { $allowPostdating = new AllowPostdating(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($allowPostdating), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($allowPostdating); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/AuthenticationTypeTest.php b/tests/Trust/XML/wst_200512/AuthenticationTypeTest.php index 8d05f94..d2e61e7 100644 --- a/tests/Trust/XML/wst_200512/AuthenticationTypeTest.php +++ b/tests/Trust/XML/wst_200512/AuthenticationTypeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $authenticationType = AuthenticationType::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($authenticationType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($authenticationType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/AuthenticatorTest.php b/tests/Trust/XML/wst_200512/AuthenticatorTest.php index 48280f5..476af02 100644 --- a/tests/Trust/XML/wst_200512/AuthenticatorTest.php +++ b/tests/Trust/XML/wst_200512/AuthenticatorTest.php @@ -64,10 +64,11 @@ public function testMarshalling(): void $combinedHash = CombinedHash::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='); $authenticator = new Authenticator($combinedHash, [$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($authenticator), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($authenticator); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/BinaryExchangeTest.php b/tests/Trust/XML/wst_200512/BinaryExchangeTest.php index 63ee765..75e92cb 100644 --- a/tests/Trust/XML/wst_200512/BinaryExchangeTest.php +++ b/tests/Trust/XML/wst_200512/BinaryExchangeTest.php @@ -63,9 +63,10 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($binaryExchange), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($binaryExchange); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/BinarySecretTest.php b/tests/Trust/XML/wst_200512/BinarySecretTest.php index 9280fe8..18932e3 100644 --- a/tests/Trust/XML/wst_200512/BinarySecretTest.php +++ b/tests/Trust/XML/wst_200512/BinarySecretTest.php @@ -65,9 +65,10 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($binarySecret), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($binarySecret); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/CancelTargetTest.php b/tests/Trust/XML/wst_200512/CancelTargetTest.php index e2e9ecf..9266db5 100644 --- a/tests/Trust/XML/wst_200512/CancelTargetTest.php +++ b/tests/Trust/XML/wst_200512/CancelTargetTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $cancelTarget = new CancelTarget($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($cancelTarget), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($cancelTarget); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/CanonicalizationAlgorithmTest.php b/tests/Trust/XML/wst_200512/CanonicalizationAlgorithmTest.php index 07a1e2f..016d5e7 100644 --- a/tests/Trust/XML/wst_200512/CanonicalizationAlgorithmTest.php +++ b/tests/Trust/XML/wst_200512/CanonicalizationAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $canonicalizationAlgorithm = CanonicalizationAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($canonicalizationAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($canonicalizationAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ChallengeTest.php b/tests/Trust/XML/wst_200512/ChallengeTest.php index 46b4064..108947c 100644 --- a/tests/Trust/XML/wst_200512/ChallengeTest.php +++ b/tests/Trust/XML/wst_200512/ChallengeTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $challenge = Challenge::fromString('accepted'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($challenge), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($challenge); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ClaimsTest.php b/tests/Trust/XML/wst_200512/ClaimsTest.php index 29ceed6..0afbb91 100644 --- a/tests/Trust/XML/wst_200512/ClaimsTest.php +++ b/tests/Trust/XML/wst_200512/ClaimsTest.php @@ -66,10 +66,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $claims = new Claims(AnyURIValue::fromString(C::NAMESPACE), [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($claims), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($claims); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/CodeTest.php b/tests/Trust/XML/wst_200512/CodeTest.php index 1341fe0..383006d 100644 --- a/tests/Trust/XML/wst_200512/CodeTest.php +++ b/tests/Trust/XML/wst_200512/CodeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $code = Code::fromString(StatusCodeEnum::Invalid->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($code), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($code); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/CombinedHashTest.php b/tests/Trust/XML/wst_200512/CombinedHashTest.php index e157766..d2993c5 100644 --- a/tests/Trust/XML/wst_200512/CombinedHashTest.php +++ b/tests/Trust/XML/wst_200512/CombinedHashTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $combinedHash = CombinedHash::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($combinedHash), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($combinedHash); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ComputedKeyAlgorithmTest.php b/tests/Trust/XML/wst_200512/ComputedKeyAlgorithmTest.php index 63ba89a..821ff94 100644 --- a/tests/Trust/XML/wst_200512/ComputedKeyAlgorithmTest.php +++ b/tests/Trust/XML/wst_200512/ComputedKeyAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $computedKeyAlgorithm = ComputedKeyAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($computedKeyAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($computedKeyAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ComputedKeyTest.php b/tests/Trust/XML/wst_200512/ComputedKeyTest.php index 553fa0b..de3a40a 100644 --- a/tests/Trust/XML/wst_200512/ComputedKeyTest.php +++ b/tests/Trust/XML/wst_200512/ComputedKeyTest.php @@ -54,9 +54,10 @@ public function testMarshalling(): void { $computedKey = ComputedKey::fromString(ComputedKeyEnum::PSHA1->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($computedKey), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($computedKey); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/DelegatableTest.php b/tests/Trust/XML/wst_200512/DelegatableTest.php index 6d49134..3bd0d3b 100644 --- a/tests/Trust/XML/wst_200512/DelegatableTest.php +++ b/tests/Trust/XML/wst_200512/DelegatableTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $delegatable = Delegatable::fromString('true'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($delegatable), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($delegatable); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/DelegateToTest.php b/tests/Trust/XML/wst_200512/DelegateToTest.php index 9b366a1..4bdb6a9 100644 --- a/tests/Trust/XML/wst_200512/DelegateToTest.php +++ b/tests/Trust/XML/wst_200512/DelegateToTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $delegateTo = new DelegateTo($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($delegateTo), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($delegateTo); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/EncryptWithTest.php b/tests/Trust/XML/wst_200512/EncryptWithTest.php index 4a392ae..ce295ee 100644 --- a/tests/Trust/XML/wst_200512/EncryptWithTest.php +++ b/tests/Trust/XML/wst_200512/EncryptWithTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $encryptWith = EncryptWith::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryptWith), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryptWith); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/EncryptionAlgorithmTest.php b/tests/Trust/XML/wst_200512/EncryptionAlgorithmTest.php index 1c32b11..4b611b4 100644 --- a/tests/Trust/XML/wst_200512/EncryptionAlgorithmTest.php +++ b/tests/Trust/XML/wst_200512/EncryptionAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $encryptionAlgorithm = EncryptionAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryptionAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryptionAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/EncryptionTest.php b/tests/Trust/XML/wst_200512/EncryptionTest.php index 2672600..2515451 100644 --- a/tests/Trust/XML/wst_200512/EncryptionTest.php +++ b/tests/Trust/XML/wst_200512/EncryptionTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $encryption = new Encryption($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($encryption), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($encryption); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/EntropyTest.php b/tests/Trust/XML/wst_200512/EntropyTest.php index 6c9ec11..f27b3e4 100644 --- a/tests/Trust/XML/wst_200512/EntropyTest.php +++ b/tests/Trust/XML/wst_200512/EntropyTest.php @@ -66,10 +66,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $entropy = new Entropy([$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($entropy), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($entropy); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/ForwardableTest.php b/tests/Trust/XML/wst_200512/ForwardableTest.php index a440ada..c9347a1 100644 --- a/tests/Trust/XML/wst_200512/ForwardableTest.php +++ b/tests/Trust/XML/wst_200512/ForwardableTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $forwardable = Forwardable::fromString('true'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($forwardable), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($forwardable); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/IssuedTokensTest.php b/tests/Trust/XML/wst_200512/IssuedTokensTest.php index a823b86..b253c84 100644 --- a/tests/Trust/XML/wst_200512/IssuedTokensTest.php +++ b/tests/Trust/XML/wst_200512/IssuedTokensTest.php @@ -77,9 +77,10 @@ public function testMarshalling(): void [$attr2], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($issuedTokens), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($issuedTokens); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/IssuerTest.php b/tests/Trust/XML/wst_200512/IssuerTest.php index 379ded5..9cf2ee6 100644 --- a/tests/Trust/XML/wst_200512/IssuerTest.php +++ b/tests/Trust/XML/wst_200512/IssuerTest.php @@ -4,7 +4,7 @@ namespace SimpleSAML\Test\WebServices\Trust\XML\wst_200512; -use DOMElement; +use Dom; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; @@ -34,14 +34,14 @@ final class IssuerTest extends TestCase use SerializableElementTestTrait; - /** @var \DOMElement $referenceParametersContent */ - protected static DOMElement $referenceParametersContent; + /** @var \Dom\Element $referenceParametersContent */ + protected static Dom\Element $referenceParametersContent; - /** @var \DOMElement $metadataContent */ - protected static DOMElement $metadataContent; + /** @var \Dom\Element $metadataContent */ + protected static Dom\Element $metadataContent; - /** @var \DOMElement $customContent */ - protected static DOMElement $customContent; + /** @var \Dom\Element $customContent */ + protected static Dom\Element $customContent; /** @@ -96,9 +96,10 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($issuer), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($issuer); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/KeyExchangeTokenTest.php b/tests/Trust/XML/wst_200512/KeyExchangeTokenTest.php index a606350..deb12bb 100644 --- a/tests/Trust/XML/wst_200512/KeyExchangeTokenTest.php +++ b/tests/Trust/XML/wst_200512/KeyExchangeTokenTest.php @@ -62,10 +62,11 @@ public function testMarshalling(): void $keyExchangeToken = new KeyExchangeToken([$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keyExchangeToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keyExchangeToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/KeySizeTest.php b/tests/Trust/XML/wst_200512/KeySizeTest.php index 044af65..749db45 100644 --- a/tests/Trust/XML/wst_200512/KeySizeTest.php +++ b/tests/Trust/XML/wst_200512/KeySizeTest.php @@ -51,9 +51,10 @@ public function testMarshalling(): void { $keySize = KeySize::fromString('4096'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keySize), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keySize); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/KeyTypeTest.php b/tests/Trust/XML/wst_200512/KeyTypeTest.php index 1da91d7..e54294d 100644 --- a/tests/Trust/XML/wst_200512/KeyTypeTest.php +++ b/tests/Trust/XML/wst_200512/KeyTypeTest.php @@ -54,9 +54,10 @@ public function testMarshalling(): void { $keyType = KeyType::fromString(KeyTypeEnum::PublicKey->value); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keyType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keyType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/KeyWrapAlgorithmTest.php b/tests/Trust/XML/wst_200512/KeyWrapAlgorithmTest.php index 196120d..216aca7 100644 --- a/tests/Trust/XML/wst_200512/KeyWrapAlgorithmTest.php +++ b/tests/Trust/XML/wst_200512/KeyWrapAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $keyWrapAlgorithm = KeyWrapAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($keyWrapAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($keyWrapAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/LifetimeTest.php b/tests/Trust/XML/wst_200512/LifetimeTest.php index 92282e3..03cdaac 100644 --- a/tests/Trust/XML/wst_200512/LifetimeTest.php +++ b/tests/Trust/XML/wst_200512/LifetimeTest.php @@ -58,10 +58,11 @@ public function testMarshalling(): void $expires = new Expires(DateTimeValue::fromString('2001-10-13T09:00:00Z')); $lifetime = new Lifetime($created, $expires); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($lifetime), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($lifetime); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/OnBehalfOfTest.php b/tests/Trust/XML/wst_200512/OnBehalfOfTest.php index b03b60d..6e842ac 100644 --- a/tests/Trust/XML/wst_200512/OnBehalfOfTest.php +++ b/tests/Trust/XML/wst_200512/OnBehalfOfTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $onBehalfOf = new OnBehalfOf($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($onBehalfOf), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($onBehalfOf); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ParticipantTest.php b/tests/Trust/XML/wst_200512/ParticipantTest.php index 4e90d58..bfb5614 100644 --- a/tests/Trust/XML/wst_200512/ParticipantTest.php +++ b/tests/Trust/XML/wst_200512/ParticipantTest.php @@ -60,9 +60,10 @@ public function testMarshalling(): void $participant = new Participant($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($participant), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($participant); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ParticipantsTest.php b/tests/Trust/XML/wst_200512/ParticipantsTest.php index d9e60f3..cf34b31 100644 --- a/tests/Trust/XML/wst_200512/ParticipantsTest.php +++ b/tests/Trust/XML/wst_200512/ParticipantsTest.php @@ -67,10 +67,11 @@ public function testMarshalling(): void $participant = new Participant($msgId); $participants = new Participants($primary, [$participant], [$msgId]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($participants), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($participants); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/PrimaryTest.php b/tests/Trust/XML/wst_200512/PrimaryTest.php index be48cc3..fdcd0bb 100644 --- a/tests/Trust/XML/wst_200512/PrimaryTest.php +++ b/tests/Trust/XML/wst_200512/PrimaryTest.php @@ -60,9 +60,10 @@ public function testMarshalling(): void $primary = new Primary($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($primary), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($primary); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ProofEncryptionTest.php b/tests/Trust/XML/wst_200512/ProofEncryptionTest.php index 8a1fc66..e00914c 100644 --- a/tests/Trust/XML/wst_200512/ProofEncryptionTest.php +++ b/tests/Trust/XML/wst_200512/ProofEncryptionTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $proofEncryption = new ProofEncryption($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($proofEncryption), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($proofEncryption); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/ReasonTest.php b/tests/Trust/XML/wst_200512/ReasonTest.php index cd709dd..6912387 100644 --- a/tests/Trust/XML/wst_200512/ReasonTest.php +++ b/tests/Trust/XML/wst_200512/ReasonTest.php @@ -49,9 +49,10 @@ public function testMarshalling(): void { $reason = Reason::fromString('phpunit'); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($reason), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($reason); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RenewTargetTest.php b/tests/Trust/XML/wst_200512/RenewTargetTest.php index be2e3b0..f38c733 100644 --- a/tests/Trust/XML/wst_200512/RenewTargetTest.php +++ b/tests/Trust/XML/wst_200512/RenewTargetTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $renewTarget = new RenewTarget($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($renewTarget), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($renewTarget); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RenewingTest.php b/tests/Trust/XML/wst_200512/RenewingTest.php index ec1b212..1114cc0 100644 --- a/tests/Trust/XML/wst_200512/RenewingTest.php +++ b/tests/Trust/XML/wst_200512/RenewingTest.php @@ -57,10 +57,11 @@ public function testMarshalling(): void BooleanValue::fromBoolean(false), ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($renewing), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($renewing); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/RequestKETTest.php b/tests/Trust/XML/wst_200512/RequestKETTest.php index f834404..1bee7f0 100644 --- a/tests/Trust/XML/wst_200512/RequestKETTest.php +++ b/tests/Trust/XML/wst_200512/RequestKETTest.php @@ -51,21 +51,11 @@ public function testMarshalling(): void { $requestKET = new RequestKET(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestKET), - ); - } + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestKET); - - /** - * Test creating an empty RequestKET object from scratch. - * - * NOTE: This element is empty per definition! - */ - public function testMarshallingEmpty(): void - { - $requestKET = new RequestKET(); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); $this->assertFalse($requestKET->isEmptyElement()); } } diff --git a/tests/Trust/XML/wst_200512/RequestSecurityTokenCollectionTest.php b/tests/Trust/XML/wst_200512/RequestSecurityTokenCollectionTest.php index c4c7346..1a5bc0b 100644 --- a/tests/Trust/XML/wst_200512/RequestSecurityTokenCollectionTest.php +++ b/tests/Trust/XML/wst_200512/RequestSecurityTokenCollectionTest.php @@ -78,9 +78,10 @@ public function testMarshalling(): void $requestSecurityToken2, ]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityTokenCollection), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityTokenCollection); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php b/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php index d49d3b0..5ef0546 100644 --- a/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php +++ b/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php @@ -77,9 +77,10 @@ public function testMarshalling(): void [$attr2], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityTokenResponseCollection), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityTokenResponseCollection); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseTest.php b/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseTest.php index d3186e8..441a850 100644 --- a/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseTest.php +++ b/tests/Trust/XML/wst_200512/RequestSecurityTokenResponseTest.php @@ -70,10 +70,11 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityTokenResponse), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityTokenResponse); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/RequestSecurityTokenTest.php b/tests/Trust/XML/wst_200512/RequestSecurityTokenTest.php index a6b7f5e..1b4f064 100644 --- a/tests/Trust/XML/wst_200512/RequestSecurityTokenTest.php +++ b/tests/Trust/XML/wst_200512/RequestSecurityTokenTest.php @@ -70,10 +70,11 @@ public function testMarshalling(): void [$attr1], ); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestSecurityToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestSecurityToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/RequestTypeTest.php b/tests/Trust/XML/wst_200512/RequestTypeTest.php index 1f38c2e..e2aca8c 100644 --- a/tests/Trust/XML/wst_200512/RequestTypeTest.php +++ b/tests/Trust/XML/wst_200512/RequestTypeTest.php @@ -55,9 +55,10 @@ public function testMarshalling(): void { $requestType = new RequestType(AnyURIValue::fromString(RequestTypeEnum::Issue->value)); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestedAttachedReferenceTest.php b/tests/Trust/XML/wst_200512/RequestedAttachedReferenceTest.php index d10b17e..96a197e 100644 --- a/tests/Trust/XML/wst_200512/RequestedAttachedReferenceTest.php +++ b/tests/Trust/XML/wst_200512/RequestedAttachedReferenceTest.php @@ -71,9 +71,10 @@ public function testMarshalling(): void $requestedAttachedReference = new RequestedAttachedReference($securityTokenReference); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedAttachedReference), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedAttachedReference); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestedProofTokenTest.php b/tests/Trust/XML/wst_200512/RequestedProofTokenTest.php index c8df1e9..a043e75 100644 --- a/tests/Trust/XML/wst_200512/RequestedProofTokenTest.php +++ b/tests/Trust/XML/wst_200512/RequestedProofTokenTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $requestedProofToken = new RequestedProofToken($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedProofToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedProofToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestedSecurityTokenTest.php b/tests/Trust/XML/wst_200512/RequestedSecurityTokenTest.php index eb77219..92f49dc 100644 --- a/tests/Trust/XML/wst_200512/RequestedSecurityTokenTest.php +++ b/tests/Trust/XML/wst_200512/RequestedSecurityTokenTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $requestedSecurityToken = new RequestedSecurityToken($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedSecurityToken), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedSecurityToken); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/RequestedTokenCancelledTest.php b/tests/Trust/XML/wst_200512/RequestedTokenCancelledTest.php index 361e5be..60f5551 100644 --- a/tests/Trust/XML/wst_200512/RequestedTokenCancelledTest.php +++ b/tests/Trust/XML/wst_200512/RequestedTokenCancelledTest.php @@ -51,21 +51,11 @@ public function testMarshalling(): void { $requestedTokenCancelled = new RequestedTokenCancelled(); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedTokenCancelled), - ); - } + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedTokenCancelled); - - /** - * Test creating an empty RequestedTokenCancelled object from scratch. - * - * NOTE: This element is empty per definition! - */ - public function testMarshallingEmpty(): void - { - $requestedTokenCancelled = new RequestedTokenCancelled(); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); $this->assertFalse($requestedTokenCancelled->isEmptyElement()); } } diff --git a/tests/Trust/XML/wst_200512/RequestedUnattachedReferenceTest.php b/tests/Trust/XML/wst_200512/RequestedUnattachedReferenceTest.php index 11f6f27..977bb11 100644 --- a/tests/Trust/XML/wst_200512/RequestedUnattachedReferenceTest.php +++ b/tests/Trust/XML/wst_200512/RequestedUnattachedReferenceTest.php @@ -71,9 +71,10 @@ public function testMarshalling(): void $requestedUnattachedReference = new RequestedUnattachedReference($securityTokenReference); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($requestedUnattachedReference), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($requestedUnattachedReference); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/SignChallengeResponseTest.php b/tests/Trust/XML/wst_200512/SignChallengeResponseTest.php index 29adc89..812cb96 100644 --- a/tests/Trust/XML/wst_200512/SignChallengeResponseTest.php +++ b/tests/Trust/XML/wst_200512/SignChallengeResponseTest.php @@ -69,9 +69,10 @@ public function testMarshalling(): void $signChallengeResponse = new SignChallengeResponse($challenge, [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signChallengeResponse), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signChallengeResponse); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/SignChallengeTest.php b/tests/Trust/XML/wst_200512/SignChallengeTest.php index d08b7e6..25d9c48 100644 --- a/tests/Trust/XML/wst_200512/SignChallengeTest.php +++ b/tests/Trust/XML/wst_200512/SignChallengeTest.php @@ -68,10 +68,11 @@ public function testMarshalling(): void $attr1 = new XMLAttribute(C::NAMESPACE, 'ssp', 'attr1', StringValue::fromString('testval1')); $signChallenge = new SignChallenge($challenge, [$msgId], [$attr1]); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signChallenge), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signChallenge); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/SignWithTest.php b/tests/Trust/XML/wst_200512/SignWithTest.php index 0795f49..b136e7a 100644 --- a/tests/Trust/XML/wst_200512/SignWithTest.php +++ b/tests/Trust/XML/wst_200512/SignWithTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $signWith = SignWith::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signWith), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signWith); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/SignatureAlgorithmTest.php b/tests/Trust/XML/wst_200512/SignatureAlgorithmTest.php index 7f3395a..0a636eb 100644 --- a/tests/Trust/XML/wst_200512/SignatureAlgorithmTest.php +++ b/tests/Trust/XML/wst_200512/SignatureAlgorithmTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $signatureAlgorithm = SignatureAlgorithm::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signatureAlgorithm), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($signatureAlgorithm); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/StatusTest.php b/tests/Trust/XML/wst_200512/StatusTest.php index 0671379..42f9448 100644 --- a/tests/Trust/XML/wst_200512/StatusTest.php +++ b/tests/Trust/XML/wst_200512/StatusTest.php @@ -58,9 +58,10 @@ public function testMarshalling(): void $reason = Reason::fromString('phpunit'); $status = new Status($code, $reason); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($status), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($status); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/TokenTypeTest.php b/tests/Trust/XML/wst_200512/TokenTypeTest.php index 108032f..5fe1e47 100644 --- a/tests/Trust/XML/wst_200512/TokenTypeTest.php +++ b/tests/Trust/XML/wst_200512/TokenTypeTest.php @@ -52,9 +52,10 @@ public function testMarshalling(): void { $tokenType = TokenType::fromString(C::NAMESPACE); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($tokenType), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($tokenType); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/Trust/XML/wst_200512/UseKeyTest.php b/tests/Trust/XML/wst_200512/UseKeyTest.php index 2cd2c0c..918f129 100644 --- a/tests/Trust/XML/wst_200512/UseKeyTest.php +++ b/tests/Trust/XML/wst_200512/UseKeyTest.php @@ -63,10 +63,11 @@ public function testMarshalling(): void $useKey = new UseKey($msgId, AnyURIValue::fromString(C::NAMESPACE)); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($useKey), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($useKey); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } diff --git a/tests/Trust/XML/wst_200512/ValidateTargetTest.php b/tests/Trust/XML/wst_200512/ValidateTargetTest.php index a90038c..66c02ac 100644 --- a/tests/Trust/XML/wst_200512/ValidateTargetTest.php +++ b/tests/Trust/XML/wst_200512/ValidateTargetTest.php @@ -62,9 +62,10 @@ public function testMarshalling(): void $validateTarget = new ValidateTarget($msgId); - $this->assertEquals( - self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($validateTarget), - ); + $expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement); + $this->assertNotFalse($expectedXml); + $actualXml = strval($validateTarget); + + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } } diff --git a/tests/resources/xml/wst/200502/Authenticator.xml b/tests/resources/xml/wst/200502/Authenticator.xml index 51867d5..5a6a3fb 100644 --- a/tests/resources/xml/wst/200502/Authenticator.xml +++ b/tests/resources/xml/wst/200502/Authenticator.xml @@ -1,4 +1,4 @@ - + /CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI= - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/CancelTarget.xml b/tests/resources/xml/wst/200502/CancelTarget.xml index d62c92a..c857256 100644 --- a/tests/resources/xml/wst/200502/CancelTarget.xml +++ b/tests/resources/xml/wst/200502/CancelTarget.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Claims.xml b/tests/resources/xml/wst/200502/Claims.xml index a909422..fc539bc 100644 --- a/tests/resources/xml/wst/200502/Claims.xml +++ b/tests/resources/xml/wst/200502/Claims.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/DelegateTo.xml b/tests/resources/xml/wst/200502/DelegateTo.xml index e946cdc..6d43cd2 100644 --- a/tests/resources/xml/wst/200502/DelegateTo.xml +++ b/tests/resources/xml/wst/200502/DelegateTo.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Encryption.xml b/tests/resources/xml/wst/200502/Encryption.xml index a9f56b2..a19d6e4 100644 --- a/tests/resources/xml/wst/200502/Encryption.xml +++ b/tests/resources/xml/wst/200502/Encryption.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Entropy.xml b/tests/resources/xml/wst/200502/Entropy.xml index d7e2bae..f2e8530 100644 --- a/tests/resources/xml/wst/200502/Entropy.xml +++ b/tests/resources/xml/wst/200502/Entropy.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/IssuedTokens.xml b/tests/resources/xml/wst/200502/IssuedTokens.xml index a4907a5..d38ccbc 100644 --- a/tests/resources/xml/wst/200502/IssuedTokens.xml +++ b/tests/resources/xml/wst/200502/IssuedTokens.xml @@ -1,5 +1,5 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/KeyExchangeToken.xml b/tests/resources/xml/wst/200502/KeyExchangeToken.xml index e9d1374..867f86b 100644 --- a/tests/resources/xml/wst/200502/KeyExchangeToken.xml +++ b/tests/resources/xml/wst/200502/KeyExchangeToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/OnBehalfOf.xml b/tests/resources/xml/wst/200502/OnBehalfOf.xml index d63452a..dd34ffe 100644 --- a/tests/resources/xml/wst/200502/OnBehalfOf.xml +++ b/tests/resources/xml/wst/200502/OnBehalfOf.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Participant.xml b/tests/resources/xml/wst/200502/Participant.xml index f1a367d..e6dd685 100644 --- a/tests/resources/xml/wst/200502/Participant.xml +++ b/tests/resources/xml/wst/200502/Participant.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Participants.xml b/tests/resources/xml/wst/200502/Participants.xml index 27eecc2..bdea6de 100644 --- a/tests/resources/xml/wst/200502/Participants.xml +++ b/tests/resources/xml/wst/200502/Participants.xml @@ -1,9 +1,9 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/Primary.xml b/tests/resources/xml/wst/200502/Primary.xml index c242157..f7d6ad1 100644 --- a/tests/resources/xml/wst/200502/Primary.xml +++ b/tests/resources/xml/wst/200502/Primary.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/ProofEncryption.xml b/tests/resources/xml/wst/200502/ProofEncryption.xml index 314a01b..15e8ca6 100644 --- a/tests/resources/xml/wst/200502/ProofEncryption.xml +++ b/tests/resources/xml/wst/200502/ProofEncryption.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RenewTarget.xml b/tests/resources/xml/wst/200502/RenewTarget.xml index 6492767..1d092fc 100644 --- a/tests/resources/xml/wst/200502/RenewTarget.xml +++ b/tests/resources/xml/wst/200502/RenewTarget.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestSecurityToken.xml b/tests/resources/xml/wst/200502/RequestSecurityToken.xml index 780b049..c0fb7dc 100644 --- a/tests/resources/xml/wst/200502/RequestSecurityToken.xml +++ b/tests/resources/xml/wst/200502/RequestSecurityToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml b/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml index 8318888..dab879e 100644 --- a/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml +++ b/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml b/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml index b0fa04e..38bb774 100644 --- a/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml +++ b/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml @@ -1,5 +1,5 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestedAttachedReference.xml b/tests/resources/xml/wst/200502/RequestedAttachedReference.xml index e82d7e0..2dd7bb7 100644 --- a/tests/resources/xml/wst/200502/RequestedAttachedReference.xml +++ b/tests/resources/xml/wst/200502/RequestedAttachedReference.xml @@ -1,5 +1,5 @@ - - + + SomeChunk diff --git a/tests/resources/xml/wst/200502/RequestedProofToken.xml b/tests/resources/xml/wst/200502/RequestedProofToken.xml index 950d0e2..d611c14 100644 --- a/tests/resources/xml/wst/200502/RequestedProofToken.xml +++ b/tests/resources/xml/wst/200502/RequestedProofToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestedSecurityToken.xml b/tests/resources/xml/wst/200502/RequestedSecurityToken.xml index d935638..477c4f4 100644 --- a/tests/resources/xml/wst/200502/RequestedSecurityToken.xml +++ b/tests/resources/xml/wst/200502/RequestedSecurityToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/RequestedUnattachedReference.xml b/tests/resources/xml/wst/200502/RequestedUnattachedReference.xml index 2c0defe..9e28fa6 100644 --- a/tests/resources/xml/wst/200502/RequestedUnattachedReference.xml +++ b/tests/resources/xml/wst/200502/RequestedUnattachedReference.xml @@ -1,5 +1,5 @@ - - + + SomeChunk diff --git a/tests/resources/xml/wst/200502/SignChallenge.xml b/tests/resources/xml/wst/200502/SignChallenge.xml index 8404a87..f02c8d6 100644 --- a/tests/resources/xml/wst/200502/SignChallenge.xml +++ b/tests/resources/xml/wst/200502/SignChallenge.xml @@ -1,4 +1,4 @@ - + accepted - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/SignChallengeResponse.xml b/tests/resources/xml/wst/200502/SignChallengeResponse.xml index 2ef3f2f..3a5447f 100644 --- a/tests/resources/xml/wst/200502/SignChallengeResponse.xml +++ b/tests/resources/xml/wst/200502/SignChallengeResponse.xml @@ -1,4 +1,4 @@ - + accepted - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200502/UseKey.xml b/tests/resources/xml/wst/200502/UseKey.xml index 5be13db..ffafe61 100644 --- a/tests/resources/xml/wst/200502/UseKey.xml +++ b/tests/resources/xml/wst/200502/UseKey.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Authenticator.xml b/tests/resources/xml/wst/200512/Authenticator.xml index c7f474c..cedbc08 100644 --- a/tests/resources/xml/wst/200512/Authenticator.xml +++ b/tests/resources/xml/wst/200512/Authenticator.xml @@ -1,4 +1,4 @@ - + /CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI= - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/CancelTarget.xml b/tests/resources/xml/wst/200512/CancelTarget.xml index 4594721..98eedb5 100644 --- a/tests/resources/xml/wst/200512/CancelTarget.xml +++ b/tests/resources/xml/wst/200512/CancelTarget.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Claims.xml b/tests/resources/xml/wst/200512/Claims.xml index 6df6511..9ecb6b3 100644 --- a/tests/resources/xml/wst/200512/Claims.xml +++ b/tests/resources/xml/wst/200512/Claims.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/DelegateTo.xml b/tests/resources/xml/wst/200512/DelegateTo.xml index 4962109..42b6f7a 100644 --- a/tests/resources/xml/wst/200512/DelegateTo.xml +++ b/tests/resources/xml/wst/200512/DelegateTo.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Encryption.xml b/tests/resources/xml/wst/200512/Encryption.xml index be813e2..9e34cf8 100644 --- a/tests/resources/xml/wst/200512/Encryption.xml +++ b/tests/resources/xml/wst/200512/Encryption.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Entropy.xml b/tests/resources/xml/wst/200512/Entropy.xml index 728bcc7..8832a9e 100644 --- a/tests/resources/xml/wst/200512/Entropy.xml +++ b/tests/resources/xml/wst/200512/Entropy.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/IssuedTokens.xml b/tests/resources/xml/wst/200512/IssuedTokens.xml index 4ae3400..14fe735 100644 --- a/tests/resources/xml/wst/200512/IssuedTokens.xml +++ b/tests/resources/xml/wst/200512/IssuedTokens.xml @@ -1,5 +1,5 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/KeyExchangeToken.xml b/tests/resources/xml/wst/200512/KeyExchangeToken.xml index dddf5bb..1dde21d 100644 --- a/tests/resources/xml/wst/200512/KeyExchangeToken.xml +++ b/tests/resources/xml/wst/200512/KeyExchangeToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/OnBehalfOf.xml b/tests/resources/xml/wst/200512/OnBehalfOf.xml index 31cadf7..683187b 100644 --- a/tests/resources/xml/wst/200512/OnBehalfOf.xml +++ b/tests/resources/xml/wst/200512/OnBehalfOf.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Participant.xml b/tests/resources/xml/wst/200512/Participant.xml index 47d03ea..a27cd52 100644 --- a/tests/resources/xml/wst/200512/Participant.xml +++ b/tests/resources/xml/wst/200512/Participant.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Participants.xml b/tests/resources/xml/wst/200512/Participants.xml index 70b243c..6c3cacc 100644 --- a/tests/resources/xml/wst/200512/Participants.xml +++ b/tests/resources/xml/wst/200512/Participants.xml @@ -1,9 +1,9 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/Primary.xml b/tests/resources/xml/wst/200512/Primary.xml index bfaac22..667db94 100644 --- a/tests/resources/xml/wst/200512/Primary.xml +++ b/tests/resources/xml/wst/200512/Primary.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/ProofEncryption.xml b/tests/resources/xml/wst/200512/ProofEncryption.xml index 3bd6b5e..5156886 100644 --- a/tests/resources/xml/wst/200512/ProofEncryption.xml +++ b/tests/resources/xml/wst/200512/ProofEncryption.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RenewTarget.xml b/tests/resources/xml/wst/200512/RenewTarget.xml index 4cc499a..bc81c37 100644 --- a/tests/resources/xml/wst/200512/RenewTarget.xml +++ b/tests/resources/xml/wst/200512/RenewTarget.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestSecurityToken.xml b/tests/resources/xml/wst/200512/RequestSecurityToken.xml index c384373..57aa21a 100644 --- a/tests/resources/xml/wst/200512/RequestSecurityToken.xml +++ b/tests/resources/xml/wst/200512/RequestSecurityToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml index dd4c31b..718daf6 100644 --- a/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml +++ b/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml @@ -1,8 +1,8 @@ - - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7df + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7df diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml index 5ba013e..52c960d 100644 --- a/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml +++ b/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml index 3948746..b18b9e0 100644 --- a/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml +++ b/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml @@ -1,5 +1,5 @@ - + - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestedAttachedReference.xml b/tests/resources/xml/wst/200512/RequestedAttachedReference.xml index 0924827..6e50679 100644 --- a/tests/resources/xml/wst/200512/RequestedAttachedReference.xml +++ b/tests/resources/xml/wst/200512/RequestedAttachedReference.xml @@ -1,5 +1,5 @@ - - + + SomeChunk diff --git a/tests/resources/xml/wst/200512/RequestedProofToken.xml b/tests/resources/xml/wst/200512/RequestedProofToken.xml index e54c12d..72e32da 100644 --- a/tests/resources/xml/wst/200512/RequestedProofToken.xml +++ b/tests/resources/xml/wst/200512/RequestedProofToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestedSecurityToken.xml b/tests/resources/xml/wst/200512/RequestedSecurityToken.xml index 203acc5..8e9baeb 100644 --- a/tests/resources/xml/wst/200512/RequestedSecurityToken.xml +++ b/tests/resources/xml/wst/200512/RequestedSecurityToken.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/RequestedUnattachedReference.xml b/tests/resources/xml/wst/200512/RequestedUnattachedReference.xml index 03da1a9..9acb689 100644 --- a/tests/resources/xml/wst/200512/RequestedUnattachedReference.xml +++ b/tests/resources/xml/wst/200512/RequestedUnattachedReference.xml @@ -1,5 +1,5 @@ - - + + SomeChunk diff --git a/tests/resources/xml/wst/200512/SignChallenge.xml b/tests/resources/xml/wst/200512/SignChallenge.xml index b8ac131..eb9bb37 100644 --- a/tests/resources/xml/wst/200512/SignChallenge.xml +++ b/tests/resources/xml/wst/200512/SignChallenge.xml @@ -1,4 +1,4 @@ - + accepted - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/SignChallengeResponse.xml b/tests/resources/xml/wst/200512/SignChallengeResponse.xml index 128ebd0..0a1d7ef 100644 --- a/tests/resources/xml/wst/200512/SignChallengeResponse.xml +++ b/tests/resources/xml/wst/200512/SignChallengeResponse.xml @@ -1,4 +1,4 @@ - + accepted - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/UseKey.xml b/tests/resources/xml/wst/200512/UseKey.xml index 322fba8..e013868 100644 --- a/tests/resources/xml/wst/200512/UseKey.xml +++ b/tests/resources/xml/wst/200512/UseKey.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de diff --git a/tests/resources/xml/wst/200512/ValidateTarget.xml b/tests/resources/xml/wst/200512/ValidateTarget.xml index 8fdb83b..554ddea 100644 --- a/tests/resources/xml/wst/200512/ValidateTarget.xml +++ b/tests/resources/xml/wst/200512/ValidateTarget.xml @@ -1,3 +1,3 @@ - - uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de + + uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de