minor fixes

Author: mtarld

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php

@@ -86,11 +86,13 @@ class UnusedTagsPass implements CompilerPassInterface
         'security.remember_me_aware',
         'security.remember_me_handler',
         'security.voter',
-        'serializer.encoder',
-        'serializer.normalizer',
         'ser_des.context_builder',
-        'ser_des.hook.serialize',
+        'ser_des.context_builder.deserialize',
+        'ser_des.context_builder.serialize',
         'ser_des.hook.deserialize',
+        'ser_des.hook.serialize',
+        'serializer.encoder',
+        'serializer.normalizer',
         'texter.transport_factory',
         'translation.dumper',
         'translation.extractor',

src/Symfony/Bundle/FrameworkBundle/Resources/config/ser_des.php

@@ -33,8 +33,8 @@
 
 return static function (ContainerConfigurator $container) {
     $container->parameters()
-        ->set('ser_des.cache_dir.template', '%kernel.cache_dir%/ser_des/template')
-        ->set('ser_des.cache_dir.lazy_object', '%kernel.cache_dir%/ser_des/lazy_object')
+        ->set('.ser_des.cache_dir.template', '%kernel.cache_dir%/ser_des/template')
+        ->set('.ser_des.cache_dir.lazy_object', '%kernel.cache_dir%/ser_des/lazy_object')
     ;
 
     $container->services()

src/Symfony/Component/SerDes/Attribute/Formatter.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\SerDes\Attribute;
 
-use Symfony\Component\SerDes\Exception\InvalidArgumentException;
-
 /**
  * @author Mathias Arlaud <[email protected]>
  *
@@ -22,19 +20,12 @@
 final class Formatter
 {
     /**
-     * @param callable|null $onSerialize
-     * @param callable|null $onDeserialize
+     * @param callable(mixed, array<string, mixed>=): mixed|null $onSerialize
+     * @param callable(mixed, array<string, mixed>=): mixed|null $onDeserialize
      */
     public function __construct(
         public readonly mixed $onSerialize = null,
         public readonly mixed $onDeserialize = null,
     ) {
-        if (null !== $onSerialize && !\is_callable($onSerialize)) {
-            throw new InvalidArgumentException(sprintf('Parameter "$onSerialize" of attribute "%s" must be a valid callable.', self::class));
-        }
-
-        if (null !== $onDeserialize && !\is_callable($onDeserialize)) {
-            throw new InvalidArgumentException(sprintf('Parameter "$onDeserialize" of attribute "%s" must be a valid callable.', self::class));
-        }
     }
 }

src/Symfony/Component/SerDes/CachedSerializableResolver.php

@@ -42,7 +42,12 @@ public function resolve(): iterable
         }
 
         if (!$item->isHit()) {
-            $item->set(iterator_to_array($this->resolver->resolve()));
+            $serializables = [];
+            foreach ($this->resolver->resolve() as $class => $serializable) {
+                $serializables[$class] = $serializable;
+            }
+
+            $item->set($serializables);
         }
 
         yield from $item->get();

src/Symfony/Component/SerDes/Context/ContextBuilder/Deserialize/DeserializeFormatterAttributeContextBuilder.php

@@ -23,7 +23,7 @@
 final class DeserializeFormatterAttributeContextBuilder implements DeserializeContextBuilderInterface
 {
     /**
-     * @var array<string, callable>
+     * @var array<string, array{deserialize: callable}>
      */
     private static ?array $cache = null;
 
@@ -52,7 +52,7 @@ public function build(array $context): array
     /**
      * @param class-string $className
      *
-     * @return array<string, callable>
+     * @return array<string, array{deserialize: callable}>
      */
     private function propertyFormatters(string $className): array
     {

src/Symfony/Component/SerDes/Context/ContextBuilder/Serialize/SerializeFormatterAttributeContextBuilder.php

@@ -23,7 +23,7 @@
 final class SerializeFormatterAttributeContextBuilder implements SerializeContextBuilderInterface
 {
     /**
-     * @var array<string, callable>
+     * @var array<string, array{serialize: callable}>
      */
     private static ?array $cache = null;
 
@@ -56,7 +56,7 @@ public function build(array $context): array
     /**
      * @param class-string $className
      *
-     * @return array<string, callable>
+     * @return array<string, array{serialize: callable}>
      */
     private function propertyFormatters(string $className): array
     {

src/Symfony/Component/SerDes/Internal/Deserialize/Deserializer.php

@@ -157,7 +157,7 @@ private function lazyDeserializeCollectionItems(\Iterator $boundaries, mixed $re
     /**
      * @param array<string, mixed> $context
      */
-    private function deserializeEnum(bool $lazy, mixed $resourceOrData, Type $type, array $context): \BackedEnum
+    private function deserializeEnum(bool $lazy, mixed $resourceOrData, Type $type, array $context): ?\BackedEnum
     {
         $data = $lazy ? $this->decoder->decode($resourceOrData, $context['boundary'][0], $context['boundary'][1], $context) : $resourceOrData;
 

src/Symfony/Component/SerDes/Internal/Serialize/Optimizer.php

@@ -72,8 +72,13 @@ private function mergeResourceStringFwrites(array $nodes): array
                 continue;
             }
 
-            /** @var ExpressionNode<FunctionNode> $node */
-            $stringContent = $stringContent.$node->node->parameters[1]->value;
+            /**
+             * @var ExpressionNode<FunctionNode> $node
+             * @var ScalarNode                   $stringParameter
+             */
+            $stringParameter = $node->node->parameters[1];
+
+            $stringContent = $stringContent.$stringParameter->value;
         }
 
         if ('' !== $stringContent) {

src/Symfony/Component/SerDes/Tests/Attribute/FormatterTest.php

@@ -49,18 +49,4 @@ public static function toUpper(string $value, array $context): string
 
         $this->addToAssertionCount(4);
     }
-
-    public function testCannotCreateWithInvalidOnSerializeCallable()
-    {
-        $this->expectException(InvalidArgumentException::class);
-
-        new Formatter(onSerialize: []);
-    }
-
-    public function testCannotCreateWithInvalidOnDeserializeCallable()
-    {
-        $this->expectException(InvalidArgumentException::class);
-
-        new Formatter(onDeserialize: []);
-    }
 }