chillerlan / php-qrcode

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 = [];
@@ -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->matrix->size();
 		$stateCount    = [];
 		$stateCount[0] = 0;

src/Decoder/Binarizer.php

Spacing +3 added lines, -3 removed lines

@@ -36,8 +36,8 @@ 
 	// This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels.
 	// So this is the smallest dimension in each axis we can accept.
 	private const BLOCK_SIZE_POWER  = 3;
-	private const BLOCK_SIZE        = 8;  // ...0100...00
-	private const BLOCK_SIZE_MASK   = 7;  // ...0011...11
+	private const BLOCK_SIZE        = 8; // ...0100...00
+	private const BLOCK_SIZE_MASK   = 7; // ...0011...11
 	private const MINIMUM_DIMENSION = 40;
 	private const MIN_DYNAMIC_RANGE = 24;
 
@@ -234,7 +234,7 @@ 
 
 					for($xx = 0; $xx < self::BLOCK_SIZE; $xx++){
 						$pixel = (int)($this->luminances[(int)($offset + $xx)]) & 0xff;
-						$sum   += $pixel;
+						$sum += $pixel;
 						// still looking for good contrast
 						if($pixel < $min){
 							$min = $pixel;

src/Data/QRMatrix.php

Spacing +18 added lines, -18 removed lines

@@ -59,13 +59,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]
 	];
 
 	/**
@@ -138,7 +138,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;
 			}
 		}
 
@@ -148,21 +148,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;
 	}
 
@@ -196,7 +196,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 | ($value ? $this::IS_DARK : 0);
+			$this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0);
 		}
 
 		return $this;
@@ -225,7 +225,7 @@ 
 			return false;
 		}
 
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 			[$ix, $iy] = $coord;
 
 			// 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)){
+			if($M_TYPE_VALUE !== null && ($this->get($x + $ix, $y + $iy)|$this::IS_DARK) !== ($M_TYPE_VALUE|$this::IS_DARK)){
 				continue;
 			}
 
@@ -349,8 +349,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);
 			}
 		}
 
@@ -574,7 +574,7 @@ 
 		foreach($this->matrix as $y => $row){
 			foreach($row as $x => $val){
 				// 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
@@ -642,7 +642,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/Output/QRGdImage.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 
 		// scale down to the expected size
 		if($this->options->drawCircularModules && $this->options->scale <= 20){
-			$this->image = imagescale($this->image, $this->length/10, $this->length/10, IMG_BILINEAR_FIXED);
+			$this->image = imagescale($this->image, $this->length / 10, $this->length / 10, IMG_BILINEAR_FIXED);
 		}
 
 		if($this->options->returnResource){

src/QRCode.php

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
 	 * @see \chillerlan\QRCode\Common\Version::AUTO
 	 * @var int
 	 */
-	public const VERSION_AUTO      = Version::AUTO;
+	public const VERSION_AUTO = Version::AUTO;
 
 	/**
 	 * @deprecated 5.0.0 use MaskPattern::AUTO instead
@@ -82,28 +82,28 @@ 
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::MARKUP_SVG
 	 * @var string
 	 */
-	public const OUTPUT_MARKUP_SVG  = QROutputInterface::MARKUP_SVG;
+	public const OUTPUT_MARKUP_SVG = QROutputInterface::MARKUP_SVG;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::GDIMAGE_PNG instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::GDIMAGE_PNG
 	 * @var string
 	 */
-	public const OUTPUT_IMAGE_PNG   = QROutputInterface::GDIMAGE_PNG;
+	public const OUTPUT_IMAGE_PNG = QROutputInterface::GDIMAGE_PNG;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::GDIMAGE_JPG instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::GDIMAGE_JPG
 	 * @var string
 	 */
-	public const OUTPUT_IMAGE_JPG   = QROutputInterface::GDIMAGE_JPG;
+	public const OUTPUT_IMAGE_JPG = QROutputInterface::GDIMAGE_JPG;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::GDIMAGE_GIF instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::GDIMAGE_GIF
 	 * @var string
 	 */
-	public const OUTPUT_IMAGE_GIF   = QROutputInterface::GDIMAGE_GIF;
+	public const OUTPUT_IMAGE_GIF = QROutputInterface::GDIMAGE_GIF;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::STRING_JSON instead
@@ -124,35 +124,35 @@ 
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::IMAGICK
 	 * @var string
 	 */
-	public const OUTPUT_IMAGICK     = QROutputInterface::IMAGICK;
+	public const OUTPUT_IMAGICK = QROutputInterface::IMAGICK;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::FPDF instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::FPDF
 	 * @var string
 	 */
-	public const OUTPUT_FPDF        = QROutputInterface::FPDF;
+	public const OUTPUT_FPDF = QROutputInterface::FPDF;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::EPS instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::EPS
 	 * @var string
 	 */
-	public const OUTPUT_EPS         = QROutputInterface::EPS;
+	public const OUTPUT_EPS = QROutputInterface::EPS;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::CUSTOM instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::CUSTOM
 	 * @var string
 	 */
-	public const OUTPUT_CUSTOM      = QROutputInterface::CUSTOM;
+	public const OUTPUT_CUSTOM = QROutputInterface::CUSTOM;
 
 	/**
 	 * @deprecated 5.0.0 use QROutputInterface::MODES instead
 	 * @see \chillerlan\QRCode\Output\QROutputInterface::MODES
 	 * @var string[]
 	 */
-	public const OUTPUT_MODES       = QROutputInterface::MODES;
+	public const OUTPUT_MODES = QROutputInterface::MODES;
 
 	/**
 	 * The settings container

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

Indentation +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 	 *
 	 *
 	 * @see https://github.com/chillerlan/php-qrcode/discussions/121
- 	 */
+	 */
 	protected bool $imageTransparent = true;
 
 	/**

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;

src/Decoder/Decoder.php

Braces +2 added lines, -1 removed lines

@@ -128,7 +128,8 @@
 				$str = AlphaNum::decodeSegment($bitBuffer, $versionNumber);
 
 				// See section 6.4.8.1, 6.4.8.2
-				if($fc1InEffect){ // ???
+				if($fc1InEffect){
+// ???
 					// We need to massage the result a bit if in an FNC1 mode:
 					$str = str_replace(chr(0x1d), '%', $str);
 					$str = str_replace('%%', '%', $str);