chillerlan / php-qrcode

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

@@ -36,41 +36,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,
 	];
 
 	/**
@@ -79,7 +79,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/Common/ReedSolomonDecoder.php

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

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 		[$numEccCodewords, $eccBlocks] = $this->version->getRSBlocks($this->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){
@@ -304,7 +304,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)));
 				}
 			}
 

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 +2 added lines, -2 removed lines

@@ -330,7 +330,7 @@ 
 	 * @return float|null vertical center of finder pattern, or null if not found
 	 * @noinspection DuplicatedCode
 	 */
-	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 = $this->getCrossCheckStateCount();
 
@@ -414,7 +414,7 @@ 
 	 * check a vertical cross-check and locate the real center of the alignment pattern.
 	 * @noinspection DuplicatedCode
 	 */
-	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->matrix->size();
 		$stateCount = $this->getCrossCheckStateCount();
 

src/Detector/Detector.php

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){

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/Decoder/GDLuminanceSource.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	protected function setLuminancePixels():void{
 
 		if($this->options->readerGrayscale){
-			imagefilter($this->gdImage,  IMG_FILTER_GRAYSCALE);
+			imagefilter($this->gdImage, IMG_FILTER_GRAYSCALE);
 		}
 
 		if($this->options->readerIncreaseContrast){

src/Detector/GridSampler.php

Braces +2 added lines, -1 removed lines

@@ -153,7 +153,8 @@
 				}
 			}
 			// @codeCoverageIgnoreStart
-			catch(Throwable $aioobe){//ArrayIndexOutOfBoundsException
+			catch(Throwable $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/AlignmentPatternFinder.php

Braces +2 added lines, -1 removed lines

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

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/Common/EccLevel.php

Spacing +45 added lines, -45 removed lines

@@ -37,46 +37,46 @@ 
 	 */
 	private const MAX_BITS = [
 	//	[    L,     M,     Q,     H]  // v  => modules
-		[ null,  null,  null,  null], // 0  =>  will be ignored, index starts at 1
-		[  152,   128,   104,    72], // 1  =>  21
-		[  272,   224,   176,   128], // 2  =>  25
-		[  440,   352,   272,   208], // 3  =>  29
-		[  640,   512,   384,   288], // 4  =>  33
-		[  864,   688,   496,   368], // 5  =>  37
-		[ 1088,   864,   608,   480], // 6  =>  41
-		[ 1248,   992,   704,   528], // 7  =>  45
-		[ 1552,  1232,   880,   688], // 8  =>  49
-		[ 1856,  1456,  1056,   800], // 9  =>  53
-		[ 2192,  1728,  1232,   976], // 10 =>  57
-		[ 2592,  2032,  1440,  1120], // 11 =>  61
-		[ 2960,  2320,  1648,  1264], // 12 =>  65
-		[ 3424,  2672,  1952,  1440], // 13 =>  69 NICE!
-		[ 3688,  2920,  2088,  1576], // 14 =>  73
-		[ 4184,  3320,  2360,  1784], // 15 =>  77
-		[ 4712,  3624,  2600,  2024], // 16 =>  81
-		[ 5176,  4056,  2936,  2264], // 17 =>  85
-		[ 5768,  4504,  3176,  2504], // 18 =>  89
-		[ 6360,  5016,  3560,  2728], // 19 =>  93
-		[ 6888,  5352,  3880,  3080], // 20 =>  97
-		[ 7456,  5712,  4096,  3248], // 21 => 101
-		[ 8048,  6256,  4544,  3536], // 22 => 105
-		[ 8752,  6880,  4912,  3712], // 23 => 109
-		[ 9392,  7312,  5312,  4112], // 24 => 113
-		[10208,  8000,  5744,  4304], // 25 => 117
-		[10960,  8496,  6032,  4768], // 26 => 121
-		[11744,  9024,  6464,  5024], // 27 => 125
-		[12248,  9544,  6968,  5288], // 28 => 129
-		[13048, 10136,  7288,  5608], // 29 => 133
-		[13880, 10984,  7880,  5960], // 30 => 137
-		[14744, 11640,  8264,  6344], // 31 => 141
-		[15640, 12328,  8920,  6760], // 32 => 145
-		[16568, 13048,  9368,  7208], // 33 => 149
-		[17528, 13800,  9848,  7688], // 34 => 153
-		[18448, 14496, 10288,  7888], // 35 => 157
-		[19472, 15312, 10832,  8432], // 36 => 161
-		[20528, 15936, 11408,  8768], // 37 => 165
-		[21616, 16816, 12016,  9136], // 38 => 169
-		[22496, 17728, 12656,  9776], // 39 => 173
+		[null, null, null, null], // 0  =>  will be ignored, index starts at 1
+		[152, 128, 104, 72], // 1  =>  21
+		[272, 224, 176, 128], // 2  =>  25
+		[440, 352, 272, 208], // 3  =>  29
+		[640, 512, 384, 288], // 4  =>  33
+		[864, 688, 496, 368], // 5  =>  37
+		[1088, 864, 608, 480], // 6  =>  41
+		[1248, 992, 704, 528], // 7  =>  45
+		[1552, 1232, 880, 688], // 8  =>  49
+		[1856, 1456, 1056, 800], // 9  =>  53
+		[2192, 1728, 1232, 976], // 10 =>  57
+		[2592, 2032, 1440, 1120], // 11 =>  61
+		[2960, 2320, 1648, 1264], // 12 =>  65
+		[3424, 2672, 1952, 1440], // 13 =>  69 NICE!
+		[3688, 2920, 2088, 1576], // 14 =>  73
+		[4184, 3320, 2360, 1784], // 15 =>  77
+		[4712, 3624, 2600, 2024], // 16 =>  81
+		[5176, 4056, 2936, 2264], // 17 =>  85
+		[5768, 4504, 3176, 2504], // 18 =>  89
+		[6360, 5016, 3560, 2728], // 19 =>  93
+		[6888, 5352, 3880, 3080], // 20 =>  97
+		[7456, 5712, 4096, 3248], // 21 => 101
+		[8048, 6256, 4544, 3536], // 22 => 105
+		[8752, 6880, 4912, 3712], // 23 => 109
+		[9392, 7312, 5312, 4112], // 24 => 113
+		[10208, 8000, 5744, 4304], // 25 => 117
+		[10960, 8496, 6032, 4768], // 26 => 121
+		[11744, 9024, 6464, 5024], // 27 => 125
+		[12248, 9544, 6968, 5288], // 28 => 129
+		[13048, 10136, 7288, 5608], // 29 => 133
+		[13880, 10984, 7880, 5960], // 30 => 137
+		[14744, 11640, 8264, 6344], // 31 => 141
+		[15640, 12328, 8920, 6760], // 32 => 145
+		[16568, 13048, 9368, 7208], // 33 => 149
+		[17528, 13800, 9848, 7688], // 34 => 153
+		[18448, 14496, 10288, 7888], // 35 => 157
+		[19472, 15312, 10832, 8432], // 36 => 161
+		[20528, 15936, 11408, 8768], // 37 => 165
+		[21616, 16816, 12016, 9136], // 38 => 169
+		[22496, 17728, 12656, 9776], // 39 => 173
 		[23648, 18672, 13328, 10208], // 40 => 177
 	];
 
@@ -88,7 +88,7 @@ 
 	 * @var int[][]
 	 */
 	private const FORMAT_PATTERN = [
-		[ // L
+		[// L
 		  0b111011111000100,
 		  0b111001011110011,
 		  0b111110110101010,
@@ -98,7 +98,7 @@ 
 		  0b110110001000001,
 		  0b110100101110110,
 		],
-		[ // M
+		[// M
 		  0b101010000010010,
 		  0b101000100100101,
 		  0b101111001111100,
@@ -108,7 +108,7 @@ 
 		  0b100111110010111,
 		  0b100101010100000,
 		],
-		[ // Q
+		[// Q
 		  0b011010101011111,
 		  0b011000001101000,
 		  0b011111100110001,
@@ -118,7 +118,7 @@ 
 		  0b010111011011010,
 		  0b010101111101101,
 		],
-		[ // H
+		[// H
 		  0b001011010001001,
 		  0b001001110111110,
 		  0b001110011100111,
@@ -147,7 +147,7 @@ 
 	 */
 	public function __construct(int $eccLevel){
 
-		if((0b11 & $eccLevel) !== $eccLevel){
+		if((0b11&$eccLevel) !== $eccLevel){
 			throw new QRCodeException('invalid ECC level');
 		}
 

src/QROptionsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -457,7 +457,7 @@
 	/**
 	 * clamp the logo space values between 0 and maximum length (177 modules at version 40)
 	 */
-	protected function clampLogoSpaceValue(?int $value):?int{
+	protected function clampLogoSpaceValue(?int $value): ?int{
 
 		if($value === null){
 			return null;