Refactoring naming

README.md

@@ -26,8 +26,8 @@ composer require terremoth/php-dsv
 ```php
 require_once 'vendor/autoload.php';
 
-use DSV\DSVWriter;
-use DSV\DSVReader;
+use DSV\Writer;
+use DSV\Reader;
 
 $data = [
     ['Name', 'Comment'],
@@ -38,9 +38,9 @@ $data = [
     ['Edward', 'アップル'],
 ];
 
-$writer = new DSVWriter('demos/data.dsv');
+$writer = new Writer('demos/data.dsv');
 $writer->write($data); // will write the $data to file in DSV format
 
-$reader = new DSVReader('demos/data.dsv');
+$reader = new Reader('demos/data.dsv');
 print_r($reader->read()); // will read the demos/data.dsv file and put it in array format 
 ```

demos/demo.php

@@ -2,8 +2,8 @@
 
 require_once 'vendor/autoload.php';
 
-use DSV\DSVWriter;
-use DSV\DSVReader;
+use DSV\Writer;
+use DSV\Reader;
 
 $data = [
     ['Name', 'Comment'],
@@ -14,9 +14,9 @@
     ['Edward', 'アップル'],
 ];
 
-$writer = new DSVWriter('demos/data.dsv');
+$writer = new Writer('demos/data.dsv');
 $writer->write($data);
 
-$reader = new DSVReader('demos/data.dsv');
+$reader = new Reader('demos/data.dsv');
 
 print_r($reader->read());

src/DSV/DSV.php

@@ -2,7 +2,7 @@
 
 namespace DSV;
 
-abstract class DSV
+trait DSV
 {
     /**
      * @var non-empty-string

src/DSV/DSVReader.php → src/DSV/Reader.php

@@ -4,8 +4,10 @@
 
 use Exception;
 
-class DSVReader extends DSV
+class Reader
 {
+    use DSV;
+
     /**
      * @throws Exception
      */

src/DSV/DSVWriter.php → src/DSV/Writer.php

@@ -2,8 +2,10 @@
 
 namespace DSV;
 
-class DSVWriter extends DSV
+class Writer
 {
+    use DSV;
+
     public function __construct(protected string $outputFile)
     {
     }

tests/DSV/DSVReaderTest.php → tests/DSV/ReaderTest.php

@@ -6,8 +6,8 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-#[CoversClass(DSVReader::class)]
-class DSVReaderTest extends TestCase
+#[CoversClass(Reader::class)]
+class ReaderTest extends TestCase
 {
     /**
      * @throws Exception
@@ -25,7 +25,7 @@ public function testRead(): void
 
         $totalFileLines = 6;
 
-        $reader = new DSVReader($tempFile);
+        $reader = new Reader($tempFile);
         $result = $reader->read();
         $this->assertEquals(count($result), $totalFileLines);
         unlink($tempFile);
@@ -37,7 +37,7 @@ public function testRead(): void
     public function testException(): void
     {
         $this->expectException(Exception::class);
-        $reader = new DSVReader(random_int(0, 999999) . '.dsv');
+        $reader = new Reader(random_int(0, 999999) . '.dsv');
         $reader->read();
     }
 }

tests/DSV/DSVWriterTest.php → tests/DSV/WriterTest.php

@@ -6,8 +6,8 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-#[CoversClass(DSVWriter::class)]
-class DSVWriterTest extends TestCase
+#[CoversClass(Writer::class)]
+class WriterTest extends TestCase
 {
     /**
      * @return array[]
@@ -49,7 +49,7 @@ public static function dataProvider(): array
     public function testWrite(array $data, string $result): void
     {
         $file = tempnam(sys_get_temp_dir(), 'dsv-test-data');
-        $writer = new DSVWriter($file);
+        $writer = new Writer($file);
         $writer->write($data);
         $this->assertEquals($result, file_get_contents($file));
         unlink($file);