add test and fix error on AvroSymbols

mattiabasone · mattiabasone · commit ecb300a562f3 · 2025-01-29T22:33:41.000+01:00
diff --git a/src/Objects/Schema/Generation/Attributes/AvroItems.php b/src/Objects/Schema/Generation/Attributes/AvroItems.php
@@ -18,7 +18,7 @@ final class AvroItems implements TypeOnlyAttribute
 
     public function __construct(Type|AvroType ...$types)
     {
-        $this->types = array_map(function ($type) {
+        $this->types = array_map(static function ($type) {
             if ($type instanceof AvroType) {
                 return $type;
             }
diff --git a/src/Objects/Schema/Generation/Attributes/AvroSymbols.php b/src/Objects/Schema/Generation/Attributes/AvroSymbols.php
@@ -12,13 +12,16 @@
 final class AvroSymbols implements VariadicAttribute
 {
     /**
-     * @var array<string>
+     * @var non-empty-array<int, string>
      */
     private array $symbols;
 
-    public function __construct(callable $symbols)
+    /**
+     * @param non-empty-array<int, string> $symbols
+     */
+    public function __construct(array $symbols)
     {
-        $this->symbols = $symbols();
+        $this->symbols = $symbols;
     }
 
     public function name(): string
diff --git a/test/Objects/Schema/Generation/Fixture/ArraysWithComplexType.php b/test/Objects/Schema/Generation/Fixture/ArraysWithComplexType.php
@@ -5,12 +5,19 @@
 namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;
 
 use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroItems;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroValues;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\Type;
 
 /**
  * @SerDe\AvroType("record")
  *
  * @SerDe\AvroName("ArraysWithComplexType")
  */
+#[AvroType('record')]
+#[AvroName('ArraysWithComplexType')]
 class ArraysWithComplexType
 {
     /**
@@ -23,6 +30,13 @@ class ArraysWithComplexType
      *     })
      * })
      */
+    #[AvroType(
+        'array',
+        attributes: new AvroItems(
+            new AvroType(Type::STRING),
+            new AvroType(Type::ARRAY, new AvroItems(new AvroType(Type::STRING))),
+        )
+    )]
     private array $arrayWithUnion;
 
     /**
@@ -34,5 +48,14 @@ class ArraysWithComplexType
      *     )
      * })
      */
+    #[AvroType(
+        Type::ARRAY,
+        attributes: new AvroItems(
+            new AvroType(
+                Type::MAP,
+                new AvroValues(new AvroType(Type::STRING))
+            ),
+        )
+    )]
     private array $arrayWithMap;
 }
diff --git a/test/Objects/Schema/Generation/Fixture/EmptyRecord.php b/test/Objects/Schema/Generation/Fixture/EmptyRecord.php
@@ -5,6 +5,9 @@
 namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;
 
 use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroNamespace;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;
 
 /**
  * @SerDe\AvroName("EmptyRecord")
@@ -13,6 +16,9 @@
  *
  * @SerDe\AvroType("record")
  */
+#[AvroName('EmptyRecord')]
+#[AvroNamespace('org.acme')]
+#[AvroType('record')]
 class EmptyRecord
 {
 }
diff --git a/test/Objects/Schema/Generation/Fixture/MapsWithComplexType.php b/test/Objects/Schema/Generation/Fixture/MapsWithComplexType.php
@@ -5,12 +5,19 @@
 namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;
 
 use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroItems;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroValues;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\Type;
 
 /**
  * @SerDe\AvroType("record")
  *
  * @SerDe\AvroName("MapsWithComplexType")
  */
+#[AvroType(Type::RECORD)]
+#[AvroName('MapsWithComplexType')]
 class MapsWithComplexType
 {
     /**
@@ -23,6 +30,16 @@ class MapsWithComplexType
      *     })
      * })
      */
+    #[AvroType(
+        Type::MAP,
+        new AvroValues(
+            Type::STRING,
+            new AvroType(
+                Type::ARRAY,
+                new AvroItems(Type::STRING)
+            )
+        )
+    )]
     private $mapWithUnion;
 
     /**
@@ -34,5 +51,14 @@ class MapsWithComplexType
      *     )
      * })
      */
+    #[AvroType(
+        Type::MAP,
+        new AvroValues(
+            new AvroType(
+                Type::ARRAY,
+                new AvroItems(Type::STRING)
+            )
+        )
+    )]
     private $mapWithArray;
 }
diff --git a/test/Objects/Schema/Generation/Fixture/PrimitiveTypes.php b/test/Objects/Schema/Generation/Fixture/PrimitiveTypes.php
@@ -5,6 +5,14 @@
 namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;
 
 use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroAliases;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroDefault;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroDoc;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroNamespace;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroOrder;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\Order;
 
 /**
  * @SerDe\AvroName("PrimitiveTypes")
@@ -13,13 +21,18 @@
  *
  * @SerDe\AvroType("record")
  */
+#[AvroName('PrimitiveTypes')]
+#[AvroNamespace('org.acme')]
+#[AvroType('record')]
 class PrimitiveTypes
 {
     /**
      * @SerDe\AvroDoc("null type")
      *
      * @SerDe\AvroType("null")
      */
+    #[AvroDoc('null type')]
+    #[AvroType('null')]
     private $nullType;
 
     /**
@@ -29,39 +42,50 @@ class PrimitiveTypes
      *
      * @SerDe\AvroType("boolean")
      */
+    #[AvroName('isItTrue')]
+    #[AvroDefault(false)]
+    #[AvroType('boolean')]
     private $booleanType;
 
     /**
      * @SerDe\AvroType("int")
      */
+    #[AvroType('int')]
     private $intType;
 
     /**
      * @SerDe\AvroType("long")
      *
      * @SerDe\AvroOrder("ascending")
      */
+    #[AvroType('long')]
+    #[AvroOrder(Order::ASC)]
     private $longType;
 
     /**
      * @SerDe\AvroType("float")
      *
      * @SerDe\AvroAliases({"foo", "bar"})
      */
+    #[AvroType('float')]
+    #[AvroAliases('foo', 'bar')]
     private $floatType;
 
     /**
      * @SerDe\AvroType("double")
      */
+    #[AvroType('double')]
     private $doubleType;
 
     /**
      * @SerDe\AvroType("bytes")
      */
+    #[AvroType('bytes')]
     private $bytesType;
 
     /**
      * @SerDe\AvroType("string")
      */
+    #[AvroType('string')]
     private $stringType;
 }
diff --git a/test/Objects/Schema/Generation/Fixture/RecordWithComplexTypes.php b/test/Objects/Schema/Generation/Fixture/RecordWithComplexTypes.php
@@ -5,12 +5,26 @@
 namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;
 
 use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroAliases;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroDefault;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroItems;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroNamespace;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroOrder;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroSize;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroSymbols;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroValues;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\Order;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\Type;
 
 /**
  * @SerDe\AvroType("record")
  *
  * @SerDe\AvroName("RecordWithComplexTypes")
  */
+#[AvroType('record')]
+#[AvroName('RecordWithComplexTypes')]
 class RecordWithComplexTypes
 {
     /**
@@ -21,6 +35,10 @@ class RecordWithComplexTypes
      *     @SerDe\AvroDefault({"foo", "bar"}),
      * })
      */
+    #[AvroType(
+        'array',
+        new AvroItems(Type::STRING), new AvroDefault(['foo', 'bar'])
+    )]
     private $array;
 
     /**
@@ -31,6 +49,10 @@ class RecordWithComplexTypes
      *     @SerDe\AvroDefault({"foo": 42, "bar": 42}),
      * })
      */
+    #[AvroType(
+        'map',
+        new AvroValues(Type::INT), new AvroDefault(['foo' => 42, 'bar' => 42])
+    )]
     private $map;
 
     /**
@@ -43,6 +65,12 @@ class RecordWithComplexTypes
      *     @SerDe\AvroSymbols({"SPADES", "HEARTS", "DIAMONDS", "CLUBS"})
      * })
      */
+    #[AvroOrder(Order::ASC)]
+    #[AvroType(
+        Type::ENUM,
+        new AvroName('Suit'),
+        new AvroSymbols(['SPADES', 'HEARTS', 'DIAMONDS', 'CLUBS'])
+    )]
     private $enum;
 
     /**
@@ -57,6 +85,13 @@ class RecordWithComplexTypes
      *     @SerDe\AvroSize(16)
      * })
      */
+    #[AvroType(
+        Type::FIXED,
+        new AvroName('md5'),
+        new AvroNamespace('org.acme'),
+        new AvroAliases('foo', 'bar'),
+        new AvroSize(16)
+    )]
     private $fixed;
 
     /**
@@ -67,5 +102,11 @@ class RecordWithComplexTypes
      *     @SerDe\AvroItems("string"),
      * })
      */
+    #[AvroType(Type::STRING)]
+    #[AvroType(Type::INT)]
+    #[AvroType(
+        Type::ARRAY,
+        new AvroItems(Type::STRING)
+    )]
     private $union;
 }
diff --git a/test/Objects/Schema/Generation/SchemaGeneratorTest.php b/test/Objects/Schema/Generation/SchemaGeneratorTest.php

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ final class AvroItems implements TypeOnlyAttribute`
`18`	`18`
`19`	`19`	`public function __construct(Type\|AvroType ...$types)`
`20`	`20`	`{`
`21`		`- $this->types = array_map(function ($type) {`
	`21`	`+ $this->types = array_map(static function ($type) {`
`22`	`22`	`if ($type instanceof AvroType) {`
`23`	`23`	`return $type;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,16 @@`
`12`	`12`	`final class AvroSymbols implements VariadicAttribute`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @var array<string>`
	`15`	`+ * @var non-empty-array<int, string>`
`16`	`16`	`*/`
`17`	`17`	`private array $symbols;`
`18`	`18`
`19`		`- public function __construct(callable $symbols)`
	`19`	`+ /**`
	`20`	`+ * @param non-empty-array<int, string> $symbols`
	`21`	`+ */`
	`22`	`+ public function __construct(array $symbols)`
`20`	`23`	`{`
`21`		`- $this->symbols = $symbols();`
	`24`	`+ $this->symbols = $symbols;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public function name(): string`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`namespace FlixTech\AvroSerializer\Test\Objects\Schema\Generation\Fixture;`
`6`	`6`
`7`	`7`	`use FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations as SerDe;`
	`8`	`+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroName;`
	`9`	`+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroNamespace;`
	`10`	`+use FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes\AvroType;`
`8`	`11`
`9`	`12`	`/**`
`10`	`13`	`* @SerDe\AvroName("EmptyRecord")`
`@@ -13,6 +16,9 @@`
`13`	`16`	`*`
`14`	`17`	`* @SerDe\AvroType("record")`
`15`	`18`	`*/`
	`19`	`+#[AvroName('EmptyRecord')]`
	`20`	`+#[AvroNamespace('org.acme')]`
	`21`	`+#[AvroType('record')]`
`16`	`22`	`class EmptyRecord`
`17`	`23`	`{`
`18`	`24`	`}`