chillerlan / php-qrcode

src/Data/QRMatrix.php

Spacing +27 added lines, -27 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],
 	];
 
 	/**
@@ -159,7 +159,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;
 			}
 		}
 
@@ -169,21 +169,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;
 	}
 
@@ -217,7 +217,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;
@@ -246,7 +246,7 @@ 
 			return false;
 		}
 
-		return ($this->matrix[$y][$x] & $M_TYPE) === $M_TYPE;
+		return ($this->matrix[$y][$x]&$M_TYPE) === $M_TYPE;
 	}
 
 	/**
@@ -290,7 +290,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;
 			}
@@ -370,8 +370,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);
 			}
 		}
 
@@ -595,7 +595,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
@@ -663,7 +663,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);
 				}
 			}