mirror of
https://github.com/chillerlan/php-qrcode.git
synced 2026-08-18 20:50:04 +00:00
:octocat: MaskPattern::$currentPattern: remove property getter in favor of asymmetric visibility
This commit is contained in:
@@ -184,7 +184,7 @@ final class EccLevel{
|
||||
* returns the format pattern for the given $eccLevel and $maskPattern
|
||||
*/
|
||||
public function getformatPattern(MaskPattern $maskPattern):int{
|
||||
return self::FORMAT_PATTERN[$this->getOrdinal()][$maskPattern->getPattern()];
|
||||
return self::FORMAT_PATTERN[$this->getOrdinal()][$maskPattern->currentPattern];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -67,7 +67,7 @@ final class MaskPattern{
|
||||
/**
|
||||
* The current mask pattern value (0-7)
|
||||
*/
|
||||
private int $maskPattern;
|
||||
private(set) int $currentPattern;
|
||||
|
||||
/**
|
||||
* MaskPattern constructor.
|
||||
@@ -80,14 +80,7 @@ final class MaskPattern{
|
||||
throw new QRCodeException('invalid mask pattern');
|
||||
}
|
||||
|
||||
$this->maskPattern = $maskPattern;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current mask pattern
|
||||
*/
|
||||
public function getPattern():int{
|
||||
return $this->maskPattern;
|
||||
$this->currentPattern = $maskPattern;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -110,7 +103,7 @@ final class MaskPattern{
|
||||
self::PATTERN_101 => fn(int $x, int $y):bool => (($x * $y) % 6) === 0,
|
||||
self::PATTERN_110 => fn(int $x, int $y):bool => (($x * $y) % 6) < 3,
|
||||
self::PATTERN_111 => fn(int $x, int $y):bool => (($x + $y + (($x * $y) % 3)) % 2) === 0,
|
||||
][$this->maskPattern];
|
||||
][$this->currentPattern];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -80,7 +80,7 @@ class QRMarkupXML extends QRMarkup{
|
||||
|
||||
$matrix->setAttribute('size', (string)$dimension);
|
||||
$matrix->setAttribute('quietzoneSize', (string)(int)(($this->moduleCount - $dimension) / 2));
|
||||
$matrix->setAttribute('maskPattern', (string)$this->matrix->maskPattern->getPattern());
|
||||
$matrix->setAttribute('maskPattern', (string)$this->matrix->maskPattern->currentPattern);
|
||||
$matrix->setAttribute('width', (string)$width);
|
||||
$matrix->setAttribute('height', (string)$height);
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ class QRStringJSON extends QROutputAbstract{
|
||||
'matrix' => [
|
||||
'size' => $dimension,
|
||||
'quietzoneSize' => (int)(($this->moduleCount - $dimension) / 2),
|
||||
'maskPattern' => $this->matrix->maskPattern->getPattern(),
|
||||
'maskPattern' => $this->matrix->maskPattern->currentPattern,
|
||||
'width' => $width,
|
||||
'height' => $height,
|
||||
'rows' => [],
|
||||
|
||||
@@ -59,7 +59,7 @@ abstract class DataInterfaceTestAbstract extends TestCase{
|
||||
$matrix = $this->QRData->writeMatrix()->setFormatInfo($maskPattern)->mask($maskPattern);
|
||||
|
||||
$this::assertInstanceOf(QRMatrix::class, $matrix);
|
||||
$this::assertSame($pattern, $matrix->maskPattern->getPattern());
|
||||
$this::assertSame($pattern, $matrix->maskPattern->currentPattern);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -71,7 +71,7 @@ final class QRMatrixTest extends TestCase{
|
||||
$matrix = new QRCode()->addByteSegment('testdata')->getQRMatrix();
|
||||
|
||||
$this::assertInstanceOf(MaskPattern::class, $matrix->maskPattern);
|
||||
$this::assertSame(MaskPattern::PATTERN_100, $matrix->maskPattern->getPattern());
|
||||
$this::assertSame(MaskPattern::PATTERN_100, $matrix->maskPattern->currentPattern);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user