Start with value abstracts

Author: cicnavi

composer.json

@@ -41,6 +41,9 @@
         "simplesamlphp/simplesamlphp-test-framework": "^1",
         "squizlabs/php_codesniffer": "^3"
     },
+    "conflict": {
+        "rector/rector": "2.3.0"
+    },
     "config": {
         "sort-packages": true,
         "cache-dir": "build/composer",

src/Factories/ClaimFactory.php

@@ -4,12 +4,12 @@
 
 namespace SimpleSAML\OpenID\Factories;
 
-use SimpleSAML\OpenID\Claims\GenericClaim;
-use SimpleSAML\OpenID\Claims\JwksClaim;
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Exceptions\JwksException;
 use SimpleSAML\OpenID\Federation\Factories\FederationClaimFactory;
 use SimpleSAML\OpenID\Helpers;
+use SimpleSAML\OpenID\ValueAbstracts\GenericClaim;
+use SimpleSAML\OpenID\ValueAbstracts\JwksClaim;
 use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Factories\VcDataModelClaimFactory;
 
 class ClaimFactory

src/Federation/Claims/TrustMarkOwnersClaimValue.php

@@ -5,8 +5,8 @@
 namespace SimpleSAML\OpenID\Federation\Claims;
 
 use JsonSerializable;
-use SimpleSAML\OpenID\Claims\JwksClaim;
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
+use SimpleSAML\OpenID\ValueAbstracts\JwksClaim;
 
 class TrustMarkOwnersClaimValue implements JsonSerializable
 {

src/Federation/EntityStatement.php

@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\OpenID\Federation;
 
-use SimpleSAML\OpenID\Claims\JwksClaim;
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Codebooks\EntityTypesEnum;
 use SimpleSAML\OpenID\Codebooks\JwtTypesEnum;
@@ -13,6 +12,7 @@
 use SimpleSAML\OpenID\Federation\Claims\TrustMarkOwnersClaimBag;
 use SimpleSAML\OpenID\Federation\Claims\TrustMarksClaimBag;
 use SimpleSAML\OpenID\Jws\ParsedJws;
+use SimpleSAML\OpenID\ValueAbstracts\JwksClaim;
 
 class EntityStatement extends ParsedJws
 {

src/ValueAbstracts/ClaimBag.php

@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\ValueAbstracts;
+
+class ClaimBag
+{
+    /**
+     * @param array<non-empty-string,mixed> $claims
+     */
+    public function __construct(
+        protected array $claims = [],
+    ) {
+    }
+
+
+    /**
+     * @return array<non-empty-string,mixed>
+     */
+    public function getAll(): array
+    {
+        return $this->claims;
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function get(string $name): mixed
+    {
+        return $this->claims[$name] ?? null;
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function has(string $name): bool
+    {
+        return isset($this->claims[$name]);
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function set(string $name, mixed $value): void
+    {
+        $this->claims[$name] = $value;
+    }
+
+
+    /**
+     * @param array<non-empty-string,mixed> $claims
+     */
+    public function merge(array $claims): void
+    {
+        $this->claims = array_merge($this->claims, $claims);
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function remove(string $name): void
+    {
+        unset($this->claims[$name]);
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function getAsString(string $name): ?string
+    {
+        $ret = $this->get($name);
+
+        if (is_string($ret)) {
+            return $ret;
+        }
+
+        return null;
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     * @return mixed[]|null
+     */
+    public function getAsArray(string $name): ?array
+    {
+        $ret = $this->get($name);
+
+        if (is_array($ret)) {
+            return $ret;
+        }
+
+        return null;
+    }
+
+
+    /**
+     * @param non-empty-string $name
+     */
+    public function getAsInt(string $name): ?int
+    {
+        $ret = $this->get($name);
+
+        if (is_int($ret)) {
+            return $ret;
+        }
+
+        return null;
+    }
+}

src/Claims/ClaimInterface.php src/ValueAbstracts/ClaimInterface.phpsrc/Claims/ClaimInterface.php renamed to src/ValueAbstracts/ClaimInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\OpenID\Claims;
+namespace SimpleSAML\OpenID\ValueAbstracts;
 
 interface ClaimInterface extends \JsonSerializable
 {

src/Claims/GenericClaim.php src/ValueAbstracts/GenericClaim.phpsrc/Claims/GenericClaim.php renamed to src/ValueAbstracts/GenericClaim.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\OpenID\Claims;
+namespace SimpleSAML\OpenID\ValueAbstracts;
 
 class GenericClaim implements ClaimInterface
 {

src/Claims/JwksClaim.php src/ValueAbstracts/JwksClaim.phpsrc/Claims/JwksClaim.php renamed to src/ValueAbstracts/JwksClaim.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\OpenID\Claims;
+namespace SimpleSAML\OpenID\ValueAbstracts;
 
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 

src/ValueAbstracts/KeyPair.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\ValueAbstracts;
+
+use SimpleSAML\OpenID\Jwk\JwkDecorator;
+
+class KeyPair
+{
+    public function __construct(
+        protected JwkDecorator $privateKey,
+        protected JwkDecorator $publicKey,
+        protected readonly string $keyId,
+        protected readonly ?string $privateKeyPassword = null,
+    ) {
+    }
+
+
+    public function getPrivateKey(): JwkDecorator
+    {
+        return $this->privateKey;
+    }
+
+
+    public function getPublicKey(): JwkDecorator
+    {
+        return $this->publicKey;
+    }
+
+
+    public function getKeyId(): string
+    {
+        return $this->keyId;
+    }
+
+
+    public function getPrivateKeyPassword(): ?string
+    {
+        return $this->privateKeyPassword;
+    }
+}

src/ValueAbstracts/KeyPairConfigInterface.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\ValueAbstracts;
+
+interface KeyPairConfigInterface
+{
+    /**
+     * @return non-empty-string
+     */
+    public function getPrivateKeyString(): string;
+
+
+    /**
+     * @return non-empty-string
+     */
+    public function getPublicKeyString(): string;
+
+
+    /**
+     * @return non-empty-string|null
+     */
+    public function getPrivateKeyPassword(): ?string;
+
+
+    /**
+     * @return non-empty-string|null
+     */
+    public function getKeyId(): ?string;
+}