Update

Author: DanielBadura

src/Extension/Generated/MiddlewareGenerator.php

@@ -95,9 +95,10 @@ public function dump(array $classes, string $middlewareFqcn): string
         // Phase 2: Generate Properties and Setup
         $propertiesCode = '';
         $setupCode = '';
+
         foreach ($normalizers as $index => $info) {
-            $propertiesCode .= "    private readonly \\{$info['normalizer']} \$n$index;\n";
-            $setupCode .= "        \$this->n$index = \$metadataFactory->metadata(\\{$info['class']}::class)->properties['{$info['propertyName']}']->normalizer;\n";
+            $propertiesCode .= "private readonly \\{$info['normalizer']} \$n$index;\n";
+            $setupCode .= "\$this->n$index = \$metadataFactory->metadata(\\{$info['class']}::class)->properties['{$info['propertyName']}']->normalizer;\n";
         }
 
         // Phase 3: Generate Class Methods
@@ -108,8 +109,8 @@ public function dump(array $classes, string $middlewareFqcn): string
         foreach ($allClasses as $class => $metadata) {
             $shortName = str_replace('\\', '', $class);
 
-            $hydrateCases .= "            \\$class::class => \$this->hydrate$shortName(\$data, \$context, \$stack),\n";
-            $extractCases .= "                \\$class::class => \$this->extract$shortName(\$object, \$context, \$stack),\n";
+            $hydrateCases .= "\\$class::class => \$this->hydrate$shortName(\$data, \$context, \$stack),\n";
+            $extractCases .= "\\$class::class => \$this->extract$shortName(\$object, \$context, \$stack),\n";
 
             $methods .= $this->generateClassMethods($metadata, $shortName, $normalizerMap);
         }
@@ -142,10 +143,11 @@ final class $middlewareClassName implements Middleware
 {
     private array \$callStack = [];
 
-$propertiesCode
+{$this->padLeft($propertiesCode, 1)}
+
     public function __construct(MetadataFactory \$metadataFactory)
     {
-$setupCode
+{$this->padLeft($setupCode, 2)}    
     }
 
     public function hydrate(ClassMetadata \$metadata, array \$data, array \$context, Stack \$stack): object
@@ -162,7 +164,7 @@ public function hydrate(ClassMetadata \$metadata, array \$data, array \$context,
     private function doHydrate(string \$class, array \$data, array \$context, Stack \$stack): object|null
     {
         return match (\$class) {
-$hydrateCases
+{$this->padLeft($hydrateCases, 3)}    
             default => null,
         };
     }
@@ -193,14 +195,15 @@ private function doExtract(object \$object, array \$context, Stack \$stack): arr
 
         try {
             return match (\$object::class) {
-$extractCases                default => null,
+{$this->padLeft($extractCases, 4)}
+                default => null,
             };
         } finally {
             \\array_pop(\$this->callStack);
         }
     }
 
-$methods
+{$this->padLeft($methods, 1)}
 }
 PHP;
     }
@@ -211,6 +214,10 @@ private function generateClassMethods(ClassMetadata $metadata, string $shortName
 
         $constructor = $metadata->reflection->getConstructor();
 
+        if ($constructor === null) {
+            dd($metadata->className);
+        }
+
         $befores = [];
         $map = [];
 
@@ -225,13 +232,13 @@ private function generateClassMethods(ClassMetadata $metadata, string $shortName
         }
 
         $methods = <<<PHP
-    private function hydrate$shortName(array \$data, array \$context, Stack \$stack): \\$targetClass
-    {
-{$this->padLeft(implode("\n", $befores), 2)}        
-        return new \\$targetClass(
-{$this->padLeft(implode(",\n", $map), 3)}  
-        );
-    }
+private function hydrate$shortName(array \$data, array \$context, Stack \$stack): \\$targetClass
+{
+{$this->padLeft(implode("\n", $befores), 1)}        
+    return new \\$targetClass(
+{$this->padLeft(implode(",\n", $map), 2)}  
+    );
+}
 
 PHP;
 
@@ -249,13 +256,13 @@ private function hydrate$shortName(array \$data, array \$context, Stack \$stack)
         }
 
         $methods .= <<<PHP
-    private function extract$shortName(\$object, array \$context, Stack \$stack): array
-    {
-{$this->padLeft(implode("\n", $befores), 2)}    
-        return [
-{$this->padLeft(implode("\n", $map), 3)}     
-        ];
-    }
+private function extract$shortName(\$object, array \$context, Stack \$stack): array
+{
+{$this->padLeft(implode("\n", $befores), 1)}    
+    return [
+{$this->padLeft(implode("\n", $map), 2)}     
+    ];
+}
 
 PHP;
 

tests/Unit/Extension/Generated/GeneratedMetadataHydratorTest.php

@@ -15,7 +15,6 @@
 use Patchlevel\Hydrator\Extension\Generated\GeneratedCoreExtension;
 use Patchlevel\Hydrator\Hydrator;
 use Patchlevel\Hydrator\HydratorBuilder;
-use Patchlevel\Hydrator\Metadata\AttributeMetadataFactory;
 use Patchlevel\Hydrator\Metadata\ClassMetadata;
 use Patchlevel\Hydrator\MetadataHydrator;
 use Patchlevel\Hydrator\Middleware\Middleware;

tests/Unit/Fixture/Circle1Dto.php

@@ -8,6 +8,10 @@
 
 final class Circle1Dto
 {
-    #[ObjectNormalizer(Circle2Dto::class)]
-    public object|null $to = null;
+    public function __construct(
+        #[ObjectNormalizer(Circle2Dto::class)]
+        public object|null $to = null
+    )
+    {
+    }
 }

tests/Unit/Fixture/Circle2Dto.php

@@ -8,6 +8,10 @@
 
 final class Circle2Dto
 {
-    #[ObjectNormalizer(Circle3Dto::class)]
-    public object|null $to = null;
+    public function __construct(
+        #[ObjectNormalizer(Circle3Dto::class)]
+        public object|null $to = null
+    )
+    {
+    }
 }

tests/Unit/Fixture/Circle3Dto.php

@@ -8,6 +8,10 @@
 
 final class Circle3Dto
 {
-    #[ObjectNormalizer(Circle1Dto::class)]
-    public object|null $to = null;
+    public function __construct(
+        #[ObjectNormalizer(Circle1Dto::class)]
+        public object|null $to = null
+    )
+    {
+    }
 }