Improve metadata cache driver

Author: Kirill Nesmeyanov

src/Mapper.php

@@ -58,7 +58,12 @@ private function createTypeParser(PlatformInterface $platform): TypeParserFacade
 
     private function createTypeRepository(PlatformInterface $platform): TypeRepositoryFacadeInterface
     {
-        $runtime = TypeRepository::createFromPlatform($platform, $this->parser);
+        $runtime = new InMemoryTypeRepository(
+            delegate: TypeRepository::createFromPlatform(
+                platform: $platform,
+                parser: $this->parser,
+            )
+        );
 
         if (($tracer = $this->config->getTracer()) !== null) {
             $runtime = new TraceableTypeRepository($tracer, $runtime);
@@ -70,7 +75,7 @@ private function createTypeRepository(PlatformInterface $platform): TypeReposito
 
         return new TypeRepositoryFacade(
             parser: $this->parser,
-            runtime: new InMemoryTypeRepository($runtime),
+            runtime: $runtime,
         );
     }
 

src/Mapping/Driver/Psr16CachedDriver.php

@@ -27,18 +27,16 @@ public function getClassMetadata(
     ): ClassMetadata {
         $index = $this->getKey($class);
 
-        $result = $this->cache->get(
-            $index,
-            fn(): ClassMetadata
-            => parent::getClassMetadata($class, $types, $parser)
-        );
+        $result = $this->cache->get($index);
 
-        if ($result instanceof \Closure) {
-            $result = $result();
-
-            $this->cache->set($index, $result, $this->ttl);
+        if ($result instanceof ClassMetadata) {
+            return $result;
         }
 
+        $result = parent::getClassMetadata($class, $types, $parser);
+
+        $this->cache->set($index, $result, $this->ttl);
+
         return $result;
     }
 }

src/Runtime/Repository/TypeDecorator/LoggableType.php

@@ -15,7 +15,7 @@
 final class LoggableType extends TypeDecorator
 {
     public function __construct(
-        private readonly ?LoggerInterface $logger,
+        private readonly LoggerInterface $logger,
         TypeInterface $delegate,
     ) {
         parent::__construct($delegate);
@@ -39,10 +39,6 @@ private function getLoggerArguments(mixed $value, Context $context): array
 
     public function match(mixed $value, Context $context): bool
     {
-        if ($this->logger === null) {
-            return parent::match($value, $context);
-        }
-
         $this->logger->debug(
             'Matching by the {type_name}',
             $this->getLoggerArguments($value, $context),
@@ -62,10 +58,6 @@ public function match(mixed $value, Context $context): bool
 
     public function cast(mixed $value, Context $context): mixed
     {
-        if ($this->logger === null) {
-            return parent::cast($value, $context);
-        }
-
         $this->logger->debug(
             'Casting by the {type_name}',
             $this->getLoggerArguments($value, $context),

src/Runtime/Repository/TypeDecorator/TraceableType.php

@@ -21,7 +21,7 @@ final class TraceableType extends TypeDecorator
     private readonly string $name;
 
     public function __construct(
-        private readonly ?TracerInterface $tracer,
+        private readonly TracerInterface $tracer,
         TypeInterface $delegate,
     ) {
         parent::__construct($delegate);
@@ -61,10 +61,6 @@ private static function getDirection(Context $context): Context\DirectionInterfa
 
     public function match(mixed $value, Context $context): bool
     {
-        if ($this->tracer === null) {
-            return parent::match($value, $context);
-        }
-
         $span = $this->tracer->start(\sprintf('Match %s', $this->name));
 
         try {
@@ -84,10 +80,6 @@ public function match(mixed $value, Context $context): bool
 
     public function cast(mixed $value, Context $context): mixed
     {
-        if ($this->tracer === null) {
-            return parent::cast($value, $context);
-        }
-
         $span = $this->tracer->start(\sprintf('Cast %s', $this->name));
 
         try {

src/Runtime/Repository/TypeDecorator/TypeDecorator.php

@@ -36,11 +36,12 @@ public function cast(mixed $value, Context $context): mixed
         return $this->delegate->cast($value, $context);
     }
 
-    /**
-     * @return array<array-key, mixed>
-     */
     public function __serialize(): array
     {
-        return ['delegate' => $this->delegate];
+        throw new \LogicException(<<<'MESSAGE'
+            Cannot serialize a type decorator.
+
+            Please disable cache in case you are using debug mode.
+            MESSAGE);
     }
 }