From 038cb6f311b4876211d14c4a1fb04bf41ec44be0 Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Thu, 9 Jan 2025 14:32:18 +0100 Subject: [PATCH] Refactor assertions --- composer.json | 10 +++++----- src/Assert/Assert.php | 14 ++++++++++++++ src/XML/ReferenceIdentifierTrait.php | 2 +- src/XML/auth/AbstractAdditionalContextType.php | 2 +- src/XML/auth/AbstractClaimType.php | 2 +- src/XML/auth/AbstractConstrainedManyValueType.php | 2 +- .../auth/AbstractConstrainedSingleValueType.php | 2 +- src/XML/auth/AbstractConstrainedValueType.php | 2 +- src/XML/auth/AbstractContextItemType.php | 2 +- src/XML/auth/AbstractDescriptionType.php | 2 +- src/XML/auth/AbstractDisplayNameType.php | 2 +- src/XML/auth/AbstractDisplayValueType.php | 2 +- src/XML/auth/AbstractEncryptedValueType.php | 2 +- src/XML/auth/AbstractStructuredValueType.php | 2 +- src/XML/auth/AbstractValueInRangeType.php | 2 +- src/XML/fed/AbstractApplicationServiceType.php | 2 +- src/XML/fed/AbstractAssertionType.php | 2 +- src/XML/fed/AbstractAttributeExtensibleString.php | 2 +- src/XML/fed/AbstractAttributeExtensibleURI.php | 2 +- src/XML/fed/AbstractAttributeServiceType.php | 2 +- src/XML/fed/AbstractClaimDialectType.php | 2 +- src/XML/fed/AbstractClaimDialectsOfferedType.php | 2 +- src/XML/fed/AbstractClaimTypesOfferedType.php | 2 +- src/XML/fed/AbstractClaimTypesRequestedType.php | 2 +- src/XML/fed/AbstractClientPseudonymType.php | 2 +- src/XML/fed/AbstractEndpointType.php | 2 +- .../fed/AbstractFederationMetadataHandlerType.php | 2 +- src/XML/fed/AbstractFederationMetadataType.php | 2 +- src/XML/fed/AbstractFederationType.php | 2 +- src/XML/fed/AbstractFilterPseudonymsType.php | 2 +- src/XML/fed/AbstractFreshnessType.php | 2 +- src/XML/fed/AbstractIssuerNameType.php | 2 +- .../fed/AbstractLogicalServiceNamesOfferedType.php | 2 +- src/XML/fed/AbstractProofTokenType.php | 2 +- src/XML/fed/AbstractPseudonymBasisType.php | 2 +- src/XML/fed/AbstractPseudonymServiceType.php | 2 +- src/XML/fed/AbstractPseudonymType.php | 2 +- src/XML/fed/AbstractReferenceDigestType.php | 2 +- src/XML/fed/AbstractReferenceTokenType.php | 2 +- src/XML/fed/AbstractRelativeToType.php | 2 +- src/XML/fed/AbstractRequestProofTokenType.php | 2 +- src/XML/fed/AbstractRequestPseudonymType.php | 2 +- src/XML/fed/AbstractSecurityTokenServiceType.php | 2 +- src/XML/fed/AbstractSecurityTokenType.php | 2 +- src/XML/fed/AbstractSignOutBasisType.php | 2 +- src/XML/fed/AbstractSignOutType.php | 2 +- src/XML/fed/AbstractTokenType.php | 2 +- src/XML/fed/AbstractTokenTypesOfferedType.php | 2 +- src/XML/fed/AutomaticPseudonyms.php | 2 +- src/XML/fed/SecurityTokenServiceType.php | 2 +- src/XML/sp_200507/AbstractEmptyType.php | 2 +- src/XML/sp_200507/AbstractHeaderType.php | 2 +- src/XML/sp_200507/AbstractHttpsTokenType.php | 2 +- src/XML/sp_200507/AbstractIssuedTokenType.php | 2 +- src/XML/sp_200507/AbstractNestedPolicyType.php | 2 +- src/XML/sp_200507/AbstractQNameAssertionType.php | 2 +- .../AbstractRequestSecurityTokenTemplateType.php | 2 +- src/XML/sp_200507/AbstractSePartsType.php | 2 +- .../AbstractSecureConversationTokenType.php | 2 +- src/XML/sp_200507/AbstractSerElementsType.php | 2 +- .../sp_200507/AbstractSpnegoContextTokenType.php | 2 +- src/XML/sp_200507/AbstractTokenAssertionType.php | 2 +- src/XML/sp_200507/IncludeTokenTypeTrait.php | 2 +- src/XML/sp_200507/XPath.php | 2 +- src/XML/sp_200702/AbstractEmptyType.php | 2 +- src/XML/sp_200702/AbstractHeaderType.php | 2 +- src/XML/sp_200702/AbstractIssuedTokenType.php | 2 +- src/XML/sp_200702/AbstractKeyValueTokenType.php | 2 +- src/XML/sp_200702/AbstractNestedPolicyType.php | 2 +- src/XML/sp_200702/AbstractQNameAssertionType.php | 2 +- src/XML/sp_200702/AbstractReqPartsType.php | 2 +- .../AbstractRequestSecurityTokenTemplateType.php | 2 +- src/XML/sp_200702/AbstractSePartsType.php | 2 +- .../AbstractSecureConversationTokenType.php | 2 +- src/XML/sp_200702/AbstractSerElementsType.php | 2 +- .../sp_200702/AbstractSpnegoContextTokenType.php | 2 +- src/XML/sp_200702/AbstractTokenAssertionType.php | 2 +- src/XML/sp_200702/IncludeTokenTypeTrait.php | 2 +- src/XML/sp_200702/XPath.php | 2 +- src/XML/wsa_200408/AbstractAttributedQNameType.php | 2 +- src/XML/wsa_200408/AbstractAttributedURIType.php | 2 +- .../wsa_200408/AbstractEndpointReferenceType.php | 2 +- src/XML/wsa_200408/AbstractRelationshipType.php | 2 +- src/XML/wsa_200408/AbstractRetryAfterType.php | 2 +- src/XML/wsa_200408/AbstractServiceNameType.php | 2 +- src/XML/wsa_200408/ReferenceParameters.php | 2 +- src/XML/wsa_200408/ReferenceProperties.php | 2 +- src/XML/wsa_200508/AbstractAttributedLongType.php | 2 +- src/XML/wsa_200508/AbstractAttributedQNameType.php | 2 +- src/XML/wsa_200508/AbstractAttributedURIType.php | 2 +- .../wsa_200508/AbstractEndpointReferenceType.php | 2 +- src/XML/wsa_200508/Metadata.php | 2 +- src/XML/wsa_200508/ProblemAction.php | 2 +- src/XML/wsa_200508/ReferenceParameters.php | 2 +- src/XML/wsa_200508/RelatesTo.php | 2 +- src/XML/wsa_200508/SoapAction.php | 2 +- src/XML/wsaw/AbstractServiceNameType.php | 2 +- src/XML/wsaw/ActionTrait.php | 2 +- src/XML/wsaw/Anonymous.php | 2 +- src/XML/wsaw/InterfaceName.php | 2 +- src/XML/wsaw/ServiceName.php | 2 +- src/XML/wsaw/UsingAddressing.php | 2 +- src/XML/wsp/AbstractOperatorContentType.php | 2 +- src/XML/wsp/AppliesTo.php | 2 +- src/XML/wsp/Policy.php | 2 +- src/XML/wsp/PolicyAttachment.php | 2 +- src/XML/wsp/PolicyReference.php | 4 ++-- src/XML/wsp/PolicyURIsTrait.php | 2 +- src/XML/wsse/AbstractAttributedString.php | 2 +- src/XML/wsse/AbstractBinarySecurityTokenType.php | 2 +- src/XML/wsse/AbstractEmbeddedType.php | 2 +- src/XML/wsse/AbstractEncodedString.php | 2 +- src/XML/wsse/AbstractKeyIdentifierType.php | 2 +- src/XML/wsse/AbstractPasswordString.php | 2 +- src/XML/wsse/AbstractReferenceType.php | 2 +- src/XML/wsse/AbstractSecurityHeaderType.php | 2 +- .../wsse/AbstractSecurityTokenReferenceType.php | 2 +- .../wsse/AbstractTransformationParametersType.php | 2 +- src/XML/wsse/AbstractUsernameTokenType.php | 2 +- src/XML/wsse/UsageTrait.php | 2 +- src/XML/wst_200502/AbstractAuthenticatorType.php | 2 +- src/XML/wst_200502/AbstractBinaryExchangeType.php | 2 +- src/XML/wst_200502/AbstractBinarySecretType.php | 2 +- src/XML/wst_200502/AbstractCancelTargetType.php | 2 +- src/XML/wst_200502/AbstractClaimsType.php | 2 +- src/XML/wst_200502/AbstractComputedKeyOpenEnum.php | 2 +- src/XML/wst_200502/AbstractDelegateToType.php | 2 +- src/XML/wst_200502/AbstractEncryptionType.php | 2 +- src/XML/wst_200502/AbstractEntropyType.php | 2 +- .../wst_200502/AbstractKeyExchangeTokenType.php | 2 +- src/XML/wst_200502/AbstractKeyTypeOpenEnum.php | 2 +- src/XML/wst_200502/AbstractLifetimeType.php | 2 +- src/XML/wst_200502/AbstractOnBehalfOfType.php | 2 +- src/XML/wst_200502/AbstractParticipantType.php | 2 +- src/XML/wst_200502/AbstractParticipantsType.php | 2 +- src/XML/wst_200502/AbstractProofEncryptionType.php | 2 +- src/XML/wst_200502/AbstractRenewTargetType.php | 2 +- src/XML/wst_200502/AbstractRenewingType.php | 2 +- ...tRequestSecurityTokenResponseCollectionType.php | 2 +- .../AbstractRequestSecurityTokenResponseType.php | 2 +- .../AbstractRequestSecurityTokenType.php | 2 +- src/XML/wst_200502/AbstractRequestTypeOpenEnum.php | 2 +- .../wst_200502/AbstractRequestedProofTokenType.php | 2 +- .../wst_200502/AbstractRequestedReferenceType.php | 2 +- .../AbstractRequestedSecurityTokenType.php | 2 +- src/XML/wst_200502/AbstractSignChallengeType.php | 2 +- src/XML/wst_200502/AbstractStatusCodeOpenEnum.php | 2 +- src/XML/wst_200502/AbstractStatusType.php | 2 +- src/XML/wst_200502/AbstractUseKeyType.php | 2 +- src/XML/wst_200502/AllowPostdating.php | 2 +- src/XML/wst_200502/KeySize.php | 2 +- src/XML/wst_200502/RequestKET.php | 2 +- src/XML/wst_200502/RequestedTokenCancelled.php | 2 +- src/XML/wst_200512/AbstractAuthenticatorType.php | 2 +- src/XML/wst_200512/AbstractBinaryExchangeType.php | 2 +- src/XML/wst_200512/AbstractBinarySecretType.php | 2 +- src/XML/wst_200512/AbstractCancelTargetType.php | 2 +- src/XML/wst_200512/AbstractClaimsType.php | 2 +- src/XML/wst_200512/AbstractComputedKeyOpenEnum.php | 2 +- src/XML/wst_200512/AbstractDelegateToType.php | 2 +- src/XML/wst_200512/AbstractEncryptionType.php | 2 +- src/XML/wst_200512/AbstractEntropyType.php | 2 +- .../wst_200512/AbstractKeyExchangeTokenType.php | 2 +- src/XML/wst_200512/AbstractKeyTypeOpenEnum.php | 2 +- src/XML/wst_200512/AbstractLifetimeType.php | 2 +- src/XML/wst_200512/AbstractOnBehalfOfType.php | 2 +- src/XML/wst_200512/AbstractParticipantType.php | 2 +- src/XML/wst_200512/AbstractParticipantsType.php | 2 +- src/XML/wst_200512/AbstractProofEncryptionType.php | 2 +- src/XML/wst_200512/AbstractRenewTargetType.php | 2 +- src/XML/wst_200512/AbstractRenewingType.php | 2 +- .../AbstractRequestSecurityTokenCollectionType.php | 2 +- ...tRequestSecurityTokenResponseCollectionType.php | 2 +- .../AbstractRequestSecurityTokenResponseType.php | 2 +- .../AbstractRequestSecurityTokenType.php | 2 +- src/XML/wst_200512/AbstractRequestTypeOpenEnum.php | 2 +- .../wst_200512/AbstractRequestedProofTokenType.php | 2 +- .../wst_200512/AbstractRequestedReferenceType.php | 2 +- .../AbstractRequestedSecurityTokenType.php | 2 +- src/XML/wst_200512/AbstractSignChallengeType.php | 2 +- src/XML/wst_200512/AbstractStatusCodeOpenEnum.php | 2 +- src/XML/wst_200512/AbstractStatusType.php | 2 +- src/XML/wst_200512/AbstractUseKeyType.php | 2 +- src/XML/wst_200512/AbstractValidateTargetType.php | 2 +- src/XML/wst_200512/AllowPostdating.php | 2 +- src/XML/wst_200512/KeySize.php | 2 +- src/XML/wst_200512/RequestKET.php | 2 +- src/XML/wst_200512/RequestedTokenCancelled.php | 2 +- src/XML/wsu/AbstractAttributedDateTime.php | 2 +- src/XML/wsu/AbstractAttributedURI.php | 2 +- src/XML/wsu/AbstractTimestamp.php | 2 +- src/XML/wsx/GetMetadata.php | 2 +- src/XML/wsx/Metadata.php | 2 +- src/XML/wsx/MetadataReference.php | 2 +- src/XML/wsx/MetadataSection.php | 2 +- 195 files changed, 213 insertions(+), 199 deletions(-) create mode 100644 src/Assert/Assert.php diff --git a/composer.json b/composer.json index 34d55cfd..77345ad0 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,14 @@ "ext-dom": "*", "ext-spl": "*", - "simplesamlphp/assert": "~1.7.0", - "simplesamlphp/composer-xmlprovider-installer": "~1.0.0", + "simplesamlphp/assert": "~1.8.1", + "simplesamlphp/composer-xmlprovider-installer": "~1.0.1", "simplesamlphp/saml2": "^5@dev", - "simplesamlphp/xml-security": "~1.12.0", - "simplesamlphp/xml-common": "~1.23.2" + "simplesamlphp/xml-security": "~1.13.0", + "simplesamlphp/xml-common": "~1.24.0" }, "require-dev": { - "simplesamlphp/simplesamlphp-test-framework": "^1.8" + "simplesamlphp/simplesamlphp-test-framework": "~1.8.0" }, "autoload": { "psr-4": { diff --git a/src/Assert/Assert.php b/src/Assert/Assert.php new file mode 100644 index 00000000..eafe62fb --- /dev/null +++ b/src/Assert/Assert.php @@ -0,0 +1,14 @@ +setAttributesNS($namespacedAttributes); diff --git a/src/XML/wsp/PolicyURIsTrait.php b/src/XML/wsp/PolicyURIsTrait.php index 33d16157..93b8f85b 100644 --- a/src/XML/wsp/PolicyURIsTrait.php +++ b/src/XML/wsp/PolicyURIsTrait.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WSSecurity\XML\wsp; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; /** * Trait grouping common functionality for elements that can hold a PolicyURIs attribute. diff --git a/src/XML/wsse/AbstractAttributedString.php b/src/XML/wsse/AbstractAttributedString.php index eb2b85f2..80505d28 100644 --- a/src/XML/wsse/AbstractAttributedString.php +++ b/src/XML/wsse/AbstractAttributedString.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wsse/AbstractBinarySecurityTokenType.php b/src/XML/wsse/AbstractBinarySecurityTokenType.php index 8dbef2a8..6eb06d01 100644 --- a/src/XML/wsse/AbstractBinarySecurityTokenType.php +++ b/src/XML/wsse/AbstractBinarySecurityTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wsse/AbstractEmbeddedType.php b/src/XML/wsse/AbstractEmbeddedType.php index 6bfca203..20310363 100644 --- a/src/XML/wsse/AbstractEmbeddedType.php +++ b/src/XML/wsse/AbstractEmbeddedType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wsse/AbstractEncodedString.php b/src/XML/wsse/AbstractEncodedString.php index b411f465..85e0fcba 100644 --- a/src/XML/wsse/AbstractEncodedString.php +++ b/src/XML/wsse/AbstractEncodedString.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wsse/AbstractKeyIdentifierType.php b/src/XML/wsse/AbstractKeyIdentifierType.php index b190492b..55f46b47 100644 --- a/src/XML/wsse/AbstractKeyIdentifierType.php +++ b/src/XML/wsse/AbstractKeyIdentifierType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wsse/AbstractPasswordString.php b/src/XML/wsse/AbstractPasswordString.php index 2781247a..0664ee3d 100644 --- a/src/XML/wsse/AbstractPasswordString.php +++ b/src/XML/wsse/AbstractPasswordString.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wsse/AbstractReferenceType.php b/src/XML/wsse/AbstractReferenceType.php index 74dd59f8..84887ba5 100644 --- a/src/XML/wsse/AbstractReferenceType.php +++ b/src/XML/wsse/AbstractReferenceType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wsse/AbstractSecurityHeaderType.php b/src/XML/wsse/AbstractSecurityHeaderType.php index 34864489..e5e8fc83 100644 --- a/src/XML/wsse/AbstractSecurityHeaderType.php +++ b/src/XML/wsse/AbstractSecurityHeaderType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wsse/AbstractSecurityTokenReferenceType.php b/src/XML/wsse/AbstractSecurityTokenReferenceType.php index 75d943f9..971f6eb4 100644 --- a/src/XML/wsse/AbstractSecurityTokenReferenceType.php +++ b/src/XML/wsse/AbstractSecurityTokenReferenceType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wsse/AbstractTransformationParametersType.php b/src/XML/wsse/AbstractTransformationParametersType.php index b0bd0bb2..451455a2 100644 --- a/src/XML/wsse/AbstractTransformationParametersType.php +++ b/src/XML/wsse/AbstractTransformationParametersType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wsse/AbstractUsernameTokenType.php b/src/XML/wsse/AbstractUsernameTokenType.php index 3a7e8535..1eb48081 100644 --- a/src/XML/wsse/AbstractUsernameTokenType.php +++ b/src/XML/wsse/AbstractUsernameTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wsse/UsageTrait.php b/src/XML/wsse/UsageTrait.php index c21c972e..0774bada 100644 --- a/src/XML/wsse/UsageTrait.php +++ b/src/XML/wsse/UsageTrait.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WSSecurity\XML\wsse; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\SchemaViolationException; /** diff --git a/src/XML/wst_200502/AbstractAuthenticatorType.php b/src/XML/wst_200502/AbstractAuthenticatorType.php index 153b1cab..cd716c9a 100644 --- a/src/XML/wst_200502/AbstractAuthenticatorType.php +++ b/src/XML/wst_200502/AbstractAuthenticatorType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; diff --git a/src/XML/wst_200502/AbstractBinaryExchangeType.php b/src/XML/wst_200502/AbstractBinaryExchangeType.php index 3d8565cc..f4edb9ca 100644 --- a/src/XML/wst_200502/AbstractBinaryExchangeType.php +++ b/src/XML/wst_200502/AbstractBinaryExchangeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200502/AbstractBinarySecretType.php b/src/XML/wst_200502/AbstractBinarySecretType.php index bd87e4db..7c4c2c13 100644 --- a/src/XML/wst_200502/AbstractBinarySecretType.php +++ b/src/XML/wst_200502/AbstractBinarySecretType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Base64ElementTrait; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wst_200502/AbstractCancelTargetType.php b/src/XML/wst_200502/AbstractCancelTargetType.php index f9595fbe..bf38a4e8 100644 --- a/src/XML/wst_200502/AbstractCancelTargetType.php +++ b/src/XML/wst_200502/AbstractCancelTargetType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractClaimsType.php b/src/XML/wst_200502/AbstractClaimsType.php index e18b1fe2..8d2c1da8 100644 --- a/src/XML/wst_200502/AbstractClaimsType.php +++ b/src/XML/wst_200502/AbstractClaimsType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php index 3f8c46c5..37ba2933 100644 --- a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php +++ b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200502/AbstractDelegateToType.php b/src/XML/wst_200502/AbstractDelegateToType.php index 8a690966..ab8915a5 100644 --- a/src/XML/wst_200502/AbstractDelegateToType.php +++ b/src/XML/wst_200502/AbstractDelegateToType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractEncryptionType.php b/src/XML/wst_200502/AbstractEncryptionType.php index c11dec20..1d45d29a 100644 --- a/src/XML/wst_200502/AbstractEncryptionType.php +++ b/src/XML/wst_200502/AbstractEncryptionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractEntropyType.php b/src/XML/wst_200502/AbstractEntropyType.php index f248e941..5c142cd0 100644 --- a/src/XML/wst_200502/AbstractEntropyType.php +++ b/src/XML/wst_200502/AbstractEntropyType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php index 05cc4052..be125e6e 100644 --- a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php +++ b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; diff --git a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php index 500eda7c..70092454 100644 --- a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php +++ b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200502/AbstractLifetimeType.php b/src/XML/wst_200502/AbstractLifetimeType.php index 8cefd902..b3184ba6 100644 --- a/src/XML/wst_200502/AbstractLifetimeType.php +++ b/src/XML/wst_200502/AbstractLifetimeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\XML\wsu\Created; use SimpleSAML\WSSecurity\XML\wsu\Expires; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wst_200502/AbstractOnBehalfOfType.php b/src/XML/wst_200502/AbstractOnBehalfOfType.php index 90ce4530..93aff7b5 100644 --- a/src/XML/wst_200502/AbstractOnBehalfOfType.php +++ b/src/XML/wst_200502/AbstractOnBehalfOfType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractParticipantType.php b/src/XML/wst_200502/AbstractParticipantType.php index 3e883149..ecfe24e4 100644 --- a/src/XML/wst_200502/AbstractParticipantType.php +++ b/src/XML/wst_200502/AbstractParticipantType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractParticipantsType.php b/src/XML/wst_200502/AbstractParticipantsType.php index d519d74f..ab9da0eb 100644 --- a/src/XML/wst_200502/AbstractParticipantsType.php +++ b/src/XML/wst_200502/AbstractParticipantsType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\TooManyElementsException; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200502/AbstractProofEncryptionType.php b/src/XML/wst_200502/AbstractProofEncryptionType.php index dfea8a6e..f5c87b4e 100644 --- a/src/XML/wst_200502/AbstractProofEncryptionType.php +++ b/src/XML/wst_200502/AbstractProofEncryptionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractRenewTargetType.php b/src/XML/wst_200502/AbstractRenewTargetType.php index 807ccb43..e7d9c42b 100644 --- a/src/XML/wst_200502/AbstractRenewTargetType.php +++ b/src/XML/wst_200502/AbstractRenewTargetType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractRenewingType.php b/src/XML/wst_200502/AbstractRenewingType.php index 1c7bff6b..ad238314 100644 --- a/src/XML/wst_200502/AbstractRenewingType.php +++ b/src/XML/wst_200502/AbstractRenewingType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; /** diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php index e68111a2..ebb3a7cd 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php index e6d0f650..9c1f5346 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php index 5c6d59ed..985ce419 100644 --- a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php +++ b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php index f9c776df..a5c5611b 100644 --- a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php +++ b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200502/AbstractRequestedProofTokenType.php b/src/XML/wst_200502/AbstractRequestedProofTokenType.php index 560ee338..b9bde6b0 100644 --- a/src/XML/wst_200502/AbstractRequestedProofTokenType.php +++ b/src/XML/wst_200502/AbstractRequestedProofTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractRequestedReferenceType.php b/src/XML/wst_200502/AbstractRequestedReferenceType.php index 09774e28..ed53bef3 100644 --- a/src/XML/wst_200502/AbstractRequestedReferenceType.php +++ b/src/XML/wst_200502/AbstractRequestedReferenceType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; diff --git a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php index 0b274d78..85254e02 100644 --- a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php +++ b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractSignChallengeType.php b/src/XML/wst_200502/AbstractSignChallengeType.php index 8e413775..fa24fb44 100644 --- a/src/XML/wst_200502/AbstractSignChallengeType.php +++ b/src/XML/wst_200502/AbstractSignChallengeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php index 5d416bed..d84e5c40 100644 --- a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php +++ b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200502/AbstractStatusType.php b/src/XML/wst_200502/AbstractStatusType.php index 7f5a54e5..734494e7 100644 --- a/src/XML/wst_200502/AbstractStatusType.php +++ b/src/XML/wst_200502/AbstractStatusType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AbstractUseKeyType.php b/src/XML/wst_200502/AbstractUseKeyType.php index 9a2d61f8..62828b49 100644 --- a/src/XML/wst_200502/AbstractUseKeyType.php +++ b/src/XML/wst_200502/AbstractUseKeyType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200502/AllowPostdating.php b/src/XML/wst_200502/AllowPostdating.php index 811a7cdd..eff18e13 100644 --- a/src/XML/wst_200502/AllowPostdating.php +++ b/src/XML/wst_200502/AllowPostdating.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200502/KeySize.php b/src/XML/wst_200502/KeySize.php index b037d597..a249711a 100644 --- a/src/XML/wst_200502/KeySize.php +++ b/src/XML/wst_200502/KeySize.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\IntegerElementTrait; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200502/RequestKET.php b/src/XML/wst_200502/RequestKET.php index 063c5543..d5add1a0 100644 --- a/src/XML/wst_200502/RequestKET.php +++ b/src/XML/wst_200502/RequestKET.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200502/RequestedTokenCancelled.php b/src/XML/wst_200502/RequestedTokenCancelled.php index 36fadeed..356b359c 100644 --- a/src/XML/wst_200502/RequestedTokenCancelled.php +++ b/src/XML/wst_200502/RequestedTokenCancelled.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200502; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200512/AbstractAuthenticatorType.php b/src/XML/wst_200512/AbstractAuthenticatorType.php index ef3ffa59..3be1ec9a 100644 --- a/src/XML/wst_200512/AbstractAuthenticatorType.php +++ b/src/XML/wst_200512/AbstractAuthenticatorType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; diff --git a/src/XML/wst_200512/AbstractBinaryExchangeType.php b/src/XML/wst_200512/AbstractBinaryExchangeType.php index c227c3b5..e9099de1 100644 --- a/src/XML/wst_200512/AbstractBinaryExchangeType.php +++ b/src/XML/wst_200512/AbstractBinaryExchangeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200512/AbstractBinarySecretType.php b/src/XML/wst_200512/AbstractBinarySecretType.php index 85a64591..f12f5705 100644 --- a/src/XML/wst_200512/AbstractBinarySecretType.php +++ b/src/XML/wst_200512/AbstractBinarySecretType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Base64ElementTrait; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wst_200512/AbstractCancelTargetType.php b/src/XML/wst_200512/AbstractCancelTargetType.php index 042f8067..2f8e7791 100644 --- a/src/XML/wst_200512/AbstractCancelTargetType.php +++ b/src/XML/wst_200512/AbstractCancelTargetType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractClaimsType.php b/src/XML/wst_200512/AbstractClaimsType.php index deb9d016..bc5a0aa2 100644 --- a/src/XML/wst_200512/AbstractClaimsType.php +++ b/src/XML/wst_200512/AbstractClaimsType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php index 2955b55a..ae1a9264 100644 --- a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php +++ b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200512/AbstractDelegateToType.php b/src/XML/wst_200512/AbstractDelegateToType.php index bd44b9de..772f9d64 100644 --- a/src/XML/wst_200512/AbstractDelegateToType.php +++ b/src/XML/wst_200512/AbstractDelegateToType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractEncryptionType.php b/src/XML/wst_200512/AbstractEncryptionType.php index 43427d2b..5af46dc3 100644 --- a/src/XML/wst_200512/AbstractEncryptionType.php +++ b/src/XML/wst_200512/AbstractEncryptionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractEntropyType.php b/src/XML/wst_200512/AbstractEntropyType.php index 43e155e7..5e122104 100644 --- a/src/XML/wst_200512/AbstractEntropyType.php +++ b/src/XML/wst_200512/AbstractEntropyType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php index eeb894a1..2fb9db49 100644 --- a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php +++ b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; diff --git a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php index a26f3985..508d5f9a 100644 --- a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php +++ b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200512/AbstractLifetimeType.php b/src/XML/wst_200512/AbstractLifetimeType.php index ba56fd4b..1a876eed 100644 --- a/src/XML/wst_200512/AbstractLifetimeType.php +++ b/src/XML/wst_200512/AbstractLifetimeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\XML\wsu\Created; use SimpleSAML\WSSecurity\XML\wsu\Expires; use SimpleSAML\XML\Exception\InvalidDOMElementException; diff --git a/src/XML/wst_200512/AbstractOnBehalfOfType.php b/src/XML/wst_200512/AbstractOnBehalfOfType.php index 18f6e51b..2cf4d718 100644 --- a/src/XML/wst_200512/AbstractOnBehalfOfType.php +++ b/src/XML/wst_200512/AbstractOnBehalfOfType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractParticipantType.php b/src/XML/wst_200512/AbstractParticipantType.php index aad271ff..606bdb44 100644 --- a/src/XML/wst_200512/AbstractParticipantType.php +++ b/src/XML/wst_200512/AbstractParticipantType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractParticipantsType.php b/src/XML/wst_200512/AbstractParticipantsType.php index 77e14f06..d4b28064 100644 --- a/src/XML/wst_200512/AbstractParticipantsType.php +++ b/src/XML/wst_200512/AbstractParticipantsType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\TooManyElementsException; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200512/AbstractProofEncryptionType.php b/src/XML/wst_200512/AbstractProofEncryptionType.php index b598a3f5..376cea73 100644 --- a/src/XML/wst_200512/AbstractProofEncryptionType.php +++ b/src/XML/wst_200512/AbstractProofEncryptionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractRenewTargetType.php b/src/XML/wst_200512/AbstractRenewTargetType.php index 8dd59e2b..ddcf2fa0 100644 --- a/src/XML/wst_200512/AbstractRenewTargetType.php +++ b/src/XML/wst_200512/AbstractRenewTargetType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractRenewingType.php b/src/XML/wst_200512/AbstractRenewingType.php index e30f977a..0ae2e2ac 100644 --- a/src/XML/wst_200512/AbstractRenewingType.php +++ b/src/XML/wst_200512/AbstractRenewingType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; /** diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php index 101ee41d..ef1a4d9b 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php index f983280e..f6e9e2ed 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\SchemaViolationException; diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php index 00eb2954..c896c714 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php index 901e9c57..00f3afcb 100644 --- a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php index 5d233bdc..2da55a86 100644 --- a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php +++ b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200512/AbstractRequestedProofTokenType.php b/src/XML/wst_200512/AbstractRequestedProofTokenType.php index 5360d0f9..22e19536 100644 --- a/src/XML/wst_200512/AbstractRequestedProofTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedProofTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractRequestedReferenceType.php b/src/XML/wst_200512/AbstractRequestedReferenceType.php index ac59581d..e1c44e7c 100644 --- a/src/XML/wst_200512/AbstractRequestedReferenceType.php +++ b/src/XML/wst_200512/AbstractRequestedReferenceType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; diff --git a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php index 97c46a92..9e3f6432 100644 --- a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractSignChallengeType.php b/src/XML/wst_200512/AbstractSignChallengeType.php index 9ff5a83f..87a29f2c 100644 --- a/src/XML/wst_200512/AbstractSignChallengeType.php +++ b/src/XML/wst_200512/AbstractSignChallengeType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php index 2369a104..1c8fad8a 100644 --- a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php +++ b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst_200512/AbstractStatusType.php b/src/XML/wst_200512/AbstractStatusType.php index 35a0f08f..c06f4129 100644 --- a/src/XML/wst_200512/AbstractStatusType.php +++ b/src/XML/wst_200512/AbstractStatusType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractUseKeyType.php b/src/XML/wst_200512/AbstractUseKeyType.php index 2331ce9e..b9f4d83e 100644 --- a/src/XML/wst_200512/AbstractUseKeyType.php +++ b/src/XML/wst_200512/AbstractUseKeyType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AbstractValidateTargetType.php b/src/XML/wst_200512/AbstractValidateTargetType.php index 925b2072..119cc7f1 100644 --- a/src/XML/wst_200512/AbstractValidateTargetType.php +++ b/src/XML/wst_200512/AbstractValidateTargetType.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException; diff --git a/src/XML/wst_200512/AllowPostdating.php b/src/XML/wst_200512/AllowPostdating.php index 10fb1613..3dae2d39 100644 --- a/src/XML/wst_200512/AllowPostdating.php +++ b/src/XML/wst_200512/AllowPostdating.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200512/KeySize.php b/src/XML/wst_200512/KeySize.php index 23b9c8e2..d2b4a7ad 100644 --- a/src/XML/wst_200512/KeySize.php +++ b/src/XML/wst_200512/KeySize.php @@ -4,7 +4,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\SchemaViolationException; use SimpleSAML\XML\IntegerElementTrait; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200512/RequestKET.php b/src/XML/wst_200512/RequestKET.php index ded54692..ae46c4c2 100644 --- a/src/XML/wst_200512/RequestKET.php +++ b/src/XML/wst_200512/RequestKET.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wst_200512/RequestedTokenCancelled.php b/src/XML/wst_200512/RequestedTokenCancelled.php index 1c5dc298..a3b15d48 100644 --- a/src/XML/wst_200512/RequestedTokenCancelled.php +++ b/src/XML/wst_200512/RequestedTokenCancelled.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait}; diff --git a/src/XML/wsu/AbstractAttributedDateTime.php b/src/XML/wsu/AbstractAttributedDateTime.php index fe344d32..0f3efc29 100644 --- a/src/XML/wsu/AbstractAttributedDateTime.php +++ b/src/XML/wsu/AbstractAttributedDateTime.php @@ -6,7 +6,7 @@ use DateTimeImmutable; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\Exception\ProtocolViolationException; use SimpleSAML\XML\Attribute as XMLAttribute; diff --git a/src/XML/wsu/AbstractAttributedURI.php b/src/XML/wsu/AbstractAttributedURI.php index 212e6a11..de47428d 100644 --- a/src/XML/wsu/AbstractAttributedURI.php +++ b/src/XML/wsu/AbstractAttributedURI.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsu; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wsu/AbstractTimestamp.php b/src/XML/wsu/AbstractTimestamp.php index e9277aeb..37aeefb8 100644 --- a/src/XML/wsu/AbstractTimestamp.php +++ b/src/XML/wsu/AbstractTimestamp.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsu; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wsx/GetMetadata.php b/src/XML/wsx/GetMetadata.php index 6bdb8801..4b231a3f 100644 --- a/src/XML/wsx/GetMetadata.php +++ b/src/XML/wsx/GetMetadata.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsx; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\TooManyElementsException; use SimpleSAML\XML\ExtendableAttributesTrait; diff --git a/src/XML/wsx/Metadata.php b/src/XML/wsx/Metadata.php index 1ba337ae..298baed5 100644 --- a/src/XML/wsx/Metadata.php +++ b/src/XML/wsx/Metadata.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsx; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wsx/MetadataReference.php b/src/XML/wsx/MetadataReference.php index 9e592eb3..36b345d3 100644 --- a/src/XML/wsx/MetadataReference.php +++ b/src/XML/wsx/MetadataReference.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsx; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\ExtendableElementTrait; diff --git a/src/XML/wsx/MetadataSection.php b/src/XML/wsx/MetadataSection.php index 590e0138..ad9e76c4 100644 --- a/src/XML/wsx/MetadataSection.php +++ b/src/XML/wsx/MetadataSection.php @@ -5,7 +5,7 @@ namespace SimpleSAML\WSSecurity\XML\wsx; use DOMElement; -use SimpleSAML\Assert\Assert; +use SimpleSAML\WSSecurity\Assert\Assert; use SimpleSAML\XML\Exception\InvalidDOMElementException; use SimpleSAML\XML\Exception\MissingElementException; use SimpleSAML\XML\Exception\TooManyElementsException;