chillerlan / php-qrcode

src/Detector/Detector.php

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
 		}
 
 		$otherToX = (int)($fromX + ($otherToX - $fromX) * $scale);
-		$result   += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, (int)$otherToX, (int)$otherToY);
+		$result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, (int)$otherToX, (int)$otherToY);
 
 		// Middle pixel is double-counted this way; subtract 1
 		return $result - 1.0;
@@ -291,7 +291,7 @@ 
 		int $estAlignmentX,
 		int $estAlignmentY,
 		float $allowanceFactor
-	):?AlignmentPattern{
+	): ?AlignmentPattern{
 		// Look for an alignment pattern (3 modules in size) around where it should be
 		$dimension           = $this->bitMatrix->getDimension();
 		$allowance           = (int)($allowanceFactor * $overallEstModuleSize);

Braces +2 added lines, -1 removed lines

@@ -59,7 +59,8 @@
 			$estAlignmentY       = (int)($topLeft->getY() + $correctionToTopLeft * ($bottomRightY - $topLeft->getY()));
 
 			// Kind of arbitrary -- expand search radius before giving up
-			for($i = 4; $i <= 16; $i <<= 1){//??????????
+			for($i = 4; $i <= 16; $i <<= 1){
+//??????????
 				$alignmentPattern = $this->findAlignmentInRegion($moduleSize, $estAlignmentX, $estAlignmentY, (float)$i);
 
 				if($alignmentPattern !== null){

src/Decoder/Decoder.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
 		$eccLevel = $parser->readFormatInformation()->getErrorCorrectionLevel();
 
 		// Read raw codewords
-		$rawCodewords  = $parser->readCodewords();
+		$rawCodewords = $parser->readCodewords();
 		// Separate into data blocks
 		$dataBlocks = $this->getDataBlocks($rawCodewords, $version, $eccLevel);
 
@@ -140,7 +140,7 @@ 
 		[$numEccCodewords, $eccBlocks] = $version->getRSBlocks($eccLevel);
 
 		// Now establish DataBlocks of the appropriate size and number of data codewords
-		$result          = [];//new DataBlock[$totalBlocks];
+		$result          = []; //new DataBlock[$totalBlocks];
 		$numResultBlocks = 0;
 
 		foreach($eccBlocks as $blockData){
@@ -206,7 +206,7 @@ 
 		$codewordsInts = [];
 
 		foreach($codewordBytes as $i => $codewordByte){
-			$codewordsInts[$i] = $codewordByte & 0xFF;
+			$codewordsInts[$i] = $codewordByte&0xFF;
 		}
 
 		$decoded = (new ReedSolomonDecoder)->decode($codewordsInts, (count($codewordBytes) - $numDataCodewords));

src/Decoder/IMagickLuminanceSource.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		$countPixels = count($pixels);
 
 		for($i = 0; $i < $countPixels; $i += 3){
-			$this->setLuminancePixel($pixels[$i] & 0xff, $pixels[$i + 1] & 0xff, $pixels[$i + 2] & 0xff);
+			$this->setLuminancePixel($pixels[$i]&0xff, $pixels[$i + 1]&0xff, $pixels[$i + 2]&0xff);
 		}
 	}
 

src/Data/ECI.php

Spacing +6 added lines, -6 removed lines

@@ -57,19 +57,19 @@
 	public static function parseValue(BitBuffer $bitBuffer):ECICharset{
 		$firstByte = $bitBuffer->read(8);
 
-		if(($firstByte & 0x80) === 0){
+		if(($firstByte&0x80) === 0){
 			// just one byte
-			return new ECICharset($firstByte & 0x7f);
+			return new ECICharset($firstByte&0x7f);
 		}
 
-		if(($firstByte & 0xc0) === 0x80){
+		if(($firstByte&0xc0) === 0x80){
 			// two bytes
-			return new ECICharset((($firstByte & 0x3f) << 8) | $bitBuffer->read(8));
+			return new ECICharset((($firstByte&0x3f) << 8)|$bitBuffer->read(8));
 		}
 
-		if(($firstByte & 0xe0) === 0xC0){
+		if(($firstByte&0xe0) === 0xC0){
 			// three bytes
-			return new ECICharset((($firstByte & 0x1f) << 16) | $bitBuffer->read(16));
+			return new ECICharset((($firstByte&0x1f) << 16)|$bitBuffer->read(16));
 		}
 
 		throw new QRCodeDataException('error decoding ECI value');

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/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);
 						}
 					}

src/Decoder/BitMatrixParser.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,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;
 	}
 
 	/**
@@ -189,8 +189,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::FORMAT_INFO_MASK_QR,
-			$formatInfoBits2 ^ FormatInformation::FORMAT_INFO_MASK_QR
+			$formatInfoBits1^FormatInformation::FORMAT_INFO_MASK_QR,
+			$formatInfoBits2^FormatInformation::FORMAT_INFO_MASK_QR
 		);
 
 		if($this->parsedFormatInfo !== null){
@@ -208,7 +208,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;
@@ -305,7 +305,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;
 
@@ -347,7 +347,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));
 	}
 
 	/**
@@ -362,7 +362,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/Output/QRMarkup.php

Indentation +6 added lines, -6 removed lines

@@ -73,8 +73,8 @@ 
 
 		if($file !== null){
 			return '<!DOCTYPE html>'.
-			       '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
-			       '<body>'.$this->options->eol.$html.'</body>';
+				   '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
+				   '<body>'.$this->options->eol.$html.'</body>';
 		}
 
 		return $html;
@@ -89,9 +89,9 @@ 
 		$matrix = $this->matrix->matrix();
 
 		$svg = sprintf($this->svgHeader, $this->options->cssClass, $this->options->svgViewBoxSize ?? $this->moduleCount)
-		       .$this->options->eol
-		       .'<defs>'.$this->options->svgDefs.'</defs>'
-		       .$this->options->eol;
+			   .$this->options->eol
+			   .'<defs>'.$this->options->svgDefs.'</defs>'
+			   .$this->options->eol;
 
 		foreach($this->moduleValues as $M_TYPE => $value){
 			$path = '';
@@ -145,7 +145,7 @@ 
 		// if saving to file, append the correct headers
 		if($file !== null){
 			return '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'.
-			       $this->options->eol.$svg;
+				   $this->options->eol.$svg;
 		}
 
 		if($this->options->imageBase64){

src/Data/QRMatrix.php

Spacing +13 added lines, -13 removed lines

@@ -121,7 +121,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;
 			}
 		}
 
@@ -145,7 +145,7 @@ 
 	/**
 	 * Returns the current mask pattern
 	 */
-	public function maskPattern():?MaskPattern{
+	public function maskPattern(): ?MaskPattern{
 		return $this->maskPattern;
 	}
 
@@ -172,7 +172,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;
 	}
@@ -192,7 +192,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;
 	}
 
 	/**
@@ -270,8 +270,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);
 			}
 		}
 
@@ -345,7 +345,7 @@ 
 			for($i = 0; $i < 18; $i++){
 				$a = (int)($i / 3);
 				$b = $i % 3 + $this->moduleCount - 8 - 3;
-				$v = !$test && (($bits >> $i) & 1) === 1;
+				$v = !$test && (($bits >> $i)&1) === 1;
 
 				$this->set($b, $a, $v, $this::M_VERSION); // ne
 				$this->set($a, $b, $v, $this::M_VERSION); // sw
@@ -365,7 +365,7 @@ 
 		$bits = $this->eccLevel->getformatPattern($maskPattern);
 
 		for($i = 0; $i < 15; $i++){
-			$v = !$test && (($bits >> $i) & 1) === 1;
+			$v = !$test && (($bits >> $i)&1) === 1;
 
 			if($i < 6){
 				$this->set(8, $i, $v, $this::M_FORMAT);
@@ -487,7 +487,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
@@ -531,10 +531,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){
@@ -548,7 +548,7 @@ 
 				$y += $inc;
 
 				if($y < 0 || $this->moduleCount <= $y){
-					$y   -=  $inc;
+					$y   -= $inc;
 					$inc  = -$inc;
 
 					break;
@@ -571,7 +571,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;
 				}
 			}