Skip to content

Commit 14290bc

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.3' into 6.4
* 6.3: [AssetMapper] Fixing bug where a circular exception could be thrown while making error message Dump Valid constaints on debug command #46544 [DependencyInjection] fix dump xml with array/object/enum default value [HttpFoundation] Add a slightly more verbose comment about a warning on UploadedFile [Messenger] BatchHandlerTrait - fix phpdoc typo [SecurityBundle] Remove unused test files Allow passing an `inline_service` to a `service_locator` [Security] Fix error with lock_factory in login_throttling fix(console): fix section output when multiples section with max height Remove me from CODEOWNERS Fix invalid method call + improve exception message Always return bool from messenger amqp conncetion nack [FrameworkBundle] Fix xsd handle-all-throwables [Console] Fix linewraps in OutputFormatter
2 parents 43de2e4 + baad2fa commit 14290bc

File tree

5 files changed

+94
-46
lines changed

5 files changed

+94
-46
lines changed

‎Formatter/OutputFormatter.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
use Symfony\Component\Console\Exception\InvalidArgumentException;
1515

16+
use function Symfony\Component\String\b;
17+
1618
/**
1719
* Formatter class for console output.
1820
*
@@ -241,7 +243,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
241243
}
242244

243245
preg_match('~(\\n)$~', $text, $matches);
244-
$text = $prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~', "\$1\n", $text);
246+
$text = $prefix.$this->addLineBreaks($text, $width);
245247
$text = rtrim($text, "\n").($matches[1] ?? '');
246248

247249
if (!$currentLineLength && '' !== $current && !str_ends_with($current, "\n")) {
@@ -265,4 +267,11 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
265267

266268
return implode("\n", $lines);
267269
}
270+
271+
private function addLineBreaks(string $text, int $width): string
272+
{
273+
$encoding = mb_detect_encoding($text, null, true) ?: 'UTF-8';
274+
275+
return b($text)->toCodePointString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);
276+
}
268277
}

‎Output/ConsoleSectionOutput.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public function __construct($stream, array &$sections, int $verbosity, bool $dec
4848
public function setMaxHeight(int $maxHeight): void
4949
{
5050
// when changing max height, clear output of current section and redraw again with the new height
51-
$existingContent = $this->popStreamContentUntilCurrentSection($this->maxHeight ? min($this->maxHeight, $this->lines) : $this->lines);
52-
51+
$previousMaxHeight = $this->maxHeight;
5352
$this->maxHeight = $maxHeight;
53+
$existingContent = $this->popStreamContentUntilCurrentSection($previousMaxHeight ? min($previousMaxHeight, $this->lines) : $this->lines);
5454

5555
parent::doWrite($this->getVisibleContent(), false);
5656
parent::doWrite($existingContent, false);
@@ -213,7 +213,7 @@ private function popStreamContentUntilCurrentSection(int $numberOfLinesToClearFr
213213
break;
214214
}
215215

216-
$numberOfLinesToClear += $section->lines;
216+
$numberOfLinesToClear += $section->maxHeight ? min($section->lines, $section->maxHeight) : $section->lines;
217217
if ('' !== $sectionContent = $section->getVisibleContent()) {
218218
if (!str_ends_with($sectionContent, \PHP_EOL)) {
219219
$sectionContent .= \PHP_EOL;

‎Tests/Formatter/OutputFormatterTest.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,21 +358,23 @@ public function testFormatAndWrap()
358358
$formatter = new OutputFormatter(true);
359359

360360
$this->assertSame("fo\no\e[37;41mb\e[39;49m\n\e[37;41mar\e[39;49m\nba\nz", $formatter->formatAndWrap('foo<error>bar</error> baz', 2));
361-
$this->assertSame("pr\ne \e[37;41m\e[39;49m\n\e[37;41mfo\e[39;49m\n\e[37;41mo \e[39;49m\n\e[37;41mba\e[39;49m\n\e[37;41mr \e[39;49m\n\e[37;41mba\e[39;49m\n\e[37;41mz\e[39;49m \npo\nst", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 2));
361+
$this->assertSame("pr\ne \e[37;41m\e[39;49m\n\e[37;41mfo\e[39;49m\n\e[37;41mo\e[39;49m\n\e[37;41mba\e[39;49m\n\e[37;41mr\e[39;49m\n\e[37;41mba\e[39;49m\n\e[37;41mz\e[39;49m \npo\nst", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 2));
362362
$this->assertSame("pre\e[37;41m\e[39;49m\n\e[37;41mfoo\e[39;49m\n\e[37;41mbar\e[39;49m\n\e[37;41mbaz\e[39;49m\npos\nt", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 3));
363-
$this->assertSame("pre \e[37;41m\e[39;49m\n\e[37;41mfoo \e[39;49m\n\e[37;41mbar \e[39;49m\n\e[37;41mbaz\e[39;49m \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
364-
$this->assertSame("pre \e[37;41mf\e[39;49m\n\e[37;41moo ba\e[39;49m\n\e[37;41mr baz\e[39;49m\npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
363+
$this->assertSame("pre \e[37;41m\e[39;49m\n\e[37;41mfoo\e[39;49m\n\e[37;41mbar\e[39;49m\n\e[37;41mbaz\e[39;49m \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
364+
$this->assertSame("pre \e[37;41mf\e[39;49m\n\e[37;41moo\e[39;49m\n\e[37;41mbar\e[39;49m\n\e[37;41mbaz\e[39;49m p\nost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
365365
$this->assertSame("Lore\nm \e[37;41mip\e[39;49m\n\e[37;41msum\e[39;49m \ndolo\nr \e[32msi\e[39m\n\e[32mt\e[39m am\net", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info> amet', 4));
366366
$this->assertSame("Lorem \e[37;41mip\e[39;49m\n\e[37;41msum\e[39;49m dolo\nr \e[32msit\e[39m am\net", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info> amet', 8));
367367
$this->assertSame("Lorem \e[37;41mipsum\e[39;49m dolor \e[32m\e[39m\n\e[32msit\e[39m, \e[37;41mamet\e[39;49m et \e[32mlauda\e[39m\n\e[32mntium\e[39m architecto", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info>, <error>amet</error> et <info>laudantium</info> architecto', 18));
368368

369369
$formatter = new OutputFormatter();
370370

371371
$this->assertSame("fo\nob\nar\nba\nz", $formatter->formatAndWrap('foo<error>bar</error> baz', 2));
372-
$this->assertSame("pr\ne \nfo\no \nba\nr \nba\nz \npo\nst", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 2));
372+
$this->assertSame("pr\ne \nfo\no\nba\nr\nba\nz \npo\nst", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 2));
373373
$this->assertSame("pre\nfoo\nbar\nbaz\npos\nt", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 3));
374-
$this->assertSame("pre \nfoo \nbar \nbaz \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
375-
$this->assertSame("pre f\noo ba\nr baz\npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
374+
$this->assertSame("pre \nfoo\nbar\nbaz \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
375+
$this->assertSame("pre f\noo\nbar\nbaz p\nost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
376+
$this->assertSame("Â rèälly\nlöng tîtlè\nthät cöüld\nnèêd\nmúltîplê\nlínès", $formatter->formatAndWrap('Â rèälly löng tîtlè thät cöüld nèêd múltîplê línès', 10));
377+
$this->assertSame("Â rèälly\nlöng tîtlè\nthät cöüld\nnèêd\nmúltîplê\n línès", $formatter->formatAndWrap("Â rèälly löng tîtlè thät cöüld nèêd múltîplê\n línès", 10));
376378
$this->assertSame('', $formatter->formatAndWrap(null, 5));
377379
}
378380
}

‎Tests/Helper/TableTest.php‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -118,30 +118,30 @@ public static function renderProvider()
118118
['ISBN', 'Title', 'Author'],
119119
$books,
120120
'compact',
121-
<<<'TABLE'
122-
ISBN Title Author
123-
99921-58-10-7 Divine Comedy Dante Alighieri
124-
9971-5-0210-0 A Tale of Two Cities Charles Dickens
125-
960-425-059-0 The Lord of the Rings J. R. R. Tolkien
126-
80-902734-1-6 And Then There Were None Agatha Christie
127-
128-
TABLE
121+
implode("\n", [
122+
'ISBN Title Author ',
123+
'99921-58-10-7 Divine Comedy Dante Alighieri ',
124+
'9971-5-0210-0 A Tale of Two Cities Charles Dickens ',
125+
'960-425-059-0 The Lord of the Rings J. R. R. Tolkien ',
126+
'80-902734-1-6 And Then There Were None Agatha Christie ',
127+
'',
128+
]),
129129
],
130130
[
131131
['ISBN', 'Title', 'Author'],
132132
$books,
133133
'borderless',
134-
<<<'TABLE'
135-
=============== ========================== ==================
136-
ISBN Title Author
137-
=============== ========================== ==================
138-
99921-58-10-7 Divine Comedy Dante Alighieri
139-
9971-5-0210-0 A Tale of Two Cities Charles Dickens
140-
960-425-059-0 The Lord of the Rings J. R. R. Tolkien
141-
80-902734-1-6 And Then There Were None Agatha Christie
142-
=============== ========================== ==================
143-
144-
TABLE
134+
implode("\n", [
135+
' =============== ========================== ================== ',
136+
' ISBN Title Author ',
137+
' =============== ========================== ================== ',
138+
' 99921-58-10-7 Divine Comedy Dante Alighieri ',
139+
' 9971-5-0210-0 A Tale of Two Cities Charles Dickens ',
140+
' 960-425-059-0 The Lord of the Rings J. R. R. Tolkien ',
141+
' 80-902734-1-6 And Then There Were None Agatha Christie ',
142+
' =============== ========================== ================== ',
143+
'',
144+
]),
145145
],
146146
[
147147
['ISBN', 'Title', 'Author'],
@@ -1378,12 +1378,14 @@ public function testColumnMaxWidths()
13781378

13791379
$expected =
13801380
<<<TABLE
1381-
+---------------+-------+------------+-----------------+
1382-
| Divine Comedy | A Tal | The Lord o | And Then There |
1383-
| | e of | f the Ring | Were None |
1384-
| | Two C | s | |
1385-
| | ities | | |
1386-
+---------------+-------+------------+-----------------+
1381+
+---------------+-------+----------+----------------+
1382+
| Divine Comedy | A | The Lord | And Then There |
1383+
| | Tale | of the | Were None |
1384+
| | of | Rings | |
1385+
| | Two | | |
1386+
| | Citie | | |
1387+
| | s | | |
1388+
+---------------+-------+----------+----------------+
13871389
13881390
TABLE;
13891391

@@ -1416,8 +1418,8 @@ public function testColumnMaxWidthsHeaders()
14161418
| Publication | Very long header with a lot of |
14171419
| | information |
14181420
+-------------+--------------------------------+
1419-
| 1954 | The Lord of the Rings, by J.R. |
1420-
| | R. Tolkien |
1421+
| 1954 | The Lord of the Rings, by |
1422+
| | J.R.R. Tolkien |
14211423
+-------------+--------------------------------+
14221424
14231425
TABLE;
@@ -1577,22 +1579,22 @@ public function testWithColspanAndMaxWith()
15771579
| Lorem ipsum dolor sit amet, consectetur adipi |
15781580
| scing elit, sed do eiusmod tempor |
15791581
+-----------------+-----------------+-----------------+
1580-
| Lorem ipsum dolor sit amet, consectetur adipi |
1581-
| scing elit, sed do eiusmod tempor |
1582+
| Lorem ipsum dolor sit amet, consectetur |
1583+
| adipiscing elit, sed do eiusmod tempor |
15821584
+-----------------+-----------------+-----------------+
15831585
| Lorem ipsum dolor sit amet, co | hello world |
15841586
| nsectetur | |
15851587
+-----------------+-----------------+-----------------+
15861588
| hello world | Lorem ipsum dolor sit amet, co |
15871589
| | nsectetur adipiscing elit |
15881590
+-----------------+-----------------+-----------------+
1589-
| hello | world | Lorem ipsum dol |
1590-
| | | or sit amet, co |
1591-
| | | nsectetur |
1591+
| hello | world | Lorem ipsum |
1592+
| | | dolor sit amet, |
1593+
| | | consectetur |
15921594
+-----------------+-----------------+-----------------+
15931595
| Symfony | Test | Lorem ipsum dol |
1594-
| | | or sit amet, co |
1595-
| | | nsectetur |
1596+
| | | or sit amet, |
1597+
| | | consectetur |
15961598
+-----------------+-----------------+-----------------+
15971599
15981600
TABLE;
@@ -1984,8 +1986,9 @@ public function testWithHyperlinkAndMaxWidth()
19841986
$expected =
19851987
<<<TABLE
19861988
+----------------------+
1987-
| \033]8;;Lorem\033\\Lorem ipsum dolor si\033]8;;\033\\ |
1988-
| \033]8;;Lorem\033\\t amet, consectetur \033]8;;\033\\ |
1989+
| \033]8;;Lorem\033\\Lorem ipsum dolor\033]8;;\033\\ |
1990+
| \033]8;;Lorem\033\\sit amet,\033]8;;\033\\ |
1991+
| \033]8;;Lorem\033\\consectetur\033]8;;\033\\ |
19891992
| \033]8;;Lorem\033\\adipiscing elit, sed\033]8;;\033\\ |
19901993
| \033]8;;Lorem\033\\do eiusmod tempor\033]8;;\033\\ |
19911994
+----------------------+

‎Tests/Output/ConsoleSectionOutputTest.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,40 @@ public function testMaxHeight()
134134
$this->assertEquals($expected, stream_get_contents($output->getStream()));
135135
}
136136

137+
public function testMaxHeightMultipleSections()
138+
{
139+
$expected = '';
140+
$sections = [];
141+
142+
$firstSection = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
143+
$firstSection->setMaxHeight(3);
144+
145+
$secondSection = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
146+
$secondSection->setMaxHeight(3);
147+
148+
// fill the first section
149+
$firstSection->writeln(['One', 'Two', 'Three']);
150+
$expected .= 'One'.\PHP_EOL.'Two'.\PHP_EOL.'Three'.\PHP_EOL;
151+
152+
// fill the second section
153+
$secondSection->writeln(['One', 'Two', 'Three']);
154+
$expected .= 'One'.\PHP_EOL.'Two'.\PHP_EOL.'Three'.\PHP_EOL;
155+
156+
// cause overflow of second section (redraw whole section, without first line)
157+
$secondSection->writeln('Four');
158+
$expected .= "\x1b[3A\x1b[0J";
159+
$expected .= 'Two'.\PHP_EOL.'Three'.\PHP_EOL.'Four'.\PHP_EOL;
160+
161+
// cause overflow of first section (redraw whole section, without first line)
162+
$firstSection->writeln("Four\nFive\nSix");
163+
$expected .= "\x1b[6A\x1b[0J";
164+
$expected .= 'Four'.\PHP_EOL.'Five'.\PHP_EOL.'Six'.\PHP_EOL;
165+
$expected .= 'Two'.\PHP_EOL.'Three'.\PHP_EOL.'Four'.\PHP_EOL;
166+
167+
rewind($this->stream);
168+
$this->assertEquals(escapeshellcmd($expected), escapeshellcmd(stream_get_contents($this->stream)));
169+
}
170+
137171
public function testMaxHeightWithoutNewLine()
138172
{
139173
$expected = '';

0 commit comments

Comments
 (0)