Skip to content

Commit efb04c6

Browse files
Merge branch '6.0' into 6.1
* 6.0: [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 068ba60 + 042e410 commit efb04c6

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
@@ -43,7 +43,7 @@ protected function configure()
4343
{
4444
$fullCommand = $_SERVER['PHP_SELF'];
4545
$commandName = basename($fullCommand);
46-
$fullCommand = realpath($fullCommand) ?: $fullCommand;
46+
$fullCommand = @realpath($fullCommand) ?: $fullCommand;
4747

4848
$shell = $this->guessShell();
4949
[$rcFile, $completionFile] = match ($shell) {

Helper/Table.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -790,18 +790,18 @@ private function calculateColumnsWidth(iterable $groups)
790790
continue;
791791
}
792792

793-
foreach ($row as $i => $cell) {
794-
if ($cell instanceof TableCell) {
795-
$textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
796-
$textLength = Helper::width($textContent);
797-
if ($textLength > 0) {
798-
$contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
799-
foreach ($contentColumns as $position => $content) {
800-
$row[$i + $position] = $content;
793+
foreach ($row as $i => $cell) {
794+
if ($cell instanceof TableCell) {
795+
$textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
796+
$textLength = Helper::width($textContent);
797+
if ($textLength > 0) {
798+
$contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
799+
foreach ($contentColumns as $position => $content) {
800+
$row[$i + $position] = $content;
801+
}
801802
}
802803
}
803804
}
804-
}
805805

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

0 commit comments

Comments
 (0)