Skip to content

Commit 042e410

Browse files
Merge branch '5.4' into 6.0
* 5.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 [ErrorHandler] Fix list of tentative return types Fix CS in Console Table after #45565 Suppress unhandled error in some specific use-cases. fix italian translation for validators
2 parents 082e563 + f7e29ec commit 042e410

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Command/DumpCompletionCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function configure()
4141
{
4242
$fullCommand = $_SERVER['PHP_SELF'];
4343
$commandName = basename($fullCommand);
44-
$fullCommand = realpath($fullCommand) ?: $fullCommand;
44+
$fullCommand = @realpath($fullCommand) ?: $fullCommand;
4545

4646
$this
4747
->setHelp(<<<EOH

Helper/Table.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -738,18 +738,18 @@ private function calculateColumnsWidth(iterable $groups)
738738
continue;
739739
}
740740

741-
foreach ($row as $i => $cell) {
742-
if ($cell instanceof TableCell) {
743-
$textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
744-
$textLength = Helper::width($textContent);
745-
if ($textLength > 0) {
746-
$contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
747-
foreach ($contentColumns as $position => $content) {
748-
$row[$i + $position] = $content;
741+
foreach ($row as $i => $cell) {
742+
if ($cell instanceof TableCell) {
743+
$textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
744+
$textLength = Helper::width($textContent);
745+
if ($textLength > 0) {
746+
$contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
747+
foreach ($contentColumns as $position => $content) {
748+
$row[$i + $position] = $content;
749+
}
749750
}
750751
}
751752
}
752-
}
753753

754754
$lengths[] = $this->getCellWidth($row, $column);
755755
}

0 commit comments

Comments
 (0)