add QROutputAbstract::getModuleValue() to avoid directly accessing the $moduleValues array

Author: codemasher

src/Output/QREps.php

@@ -108,9 +108,10 @@ public function dump(string $file = null):string{
 			}
 
 			// 4 values will be interpreted as CMYK, 3 as RGB
-			$format = (count($this->moduleValues[$M_TYPE]) === 4) ? '%f %f %f %f C' : '%f %f %f R';
-			$eps[] = sprintf($format, ...$this->moduleValues[$M_TYPE]);
-			$eps[] = implode("\n", $path);
+			$val    = $this->getModuleValue($M_TYPE);
+			$format = (count($val) === 4) ? '%f %f %f %f C' : '%f %f %f R';
+			$eps[]  = sprintf($format, ...$val);
+			$eps[]  = implode("\n", $path);
 		}
 
 		// end file

src/Output/QRFpdf.php

@@ -123,8 +123,7 @@ public function dump(string $file = null){
 					continue;
 				}
 
-				/** @var int $M_TYPE */
-				$color = $this->moduleValues[$M_TYPE];
+				$color = $this->getModuleValue($M_TYPE);
 
 				if($prevColor !== $color){
 					/** @phan-suppress-next-line PhanParamTooFewUnpack */

src/Output/QRGdImage.php

@@ -252,15 +252,15 @@ protected function setPixel(int $x, int $y, int $M_TYPE):void{
 				(int)(($y * $this->scale) + ($this->scale / 2)),
 				(int)(2 * $this->options->circleRadius * $this->scale),
 				(int)(2 * $this->options->circleRadius * $this->scale),
-				$this->moduleValues[$M_TYPE]
+				$this->getModuleValue($M_TYPE)
 			)
 			: imagefilledrectangle(
 				$this->image,
 				($x * $this->scale),
 				($y * $this->scale),
 				(($x + 1) * $this->scale),
 				(($y + 1) * $this->scale),
-				$this->moduleValues[$M_TYPE]
+				$this->getModuleValue($M_TYPE)
 			);
 	}
 

src/Output/QRImagick.php

@@ -204,7 +204,7 @@ protected function setPixel(int $x, int $y, int $M_TYPE):void{
 			return;
 		}
 
-		$this->imagickDraw->setFillColor($this->moduleValues[$M_TYPE]);
+		$this->imagickDraw->setFillColor($this->getModuleValue($M_TYPE));
 
 		$this->options->drawCircularModules && !$this->matrix->checkTypeIn($x, $y, $this->options->keepAsSquare)
 			? $this->imagickDraw->circle(

src/Output/QRMarkupHTML.php

@@ -31,7 +31,7 @@ protected function createMarkup(bool $saveToFile):string{
 			$html .= '<div>';
 
 			foreach($row as $M_TYPE){
-				$html .= sprintf('<span style="background: %s;"></span>', $this->moduleValues[$M_TYPE]);
+				$html .= sprintf('<span style="background: %s;"></span>', $this->getModuleValue($M_TYPE));
 			}
 
 			$html .= '</div>'.$this->options->eol;

src/Output/QRMarkupSVG.php

@@ -124,16 +124,17 @@ protected function paths():string{
 	 * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
 	 */
 	protected function path(string $path, int $M_TYPE):string{
+		$val = $this->getModuleValue($M_TYPE);
 		// ignore non-existent module values
-		$format = !isset($this->moduleValues[$M_TYPE]) || empty($this->moduleValues[$M_TYPE])
+		$format = empty($val)
 			? '<path class="%1$s" d="%2$s"/>'
 			: '<path class="%1$s" fill="%3$s" fill-opacity="%4$s" d="%2$s"/>';
 
 		return sprintf(
 			$format,
 			$this->getCssClass($M_TYPE),
 			$path,
-			($this->moduleValues[$M_TYPE] ?? ''), // value may or may not exist
+			($val ?? ''), // value may or may not exist
 			$this->options->svgOpacity
 		);
 	}

src/Output/QROutputAbstract.php

@@ -92,7 +92,16 @@ protected function setModuleValues():void{
 	}
 
 	/**
-	 * Returns the final value for the given input (return value depends on the output module)
+	 * Returns the prepared value for the given $M_TYPE (return value depends on the output class)
+	 *
+	 * @return mixed|null
+	 */
+	protected function getModuleValue(int $M_TYPE){
+		return ($this->moduleValues[$M_TYPE] ?? null);
+	}
+
+	/**
+	 * Prepares the value for the given input (return value depends on the output class)
 	 *
 	 * @param mixed $value
 	 *
@@ -101,7 +110,7 @@ protected function setModuleValues():void{
 	abstract protected function prepareModuleValue($value);
 
 	/**
-	 * Returns a default value for either dark or light modules (return value depends on the output module)
+	 * Returns a default value for either dark or light modules (return value depends on the output class)
 	 *
 	 * @return mixed
 	 */

src/Output/QRString.php

@@ -70,7 +70,7 @@ protected function text():string{
 			$r = [];
 
 			foreach($row as $M_TYPE){
-				$r[] = $this->moduleValues[$M_TYPE];
+				$r[] = $this->getModuleValue($M_TYPE);
 			}
 
 			$str[] = implode('', $r);