Add property array values rendering in the PropertyRenderer (#5)

cycle · Nov 18, 2021 · 8fae316 · 8fae316
1 parent 9ac5162
commit 8fae316
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/src/ConsoleRenderer/Renderer/PropertyRenderer.php b/src/ConsoleRenderer/Renderer/PropertyRenderer.php
@@ -24,14 +24,37 @@ public function render(Formatter $formatter, array $schema, string $role): ?stri
     {
         $row = sprintf('%s: ', $formatter->title($this->title));
 
-        if (!array_key_exists($this->property, $schema)) {
+        if (!isset($schema[$this->property])) {
             return $this->required ? $row . $formatter->error('not defined') : null;
         }
 
+        $propertyValue = $schema[$this->property];
+
+        if (is_array($propertyValue)) {
+            if (count($propertyValue) >= 1) {
+                return $row . $this->convertArrayToString($formatter, $propertyValue);
+            }
+            $propertyValue = '[]';
+        }
+
         return sprintf(
             '%s%s',
             $row,
-            $formatter->typecast($schema[$this->property])
+            $formatter->typecast($propertyValue)
+        );
+    }
+
+    private function convertArrayToString(Formatter $formatter, array $values): string
+    {
+        $string = implode(
+            "\n",
+            array_map(static fn ($property) => sprintf(
+                '  %s%s',
+                $formatter->title(' '),
+                $formatter->typecast($property)
+            ), $values)
         );
+
+        return ltrim($string);
     }
 }
diff --git a/src/OutputSchemaRenderer.php b/src/OutputSchemaRenderer.php
@@ -28,7 +28,7 @@ final class OutputSchemaRenderer extends OutputRenderer
         'ROLE' => 'Role',
         'ENTITY' => 'Entity',
         'MAPPER' => 'Mapper',
-        'SCOPE' => 'Constrain',
+        'SCOPE' => 'Scope',
         'REPOSITORY' => 'Repository',
     ];
 

diff --git a/tests/Schema/Renderer/Fixture/console_output.stub.txt b/tests/Schema/Renderer/Fixture/console_output.stub.txt
@@ -16,6 +16,7 @@
 [35m[Cycle\Schema\Renderer\Tests\Fixture\Tag][39m :: [32mdefault[39m.[32mtag[39m
          Role: [34mtag[39m
        Mapper: [34mCycle\ORM\Mapper\Mapper[39m
+               [34mApp\FooMapper[39m
   Primary key: [36mid[39m, [36mname[39m
        Fields:
      ([36mproperty[39m -> [32mdb.field[39m -> [34mtypecast[39m)

diff --git a/tests/Schema/Renderer/Fixture/console_output_plain.stub.txt b/tests/Schema/Renderer/Fixture/console_output_plain.stub.txt
@@ -16,6 +16,7 @@
 [tag] :: default.tag
        Entity: Cycle\Schema\Renderer\Tests\Fixture\Tag
        Mapper: Cycle\ORM\Mapper\Mapper
+               App\FooMapper
   Primary key: id, name
        Fields:
      (property -> db.field -> typecast)

diff --git a/tests/Schema/Renderer/Fixture/console_output_with_custom_properties.stub.txt b/tests/Schema/Renderer/Fixture/console_output_with_custom_properties.stub.txt
@@ -17,6 +17,7 @@
 [35m[Cycle\Schema\Renderer\Tests\Fixture\Tag][39m :: [32mdefault[39m.[32mtag[39m
          Role: [34mtag[39m
        Mapper: [34mCycle\ORM\Mapper\Mapper[39m
+               [34mApp\FooMapper[39m
   Primary key: [36mid[39m, [36mname[39m
        Fields:
      ([36mproperty[39m -> [32mdb.field[39m -> [34mtypecast[39m)

diff --git a/tests/Schema/Renderer/OutputSchemaRendererTest.php b/tests/Schema/Renderer/OutputSchemaRendererTest.php
@@ -61,7 +61,10 @@ protected function setUp(): void
             ],
             Tag::class => [
                 SchemaInterface::ROLE => 'tag',
-                SchemaInterface::MAPPER => Mapper::class,
+                SchemaInterface::MAPPER => [
+                    Mapper::class,
+                    'App\FooMapper',
+                ],
                 SchemaInterface::DATABASE => 'default',
                 SchemaInterface::TABLE => 'tag',
                 SchemaInterface::PRIMARY_KEY => ['id', 'name'],
@@ -82,7 +85,9 @@ protected function setUp(): void
             ],
             TagContext::class => [
                 SchemaInterface::ROLE => 'tag_context',
-                SchemaInterface::MAPPER => Mapper::class,
+                SchemaInterface::MAPPER => [
+                    Mapper::class,
+                ],
                 SchemaInterface::DATABASE => 'default',
                 SchemaInterface::TABLE => 'tag_user_map',
                 SchemaInterface::COLUMNS => [],