chillerlan / php-qrcode

src/QRCode.php

Spacing +36 added lines, -36 removed lines

@@ -45,29 +45,29 @@ 
 	const ERROR_CORRECT_LEVEL_H = 2; // 30%.
 
 	// max bits @ ec level L:07 M:15 Q:25 H:30 %
-	const TYPE_01 =  1; //  152  128  104   72
-	const TYPE_02 =  2; //  272  224  176  128
-	const TYPE_03 =  3; //  440  352  272  208
-	const TYPE_04 =  4; //  640  512  384  288
-	const TYPE_05 =  5; //  864  688  496  368
-	const TYPE_06 =  6; // 1088  864  608  480
-	const TYPE_07 =  7; // 1248  992  704  528
-	const TYPE_08 =  8; // 1552 1232  880  688
-	const TYPE_09 =  9; // 1856 1456 1056  800
+	const TYPE_01 = 1; //  152  128  104   72
+	const TYPE_02 = 2; //  272  224  176  128
+	const TYPE_03 = 3; //  440  352  272  208
+	const TYPE_04 = 4; //  640  512  384  288
+	const TYPE_05 = 5; //  864  688  496  368
+	const TYPE_06 = 6; // 1088  864  608  480
+	const TYPE_07 = 7; // 1248  992  704  528
+	const TYPE_08 = 8; // 1552 1232  880  688
+	const TYPE_09 = 9; // 1856 1456 1056  800
 	const TYPE_10 = 10; // 2192 1728 1232  976
 
 
 	const MAX_BITS = [
-		self::TYPE_01 => [ 128,  152,   72,  104],
-		self::TYPE_02 => [ 224,  272,  128,  176],
-		self::TYPE_03 => [ 352,  440,  208,  272],
-		self::TYPE_04 => [ 512,  640,  288,  384],
-		self::TYPE_05 => [ 688,  864,  368,  496],
-		self::TYPE_06 => [ 864, 1088,  480,  608],
-		self::TYPE_07 => [ 992, 1248,  528,  704],
-		self::TYPE_08 => [1232, 1552,  688,  880],
-		self::TYPE_09 => [1456, 1856,  800, 1056],
-		self::TYPE_10 => [1728, 2192,  976, 1232],
+		self::TYPE_01 => [128, 152, 72, 104],
+		self::TYPE_02 => [224, 272, 128, 176],
+		self::TYPE_03 => [352, 440, 208, 272],
+		self::TYPE_04 => [512, 640, 288, 384],
+		self::TYPE_05 => [688, 864, 368, 496],
+		self::TYPE_06 => [864, 1088, 480, 608],
+		self::TYPE_07 => [992, 1248, 528, 704],
+		self::TYPE_08 => [1232, 1552, 688, 880],
+		self::TYPE_09 => [1456, 1856, 800, 1056],
+		self::TYPE_10 => [1728, 2192, 976, 1232],
 	];
 
 	const RSBLOCK = [
@@ -337,9 +337,9 @@ 
 				$count = 0;
 
 				if(
-					   $this->matrix[$row    ][$col    ]
-					|| $this->matrix[$row    ][$col + 1]
-					|| $this->matrix[$row + 1][$col    ]
+					   $this->matrix[$row][$col]
+					|| $this->matrix[$row][$col + 1]
+					|| $this->matrix[$row + 1][$col]
 					|| $this->matrix[$row + 1][$col + 1]
 				){
 					$count++;
@@ -366,7 +366,7 @@ 
 			foreach($range2 as $col){
 
 				if(
-					    $this->matrix[$row][$col    ]
+					    $this->matrix[$row][$col]
 					&& !$this->matrix[$row][$col + 1]
 					&&  $this->matrix[$row][$col + 2]
 					&&  $this->matrix[$row][$col + 3]
@@ -384,7 +384,7 @@ 
 			foreach($range2 as $row){
 
 				if(
-					    $this->matrix[$row    ][$col]
+					    $this->matrix[$row][$col]
 					&& !$this->matrix[$row + 1][$col]
 					&&  $this->matrix[$row + 2][$col]
 					&&  $this->matrix[$row + 3][$col]
@@ -427,11 +427,11 @@ 
 		$this->lostPoint = 0;
 		$this->darkCount = 0;
 
-		$range = range(0, $this->pixelCount-1);
+		$range = range(0, $this->pixelCount - 1);
 
 		$this->testLevel1($range);
-		$this->testLevel2(range(0, $this->pixelCount-2));
-		$this->testLevel3($range, range(0, $this->pixelCount-7));
+		$this->testLevel2(range(0, $this->pixelCount - 2));
+		$this->testLevel3($range, range(0, $this->pixelCount - 7));
 		$this->testLevel4($range);
 
 		$this->lostPoint += (abs(100 * $this->darkCount / $this->pixelCount / $this->pixelCount - 50) / 5) * 10;
@@ -455,7 +455,7 @@ 
 			$a = (int)floor($i / 3);
 			$b = $i % 3 + $this->pixelCount - 8 - 3;
 
-			$this->matrix[$a][$b] = $this->matrix[$b][$a] = !$test && (($bits >> $i) & 1) === 1;
+			$this->matrix[$a][$b] = $this->matrix[$b][$a] = !$test && (($bits >> $i)&1) === 1;
 		}
 
 	}
@@ -468,13 +468,13 @@ 
 	 */
 	protected function setTypeInfo(bool $test, int $pattern){
 		$this->setPattern();
-		$bits = Util::getBCHTypeInfo(($this->errorCorrectLevel << 3) | $pattern);
+		$bits = Util::getBCHTypeInfo(($this->errorCorrectLevel << 3)|$pattern);
 
 		for($i = 0; $i < 15; $i++){
-			$mod = !$test && (($bits >> $i) & 1) === 1;
+			$mod = !$test && (($bits >> $i)&1) === 1;
 
 			switch(true){
-				case $i < 6: $this->matrix[$i    ][8] = $mod; break;
+				case $i < 6: $this->matrix[$i][8] = $mod; break;
 				case $i < 8: $this->matrix[$i + 1][8] = $mod; break;
 				default:
 					$this->matrix[$this->pixelCount - 15 + $i][8] = $mod;
@@ -482,7 +482,7 @@ 
 
 			switch(true){
 				case $i < 8: $this->matrix[8][$this->pixelCount - $i - 1] = $mod; break;
-				case $i < 9: $this->matrix[8][           15 + 1 - $i - 1] = $mod; break;
+				case $i < 9: $this->matrix[8][15 + 1 - $i - 1] = $mod; break;
 				default:
 					$this->matrix[8][15 - $i - 1] = $mod;
 			}
@@ -565,7 +565,7 @@ 
 
 			foreach($dcdata[$key] as $i => &$_dcdata){
 				$bdata = $this->bitBuffer->buffer;
-				$_dcdata = 0xff & $bdata[$i + $offset];
+				$_dcdata = 0xff&$bdata[$i + $offset];
 			}
 
 			$offset += $rsBlockDataCount;
@@ -641,7 +641,7 @@ 
 						$dark = false;
 
 						if($byteIndex < $dataCount){
-							$dark = (($data[$byteIndex] >> $bitIndex) & 1) === 1;
+							$dark = (($data[$byteIndex] >> $bitIndex)&1) === 1;
 						}
 
 						$a = $row + $_col;
@@ -702,7 +702,7 @@ 
 					$this->matrix[$row + $r][$col + $c] =
 						(0 <= $r && $r <= 6 && ($c === 0 || $c === 6))
 						|| (0 <= $c && $c <= 6 && ($r === 0 || $r === 6))
-						|| (2 <= $c && $c <= 4 &&  2 <= $r && $r <= 4);
+						|| (2 <= $c && $c <= 4 && 2 <= $r && $r <= 4);
 				}
 			}
 		}
@@ -726,7 +726,7 @@ 
 						$this->matrix[$posI + $row][$posJ + $col] =
 							    $row === -2 || $row === 2
 							||  $col === -2 || $col === 2
-							|| ($row ===  0 && $col === 0);
+							|| ($row === 0 && $col === 0);
 					}
 				}
 			}

src/Util.php

Spacing +23 added lines, -23 removed lines

@@ -20,16 +20,16 @@ 
 class Util{
 
 	const MAX_LENGTH = [
-		[[ 41,  25,  17,  10], [ 34,  20,  14,   8], [ 27,  16,  11,   7], [ 17,  10,   7,   4]],
-		[[ 77,  47,  32,  20], [ 63,  38,  26,  16], [ 48,  29,  20,  12], [ 34,  20,  14,   8]],
-		[[127,  77,  53,  32], [101,  61,  42,  26], [ 77,  47,  32,  20], [ 58,  35,  24,  15]],
-		[[187, 114,  78,  48], [149,  90,  62,  38], [111,  67,  46,  28], [ 82,  50,  34,  21]],
-		[[255, 154, 106,  65], [202, 122,  84,  52], [144,  87,  60,  37], [106,  64,  44,  27]],
-		[[322, 195, 134,  82], [255, 154, 106,  65], [178, 108,  74,  45], [139,  84,  58,  36]],
-		[[370, 224, 154,  95], [293, 178, 122,  75], [207, 125,  86,  53], [154,  93,  64,  39]],
-		[[461, 279, 192, 118], [365, 221, 152,  93], [259, 157, 108,  66], [202, 122,  84,  52]],
-		[[552, 335, 230, 141], [432, 262, 180, 111], [312, 189, 130,  80], [235, 143,  98,  60]],
-		[[652, 395, 271, 167], [513, 311, 213, 131], [364, 221, 151,  93], [288, 174, 119,  74]],
+		[[41, 25, 17, 10], [34, 20, 14, 8], [27, 16, 11, 7], [17, 10, 7, 4]],
+		[[77, 47, 32, 20], [63, 38, 26, 16], [48, 29, 20, 12], [34, 20, 14, 8]],
+		[[127, 77, 53, 32], [101, 61, 42, 26], [77, 47, 32, 20], [58, 35, 24, 15]],
+		[[187, 114, 78, 48], [149, 90, 62, 38], [111, 67, 46, 28], [82, 50, 34, 21]],
+		[[255, 154, 106, 65], [202, 122, 84, 52], [144, 87, 60, 37], [106, 64, 44, 27]],
+		[[322, 195, 134, 82], [255, 154, 106, 65], [178, 108, 74, 45], [139, 84, 58, 36]],
+		[[370, 224, 154, 95], [293, 178, 122, 75], [207, 125, 86, 53], [154, 93, 64, 39]],
+		[[461, 279, 192, 118], [365, 221, 152, 93], [259, 157, 108, 66], [202, 122, 84, 52]],
+		[[552, 335, 230, 141], [432, 262, 180, 111], [312, 189, 130, 80], [235, 143, 98, 60]],
+		[[652, 395, 271, 167], [513, 311, 213, 131], [364, 221, 151, 93], [288, 174, 119, 74]],
 	];
 
 	const BLOCK_TABLE = [
@@ -37,7 +37,7 @@ 
 		[1, 26, 19], // L
 		[1, 26, 16], // M
 		[1, 26, 13], // Q
-		[1, 26,  9], // H
+		[1, 26, 9], // H
 		// 2
 		[1, 44, 34],
 		[1, 44, 28],
@@ -50,14 +50,14 @@ 
 		[2, 35, 13],
 		// 4
 		[1, 100, 80],
-		[2,  50, 32],
-		[2,  50, 24],
-		[4,  25,  9],
+		[2, 50, 32],
+		[2, 50, 24],
+		[4, 25, 9],
 		// 5
 		[1, 134, 108],
-		[2,  67,  43],
-		[2,  33,  15, 2, 34, 16],
-		[2,  33,  11, 2, 34, 12],
+		[2, 67, 43],
+		[2, 33, 15, 2, 34, 16],
+		[2, 33, 11, 2, 34, 12],
 		// 6
 		[2, 86, 68],
 		[4, 43, 27],
@@ -70,14 +70,14 @@ 
 		[4, 39, 13, 1, 40, 14],
 		// 8
 		[2, 121, 97],
-		[2,  60, 38, 2, 61, 39],
-		[4,  40, 18, 2, 41, 19],
-		[4,  40, 14, 2, 41, 15],
+		[2, 60, 38, 2, 61, 39],
+		[4, 40, 18, 2, 41, 19],
+		[4, 40, 14, 2, 41, 15],
 		// 9
 		[2, 146, 116],
-		[3,  58,  36, 2, 59, 37],
-		[4,  36,  16, 4, 37, 17],
-		[4,  36,  12, 4, 37, 13],
+		[3, 58, 36, 2, 59, 37],
+		[4, 36, 16, 4, 37, 17],
+		[4, 36, 12, 4, 37, 13],
 		// 10
 		[2, 86, 68, 2, 87, 69],
 		[4, 69, 43, 1, 70, 44],