Raise coverage

src/XML/sp/AbstractIssuedTokenType.php

@@ -63,9 +63,9 @@ final public function __construct(
     /**
      * Collect the value of the Issuer property.
      *
-     * @return \SimpleSAML\WSSecurity\XML\sp\Issuer|\SimpleSAML\WSSecurity\XML\sp\IssuerName
+     * @return \SimpleSAML\WSSecurity\XML\sp\Issuer|\SimpleSAML\WSSecurity\XML\sp\IssuerName|null
      */
-    public function getIssuer(): Issuer|IssuerName
+    public function getIssuer(): Issuer|IssuerName|null
     {
         return $this->issuer;
     }
@@ -173,6 +173,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         $this->getRequestSecurityTokenTemplate()->toXML($e);
 
         foreach ($this->getElements() as $elt) {
+            /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
             $elt->toXML($e);
         }
 

src/XML/sp/AbstractKeyValueTokenType.php

@@ -144,6 +144,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         }
 
         foreach ($this->getElements() as $elt) {
+            /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
             $elt->toXML($e);
         }
 

src/XML/sp/AbstractRequestSecurityTokenTemplateType.php

@@ -142,6 +142,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         }
 
         foreach ($this->getElements() as $elt) {
+            /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
             $elt->toXML($e);
         }
 

src/XML/sp/AbstractSerElementsType.php

@@ -146,6 +146,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         }
 
         foreach ($this->getElements() as $elt) {
+            /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
             $elt->toXML($e);
         }
 

src/XML/sp/AbstractTokenAssertionType.php

@@ -144,6 +144,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         }
 
         foreach ($this->getElements() as $elt) {
+            /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
             $elt->toXML($e);
         }
 

src/XML/sp/IssuerName.php

@@ -33,7 +33,7 @@ public function __construct(
      * Validate the content of the element.
      *
      * @param string $content  The value to go in the XML textContent
-     * @throws \SimpleSAML\XML\Exception\SchemaViolationExcetion on failure
+     * @throws \SimpleSAML\XML\Exception\SchemaViolationException on failure
      * @return void
      */
     protected function validateContent(string $content): void

tests/WSSecurity/XML/sp/EncryptedElementsTest.php

@@ -67,7 +67,12 @@ public function testMarshallingElementOrdering(): void
 
         // Test ordering of EncryptedElements contents
         /** @psalm-var \DOMElement[] $EncryptedElementsElements */
-        $EncryptedElementsElements = XMLXPath::xpQuery($EncryptedElementsElement, './sp:XPath/following-sibling::*', $xpCache);
+        $EncryptedElementsElements = XMLXPath::xpQuery(
+            $EncryptedElementsElement,
+            './sp:XPath/following-sibling::*',
+            $xpCache,
+        );
+
         $this->assertCount(1, $EncryptedElementsElements);
         $this->assertEquals('ssp:Chunk', $EncryptedElementsElements[0]->tagName);
     }

tests/WSSecurity/XML/sp/HttpsTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\HttpsTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\HttpsToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/IssuedTokenTest.php

@@ -24,6 +24,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\IssuedTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\IssuedToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractIssuedTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *
@@ -58,7 +59,11 @@ public function testMarshallingElementOrdering(): void
         $chunk = new Chunk(DOMDocumentFactory::fromString(
             '<ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">some</ssp:Chunk>'
         )->documentElement);
-        $requestSecurityTokenTemplate = new RequestSecurityTokenTemplate('urn:x-simplesamlphp:version', [$chunk], [$attr]);
+        $requestSecurityTokenTemplate = new RequestSecurityTokenTemplate(
+            'urn:x-simplesamlphp:version',
+            [$chunk],
+            [$attr],
+        );
 
         $issuedToken = new IssuedToken($requestSecurityTokenTemplate, $issuer, IncludeToken::Always, [$chunk], [$attr]);
         $issuedTokenElement = $issuedToken->toXML();
@@ -91,7 +96,11 @@ public function testMarshalling(): void
         )->documentElement);
 
         $issuer = new IssuerName('urn:x-simplesamlphp:issuer');
-        $requestSecurityTokenTemplate = new RequestSecurityTokenTemplate('urn:x-simplesamlphp:version', [$chunk], [$attr]);
+        $requestSecurityTokenTemplate = new RequestSecurityTokenTemplate(
+            'urn:x-simplesamlphp:version',
+            [$chunk],
+            [$attr],
+        );
 
         $issuedToken = new IssuedToken($requestSecurityTokenTemplate, $issuer, IncludeToken::Always, [$chunk], [$attr]);
         $this->assertEquals(

tests/WSSecurity/XML/sp/KerberosTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\KerberosTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\KerberosToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/KeyValueTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\KeyValueTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\KeyValueToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractKeyValueTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/RelTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\RelTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\RelToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php

@@ -54,7 +54,12 @@ public function testMarshalling(): void
             '<ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">some</ssp:Chunk>'
         )->documentElement);
 
-        $RequestSecurityTokenTemplateElements = new RequestSecurityTokenTemplate('urn:x-simplesamlphp:version', [$chunk], [$attr]);
+        $RequestSecurityTokenTemplateElements = new RequestSecurityTokenTemplate(
+            'urn:x-simplesamlphp:version',
+            [$chunk],
+            [$attr],
+        );
+
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
             strval($RequestSecurityTokenTemplateElements),

tests/WSSecurity/XML/sp/RequiredElementsTest.php

@@ -67,7 +67,12 @@ public function testMarshallingElementOrdering(): void
 
         // Test ordering of RequiredElements contents
         /** @psalm-var \DOMElement[] $requiredElementsElements */
-        $requiredElementsElements = XMLXPath::xpQuery($requiredElementsElement, './sp:XPath/following-sibling::*', $xpCache);
+        $requiredElementsElements = XMLXPath::xpQuery(
+            $requiredElementsElement,
+            './sp:XPath/following-sibling::*',
+            $xpCache,
+        );
+
         $this->assertCount(1, $requiredElementsElements);
         $this->assertEquals('ssp:Chunk', $requiredElementsElements[0]->tagName);
     }

tests/WSSecurity/XML/sp/SamlTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\SamlTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\SamlToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/SecurityContextTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\SecurityContextTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\SecurityContextToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/SignedElementsTest.php

@@ -67,7 +67,12 @@ public function testMarshallingElementOrdering(): void
 
         // Test ordering of SignedElements contents
         /** @psalm-var \DOMElement[] $SignedElementsElements */
-        $SignedElementsElements = XMLXPath::xpQuery($SignedElementsElement, './sp:XPath/following-sibling::*', $xpCache);
+        $SignedElementsElements = XMLXPath::xpQuery(
+            $SignedElementsElement,
+            './sp:XPath/following-sibling::*',
+            $xpCache,
+        );
+
         $this->assertCount(1, $SignedElementsElements);
         $this->assertEquals('ssp:Chunk', $SignedElementsElements[0]->tagName);
     }

tests/WSSecurity/XML/sp/UsernameTokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\UsernameTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\UsernameToken
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *

tests/WSSecurity/XML/sp/X509TokenTest.php

@@ -22,6 +22,7 @@
  * Class \SimpleSAML\WSSecurity\XML\sp\X509lTokenTest
  *
  * @covers \SimpleSAML\WSSecurity\XML\sp\X509Token
+ * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractAssertionTokenType
  * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
  *