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

🚿 rename QRMatrix::checkTypes() to checkTypeNotIn() and switch return value to better reflect what it actually does

Browse Source
This commit is contained in:
smiley
2022-06-06 07:43:16 +02:00
parent 9aad8fbbdf
commit 1f435dfd54
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Data/QRMatrix.php
+5 -4
View File
@@ -211,17 +211,18 @@ class QRMatrix{
}
/**
* checks whether a module matches one of the given $M_TYPES
* checks whether the module at ($x, $y) is not in the given array of $M_TYPES,
* returns true if no matches are found, otherwise false.
*/
public function checkTypes(int $x, int $y, array $M_TYPES):bool{
public function checkTypeNotIn(int $x, int $y, array $M_TYPES):bool{
foreach($M_TYPES as $type){
if($this->checkType($x, $y, $type)){
return true;
return false;
}
}
return false;
return true;
}
/**
src/Output/QRGdImage.php
+1 -1
View File
@@ -147,7 +147,7 @@ class QRGdImage extends QROutputAbstract{
/** @phan-suppress-next-line PhanParamTooFewInternalUnpack */
$color = imagecolorallocate($this->image, ...$this->moduleValues[$M_TYPE]);
$this->options->drawCircularModules && !$this->matrix->checkTypes($x, $y, $this->options->keepAsSquare)
$this->options->drawCircularModules && $this->matrix->checkTypeNotIn($x, $y, $this->options->keepAsSquare)
? imagefilledellipse(
$this->image,
($x * $this->scale) + ($this->scale / 2),
src/Output/QRImagick.php
+1 -1
View File
@@ -121,7 +121,7 @@ class QRImagick extends QROutputAbstract{
$this->imagickDraw->setStrokeColor($this->moduleValues[$M_TYPE]);
$this->imagickDraw->setFillColor($this->moduleValues[$M_TYPE]);
$this->options->drawCircularModules && !$this->matrix->checkTypes($x, $y, $this->options->keepAsSquare)
$this->options->drawCircularModules && $this->matrix->checkTypeNotIn($x, $y, $this->options->keepAsSquare)
? $this->imagickDraw->circle(
($x + 0.5) * $this->scale,
($y + 0.5) * $this->scale,
src/Output/QRMarkup.php
+1 -1
View File
@@ -188,7 +188,7 @@ class QRMarkup extends QROutputAbstract{
return '';
}
if($this->options->drawCircularModules && !$this->matrix->checkTypes($x, $y, $this->options->keepAsSquare)){
if($this->options->drawCircularModules && $this->matrix->checkTypeNotIn($x, $y, $this->options->keepAsSquare)){
$r = $this->options->circleRadius;
return sprintf(
src/Output/QROutputAbstract.php
+1 -1
View File
@@ -142,7 +142,7 @@ abstract class QROutputAbstract implements QROutputInterface{
foreach($this->matrix->matrix() as $y => $row){
foreach($row as $x => $M_TYPE){
if($this->options->connectPaths && !$this->matrix->checkTypes($x, $y, $this->options->excludeFromConnect)){
if($this->options->connectPaths && $this->matrix->checkTypeNotIn($x, $y, $this->options->excludeFromConnect)){
// to connect paths we'll redeclare the $M_TYPE to data only
$M_TYPE = QRMatrix::M_DATA;