Merge branch 'master' into feature/ds-missing-elements

.github/workflows/php.yml

@@ -52,7 +52,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the higest supported version, so we can use the newest tools
-          php-version: '8.3'
+          php-version: '8.4'
           tools: composer, composer-require-checker, composer-unused, phpcs
           extensions: ctype, date, dom, filter, hash, mbstring, openssl, pcre, spl, xml
           coverage: none
@@ -144,7 +144,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Print OpenSSL version
@@ -187,15 +187,15 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run unit tests with coverage
-        if: ${{ matrix.php-versions == '8.3' }}
+        if: ${{ matrix.php-versions == '8.4' }}
         run: vendor/bin/phpunit
 
       - name: Run unit tests (no coverage)
-        if: ${{ matrix.php-versions != '8.3' }}
+        if: ${{ matrix.php-versions != '8.4' }}
         run: vendor/bin/phpunit --no-coverage
 
       - name: Save coverage data
-        if: ${{ matrix.php-versions == '8.3' }}
+        if: ${{ matrix.php-versions == '8.4' }}
         uses: actions/upload-artifact@v4
         with:
           name: coverage-data
@@ -209,7 +209,7 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Print OpenSSL version

composer.json

@@ -43,8 +43,8 @@
         "ext-pcre": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "^1.3",
-        "simplesamlphp/xml-common": "^1.19.0"
+        "simplesamlphp/assert": "^1.5",
+        "simplesamlphp/xml-common": "^1.20.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "^1.7"

src/Utils/XML.php

@@ -33,8 +33,8 @@ class XML
     public static function canonicalizeData(
         DOMElement $element,
         string $c14nMethod,
-        array $xpaths = null,
-        array $prefixes = null,
+        ?array $xpaths = null,
+        ?array $prefixes = null,
     ): string {
         $withComments = match ($c14nMethod) {
             C::C14N_EXCLUSIVE_WITH_COMMENTS, C::C14N_INCLUSIVE_WITH_COMMENTS => true,

src/XML/EncryptedElementTrait.php

@@ -179,7 +179,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $this->encryptedData->toXML($e);
@@ -196,7 +196,7 @@ public function toXML(DOMElement $parent = null): DOMElement
      * @param \DOMElement|null $parent The element we should append to.
      * @return \DOMElement
      */
-    abstract public function instantiateParentElement(DOMElement $parent = null): DOMElement;
+    abstract public function instantiateParentElement(?DOMElement $parent = null): DOMElement;
 
 
     /**

src/XML/SignedElementInterface.php

@@ -65,5 +65,5 @@ public function isSigned(): bool;
      * in the signature.
      * @throws \SimpleSAML\XMLSecurity\Exception\RuntimeException if the signature fails to validate.
      */
-    public function verify(SignatureAlgorithmInterface $verifier = null): SignedElementInterface;
+    public function verify(?SignatureAlgorithmInterface $verifier = null): SignedElementInterface;
 }

src/XML/SignedElementTrait.php

@@ -251,7 +251,7 @@ public function isSigned(): bool
      * in the signature.
      * @throws \SimpleSAML\XMLSecurity\Exception\RuntimeException if the signature fails to verify.
      */
-    public function verify(SignatureAlgorithmInterface $verifier = null): SignedElementInterface
+    public function verify(?SignatureAlgorithmInterface $verifier = null): SignedElementInterface
     {
         if (!$this->isSigned()) {
             throw new NoSignatureFoundException();

src/XML/ds/AbstractKeyInfoType.php

@@ -111,7 +111,7 @@ public function getInfo(): array
      * @param \DOMElement|null $parent The element we should append this KeyInfo to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/CanonicalizationMethod.php

@@ -78,7 +78,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyName element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/DigestMethod.php

@@ -84,7 +84,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this DigestMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/DsObject.php

@@ -123,7 +123,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this ds:Object element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/KeyValue.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Manifest.php

@@ -88,7 +88,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Manifest element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/RSAKeyValue.php

@@ -104,7 +104,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this RSAKeyValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Reference.php

@@ -167,7 +167,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Reference element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         if ($this->getId() !== null) {

src/XML/ds/RetrievalMethod.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this RetrievalMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getURI());

src/XML/ds/Signature.php

@@ -161,7 +161,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Signature element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/SignatureMethod.php

@@ -109,7 +109,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/SignatureProperties.php

@@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureProperties element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/SignatureProperty.php

@@ -102,7 +102,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureProperty element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Target', $this->getTarget());

src/XML/ds/SignatureValue.php

@@ -70,7 +70,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();

src/XML/ds/SignedInfo.php

@@ -172,7 +172,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignedInfo element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Transform.php

@@ -127,7 +127,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Transform element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Transforms.php

@@ -76,7 +76,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Transforms element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/X509Data.php

@@ -102,7 +102,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509Data element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/X509IssuerSerial.php

@@ -90,7 +90,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509IssuerSerial element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/XPath.php

@@ -88,7 +88,7 @@ public static function fromXML(DOMElement $xml): static
      * @param DOMElement|null $parent
      * @return DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getExpression();

src/XML/dsig11/KeyInfoReference.php

@@ -80,7 +80,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyInfoReference element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getURI());

src/XML/dsig11/X509Digest.php

@@ -81,7 +81,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509Digest element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();

src/XML/ec/InclusiveNamespaces.php

@@ -68,7 +68,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this InclusiveNamespaces to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractAgreementMethodType.php

@@ -140,7 +140,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this AgreementMethod to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/xenc/AbstractDHKeyValueType.php

@@ -172,7 +172,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this DHKeyValue to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptedType.php

@@ -125,7 +125,7 @@ public function getType(): ?string
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptionMethod.php

@@ -118,7 +118,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this EncryptionMethod to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/xenc/AbstractEncryptionPropertiesType.php

@@ -75,7 +75,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptionPropertyType.php

@@ -99,7 +99,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractReference.php

@@ -74,7 +74,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getUri());

src/XML/xenc/CipherData.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/CipherReference.php

@@ -68,7 +68,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getUri());

src/XML/xenc/EncryptedKey.php

@@ -242,7 +242,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = parent::toXML($parent);