Few psalm-fixes

Author: tvdijen

src/DOMDocumentFactory.php

@@ -20,7 +20,6 @@
 use function libxml_get_last_error;
 use function libxml_use_internal_errors;
 use function sprintf;
-use function trim;
 
 /**
  * @package simplesamlphp/xml-common
@@ -43,7 +42,7 @@ private function __construct()
      */
     public static function fromString(string $xml): DOMDocument
     {
-        Assert::stringNotEmpty(trim($xml));
+        Assert::notWhitespaceOnly($xml);
 
         $internalErrors = libxml_use_internal_errors(true);
         libxml_clear_errors();
@@ -98,10 +97,7 @@ public static function fromFile(string $file): DOMDocument
             throw new IOException("File '$file' was not loaded;  $error");
         }
 
-        if (trim($xml) === '') {
-            throw new RuntimeException(sprintf('File "%s" does not have content', $file));
-        }
-
+        Assert::notWhitespaceOnly($xml, sprintf('File "%s" does not have content', $file), RuntimeException::class);
         return static::fromString($xml);
     }
 

tests/Utils/ExtendableAttributesElement.php

@@ -75,7 +75,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::same($xml->localName, 'ExtendableAttributesElement', InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, 'urn:x-simplesamlphp:namespace', InvalidDOMElementException::class);
 
-        return new self(self::getAttributesNSFromXML($xml));
+        return new static(self::getAttributesNSFromXML($xml));
     }
 
 

tests/src/DOMDocumentFactoryTest.php

@@ -73,7 +73,7 @@ public function testFileWithValidXMLCanBeLoaded(): void
 
 
     /**
-     * @group                    domdocument
+     * @group domdocument
      */
     public function testFileThatContainsDocTypeIsNotAccepted(): void
     {
@@ -87,7 +87,7 @@ public function testFileThatContainsDocTypeIsNotAccepted(): void
 
 
     /**
-     * @group                    domdocument
+     * @group domdocument
      */
     public function testStringThatContainsDocTypeIsNotAccepted(): void
     {
@@ -101,7 +101,7 @@ public function testStringThatContainsDocTypeIsNotAccepted(): void
 
 
     /**
-     * @group                    domdocument
+     * @group domdocument
      */
     public function testEmptyFileIsNotValid(): void
     {
@@ -119,8 +119,8 @@ public function testEmptyStringIsNotValid(): void
     {
         $this->expectException(AssertionFailedException::class);
         $this->expectExceptionMessage(
-            'Expected a different value than "".',
+            'Expected a non-whitespace string. Got: ""',
         );
-        DOMDocumentFactory::fromString("");
+        DOMDocumentFactory::fromString('');
     }
 }