From 583072133f409bd475584043ce6797a45c1f6758 Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Tue, 24 Sep 2024 10:31:53 +0200 Subject: [PATCH] Refactor ws-trust --- resources/schemas/ws-trust-200502.xsd | 451 ++++++++++++++++++ .../{ws-trust.xsd => ws-trust-200512.xsd} | 0 src/Constants.php | 3 +- src/Utils/XPath.php | 3 +- src/XML/element.registry.php | 100 ++-- .../sp_200507/AbstractTokenAssertionType.php | 2 - src/XML/sp_200702/AbstractIssuedTokenType.php | 2 - .../sp_200702/AbstractKeyValueTokenType.php | 2 - .../AbstractSecureConversationTokenType.php | 2 - .../AbstractSpnegoContextTokenType.php | 2 - .../AbstractAuthenticatorType.php | 6 +- .../AbstractBinaryExchangeType.php | 2 +- .../AbstractBinarySecretType.php | 4 +- .../AbstractCancelTargetType.php | 2 +- .../AbstractClaimsType.php | 2 +- .../AbstractComputedKeyOpenEnum.php | 4 +- .../AbstractDelegateToType.php | 2 +- .../AbstractEncryptionType.php | 2 +- .../AbstractEntropyType.php | 2 +- .../AbstractKeyExchangeTokenType.php | 2 +- .../AbstractKeyTypeOpenEnum.php | 4 +- .../AbstractLifetimeType.php | 2 +- .../AbstractOnBehalfOfType.php | 2 +- .../AbstractParticipantType.php | 2 +- .../AbstractParticipantsType.php | 10 +- .../AbstractProofEncryptionType.php | 2 +- .../AbstractRenewTargetType.php | 2 +- .../AbstractRenewingType.php | 2 +- ...ractRequestSecurityTokenCollectionType.php | 6 +- ...estSecurityTokenResponseCollectionType.php | 6 +- ...stractRequestSecurityTokenResponseType.php | 2 +- .../AbstractRequestSecurityTokenType.php | 2 +- .../AbstractRequestTypeOpenEnum.php | 4 +- .../AbstractRequestedProofTokenType.php | 2 +- .../AbstractRequestedReferenceType.php | 2 +- .../AbstractRequestedSecurityTokenType.php | 2 +- .../AbstractSignChallengeType.php | 6 +- .../AbstractStatusCodeOpenEnum.php | 4 +- .../AbstractStatusType.php | 10 +- .../AbstractUseKeyType.php | 2 +- .../AbstractValidateTargetType.php | 2 +- .../AbstractWstElement.php | 4 +- .../{wst => wst_200512}/AllowPostdating.php | 2 +- .../AuthenticationType.php | 2 +- src/XML/{wst => wst_200512}/Authenticator.php | 2 +- .../{wst => wst_200512}/BinaryExchange.php | 2 +- src/XML/{wst => wst_200512}/BinarySecret.php | 2 +- .../BinarySecretTypeEnum.php | 2 +- src/XML/{wst => wst_200512}/CancelTarget.php | 2 +- .../CanonicalizationAlgorithm.php | 2 +- src/XML/{wst => wst_200512}/Challenge.php | 2 +- src/XML/{wst => wst_200512}/Claims.php | 2 +- src/XML/{wst => wst_200512}/Code.php | 2 +- src/XML/{wst => wst_200512}/CombinedHash.php | 2 +- src/XML/{wst => wst_200512}/ComputedKey.php | 2 +- .../ComputedKeyAlgorithm.php | 2 +- .../{wst => wst_200512}/ComputedKeyEnum.php | 2 +- src/XML/{wst => wst_200512}/Delegatable.php | 2 +- src/XML/{wst => wst_200512}/DelegateTo.php | 2 +- src/XML/{wst => wst_200512}/EncryptWith.php | 2 +- src/XML/{wst => wst_200512}/Encryption.php | 2 +- .../EncryptionAlgorithm.php | 2 +- src/XML/{wst => wst_200512}/Entropy.php | 2 +- src/XML/{wst => wst_200512}/Forwardable.php | 2 +- src/XML/{wst => wst_200512}/IssuedTokens.php | 2 +- src/XML/{wst => wst_200512}/Issuer.php | 4 +- .../{wst => wst_200512}/KeyExchangeToken.php | 2 +- src/XML/{wst => wst_200512}/KeySize.php | 2 +- src/XML/{wst => wst_200512}/KeyType.php | 2 +- src/XML/{wst => wst_200512}/KeyTypeEnum.php | 2 +- .../{wst => wst_200512}/KeyWrapAlgorithm.php | 2 +- src/XML/{wst => wst_200512}/Lifetime.php | 2 +- src/XML/{wst => wst_200512}/OnBehalfOf.php | 2 +- src/XML/{wst => wst_200512}/Participant.php | 2 +- src/XML/{wst => wst_200512}/Participants.php | 2 +- src/XML/{wst => wst_200512}/Primary.php | 2 +- .../{wst => wst_200512}/ProofEncryption.php | 2 +- src/XML/{wst => wst_200512}/Reason.php | 2 +- src/XML/{wst => wst_200512}/RenewTarget.php | 2 +- src/XML/{wst => wst_200512}/Renewing.php | 2 +- src/XML/{wst => wst_200512}/RequestKET.php | 2 +- .../RequestSecurityToken.php | 2 +- .../RequestSecurityTokenCollection.php | 2 +- .../RequestSecurityTokenResponse.php | 2 +- ...RequestSecurityTokenResponseCollection.php | 2 +- src/XML/{wst => wst_200512}/RequestType.php | 2 +- .../{wst => wst_200512}/RequestTypeEnum.php | 2 +- .../RequestedAttachedReference.php | 2 +- .../RequestedProofToken.php | 2 +- .../RequestedSecurityToken.php | 2 +- .../RequestedTokenCancelled.php | 2 +- .../RequestedUnattachedReference.php | 2 +- src/XML/{wst => wst_200512}/SignChallenge.php | 2 +- .../SignChallengeResponse.php | 2 +- src/XML/{wst => wst_200512}/SignWith.php | 2 +- .../SignatureAlgorithm.php | 2 +- src/XML/{wst => wst_200512}/Status.php | 2 +- .../{wst => wst_200512}/StatusCodeEnum.php | 2 +- src/XML/{wst => wst_200512}/TokenType.php | 2 +- src/XML/{wst => wst_200512}/UseKey.php | 2 +- .../{wst => wst_200512}/ValidateTarget.php | 2 +- .../AllowPostdatingTest.php | 12 +- .../AuthenticationTypeTest.php | 12 +- .../{wst => wst_200512}/AuthenticatorTest.php | 16 +- .../BinaryExchangeTest.php | 14 +- .../{wst => wst_200512}/BinarySecretTest.php | 16 +- .../{wst => wst_200512}/CancelTargetTest.php | 14 +- .../CanonicalizationAlgorithmTest.php | 12 +- .../XML/{wst => wst_200512}/ChallengeTest.php | 12 +- .../XML/{wst => wst_200512}/ClaimsTest.php | 14 +- .../XML/{wst => wst_200512}/CodeTest.php | 14 +- .../{wst => wst_200512}/CombinedHashTest.php | 12 +- .../ComputedKeyAlgorithmTest.php | 12 +- .../{wst => wst_200512}/ComputedKeyTest.php | 16 +- .../{wst => wst_200512}/DelegatableTest.php | 12 +- .../{wst => wst_200512}/DelegateToTest.php | 14 +- .../{wst => wst_200512}/EncryptWithTest.php | 12 +- .../EncryptionAlgorithmTest.php | 12 +- .../{wst => wst_200512}/EncryptionTest.php | 14 +- .../XML/{wst => wst_200512}/EntropyTest.php | 14 +- .../{wst => wst_200512}/ForwardableTest.php | 12 +- .../{wst => wst_200512}/IssuedTokensTest.php | 14 +- .../XML/{wst => wst_200512}/IssuerTest.php | 8 +- .../KeyExchangeTokenTest.php | 14 +- .../XML/{wst => wst_200512}/KeySizeTest.php | 12 +- .../XML/{wst => wst_200512}/KeyTypeTest.php | 16 +- .../KeyWrapAlgorithmTest.php | 12 +- .../XML/{wst => wst_200512}/LifetimeTest.php | 12 +- .../{wst => wst_200512}/OnBehalfOfTest.php | 14 +- .../{wst => wst_200512}/ParticipantTest.php | 12 +- .../{wst => wst_200512}/ParticipantsTest.php | 20 +- .../XML/{wst => wst_200512}/PrimaryTest.php | 12 +- .../ProofEncryptionTest.php | 14 +- .../XML/{wst => wst_200512}/ReasonTest.php | 10 +- .../{wst => wst_200512}/RenewTargetTest.php | 14 +- .../XML/{wst => wst_200512}/RenewingTest.php | 14 +- .../{wst => wst_200512}/RequestKETTest.php | 12 +- .../RequestSecurityTokenCollectionTest.php | 16 +- ...estSecurityTokenResponseCollectionTest.php | 16 +- .../RequestSecurityTokenResponseTest.php | 14 +- .../RequestSecurityTokenTest.php | 14 +- .../{wst => wst_200512}/RequestTypeTest.php | 16 +- .../RequestedAttachedReferenceTest.php | 14 +- .../RequestedProofTokenTest.php | 14 +- .../RequestedSecurityTokenTest.php | 14 +- .../RequestedTokenCancelledTest.php | 12 +- .../RequestedUnattachedReferenceTest.php | 14 +- .../SignChallengeResponseTest.php | 16 +- .../{wst => wst_200512}/SignChallengeTest.php | 16 +- .../XML/{wst => wst_200512}/SignWithTest.php | 12 +- .../SignatureAlgorithmTest.php | 12 +- .../XML/{wst => wst_200512}/StatusTest.php | 20 +- .../XML/{wst => wst_200512}/TokenTypeTest.php | 12 +- .../XML/{wst => wst_200512}/UseKeyTest.php | 14 +- .../ValidateTargetTest.php | 14 +- .../200512/AllowPostdating.xml} | 0 .../200512/AuthenticationType.xml} | 0 .../200512/Authenticator.xml} | 0 .../200512/BinaryExchange.xml} | 0 .../200512/BinarySecret.xml} | 0 .../200512/CancelTarget.xml} | 0 .../200512/CanonicalizationAlgorithm.xml} | 0 .../200512/Challenge.xml} | 0 .../{wst_Claims.xml => wst/200512/Claims.xml} | 0 .../xml/{wst_Code.xml => wst/200512/Code.xml} | 0 .../200512/CombinedHash.xml} | 0 .../200512/ComputedKey.xml} | 0 .../200512/ComputedKeyAlgorithm.xml} | 0 .../200512/Delegatable.xml} | 0 .../200512/DelegateTo.xml} | 0 .../200512/EncryptWith.xml} | 0 .../200512/Encryption.xml} | 0 .../200512/EncryptionAlgorithm.xml} | 0 .../200512/Entropy.xml} | 0 .../200512/Forwardable.xml} | 0 .../200512/IssuedTokens.xml} | 0 .../{wst_Issuer.xml => wst/200512/Issuer.xml} | 0 .../200512/KeyExchangeToken.xml} | 0 .../200512/KeySize.xml} | 0 .../200512/KeyType.xml} | 0 .../200512/KeyWrapAlgorithm.xml} | 0 .../200512/Lifetime.xml} | 0 .../200512/OnBehalfOf.xml} | 0 .../200512/Participant.xml} | 0 .../200512/Participants.xml} | 0 .../200512/Primary.xml} | 0 .../200512/ProofEncryption.xml} | 0 .../{wst_Reason.xml => wst/200512/Reason.xml} | 0 .../200512/RenewTarget.xml} | 0 .../200512/Renewing.xml} | 0 .../200512/RequestKET.xml} | 0 .../200512/RequestSecurityToken.xml} | 0 .../RequestSecurityTokenCollection.xml} | 0 .../200512/RequestSecurityTokenResponse.xml} | 0 ...equestSecurityTokenResponseCollection.xml} | 0 .../200512/RequestType.xml} | 0 .../200512/RequestedAttachedReference.xml} | 0 .../200512/RequestedProofToken.xml} | 0 .../200512/RequestedSecurityToken.xml} | 0 .../200512/RequestedTokenCancelled.xml} | 0 .../200512/RequestedUnattachedReference.xml} | 0 .../200512/SignChallenge.xml} | 0 .../200512/SignChallengeResponse.xml} | 0 .../200512/SignWith.xml} | 0 .../200512/SignatureAlgorithm.xml} | 0 .../{wst_Status.xml => wst/200512/Status.xml} | 0 .../200512/TokenType.xml} | 0 .../{wst_UseKey.xml => wst/200512/UseKey.xml} | 0 .../200512/ValidateTarget.xml} | 0 209 files changed, 987 insertions(+), 544 deletions(-) create mode 100644 resources/schemas/ws-trust-200502.xsd rename resources/schemas/{ws-trust.xsd => ws-trust-200512.xsd} (100%) rename src/XML/{wst => wst_200512}/AbstractAuthenticatorType.php (92%) rename src/XML/{wst => wst_200512}/AbstractBinaryExchangeType.php (98%) rename src/XML/{wst => wst_200512}/AbstractBinarySecretType.php (95%) rename src/XML/{wst => wst_200512}/AbstractCancelTargetType.php (97%) rename src/XML/{wst => wst_200512}/AbstractClaimsType.php (98%) rename src/XML/{wst => wst_200512}/AbstractComputedKeyOpenEnum.php (91%) rename src/XML/{wst => wst_200512}/AbstractDelegateToType.php (97%) rename src/XML/{wst => wst_200512}/AbstractEncryptionType.php (97%) rename src/XML/{wst => wst_200512}/AbstractEntropyType.php (98%) rename src/XML/{wst => wst_200512}/AbstractKeyExchangeTokenType.php (97%) rename src/XML/{wst => wst_200512}/AbstractKeyTypeOpenEnum.php (92%) rename src/XML/{wst => wst_200512}/AbstractLifetimeType.php (98%) rename src/XML/{wst => wst_200512}/AbstractOnBehalfOfType.php (97%) rename src/XML/{wst => wst_200512}/AbstractParticipantType.php (97%) rename src/XML/{wst => wst_200512}/AbstractParticipantsType.php (89%) rename src/XML/{wst => wst_200512}/AbstractProofEncryptionType.php (97%) rename src/XML/{wst => wst_200512}/AbstractRenewTargetType.php (97%) rename src/XML/{wst => wst_200512}/AbstractRenewingType.php (98%) rename src/XML/{wst => wst_200512}/AbstractRequestSecurityTokenCollectionType.php (90%) rename src/XML/{wst => wst_200512}/AbstractRequestSecurityTokenResponseCollectionType.php (91%) rename src/XML/{wst => wst_200512}/AbstractRequestSecurityTokenResponseType.php (98%) rename src/XML/{wst => wst_200512}/AbstractRequestSecurityTokenType.php (98%) rename src/XML/{wst => wst_200512}/AbstractRequestTypeOpenEnum.php (91%) rename src/XML/{wst => wst_200512}/AbstractRequestedProofTokenType.php (97%) rename src/XML/{wst => wst_200512}/AbstractRequestedReferenceType.php (98%) rename src/XML/{wst => wst_200512}/AbstractRequestedSecurityTokenType.php (97%) rename src/XML/{wst => wst_200512}/AbstractSignChallengeType.php (94%) rename src/XML/{wst => wst_200512}/AbstractStatusCodeOpenEnum.php (91%) rename src/XML/{wst => wst_200512}/AbstractStatusType.php (87%) rename src/XML/{wst => wst_200512}/AbstractUseKeyType.php (98%) rename src/XML/{wst => wst_200512}/AbstractValidateTargetType.php (97%) rename src/XML/{wst => wst_200512}/AbstractWstElement.php (80%) rename src/XML/{wst => wst_200512}/AllowPostdating.php (96%) rename src/XML/{wst => wst_200512}/AuthenticationType.php (88%) rename src/XML/{wst => wst_200512}/Authenticator.php (78%) rename src/XML/{wst => wst_200512}/BinaryExchange.php (78%) rename src/XML/{wst => wst_200512}/BinarySecret.php (78%) rename src/XML/{wst => wst_200512}/BinarySecretTypeEnum.php (86%) rename src/XML/{wst => wst_200512}/CancelTarget.php (78%) rename src/XML/{wst => wst_200512}/CanonicalizationAlgorithm.php (89%) rename src/XML/{wst => wst_200512}/Challenge.php (88%) rename src/XML/{wst => wst_200512}/Claims.php (76%) rename src/XML/{wst => wst_200512}/Code.php (76%) rename src/XML/{wst => wst_200512}/CombinedHash.php (88%) rename src/XML/{wst => wst_200512}/ComputedKey.php (78%) rename src/XML/{wst => wst_200512}/ComputedKeyAlgorithm.php (89%) rename src/XML/{wst => wst_200512}/ComputedKeyEnum.php (82%) rename src/XML/{wst => wst_200512}/Delegatable.php (88%) rename src/XML/{wst => wst_200512}/DelegateTo.php (77%) rename src/XML/{wst => wst_200512}/EncryptWith.php (88%) rename src/XML/{wst => wst_200512}/Encryption.php (77%) rename src/XML/{wst => wst_200512}/EncryptionAlgorithm.php (88%) rename src/XML/{wst => wst_200512}/Entropy.php (76%) rename src/XML/{wst => wst_200512}/Forwardable.php (88%) rename src/XML/{wst => wst_200512}/IssuedTokens.php (80%) rename src/XML/{wst => wst_200512}/Issuer.php (87%) rename src/XML/{wst => wst_200512}/KeyExchangeToken.php (79%) rename src/XML/{wst => wst_200512}/KeySize.php (97%) rename src/XML/{wst => wst_200512}/KeyType.php (76%) rename src/XML/{wst => wst_200512}/KeyTypeEnum.php (86%) rename src/XML/{wst => wst_200512}/KeyWrapAlgorithm.php (88%) rename src/XML/{wst => wst_200512}/Lifetime.php (76%) rename src/XML/{wst => wst_200512}/OnBehalfOf.php (77%) rename src/XML/{wst => wst_200512}/Participant.php (77%) rename src/XML/{wst => wst_200512}/Participants.php (78%) rename src/XML/{wst => wst_200512}/Primary.php (76%) rename src/XML/{wst => wst_200512}/ProofEncryption.php (78%) rename src/XML/{wst => wst_200512}/Reason.php (88%) rename src/XML/{wst => wst_200512}/RenewTarget.php (77%) rename src/XML/{wst => wst_200512}/Renewing.php (76%) rename src/XML/{wst => wst_200512}/RequestKET.php (95%) rename src/XML/{wst => wst_200512}/RequestSecurityToken.php (80%) rename src/XML/{wst => wst_200512}/RequestSecurityTokenCollection.php (82%) rename src/XML/{wst => wst_200512}/RequestSecurityTokenResponse.php (82%) rename src/XML/{wst => wst_200512}/RequestSecurityTokenResponseCollection.php (83%) rename src/XML/{wst => wst_200512}/RequestType.php (78%) rename src/XML/{wst => wst_200512}/RequestTypeEnum.php (90%) rename src/XML/{wst => wst_200512}/RequestedAttachedReference.php (81%) rename src/XML/{wst => wst_200512}/RequestedProofToken.php (80%) rename src/XML/{wst => wst_200512}/RequestedSecurityToken.php (80%) rename src/XML/{wst => wst_200512}/RequestedTokenCancelled.php (96%) rename src/XML/{wst => wst_200512}/RequestedUnattachedReference.php (81%) rename src/XML/{wst => wst_200512}/SignChallenge.php (78%) rename src/XML/{wst => wst_200512}/SignChallengeResponse.php (79%) rename src/XML/{wst => wst_200512}/SignWith.php (88%) rename src/XML/{wst => wst_200512}/SignatureAlgorithm.php (88%) rename src/XML/{wst => wst_200512}/Status.php (76%) rename src/XML/{wst => wst_200512}/StatusCodeEnum.php (82%) rename src/XML/{wst => wst_200512}/TokenType.php (88%) rename src/XML/{wst => wst_200512}/UseKey.php (76%) rename src/XML/{wst => wst_200512}/ValidateTarget.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/AllowPostdatingTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/AuthenticationTypeTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/AuthenticatorTest.php (80%) rename tests/WSSecurity/XML/{wst => wst_200512}/BinaryExchangeTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/BinarySecretTest.php (77%) rename tests/WSSecurity/XML/{wst => wst_200512}/CancelTargetTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/CanonicalizationAlgorithmTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/ChallengeTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/ClaimsTest.php (83%) rename tests/WSSecurity/XML/{wst => wst_200512}/CodeTest.php (72%) rename tests/WSSecurity/XML/{wst => wst_200512}/CombinedHashTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/ComputedKeyAlgorithmTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/ComputedKeyTest.php (73%) rename tests/WSSecurity/XML/{wst => wst_200512}/DelegatableTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/DelegateToTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/EncryptWithTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/EncryptionAlgorithmTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/EncryptionTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/EntropyTest.php (83%) rename tests/WSSecurity/XML/{wst => wst_200512}/ForwardableTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/IssuedTokensTest.php (83%) rename tests/WSSecurity/XML/{wst => wst_200512}/IssuerTest.php (92%) rename tests/WSSecurity/XML/{wst => wst_200512}/KeyExchangeTokenTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/KeySizeTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/KeyTypeTest.php (73%) rename tests/WSSecurity/XML/{wst => wst_200512}/KeyWrapAlgorithmTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/LifetimeTest.php (84%) rename tests/WSSecurity/XML/{wst => wst_200512}/OnBehalfOfTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/ParticipantTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/ParticipantsTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/PrimaryTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/ProofEncryptionTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/ReasonTest.php (77%) rename tests/WSSecurity/XML/{wst => wst_200512}/RenewTargetTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/RenewingTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestKETTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestSecurityTokenCollectionTest.php (80%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestSecurityTokenResponseCollectionTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestSecurityTokenResponseTest.php (82%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestSecurityTokenTest.php (82%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestTypeTest.php (73%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestedAttachedReferenceTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestedProofTokenTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestedSecurityTokenTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestedTokenCancelledTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/RequestedUnattachedReferenceTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/SignChallengeResponseTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/SignChallengeTest.php (81%) rename tests/WSSecurity/XML/{wst => wst_200512}/SignWithTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/SignatureAlgorithmTest.php (78%) rename tests/WSSecurity/XML/{wst => wst_200512}/StatusTest.php (71%) rename tests/WSSecurity/XML/{wst => wst_200512}/TokenTypeTest.php (79%) rename tests/WSSecurity/XML/{wst => wst_200512}/UseKeyTest.php (82%) rename tests/WSSecurity/XML/{wst => wst_200512}/ValidateTargetTest.php (79%) rename tests/resources/xml/{wst_AllowPostdating.xml => wst/200512/AllowPostdating.xml} (100%) rename tests/resources/xml/{wst_AuthenticationType.xml => wst/200512/AuthenticationType.xml} (100%) rename tests/resources/xml/{wst_Authenticator.xml => wst/200512/Authenticator.xml} (100%) rename tests/resources/xml/{wst_BinaryExchange.xml => wst/200512/BinaryExchange.xml} (100%) rename tests/resources/xml/{wst_BinarySecret.xml => wst/200512/BinarySecret.xml} (100%) rename tests/resources/xml/{wst_CancelTarget.xml => wst/200512/CancelTarget.xml} (100%) rename tests/resources/xml/{wst_CanonicalizationAlgorithm.xml => wst/200512/CanonicalizationAlgorithm.xml} (100%) rename tests/resources/xml/{wst_Challenge.xml => wst/200512/Challenge.xml} (100%) rename tests/resources/xml/{wst_Claims.xml => wst/200512/Claims.xml} (100%) rename tests/resources/xml/{wst_Code.xml => wst/200512/Code.xml} (100%) rename tests/resources/xml/{wst_CombinedHash.xml => wst/200512/CombinedHash.xml} (100%) rename tests/resources/xml/{wst_ComputedKey.xml => wst/200512/ComputedKey.xml} (100%) rename tests/resources/xml/{wst_ComputedKeyAlgorithm.xml => wst/200512/ComputedKeyAlgorithm.xml} (100%) rename tests/resources/xml/{wst_Delegatable.xml => wst/200512/Delegatable.xml} (100%) rename tests/resources/xml/{wst_DelegateTo.xml => wst/200512/DelegateTo.xml} (100%) rename tests/resources/xml/{wst_EncryptWith.xml => wst/200512/EncryptWith.xml} (100%) rename tests/resources/xml/{wst_Encryption.xml => wst/200512/Encryption.xml} (100%) rename tests/resources/xml/{wst_EncryptionAlgorithm.xml => wst/200512/EncryptionAlgorithm.xml} (100%) rename tests/resources/xml/{wst_Entropy.xml => wst/200512/Entropy.xml} (100%) rename tests/resources/xml/{wst_Forwardable.xml => wst/200512/Forwardable.xml} (100%) rename tests/resources/xml/{wst_IssuedTokens.xml => wst/200512/IssuedTokens.xml} (100%) rename tests/resources/xml/{wst_Issuer.xml => wst/200512/Issuer.xml} (100%) rename tests/resources/xml/{wst_KeyExchangeToken.xml => wst/200512/KeyExchangeToken.xml} (100%) rename tests/resources/xml/{wst_KeySize.xml => wst/200512/KeySize.xml} (100%) rename tests/resources/xml/{wst_KeyType.xml => wst/200512/KeyType.xml} (100%) rename tests/resources/xml/{wst_KeyWrapAlgorithm.xml => wst/200512/KeyWrapAlgorithm.xml} (100%) rename tests/resources/xml/{wst_Lifetime.xml => wst/200512/Lifetime.xml} (100%) rename tests/resources/xml/{wst_OnBehalfOf.xml => wst/200512/OnBehalfOf.xml} (100%) rename tests/resources/xml/{wst_Participant.xml => wst/200512/Participant.xml} (100%) rename tests/resources/xml/{wst_Participants.xml => wst/200512/Participants.xml} (100%) rename tests/resources/xml/{wst_Primary.xml => wst/200512/Primary.xml} (100%) rename tests/resources/xml/{wst_ProofEncryption.xml => wst/200512/ProofEncryption.xml} (100%) rename tests/resources/xml/{wst_Reason.xml => wst/200512/Reason.xml} (100%) rename tests/resources/xml/{wst_RenewTarget.xml => wst/200512/RenewTarget.xml} (100%) rename tests/resources/xml/{wst_Renewing.xml => wst/200512/Renewing.xml} (100%) rename tests/resources/xml/{wst_RequestKET.xml => wst/200512/RequestKET.xml} (100%) rename tests/resources/xml/{wst_RequestSecurityToken.xml => wst/200512/RequestSecurityToken.xml} (100%) rename tests/resources/xml/{wst_RequestSecurityTokenCollection.xml => wst/200512/RequestSecurityTokenCollection.xml} (100%) rename tests/resources/xml/{wst_RequestSecurityTokenResponse.xml => wst/200512/RequestSecurityTokenResponse.xml} (100%) rename tests/resources/xml/{wst_RequestSecurityTokenResponseCollection.xml => wst/200512/RequestSecurityTokenResponseCollection.xml} (100%) rename tests/resources/xml/{wst_RequestType.xml => wst/200512/RequestType.xml} (100%) rename tests/resources/xml/{wst_RequestedAttachedReference.xml => wst/200512/RequestedAttachedReference.xml} (100%) rename tests/resources/xml/{wst_RequestedProofToken.xml => wst/200512/RequestedProofToken.xml} (100%) rename tests/resources/xml/{wst_RequestedSecurityToken.xml => wst/200512/RequestedSecurityToken.xml} (100%) rename tests/resources/xml/{wst_RequestedTokenCancelled.xml => wst/200512/RequestedTokenCancelled.xml} (100%) rename tests/resources/xml/{wst_RequestedUnattachedReference.xml => wst/200512/RequestedUnattachedReference.xml} (100%) rename tests/resources/xml/{wst_SignChallenge.xml => wst/200512/SignChallenge.xml} (100%) rename tests/resources/xml/{wst_SignChallengeResponse.xml => wst/200512/SignChallengeResponse.xml} (100%) rename tests/resources/xml/{wst_SignWith.xml => wst/200512/SignWith.xml} (100%) rename tests/resources/xml/{wst_SignatureAlgorithm.xml => wst/200512/SignatureAlgorithm.xml} (100%) rename tests/resources/xml/{wst_Status.xml => wst/200512/Status.xml} (100%) rename tests/resources/xml/{wst_TokenType.xml => wst/200512/TokenType.xml} (100%) rename tests/resources/xml/{wst_UseKey.xml => wst/200512/UseKey.xml} (100%) rename tests/resources/xml/{wst_ValidateTarget.xml => wst/200512/ValidateTarget.xml} (100%) diff --git a/resources/schemas/ws-trust-200502.xsd b/resources/schemas/ws-trust-200502.xsd new file mode 100644 index 00000000..bb3fc11b --- /dev/null +++ b/resources/schemas/ws-trust-200502.xsd @@ -0,0 +1,451 @@ + + + + + + + + + + + + + + + Actual content model is non-deterministic, hence wildcard. The following shows intended content model: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Actual content model is non-deterministic, hence wildcard. The following shows intended content model: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/schemas/ws-trust.xsd b/resources/schemas/ws-trust-200512.xsd similarity index 100% rename from resources/schemas/ws-trust.xsd rename to resources/schemas/ws-trust-200512.xsd diff --git a/src/Constants.php b/src/Constants.php index d84ec2cc..f52b9f69 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -36,7 +36,8 @@ class Constants extends \SimpleSAML\SAML2\Constants /** * The namespace for WS-Trust protocol. */ - public const NS_TRUST = 'http://docs.oasis-open.org/ws-sx/ws-trust/200512/'; + public const NS_TRUST_200502 = 'http://schemas.xmlsoap.org/ws/2005/02/trust'; + public const NS_TRUST_200512 = 'http://docs.oasis-open.org/ws-sx/ws-trust/200512/'; /** * The namespace for WS-Security extensions. diff --git a/src/Utils/XPath.php b/src/Utils/XPath.php index 6e02b8db..b8597854 100644 --- a/src/Utils/XPath.php +++ b/src/Utils/XPath.php @@ -31,7 +31,8 @@ public static function getXPath(DOMNode $node): DOMXPath $xp->registerNamespace('wsa', C::NS_ADDR_200408); $xp->registerNamespace('auth', C::NS_AUTH); $xp->registerNamespace('fed', C::NS_FED); - $xp->registerNamespace('trust', C::NS_TRUST); + $xp->registerNamespace('t', C::NS_TRUST_200502); + $xp->registerNamespace('trust', C::NS_TRUST_200512); $xp->registerNamespace('policy', C::NS_POLICY); $xp->registerNamespace('sp11', C::NS_SEC_POLICY_11); $xp->registerNamespace('sp12', C::NS_SEC_POLICY_12); diff --git a/src/XML/element.registry.php b/src/XML/element.registry.php index 78b3ef61..136e9970 100644 --- a/src/XML/element.registry.php +++ b/src/XML/element.registry.php @@ -353,56 +353,56 @@ 'UsernameToken' => '\SimpleSAML\WSSecurity\XML\wsse\UsernameToken', ], 'http://docs.oasis-open.org/ws-sx/ws-trust/200512/' => [ - 'AllowPostdating' => '\SimpleSAML\WSSecurity\XML\wst\AllowPostdating', - 'AuthenticationType' => '\SimpleSAML\WSSecurity\XML\wst\AuthenticationType', - 'Authenticator' => '\SimpleSAML\WSSecurity\XML\wst\Authenticator', - 'BinaryExchange' => '\SimpleSAML\WSSecurity\XML\wst\BinaryExchange', - 'BinarySecret' => '\SimpleSAML\WSSecurity\XML\wst\BinarySecret', - 'CancelTarget' => '\SimpleSAML\WSSecurity\XML\wst\CancelTarget', - 'CanonicalizationAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithm', - 'Challenge' => '\SimpleSAML\WSSecurity\XML\wst\Challenge', - 'Claims' => '\SimpleSAML\WSSecurity\XML\wst\Claims', - 'CombinedHash' => '\SimpleSAML\WSSecurity\XML\wst\CombinedHash', - 'ComputedKey' => '\SimpleSAML\WSSecurity\XML\wst\ComputedKey', - 'ComputedKeyAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithm', - 'Delegatable' => '\SimpleSAML\WSSecurity\XML\wst\Delegatable', - 'DelegateTo' => '\SimpleSAML\WSSecurity\XML\wst\DelegateTo', - 'EncryptWith' => '\SimpleSAML\WSSecurity\XML\wst\EncryptWith', - 'Encryption' => '\SimpleSAML\WSSecurity\XML\wst\Encryption', - 'EncryptionAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithm', - 'Entropy' => '\SimpleSAML\WSSecurity\XML\wst\Entropy', - 'Forwardable' => '\SimpleSAML\WSSecurity\XML\wst\Forwardable', - 'IssuedTokens' => '\SimpleSAML\WSSecurity\XML\wst\IssuedTokens', - 'Issuer' => '\SimpleSAML\WSSecurity\XML\wst\Issuer', - 'KeyExchangeToken' => '\SimpleSAML\WSSecurity\XML\wst\KeyExchangeToken', - 'KeySize' => '\SimpleSAML\WSSecurity\XML\wst\KeySize', - 'KeyType' => '\SimpleSAML\WSSecurity\XML\wst\KeyType', - 'KeyWrapAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithm', - 'Lifetime' => '\SimpleSAML\WSSecurity\XML\wst\Lifetime', - 'OnBehalfOf' => '\SimpleSAML\WSSecurity\XML\wst\OnBehalfOf', - 'Participants' => '\SimpleSAML\WSSecurity\XML\wst\Participants', - 'ProofEncryption' => '\SimpleSAML\WSSecurity\XML\wst\ProofEncryption', - 'RenewTarget' => '\SimpleSAML\WSSecurity\XML\wst\RenewTarget', - 'Renewing' => '\SimpleSAML\WSSecurity\XML\wst\Renewing', - 'RequestKET' => '\SimpleSAML\WSSecurity\XML\wst\RequestKET', - 'RequestSecurityToken' => '\SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken', - 'RequestSecurityTokenCollection' => '\SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollection', - 'RequestSecurityTokenResponse' => '\SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse', - 'RequestSecurityTokenResponseCollection' => '\SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollection', - 'RequestType' => '\SimpleSAML\WSSecurity\XML\wst\RequestType', - 'RequestedAttachedReference' => '\SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReference', - 'RequestedProofToken' => '\SimpleSAML\WSSecurity\XML\wst\RequestedProofToken', - 'RequestedSecurityToken' => '\SimpleSAML\WSSecurity\XML\wst\RequestedSecurityToken', - 'RequestedTokenCancelled' => '\SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelled', - 'RequestedUnattachedReference' => '\SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReference', - 'SignChallenge' => '\SimpleSAML\WSSecurity\XML\wst\SignChallenge', - 'SignChallengeResponse' => '\SimpleSAML\WSSecurity\XML\wst\SignChallengeResponse', - 'SignWith' => '\SimpleSAML\WSSecurity\XML\wst\SignWith', - 'SignatureAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithm', - 'Status' => '\SimpleSAML\WSSecurity\XML\wst\Status', - 'TokenType' => '\SimpleSAML\WSSecurity\XML\wst\TokenType', - 'UseKey' => '\SimpleSAML\WSSecurity\XML\wst\UseKey', - 'ValidateTarget' => '\SimpleSAML\WSSecurity\XML\wst\ValidateTarget', + 'AllowPostdating' => '\SimpleSAML\WSSecurity\XML\wst_200512\AllowPostdating', + 'AuthenticationType' => '\SimpleSAML\WSSecurity\XML\wst_200512\AuthenticationType', + 'Authenticator' => '\SimpleSAML\WSSecurity\XML\wst_200512\Authenticator', + 'BinaryExchange' => '\SimpleSAML\WSSecurity\XML\wst_200512\BinaryExchange', + 'BinarySecret' => '\SimpleSAML\WSSecurity\XML\wst_200512\BinarySecret', + 'CancelTarget' => '\SimpleSAML\WSSecurity\XML\wst_200512\CancelTarget', + 'CanonicalizationAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst_200512\CanonicalizationAlgorithm', + 'Challenge' => '\SimpleSAML\WSSecurity\XML\wst_200512\Challenge', + 'Claims' => '\SimpleSAML\WSSecurity\XML\wst_200512\Claims', + 'CombinedHash' => '\SimpleSAML\WSSecurity\XML\wst_200512\CombinedHash', + 'ComputedKey' => '\SimpleSAML\WSSecurity\XML\wst_200512\ComputedKey', + 'ComputedKeyAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyAlgorithm', + 'Delegatable' => '\SimpleSAML\WSSecurity\XML\wst_200512\Delegatable', + 'DelegateTo' => '\SimpleSAML\WSSecurity\XML\wst_200512\DelegateTo', + 'EncryptWith' => '\SimpleSAML\WSSecurity\XML\wst_200512\EncryptWith', + 'Encryption' => '\SimpleSAML\WSSecurity\XML\wst_200512\Encryption', + 'EncryptionAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst_200512\EncryptionAlgorithm', + 'Entropy' => '\SimpleSAML\WSSecurity\XML\wst_200512\Entropy', + 'Forwardable' => '\SimpleSAML\WSSecurity\XML\wst_200512\Forwardable', + 'IssuedTokens' => '\SimpleSAML\WSSecurity\XML\wst_200512\IssuedTokens', + 'Issuer' => '\SimpleSAML\WSSecurity\XML\wst_200512\Issuer', + 'KeyExchangeToken' => '\SimpleSAML\WSSecurity\XML\wst_200512\KeyExchangeToken', + 'KeySize' => '\SimpleSAML\WSSecurity\XML\wst_200512\KeySize', + 'KeyType' => '\SimpleSAML\WSSecurity\XML\wst_200512\KeyType', + 'KeyWrapAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst_200512\KeyWrapAlgorithm', + 'Lifetime' => '\SimpleSAML\WSSecurity\XML\wst_200512\Lifetime', + 'OnBehalfOf' => '\SimpleSAML\WSSecurity\XML\wst_200512\OnBehalfOf', + 'Participants' => '\SimpleSAML\WSSecurity\XML\wst_200512\Participants', + 'ProofEncryption' => '\SimpleSAML\WSSecurity\XML\wst_200512\ProofEncryption', + 'RenewTarget' => '\SimpleSAML\WSSecurity\XML\wst_200512\RenewTarget', + 'Renewing' => '\SimpleSAML\WSSecurity\XML\wst_200512\Renewing', + 'RequestKET' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestKET', + 'RequestSecurityToken' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken', + 'RequestSecurityTokenCollection' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenCollection', + 'RequestSecurityTokenResponse' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse', + 'RequestSecurityTokenResponseCollection' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseCollection', + 'RequestType' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestType', + 'RequestedAttachedReference' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestedAttachedReference', + 'RequestedProofToken' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestedProofToken', + 'RequestedSecurityToken' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestedSecurityToken', + 'RequestedTokenCancelled' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestedTokenCancelled', + 'RequestedUnattachedReference' => '\SimpleSAML\WSSecurity\XML\wst_200512\RequestedUnattachedReference', + 'SignChallenge' => '\SimpleSAML\WSSecurity\XML\wst_200512\SignChallenge', + 'SignChallengeResponse' => '\SimpleSAML\WSSecurity\XML\wst_200512\SignChallengeResponse', + 'SignWith' => '\SimpleSAML\WSSecurity\XML\wst_200512\SignWith', + 'SignatureAlgorithm' => '\SimpleSAML\WSSecurity\XML\wst_200512\SignatureAlgorithm', + 'Status' => '\SimpleSAML\WSSecurity\XML\wst_200512\Status', + 'TokenType' => '\SimpleSAML\WSSecurity\XML\wst_200512\TokenType', + 'UseKey' => '\SimpleSAML\WSSecurity\XML\wst_200512\UseKey', + 'ValidateTarget' => '\SimpleSAML\WSSecurity\XML\wst_200512\ValidateTarget', ], 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd' => [ 'Created' => '\SimpleSAML\WSSecurity\XML\wsu\Created', diff --git a/src/XML/sp_200507/AbstractTokenAssertionType.php b/src/XML/sp_200507/AbstractTokenAssertionType.php index c5b54b9d..605a01ab 100644 --- a/src/XML/sp_200507/AbstractTokenAssertionType.php +++ b/src/XML/sp_200507/AbstractTokenAssertionType.php @@ -10,9 +10,7 @@ use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; -use ValueError; -use function is_string; use function sprintf; /** diff --git a/src/XML/sp_200702/AbstractIssuedTokenType.php b/src/XML/sp_200702/AbstractIssuedTokenType.php index 554946de..9436d370 100644 --- a/src/XML/sp_200702/AbstractIssuedTokenType.php +++ b/src/XML/sp_200702/AbstractIssuedTokenType.php @@ -12,10 +12,8 @@ use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; -use ValueError; use function array_pop; -use function is_string; use function sprintf; /** diff --git a/src/XML/sp_200702/AbstractKeyValueTokenType.php b/src/XML/sp_200702/AbstractKeyValueTokenType.php index c8fb4fbd..47c6d02d 100644 --- a/src/XML/sp_200702/AbstractKeyValueTokenType.php +++ b/src/XML/sp_200702/AbstractKeyValueTokenType.php @@ -10,9 +10,7 @@ use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; -use ValueError; -use function is_string; use function sprintf; /** diff --git a/src/XML/sp_200702/AbstractSecureConversationTokenType.php b/src/XML/sp_200702/AbstractSecureConversationTokenType.php index fc2b14a1..08a07e63 100644 --- a/src/XML/sp_200702/AbstractSecureConversationTokenType.php +++ b/src/XML/sp_200702/AbstractSecureConversationTokenType.php @@ -10,10 +10,8 @@ use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; -use ValueError; use function array_pop; -use function is_string; use function sprintf; /** diff --git a/src/XML/sp_200702/AbstractSpnegoContextTokenType.php b/src/XML/sp_200702/AbstractSpnegoContextTokenType.php index 1056edc1..5275d5f3 100644 --- a/src/XML/sp_200702/AbstractSpnegoContextTokenType.php +++ b/src/XML/sp_200702/AbstractSpnegoContextTokenType.php @@ -10,10 +10,8 @@ use SimpleSAML\XML\ExtendableAttributesTrait; use SimpleSAML\XML\ExtendableElementTrait; use SimpleSAML\XML\XsNamespace as NS; -use ValueError; use function array_pop; -use function is_string; use function sprintf; /** diff --git a/src/XML/wst/AbstractAuthenticatorType.php b/src/XML/wst_200512/AbstractAuthenticatorType.php similarity index 92% rename from src/XML/wst/AbstractAuthenticatorType.php rename to src/XML/wst_200512/AbstractAuthenticatorType.php index 5ca8a4fa..d300524f 100644 --- a/src/XML/wst/AbstractAuthenticatorType.php +++ b/src/XML/wst_200512/AbstractAuthenticatorType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -28,7 +28,7 @@ abstract class AbstractAuthenticatorType extends AbstractWstElement /** * AbstractAuthenticatorType constructor * - * @param \SimpleSAML\WSSecurity\XML\wst\CombinedHash|null $combinedHash + * @param \SimpleSAML\WSSecurity\XML\wst_200512\CombinedHash|null $combinedHash * @param array<\SimpleSAML\XML\SerializableElementInterface> $children */ final public function __construct( @@ -40,7 +40,7 @@ final public function __construct( /** - * @return \SimpleSAML\WSSecurity\XML\wst\CombinedHash|null + * @return \SimpleSAML\WSSecurity\XML\wst_200512\CombinedHash|null */ public function getCombinedHash(): ?CombinedHash { diff --git a/src/XML/wst/AbstractBinaryExchangeType.php b/src/XML/wst_200512/AbstractBinaryExchangeType.php similarity index 98% rename from src/XML/wst/AbstractBinaryExchangeType.php rename to src/XML/wst_200512/AbstractBinaryExchangeType.php index 22e14a9e..4b52ca61 100644 --- a/src/XML/wst/AbstractBinaryExchangeType.php +++ b/src/XML/wst_200512/AbstractBinaryExchangeType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractBinarySecretType.php b/src/XML/wst_200512/AbstractBinarySecretType.php similarity index 95% rename from src/XML/wst/AbstractBinarySecretType.php rename to src/XML/wst_200512/AbstractBinarySecretType.php index 9752b045..301af111 100644 --- a/src/XML/wst/AbstractBinarySecretType.php +++ b/src/XML/wst_200512/AbstractBinarySecretType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -35,7 +35,7 @@ abstract class AbstractBinarySecretType extends AbstractWstElement /** * @param string $content - * @param (\SimpleSAML\WSSecurity\XML\wst\BinarySecretTypeEnum|string)[]|null $Type + * @param (\SimpleSAML\WSSecurity\XML\wst_200512\BinarySecretTypeEnum|string)[]|null $Type * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes */ final public function __construct( diff --git a/src/XML/wst/AbstractCancelTargetType.php b/src/XML/wst_200512/AbstractCancelTargetType.php similarity index 97% rename from src/XML/wst/AbstractCancelTargetType.php rename to src/XML/wst_200512/AbstractCancelTargetType.php index 604063f6..e52af44f 100644 --- a/src/XML/wst/AbstractCancelTargetType.php +++ b/src/XML/wst_200512/AbstractCancelTargetType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractClaimsType.php b/src/XML/wst_200512/AbstractClaimsType.php similarity index 98% rename from src/XML/wst/AbstractClaimsType.php rename to src/XML/wst_200512/AbstractClaimsType.php index cc23eefe..b5756a87 100644 --- a/src/XML/wst/AbstractClaimsType.php +++ b/src/XML/wst_200512/AbstractClaimsType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php similarity index 91% rename from src/XML/wst/AbstractComputedKeyOpenEnum.php rename to src/XML/wst_200512/AbstractComputedKeyOpenEnum.php index 4e265ea2..2955b55a 100644 --- a/src/XML/wst/AbstractComputedKeyOpenEnum.php +++ b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -27,7 +27,7 @@ abstract class AbstractComputedKeyOpenEnum extends AbstractWstElement /** - * @param (\SimpleSAML\WSSecurity\XML\wst\ComputedKeyEnum|string)[] $values + * @param (\SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyEnum|string)[] $values */ public function __construct(array $values) { diff --git a/src/XML/wst/AbstractDelegateToType.php b/src/XML/wst_200512/AbstractDelegateToType.php similarity index 97% rename from src/XML/wst/AbstractDelegateToType.php rename to src/XML/wst_200512/AbstractDelegateToType.php index 8ea5230b..50ee0570 100644 --- a/src/XML/wst/AbstractDelegateToType.php +++ b/src/XML/wst_200512/AbstractDelegateToType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractEncryptionType.php b/src/XML/wst_200512/AbstractEncryptionType.php similarity index 97% rename from src/XML/wst/AbstractEncryptionType.php rename to src/XML/wst_200512/AbstractEncryptionType.php index b612d222..ebf4dfcf 100644 --- a/src/XML/wst/AbstractEncryptionType.php +++ b/src/XML/wst_200512/AbstractEncryptionType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractEntropyType.php b/src/XML/wst_200512/AbstractEntropyType.php similarity index 98% rename from src/XML/wst/AbstractEntropyType.php rename to src/XML/wst_200512/AbstractEntropyType.php index cc033de2..ab31ea13 100644 --- a/src/XML/wst/AbstractEntropyType.php +++ b/src/XML/wst_200512/AbstractEntropyType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractKeyExchangeTokenType.php b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php similarity index 97% rename from src/XML/wst/AbstractKeyExchangeTokenType.php rename to src/XML/wst_200512/AbstractKeyExchangeTokenType.php index 99cb4ca7..a3a66e96 100644 --- a/src/XML/wst/AbstractKeyExchangeTokenType.php +++ b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php similarity index 92% rename from src/XML/wst/AbstractKeyTypeOpenEnum.php rename to src/XML/wst_200512/AbstractKeyTypeOpenEnum.php index fb69814d..a26f3985 100644 --- a/src/XML/wst/AbstractKeyTypeOpenEnum.php +++ b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -27,7 +27,7 @@ abstract class AbstractKeyTypeOpenEnum extends AbstractWstElement /** - * @param (\SimpleSAML\WSSecurity\XML\wst\KeyTypeEnum|string)[] $values + * @param (\SimpleSAML\WSSecurity\XML\wst_200512\KeyTypeEnum|string)[] $values */ public function __construct(array $values) { diff --git a/src/XML/wst/AbstractLifetimeType.php b/src/XML/wst_200512/AbstractLifetimeType.php similarity index 98% rename from src/XML/wst/AbstractLifetimeType.php rename to src/XML/wst_200512/AbstractLifetimeType.php index 33a47fb5..3795b495 100644 --- a/src/XML/wst/AbstractLifetimeType.php +++ b/src/XML/wst_200512/AbstractLifetimeType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractOnBehalfOfType.php b/src/XML/wst_200512/AbstractOnBehalfOfType.php similarity index 97% rename from src/XML/wst/AbstractOnBehalfOfType.php rename to src/XML/wst_200512/AbstractOnBehalfOfType.php index ece3582d..e693d5b6 100644 --- a/src/XML/wst/AbstractOnBehalfOfType.php +++ b/src/XML/wst_200512/AbstractOnBehalfOfType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractParticipantType.php b/src/XML/wst_200512/AbstractParticipantType.php similarity index 97% rename from src/XML/wst/AbstractParticipantType.php rename to src/XML/wst_200512/AbstractParticipantType.php index 1effb9a1..bc4e4c26 100644 --- a/src/XML/wst/AbstractParticipantType.php +++ b/src/XML/wst_200512/AbstractParticipantType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractParticipantsType.php b/src/XML/wst_200512/AbstractParticipantsType.php similarity index 89% rename from src/XML/wst/AbstractParticipantsType.php rename to src/XML/wst_200512/AbstractParticipantsType.php index 82cac5e3..707d140c 100644 --- a/src/XML/wst/AbstractParticipantsType.php +++ b/src/XML/wst_200512/AbstractParticipantsType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -27,8 +27,8 @@ abstract class AbstractParticipantsType extends AbstractWstElement /** * AbstractParticipantsType constructor * - * @param \SimpleSAML\WSSecurity\XML\wst\Primary|null $primary - * @param array<\SimpleSAML\WSSecurity\XML\wst\Participant> $participant + * @param \SimpleSAML\WSSecurity\XML\wst_200512\Primary|null $primary + * @param array<\SimpleSAML\WSSecurity\XML\wst_200512\Participant> $participant * @param array<\SimpleSAML\XML\SerializableElementInterface> $children */ final public function __construct( @@ -41,7 +41,7 @@ final public function __construct( /** - * @return \SimpleSAML\WSSecurity\XML\wst\Primary|null + * @return \SimpleSAML\WSSecurity\XML\wst_200512\Primary|null */ public function getPrimary(): ?Primary { @@ -50,7 +50,7 @@ public function getPrimary(): ?Primary /** - * @return \SimpleSAML\WSSecurity\XML\wst\Participant[] + * @return \SimpleSAML\WSSecurity\XML\wst_200512\Participant[] */ public function getParticipant(): array { diff --git a/src/XML/wst/AbstractProofEncryptionType.php b/src/XML/wst_200512/AbstractProofEncryptionType.php similarity index 97% rename from src/XML/wst/AbstractProofEncryptionType.php rename to src/XML/wst_200512/AbstractProofEncryptionType.php index 87a0283a..b726d78a 100644 --- a/src/XML/wst/AbstractProofEncryptionType.php +++ b/src/XML/wst_200512/AbstractProofEncryptionType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRenewTargetType.php b/src/XML/wst_200512/AbstractRenewTargetType.php similarity index 97% rename from src/XML/wst/AbstractRenewTargetType.php rename to src/XML/wst_200512/AbstractRenewTargetType.php index c6b37cd7..5b1c8baf 100644 --- a/src/XML/wst/AbstractRenewTargetType.php +++ b/src/XML/wst_200512/AbstractRenewTargetType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRenewingType.php b/src/XML/wst_200512/AbstractRenewingType.php similarity index 98% rename from src/XML/wst/AbstractRenewingType.php rename to src/XML/wst_200512/AbstractRenewingType.php index dbcec291..d99a9c96 100644 --- a/src/XML/wst/AbstractRenewingType.php +++ b/src/XML/wst_200512/AbstractRenewingType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRequestSecurityTokenCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php similarity index 90% rename from src/XML/wst/AbstractRequestSecurityTokenCollectionType.php rename to src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php index 10fcafca..fec742cb 100644 --- a/src/XML/wst/AbstractRequestSecurityTokenCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -18,7 +18,7 @@ abstract class AbstractRequestSecurityTokenCollectionType extends AbstractWstElement { /** - * @param array<\SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken> $requestSecurityToken + * @param array<\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken> $requestSecurityToken */ final public function __construct( protected array $requestSecurityToken, @@ -35,7 +35,7 @@ final public function __construct( /** * Get the requestSecurityToken property. * - * @return \SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken[] + * @return \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken[] */ public function getRequestSecurityToken(): array { diff --git a/src/XML/wst/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php similarity index 91% rename from src/XML/wst/AbstractRequestSecurityTokenResponseCollectionType.php rename to src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php index 0ceb5833..86f8080b 100644 --- a/src/XML/wst/AbstractRequestSecurityTokenResponseCollectionType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -26,7 +26,7 @@ abstract class AbstractRequestSecurityTokenResponseCollectionType extends Abstra /** - * @param array<\SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse> $requestSecurityTokenResponse + * @param array<\SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse> $requestSecurityTokenResponse * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes */ final public function __construct( @@ -47,7 +47,7 @@ final public function __construct( /** * Get the requestSecurityTokenResponse property. * - * @return \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse[] + * @return \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse[] */ public function getRequestSecurityTokenResponse(): array { diff --git a/src/XML/wst/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php similarity index 98% rename from src/XML/wst/AbstractRequestSecurityTokenResponseType.php rename to src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php index 1b04750d..2c4ad05b 100644 --- a/src/XML/wst/AbstractRequestSecurityTokenResponseType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRequestSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php similarity index 98% rename from src/XML/wst/AbstractRequestSecurityTokenType.php rename to src/XML/wst_200512/AbstractRequestSecurityTokenType.php index 095c9cee..f5e5cb3b 100644 --- a/src/XML/wst/AbstractRequestSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php similarity index 91% rename from src/XML/wst/AbstractRequestTypeOpenEnum.php rename to src/XML/wst_200512/AbstractRequestTypeOpenEnum.php index f2fa505c..5d233bdc 100644 --- a/src/XML/wst/AbstractRequestTypeOpenEnum.php +++ b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -27,7 +27,7 @@ abstract class AbstractRequestTypeOpenEnum extends AbstractWstElement /** - * @param (\SimpleSAML\WSSecurity\XML\wst\RequestTypeEnum|string)[] $values + * @param (\SimpleSAML\WSSecurity\XML\wst_200512\RequestTypeEnum|string)[] $values */ public function __construct(array $values) { diff --git a/src/XML/wst/AbstractRequestedProofTokenType.php b/src/XML/wst_200512/AbstractRequestedProofTokenType.php similarity index 97% rename from src/XML/wst/AbstractRequestedProofTokenType.php rename to src/XML/wst_200512/AbstractRequestedProofTokenType.php index 429314a3..2d46edd1 100644 --- a/src/XML/wst/AbstractRequestedProofTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedProofTokenType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRequestedReferenceType.php b/src/XML/wst_200512/AbstractRequestedReferenceType.php similarity index 98% rename from src/XML/wst/AbstractRequestedReferenceType.php rename to src/XML/wst_200512/AbstractRequestedReferenceType.php index fea7c0b0..7f6cd4dc 100644 --- a/src/XML/wst/AbstractRequestedReferenceType.php +++ b/src/XML/wst_200512/AbstractRequestedReferenceType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php similarity index 97% rename from src/XML/wst/AbstractRequestedSecurityTokenType.php rename to src/XML/wst_200512/AbstractRequestedSecurityTokenType.php index ef206df5..148fe6f9 100644 --- a/src/XML/wst/AbstractRequestedSecurityTokenType.php +++ b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractSignChallengeType.php b/src/XML/wst_200512/AbstractSignChallengeType.php similarity index 94% rename from src/XML/wst/AbstractSignChallengeType.php rename to src/XML/wst_200512/AbstractSignChallengeType.php index baae7295..8042ee6e 100644 --- a/src/XML/wst/AbstractSignChallengeType.php +++ b/src/XML/wst_200512/AbstractSignChallengeType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -38,7 +38,7 @@ abstract class AbstractSignChallengeType extends AbstractWstElement /** * AbstractSignChallengeType constructor * - * @param \SimpleSAML\WSSecurity\XML\wst\Challenge|null $challenge + * @param \SimpleSAML\WSSecurity\XML\wst_200512\Challenge|null $challenge * @param array<\SimpleSAML\XML\SerializableElementInterface> $children * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes */ @@ -53,7 +53,7 @@ final public function __construct( /** - * @return \SimpleSAML\WSSecurity\XML\wst\Challenge|null + * @return \SimpleSAML\WSSecurity\XML\wst_200512\Challenge|null */ public function getChallenge(): ?Challenge { diff --git a/src/XML/wst/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php similarity index 91% rename from src/XML/wst/AbstractStatusCodeOpenEnum.php rename to src/XML/wst_200512/AbstractStatusCodeOpenEnum.php index c2ae72bd..2369a104 100644 --- a/src/XML/wst/AbstractStatusCodeOpenEnum.php +++ b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -27,7 +27,7 @@ abstract class AbstractStatusCodeOpenEnum extends AbstractWstElement /** - * @param (\SimpleSAML\WSSecurity\XML\wst\StatusCodeEnum|string)[] $values + * @param (\SimpleSAML\WSSecurity\XML\wst_200512\StatusCodeEnum|string)[] $values */ public function __construct(array $values) { diff --git a/src/XML/wst/AbstractStatusType.php b/src/XML/wst_200512/AbstractStatusType.php similarity index 87% rename from src/XML/wst/AbstractStatusType.php rename to src/XML/wst_200512/AbstractStatusType.php index b432eb37..ccb9d817 100644 --- a/src/XML/wst/AbstractStatusType.php +++ b/src/XML/wst_200512/AbstractStatusType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; @@ -20,8 +20,8 @@ abstract class AbstractStatusType extends AbstractWstElement /** * AbstractStatusType constructor * - * @param \SimpleSAML\WSSecurity\XML\wst\Code $code - * @param \SimpleSAML\WSSecurity\XML\wst\Reason|null $reason + * @param \SimpleSAML\WSSecurity\XML\wst_200512\Code $code + * @param \SimpleSAML\WSSecurity\XML\wst_200512\Reason|null $reason */ final public function __construct( protected Code $code, @@ -31,7 +31,7 @@ final public function __construct( /** - * @return \SimpleSAML\WSSecurity\XML\wst\Code + * @return \SimpleSAML\WSSecurity\XML\wst_200512\Code */ public function getCode(): Code { @@ -40,7 +40,7 @@ public function getCode(): Code /** - * @return \SimpleSAML\WSSecurity\XML\wst\Reason|null + * @return \SimpleSAML\WSSecurity\XML\wst_200512\Reason|null */ public function getReason(): ?Reason { diff --git a/src/XML/wst/AbstractUseKeyType.php b/src/XML/wst_200512/AbstractUseKeyType.php similarity index 98% rename from src/XML/wst/AbstractUseKeyType.php rename to src/XML/wst_200512/AbstractUseKeyType.php index 94b9e837..58bbf353 100644 --- a/src/XML/wst/AbstractUseKeyType.php +++ b/src/XML/wst_200512/AbstractUseKeyType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractValidateTargetType.php b/src/XML/wst_200512/AbstractValidateTargetType.php similarity index 97% rename from src/XML/wst/AbstractValidateTargetType.php rename to src/XML/wst_200512/AbstractValidateTargetType.php index aec60cf1..b3592cc1 100644 --- a/src/XML/wst/AbstractValidateTargetType.php +++ b/src/XML/wst_200512/AbstractValidateTargetType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AbstractWstElement.php b/src/XML/wst_200512/AbstractWstElement.php similarity index 80% rename from src/XML/wst/AbstractWstElement.php rename to src/XML/wst_200512/AbstractWstElement.php index 6c04523a..c9f2993b 100644 --- a/src/XML/wst/AbstractWstElement.php +++ b/src/XML/wst_200512/AbstractWstElement.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\XML\AbstractElement; @@ -15,7 +15,7 @@ abstract class AbstractWstElement extends AbstractElement { /** @var string */ - public const NS = C::NS_TRUST; + public const NS = C::NS_TRUST_200512; /** @var string */ public const NS_PREFIX = 'wst'; diff --git a/src/XML/wst/AllowPostdating.php b/src/XML/wst_200512/AllowPostdating.php similarity index 96% rename from src/XML/wst/AllowPostdating.php rename to src/XML/wst_200512/AllowPostdating.php index b43d27d9..98b441bf 100644 --- a/src/XML/wst/AllowPostdating.php +++ b/src/XML/wst_200512/AllowPostdating.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/AuthenticationType.php b/src/XML/wst_200512/AuthenticationType.php similarity index 88% rename from src/XML/wst/AuthenticationType.php rename to src/XML/wst_200512/AuthenticationType.php index 6c97e12a..0b99f69c 100644 --- a/src/XML/wst/AuthenticationType.php +++ b/src/XML/wst_200512/AuthenticationType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Authenticator.php b/src/XML/wst_200512/Authenticator.php similarity index 78% rename from src/XML/wst/Authenticator.php rename to src/XML/wst_200512/Authenticator.php index 5ed0b31d..a5cf8de0 100644 --- a/src/XML/wst/Authenticator.php +++ b/src/XML/wst_200512/Authenticator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * An Authenticator element diff --git a/src/XML/wst/BinaryExchange.php b/src/XML/wst_200512/BinaryExchange.php similarity index 78% rename from src/XML/wst/BinaryExchange.php rename to src/XML/wst_200512/BinaryExchange.php index 987cd804..4b418f6f 100644 --- a/src/XML/wst/BinaryExchange.php +++ b/src/XML/wst_200512/BinaryExchange.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A BinaryExchange element diff --git a/src/XML/wst/BinarySecret.php b/src/XML/wst_200512/BinarySecret.php similarity index 78% rename from src/XML/wst/BinarySecret.php rename to src/XML/wst_200512/BinarySecret.php index 609887a4..d1fee771 100644 --- a/src/XML/wst/BinarySecret.php +++ b/src/XML/wst_200512/BinarySecret.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A BinarySecret element diff --git a/src/XML/wst/BinarySecretTypeEnum.php b/src/XML/wst_200512/BinarySecretTypeEnum.php similarity index 86% rename from src/XML/wst/BinarySecretTypeEnum.php rename to src/XML/wst_200512/BinarySecretTypeEnum.php index 4f1284a2..f6b1e4ac 100644 --- a/src/XML/wst/BinarySecretTypeEnum.php +++ b/src/XML/wst_200512/BinarySecretTypeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; enum BinarySecretTypeEnum: string { diff --git a/src/XML/wst/CancelTarget.php b/src/XML/wst_200512/CancelTarget.php similarity index 78% rename from src/XML/wst/CancelTarget.php rename to src/XML/wst_200512/CancelTarget.php index d33d3dc1..5f290a25 100644 --- a/src/XML/wst/CancelTarget.php +++ b/src/XML/wst_200512/CancelTarget.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A CancelTarget element diff --git a/src/XML/wst/CanonicalizationAlgorithm.php b/src/XML/wst_200512/CanonicalizationAlgorithm.php similarity index 89% rename from src/XML/wst/CanonicalizationAlgorithm.php rename to src/XML/wst_200512/CanonicalizationAlgorithm.php index 7b0ba9e1..3bb2dd6d 100644 --- a/src/XML/wst/CanonicalizationAlgorithm.php +++ b/src/XML/wst_200512/CanonicalizationAlgorithm.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Challenge.php b/src/XML/wst_200512/Challenge.php similarity index 88% rename from src/XML/wst/Challenge.php rename to src/XML/wst_200512/Challenge.php index 54937442..463d3c0d 100644 --- a/src/XML/wst/Challenge.php +++ b/src/XML/wst_200512/Challenge.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst/Claims.php b/src/XML/wst_200512/Claims.php similarity index 76% rename from src/XML/wst/Claims.php rename to src/XML/wst_200512/Claims.php index 164d1855..986efb0b 100644 --- a/src/XML/wst/Claims.php +++ b/src/XML/wst_200512/Claims.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Claims element diff --git a/src/XML/wst/Code.php b/src/XML/wst_200512/Code.php similarity index 76% rename from src/XML/wst/Code.php rename to src/XML/wst_200512/Code.php index a389bad1..b6257f46 100644 --- a/src/XML/wst/Code.php +++ b/src/XML/wst_200512/Code.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Code element diff --git a/src/XML/wst/CombinedHash.php b/src/XML/wst_200512/CombinedHash.php similarity index 88% rename from src/XML/wst/CombinedHash.php rename to src/XML/wst_200512/CombinedHash.php index f94addb3..203ed4a6 100644 --- a/src/XML/wst/CombinedHash.php +++ b/src/XML/wst_200512/CombinedHash.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\Base64ElementTrait; diff --git a/src/XML/wst/ComputedKey.php b/src/XML/wst_200512/ComputedKey.php similarity index 78% rename from src/XML/wst/ComputedKey.php rename to src/XML/wst_200512/ComputedKey.php index 950f47d5..5712a643 100644 --- a/src/XML/wst/ComputedKey.php +++ b/src/XML/wst_200512/ComputedKey.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A ComputedKey element diff --git a/src/XML/wst/ComputedKeyAlgorithm.php b/src/XML/wst_200512/ComputedKeyAlgorithm.php similarity index 89% rename from src/XML/wst/ComputedKeyAlgorithm.php rename to src/XML/wst_200512/ComputedKeyAlgorithm.php index edff45ae..6a329dd6 100644 --- a/src/XML/wst/ComputedKeyAlgorithm.php +++ b/src/XML/wst_200512/ComputedKeyAlgorithm.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/ComputedKeyEnum.php b/src/XML/wst_200512/ComputedKeyEnum.php similarity index 82% rename from src/XML/wst/ComputedKeyEnum.php rename to src/XML/wst_200512/ComputedKeyEnum.php index 61ec0aee..43d17dfa 100644 --- a/src/XML/wst/ComputedKeyEnum.php +++ b/src/XML/wst_200512/ComputedKeyEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; enum ComputedKeyEnum: string { diff --git a/src/XML/wst/Delegatable.php b/src/XML/wst_200512/Delegatable.php similarity index 88% rename from src/XML/wst/Delegatable.php rename to src/XML/wst_200512/Delegatable.php index 75dce365..945917ef 100644 --- a/src/XML/wst/Delegatable.php +++ b/src/XML/wst_200512/Delegatable.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\BooleanElementTrait; diff --git a/src/XML/wst/DelegateTo.php b/src/XML/wst_200512/DelegateTo.php similarity index 77% rename from src/XML/wst/DelegateTo.php rename to src/XML/wst_200512/DelegateTo.php index 3ea0d8e5..ac800451 100644 --- a/src/XML/wst/DelegateTo.php +++ b/src/XML/wst_200512/DelegateTo.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A DelegateTo element diff --git a/src/XML/wst/EncryptWith.php b/src/XML/wst_200512/EncryptWith.php similarity index 88% rename from src/XML/wst/EncryptWith.php rename to src/XML/wst_200512/EncryptWith.php index 02ec460c..311f05fa 100644 --- a/src/XML/wst/EncryptWith.php +++ b/src/XML/wst_200512/EncryptWith.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Encryption.php b/src/XML/wst_200512/Encryption.php similarity index 77% rename from src/XML/wst/Encryption.php rename to src/XML/wst_200512/Encryption.php index 61b842c5..3f8c6f47 100644 --- a/src/XML/wst/Encryption.php +++ b/src/XML/wst_200512/Encryption.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Encryption element diff --git a/src/XML/wst/EncryptionAlgorithm.php b/src/XML/wst_200512/EncryptionAlgorithm.php similarity index 88% rename from src/XML/wst/EncryptionAlgorithm.php rename to src/XML/wst_200512/EncryptionAlgorithm.php index d56410a2..b789b573 100644 --- a/src/XML/wst/EncryptionAlgorithm.php +++ b/src/XML/wst_200512/EncryptionAlgorithm.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Entropy.php b/src/XML/wst_200512/Entropy.php similarity index 76% rename from src/XML/wst/Entropy.php rename to src/XML/wst_200512/Entropy.php index 7f2ed090..40794277 100644 --- a/src/XML/wst/Entropy.php +++ b/src/XML/wst_200512/Entropy.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * An Entropy element diff --git a/src/XML/wst/Forwardable.php b/src/XML/wst_200512/Forwardable.php similarity index 88% rename from src/XML/wst/Forwardable.php rename to src/XML/wst_200512/Forwardable.php index ded68d47..1d317032 100644 --- a/src/XML/wst/Forwardable.php +++ b/src/XML/wst_200512/Forwardable.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\BooleanElementTrait; diff --git a/src/XML/wst/IssuedTokens.php b/src/XML/wst_200512/IssuedTokens.php similarity index 80% rename from src/XML/wst/IssuedTokens.php rename to src/XML/wst_200512/IssuedTokens.php index b16a01ca..4ea26e3d 100644 --- a/src/XML/wst/IssuedTokens.php +++ b/src/XML/wst_200512/IssuedTokens.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A IssuedTokens element diff --git a/src/XML/wst/Issuer.php b/src/XML/wst_200512/Issuer.php similarity index 87% rename from src/XML/wst/Issuer.php rename to src/XML/wst_200512/Issuer.php index c8e155f3..be61f30c 100644 --- a/src/XML/wst/Issuer.php +++ b/src/XML/wst_200512/Issuer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\AbstractEndpointReferenceType; @@ -15,7 +15,7 @@ final class Issuer extends AbstractEndpointReferenceType { /** @var string */ - public const NS = C::NS_TRUST; + public const NS = C::NS_TRUST_200512; /** @var string */ public const NS_PREFIX = 'wst'; diff --git a/src/XML/wst/KeyExchangeToken.php b/src/XML/wst_200512/KeyExchangeToken.php similarity index 79% rename from src/XML/wst/KeyExchangeToken.php rename to src/XML/wst_200512/KeyExchangeToken.php index 97aca55b..8c69e4d5 100644 --- a/src/XML/wst/KeyExchangeToken.php +++ b/src/XML/wst_200512/KeyExchangeToken.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A KeyEchangeToken element diff --git a/src/XML/wst/KeySize.php b/src/XML/wst_200512/KeySize.php similarity index 97% rename from src/XML/wst/KeySize.php rename to src/XML/wst_200512/KeySize.php index 60213365..1571a250 100644 --- a/src/XML/wst/KeySize.php +++ b/src/XML/wst_200512/KeySize.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/KeyType.php b/src/XML/wst_200512/KeyType.php similarity index 76% rename from src/XML/wst/KeyType.php rename to src/XML/wst_200512/KeyType.php index e6d84713..cbe212e0 100644 --- a/src/XML/wst/KeyType.php +++ b/src/XML/wst_200512/KeyType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A KeyType element diff --git a/src/XML/wst/KeyTypeEnum.php b/src/XML/wst_200512/KeyTypeEnum.php similarity index 86% rename from src/XML/wst/KeyTypeEnum.php rename to src/XML/wst_200512/KeyTypeEnum.php index ad731ca5..e1a1e13f 100644 --- a/src/XML/wst/KeyTypeEnum.php +++ b/src/XML/wst_200512/KeyTypeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; enum KeyTypeEnum: string { diff --git a/src/XML/wst/KeyWrapAlgorithm.php b/src/XML/wst_200512/KeyWrapAlgorithm.php similarity index 88% rename from src/XML/wst/KeyWrapAlgorithm.php rename to src/XML/wst_200512/KeyWrapAlgorithm.php index a0089eff..aea9408c 100644 --- a/src/XML/wst/KeyWrapAlgorithm.php +++ b/src/XML/wst_200512/KeyWrapAlgorithm.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Lifetime.php b/src/XML/wst_200512/Lifetime.php similarity index 76% rename from src/XML/wst/Lifetime.php rename to src/XML/wst_200512/Lifetime.php index dde5862f..249ee203 100644 --- a/src/XML/wst/Lifetime.php +++ b/src/XML/wst_200512/Lifetime.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Lifetime element diff --git a/src/XML/wst/OnBehalfOf.php b/src/XML/wst_200512/OnBehalfOf.php similarity index 77% rename from src/XML/wst/OnBehalfOf.php rename to src/XML/wst_200512/OnBehalfOf.php index d7fa3833..e0679fe2 100644 --- a/src/XML/wst/OnBehalfOf.php +++ b/src/XML/wst_200512/OnBehalfOf.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A OnBehalfOf element diff --git a/src/XML/wst/Participant.php b/src/XML/wst_200512/Participant.php similarity index 77% rename from src/XML/wst/Participant.php rename to src/XML/wst_200512/Participant.php index b9f454f5..0f734c34 100644 --- a/src/XML/wst/Participant.php +++ b/src/XML/wst_200512/Participant.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Participant element diff --git a/src/XML/wst/Participants.php b/src/XML/wst_200512/Participants.php similarity index 78% rename from src/XML/wst/Participants.php rename to src/XML/wst_200512/Participants.php index 1352a635..fc9a98b9 100644 --- a/src/XML/wst/Participants.php +++ b/src/XML/wst_200512/Participants.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Participants element diff --git a/src/XML/wst/Primary.php b/src/XML/wst_200512/Primary.php similarity index 76% rename from src/XML/wst/Primary.php rename to src/XML/wst_200512/Primary.php index fe59f1ae..08cdf79d 100644 --- a/src/XML/wst/Primary.php +++ b/src/XML/wst_200512/Primary.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Primary element diff --git a/src/XML/wst/ProofEncryption.php b/src/XML/wst_200512/ProofEncryption.php similarity index 78% rename from src/XML/wst/ProofEncryption.php rename to src/XML/wst_200512/ProofEncryption.php index fa0ee4ee..02174d34 100644 --- a/src/XML/wst/ProofEncryption.php +++ b/src/XML/wst_200512/ProofEncryption.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A ProofEncryption element diff --git a/src/XML/wst/Reason.php b/src/XML/wst_200512/Reason.php similarity index 88% rename from src/XML/wst/Reason.php rename to src/XML/wst_200512/Reason.php index 7d38e6af..12922185 100644 --- a/src/XML/wst/Reason.php +++ b/src/XML/wst_200512/Reason.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\StringElementTrait; diff --git a/src/XML/wst/RenewTarget.php b/src/XML/wst_200512/RenewTarget.php similarity index 77% rename from src/XML/wst/RenewTarget.php rename to src/XML/wst_200512/RenewTarget.php index 72c4bae1..cb102453 100644 --- a/src/XML/wst/RenewTarget.php +++ b/src/XML/wst_200512/RenewTarget.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RenewTarget element diff --git a/src/XML/wst/Renewing.php b/src/XML/wst_200512/Renewing.php similarity index 76% rename from src/XML/wst/Renewing.php rename to src/XML/wst_200512/Renewing.php index 4ba9b855..987674b5 100644 --- a/src/XML/wst/Renewing.php +++ b/src/XML/wst_200512/Renewing.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Renewing element diff --git a/src/XML/wst/RequestKET.php b/src/XML/wst_200512/RequestKET.php similarity index 95% rename from src/XML/wst/RequestKET.php rename to src/XML/wst_200512/RequestKET.php index ac36200c..b5979a21 100644 --- a/src/XML/wst/RequestKET.php +++ b/src/XML/wst_200512/RequestKET.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/RequestSecurityToken.php b/src/XML/wst_200512/RequestSecurityToken.php similarity index 80% rename from src/XML/wst/RequestSecurityToken.php rename to src/XML/wst_200512/RequestSecurityToken.php index 602b7a41..45361fa2 100644 --- a/src/XML/wst/RequestSecurityToken.php +++ b/src/XML/wst_200512/RequestSecurityToken.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestSecurityToken element diff --git a/src/XML/wst/RequestSecurityTokenCollection.php b/src/XML/wst_200512/RequestSecurityTokenCollection.php similarity index 82% rename from src/XML/wst/RequestSecurityTokenCollection.php rename to src/XML/wst_200512/RequestSecurityTokenCollection.php index ea6c9205..57bf1615 100644 --- a/src/XML/wst/RequestSecurityTokenCollection.php +++ b/src/XML/wst_200512/RequestSecurityTokenCollection.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestSecurityTokenCollection element diff --git a/src/XML/wst/RequestSecurityTokenResponse.php b/src/XML/wst_200512/RequestSecurityTokenResponse.php similarity index 82% rename from src/XML/wst/RequestSecurityTokenResponse.php rename to src/XML/wst_200512/RequestSecurityTokenResponse.php index e961dbd0..0265e69a 100644 --- a/src/XML/wst/RequestSecurityTokenResponse.php +++ b/src/XML/wst_200512/RequestSecurityTokenResponse.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestSecurityTokenResponse element diff --git a/src/XML/wst/RequestSecurityTokenResponseCollection.php b/src/XML/wst_200512/RequestSecurityTokenResponseCollection.php similarity index 83% rename from src/XML/wst/RequestSecurityTokenResponseCollection.php rename to src/XML/wst_200512/RequestSecurityTokenResponseCollection.php index d2865fe1..dac61d7c 100644 --- a/src/XML/wst/RequestSecurityTokenResponseCollection.php +++ b/src/XML/wst_200512/RequestSecurityTokenResponseCollection.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestSecurityTokenResponseCollection element diff --git a/src/XML/wst/RequestType.php b/src/XML/wst_200512/RequestType.php similarity index 78% rename from src/XML/wst/RequestType.php rename to src/XML/wst_200512/RequestType.php index 6fe37140..5c4c63bb 100644 --- a/src/XML/wst/RequestType.php +++ b/src/XML/wst_200512/RequestType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestType element diff --git a/src/XML/wst/RequestTypeEnum.php b/src/XML/wst_200512/RequestTypeEnum.php similarity index 90% rename from src/XML/wst/RequestTypeEnum.php rename to src/XML/wst_200512/RequestTypeEnum.php index 7c5a41f9..71190205 100644 --- a/src/XML/wst/RequestTypeEnum.php +++ b/src/XML/wst_200512/RequestTypeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; enum RequestTypeEnum: string { diff --git a/src/XML/wst/RequestedAttachedReference.php b/src/XML/wst_200512/RequestedAttachedReference.php similarity index 81% rename from src/XML/wst/RequestedAttachedReference.php rename to src/XML/wst_200512/RequestedAttachedReference.php index 3767046d..ff2a4052 100644 --- a/src/XML/wst/RequestedAttachedReference.php +++ b/src/XML/wst_200512/RequestedAttachedReference.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestedAttachedReference element diff --git a/src/XML/wst/RequestedProofToken.php b/src/XML/wst_200512/RequestedProofToken.php similarity index 80% rename from src/XML/wst/RequestedProofToken.php rename to src/XML/wst_200512/RequestedProofToken.php index f615047e..427604f1 100644 --- a/src/XML/wst/RequestedProofToken.php +++ b/src/XML/wst_200512/RequestedProofToken.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestedProofToken element diff --git a/src/XML/wst/RequestedSecurityToken.php b/src/XML/wst_200512/RequestedSecurityToken.php similarity index 80% rename from src/XML/wst/RequestedSecurityToken.php rename to src/XML/wst_200512/RequestedSecurityToken.php index 90ce0d18..72609f3c 100644 --- a/src/XML/wst/RequestedSecurityToken.php +++ b/src/XML/wst_200512/RequestedSecurityToken.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestedSecurityToken element diff --git a/src/XML/wst/RequestedTokenCancelled.php b/src/XML/wst_200512/RequestedTokenCancelled.php similarity index 96% rename from src/XML/wst/RequestedTokenCancelled.php rename to src/XML/wst_200512/RequestedTokenCancelled.php index b415325a..5ec8b8d2 100644 --- a/src/XML/wst/RequestedTokenCancelled.php +++ b/src/XML/wst_200512/RequestedTokenCancelled.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use DOMElement; use SimpleSAML\Assert\Assert; diff --git a/src/XML/wst/RequestedUnattachedReference.php b/src/XML/wst_200512/RequestedUnattachedReference.php similarity index 81% rename from src/XML/wst/RequestedUnattachedReference.php rename to src/XML/wst_200512/RequestedUnattachedReference.php index 1bf19c84..98e3c61a 100644 --- a/src/XML/wst/RequestedUnattachedReference.php +++ b/src/XML/wst_200512/RequestedUnattachedReference.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A RequestedUnattachedReference element diff --git a/src/XML/wst/SignChallenge.php b/src/XML/wst_200512/SignChallenge.php similarity index 78% rename from src/XML/wst/SignChallenge.php rename to src/XML/wst_200512/SignChallenge.php index 046870e3..4c7bf46b 100644 --- a/src/XML/wst/SignChallenge.php +++ b/src/XML/wst_200512/SignChallenge.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * An SignChallenge element diff --git a/src/XML/wst/SignChallengeResponse.php b/src/XML/wst_200512/SignChallengeResponse.php similarity index 79% rename from src/XML/wst/SignChallengeResponse.php rename to src/XML/wst_200512/SignChallengeResponse.php index 6e88c6d1..91c6b5c5 100644 --- a/src/XML/wst/SignChallengeResponse.php +++ b/src/XML/wst_200512/SignChallengeResponse.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * An SignChallengeResponse element diff --git a/src/XML/wst/SignWith.php b/src/XML/wst_200512/SignWith.php similarity index 88% rename from src/XML/wst/SignWith.php rename to src/XML/wst_200512/SignWith.php index a38387de..90d5f158 100644 --- a/src/XML/wst/SignWith.php +++ b/src/XML/wst_200512/SignWith.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/SignatureAlgorithm.php b/src/XML/wst_200512/SignatureAlgorithm.php similarity index 88% rename from src/XML/wst/SignatureAlgorithm.php rename to src/XML/wst_200512/SignatureAlgorithm.php index aa48ba70..1bd7e435 100644 --- a/src/XML/wst/SignatureAlgorithm.php +++ b/src/XML/wst_200512/SignatureAlgorithm.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/Status.php b/src/XML/wst_200512/Status.php similarity index 76% rename from src/XML/wst/Status.php rename to src/XML/wst_200512/Status.php index a3660d0c..03cacf42 100644 --- a/src/XML/wst/Status.php +++ b/src/XML/wst_200512/Status.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A Status element diff --git a/src/XML/wst/StatusCodeEnum.php b/src/XML/wst_200512/StatusCodeEnum.php similarity index 82% rename from src/XML/wst/StatusCodeEnum.php rename to src/XML/wst_200512/StatusCodeEnum.php index 97e1c993..cd2eed4c 100644 --- a/src/XML/wst/StatusCodeEnum.php +++ b/src/XML/wst_200512/StatusCodeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; enum StatusCodeEnum: string { diff --git a/src/XML/wst/TokenType.php b/src/XML/wst_200512/TokenType.php similarity index 88% rename from src/XML/wst/TokenType.php rename to src/XML/wst_200512/TokenType.php index a5fbf9bc..d4d08ff3 100644 --- a/src/XML/wst/TokenType.php +++ b/src/XML/wst_200512/TokenType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; use SimpleSAML\XML\URIElementTrait; diff --git a/src/XML/wst/UseKey.php b/src/XML/wst_200512/UseKey.php similarity index 76% rename from src/XML/wst/UseKey.php rename to src/XML/wst_200512/UseKey.php index d52d4f96..ef8e38f0 100644 --- a/src/XML/wst/UseKey.php +++ b/src/XML/wst_200512/UseKey.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A UseKey element diff --git a/src/XML/wst/ValidateTarget.php b/src/XML/wst_200512/ValidateTarget.php similarity index 78% rename from src/XML/wst/ValidateTarget.php rename to src/XML/wst_200512/ValidateTarget.php index 7e1a3997..13b06d60 100644 --- a/src/XML/wst/ValidateTarget.php +++ b/src/XML/wst_200512/ValidateTarget.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\WSSecurity\XML\wst; +namespace SimpleSAML\WSSecurity\XML\wst_200512; /** * A ValidateTarget element diff --git a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php b/tests/WSSecurity/XML/wst_200512/AllowPostdatingTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/AllowPostdatingTest.php rename to tests/WSSecurity/XML/wst_200512/AllowPostdatingTest.php index 3714df9f..30409797 100644 --- a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php +++ b/tests/WSSecurity/XML/wst_200512/AllowPostdatingTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\AllowPostdating; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\AllowPostdating; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\AllowPostdatingTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\AllowPostdatingTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class AllowPostdatingTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = AllowPostdating::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_AllowPostdating.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/AllowPostdating.xml', ); } diff --git a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php b/tests/WSSecurity/XML/wst_200512/AuthenticationTypeTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/AuthenticationTypeTest.php rename to tests/WSSecurity/XML/wst_200512/AuthenticationTypeTest.php index ab8cbf81..b99f394a 100644 --- a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php +++ b/tests/WSSecurity/XML/wst_200512/AuthenticationTypeTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\AuthenticationType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\AuthenticationType; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\AuthenticationTypeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\AuthenticationTypeTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class AuthenticationTypeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = AuthenticationType::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_AuthenticationType.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/AuthenticationType.xml', ); } diff --git a/tests/WSSecurity/XML/wst/AuthenticatorTest.php b/tests/WSSecurity/XML/wst_200512/AuthenticatorTest.php similarity index 80% rename from tests/WSSecurity/XML/wst/AuthenticatorTest.php rename to tests/WSSecurity/XML/wst_200512/AuthenticatorTest.php index 4de7ef64..eb72fb8a 100644 --- a/tests/WSSecurity/XML/wst/AuthenticatorTest.php +++ b/tests/WSSecurity/XML/wst_200512/AuthenticatorTest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractAuthenticatorType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Authenticator; -use SimpleSAML\WSSecurity\XML\wst\CombinedHash; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractAuthenticatorType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Authenticator; +use SimpleSAML\WSSecurity\XML\wst_200512\CombinedHash; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\AuthenticatorTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\AuthenticatorTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class AuthenticatorTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Authenticator::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Authenticator.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Authenticator.xml', ); } diff --git a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php b/tests/WSSecurity/XML/wst_200512/BinaryExchangeTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/BinaryExchangeTest.php rename to tests/WSSecurity/XML/wst_200512/BinaryExchangeTest.php index 76d221d9..e83e20be 100644 --- a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php +++ b/tests/WSSecurity/XML/wst_200512/BinaryExchangeTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractBinaryExchangeType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\BinaryExchange; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractBinaryExchangeType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\BinaryExchange; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -19,7 +19,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\BinaryExchangeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\BinaryExchangeTest * * @package simplesamlphp/ws-security */ @@ -37,12 +37,12 @@ final class BinaryExchangeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = BinaryExchange::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_BinaryExchange.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/BinaryExchange.xml', ); } diff --git a/tests/WSSecurity/XML/wst/BinarySecretTest.php b/tests/WSSecurity/XML/wst_200512/BinarySecretTest.php similarity index 77% rename from tests/WSSecurity/XML/wst/BinarySecretTest.php rename to tests/WSSecurity/XML/wst_200512/BinarySecretTest.php index 31ec2071..fc894aa4 100644 --- a/tests/WSSecurity/XML/wst/BinarySecretTest.php +++ b/tests/WSSecurity/XML/wst_200512/BinarySecretTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractBinarySecretType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\BinarySecret; -use SimpleSAML\WSSecurity\XML\wst\BinarySecretTypeEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractBinarySecretType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\BinarySecret; +use SimpleSAML\WSSecurity\XML\wst_200512\BinarySecretTypeEnum; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\BinarySecretTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\BinarySecretTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class BinarySecretTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = BinarySecret::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_BinarySecret.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/BinarySecret.xml', ); } diff --git a/tests/WSSecurity/XML/wst/CancelTargetTest.php b/tests/WSSecurity/XML/wst_200512/CancelTargetTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/CancelTargetTest.php rename to tests/WSSecurity/XML/wst_200512/CancelTargetTest.php index 46f3f025..a6111559 100644 --- a/tests/WSSecurity/XML/wst/CancelTargetTest.php +++ b/tests/WSSecurity/XML/wst_200512/CancelTargetTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractCancelTargetType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\CancelTarget; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractCancelTargetType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\CancelTarget; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\CancelTargetTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\CancelTargetTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class CancelTargetTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = CancelTarget::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_CancelTarget.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/CancelTarget.xml', ); } diff --git a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php b/tests/WSSecurity/XML/wst_200512/CanonicalizationAlgorithmTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php rename to tests/WSSecurity/XML/wst_200512/CanonicalizationAlgorithmTest.php index 5634a363..0c5ecfff 100644 --- a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php +++ b/tests/WSSecurity/XML/wst_200512/CanonicalizationAlgorithmTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithm; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\CanonicalizationAlgorithm; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithmTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\CanonicalizationAlgorithmTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class CanonicalizationAlgorithmTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = CanonicalizationAlgorithm::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_CanonicalizationAlgorithm.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/CanonicalizationAlgorithm.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ChallengeTest.php b/tests/WSSecurity/XML/wst_200512/ChallengeTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/ChallengeTest.php rename to tests/WSSecurity/XML/wst_200512/ChallengeTest.php index 045b3f18..d310ca9b 100644 --- a/tests/WSSecurity/XML/wst/ChallengeTest.php +++ b/tests/WSSecurity/XML/wst_200512/ChallengeTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Challenge; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Challenge; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ChallengeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ChallengeTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class ChallengeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Challenge::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Challenge.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Challenge.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ClaimsTest.php b/tests/WSSecurity/XML/wst_200512/ClaimsTest.php similarity index 83% rename from tests/WSSecurity/XML/wst/ClaimsTest.php rename to tests/WSSecurity/XML/wst_200512/ClaimsTest.php index ec07a207..ca078a09 100644 --- a/tests/WSSecurity/XML/wst/ClaimsTest.php +++ b/tests/WSSecurity/XML/wst_200512/ClaimsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,9 +10,9 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractClaimsType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Claims; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractClaimsType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Claims; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ClaimsTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ClaimsTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class ClaimsTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Claims::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Claims.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Claims.xml', ); } diff --git a/tests/WSSecurity/XML/wst/CodeTest.php b/tests/WSSecurity/XML/wst_200512/CodeTest.php similarity index 72% rename from tests/WSSecurity/XML/wst/CodeTest.php rename to tests/WSSecurity/XML/wst_200512/CodeTest.php index b16e26aa..657c110c 100644 --- a/tests/WSSecurity/XML/wst/CodeTest.php +++ b/tests/WSSecurity/XML/wst_200512/CodeTest.php @@ -2,22 +2,22 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractStatusCodeOpenEnum; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Code; -use SimpleSAML\WSSecurity\XML\wst\StatusCodeEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractStatusCodeOpenEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Code; +use SimpleSAML\WSSecurity\XML\wst_200512\StatusCodeEnum; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\CodeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\CodeTest * * @package simplesamlphp/ws-security */ @@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void self::$testedClass = Code::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Code.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Code.xml', ); } diff --git a/tests/WSSecurity/XML/wst/CombinedHashTest.php b/tests/WSSecurity/XML/wst_200512/CombinedHashTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/CombinedHashTest.php rename to tests/WSSecurity/XML/wst_200512/CombinedHashTest.php index 448e712b..ebdc97d6 100644 --- a/tests/WSSecurity/XML/wst/CombinedHashTest.php +++ b/tests/WSSecurity/XML/wst_200512/CombinedHashTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\CombinedHash; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\CombinedHash; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\CombinedHashTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\CombinedHashTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class CombinedHashTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = CombinedHash::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_CombinedHash.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/CombinedHash.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php b/tests/WSSecurity/XML/wst_200512/ComputedKeyAlgorithmTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php rename to tests/WSSecurity/XML/wst_200512/ComputedKeyAlgorithmTest.php index 840c4212..ddf05452 100644 --- a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php +++ b/tests/WSSecurity/XML/wst_200512/ComputedKeyAlgorithmTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithm; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyAlgorithm; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithmTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyAlgorithmTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class ComputedKeyAlgorithmTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = ComputedKeyAlgorithm::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_ComputedKeyAlgorithm.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/ComputedKeyAlgorithm.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ComputedKeyTest.php b/tests/WSSecurity/XML/wst_200512/ComputedKeyTest.php similarity index 73% rename from tests/WSSecurity/XML/wst/ComputedKeyTest.php rename to tests/WSSecurity/XML/wst_200512/ComputedKeyTest.php index 11f1489f..95a21841 100644 --- a/tests/WSSecurity/XML/wst/ComputedKeyTest.php +++ b/tests/WSSecurity/XML/wst_200512/ComputedKeyTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractComputedKeyOpenEnum; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\ComputedKey; -use SimpleSAML\WSSecurity\XML\wst\ComputedKeyEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractComputedKeyOpenEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\ComputedKey; +use SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyEnum; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -18,7 +18,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ComputedKeyTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ComputedKeyTest * * @package simplesamlphp/ws-security */ @@ -36,12 +36,12 @@ final class ComputedKeyTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = ComputedKey::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_ComputedKey.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/ComputedKey.xml', ); } diff --git a/tests/WSSecurity/XML/wst/DelegatableTest.php b/tests/WSSecurity/XML/wst_200512/DelegatableTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/DelegatableTest.php rename to tests/WSSecurity/XML/wst_200512/DelegatableTest.php index 12f68594..07d4d9e5 100644 --- a/tests/WSSecurity/XML/wst/DelegatableTest.php +++ b/tests/WSSecurity/XML/wst_200512/DelegatableTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Delegatable; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Delegatable; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\DelegatableTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\DelegatableTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class DelegatableTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Delegatable::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Delegatable.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Delegatable.xml', ); } diff --git a/tests/WSSecurity/XML/wst/DelegateToTest.php b/tests/WSSecurity/XML/wst_200512/DelegateToTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/DelegateToTest.php rename to tests/WSSecurity/XML/wst_200512/DelegateToTest.php index 22699f39..52b0bf54 100644 --- a/tests/WSSecurity/XML/wst/DelegateToTest.php +++ b/tests/WSSecurity/XML/wst_200512/DelegateToTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractDelegateToType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\DelegateTo; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractDelegateToType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\DelegateTo; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\DelegateToTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\DelegateToTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class DelegateToTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = DelegateTo::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_DelegateTo.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/DelegateTo.xml', ); } diff --git a/tests/WSSecurity/XML/wst/EncryptWithTest.php b/tests/WSSecurity/XML/wst_200512/EncryptWithTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/EncryptWithTest.php rename to tests/WSSecurity/XML/wst_200512/EncryptWithTest.php index a8c7022b..2435075a 100644 --- a/tests/WSSecurity/XML/wst/EncryptWithTest.php +++ b/tests/WSSecurity/XML/wst_200512/EncryptWithTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\EncryptWith; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\EncryptWith; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\EncryptWithTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\EncryptWithTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class EncryptWithTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = EncryptWith::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_EncryptWith.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/EncryptWith.xml', ); } diff --git a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php b/tests/WSSecurity/XML/wst_200512/EncryptionAlgorithmTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php rename to tests/WSSecurity/XML/wst_200512/EncryptionAlgorithmTest.php index 1f364d0a..042c67d4 100644 --- a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php +++ b/tests/WSSecurity/XML/wst_200512/EncryptionAlgorithmTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithm; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\EncryptionAlgorithm; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithmTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\EncryptionAlgorithmTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class EncryptionAlgorithmTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = EncryptionAlgorithm::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_EncryptionAlgorithm.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/EncryptionAlgorithm.xml', ); } diff --git a/tests/WSSecurity/XML/wst/EncryptionTest.php b/tests/WSSecurity/XML/wst_200512/EncryptionTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/EncryptionTest.php rename to tests/WSSecurity/XML/wst_200512/EncryptionTest.php index 506892c6..574a8678 100644 --- a/tests/WSSecurity/XML/wst/EncryptionTest.php +++ b/tests/WSSecurity/XML/wst_200512/EncryptionTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractEncryptionType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Encryption; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractEncryptionType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Encryption; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\EncryptionTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\EncryptionTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class EncryptionTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Encryption::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Encryption.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Encryption.xml', ); } diff --git a/tests/WSSecurity/XML/wst/EntropyTest.php b/tests/WSSecurity/XML/wst_200512/EntropyTest.php similarity index 83% rename from tests/WSSecurity/XML/wst/EntropyTest.php rename to tests/WSSecurity/XML/wst_200512/EntropyTest.php index 5254c3b8..e513bdeb 100644 --- a/tests/WSSecurity/XML/wst/EntropyTest.php +++ b/tests/WSSecurity/XML/wst_200512/EntropyTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,9 +10,9 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractEntropyType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Entropy; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractEntropyType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Entropy; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\EntropyTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\EntropyTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class EntropyTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Entropy::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Entropy.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Entropy.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ForwardableTest.php b/tests/WSSecurity/XML/wst_200512/ForwardableTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/ForwardableTest.php rename to tests/WSSecurity/XML/wst_200512/ForwardableTest.php index d0eaa1a2..208ecab3 100644 --- a/tests/WSSecurity/XML/wst/ForwardableTest.php +++ b/tests/WSSecurity/XML/wst_200512/ForwardableTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Forwardable; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Forwardable; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ForwardableTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ForwardableTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class ForwardableTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Forwardable::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Forwardable.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Forwardable.xml', ); } diff --git a/tests/WSSecurity/XML/wst/IssuedTokensTest.php b/tests/WSSecurity/XML/wst_200512/IssuedTokensTest.php similarity index 83% rename from tests/WSSecurity/XML/wst/IssuedTokensTest.php rename to tests/WSSecurity/XML/wst_200512/IssuedTokensTest.php index 77df294a..689cb3ab 100644 --- a/tests/WSSecurity/XML/wst/IssuedTokensTest.php +++ b/tests/WSSecurity/XML/wst_200512/IssuedTokensTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -11,9 +11,9 @@ use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\AbstractEndpointReferenceType; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\IssuedTokens; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\IssuedTokens; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -22,7 +22,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\IssuedTokensTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\IssuedTokensTest * * @package simplesamlphp/ws-security */ @@ -40,12 +40,12 @@ final class IssuedTokensTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = IssuedTokens::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_IssuedTokens.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/IssuedTokens.xml', ); } diff --git a/tests/WSSecurity/XML/wst/IssuerTest.php b/tests/WSSecurity/XML/wst_200512/IssuerTest.php similarity index 92% rename from tests/WSSecurity/XML/wst/IssuerTest.php rename to tests/WSSecurity/XML/wst_200512/IssuerTest.php index a12f06bf..67d8a74b 100644 --- a/tests/WSSecurity/XML/wst/IssuerTest.php +++ b/tests/WSSecurity/XML/wst_200512/IssuerTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use DOMElement; use PHPUnit\Framework\Attributes\CoversClass; @@ -12,8 +12,8 @@ use SimpleSAML\WSSecurity\XML\wsa_200508\Address; use SimpleSAML\WSSecurity\XML\wsa_200508\Metadata; use SimpleSAML\WSSecurity\XML\wsa_200508\ReferenceParameters; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Issuer; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Issuer; use SimpleSAML\XML\Attribute; use SimpleSAML\XML\Chunk; use SimpleSAML\XML\DOMDocumentFactory; @@ -52,7 +52,7 @@ public static function setUpBeforeClass(): void self::$testedClass = Issuer::class; self::$xmlRepresentation = DOMDocumentFactory::FromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Issuer.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Issuer.xml', ); self::$referenceParametersContent = DOMDocumentFactory::fromString( diff --git a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php b/tests/WSSecurity/XML/wst_200512/KeyExchangeTokenTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php rename to tests/WSSecurity/XML/wst_200512/KeyExchangeTokenTest.php index 0050701a..d76c6116 100644 --- a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php +++ b/tests/WSSecurity/XML/wst_200512/KeyExchangeTokenTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractKeyExchangeTokenType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\KeyExchangeToken; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractKeyExchangeTokenType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\KeyExchangeToken; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\KeyExchangeTokenTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\KeyExchangeTokenTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class KeyExchangeTokenTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = KeyExchangeToken::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_KeyExchangeToken.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/KeyExchangeToken.xml', ); } diff --git a/tests/WSSecurity/XML/wst/KeySizeTest.php b/tests/WSSecurity/XML/wst_200512/KeySizeTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/KeySizeTest.php rename to tests/WSSecurity/XML/wst_200512/KeySizeTest.php index 9f100cc9..2dac0561 100644 --- a/tests/WSSecurity/XML/wst/KeySizeTest.php +++ b/tests/WSSecurity/XML/wst_200512/KeySizeTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\KeySize; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\KeySize; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\KeySizeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\KeySizeTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class KeySizeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = KeySize::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_KeySize.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/KeySize.xml', ); } diff --git a/tests/WSSecurity/XML/wst/KeyTypeTest.php b/tests/WSSecurity/XML/wst_200512/KeyTypeTest.php similarity index 73% rename from tests/WSSecurity/XML/wst/KeyTypeTest.php rename to tests/WSSecurity/XML/wst_200512/KeyTypeTest.php index 7b4a31b3..c6a64073 100644 --- a/tests/WSSecurity/XML/wst/KeyTypeTest.php +++ b/tests/WSSecurity/XML/wst_200512/KeyTypeTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractKeyTypeOpenEnum; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\KeyType; -use SimpleSAML\WSSecurity\XML\wst\KeyTypeEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractKeyTypeOpenEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\KeyType; +use SimpleSAML\WSSecurity\XML\wst_200512\KeyTypeEnum; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -18,7 +18,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\KeyTypeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\KeyTypeTest * * @package simplesamlphp/ws-security */ @@ -36,12 +36,12 @@ final class KeyTypeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = KeyType::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_KeyType.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/KeyType.xml', ); } diff --git a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php b/tests/WSSecurity/XML/wst_200512/KeyWrapAlgorithmTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php rename to tests/WSSecurity/XML/wst_200512/KeyWrapAlgorithmTest.php index 2fef90e1..2d1e19a3 100644 --- a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php +++ b/tests/WSSecurity/XML/wst_200512/KeyWrapAlgorithmTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithm; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\KeyWrapAlgorithm; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithmTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\KeyWrapAlgorithmTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class KeyWrapAlgorithmTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = KeyWrapAlgorithm::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_KeyWrapAlgorithm.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/KeyWrapAlgorithm.xml', ); } diff --git a/tests/WSSecurity/XML/wst/LifetimeTest.php b/tests/WSSecurity/XML/wst_200512/LifetimeTest.php similarity index 84% rename from tests/WSSecurity/XML/wst/LifetimeTest.php rename to tests/WSSecurity/XML/wst_200512/LifetimeTest.php index e24d984d..22ad2197 100644 --- a/tests/WSSecurity/XML/wst/LifetimeTest.php +++ b/tests/WSSecurity/XML/wst_200512/LifetimeTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use DateTimeImmutable; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractLifetimeType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Lifetime; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractLifetimeType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Lifetime; use SimpleSAML\WSSecurity\XML\wsu\Created; use SimpleSAML\WSSecurity\XML\wsu\Expires; use SimpleSAML\XML\DOMDocumentFactory; @@ -38,12 +38,12 @@ final class LifetimeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Lifetime::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Lifetime.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Lifetime.xml', ); } diff --git a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php b/tests/WSSecurity/XML/wst_200512/OnBehalfOfTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/OnBehalfOfTest.php rename to tests/WSSecurity/XML/wst_200512/OnBehalfOfTest.php index 719fd793..d5c4186c 100644 --- a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php +++ b/tests/WSSecurity/XML/wst_200512/OnBehalfOfTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractOnBehalfOfType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\OnBehalfOf; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractOnBehalfOfType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\OnBehalfOf; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\OnBehalfOfTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\OnBehalfOfTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class OnBehalfOfTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = OnBehalfOf::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_OnBehalfOf.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/OnBehalfOf.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ParticipantTest.php b/tests/WSSecurity/XML/wst_200512/ParticipantTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/ParticipantTest.php rename to tests/WSSecurity/XML/wst_200512/ParticipantTest.php index c26e237b..89aa30da 100644 --- a/tests/WSSecurity/XML/wst/ParticipantTest.php +++ b/tests/WSSecurity/XML/wst_200512/ParticipantTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Participant; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractParticipantType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Participant; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -19,7 +19,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ParticipantTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ParticipantTest * * @package simplesamlphp/ws-security */ @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void self::$testedClass = Participant::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Participant.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Participant.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ParticipantsTest.php b/tests/WSSecurity/XML/wst_200512/ParticipantsTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/ParticipantsTest.php rename to tests/WSSecurity/XML/wst_200512/ParticipantsTest.php index 533d038f..8f897374 100644 --- a/tests/WSSecurity/XML/wst/ParticipantsTest.php +++ b/tests/WSSecurity/XML/wst_200512/ParticipantsTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,11 +10,11 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantsType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Participant; -use SimpleSAML\WSSecurity\XML\wst\Participants; -use SimpleSAML\WSSecurity\XML\wst\Primary; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractParticipantsType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Participant; +use SimpleSAML\WSSecurity\XML\wst_200512\Participants; +use SimpleSAML\WSSecurity\XML\wst_200512\Primary; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -23,7 +23,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ParticipantsTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ParticipantsTest * * @package simplesamlphp/ws-security */ @@ -41,12 +41,12 @@ final class ParticipantsTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Participants::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Participants.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Participants.xml', ); } @@ -78,7 +78,7 @@ public function testMarshalling(): void */ public function testMarshallingEmptyElement(): void { - $wstns = C::NS_TRUST; + $wstns = C::NS_TRUST_200512; $participants = new Participants(); $this->assertEquals( "", diff --git a/tests/WSSecurity/XML/wst/PrimaryTest.php b/tests/WSSecurity/XML/wst_200512/PrimaryTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/PrimaryTest.php rename to tests/WSSecurity/XML/wst_200512/PrimaryTest.php index 6720a7a5..46ba105f 100644 --- a/tests/WSSecurity/XML/wst/PrimaryTest.php +++ b/tests/WSSecurity/XML/wst_200512/PrimaryTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Primary; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractParticipantType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Primary; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -19,7 +19,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\PrimaryTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\PrimaryTest * * @package simplesamlphp/ws-security */ @@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void self::$testedClass = Primary::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Primary.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Primary.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php b/tests/WSSecurity/XML/wst_200512/ProofEncryptionTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/ProofEncryptionTest.php rename to tests/WSSecurity/XML/wst_200512/ProofEncryptionTest.php index c38dab1d..1fbb9a6d 100644 --- a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php +++ b/tests/WSSecurity/XML/wst_200512/ProofEncryptionTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractProofEncryptionType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\ProofEncryption; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractProofEncryptionType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\ProofEncryption; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ProofEncryptionTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ProofEncryptionTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class ProofEncryptionTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = ProofEncryption::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_ProofEncryption.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/ProofEncryption.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ReasonTest.php b/tests/WSSecurity/XML/wst_200512/ReasonTest.php similarity index 77% rename from tests/WSSecurity/XML/wst/ReasonTest.php rename to tests/WSSecurity/XML/wst_200512/ReasonTest.php index b08231a6..d778efad 100644 --- a/tests/WSSecurity/XML/wst/ReasonTest.php +++ b/tests/WSSecurity/XML/wst_200512/ReasonTest.php @@ -2,20 +2,20 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Reason; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Reason; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ReasonTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ReasonTest * * @package simplesamlphp/ws-security */ @@ -34,7 +34,7 @@ public static function setUpBeforeClass(): void self::$testedClass = Reason::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Reason.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Reason.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RenewTargetTest.php b/tests/WSSecurity/XML/wst_200512/RenewTargetTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/RenewTargetTest.php rename to tests/WSSecurity/XML/wst_200512/RenewTargetTest.php index 15c61653..95f6edd6 100644 --- a/tests/WSSecurity/XML/wst/RenewTargetTest.php +++ b/tests/WSSecurity/XML/wst_200512/RenewTargetTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRenewTargetType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RenewTarget; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRenewTargetType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RenewTarget; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RenewTargetTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RenewTargetTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class RenewTargetTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RenewTarget::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RenewTarget.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RenewTarget.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RenewingTest.php b/tests/WSSecurity/XML/wst_200512/RenewingTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/RenewingTest.php rename to tests/WSSecurity/XML/wst_200512/RenewingTest.php index 0e978de9..0d465b1f 100644 --- a/tests/WSSecurity/XML/wst/RenewingTest.php +++ b/tests/WSSecurity/XML/wst_200512/RenewingTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractRenewingType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Renewing; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRenewingType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Renewing; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RenewingTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RenewingTest * * @package simplesamlphp/ws-security */ @@ -35,12 +35,12 @@ final class RenewingTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Renewing::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Renewing.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Renewing.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestKETTest.php b/tests/WSSecurity/XML/wst_200512/RequestKETTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/RequestKETTest.php rename to tests/WSSecurity/XML/wst_200512/RequestKETTest.php index 81e7f0d1..c8bba330 100644 --- a/tests/WSSecurity/XML/wst/RequestKETTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestKETTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestKET; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestKET; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestKETTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestKETTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class RequestKETTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestKET::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestKET.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestKET.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenCollectionTest.php similarity index 80% rename from tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php rename to tests/WSSecurity/XML/wst_200512/RequestSecurityTokenCollectionTest.php index a69c2b2c..fbf93d61 100644 --- a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenCollectionTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,10 +10,10 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenCollectionType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollection; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestSecurityTokenCollectionType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenCollection; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -22,7 +22,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollectionTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenCollectionTest * * @package simplesamlphp/ws-security */ @@ -40,12 +40,12 @@ final class RequestSecurityTokenCollectionTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestSecurityTokenCollection::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestSecurityTokenCollection.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestSecurityTokenCollection.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php rename to tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php index 8234f746..0f5c4f09 100644 --- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseCollectionTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,10 +10,10 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseCollectionType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollection; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestSecurityTokenResponseCollectionType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseCollection; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -22,7 +22,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollectionTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseCollectionTest * * @package simplesamlphp/ws-security */ @@ -40,12 +40,12 @@ final class RequestSecurityTokenResponseCollectionTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestSecurityTokenResponseCollection::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestSecurityTokenResponseCollection.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseTest.php similarity index 82% rename from tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php rename to tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseTest.php index cd0efd8f..27a8cd06 100644 --- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenResponseTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,9 +10,9 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestSecurityTokenResponseType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponse; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class RequestSecurityTokenResponseTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestSecurityTokenResponse::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestSecurityTokenResponse.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestSecurityTokenResponse.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenTest.php similarity index 82% rename from tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php rename to tests/WSSecurity/XML/wst_200512/RequestSecurityTokenTest.php index 762889ad..eb6754a9 100644 --- a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestSecurityTokenTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,9 +10,9 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestSecurityTokenType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class RequestSecurityTokenTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestSecurityToken::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestSecurityToken.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestSecurityToken.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestTypeTest.php b/tests/WSSecurity/XML/wst_200512/RequestTypeTest.php similarity index 73% rename from tests/WSSecurity/XML/wst/RequestTypeTest.php rename to tests/WSSecurity/XML/wst_200512/RequestTypeTest.php index 3dcdd66e..8935a13b 100644 --- a/tests/WSSecurity/XML/wst/RequestTypeTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestTypeTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestTypeOpenEnum; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestType; -use SimpleSAML\WSSecurity\XML\wst\RequestTypeEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestTypeOpenEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestType; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestTypeEnum; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -18,7 +18,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestTypeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestTypeTest * * @package simplesamlphp/ws-security */ @@ -36,12 +36,12 @@ final class RequestTypeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestType::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestType.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestType.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php b/tests/WSSecurity/XML/wst_200512/RequestedAttachedReferenceTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php rename to tests/WSSecurity/XML/wst_200512/RequestedAttachedReferenceTest.php index 9a105f3b..d0d98d4b 100644 --- a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestedAttachedReferenceTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReference; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestedReferenceType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestedAttachedReference; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Chunk; use SimpleSAML\XML\DOMDocumentFactory; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReferenceTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestedAttachedReferenceTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class RequestedAttachedReferenceTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestedAttachedReference::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestedAttachedReference.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestedAttachedReference.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php b/tests/WSSecurity/XML/wst_200512/RequestedProofTokenTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/RequestedProofTokenTest.php rename to tests/WSSecurity/XML/wst_200512/RequestedProofTokenTest.php index 437f6400..1faff752 100644 --- a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestedProofTokenTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedProofTokenType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestedProofToken; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestedProofTokenType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestedProofToken; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestedProofTokenTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestedProofTokenTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class RequestedProofTokenTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestedProofToken::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestedProofToken.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestedProofToken.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php b/tests/WSSecurity/XML/wst_200512/RequestedSecurityTokenTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php rename to tests/WSSecurity/XML/wst_200512/RequestedSecurityTokenTest.php index c3cd6267..83a730e1 100644 --- a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestedSecurityTokenTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedSecurityTokenType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestedSecurityToken; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestedSecurityTokenType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestedSecurityToken; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestedSecurityTokenTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestedSecurityTokenTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class RequestedSecurityTokenTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestedSecurityToken::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestedSecurityToken.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestedSecurityToken.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php b/tests/WSSecurity/XML/wst_200512/RequestedTokenCancelledTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php rename to tests/WSSecurity/XML/wst_200512/RequestedTokenCancelledTest.php index 78f8303d..2e26bda6 100644 --- a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestedTokenCancelledTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelled; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestedTokenCancelled; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,7 +16,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelledTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestedTokenCancelledTest * * @package simplesamlphp/ws-security */ @@ -33,12 +33,12 @@ final class RequestedTokenCancelledTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestedTokenCancelled::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestedTokenCancelled.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestedTokenCancelled.xml', ); } diff --git a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php b/tests/WSSecurity/XML/wst_200512/RequestedUnattachedReferenceTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php rename to tests/WSSecurity/XML/wst_200512/RequestedUnattachedReferenceTest.php index e9476daa..d87d6a5a 100644 --- a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php +++ b/tests/WSSecurity/XML/wst_200512/RequestedUnattachedReferenceTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference; -use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReference; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractRequestedReferenceType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\RequestedUnattachedReference; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\Chunk; use SimpleSAML\XML\DOMDocumentFactory; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReferenceTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\RequestedUnattachedReferenceTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class RequestedUnattachedReferenceTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = RequestedUnattachedReference::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_RequestedUnattachedReference.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/RequestedUnattachedReference.xml', ); } diff --git a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php b/tests/WSSecurity/XML/wst_200512/SignChallengeResponseTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/SignChallengeResponseTest.php rename to tests/WSSecurity/XML/wst_200512/SignChallengeResponseTest.php index 7e780d37..e6d02bd6 100644 --- a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php +++ b/tests/WSSecurity/XML/wst_200512/SignChallengeResponseTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,10 +10,10 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Challenge; -use SimpleSAML\WSSecurity\XML\wst\SignChallengeResponse; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractSignChallengeType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Challenge; +use SimpleSAML\WSSecurity\XML\wst_200512\SignChallengeResponse; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -22,7 +22,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\SignChallengeResponseTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\SignChallengeResponseTest * * @package simplesamlphp/ws-security */ @@ -40,12 +40,12 @@ final class SignChallengeResponseTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = SignChallengeResponse::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_SignChallengeResponse.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/SignChallengeResponse.xml', ); } diff --git a/tests/WSSecurity/XML/wst/SignChallengeTest.php b/tests/WSSecurity/XML/wst_200512/SignChallengeTest.php similarity index 81% rename from tests/WSSecurity/XML/wst/SignChallengeTest.php rename to tests/WSSecurity/XML/wst_200512/SignChallengeTest.php index 7d27484d..8eb8a53e 100644 --- a/tests/WSSecurity/XML/wst/SignChallengeTest.php +++ b/tests/WSSecurity/XML/wst_200512/SignChallengeTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,10 +10,10 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Challenge; -use SimpleSAML\WSSecurity\XML\wst\SignChallenge; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractSignChallengeType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Challenge; +use SimpleSAML\WSSecurity\XML\wst_200512\SignChallenge; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -22,7 +22,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\SignChallengeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\SignChallengeTest * * @package simplesamlphp/ws-security */ @@ -40,12 +40,12 @@ final class SignChallengeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = SignChallenge::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_SignChallenge.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/SignChallenge.xml', ); } diff --git a/tests/WSSecurity/XML/wst/SignWithTest.php b/tests/WSSecurity/XML/wst_200512/SignWithTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/SignWithTest.php rename to tests/WSSecurity/XML/wst_200512/SignWithTest.php index 5a211af4..5244f35c 100644 --- a/tests/WSSecurity/XML/wst/SignWithTest.php +++ b/tests/WSSecurity/XML/wst_200512/SignWithTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\SignWith; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\SignWith; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\SignWithTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\SignWithTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class SignWithTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = SignWith::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_SignWith.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/SignWith.xml', ); } diff --git a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php b/tests/WSSecurity/XML/wst_200512/SignatureAlgorithmTest.php similarity index 78% rename from tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php rename to tests/WSSecurity/XML/wst_200512/SignatureAlgorithmTest.php index 0f36ced3..8065d65d 100644 --- a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php +++ b/tests/WSSecurity/XML/wst_200512/SignatureAlgorithmTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithm; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\SignatureAlgorithm; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithmTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\SignatureAlgorithmTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class SignatureAlgorithmTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = SignatureAlgorithm::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_SignatureAlgorithm.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/SignatureAlgorithm.xml', ); } diff --git a/tests/WSSecurity/XML/wst/StatusTest.php b/tests/WSSecurity/XML/wst_200512/StatusTest.php similarity index 71% rename from tests/WSSecurity/XML/wst/StatusTest.php rename to tests/WSSecurity/XML/wst_200512/StatusTest.php index 00de174d..fe367448 100644 --- a/tests/WSSecurity/XML/wst/StatusTest.php +++ b/tests/WSSecurity/XML/wst_200512/StatusTest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use SimpleSAML\WSSecurity\XML\wst\AbstractStatusType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\Code; -use SimpleSAML\WSSecurity\XML\wst\Reason; -use SimpleSAML\WSSecurity\XML\wst\Status; -use SimpleSAML\WSSecurity\XML\wst\StatusCodeEnum; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractStatusType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\Code; +use SimpleSAML\WSSecurity\XML\wst_200512\Reason; +use SimpleSAML\WSSecurity\XML\wst_200512\Status; +use SimpleSAML\WSSecurity\XML\wst_200512\StatusCodeEnum; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\StatusTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\StatusTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class StatusTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = Status::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_Status.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/Status.xml', ); } diff --git a/tests/WSSecurity/XML/wst/TokenTypeTest.php b/tests/WSSecurity/XML/wst_200512/TokenTypeTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/TokenTypeTest.php rename to tests/WSSecurity/XML/wst_200512/TokenTypeTest.php index 620942f8..57338a77 100644 --- a/tests/WSSecurity/XML/wst/TokenTypeTest.php +++ b/tests/WSSecurity/XML/wst_200512/TokenTypeTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\Test\WSSecurity\Constants as C; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\TokenType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\TokenType; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -17,7 +17,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\TokenTypeTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\TokenTypeTest * * @package simplesamlphp/ws-security */ @@ -34,12 +34,12 @@ final class TokenTypeTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = TokenType::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_TokenType.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/TokenType.xml', ); } diff --git a/tests/WSSecurity/XML/wst/UseKeyTest.php b/tests/WSSecurity/XML/wst_200512/UseKeyTest.php similarity index 82% rename from tests/WSSecurity/XML/wst/UseKeyTest.php rename to tests/WSSecurity/XML/wst_200512/UseKeyTest.php index 6df2b070..4bbc08a6 100644 --- a/tests/WSSecurity/XML/wst/UseKeyTest.php +++ b/tests/WSSecurity/XML/wst_200512/UseKeyTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; @@ -10,9 +10,9 @@ use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\Test\WSSecurity\Constants as C; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractUseKeyType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\UseKey; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractUseKeyType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\UseKey; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -21,7 +21,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\UseKeyTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\UseKeyTest * * @package simplesamlphp/ws-security */ @@ -39,12 +39,12 @@ final class UseKeyTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = UseKey::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_UseKey.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/UseKey.xml', ); } diff --git a/tests/WSSecurity/XML/wst/ValidateTargetTest.php b/tests/WSSecurity/XML/wst_200512/ValidateTargetTest.php similarity index 79% rename from tests/WSSecurity/XML/wst/ValidateTargetTest.php rename to tests/WSSecurity/XML/wst_200512/ValidateTargetTest.php index 0ddf8158..8a8762d9 100644 --- a/tests/WSSecurity/XML/wst/ValidateTargetTest.php +++ b/tests/WSSecurity/XML/wst_200512/ValidateTargetTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace SimpleSAML\Test\WSSecurity\XML\wst; +namespace SimpleSAML\Test\WSSecurity\XML\wst_200512; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use SimpleSAML\SOAP\Constants as SOAP; use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID; -use SimpleSAML\WSSecurity\XML\wst\AbstractValidateTargetType; -use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement; -use SimpleSAML\WSSecurity\XML\wst\ValidateTarget; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractValidateTargetType; +use SimpleSAML\WSSecurity\XML\wst_200512\AbstractWstElement; +use SimpleSAML\WSSecurity\XML\wst_200512\ValidateTarget; use SimpleSAML\XML\Attribute as XMLAttribute; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait; @@ -20,7 +20,7 @@ use function dirname; /** - * Class \SimpleSAML\WSSecurity\XML\wst\ValidateTargetTest + * Class \SimpleSAML\WSSecurity\XML\wst_200512\ValidateTargetTest * * @package simplesamlphp/ws-security */ @@ -38,12 +38,12 @@ final class ValidateTargetTest extends TestCase */ public static function setUpBeforeClass(): void { - self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust.xsd'; + self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/ws-trust-200512.xsd'; self::$testedClass = ValidateTarget::class; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 4) . '/resources/xml/wst_ValidateTarget.xml', + dirname(__FILE__, 4) . '/resources/xml/wst/200512/ValidateTarget.xml', ); } diff --git a/tests/resources/xml/wst_AllowPostdating.xml b/tests/resources/xml/wst/200512/AllowPostdating.xml similarity index 100% rename from tests/resources/xml/wst_AllowPostdating.xml rename to tests/resources/xml/wst/200512/AllowPostdating.xml diff --git a/tests/resources/xml/wst_AuthenticationType.xml b/tests/resources/xml/wst/200512/AuthenticationType.xml similarity index 100% rename from tests/resources/xml/wst_AuthenticationType.xml rename to tests/resources/xml/wst/200512/AuthenticationType.xml diff --git a/tests/resources/xml/wst_Authenticator.xml b/tests/resources/xml/wst/200512/Authenticator.xml similarity index 100% rename from tests/resources/xml/wst_Authenticator.xml rename to tests/resources/xml/wst/200512/Authenticator.xml diff --git a/tests/resources/xml/wst_BinaryExchange.xml b/tests/resources/xml/wst/200512/BinaryExchange.xml similarity index 100% rename from tests/resources/xml/wst_BinaryExchange.xml rename to tests/resources/xml/wst/200512/BinaryExchange.xml diff --git a/tests/resources/xml/wst_BinarySecret.xml b/tests/resources/xml/wst/200512/BinarySecret.xml similarity index 100% rename from tests/resources/xml/wst_BinarySecret.xml rename to tests/resources/xml/wst/200512/BinarySecret.xml diff --git a/tests/resources/xml/wst_CancelTarget.xml b/tests/resources/xml/wst/200512/CancelTarget.xml similarity index 100% rename from tests/resources/xml/wst_CancelTarget.xml rename to tests/resources/xml/wst/200512/CancelTarget.xml diff --git a/tests/resources/xml/wst_CanonicalizationAlgorithm.xml b/tests/resources/xml/wst/200512/CanonicalizationAlgorithm.xml similarity index 100% rename from tests/resources/xml/wst_CanonicalizationAlgorithm.xml rename to tests/resources/xml/wst/200512/CanonicalizationAlgorithm.xml diff --git a/tests/resources/xml/wst_Challenge.xml b/tests/resources/xml/wst/200512/Challenge.xml similarity index 100% rename from tests/resources/xml/wst_Challenge.xml rename to tests/resources/xml/wst/200512/Challenge.xml diff --git a/tests/resources/xml/wst_Claims.xml b/tests/resources/xml/wst/200512/Claims.xml similarity index 100% rename from tests/resources/xml/wst_Claims.xml rename to tests/resources/xml/wst/200512/Claims.xml diff --git a/tests/resources/xml/wst_Code.xml b/tests/resources/xml/wst/200512/Code.xml similarity index 100% rename from tests/resources/xml/wst_Code.xml rename to tests/resources/xml/wst/200512/Code.xml diff --git a/tests/resources/xml/wst_CombinedHash.xml b/tests/resources/xml/wst/200512/CombinedHash.xml similarity index 100% rename from tests/resources/xml/wst_CombinedHash.xml rename to tests/resources/xml/wst/200512/CombinedHash.xml diff --git a/tests/resources/xml/wst_ComputedKey.xml b/tests/resources/xml/wst/200512/ComputedKey.xml similarity index 100% rename from tests/resources/xml/wst_ComputedKey.xml rename to tests/resources/xml/wst/200512/ComputedKey.xml diff --git a/tests/resources/xml/wst_ComputedKeyAlgorithm.xml b/tests/resources/xml/wst/200512/ComputedKeyAlgorithm.xml similarity index 100% rename from tests/resources/xml/wst_ComputedKeyAlgorithm.xml rename to tests/resources/xml/wst/200512/ComputedKeyAlgorithm.xml diff --git a/tests/resources/xml/wst_Delegatable.xml b/tests/resources/xml/wst/200512/Delegatable.xml similarity index 100% rename from tests/resources/xml/wst_Delegatable.xml rename to tests/resources/xml/wst/200512/Delegatable.xml diff --git a/tests/resources/xml/wst_DelegateTo.xml b/tests/resources/xml/wst/200512/DelegateTo.xml similarity index 100% rename from tests/resources/xml/wst_DelegateTo.xml rename to tests/resources/xml/wst/200512/DelegateTo.xml diff --git a/tests/resources/xml/wst_EncryptWith.xml b/tests/resources/xml/wst/200512/EncryptWith.xml similarity index 100% rename from tests/resources/xml/wst_EncryptWith.xml rename to tests/resources/xml/wst/200512/EncryptWith.xml diff --git a/tests/resources/xml/wst_Encryption.xml b/tests/resources/xml/wst/200512/Encryption.xml similarity index 100% rename from tests/resources/xml/wst_Encryption.xml rename to tests/resources/xml/wst/200512/Encryption.xml diff --git a/tests/resources/xml/wst_EncryptionAlgorithm.xml b/tests/resources/xml/wst/200512/EncryptionAlgorithm.xml similarity index 100% rename from tests/resources/xml/wst_EncryptionAlgorithm.xml rename to tests/resources/xml/wst/200512/EncryptionAlgorithm.xml diff --git a/tests/resources/xml/wst_Entropy.xml b/tests/resources/xml/wst/200512/Entropy.xml similarity index 100% rename from tests/resources/xml/wst_Entropy.xml rename to tests/resources/xml/wst/200512/Entropy.xml diff --git a/tests/resources/xml/wst_Forwardable.xml b/tests/resources/xml/wst/200512/Forwardable.xml similarity index 100% rename from tests/resources/xml/wst_Forwardable.xml rename to tests/resources/xml/wst/200512/Forwardable.xml diff --git a/tests/resources/xml/wst_IssuedTokens.xml b/tests/resources/xml/wst/200512/IssuedTokens.xml similarity index 100% rename from tests/resources/xml/wst_IssuedTokens.xml rename to tests/resources/xml/wst/200512/IssuedTokens.xml diff --git a/tests/resources/xml/wst_Issuer.xml b/tests/resources/xml/wst/200512/Issuer.xml similarity index 100% rename from tests/resources/xml/wst_Issuer.xml rename to tests/resources/xml/wst/200512/Issuer.xml diff --git a/tests/resources/xml/wst_KeyExchangeToken.xml b/tests/resources/xml/wst/200512/KeyExchangeToken.xml similarity index 100% rename from tests/resources/xml/wst_KeyExchangeToken.xml rename to tests/resources/xml/wst/200512/KeyExchangeToken.xml diff --git a/tests/resources/xml/wst_KeySize.xml b/tests/resources/xml/wst/200512/KeySize.xml similarity index 100% rename from tests/resources/xml/wst_KeySize.xml rename to tests/resources/xml/wst/200512/KeySize.xml diff --git a/tests/resources/xml/wst_KeyType.xml b/tests/resources/xml/wst/200512/KeyType.xml similarity index 100% rename from tests/resources/xml/wst_KeyType.xml rename to tests/resources/xml/wst/200512/KeyType.xml diff --git a/tests/resources/xml/wst_KeyWrapAlgorithm.xml b/tests/resources/xml/wst/200512/KeyWrapAlgorithm.xml similarity index 100% rename from tests/resources/xml/wst_KeyWrapAlgorithm.xml rename to tests/resources/xml/wst/200512/KeyWrapAlgorithm.xml diff --git a/tests/resources/xml/wst_Lifetime.xml b/tests/resources/xml/wst/200512/Lifetime.xml similarity index 100% rename from tests/resources/xml/wst_Lifetime.xml rename to tests/resources/xml/wst/200512/Lifetime.xml diff --git a/tests/resources/xml/wst_OnBehalfOf.xml b/tests/resources/xml/wst/200512/OnBehalfOf.xml similarity index 100% rename from tests/resources/xml/wst_OnBehalfOf.xml rename to tests/resources/xml/wst/200512/OnBehalfOf.xml diff --git a/tests/resources/xml/wst_Participant.xml b/tests/resources/xml/wst/200512/Participant.xml similarity index 100% rename from tests/resources/xml/wst_Participant.xml rename to tests/resources/xml/wst/200512/Participant.xml diff --git a/tests/resources/xml/wst_Participants.xml b/tests/resources/xml/wst/200512/Participants.xml similarity index 100% rename from tests/resources/xml/wst_Participants.xml rename to tests/resources/xml/wst/200512/Participants.xml diff --git a/tests/resources/xml/wst_Primary.xml b/tests/resources/xml/wst/200512/Primary.xml similarity index 100% rename from tests/resources/xml/wst_Primary.xml rename to tests/resources/xml/wst/200512/Primary.xml diff --git a/tests/resources/xml/wst_ProofEncryption.xml b/tests/resources/xml/wst/200512/ProofEncryption.xml similarity index 100% rename from tests/resources/xml/wst_ProofEncryption.xml rename to tests/resources/xml/wst/200512/ProofEncryption.xml diff --git a/tests/resources/xml/wst_Reason.xml b/tests/resources/xml/wst/200512/Reason.xml similarity index 100% rename from tests/resources/xml/wst_Reason.xml rename to tests/resources/xml/wst/200512/Reason.xml diff --git a/tests/resources/xml/wst_RenewTarget.xml b/tests/resources/xml/wst/200512/RenewTarget.xml similarity index 100% rename from tests/resources/xml/wst_RenewTarget.xml rename to tests/resources/xml/wst/200512/RenewTarget.xml diff --git a/tests/resources/xml/wst_Renewing.xml b/tests/resources/xml/wst/200512/Renewing.xml similarity index 100% rename from tests/resources/xml/wst_Renewing.xml rename to tests/resources/xml/wst/200512/Renewing.xml diff --git a/tests/resources/xml/wst_RequestKET.xml b/tests/resources/xml/wst/200512/RequestKET.xml similarity index 100% rename from tests/resources/xml/wst_RequestKET.xml rename to tests/resources/xml/wst/200512/RequestKET.xml diff --git a/tests/resources/xml/wst_RequestSecurityToken.xml b/tests/resources/xml/wst/200512/RequestSecurityToken.xml similarity index 100% rename from tests/resources/xml/wst_RequestSecurityToken.xml rename to tests/resources/xml/wst/200512/RequestSecurityToken.xml diff --git a/tests/resources/xml/wst_RequestSecurityTokenCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml similarity index 100% rename from tests/resources/xml/wst_RequestSecurityTokenCollection.xml rename to tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml diff --git a/tests/resources/xml/wst_RequestSecurityTokenResponse.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml similarity index 100% rename from tests/resources/xml/wst_RequestSecurityTokenResponse.xml rename to tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml diff --git a/tests/resources/xml/wst_RequestSecurityTokenResponseCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml similarity index 100% rename from tests/resources/xml/wst_RequestSecurityTokenResponseCollection.xml rename to tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml diff --git a/tests/resources/xml/wst_RequestType.xml b/tests/resources/xml/wst/200512/RequestType.xml similarity index 100% rename from tests/resources/xml/wst_RequestType.xml rename to tests/resources/xml/wst/200512/RequestType.xml diff --git a/tests/resources/xml/wst_RequestedAttachedReference.xml b/tests/resources/xml/wst/200512/RequestedAttachedReference.xml similarity index 100% rename from tests/resources/xml/wst_RequestedAttachedReference.xml rename to tests/resources/xml/wst/200512/RequestedAttachedReference.xml diff --git a/tests/resources/xml/wst_RequestedProofToken.xml b/tests/resources/xml/wst/200512/RequestedProofToken.xml similarity index 100% rename from tests/resources/xml/wst_RequestedProofToken.xml rename to tests/resources/xml/wst/200512/RequestedProofToken.xml diff --git a/tests/resources/xml/wst_RequestedSecurityToken.xml b/tests/resources/xml/wst/200512/RequestedSecurityToken.xml similarity index 100% rename from tests/resources/xml/wst_RequestedSecurityToken.xml rename to tests/resources/xml/wst/200512/RequestedSecurityToken.xml diff --git a/tests/resources/xml/wst_RequestedTokenCancelled.xml b/tests/resources/xml/wst/200512/RequestedTokenCancelled.xml similarity index 100% rename from tests/resources/xml/wst_RequestedTokenCancelled.xml rename to tests/resources/xml/wst/200512/RequestedTokenCancelled.xml diff --git a/tests/resources/xml/wst_RequestedUnattachedReference.xml b/tests/resources/xml/wst/200512/RequestedUnattachedReference.xml similarity index 100% rename from tests/resources/xml/wst_RequestedUnattachedReference.xml rename to tests/resources/xml/wst/200512/RequestedUnattachedReference.xml diff --git a/tests/resources/xml/wst_SignChallenge.xml b/tests/resources/xml/wst/200512/SignChallenge.xml similarity index 100% rename from tests/resources/xml/wst_SignChallenge.xml rename to tests/resources/xml/wst/200512/SignChallenge.xml diff --git a/tests/resources/xml/wst_SignChallengeResponse.xml b/tests/resources/xml/wst/200512/SignChallengeResponse.xml similarity index 100% rename from tests/resources/xml/wst_SignChallengeResponse.xml rename to tests/resources/xml/wst/200512/SignChallengeResponse.xml diff --git a/tests/resources/xml/wst_SignWith.xml b/tests/resources/xml/wst/200512/SignWith.xml similarity index 100% rename from tests/resources/xml/wst_SignWith.xml rename to tests/resources/xml/wst/200512/SignWith.xml diff --git a/tests/resources/xml/wst_SignatureAlgorithm.xml b/tests/resources/xml/wst/200512/SignatureAlgorithm.xml similarity index 100% rename from tests/resources/xml/wst_SignatureAlgorithm.xml rename to tests/resources/xml/wst/200512/SignatureAlgorithm.xml diff --git a/tests/resources/xml/wst_Status.xml b/tests/resources/xml/wst/200512/Status.xml similarity index 100% rename from tests/resources/xml/wst_Status.xml rename to tests/resources/xml/wst/200512/Status.xml diff --git a/tests/resources/xml/wst_TokenType.xml b/tests/resources/xml/wst/200512/TokenType.xml similarity index 100% rename from tests/resources/xml/wst_TokenType.xml rename to tests/resources/xml/wst/200512/TokenType.xml diff --git a/tests/resources/xml/wst_UseKey.xml b/tests/resources/xml/wst/200512/UseKey.xml similarity index 100% rename from tests/resources/xml/wst_UseKey.xml rename to tests/resources/xml/wst/200512/UseKey.xml diff --git a/tests/resources/xml/wst_ValidateTarget.xml b/tests/resources/xml/wst/200512/ValidateTarget.xml similarity index 100% rename from tests/resources/xml/wst_ValidateTarget.xml rename to tests/resources/xml/wst/200512/ValidateTarget.xml