chillerlan / php-qrcode

src/Decoder/BitMatrix.php

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 		$offset = (int)($y * $this->rowSize + ($x / 0x20));
 
 		$this->bits[$offset] ??= 0;
-		$this->bits[$offset] |= ($this->bits[$offset] |= 1 << ($x & 0x1f));
+		$this->bits[$offset] |= ($this->bits[$offset] |= 1 << ($x&0x1f));
 
 		return $this;
 	}
@@ -61,7 +61,7 @@ 
 	public function flip(int $x, int $y):self{
 		$offset = $y * $this->rowSize + (int)($x / 0x20);
 
-		$this->bits[$offset] = ($this->bits[$offset] ^ (1 << ($x & 0x1f)));
+		$this->bits[$offset] = ($this->bits[$offset]^(1 << ($x&0x1f)));
 
 		return $this;
 	}
@@ -98,7 +98,7 @@ 
 
 			for($x = $left; $x < $right; $x++){
 				$xOffset              = $yOffset + (int)($x / 0x20);
-				$this->bits[$xOffset] = ($this->bits[$xOffset] |= 1 << ($x & 0x1f));
+				$this->bits[$xOffset] = ($this->bits[$xOffset] |= 1 << ($x&0x1f));
 			}
 		}
 
@@ -115,14 +115,14 @@ 
 	/**
 	 *
 	 */
-	public function getFormatInfo():?FormatInformation{
+	public function getFormatInfo(): ?FormatInformation{
 		return $this->formatInfo;
 	}
 
 	/**
 	 *
 	 */
-	public function getVersion():?Version{
+	public function getVersion(): ?Version{
 		return $this->version;
 	}
 
@@ -139,7 +139,7 @@ 
 
 		$this->bits[$offset] ??= 0;
 
-		return ($this->uRShift($this->bits[$offset], ($x & 0x1f)) & 1) !== 0;
+		return ($this->uRShift($this->bits[$offset], ($x&0x1f))&1) !== 0;
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 			? $this->get($j, $i)
 			: $this->get($i, $j);
 
-		return $bit ? ($versionBits << 1) | 0x1 : $versionBits << 1;
+		return $bit ? ($versionBits << 1)|0x1 : $versionBits << 1;
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 		// Should return null, but, some QR codes apparently do not mask this info.
 		// Try again by actually masking the pattern first.
 		$this->formatInfo = $this->doDecodeFormatInformation(
-			$formatInfoBits1 ^ FormatInformation::FORMAT_INFO_MASK_QR,
-			$formatInfoBits2 ^ FormatInformation::FORMAT_INFO_MASK_QR
+			$formatInfoBits1^FormatInformation::FORMAT_INFO_MASK_QR,
+			$formatInfoBits2^FormatInformation::FORMAT_INFO_MASK_QR
 		);
 
 		if($this->formatInfo !== null){
@@ -383,7 +383,7 @@ 
 	 * @return \chillerlan\QRCode\Common\FormatInformation|null information about the format it specifies, or null
 	 *                                                          if doesn't seem to match any known pattern
 	 */
-	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?FormatInformation{
+	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?FormatInformation{
 		// Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing
 		$bestDifference = PHP_INT_MAX;
 		$bestFormatInfo = 0;
@@ -479,7 +479,7 @@ 
 	 *
 	 * @return \chillerlan\QRCode\Common\Version|null
 	 */
-	private function decodeVersionInformation(int $versionBits):?Version{
+	private function decodeVersionInformation(int $versionBits): ?Version{
 		$bestDifference = PHP_INT_MAX;
 		$bestVersion    = 0;
 
@@ -521,7 +521,7 @@ 
 			return $a;
 		}
 
-		return ($a >> $b) & ~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
+		return ($a >> $b)&~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
 	}
 
 	/**
@@ -536,7 +536,7 @@ 
 		$count = 0;
 
 		for($i = 0; $i < 32; $i += 4){
-			$count += $BITS_SET_IN_HALF_BYTE[$this->uRShift($a, $i) & 0x0F];
+			$count += $BITS_SET_IN_HALF_BYTE[$this->uRShift($a, $i)&0x0F];
 		}
 
 		return $count;

src/Data/QRMatrix.php

Spacing +13 added lines, -13 removed lines

@@ -129,7 +129,7 @@ 
 			$matrix[$y] = [];
 
 			foreach($row as $x => $val){
-				$matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK;
+				$matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK;
 			}
 		}
 
@@ -153,7 +153,7 @@ 
 	/**
 	 * Returns the current mask pattern
 	 */
-	public function maskPattern():?MaskPattern{
+	public function maskPattern(): ?MaskPattern{
 		return $this->maskPattern;
 	}
 
@@ -180,7 +180,7 @@ 
 	 *   false => $M_TYPE
 	 */
 	public function set(int $x, int $y, bool $value, int $M_TYPE):self{
-		$this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0);
+		$this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0);
 
 		return $this;
 	}
@@ -200,7 +200,7 @@ 
 	 *   true => $value & $M_TYPE === $M_TYPE
 	 */
 	public function checkType(int $x, int $y, int $M_TYPE):bool{
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -280,8 +280,8 @@ 
 
 		for($c = 0; $c < 3; $c++){
 			for($i = 0; $i < 8; $i++){
-				$this->set($h[$c][0]     , $h[$c][1] + $i, false, $this::M_SEPARATOR);
-				$this->set($v[$c][0] - $i, $v[$c][1]     , false, $this::M_SEPARATOR);
+				$this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR);
+				$this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR);
 			}
 		}
 
@@ -355,7 +355,7 @@ 
 			for($i = 0; $i < 18; $i++){
 				$a = (int)($i / 3);
 				$b = $i % 3 + $this->moduleCount - 8 - 3;
-				$v = (($bits >> $i) & 1) === 1;
+				$v = (($bits >> $i)&1) === 1;
 
 				$this->set($b, $a, $v, $this::M_VERSION); // ne
 				$this->set($a, $b, $v, $this::M_VERSION); // sw
@@ -375,7 +375,7 @@ 
 		$bits = $this->eccLevel->getformatPattern($maskPattern);
 
 		for($i = 0; $i < 15; $i++){
-			$v = (($bits >> $i) & 1) === 1;
+			$v = (($bits >> $i)&1) === 1;
 
 			if($i < 6){
 				$this->set(8, $i, $v, $this::M_FORMAT);
@@ -495,7 +495,7 @@ 
 		foreach($this->matrix as $y => $row){
 			foreach($row as $x => $val){
 				// out of bounds, skip
-				if($x < $start || $y < $start ||$x >= $end || $y >= $end){
+				if($x < $start || $y < $start || $x >= $end || $y >= $end){
 					continue;
 				}
 				// a match
@@ -542,10 +542,10 @@ 
 					$v = false;
 
 					if($byteIndex < $byteCount){
-						$v = (($data[$byteIndex] >> $bitIndex) & 1) === 1;
+						$v = (($data[$byteIndex] >> $bitIndex)&1) === 1;
 					}
 
-					$this->matrix[$y][$x] = $this::M_DATA | ($v ? $this::IS_DARK : 0);
+					$this->matrix[$y][$x] = $this::M_DATA|($v ? $this::IS_DARK : 0);
 					$bitIndex--;
 
 					if($bitIndex === -1){
@@ -558,7 +558,7 @@ 
 				$y += $inc;
 
 				if($y < 0 || $this->moduleCount <= $y){
-					$y   -=  $inc;
+					$y   -= $inc;
 					$inc  = -$inc;
 
 					break;
@@ -581,7 +581,7 @@ 
 
 		foreach($this->matrix as $y => &$row){
 			foreach($row as $x => &$val){
-				if($mask($x, $y) && ($val & $this::M_DATA) === $this::M_DATA){
+				if($mask($x, $y) && ($val&$this::M_DATA) === $this::M_DATA){
 					$val ^= $this::IS_DARK;
 				}
 			}

src/Common/MaskPattern.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function __construct(int $maskPattern){
 
-		if((0b111 & $maskPattern) !== $maskPattern){
+		if((0b111&$maskPattern) !== $maskPattern){
 			throw new QRCodeException('invalid mask pattern');
 		}
 
@@ -149,7 +149,7 @@ 
 						$penalty += 3 + ($numSameBitCells - 5);
 					}
 
-					$numSameBitCells = 1;  // Include the cell itself.
+					$numSameBitCells = 1; // Include the cell itself.
 					$prevBit         = $bit;
 				}
 			}