Resolve conflict

tiamo · Feb 12, 2024 · df94c22 · df94c22
1 parent d20497a
commit df94c22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Sav/Reader.php b/src/Sav/Reader.php
@@ -165,7 +165,7 @@ public function readBody()
             $encode = $this->info[Record\Info\CharacterEncoding::SUBTYPE]->value;
             // If is not set assume the UTF-8 encode.
             $encode = (isset($encode) && !empty($encode)) ? $encode : "UTF-8";
-            $this->_buffer->charset = $encode;
+            $this->_buffer->streamCharset = $encode;
 
             if ($this->_buffer->seek($headerPosition) === 0) {
                 $this->valueLabels = [];

diff --git a/src/Sav/Writer.php b/src/Sav/Writer.php
@@ -100,7 +100,7 @@ public function write($data)
 
         $encode = (isset($data['info']) && isset($data['info']['characterEncoding'])) ? $data['info']['characterEncoding'] : 'UTF-8';
         $this->info[Record\Info\CharacterEncoding::SUBTYPE]       = new Record\Info\CharacterEncoding($encode);
-        $this->buffer->charset = $encode;
+        $this->buffer->streamCharset = $encode;
 
         $this->data = new Record\Data();