Inspection of ":shower: mask pattern cleanup" - chillerlan/php-qrcode - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — main ( a9949d...738294 )

by smiley

created 2021-11-26 20:33 UTC

Status

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 			? $this->bitMatrix->get($j, $i)
 			: $this->bitMatrix->get($i, $j);
 
-		return $bit ? ($versionBits << 1) | 0x1 : $versionBits << 1;
+		return $bit ? ($versionBits << 1)|0x1 : $versionBits << 1;
 	}
 
 	/**
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
 		// Should return null, but, some QR codes apparently do not mask this info.
 		// Try again by actually masking the pattern first.
 		$this->parsedFormatInfo = $this->doDecodeFormatInformation(
-			$formatInfoBits1 ^ FormatInformation::FORMAT_INFO_MASK_QR,
-			$formatInfoBits2 ^ FormatInformation::FORMAT_INFO_MASK_QR
+			$formatInfoBits1^FormatInformation::FORMAT_INFO_MASK_QR,
+			$formatInfoBits2^FormatInformation::FORMAT_INFO_MASK_QR
 		);
 
 		if($this->parsedFormatInfo !== null){
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
 	 * @return \chillerlan\QRCode\Common\FormatInformation|null information about the format it specifies, or null
 	 *                                                          if doesn't seem to match any known pattern
 	 */
-	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?FormatInformation{
+	private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?FormatInformation{
 		// Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing
 		$bestDifference = PHP_INT_MAX;
 		$bestFormatInfo = 0;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return \chillerlan\QRCode\Common\Version|null
 	 */
-	private function decodeVersionInformation(int $versionBits):?Version{
+	private function decodeVersionInformation(int $versionBits): ?Version{
 		$bestDifference = PHP_INT_MAX;
 		$bestVersion    = 0;
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
 			return $a;
 		}
 
-		return ($a >> $b) & ~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
+		return ($a >> $b)&~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
 	}
 
 	/**
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
 		$count = 0;
 
 		for($i = 0; $i < 32; $i += 4){
-			$count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i) & 0x0F];
+			$count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i)&0x0F];
 		}
 
 		return $count;

Please login to merge, or discard this patch.

src/Output/QRMarkup.php 1 patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -73,8 +73,8 @@  discard block
 block discarded – undo
 
 		if($file !== null){
 			return '<!DOCTYPE html>'.
-			       '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
-			       '<body>'.$this->options->eol.$html.'</body>';
+				   '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
+				   '<body>'.$this->options->eol.$html.'</body>';
 		}
 
 		return $html;
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
 		$matrix = $this->matrix->matrix();
 
 		$svg = sprintf($this->svgHeader, $this->options->cssClass, $this->options->svgViewBoxSize ?? $this->moduleCount)
-		       .$this->options->eol
-		       .'<defs>'.$this->options->svgDefs.'</defs>'
-		       .$this->options->eol;
+			   .$this->options->eol
+			   .'<defs>'.$this->options->svgDefs.'</defs>'
+			   .$this->options->eol;
 
 		foreach($this->moduleValues as $M_TYPE => $value){
 			$path = '';
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 		// if saving to file, append the correct headers
 		if($file !== null){
 			return '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'.
-			       $this->options->eol.$svg;
+				   $this->options->eol.$svg;
 		}
 
 		if($this->options->imageBase64){

Please login to merge, or discard this patch.

src/Data/QRMatrix.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 			$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;
 			}
 		}
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 	/**
 	 * Returns the current mask pattern
 	 */
-	public function maskPattern():?MaskPattern{
+	public function maskPattern(): ?MaskPattern{
 		return $this->maskPattern;
 	}
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
 	 *   false => $M_TYPE
 	 */
 	public function set(int $x, int $y, bool $value, int $M_TYPE):self{
-		$this->matrix[$y][$x] = $M_TYPE | ($value ? $this::IS_DARK : 0);
+		$this->matrix[$y][$x] = $M_TYPE|($value ? $this::IS_DARK : 0);
 
 		return $this;
 	}
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 	 *   true => $value & $M_TYPE === $M_TYPE
 	 */
 	public function checkType(int $x, int $y, int $M_TYPE):bool{
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -270,8 +270,8 @@  discard block
 block discarded – undo
 
 		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);
 			}
 		}
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
 			for($i = 0; $i < 18; $i++){
 				$a = (int)($i / 3);
 				$b = $i % 3 + $this->moduleCount - 8 - 3;
-				$v = !$test && (($bits >> $i) & 1) === 1;
+				$v = !$test && (($bits >> $i)&1) === 1;
 
 				$this->set($b, $a, $v, $this::M_VERSION); // ne
 				$this->set($a, $b, $v, $this::M_VERSION); // sw
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
 		$bits = $this->eccLevel->getformatPattern($maskPattern);
 
 		for($i = 0; $i < 15; $i++){
-			$v = !$test && (($bits >> $i) & 1) === 1;
+			$v = !$test && (($bits >> $i)&1) === 1;
 
 			if($i < 6){
 				$this->set(8, $i, $v, $this::M_FORMAT);
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
 		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
@@ -531,10 +531,10 @@  discard block
 block discarded – undo
 						$v = false;
 
 						if($byteIndex < $byteCount){
-							$v = (($data[$byteIndex] >> $bitIndex) & 1) === 1;
+							$v = (($data[$byteIndex] >> $bitIndex)&1) === 1;
 						}
 
-						$this->matrix[$y][$x] = $this::M_DATA | ($v ? $this::IS_DARK : 0);
+						$this->matrix[$y][$x] = $this::M_DATA|($v ? $this::IS_DARK : 0);
 						$bitIndex--;
 
 						if($bitIndex === -1){
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
 				$y += $inc;
 
 				if($y < 0 || $this->moduleCount <= $y){
-					$y   -=  $inc;
+					$y   -= $inc;
 					$inc  = -$inc;
 
 					break;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
 
 		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){
 					$val ^= $this::IS_DARK;
 				}
 			}

Please login to merge, or discard this patch.

src/Common/FormatInformation.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -80,8 +80,8 @@
 block discarded – undo
 	 * Receives the format information from a parsed QR Code, detects ECC level and mask pattern
 	 */
 	public function __construct(int $formatInfo){
-		$this->errorCorrectionLevel = ($formatInfo >> 3) & 0x03; // Bits 3,4
-		$this->maskPattern          = ($formatInfo & 0x07); // Bottom 3 bits
+		$this->errorCorrectionLevel = ($formatInfo >> 3)&0x03; // Bits 3,4
+		$this->maskPattern          = ($formatInfo&0x07); // Bottom 3 bits
 	}
 
 	/**

Please login to merge, or discard this patch.

src/Common/ECICharset.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -18,16 +18,16 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
 	 * @see \mb_convert_encoding()
 	 * @see \iconv()
 	 */
-	public function getName():?string{
+	public function getName(): ?string{
 		return self::MB_ENCODINGS[$this->charsetID];
 	}
 

Please login to merge, or discard this patch.

src/Common/BitBuffer.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 	/**
 	 * Read count (bits)
 	 */
-	private int $bitsRead  = 0;
+	private int $bitsRead = 0;
 
 	/**
 	 * BitBuffer constructor.
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	public function put(int $bits, int $length):self{
 
 		for($i = 0; $i < $length; $i++){
-			$this->putBit((($bits >> ($length - $i - 1)) & 1) === 1);
+			$this->putBit((($bits >> ($length - $i - 1))&1) === 1);
 		}
 
 		return $this;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
 			$toRead         = min($numBits, $bitsLeft);
 			$bitsToNotRead  = $bitsLeft - $toRead;
 			$mask           = (0xff >> (8 - $toRead)) << $bitsToNotRead;
-			$result         = ($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead;
+			$result         = ($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead;
 			$numBits        -= $toRead;
 			$this->bitsRead += $toRead;
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
 		if($numBits > 0){
 
 			while($numBits >= 8){
-				$result = ($result << 8) | ($this->buffer[$this->bytesRead] & 0xff);
+				$result = ($result << 8)|($this->buffer[$this->bytesRead]&0xff);
 				$this->bytesRead++;
 				$numBits -= 8;
 			}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
 			if($numBits > 0){
 				$bitsToNotRead  = 8 - $numBits;
 				$mask           = (0xff >> $bitsToNotRead) << $bitsToNotRead;
-				$result         = ($result << $numBits) | (($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead);
+				$result         = ($result << $numBits)|(($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead);
 				$this->bitsRead += $numBits;
 			}
 		}

Please login to merge, or discard this patch.

		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	$matrix[$y] = [];
122	122
123	123	foreach($row as $x => $val){
124		- $matrix[$y][$x] = ($val & $this::IS_DARK) === $this::IS_DARK;
	124	+ $matrix[$y][$x] = ($val&$this::IS_DARK) === $this::IS_DARK;
125	125	}
126	126	}
127	127
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	/**
146	146	* Returns the current mask pattern
147	147	*/
148		- public function maskPattern():?MaskPattern{
	148	+ public function maskPattern(): ?MaskPattern{
149	149	return $this->maskPattern;
150	150	}
151	151
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	* false => $M_TYPE
173	173	*/
174	174	public function set(int $x, int $y, bool $value, int $M_TYPE):self{
175		- $this->matrix[$y][$x] = $M_TYPE \| ($value ? $this::IS_DARK : 0);
	175	+ $this->matrix[$y][$x] = $M_TYPE\|($value ? $this::IS_DARK : 0);
176	176
177	177	return $this;
178	178	}
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	* true => $value & $M_TYPE === $M_TYPE
193	193	*/
194	194	public function checkType(int $x, int $y, int $M_TYPE):bool{
195		- return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
	195	+ return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
196	196	}
197	197
198	198	/**
		@@ -270,8 +270,8 @@ discard block
		block discarded – undo
270	270
271	271	for($c = 0; $c < 3; $c++){
272	272	for($i = 0; $i < 8; $i++){
273		- $this->set($h[$c][0] , $h[$c][1] + $i, false, $this::M_SEPARATOR);
274		- $this->set($v[$c][0] - $i, $v[$c][1] , false, $this::M_SEPARATOR);
	273	+ $this->set($h[$c][0], $h[$c][1] + $i, false, $this::M_SEPARATOR);
	274	+ $this->set($v[$c][0] - $i, $v[$c][1], false, $this::M_SEPARATOR);
275	275	}
276	276	}
277	277
		@@ -345,7 +345,7 @@ discard block
		block discarded – undo
345	345	for($i = 0; $i < 18; $i++){
346	346	$a = (int)($i / 3);
347	347	$b = $i % 3 + $this->moduleCount - 8 - 3;
348		- $v = !$test && (($bits >> $i) & 1) === 1;
	348	+ $v = !$test && (($bits >> $i)&1) === 1;
349	349
350	350	$this->set($b, $a, $v, $this::M_VERSION); // ne
351	351	$this->set($a, $b, $v, $this::M_VERSION); // sw
		@@ -365,7 +365,7 @@ discard block
		block discarded – undo
365	365	$bits = $this->eccLevel->getformatPattern($maskPattern);
366	366
367	367	for($i = 0; $i < 15; $i++){
368		- $v = !$test && (($bits >> $i) & 1) === 1;
	368	+ $v = !$test && (($bits >> $i)&1) === 1;
369	369
370	370	if($i < 6){
371	371	$this->set(8, $i, $v, $this::M_FORMAT);
		@@ -487,7 +487,7 @@ discard block
		block discarded – undo
487	487	foreach($this->matrix as $y => $row){
488	488	foreach($row as $x => $val){
489	489	// out of bounds, skip
490		- if($x < $start \|\| $y < $start \|\|$x >= $end \|\| $y >= $end){
	490	+ if($x < $start \|\| $y < $start \|\| $x >= $end \|\| $y >= $end){
491	491	continue;
492	492	}
493	493	// a match
		@@ -531,10 +531,10 @@ discard block
		block discarded – undo
531	531	$v = false;
532	532
533	533	if($byteIndex < $byteCount){
534		- $v = (($data[$byteIndex] >> $bitIndex) & 1) === 1;
	534	+ $v = (($data[$byteIndex] >> $bitIndex)&1) === 1;
535	535	}
536	536
537		- $this->matrix[$y][$x] = $this::M_DATA \| ($v ? $this::IS_DARK : 0);
	537	+ $this->matrix[$y][$x] = $this::M_DATA\|($v ? $this::IS_DARK : 0);
538	538	$bitIndex--;
539	539
540	540	if($bitIndex === -1){
		@@ -548,7 +548,7 @@ discard block
		block discarded – undo
548	548	$y += $inc;
549	549
550	550	if($y < 0 \|\| $this->moduleCount <= $y){
551		- $y -= $inc;
	551	+ $y -= $inc;
552	552	$inc = -$inc;
553	553
554	554	break;
		@@ -571,7 +571,7 @@ discard block
		block discarded – undo
571	571
572	572	foreach($this->matrix as $y => &$row){
573	573	foreach($row as $x => &$val){
574		- if($mask($x, $y) && ($val & $this::M_DATA) === $this::M_DATA){
	574	+ if($mask($x, $y) && ($val&$this::M_DATA) === $this::M_DATA){
575	575	$val ^= $this::IS_DARK;
576	576	}
577	577	}

		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	? $this->bitMatrix->get($j, $i)
71	71	: $this->bitMatrix->get($i, $j);
72	72
73		- return $bit ? ($versionBits << 1) \| 0x1 : $versionBits << 1;
	73	+ return $bit ? ($versionBits << 1)\|0x1 : $versionBits << 1;
74	74	}
75	75
76	76	/**
		@@ -189,8 +189,8 @@ discard block
		block discarded – undo
189	189	// Should return null, but, some QR codes apparently do not mask this info.
190	190	// Try again by actually masking the pattern first.
191	191	$this->parsedFormatInfo = $this->doDecodeFormatInformation(
192		- $formatInfoBits1 ^ FormatInformation::FORMAT_INFO_MASK_QR,
193		- $formatInfoBits2 ^ FormatInformation::FORMAT_INFO_MASK_QR
	192	+ $formatInfoBits1^FormatInformation::FORMAT_INFO_MASK_QR,
	193	+ $formatInfoBits2^FormatInformation::FORMAT_INFO_MASK_QR
194	194	);
195	195
196	196	if($this->parsedFormatInfo !== null){
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	* @return \chillerlan\QRCode\Common\FormatInformation\|null information about the format it specifies, or null
209	209	* if doesn't seem to match any known pattern
210	210	*/
211		- private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2):?FormatInformation{
	211	+ private function doDecodeFormatInformation(int $maskedFormatInfo1, int $maskedFormatInfo2): ?FormatInformation{
212	212	// Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing
213	213	$bestDifference = PHP_INT_MAX;
214	214	$bestFormatInfo = 0;
		@@ -305,7 +305,7 @@ discard block
		block discarded – undo
305	305	*
306	306	* @return \chillerlan\QRCode\Common\Version\|null
307	307	*/
308		- private function decodeVersionInformation(int $versionBits):?Version{
	308	+ private function decodeVersionInformation(int $versionBits): ?Version{
309	309	$bestDifference = PHP_INT_MAX;
310	310	$bestVersion = 0;
311	311
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347	return $a;
348	348	}
349	349
350		- return ($a >> $b) & ~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
	350	+ return ($a >> $b)&~((1 << (8 * PHP_INT_SIZE - 1)) >> ($b - 1));
351	351	}
352	352
353	353	/**
		@@ -362,7 +362,7 @@ discard block
		block discarded – undo
362	362	$count = 0;
363	363
364	364	for($i = 0; $i < 32; $i += 4){
365		- $count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i) & 0x0F];
	365	+ $count += $BITS_SET_IN_HALF_BYTE[self::uRShift($a, $i)&0x0F];
366	366	}
367	367
368	368	return $count;

		@@ -73,8 +73,8 @@ discard block
		block discarded – undo
73	73
74	74	if($file !== null){
75	75	return '<!DOCTYPE html>'.
76		- '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
77		- '<body>'.$this->options->eol.$html.'</body>';
	76	+ '<head><meta charset="UTF-8"><title>QR Code</title></head>'.
	77	+ '<body>'.$this->options->eol.$html.'</body>';
78	78	}
79	79
80	80	return $html;
		@@ -89,9 +89,9 @@ discard block
		block discarded – undo
89	89	$matrix = $this->matrix->matrix();
90	90
91	91	$svg = sprintf($this->svgHeader, $this->options->cssClass, $this->options->svgViewBoxSize ?? $this->moduleCount)
92		- .$this->options->eol
93		- .'<defs>'.$this->options->svgDefs.'</defs>'
94		- .$this->options->eol;
	92	+ .$this->options->eol
	93	+ .'<defs>'.$this->options->svgDefs.'</defs>'
	94	+ .$this->options->eol;
95	95
96	96	foreach($this->moduleValues as $M_TYPE => $value){
97	97	$path = '';
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	// if saving to file, append the correct headers
146	146	if($file !== null){
147	147	return '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'.
148		- $this->options->eol.$svg;
	148	+ $this->options->eol.$svg;
149	149	}
150	150
151	151	if($this->options->imageBase64){

		@@ -80,8 +80,8 @@
		block discarded – undo
80	80	* Receives the format information from a parsed QR Code, detects ECC level and mask pattern
81	81	*/
82	82	public function __construct(int $formatInfo){
83		- $this->errorCorrectionLevel = ($formatInfo >> 3) & 0x03; // Bits 3,4
84		- $this->maskPattern = ($formatInfo & 0x07); // Bottom 3 bits
	83	+ $this->errorCorrectionLevel = ($formatInfo >> 3)&0x03; // Bits 3,4
	84	+ $this->maskPattern = ($formatInfo&0x07); // Bottom 3 bits
85	85	}
86	86
87	87	/**

		@@ -18,16 +18,16 @@ discard block
		block discarded – undo
18	18	*/
19	19	final class ECICharset{
20	20
21		- public const CP437 = 0; // Code page 437, DOS Latin US
22		- 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
23		- public const CP437_WO_GLI = 2; // An equivalent code table to CP437, without the return-to-GLI 0 logic
24		- public const ISO_IEC_8859_1 = 3; // Latin-1 (Default)
25		- public const ISO_IEC_8859_2 = 4; // Latin-2
26		- public const ISO_IEC_8859_3 = 5; // Latin-3
27		- public const ISO_IEC_8859_4 = 6; // Latin-4
28		- public const ISO_IEC_8859_5 = 7; // Latin/Cyrillic
29		- public const ISO_IEC_8859_6 = 8; // Latin/Arabic
30		- public const ISO_IEC_8859_7 = 9; // Latin/Greek
	21	+ public const CP437 = 0; // Code page 437, DOS Latin US
	22	+ 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
	23	+ public const CP437_WO_GLI = 2; // An equivalent code table to CP437, without the return-to-GLI 0 logic
	24	+ public const ISO_IEC_8859_1 = 3; // Latin-1 (Default)
	25	+ public const ISO_IEC_8859_2 = 4; // Latin-2
	26	+ public const ISO_IEC_8859_3 = 5; // Latin-3
	27	+ public const ISO_IEC_8859_4 = 6; // Latin-4
	28	+ public const ISO_IEC_8859_5 = 7; // Latin/Cyrillic
	29	+ public const ISO_IEC_8859_6 = 8; // Latin/Arabic
	30	+ public const ISO_IEC_8859_7 = 9; // Latin/Greek
31	31	public const ISO_IEC_8859_8 = 10; // Latin/Hebrew
32	32	public const ISO_IEC_8859_9 = 11; // Latin-5
33	33	public const ISO_IEC_8859_10 = 12; // Latin-6
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	* @see \mb_convert_encoding()
118	118	* @see \iconv()
119	119	*/
120		- public function getName():?string{
	120	+ public function getName(): ?string{
121	121	return self::MB_ENCODINGS[$this->charsetID];
122	122	}
123	123

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	/**
39	39	* Read count (bits)
40	40	*/
41		- private int $bitsRead = 0;
	41	+ private int $bitsRead = 0;
42	42
43	43	/**
44	44	* BitBuffer constructor.
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	public function put(int $bits, int $length):self{
57	57
58	58	for($i = 0; $i < $length; $i++){
59		- $this->putBit((($bits >> ($length - $i - 1)) & 1) === 1);
	59	+ $this->putBit((($bits >> ($length - $i - 1))&1) === 1);
60	60	}
61	61
62	62	return $this;
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	$toRead = min($numBits, $bitsLeft);
125	125	$bitsToNotRead = $bitsLeft - $toRead;
126	126	$mask = (0xff >> (8 - $toRead)) << $bitsToNotRead;
127		- $result = ($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead;
	127	+ $result = ($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead;
128	128	$numBits -= $toRead;
129	129	$this->bitsRead += $toRead;
130	130
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	if($numBits > 0){
139	139
140	140	while($numBits >= 8){
141		- $result = ($result << 8) \| ($this->buffer[$this->bytesRead] & 0xff);
	141	+ $result = ($result << 8)\|($this->buffer[$this->bytesRead]&0xff);
142	142	$this->bytesRead++;
143	143	$numBits -= 8;
144	144	}
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	if($numBits > 0){
148	148	$bitsToNotRead = 8 - $numBits;
149	149	$mask = (0xff >> $bitsToNotRead) << $bitsToNotRead;
150		- $result = ($result << $numBits) \| (($this->buffer[$this->bytesRead] & $mask) >> $bitsToNotRead);
	150	+ $result = ($result << $numBits)\|(($this->buffer[$this->bytesRead]&$mask) >> $bitsToNotRead);
151	151	$this->bitsRead += $numBits;
152	152	}
153	153	}

chillerlan / php-qrcode

Push — main ( a9949d...738294 )

Status

Category

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch