Skip to content

Commit b8cebb6

Browse files
committed
:octocat: QROutputAbstract::setModuleValues() allow setting extra values from options
1 parent c651052 commit b8cebb6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/Output/QROutputAbstract.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,16 @@ protected function getOutputDimensions():array{
9494
*/
9595
protected function setModuleValues():void{
9696

97+
// first fill the map with the default values
9798
foreach($this::DEFAULT_MODULE_VALUES as $M_TYPE => $defaultValue){
98-
$value = ($this->options->moduleValues[$M_TYPE] ?? null);
99+
$this->moduleValues[$M_TYPE] = $this->getDefaultModuleValue($defaultValue);
100+
}
99101

100-
$this->moduleValues[$M_TYPE] = $this::moduleValueIsValid($value)
101-
? $this->prepareModuleValue($value)
102-
: $this->getDefaultModuleValue($defaultValue);
102+
// now loop over the options values to replace defaults and add extra values
103+
foreach($this->options->moduleValues as $M_TYPE => $value){
104+
if($this::moduleValueIsValid($value)){
105+
$this->moduleValues[$M_TYPE] = $this->prepareModuleValue($value);
106+
}
103107
}
104108

105109
}

0 commit comments

Comments
 (0)