Merge pull request #2 from simplesamlphp/feature/php83

tvdijen · web-flow · commit 76e2c676347e · 2025-12-17T22:39:33.000+01:00
Feature/php83
diff --git 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,15 +45,15 @@ 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
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, filter, pcre, soap, spl, xml
+          extensions: ctype, date, dom, filter, intl, pcre, soap, sodium, spl, xml
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: pcov
@@ -107,15 +107,15 @@ 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
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, filter, pcre, soap, spl, xml
+          extensions: ctype, date, dom, filter, intl, pcre, soap, sodium, spl, xml
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: none
@@ -163,7 +163,7 @@ jobs:
           # Should be the higest supported version, so we can use the newest tools
           php-version: '8.5'
           tools: composer, composer-require-checker, composer-unused, phpcs
-          extensions: ctype, date, dom, filter, pcre, soap, spl, xml
+          extensions: ctype, date, dom, filter, intl, pcre, soap, sodium, spl, xml
           coverage: none
 
       - name: Setup problem matchers for PHP
@@ -215,8 +215,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.2'
-          extensions: ctype, date, dom, filter, pcre, soap, spl, xml
+          php-version: '8.3'
+          extensions: ctype, date, dom, filter, intl, pcre, soap, sodium, spl, xml
           tools: composer
           coverage: none
 
diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-dom": "*",
         "ext-spl": "*",
 
         "simplesamlphp/assert": "~1.9",
         "simplesamlphp/xml-common": "~2.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10",
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11",
         "simplesamlphp/xml-security": "~2.0"
     },
     "autoload": {
diff --git a/src/Assert/DateTimeTrait.php b/src/Assert/DateTimeTrait.php
@@ -13,8 +13,6 @@
 trait DateTimeTrait
 {
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validDateTime(string $value, string $message = ''): void
     {
diff --git a/src/Constants.php b/src/Constants.php
@@ -15,19 +15,21 @@ class Constants extends \SimpleSAML\XML\Constants
     /**
      * The namespace for WS-Security extensions.
      */
-    public const NS_SEC_EXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
+    public const string NS_SEC_EXT =
+        'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
 
     /**
      * The namespace for WS-Security utilities protocol.
      */
-    public const NS_SEC_UTIL = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
+    public const string NS_SEC_UTIL =
+        'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
 
     /**
      */
-    public const WSU_TIMESTAMP_FAULT = 'MessageExpired';
+    public const string WSU_TIMESTAMP_FAULT = 'MessageExpired';
 
     /**
      * The format to express a timestamp in WSU
      */
-    public const DATETIME_FORMAT = 'Y-m-d\\TH:i:sp';
+    public const string DATETIME_FORMAT = 'Y-m-d\\TH:i:sp';
 }
diff --git a/src/Type/DateTimeValue.php b/src/Type/DateTimeValue.php
@@ -15,16 +15,13 @@ class DateTimeValue extends BaseDateTimeValue
 {
     /**
      * Lowercase p as opposed to the base-class to covert the timestamp to UTC as required
-     * by the WSSecurity specifications
+     *  by the WSSecurity specifications
      */
-    public const DATETIME_FORMAT = 'Y-m-d\\TH:i:sp';
+    public const string DATETIME_FORMAT = 'Y-m-d\\TH:i:sp';
 
 
     /**
      * Validate the value.
-     *
-     * @param string $value
-     * @return void
      */
     protected function validateValue(string $value): void
     {
diff --git a/src/XML/wsse/AbstractAttributedString.php b/src/XML/wsse/AbstractAttributedString.php
@@ -28,15 +28,14 @@ abstract class AbstractAttributedString extends AbstractWsseElement
 
 
     /** 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;
 
     /** The exclusions for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_EXCLUSIONS = [
+    public const array XS_ANY_ATTR_EXCLUSIONS = [
         ['http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd', 'Id'],
     ];
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = StringValue::class;
+    public const string TEXTCONTENT_TYPE = StringValue::class;
 
 
     /**
@@ -69,7 +68,6 @@ public function getId(): ?IDValue
      * 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
@@ -94,7 +92,6 @@ public static function fromXML(DOMElement $xml): static
 
     /**
      * @param \DOMElement|null $parent
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractBinarySecurityTokenType.php b/src/XML/wsse/AbstractBinarySecurityTokenType.php
@@ -53,7 +53,6 @@ public function getValueType(): ?AnyURIValue
      * 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
@@ -82,7 +81,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this username token to an XML element.
      *
      * @param \DOMElement $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractEmbeddedType.php b/src/XML/wsse/AbstractEmbeddedType.php
@@ -24,10 +24,10 @@ abstract class AbstractEmbeddedType extends AbstractWsseElement
 
 
     /** 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;
 
     /** 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;
 
 
     /**
@@ -58,8 +58,6 @@ public function getValueType(): ?AnyURIValue
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -73,7 +71,6 @@ public function isEmptyElement(): bool
      * 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
@@ -95,7 +92,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this username token to an XML element.
      *
      * @param \DOMElement|null $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractEncodedString.php b/src/XML/wsse/AbstractEncodedString.php
@@ -52,7 +52,6 @@ public function getEncodingType(): ?AnyURIValue
      * 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
@@ -78,7 +77,6 @@ public static function fromXML(DOMElement $xml): static
 
     /**
      * @param \DOMElement|null $parent
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractKeyIdentifierType.php b/src/XML/wsse/AbstractKeyIdentifierType.php
@@ -52,7 +52,6 @@ public function getValueType(): ?AnyURIValue
      * 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
@@ -81,7 +80,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this username token to an XML element.
      *
      * @param \DOMElement $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractPasswordString.php b/src/XML/wsse/AbstractPasswordString.php
@@ -51,7 +51,6 @@ public function getType(): ?AnyURIValue
      * 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
@@ -77,7 +76,6 @@ public static function fromXML(DOMElement $xml): static
 
     /**
      * @param \DOMElement|null $parent
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractReferenceType.php b/src/XML/wsse/AbstractReferenceType.php
@@ -22,7 +22,7 @@ abstract class AbstractReferenceType extends AbstractWsseElement
 
 
     /** 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;
 
 
     /**
@@ -63,7 +63,6 @@ public function getURI(): ?AnyURIValue
      * 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
@@ -85,7 +84,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this username token to an XML element.
      *
      * @param \DOMElement|null $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractSecurityHeaderType.php b/src/XML/wsse/AbstractSecurityHeaderType.php
@@ -23,10 +23,10 @@ abstract class AbstractSecurityHeaderType extends AbstractWsseElement
 
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NS::ANY;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::ANY;
 
     /** 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;
 
 
     /**
@@ -46,8 +46,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
     {
@@ -60,7 +58,6 @@ public function isEmptyElement(): bool
      * 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
@@ -81,7 +78,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this SecurityHeaderType token to an XML element.
      *
      * @param \DOMElement|null $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractSecurityTokenReferenceType.php b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
@@ -30,16 +30,16 @@ abstract class AbstractSecurityTokenReferenceType extends AbstractWsseElement
 
 
     /** 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;
 
     /** The exclusions for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_EXCLUSIONS = [
+    public const array XS_ANY_ATTR_EXCLUSIONS = [
         ['http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd', 'Id'],
         ['http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd', 'Usage'],
     ];
 
     /** 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;
 
 
     /**
@@ -73,8 +73,6 @@ public function getId(): ?IDValue
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -89,8 +87,6 @@ public function isEmptyElement(): bool
      * 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
      */
@@ -122,7 +118,6 @@ public static function fromXML(DOMElement $xml): static
      * Add this SecurityTokenReferenceType token to an XML element.
      *
      * @param \DOMElement|null $parent The element we should append this username token to.
-     * @return \DOMElement
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {
diff --git a/src/XML/wsse/AbstractTransformationParametersType.php b/src/XML/wsse/AbstractTransformationParametersType.php
diff --git a/src/XML/wsse/AbstractUsernameTokenType.php b/src/XML/wsse/AbstractUsernameTokenType.php
diff --git a/src/XML/wsse/AbstractWsseElement.php b/src/XML/wsse/AbstractWsseElement.php
diff --git a/src/XML/wsu/AbstractAttributedDateTime.php b/src/XML/wsu/AbstractAttributedDateTime.php
diff --git a/src/XML/wsu/AbstractAttributedURI.php b/src/XML/wsu/AbstractAttributedURI.php
diff --git a/src/XML/wsu/AbstractTimestamp.php b/src/XML/wsu/AbstractTimestamp.php
diff --git a/src/XML/wsu/AbstractWsuElement.php b/src/XML/wsu/AbstractWsuElement.php

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`trait DateTimeTrait`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * @param string $value`
`17`		`- * @param string $message`
`18`	`16`	`*/`
`19`	`17`	`protected static function validDateTime(string $value, string $message = ''): void`
`20`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public function getValueType(): ?AnyURIValue`
`53`	`53`	`* Create an instance of this object from its XML representation.`
`54`	`54`	`*`
`55`	`55`	`* @param \DOMElement $xml`
`56`		`- * @return static`
`57`	`56`	`*`
`58`	`57`	`* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException`
`59`	`58`	`* if the qualified name of the supplied element is wrong`
`@@ -82,7 +81,6 @@ public static function fromXML(DOMElement $xml): static`
`82`	`81`	`* Add this username token to an XML element.`
`83`	`82`	`*`
`84`	`83`	`* @param \DOMElement $parent The element we should append this username token to.`
`85`		`- * @return \DOMElement`
`86`	`84`	`*/`
`87`	`85`	`public function toXML(?DOMElement $parent = null): DOMElement`
`88`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ abstract class AbstractEmbeddedType extends AbstractWsseElement`
`24`	`24`
`25`	`25`
`26`	`26`	`/** The namespace-attribute for the xs:anyAttribute element */`
`27`		`- public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;`
	`27`	`+ public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;`
`28`	`28`
`29`	`29`	`/** The namespace-attribute for the xs:any element */`
`30`		`- public const XS_ANY_ELT_NAMESPACE = NS::ANY;`
	`30`	`+ public const string XS_ANY_ELT_NAMESPACE = NS::ANY;`
`31`	`31`
`32`	`32`
`33`	`33`	`/**`
`@@ -58,8 +58,6 @@ public function getValueType(): ?AnyURIValue`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* Test if an object, at the state it's in, would produce an empty XML-element`
`61`		`- *`
`62`		`- * @return bool`
`63`	`61`	`*/`
`64`	`62`	`public function isEmptyElement(): bool`
`65`	`63`	`{`
`@@ -73,7 +71,6 @@ public function isEmptyElement(): bool`
`73`	`71`	`* Create an instance of this object from its XML representation.`
`74`	`72`	`*`
`75`	`73`	`* @param \DOMElement $xml`
`76`		`- * @return static`
`77`	`74`	`*`
`78`	`75`	`* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException`
`79`	`76`	`* if the qualified name of the supplied element is wrong`
`@@ -95,7 +92,6 @@ public static function fromXML(DOMElement $xml): static`
`95`	`92`	`* Add this username token to an XML element.`
`96`	`93`	`*`
`97`	`94`	`* @param \DOMElement\|null $parent The element we should append this username token to.`
`98`		`- * @return \DOMElement`
`99`	`95`	`*/`
`100`	`96`	`public function toXML(?DOMElement $parent = null): DOMElement`
`101`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public function getEncodingType(): ?AnyURIValue`
`52`	`52`	`* Create an instance of this object from its XML representation.`
`53`	`53`	`*`
`54`	`54`	`* @param \DOMElement $xml`
`55`		`- * @return static`
`56`	`55`	`*`
`57`	`56`	`* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException`
`58`	`57`	`* if the qualified name of the supplied element is wrong`
`@@ -78,7 +77,6 @@ public static function fromXML(DOMElement $xml): static`
`78`	`77`
`79`	`78`	`/**`
`80`	`79`	`* @param \DOMElement\|null $parent`
`81`		`- * @return \DOMElement`
`82`	`80`	`*/`
`83`	`81`	`public function toXML(?DOMElement $parent = null): DOMElement`
`84`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public function getValueType(): ?AnyURIValue`
`52`	`52`	`* Create an instance of this object from its XML representation.`
`53`	`53`	`*`
`54`	`54`	`* @param \DOMElement $xml`
`55`		`- * @return static`
`56`	`55`	`*`
`57`	`56`	`* @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException`
`58`	`57`	`* if the qualified name of the supplied element is wrong`
`@@ -81,7 +80,6 @@ public static function fromXML(DOMElement $xml): static`
`81`	`80`	`* Add this username token to an XML element.`
`82`	`81`	`*`
`83`	`82`	`* @param \DOMElement $parent The element we should append this username token to.`
`84`		`- * @return \DOMElement`
`85`	`83`	`*/`
`86`	`84`	`public function toXML(?DOMElement $parent = null): DOMElement`
`87`	`85`	`{`