Add typed property support and some fixes for StringFactory

Author: sandrokeil

src/PropertyFactory.php

@@ -20,6 +20,16 @@
 
 final class PropertyFactory
 {
+    /**
+     * @var bool
+     **/
+    private $typed;
+
+    public function __construct(bool $typed)
+    {
+        $this->typed = $typed;
+    }
+
     /**
      * @param  TypeSet $typeSet
      * @return array<NodeVisitor>
@@ -83,7 +93,7 @@ public function nodeVisitorFromNative(string $name, string $type): array
     {
         return [
             new \OpenCodeModeling\CodeAst\NodeVisitor\Property(
-                new PropertyGenerator($name, $type)
+                new PropertyGenerator($name, $type, null, $this->typed)
             ),
         ];
     }

src/ValueObject/StringFactory.php

@@ -60,10 +60,10 @@ final class StringFactory
     private Parser $parser;
     private PropertyFactory $propertyFactory;
 
-    public function __construct(Parser $parser)
+    public function __construct(Parser $parser, bool $typed)
     {
         $this->parser = $parser;
-        $this->propertyFactory = new PropertyFactory();
+        $this->propertyFactory = new PropertyFactory($typed);
     }
 
     /**
@@ -73,19 +73,17 @@ public function __construct(Parser $parser)
     public function nodeVisitors(StringType $typeDefinition): array
     {
         $name = $typeDefinition->name() ?: 'text';
-        $type = $typeDefinition->type();
 
-        return $this->nodeVisitorsFromNative($type, $name);
+        return $this->nodeVisitorsFromNative($name);
     }
 
     /**
-     * @param string $type
      * @param string $name
      * @return array<NodeVisitor>
      */
-    public function nodeVisitorsFromNative(string $type, string $name): array
+    public function nodeVisitorsFromNative(string $name): array
     {
-        $nodeVisitors = $this->propertyFactory->nodeVisitorFromNative($name, $type);
+        $nodeVisitors = $this->propertyFactory->nodeVisitorFromNative($name, 'string');
         $nodeVisitors[] = $this->methodFromString($name);
         $nodeVisitors[] = $this->methodMagicConstruct($name);
         $nodeVisitors[] = $this->methodToString($name);
@@ -128,9 +126,7 @@ public function methodToString(string $argumentName): NodeVisitor
     {
         $method = new MethodGenerator(
             'toString',
-            [
-                new ParameterGenerator($argumentName, 'string'),
-            ],
+            [],
             MethodGenerator::FLAG_PUBLIC,
             new BodyGenerator($this->parser, 'return $this->' . $argumentName . ';')
         );
@@ -152,7 +148,7 @@ public function methodEquals(string $propertyName, string $argumentName = 'other
         $method = new MethodGenerator(
             'equals',
             [
-                new ParameterGenerator($argumentName, 'string'),
+                new ParameterGenerator($argumentName),
             ],
             MethodGenerator::FLAG_PUBLIC,
             new BodyGenerator($this->parser, $body)

tests/ValueObject/StringFactoryTest.php

@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenCodeModelingTest\JsonSchemaToPhpAst\ValueObject;
+
+use OpenCodeModeling\JsonSchemaToPhpAst\ValueObject\StringFactory;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
+use PhpParser\Parser;
+use PhpParser\ParserFactory;
+use PhpParser\PrettyPrinter\Standard;
+use PhpParser\PrettyPrinterAbstract;
+use PHPUnit\Framework\TestCase;
+
+final class StringFactoryTest extends TestCase
+{
+    private Parser $parser;
+    private PrettyPrinterAbstract $printer;
+    private StringFactory $stringFactory;
+
+    public function setUp(): void
+    {
+        $this->parser = (new ParserFactory())->create(ParserFactory::ONLY_PHP7);
+        $this->printer = new Standard(['shortArraySyntax' => true]);
+        $this->stringFactory = new StringFactory($this->parser, true);
+    }
+
+    /**
+     * @test
+     */
+    public function it_generates_code_from_native(): void
+    {
+        $this->assertCode($this->stringFactory->nodeVisitorsFromNative('name'));
+    }
+
+    /**
+     * @param array<NodeVisitor> $nodeVisitors
+     */
+    private function assertCode(array $nodeVisitors): void
+    {
+        $ast = $this->parser->parse('<?php final class StringVO {}');
+
+        $nodeTraverser = new NodeTraverser();
+
+        foreach ($nodeVisitors as $nodeVisitor) {
+            $nodeTraverser->addVisitor($nodeVisitor);
+        }
+
+        $expected = <<<'EOF'
+<?php
+
+final class StringVO
+{
+    private string $name;
+    public static function fromString(string $name) : self
+    {
+        return new self($name);
+    }
+    private function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+    public function toString() : string
+    {
+        return $this->name;
+    }
+    public function equals($other) : bool
+    {
+        if (!$other instanceof self) {
+            return false;
+        }
+        return $this->name === $other->name;
+    }
+    public function __toString() : string
+    {
+        return $this->name;
+    }
+}
+EOF;
+
+        $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
+    }
+}