Move to ClaimInterface

Author: cicnavi

src/VerifiableCredentials/VcDataModel/Claims/VcAtContextClaimValue.php

@@ -4,11 +4,12 @@
 
 namespace SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims;
 
-use JsonSerializable;
+use SimpleSAML\OpenID\Claims\ClaimInterface;
 use SimpleSAML\OpenID\Codebooks\AtContextsEnum;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Exceptions\VcDataModelException;
 
-class VcAtContextClaimValue implements JsonSerializable
+class VcAtContextClaimValue implements ClaimInterface
 {
     /**
      * @param mixed[] $otherContexts
@@ -32,10 +33,7 @@ public function __construct(
      */
     public function jsonSerialize(): array
     {
-        return [
-            $this->baseContext,
-            ...$this->otherContexts,
-        ];
+        return $this->getValue();
     }
 
     public function getBaseContext(): string
@@ -50,4 +48,20 @@ public function getOtherContexts(): array
     {
         return $this->otherContexts;
     }
+
+    public function getName(): string
+    {
+        return ClaimsEnum::AtContext->name;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getValue(): array
+    {
+        return[
+            $this->baseContext,
+            ...$this->otherContexts,
+        ];
+    }
 }

src/VerifiableCredentials/VcDataModel/Claims/VcClaimValue.php

@@ -5,9 +5,10 @@
 namespace SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims;
 
 use DateTimeImmutable;
-use JsonSerializable;
+use SimpleSAML\OpenID\Claims\ClaimInterface;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 
-class VcClaimValue implements JsonSerializable
+class VcClaimValue implements ClaimInterface
 {
     /**
      * @param null|non-empty-string $id
@@ -33,8 +34,7 @@ public function __construct(
      */
     public function jsonSerialize(): array
     {
-        // TODO: Implement jsonSerialize() method.
-        return [];
+        return $this->getValue();
     }
 
     public function getAtContext(): VcAtContextClaimValue
@@ -87,4 +87,18 @@ public function getCredentialStatus(): ?VcCredentialStatusClaimValue
     {
         return $this->credentialStatusClaimValue;
     }
+
+    public function getName(): string
+    {
+        return ClaimsEnum::Vc->value;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getValue(): array
+    {
+        // TODO: Implement getValue() method.
+        return [];
+    }
 }

src/VerifiableCredentials/VcDataModel/Claims/VcCredentialSubjectClaimBag.php

@@ -4,9 +4,10 @@
 
 namespace SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims;
 
-use JsonSerializable;
+use SimpleSAML\OpenID\Claims\ClaimInterface;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 
-class VcCredentialSubjectClaimBag implements JsonSerializable
+class VcCredentialSubjectClaimBag implements ClaimInterface
 {
     /** @var \SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims\VcCredentialSubjectClaimValue[] */
     protected array $vcCredentialSubjectClaimValueValues;
@@ -25,6 +26,19 @@ public function __construct(
      * @return mixed[]
      */
     public function jsonSerialize(): array
+    {
+        return $this->getValue();
+    }
+
+    public function getName(): string
+    {
+        return ClaimsEnum::Credential_Subject->value;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getValue(): array
     {
         return array_map(
             fn(

src/VerifiableCredentials/VcDataModel/Claims/VcCredentialSubjectClaimValue.php

@@ -4,9 +4,10 @@
 
 namespace SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims;
 
-use JsonSerializable;
+use SimpleSAML\OpenID\Claims\ClaimInterface;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 
-class VcCredentialSubjectClaimValue implements JsonSerializable
+class VcCredentialSubjectClaimValue implements ClaimInterface
 {
     /**
      * @param non-empty-array<mixed> $data
@@ -24,6 +25,19 @@ public function get(int|string $key): mixed
      * @return non-empty-array<mixed>
      */
     public function jsonSerialize(): array
+    {
+        return $this->getValue();
+    }
+
+    public function getName(): string
+    {
+        return ClaimsEnum::Credential_Subject->value;
+    }
+
+    /**
+     * @return non-empty-array<mixed>
+     */
+    public function getValue(): array
     {
         return $this->data;
     }