Fix nits

Author: tvdijen

src/XML/SignableElementTrait.php

@@ -25,6 +25,8 @@
 use SimpleSAML\XMLSecurity\XML\ds\Transform;
 use SimpleSAML\XMLSecurity\XML\ds\Transforms;
 
+use function in_array;
+
 /**
  * Trait SignableElementTrait
  *

src/XML/SignedElementTrait.php

@@ -12,7 +12,7 @@
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Exception\NoSignatureFound;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
-use SimpleSAML\XMLSecurity\Key\AbstractKey;
+use SimpleSAML\XMLSecurity\Key;
 use SimpleSAML\XMLSecurity\Utils\Security;
 use SimpleSAML\XMLSecurity\Utils\XML;
 use SimpleSAML\XMLSecurity\Utils\XPath;
@@ -21,6 +21,10 @@
 use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
 use SimpleSAML\XMLSecurity\XML\ds\X509Data;
 
+use function array_pop;
+use function base64_decode;
+use function in_array;
+
 /**
  * Helper trait for processing signed elements.
  *
@@ -42,7 +46,7 @@ trait SignedElementTrait
      *
      * @var \SimpleSAML\XMLSecurity\Key\AbstractKey|null
      */
-    private ?AbstractKey $validatingKey = null;
+    private ?Key\AbstractKey $validatingKey = null;
 
 
     /**
@@ -132,14 +136,14 @@ private function validateReference(): SignedElementInterface
         $this->validateReferenceUri($reference, $xml);
 
         $xp = XPath::getXPath($xml->ownerDocument);
-        $sigNode = $xp->query('child::ds:Signature', $xml);
+        $sigNode = XPath::xpQuery($xml, 'child::ds:Signature', $xp);
         Assert::count(
             $sigNode,
             1,
             'None or more than one signature found in object.',
             RuntimeException::class
         );
-        $xml->removeChild($sigNode->item(0));
+        $xml->removeChild($sigNode[0]);
 
         $data = XML::processTransforms($reference->getTransforms(), $xml);
         $digest = Security::hash($reference->getDigestMethod()->getAlgorithm(), $data, false);
@@ -196,7 +200,7 @@ private function verifyInternal(SignatureAlgorithm $verifier): SignedElementInte
      *
      * @return \SimpleSAML\XMLSecurity\Key\AbstractKey|null The key that successfully validated this signature.
      */
-    public function getValidatingKey(): ?AbstractKey
+    public function getValidatingKey(): ?Key\AbstractKey
     {
         return $this->validatingKey;
     }
@@ -266,11 +270,11 @@ public function verify(SignatureAlgorithm $verifier = null): SignedElementInterf
                 }
 
                 // build a valid PEM for the certificate
-                $cert = \SimpleSAML\XMLSecurity\Key\X509Certificate::PEM_HEADER . "\n" .
+                $cert = Key\X509Certificate::PEM_HEADER . "\n" .
                         $data->getRawContent() . "\n" .
-                        \SimpleSAML\XMLSecurity\Key\X509Certificate::PEM_FOOTER;
+                        Key\X509Certificate::PEM_FOOTER;
 
-                $key = new \SimpleSAML\XMLSecurity\Key\X509Certificate($cert);
+                $key = new Key\X509Certificate($cert);
                 $verifier = $factory->getAlgorithm($algId, $key);
 
                 try {

src/XML/ds/Reference.php

@@ -9,6 +9,7 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 use function array_pop;
+use function preg_match;
 
 /**
  * Class representing a ds:Reference element.

tests/XML/CustomSignable.php

@@ -33,7 +33,7 @@ class CustomSignable extends AbstractXMLElement implements SignableElementInterf
     public ?string $id = null;
 
     /** @var \DOMElement $xml */
-    protected \DOMElement $xml;
+    protected DOMElement $xml;
 
     /** @var bool */
     protected bool $formatOutput = false;

tests/XML/SignedElementTest.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\XMLSecurity\Test\XML;
 
+use DOMElement;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
@@ -36,13 +37,13 @@ final class SignedElementTest extends TestCase
     private string $certificate;
 
     /** @var \DOMElement */
-    private \DOMElement $signedDocumentWithComments;
+    private DOMElement $signedDocumentWithComments;
 
     /** @var \DOMElement */
-    private \DOMElement $signedDocument;
+    private DOMElement $signedDocument;
 
     /** @var \DOMElement  */
-    private \DOMElement $tamperedDocument;
+    private DOMElement $tamperedDocument;
 
 
     /**