Skip to content

Commit 6476eb0

Browse files
authored
Merge pull request #160 from Bernhard-Krop/code-39-extended
Fixing a bug in Code 39 Extended (with or without checksum)
2 parents 52f3453 + 85d0feb commit 6476eb0

7 files changed

+180
-76
lines changed

src/Types/TypeCode39.php

-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ public function getBarcodeData(string $code): Barcode
7070
throw new InvalidLengthException('You should provide a barcode string.');
7171
}
7272

73-
$code = strtoupper($code);
74-
7573
if ($this->extended) {
7674
// extended mode
7775
$code = $this->encode_code39_ext($code);

tests/TypesTest.php

+11-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,27 @@ class TypesTest extends TestCase
77
public function test_generator_can_generate_code_39_barcode()
88
{
99
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
10-
$result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39);
10+
$result = $generator->getBarcode('1234567890ABC', $generator::TYPE_CODE_39);
1111

12-
$this->assertStringEqualsFile('tests/verified-files/C39-1234567890abcABC.svg', $result);
12+
$this->assertStringEqualsFile('tests/verified-files/C39-1234567890ABC.svg', $result);
1313
}
1414

1515
public function test_generator_can_generate_code_39_checksum_barcode()
1616
{
1717
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
18-
$result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39_CHECKSUM);
18+
$result = $generator->getBarcode('1234567890ABC', $generator::TYPE_CODE_39_CHECKSUM);
1919

2020
$this->assertGreaterThan(100, strlen($result));
2121
}
2222

23+
public function test_generator_can_generate_code_39_extended_barcode()
24+
{
25+
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
26+
$result = $generator->getBarcode('1234567890abcABC', $generator::TYPE_CODE_39E);
27+
28+
$this->assertStringEqualsFile('tests/verified-files/C39E-1234567890abcABC.svg', $result);
29+
}
30+
2331
public function test_generator_can_generate_code_39_extended_checksum_barcode()
2432
{
2533
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();

tests/VerifiedBarcodeTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
class VerifiedBarcodeTest extends TestCase
1515
{
1616
public static $supportedBarcodes = [
17-
['type' => BarcodeGenerator::TYPE_CODE_39, 'barcodes' => ['1234567890abcABC']],
18-
['type' => BarcodeGenerator::TYPE_CODE_39_CHECKSUM, 'barcodes' => ['1234567890abcABC']],
17+
['type' => BarcodeGenerator::TYPE_CODE_39, 'barcodes' => ['1234567890ABC']],
18+
['type' => BarcodeGenerator::TYPE_CODE_39_CHECKSUM, 'barcodes' => ['1234567890ABC']],
19+
['type' => BarcodeGenerator::TYPE_CODE_39E, 'barcodes' => ['1234567890abcABC']],
1920
['type' => BarcodeGenerator::TYPE_CODE_39E_CHECKSUM, 'barcodes' => ['1234567890abcABC']],
2021
['type' => BarcodeGenerator::TYPE_CODE_93, 'barcodes' => ['1234567890abcABC']],
2122
['type' => BarcodeGenerator::TYPE_STANDARD_2_5, 'barcodes' => ['1234567890']],

tests/verified-files/C39-1234567890abcABC.svg renamed to tests/verified-files/C39+-1234567890ABC.svg

+11-21
Loading

tests/verified-files/C39+-1234567890abcABC.svg renamed to tests/verified-files/C39-1234567890ABC.svg

+6-26
Loading

tests/verified-files/C39E+-1234567890abcABC.svg

+37-22
Loading
Loading

0 commit comments

Comments
 (0)