Reverting the leading comma prevent [7b544c9]

- Fails on image ASCII
GBLIX · Jan 6, 2021 · ef545b6 · ef545b6
1 parent 89b3914
commit ef545b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/Weez/Zpl/Utils/ZplUtils.php b/src/Weez/Zpl/Utils/ZplUtils.php
@@ -56,20 +56,12 @@ public static function zplCommand($command, $variables = null)
             return $zpl;
         }
 
-        $cv = count($variables);
-        if ($cv > 1) {
-            $zpl .= self::variableObjectToZplCode($variables[0]);
-            for ($i = 1; $i < $cv; $i++) {
-                $zpl .= ",";
-                $zpl .= self::variableObjectToZplCode($variables[$i]);
-            }
+        $zplVariables = array_map(static function ($iValue) {
+            return self::variableObjectToZplCode($iValue);
+        }, $variables);
+
+        $zpl .= implode(',', $zplVariables);
 
-            //Prevents leading comma
-            $zpl = rtrim($zpl, ',');
-        } elseif ($cv == 1) {
-            //Only one element in variables
-            $zpl .= self::variableObjectToZplCode($variables[0]);
-        }
         return $zpl;
     }
 

diff --git a/tests/Weez/Zpl/Tests/Model/Element/ZebraFieldBlockTest.php b/tests/Weez/Zpl/Tests/Model/Element/ZebraFieldBlockTest.php
@@ -17,6 +17,6 @@ class ZebraFieldBlockTest extends TestCase
     public function testGetZplCode(): void
     {
         $barcode = new ZebraFieldBlock(500, 2, 10, new ZebraAlignment(ZebraAlignment::CENTER));
-        self::assertEquals("^FB500,2,10,C", $barcode->getZplCode());
+        self::assertEquals("^FB500,2,10,C,", $barcode->getZplCode());
     }
 }
diff --git a/tests/Weez/Zpl/Tests/Model/Element/ZebraTextTest.php b/tests/Weez/Zpl/Tests/Model/Element/ZebraTextTest.php
@@ -20,7 +20,7 @@ public function testGetZplCodeWithBlockTest(): void
     {
         $block = new ZebraFieldBlock(500, 2, 1, new ZebraAlignment(ZebraAlignment::RIGHT));
         $text = new ZebraText(20, 20, "Text", null, null, null, $block);
-        self::assertEquals("^FT20,20^FB500,2,1,R^FH\^FDText^FS\n", $text->getZplCode());
+        self::assertEquals("^FT20,20^FB500,2,1,R,^FH\^FDText^FS\n", $text->getZplCode());
     }
 
     public function testGetZplCodeAllowDecimalTest(): void