geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-29 19:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into php-7.4

Browse Source 
# Conflicts:
#	composer.json
#	src/Output/QROutputAbstract.php
#	src/QROptionsTrait.php
This commit is contained in:
codemasher
2019-08-09 21:47:27 +02:00
parent da71e4dec9 464667f452
commit 76afbbb70d
18 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Data/QRDataAbstract.php
+19 -18
View File
@@ -16,6 +16,8 @@ use chillerlan\QRCode\{QRCode, QRCodeException};
use chillerlan\QRCode\Helpers\{BitBuffer, Polynomial};
use chillerlan\Settings\SettingsContainerInterface;
use function array_fill, array_merge, count, max, mb_convert_encoding, mb_detect_encoding, range, sprintf, strlen;
/**
* Processes the binary data and maps it on a matrix which is then being returned
*/
@@ -78,7 +80,7 @@ abstract class QRDataAbstract implements QRDataInterface{
public function setData(string $data):QRDataInterface{
if($this->datamode === QRCode::DATA_KANJI){
$data = \mb_convert_encoding($data, 'SJIS', \mb_detect_encoding($data));
$data = mb_convert_encoding($data, 'SJIS', mb_detect_encoding($data));
}
$this->strlen = $this->getLength($data);
@@ -126,14 +128,14 @@ abstract class QRDataAbstract implements QRDataInterface{
}
}
throw new QRCodeDataException('invalid version number: '.$this->version);
throw new QRCodeDataException(sprintf('invalid version number: %d', $this->version));
}
/**
* returns the byte count of the $data string
*/
protected function getLength(string $data):int{
return \strlen($data);
return strlen($data);
}
/**
@@ -145,7 +147,7 @@ abstract class QRDataAbstract implements QRDataInterface{
$maxlength = 0;
// guess the version number within the given range
foreach(\range($this->options->versionMin, $this->options->versionMax) as $version){
foreach(range($this->options->versionMin, $this->options->versionMax) as $version){
$maxlength = $this::MAX_LENGTH[$version][QRCode::DATA_MODES[$this->datamode]][QRCode::ECC_MODES[$this->options->eccLevel]];
if($this->strlen <= $maxlength){
@@ -153,7 +155,7 @@ abstract class QRDataAbstract implements QRDataInterface{
}
}
throw new QRCodeDataException('data exceeds '.$maxlength.' characters');
throw new QRCodeDataException(sprintf('data exceeds %d characters', $maxlength));
}
/**
@@ -169,7 +171,6 @@ abstract class QRDataAbstract implements QRDataInterface{
protected function writeBitBuffer(string $data):QRDataInterface{
$this->bitBuffer = new BitBuffer;
// @todo: fixme, get real length
$MAX_BITS = $this::MAX_BITS[$this->version][QRCode::ECC_MODES[$this->options->eccLevel]];
$this->bitBuffer
@@ -182,7 +183,7 @@ abstract class QRDataAbstract implements QRDataInterface{
// there was an error writing the BitBuffer data, which is... unlikely.
if($this->bitBuffer->length > $MAX_BITS){
throw new QRCodeException('code length overflow. ('.$this->bitBuffer->length.' > '.$MAX_BITS.'bit)'); // @codeCoverageIgnore
throw new QRCodeException(sprintf('code length overflow. (%d > %d bit)', $this->bitBuffer->length, $MAX_BITS)); // @codeCoverageIgnore
}
// end code.
@@ -224,13 +225,13 @@ abstract class QRDataAbstract implements QRDataInterface{
protected function maskECC():array{
[$l1, $l2, $b1, $b2] = $this::RSBLOCKS[$this->version][QRCode::ECC_MODES[$this->options->eccLevel]];
$rsBlocks = \array_fill(0, $l1, [$b1, $b2]);
$rsBlocks = array_fill(0, $l1, [$b1, $b2]);
$rsCount = $l1 + $l2;
$this->ecdata = \array_fill(0, $rsCount, null);
$this->ecdata = array_fill(0, $rsCount, null);
$this->dcdata = $this->ecdata;
if($l2 > 0){
$rsBlocks = \array_merge($rsBlocks, \array_fill(0, $l2, [$b1 + 1, $b2 + 1]));
$rsBlocks = array_merge($rsBlocks, array_fill(0, $l2, [$b1 + 1, $b2 + 1]));
}
$totalCodeCount = 0;
@@ -242,9 +243,9 @@ abstract class QRDataAbstract implements QRDataInterface{
[$rsBlockTotal, $dcCount] = $block;
$ecCount = $rsBlockTotal - $dcCount;
$maxDcCount = \max($maxDcCount, $dcCount);
$maxEcCount = \max($maxEcCount, $ecCount);
$this->dcdata[$key] = \array_fill(0, $dcCount, null);
$maxDcCount = max($maxDcCount, $dcCount);
$maxEcCount = max($maxEcCount, $ecCount);
$this->dcdata[$key] = array_fill(0, $dcCount, null);
foreach($this->dcdata[$key] as $a => $_z){
$this->dcdata[$key][$a] = 0xff & $this->bitBuffer->buffer[$a + $offset];
@@ -261,13 +262,13 @@ abstract class QRDataAbstract implements QRDataInterface{
$totalCodeCount += $rsBlockTotal;
}
$data = \array_fill(0, $totalCodeCount, null);
$data = array_fill(0, $totalCodeCount, null);
$index = 0;
$mask = function(array $arr, int $count) use (&$data, &$index, $rsCount){
for($x = 0; $x < $count; $x++){
for($y = 0; $y < $rsCount; $y++){
if($x < \count($arr[$y])){
if($x < count($arr[$y])){
$data[$index] = $arr[$y][$x];
$index++;
}
@@ -293,19 +294,19 @@ abstract class QRDataAbstract implements QRDataInterface{
$rsPoly->multiply($modPoly->getNum());
}
$rsPolyCount = \count($rsPoly->getNum());
$rsPolyCount = count($rsPoly->getNum());
$modPoly
->setNum($this->dcdata[$key], $rsPolyCount - 1)
->mod($rsPoly->getNum())
;
$this->ecdata[$key] = \array_fill(0, $rsPolyCount - 1, null);
$this->ecdata[$key] = array_fill(0, $rsPolyCount - 1, null);
$num = $modPoly->getNum();
return [
$num,
\count($num) - \count($this->ecdata[$key]),
count($num) - count($this->ecdata[$key]),
];
}