Skip to content

Commit 5be2b84

Browse files
committed
Fix invalid chars in test files filename #94
1 parent fd18d04 commit 5be2b84

8 files changed

+20
-8
lines changed

examples.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ These are examples of supported barcodes with this library.
4848

4949
![Barcode 081231723897 as C128](tests/verified-files/C128-081231723897.svg)
5050

51-
![Barcode 1234567890abcABC-283*33 as C128](tests/verified-files/C128-1234567890abcABC-283*33.svg)
51+
![Barcode 1234567890abcABC-283*33 as C128](tests/verified-files/C128-1234567890abcABC-283-33.svg)
5252

5353
### C128A
5454

@@ -58,15 +58,15 @@ These are examples of supported barcodes with this library.
5858

5959
![Barcode 081231723897 as C128B](tests/verified-files/C128B-081231723897.svg)
6060

61-
![Barcode 1234567890abcABC-283*33 as C128B](tests/verified-files/C128B-1234567890abcABC-283*33.svg)
61+
![Barcode 1234567890abcABC-283*33 as C128B](tests/verified-files/C128B-1234567890abcABC-283-33.svg)
6262

6363
### EAN2
6464

6565
![Barcode 22 as EAN2](tests/verified-files/EAN2-22.svg)
6666

6767
### EAN5
6868

69-
![Barcode 1234567890abcABC-283*33 as EAN5](tests/verified-files/EAN5-1234567890abcABC-283*33.svg)
69+
![Barcode 1234567890abcABC-283*33 as EAN5](tests/verified-files/EAN5-1234567890abcABC-283-33.svg)
7070

7171
### EAN8
7272

generate-examples.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
function getSaveFilename($value) {
4+
return preg_replace('/[^a-zA-Z0-9_ \-+]/s', '-', $value);
5+
}
6+
37
require('vendor/autoload.php');
48
require(__DIR__ . '/tests/VerifiedBarcodeTest.php');
59
$verifiedFiles = VerifiedBarcodeTest::$supportedBarcodes;
@@ -12,7 +16,7 @@
1216
foreach ($verifiedFiles as $verifiedFile) {
1317
$result[] = '### ' . $verifiedFile['type'];
1418
foreach ($verifiedFile['barcodes'] as $barcode) {
15-
$result[] = sprintf('![Barcode %s as %s](tests/verified-files/%s-%s.svg)', $barcode, $verifiedFile['type'], $verifiedFile['type'], $barcode);
19+
$result[] = sprintf('![Barcode %s as %s](tests/verified-files/%s.svg)', $barcode, $verifiedFile['type'], getSaveFilename($verifiedFile['type'] . '-' . $barcode));
1620
}
1721
}
1822

generate-verified-files.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
require('vendor/autoload.php');
44

5+
function getSaveFilename($value) {
6+
return preg_replace('/[^a-zA-Z0-9_ \-+]/s', '-', $value);
7+
}
8+
59
$generatorSVG = new Picqer\Barcode\BarcodeGeneratorSVG();
610
file_put_contents('tests/verified-files/081231723897-ean13.svg', $generatorSVG->getBarcode('081231723897', $generatorSVG::TYPE_EAN_13));
711

@@ -19,6 +23,6 @@
1923
$generatorSVG = new Picqer\Barcode\BarcodeGeneratorSVG();
2024
foreach ($verifiedFiles as $verifiedFile) {
2125
foreach ($verifiedFile['barcodes'] as $barcode) {
22-
file_put_contents('tests/verified-files/' . $verifiedFile['type'] . '-' . $barcode . '.svg', $generatorSVG->getBarcode($barcode, $verifiedFile['type']));
26+
file_put_contents('tests/verified-files/' . getSaveFilename($verifiedFile['type'] . '-' . $barcode) . '.svg', $generatorSVG->getBarcode($barcode, $verifiedFile['type']));
2327
}
2428
}

tests/TypesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function test_generator_can_generate_code_128_barcode()
7373
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
7474
$result = $generator->getBarcode('1234567890abcABC-283*33', $generator::TYPE_CODE_128);
7575

76-
$this->assertStringEqualsFile('tests/verified-files/C128-1234567890abcABC-283*33.svg', $result);
76+
$this->assertStringEqualsFile('tests/verified-files/C128-1234567890abcABC-283-33.svg', $result);
7777
}
7878

7979
public function test_generator_can_generate_code_128_a_barcode()
@@ -89,7 +89,7 @@ public function test_generator_can_generate_code_128_b_barcode()
8989
$generator = new Picqer\Barcode\BarcodeGeneratorSVG();
9090
$result = $generator->getBarcode('1234567890abcABC-283*33', $generator::TYPE_CODE_128_B);
9191

92-
$this->assertStringEqualsFile('tests/verified-files/C128B-1234567890abcABC-283*33.svg', $result);
92+
$this->assertStringEqualsFile('tests/verified-files/C128B-1234567890abcABC-283-33.svg', $result);
9393
}
9494

9595
public function test_generator_can_generate_ean_2_barcode()

tests/VerifiedBarcodeTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ public function testAllSupportedBarcodeTypes()
5353
$result = $generator->getBarcode($barcode, $barcodeTestSet['type']);
5454

5555
$this->assertStringEqualsFile(
56-
sprintf('tests/verified-files/%s-%s.svg', $barcodeTestSet['type'], $barcode),
56+
sprintf('tests/verified-files/%s.svg', $this->getSaveFilename($barcodeTestSet['type'] . '-' . $barcode)),
5757
$result,
5858
sprintf('%s x %s dynamic test failed', $barcodeTestSet['type'], $barcode)
5959
);
6060
}
6161
}
6262
}
63+
64+
protected function getSaveFilename($value) {
65+
return preg_replace('/[^a-zA-Z0-9_ \-+]/s', '-', $value);
66+
}
6367
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)