Merge pull request #62 from lestcape/FixReturnValue

Fix the return value of the isVeryLong function
tiamo · Jul 6, 2021 · a32a5cf · a32a5cf
2 parents 04513e4 + d9d0960
commit a32a5cf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/src/Sav/Record/Data.php b/src/Sav/Record/Data.php
@@ -376,7 +376,7 @@ protected function readCaseData(Buffer $buffer, $compressed, $bias, $variables,
         for ($index = 0; $index < $varCount; $index++) {
             $var = $variables[$index];
             $isNumeric = 0 === $var->width && \SPSS\Sav\Variable::isNumberFormat($var->write[1]);
-            $width = isset($var->write[2]) ? $var->write[2] : $var->width;
+            $width = (isset($var->write[2]) && ($var->write[2] !== 0)) ? $var->write[2] : $var->width;
 
             // var_dump($var);
             // exit;
@@ -463,7 +463,7 @@ protected function writeCaseData(Buffer $buffer, $row, $compressed, $bias, $vari
 
             // $isNumeric = $var->width == 0;
             $isNumeric = 0 === $var->width && \SPSS\Sav\Variable::isNumberFormat($var->write[1]);
-            $width = isset($var->write[2]) ? $var->write[2] : $var->width;
+            $width = (isset($var->write[2]) && ($var->write[2] !== 0)) ? $var->write[2] : $var->width;
 
             if ($isNumeric) {
                 if (!$compressed) {

diff --git a/src/Sav/Record/Info/LongStringValueLabels.php b/src/Sav/Record/Info/LongStringValueLabels.php
@@ -46,14 +46,14 @@ public function write(Buffer $buffer)
             }
             $width = (int) $data['width'];
             $localBuffer->writeInt(mb_strlen($varName));
-            $localBuffer->writeString($varName);
+            $localBuffer->writeString($varName, mb_strlen($varName));
             $localBuffer->writeInt($width);
             $localBuffer->writeInt(Utils::is_countable($data['values']) ? \count($data['values']) : 0);
             foreach ($data['values'] as $value => $label) {
                 $localBuffer->writeInt($width);
                 $localBuffer->writeString($value, $width);
                 $localBuffer->writeInt(mb_strlen($label));
-                $localBuffer->writeString($label);
+                $localBuffer->writeString($label, mb_strlen($label));
             }
         }
 

diff --git a/src/Sav/Record/ValueLabel.php b/src/Sav/Record/ValueLabel.php
@@ -89,12 +89,8 @@ public function read(Buffer $buffer)
 
     public function write(Buffer $buffer)
     {
-        $convertToDouble = false;
-        $varIndex        = reset($this->indexes);
-        if (false !== $varIndex && isset($this->variables[$varIndex - 1])) {
-            $varWidth        = $this->variables[$varIndex - 1]->width;
-            $convertToDouble = $varWidth > 0;
-        }
+        $var = (count($this->variables) > 0) ? $this->variables[count($this->variables) - 1] : null;
+        $convertToDouble = (isset($var) && ($var->width > 0));
 
         // Value label record.
         $buffer->writeInt(self::TYPE);

diff --git a/src/Sav/Record/Variable.php b/src/Sav/Record/Variable.php
@@ -50,15 +50,15 @@ class Variable extends Record
 
     /**
      * Print format for this variable.
-     * [decimals, width, format, 0].
+     * [0, format, width, decimals].
      *
      * @var array
      */
     public $print = [0, 0, 0, 0];
 
     /**
      * Write format for this variable.
-     * [decimals, width, format, 0].
+     * [0, format, width, decimals].
      *
      * @var array
      */

diff --git a/src/Sav/Writer.php b/src/Sav/Writer.php
@@ -130,13 +130,13 @@ public function write($data)
             $variable->print = [
                 0,
                 $var->format,
-                $var->width !== [] ? min($var->width, 255) : 8,
+                $var->width > 0 ? min($var->width, 255) : 8,
                 $var->decimals,
             ];
             $variable->write = [
                 0,
                 $var->format,
-                $var->width !== [] ? min($var->width, 255) : 8,
+                $var->width > 0 ? min($var->width, 255) : 8,
                 $var->decimals,
             ];
 
@@ -188,7 +188,7 @@ public function write($data)
 
             $this->info[Record\Info\LongVariableNames::SUBTYPE][$shortName] = $var->name;
 
-            if (Record\Variable::isVeryLong($var->width) !== 0) {
+            if (Record\Variable::isVeryLong($var->width) !== false) {
                 $this->info[Record\Info\VeryLongString::SUBTYPE][$shortName] = $var->width;
             }
 

diff --git a/src/Utils.php b/src/Utils.php
@@ -163,7 +163,7 @@ public static function widthToBytes($width)
 
         if (0 === $width) {
             $bytes = 8;
-        } elseif (Variable::isVeryLong($width) === 0) {
+        } elseif (Variable::isVeryLong($width) === false) {
             $bytes = $width;
         } else {
             $chunks    = $width / Variable::EFFECTIVE_VLS_CHUNK;
@@ -202,7 +202,7 @@ public static function widthToOcts($width)
      */
     public static function widthToSegments($width)
     {
-        return Variable::isVeryLong($width) !== 0 ? ceil($width / Variable::EFFECTIVE_VLS_CHUNK) : 1;
+        return Variable::isVeryLong($width) !== false ? ceil($width / Variable::EFFECTIVE_VLS_CHUNK) : 1;
     }
 
     /**
@@ -233,7 +233,7 @@ public static function segmentAllocWidth($width, $segment = 0)
         $segmentCount = self::widthToSegments($width);
         // assert($segment < $segmentCount);
 
-        if (Variable::isVeryLong($width) === 0) {
+        if (Variable::isVeryLong($width) === false) {
             return $width;
         }