Merge branch 'master' into dependabot/github_actions/all-actions-1a25…

…05a5f7
simplesamlphp · Feb 3, 2024 · 29eb94c · 29eb94c
2 parents 38f5788 + f7bb0ae
commit 29eb94c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/phpstan-dev.neon b/phpstan-dev.neon
@@ -1,4 +1,4 @@
 parameters:
-  level: 9
+  level: 6
   paths:
     - tests
diff --git a/tests/Key/PrivateKeyTest.php b/tests/Key/PrivateKeyTest.php
@@ -19,8 +19,8 @@
  */
 final class PrivateKeyTest extends TestCase
 {
-    /** @var array */
-    protected static $privKey = [];
+    /** @var array<string, string|int> */
+    protected static array $privKey = [];
 
     /** @var string */
     protected static string $f;

diff --git a/tests/Key/PublicKeyTest.php b/tests/Key/PublicKeyTest.php
@@ -20,8 +20,8 @@
  */
 final class PublicKeyTest extends TestCase
 {
-    /** @var array */
-    protected static $pubKey = [];
+    /** @var array<string, string|array<string>> */
+    protected static array $pubKey = [];
 
     /** @var string */
     protected static string $f;

diff --git a/tests/Key/X509CertificateTest.php b/tests/Key/X509CertificateTest.php
@@ -23,8 +23,8 @@
  */
 final class X509CertificateTest extends TestCase
 {
-    /** @var array */
-    protected static $cert = [];
+    /** @var array<string, string|int> */
+    protected static array $cert = [];
 
     /** @var string */
     protected static string $f;

diff --git a/tests/XML/CustomSignable.php b/tests/XML/CustomSignable.php
@@ -55,7 +55,7 @@ class CustomSignable extends AbstractElement implements
      *
      * @param \DOMElement $xml
      */
-    public function __construct(
+    final public function __construct(
         protected DOMElement $xml,
         protected ?string $id
     ) {

diff --git a/tests/XML/SignableElementTest.php b/tests/XML/SignableElementTest.php
@@ -215,6 +215,7 @@ public function testSigningElementWithIdAndComments(): void
     public function testSigningDocumentWithoutRoot(): void
     {
         $doc = new DOMDocument('1.0', 'UTF-8');
+        /** @var \DOMElement $node */
         $node = $doc->importNode(self::$xmlRepresentation->documentElement, true);
         $customSignable = CustomSignable::fromXML($node);
         $factory = new SignatureAlgorithmFactory();
@@ -238,6 +239,7 @@ public function testSigningDocumentWithoutRoot(): void
     public function testSigningWithDifferentRoot(): void
     {
         $doc = DOMDocumentFactory::fromString('<ns:Root><ns:foo>bar</ns:foo></ns:Root>');
+        /** @var \DOMElement $node */
         $node = $doc->importNode(self::$xmlRepresentation->documentElement, true);
         $doc->appendChild($node);
         $customSignable = CustomSignable::fromXML($node);

diff --git a/tests/XML/ds/RSAKeyValueTest.php b/tests/XML/ds/RSAKeyValueTest.php
@@ -74,6 +74,7 @@ public function testMarshallingElementOrder(): void
         $modulus = XPath::xpQuery($RSAKeyValueElement, './ds:Modulus', $xpCache);
         $this->assertCount(1, $modulus);
 
+        /** @var \DOMElement[] $RSAKeyValueElements */
         $RSAKeyValueElements = XPath::xpQuery($RSAKeyValueElement, './ds:Modulus/following-sibling::*', $xpCache);
 
         // Test ordering of RSAKeyValue contents

diff --git a/tests/XML/ds/SignatureTest.php b/tests/XML/ds/SignatureTest.php
@@ -135,6 +135,7 @@ public function testMarshallingElementOrdering(): void
         $signedInfo = XPath::xpQuery($signatureElement, './ds:SignedInfo', $xpCache);
         $this->assertCount(1, $signedInfo);
 
+        /** @var \DOMElement[] $signatureElements */
         $signatureElements = XPath::xpQuery($signatureElement, './ds:SignedInfo/following-sibling::*', $xpCache);
 
         // Test ordering of Signature contents