commit

foolfish3 · Sep 11, 2024 · ce319ac · ce319ac
1 parent 2853fcb
commit ce319ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/GoodCodecCSV.php b/src/GoodCodecCSV.php
@@ -74,8 +74,9 @@ public static function csv_encode_row($row, $out_charset = "UTF-8", $in_charset
         $enclosure = isset($enclosure) ? $enclosure : "\"";
         $force_quote = isset($force_quote) ? $force_quote : 0;
         $s = "";
-        foreach ($row as $idx => $str) {
-            if ($idx !== 0) {
+        $idx = -1;
+        foreach ($row as $str) {
+            if (++$idx !== 0) {
                 $s .= $delimiter;
             }
             $s .= self::csv_encode_str($str, "UTF-8", $in_charset, 0, $null, $delimiter, $enclosure, $force_quote);

diff --git a/src/GoodCodecTSV.php b/src/GoodCodecTSV.php
@@ -44,8 +44,9 @@ public static function tsv_encode_row($row, $out_charset = "UTF-8", $in_charset
         }
         $need_iconv = $in_charset !== "UTF-8";
         $s = "";
-        foreach ($row as $k => $str) {
-            if ($k != 0) {
+        $idx = -1;
+        foreach ($row as $str) {
+            if (++$idx !== 0) {
                 $s .= "\t";
             }
             if ($str === NULL) {
@@ -75,8 +76,9 @@ public static function tsv_encode_table($data, $out_charset = "UTF-8", $in_chars
         $need_iconv = $in_charset !== "UTF-8";
         $s = "";
         foreach ($data as $row) {
-            foreach ($row as $k => $str) {
-                if ($k != 0) {
+            $idx = -1;
+            foreach ($row as $str) {
+                if (++$idx !== 0) {
                     $s .= "\t";
                 }
                 if ($str === NULL) {