make context builders internal

Author: mtarld

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

@@ -89,10 +89,6 @@ class UnusedTagsPass implements CompilerPassInterface
         'security.remember_me_handler',
         'security.voter',
         'ser_des.context_builder',
-        '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',

src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php

@@ -56,7 +56,6 @@
 use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\SerDes\DependencyInjection\SerDesPass;
 use Symfony\Component\Messenger\DependencyInjection\MessengerPass;
 use Symfony\Component\Mime\DependencyInjection\AddMimeTypeGuesserPass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
@@ -171,7 +170,6 @@ public function build(ContainerBuilder $container)
         $this->addCompilerPassIfExists($container, MessengerPass::class);
         $this->addCompilerPassIfExists($container, HttpClientPass::class);
         $this->addCompilerPassIfExists($container, AddAutoMappingConfigurationPass::class);
-        $this->addCompilerPassIfExists($container, SerDesPass::class);
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RemoveUnusedSessionMarshallingHandlerPass());

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

@@ -41,10 +41,19 @@
         // Serializer
         ->set('ser_des.serializer', Serializer::class)
             ->args([
-                abstract_arg('serialize context builders'),
-                abstract_arg('deserialize context builders'),
                 param('.ser_des.cache_dir.template'),
             ])
+            ->call('setSerializeContextBuilders', [[
+                service('.ser_des.context_builder.serialize.hook'),
+                service('.ser_des.context_builder.serialize.name_attribute'),
+                service('.ser_des.context_builder.serialize.formatter_attribute'),
+            ]])
+            ->call('setDeserializeContextBuilders', [[
+                service('.ser_des.context_builder.deserialize.hook'),
+                service('.ser_des.context_builder.deserialize.name_attribute'),
+                service('.ser_des.context_builder.deserialize.formatter_attribute'),
+                service('.ser_des.context_builder.deserialize.instantiator'),
+            ]])
 
         ->alias(SerializerInterface::class, 'ser_des.serializer')
 
@@ -64,72 +73,63 @@
         ->alias('ser_des.type_extractor', 'ser_des.type_extractor.reflection')
 
         // Context builders
-        ->set('ser_des.context_builder.serialize.hook', SerializeHookContextBuilder::class)
-            ->args([
-                abstract_arg('serialize hooks'),
-            ])
-            ->tag('ser_des.context_builder.serialize', ['priority' => -1024])
+        ->set('.ser_des.context_builder.serialize.hook', SerializeHookContextBuilder::class)
+            ->args([[
+                'object' => service('ser_des.hook.serialize.object'),
+                'property' => service('ser_des.hook.serialize.property'),
+            ]])
 
-        ->set('ser_des.context_builder.serialize.name_attribute', SerializeNameAttributeContextBuilder::class)
+        ->set('.ser_des.context_builder.serialize.name_attribute', SerializeNameAttributeContextBuilder::class)
             ->args([
                 service('ser_des.serializable_resolver'),
             ])
-            ->tag('ser_des.context_builder.serialize', ['priority' => -1024])
 
-        ->set('ser_des.context_builder.serialize.formatter_attribute', SerializeFormatterAttributeContextBuilder::class)
+        ->set('.ser_des.context_builder.serialize.formatter_attribute', SerializeFormatterAttributeContextBuilder::class)
             ->args([
                 service('ser_des.serializable_resolver'),
             ])
-            ->tag('ser_des.context_builder.serialize', ['priority' => -1024])
 
-        ->set('ser_des.context_builder.deserialize.hook', DeserializeHookContextBuilder::class)
-            ->args([
-                abstract_arg('deserialize hooks'),
-            ])
-            ->tag('ser_des.context_builder.deserialize', ['priority' => -1024])
+        ->set('.ser_des.context_builder.deserialize.hook', DeserializeHookContextBuilder::class)
+            ->args([[
+                'object' => service('ser_des.hook.deserialize.object'),
+                'property' => service('ser_des.hook.deserialize.property'),
+            ]])
 
-        ->set('ser_des.context_builder.deserialize.name_attribute', DeserializeNameAttributeContextBuilder::class)
+        ->set('.ser_des.context_builder.deserialize.name_attribute', DeserializeNameAttributeContextBuilder::class)
             ->args([
                 service('ser_des.serializable_resolver'),
             ])
-            ->tag('ser_des.context_builder.deserialize', ['priority' => -1024])
 
-        ->set('ser_des.context_builder.deserialize.formatter_attribute', DeserializeFormatterAttributeContextBuilder::class)
+        ->set('.ser_des.context_builder.deserialize.formatter_attribute', DeserializeFormatterAttributeContextBuilder::class)
             ->args([
                 service('ser_des.serializable_resolver'),
             ])
-            ->tag('ser_des.context_builder.deserialize', ['priority' => -1024])
 
-        ->set('ser_des.context_builder.deserialize.instantiator', DeserializeInstantiatorContextBuilder::class)
+        ->set('.ser_des.context_builder.deserialize.instantiator', DeserializeInstantiatorContextBuilder::class)
             ->args([
                 service('ser_des.instantiator.lazy'),
             ])
-            ->tag('ser_des.context_builder.deserialize', ['priority' => -1024])
 
         // Hooks
         ->set('ser_des.hook.serialize.object', SerializeHook\ObjectHook::class)
             ->args([
                 service('ser_des.type_extractor'),
             ])
-            ->tag('ser_des.hook.serialize', ['name' => 'object'])
 
         ->set('ser_des.hook.serialize.property', SerializeHook\PropertyHook::class)
             ->args([
                 service('ser_des.type_extractor'),
             ])
-            ->tag('ser_des.hook.serialize', ['name' => 'property'])
 
         ->set('ser_des.hook.deserialize.object', DeserializeHook\ObjectHook::class)
             ->args([
                 service('ser_des.type_extractor'),
             ])
-            ->tag('ser_des.hook.deserialize', ['name' => 'object'])
 
         ->set('ser_des.hook.deserialize.property', DeserializeHook\PropertyHook::class)
             ->args([
                 service('ser_des.type_extractor'),
             ])
-            ->tag('ser_des.hook.deserialize', ['name' => 'property'])
 
         // Serializable resolvers
         ->set('ser_des.serializable_resolver', PathSerializableResolver::class)

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

@@ -18,7 +18,7 @@
 /**
  * @author Mathias Arlaud <[email protected]>
  *
- * @experimental in 7.0
+ * @internal
  */
 final class DeserializeNameAttributeContextBuilder implements DeserializeContextBuilderInterface
 {

src/Symfony/Component/SerDes/DependencyInjection/SerDesPass.php

@@ -40,7 +40,6 @@ public function __construct(
     public function __invoke(string $type, array $context): array
     {
         return [
-            'type' => $type,
             'context' => $this->addGenericParameterTypes($type, $context),
         ];
     }

src/Symfony/Component/SerDes/Hook/Deserialize/ObjectHook.php

@@ -33,8 +33,6 @@ public function __construct(
     public function __invoke(string $type, string $accessor, array $context): array
     {
         return [
-            'type' => $type,
-            'accessor' => $accessor,
             'context' => $this->addGenericParameterTypes($type, $context),
         ];
     }

src/Symfony/Component/SerDes/Hook/Serialize/ObjectHook.php

@@ -39,7 +39,6 @@ public function __invoke(\ReflectionProperty $property, string $accessor, array
             'name' => $this->name($property, $className, $name, $context),
             'type' => $this->type($property, $propertyFormatter, $context),
             'accessor' => $this->accessor($className, $name, $propertyFormatter, $accessor, $context),
-            'context' => $context,
         ];
     }
 

src/Symfony/Component/SerDes/Hook/Serialize/PropertyHook.php

@@ -212,6 +212,8 @@ private function computePropertiesInfo(string $className, string $objectAccessor
     {
         $class = new \ReflectionClass($className);
 
+        $propertiesInfo = [];
+
         foreach ($class->getProperties() as $property) {
             if (!$property->isPublic()) {
                 throw new LogicException(sprintf('"%s::$%s" must be public.', $class->getName(), $property->getName()));

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

@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\SerDes;
 
-use Symfony\Component\SerDes\Context\ContextBuilder\DeserializeContextBuilderInterface;
-use Symfony\Component\SerDes\Context\ContextBuilder\SerializeContextBuilderInterface;
+use Symfony\Component\SerDes\Context\ContextBuilder\ContextBuilderInterface;
 use Symfony\Component\SerDes\Context\ContextInterface;
 use Symfony\Component\SerDes\Stream\StreamInterface;
 
@@ -24,12 +23,16 @@
 final class Serializer implements SerializerInterface
 {
     /**
-     * @param iterable<SerializeContextBuilderInterface>   $serializeContextBuilders
-     * @param iterable<DeserializeContextBuilderInterface> $deserializeContextBuilders
+     * @var iterable<ContextBuilderInterface>
      */
+    private iterable $serializeContextBuilders = [];
+
+    /**
+     * @var iterable<ContextBuilderInterface>
+     */
+    private iterable $deserializeContextBuilders = [];
+
     public function __construct(
-        private readonly iterable $serializeContextBuilders,
-        private readonly iterable $deserializeContextBuilders,
         private readonly string $templateCacheDir,
     ) {
     }
@@ -71,4 +74,24 @@ public function deserialize(mixed $input, string $type, string $format, ContextI
 
         return deserialize($input, $type, $format, $context);
     }
+
+    /**
+     * @param iterable<ContextBuilderInterface> $serializeContextBuilders
+     *
+     * @internal
+     */
+    public function setSerializeContextBuilders(iterable $serializeContextBuilders): void
+    {
+        $this->serializeContextBuilders = $serializeContextBuilders;
+    }
+
+    /**
+     * @param iterable<ContextBuilderInterface> $deserializeContextBuilders
+     *
+     * @internal
+     */
+    public function setDeserializeContextBuilders(iterable $deserializeContextBuilders): void
+    {
+        $this->deserializeContextBuilders = $deserializeContextBuilders;
+    }
 }