Fix unit tests

Author: tvdijen

tests/XML/DOMDocumentFactoryTest.php

@@ -8,6 +8,7 @@
 use DOMException;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use SimpleSAML\Assert\AssertionFailedException;
@@ -54,15 +55,14 @@ protected function tearDown(): void
      * Classic external-entity payload aimed at a file we control.
      * The factory must reject the document; the marker must never appear.
      */
+    #[RequiresOperatingSystemFamily('Linux')]
     public function testExternalEntityCannotReadLocalFileUsingDefaultOptions(): void
     {
         // file:// URI pointing at our temporary secret
-        $uri = 'file://' . $this->secretFile;
-
+        $uri = 'file:///' . $this->secretFile;
         $payload = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE foo [
-  <!ELEMENT foo ANY>
   <!ENTITY xxe SYSTEM "{$uri}">
 ]>
 <foo>&xxe;</foo>
@@ -73,7 +73,7 @@ public function testExternalEntityCannotReadLocalFileUsingDefaultOptions(): void
         $xml = $doc->saveXml();
         $this->assertStringNotContainsString(
             $this->marker,
-            $xml,
+            (string)$xml,
             'XXE succeeded: local file content was expanded into the document',
         );
     }
@@ -83,15 +83,14 @@ public function testExternalEntityCannotReadLocalFileUsingDefaultOptions(): void
      * Classic external-entity payload aimed at a file we control.
      * The factory must reject the document; the marker must never appear.
      */
+    #[RequiresOperatingSystemFamily('Linux')]
     public function testExternalEntityCannotReadLocalFileUsingNonDefaultOptions(): void
     {
         // file:// URI pointing at our temporary secret
         $uri = 'file://' . $this->secretFile;
-
         $payload = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE foo [
-  <!ELEMENT foo ANY>
   <!ENTITY xxe SYSTEM "{$uri}">
 ]>
 <foo>&xxe;</foo>
@@ -102,7 +101,7 @@ public function testExternalEntityCannotReadLocalFileUsingNonDefaultOptions(): v
         $xml = $doc->saveXml();
         $this->assertStringContainsString(
             $this->marker,
-            $xml,
+            (string)$xml,
             'XXE succeeded: local file content was expanded into the document',
         );
     }
@@ -111,14 +110,14 @@ public function testExternalEntityCannotReadLocalFileUsingNonDefaultOptions(): v
     /**
      * Same idea with a UTF-16LE encoded payload.
      */
+    #[RequiresOperatingSystemFamily('Linux')]
     public function testUtf16ExternalEntityCannotReadLocalFileUsingDefaultOptions(): void
     {
         $uri = 'file://' . $this->secretFile;
 
         $utf8 = <<<XML
 <?xml version="1.0" encoding="UTF-16"?>
 <!DOCTYPE foo [
-  <!ELEMENT foo ANY>
   <!ENTITY xxe SYSTEM "{$uri}">
 ]>
 <foo>&xxe;</foo>
@@ -131,7 +130,7 @@ public function testUtf16ExternalEntityCannotReadLocalFileUsingDefaultOptions():
         $xml = $doc->saveXml();
         $this->assertStringNotContainsString(
             $this->marker,
-            $xml,
+            (string)$xml,
             'XXE succeeded: local file content was expanded into the document',
         );
     }
@@ -140,14 +139,14 @@ public function testUtf16ExternalEntityCannotReadLocalFileUsingDefaultOptions():
     /**
      * Same idea with a UTF-16LE encoded payload.
      */
+    #[RequiresOperatingSystemFamily('Linux')]
     public function testUtf16ExternalEntityCannotReadLocalFileUsingNonDefaultOptions(): void
     {
         $uri = 'file://' . $this->secretFile;
 
         $utf8 = <<<XML
 <?xml version="1.0" encoding="UTF-16"?>
 <!DOCTYPE foo [
-  <!ELEMENT foo ANY>
   <!ENTITY xxe SYSTEM "{$uri}">
 ]>
 <foo>&xxe;</foo>
@@ -160,7 +159,7 @@ public function testUtf16ExternalEntityCannotReadLocalFileUsingNonDefaultOptions
         $xml = mb_convert_encoding($doc->saveXml(), 'UTF-8', 'UTF-16LE');
         $this->assertStringContainsString(
             $this->marker,
-            $xml,
+            (string)$xml,
             'XXE succeeded: local file content was expanded into the document',
         );
     }

tests/XPath/XPathTest.php

@@ -220,7 +220,7 @@ public function testSkipsDefaultNamespaceDeclarationDoesNotCreateUsableXmlnsPref
             XPath::xpQuery($context, 'xmlns:b', $xp);
         } finally {
             $errors = libxml_get_errors();
-            $this->assertEquals("Undefined namespace prefix\n", $errors[0]->message);
+            $this->assertStringStartsWith("Undefined namespace prefix", $errors[0]->message);
             libxml_clear_errors();
             libxml_use_internal_errors(false);
         }
@@ -251,7 +251,7 @@ public function testSkipsEmptyUriNamespaceDeclaration(): void
         } finally {
             $errors = libxml_get_errors();
             $this->assertEquals("xmlns:empty: Empty XML namespace is not allowed\n", $errors[0]->message);
-            $this->assertEquals("Undefined namespace prefix\n", $errors[1]->message);
+            $this->assertStringStartsWith("Undefined namespace prefix", $errors[1]->message);
             libxml_clear_errors();
             libxml_use_internal_errors(false);
         }
@@ -352,7 +352,7 @@ public function testAbsoluteXPathFindsTopLevelSlatePerson(
             } finally {
                 $errors = libxml_get_errors();
                 $this->assertNotEmpty($errors);
-                $this->assertSame("Undefined namespace prefix\n", $errors[0]->message);
+                $this->assertStringStartsWith("Undefined namespace prefix", $errors[0]->message);
                 libxml_clear_errors();
                 libxml_use_internal_errors(false);
             }