Restore backwards compatibility

Author: tvdijen

src/SAML2/DOMDocumentFactory.php

@@ -47,7 +47,7 @@ public static function fromFile(string $file): DOMDocument
     /**
      * @return \DOMDocument
      */
-    public static function create() : DOMDocument
+    public static function create(): DOMDocument
     {
         return BaseDOMDocumentFactory::create('1.0', 'UTF-8');
     }

tests/SAML2/DOMDocumentFactoryTest.php

@@ -11,13 +11,15 @@
 use SimpleSAML\XML\Exception\RuntimeException;
 use SimpleSAML\XML\Exception\UnparseableXMLException;
 
+use function sprintf;
+
 class DOMDocumentFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @group domdocument
      * @return void
      */
-    public function testNotXmlStringRaisesAnException() : void
+    public function testNotXmlStringRaisesAnException(): void
     {
         $this->expectException(UnparseableXMLException::class);
         DOMDocumentFactory::fromString('this is not xml');
@@ -28,7 +30,7 @@ public function testNotXmlStringRaisesAnException() : void
      * @group domdocument
      * @return void
      */
-    public function testXmlStringIsCorrectlyLoaded() : void
+    public function testXmlStringIsCorrectlyLoaded(): void
     {
         $xml = '<root/>';
 
@@ -41,7 +43,7 @@ public function testXmlStringIsCorrectlyLoaded() : void
     /**
      * @return void
      */
-    public function testFileThatDoesNotExistIsNotAccepted() : void
+    public function testFileThatDoesNotExistIsNotAccepted(): void
     {
         $this->expectException(IOException::class);
         $filename = 'DoesNotExist.ext';
@@ -53,7 +55,7 @@ public function testFileThatDoesNotExistIsNotAccepted() : void
      * @group domdocument
      * @return void
      */
-    public function testFileThatDoesNotContainXMLCannotBeLoaded() : void
+    public function testFileThatDoesNotContainXMLCannotBeLoaded(): void
     {
         $this->expectException(UnparseableXMLException::class);
         $file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'domdocument_invalid_xml.xml';
@@ -65,7 +67,7 @@ public function testFileThatDoesNotContainXMLCannotBeLoaded() : void
      * @group domdocument
      * @return void
      */
-    public function testFileWithValidXMLCanBeLoaded() : void
+    public function testFileWithValidXMLCanBeLoaded(): void
     {
         $file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'domdocument_valid_xml.xml';
 
@@ -79,7 +81,7 @@ public function testFileWithValidXMLCanBeLoaded() : void
      * @group                    domdocument
      * @return void
      */
-    public function testFileThatContainsDocTypeIsNotAccepted() : void
+    public function testFileThatContainsDocTypeIsNotAccepted(): void
     {
         $this->expectException(RuntimeException::class, 'Dangerous XML detected, DOCTYPE nodes are not allowed in the XML body');
         $file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'domdocument_doctype.xml';
@@ -93,7 +95,7 @@ public function testFileThatContainsDocTypeIsNotAccepted() : void
      * @group                    domdocument
      * @return void
      */
-    public function testStringThatContainsDocTypeIsNotAccepted() : void
+    public function testStringThatContainsDocTypeIsNotAccepted(): void
     {
         $this->expectException(RuntimeException::class, 'Dangerous XML detected, DOCTYPE nodes are not allowed in the XML body');
         $xml = '<!DOCTYPE foo [<!ELEMENT foo ANY > <!ENTITY xxe SYSTEM "file:///dev/random" >]><foo />';
@@ -123,12 +125,12 @@ public function testStringThatContainsDocTypeIsNotAccepted2(): void
      * @group                    domdocument
      * @return void
      */
-    public function testEmptyFileIsNotValid() : void
+    public function testEmptyFileIsNotValid(): void
     {
         $this->expectException(RuntimeException::class, 'does not have content');
         $file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'domdocument_empty.xml';
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('File "/home/runner/work/saml2/saml2/tests/SAML2/domdocument_empty.xml" does not have content');
+        $this->expectExceptionMessage(sprintf('File "%s" does not have content', $file));
         DOMDocumentFactory::fromFile($file);
     }
 
@@ -137,7 +139,7 @@ public function testEmptyFileIsNotValid() : void
      * @group                    domdocument
      * @return void
      */
-    public function testEmptyStringIsNotValid() : void
+    public function testEmptyStringIsNotValid(): void
     {
         $this->expectException(AssertionFailedException::class);
         $this->expectExceptionMessage('Expected a non-whitespace string. Got: ""');