refactor: fix dependency on test execution order (#10014)

* refactor: fix dependency on test execution order

* reset in SignalTest

Author: michalsn

system/CLI/CLI.php

@@ -1136,7 +1136,7 @@ public static function reset(): void
         static::$initialized = false;
         static::$segments    = [];
         static::$options     = [];
-        static::$lastWrite   = 'write';
+        static::$lastWrite   = null;
         static::$height      = null;
         static::$width       = null;
         static::$isColored   = static::hasColorSupport(STDOUT);

tests/system/CLI/CLITest.php

@@ -347,23 +347,23 @@ public function testWriteForeground(): void
     {
         CLI::write('test', 'red');
 
-        $expected = "\033[0;31mtest\033[0m" . PHP_EOL;
+        $expected = PHP_EOL . "\033[0;31mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
     public function testWriteForegroundWithColorBefore(): void
     {
         CLI::write(CLI::color('green', 'green') . ' red', 'red');
 
-        $expected = "\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
+        $expected = PHP_EOL . "\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
     public function testWriteForegroundWithColorAfter(): void
     {
         CLI::write('red ' . CLI::color('green', 'green'), 'red');
 
-        $expected = "\033[0;31mred \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
+        $expected = PHP_EOL . "\033[0;31mred \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
@@ -377,15 +377,15 @@ public function testWriteForegroundWithColorTwice(): void
             'red',
         );
 
-        $expected = "\033[0;32mgreen\033[0m\033[0;31m red \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
+        $expected = PHP_EOL . "\033[0;32mgreen\033[0m\033[0;31m red \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
     public function testWriteBackground(): void
     {
         CLI::write('test', 'red', 'green');
 
-        $expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
+        $expected = PHP_EOL . "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
@@ -427,7 +427,7 @@ public function testShowProgress(): void
         CLI::write('third.');
         CLI::showProgress(1, 20);
 
-        $expected = 'first.' . PHP_EOL .
+        $expected = PHP_EOL . 'first.' . PHP_EOL .
                     "[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL .
                     "\033[1A[\033[32m#####.....\033[0m]  50% Complete" . PHP_EOL .
                     "\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
@@ -447,7 +447,7 @@ public function testShowProgressWithoutBar(): void
         CLI::showProgress(false, 20);
         CLI::showProgress(false, 20);
 
-        $expected = 'first.' . PHP_EOL . "\007\007\007";
+        $expected = PHP_EOL . 'first.' . PHP_EOL . "\007\007\007";
         $this->assertSame($expected, $this->getStreamFilterBuffer());
     }
 
@@ -620,13 +620,15 @@ public static function provideTable(): iterable
             [
                 $oneRow,
                 [],
+                PHP_EOL .
                 '+---+-----+' . PHP_EOL .
                 '| 1 | bar |' . PHP_EOL .
                 '+---+-----+' . PHP_EOL . PHP_EOL,
             ],
             [
                 $oneRow,
                 $head,
+                PHP_EOL .
                 '+----+-------+' . PHP_EOL .
                 '| ID | Title |' . PHP_EOL .
                 '+----+-------+' . PHP_EOL .
@@ -636,6 +638,7 @@ public static function provideTable(): iterable
             [
                 $manyRows,
                 [],
+                PHP_EOL .
                 '+---+-----------------+' . PHP_EOL .
                 '| 1 | bar             |' . PHP_EOL .
                 '| 2 | bar * 2         |' . PHP_EOL .
@@ -645,6 +648,7 @@ public static function provideTable(): iterable
             [
                 $manyRows,
                 $head,
+                PHP_EOL .
                 '+----+-----------------+' . PHP_EOL .
                 '| ID | Title           |' . PHP_EOL .
                 '+----+-----------------+' . PHP_EOL .
@@ -665,6 +669,7 @@ public static function provideTable(): iterable
                     'ID',
                     'タイトル',
                 ],
+                PHP_EOL .
                 '+------+----------+' . PHP_EOL .
                 '| ID   | タイトル |' . PHP_EOL .
                 '+------+----------+' . PHP_EOL .

tests/system/CLI/SignalTest.php

@@ -53,6 +53,13 @@ protected function setUp(): void
         $this->command = new SignalCommand($this->logger, service('commands'));
     }
 
+    protected function tearDown(): void
+    {
+        CLI::reset();
+
+        parent::tearDown();
+    }
+
     public function testSignalRegistration(): void
     {
         $this->command->testRegisterSignals([SIGTERM, SIGINT], [SIGTERM => 'customTermHandler']);