@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $matrix[$y] = []; |
| 122 | 122 | |
| 123 | 123 | foreach($row as $x => $val){ |
| 124 | - $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK; |
|
| 124 | + $matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | /** |
| 146 | 146 | * Returns the current mask pattern |
| 147 | 147 | */ |
| 148 | - public function maskPattern():?MaskPattern{ |
|
| 148 | + public function maskPattern(): ?MaskPattern{ |
|
| 149 | 149 | return $this->maskPattern; |
| 150 | 150 | } |
| 151 | 151 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | * false => $M_TYPE |
| 173 | 173 | */ |
| 174 | 174 | public function set(int $x, int $y, bool $value, int $M_TYPE):self{ |
| 175 | - $this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0); |
|
| 175 | + $this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0); |
|
| 176 | 176 | |
| 177 | 177 | return $this; |
| 178 | 178 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * true => $value & $M_TYPE === $M_TYPE |
| 193 | 193 | */ |
| 194 | 194 | public function checkType(int $x, int $y, int $M_TYPE):bool{ |
| 195 | - return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE; |
|
| 195 | + return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE; |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /** |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | for($c = 0; $c < 3; $c++){ |
| 272 | 272 | for($i = 0; $i < 8; $i++){ |
| 273 | - $this->set($h[$c][0] , $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
| 274 | - $this->set($v[$c][0] - $i, $v[$c][1] , false, $this::M_SEPARATOR); |
|
| 273 | + $this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR); |
|
| 274 | + $this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR); |
|
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | for($i = 0; $i < 18; $i++){ |
| 346 | 346 | $a = (int)($i / 3); |
| 347 | 347 | $b = $i % 3 + $this->moduleCount - 8 - 3; |
| 348 | - $v = !$test && (($bits >> $i) & 1) === 1; |
|
| 348 | + $v = !$test && (($bits >> $i)&1) === 1; |
|
| 349 | 349 | |
| 350 | 350 | $this->set($b, $a, $v, $this::M_VERSION); // ne |
| 351 | 351 | $this->set($a, $b, $v, $this::M_VERSION); // sw |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | $bits = $this->eccLevel->getformatPattern($maskPattern); |
| 366 | 366 | |
| 367 | 367 | for($i = 0; $i < 15; $i++){ |
| 368 | - $v = !$test && (($bits >> $i) & 1) === 1; |
|
| 368 | + $v = !$test && (($bits >> $i)&1) === 1; |
|
| 369 | 369 | |
| 370 | 370 | if($i < 6){ |
| 371 | 371 | $this->set(8, $i, $v, $this::M_FORMAT); |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | foreach($this->matrix as $y => $row){ |
| 488 | 488 | foreach($row as $x => $val){ |
| 489 | 489 | // out of bounds, skip |
| 490 | - if($x < $start || $y < $start ||$x >= $end || $y >= $end){ |
|
| 490 | + if($x < $start || $y < $start || $x >= $end || $y >= $end){ |
|
| 491 | 491 | continue; |
| 492 | 492 | } |
| 493 | 493 | // a match |
@@ -531,10 +531,10 @@ discard block |
||
| 531 | 531 | $v = false; |
| 532 | 532 | |
| 533 | 533 | if($byteIndex < $byteCount){ |
| 534 | - $v = (($data[$byteIndex] >> $bitIndex) & 1) === 1; |
|
| 534 | + $v = (($data[$byteIndex] >> $bitIndex)&1) === 1; |
|
| 535 | 535 | } |
| 536 | 536 | |
| 537 | - $this->matrix[$y][$x] = $this::M_DATA | ($v ? $this::IS_DARK : 0); |
|
| 537 | + $this->matrix[$y][$x] = $this::M_DATA|($v ? $this::IS_DARK : 0); |
|
| 538 | 538 | $bitIndex--; |
| 539 | 539 | |
| 540 | 540 | if($bitIndex === -1){ |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | $y += $inc; |
| 549 | 549 | |
| 550 | 550 | if($y < 0 || $this->moduleCount <= $y){ |
| 551 | - $y -= $inc; |
|
| 551 | + $y -= $inc; |
|
| 552 | 552 | $inc = -$inc; |
| 553 | 553 | |
| 554 | 554 | break; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | |
| 572 | 572 | foreach($this->matrix as $y => &$row){ |
| 573 | 573 | foreach($row as $x => &$val){ |
| 574 | - if($mask($x, $y) === 0 && ($val & $this::M_DATA) === $this::M_DATA){ |
|
| 574 | + if($mask($x, $y) === 0 && ($val&$this::M_DATA) === $this::M_DATA){ |
|
| 575 | 575 | $val ^= $this::IS_DARK; |
| 576 | 576 | } |
| 577 | 577 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | public function put(int $num, int $length):self{ |
| 58 | 58 | |
| 59 | 59 | for($i = 0; $i < $length; $i++){ |
| 60 | - $this->putBit((($num >> ($length - $i - 1)) & 1) === 1); |
|
| 60 | + $this->putBit((($num >> ($length - $i - 1))&1) === 1); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $this; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | $toRead = $numBits < $bitsLeft ? $numBits : $bitsLeft; |
| 127 | 127 | $bitsToNotRead = $bitsLeft - $toRead; |
| 128 | 128 | $mask = (0xff >> (8 - $toRead)) << $bitsToNotRead; |
| 129 | - $result = ($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead; |
|
| 129 | + $result = ($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead; |
|
| 130 | 130 | $numBits -= $toRead; |
| 131 | 131 | $this->bitsRead += $toRead; |
| 132 | 132 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | if($numBits > 0){ |
| 141 | 141 | |
| 142 | 142 | while($numBits >= 8){ |
| 143 | - $result = ($result << 8) | ($this->buffer[$this->bytesRead] & 0xff); |
|
| 143 | + $result = ($result << 8)|($this->buffer[$this->bytesRead]&0xff); |
|
| 144 | 144 | $this->bytesRead++; |
| 145 | 145 | $numBits -= 8; |
| 146 | 146 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | if($numBits > 0){ |
| 150 | 150 | $bitsToNotRead = 8 - $numBits; |
| 151 | 151 | $mask = (0xff >> $bitsToNotRead) << $bitsToNotRead; |
| 152 | - $result = ($result << $numBits) | (($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead); |
|
| 152 | + $result = ($result << $numBits)|(($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead); |
|
| 153 | 153 | $this->bitsRead += $numBits; |
| 154 | 154 | } |
| 155 | 155 | } |