@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $matrix[$y] = []; |
124 | 124 | |
125 | 125 | foreach($row as $x => $val){ |
126 | - $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK; |
|
126 | + $matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK; |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | /** |
148 | 148 | * Returns the current mask pattern |
149 | 149 | */ |
150 | - public function maskPattern():?MaskPattern{ |
|
150 | + public function maskPattern(): ?MaskPattern{ |
|
151 | 151 | return $this->maskPattern; |
152 | 152 | } |
153 | 153 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * false => $M_TYPE |
175 | 175 | */ |
176 | 176 | public function set(int $x, int $y, bool $value, int $M_TYPE):QRMatrix{ |
177 | - $this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0); |
|
177 | + $this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0); |
|
178 | 178 | |
179 | 179 | return $this; |
180 | 180 | } |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * true => $value & $M_TYPE === $M_TYPE |
195 | 195 | */ |
196 | 196 | public function checkType(int $x, int $y, int $M_TYPE):bool{ |
197 | - return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE; |
|
197 | + return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE; |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | /** |
@@ -272,8 +272,8 @@ discard block |
||
272 | 272 | |
273 | 273 | for($c = 0; $c < 3; $c++){ |
274 | 274 | for($i = 0; $i < 8; $i++){ |
275 | - $this->set($h[$c][0] , $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
276 | - $this->set($v[$c][0] - $i, $v[$c][1] , false, $this::M_SEPARATOR); |
|
275 | + $this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
276 | + $this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR); |
|
277 | 277 | } |
278 | 278 | } |
279 | 279 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | for($i = 0; $i < 18; $i++){ |
348 | 348 | $a = (int)($i / 3); |
349 | 349 | $b = $i % 3 + $this->moduleCount - 8 - 3; |
350 | - $v = !$test && (($bits >> $i) & 1) === 1; |
|
350 | + $v = !$test && (($bits >> $i)&1) === 1; |
|
351 | 351 | |
352 | 352 | $this->set($b, $a, $v, $this::M_VERSION); // ne |
353 | 353 | $this->set($a, $b, $v, $this::M_VERSION); // sw |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | $bits = $this->eccLevel->getformatPattern($maskPattern); |
368 | 368 | |
369 | 369 | for($i = 0; $i < 15; $i++){ |
370 | - $v = !$test && (($bits >> $i) & 1) === 1; |
|
370 | + $v = !$test && (($bits >> $i)&1) === 1; |
|
371 | 371 | |
372 | 372 | if($i < 6){ |
373 | 373 | $this->set(8, $i, $v, $this::M_FORMAT); |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | foreach($this->matrix as $y => $row){ |
490 | 490 | foreach($row as $x => $val){ |
491 | 491 | // out of bounds, skip |
492 | - if($x < $start || $y < $start ||$x >= $end || $y >= $end){ |
|
492 | + if($x < $start || $y < $start || $x >= $end || $y >= $end){ |
|
493 | 493 | continue; |
494 | 494 | } |
495 | 495 | // a match |
@@ -533,10 +533,10 @@ discard block |
||
533 | 533 | $v = false; |
534 | 534 | |
535 | 535 | if($byteIndex < $byteCount){ |
536 | - $v = (($data[$byteIndex] >> $bitIndex) & 1) === 1; |
|
536 | + $v = (($data[$byteIndex] >> $bitIndex)&1) === 1; |
|
537 | 537 | } |
538 | 538 | |
539 | - $this->matrix[$y][$x] = $this::M_DATA | ($v ? $this::IS_DARK : 0); |
|
539 | + $this->matrix[$y][$x] = $this::M_DATA|($v ? $this::IS_DARK : 0); |
|
540 | 540 | $bitIndex--; |
541 | 541 | |
542 | 542 | if($bitIndex === -1){ |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | $y += $inc; |
551 | 551 | |
552 | 552 | if($y < 0 || $this->moduleCount <= $y){ |
553 | - $y -= $inc; |
|
553 | + $y -= $inc; |
|
554 | 554 | $inc = -$inc; |
555 | 555 | |
556 | 556 | break; |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | |
574 | 574 | foreach($this->matrix as $y => &$row){ |
575 | 575 | foreach($row as $x => &$val){ |
576 | - if($mask($x, $y) === 0 && ($val & $this::M_DATA) === $this::M_DATA){ |
|
576 | + if($mask($x, $y) === 0 && ($val&$this::M_DATA) === $this::M_DATA){ |
|
577 | 577 | $val ^= $this::IS_DARK; |
578 | 578 | } |
579 | 579 | } |
@@ -62,45 +62,45 @@ discard block |
||
62 | 62 | */ |
63 | 63 | private const MAX_BITS = [ |
64 | 64 | // v => [ L, M, Q, H] // modules |
65 | - 1 => [ 152, 128, 104, 72], // 21 |
|
66 | - 2 => [ 272, 224, 176, 128], // 25 |
|
67 | - 3 => [ 440, 352, 272, 208], // 29 |
|
68 | - 4 => [ 640, 512, 384, 288], // 33 |
|
69 | - 5 => [ 864, 688, 496, 368], // 37 |
|
70 | - 6 => [ 1088, 864, 608, 480], // 41 |
|
71 | - 7 => [ 1248, 992, 704, 528], // 45 |
|
72 | - 8 => [ 1552, 1232, 880, 688], // 49 |
|
73 | - 9 => [ 1856, 1456, 1056, 800], // 53 |
|
74 | - 10 => [ 2192, 1728, 1232, 976], // 57 |
|
75 | - 11 => [ 2592, 2032, 1440, 1120], // 61 |
|
76 | - 12 => [ 2960, 2320, 1648, 1264], // 65 |
|
77 | - 13 => [ 3424, 2672, 1952, 1440], // 69 NICE! |
|
78 | - 14 => [ 3688, 2920, 2088, 1576], // 73 |
|
79 | - 15 => [ 4184, 3320, 2360, 1784], // 77 |
|
80 | - 16 => [ 4712, 3624, 2600, 2024], // 81 |
|
81 | - 17 => [ 5176, 4056, 2936, 2264], // 85 |
|
82 | - 18 => [ 5768, 4504, 3176, 2504], // 89 |
|
83 | - 19 => [ 6360, 5016, 3560, 2728], // 93 |
|
84 | - 20 => [ 6888, 5352, 3880, 3080], // 97 |
|
85 | - 21 => [ 7456, 5712, 4096, 3248], // 101 |
|
86 | - 22 => [ 8048, 6256, 4544, 3536], // 105 |
|
87 | - 23 => [ 8752, 6880, 4912, 3712], // 109 |
|
88 | - 24 => [ 9392, 7312, 5312, 4112], // 113 |
|
89 | - 25 => [10208, 8000, 5744, 4304], // 117 |
|
90 | - 26 => [10960, 8496, 6032, 4768], // 121 |
|
91 | - 27 => [11744, 9024, 6464, 5024], // 125 |
|
92 | - 28 => [12248, 9544, 6968, 5288], // 129 |
|
93 | - 29 => [13048, 10136, 7288, 5608], // 133 |
|
94 | - 30 => [13880, 10984, 7880, 5960], // 137 |
|
95 | - 31 => [14744, 11640, 8264, 6344], // 141 |
|
96 | - 32 => [15640, 12328, 8920, 6760], // 145 |
|
97 | - 33 => [16568, 13048, 9368, 7208], // 149 |
|
98 | - 34 => [17528, 13800, 9848, 7688], // 153 |
|
99 | - 35 => [18448, 14496, 10288, 7888], // 157 |
|
100 | - 36 => [19472, 15312, 10832, 8432], // 161 |
|
101 | - 37 => [20528, 15936, 11408, 8768], // 165 |
|
102 | - 38 => [21616, 16816, 12016, 9136], // 169 |
|
103 | - 39 => [22496, 17728, 12656, 9776], // 173 |
|
65 | + 1 => [152, 128, 104, 72], // 21 |
|
66 | + 2 => [272, 224, 176, 128], // 25 |
|
67 | + 3 => [440, 352, 272, 208], // 29 |
|
68 | + 4 => [640, 512, 384, 288], // 33 |
|
69 | + 5 => [864, 688, 496, 368], // 37 |
|
70 | + 6 => [1088, 864, 608, 480], // 41 |
|
71 | + 7 => [1248, 992, 704, 528], // 45 |
|
72 | + 8 => [1552, 1232, 880, 688], // 49 |
|
73 | + 9 => [1856, 1456, 1056, 800], // 53 |
|
74 | + 10 => [2192, 1728, 1232, 976], // 57 |
|
75 | + 11 => [2592, 2032, 1440, 1120], // 61 |
|
76 | + 12 => [2960, 2320, 1648, 1264], // 65 |
|
77 | + 13 => [3424, 2672, 1952, 1440], // 69 NICE! |
|
78 | + 14 => [3688, 2920, 2088, 1576], // 73 |
|
79 | + 15 => [4184, 3320, 2360, 1784], // 77 |
|
80 | + 16 => [4712, 3624, 2600, 2024], // 81 |
|
81 | + 17 => [5176, 4056, 2936, 2264], // 85 |
|
82 | + 18 => [5768, 4504, 3176, 2504], // 89 |
|
83 | + 19 => [6360, 5016, 3560, 2728], // 93 |
|
84 | + 20 => [6888, 5352, 3880, 3080], // 97 |
|
85 | + 21 => [7456, 5712, 4096, 3248], // 101 |
|
86 | + 22 => [8048, 6256, 4544, 3536], // 105 |
|
87 | + 23 => [8752, 6880, 4912, 3712], // 109 |
|
88 | + 24 => [9392, 7312, 5312, 4112], // 113 |
|
89 | + 25 => [10208, 8000, 5744, 4304], // 117 |
|
90 | + 26 => [10960, 8496, 6032, 4768], // 121 |
|
91 | + 27 => [11744, 9024, 6464, 5024], // 125 |
|
92 | + 28 => [12248, 9544, 6968, 5288], // 129 |
|
93 | + 29 => [13048, 10136, 7288, 5608], // 133 |
|
94 | + 30 => [13880, 10984, 7880, 5960], // 137 |
|
95 | + 31 => [14744, 11640, 8264, 6344], // 141 |
|
96 | + 32 => [15640, 12328, 8920, 6760], // 145 |
|
97 | + 33 => [16568, 13048, 9368, 7208], // 149 |
|
98 | + 34 => [17528, 13800, 9848, 7688], // 153 |
|
99 | + 35 => [18448, 14496, 10288, 7888], // 157 |
|
100 | + 36 => [19472, 15312, 10832, 8432], // 161 |
|
101 | + 37 => [20528, 15936, 11408, 8768], // 165 |
|
102 | + 38 => [21616, 16816, 12016, 9136], // 169 |
|
103 | + 39 => [22496, 17728, 12656, 9776], // 173 |
|
104 | 104 | 40 => [23648, 18672, 13328, 10208], // 177 |
105 | 105 | ]; |
106 | 106 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @var int[][] |
113 | 113 | */ |
114 | 114 | private const FORMAT_PATTERN = [ |
115 | - [ // L |
|
115 | + [// L |
|
116 | 116 | 0b111011111000100, |
117 | 117 | 0b111001011110011, |
118 | 118 | 0b111110110101010, |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | 0b110110001000001, |
123 | 123 | 0b110100101110110, |
124 | 124 | ], |
125 | - [ // M |
|
125 | + [// M |
|
126 | 126 | 0b101010000010010, |
127 | 127 | 0b101000100100101, |
128 | 128 | 0b101111001111100, |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | 0b100111110010111, |
133 | 133 | 0b100101010100000, |
134 | 134 | ], |
135 | - [ // Q |
|
135 | + [// Q |
|
136 | 136 | 0b011010101011111, |
137 | 137 | 0b011000001101000, |
138 | 138 | 0b011111100110001, |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | 0b010111011011010, |
143 | 143 | 0b010101111101101, |
144 | 144 | ], |
145 | - [ // H |
|
145 | + [// H |
|
146 | 146 | 0b001011010001001, |
147 | 147 | 0b001001110111110, |
148 | 148 | 0b001110011100111, |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | */ |
164 | 164 | public function __construct(int $eccLevel){ |
165 | 165 | |
166 | - if((0b11 & $eccLevel) !== $eccLevel){ |
|
166 | + if((0b11&$eccLevel) !== $eccLevel){ |
|
167 | 167 | throw new QRCodeException('invalid ECC level'); |
168 | 168 | } |
169 | 169 |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function __construct(int $maskPattern){ |
51 | 51 | |
52 | - if((0b111 & $maskPattern) !== $maskPattern){ |
|
52 | + if((0b111&$maskPattern) !== $maskPattern){ |
|
53 | 53 | throw new QRCodeException('invalid mask pattern'); |
54 | 54 | } |
55 | 55 |