Fix psalm-issues

tvdijen · tvdijen · commit 0407b930627c · 2023-01-27T11:47:07.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "ext-zlib": "*",
 
         "psr/log": "~1.1 || ^2.0 || ^3.0",
-        "simplesamlphp/xml-security": "^1.1.0",
+        "simplesamlphp/xml-security": "^1.1.1",
         "simplesamlphp/xml-soap": "^1.0.0",
         "simplesamlphp/assert": "^1.0.0"
     },
diff --git a/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php b/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php
@@ -32,7 +32,9 @@ public function __construct(
     /**
      * @param \SimpleSAML\SAML2\Assertion\Validation\SubjectConfirmationConstraintValidator $constraint
      */
-    public function addConstraintValidator(SubjectConfirmationConstraintValidator $constraint): void {
+    public function addConstraintValidator(
+        SubjectConfirmationConstraintValidator $constraint
+    ): void {
         if ($constraint instanceof IdentityProviderAware) {
             $constraint->setIdentityProvider($this->identityProvider);
         }
diff --git a/src/SAML2/XML/ExtensionsTrait.php b/src/SAML2/XML/ExtensionsTrait.php
@@ -19,14 +19,14 @@
  */
 trait ExtensionsTrait
 {
-    /** @var \SimpleSAML\XML\ElementInterface[] */
+    /** @var \SimpleSAML\XML\SerializableElementInterface[] */
     protected array $extensions = [];
 
 
     /**
      * Extensions constructor.
      *
-     * @param \SimpleSAML\XML\ElementInterface[] $extensions
+     * @param \SimpleSAML\XML\SerializableElementInterface[] $extensions
      */
     public function __construct(array $extensions)
     {
@@ -57,7 +57,7 @@ public function __construct(array $extensions)
     /**
      * Get an array with all extensions present.
      *
-     * @return \SimpleSAML\XML\ElementInterface[]
+     * @return \SimpleSAML\XML\SerializableElementInterface[]
      */
     public function getList(): array
     {
diff --git a/src/SAML2/XML/alg/DigestMethod.php b/src/SAML2/XML/alg/DigestMethod.php
@@ -58,7 +58,7 @@ public function getAlgorithm(): string
      * Convert XML into a DigestMethod
      *
      * @param \DOMElement $xml The XML element we should load
-     * @return self
+     * @return static
      *
      * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
diff --git a/tests/SAML2/XML/md/KeyDescriptorTest.php b/tests/SAML2/XML/md/KeyDescriptorTest.php
@@ -92,7 +92,8 @@ public function testMarshallingWithoutOptionalParameters(): void
         $this->assertNull($kd->getUse());
         $this->assertEmpty($kd->getEncryptionMethod());
 
-        $this->assertEquals(<<<XML
+        $this->assertEquals(
+            <<<XML
 <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
   <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
     <ds:KeyName>IdentityProvider.com SSO Key</ds:KeyName>
diff --git a/tests/SAML2/XML/saml/SubjectTest.php b/tests/SAML2/XML/saml/SubjectTest.php
@@ -20,7 +20,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use simpleSAML\XMLSecurity\XML\ds\KeyInfo;
-use simpleSAML\XMLSecurity\XML\ds\KeyName;
+use SimpleSAML\XMLSecurity\XML\ds\KeyName;
 
 use function dirname;
 use function strval;

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@`
`19`	`19`	`*/`
`20`	`20`	`trait ExtensionsTrait`
`21`	`21`	`{`
`22`		`- /** @var \SimpleSAML\XML\ElementInterface[] */`
	`22`	`+ /** @var \SimpleSAML\XML\SerializableElementInterface[] */`
`23`	`23`	`protected array $extensions = [];`
`24`	`24`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* Extensions constructor.`
`28`	`28`	`*`
`29`		`- * @param \SimpleSAML\XML\ElementInterface[] $extensions`
	`29`	`+ * @param \SimpleSAML\XML\SerializableElementInterface[] $extensions`
`30`	`30`	`*/`
`31`	`31`	`public function __construct(array $extensions)`
`32`	`32`	`{`
`@@ -57,7 +57,7 @@ public function __construct(array $extensions)`
`57`	`57`	`/**`
`58`	`58`	`* Get an array with all extensions present.`
`59`	`59`	`*`
`60`		`- * @return \SimpleSAML\XML\ElementInterface[]`
	`60`	`+ * @return \SimpleSAML\XML\SerializableElementInterface[]`
`61`	`61`	`*/`
`62`	`62`	`public function getList(): array`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getAlgorithm(): string`
`58`	`58`	`* Convert XML into a DigestMethod`
`59`	`59`	`*`
`60`	`60`	`* @param \DOMElement $xml The XML element we should load`
`61`		`- * @return self`
	`61`	`+ * @return static`
`62`	`62`	`*`
`63`	`63`	`* @throws \SimpleSAML\XML\Exception\InvalidDOMElementException`
`64`	`64`	`* if the qualified name of the supplied element is wrong`