chillerlan / php-qrcode

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
-		[    0,     0,     0,     0], // 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
+		[0, 0, 0, 0], // 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,
@@ -150,7 +150,7 @@ 
 	 */
 	public function __construct(int $eccLevel){
 
-		if((0b11 & $eccLevel) !== $eccLevel){
+		if((0b11&$eccLevel) !== $eccLevel){
 			throw new QRCodeException('invalid ECC level');
 		}
 

src/Data/QRMatrix.php

Spacing +30 added lines, -30 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],
 	];
 
 	/**
@@ -162,7 +162,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;
 			}
 		}
 
@@ -181,7 +181,7 @@ 
 	/**
 	 * Returns the current version number
 	 */
-	public function getVersion():?Version{
+	public function getVersion(): ?Version{
 		return $this->version;
 	}
 
@@ -190,14 +190,14 @@ 
 	 * @see \chillerlan\QRCode\Data\QRMatrix::getVersion()
 	 * @codeCoverageIgnore
 	 */
-	public function version():?Version{
+	public function version(): ?Version{
 		return $this->getVersion();
 	}
 
 	/**
 	 * Returns the current ECC level
 	 */
-	public function getEccLevel():?EccLevel{
+	public function getEccLevel(): ?EccLevel{
 		return $this->eccLevel;
 	}
 
@@ -206,14 +206,14 @@ 
 	 * @see \chillerlan\QRCode\Data\QRMatrix::getEccLevel()
 	 * @codeCoverageIgnore
 	 */
-	public function eccLevel():?EccLevel{
+	public function eccLevel(): ?EccLevel{
 		return $this->getEccLevel();
 	}
 
 	/**
 	 * Returns the current mask pattern
 	 */
-	public function getMaskPattern():?MaskPattern{
+	public function getMaskPattern(): ?MaskPattern{
 		return $this->maskPattern;
 	}
 
@@ -222,7 +222,7 @@ 
 	 * @see \chillerlan\QRCode\Data\QRMatrix::getMaskPattern()
 	 * @codeCoverageIgnore
 	 */
-	public function maskPattern():?MaskPattern{
+	public function maskPattern(): ?MaskPattern{
 		return $this->getMaskPattern();
 	}
 
@@ -265,7 +265,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;
@@ -294,7 +294,7 @@ 
 			return false;
 		}
 
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -338,7 +338,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;
 			}
@@ -418,8 +418,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);
 			}
 		}
 
@@ -647,7 +647,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
@@ -716,7 +716,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);
 				}
 			}