From c71753e28608f14aea896f5a26309c1a9515c775 Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Sun, 16 Jun 2024 22:07:14 +0200 Subject: [PATCH] Add trailing comma's --- src/CryptoEncoding/PEMBundle.php | 8 ++++---- src/Key/PrivateKey.php | 2 +- src/Key/PublicKey.php | 2 +- src/TestUtils/PEMCertificatesMock.php | 18 +++++++++--------- src/Utils/Random.php | 2 +- src/Utils/XML.php | 5 +++-- src/XML/SignableElementInterface.php | 2 +- src/XML/SignableElementTrait.php | 2 +- src/XML/SignedElementTrait.php | 2 +- src/XML/ds/KeyValue.php | 4 ++-- src/XML/ds/RSAKeyValue.php | 8 ++++---- src/XML/ds/RetrievalMethod.php | 2 +- src/XML/ds/Transform.php | 2 +- src/XML/ec/InclusiveNamespaces.php | 2 +- src/XML/xenc/CipherData.php | 4 ++-- tests/Alg/Signature/RSASignatureTest.php | 2 +- tests/Backend/OpenSSLTest.php | 8 ++++---- tests/XML/CustomSignable.php | 2 +- tests/XML/CustomSignableTest.php | 4 +++- tests/XML/SignableElementTest.php | 2 +- tests/XML/SignedElementTest.php | 2 +- tests/XML/ds/DigestMethodTest.php | 4 ++-- tests/XML/ds/KeyInfoTest.php | 4 ++-- tests/XML/ds/KeyValueTest.php | 4 ++-- tests/XML/ds/ObjectTest.php | 12 ++++++------ tests/XML/ds/ReferenceTest.php | 2 +- tests/XML/ds/SignaturePropertiesTest.php | 6 +++--- tests/XML/ds/SignaturePropertyTest.php | 6 +++--- tests/XML/ds/X509CertificateTest.php | 2 +- tests/XML/ds/X509DataTest.php | 10 +++++----- tests/XML/xenc/EncryptedDataTest.php | 2 +- tests/XML/xenc/EncryptionMethodTest.php | 4 +++- tests/XML/xenc/ReferenceListTest.php | 4 ++-- 33 files changed, 75 insertions(+), 70 deletions(-) diff --git a/src/CryptoEncoding/PEMBundle.php b/src/CryptoEncoding/PEMBundle.php index 551ef951..81c90fd5 100644 --- a/src/CryptoEncoding/PEMBundle.php +++ b/src/CryptoEncoding/PEMBundle.php @@ -82,12 +82,12 @@ function ($match) { $data = base64_decode($payload, true); if (empty($data)) { throw new UnexpectedValueException( - 'Failed to decode PEM data.' + 'Failed to decode PEM data.', ); } return new PEM($match[1], $data); }, - $matches + $matches, ); return new self(...$pems); @@ -216,8 +216,8 @@ public function string(): string function (PEM $pem) { return $pem->string(); }, - $this->pems - ) + $this->pems, + ), ); } } diff --git a/src/Key/PrivateKey.php b/src/Key/PrivateKey.php index ce7298e0..28a89f97 100644 --- a/src/Key/PrivateKey.php +++ b/src/Key/PrivateKey.php @@ -30,7 +30,7 @@ final public function __construct( Assert::oneOf( $key->type(), [PEM::TYPE_PRIVATE_KEY, PEM::TYPE_RSA_PRIVATE_KEY], - "PEM structure has the wrong type %s." + "PEM structure has the wrong type %s.", ); parent::__construct($key); diff --git a/src/Key/PublicKey.php b/src/Key/PublicKey.php index 0fd860b4..82c93dec 100644 --- a/src/Key/PublicKey.php +++ b/src/Key/PublicKey.php @@ -52,7 +52,7 @@ final public function __construct( Assert::oneOf( $key->type(), [PEM::TYPE_PUBLIC_KEY, PEM::TYPE_RSA_PUBLIC_KEY], - "PEM structure has the wrong type %s." + "PEM structure has the wrong type %s.", ); parent::__construct($key); diff --git a/src/TestUtils/PEMCertificatesMock.php b/src/TestUtils/PEMCertificatesMock.php index dbde60c7..9e128ed1 100644 --- a/src/TestUtils/PEMCertificatesMock.php +++ b/src/TestUtils/PEMCertificatesMock.php @@ -120,7 +120,7 @@ public static function getPrivateKey(string $file, string $passphrase = self::PA * @return string */ public static function getPlainCertificate( - string $file = self::CERTIFICATE + string $file = self::CERTIFICATE, ): string { return self::loadPlainCertificateFile($file); } @@ -131,7 +131,7 @@ public static function getPlainCertificate( * @return string */ public static function getPlainPublicKey( - string $file = self::PUBLIC_KEY + string $file = self::PUBLIC_KEY, ): string { return self::loadPlainKeyFile($file); } @@ -142,7 +142,7 @@ public static function getPlainPublicKey( * @return string */ public static function getPlainPrivateKey( - string $file = self::PRIVATE_KEY + string $file = self::PRIVATE_KEY, ): string { return self::loadPlainKeyFile($file); } @@ -153,11 +153,11 @@ public static function getPlainPrivateKey( * @return string */ public static function getPlainCertificateContents( - string $file = self::CERTIFICATE + string $file = self::CERTIFICATE, ): string { return CertificateUtils::stripHeaders( self::loadPlainCertificateFile($file), - CertificateUtils::CERTIFICATE_PATTERN + CertificateUtils::CERTIFICATE_PATTERN, ); } @@ -167,11 +167,11 @@ public static function getPlainCertificateContents( * @return string */ public static function getPlainPublicKeyContents( - string $file = self::PUBLIC_KEY + string $file = self::PUBLIC_KEY, ): string { return CertificateUtils::stripHeaders( self::loadPlainKeyFile($file), - CertificateUtils::PUBLIC_KEY_PATTERN + CertificateUtils::PUBLIC_KEY_PATTERN, ); } @@ -181,11 +181,11 @@ public static function getPlainPublicKeyContents( * @return string */ public static function getPlainPrivateKeyContents( - string $file = self::PRIVATE_KEY + string $file = self::PRIVATE_KEY, ): string { return CertificateUtils::stripHeaders( self::loadPlainCertificateFile($file), - CertificateUtils::PRIVATE_KEY_PATTERN + CertificateUtils::PRIVATE_KEY_PATTERN, ); } } diff --git a/src/Utils/Random.php b/src/Utils/Random.php index 6200d22e..8ffd8d57 100644 --- a/src/Utils/Random.php +++ b/src/Utils/Random.php @@ -36,7 +36,7 @@ public static function generateRandomBytes(int $length): string Assert::positiveInteger( $length, 'Invalid length received to generate random bytes.', - InvalidArgumentException::class + InvalidArgumentException::class, ); try { diff --git a/src/Utils/XML.php b/src/Utils/XML.php index 6bcd8cae..b7a3df3c 100644 --- a/src/Utils/XML.php +++ b/src/Utils/XML.php @@ -23,9 +23,10 @@ class XML * * @param \DOMElement $element The DOM element that needs canonicalization. * @param string $c14nMethod The identifier of the canonicalization algorithm to use. - * See \SimpleSAML\XMLSecurity\Constants. + * See \SimpleSAML\XMLSecurity\Constants. * @param string[]|null $xpaths An array of xpaths to filter the nodes by. Defaults to null (no filters). - * @param string[]|null $prefixes An array of namespace prefixes to filter the nodes by. Defaults to null (no filters). + * @param string[]|null $prefixes An array of namespace prefixes to filter the nodes by. + * Defaults to null (no filters). * * @return string The canonical representation of the given DOM node, according to the algorithm requested. */ diff --git a/src/XML/SignableElementInterface.php b/src/XML/SignableElementInterface.php index c2cea1fd..50a00ecd 100644 --- a/src/XML/SignableElementInterface.php +++ b/src/XML/SignableElementInterface.php @@ -37,6 +37,6 @@ public function getId(): ?string; public function sign( SignatureAlgorithmInterface $signer, string $canonicalizationAlg, - ?KeyInfo $keyInfo = null + ?KeyInfo $keyInfo = null, ): void; } diff --git a/src/XML/SignableElementTrait.php b/src/XML/SignableElementTrait.php index 9da5c1d6..e55edd31 100644 --- a/src/XML/SignableElementTrait.php +++ b/src/XML/SignableElementTrait.php @@ -73,7 +73,7 @@ abstract public function getId(): ?string; public function sign( SignatureAlgorithmInterface $signer, string $canonicalizationAlg = C::C14N_EXCLUSIVE_WITHOUT_COMMENTS, - ?KeyInfo $keyInfo = null + ?KeyInfo $keyInfo = null, ): void { $this->signer = $signer; $this->keyInfo = $keyInfo; diff --git a/src/XML/SignedElementTrait.php b/src/XML/SignedElementTrait.php index d3dc9baa..83eb7319 100644 --- a/src/XML/SignedElementTrait.php +++ b/src/XML/SignedElementTrait.php @@ -286,7 +286,7 @@ public function verify(SignatureAlgorithmInterface $verifier = null): SignedElem // build a valid PEM for the certificate $cert = sprintf( "-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----", - $data->getRawContent() + $data->getRawContent(), ); $cert = new Key\X509Certificate(PEM::fromString($cert)); diff --git a/src/XML/ds/KeyValue.php b/src/XML/ds/KeyValue.php index 7a0063e8..32a7ce0e 100644 --- a/src/XML/ds/KeyValue.php +++ b/src/XML/ds/KeyValue.php @@ -80,7 +80,7 @@ public static function fromXML(DOMElement $xml): static $RSAKeyValue, 1, 'A can contain exactly one ', - TooManyElementsException::class + TooManyElementsException::class, ); $elements = []; @@ -95,7 +95,7 @@ public static function fromXML(DOMElement $xml): static $elements, 1, 'A can contain exactly one element in namespace ##other', - TooManyElementsException::class + TooManyElementsException::class, ); return new static(array_pop($RSAKeyValue), array_pop($elements)); diff --git a/src/XML/ds/RSAKeyValue.php b/src/XML/ds/RSAKeyValue.php index ab061516..1a23e70b 100644 --- a/src/XML/ds/RSAKeyValue.php +++ b/src/XML/ds/RSAKeyValue.php @@ -71,13 +71,13 @@ public static function fromXML(DOMElement $xml): static $modulus, 1, 'An must contain exactly one ', - MissingElementException::class + MissingElementException::class, ); Assert::maxCount( $modulus, 1, 'An must contain exactly one ', - TooManyElementsException::class + TooManyElementsException::class, ); $exponent = Exponent::getChildrenOfClass($xml); @@ -85,13 +85,13 @@ public static function fromXML(DOMElement $xml): static $exponent, 1, 'An must contain exactly one ', - MissingElementException::class + MissingElementException::class, ); Assert::maxCount( $exponent, 1, 'An must contain exactly one ', - TooManyElementsException::class + TooManyElementsException::class, ); return new static(array_pop($modulus), array_pop($exponent)); diff --git a/src/XML/ds/RetrievalMethod.php b/src/XML/ds/RetrievalMethod.php index 03d0394a..e75fcca8 100644 --- a/src/XML/ds/RetrievalMethod.php +++ b/src/XML/ds/RetrievalMethod.php @@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static return new static( array_pop($transforms), $URI, - $Type + $Type, ); } diff --git a/src/XML/ds/Transform.php b/src/XML/ds/Transform.php index 25c0dea0..a1025881 100644 --- a/src/XML/ds/Transform.php +++ b/src/XML/ds/Transform.php @@ -53,7 +53,7 @@ final public function __construct( sprintf( 'Transform algorithm "%s" or "%s" required if InclusiveNamespaces provided.', C::C14N_EXCLUSIVE_WITH_COMMENTS, - C::C14N_EXCLUSIVE_WITHOUT_COMMENTS + C::C14N_EXCLUSIVE_WITHOUT_COMMENTS, ), ); } diff --git a/src/XML/ec/InclusiveNamespaces.php b/src/XML/ec/InclusiveNamespaces.php index b5162e46..7deff9eb 100644 --- a/src/XML/ec/InclusiveNamespaces.php +++ b/src/XML/ec/InclusiveNamespaces.php @@ -32,7 +32,7 @@ final public function __construct( Assert::allString( $prefixes, 'Can only add string InclusiveNamespaces prefixes.', - InvalidArgumentException::class + InvalidArgumentException::class, ); Assert::allRegex($prefixes, '/^[a-z0-9._\\-:]*$/i', SchemaViolationException::class); // xsd:NMTOKEN } diff --git a/src/XML/xenc/CipherData.php b/src/XML/xenc/CipherData.php index 093b1351..39ddc20a 100644 --- a/src/XML/xenc/CipherData.php +++ b/src/XML/xenc/CipherData.php @@ -79,7 +79,7 @@ public static function fromXML(DOMElement $xml): static $cv, 1, 'More than one CipherValue element in ', - TooManyElementsException::class + TooManyElementsException::class, ); $cr = CipherReference::getChildrenOfClass($xml); @@ -87,7 +87,7 @@ public static function fromXML(DOMElement $xml): static $cr, 1, 'More than one CipherReference element in ', - TooManyElementsException::class + TooManyElementsException::class, ); return new static( diff --git a/tests/Alg/Signature/RSASignatureTest.php b/tests/Alg/Signature/RSASignatureTest.php index 97b3b0c8..920df9b4 100644 --- a/tests/Alg/Signature/RSASignatureTest.php +++ b/tests/Alg/Signature/RSASignatureTest.php @@ -219,7 +219,7 @@ public function testVerificationFailure(): void // test wrong key $rsa = self::$factory->getAlgorithm( C::SIG_RSA_SHA1, - PEMCertificatesMock::getPublicKey(PEMCertificatesMock::OTHER_PUBLIC_KEY) + PEMCertificatesMock::getPublicKey(PEMCertificatesMock::OTHER_PUBLIC_KEY), ); $this->assertFalse($rsa->verify( self::PLAINTEXT, diff --git a/tests/Backend/OpenSSLTest.php b/tests/Backend/OpenSSLTest.php index d190f218..a2df48c0 100644 --- a/tests/Backend/OpenSSLTest.php +++ b/tests/Backend/OpenSSLTest.php @@ -50,10 +50,10 @@ final class OpenSSLTest extends TestCase public static function setUpBeforeClass(): void { self::$privKey = PrivateKey::fromFile( - 'file://' . dirname(__FILE__, 3) . '/resources/keys/privkey.pem' + 'file://' . dirname(__FILE__, 3) . '/resources/keys/privkey.pem', ); self::$pubKey = PublicKey::fromFile( - 'file://' . dirname(__FILE__, 3) . '/resources/keys/pubkey.pem' + 'file://' . dirname(__FILE__, 3) . '/resources/keys/pubkey.pem', ); self::$sharedKey = new SymmetricKey(hex2bin('54c98b0ea7d98186c27a6c0c6f35ee1a')); self::$backend = new OpenSSL(); @@ -142,7 +142,7 @@ public function testDecrypt(): void '1cb79beec171b9c0cf11466e90187e91377a7f7582f3eec3df6703a1abda89339d0f490bca61ceac743be401d861d50' . 'eb6aaa2db63264cd2013e4008d82c4e7b3f8f13447cf136e52c9b9f06c062a3fe66d3b9f7fa78281d149e7756a97edb' . '0b2a500f110587f2d81790922def9061c4d8d500cd67ade406b61a20a8fe3b7db1ccc69095a20f556e5ed1f91ccaff1' . - 'cb3f13065ebee9e20064b0a75edb2b603af6c' + 'cb3f13065ebee9e20064b0a75edb2b603af6c', ), ), ); @@ -158,7 +158,7 @@ public function testDecrypt(): void '4570d9065b9604587111b116e8d15d8ef820f2ea2c1ae129ce27a20c4a7e4df815fb47a047cd11b06ada9f4ad881545' . '2380a09fb6bff787ff167a20662740e1ac034e66612e2194d8b60a22341032d758fd94221314125dbb2d1432b4a3633' . 'b0857d8d4938aabe1b53ab5f970fb4ad0ed0a554771cfa819cffba8ec5935a6d2f706dfcada355da34b994691c76a60' . - 'd10c746a5b683b2a0080d847ff208cf240a1c' + 'd10c746a5b683b2a0080d847ff208cf240a1c', ), ), ); diff --git a/tests/XML/CustomSignable.php b/tests/XML/CustomSignable.php index bca43dbd..c25a8737 100644 --- a/tests/XML/CustomSignable.php +++ b/tests/XML/CustomSignable.php @@ -57,7 +57,7 @@ class CustomSignable extends AbstractElement implements */ final public function __construct( protected DOMElement $xml, - protected ?string $id + protected ?string $id, ) { } diff --git a/tests/XML/CustomSignableTest.php b/tests/XML/CustomSignableTest.php index 87587e34..81289a45 100644 --- a/tests/XML/CustomSignableTest.php +++ b/tests/XML/CustomSignableTest.php @@ -47,9 +47,11 @@ public static function setUpBeforeClass(): void */ public function testMarshalling(): void { - $document = DOMDocumentFactory::fromString(<<Some XML + , ); $customSignable = new CustomSignable($document->documentElement, null); diff --git a/tests/XML/SignableElementTest.php b/tests/XML/SignableElementTest.php index 15004181..b1cc38ff 100644 --- a/tests/XML/SignableElementTest.php +++ b/tests/XML/SignableElementTest.php @@ -196,7 +196,7 @@ public function testSigningElementWithIdAndComments(): void $customSignable->sign($signer, C::C14N_EXCLUSIVE_WITH_COMMENTS, $keyInfo); $signed = DOMDocumentFactory::fromFile( - dirname(__FILE__, 2) . '/resources/xml/custom_CustomSignableSignedWithCommentsAndId.xml' + dirname(__FILE__, 2) . '/resources/xml/custom_CustomSignableSignedWithCommentsAndId.xml', ); $this->assertEquals( diff --git a/tests/XML/SignedElementTest.php b/tests/XML/SignedElementTest.php index 21d4bb88..80f63788 100644 --- a/tests/XML/SignedElementTest.php +++ b/tests/XML/SignedElementTest.php @@ -61,7 +61,7 @@ public function setUp(): void )->documentElement; $this->certificate = PEM::fromString( - PEMCertificatesMock::getPlainCertificate(PEMCertificatesMock::SELFSIGNED_CERTIFICATE) + PEMCertificatesMock::getPlainCertificate(PEMCertificatesMock::SELFSIGNED_CERTIFICATE), ); } diff --git a/tests/XML/ds/DigestMethodTest.php b/tests/XML/ds/DigestMethodTest.php index d98a2a40..d5003507 100644 --- a/tests/XML/ds/DigestMethodTest.php +++ b/tests/XML/ds/DigestMethodTest.php @@ -51,8 +51,8 @@ public function testMarshalling(): void C::DIGEST_SHA256, [ new Chunk(DOMDocumentFactory::fromString( - 'Random' - )->documentElement) + 'Random', + )->documentElement), ], ); diff --git a/tests/XML/ds/KeyInfoTest.php b/tests/XML/ds/KeyInfoTest.php index 68fe7eae..e8e9f547 100644 --- a/tests/XML/ds/KeyInfoTest.php +++ b/tests/XML/ds/KeyInfoTest.php @@ -70,7 +70,7 @@ public function setUp(): void '', '', "\n", - '' + '', ], PEMCertificatesMock::getPlainCertificate(PEMCertificatesMock::SELFSIGNED_CERTIFICATE), ); @@ -95,7 +95,7 @@ public function testMarshalling(): void ], ), new Chunk(DOMDocumentFactory::fromString( - 'some' + 'some', )->documentElement), ], 'fed654', diff --git a/tests/XML/ds/KeyValueTest.php b/tests/XML/ds/KeyValueTest.php index 46b65424..b6329157 100644 --- a/tests/XML/ds/KeyValueTest.php +++ b/tests/XML/ds/KeyValueTest.php @@ -113,7 +113,7 @@ public function testMarshallingEmpty(): void { $this->expectException(SchemaViolationException::class); $this->expectExceptionMessage( - 'A requires either a RSAKeyValue or an element in namespace ##other' + 'A requires either a RSAKeyValue or an element in namespace ##other', ); new KeyValue(null, null); @@ -147,7 +147,7 @@ public function testUnmarshallingEmpty(): void $this->expectException(SchemaViolationException::class); $this->expectExceptionMessage( - 'A requires either a RSAKeyValue or an element in namespace ##other' + 'A requires either a RSAKeyValue or an element in namespace ##other', ); KeyValue::fromXML($document->documentElement); diff --git a/tests/XML/ds/ObjectTest.php b/tests/XML/ds/ObjectTest.php index da707673..ad860bab 100644 --- a/tests/XML/ds/ObjectTest.php +++ b/tests/XML/ds/ObjectTest.php @@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void self::$schemaFile = dirname(__FILE__, 4) . '/resources/schemas/xmldsig1-schema.xsd'; self::$xmlRepresentation = DOMDocumentFactory::fromFile( - dirname(__FILE__, 3) . '/resources/xml/ds_Object.xml' + dirname(__FILE__, 3) . '/resources/xml/ds_Object.xml', ); } @@ -53,15 +53,15 @@ public function testMarshalling(): void new Chunk( DOMDocumentFactory::fromString(sprintf( '%s', - $img - ))->documentElement - ) + $img, + ))->documentElement, + ), ], ); $this->assertEquals( self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($obj) + strval($obj), ); } @@ -75,7 +75,7 @@ public function testMarshallingEmptyElement(): void $obj = new DsObject(null, null, null, []); $this->assertEquals( "", - strval($obj) + strval($obj), ); $this->assertTrue($obj->isEmptyElement()); } diff --git a/tests/XML/ds/ReferenceTest.php b/tests/XML/ds/ReferenceTest.php index 025c8ad6..610890ab 100644 --- a/tests/XML/ds/ReferenceTest.php +++ b/tests/XML/ds/ReferenceTest.php @@ -82,7 +82,7 @@ public function testMarshallingReferenceElementOrdering(): void [ new Transform(C::XMLDSIG_ENVELOPED), new Transform(C::C14N_EXCLUSIVE_WITHOUT_COMMENTS), - ] + ], ), 'ghi789', 'urn:some:type', diff --git a/tests/XML/ds/SignaturePropertiesTest.php b/tests/XML/ds/SignaturePropertiesTest.php index 1e44b7fa..003592b3 100644 --- a/tests/XML/ds/SignaturePropertiesTest.php +++ b/tests/XML/ds/SignaturePropertiesTest.php @@ -49,19 +49,19 @@ public static function setUpBeforeClass(): void public function testMarshalling(): void { $document = DOMDocumentFactory::fromString( - '1234567890' + '1234567890', ); $signatureProperty = new SignatureProperty( [new Chunk($document->documentElement)], 'https://simplesamlphp.org/some/target', - 'abc123' + 'abc123', ); $signatureProperties = new SignatureProperties([$signatureProperty], 'def456'); $this->assertEquals( self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signatureProperties) + strval($signatureProperties), ); } } diff --git a/tests/XML/ds/SignaturePropertyTest.php b/tests/XML/ds/SignaturePropertyTest.php index 23415df1..3f5cfc94 100644 --- a/tests/XML/ds/SignaturePropertyTest.php +++ b/tests/XML/ds/SignaturePropertyTest.php @@ -48,18 +48,18 @@ public static function setUpBeforeClass(): void public function testMarshalling(): void { $document = DOMDocumentFactory::fromString( - '1234567890' + '1234567890', ); $signatureProperty = new SignatureProperty( [new Chunk($document->documentElement)], 'https://simplesamlphp.org/some/target', - 'abc123' + 'abc123', ); $this->assertEquals( self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement), - strval($signatureProperty) + strval($signatureProperty), ); } } diff --git a/tests/XML/ds/X509CertificateTest.php b/tests/XML/ds/X509CertificateTest.php index 85f7e8a9..ccb5d73a 100644 --- a/tests/XML/ds/X509CertificateTest.php +++ b/tests/XML/ds/X509CertificateTest.php @@ -59,7 +59,7 @@ public static function setUpBeforeClass(): void '', '', "\n", - '' + '', ], PEMCertificatesMock::getPlainCertificate(PEMCertificatesMock::SELFSIGNED_CERTIFICATE), ); diff --git a/tests/XML/ds/X509DataTest.php b/tests/XML/ds/X509DataTest.php index 176aef63..bedb2f73 100644 --- a/tests/XML/ds/X509DataTest.php +++ b/tests/XML/ds/X509DataTest.php @@ -70,7 +70,7 @@ public static function setUpBeforeClass(): void '', '', "\n", - '' + '', ], PEMCertificatesMock::getPlainCertificate(PEMCertificatesMock::SELFSIGNED_CERTIFICATE), ); @@ -89,21 +89,21 @@ public function testMarshalling(): void [ new Chunk( DOMDocumentFactory::fromString( - 'some' + 'some', )->documentElement, ), new X509Certificate(self::$certificate), new X509IssuerSerial( new X509IssuerName(sprintf( 'C=US,ST=Hawaii,L=Honolulu,O=SimpleSAMLphp HQ,CN=SimpleSAMLphp Testing CA,emailAddress=%s', - 'noreply@simplesamlphp.org' + 'noreply@simplesamlphp.org', )), new X509SerialNumber('2'), ), new X509SubjectName(self::$certData['name']), new Chunk(DOMDocumentFactory::fromString( - 'other' - )->documentElement) + 'other', + )->documentElement), ], ); diff --git a/tests/XML/xenc/EncryptedDataTest.php b/tests/XML/xenc/EncryptedDataTest.php index 791149b7..3923ca4d 100644 --- a/tests/XML/xenc/EncryptedDataTest.php +++ b/tests/XML/xenc/EncryptedDataTest.php @@ -129,7 +129,7 @@ public function testMarshallingElementOrdering(): void $encryptedDataElements = XPath::xpQuery( $encryptedDataElement, './xenc:EncryptionMethod/following-sibling::*', - $xpCache + $xpCache, ); $this->assertCount(2, $encryptedDataElements); $this->assertEquals('ds:KeyInfo', $encryptedDataElements[0]->tagName); diff --git a/tests/XML/xenc/EncryptionMethodTest.php b/tests/XML/xenc/EncryptionMethodTest.php index 1104f9a2..cbda1709 100644 --- a/tests/XML/xenc/EncryptionMethodTest.php +++ b/tests/XML/xenc/EncryptionMethodTest.php @@ -148,9 +148,11 @@ public function testUnmarshallingWithoutAlgorithm(): void public function testUnmarshallingWithoutOptionalParameters(): void { $xencns = C::NS_XENC; - $document = DOMDocumentFactory::fromString(<< XML + , ); /** @var \DOMElement @element */ diff --git a/tests/XML/xenc/ReferenceListTest.php b/tests/XML/xenc/ReferenceListTest.php index 6a8ebf16..e3fa10e9 100644 --- a/tests/XML/xenc/ReferenceListTest.php +++ b/tests/XML/xenc/ReferenceListTest.php @@ -68,10 +68,10 @@ public function testMarshalling(): void $referenceList = new ReferenceList( [ - new DataReference('#Encrypted_DATA_ID', [new Transforms([$transformData])]) + new DataReference('#Encrypted_DATA_ID', [new Transforms([$transformData])]), ], [ - new KeyReference('#Encrypted_KEY_ID', [new Transforms([$transformKey])]) + new KeyReference('#Encrypted_KEY_ID', [new Transforms([$transformKey])]), ], );