Merge branch 'picqer:main' into main

Author: Bernhard-Krop

Readme.md

@@ -8,7 +8,8 @@ It creates SVG, PNG, JPG and HTML images, from the most used 1D barcode standard
 *The codebase is based on the [TCPDF barcode generator](https://github.com/tecnickcom/TCPDF) by Nicola Asuni. This code is therefor licensed under LGPLv3.*
 
 ## No support for...
-We do not support any 2D barcodes, like QR codes. We also only generate the 'bars' part of a barcode. If you want text of the code below the barcode, you could add it later to the output of this package. 
+- No support for any **2D** barcodes, like QR codes.
+- We only generate the 'bars' part of a barcode, without text below the barcode. If you want text of the code below the barcode, you could add it later to the output of this package. 
 
 ## Installation
 Install through [composer](https://getcomposer.org/doc/00-intro.md):

src/Types/TypeCode39.php

@@ -70,8 +70,6 @@ public function getBarcodeData(string $code): Barcode
             throw new InvalidLengthException('You should provide a barcode string.');
         }
 
-        $code = strtoupper($code);
-
         if ($this->extended) {
             // extended mode
             $code = $this->encode_code39_ext($code);

src/Types/TypeStandard2of5.php

@@ -26,16 +26,12 @@ public function getBarcodeData(string $code): Barcode
         $chr['5'] = '11101011101010';
         $chr['6'] = '10111011101010';
         $chr['7'] = '10101011101110';
-        $chr['8'] = '10101110111010';
+        $chr['8'] = '11101010111010';
         $chr['9'] = '10111010111010';
         if ($this->checksum) {
             // add checksum
             $code .= $this->checksum_s25($code);
         }
-        if ((strlen($code) % 2) != 0) {
-            // add leading zero if code-length is odd
-            $code = '0' . $code;
-        }
         $seq = '11011010';
 
         for ($i = 0; $i < strlen($code); ++$i) {

tests/TypesTest.php

@@ -7,19 +7,27 @@ class TypesTest extends TestCase
     public function test_generator_can_generate_code_39_barcode()
     {
         $generator = new Picqer\Barcode\BarcodeGeneratorSVG();
-        $result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39);
+        $result = $generator->getBarcode('1234567890ABC', $generator::TYPE_CODE_39);
 
-        $this->assertStringEqualsFile('tests/verified-files/C39-1234567890abcABC.svg', $result);
+        $this->assertStringEqualsFile('tests/verified-files/C39-1234567890ABC.svg', $result);
     }
 
     public function test_generator_can_generate_code_39_checksum_barcode()
     {
         $generator = new Picqer\Barcode\BarcodeGeneratorSVG();
-        $result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39_CHECKSUM);
+        $result = $generator->getBarcode('1234567890ABC', $generator::TYPE_CODE_39_CHECKSUM);
 
         $this->assertGreaterThan(100, strlen($result));
     }
 
+    public function test_generator_can_generate_code_39_extended_barcode()
+    {
+        $generator = new Picqer\Barcode\BarcodeGeneratorSVG();
+        $result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39E);
+
+        $this->assertStringEqualsFile('tests/verified-files/C39E-1234567890abcABC.svg', $result);
+    }
+
     public function test_generator_can_generate_code_39_extended_checksum_barcode()
     {
         $generator = new Picqer\Barcode\BarcodeGeneratorSVG();

tests/VerifiedBarcodeTest.php

@@ -14,8 +14,9 @@
 class VerifiedBarcodeTest extends TestCase
 {
     public static $supportedBarcodes = [
-        ['type' => BarcodeGenerator::TYPE_CODE_39, 'barcodes' => ['1234567890abcABC']],
-        ['type' => BarcodeGenerator::TYPE_CODE_39_CHECKSUM, 'barcodes' => ['1234567890abcABC']],
+        ['type' => BarcodeGenerator::TYPE_CODE_39, 'barcodes' => ['1234567890ABC']],
+        ['type' => BarcodeGenerator::TYPE_CODE_39_CHECKSUM, 'barcodes' => ['1234567890ABC']],
+        ['type' => BarcodeGenerator::TYPE_CODE_39E, 'barcodes' => ['1234567890abcABC']],
         ['type' => BarcodeGenerator::TYPE_CODE_39E_CHECKSUM, 'barcodes' => ['1234567890abcABC']],
         ['type' => BarcodeGenerator::TYPE_CODE_93, 'barcodes' => ['1234567890abcABC']],
         ['type' => BarcodeGenerator::TYPE_STANDARD_2_5, 'barcodes' => ['1234567890']],