Introduce Align enum for text alignment in drawCell method

Author: andersonls

README.md

@@ -18,14 +18,15 @@ require __DIR__ . '/vendor/autoload.php';
 
 // Use millimeters for coordinates and dimensions
 use Zpl\Enums\Unit;
+use Zpl\Enums\Align;
 $driver = new \Zpl\ZplBuilder(Unit::MM);
 
 // Set encoding (optional)
 $driver->setEncoding(28);
 
 $driver->setFont('0', 16);
 $driver->setXY(0, 0);
-$driver->drawCell(100, 10, 'Hello World', true, true, 'C');
+$driver->drawCell(100, 10, 'Hello World', true, true, Align::CENTER);
 
 $zpl = $driver->toZpl();
 

src/AbstractBuilder.php

@@ -2,6 +2,7 @@
 
 namespace Zpl;
 
+use Zpl\Enums\Align;
 use Zpl\Enums\Barcode;
 use Zpl\Enums\Orientation;
 use Zpl\Enums\Unit;
@@ -96,15 +97,15 @@ abstract public function drawRect(
      * @param string $text Text to be drawn
      * @param bool $border Whether the cell have a border or not
      * @param bool $ln Whether to advance the X, Y coordinates to the next line
-     * @param string $align Alignment of the text inside the cell (L = left, C = center, R = right, J = justified)
+     * @param ?Align $align Alignment of the text inside the cell
      */
     abstract public function drawCell(
         float $width,
         float $height,
         string $text,
         bool $border = false,
         bool $ln = false,
-        string $align = ''
+        ?Align $align = null
     ): void;
 
     /**

src/Enums/Align.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Zpl\Enums;
+
+enum Align: string
+{
+    case LEFT = 'L';
+    case CENTER = 'C';
+    case RIGHT = 'R';
+    case JUSTIFIED = 'J';
+}

src/PdfBuilder.php

@@ -2,6 +2,7 @@
 
 namespace Zpl;
 
+use Zpl\Enums\Align;
 use Zpl\Enums\Barcode;
 use Zpl\Enums\Orientation;
 use Zpl\Enums\Unit;
@@ -102,9 +103,9 @@ public function drawCell(
         string $text,
         bool $border = false,
         bool $ln = false,
-        string $align = ''
+        ?Align $align = null
     ): void {
-        $this->pdfDriver->Cell($width, $height, $this->_($text), $border, $ln, $align);
+        $this->pdfDriver->Cell($width, $height, $this->_($text), $border, $ln, $align->value ?? '');
     }
 
     /**

src/ZplBuilder.php

@@ -3,6 +3,7 @@
 namespace Zpl;
 
 use Zpl\Commands\GraphicField;
+use Zpl\Enums\Align;
 use Zpl\Enums\Barcode;
 use Zpl\Enums\Orientation;
 use Zpl\Enums\Unit;
@@ -268,7 +269,7 @@ public function drawCell(
         string $text,
         bool $border = false,
         bool $ln = false,
-        string $align = ''
+        ?Align $align = null
     ): void {
         $x = $this->getX();
         $y = $this->getY();
@@ -279,8 +280,8 @@ public function drawCell(
             $offsetX = 10;
             $offsetY = $this->toDots($height) / 4;
             $this->commands[] = '^FO' . ($this->toDots($x) + $offsetX) . ',' . ($this->toDots($y) + $offsetY);
-            if ($align !== '') {
-                $this->commands[] = '^FB' . ($this->toDots($width) - $offsetX) . ',' . ($this->toDots($height) - $offsetY) . ',0,' . $align;
+            if ($align) {
+                $this->commands[] = '^FB' . ($this->toDots($width) - $offsetX) . ',' . ($this->toDots($height) - $offsetY) . ',0,' . $align->value;
             }
             $this->commands[] = '^FH^FD' . strtr($text, self::CONTROL_CHAR_HEX_MAPPINGS) . '^FS';
         }

tests/ZplTest.php

@@ -3,6 +3,7 @@
 namespace Zpl\Tests;
 
 use PHPUnit\Framework\Attributes\Test;
+use Zpl\Enums\Align;
 use Zpl\Enums\Barcode;
 use Zpl\Enums\Orientation;
 
@@ -104,15 +105,15 @@ public function drawCircle(): void
     #[Test]
     public function drawCell(): void
     {
-        $this->driver->drawCell(100, 10, 'Hello World', true, true, 'C');
+        $this->driver->drawCell(100, 10, 'Hello World', true, true, Align::CENTER);
 
         $this->assertEquals("^XA\n^FO0,0^GB100,10,3,B,0^FS\n^FO10,2.5\n^FB90,7.5,0,C\n^FH^FDHello World^FS\n^XZ\n", $this->getZpl());
     }
 
     #[Test]
-    public function drawCellWithEspecialCharaters(): void
+    public function drawCellWithEspecialCharacters(): void
     {
-        $this->driver->drawCell(100, 10, 'E ^~_ C', true, true, 'C');
+        $this->driver->drawCell(100, 10, 'E ^~_ C', true, true, Align::CENTER);
 
         $this->assertEquals("^XA\n^FO0,0^GB100,10,3,B,0^FS\n^FO10,2.5\n^FB90,7.5,0,C\n^FH^FDE _5E_7E_5F C^FS\n^XZ\n", $this->getZpl());
     }
@@ -126,7 +127,7 @@ public function drawText(): void
     }
 
     #[Test]
-    public function drawTextWithEspecialCharaters(): void
+    public function drawTextWithEspecialCharacters(): void
     {
         $this->driver->drawText(5, 40, 'E ^~_ C');