@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | * @return float|null vertical center of finder pattern, or null if not found |
331 | 331 | * @noinspection DuplicatedCode |
332 | 332 | */ |
333 | - private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal):?float{ |
|
333 | + private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal): ?float{ |
|
334 | 334 | $maxI = $this->matrix->size(); |
335 | 335 | $stateCount = $this->getCrossCheckStateCount(); |
336 | 336 | |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | * check a vertical cross check and locate the real center of the alignment pattern. |
415 | 415 | * @noinspection DuplicatedCode |
416 | 416 | */ |
417 | - private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal):?float{ |
|
417 | + private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal): ?float{ |
|
418 | 418 | $maxJ = $this->matrix->size(); |
419 | 419 | $stateCount = $this->getCrossCheckStateCount(); |
420 | 420 |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | } |
152 | 152 | |
153 | 153 | $otherToX = (int)($fromX + ($otherToX - $fromX) * $scale); |
154 | - $result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, $otherToX, $otherToY); |
|
154 | + $result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, $otherToX, $otherToY); |
|
155 | 155 | |
156 | 156 | // Middle pixel is double-counted this way; subtract 1 |
157 | 157 | return $result - 1.0; |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | int $estAlignmentX, |
277 | 277 | int $estAlignmentY, |
278 | 278 | float $allowanceFactor |
279 | - ):?AlignmentPattern{ |
|
279 | + ): ?AlignmentPattern{ |
|
280 | 280 | // Look for an alignment pattern (3 modules in size) around where it should be |
281 | 281 | $dimension = $this->matrix->size(); |
282 | 282 | $allowance = (int)($allowanceFactor * $overallEstModuleSize); |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | public function __construct(BitMatrix $matrix, float $moduleSize){ |
45 | 45 | $this->matrix = $matrix; |
46 | 46 | $this->moduleSize = $moduleSize; |
47 | - $this->possibleCenters = []; |
|
47 | + $this->possibleCenters = []; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -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 = []; |
@@ -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->matrix->size(); |
228 | 228 | $stateCount = []; |
229 | 229 | $stateCount[0] = 0; |
@@ -85,7 +85,8 @@ |
||
85 | 85 | |
86 | 86 | if($this->matrix->check($j, $i)){ |
87 | 87 | // Black pixel |
88 | - if($currentState === 1){ // Counting black pixels |
|
88 | + if($currentState === 1){ |
|
89 | +// Counting black pixels |
|
89 | 90 | $stateCount[$currentState]++; |
90 | 91 | } |
91 | 92 | // Counting white pixels |
@@ -222,8 +222,8 @@ discard block |
||
222 | 222 | // Should return null, but, some QR codes apparently do not mask this info. |
223 | 223 | // Try again by actually masking the pattern first. |
224 | 224 | $formatInfo = $this->doDecodeFormatInformation( |
225 | - $formatInfoBits1 ^ $this::FORMAT_INFO_MASK_QR, |
|
226 | - $formatInfoBits2 ^ $this::FORMAT_INFO_MASK_QR |
|
225 | + $formatInfoBits1^$this::FORMAT_INFO_MASK_QR, |
|
226 | + $formatInfoBits2^$this::FORMAT_INFO_MASK_QR |
|
227 | 227 | ); |
228 | 228 | |
229 | 229 | // still nothing??? |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | ? $this->check($j, $i) |
249 | 249 | : $this->check($i, $j); |
250 | 250 | |
251 | - return $bit ? ($versionBits << 1) | 0x1 : $versionBits << 1; |
|
251 | + return $bit ? ($versionBits << 1)|0x1 : $versionBits << 1; |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | /** |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | * |
259 | 259 | * @return int|null information about the format it specifies, or null if doesn't seem to match any known pattern |
260 | 260 | */ |
261 | - private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?int{ |
|
261 | + private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?int{ |
|
262 | 262 | // Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing |
263 | 263 | $bestDifference = PHP_INT_MAX; |
264 | 264 | $bestFormatInfo = 0; |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | /** |
355 | 355 | * |
356 | 356 | */ |
357 | - private function decodeVersionInformation(int $versionBits):?Version{ |
|
357 | + private function decodeVersionInformation(int $versionBits): ?Version{ |
|
358 | 358 | $bestDifference = PHP_INT_MAX; |
359 | 359 | $bestVersion = 0; |
360 | 360 |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | // This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels. |
37 | 37 | // So this is the smallest dimension in each axis we can accept. |
38 | 38 | private const BLOCK_SIZE_POWER = 3; |
39 | - private const BLOCK_SIZE = 8; // ...0100...00 |
|
40 | - private const BLOCK_SIZE_MASK = 7; // ...0011...11 |
|
39 | + private const BLOCK_SIZE = 8; // ...0100...00 |
|
40 | + private const BLOCK_SIZE_MASK = 7; // ...0011...11 |
|
41 | 41 | private const MINIMUM_DIMENSION = 40; |
42 | 42 | private const MIN_DYNAMIC_RANGE = 24; |
43 | 43 | |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | |
235 | 235 | for($xx = 0; $xx < self::BLOCK_SIZE; $xx++){ |
236 | 236 | $pixel = (int)($this->luminances[(int)($offset + $xx)]) & 0xff; |
237 | - $sum += $pixel; |
|
237 | + $sum += $pixel; |
|
238 | 238 | // still looking for good contrast |
239 | 239 | if($pixel < $min){ |
240 | 240 | $min = $pixel; |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $matrix[$y] = []; |
121 | 121 | |
122 | 122 | foreach($row as $x => $val){ |
123 | - $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK; |
|
123 | + $matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK; |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
@@ -130,21 +130,21 @@ discard block |
||
130 | 130 | /** |
131 | 131 | * Returns the current version number |
132 | 132 | */ |
133 | - public function version():?Version{ |
|
133 | + public function version(): ?Version{ |
|
134 | 134 | return $this->version; |
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
138 | 138 | * Returns the current ECC level |
139 | 139 | */ |
140 | - public function eccLevel():?EccLevel{ |
|
140 | + public function eccLevel(): ?EccLevel{ |
|
141 | 141 | return $this->eccLevel; |
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | 145 | * Returns the current mask pattern |
146 | 146 | */ |
147 | - public function maskPattern():?MaskPattern{ |
|
147 | + public function maskPattern(): ?MaskPattern{ |
|
148 | 148 | return $this->maskPattern; |
149 | 149 | } |
150 | 150 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | * false => $M_TYPE |
172 | 172 | */ |
173 | 173 | public function set(int $x, int $y, bool $value, int $M_TYPE):self{ |
174 | - $this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0); |
|
174 | + $this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0); |
|
175 | 175 | |
176 | 176 | return $this; |
177 | 177 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * true => $value & $M_TYPE === $M_TYPE |
192 | 192 | */ |
193 | 193 | public function checkType(int $x, int $y, int $M_TYPE):bool{ |
194 | - return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE; |
|
194 | + return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE; |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
@@ -285,8 +285,8 @@ discard block |
||
285 | 285 | |
286 | 286 | for($c = 0; $c < 3; $c++){ |
287 | 287 | for($i = 0; $i < 8; $i++){ |
288 | - $this->set($h[$c][0] , $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
289 | - $this->set($v[$c][0] - $i, $v[$c][1] , false, $this::M_SEPARATOR); |
|
288 | + $this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
289 | + $this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR); |
|
290 | 290 | } |
291 | 291 | } |
292 | 292 | |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | foreach($this->matrix as $y => $row){ |
511 | 511 | foreach($row as $x => $val){ |
512 | 512 | // out of bounds, skip |
513 | - if($x < $start || $y < $start ||$x >= $end || $y >= $end){ |
|
513 | + if($x < $start || $y < $start || $x >= $end || $y >= $end){ |
|
514 | 514 | continue; |
515 | 515 | } |
516 | 516 | // a match |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | |
579 | 579 | foreach($this->matrix as $y => $row){ |
580 | 580 | foreach($row as $x => $val){ |
581 | - if($mask($x, $y) && ($val & $this::M_DATA) === $this::M_DATA){ |
|
581 | + if($mask($x, $y) && ($val&$this::M_DATA) === $this::M_DATA){ |
|
582 | 582 | $this->flip($x, $y); |
583 | 583 | } |
584 | 584 | } |