Merge pull request #109 from atmtk/feature/implicit-encoders

replaceable encoder for converters

Author: gam6itko

src/DataConverter/Encoder/EncoderInterface.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace XBase\DataConverter\Encoder;
+
+interface EncoderInterface
+{
+    public function encode(string $string, string $fromEncoding, string $toEncoding): string;
+}

src/DataConverter/Encoder/IconvEncoder.php

@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace XBase\DataConverter\Encoder;
+
+class IconvEncoder implements EncoderInterface
+{
+    public function encode(string $string, string $fromEncoding, string $toEncoding): string
+    {
+        return iconv($fromEncoding, $toEncoding, $string);
+    }
+}

src/DataConverter/Field/AbstractFieldDataConverter.php

@@ -2,6 +2,7 @@
 
 namespace XBase\DataConverter\Field;
 
+use XBase\DataConverter\Encoder\EncoderInterface;
 use XBase\Header\Column;
 use XBase\Table\Table;
 
@@ -13,9 +14,13 @@ abstract class AbstractFieldDataConverter implements FieldDataConverterInterface
     /** @var Column */
     protected $column;
 
-    public function __construct(Table $table, Column $column)
+    /** @var EncoderInterface */
+    protected $encoder;
+
+    public function __construct(Table $table, Column $column, EncoderInterface $encoder)
     {
         $this->table = $table;
         $this->column = $column;
+        $this->encoder = $encoder;
     }
 }

src/DataConverter/Field/DBase/CharConverter.php

@@ -15,7 +15,7 @@ public static function getType(): string
     public function fromBinaryString(string $value)
     {
         if ($inCharset = $this->table->options['encoding']) {
-            $value = iconv($inCharset, 'utf-8', $value);
+            $value = $this->encoder->encode($value, $inCharset, 'utf-8');
         }
 
         return trim($value);
@@ -24,7 +24,7 @@ public function fromBinaryString(string $value)
     public function toBinaryString($value): string
     {
         if ($value && $outCharset = $this->table->options['encoding']) {
-            $value = iconv('utf-8', $outCharset, $value);
+            $value = $this->encoder->encode($value, 'utf-8', $outCharset);
         }
 
         return str_pad($value ?? '', $this->column->length);

src/DataConverter/Field/VisualFoxpro/VarFieldConverter.php

@@ -19,7 +19,7 @@ public function fromBinaryString(string $value): string
         }
 
         if ($inCharset = $this->table->options['encoding']) {
-            $value = iconv($inCharset, 'utf-8', $value);
+            $value = $this->encoder->encode($value, $inCharset, 'utf-8');
         }
 
         return $value;
@@ -32,7 +32,7 @@ public function toBinaryString($value): string
     {
         $value = $value ?? '';
         if ($outCharset = $this->table->options['encoding']) {
-            $value = iconv('utf-8', $outCharset, $value);
+            $value = $this->encoder->encode($value, 'utf-8', $outCharset);
         }
 
         return str_pad($value, $this->column->length - 1, chr(0x00)).chr(0x03);

src/DataConverter/Record/DBaseDataConverter.php

@@ -2,6 +2,7 @@
 
 namespace XBase\DataConverter\Record;
 
+use XBase\DataConverter\Encoder\EncoderInterface;
 use XBase\DataConverter\Field\DBase\CharConverter;
 use XBase\DataConverter\Field\DBase\DateConverter;
 use XBase\DataConverter\Field\DBase\IgnoreConverter;
@@ -20,9 +21,13 @@ class DBaseDataConverter implements RecordDataConverterInterface
     /** @var Table */
     protected $table;
 
-    public function __construct(Table $table)
+    /** @var EncoderInterface */
+    protected $encoder;
+
+    public function __construct(Table $table, EncoderInterface $encoder)
     {
         $this->table = $table;
+        $this->encoder = $encoder;
     }
 
     /**
@@ -80,7 +85,7 @@ private function findFieldConverter(Column $column): FieldDataConverterInterface
     {
         foreach (static::getFieldConverters() as $class) {
             if ($column->type === $class::getType()) {
-                return new $class($this->table, $column);
+                return new $class($this->table, $column, $this->encoder);
             }
         }
 

src/Memo/AbstractMemo.php

@@ -2,6 +2,7 @@
 
 namespace XBase\Memo;
 
+use XBase\DataConverter\Encoder\EncoderInterface;
 use XBase\Stream\Stream;
 use XBase\Table\Table;
 
@@ -16,12 +17,16 @@ abstract class AbstractMemo implements MemoInterface
     /** @var string */
     protected $filepath;
 
+    /** @var EncoderInterface */
+    protected $encoder;
+
     /**
      * @param string $filepath Path to memo file
      */
-    public function __construct(Table $table, string $filepath)
+    public function __construct(Table $table, string $filepath, EncoderInterface $encoder)
     {
         $this->table = $table;
+        $this->encoder = $encoder;
 
         $this->filepath = $filepath;
         $this->open();

src/Memo/DBase3Memo.php

@@ -51,7 +51,7 @@ public function get(int $pointer): ?MemoObject
                 $result = substr($result, 0, -1); // remove endline symbol (0x00)
             }
             if ($this->table->options['encoding']) {
-                $result = iconv($this->table->options['encoding'], 'utf-8', $result);
+                $result = $this->encoder->encode($result, $this->table->options['encoding'], 'utf-8');
             }
         }
 

src/Memo/DBase4Memo.php

@@ -48,7 +48,7 @@ public function get(int $pointer): ?MemoObject
         $info = $this->guessDataType($result);
         assert(isset($info['type']));
         if (MemoObject::TYPE_TEXT === $info['type'] && $this->table->options['encoding']) {
-            $result = iconv($this->table->options['encoding'], 'utf-8', $result);
+            $result = $this->encoder->encode($result, $this->table->options['encoding'], 'utf-8');
         }
 
         return new MemoObject($result, $info['type'], $pointer, $memoLength[1]);

src/Memo/FoxproMemo.php

@@ -56,7 +56,7 @@ public function get(int $pointer): ?MemoObject
         $info = $this->guessDataType($result);
         assert(isset($info['type']));
         if ($this->table->options['encoding']) {
-            $result = iconv($this->table->options['encoding'], 'utf-8', $result);
+            $result = $this->encoder->encode($result, $this->table->options['encoding'], 'utf-8');
         }
 
         return new MemoObject($result, $info['type'], $pointer, $memoLength[1], $info);