minor #39209 [Console] Fix parameter order (jderusse)

derrabus · derrabus · commit fe36f35d9b55 · 2020-11-28T11:52:00.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Fix parameter order | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39208 | License | MIT | Doc PR | - Commits ------- 726f361 Fix parameter order
diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
@@ -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));
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class SymfonyStyle extends OutputStyle`
`46`	`46`	`public function __construct(InputInterface $input, OutputInterface $output)`
`47`	`47`	`{`
`48`	`48`	`$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());`
`50`	`50`	`// Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.`
`51`	`51`	`$width = (new Terminal())->getWidth() ?: self::MAX_LINE_LENGTH;`
`52`	`52`	`$this->lineLength = min($width - (int) (\DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);`