From e818e3526102a20b7d9c7e1b14feef686c973a5d Mon Sep 17 00:00:00 2001
From: gam6itko <gam6itko@gmail.com>
Date: Tue, 7 Jun 2022 13:51:07 +0300
Subject: [PATCH] fix #115: VisualFoxproTest fix for Ignore colunm

---
 .../Field/VisualFoxpro/IgnoreConverter.php    |   2 +-
 tests/Resources/foxpro/issue115.cdx           | Bin 0 -> 4608 bytes
 tests/Resources/foxpro/issue115.dbf           | Bin 0 -> 1724 bytes
 tests/TableEditor/VisualFoxproTest.php        |  43 ++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 tests/Resources/foxpro/issue115.cdx
 create mode 100644 tests/Resources/foxpro/issue115.dbf

diff --git a/src/DataConverter/Field/VisualFoxpro/IgnoreConverter.php b/src/DataConverter/Field/VisualFoxpro/IgnoreConverter.php
index d75316d..a8a20ff 100644
--- a/src/DataConverter/Field/VisualFoxpro/IgnoreConverter.php
+++ b/src/DataConverter/Field/VisualFoxpro/IgnoreConverter.php
@@ -19,6 +19,6 @@ public function fromBinaryString(string $value): string
 
     public function toBinaryString($value): string
     {
-        return $value ?? chr(0x20).chr(0x0a);
+        return str_pad((string) $value, $this->column->length, chr(0x20));
     }
 }
diff --git a/tests/Resources/foxpro/issue115.cdx b/tests/Resources/foxpro/issue115.cdx
new file mode 100644
index 0000000000000000000000000000000000000000..d35bc1e193df84617091dc8491bfc2985c9b26d3
GIT binary patch
literal 4608
zcmZQzVSoWfE`|q;FwQ7FyhDJI0Tk7v(LKClnXvDe8JHOUL&0^%|Nj{n`1u7`SeO}j
z3K-ZF2<snJF$6=v#nms=*E7h~+24hM3*mkhhJ?`q0TCR-n#Bn&`#Bj>Qu9i4GmBD(
zwP!~?hcg7&f$0EN{@-Wh2dcBTXJKPwVl2U_WmIA~gn*;Ft6xZ{4}$>0Gb{`_qvby$
zIEFQgg#nb;Ss0S@QyBF8{6q9yTzy<aTwOFYhqbpyJ%<(o$mRcIMrNQaJ3A9IGvjDM
OfEG~0kZWLIU<d#mfG+a@

literal 0
HcmV?d00001

diff --git a/tests/Resources/foxpro/issue115.dbf b/tests/Resources/foxpro/issue115.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..2d4c150ac8146f5894c88d4db1e05e0422384a06
GIT binary patch
literal 1724
zcmXpIV`JxJU|`5#ss@s%fbj$agR{R2OwgGT$YO!<ptOstU#PEVkSmbu%nBq_(Bz%{
z{X*iy9Q{D@nm|H?feA%Lh^r5b?`#WX382Y4dBz9326=+b_XWx`Vafv?;1~pya`p!j
zT$u6!{tzpiBe9t8>lp0m=LnPl>d(X?@8sj}>=*);_p1a_jA-V^`<3S8xaB0K7c&@C
zf#pG=fB?M7`FSPrNr_d7dMQcC2=S4|QZO(uFm!Zx^$Q90Q6Lo<m>XLdnp>Efnvtp#
zsGb32wGkN_sinot)Wp=xgj%K%ZB8OkB?uD&*wmnlB_f%GDTiu<A;emAWvGfEJZx&v
q#YU~h3=!0@ga&vLswh@oG8WMkG_h2LG`L7QoCRTIpz#OPYAFC9PrI-H

literal 0
HcmV?d00001

diff --git a/tests/TableEditor/VisualFoxproTest.php b/tests/TableEditor/VisualFoxproTest.php
index ecbab0f..80afb40 100644
--- a/tests/TableEditor/VisualFoxproTest.php
+++ b/tests/TableEditor/VisualFoxproTest.php
@@ -3,6 +3,7 @@
 namespace XBase\Tests\TableEditor;
 
 use PHPUnit\Framework\TestCase;
+use XBase\Column\ColumnInterface;
 use XBase\Enum\TableType;
 use XBase\Memo\MemoObject;
 use XBase\Record\VisualFoxproRecord;
@@ -314,4 +315,46 @@ public function testIssue91(): void
         }
         self::assertEquals($data, $actual);
     }
+
+    public function testIssue115(): void
+    {
+        $filename = __DIR__.'/../Resources/foxpro/issue115.dbf';
+        $table = new TableEditor($filename);
+
+        $record = $table->appendRecord();
+        $record->cod = 'a';
+        $record->denumire = 'b';
+        $record->cont_van = 'c';
+        $record->tel = 'd';
+        $record->bi_serie = 'e';
+        $record->bi_numar = 'f';
+        $record->bi_pol = 'g';
+        $record->masina = 'h';
+        $record->blocat = 1;
+
+        $table
+            ->writeRecord()
+            ->save()
+            ->close();
+        unset($record, $table);
+
+        $table = new TableReader($filename);
+        self::assertSame(
+            $table->getRecordByteLength(),
+            array_reduce($table->getColumns(), static function (int $carry, ColumnInterface $c) {
+                return $carry + $c->getLength();
+            }, 1)
+        );
+
+        $record = $table->pickRecord($table->getRecordCount() - 1);
+        self::assertSame($record->cod, 'a');
+        self::assertSame($record->denumire, 'b');
+        self::assertSame($record->cont_van, 'c');
+        self::assertSame($record->tel, 'd');
+        self::assertSame($record->bi_serie, 'e');
+        self::assertSame($record->bi_numar, 'f');
+        self::assertSame($record->bi_pol, 'g');
+        self::assertSame($record->masina, 'h');
+        self::assertSame($record->blocat, 1);
+    }
 }