diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c81c5b0..184e416 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.2', '8.3', '8.4', '8.5']
+        php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.6
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.6
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
     with:
       enable_eslinter: false
       enable_jsonlinter: true
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.3', '8.4', '8.5']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -53,7 +53,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, pcre, spl, xml
+          extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: pcov
@@ -107,7 +107,7 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.3', '8.4', '8.5']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -115,7 +115,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, pcre, spl, xml
+          extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: none
@@ -160,8 +160,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.2'
-          extensions: ctype, date, dom, pcre, spl, xml
+          php-version: '8.3'
+          extensions: ctype, date, dom, intl, pcre, sodium, spl, xml
           tools: composer
           coverage: none
 
diff --git a/composer.json b/composer.json
index 412e1b7..3c7945a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-dom": "*",
 
         "simplesamlphp/assert": "~1.9",
@@ -19,7 +19,7 @@
         "simplesamlphp/xml-wss-core": "~1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10",
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11",
         "simplesamlphp/xml-soap": "~2.0"
     },
     "autoload": {
diff --git a/src/Constants.php b/src/Constants.php
index 7303fd9..f454da3 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -15,46 +15,46 @@ class Constants extends \SimpleSAML\XML\Constants
     /**
      * The namespace for WS-Addressing protocol.
      */
-    public const NS_ADDR_200408 = 'http://schemas.xmlsoap.org/ws/2004/08/addressing';
+    public const string NS_ADDR_200408 = 'http://schemas.xmlsoap.org/ws/2004/08/addressing';
 
-    public const NS_ADDR_200508 = 'http://www.w3.org/2005/08/addressing';
+    public const string NS_ADDR_200508 = 'http://www.w3.org/2005/08/addressing';
 
     /**
      * The namespace for the WS-Addressing - Metadata.
      */
-    public const NS_ADDR_METADATA = 'http://www.w3.org/2007/02/addressing/metadata';
+    public const string NS_ADDR_METADATA = 'http://www.w3.org/2007/02/addressing/metadata';
 
     /**
      * The namespace for the WS-Addressing - WSDL Binding.
      */
-    public const NS_ADDR_WSDL = 'http://www.w3.org/2006/05/addressing/wsdl';
+    public const string NS_ADDR_WSDL = 'http://www.w3.org/2006/05/addressing/wsdl';
 
     /**
      * The schema-defined wsa fault codes
      */
-    public const WSA_FAULT_INVALID_ADDRESSING_HEADER = 'InvalidAddressingHeader';
+    public const string WSA_FAULT_INVALID_ADDRESSING_HEADER = 'InvalidAddressingHeader';
 
-    public const WSA_FAULT_INVALID_ADDRESS = 'InvalidAddress';
+    public const string WSA_FAULT_INVALID_ADDRESS = 'InvalidAddress';
 
-    public const WSA_FAULT_INVALID_EPR = 'InvalidEPR';
+    public const string WSA_FAULT_INVALID_EPR = 'InvalidEPR';
 
-    public const WSA_FAULT_INVALID_CARDINALITY = 'InvalidCardinality';
+    public const string WSA_FAULT_INVALID_CARDINALITY = 'InvalidCardinality';
 
-    public const WSA_FAULT_MISSING_ADDRESS_IN_EPR = 'MissingAddressInEPR';
+    public const string WSA_FAULT_MISSING_ADDRESS_IN_EPR = 'MissingAddressInEPR';
 
-    public const WSA_FAULT_DUPLICATE_MESSAGEID = 'DupicateMessageID';
+    public const string WSA_FAULT_DUPLICATE_MESSAGEID = 'DupicateMessageID';
 
-    public const WSA_FAULT_ACTION_MISMATCH = 'ActionMismatch';
+    public const string WSA_FAULT_ACTION_MISMATCH = 'ActionMismatch';
 
-    public const WSA_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED = 'MessageAddressingHeaderRequired';
+    public const string WSA_FAULT_MESSAGE_ADDRESSING_HEADER_REQUIRED = 'MessageAddressingHeaderRequired';
 
-    public const WSA_FAULT_DESTINATION_UNREACHABLE = 'DestinationUnreachable';
+    public const string WSA_FAULT_DESTINATION_UNREACHABLE = 'DestinationUnreachable';
 
-    public const WSA_FAULT_ACTION_NOT_SUPPORTED = 'ActionNotSupported';
+    public const string WSA_FAULT_ACTION_NOT_SUPPORTED = 'ActionNotSupported';
 
-    public const WSA_FAULT_ENDPOINT_UNAVAILABLE = 'EndpointUnavailable';
+    public const string WSA_FAULT_ENDPOINT_UNAVAILABLE = 'EndpointUnavailable';
 
-    public const FAULT_CODES = [
+    public const array FAULT_CODES = [
         self::WSA_FAULT_INVALID_ADDRESSING_HEADER,
         self::WSA_FAULT_INVALID_ADDRESS,
         self::WSA_FAULT_INVALID_EPR,
diff --git a/src/XML/wsa_200408/AbstractAttributedQNameType.php b/src/XML/wsa_200408/AbstractAttributedQNameType.php
index d1d1d97..8fb5e94 100644
--- a/src/XML/wsa_200408/AbstractAttributedQNameType.php
+++ b/src/XML/wsa_200408/AbstractAttributedQNameType.php
@@ -27,11 +27,10 @@ abstract class AbstractAttributedQNameType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
     /** The namespace-attribute for the xs:anyElement element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -51,7 +50,6 @@ final public function __construct(QNameValue $value, array $namespacedAttributes
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractAttributedURIType.php b/src/XML/wsa_200408/AbstractAttributedURIType.php
index c0172c3..fff4b55 100644
--- a/src/XML/wsa_200408/AbstractAttributedURIType.php
+++ b/src/XML/wsa_200408/AbstractAttributedURIType.php
@@ -27,11 +27,10 @@ abstract class AbstractAttributedURIType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -51,7 +50,6 @@ final public function __construct(AnyURIValue $value, array $namespacedAttribute
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractEndpointReferenceType.php b/src/XML/wsa_200408/AbstractEndpointReferenceType.php
index 17b8b7b..676a672 100644
--- a/src/XML/wsa_200408/AbstractEndpointReferenceType.php
+++ b/src/XML/wsa_200408/AbstractEndpointReferenceType.php
@@ -32,10 +32,10 @@ abstract class AbstractEndpointReferenceType extends AbstractWsaElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -126,7 +126,6 @@ public function getServiceName(): ?ServiceName
      * Note: this method cannot be used when extending this class, if the constructor has a different signature.
      *
      * @param \DOMElement $xml The XML element we should load.
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
@@ -175,7 +174,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this endpoint reference to an XML element.
      *
      * @param \DOMElement|null $parent The element we should append this endpoint to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractRelationshipType.php b/src/XML/wsa_200408/AbstractRelationshipType.php
index 4096174..26e5c22 100644
--- a/src/XML/wsa_200408/AbstractRelationshipType.php
+++ b/src/XML/wsa_200408/AbstractRelationshipType.php
@@ -28,11 +28,10 @@ abstract class AbstractRelationshipType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -65,7 +64,6 @@ public function getRelationshipType(): ?QNameValue
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -87,7 +85,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractRetryAfterType.php b/src/XML/wsa_200408/AbstractRetryAfterType.php
index 62005f5..3e4c710 100644
--- a/src/XML/wsa_200408/AbstractRetryAfterType.php
+++ b/src/XML/wsa_200408/AbstractRetryAfterType.php
@@ -27,11 +27,10 @@ abstract class AbstractRetryAfterType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = NonNegativeIntegerValue::class;
+    public const string TEXTCONTENT_TYPE = NonNegativeIntegerValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -53,7 +52,6 @@ final public function __construct(
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -71,7 +69,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractServiceNameType.php b/src/XML/wsa_200408/AbstractServiceNameType.php
index 7e2f3c7..3b33273 100644
--- a/src/XML/wsa_200408/AbstractServiceNameType.php
+++ b/src/XML/wsa_200408/AbstractServiceNameType.php
@@ -28,11 +28,10 @@ abstract class AbstractServiceNameType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
     /** The namespace-attribute for the xs:anyElement element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -65,7 +64,6 @@ public function getPortName(): ?NCNameValue
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -87,7 +85,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/AbstractWsaElement.php b/src/XML/wsa_200408/AbstractWsaElement.php
index 7904430..2e2ad54 100644
--- a/src/XML/wsa_200408/AbstractWsaElement.php
+++ b/src/XML/wsa_200408/AbstractWsaElement.php
@@ -14,12 +14,9 @@
  */
 abstract class AbstractWsaElement extends AbstractElement
 {
-    /** @var string */
-    public const NS = C::NS_ADDR_200408;
+    public const string NS = C::NS_ADDR_200408;
 
-    /** @var string */
-    public const NS_PREFIX = 'wsa';
+    public const string NS_PREFIX = 'wsa';
 
-    /** @var string */
-    public const SCHEMA = 'resources/schemas/ws-addr-200408.xsd';
+    public const string SCHEMA = 'resources/schemas/ws-addr-200408.xsd';
 }
diff --git a/src/XML/wsa_200408/ReferenceParameters.php b/src/XML/wsa_200408/ReferenceParameters.php
index a509a9e..6877e1f 100644
--- a/src/XML/wsa_200408/ReferenceParameters.php
+++ b/src/XML/wsa_200408/ReferenceParameters.php
@@ -21,7 +21,7 @@ final class ReferenceParameters extends AbstractWsaElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
+    public const string XS_ANY_ELT_NAMESPACE = NS::ANY;
 
 
     /**
@@ -37,8 +37,6 @@ public function __construct(array $children = [])
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -50,7 +48,6 @@ public function isEmptyElement(): bool
      * Convert XML into an ReferenceParameters element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -70,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this ReferenceParameters to XML.
      *
      * @param \DOMElement|null $parent The element we should add this ReferenceParameters to.
-     * @return \DOMElement This Header-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200408/ReferenceProperties.php b/src/XML/wsa_200408/ReferenceProperties.php
index c682aee..623f22a 100644
--- a/src/XML/wsa_200408/ReferenceProperties.php
+++ b/src/XML/wsa_200408/ReferenceProperties.php
@@ -21,7 +21,7 @@ final class ReferenceProperties extends AbstractWsaElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
+    public const string XS_ANY_ELT_NAMESPACE = NS::ANY;
 
 
     /**
@@ -37,8 +37,6 @@ public function __construct(array $children = [])
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -50,7 +48,6 @@ public function isEmptyElement(): bool
      * Convert XML into an ReferenceProperties element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -70,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this ReferenceProperties to XML.
      *
      * @param \DOMElement|null $parent The element we should add this ReferenceProperties to.
-     * @return \DOMElement This Header-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractAttributedQNameType.php b/src/XML/wsa_200508/AbstractAttributedQNameType.php
index f5c0a20..05c0685 100644
--- a/src/XML/wsa_200508/AbstractAttributedQNameType.php
+++ b/src/XML/wsa_200508/AbstractAttributedQNameType.php
@@ -27,11 +27,10 @@ abstract class AbstractAttributedQNameType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
     /** The namespace-attribute for the xs:anyElement element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -51,7 +50,6 @@ final public function __construct(QNameValue $value, array $namespacedAttributes
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractAttributedURIType.php b/src/XML/wsa_200508/AbstractAttributedURIType.php
index 4f5a0e4..16d291d 100644
--- a/src/XML/wsa_200508/AbstractAttributedURIType.php
+++ b/src/XML/wsa_200508/AbstractAttributedURIType.php
@@ -27,11 +27,10 @@ abstract class AbstractAttributedURIType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -51,7 +50,6 @@ final public function __construct(AnyURIValue $value, array $namespacedAttribute
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractAttributedUnsignedLongType.php b/src/XML/wsa_200508/AbstractAttributedUnsignedLongType.php
index d3b9b88..5357b4a 100644
--- a/src/XML/wsa_200508/AbstractAttributedUnsignedLongType.php
+++ b/src/XML/wsa_200508/AbstractAttributedUnsignedLongType.php
@@ -27,11 +27,10 @@ abstract class AbstractAttributedUnsignedLongType extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = UnsignedLongValue::class;
+    public const string TEXTCONTENT_TYPE = UnsignedLongValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -51,7 +50,6 @@ final public function __construct(UnsignedLongValue $value, array $namespacedAtt
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -69,7 +67,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractEndpointReferenceType.php b/src/XML/wsa_200508/AbstractEndpointReferenceType.php
index d5e27b4..fcb2cbd 100644
--- a/src/XML/wsa_200508/AbstractEndpointReferenceType.php
+++ b/src/XML/wsa_200508/AbstractEndpointReferenceType.php
@@ -32,10 +32,10 @@ abstract class AbstractEndpointReferenceType extends AbstractWsaElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -100,7 +100,6 @@ public function getMetadata(): ?Metadata
      * Note: this method cannot be used when extending this class, if the constructor has a different signature.
      *
      * @param \DOMElement $xml The XML element we should load.
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
@@ -141,7 +140,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this endpoint reference to an XML element.
      *
      * @param \DOMElement $parent The element we should append this endpoint to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractProblemActionType.php b/src/XML/wsa_200508/AbstractProblemActionType.php
index f25af77..5fcbb79 100644
--- a/src/XML/wsa_200508/AbstractProblemActionType.php
+++ b/src/XML/wsa_200508/AbstractProblemActionType.php
@@ -23,7 +23,7 @@ abstract class AbstractProblemActionType extends AbstractWsaElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -44,8 +44,6 @@ final public function __construct(
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -57,7 +55,6 @@ public function isEmptyElement(): bool
      * Convert this element to XML.
      *
      * @param \DOMElement|null $parent The element we should append this element to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/AbstractWsaElement.php b/src/XML/wsa_200508/AbstractWsaElement.php
index bf973b9..6371d32 100644
--- a/src/XML/wsa_200508/AbstractWsaElement.php
+++ b/src/XML/wsa_200508/AbstractWsaElement.php
@@ -14,12 +14,9 @@
  */
 abstract class AbstractWsaElement extends AbstractElement
 {
-    /** @var string */
-    public const NS = C::NS_ADDR_200508;
+    public const string NS = C::NS_ADDR_200508;
 
-    /** @var string */
-    public const NS_PREFIX = 'wsa10';
+    public const string NS_PREFIX = 'wsa10';
 
-    /** @var string */
-    public const SCHEMA = 'resources/schemas/ws-addr-200508.xsd';
+    public const string SCHEMA = 'resources/schemas/ws-addr-200508.xsd';
 }
diff --git a/src/XML/wsa_200508/Metadata.php b/src/XML/wsa_200508/Metadata.php
index 41241d3..f3ecc99 100644
--- a/src/XML/wsa_200508/Metadata.php
+++ b/src/XML/wsa_200508/Metadata.php
@@ -26,10 +26,10 @@ final class Metadata extends AbstractWsaElement implements SchemaValidatableElem
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
+    public const string XS_ANY_ELT_NAMESPACE = NS::ANY;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -47,8 +47,6 @@ public function __construct(array $children = [], array $namespacedAttributes =
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -60,7 +58,6 @@ public function isEmptyElement(): bool
      * Convert XML into an Metadata element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -81,7 +78,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Metadata to XML.
      *
      * @param \DOMElement|null $parent The element we should add this Metadata to.
-     * @return \DOMElement This Metadata-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/ProblemAction.php b/src/XML/wsa_200508/ProblemAction.php
index dc2dda8..6348e3f 100644
--- a/src/XML/wsa_200508/ProblemAction.php
+++ b/src/XML/wsa_200508/ProblemAction.php
@@ -27,7 +27,6 @@ final class ProblemAction extends AbstractProblemActionType implements SchemaVal
      * Convert XML into a class instance
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
diff --git a/src/XML/wsa_200508/ReferenceParameters.php b/src/XML/wsa_200508/ReferenceParameters.php
index 8002644..28feff3 100644
--- a/src/XML/wsa_200508/ReferenceParameters.php
+++ b/src/XML/wsa_200508/ReferenceParameters.php
@@ -26,10 +26,10 @@ final class ReferenceParameters extends AbstractWsaElement implements SchemaVali
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
+    public const string XS_ANY_ELT_NAMESPACE = NS::ANY;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -47,8 +47,6 @@ public function __construct(array $children = [], array $namespacedAttributes =
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -60,7 +58,6 @@ public function isEmptyElement(): bool
      * Convert XML into an ReferenceParameters element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -81,7 +78,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this ReferenceParameters to XML.
      *
      * @param \DOMElement|null $parent The element we should add this ReferenceParameters to.
-     * @return \DOMElement This Header-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/RelatesTo.php b/src/XML/wsa_200508/RelatesTo.php
index 3381b11..00a6cbf 100644
--- a/src/XML/wsa_200508/RelatesTo.php
+++ b/src/XML/wsa_200508/RelatesTo.php
@@ -26,11 +26,10 @@ final class RelatesTo extends AbstractWsaElement implements SchemaValidatableEle
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -65,7 +64,6 @@ public function getRelationshipType(): ?AnyURIValue
      * Convert XML into an RelatesTo element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -87,7 +85,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this RelatesTo to XML.
      *
      * @param \DOMElement|null $parent The element we should add this RelatesTo to.
-     * @return \DOMElement This Header-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsa_200508/SoapAction.php b/src/XML/wsa_200508/SoapAction.php
index 3d50dc2..665803d 100644
--- a/src/XML/wsa_200508/SoapAction.php
+++ b/src/XML/wsa_200508/SoapAction.php
@@ -15,6 +15,5 @@ final class SoapAction extends AbstractWsaElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 }
diff --git a/src/XML/wsam/AbstractAddressing.php b/src/XML/wsam/AbstractAddressing.php
index 7462f97..4833b03 100644
--- a/src/XML/wsam/AbstractAddressing.php
+++ b/src/XML/wsam/AbstractAddressing.php
@@ -20,7 +20,7 @@ abstract class AbstractAddressing extends AbstractWsamElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -39,8 +39,6 @@ public function __construct(
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -63,7 +61,6 @@ public function getPolicy(): Policy
      * Convert this Addressing to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this Addressing.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsam/AbstractAnonymousResponses.php b/src/XML/wsam/AbstractAnonymousResponses.php
index eda03ab..5817648 100644
--- a/src/XML/wsam/AbstractAnonymousResponses.php
+++ b/src/XML/wsam/AbstractAnonymousResponses.php
@@ -19,7 +19,7 @@ abstract class AbstractAnonymousResponses extends AbstractWsamElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -36,8 +36,6 @@ public function __construct(
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -49,7 +47,6 @@ public function isEmptyElement(): bool
      * Convert this AnonymousResponses to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this AnonymousResponses.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsam/AbstractAttributedQNameType.php b/src/XML/wsam/AbstractAttributedQNameType.php
index f962bfc..944244e 100644
--- a/src/XML/wsam/AbstractAttributedQNameType.php
+++ b/src/XML/wsam/AbstractAttributedQNameType.php
@@ -22,10 +22,9 @@ abstract class AbstractAttributedQNameType extends AbstractWsamElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
 
     /**
@@ -47,7 +46,6 @@ public function __construct(
      * Convert this AttributedQNameType to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this AttributedQNameType.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsam/AbstractNonAnonymousResponses.php b/src/XML/wsam/AbstractNonAnonymousResponses.php
index 70b3992..75bf770 100644
--- a/src/XML/wsam/AbstractNonAnonymousResponses.php
+++ b/src/XML/wsam/AbstractNonAnonymousResponses.php
@@ -19,7 +19,7 @@ abstract class AbstractNonAnonymousResponses extends AbstractWsamElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -36,8 +36,6 @@ public function __construct(
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -49,7 +47,6 @@ public function isEmptyElement(): bool
      * Convert this NonAnonymousResponses to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this NonAnonymousResponses.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsam/AbstractServiceNameType.php b/src/XML/wsam/AbstractServiceNameType.php
index fd953a8..4d4f737 100644
--- a/src/XML/wsam/AbstractServiceNameType.php
+++ b/src/XML/wsam/AbstractServiceNameType.php
@@ -23,10 +23,9 @@ abstract class AbstractServiceNameType extends AbstractWsamElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
 
     /**
@@ -61,7 +60,6 @@ public function getEndpointName(): ?NCNameValue
      * Convert this ServiceNameType to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this ServiceNameType.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsam/AbstractWsamElement.php b/src/XML/wsam/AbstractWsamElement.php
index 12438f3..091fb5c 100644
--- a/src/XML/wsam/AbstractWsamElement.php
+++ b/src/XML/wsam/AbstractWsamElement.php
@@ -16,12 +16,9 @@
  */
 abstract class AbstractWsamElement extends AbstractElement
 {
-    /** @var string */
-    public const NS = C::NS_ADDR_METADATA;
+    public const string NS = C::NS_ADDR_METADATA;
 
-    /** @var string */
-    public const NS_PREFIX = 'wsam';
+    public const string NS_PREFIX = 'wsam';
 
-    /** @var string */
-    public const SCHEMA = 'resources/schemas/ws-addr-metadata.xsd';
+    public const string SCHEMA = 'resources/schemas/ws-addr-metadata.xsd';
 }
diff --git a/src/XML/wsam/Addressing.php b/src/XML/wsam/Addressing.php
index 04fea3d..2ee6293 100644
--- a/src/XML/wsam/Addressing.php
+++ b/src/XML/wsam/Addressing.php
@@ -27,7 +27,6 @@ final class Addressing extends AbstractAddressing implements SchemaValidatableEl
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsam/AnonymousResponses.php b/src/XML/wsam/AnonymousResponses.php
index 1dc4b95..3fbf24e 100644
--- a/src/XML/wsam/AnonymousResponses.php
+++ b/src/XML/wsam/AnonymousResponses.php
@@ -24,7 +24,6 @@ final class AnonymousResponses extends AbstractAnonymousResponses implements Sch
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsam/InterfaceName.php b/src/XML/wsam/InterfaceName.php
index 56664f5..9787d49 100644
--- a/src/XML/wsam/InterfaceName.php
+++ b/src/XML/wsam/InterfaceName.php
@@ -25,7 +25,6 @@ final class InterfaceName extends AbstractAttributedQNameType implements SchemaV
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsam/NonAnonymousResponses.php b/src/XML/wsam/NonAnonymousResponses.php
index aebf453..3a8fabc 100644
--- a/src/XML/wsam/NonAnonymousResponses.php
+++ b/src/XML/wsam/NonAnonymousResponses.php
@@ -24,7 +24,6 @@ final class NonAnonymousResponses extends AbstractNonAnonymousResponses implemen
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsam/ServiceName.php b/src/XML/wsam/ServiceName.php
index f2c52ad..22d85e8 100644
--- a/src/XML/wsam/ServiceName.php
+++ b/src/XML/wsam/ServiceName.php
@@ -26,7 +26,6 @@ final class ServiceName extends AbstractServiceNameType implements SchemaValidat
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsam/UsingAddressing.php b/src/XML/wsam/UsingAddressing.php
index a0bc7d7..aa3dde3 100644
--- a/src/XML/wsam/UsingAddressing.php
+++ b/src/XML/wsam/UsingAddressing.php
@@ -24,7 +24,7 @@ final class UsingAddressing extends AbstractWsamElement implements SchemaValidat
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -43,7 +43,6 @@ final public function __construct(
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
@@ -61,7 +60,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this UsingAddressing to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this UsingAddressing.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsaw/AbstractAnonymousType.php b/src/XML/wsaw/AbstractAnonymousType.php
index 30f05ee..4ba2faf 100644
--- a/src/XML/wsaw/AbstractAnonymousType.php
+++ b/src/XML/wsaw/AbstractAnonymousType.php
@@ -37,7 +37,6 @@ public function getValue(): AnonymousEnum
      * Convert this Anomymous to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this Anonymous.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsaw/AbstractAttributedQNameType.php b/src/XML/wsaw/AbstractAttributedQNameType.php
index 77807b5..a580042 100644
--- a/src/XML/wsaw/AbstractAttributedQNameType.php
+++ b/src/XML/wsaw/AbstractAttributedQNameType.php
@@ -22,10 +22,9 @@ abstract class AbstractAttributedQNameType extends AbstractWsawElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
 
     /**
@@ -47,7 +46,6 @@ public function __construct(
      * Convert this AttributedQNameType to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this AttributedQNameType.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsaw/AbstractServiceNameType.php b/src/XML/wsaw/AbstractServiceNameType.php
index c486e0c..8b54b91 100644
--- a/src/XML/wsaw/AbstractServiceNameType.php
+++ b/src/XML/wsaw/AbstractServiceNameType.php
@@ -23,10 +23,9 @@ abstract class AbstractServiceNameType extends AbstractWsawElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 
 
     /**
@@ -61,7 +60,6 @@ public function getEndpointName(): ?NCNameValue
      * Convert this ServiceNameType to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this ServiceNameType.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsaw/AbstractWsawElement.php b/src/XML/wsaw/AbstractWsawElement.php
index 13a7225..eb8ba77 100644
--- a/src/XML/wsaw/AbstractWsawElement.php
+++ b/src/XML/wsaw/AbstractWsawElement.php
@@ -16,12 +16,9 @@
  */
 abstract class AbstractWsawElement extends AbstractElement
 {
-    /** @var string */
-    public const NS = C::NS_ADDR_WSDL;
+    public const string NS = C::NS_ADDR_WSDL;
 
-    /** @var string */
-    public const NS_PREFIX = 'wsaw';
+    public const string NS_PREFIX = 'wsaw';
 
-    /** @var string */
-    public const SCHEMA = 'resources/schemas/ws-addr-wsdl.xsd';
+    public const string SCHEMA = 'resources/schemas/ws-addr-wsdl.xsd';
 }
diff --git a/src/XML/wsaw/Anonymous.php b/src/XML/wsaw/Anonymous.php
index 07d10c2..1ff38e7 100644
--- a/src/XML/wsaw/Anonymous.php
+++ b/src/XML/wsaw/Anonymous.php
@@ -28,7 +28,7 @@ final class Anonymous extends AbstractAnonymousType implements SchemaValidatable
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -50,7 +50,6 @@ final public function __construct(
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
@@ -76,7 +75,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Anonymous to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this Anonymous.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsaw/InterfaceName.php b/src/XML/wsaw/InterfaceName.php
index 87151d8..c8d1783 100644
--- a/src/XML/wsaw/InterfaceName.php
+++ b/src/XML/wsaw/InterfaceName.php
@@ -25,7 +25,6 @@ final class InterfaceName extends AbstractAttributedQNameType implements SchemaV
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsaw/ServiceName.php b/src/XML/wsaw/ServiceName.php
index e79e2ab..d37ca97 100644
--- a/src/XML/wsaw/ServiceName.php
+++ b/src/XML/wsaw/ServiceName.php
@@ -26,7 +26,6 @@ final class ServiceName extends AbstractServiceNameType implements SchemaValidat
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/src/XML/wsaw/UsingAddressing.php b/src/XML/wsaw/UsingAddressing.php
index 8e82ea5..2d0405e 100644
--- a/src/XML/wsaw/UsingAddressing.php
+++ b/src/XML/wsaw/UsingAddressing.php
@@ -24,7 +24,7 @@ final class UsingAddressing extends AbstractWsawElement implements SchemaValidat
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;
 
 
     /**
@@ -43,7 +43,6 @@ final public function __construct(
      * Create an instance of this object from its XML representation.
      *
      * @param \DOMElement $xml
-     * @return static
      *
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
@@ -61,7 +60,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this UsingAddressing to XML.
      *
      * @param \DOMElement|null $parent The element we should append this class to.
-     * @return \DOMElement The XML element after adding the data corresponding to this UsingAddressing.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/tests/Addressing/Constants.php b/tests/Addressing/Constants.php
index 7f075c3..c883e08 100644
--- a/tests/Addressing/Constants.php
+++ b/tests/Addressing/Constants.php
@@ -11,5 +11,5 @@
  */
 class Constants extends \SimpleSAML\WebServices\Addressing\Constants
 {
-    public const NAMESPACE = 'urn:x-simplesamlphp:namespace';
+    public const string NAMESPACE = 'urn:x-simplesamlphp:namespace';
 }