Skip to content

Commit

Permalink
Merge branch '4.4' into 5.1
Browse files Browse the repository at this point in the history
* 4.4:
  Fix parameter order
  [DependencyInjection] Fix circular in DI with lazy + byContruct loop
  adjust Client::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
  • Loading branch information
derrabus committed Nov 28, 2020
2 parents e5e1476 + c8e37f6 commit 037b57a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Output/TrimmedBufferOutput.php
Expand Up @@ -25,10 +25,10 @@ class TrimmedBufferOutput extends Output
private $buffer = '';

public function __construct(
int $maxLength,
?int $verbosity = self::VERBOSITY_NORMAL,
bool $decorated = false,
OutputFormatterInterface $formatter = null,
int $maxLength
OutputFormatterInterface $formatter = null
) {
if ($maxLength <= 0) {
throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
Expand Down
2 changes: 1 addition & 1 deletion Style/SymfonyStyle.php
Expand Up @@ -46,7 +46,7 @@ class SymfonyStyle extends OutputStyle
public function __construct(InputInterface $input, OutputInterface $output)
{
$this->input = $input;
$this->bufferedOutput = new TrimmedBufferOutput($output->getVerbosity(), false, clone $output->getFormatter(), \DIRECTORY_SEPARATOR === '\\' ? 4 : 2);
$this->bufferedOutput = new TrimmedBufferOutput(\DIRECTORY_SEPARATOR === '\\' ? 4 : 2, $output->getVerbosity(), false, clone $output->getFormatter());
// Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
$width = (new Terminal())->getWidth() ?: self::MAX_LINE_LENGTH;
$this->lineLength = min($width - (int) (\DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
Expand Down

0 comments on commit 037b57a

Please sign in to comment.