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

:octocat: QRMatrix::getBitBuffer() remove property getter in favor of asymmetric visibility

Browse Source
This commit is contained in:
smiley
2026-03-18 01:42:32 +01:00
parent 63d2a08933
commit d51f7a7e8c
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
benchmark/QRDataBenchmark.php
+1 -1
View File
@@ -41,7 +41,7 @@ final class QRDataBenchmark extends BenchmarkAbstract{
} }
public function initBitBuffer():void{ public function initBitBuffer():void{
$this->bitBuffer = $this->qrData->getBitBuffer(); $this->bitBuffer = $this->qrData->bitBuffer;
$this->bitBuffer->read(4); // read data mode indicator $this->bitBuffer->read(4); // read data mode indicator
} }
src/Data/QRData.php
+1 -10
View File
@@ -29,7 +29,7 @@ final class QRData{
/** /**
* a BitBuffer instance * a BitBuffer instance
*/ */
private BitBuffer $bitBuffer; private(set) BitBuffer $bitBuffer;
/** /**
* an EccLevel instance * an EccLevel instance
@@ -84,15 +84,6 @@ final class QRData{
return $this; return $this;
} }
/**
* Returns the current BitBuffer instance
*
* @codeCoverageIgnore
*/
public function getBitBuffer():BitBuffer{
return $this->bitBuffer;
}
/** /**
* Sets a BitBuffer object * Sets a BitBuffer object
* *
tests/Data/DataInterfaceTestAbstract.php
+3 -3
View File
@@ -125,7 +125,7 @@ abstract class DataInterfaceTestAbstract extends TestCase{
// invoke a QRData instance and write data // invoke a QRData instance and write data
$this->QRData = new QRData($options, [$this->dataMode]); $this->QRData = new QRData($options, [$this->dataMode]);
// get the filled bitbuffer // get the filled bitbuffer
$bitBuffer = $this->QRData->getBitBuffer(); $bitBuffer = $this->QRData->bitBuffer;
// read the first 4 bits // read the first 4 bits
$this::assertSame($this->dataMode::DATAMODE, $bitBuffer->read(4)); $this::assertSame($this->dataMode::DATAMODE, $bitBuffer->read(4));
// decode the data // decode the data
@@ -184,7 +184,7 @@ abstract class DataInterfaceTestAbstract extends TestCase{
$this->dataMode = static::getDataModeInterface($str); $this->dataMode = static::getDataModeInterface($str);
$this->QRData = new QRData($options, [$this->dataMode]); $this->QRData = new QRData($options, [$this->dataMode]);
$bitBuffer = $this->QRData->getBitBuffer(); $bitBuffer = $this->QRData->bitBuffer;
$this::assertSame($this->dataMode::DATAMODE, $bitBuffer->read(4)); $this::assertSame($this->dataMode::DATAMODE, $bitBuffer->read(4));
$this::assertSame($str, $this->dataMode->decodeSegment($bitBuffer, $options->version)); $this::assertSame($str, $this->dataMode->decodeSegment($bitBuffer, $options->version));
@@ -203,7 +203,7 @@ abstract class DataInterfaceTestAbstract extends TestCase{
$this->dataMode = static::getDataModeInterface($str); $this->dataMode = static::getDataModeInterface($str);
$this->QRData = new QRData($options, [$this->dataMode]); $this->QRData = new QRData($options, [$this->dataMode]);
$bitBuffer = $this->QRData->getBitBuffer(); $bitBuffer = $this->QRData->bitBuffer;
$this::assertLessThanOrEqual($eccLevel->getMaxBitsForVersion($version), $this->QRData->estimateTotalBitLength()); $this::assertLessThanOrEqual($eccLevel->getMaxBitsForVersion($version), $this->QRData->estimateTotalBitLength());
tests/Data/ECITest.php
+3 -3
View File
@@ -63,7 +63,7 @@ final class ECITest extends TestCase{
// invoke a QRData instance and write data // invoke a QRData instance and write data
$this->QRData = new QRData($options, $segments); $this->QRData = new QRData($options, $segments);
// get the filled bitbuffer // get the filled bitbuffer
$bitBuffer = $this->QRData->getBitBuffer(); $bitBuffer = $this->QRData->bitBuffer;
// read the first 4 bits // read the first 4 bits
$this::assertSame($segments[0]::DATAMODE, $bitBuffer->read(4)); $this::assertSame($segments[0]::DATAMODE, $bitBuffer->read(4));
// decode the data // decode the data
@@ -130,7 +130,7 @@ final class ECITest extends TestCase{
$segments = $this->getDataSegments(); $segments = $this->getDataSegments();
// follow the ECI segment by a non-8bit-byte segment // follow the ECI segment by a non-8bit-byte segment
$segments[1] = new Hanzi(self::testData); $segments[1] = new Hanzi(self::testData);
$bitBuffer = new QRData($options, $segments)->getBitBuffer(); $bitBuffer = new QRData($options, $segments)->bitBuffer;
// verify the ECI mode indicator // verify the ECI mode indicator
$this::assertSame(Mode::ECI, $bitBuffer->read(4)); $this::assertSame(Mode::ECI, $bitBuffer->read(4));
// throw // throw
@@ -157,7 +157,7 @@ final class ECITest extends TestCase{
$options->version = 5; $options->version = 5;
$segments = [new ECI($id), new Byte($data)]; $segments = [new ECI($id), new Byte($data)];
$bitBuffer = new QRData($options, $segments)->getBitBuffer(); $bitBuffer = new QRData($options, $segments)->bitBuffer;
$this::assertSame(Mode::ECI, $bitBuffer->read(4)); $this::assertSame(Mode::ECI, $bitBuffer->read(4));
$this::assertSame($data, new ECI()->decodeSegment($bitBuffer, $options->version)); $this::assertSame($data, new ECI()->decodeSegment($bitBuffer, $options->version));
} }