Merge pull request #108 from mvorisek/fix_tests_for_win

Make sure all lines are terminated by LF

Author: greg0ire

src/CliHighlighter.php

@@ -6,8 +6,6 @@
 
 use function sprintf;
 
-use const PHP_EOL;
-
 final class CliHighlighter implements Highlighter
 {
     public const HIGHLIGHT_FUNCTIONS = 'functions';
@@ -59,7 +57,7 @@ public function highlightError(string $value): string
     {
         return sprintf(
             '%s%s%s%s',
-            PHP_EOL,
+            "\n",
             $this->escapeSequences[self::HIGHLIGHT_ERROR],
             $value,
             "\x1b[0m",

src/HtmlHighlighter.php

@@ -10,7 +10,6 @@
 
 use const ENT_COMPAT;
 use const ENT_IGNORE;
-use const PHP_EOL;
 
 final class HtmlHighlighter implements Highlighter
 {
@@ -70,7 +69,7 @@ public function highlightError(string $value): string
     {
         return sprintf(
             '%s<span %s>%s</span>',
-            PHP_EOL,
+            "\n",
             $this->htmlAttributes[self::HIGHLIGHT_ERROR],
             $value,
         );

tests/SqlFormatterTest.php

@@ -19,8 +19,8 @@
 use function explode;
 use function file_get_contents;
 use function pack;
+use function rtrim;
 use function sprintf;
-use function trim;
 
 final class SqlFormatterTest extends TestCase
 {
@@ -37,20 +37,20 @@ protected function setUp(): void
     #[DataProvider('formatHighlightData')]
     public function testFormatHighlight(string $sql, string $html): void
     {
-        $this->assertEquals(trim($html), trim($this->formatter->format($sql)));
+        $this->assertSame($html, $this->formatter->format($sql));
     }
 
     #[DataProvider('formatData')]
     public function testFormat(string $sql, string $html): void
     {
         $formatter = new SqlFormatter(new NullHighlighter());
-        $this->assertEquals(trim($html), trim($formatter->format($sql)));
+        $this->assertSame($html, $formatter->format($sql));
     }
 
     #[DataProvider('highlightData')]
     public function testHighlight(string $sql, string $html): void
     {
-        $this->assertEquals(trim($html), trim($this->formatter->highlight($sql)));
+        $this->assertSame($html, $this->formatter->highlight($sql));
     }
 
     public function testHighlightBinary(): void
@@ -69,42 +69,42 @@ public function testHighlightBinary(): void
             $binaryData .
             '</span> <span style="font-weight:bold;">AS</span> <span style="color: #333;">BINARY</span></pre>';
 
-        $this->assertEquals(trim($html), trim($this->formatter->highlight($sql)));
+        $this->assertSame($html, $this->formatter->highlight($sql));
     }
 
     #[DataProvider('highlightCliData')]
     public function testCliHighlight(string $sql, string $html): void
     {
         $formatter = new SqlFormatter(new CliHighlighter());
-        $this->assertEquals(trim($html), trim($formatter->format($sql)));
+        $this->assertSame($html . "\n", $formatter->format($sql));
     }
 
     #[DataProvider('compressData')]
     public function testCompress(string $sql, string $html): void
     {
-        $this->assertEquals(trim($html), trim($this->formatter->compress($sql)));
+        $this->assertSame($html, $this->formatter->compress($sql));
     }
 
     public function testUsePre(): void
     {
         $formatter = new SqlFormatter(new HtmlHighlighter([], false));
         $actual    = $formatter->highlight('test');
         $expected  = '<span style="color: #333;">test</span>';
-        $this->assertEquals($actual, $expected);
+        $this->assertSame($actual, $expected);
 
         $formatter = new SqlFormatter(new HtmlHighlighter([], true));
         $actual    = $formatter->highlight('test');
         $expected  = '<pre style="color: black; background-color: white;">' .
             '<span style="color: #333;">test</span></pre>';
-        $this->assertEquals($actual, $expected);
+        $this->assertSame($actual, $expected);
     }
 
     /** @return Generator<mixed[]> */
     private static function fileDataProvider(string $file): Generator
     {
         $contents = file_get_contents(__DIR__ . '/' . $file);
         assert($contents !== false);
-        $formatHighlightData = explode("\n---\n", $contents);
+        $formatHighlightData = explode("\n---\n", rtrim($contents, "\n"));
         $sqlData             = self::sqlData();
         if (count($formatHighlightData) !== count($sqlData)) {
             throw new UnexpectedValueException(sprintf(
@@ -156,6 +156,6 @@ private static function sqlData(): array
         $contents = file_get_contents(__DIR__ . '/sql.sql');
         assert($contents !== false);
 
-        return explode("\n---\n", $contents);
+        return explode("\n---\n", rtrim($contents, "\n"));
     }
 }