@@ -66,8 +66,8 @@ |
||
66 | 66 | private int $dataMask; |
67 | 67 | |
68 | 68 | public function __construct(int $formatInfo){ |
69 | - $this->errorCorrectionLevel = ($formatInfo >> 3) & 0x03; // Bits 3,4 |
|
70 | - $this->dataMask = ($formatInfo & 0x07); // Bottom 3 bits |
|
69 | + $this->errorCorrectionLevel = ($formatInfo >> 3)&0x03; // Bits 3,4 |
|
70 | + $this->dataMask = ($formatInfo&0x07); // Bottom 3 bits |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | public function getErrorCorrectionLevel():EccLevel{ |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | // Black pixel |
79 | 79 | if($this->bitMatrix->get($j, $i)){ |
80 | 80 | // Counting white pixels |
81 | - if(($currentState & 1) === 1){ |
|
81 | + if(($currentState&1) === 1){ |
|
82 | 82 | $currentState++; |
83 | 83 | } |
84 | 84 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | // White pixel |
88 | 88 | else{ |
89 | 89 | // Counting black pixels |
90 | - if(($currentState & 1) === 0){ |
|
90 | + if(($currentState&1) === 0){ |
|
91 | 91 | // A winner? |
92 | 92 | if($currentState === 4){ |
93 | 93 | // Yes |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | * |
340 | 340 | * @return float|null vertical center of finder pattern, or null if not found |
341 | 341 | */ |
342 | - private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal):?float{ |
|
342 | + private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal): ?float{ |
|
343 | 343 | $maxI = $this->bitMatrix->getDimension(); |
344 | 344 | $stateCount = $this->getCrossCheckStateCount(); |
345 | 345 | |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | * except it reads horizontally instead of vertically. This is used to cross-cross |
423 | 423 | * check a vertical cross check and locate the real center of the alignment pattern.</p> |
424 | 424 | */ |
425 | - private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal):?float{ |
|
425 | + private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal): ?float{ |
|
426 | 426 | $maxJ = $this->bitMatrix->getDimension(); |
427 | 427 | $stateCount = $this->getCrossCheckStateCount(); |
428 | 428 |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | $otherToX = (int)($fromX + ($otherToX - $fromX) * $scale); |
164 | - $result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, (int)$otherToX, (int)$otherToY); |
|
164 | + $result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, (int)$otherToX, (int)$otherToY); |
|
165 | 165 | |
166 | 166 | // Middle pixel is double-counted this way; subtract 1 |
167 | 167 | return $result - 1.0; |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | int $estAlignmentX, |
292 | 292 | int $estAlignmentY, |
293 | 293 | float $allowanceFactor |
294 | - ):?AlignmentPattern{ |
|
294 | + ): ?AlignmentPattern{ |
|
295 | 295 | // Look for an alignment pattern (3 modules in size) around where it should be |
296 | 296 | $dimension = $this->bitMatrix->getDimension(); |
297 | 297 | $allowance = (int)($allowanceFactor * $overallEstModuleSize); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $eccLevel = $parser->readFormatInformation()->getErrorCorrectionLevel(); |
96 | 96 | |
97 | 97 | // Read raw codewords |
98 | - $rawCodewords = $parser->readCodewords(); |
|
98 | + $rawCodewords = $parser->readCodewords(); |
|
99 | 99 | // Separate into data blocks |
100 | 100 | $dataBlocks = $this->getDataBlocks($rawCodewords, $version, $eccLevel); |
101 | 101 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | [$numEccCodewords, $eccBlocks] = $version->getRSBlocks($eccLevel); |
141 | 141 | |
142 | 142 | // Now establish DataBlocks of the appropriate size and number of data codewords |
143 | - $result = [];//new DataBlock[$totalBlocks]; |
|
143 | + $result = []; //new DataBlock[$totalBlocks]; |
|
144 | 144 | $numResultBlocks = 0; |
145 | 145 | |
146 | 146 | foreach($eccBlocks as $blockData){ |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | $codewordsInts = []; |
207 | 207 | |
208 | 208 | foreach($codewordBytes as $i => $codewordByte){ |
209 | - $codewordsInts[$i] = $codewordByte & 0xFF; |
|
209 | + $codewordsInts[$i] = $codewordByte&0xFF; |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | $decoded = (new ReedSolomonDecoder)->decode($codewordsInts, (count($codewordBytes) - $numDataCodewords)); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | $countPixels = count($pixels); |
47 | 47 | |
48 | 48 | for($i = 0; $i < $countPixels; $i += 3){ |
49 | - $this->setLuminancePixel($pixels[$i] & 0xff, $pixels[$i + 1] & 0xff, $pixels[$i + 2] & 0xff); |
|
49 | + $this->setLuminancePixel($pixels[$i]&0xff, $pixels[$i + 1]&0xff, $pixels[$i + 2]&0xff); |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 |
@@ -57,19 +57,19 @@ |
||
57 | 57 | public static function parseValue(BitBuffer $bitBuffer):ECICharset{ |
58 | 58 | $firstByte = $bitBuffer->read(8); |
59 | 59 | |
60 | - if(($firstByte & 0x80) === 0){ |
|
60 | + if(($firstByte&0x80) === 0){ |
|
61 | 61 | // just one byte |
62 | - return new ECICharset($firstByte & 0x7f); |
|
62 | + return new ECICharset($firstByte&0x7f); |
|
63 | 63 | } |
64 | 64 | |
65 | - if(($firstByte & 0xc0) === 0x80){ |
|
65 | + if(($firstByte&0xc0) === 0x80){ |
|
66 | 66 | // two bytes |
67 | - return new ECICharset((($firstByte & 0x3f) << 8) | $bitBuffer->read(8)); |
|
67 | + return new ECICharset((($firstByte&0x3f) << 8)|$bitBuffer->read(8)); |
|
68 | 68 | } |
69 | 69 | |
70 | - if(($firstByte & 0xe0) === 0xC0){ |
|
70 | + if(($firstByte&0xe0) === 0xC0){ |
|
71 | 71 | // three bytes |
72 | - return new ECICharset((($firstByte & 0x1f) << 16) | $bitBuffer->read(16)); |
|
72 | + return new ECICharset((($firstByte&0x1f) << 16)|$bitBuffer->read(16)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | throw new QRCodeDataException('error decoding ECI value'); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * |
59 | 59 | * @return \chillerlan\QRCode\Detector\AlignmentPattern|null |
60 | 60 | */ |
61 | - public function find(int $startX, int $startY, int $width, int $height):?AlignmentPattern{ |
|
61 | + public function find(int $startX, int $startY, int $width, int $height): ?AlignmentPattern{ |
|
62 | 62 | $maxJ = $startX + $width; |
63 | 63 | $middleI = $startY + ($height / 2); |
64 | 64 | $stateCount = []; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | // this tracks the number of black/white/black modules seen so far |
68 | 68 | for($iGen = 0; $iGen < $height; $iGen++){ |
69 | 69 | // Search from middle outwards |
70 | - $i = (int)($middleI + (($iGen & 0x01) === 0 ? ($iGen + 1) / 2 : -(($iGen + 1) / 2))); |
|
70 | + $i = (int)($middleI + (($iGen&0x01) === 0 ? ($iGen + 1) / 2 : -(($iGen + 1) / 2))); |
|
71 | 71 | $stateCount[0] = 0; |
72 | 72 | $stateCount[1] = 0; |
73 | 73 | $stateCount[2] = 0; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * |
175 | 175 | * @return \chillerlan\QRCode\Detector\AlignmentPattern|null if we have found the same pattern twice, or null if not |
176 | 176 | */ |
177 | - private function handlePossibleCenter(array $stateCount, int $i, int $j):?AlignmentPattern{ |
|
177 | + private function handlePossibleCenter(array $stateCount, int $i, int $j): ?AlignmentPattern{ |
|
178 | 178 | $stateCountTotal = $stateCount[0] + $stateCount[1] + $stateCount[2]; |
179 | 179 | $centerJ = $this->centerFromEnd($stateCount, $j); |
180 | 180 | $centerI = $this->crossCheckVertical($i, (int)$centerJ, 2 * $stateCount[1], $stateCountTotal); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @return float|null vertical center of alignment pattern, or null if not found |
225 | 225 | */ |
226 | - private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal):?float{ |
|
226 | + private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal): ?float{ |
|
227 | 227 | $maxI = $this->bitMatrix->getDimension(); |
228 | 228 | $stateCount = []; |
229 | 229 | $stateCount[0] = 0; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $offset = (int)($y * $this->rowSize + ($x / 0x20)); |
38 | 38 | |
39 | 39 | $this->bits[$offset] ??= 0; |
40 | - $this->bits[$offset] |= ($this->bits[$offset] |= 1 << ($x & 0x1f)); |
|
40 | + $this->bits[$offset] |= ($this->bits[$offset] |= 1 << ($x&0x1f)); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function flip(int $x, int $y):void{ |
50 | 50 | $offset = $y * $this->rowSize + (int)($x / 0x20); |
51 | 51 | |
52 | - $this->bits[$offset] = ($this->bits[$offset] ^ (1 << ($x & 0x1f))); |
|
52 | + $this->bits[$offset] = ($this->bits[$offset]^(1 << ($x&0x1f))); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | for($x = $left; $x < $right; $x++){ |
86 | 86 | $xOffset = $yOffset + (int)($x / 0x20); |
87 | - $this->bits[$xOffset] = ($this->bits[$xOffset] |= 1 << ($x & 0x1f)); |
|
87 | + $this->bits[$xOffset] = ($this->bits[$xOffset] |= 1 << ($x&0x1f)); |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | $this->bits[$offset] ??= 0; |
111 | 111 | |
112 | - return (BitMatrixParser::uRShift($this->bits[$offset], ($x & 0x1f)) & 1) !== 0; |
|
112 | + return (BitMatrixParser::uRShift($this->bits[$offset], ($x&0x1f))&1) !== 0; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ? $this->bitMatrix->get($j, $i) |
68 | 68 | : $this->bitMatrix->get($i, $j); |
69 | 69 | |
70 | - return $bit ? ($versionBits << 1) | 0x1 : $versionBits << 1; |
|
70 | + return $bit ? ($versionBits << 1)|0x1 : $versionBits << 1; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | // Should return null, but, some QR codes apparently do not mask this info. |
187 | 187 | // Try again by actually masking the pattern first. |
188 | 188 | $this->parsedFormatInfo = $this->doDecodeFormatInformation( |
189 | - $formatInfoBits1 ^ FormatInformation::MASK_QR, |
|
190 | - $formatInfoBits2 ^ FormatInformation::MASK_QR |
|
189 | + $formatInfoBits1^FormatInformation::MASK_QR, |
|
190 | + $formatInfoBits2^FormatInformation::MASK_QR |
|
191 | 191 | ); |
192 | 192 | |
193 | 193 | if($this->parsedFormatInfo !== null){ |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | * @return \chillerlan\QRCode\Common\FormatInformation|null information about the format it specifies, or null |
206 | 206 | * if doesn't seem to match any known pattern |
207 | 207 | */ |
208 | - private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?FormatInformation{ |
|
208 | + private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?FormatInformation{ |
|
209 | 209 | // Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing |
210 | 210 | $bestDifference = PHP_INT_MAX; |
211 | 211 | $bestFormatInfo = 0; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * |
303 | 303 | * @return \chillerlan\QRCode\Common\Version|null |
304 | 304 | */ |
305 | - private function decodeVersionInformation(int $versionBits):?Version{ |
|
305 | + private function decodeVersionInformation(int $versionBits): ?Version{ |
|
306 | 306 | $bestDifference = PHP_INT_MAX; |
307 | 307 | $bestVersion = 0; |
308 | 308 | |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | return $a; |
342 | 342 | } |
343 | 343 | |
344 | - return ($a >> $b) & ~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1)); |
|
344 | + return ($a >> $b)&~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1)); |
|
345 | 345 | } |
346 | 346 | |
347 | 347 | private static function numBitsDiffering(int $a, int $b):int{ |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $count = 0; |
354 | 354 | |
355 | 355 | for($i = 0; $i < 32; $i += 4){ |
356 | - $count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i) & 0x0F]; |
|
356 | + $count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i)&0x0F]; |
|
357 | 357 | } |
358 | 358 | |
359 | 359 | return $count; |