Refactor assertions

composer.json

@@ -14,14 +14,14 @@
         "ext-dom": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "~1.7.0",
-        "simplesamlphp/composer-xmlprovider-installer": "~1.0.0",
+        "simplesamlphp/assert": "~1.8.1",
+        "simplesamlphp/composer-xmlprovider-installer": "~1.0.1",
         "simplesamlphp/saml2": "^5@dev",
-        "simplesamlphp/xml-security": "~1.12.0",
-        "simplesamlphp/xml-common": "~1.23.2"
+        "simplesamlphp/xml-security": "~1.13.0",
+        "simplesamlphp/xml-common": "~1.24.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.8"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"
     },
     "autoload": {
         "psr-4": {

src/Assert/Assert.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WSSecurity\Assert;
+
+use SimpleSAML\XMLSecurity\Assert\Assert as BaseAssert;
+
+/**
+ * @package simplesamlphp/ws-security
+ */
+class Assert extends BaseAssert
+{
+}

src/XML/fed/AbstractSignOutType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;

src/XML/fed/SecurityTokenServiceType.php

@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\XML\md\{ContactPerson, Extensions, KeyDescriptor, Organization};
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;

src/XML/sp_200507/AbstractHeaderType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;

src/XML/sp_200702/AbstractHeaderType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;

src/XML/wsa_200408/AbstractRelationshipType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;

src/XML/wsa_200408/AbstractServiceNameType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;

src/XML/wsaw/AbstractServiceNameType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\QNameElementTrait;

src/XML/wsp/Policy.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;

src/XML/wsp/PolicyReference.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
@@ -43,7 +43,7 @@ public function __construct(
         array $namespacedAttributes = [],
     ) {
         Assert::validURI($URI, SchemaViolationException::class);
-        Assert::nullOrStringPlausibleBase64($Digest, SchemaViolationException::class);
+        Assert::nullOrValidBase64($Digest, SchemaViolationException::class);
         Assert::nullOrValidURI($DigestAlgorithm, SchemaViolationException::class);
 
         $this->setAttributesNS($namespacedAttributes);

src/XML/wsse/AbstractAttributedString.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;

src/XML/wsse/AbstractSecurityTokenReferenceType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;

src/XML/wsse/AbstractUsernameTokenType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;

src/XML/wst_200502/AbstractBinarySecretType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;

src/XML/wst_200502/AbstractComputedKeyOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200502/AbstractKeyTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200502/AbstractRequestTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200502/AbstractStatusCodeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200512/AbstractBinarySecretType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;

src/XML/wst_200512/AbstractComputedKeyOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200512/AbstractKeyTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200512/AbstractRequestTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wst_200512/AbstractStatusCodeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

src/XML/wsu/AbstractAttributedDateTime.php

@@ -6,7 +6,7 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Exception\ProtocolViolationException;
 use SimpleSAML\XML\Attribute as XMLAttribute;

src/XML/wsu/AbstractAttributedURI.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;

src/XML/wsu/AbstractTimestamp.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;