Enable adding additional data to JwkDecorator

Author: cicnavi

src/Jwk/Factories/JwkDecoratorFactory.php

@@ -23,7 +23,7 @@ public function fromData(array $data): JwkDecorator
 
     /**
      * @param non-empty-string $path
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function fromPkcs1Or8KeyFile(
         string $path,
@@ -39,7 +39,7 @@ public function fromPkcs1Or8KeyFile(
 
     /**
      * @param non-empty-string $key
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function fromPkcs1Or8Key(
         string $key,
@@ -55,7 +55,7 @@ public function fromPkcs1Or8Key(
 
     /**
      * @param non-empty-string $path
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function fromPkcs12CertificateFile(
         string $path,
@@ -71,7 +71,7 @@ public function fromPkcs12CertificateFile(
 
     /**
      * @param non-empty-string $path
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function fromX509CertificateFile(
         string $path,
@@ -86,7 +86,7 @@ public function fromX509CertificateFile(
 
     /**
      * @param non-empty-string $certificate
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function fromX509Certificate(
         string $certificate,

src/Jwk/JwkDecorator.php

@@ -9,11 +9,11 @@
 class JwkDecorator implements \JsonSerializable
 {
     /**
-     * @param mixed[] $additionalData
+     * @param array<non-empty-string,mixed> $additionalData
      */
     public function __construct(
         protected readonly JWK $jwk,
-        protected readonly array $additionalData = [],
+        protected array $additionalData = [],
     ) {
     }
 
@@ -25,14 +25,23 @@ public function jwk(): JWK
 
 
     /**
-     * @return mixed[]
+     * @return array<non-empty-string,mixed>
      */
     public function getAdditionalData(): array
     {
         return $this->additionalData;
     }
 
 
+    /**
+     * @param non-empty-string $key
+     */
+    public function addAdditionalData(string $key, mixed $value): void
+    {
+        $this->additionalData[$key] = $value;
+    }
+
+
     /**
      * @return mixed[]
      */

tests/src/Jwk/JwkDecoratorTest.php

@@ -53,11 +53,14 @@ public function testCanGetJwk(): void
     }
 
 
-    public function testCanGetAdditionalData(): void
+    public function testCanGetAndSetAdditionalData(): void
     {
         $this->additionalData = ['foo' => 'bar'];
+        $sut = $this->sut();
+        $this->assertSame($this->additionalData, $sut->getAdditionalData());
 
-        $this->assertSame($this->additionalData, $this->sut()->getAdditionalData());
+        $sut->addAdditionalData('baz', 'qux');
+        $this->assertSame(['foo' => 'bar', 'baz' => 'qux'], $sut->getAdditionalData());
     }