chillerlan / php-qrcode

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

src/Common/Version.php

Spacing +44 added lines, -44 removed lines

@@ -54,14 +54,14 @@ 
 		18 => [6, 30, 56, 82],
 		19 => [6, 30, 58, 86],
 		20 => [6, 34, 62, 90],
-		21 => [6, 28, 50, 72,  94],
-		22 => [6, 26, 50, 74,  98],
+		21 => [6, 28, 50, 72, 94],
+		22 => [6, 26, 50, 74, 98],
 		23 => [6, 30, 54, 78, 102],
 		24 => [6, 28, 54, 80, 106],
 		25 => [6, 32, 58, 84, 110],
 		26 => [6, 30, 58, 86, 114],
 		27 => [6, 34, 62, 90, 118],
-		28 => [6, 26, 50, 74,  98, 122],
+		28 => [6, 26, 50, 74, 98, 122],
 		29 => [6, 30, 54, 78, 102, 126],
 		30 => [6, 26, 52, 78, 104, 130],
 		31 => [6, 30, 56, 82, 108, 134],
@@ -126,46 +126,46 @@ 
 	 * @see http://www.thonky.com/qr-code-tutorial/error-correction-table
 	 */
 	private const RSBLOCKS = [
-		1  => [[ 7, [[ 1,  19], [ 0,   0]]], [10, [[ 1, 16], [ 0,  0]]], [13, [[ 1, 13], [ 0,  0]]], [17, [[ 1,  9], [ 0,  0]]]],
-		2  => [[10, [[ 1,  34], [ 0,   0]]], [16, [[ 1, 28], [ 0,  0]]], [22, [[ 1, 22], [ 0,  0]]], [28, [[ 1, 16], [ 0,  0]]]],
-		3  => [[15, [[ 1,  55], [ 0,   0]]], [26, [[ 1, 44], [ 0,  0]]], [18, [[ 2, 17], [ 0,  0]]], [22, [[ 2, 13], [ 0,  0]]]],
-		4  => [[20, [[ 1,  80], [ 0,   0]]], [18, [[ 2, 32], [ 0,  0]]], [26, [[ 2, 24], [ 0,  0]]], [16, [[ 4,  9], [ 0,  0]]]],
-		5  => [[26, [[ 1, 108], [ 0,   0]]], [24, [[ 2, 43], [ 0,  0]]], [18, [[ 2, 15], [ 2, 16]]], [22, [[ 2, 11], [ 2, 12]]]],
-		6  => [[18, [[ 2,  68], [ 0,   0]]], [16, [[ 4, 27], [ 0,  0]]], [24, [[ 4, 19], [ 0,  0]]], [28, [[ 4, 15], [ 0,  0]]]],
-		7  => [[20, [[ 2,  78], [ 0,   0]]], [18, [[ 4, 31], [ 0,  0]]], [18, [[ 2, 14], [ 4, 15]]], [26, [[ 4, 13], [ 1, 14]]]],
-		8  => [[24, [[ 2,  97], [ 0,   0]]], [22, [[ 2, 38], [ 2, 39]]], [22, [[ 4, 18], [ 2, 19]]], [26, [[ 4, 14], [ 2, 15]]]],
-		9  => [[30, [[ 2, 116], [ 0,   0]]], [22, [[ 3, 36], [ 2, 37]]], [20, [[ 4, 16], [ 4, 17]]], [24, [[ 4, 12], [ 4, 13]]]],
-		10 => [[18, [[ 2,  68], [ 2,  69]]], [26, [[ 4, 43], [ 1, 44]]], [24, [[ 6, 19], [ 2, 20]]], [28, [[ 6, 15], [ 2, 16]]]],
-		11 => [[20, [[ 4,  81], [ 0,   0]]], [30, [[ 1, 50], [ 4, 51]]], [28, [[ 4, 22], [ 4, 23]]], [24, [[ 3, 12], [ 8, 13]]]],
-		12 => [[24, [[ 2,  92], [ 2,  93]]], [22, [[ 6, 36], [ 2, 37]]], [26, [[ 4, 20], [ 6, 21]]], [28, [[ 7, 14], [ 4, 15]]]],
-		13 => [[26, [[ 4, 107], [ 0,   0]]], [22, [[ 8, 37], [ 1, 38]]], [24, [[ 8, 20], [ 4, 21]]], [22, [[12, 11], [ 4, 12]]]],
-		14 => [[30, [[ 3, 115], [ 1, 116]]], [24, [[ 4, 40], [ 5, 41]]], [20, [[11, 16], [ 5, 17]]], [24, [[11, 12], [ 5, 13]]]],
-		15 => [[22, [[ 5,  87], [ 1,  88]]], [24, [[ 5, 41], [ 5, 42]]], [30, [[ 5, 24], [ 7, 25]]], [24, [[11, 12], [ 7, 13]]]],
-		16 => [[24, [[ 5,  98], [ 1,  99]]], [28, [[ 7, 45], [ 3, 46]]], [24, [[15, 19], [ 2, 20]]], [30, [[ 3, 15], [13, 16]]]],
-		17 => [[28, [[ 1, 107], [ 5, 108]]], [28, [[10, 46], [ 1, 47]]], [28, [[ 1, 22], [15, 23]]], [28, [[ 2, 14], [17, 15]]]],
-		18 => [[30, [[ 5, 120], [ 1, 121]]], [26, [[ 9, 43], [ 4, 44]]], [28, [[17, 22], [ 1, 23]]], [28, [[ 2, 14], [19, 15]]]],
-		19 => [[28, [[ 3, 113], [ 4, 114]]], [26, [[ 3, 44], [11, 45]]], [26, [[17, 21], [ 4, 22]]], [26, [[ 9, 13], [16, 14]]]],
-		20 => [[28, [[ 3, 107], [ 5, 108]]], [26, [[ 3, 41], [13, 42]]], [30, [[15, 24], [ 5, 25]]], [28, [[15, 15], [10, 16]]]],
-		21 => [[28, [[ 4, 116], [ 4, 117]]], [26, [[17, 42], [ 0,  0]]], [28, [[17, 22], [ 6, 23]]], [30, [[19, 16], [ 6, 17]]]],
-		22 => [[28, [[ 2, 111], [ 7, 112]]], [28, [[17, 46], [ 0,  0]]], [30, [[ 7, 24], [16, 25]]], [24, [[34, 13], [ 0,  0]]]],
-		23 => [[30, [[ 4, 121], [ 5, 122]]], [28, [[ 4, 47], [14, 48]]], [30, [[11, 24], [14, 25]]], [30, [[16, 15], [14, 16]]]],
-		24 => [[30, [[ 6, 117], [ 4, 118]]], [28, [[ 6, 45], [14, 46]]], [30, [[11, 24], [16, 25]]], [30, [[30, 16], [ 2, 17]]]],
-		25 => [[26, [[ 8, 106], [ 4, 107]]], [28, [[ 8, 47], [13, 48]]], [30, [[ 7, 24], [22, 25]]], [30, [[22, 15], [13, 16]]]],
-		26 => [[28, [[10, 114], [ 2, 115]]], [28, [[19, 46], [ 4, 47]]], [28, [[28, 22], [ 6, 23]]], [30, [[33, 16], [ 4, 17]]]],
-		27 => [[30, [[ 8, 122], [ 4, 123]]], [28, [[22, 45], [ 3, 46]]], [30, [[ 8, 23], [26, 24]]], [30, [[12, 15], [28, 16]]]],
-		28 => [[30, [[ 3, 117], [10, 118]]], [28, [[ 3, 45], [23, 46]]], [30, [[ 4, 24], [31, 25]]], [30, [[11, 15], [31, 16]]]],
-		29 => [[30, [[ 7, 116], [ 7, 117]]], [28, [[21, 45], [ 7, 46]]], [30, [[ 1, 23], [37, 24]]], [30, [[19, 15], [26, 16]]]],
-		30 => [[30, [[ 5, 115], [10, 116]]], [28, [[19, 47], [10, 48]]], [30, [[15, 24], [25, 25]]], [30, [[23, 15], [25, 16]]]],
-		31 => [[30, [[13, 115], [ 3, 116]]], [28, [[ 2, 46], [29, 47]]], [30, [[42, 24], [ 1, 25]]], [30, [[23, 15], [28, 16]]]],
-		32 => [[30, [[17, 115], [ 0,   0]]], [28, [[10, 46], [23, 47]]], [30, [[10, 24], [35, 25]]], [30, [[19, 15], [35, 16]]]],
-		33 => [[30, [[17, 115], [ 1, 116]]], [28, [[14, 46], [21, 47]]], [30, [[29, 24], [19, 25]]], [30, [[11, 15], [46, 16]]]],
-		34 => [[30, [[13, 115], [ 6, 116]]], [28, [[14, 46], [23, 47]]], [30, [[44, 24], [ 7, 25]]], [30, [[59, 16], [ 1, 17]]]],
-		35 => [[30, [[12, 121], [ 7, 122]]], [28, [[12, 47], [26, 48]]], [30, [[39, 24], [14, 25]]], [30, [[22, 15], [41, 16]]]],
-		36 => [[30, [[ 6, 121], [14, 122]]], [28, [[ 6, 47], [34, 48]]], [30, [[46, 24], [10, 25]]], [30, [[ 2, 15], [64, 16]]]],
-		37 => [[30, [[17, 122], [ 4, 123]]], [28, [[29, 46], [14, 47]]], [30, [[49, 24], [10, 25]]], [30, [[24, 15], [46, 16]]]],
-		38 => [[30, [[ 4, 122], [18, 123]]], [28, [[13, 46], [32, 47]]], [30, [[48, 24], [14, 25]]], [30, [[42, 15], [32, 16]]]],
-		39 => [[30, [[20, 117], [ 4, 118]]], [28, [[40, 47], [ 7, 48]]], [30, [[43, 24], [22, 25]]], [30, [[10, 15], [67, 16]]]],
-		40 => [[30, [[19, 118], [ 6, 119]]], [28, [[18, 47], [31, 48]]], [30, [[34, 24], [34, 25]]], [30, [[20, 15], [61, 16]]]],
+		1  => [[7, [[1, 19], [0, 0]]], [10, [[1, 16], [0, 0]]], [13, [[1, 13], [0, 0]]], [17, [[1, 9], [0, 0]]]],
+		2  => [[10, [[1, 34], [0, 0]]], [16, [[1, 28], [0, 0]]], [22, [[1, 22], [0, 0]]], [28, [[1, 16], [0, 0]]]],
+		3  => [[15, [[1, 55], [0, 0]]], [26, [[1, 44], [0, 0]]], [18, [[2, 17], [0, 0]]], [22, [[2, 13], [0, 0]]]],
+		4  => [[20, [[1, 80], [0, 0]]], [18, [[2, 32], [0, 0]]], [26, [[2, 24], [0, 0]]], [16, [[4, 9], [0, 0]]]],
+		5  => [[26, [[1, 108], [0, 0]]], [24, [[2, 43], [0, 0]]], [18, [[2, 15], [2, 16]]], [22, [[2, 11], [2, 12]]]],
+		6  => [[18, [[2, 68], [0, 0]]], [16, [[4, 27], [0, 0]]], [24, [[4, 19], [0, 0]]], [28, [[4, 15], [0, 0]]]],
+		7  => [[20, [[2, 78], [0, 0]]], [18, [[4, 31], [0, 0]]], [18, [[2, 14], [4, 15]]], [26, [[4, 13], [1, 14]]]],
+		8  => [[24, [[2, 97], [0, 0]]], [22, [[2, 38], [2, 39]]], [22, [[4, 18], [2, 19]]], [26, [[4, 14], [2, 15]]]],
+		9  => [[30, [[2, 116], [0, 0]]], [22, [[3, 36], [2, 37]]], [20, [[4, 16], [4, 17]]], [24, [[4, 12], [4, 13]]]],
+		10 => [[18, [[2, 68], [2, 69]]], [26, [[4, 43], [1, 44]]], [24, [[6, 19], [2, 20]]], [28, [[6, 15], [2, 16]]]],
+		11 => [[20, [[4, 81], [0, 0]]], [30, [[1, 50], [4, 51]]], [28, [[4, 22], [4, 23]]], [24, [[3, 12], [8, 13]]]],
+		12 => [[24, [[2, 92], [2, 93]]], [22, [[6, 36], [2, 37]]], [26, [[4, 20], [6, 21]]], [28, [[7, 14], [4, 15]]]],
+		13 => [[26, [[4, 107], [0, 0]]], [22, [[8, 37], [1, 38]]], [24, [[8, 20], [4, 21]]], [22, [[12, 11], [4, 12]]]],
+		14 => [[30, [[3, 115], [1, 116]]], [24, [[4, 40], [5, 41]]], [20, [[11, 16], [5, 17]]], [24, [[11, 12], [5, 13]]]],
+		15 => [[22, [[5, 87], [1, 88]]], [24, [[5, 41], [5, 42]]], [30, [[5, 24], [7, 25]]], [24, [[11, 12], [7, 13]]]],
+		16 => [[24, [[5, 98], [1, 99]]], [28, [[7, 45], [3, 46]]], [24, [[15, 19], [2, 20]]], [30, [[3, 15], [13, 16]]]],
+		17 => [[28, [[1, 107], [5, 108]]], [28, [[10, 46], [1, 47]]], [28, [[1, 22], [15, 23]]], [28, [[2, 14], [17, 15]]]],
+		18 => [[30, [[5, 120], [1, 121]]], [26, [[9, 43], [4, 44]]], [28, [[17, 22], [1, 23]]], [28, [[2, 14], [19, 15]]]],
+		19 => [[28, [[3, 113], [4, 114]]], [26, [[3, 44], [11, 45]]], [26, [[17, 21], [4, 22]]], [26, [[9, 13], [16, 14]]]],
+		20 => [[28, [[3, 107], [5, 108]]], [26, [[3, 41], [13, 42]]], [30, [[15, 24], [5, 25]]], [28, [[15, 15], [10, 16]]]],
+		21 => [[28, [[4, 116], [4, 117]]], [26, [[17, 42], [0, 0]]], [28, [[17, 22], [6, 23]]], [30, [[19, 16], [6, 17]]]],
+		22 => [[28, [[2, 111], [7, 112]]], [28, [[17, 46], [0, 0]]], [30, [[7, 24], [16, 25]]], [24, [[34, 13], [0, 0]]]],
+		23 => [[30, [[4, 121], [5, 122]]], [28, [[4, 47], [14, 48]]], [30, [[11, 24], [14, 25]]], [30, [[16, 15], [14, 16]]]],
+		24 => [[30, [[6, 117], [4, 118]]], [28, [[6, 45], [14, 46]]], [30, [[11, 24], [16, 25]]], [30, [[30, 16], [2, 17]]]],
+		25 => [[26, [[8, 106], [4, 107]]], [28, [[8, 47], [13, 48]]], [30, [[7, 24], [22, 25]]], [30, [[22, 15], [13, 16]]]],
+		26 => [[28, [[10, 114], [2, 115]]], [28, [[19, 46], [4, 47]]], [28, [[28, 22], [6, 23]]], [30, [[33, 16], [4, 17]]]],
+		27 => [[30, [[8, 122], [4, 123]]], [28, [[22, 45], [3, 46]]], [30, [[8, 23], [26, 24]]], [30, [[12, 15], [28, 16]]]],
+		28 => [[30, [[3, 117], [10, 118]]], [28, [[3, 45], [23, 46]]], [30, [[4, 24], [31, 25]]], [30, [[11, 15], [31, 16]]]],
+		29 => [[30, [[7, 116], [7, 117]]], [28, [[21, 45], [7, 46]]], [30, [[1, 23], [37, 24]]], [30, [[19, 15], [26, 16]]]],
+		30 => [[30, [[5, 115], [10, 116]]], [28, [[19, 47], [10, 48]]], [30, [[15, 24], [25, 25]]], [30, [[23, 15], [25, 16]]]],
+		31 => [[30, [[13, 115], [3, 116]]], [28, [[2, 46], [29, 47]]], [30, [[42, 24], [1, 25]]], [30, [[23, 15], [28, 16]]]],
+		32 => [[30, [[17, 115], [0, 0]]], [28, [[10, 46], [23, 47]]], [30, [[10, 24], [35, 25]]], [30, [[19, 15], [35, 16]]]],
+		33 => [[30, [[17, 115], [1, 116]]], [28, [[14, 46], [21, 47]]], [30, [[29, 24], [19, 25]]], [30, [[11, 15], [46, 16]]]],
+		34 => [[30, [[13, 115], [6, 116]]], [28, [[14, 46], [23, 47]]], [30, [[44, 24], [7, 25]]], [30, [[59, 16], [1, 17]]]],
+		35 => [[30, [[12, 121], [7, 122]]], [28, [[12, 47], [26, 48]]], [30, [[39, 24], [14, 25]]], [30, [[22, 15], [41, 16]]]],
+		36 => [[30, [[6, 121], [14, 122]]], [28, [[6, 47], [34, 48]]], [30, [[46, 24], [10, 25]]], [30, [[2, 15], [64, 16]]]],
+		37 => [[30, [[17, 122], [4, 123]]], [28, [[29, 46], [14, 47]]], [30, [[49, 24], [10, 25]]], [30, [[24, 15], [46, 16]]]],
+		38 => [[30, [[4, 122], [18, 123]]], [28, [[13, 46], [32, 47]]], [30, [[48, 24], [14, 25]]], [30, [[42, 15], [32, 16]]]],
+		39 => [[30, [[20, 117], [4, 118]]], [28, [[40, 47], [7, 48]]], [30, [[43, 24], [22, 25]]], [30, [[10, 15], [67, 16]]]],
+		40 => [[30, [[19, 118], [6, 119]]], [28, [[18, 47], [31, 48]]], [30, [[34, 24], [34, 25]]], [30, [[20, 15], [61, 16]]]],
 	];
 
 	/**
@@ -257,7 +257,7 @@ 
 	/**
 	 * the version pattern for the given version
 	 */
-	public function getVersionPattern():?int{
+	public function getVersionPattern(): ?int{
 		return (self::VERSION_PATTERN[$this->version] ?? null);
 	}
 

src/Common/ReedSolomonDecoder.php

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