chillerlan / php-qrcode

src/Detector/GridSampler.php

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
 					}
 				}
 			}
-			catch(Exception $aioobe){//ArrayIndexOutOfBoundsException
+			catch(Exception $aioobe){
+//ArrayIndexOutOfBoundsException
 				// This feels wrong, but, sometimes if the finder patterns are misidentified, the resulting
 				// transform gets "twisted" such that it maps a straight line of points to a set of points
 				// whose endpoints are in bounds, but others are not. There is probably some mathematical

src/Detector/FinderPatternFinder.php

Indentation +1 added lines, -1 removed lines

@@ -580,7 +580,7 @@
 					$this->hasSkipped = true;
 
 					return (int)((abs($firstConfirmedCenter->getX() - $center->getX()) -
-					              abs($firstConfirmedCenter->getY() - $center->getY())) / 2);
+								  abs($firstConfirmedCenter->getY() - $center->getY())) / 2);
 				}
 			}
 		}

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 				// Black pixel
 				if($this->bitMatrix->get($j, $i)){
 					// Counting white pixels
-					if(($currentState & 1) === 1){
+					if(($currentState&1) === 1){
 						$currentState++;
 					}
 
@@ -87,7 +87,7 @@ 
 				// White pixel
 				else{
 					// Counting black pixels
-					if(($currentState & 1) === 0){
+					if(($currentState&1) === 0){
 						// A winner?
 						if($currentState === 4){
 							// Yes
@@ -339,7 +339,7 @@ 
 	 *
 	 * @return float|null vertical center of finder pattern, or null if not found
 	 */
-	private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal):?float{
+	private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal): ?float{
 		$maxI       = $this->bitMatrix->getDimension();
 		$stateCount = $this->getCrossCheckStateCount();
 
@@ -422,7 +422,7 @@ 
 	 * except it reads horizontally instead of vertically. This is used to cross-cross
 	 * check a vertical cross check and locate the real center of the alignment pattern.</p>
 	 */
-	private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal):?float{
+	private function crossCheckHorizontal(int $startJ, int $centerI, int $maxCount, int $originalStateCountTotal): ?float{
 		$maxJ       = $this->bitMatrix->getDimension();
 		$stateCount = $this->getCrossCheckStateCount();
 

src/Detector/AlignmentPatternFinder.php

Braces +2 added lines, -1 removed lines

@@ -88,7 +88,8 @@
 
 				if($this->bitMatrix->get($j, $i)){
 					// Black pixel
-					if($currentState === 1){ // Counting black pixels
+					if($currentState === 1){
+// Counting black pixels
 						$stateCount[$currentState]++;
 					}
 					// Counting white pixels

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 	 *
 	 * @return \chillerlan\QRCode\Detector\AlignmentPattern|null
 	 */
-	public function find(int $startX, int $startY, int $width, int $height):?AlignmentPattern{
+	public function find(int $startX, int $startY, int $width, int $height): ?AlignmentPattern{
 		$maxJ       = $startX + $width;
 		$middleI    = $startY + ($height / 2);
 		$stateCount = [];
@@ -67,7 +67,7 @@ 
 		// this tracks the number of black/white/black modules seen so far
 		for($iGen = 0; $iGen < $height; $iGen++){
 			// Search from middle outwards
-			$i             = (int)($middleI + (($iGen & 0x01) === 0 ? ($iGen + 1) / 2 : -(($iGen + 1) / 2)));
+			$i             = (int)($middleI + (($iGen&0x01) === 0 ? ($iGen + 1) / 2 : -(($iGen + 1) / 2)));
 			$stateCount[0] = 0;
 			$stateCount[1] = 0;
 			$stateCount[2] = 0;
@@ -174,7 +174,7 @@ 
 	 *
 	 * @return \chillerlan\QRCode\Detector\AlignmentPattern|null if we have found the same pattern twice, or null if not
 	 */
-	private function handlePossibleCenter(array $stateCount, int $i, int $j):?AlignmentPattern{
+	private function handlePossibleCenter(array $stateCount, int $i, int $j): ?AlignmentPattern{
 		$stateCountTotal = $stateCount[0] + $stateCount[1] + $stateCount[2];
 		$centerJ         = $this->centerFromEnd($stateCount, $j);
 		$centerI         = $this->crossCheckVertical($i, (int)$centerJ, 2 * $stateCount[1], $stateCountTotal);
@@ -223,7 +223,7 @@ 
 	 *
 	 * @return float|null vertical center of alignment pattern, or null if not found
 	 */
-	private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal):?float{
+	private function crossCheckVertical(int $startI, int $centerJ, int $maxCount, int $originalStateCountTotal): ?float{
 		$maxI          = $this->bitMatrix->getDimension();
 		$stateCount    = [];
 		$stateCount[0] = 0;

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