Try

VincentLanglet · Feb 19, 2024 · 2047b7b · 2047b7b
1 parent a754fca
commit 2047b7b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/src/Report/Reporter/TextReporter.php b/src/Report/Reporter/TextReporter.php
@@ -75,7 +75,7 @@ public function display(
                 $messageLevel = Violation::getLevelAsString($violation->getLevel());
                 $rows[] = [
                     new TableCell(sprintf('<comment>%s</comment>', $messageLevel)),
-                    implode("\n", $formattedText),
+                    implode(\PHP_EOL, $formattedText),
                 ];
             }
 

diff --git a/tests/BCLayer.php b/tests/BCLayer.php
@@ -10,12 +10,12 @@ final class BCLayer
 {
     public static function assertStringContainsStringIgnoringLineEndings(string $needle, string $haystack, string $message = ''): void
     {
-//        // @phpstan-ignore-next-line
-//        if (method_exists(Assert::class, 'assertStringContainsStringIgnoringLineEndings')) {
-//            Assert::assertStringContainsStringIgnoringLineEndings($needle, $haystack, $message);
-//
-//            return;
-//        }
+        //        // @phpstan-ignore-next-line
+        //        if (method_exists(Assert::class, 'assertStringContainsStringIgnoringLineEndings')) {
+        //            Assert::assertStringContainsStringIgnoringLineEndings($needle, $haystack, $message);
+        //
+        //            return;
+        //        }
 
         $needle = strtr($needle, ["\r\n" => "\n", "\r" => "\n"]);
         $haystack = strtr($haystack, ["\r\n" => "\n", "\r" => "\n"]);

diff --git a/tests/Report/Reporter/CheckstyleReporterTest.php b/tests/Report/Reporter/CheckstyleReporterTest.php
@@ -11,7 +11,6 @@
 use TwigCsFixer\Report\Reporter\CheckstyleReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\BCLayer;
 
 final class CheckstyleReporterTest extends TestCase
 {
@@ -83,7 +82,7 @@ public function testDisplayErrors(string $expected, ?string $level, bool $debug)
         $textFormatter->display($output, $report, $level, $debug);
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings($expected, $text);
+        static::assertSame($expected, rtrim($text));
     }
 
     /**

diff --git a/tests/Report/Reporter/GithubReporterTest.php b/tests/Report/Reporter/GithubReporterTest.php
@@ -11,7 +11,6 @@
 use TwigCsFixer\Report\Reporter\GithubReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\BCLayer;
 
 final class GithubReporterTest extends TestCase
 {
@@ -63,7 +62,7 @@ public function testDisplayErrors(string $expected, ?string $level, bool $debug)
         $textFormatter->display($output, $report, $level, $debug);
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings(str_replace("\n", \PHP_EOL, $expected), $text);
+        static::assertSame($expected, rtrim($text));
     }
 
     /**

diff --git a/tests/Report/Reporter/JUnitReporterTest.php b/tests/Report/Reporter/JUnitReporterTest.php
@@ -11,7 +11,6 @@
 use TwigCsFixer\Report\Reporter\JUnitReporter;
 use TwigCsFixer\Report\Violation;
 use TwigCsFixer\Report\ViolationId;
-use TwigCsFixer\Tests\BCLayer;
 
 final class JUnitReporterTest extends TestCase
 {
@@ -83,7 +82,7 @@ public function testDisplayErrors(string $expected, ?string $level, bool $debug)
         $textFormatter->display($output, $report, $level, $debug);
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings($expected, $text);
+        static::assertSame($expected, rtrim($text));
     }
 
     /**
@@ -187,6 +186,6 @@ public function testDisplaySuccess(): void
             EOD;
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings($expected, $text);
+        static::assertSame($expected, rtrim($text));
     }
 }
diff --git a/tests/Report/Reporter/TextReporterTest.php b/tests/Report/Reporter/TextReporterTest.php
@@ -63,7 +63,7 @@ public function testDisplayErrors(string $expected, ?string $level, bool $debug)
         $textFormatter->display($output, $report, $level, $debug);
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings($expected, $text);
+        static::assertStringContainsString($expected, $text);
         static::assertStringContainsString('[ERROR]', $text);
     }
 
@@ -206,7 +206,7 @@ public function testDisplayNotFoundFile(): void
         $output = new BufferedOutput();
         $textFormatter->display($output, $report, null, false);
 
-        BCLayer::assertStringContainsStringIgnoringLineEndings(
+        static::assertStringContainsString(
             sprintf(
                 <<<EOD
                      KO %s
@@ -216,7 +216,7 @@ public function testDisplayNotFoundFile(): void
                     EOD,
                 $file
             ),
-            $output->fetch()
+            rtrim($output->fetch())
         );
     }
 
@@ -239,7 +239,7 @@ public function testDisplayBlock(string $expected, int $level): void
         $textFormatter->display($output, $report, null, false);
 
         $text = $output->fetch();
-        BCLayer::assertStringContainsStringIgnoringLineEndings($expected, $text);
+        static::assertStringContainsString($expected, $text);
     }
 
     /**