Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit f7e29ecb38b7 · 2022-05-10T11:18:46.000+02:00
* 4.4:
  [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false
  [Serializer] Fix JsonSerializableNormalizer ignores circular reference handler in $context
  [Serializer][PropertyInfo] Fix support for "false" built-in type on PHP 8.2
  Fix CS in Console Table after #45565
  fix italian translation for validators
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -800,18 +800,18 @@ private function calculateColumnsWidth(iterable $groups)
                         continue;
                     }
 
-                foreach ($row as $i => $cell) {
-                    if ($cell instanceof TableCell) {
-                        $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
-                        $textLength = Helper::width($textContent);
-                        if ($textLength > 0) {
-                            $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
-                            foreach ($contentColumns as $position => $content) {
-                                $row[$i + $position] = $content;
+                    foreach ($row as $i => $cell) {
+                        if ($cell instanceof TableCell) {
+                            $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
+                            $textLength = Helper::width($textContent);
+                            if ($textLength > 0) {
+                                $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
+                                foreach ($contentColumns as $position => $content) {
+                                    $row[$i + $position] = $content;
+                                }
                             }
                         }
                     }
-                }
 
                     $lengths[] = $this->getCellWidth($row, $column);
                 }

Original file line number	Diff line number	Diff line change
`@@ -800,18 +800,18 @@ private function calculateColumnsWidth(iterable $groups)`
`800`	`800`	`continue;`
`801`	`801`	`}`
`802`	`802`
`803`		`- foreach ($row as $i => $cell) {`
`804`		`- if ($cell instanceof TableCell) {`
`805`		`- $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);`
`806`		`- $textLength = Helper::width($textContent);`
`807`		`- if ($textLength > 0) {`
`808`		`- $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));`
`809`		`- foreach ($contentColumns as $position => $content) {`
`810`		`- $row[$i + $position] = $content;`
	`803`	`+ foreach ($row as $i => $cell) {`
	`804`	`+ if ($cell instanceof TableCell) {`
	`805`	`+ $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);`
	`806`	`+ $textLength = Helper::width($textContent);`
	`807`	`+ if ($textLength > 0) {`
	`808`	`+ $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));`
	`809`	`+ foreach ($contentColumns as $position => $content) {`
	`810`	`+ $row[$i + $position] = $content;`
	`811`	`+ }`
`811`	`812`	`}`
`812`	`813`	`}`
`813`	`814`	`}`
`814`		`- }`
`815`	`815`
`816`	`816`	`$lengths[] = $this->getCellWidth($row, $column);`
`817`	`817`	`}`