Improving code coverage

Author: moufmouf

src/TdbmFluidColumnJsonOptions.php

@@ -14,30 +14,10 @@ class TdbmFluidColumnJsonOptions
      * @var TdbmFluidColumnOptions
      */
     private $tdbmFluidColumnOptions;
-    /**
-     * @var string
-     */
-    private $name;
-    /**
-     * @var string
-     */
-    private $outputType;
-    /**
-     * @var FluidColumn
-     */
-    private $fluidColumn;
 
-    public function __construct(TdbmFluidColumnOptions $tdbmFluidColumnOptions, FluidColumn $fluidColumn)
+    public function __construct(TdbmFluidColumnOptions $tdbmFluidColumnOptions)
     {
         $this->tdbmFluidColumnOptions = $tdbmFluidColumnOptions;
-        $this->fluidColumn = $fluidColumn;
-    }
-
-    private function getComment(): Comment
-    {
-        $comment = $this->fluidColumn->getDbalColumn()->getComment();
-
-        return new Comment($comment ?? '');
     }
 
     public function key(string $name): self
@@ -131,12 +111,6 @@ public function addAnnotation(string $annotation, $content = null, bool $replace
         return $this;
     }
 
-    public function removeAnnotation(string $annotation): self
-    {
-        $this->tdbmFluidColumnOptions->removeAnnotation($annotation);
-        return $this;
-    }
-
     public function endJsonSerialize(): TdbmFluidColumnOptions
     {
         return $this->tdbmFluidColumnOptions;

src/TdbmFluidColumnOptions.php

@@ -110,7 +110,7 @@ public function graphqlField(): TdbmFluidColumnGraphqlOptions
 
     public function jsonSerialize(): TdbmFluidColumnJsonOptions
     {
-        return new TdbmFluidColumnJsonOptions($this, $this->fluidColumn);
+        return new TdbmFluidColumnJsonOptions($this);
     }
 
     public function protectedGetter(): self

tests/TdbmFluidJunctionTableJsonOptionsTest.php

@@ -27,19 +27,27 @@ public function testJson()
             ->column('another_parent')->references('nodes')->comment('@JsonCollection("entries") @JsonFormat(property="entry")');
 
         $nodesTable = $schema->getTable('nodes');
-        $this->assertContains("@JsonIgnore", $nodesTable->getColumn('id')->getComment());
-        $this->assertContains("@JsonRecursive", $nodesTable->getColumn('alias_id')->getComment());
-        $this->assertContains("@JsonInclude", $nodesTable->getColumn('parent_id')->getComment());
-        $this->assertContains("@JsonIgnore", $nodesTable->getColumn('root_id')->getComment());
+        $this->assertContains('@JsonIgnore', $nodesTable->getColumn('id')->getComment());
+        $this->assertContains('@JsonRecursive', $nodesTable->getColumn('alias_id')->getComment());
+        $this->assertContains('@JsonInclude', $nodesTable->getColumn('parent_id')->getComment());
+        $this->assertContains('@JsonIgnore', $nodesTable->getColumn('root_id')->getComment());
         $this->assertContains('@JsonFormat(property = "name")', $nodesTable->getColumn('owner_id')->getComment());
         $this->assertContains('@JsonFormat(method = "myMethod")', $nodesTable->getColumn('owner_country')->getComment());
-        $this->assertContains("@JsonKey(key = \"basename\")", $nodesTable->getColumn('name')->getComment());
-        $this->assertContains("@JsonFormat(unit = \" o\")", $nodesTable->getColumn('size')->getComment());
-        $this->assertContains("@JsonFormat(decimals = 2, point = \",\", separator = \".\", unit = \"g\")", $nodesTable->getColumn('weight')->getComment());
-        $this->assertContains("@JsonFormat(date = \"Y-m-d\")", $nodesTable->getColumn('created_at')->getComment());
-        $this->assertContains("@JsonCollection(\"entries\")", $nodesTable->getColumn('another_parent')->getComment());
+        $this->assertContains('@JsonKey(key = "basename")', $nodesTable->getColumn('name')->getComment());
+        $this->assertContains('@JsonFormat(unit = " o")', $nodesTable->getColumn('size')->getComment());
+        $this->assertContains('@JsonFormat(decimals = 2, point = ",", separator = ".", unit = "g")', $nodesTable->getColumn('weight')->getComment());
+        $this->assertContains('@JsonFormat(date = "Y-m-d")', $nodesTable->getColumn('created_at')->getComment());
+        $this->assertContains('@JsonCollection("entries")', $nodesTable->getColumn('another_parent')->getComment());
+
+        $fluid->table('node_entries')
+            ->column('id')->integer()->primaryKey()->autoIncrement()
+            ->column('node_id')->references('nodes')->jsonSerialize()->collection("entries")
+            ->column('entry')->string()->null();
+
+        $this->assertContains('@JsonCollection(key = "entries")', $schema->getTable('node_entries')->getColumn('node_id')->getComment());
 
         $anotherColumn = $fluid->table('nodes')->column('another_column')->integer();
         $this->assertSame($anotherColumn, $anotherColumn->jsonSerialize()->endJsonSerialize());
+        $this->assertSame($fluid->table('nodes'), $anotherColumn->jsonSerialize()->then());
     }
 }