Feature/php83

.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, dom, filter, pcre, spl, xml
+          extensions: ctype, dom, filter, intl, pcre, 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, dom, filter, pcre, spl, xml
+          extensions: ctype, dom, filter, intl, pcre, 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
-          extensions: ctype, dom, filter, pcre, spl, xml
+          extensions: ctype, dom, filter, intl, pcre, sodium, spl, xml
           coverage: none
 
       - name: Setup problem matchers for PHP
@@ -215,7 +215,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: ctype, dom, filter, pcre, spl, xml
           tools: composer
           coverage: none

composer.json

@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-dom": "*",
         "ext-pcre": "*",
 
         "simplesamlphp/assert": "~1.9",
         "simplesamlphp/xml-common": "~2.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11"
     },
     "autoload": {
         "psr-4": {

src/SOAP11/Constants.php

@@ -15,14 +15,14 @@ class Constants extends \SimpleSAML\XML\Constants
     /**
      * The namespace for the SOAP envelope 1.1.
      */
-    public const NS_SOAP_ENV = 'http://schemas.xmlsoap.org/soap/envelope/';
+    public const string NS_SOAP_ENV = 'http://schemas.xmlsoap.org/soap/envelope/';
 
     /**
      * The namespace for SOAP encoding 1.1.
      */
-    public const NS_SOAP_ENC = 'https://schemas.xmlsoap.org/soap/encoding/';
+    public const string NS_SOAP_ENC = 'https://schemas.xmlsoap.org/soap/encoding/';
 
     /**
      */
-    public const SOAP_ACTOR_NEXT = 'http://schemas.xmlsoap.org/soap/actor/next';
+    public const string SOAP_ACTOR_NEXT = 'http://schemas.xmlsoap.org/soap/actor/next';
 }

src/SOAP11/Type/EncodingStyleValue.php

@@ -16,16 +16,14 @@
  */
 class EncodingStyleValue extends NMTokensValue
 {
-    /** @var string */
-    public const SCHEMA_TYPE = 'encodingStyle';
+    public const string SCHEMA_TYPE = 'encodingStyle';
 
 
     /**
      * Validate the value.
      *
      * @param string $value The value
      * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
-     * @return void
      */
     protected function validateValue(string $value): void
     {

src/SOAP11/Type/MustUnderstandValue.php

@@ -14,20 +14,18 @@
 use function boolval;
 
 /**
- * @package simplesaml/xml-common
+ * @package simplesaml/xml-soap
  */
 class MustUnderstandValue extends BooleanValue implements AttributeTypeInterface
 {
-    /** @var string */
-    public const SCHEMA_TYPE = 'boolean';
+    public const string SCHEMA_TYPE = 'boolean';
 
 
     /**
      * Validate the value.
      *
      * @param string $value
      * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
-     * @return void
      */
     protected function validateValue(string $value): void
     {
@@ -37,8 +35,6 @@ protected function validateValue(string $value): void
 
 
     /**
-     * @param boolean $value
-     * @return static
      */
     public static function fromBoolean(bool $value): static
     {
@@ -49,7 +45,6 @@ public static function fromBoolean(bool $value): static
 
 
     /**
-     * @return boolean $value
      */
     public function toBoolean(): bool
     {

src/SOAP11/XML/AbstractSoapElement.php

@@ -14,12 +14,9 @@
  */
 abstract class AbstractSoapElement extends AbstractElement
 {
-    /** @var string */
-    public const NS = C::NS_SOAP_ENV;
+    public const string NS = C::NS_SOAP_ENV;
 
-    /** @var string */
-    public const NS_PREFIX = 'SOAP-ENV';
+    public const string NS_PREFIX = 'SOAP-ENV';
 
-    /** @var string */
-    public const SCHEMA = 'resources/schemas/soap-envelope-1.1.xsd';
+    public const string SCHEMA = 'resources/schemas/soap-envelope-1.1.xsd';
 }

src/SOAP11/XML/Body.php

@@ -32,10 +32,10 @@ final class Body extends AbstractSoapElement implements SchemaValidatableElement
 
 
     /** 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::ANY;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::ANY;
 
 
     /**
@@ -87,8 +87,6 @@ public function getFault(): ?Fault
 
     /**
      * Test if an object, at the state it's in, would produce an empty XML-element
-     *
-     * @return bool
      */
     public function isEmptyElement(): bool
     {
@@ -100,7 +98,6 @@ public function isEmptyElement(): bool
      * Convert XML into an Body element
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return static
      *
      * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
@@ -121,7 +118,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Body to XML.
      *
      * @param \DOMElement|null $parent The element we should add this Body to.
-     * @return \DOMElement This Body-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {

src/SOAP11/XML/Detail.php

@@ -23,20 +23,17 @@ final class Detail extends AbstractElement
     use ExtendableElementTrait;
 
 
-    /** @var string */
-    public const LOCALNAME = 'detail';
+    public const string LOCALNAME = 'detail';
 
-    /** @var null */
-    public const NS = null;
+    public const null NS = null;
 
-    /** @var null */
-    public const NS_PREFIX = null;
+    public const null NS_PREFIX = null;
 
     /** 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::ANY;
+    public const string XS_ANY_ATTR_NAMESPACE = NS::ANY;
 
 
     /**
@@ -54,8 +51,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
     {
@@ -67,7 +62,6 @@ public function isEmptyElement(): bool
      * Convert XML into an Detail 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
@@ -88,7 +82,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Detail to XML.
      *
      * @param \DOMElement|null $parent The element we should add this Detail to.
-     * @return \DOMElement This Detail-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {

src/SOAP11/XML/Envelope.php

@@ -28,10 +28,10 @@ final class Envelope extends AbstractSoapElement implements SchemaValidatableEle
 
 
     /** 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;
 
 
     /**
@@ -75,7 +75,6 @@ public function getHeader(): ?Header
      * Convert XML into an Envelope 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
@@ -104,7 +103,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Envelope to XML.
      *
      * @param \DOMElement|null $parent The element we should add this envelope to.
-     * @return \DOMElement This Envelope-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {

src/SOAP11/XML/Fault.php

@@ -79,7 +79,6 @@ public function getDetail(): ?Detail
      * Convert XML into an Fault 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
@@ -119,7 +118,6 @@ public static function fromXML(DOMElement $xml): static
      * Convert this Fault to XML.
      *
      * @param \DOMElement|null $parent The element we should add this fault to.
-     * @return \DOMElement This Fault-element.
      */
     public function toXML(?DOMElement $parent = null): DOMElement
     {

src/SOAP11/XML/FaultActor.php

@@ -18,15 +18,11 @@ final class FaultActor extends AbstractElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const LOCALNAME = 'faultactor';
+    public const string LOCALNAME = 'faultactor';
 
-    /** @var null */
-    public const NS = null;
+    public const null NS = null;
 
-    /** @var null */
-    public const NS_PREFIX = null;
+    public const null NS_PREFIX = null;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIValue::class;
+    public const string TEXTCONTENT_TYPE = AnyURIValue::class;
 }

src/SOAP11/XML/FaultCode.php

@@ -18,15 +18,11 @@ final class FaultCode extends AbstractElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const LOCALNAME = 'faultcode';
+    public const string LOCALNAME = 'faultcode';
 
-    /** @var null */
-    public const NS = null;
+    public const null NS = null;
 
-    /** @var null */
-    public const NS_PREFIX = null;
+    public const null NS_PREFIX = null;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = QNameValue::class;
+    public const string TEXTCONTENT_TYPE = QNameValue::class;
 }

src/SOAP11/XML/FaultString.php

@@ -18,15 +18,11 @@ final class FaultString extends AbstractElement
     use TypedTextContentTrait;
 
 
-    /** @var string */
-    public const LOCALNAME = 'faultstring';
+    public const string LOCALNAME = 'faultstring';
 
-    /** @var null */
-    public const NS = null;
+    public const null NS = null;
 
-    /** @var null */
-    public const NS_PREFIX = null;
+    public const null NS_PREFIX = null;
 
-    /** @var string */
-    public const TEXTCONTENT_TYPE = StringValue::class;
+    public const string TEXTCONTENT_TYPE = StringValue::class;
 }