Fix remaining tests.Added pre-commit commands in composer.json (#394)

Author: ioigoume

composer.json

@@ -69,5 +69,15 @@
             "phpstan/extension-installer": true,
             "simplesamlphp/composer-xmlprovider-installer": true
         }
+    },
+    "scripts": {
+        "pre-commit": [
+            "vendor/bin/phpcs -p",
+            "vendor/bin/composer-require-checker check --config-file=tools/composer-require-checker.json composer.json",
+            "vendor/bin/phpstan analyze -c phpstan.neon",
+            "vendor/bin/phpstan analyze -c phpstan-dev.neon",
+            "vendor/bin/composer-unused",
+            "vendor/bin/phpunit --no-coverage --testdox"
+        ]
     }
 }

tests/SAML2/XML/md/EntityDescriptorTest.php

@@ -494,10 +494,17 @@ public function testUnmarshalling(): void
             $entityDescriptor->getAdditionalMetadataLocation()[1],
         );
 
-        $this->assertEquals(
+        // Normalize both documents before comparing
+        $expectedDoc = DOMDocumentFactory::fromString(
             $xmlRepresentation->saveXML($xmlRepresentation->documentElement),
-            strval($entityDescriptor),
         );
+        $expected = DOMDocumentFactory::normalizeDocument($expectedDoc);
+
+        $actualDoc = DOMDocumentFactory::fromString((string) $entityDescriptor);
+        $actual = DOMDocumentFactory::normalizeDocument($actualDoc);
+
+        // Compare normalized XML
+        $this->assertXmlStringEqualsXmlString($expected->saveXML(), $actual->saveXML());
     }
 
 

tests/SAML2/XML/saml/SubjectTest.php

@@ -266,7 +266,12 @@ public function testMarshallingBaseID(): void
         AbstractBaseID::fromXML(self::$baseId->documentElement)->toXML($document->documentElement);
         SubjectConfirmation::fromXML(self::$subjectConfirmation->documentElement)->toXML($document->documentElement);
 
-        $this->assertXmlStringEqualsXmlString($document->saveXML(), strval($subject));
+        // Normalize both documents before comparing
+        $expected = DOMDocumentFactory::normalizeDocument($document);
+        $actualDoc = DOMDocumentFactory::fromString((string) $subject);
+        $actual = DOMDocumentFactory::normalizeDocument($actualDoc);
+
+        $this->assertXmlStringEqualsXmlString($expected->saveXML(), $actual->saveXML());
     }