diff --git a/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php b/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php
index 921dd54f1..516896353 100644
--- a/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php
+++ b/src/SAML2/Assertion/Validation/SubjectConfirmationValidator.php
@@ -33,7 +33,7 @@ public function __construct(
      * @param \SimpleSAML\SAML2\Assertion\Validation\SubjectConfirmationConstraintValidator $constraint
      */
     public function addConstraintValidator(
-        SubjectConfirmationConstraintValidator $constraint
+        SubjectConfirmationConstraintValidator $constraint,
     ): void {
         if ($constraint instanceof IdentityProviderAware) {
             $constraint->setIdentityProvider($this->identityProvider);
diff --git a/src/SAML2/Binding.php b/src/SAML2/Binding.php
index 47c0b539e..a848ec40d 100644
--- a/src/SAML2/Binding.php
+++ b/src/SAML2/Binding.php
@@ -132,7 +132,7 @@ public static function getCurrentBinding(ServerRequestInterface $request): Bindi
 
         if (!empty($query)) {
             $logger->warning(
-                $method . " parameters: '" . implode("', '", array_map('addslashes', array_keys($query))) . "'"
+                $method . " parameters: '" . implode("', '", array_map('addslashes', array_keys($query))) . "'",
             );
         }
 
diff --git a/src/SAML2/Compat/MockContainer.php b/src/SAML2/Compat/MockContainer.php
index f03cad57c..b60018a54 100644
--- a/src/SAML2/Compat/MockContainer.php
+++ b/src/SAML2/Compat/MockContainer.php
@@ -62,7 +62,7 @@ public function debugMessage($message, string $type): void
      */
     public function getPOSTRedirectURL(
         /** @scrutinizer ignore-unused */string $url = null,
-        /** @scrutinizer ignore-unused */array $data = []
+        /** @scrutinizer ignore-unused */array $data = [],
     ): string {
         return strval($url);
     }
diff --git a/src/SAML2/Configuration/SimpleSAMLConverter.php b/src/SAML2/Configuration/SimpleSAMLConverter.php
index 6eafa76e6..bf19e6857 100644
--- a/src/SAML2/Configuration/SimpleSAMLConverter.php
+++ b/src/SAML2/Configuration/SimpleSAMLConverter.php
@@ -149,7 +149,7 @@ protected static function enrichForDecryptionProvider(
 
             if ($configuration->hasValue('encryption.blacklisted-algorithms')) {
                 $baseConfiguration['blacklistedEncryptionAlgorithms'] = $configuration->getValue(
-                    'encryption.blacklisted-algorithms'
+                    'encryption.blacklisted-algorithms',
                 );
             }
         }
diff --git a/src/SAML2/HTTPArtifact.php b/src/SAML2/HTTPArtifact.php
index 855e5e152..8922089a6 100644
--- a/src/SAML2/HTTPArtifact.php
+++ b/src/SAML2/HTTPArtifact.php
@@ -153,7 +153,7 @@ public function receive(ServerRequestInterface $request): AbstractMessage
         }
 
         Utils::getContainer()->getLogger()->debug(
-            "ArtifactResolutionService endpoint being used is := " . $endpoint['Location']
+            "ArtifactResolutionService endpoint being used is := " . $endpoint['Location'],
         );
 
         /**
diff --git a/src/SAML2/HTTPRedirect.php b/src/SAML2/HTTPRedirect.php
index f808ebeb5..46b72b4ee 100644
--- a/src/SAML2/HTTPRedirect.php
+++ b/src/SAML2/HTTPRedirect.php
@@ -101,7 +101,7 @@ public function send(AbstractMessage $message): ResponseInterface
     {
         $destination = $this->getRedirectURL($message);
         Utils::getContainer()->getLogger()->debug(
-            'Redirect to ' . strlen($destination) . ' byte URL: ' . $destination
+            'Redirect to ' . strlen($destination) . ' byte URL: ' . $destination,
         );
         return new Response(303, ['Location' => $destination]);
     }
diff --git a/src/SAML2/SOAPClient.php b/src/SAML2/SOAPClient.php
index ee20afb2a..5ccf2d3be 100644
--- a/src/SAML2/SOAPClient.php
+++ b/src/SAML2/SOAPClient.php
@@ -69,7 +69,7 @@ public function send(
             if ($cert !== false) {
                 $configUtils = new Config();
                 $ctxOpts['ssl']['local_cert'] = $configUtils->getCertPath(
-                    $srcMetadata->getString('saml.SOAPClient.certificate')
+                    $srcMetadata->getString('saml.SOAPClient.certificate'),
                 );
                 if ($srcMetadata->hasValue('saml.SOAPClient.privatekey_pass')) {
                     $ctxOpts['ssl']['passphrase'] = $srcMetadata->getString('saml.SOAPClient.privatekey_pass');
diff --git a/src/SAML2/XML/ecp/RequestAuthenticated.php b/src/SAML2/XML/ecp/RequestAuthenticated.php
index c7a8021d3..27410cfd5 100644
--- a/src/SAML2/XML/ecp/RequestAuthenticated.php
+++ b/src/SAML2/XML/ecp/RequestAuthenticated.php
@@ -27,7 +27,7 @@ final class RequestAuthenticated extends AbstractEcpElement
      * @param bool $mustUnderstand
      */
     public function __construct(
-        protected bool $mustUnderstand
+        protected bool $mustUnderstand,
     ) {
     }
 
diff --git a/src/SAML2/XML/md/AbstractRoleDescriptor.php b/src/SAML2/XML/md/AbstractRoleDescriptor.php
index 7f5ceb437..d707aa290 100644
--- a/src/SAML2/XML/md/AbstractRoleDescriptor.php
+++ b/src/SAML2/XML/md/AbstractRoleDescriptor.php
@@ -106,7 +106,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(
             $xml->hasAttributeNS(C::NS_XSI, 'type'),
             'Missing required xsi:type in <saml:RoleDescriptor> element.',
-            SchemaViolationException::class
+            SchemaViolationException::class,
         );
 
         $type = $xml->getAttributeNS(C::NS_XSI, 'type');
diff --git a/src/SAML2/XML/md/AbstractRoleDescriptorType.php b/src/SAML2/XML/md/AbstractRoleDescriptorType.php
index f4f7a3b56..752271944 100644
--- a/src/SAML2/XML/md/AbstractRoleDescriptorType.php
+++ b/src/SAML2/XML/md/AbstractRoleDescriptorType.php
@@ -54,7 +54,7 @@ public function __construct(
         protected array $keyDescriptor = [],
         protected ?Organization $organization = null,
         protected array $contact = [],
-        array $namespacedAttributes = []
+        array $namespacedAttributes = [],
     ) {
         Assert::maxCount($protocolSupportEnumeration, C::UNBOUNDED_LIMIT);
         Assert::minCount(
diff --git a/src/SAML2/XML/md/AttributeAuthorityDescriptor.php b/src/SAML2/XML/md/AttributeAuthorityDescriptor.php
index a64dfede2..827914ccc 100644
--- a/src/SAML2/XML/md/AttributeAuthorityDescriptor.php
+++ b/src/SAML2/XML/md/AttributeAuthorityDescriptor.php
@@ -57,7 +57,7 @@ public function __construct(
         ?Organization $organization = null,
         array $keyDescriptor = [],
         array $contact = [],
-        array $namespacedAttributes = []
+        array $namespacedAttributes = [],
     ) {
         Assert::maxCount($attributeService, C::UNBOUNDED_LIMIT);
         Assert::minCount(
@@ -91,7 +91,7 @@ public function __construct(
             $keyDescriptor,
             $organization,
             $contact,
-            $namespacedAttributes
+            $namespacedAttributes,
         );
     }
 
diff --git a/src/SAML2/XML/md/KeyDescriptor.php b/src/SAML2/XML/md/KeyDescriptor.php
index 65e61e64c..e102c3df8 100644
--- a/src/SAML2/XML/md/KeyDescriptor.php
+++ b/src/SAML2/XML/md/KeyDescriptor.php
@@ -29,7 +29,7 @@ final class KeyDescriptor extends AbstractMdElement
     public function __construct(
         protected KeyInfo $keyInfo,
         protected ?string $use = null,
-        protected array $encryptionMethod = []
+        protected array $encryptionMethod = [],
     ) {
         Assert::nullOrOneOf(
             $use,
diff --git a/src/SAML2/XML/md/SPSSODescriptor.php b/src/SAML2/XML/md/SPSSODescriptor.php
index 7930e812d..92bfc7f29 100644
--- a/src/SAML2/XML/md/SPSSODescriptor.php
+++ b/src/SAML2/XML/md/SPSSODescriptor.php
@@ -76,7 +76,7 @@ public function __construct(
             $artifactResolutionService,
             $singleLogoutService,
             $manageNameIDService,
-            $nameIDFormat
+            $nameIDFormat,
         );
 
         Assert::maxCount($assertionConsumerService, C::UNBOUNDED_LIMIT);
@@ -99,7 +99,7 @@ public function __construct(
                 $attributeConsumingService,
                 function (AttributeConsumingService $acs) {
                     return $acs->getIsDefault() === true;
-                }
+                },
             ),
             1,
             'Only one md:AttributeConsumingService can be set as default.',
diff --git a/src/SAML2/XML/md/UnknownRoleDescriptor.php b/src/SAML2/XML/md/UnknownRoleDescriptor.php
index b675ffd1c..441def5a0 100644
--- a/src/SAML2/XML/md/UnknownRoleDescriptor.php
+++ b/src/SAML2/XML/md/UnknownRoleDescriptor.php
@@ -46,7 +46,7 @@ protected function __construct(
         array $keyDescriptors = [],
         ?Organization $organization = null,
         array $contacts = [],
-        array $namespacedAttributes = []
+        array $namespacedAttributes = [],
     ) {
         parent::__construct(
             $type,
diff --git a/tests/SAML2/XML/init/RequestInitiatorTest.php b/tests/SAML2/XML/init/RequestInitiatorTest.php
index 4af8eb159..49915d68a 100644
--- a/tests/SAML2/XML/init/RequestInitiatorTest.php
+++ b/tests/SAML2/XML/init/RequestInitiatorTest.php
@@ -42,7 +42,7 @@ final class RequestInitiatorTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         self::$ext = new Chunk(DOMDocumentFactory::fromString(
-            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>'
+            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>',
         )->documentElement);
 
         self::$schemaFile = dirname(__FILE__, 5) . '/resources/schemas/sstc-request-initiation.xsd';
diff --git a/tests/SAML2/XML/md/AffiliationDescriptorTest.php b/tests/SAML2/XML/md/AffiliationDescriptorTest.php
index 668663550..d435a65cb 100644
--- a/tests/SAML2/XML/md/AffiliationDescriptorTest.php
+++ b/tests/SAML2/XML/md/AffiliationDescriptorTest.php
@@ -136,7 +136,7 @@ public function testUnmarshallingWithoutMembers(): void
 <md:AffiliationDescriptor xmlns:md="{$mdNamespace}" affiliationOwnerID="{$entity_idp}" ID="TheID"
     validUntil="2009-02-13T23:31:30Z" cacheDuration="PT5000S">
 </md:AffiliationDescriptor>
-XML
+XML,
         );
         $this->expectException(Exception::class);
         $this->expectExceptionMessage('List of affiliated members must not be empty.');
@@ -159,7 +159,7 @@ public function testUnmarshallingWithoutOwner(): void
   <md:AffiliateMember>{$entity_sp}</md:AffiliateMember>
   <md:AffiliateMember>{$entity_other}</md:AffiliateMember>
 </md:AffiliationDescriptor>
-XML
+XML,
         );
 
         $this->expectException(MissingAttributeException::class);
diff --git a/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php b/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php
index 3ba22feb3..9e4df6cb5 100644
--- a/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php
+++ b/tests/SAML2/XML/md/ArtifactResolutionServiceTest.php
@@ -50,7 +50,7 @@ final class ArtifactResolutionServiceTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         self::$ext = new Chunk(DOMDocumentFactory::fromString(
-            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>'
+            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>',
         )->documentElement);
 
         self::$attr = new XMLAttribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', 'testval1');
diff --git a/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php b/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php
index c7e6ffa29..4067a0135 100644
--- a/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php
+++ b/tests/SAML2/XML/md/AttributeAuthorityDescriptorTest.php
@@ -242,7 +242,7 @@ public function testUnmarshallingWithoutOptionalElements(): void
   <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
       Location="https://IdentityProvider.com/SAML/AA/SOAP"/>
 </md:AttributeAuthorityDescriptor>
-XML
+XML,
         );
 
         $aad = AttributeAuthorityDescriptor::fromXML($document->documentElement);
@@ -271,7 +271,7 @@ public function testUnmarshallingWithEmptyNameIDFormat(): void
       Location="https://IdentityProvider.com/SAML/AA/SOAP"/>
   <md:NameIDFormat></md:NameIDFormat>
 </md:AttributeAuthorityDescriptor>
-XML
+XML,
         );
         $this->expectException(SchemaViolationException::class);
         AttributeAuthorityDescriptor::fromXML($document->documentElement);
@@ -290,7 +290,7 @@ public function testUnmarshallingWithEmptyAttributeProfile(): void
       Location="https://IdentityProvider.com/SAML/AA/SOAP"/>
   <md:AttributeProfile></md:AttributeProfile>
 </md:AttributeAuthorityDescriptor>
-XML
+XML,
         );
         $this->expectException(SchemaViolationException::class);
         AttributeAuthorityDescriptor::fromXML($document->documentElement);
diff --git a/tests/SAML2/XML/md/ContactPersonTest.php b/tests/SAML2/XML/md/ContactPersonTest.php
index 63500d7d4..db5396389 100644
--- a/tests/SAML2/XML/md/ContactPersonTest.php
+++ b/tests/SAML2/XML/md/ContactPersonTest.php
@@ -225,7 +225,7 @@ public function testUnmarshallingWithoutOptionalArguments(): void
         $mdNamespace = C::NS_MD;
         $document = DOMDocumentFactory::fromString(<<<XML
 <md:ContactPerson contactType="other" xmlns:md="{$mdNamespace}"/>
-XML
+XML,
         );
         $cp = ContactPerson::fromXML($document->documentElement);
         $this->assertEquals($document->saveXML($document->documentElement), strval($cp));
diff --git a/tests/SAML2/XML/md/EncryptionMethodTest.php b/tests/SAML2/XML/md/EncryptionMethodTest.php
index 455990dbb..fc09ed132 100644
--- a/tests/SAML2/XML/md/EncryptionMethodTest.php
+++ b/tests/SAML2/XML/md/EncryptionMethodTest.php
@@ -60,7 +60,7 @@ public function testMarshalling(): void
     {
         $alg = C::KEY_TRANSPORT_OAEP_MGF1P;
         $chunkXml = DOMDocumentFactory::fromString(
-            '<ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">Value</ssp:Chunk>'
+            '<ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">Value</ssp:Chunk>',
         );
         $chunk = Chunk::fromXML($chunkXml->documentElement);
 
diff --git a/tests/SAML2/XML/md/EndpointTypeTest.php b/tests/SAML2/XML/md/EndpointTypeTest.php
index 941e68b67..4a1201959 100644
--- a/tests/SAML2/XML/md/EndpointTypeTest.php
+++ b/tests/SAML2/XML/md/EndpointTypeTest.php
@@ -210,7 +210,7 @@ public function testUnmarshallingWithoutOptionalAttributes(): void
 
         $document = DOMDocumentFactory::fromString(<<<XML
 <md:AttributeService xmlns:md="{$mdNamespace}" Binding="urn:x-simplesamlphp:namespace" Location="{$location}" />
-XML
+XML,
         );
         $as = AttributeService::fromXML($document->documentElement);
         $this->assertNull($as->getResponseLocation());
diff --git a/tests/SAML2/XML/md/EntityDescriptorTest.php b/tests/SAML2/XML/md/EntityDescriptorTest.php
index 74f459b34..0d8ff0693 100644
--- a/tests/SAML2/XML/md/EntityDescriptorTest.php
+++ b/tests/SAML2/XML/md/EntityDescriptorTest.php
@@ -158,7 +158,7 @@ public function testMarshalling(): void
             new PublicationInfo(
                 publisher: 'http://publisher.ra/',
                 creationInstant: new DateTimeImmutable('2020-02-03T13:46:24Z'),
-                usagePolicy: [new UsagePolicy('en', 'http://publisher.ra/policy.txt')]
+                usagePolicy: [new UsagePolicy('en', 'http://publisher.ra/policy.txt')],
             ),
         ]);
 
@@ -227,7 +227,7 @@ public function testMarshallingWithAffiliationDescriptor(): void
   <md:AdditionalMetadataLocation
       namespace="urn:x-simplesamlphp:namespace">https://example.edu/more/metadata.xml</md:AdditionalMetadataLocation>
 </md:EntityDescriptor>
-XML
+XML,
         );
 
         $entityid = C::ENTITY_IDP;
@@ -446,7 +446,7 @@ public function testUnmarshallingWithoutEntityId(): void
         <AffiliateMember>{$entity_sp}</AffiliateMember>
     </AffiliationDescriptor>
 </EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(MissingAttributeException::class);
         $this->expectExceptionMessage('Missing \'entityID\' attribute on md:EntityDescriptor.');
@@ -464,7 +464,7 @@ public function testUnmarshallingWithoutDescriptors(): void
 
         $document = DOMDocumentFactory::fromString(<<<XML
 <EntityDescriptor entityID="{$entity_idp}" xmlns="{$saml_md}"></EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
@@ -488,7 +488,7 @@ public function testUnmarshallingWithInvalidValidUntil(): void
         <AffiliateMember>{$entity_sp}</AffiliateMember>
     </AffiliationDescriptor>
 </EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(AssertionFailedException::class);
         $this->expectExceptionMessage('\'asdf\' is not a valid xs:dateTime');
@@ -514,7 +514,7 @@ public function testUnmarshallingWithAffiliationDescriptor(): void
     <AffiliateMember>{$entity_other}</AffiliateMember>
   </AffiliationDescriptor>
 </EntityDescriptor>
-XML
+XML,
         );
         $entityDescriptor = EntityDescriptor::fromXML($document->documentElement);
         $this->assertEquals([], $entityDescriptor->getRoleDescriptor());
@@ -543,7 +543,7 @@ public function testUnmarshallingWithSeveralAffiliationDescriptors(): void
     <AffiliateMember>{$entity_sp}</AffiliateMember>
   </AffiliationDescriptor>
 </EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(TooManyElementsException::class);
         $this->expectExceptionMessage('More than one AffiliationDescriptor in the entity.');
@@ -576,7 +576,7 @@ public function testUnmarshallingWithMultipleOrganizations(): void
     <OrganizationURL xml:lang="no">https://IdentityProvider.com</OrganizationURL>
   </Organization>
 </EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(TooManyElementsException::class);
         $this->expectExceptionMessage('More than one Organization in the entity.');
@@ -610,7 +610,7 @@ public function testUnmarshallingWithRoleandAffiliationDescriptors(): void
     <OrganizationURL xml:lang="en">https://IdentityProvider.com</OrganizationURL>
   </Organization>
 </EntityDescriptor>
-XML
+XML,
         );
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
diff --git a/tests/SAML2/XML/md/ExtensionsTest.php b/tests/SAML2/XML/md/ExtensionsTest.php
index d305ac897..b063114be 100644
--- a/tests/SAML2/XML/md/ExtensionsTest.php
+++ b/tests/SAML2/XML/md/ExtensionsTest.php
@@ -187,7 +187,7 @@ public function testUnmarshalling(): void
   </emd:RepublishRequest>
   <ns:SomeChunk foo="bar">SomeText</ns:SomeChunk>
 </md:Extensions>
-XML
+XML,
         );
         $extensions = Extensions::fromXML($document->documentElement);
         $list = $extensions->getList();
diff --git a/tests/SAML2/XML/md/IDPSSODescriptorTest.php b/tests/SAML2/XML/md/IDPSSODescriptorTest.php
index 6876e49e8..7f6ece7ad 100644
--- a/tests/SAML2/XML/md/IDPSSODescriptorTest.php
+++ b/tests/SAML2/XML/md/IDPSSODescriptorTest.php
@@ -303,7 +303,7 @@ public function testUnmarshallingWithoutOptionalArguments(): void
   <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
       Location="https://IdentityProvider.com/SAML/SSO/Browser"/>
 </md:IDPSSODescriptor>
-XML
+XML,
         );
         $idpssod = IDPSSODescriptor::fromXML($document->documentElement);
         $this->assertCount(1, $idpssod->getSingleSignOnService());
diff --git a/tests/SAML2/XML/md/KeyDescriptorTest.php b/tests/SAML2/XML/md/KeyDescriptorTest.php
index 77a6ed38d..96c5d4af1 100644
--- a/tests/SAML2/XML/md/KeyDescriptorTest.php
+++ b/tests/SAML2/XML/md/KeyDescriptorTest.php
@@ -101,7 +101,7 @@ public function testMarshallingWithoutOptionalParameters(): void
     <ds:KeyName>IdentityProvider.com SSO Key</ds:KeyName>
   </ds:KeyInfo>
 </md:KeyDescriptor>
-XML
+XML,
             ,
             strval($kd),
         );
@@ -137,7 +137,7 @@ public function testUnmarshallingWithoutOptionalParameters(): void
     <ds:KeyName>IdentityProvider.com SSO Key</ds:KeyName>
   </ds:KeyInfo>
 </md:KeyDescriptor>
-XML
+XML,
         );
 
         $kd = KeyDescriptor::fromXML($document->documentElement);
diff --git a/tests/SAML2/XML/md/OrganizationTest.php b/tests/SAML2/XML/md/OrganizationTest.php
index 9578b3966..d3426e141 100644
--- a/tests/SAML2/XML/md/OrganizationTest.php
+++ b/tests/SAML2/XML/md/OrganizationTest.php
@@ -52,7 +52,7 @@ public static function setUpBeforeClass(): void
         self::$testedClass = Organization::class;
 
         self::$ext = DOMDocumentFactory::fromString(
-            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>'
+            '<some:Ext xmlns:some="urn:mace:some:metadata:1.0">SomeExtension</some:Ext>',
         );
 
         self::$arrayRepresentation = [
diff --git a/tests/SAML2/XML/md/PDPDescriptorTest.php b/tests/SAML2/XML/md/PDPDescriptorTest.php
index c53bdfec8..4e91df593 100644
--- a/tests/SAML2/XML/md/PDPDescriptorTest.php
+++ b/tests/SAML2/XML/md/PDPDescriptorTest.php
@@ -186,7 +186,7 @@ public function testUnmarshallingWithoutOptionalArguments(): void
   <md:AuthzService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
       Location="https://IdentityProvider.com/SAML/AA/SOAP"/>
 </md:PDPDescriptor>
-XML
+XML,
         );
         $pdpd = PDPDescriptor::fromXML($document->documentElement);
         $this->assertEmpty($pdpd->getAssertionIDRequestService());
diff --git a/tests/SAML2/XML/md/SPSSODescriptorTest.php b/tests/SAML2/XML/md/SPSSODescriptorTest.php
index c1c1ffa9f..d1e8cb4c6 100644
--- a/tests/SAML2/XML/md/SPSSODescriptorTest.php
+++ b/tests/SAML2/XML/md/SPSSODescriptorTest.php
@@ -265,7 +265,7 @@ public function testUnmarshallingWithoutOptionalArguments(): void
   <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
     Location="https://ServiceProvider.com/SAML/SSO/Artifact" index="0" isDefault="true"/>
 </md:SPSSODescriptor>
-XML
+XML,
         );
 
         $spssod = SPSSODescriptor::fromXML($document->documentElement);
diff --git a/tests/SAML2/XML/mdattr/EntityAttributesTest.php b/tests/SAML2/XML/mdattr/EntityAttributesTest.php
index 0a71a67d5..e57501bf5 100644
--- a/tests/SAML2/XML/mdattr/EntityAttributesTest.php
+++ b/tests/SAML2/XML/mdattr/EntityAttributesTest.php
@@ -133,13 +133,13 @@ public function testMarshalling(): void
             '_93af655219464fb403b34436cfb0c5cb1d9a5502',
             $subject,
             $conditions,
-            [$attrStatement]
+            [$attrStatement],
         );
 
         // Sign the assertion
         $signer = (new SignatureAlgorithmFactory())->getAlgorithm(
             C::SIG_RSA_SHA256,
-            PEMCertificatesMock::getPrivateKey(PEMCertificatesMock::PRIVATE_KEY)
+            PEMCertificatesMock::getPrivateKey(PEMCertificatesMock::PRIVATE_KEY),
         );
         $unsignedAssertion->sign($signer);
         $signedAssertion = Assertion::fromXML($unsignedAssertion->toXML());
diff --git a/tests/SAML2/XML/mdrpi/PublicationInfoTest.php b/tests/SAML2/XML/mdrpi/PublicationInfoTest.php
index 51b07709d..66eb534d7 100644
--- a/tests/SAML2/XML/mdrpi/PublicationInfoTest.php
+++ b/tests/SAML2/XML/mdrpi/PublicationInfoTest.php
@@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void
         self::$testedClass = PublicationInfo::class;
 
         self::$xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 4) . '/resources/xml/mdrpi_PublicationInfo.xml'
+            dirname(__FILE__, 4) . '/resources/xml/mdrpi_PublicationInfo.xml',
         );
 
         self::$arrayRepresentation = [
@@ -86,7 +86,9 @@ public function testCreationInstantTimezoneNotZuluThrowsException(): void
         $document->setAttribute('creationInstant', '2011-01-01T00:00:00WT');
 
         $this->expectException(ProtocolViolationException::class);
-        $this->expectExceptionMessage("'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.");
+        $this->expectExceptionMessage(
+            "'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.",
+        );
         PublicationInfo::fromXML($document);
     }
 
@@ -95,12 +97,14 @@ public function testCreationInstantTimezoneNotZuluThrowsException(): void
      */
     public function testMissingPublisherThrowsException(): void
     {
-        $document = DOMDocumentFactory::fromString(<<<XML
+        $document = DOMDocumentFactory::fromString(
+            <<<XML
 <mdrpi:PublicationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
                        creationInstant="2011-01-01T00:00:00Z"
                        publicationId="SomePublicationId">
 </mdrpi:PublicationInfo>
 XML
+            ,
         );
 
         $this->expectException(MissingAttributeException::class);
@@ -122,7 +126,7 @@ public function testMultipleUsagePoliciesWithSameLanguageThrowsException(): void
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdrpi:UsagePolicy>,'
-            . ' within a given <mdrpi:PublicationInfo>, for a given language'
+            . ' within a given <mdrpi:PublicationInfo>, for a given language',
         );
         PublicationInfo::fromXML($document);
     }
diff --git a/tests/SAML2/XML/mdrpi/PublicationTest.php b/tests/SAML2/XML/mdrpi/PublicationTest.php
index 6245e63b5..c8d2f5709 100644
--- a/tests/SAML2/XML/mdrpi/PublicationTest.php
+++ b/tests/SAML2/XML/mdrpi/PublicationTest.php
@@ -80,7 +80,9 @@ public function testCreationInstantTimezoneNotZuluThrowsException(): void
         $document->setAttribute('creationInstant', '2011-01-01T00:00:00WT');
 
         $this->expectException(ProtocolViolationException::class);
-        $this->expectExceptionMessage("'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.");
+        $this->expectExceptionMessage(
+            "'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.",
+        );
         Publication::fromXML($document);
     }
 
@@ -89,12 +91,14 @@ public function testCreationInstantTimezoneNotZuluThrowsException(): void
      */
     public function testMissingPublisherThrowsException(): void
     {
-        $document = DOMDocumentFactory::fromString(<<<XML
+        $document = DOMDocumentFactory::fromString(
+            <<<XML
 <mdrpi:Publication xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
                        creationInstant="2011-01-01T00:00:00Z"
                        publicationId="SomePublicationId">
 </mdrpi:Publication>
 XML
+            ,
         );
 
         $this->expectException(MissingAttributeException::class);
diff --git a/tests/SAML2/XML/mdrpi/RegistrationInfoTest.php b/tests/SAML2/XML/mdrpi/RegistrationInfoTest.php
index ec57b6eb2..e128ef832 100644
--- a/tests/SAML2/XML/mdrpi/RegistrationInfoTest.php
+++ b/tests/SAML2/XML/mdrpi/RegistrationInfoTest.php
@@ -83,11 +83,13 @@ public function testMarshalling(): void
      */
     public function testMissingPublisherThrowsException(): void
     {
-        $document = DOMDocumentFactory::fromString(<<<XML
+        $document = DOMDocumentFactory::fromString(
+            <<<XML
 <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
                        registrationInstant="2011-01-01T00:00:00Z">
 </mdrpi:RegistrationInfo>
 XML
+            ,
         );
 
         $this->expectException(MissingAttributeException::class);
@@ -104,7 +106,9 @@ public function testRegistrationInstantTimezoneNotZuluThrowsException(): void
         $document->setAttribute('registrationInstant', '2011-01-01T00:00:00WT');
 
         $this->expectException(ProtocolViolationException::class);
-        $this->expectExceptionMessage("'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.");
+        $this->expectExceptionMessage(
+            "'2011-01-01T00:00:00WT' is not a DateTime expressed in the UTC timezone using the 'Z' timezone identifier.",
+        );
         RegistrationInfo::fromXML($document);
     }
 
@@ -122,7 +126,7 @@ public function testMultipleRegistrationPoliciesWithSameLanguageThrowsException(
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdrpi:RegistrationPolicy>,'
-            . ' within a given <mdrpi:RegistrationInfo>, for a given language'
+            . ' within a given <mdrpi:RegistrationInfo>, for a given language',
         );
         RegistrationInfo::fromXML($document);
     }
diff --git a/tests/SAML2/XML/mdui/DiscoHintsTest.php b/tests/SAML2/XML/mdui/DiscoHintsTest.php
index fbd521897..1cf203a84 100644
--- a/tests/SAML2/XML/mdui/DiscoHintsTest.php
+++ b/tests/SAML2/XML/mdui/DiscoHintsTest.php
@@ -132,7 +132,7 @@ public function testUnmarshallingChildren(): void
   <mdui:GeolocationHint>geo:47.37328,8.531126</mdui:GeolocationHint>
   <ssp:child1 xmlns:ssp="urn:custom:ssp">content of tag</ssp:child1>
 </mdui:DiscoHints>
-XML
+XML,
         );
 
         $disco = DiscoHints::fromXML($document->documentElement);
diff --git a/tests/SAML2/XML/mdui/UIInfoTest.php b/tests/SAML2/XML/mdui/UIInfoTest.php
index 10d9edff9..0a6fc9110 100644
--- a/tests/SAML2/XML/mdui/UIInfoTest.php
+++ b/tests/SAML2/XML/mdui/UIInfoTest.php
@@ -91,10 +91,10 @@ public function testMarshalling(): void
             ],
             children: [
                 new Chunk(DOMDocumentFactory::fromString(
-                    '<ssp:child1 xmlns:ssp="urn:custom:ssp" />'
+                    '<ssp:child1 xmlns:ssp="urn:custom:ssp" />',
                 )->documentElement),
                 new Chunk(DOMDocumentFactory::fromString(
-                    '<myns:child2 xmlns:myns="urn:test:mynamespace" />'
+                    '<myns:child2 xmlns:myns="urn:test:mynamespace" />',
                 )->documentElement),
             ],
         );
@@ -210,7 +210,7 @@ public function testMultipleDescriptionWithSameLanguageThrowsException(): void
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdui:Description>,'
-            . ' within a given <mdui:UIInfo>, for a given language'
+            . ' within a given <mdui:UIInfo>, for a given language',
         );
         UIInfo::fromXML($document->documentElement);
     }
@@ -229,7 +229,7 @@ public function testMultipleDisplayNameWithSameLanguageThrowsException(): void
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdui:DisplayName>,'
-            . ' within a given <mdui:UIInfo>, for a given language'
+            . ' within a given <mdui:UIInfo>, for a given language',
         );
         UIInfo::fromXML($document->documentElement);
     }
@@ -248,7 +248,7 @@ public function testMultipleKeywordsWithSameLanguageThrowsException(): void
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdui:Keywords>,'
-            . ' within a given <mdui:UIInfo>, for a given language'
+            . ' within a given <mdui:UIInfo>, for a given language',
         );
         UIInfo::fromXML($document->documentElement);
     }
@@ -267,7 +267,7 @@ public function testMultipleInformationURLWithSameLanguageThrowsException(): voi
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdui:InformationURL>,'
-            . ' within a given <mdui:UIInfo>, for a given language'
+            . ' within a given <mdui:UIInfo>, for a given language',
         );
         UIInfo::fromXML($document->documentElement);
     }
@@ -286,7 +286,7 @@ public function testMultiplePrivacyStatementURLWithSameLanguageThrowsException()
         $this->expectException(ProtocolViolationException::class);
         $this->expectExceptionMessage(
             'There MUST NOT be more than one <mdui:PrivacyStatementURL>,'
-            . ' within a given <mdui:UIInfo>, for a given language'
+            . ' within a given <mdui:UIInfo>, for a given language',
         );
         UIInfo::fromXML($document->documentElement);
     }