Merge branch '1.18.x' into 2.0.x

Author: DavidBadura

phpstan-baseline.neon

@@ -54,7 +54,7 @@ public function encrypt(string $subjectId, mixed $value): array
             $cipherKey = $this->cipherKeyStore->currentKeyFor($subjectId);
         } catch (CipherKeyNotExists) {
             $cipherKey = ($this->cipherKeyFactory)($subjectId);
-            $this->cipherKeyStore->store($cipherKey->id, $cipherKey);
+            $this->cipherKeyStore->store($cipherKey);
         }
 
         $parameter = $this->cipher->encrypt($cipherKey, $value);

src/Extension/Cryptography/BaseCryptographer.php

@@ -12,9 +12,9 @@ interface CipherKeyStore
     public function currentKeyFor(string $subjectId): CipherKey;
 
     /** @throws CipherKeyNotExists */
-    public function get(string $keyId): CipherKey;
+    public function get(string $id): CipherKey;
 
-    public function store(string $id, CipherKey $key): void;
+    public function store(CipherKey $key): void;
 
     public function remove(string $id): void;
 

src/Extension/Cryptography/Store/CipherKeyStore.php

@@ -13,7 +13,7 @@ final class InMemoryCipherKeyStore implements CipherKeyStore
     /** @var array<string, CipherKey> */
     private array $indexById = [];
 
-    /** @var array<string, list<CipherKey>> */
+    /** @var array<string, array<string, CipherKey>> */
     private array $indexBySubjectId = [];
 
     public function currentKeyFor(string $subjectId): CipherKey
@@ -31,43 +31,31 @@ public function currentKeyFor(string $subjectId): CipherKey
         return $this->indexBySubjectId[$subjectId][$lastKey];
     }
 
-    public function get(string $keyId): CipherKey
+    public function get(string $id): CipherKey
     {
-        return $this->indexById[$keyId] ?? throw CipherKeyNotExists::forKeyId($keyId);
+        return $this->indexById[$id] ?? throw CipherKeyNotExists::forKeyId($id);
     }
 
-    public function store(string $id, CipherKey $key): void
+    public function store(CipherKey $key): void
     {
-        $this->indexById[$id] = $key;
+        $this->remove($key->id);
 
-        if (!isset($this->indexBySubjectId[$key->subjectId])) {
-            $this->indexBySubjectId[$key->subjectId] = [];
-        }
-
-        $this->indexBySubjectId[$key->subjectId][] = $key;
+        $this->indexById[$key->id] = $key;
+        $this->indexBySubjectId[$key->subjectId][$key->id] = $key;
     }
 
     public function remove(string $id): void
     {
-        unset($this->indexById[$id]);
-
-        foreach ($this->indexBySubjectId as $subjectId => $keys) {
-            $filtered = [];
-
-            foreach ($keys as $key) {
-                if ($key->id === $id) {
-                    continue;
-                }
+        $key = $this->indexById[$id] ?? null;
 
-                $filtered[] = $key;
-            }
-
-            if ($filtered === []) {
-                unset($this->indexBySubjectId[$subjectId]);
-            } else {
-                $this->indexBySubjectId[$subjectId] = $filtered;
-            }
+        if (!$key) {
+            return;
         }
+
+        unset(
+            $this->indexBySubjectId[$key->subjectId][$id],
+            $this->indexById[$id],
+        );
     }
 
     public function clear(): void

src/Extension/Cryptography/Store/InMemoryCipherKeyStore.php

@@ -124,10 +124,13 @@ private function getPropertyMetadataList(ReflectionClass $reflectionClass): arra
                 );
             }
 
+            $type = $this->typeResolver->resolve($reflectionProperty);
+
             $properties[$fieldName] = new PropertyMetadata(
                 $reflectionProperty,
+                $type,
                 $fieldName,
-                $this->getNormalizer($reflectionProperty),
+                $this->getNormalizer($reflectionProperty, $type),
             );
         }
 
@@ -198,18 +201,16 @@ private function mergeMetadata(ClassMetadata $parent, ClassMetadata $child): Cla
         );
     }
 
-    private function getNormalizer(ReflectionProperty $reflectionProperty): Normalizer|null
+    private function getNormalizer(ReflectionProperty $reflectionProperty, Type $type): Normalizer|null
     {
         $normalizer = $this->findNormalizerOnProperty($reflectionProperty);
-        $type = null;
 
         if (!$normalizer) {
-            $type = $this->typeResolver->resolve($reflectionProperty);
             $normalizer = $this->inferNormalizerByType($type);
         }
 
         if ($normalizer instanceof TypeAwareNormalizer) {
-            $normalizer->handleType($type ?? $this->typeResolver->resolve($reflectionProperty));
+            $normalizer->handleType($type);
         }
 
         return $normalizer;

src/Metadata/AttributeMetadataFactory.php

@@ -6,10 +6,12 @@
 
 use Patchlevel\Hydrator\Normalizer\Normalizer;
 use ReflectionProperty;
+use Symfony\Component\TypeInfo\Type;
 
 /**
  * @phpstan-type serialized = array{
  *     className: class-string,
+ *     type: Type,
  *     propertyName: string,
  *     fieldName: string,
  *     normalizer: Normalizer|null,
@@ -23,6 +25,7 @@ final class PropertyMetadata
     /** @param array<string, mixed> $extras */
     public function __construct(
         public readonly ReflectionProperty $reflection,
+        public readonly Type $type,
         public string $fieldName,
         public Normalizer|null $normalizer = null,
         public array $extras = [],
@@ -46,6 +49,7 @@ public function __serialize(): array
         return [
             'className' => $this->reflection->getDeclaringClass()->getName(),
             'propertyName' => $this->propertyName,
+            'type' => $this->type,
             'fieldName' => $this->fieldName,
             'normalizer' => $this->normalizer,
             'extras' => $this->extras,
@@ -56,6 +60,7 @@ public function __serialize(): array
     public function __unserialize(array $data): void
     {
         $this->reflection = new ReflectionProperty($data['className'], $data['propertyName']);
+        $this->type = $data['type'];
         $this->propertyName = $data['propertyName'];
         $this->fieldName = $data['fieldName'];
         $this->normalizer = $data['normalizer'];

src/Metadata/PropertyMetadata.php

@@ -70,7 +70,7 @@ public function testEncryptWithoutKey(): void
         $cipherKeyStore
             ->expects($this->once())
             ->method('store')
-            ->with('key-456', $cipherKey);
+            ->with($cipherKey);
 
         $cipher = $this->createMock(Cipher::class);
         $cipher->expects($this->once())->method('encrypt')->with($cipherKey, 'info@patchlevel.de')