[Console] added TableCellStyle

khoptynskyi · khoptynskyi · commit dd70d46eadac · 2020-08-16T14:06:55.000+03:00
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -518,7 +518,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
         if ($cell instanceof TableCell && $cell->getStyle() instanceof TableCellStyle) {
             $isNotStyledByTag = !preg_match('/^<(\w+|(\w+=[\w,]+;?)*)>.+<\/(\w+|(\w+=\w+;?)*)?>$/', $cell);
             if ($isNotStyledByTag) {
-                if ($cell->hasCellFormat()) {
+                if ($cell->getStyle()->hasCellFormat()) {
                     $cellFormat = $cell->getStyle()->getCellFormat();
                 } else {
                     $tag = http_build_query($cell->getStyle()->getTagOptions(), null, ';');
@@ -535,7 +535,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
                 }
             }
 
-            if ($cell->hasAlign()) {
+            if ($cell->getStyle()->hasAlign()) {
                 $padType = $cell->getStyle()->getPadByAlign();
             }
         }
diff --git a/src/Symfony/Component/Console/Helper/TableCell.php b/src/Symfony/Component/Console/Helper/TableCell.php
@@ -75,20 +75,4 @@ public function getStyle(): ?TableCellStyle
     {
         return $this->options['style'];
     }
-
-    public function hasAlign(): bool
-    {
-        $style = $this->getStyle();
-
-        return $style instanceof TableCellStyle
-            && $style->hasAlign();
-    }
-
-    public function hasCellFormat(): bool
-    {
-        $style = $this->getStyle();
-
-        return $style instanceof TableCellStyle
-            && $style->getCellFormat();
-    }
 }
diff --git a/src/Symfony/Component/Console/Helper/TableCellStyle.php b/src/Symfony/Component/Console/Helper/TableCellStyle.php
@@ -89,16 +89,11 @@ public function getCellFormat(): ?string
 
     public function hasAlign(): bool
     {
-        $options = $this->getOptions();
-
-        return isset($options['align'])
-            && self::DEFAULT_ALIGN !== $options['align'];
+        return isset($this->getOptions()['align']) && self::DEFAULT_ALIGN !== $this->getOptions()['align'];
     }
 
     public function hasCellFormat(): bool
     {
-        $options = $this->getOptions();
-
-        return isset($options['cellFormat']) && \is_string($options['cellFormat']);
+        return isset($this->getOptions()['cellFormat']) && \is_string($this->getOptions()['cellFormat']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`518`	`518`	`if ($cell instanceof TableCell && $cell->getStyle() instanceof TableCellStyle) {`
`519`	`519`	`$isNotStyledByTag = !preg_match('/^<(\w+\|(\w+=[\w,]+;?))>.+<\/(\w+\|(\w+=\w+;?))?>$/', $cell);`
`520`	`520`	`if ($isNotStyledByTag) {`
`521`		`- if ($cell->hasCellFormat()) {`
	`521`	`+ if ($cell->getStyle()->hasCellFormat()) {`
`522`	`522`	`$cellFormat = $cell->getStyle()->getCellFormat();`
`523`	`523`	`} else {`
`524`	`524`	`$tag = http_build_query($cell->getStyle()->getTagOptions(), null, ';');`
`@@ -535,7 +535,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`- if ($cell->hasAlign()) {`
	`538`	`+ if ($cell->getStyle()->hasAlign()) {`
`539`	`539`	`$padType = $cell->getStyle()->getPadByAlign();`
`540`	`540`	`}`
`541`	`541`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,16 +89,11 @@ public function getCellFormat(): ?string`
`89`	`89`
`90`	`90`	`public function hasAlign(): bool`
`91`	`91`	`{`
`92`		`- $options = $this->getOptions();`
`93`		`-`
`94`		`- return isset($options['align'])`
`95`		`- && self::DEFAULT_ALIGN !== $options['align'];`
	`92`	`+ return isset($this->getOptions()['align']) && self::DEFAULT_ALIGN !== $this->getOptions()['align'];`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`public function hasCellFormat(): bool`
`99`	`96`	`{`
`100`		`- $options = $this->getOptions();`
`101`		`-`
`102`		`- return isset($options['cellFormat']) && \is_string($options['cellFormat']);`
	`97`	`+ return isset($this->getOptions()['cellFormat']) && \is_string($this->getOptions()['cellFormat']);`
`103`	`98`	`}`
`104`	`99`	`}`