chillerlan / php-qrcode

src/Common/ReedSolomonEncoder.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 			$dataBytes[$key] = [];
 
 			for($i = 0; $i < $dataByteCount; $i++){
-				$dataBytes[$key][$i] = $bitBufferData[$i + $dataByteOffset] & 0xff;
+				$dataBytes[$key][$i] = $bitBufferData[$i + $dataByteOffset]&0xff;
 			}
 
 			$ecByteCount    = $rsBlockTotal - $dataByteCount;

src/Common/GF256.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 	private const logTable = [
 		  0, // the first value is never returned, index starts at 1
-		       0,   1,  25,   2,  50,  26, 198,   3, 223,  51, 238,  27, 104, 199,  75,
+			   0,   1,  25,   2,  50,  26, 198,   3, 223,  51, 238,  27, 104, 199,  75,
 		  4, 100, 224,  14,  52, 141, 239, 129,  28, 193, 105, 248, 200,   8,  76, 113,
 		  5, 138, 101,  47, 225,  36,  15,  33,  53, 147, 142, 218, 240,  18, 130,  69,
 		 29, 181, 194, 125, 106,  39, 249, 185, 201, 154,   9, 120,  77, 228, 114, 166,

Spacing +33 added lines, -33 removed lines

@@ -38,41 +38,41 @@ 
 
 	private const logTable = [
 		  0, // the first value is never returned, index starts at 1
-		       0,   1,  25,   2,  50,  26, 198,   3, 223,  51, 238,  27, 104, 199,  75,
-		  4, 100, 224,  14,  52, 141, 239, 129,  28, 193, 105, 248, 200,   8,  76, 113,
-		  5, 138, 101,  47, 225,  36,  15,  33,  53, 147, 142, 218, 240,  18, 130,  69,
-		 29, 181, 194, 125, 106,  39, 249, 185, 201, 154,   9, 120,  77, 228, 114, 166,
-		  6, 191, 139,  98, 102, 221,  48, 253, 226, 152,  37, 179,  16, 145,  34, 136,
-		 54, 208, 148, 206, 143, 150, 219, 189, 241, 210,  19,  92, 131,  56,  70,  64,
-		 30,  66, 182, 163, 195,  72, 126, 110, 107,  58,  40,  84, 250, 133, 186,  61,
-		202,  94, 155, 159,  10,  21, 121,  43,  78, 212, 229, 172, 115, 243, 167,  87,
-		  7, 112, 192, 247, 140, 128,  99,  13, 103,  74, 222, 237,  49, 197, 254,  24,
-		227, 165, 153, 119,  38, 184, 180, 124,  17,  68, 146, 217,  35,  32, 137,  46,
-		 55,  63, 209,  91, 149, 188, 207, 205, 144, 135, 151, 178, 220, 252, 190,  97,
-		242,  86, 211, 171,  20,  42,  93, 158, 132,  60,  57,  83,  71, 109,  65, 162,
-		 31,  45,  67, 216, 183, 123, 164, 118, 196,  23,  73, 236, 127,  12, 111, 246,
-		108, 161,  59,  82,  41, 157,  85, 170, 251,  96, 134, 177, 187, 204,  62,  90,
-		203,  89,  95, 176, 156, 169, 160,  81,  11, 245,  22, 235, 122, 117,  44, 215,
-		 79, 174, 213, 233, 230, 231, 173, 232, 116, 214, 244, 234, 168,  80,  88, 175,
+		       0, 1, 25, 2, 50, 26, 198, 3, 223, 51, 238, 27, 104, 199, 75,
+		  4, 100, 224, 14, 52, 141, 239, 129, 28, 193, 105, 248, 200, 8, 76, 113,
+		  5, 138, 101, 47, 225, 36, 15, 33, 53, 147, 142, 218, 240, 18, 130, 69,
+		 29, 181, 194, 125, 106, 39, 249, 185, 201, 154, 9, 120, 77, 228, 114, 166,
+		  6, 191, 139, 98, 102, 221, 48, 253, 226, 152, 37, 179, 16, 145, 34, 136,
+		 54, 208, 148, 206, 143, 150, 219, 189, 241, 210, 19, 92, 131, 56, 70, 64,
+		 30, 66, 182, 163, 195, 72, 126, 110, 107, 58, 40, 84, 250, 133, 186, 61,
+		202, 94, 155, 159, 10, 21, 121, 43, 78, 212, 229, 172, 115, 243, 167, 87,
+		  7, 112, 192, 247, 140, 128, 99, 13, 103, 74, 222, 237, 49, 197, 254, 24,
+		227, 165, 153, 119, 38, 184, 180, 124, 17, 68, 146, 217, 35, 32, 137, 46,
+		 55, 63, 209, 91, 149, 188, 207, 205, 144, 135, 151, 178, 220, 252, 190, 97,
+		242, 86, 211, 171, 20, 42, 93, 158, 132, 60, 57, 83, 71, 109, 65, 162,
+		 31, 45, 67, 216, 183, 123, 164, 118, 196, 23, 73, 236, 127, 12, 111, 246,
+		108, 161, 59, 82, 41, 157, 85, 170, 251, 96, 134, 177, 187, 204, 62, 90,
+		203, 89, 95, 176, 156, 169, 160, 81, 11, 245, 22, 235, 122, 117, 44, 215,
+		 79, 174, 213, 233, 230, 231, 173, 232, 116, 214, 244, 234, 168, 80, 88, 175,
 	];
 
 	private const expTable = [
-		  1,   2,   4,   8,  16,  32,  64, 128,  29,  58, 116, 232, 205, 135,  19,  38,
-		 76, 152,  45,  90, 180, 117, 234, 201, 143,   3,   6,  12,  24,  48,  96, 192,
-		157,  39,  78, 156,  37,  74, 148,  53, 106, 212, 181, 119, 238, 193, 159,  35,
-		 70, 140,   5,  10,  20,  40,  80, 160,  93, 186, 105, 210, 185, 111, 222, 161,
-		 95, 190,  97, 194, 153,  47,  94, 188, 101, 202, 137,  15,  30,  60, 120, 240,
-		253, 231, 211, 187, 107, 214, 177, 127, 254, 225, 223, 163,  91, 182, 113, 226,
-		217, 175,  67, 134,  17,  34,  68, 136,  13,  26,  52, 104, 208, 189, 103, 206,
-		129,  31,  62, 124, 248, 237, 199, 147,  59, 118, 236, 197, 151,  51, 102, 204,
-		133,  23,  46,  92, 184, 109, 218, 169,  79, 158,  33,  66, 132,  21,  42,  84,
-		168,  77, 154,  41,  82, 164,  85, 170,  73, 146,  57, 114, 228, 213, 183, 115,
-		230, 209, 191,  99, 198, 145,  63, 126, 252, 229, 215, 179, 123, 246, 241, 255,
-		227, 219, 171,  75, 150,  49,  98, 196, 149,  55, 110, 220, 165,  87, 174,  65,
-		130,  25,  50, 100, 200, 141,   7,  14,  28,  56, 112, 224, 221, 167,  83, 166,
-		 81, 162,  89, 178, 121, 242, 249, 239, 195, 155,  43,  86, 172,  69, 138,   9,
-		 18,  36,  72, 144,  61, 122, 244, 245, 247, 243, 251, 235, 203, 139,  11,  22,
-		 44,  88, 176, 125, 250, 233, 207, 131,  27,  54, 108, 216, 173,  71, 142,   1,
+		  1, 2, 4, 8, 16, 32, 64, 128, 29, 58, 116, 232, 205, 135, 19, 38,
+		 76, 152, 45, 90, 180, 117, 234, 201, 143, 3, 6, 12, 24, 48, 96, 192,
+		157, 39, 78, 156, 37, 74, 148, 53, 106, 212, 181, 119, 238, 193, 159, 35,
+		 70, 140, 5, 10, 20, 40, 80, 160, 93, 186, 105, 210, 185, 111, 222, 161,
+		 95, 190, 97, 194, 153, 47, 94, 188, 101, 202, 137, 15, 30, 60, 120, 240,
+		253, 231, 211, 187, 107, 214, 177, 127, 254, 225, 223, 163, 91, 182, 113, 226,
+		217, 175, 67, 134, 17, 34, 68, 136, 13, 26, 52, 104, 208, 189, 103, 206,
+		129, 31, 62, 124, 248, 237, 199, 147, 59, 118, 236, 197, 151, 51, 102, 204,
+		133, 23, 46, 92, 184, 109, 218, 169, 79, 158, 33, 66, 132, 21, 42, 84,
+		168, 77, 154, 41, 82, 164, 85, 170, 73, 146, 57, 114, 228, 213, 183, 115,
+		230, 209, 191, 99, 198, 145, 63, 126, 252, 229, 215, 179, 123, 246, 241, 255,
+		227, 219, 171, 75, 150, 49, 98, 196, 149, 55, 110, 220, 165, 87, 174, 65,
+		130, 25, 50, 100, 200, 141, 7, 14, 28, 56, 112, 224, 221, 167, 83, 166,
+		 81, 162, 89, 178, 121, 242, 249, 239, 195, 155, 43, 86, 172, 69, 138, 9,
+		 18, 36, 72, 144, 61, 122, 244, 245, 247, 243, 251, 235, 203, 139, 11, 22,
+		 44, 88, 176, 125, 250, 233, 207, 131, 27, 54, 108, 216, 173, 71, 142, 1,
 	];
 
 	/**
@@ -81,7 +81,7 @@ 
 	 * @return int sum/difference of a and b
 	 */
 	public static function addOrSubtract(int $a, int $b):int{
-		return $a ^ $b;
+		return $a^$b;
 	}
 
 	/**

src/Output/QROutputInterface.php

Spacing +9 added lines, -9 removed lines

@@ -33,15 +33,15 @@
 		QRMatrix::M_LOGO                           => false,
 		QRMatrix::M_TEST                           => false,
 		// dark
-		QRMatrix::M_DARKMODULE | QRMatrix::IS_DARK => true,
-		QRMatrix::M_DATA | QRMatrix::IS_DARK       => true,
-		QRMatrix::M_FINDER | QRMatrix::IS_DARK     => true,
-		QRMatrix::M_ALIGNMENT | QRMatrix::IS_DARK  => true,
-		QRMatrix::M_TIMING | QRMatrix::IS_DARK     => true,
-		QRMatrix::M_FORMAT | QRMatrix::IS_DARK     => true,
-		QRMatrix::M_VERSION | QRMatrix::IS_DARK    => true,
-		QRMatrix::M_FINDER_DOT | QRMatrix::IS_DARK => true,
-		QRMatrix::M_TEST | QRMatrix::IS_DARK       => true,
+		QRMatrix::M_DARKMODULE|QRMatrix::IS_DARK => true,
+		QRMatrix::M_DATA|QRMatrix::IS_DARK       => true,
+		QRMatrix::M_FINDER|QRMatrix::IS_DARK     => true,
+		QRMatrix::M_ALIGNMENT|QRMatrix::IS_DARK  => true,
+		QRMatrix::M_TIMING|QRMatrix::IS_DARK     => true,
+		QRMatrix::M_FORMAT|QRMatrix::IS_DARK     => true,
+		QRMatrix::M_VERSION|QRMatrix::IS_DARK    => true,
+		QRMatrix::M_FINDER_DOT|QRMatrix::IS_DARK => true,
+		QRMatrix::M_TEST|QRMatrix::IS_DARK       => true,
 	];
 
 	/**

src/Common/ReedSolomonDecoder.php

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 					// Above should work but fails on some Apple and Linux JDKs due to a Hotspot bug.
 					// Below is a funny-looking workaround from Steven Parkes
 					$term        = GF256::multiply($errorLocations[$j], $xiInverse);
-					$denominator = GF256::multiply($denominator, (($term & 0x1) === 0 ? $term | 1 : $term & ~1));
+					$denominator = GF256::multiply($denominator, (($term&0x1) === 0 ? $term|1 : $term&~1));
 				}
 			}
 

Braces +2 added lines, -1 removed lines

@@ -143,7 +143,8 @@
 		// This is a direct application of Chien's search
 		$numErrors = $errorLocator->getDegree();
 
-		if($numErrors === 1){ // shortcut
+		if($numErrors === 1){
+// shortcut
 			return [$errorLocator->getCoefficient(1)];
 		}
 

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

@@ -75,7 +75,7 @@ 
 				// Black pixel
 				if($this->bitMatrix->get($j, $i)){
 					// Counting white pixels
-					if(($currentState & 1) === 1){
+					if(($currentState&1) === 1){
 						$currentState++;
 					}
 
@@ -84,7 +84,7 @@ 
 				// White pixel
 				else{
 					// Counting black pixels
-					if(($currentState & 1) === 0){
+					if(($currentState&1) === 0){
 						// A winner?
 						if($currentState === 4){
 							// Yes
@@ -330,7 +330,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();
 
@@ -413,7 +413,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.
 	 */
-	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/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/Common/FormatInformation.php

Spacing +2 added lines, -2 removed lines

@@ -80,8 +80,8 @@
 	 * Receives the format information from a parsed QR Code, detects ECC level and mask pattern
 	 */
 	public function __construct(int $formatInfo){
-		$this->errorCorrectionLevel = ($formatInfo >> 3) & 0x03; // Bits 3,4
-		$this->maskPattern          = ($formatInfo & 0x07); // Bottom 3 bits
+		$this->errorCorrectionLevel = ($formatInfo >> 3)&0x03; // Bits 3,4
+		$this->maskPattern          = ($formatInfo&0x07); // Bottom 3 bits
 	}
 
 	/**