Refactor EOL detection

Author: K-Adam

src/EnvFile/EOLType.php

@@ -8,4 +8,14 @@ final class EOLType
     const WINDOWS = "\r\n";
     const UNIX = "\n";
 
+    public static function detect(string $content, string $default = EOLType::UNIX): string
+    {
+        if (str_contains($content, EOLType::WINDOWS)) {
+            return EOLType::WINDOWS;
+        } elseif (str_contains($content, EOLType::UNIX)) {
+            return EOLType::UNIX;
+        }
+
+        return $default;
+    }
 }

src/Parser.php

@@ -19,7 +19,7 @@ public function parse(string $content): EnvFile
 
         $file = new EnvFile();
 
-        $file->EOL = $this->EOL ?? $this->detectEOLType($content);
+        $file->EOL = $this->EOL ?? EOLType::detect($content);
 
         $blockStart = "^";
         $blockEnd = "(?:{$file->EOL}|$)";
@@ -105,17 +105,4 @@ public function parse(string $content): EnvFile
 
     }
 
-    public function detectEOLType(string $content, string $default = EOLType::UNIX): string
-    {
-
-        if (str_contains($content, EOLType::WINDOWS)) {
-            return EOLType::WINDOWS;
-        } elseif (str_contains($content, EOLType::UNIX)) {
-            return EOLType::UNIX;
-        }
-
-        return $default;
-
-    }
-
 }

tests/Unit/EnvFile/EOLTypeTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\EnvFile;
+
+use EnvEditor\EnvFile\EOLType;
+use Tests\TestCase;
+
+class EOLTypeTest extends TestCase
+{
+
+    public function testDetectUnix(): void
+    {
+        $unix = "#test\n#test";
+        $this->assertEquals(EOLType::UNIX, EOLType::detect($unix));
+    }
+
+    public function testDetectWindows(): void
+    {
+        $win = "#test\r\n#test";
+        $this->assertEquals(EOLType::WINDOWS, EOLType::detect($win));
+    }
+
+    public function testDetectDefault(): void
+    {
+        $empty = "";
+        $this->assertEquals(EOLType::UNIX, EOLType::detect($empty));
+        $this->assertEquals(EOLType::UNIX, EOLType::detect($empty, EOLType::UNIX));
+        $this->assertEquals(EOLType::WINDOWS, EOLType::detect($empty, EOLType::WINDOWS));
+    }
+
+}

tests/Unit/ParserTest.php

@@ -8,26 +8,7 @@
 
 class ParserTest extends TestCase
 {
-
-    public function testDetectEOLType(): void
-    {
-        $parser = new Parser();
-
-        $win = "#test\r\n#test";
-        $unix = "#test\n#test";
-        $empty = "";
-
-        $this->assertEquals(EOLType::WINDOWS, $parser->detectEOLType($win));
-        $this->assertEquals(EOLType::UNIX, $parser->detectEOLType($unix));
-        $this->assertEquals(EOLType::UNIX, $parser->detectEOLType($empty));
-        $this->assertEquals(EOLType::UNIX, $parser->detectEOLType($empty, EOLType::UNIX));
-        $this->assertEquals(EOLType::WINDOWS, $parser->detectEOLType($empty, EOLType::WINDOWS));
-
-    }
-
-    /**
-     * @depends testDetectEOLType
-     */
+    
     public function testFileEOLType(): void
     {