rename attributes

Author: mtarld

src/Symfony/Component/SerDes/Attribute/Formatter.php renamed to src/Symfony/Component/SerDes/Attribute/DeserializeFormatter.php

@@ -17,15 +17,13 @@
  * @experimental in 7.0
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)]
-final class Formatter
+final class DeserializeFormatter
 {
     /**
-     * @param callable(mixed, array<string, mixed>=): mixed|null $onSerialize
-     * @param callable(mixed, array<string, mixed>=): mixed|null $onDeserialize
+     * @param callable(mixed, array<string, mixed>=): mixed|null $formatter
      */
     public function __construct(
-        public readonly mixed $onSerialize = null,
-        public readonly mixed $onDeserialize = null,
+        public readonly mixed $formatter,
     ) {
     }
 }

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

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\SerDes\Attribute;
+
+/**
+ * @author Mathias Arlaud <[email protected]>
+ *
+ * @experimental in 7.0
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+final class SerializeFormatter
+{
+    /**
+     * @param callable(mixed, array<string, mixed>=): mixed|null $formatter
+     */
+    public function __construct(
+        public readonly mixed $formatter,
+    ) {
+    }
+}

src/Symfony/Component/SerDes/Attribute/Name.php renamed to src/Symfony/Component/SerDes/Attribute/SerializedName.php

@@ -17,7 +17,7 @@
  * @experimental in 7.0
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)]
-final class Name
+final class SerializedName
 {
     public function __construct(
         public readonly string $name,

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

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\SerDes\Context\ContextBuilder\Deserialize;
 
-use Symfony\Component\SerDes\Attribute\Formatter;
+use Symfony\Component\SerDes\Attribute\DeserializeFormatter;
 use Symfony\Component\SerDes\Context\ContextBuilder\DeserializeContextBuilderInterface;
 use Symfony\Component\SerDes\SerializableResolver\SerializableResolverInterface;
 
@@ -60,18 +60,14 @@ private function propertyFormatters(string $className): array
 
         foreach ((new \ReflectionClass($className))->getProperties() as $property) {
             foreach ($property->getAttributes() as $attribute) {
-                if (Formatter::class !== $attribute->getName()) {
+                if (DeserializeFormatter::class !== $attribute->getName()) {
                     continue;
                 }
 
-                /** @var Formatter $attributeInstance */
+                /** @var DeserializeFormatter $attributeInstance */
                 $attributeInstance = $attribute->newInstance();
 
-                if (null === $attributeInstance->onDeserialize) {
-                    break;
-                }
-
-                $propertyFormatters[$property->getDeclaringClass()->getName()][$property->getName()] = $attributeInstance->onDeserialize;
+                $propertyFormatters[$property->getDeclaringClass()->getName()][$property->getName()] = $attributeInstance->formatter;
 
                 break;
             }

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

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\SerDes\Context\ContextBuilder\Deserialize;
 
-use Symfony\Component\SerDes\Attribute\Name;
+use Symfony\Component\SerDes\Attribute\SerializedName;
 use Symfony\Component\SerDes\Context\ContextBuilder\DeserializeContextBuilderInterface;
 use Symfony\Component\SerDes\SerializableResolver\SerializableResolverInterface;
 
@@ -60,11 +60,11 @@ private function propertyNames(string $className): array
 
         foreach ((new \ReflectionClass($className))->getProperties() as $property) {
             foreach ($property->getAttributes() as $attribute) {
-                if (Name::class !== $attribute->getName()) {
+                if (SerializedName::class !== $attribute->getName()) {
                     continue;
                 }
 
-                /** @var Name $attributeInstance */
+                /** @var SerializedName $attributeInstance */
                 $attributeInstance = $attribute->newInstance();
 
                 $propertyNames[$property->getDeclaringClass()->getName()][$attributeInstance->name] = $property->getName();

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

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\SerDes\Context\ContextBuilder\Serialize;
 
-use Symfony\Component\SerDes\Attribute\Formatter;
+use Symfony\Component\SerDes\Attribute\SerializeFormatter;
 use Symfony\Component\SerDes\Context\ContextBuilder\SerializeContextBuilderInterface;
 use Symfony\Component\SerDes\SerializableResolver\SerializableResolverInterface;
 
@@ -64,18 +64,14 @@ private function propertyFormatters(string $className): array
 
         foreach ((new \ReflectionClass($className))->getProperties() as $property) {
             foreach ($property->getAttributes() as $attribute) {
-                if (Formatter::class !== $attribute->getName()) {
+                if (SerializeFormatter::class !== $attribute->getName()) {
                     continue;
                 }
 
-                /** @var Formatter $attributeInstance */
+                /** @var SerializeFormatter $attributeInstance */
                 $attributeInstance = $attribute->newInstance();
 
-                if (null === $attributeInstance->onSerialize) {
-                    break;
-                }
-
-                $propertyFormatters[$property->getDeclaringClass()->getName()][$property->getName()] = $attributeInstance->onSerialize;
+                $propertyFormatters[$property->getDeclaringClass()->getName()][$property->getName()] = $attributeInstance->formatter;
 
                 break;
             }

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

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\SerDes\Context\ContextBuilder\Serialize;
 
-use Symfony\Component\SerDes\Attribute\Name;
+use Symfony\Component\SerDes\Attribute\SerializedName;
 use Symfony\Component\SerDes\Context\ContextBuilder\SerializeContextBuilderInterface;
 use Symfony\Component\SerDes\SerializableResolver\SerializableResolverInterface;
 
@@ -64,11 +64,11 @@ private function propertyNames(string $className): array
 
         foreach ((new \ReflectionClass($className))->getProperties() as $property) {
             foreach ($property->getAttributes() as $attribute) {
-                if (Name::class !== $attribute->getName()) {
+                if (SerializedName::class !== $attribute->getName()) {
                     continue;
                 }
 
-                /** @var Name $attributeInstance */
+                /** @var SerializedName $attributeInstance */
                 $attributeInstance = $attribute->newInstance();
 
                 $propertyNames[$property->getDeclaringClass()->getName()][$property->getName()] = $attributeInstance->name;

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

@@ -2,16 +2,15 @@
 
 namespace Symfony\Component\SerDes\Tests\Fixtures\Dto;
 
-use Symfony\Component\SerDes\Attribute\Formatter;
+use Symfony\Component\SerDes\Attribute\DeserializeFormatter;
+use Symfony\Component\SerDes\Attribute\SerializeFormatter;
 
 class AnotherDummyWithFormatterAttributes
 {
     public int $id = 1;
 
-    #[Formatter(
-        onSerialize: [self::class, 'uppercase'],
-        onDeserialize: [self::class, 'lowercase'],
-    )]
+    #[SerializeFormatter([self::class, 'uppercase'])]
+    #[DeserializeFormatter([self::class, 'lowercase'])]
     public string $name = 'dummy';
 
     public static function uppercase(string $value): string

src/Symfony/Component/SerDes/Tests/Fixtures/Dto/AnotherDummyWithFormatterAttributes.php

@@ -2,12 +2,12 @@
 
 namespace Symfony\Component\SerDes\Tests\Fixtures\Dto;
 
-use Symfony\Component\SerDes\Attribute\Name;
+use Symfony\Component\SerDes\Attribute\SerializedName;
 
 class AnotherDummyWithNameAttributes
 {
     public int $id = 1;
 
-    #[Name('call_me_with')]
+    #[SerializedName('call_me_with')]
     public string $name = 'dummy';
 }

src/Symfony/Component/SerDes/Tests/Fixtures/Dto/AnotherDummyWithNameAttributes.php

@@ -2,14 +2,13 @@
 
 namespace Symfony\Component\SerDes\Tests\Fixtures\Dto;
 
-use Symfony\Component\SerDes\Attribute\Formatter;
+use Symfony\Component\SerDes\Attribute\DeserializeFormatter;
+use Symfony\Component\SerDes\Attribute\SerializeFormatter;
 
 class DummyWithFormatterAttributes
 {
-    #[Formatter(
-        onSerialize: [self::class, 'doubleAndCastToString'],
-        onDeserialize: [self::class, 'divideAndCastToInt'],
-    )]
+    #[SerializeFormatter([self::class, 'doubleAndCastToString'])]
+    #[DeserializeFormatter([self::class, 'divideAndCastToInt'])]
     public int $id = 1;
 
     public string $name = 'dummy';

src/Symfony/Component/SerDes/Tests/Fixtures/Dto/DummyWithFormatterAttributes.php

@@ -2,11 +2,11 @@
 
 namespace Symfony\Component\SerDes\Tests\Fixtures\Dto;
 
-use Symfony\Component\SerDes\Attribute\Name;
+use Symfony\Component\SerDes\Attribute\SerializedName;
 
 class DummyWithNameAttributes
 {
-    #[Name('@id')]
+    #[SerializedName('@id')]
     public int $id = 1;
 
     public string $name = 'dummy';

src/Symfony/Component/SerDes/Tests/Fixtures/Dto/DummyWithNameAttributes.php

@@ -2,10 +2,10 @@
 
 namespace Symfony\Component\SerDes\Tests\Fixtures\Dto;
 
-use Symfony\Component\SerDes\Attribute\Name;
+use Symfony\Component\SerDes\Attribute\SerializedName;
 
 class DummyWithQuotes
 {
-    #[Name('"name"')]
+    #[SerializedName('"name"')]
     public string $name = '"quoted" dummy';
 }