extract QRMatrix::getBooleanMatrix() from QRMatrix::getMatrix() to remove type ambiguity

Author: codemasher

src/Common/MaskPattern.php

@@ -124,7 +124,7 @@ public static function getBestPattern(QRMatrix $QRMatrix):self{
 
 		foreach(self::PATTERNS as $pattern){
 			$mp      = new self($pattern);
-			$matrix  = (clone $QRMatrix)->setFormatInfo($mp)->mask($mp)->getMatrix(true);
+			$matrix  = (clone $QRMatrix)->setFormatInfo($mp)->mask($mp)->getBooleanMatrix();
 			$penalty = 0;
 
 			for($level = 1; $level <= 4; $level++){

src/Data/QRMatrix.php

@@ -174,22 +174,26 @@ public function initFunctionalPatterns():static{
 	}
 
 	/**
-	 * Returns the data matrix, returns a pure boolean representation if $boolean is set to true
+	 * Returns the data matrix
 	 *
 	 * @return int[][]
 	 */
-	public function getMatrix(bool|null $boolean = null):array{
-
-		if($boolean !== true){
-			return $this->matrix;
-		}
+	public function getMatrix():array{
+		return $this->matrix;
+	}
 
+	/**
+	 * Returns a boolean representation of the data matrix
+	 *
+	 * @return bool[][]
+	 */
+	public function getBooleanMatrix():array{
 		$matrix = $this->matrix;
 
 		foreach($matrix as &$row){
 			$row = array_map($this->isDark(...), $row);
 		}
-
+		/** @var bool[][] $matrix (phpstan hates this otherwise) */
 		return $matrix;
 	}
 

tests/Data/QRMatrixTest.php

@@ -42,7 +42,7 @@ protected function setUp():void{
 	 * Tests if size() returns the actual matrix size/count
 	 */
 	public function testGetSize():void{
-		$this::assertCount($this->matrix->getSize(), $this->matrix->getMatrix(true));
+		$this::assertCount($this->matrix->getSize(), $this->matrix->getBooleanMatrix());
 	}
 
 	/**
@@ -255,8 +255,8 @@ public function testSetQuietZone(QRMatrix $matrix):void{
 
 		$s = ($size + 2 * $quietZoneSize);
 
-		$this::assertCount($s, $matrix->getMatrix(true));
-		$this::assertCount($s, $matrix->getMatrix(true)[($size - 1)]);
+		$this::assertCount($s, $matrix->getBooleanMatrix());
+		$this::assertCount($s, $matrix->getBooleanMatrix()[($size - 1)]);
 
 		$size = $matrix->getSize();