QRMarkupSVG::paths(): ignore non-existent module values

codemasher · codemasher · commit 1ca995a3bbe5 · 2022-07-08T16:56:27.000+02:00
diff --git a/src/Output/QRMarkupSVG.php b/src/Output/QRMarkupSVG.php
@@ -91,15 +91,16 @@ protected function paths():string{
 				continue;
 			}
 
-			$format = empty($this->moduleValues[$M_TYPE])
+			// ignore non-existent module values
+			$format = !isset($this->moduleValues[$M_TYPE]) || empty($this->moduleValues[$M_TYPE])
 				? '<path class="%1$s" d="%2$s"/>'
 				: '<path class="%1$s" fill="%3$s" fill-opacity="%4$s" d="%2$s"/>';
 
 			$svg[] = sprintf(
 				$format,
 				$this->getCssClass($M_TYPE),
 				$path,
-				$this->moduleValues[$M_TYPE],
+				$this->moduleValues[$M_TYPE] ?? '',
 				$this->options->svgOpacity)
 			;
 		}

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,16 @@ protected function paths():string{`
`91`	`91`	`continue;`
`92`	`92`	`}`
`93`	`93`
`94`		`- $format = empty($this->moduleValues[$M_TYPE])`
	`94`	`+ // ignore non-existent module values`
	`95`	`+ $format = !isset($this->moduleValues[$M_TYPE]) \|\| empty($this->moduleValues[$M_TYPE])`
`95`	`96`	`? '<path class="%1$s" d="%2$s"/>'`
`96`	`97`	`: '<path class="%1$s" fill="%3$s" fill-opacity="%4$s" d="%2$s"/>';`
`97`	`98`
`98`	`99`	`$svg[] = sprintf(`
`99`	`100`	`$format,`
`100`	`101`	`$this->getCssClass($M_TYPE),`
`101`	`102`	`$path,`
`102`		`- $this->moduleValues[$M_TYPE],`
	`103`	`+ $this->moduleValues[$M_TYPE] ?? '',`
`103`	`104`	`$this->options->svgOpacity)`
`104`	`105`	`;`
`105`	`106`	`}`