Skip to content

Commit 3e0564f

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: Fix parameter order [DependencyInjection] Fix circular in DI with lazy + byContruct loop adjust Client::getProfile() typehint adjust KernelBrowser::getProfile() typehint fix: resolving pt translation issues Update VERSION for 3.4.47 Update CONTRIBUTORS for 3.4.47 Update CHANGELOG for 3.4.47 Add Romanian missing translations [DependencyInjection][Translator] Silent deprecation triggered by libxml_disable_entity_loader fix lexing strings containing escaped quotation characters prevent duplicated error message for file upload limits ignore the pattern attribute for textareas fix: solving pt-br translation issues
2 parents 130e1bf + 037b57a commit 3e0564f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Output/TrimmedBufferOutput.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class TrimmedBufferOutput extends Output
2525
private $buffer = '';
2626

2727
public function __construct(
28+
int $maxLength,
2829
?int $verbosity = self::VERBOSITY_NORMAL,
2930
bool $decorated = false,
30-
OutputFormatterInterface $formatter = null,
31-
int $maxLength
31+
OutputFormatterInterface $formatter = null
3232
) {
3333
if ($maxLength <= 0) {
3434
throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));

Style/SymfonyStyle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class SymfonyStyle extends OutputStyle
4646
public function __construct(InputInterface $input, OutputInterface $output)
4747
{
4848
$this->input = $input;
49-
$this->bufferedOutput = new TrimmedBufferOutput($output->getVerbosity(), false, clone $output->getFormatter(), \DIRECTORY_SEPARATOR === '\\' ? 4 : 2);
49+
$this->bufferedOutput = new TrimmedBufferOutput(\DIRECTORY_SEPARATOR === '\\' ? 4 : 2, $output->getVerbosity(), false, clone $output->getFormatter());
5050
// Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
5151
$width = (new Terminal())->getWidth() ?: self::MAX_LINE_LENGTH;
5252
$this->lineLength = min($width - (int) (\DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);

0 commit comments

Comments
 (0)