move encrypted field name logic into metadata

Author: DavidBadura

src/Cryptography/PersonalDataPayloadCryptographer.php

@@ -19,8 +19,6 @@
 
 final class PersonalDataPayloadCryptographer implements PayloadCryptographer
 {
-    public const ENCRYPTED_PREFIX = '!';
-
     public function __construct(
         private readonly CipherKeyStore $cipherKeyStore,
         private readonly CipherKeyFactory $cipherKeyFactory,
@@ -54,7 +52,7 @@ public function encrypt(ClassMetadata $metadata, array $data): array
                 continue;
             }
 
-            $data[self::ENCRYPTED_PREFIX . $propertyMetadata->fieldName()] = $this->cipher->encrypt(
+            $data[$propertyMetadata->encryptedFieldName()] = $this->cipher->encrypt(
                 $cipherKey,
                 $data[$propertyMetadata->fieldName()],
             );
@@ -89,11 +87,9 @@ public function decrypt(ClassMetadata $metadata, array $data): array
                 continue;
             }
 
-            $fieldNameWithPrefix = self::ENCRYPTED_PREFIX . $propertyMetadata->fieldName();
-
-            if (array_key_exists($fieldNameWithPrefix, $data)) {
-                $rawData = $data[$fieldNameWithPrefix];
-                unset($data[$fieldNameWithPrefix]);
+            if (array_key_exists($propertyMetadata->encryptedFieldName(), $data)) {
+                $rawData = $data[$propertyMetadata->encryptedFieldName()];
+                unset($data[$propertyMetadata->encryptedFieldName()]);
             } elseif ($this->fallbackWithoutPrefix) {
                 $rawData = $data[$propertyMetadata->fieldName()];
             } else {

src/Metadata/PropertyMetadata.php

@@ -5,7 +5,6 @@
 namespace Patchlevel\Hydrator\Metadata;
 
 use InvalidArgumentException;
-use Patchlevel\Hydrator\Cryptography\PersonalDataPayloadCryptographer;
 use Patchlevel\Hydrator\Normalizer\Normalizer;
 use ReflectionProperty;
 
@@ -23,14 +22,16 @@
  */
 final class PropertyMetadata
 {
+    private const ENCRYPTED_PREFIX = '!';
+
     public function __construct(
         private readonly ReflectionProperty $reflection,
         private readonly string $fieldName,
         private readonly Normalizer|null $normalizer = null,
         private readonly bool $isPersonalData = false,
         private readonly mixed $personalDataFallback = null,
     ) {
-        if (str_starts_with($fieldName, PersonalDataPayloadCryptographer::ENCRYPTED_PREFIX)) {
+        if (str_starts_with($fieldName, self::ENCRYPTED_PREFIX)) {
             throw new InvalidArgumentException('fieldName must not start with !');
         }
     }
@@ -50,6 +51,11 @@ public function fieldName(): string
         return $this->fieldName;
     }
 
+    public function encryptedFieldName(): string
+    {
+        return self::ENCRYPTED_PREFIX . $this->fieldName;
+    }
+
     public function normalizer(): Normalizer|null
     {
         return $this->normalizer;