Merge branch 'release-7.x' into refactor/soap-ssl-validator-openssl

Author: tvdijen

.github/workflows/php.yml

@@ -19,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.5']
+        php-version: ['8.5', '8.6']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@release-2.x
     secrets: inherit
     with:
       php-version: ${{ matrix.php-version }}
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@release-2.x
     secrets: inherit
     with:
       enable_eslinter: false
@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.5']
+        php-versions: ['8.5', '8.6']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -57,7 +57,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: ctype, date, dom, filter, hash, intl, mbstring, openssl, pcre, soap, spl, sodium, xml
           tools: composer
-          ini-values: error_reporting=E_ALL
+          ini-values: error_reporting=E_ALL, display_errors=on
           coverage: pcov
 
       - name: Setup problem matchers for PHP
@@ -118,7 +118,7 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.5']
+        php-versions: ['8.5', '8.6']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -129,7 +129,7 @@ jobs:
           extensions: ctype, date, dom, filter, hash, intl, mbstring, openssl, pcre,\
             soap, sodium, spl, xml, zip
           tools: composer
-          ini-values: error_reporting=E_ALL
+          ini-values: error_reporting=E_ALL, display_errors=on
           coverage: none
 
       - name: Setup problem matchers for PHP

composer.json

@@ -39,11 +39,11 @@
         "ext-intl": "*",
 
         "beste/clock": "~3.0",
-        "mockery/mockery": "~1.6",
-        "simplesamlphp/simplesamlphp": "^2.5",
-        "simplesamlphp/simplesamlphp-test-framework": "~1.11",
         "icanhazstring/composer-unused": "^0.9.6",
         "maglnet/composer-require-checker": "^4.20"
+        "mockery/mockery": "~1.6",
+        "simplesamlphp/simplesamlphp": "^2.5",
+        "simplesamlphp/simplesamlphp-test-framework": "~2.0",
     },
     "suggest": {
         "ext-soap": "*"

src/Configuration/IdentityProvider.php

@@ -8,7 +8,7 @@
 use SimpleSAML\XMLSecurity\Constants as C;
 
 use function array_filter;
-use function array_pop;
+use function array_last;
 use function count;
 use function sprintf;
 
@@ -94,7 +94,7 @@ public function getPrivateKey(string $name, ?bool $required = null)
             return null;
         }
 
-        return array_pop($key);
+        return array_last($key);
     }
 
 

src/Configuration/ServiceProvider.php

@@ -8,7 +8,7 @@
 use SimpleSAML\XMLSecurity\Constants as C;
 
 use function array_filter;
-use function array_pop;
+use function array_last;
 use function count;
 use function sprintf;
 
@@ -102,7 +102,7 @@ public function getPrivateKey(string $name, ?bool $required = null)
             return null;
         }
 
-        return array_pop($key);
+        return array_last($key);
     }
 
 

src/XML/IdentifierTrait.php

@@ -12,7 +12,7 @@
 use SimpleSAML\SAML2\XML\saml\NameID;
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Trait grouping common functionality for elements that can hold identifiers.
@@ -94,7 +94,7 @@ protected static function getIdentifierFromXML(DOMElement $xml): ?IdentifierInte
             TooManyElementsException::class,
         );
 
-        $identifier = array_pop($identifiers);
+        $identifier = array_last($identifiers);
 
         return $identifier;
     }

src/XML/SignedElementTrait.php

@@ -11,6 +11,8 @@
 use SimpleSAML\XMLSecurity\XML\ds\Signature;
 use SimpleSAML\XMLSecurity\XML\SignedElementTrait as BaseSignedElementTrait;
 
+use function array_last;
+
 /**
  * Helper trait for processing signed elements.
  *
@@ -37,7 +39,7 @@ protected function setSignature(Signature $signature): void
         $references = $signature->getSignedInfo()->getReferences();
         Assert::count($references, 1, "A signature needs to have exactly one Reference, %d found.");
 
-        $reference = array_pop($references);
+        $reference = array_last($references);
         Assert::notNull($reference->getURI(), "URI attribute not found.", ReferenceValidationFailedException::class);
         Assert::startsWith(
             $reference->getURI()->getValue(),

src/XML/ecp/Request.php

@@ -19,6 +19,7 @@
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 use SimpleSAML\XMLSchema\Type\BooleanValue;
 
+use function array_last;
 use function intval;
 use function strval;
 
@@ -140,8 +141,8 @@ public static function fromXML(DOMElement $xml): static
         $idpList = IDPList::getChildrenOfClass($xml);
 
         return new static(
-            array_pop($issuer),
-            array_pop($idpList),
+            array_last($issuer),
+            array_last($idpList),
             self::getOptionalAttribute($xml, 'ProviderName', SAMLStringValue::class, null),
             self::getOptionalAttribute($xml, 'IsPassive', BooleanValue::class, null),
         );

src/XML/ecp/SubjectConfirmation.php

@@ -17,6 +17,8 @@
 use SimpleSAML\XMLSchema\Exception\MissingAttributeException;
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 
+use function array_last;
+
 /**
  * Class representing the ECP SubjectConfirmation element.
  *
@@ -113,7 +115,7 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             self::getAttribute($xml, 'Method', SAMLAnyURIValue::class),
-            array_pop($subjectConfirmationData),
+            array_last($subjectConfirmationData),
         );
     }
 

src/XML/emd/RepublishRequest.php

@@ -14,7 +14,7 @@
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Class implementing RepublishRequest.
@@ -71,7 +71,7 @@ public static function fromXML(DOMElement $xml): static
             SchemaViolationException::class,
         );
 
-        return new static(array_pop($republishTarget));
+        return new static(array_last($republishTarget));
     }
 
 

src/XML/md/AbstractRoleDescriptor.php

@@ -24,7 +24,7 @@
 use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSchema\Type\QNameValue;
 
-use function array_pop;
+use function array_last;
 
 /**
  * Class representing a SAML2 RoleDescriptor element.
@@ -148,10 +148,10 @@ public static function fromXML(DOMElement $xml): static
                 self::getOptionalAttribute($xml, 'ID', IDValue::class, null),
                 self::getOptionalAttribute($xml, 'validUntil', SAMLDateTimeValue::class, null),
                 self::getOptionalAttribute($xml, 'cacheDuration', DurationValue::class, null),
-                array_pop($extensions),
+                array_last($extensions),
                 self::getOptionalAttribute($xml, 'errorURL', SAMLAnyURIValue::class, null),
                 KeyDescriptor::getChildrenOfClass($xml),
-                array_pop($orgs),
+                array_last($orgs),
                 ContactPerson::getChildrenOfClass($xml),
                 self::getAttributesNSFromXML($xml),
             );