symfony · fabpot · Jun 20, 2016 · Jun 20, 2016
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
@@ -2,10 +2,10 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has single blank line at start when using block element
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->caution('Lorem ipsum dolor sit amet');
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has single blank line between titles and blocks
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->title('Title');
     $output->warning('Lorem ipsum dolor sit amet');
     $output->title('Title');

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure that all lines are aligned to the begin of the first line in a very long line block
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->block(
         'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
         'CUSTOM',

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 // ensure long words are properly wrapped in blocks
 return function (InputInterface $input, OutputInterface $output) {
     $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
-    $sfStyle = new SymfonyStyleWithForcedLineLength($input, $output);
+    $sfStyle = new SymfonyStyle($input, $output);
     $sfStyle->block($word, 'CUSTOM', 'fg=white;bg=blue', ' § ', false);
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_12.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 // ensure that all lines are aligned to the begin of the first one and start with '//' in a very long line comment
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->comment(
         'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum'
     );

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has single blank line between blocks
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->warning('Warning');
     $output->caution('Caution');
     $output->error('Error');

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has single blank line between two titles
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->title('First title');
     $output->title('Second title');
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has single blank line after any text and a title
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
 
     $output->write('Lorem ipsum dolor sit amet');
     $output->title('First title');

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has proper line ending before outputing a text block like with SymfonyStyle::listing() or SymfonyStyle::text()
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
 
     $output->writeln('Lorem ipsum dolor sit amet');
     $output->listing(array(

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure has proper blank line after text block when using a block like with SymfonyStyle::success
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
 
     $output->listing(array(
         'Lorem ipsum dolor sit amet',

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure questions do not output anything when input is non-interactive
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->title('Title');
     $output->askHidden('Hidden question');
     $output->choice('Choice question with default', array('choice1', 'choice2'), 'choice1');

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
@@ -2,7 +2,7 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Helper\TableCell;
 
 //Ensure formatting tables when using multiple headers with TableCell
@@ -21,6 +21,6 @@
         array('978-0804169127', 'Divine Comedy'),
     );
 
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->table($headers, $rows);
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
@@ -2,10 +2,10 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure that all lines are aligned to the begin of the first line in a multi-line block
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $output->block(array('Custom block', 'Second custom block line'), 'CUSTOM', 'fg=white;bg=green', 'X ', true);
 };
diff --git a/...ony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php b/...ony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
@@ -2,11 +2,11 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 //Ensure that questions have the expected outputs
 return function (InputInterface $input, OutputInterface $output) {
-    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output = new SymfonyStyle($input, $output);
     $stream = fopen('php://memory', 'r+', false);
 
     fputs($stream, "Foo\nBar\nBaz");

diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -13,8 +13,6 @@
 
 use PHPUnit_Framework_TestCase;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -27,6 +25,7 @@ class SymfonyStyleTest extends PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        putenv('COLUMNS=121');
         $this->command = new Command('sfstyle');
         $this->tester = new CommandTester($this->command);
     }
@@ -73,19 +72,3 @@ public function inputCommandToOutputFilesProvider()
         return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
     }
 }
-
-/**
- * Use this class in tests to force the line length
- * and ensure a consistent output for expectations.
- */
-class SymfonyStyleWithForcedLineLength extends SymfonyStyle
-{
-    public function __construct(InputInterface $input, OutputInterface $output)
-    {
-        parent::__construct($input, $output);
-
-        $ref = new \ReflectionProperty(get_parent_class($this), 'lineLength');
-        $ref->setAccessible(true);
-        $ref->setValue($this, 120);
-    }
-}