chillerlan / php-qrcode

src/Common/MaskPattern.php

Spacing +2 added lines, -2 removed lines

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

src/Common/BitBuffer.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 	/**
 	 * Read count (bits)
 	 */
-	private int $bitsRead  = 0;
+	private int $bitsRead = 0;
 
 	/**
 	 * BitBuffer constructor.
@@ -124,7 +124,7 @@ 
 			$toRead         = min($numBits, $bitsLeft);
 			$bitsToNotRead  = ($bitsLeft - $toRead);
 			$mask           = ((0xff >> (8 - $toRead)) << $bitsToNotRead);
-			$result         = (($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead);
+			$result         = (($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead);
 			$numBits        -= $toRead;
 			$this->bitsRead += $toRead;
 
@@ -138,7 +138,7 @@ 
 		if($numBits > 0){
 
 			while($numBits >= 8){
-				$result = (($result << 8) | ($this->buffer[$this->bytesRead] & 0xff));
+				$result = (($result << 8)|($this->buffer[$this->bytesRead] & 0xff));
 				$this->bytesRead++;
 				$numBits -= 8;
 			}
@@ -147,7 +147,7 @@ 
 			if($numBits > 0){
 				$bitsToNotRead  = (8 - $numBits);
 				$mask           = ((0xff >> $bitsToNotRead) << $bitsToNotRead);
-				$result         = (($result << $numBits) | (($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead));
+				$result         = (($result << $numBits)|(($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead));
 				$this->bitsRead += $numBits;
 			}
 		}

src/Detector/Detector.php

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 		}
 
 		$otherToX = (int)($fromX + ($otherToX - $fromX) * $scale);
-		$result   += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, $otherToX, $otherToY);
+		$result += $this->sizeOfBlackWhiteBlackRun((int)$fromX, (int)$fromY, $otherToX, $otherToY);
 
 		// Middle pixel is double-counted this way; subtract 1
 		return ($result - 1.0);
@@ -276,7 +276,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->matrix->size();
 		$allowance           = (int)($allowanceFactor * $overallEstModuleSize);

src/Detector/AlignmentPatternFinder.php

Spacing +3 added lines, -3 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 = [];
@@ -173,7 +173,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);
@@ -222,7 +222,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->matrix->size();
 		$stateCount    = [];
 		$stateCount[0] = 0;

src/Data/Kanji.php

Spacing +6 added lines, -6 removed lines

@@ -99,7 +99,7 @@ 
 			$byte2 = ord($string[($i + 1)]);
 
 			// byte 1 unused and vendor ranges
-			if($byte1 < 0x81 || ($byte1 > 0x84 && $byte1 < 0x88) || ($byte1 > 0x9f && $byte1 < 0xe0) ||  $byte1 > 0xea){
+			if($byte1 < 0x81 || ($byte1 > 0x84 && $byte1 < 0x88) || ($byte1 > 0x9f && $byte1 < 0xe0) || $byte1 > 0xea){
 				return false;
 			}
 
@@ -128,7 +128,7 @@ 
 		$len = strlen($this->data);
 
 		for($i = 0; ($i + 1) < $len; $i += 2){
-			$c = (((0xff & ord($this->data[$i])) << 8) | (0xff & ord($this->data[($i + 1)])));
+			$c = (((0xff & ord($this->data[$i])) << 8)|(0xff & ord($this->data[($i + 1)])));
 
 			if($c >= 0x8140 && $c <= 0x9ffc){
 				$c -= 0x8140;
@@ -158,7 +158,7 @@ 
 		$length = $bitBuffer->read(self::getLengthBits($versionNumber));
 
 		if($bitBuffer->available() < ($length * 13)){
-			throw new QRCodeDataException('not enough bits available');  // @codeCoverageIgnore
+			throw new QRCodeDataException('not enough bits available'); // @codeCoverageIgnore
 		}
 
 		// Each character will require 2 bytes. Read the characters as 2-byte pairs and decode as SJIS afterwards
@@ -168,15 +168,15 @@ 
 		while($length > 0){
 			// Each 13 bits encodes a 2-byte character
 			$twoBytes          = $bitBuffer->read(13);
-			$assembledTwoBytes = ((((int)($twoBytes / 0x0c0)) << 8) | ($twoBytes % 0x0c0));
+			$assembledTwoBytes = ((((int)($twoBytes / 0x0c0)) << 8)|($twoBytes % 0x0c0));
 
 			$assembledTwoBytes += ($assembledTwoBytes < 0x01f00)
 				? 0x08140  // In the 0x8140 to 0x9FFC range
 				: 0x0c140; // In the 0xE040 to 0xEBBF range
 
 			$buffer[$offset]       = chr(0xff & ($assembledTwoBytes >> 8));
-			$buffer[($offset + 1)] = chr(0xff & $assembledTwoBytes);
-			$offset                += 2;
+			$buffer[($offset + 1)] = chr(0xff&$assembledTwoBytes);
+			$offset += 2;
 			$length--;
 		}
 

src/Data/Hanzi.php

Spacing +4 added lines, -4 removed lines

@@ -131,7 +131,7 @@ 
 		$len = strlen($this->data);
 
 		for($i = 0; ($i + 1) < $len; $i += 2){
-			$c = (((0xff & ord($this->data[$i])) << 8) | (0xff & ord($this->data[($i + 1)])));
+			$c = (((0xff & ord($this->data[$i])) << 8)|(0xff & ord($this->data[($i + 1)])));
 
 			if($c >= 0xa1a1 && $c <= 0xaafe){
 				$c -= 0x0a1a1;
@@ -177,15 +177,15 @@ 
 		while($length > 0){
 			// Each 13 bits encodes a 2-byte character
 			$twoBytes          = $bitBuffer->read(13);
-			$assembledTwoBytes = ((((int)($twoBytes / 0x060)) << 8) | ($twoBytes % 0x060));
+			$assembledTwoBytes = ((((int)($twoBytes / 0x060)) << 8)|($twoBytes % 0x060));
 
 			$assembledTwoBytes += ($assembledTwoBytes < 0x00a00) // 0x003BF
 				? 0x0a1a1  // In the 0xA1A1 to 0xAAFE range
 				: 0x0a6a1; // In the 0xB0A1 to 0xFAFE range
 
 			$buffer[$offset]       = chr(0xff & ($assembledTwoBytes >> 8));
-			$buffer[($offset + 1)] = chr(0xff & $assembledTwoBytes);
-			$offset                += 2;
+			$buffer[($offset + 1)] = chr(0xff&$assembledTwoBytes);
+			$offset += 2;
 			$length--;
 		}
 

src/Data/QRMatrix.php

Spacing +27 added lines, -27 removed lines

@@ -26,43 +26,43 @@ 
 	/** @var int */
 	public const M_NULL           = 0b000000000000;
 	/** @var int */
-	public const M_DARKMODULE     = (0b000000000001 | self::IS_DARK);
+	public const M_DARKMODULE     = (0b000000000001|self::IS_DARK);
 	/** @var int */
 	public const M_DATA           = 0b000000000010;
 	/** @var int */
-	public const M_DATA_DARK      = (self::M_DATA | self::IS_DARK);
+	public const M_DATA_DARK      = (self::M_DATA|self::IS_DARK);
 	/** @var int */
 	public const M_FINDER         = 0b000000000100;
 	/** @var int */
-	public const M_FINDER_DARK    = (self::M_FINDER | self::IS_DARK);
+	public const M_FINDER_DARK    = (self::M_FINDER|self::IS_DARK);
 	/** @var int */
 	public const M_SEPARATOR      = 0b000000001000;
 	/** @var int */
 	public const M_ALIGNMENT      = 0b000000010000;
 	/** @var int */
-	public const M_ALIGNMENT_DARK = (self::M_ALIGNMENT | self::IS_DARK);
+	public const M_ALIGNMENT_DARK = (self::M_ALIGNMENT|self::IS_DARK);
 	/** @var int */
 	public const M_TIMING         = 0b000000100000;
 	/** @var int */
-	public const M_TIMING_DARK    = (self::M_TIMING | self::IS_DARK);
+	public const M_TIMING_DARK    = (self::M_TIMING|self::IS_DARK);
 	/** @var int */
 	public const M_FORMAT         = 0b000001000000;
 	/** @var int */
-	public const M_FORMAT_DARK    = (self::M_FORMAT | self::IS_DARK);
+	public const M_FORMAT_DARK    = (self::M_FORMAT|self::IS_DARK);
 	/** @var int */
 	public const M_VERSION        = 0b000010000000;
 	/** @var int */
-	public const M_VERSION_DARK   = (self::M_VERSION | self::IS_DARK);
+	public const M_VERSION_DARK   = (self::M_VERSION|self::IS_DARK);
 	/** @var int */
 	public const M_QUIETZONE      = 0b000100000000;
 	/** @var int */
 	public const M_LOGO           = 0b001000000000;
 	/** @var int */
-	public const M_FINDER_DOT     = (0b010000000000 | self::IS_DARK);
+	public const M_FINDER_DOT     = (0b010000000000|self::IS_DARK);
 	/** @var int */
 	public const M_TEST           = 0b011111111111;
 	/** @var int */
-	public const M_TEST_DARK      = (self::M_TEST | self::IS_DARK);
+	public const M_TEST_DARK      = (self::M_TEST|self::IS_DARK);
 
 	/**
 	 * Map of flag => coord
@@ -73,13 +73,13 @@ 
 	 */
 	protected const neighbours = [
 		0b00000001 => [-1, -1],
-		0b00000010 => [ 0, -1],
-		0b00000100 => [ 1, -1],
-		0b00001000 => [ 1,  0],
-		0b00010000 => [ 1,  1],
-		0b00100000 => [ 0,  1],
-		0b01000000 => [-1,  1],
-		0b10000000 => [-1,  0],
+		0b00000010 => [0, -1],
+		0b00000100 => [1, -1],
+		0b00001000 => [1, 0],
+		0b00010000 => [1, 1],
+		0b00100000 => [0, 1],
+		0b01000000 => [-1, 1],
+		0b10000000 => [-1, 0],
 	];
 
 	/**
@@ -159,7 +159,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;
 			}
 		}
 
@@ -169,21 +169,21 @@ 
 	/**
 	 * Returns the current version number
 	 */
-	public function version():?Version{
+	public function version(): ?Version{
 		return $this->version;
 	}
 
 	/**
 	 * Returns the current ECC level
 	 */
-	public function eccLevel():?EccLevel{
+	public function eccLevel(): ?EccLevel{
 		return $this->eccLevel;
 	}
 
 	/**
 	 * Returns the current mask pattern
 	 */
-	public function maskPattern():?MaskPattern{
+	public function maskPattern(): ?MaskPattern{
 		return $this->maskPattern;
 	}
 
@@ -217,7 +217,7 @@ 
 	public function set(int $x, int $y, bool $value, int $M_TYPE):self{
 
 		if(isset($this->matrix[$y][$x])){
-			$this->matrix[$y][$x] = (($M_TYPE & ~$this::IS_DARK) | (($value) ? $this::IS_DARK : 0));
+			$this->matrix[$y][$x] = (($M_TYPE & ~$this::IS_DARK)|(($value) ? $this::IS_DARK : 0));
 		}
 
 		return $this;
@@ -246,7 +246,7 @@ 
 			return false;
 		}
 
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 			// check if the field is the same type
 			if(
 				$M_TYPE_VALUE !== null
-				&& ($this->get(($x + $ix), ($y + $iy)) | $this::IS_DARK) !== ($M_TYPE_VALUE | $this::IS_DARK)
+				&& ($this->get(($x + $ix), ($y + $iy))|$this::IS_DARK) !== ($M_TYPE_VALUE|$this::IS_DARK)
 			){
 				continue;
 			}
@@ -370,8 +370,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);
 			}
 		}
 
@@ -595,7 +595,7 @@ 
 		for($y = 0; $y < $this->moduleCount; $y++){
 			for($x = 0; $x < $this->moduleCount; $x++){
 				// 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
@@ -663,7 +663,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){
 					$this->flip($x, $y);
 				}
 			}

src/Data/ECI.php

Spacing +4 added lines, -4 removed lines

@@ -73,10 +73,10 @@ 
 			$bitBuffer->put($this->encoding, 8);
 		}
 		elseif($this->encoding < 16384){
-			$bitBuffer->put(($this->encoding | 0x8000), 16);
+			$bitBuffer->put(($this->encoding|0x8000), 16);
 		}
 		elseif($this->encoding < 1000000){
-			$bitBuffer->put(($this->encoding | 0xC00000), 24);
+			$bitBuffer->put(($this->encoding|0xC00000), 24);
 		}
 
 		return $this;
@@ -96,11 +96,11 @@ 
 		}
 		// two bytes
 		elseif(($firstByte & 0b11000000) === 0b10000000){
-			$id = ((($firstByte & 0b00111111) << 8) | $bitBuffer->read(8));
+			$id = ((($firstByte & 0b00111111) << 8)|$bitBuffer->read(8));
 		}
 		// three bytes
 		elseif(($firstByte & 0b11100000) === 0b11000000){
-			$id = ((($firstByte & 0b00011111) << 16) | $bitBuffer->read(16));
+			$id = ((($firstByte & 0b00011111) << 16)|$bitBuffer->read(16));
 		}
 		else{
 			throw new QRCodeDataException(sprintf('error decoding ECI value first byte: %08b', $firstByte)); // @codeCoverageIgnore

src/Common/ECICharset.php

Spacing +11 added lines, -11 removed lines

@@ -19,16 +19,16 @@ 
  */
 final class ECICharset{
 
-	public const CP437                 = 0;  // Code page 437, DOS Latin US
-	public const ISO_IEC_8859_1_GLI    = 1;  // GLI encoding with characters 0 to 127 identical to ISO/IEC 646 and characters 128 to 255 identical to ISO 8859-1
-	public const CP437_WO_GLI          = 2;  // An equivalent code table to CP437, without the return-to-GLI 0 logic
-	public const ISO_IEC_8859_1        = 3;  // Latin-1 (Default)
-	public const ISO_IEC_8859_2        = 4;  // Latin-2
-	public const ISO_IEC_8859_3        = 5;  // Latin-3
-	public const ISO_IEC_8859_4        = 6;  // Latin-4
-	public const ISO_IEC_8859_5        = 7;  // Latin/Cyrillic
-	public const ISO_IEC_8859_6        = 8;  // Latin/Arabic
-	public const ISO_IEC_8859_7        = 9;  // Latin/Greek
+	public const CP437                 = 0; // Code page 437, DOS Latin US
+	public const ISO_IEC_8859_1_GLI    = 1; // GLI encoding with characters 0 to 127 identical to ISO/IEC 646 and characters 128 to 255 identical to ISO 8859-1
+	public const CP437_WO_GLI          = 2; // An equivalent code table to CP437, without the return-to-GLI 0 logic
+	public const ISO_IEC_8859_1        = 3; // Latin-1 (Default)
+	public const ISO_IEC_8859_2        = 4; // Latin-2
+	public const ISO_IEC_8859_3        = 5; // Latin-3
+	public const ISO_IEC_8859_4        = 6; // Latin-4
+	public const ISO_IEC_8859_5        = 7; // Latin/Cyrillic
+	public const ISO_IEC_8859_6        = 8; // Latin/Arabic
+	public const ISO_IEC_8859_7        = 9; // Latin/Greek
 	public const ISO_IEC_8859_8        = 10; // Latin/Hebrew
 	public const ISO_IEC_8859_9        = 11; // Latin-5
 	public const ISO_IEC_8859_10       = 12; // Latin-6
@@ -118,7 +118,7 @@ 
 	 * @see \mb_convert_encoding()
 	 * @see \iconv()
 	 */
-	public function getName():?string{
+	public function getName(): ?string{
 		return (self::MB_ENCODINGS[$this->charsetID] ?? null);
 	}