Minor Composer & test refactoring

Override EOL

Author: K-Adam

src/Composer.php

@@ -7,15 +7,13 @@
 class Composer
 {
 
-    public ?string $EOL = null;
-
-    public function compose(EnvFile $file): string
+    public function compose(EnvFile $file, ?string $overrideEOL = null): string
     {
         $visitor = new Visitor();
 
         $file->visitBlocks($visitor);
 
-        $EOL = $this->EOL ?? $file->EOL;
+        $EOL = $overrideEOL ?? $file->EOL;
         return implode($EOL, $visitor->results);
     }
 

tests/Unit/ComposerTest.php

@@ -11,34 +11,36 @@
 class ComposerTest extends TestCase
 {
 
+    private Composer $composer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->composer = new Composer();
+    }
+
     public function testCompose(): void
     {
-        $composer = new Composer();
         $file = new EnvFile();
 
         $file->blocks[] = new CommentBlock("test1");
         $file->blocks[] = new CommentBlock("test2");
 
-        $result = $composer->compose($file);
+        $result = $this->composer->compose($file);
         $this->assertEquals("#test1\n#test2", $result);
     }
 
     public function testEOL(): void
     {
-        $composer = new Composer();
         $file = new EnvFile();
 
         $file->blocks[] = new CommentBlock("test1");
         $file->blocks[] = new CommentBlock("test2");
 
-        $file->EOL = EOLType::UNIX;
-        $this->assertEquals("#test1\n#test2", $composer->compose($file));
-
-        $file->EOL = EOLType::WINDOWS;
-        $this->assertEquals("#test1\r\n#test2", $composer->compose($file));
-
-        $composer->EOL = EOLType::UNIX;
-        $this->assertEquals("#test1\n#test2", $composer->compose($file));
+        $this->assertEquals("#test1\n#test2", $this->composer->compose($file, EOLType::UNIX));
+        $this->assertEquals("#test1\r\n#test2", $this->composer->compose($file, EOLType::WINDOWS));
+        $this->assertEquals("#test1\n#test2", $this->composer->compose($file, EOLType::UNIX));
     }
 
 }