diff --git a/src/XML/ds/AbstractDSAKeyValueType.php b/src/XML/ds/AbstractDSAKeyValueType.php
index becfd5c4..7462f5e4 100644
--- a/src/XML/ds/AbstractDSAKeyValueType.php
+++ b/src/XML/ds/AbstractDSAKeyValueType.php
@@ -27,7 +27,6 @@ abstract class AbstractDSAKeyValueType extends AbstractDsElement
      * @param \SimpleSAML\XMLSecurity\XML\ds\J|null $j
      * @param \SimpleSAML\XMLSecurity\XML\ds\P|null $p
      * @param \SimpleSAML\XMLSecurity\XML\ds\Q|null $q
-     * @param \SimpleSAML\XMLSecurity\XML\ds\Generator|null $generator
      * @param \SimpleSAML\XMLSecurity\XML\ds\Seed|null $seed
      * @param \SimpleSAML\XMLSecurity\XML\ds\PgenCounter|null $pgenCounter
      */
@@ -68,9 +67,9 @@ public function getY(): Y
     /**
      * Get the G.
      *
-     * @return \SimpleSAML\XMLSecurity\XML\ds\G
+     * @return \SimpleSAML\XMLSecurity\XML\ds\G|null
      */
-    public function getG(): G
+    public function getG(): ?G
     {
         return $this->g;
     }
@@ -79,9 +78,9 @@ public function getG(): G
     /**
      * Get the J.
      *
-     * @return \SimpleSAML\XMLSecurity\XML\ds\J
+     * @return \SimpleSAML\XMLSecurity\XML\ds\J|null
      */
-    public function getJ(): J
+    public function getJ(): ?J
     {
         return $this->j;
     }
diff --git a/src/XML/ds/AbstractSPKIDataType.php b/src/XML/ds/AbstractSPKIDataType.php
index 46d3d0da..e72ebf28 100644
--- a/src/XML/ds/AbstractSPKIDataType.php
+++ b/src/XML/ds/AbstractSPKIDataType.php
@@ -23,7 +23,9 @@ abstract class AbstractSPKIDataType extends AbstractDsElement
     /**
      * Initialize a SPKIData element.
      *
-     * @param array{array{\SimpleSAML\XMLSecurity\XML\ds\SPKISexp, \SimpleSAML\XML\SerializableElementInterface|null}} $tuples
+     * @param array{
+     *   array{\SimpleSAML\XMLSecurity\XML\ds\SPKISexp, \SimpleSAML\XML\SerializableElementInterface|null}
+     * } $tuples
      */
     final public function __construct(
         protected array $tuples,
diff --git a/tests/XML/ds/KeyValueTest.php b/tests/XML/ds/KeyValueTest.php
index 82ee0cd7..a64a3711 100644
--- a/tests/XML/ds/KeyValueTest.php
+++ b/tests/XML/ds/KeyValueTest.php
@@ -124,7 +124,9 @@ public function testMarshallingEmpty(): void
     public function testUnmarshallingWithOtherElement(): void
     {
         $document = self::$empty;
-        $document->documentElement->appendChild($document->importNode(self::$encryptionProperty->documentElement, true));
+        $document->documentElement->appendChild(
+            $document->importNode(self::$encryptionProperty->documentElement, true),
+        );
 
         $keyValue = KeyValue::fromXML($document->documentElement);
 
diff --git a/tests/XML/ds/RetrievalMethodTest.php b/tests/XML/ds/RetrievalMethodTest.php
index adc56217..ae44d499 100644
--- a/tests/XML/ds/RetrievalMethodTest.php
+++ b/tests/XML/ds/RetrievalMethodTest.php
@@ -50,9 +50,12 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $transforms = new Transforms(
-            [new Transform(C::XPATH10_URI, new XPath('self::xenc:CipherValue[@Id="example1"]', ['xenc' => C::NS_XENC]))],
-        );
+        $transforms = new Transforms([
+            new Transform(
+                C::XPATH10_URI,
+                new XPath('self::xenc:CipherValue[@Id="example1"]', ['xenc' => C::NS_XENC]),
+            ),
+        ]);
 
         $retrievalMethod = new RetrievalMethod($transforms, '#Encrypted_KEY_ID', C:: XMLENC_ENCRYPTEDKEY);