geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-09-14 19:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

:octocat: allow for ECI encoded numeric and alphanum segments (???), see https://github.com/chillerlan/php-qrcode/discussions/289

Browse Source
This commit is contained in:
smiley
2024-11-16 19:27:59 +01:00
parent 052c7c66fb
commit 1d8b7fd8ba
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/reader.php
+1 -1
View File
@@ -25,7 +25,7 @@ try{
var_dump($result);
}
catch(Throwable $e){
echo $e->getMessage();
printf("%s(%s): %s\n%s", $e->getFile(), $e->getLine(), $e->getMessage(), $e->getTraceAsString());
}
exit;
src/Data/ECI.php
+13 -7
View File
@@ -124,17 +124,23 @@ final class ECI extends QRDataModeAbstract{
public static function decodeSegment(BitBuffer $bitBuffer, int $versionNumber):string{
$eciCharset = self::parseValue($bitBuffer);
$nextMode = $bitBuffer->read(4);
$encoding = $eciCharset->getName();
if($nextMode !== Mode::BYTE){
throw new QRCodeDataException(sprintf('ECI designator followed by invalid mode: "%04b"', $nextMode));
}
$data = Byte::decodeSegment($bitBuffer, $versionNumber);
$encoding = $eciCharset->getName();
// this is definitely weird, but there are QR Codes out in the wild
// that have ECI followed by numeric and alphanum segments
// @see https://github.com/chillerlan/php-qrcode/discussions/289
$data = match($nextMode){
Mode::NUMBER => Number::decodeSegment($bitBuffer, $versionNumber),
Mode::ALPHANUM => AlphaNum::decodeSegment($bitBuffer, $versionNumber),
Mode::BYTE => Byte::decodeSegment($bitBuffer, $versionNumber),
default => throw new QRCodeDataException(
sprintf('ECI designator followed by invalid mode: "%04b"', $nextMode),
),
};
if($encoding === null){
// The spec isn't clear on this mode; see
// section 6.4.5: t does not say which encoding to assuming
// section 6.4.5: it does not say which encoding to assuming
// upon decoding. I have seen ISO-8859-1 used as well as
// Shift_JIS -- without anything like an ECI designator to
// give a hint.