chillerlan / php-qrcode

src/Decoder/BitMatrix.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,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));
 	}
 
 	/**
@@ -49,7 +49,7 @@ 
 	public function flip(int $x, int $y):void{
 		$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)));
 	}
 
 	/**
@@ -84,7 +84,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));
 			}
 		}
 	}
@@ -109,7 +109,7 @@ 
 
 		$this->bits[$offset] ??= 0;
 
-		return (BitMatrixParser::uRShift($this->bits[$offset], ($x & 0x1f)) & 1) !== 0;
+		return (BitMatrixParser::uRShift($this->bits[$offset], ($x&0x1f))&1) !== 0;
 	}
 
 	/**

src/Decoder/BitMatrixParser.php

Spacing +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
 			? $this->bitMatrix->get($j, $i)
 			: $this->bitMatrix->get($i, $j);
 
-		return $bit ? ($versionBits << 1) | 0x1 : $versionBits << 1;
+		return $bit ? ($versionBits << 1)|0x1 : $versionBits << 1;
 	}
 
 	/**
@@ -186,8 +186,8 @@ 
 		// Should return null, but, some QR codes apparently do not mask this info.
 		// Try again by actually masking the pattern first.
 		$this->parsedFormatInfo = $this->doDecodeFormatInformation(
-			$formatInfoBits1 ^ FormatInformation::MASK_QR,
-			$formatInfoBits2 ^ FormatInformation::MASK_QR
+			$formatInfoBits1^FormatInformation::MASK_QR,
+			$formatInfoBits2^FormatInformation::MASK_QR
 		);
 
 		if($this->parsedFormatInfo !== null){
@@ -205,7 +205,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;
@@ -302,7 +302,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;
 
@@ -341,7 +341,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));
 	}
 
 	private static function numBitsDiffering(int $a, int $b):int{
@@ -353,7 +353,7 @@ 
 		$count = 0;
 
 		for($i = 0; $i < 32; $i += 4){
-			$count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i) & 0x0F];
+			$count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i)&0x0F];
 		}
 
 		return $count;

src/Decoder/Binarizer.php

Spacing +11 added lines, -11 removed lines

@@ -36,8 +36,8 @@ 
 	// This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels.
 	// So this is the smallest dimension in each axis we can accept.
 	private const BLOCK_SIZE_POWER  = 3;
-	private const BLOCK_SIZE        = 8;  // ...0100...00
-	private const BLOCK_SIZE_MASK   = 7;  // ...0011...11
+	private const BLOCK_SIZE        = 8; // ...0100...00
+	private const BLOCK_SIZE_MASK   = 7; // ...0011...11
 	private const MINIMUM_DIMENSION = 40;
 	private const MIN_DYNAMIC_RANGE = 24;
 
@@ -137,13 +137,13 @@ 
 		if($width >= self::MINIMUM_DIMENSION && $height >= self::MINIMUM_DIMENSION){
 			$subWidth = $width >> self::BLOCK_SIZE_POWER;
 
-			if(($width & self::BLOCK_SIZE_MASK) !== 0){
+			if(($width&self::BLOCK_SIZE_MASK) !== 0){
 				$subWidth++;
 			}
 
 			$subHeight = $height >> self::BLOCK_SIZE_POWER;
 
-			if(($height & self::BLOCK_SIZE_MASK) !== 0){
+			if(($height&self::BLOCK_SIZE_MASK) !== 0){
 				$subHeight++;
 			}
 
@@ -167,7 +167,7 @@ 
 			$right           = (int)(($width * 4) / 5);
 
 			for($x = (int)($width / 5); $x < $right; $x++){
-				$pixel = $localLuminances[(int)$x] & 0xff;
+				$pixel = $localLuminances[(int)$x]&0xff;
 				$buckets[$pixel >> self::LUMINANCE_SHIFT]++;
 			}
 		}
@@ -183,7 +183,7 @@ 
 			$offset = $y * $width;
 
 			for($x = 0; $x < $width; $x++){
-				$pixel = (int)($localLuminances[$offset + $x] & 0xff);
+				$pixel = (int)($localLuminances[$offset + $x]&0xff);
 
 				if($pixel < $blackPoint){
 					$matrix->set($x, $y);
@@ -230,8 +230,8 @@ 
 				for($yy = 0, $offset = $yoffset * $width + $xoffset; $yy < self::BLOCK_SIZE; $yy++, $offset += $width){
 
 					for($xx = 0; $xx < self::BLOCK_SIZE; $xx++){
-						$pixel = (int)($luminances[(int)($offset + $xx)]) & 0xff;
-						$sum   += $pixel;
+						$pixel = (int)($luminances[(int)($offset + $xx)])&0xff;
+						$sum += $pixel;
 						// still looking for good contrast
 						if($pixel < $min){
 							$min = $pixel;
@@ -247,7 +247,7 @@ 
 						// finish the rest of the rows quickly
 						for($yy++, $offset += $width; $yy < self::BLOCK_SIZE; $yy++, $offset += $width){
 							for($xx = 0; $xx < self::BLOCK_SIZE; $xx++){
-								$sum += $luminances[$offset + $xx] & 0xff;
+								$sum += $luminances[$offset + $xx]&0xff;
 							}
 						}
 					}
@@ -325,7 +325,7 @@ 
 
 				for($z = -2; $z <= 2; $z++){
 					$blackRow = $blackPoints[$top + $z];
-					$sum      += $blackRow[$left - 2] + $blackRow[$left - 1] + $blackRow[$left] + $blackRow[$left + 1] + $blackRow[$left + 2];
+					$sum += $blackRow[$left - 2] + $blackRow[$left - 1] + $blackRow[$left] + $blackRow[$left + 1] + $blackRow[$left + 2];
 				}
 
 				$average = (int)($sum / 25);
@@ -334,7 +334,7 @@ 
 				for($j = 0, $o = $yoffset * $width + $xoffset; $j < self::BLOCK_SIZE; $j++, $o += $width){
 					for($i = 0; $i < self::BLOCK_SIZE; $i++){
 						// Comparison needs to be <= so that black == 0 pixels are black even if the threshold is 0.
-						if(($luminances[$o + $i] & 0xff) <= $average){
+						if(($luminances[$o + $i]&0xff) <= $average){
 							$matrix->set($xoffset + $i, $yoffset + $j);
 						}
 					}