Refactor assertions

Author: tvdijen

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/ReferenceIdentifierTrait.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**

src/XML/auth/AbstractAdditionalContextType.php

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

src/XML/auth/AbstractClaimType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\auth\ConstrainedValue;
 use SimpleSAML\WSSecurity\XML\auth\Description;
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;

src/XML/auth/AbstractConstrainedManyValueType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 /**

src/XML/auth/AbstractConstrainedSingleValueType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 

src/XML/auth/AbstractConstrainedValueType.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;

src/XML/auth/AbstractContextItemType.php

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

src/XML/auth/AbstractDescriptionType.php

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