chillerlan / php-qrcode

src/Common/ECICharset.php

Spacing +11 added lines, -11 removed lines

@@ -18,16 +18,16 @@ 
  */
 final class ECICharset{
 
-	public const CP437                 = 0;  // Code page 437, DOS Latin US
-	public const ISO_IEC_8859_1_GLI    = 1;  // GLI encoding with characters 0 to 127 identical to ISO/IEC 646 and characters 128 to 255 identical to ISO 8859-1
-	public const CP437_WO_GLI          = 2;  // An equivalent code table to CP437, without the return-to-GLI 0 logic
-	public const ISO_IEC_8859_1        = 3;  // Latin-1 (Default)
-	public const ISO_IEC_8859_2        = 4;  // Latin-2
-	public const ISO_IEC_8859_3        = 5;  // Latin-3
-	public const ISO_IEC_8859_4        = 6;  // Latin-4
-	public const ISO_IEC_8859_5        = 7;  // Latin/Cyrillic
-	public const ISO_IEC_8859_6        = 8;  // Latin/Arabic
-	public const ISO_IEC_8859_7        = 9;  // Latin/Greek
+	public const CP437                 = 0; // Code page 437, DOS Latin US
+	public const ISO_IEC_8859_1_GLI    = 1; // GLI encoding with characters 0 to 127 identical to ISO/IEC 646 and characters 128 to 255 identical to ISO 8859-1
+	public const CP437_WO_GLI          = 2; // An equivalent code table to CP437, without the return-to-GLI 0 logic
+	public const ISO_IEC_8859_1        = 3; // Latin-1 (Default)
+	public const ISO_IEC_8859_2        = 4; // Latin-2
+	public const ISO_IEC_8859_3        = 5; // Latin-3
+	public const ISO_IEC_8859_4        = 6; // Latin-4
+	public const ISO_IEC_8859_5        = 7; // Latin/Cyrillic
+	public const ISO_IEC_8859_6        = 8; // Latin/Arabic
+	public const ISO_IEC_8859_7        = 9; // Latin/Greek
 	public const ISO_IEC_8859_8        = 10; // Latin/Hebrew
 	public const ISO_IEC_8859_9        = 11; // Latin-5
 	public const ISO_IEC_8859_10       = 12; // Latin-6
@@ -117,7 +117,7 @@ 
 	 * @see \mb_convert_encoding()
 	 * @see \iconv()
 	 */
-	public function getName():?string{
+	public function getName(): ?string{
 		return self::MB_ENCODINGS[$this->charsetID];
 	}
 

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/Data/ECI.php

Spacing +2 added lines, -2 removed lines

@@ -67,12 +67,12 @@
 
 		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){
 			// 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/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/Detector/FinderPatternFinder.php

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/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;

src/QRCode.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,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
@@ -84,28 +84,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
@@ -126,35 +126,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
@@ -271,7 +271,7 @@ 
 	 * @throws \chillerlan\QRCode\Output\QRCodeOutputException
 	 */
 	protected function initOutputInterface(QRMatrix $matrix):QROutputInterface{
-		$outputInterface =( QROutputInterface::MODES[$this->options->outputType] ?? null);
+		$outputInterface = (QROutputInterface::MODES[$this->options->outputType] ?? null);
 
 		if($this->options->outputType === QROutputInterface::CUSTOM){
 			$outputInterface = $this->options->outputInterface;

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

Spacing +5 added lines, -5 removed lines

@@ -220,8 +220,8 @@ 
 			// Should return null, but, some QR codes apparently do not mask this info.
 			// Try again by actually masking the pattern first.
 			$formatInfo = $this->doDecodeFormatInformation(
-				($formatInfoBits1 ^ $this::FORMAT_INFO_MASK_QR),
-				($formatInfoBits2 ^ $this::FORMAT_INFO_MASK_QR)
+				($formatInfoBits1^$this::FORMAT_INFO_MASK_QR),
+				($formatInfoBits2^$this::FORMAT_INFO_MASK_QR)
 			);
 
 			// still nothing???
@@ -246,13 +246,13 @@ 
 			? $this->check($j, $i)
 			: $this->check($i, $j);
 
-		return ($bit) ? (($versionBits << 1) | 0x1) : ($versionBits << 1);
+		return ($bit) ? (($versionBits << 1)|0x1) : ($versionBits << 1);
 	}
 
 	/**
 	 * Returns information about the format it specifies, or null if it doesn't seem to match any known pattern
 	 */
-	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?int{
+	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?int{
 		$bestDifference = PHP_INT_MAX;
 		$bestFormatInfo = 0;
 
@@ -348,7 +348,7 @@ 
 	/**
 	 * Decodes the version information from the given bit sequence, returns null if no valid match is found.
 	 */
-	private function decodeVersionInformation(int $versionBits):?Version{
+	private function decodeVersionInformation(int $versionBits): ?Version{
 		$bestDifference = PHP_INT_MAX;
 		$bestVersion    = 0;