Improve ITF-14 code

Author: casperbakker

src/Types/TypeITF14.php

@@ -29,25 +29,26 @@ public function getBarcodeData(string $code): Barcode
         $chr['A'] = '11';
         $chr['Z'] = '21';
 
-        if (strlen($code) === 13) {
-            $code .= $this->getChecksum($code);
+        if (strlen($code) < 13 || strlen($code) > 14) {
+            throw new InvalidLengthException();
         }
 
-        if (strlen($code) > 14 || strlen($code) < 13) {
-            throw new InvalidLengthException();
+        if (strlen($code) === 13) {
+            $code .= $this->getChecksum($code);
         }
 
         $barcode = new Barcode($code);
 
         // Add start and stop codes
         $code = 'AA' . strtolower($code) . 'ZA';
 
+        // Loop through 2 chars at once
         for ($charIndex = 0; $charIndex < strlen($code); $charIndex += 2) {
             if (! isset($chr[$code[$charIndex]]) || ! isset($chr[$code[$charIndex + 1]])) {
                 throw new InvalidCharacterException();
             }
 
-            $bars = true;
+            $drawBar = true;
             $pbars = $chr[$code[$charIndex]];
             $pspaces = $chr[$code[$charIndex + 1]];
             $pmixed = '';
@@ -58,18 +59,9 @@ public function getBarcodeData(string $code): Barcode
                 $pspaces = substr($pspaces, 1);
             }
 
-            $pmixedarr = str_split($pmixed);
-
-            foreach ($pmixedarr as $x) {
-                if ($bars) {
-                    $t = true;
-                } else {
-                    $t = false;
-                }
-                $width = ($x === '1') ? '1' : '2';
-
-                $barcode->addBar(new BarcodeBar($width, 1, $t));
-                $bars = ! $bars;
+            foreach (str_split($pmixed) as $width) {
+                $barcode->addBar(new BarcodeBar($width, 1, $drawBar));
+                $drawBar = ! $drawBar;
             }
         }
 

src/Types/TypeInterleaved25Checksum.php

@@ -37,6 +37,7 @@ public function getBarcodeData(string $code): Barcode
             // add leading zero if code-length is odd
             $code = '0' . $code;
         }
+
         // add start and stop codes
         $code = 'AA' . strtolower($code) . 'ZA';
 

tests/VerifiedBarcodeTest.php

@@ -5,7 +5,7 @@
 
 /*
  * Test all supported barcodes types, with as much different but supported input strings.
- * Verified files can be build with generate-verified-files.php file.
+ * Verified files can be built with generate-verified-files.php file.
  * Only run that file if you added new types or new strings to test.
  *
  * We use SVG because that output is vector and should be the same on every host system.
@@ -24,7 +24,7 @@ class VerifiedBarcodeTest extends TestCase
         ['type' => BarcodeGenerator::TYPE_INTERLEAVED_2_5, 'barcodes' => ['1234567890']],
         ['type' => BarcodeGenerator::TYPE_INTERLEAVED_2_5_CHECKSUM, 'barcodes' => ['1234567890']],
         ['type' => BarcodeGenerator::TYPE_EAN_13, 'barcodes' => ['081231723897', '0049000004632', '004900000463']],
-        ['type' => BarcodeGenerator::TYPE_ITF_14, 'barcodes' => ['00012345600012']],
+        ['type' => BarcodeGenerator::TYPE_ITF_14, 'barcodes' => ['00012345600012', '05400141288766']],
         ['type' => BarcodeGenerator::TYPE_CODE_128, 'barcodes' => ['081231723897', '1234567890abcABC-283*33']],
         ['type' => BarcodeGenerator::TYPE_CODE_128_A, 'barcodes' => ['1234567890']],
         ['type' => BarcodeGenerator::TYPE_CODE_128_B, 'barcodes' => ['081231723897', '1234567890abcABC-283*33']],