boonkerz/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed

Browse Source
This commit is contained in:
Thomas Peterson 2025-07-17 14:04:51 +02:00
parent 3660f33799
commit 219a7e5af9
2 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
cobertura.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd"> <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
<coverage line-rate="0.74630784378077" branch-rate="0" lines-covered="2274" lines-valid="3047" branches-covered="0" branches-valid="0" complexity="1345" version="0.4" timestamp="1752753637"> <coverage line-rate="0.73794686782552" branch-rate="0" lines-covered="2250" lines-valid="3049" branches-covered="0" branches-valid="0" complexity="1346" version="0.4" timestamp="1752753848">
<sources> <sources>
<source>/home/thomas/projekte/calc/src</source> <source>/home/thomas/projekte/calc/src</source>
</sources> </sources>
@ -6116,9 +6116,9 @@
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Parser/Select.php" line-rate="0.77586206896552" branch-rate="0" complexity="53"> <package name="Option/Parser/Select.php" line-rate="0.61206896551724" branch-rate="0" complexity="53">
<classes> <classes>
<class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.77586206896552" branch-rate="0" complexity="53"> <class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.61206896551724" branch-rate="0" complexity="53">
<methods> <methods>
<method name="__construct" signature="null|string $mode" line-rate="1" branch-rate="0" complexity="7"> <method name="__construct" signature="null|string $mode" line-rate="1" branch-rate="0" complexity="7">
<lines> <lines>
@ -6226,30 +6226,30 @@
<line number="172" hits="0"/> <line number="172" hits="0"/>
</lines> </lines>
</method> </method>
<method name="parseModeColorDbXML" signature="" line-rate="1" branch-rate="0" complexity="5"> <method name="parseModeColorDbXML" signature="" line-rate="0.24" branch-rate="0" complexity="5">
<lines> <lines>
<line number="181" hits="8"/> <line number="181" hits="8"/>
<line number="183" hits="8"/> <line number="183" hits="8"/>
<line number="185" hits="8"/> <line number="185" hits="8"/>
<line number="186" hits="1"/> <line number="186" hits="0"/>
<line number="188" hits="1"/> <line number="188" hits="0"/>
<line number="190" hits="1"/> <line number="190" hits="0"/>
<line number="191" hits="1"/> <line number="191" hits="0"/>
<line number="193" hits="1"/> <line number="193" hits="0"/>
<line number="194" hits="1"/> <line number="194" hits="0"/>
<line number="197" hits="1"/> <line number="197" hits="0"/>
<line number="198" hits="1"/> <line number="198" hits="0"/>
<line number="199" hits="1"/> <line number="199" hits="0"/>
<line number="200" hits="1"/> <line number="200" hits="0"/>
<line number="201" hits="1"/> <line number="201" hits="0"/>
<line number="202" hits="1"/> <line number="202" hits="0"/>
<line number="203" hits="1"/> <line number="203" hits="0"/>
<line number="204" hits="1"/> <line number="204" hits="0"/>
<line number="205" hits="1"/> <line number="205" hits="0"/>
<line number="206" hits="1"/> <line number="206" hits="0"/>
<line number="207" hits="1"/> <line number="207" hits="0"/>
<line number="208" hits="1"/> <line number="208" hits="0"/>
<line number="212" hits="1"/> <line number="212" hits="0"/>
<line number="213" hits="8"/> <line number="213" hits="8"/>
<line number="215" hits="8"/> <line number="215" hits="8"/>
<line number="217" hits="8"/> <line number="217" hits="8"/>
@ -6379,25 +6379,25 @@
<line number="181" hits="8"/> <line number="181" hits="8"/>
<line number="183" hits="8"/> <line number="183" hits="8"/>
<line number="185" hits="8"/> <line number="185" hits="8"/>
<line number="186" hits="1"/> <line number="186" hits="0"/>
<line number="188" hits="1"/> <line number="188" hits="0"/>
<line number="190" hits="1"/> <line number="190" hits="0"/>
<line number="191" hits="1"/> <line number="191" hits="0"/>
<line number="193" hits="1"/> <line number="193" hits="0"/>
<line number="194" hits="1"/> <line number="194" hits="0"/>
<line number="197" hits="1"/> <line number="197" hits="0"/>
<line number="198" hits="1"/> <line number="198" hits="0"/>
<line number="199" hits="1"/> <line number="199" hits="0"/>
<line number="200" hits="1"/> <line number="200" hits="0"/>
<line number="201" hits="1"/> <line number="201" hits="0"/>
<line number="202" hits="1"/> <line number="202" hits="0"/>
<line number="203" hits="1"/> <line number="203" hits="0"/>
<line number="204" hits="1"/> <line number="204" hits="0"/>
<line number="205" hits="1"/> <line number="205" hits="0"/>
<line number="206" hits="1"/> <line number="206" hits="0"/>
<line number="207" hits="1"/> <line number="207" hits="0"/>
<line number="208" hits="1"/> <line number="208" hits="0"/>
<line number="212" hits="1"/> <line number="212" hits="0"/>
<line number="213" hits="8"/> <line number="213" hits="8"/>
<line number="215" hits="8"/> <line number="215" hits="8"/>
<line number="217" hits="8"/> <line number="217" hits="8"/>
@ -7900,9 +7900,9 @@
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Type/Select.php" line-rate="0.80645161290323" branch-rate="0" complexity="29"> <package name="Option/Type/Select.php" line-rate="0.796875" branch-rate="0" complexity="30">
<classes> <classes>
<class name="PSC\Library\Calc\Option\Type\Select" filename="Option/Type/Select.php" line-rate="0.80645161290323" branch-rate="0" complexity="29"> <class name="PSC\Library\Calc\Option\Type\Select" filename="Option/Type/Select.php" line-rate="0.796875" branch-rate="0" complexity="30">
<methods> <methods>
<method name="__construct" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="__construct" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
@ -8021,7 +8021,7 @@
<line number="170" hits="1"/> <line number="170" hits="1"/>
</lines> </lines>
</method> </method>
<method name="generateJson" signature="" line-rate="0.88888888888889" branch-rate="0" complexity="3"> <method name="generateJson" signature="" line-rate="0.81818181818182" branch-rate="0" complexity="4">
<lines> <lines>
<line number="175" hits="1"/> <line number="175" hits="1"/>
<line number="176" hits="1"/> <line number="176" hits="1"/>
@ -8031,7 +8031,9 @@
<line number="181" hits="1"/> <line number="181" hits="1"/>
<line number="183" hits="1"/> <line number="183" hits="1"/>
<line number="184" hits="1"/> <line number="184" hits="1"/>
<line number="187" hits="1"/> <line number="185" hits="1"/>
<line number="188" hits="0"/>
<line number="190" hits="1"/>
</lines> </lines>
</method> </method>
</methods> </methods>
@ -8097,18 +8099,20 @@
<line number="181" hits="1"/> <line number="181" hits="1"/>
<line number="183" hits="1"/> <line number="183" hits="1"/>
<line number="184" hits="1"/> <line number="184" hits="1"/>
<line number="187" hits="1"/> <line number="185" hits="1"/>
<line number="188" hits="0"/>
<line number="190" hits="1"/>
</lines> </lines>
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Type/Select/ColorOpt.php" line-rate="0.5" branch-rate="0" complexity="12"> <package name="Option/Type/Select/ColorOpt.php" line-rate="0" branch-rate="0" complexity="12">
<classes> <classes>
<class name="PSC\Library\Calc\Option\Type\Select\ColorOpt" filename="Option/Type/Select/ColorOpt.php" line-rate="0.5" branch-rate="0" complexity="12"> <class name="PSC\Library\Calc\Option\Type\Select\ColorOpt" filename="Option/Type/Select/ColorOpt.php" line-rate="0" branch-rate="0" complexity="12">
<methods> <methods>
<method name="setValue" signature="string $value" line-rate="1" branch-rate="0" complexity="1"> <method name="setValue" signature="string $value" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="24" hits="1"/> <line number="24" hits="0"/>
</lines> </lines>
</method> </method>
<method name="getValue" signature="" line-rate="0" branch-rate="0" complexity="1"> <method name="getValue" signature="" line-rate="0" branch-rate="0" complexity="1">
@ -8121,9 +8125,9 @@
<line number="34" hits="0"/> <line number="34" hits="0"/>
</lines> </lines>
</method> </method>
<method name="setColorHex" signature="string $colorHex" line-rate="1" branch-rate="0" complexity="1"> <method name="setColorHex" signature="string $colorHex" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="39" hits="1"/> <line number="39" hits="0"/>
</lines> </lines>
</method> </method>
<method name="getColorCMYK" signature="" line-rate="0" branch-rate="0" complexity="1"> <method name="getColorCMYK" signature="" line-rate="0" branch-rate="0" complexity="1">
@ -8131,9 +8135,9 @@
<line number="44" hits="0"/> <line number="44" hits="0"/>
</lines> </lines>
</method> </method>
<method name="setColorCMYK" signature="string $colorCMYK" line-rate="1" branch-rate="0" complexity="1"> <method name="setColorCMYK" signature="string $colorCMYK" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="49" hits="1"/> <line number="49" hits="0"/>
</lines> </lines>
</method> </method>
<method name="getColorRGB" signature="" line-rate="0" branch-rate="0" complexity="1"> <method name="getColorRGB" signature="" line-rate="0" branch-rate="0" complexity="1">
@ -8141,9 +8145,9 @@
<line number="54" hits="0"/> <line number="54" hits="0"/>
</lines> </lines>
</method> </method>
<method name="setColorRGB" signature="string $colorRGB" line-rate="1" branch-rate="0" complexity="1"> <method name="setColorRGB" signature="string $colorRGB" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="59" hits="1"/> <line number="59" hits="0"/>
</lines> </lines>
</method> </method>
<method name="getSuffix" signature="" line-rate="0" branch-rate="0" complexity="1"> <method name="getSuffix" signature="" line-rate="0" branch-rate="0" complexity="1">
@ -8151,9 +8155,9 @@
<line number="67" hits="0"/> <line number="67" hits="0"/>
</lines> </lines>
</method> </method>
<method name="setSuffix" signature="$suffix" line-rate="1" branch-rate="0" complexity="1"> <method name="setSuffix" signature="$suffix" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="75" hits="1"/> <line number="75" hits="0"/>
</lines> </lines>
</method> </method>
<method name="getPrefix" signature="" line-rate="0" branch-rate="0" complexity="1"> <method name="getPrefix" signature="" line-rate="0" branch-rate="0" complexity="1">
@ -8161,25 +8165,25 @@
<line number="80" hits="0"/> <line number="80" hits="0"/>
</lines> </lines>
</method> </method>
<method name="setPrefix" signature="?string $prefix" line-rate="1" branch-rate="0" complexity="1"> <method name="setPrefix" signature="?string $prefix" line-rate="0" branch-rate="0" complexity="1">
<lines> <lines>
<line number="85" hits="1"/> <line number="85" hits="0"/>
</lines> </lines>
</method> </method>
</methods> </methods>
<lines> <lines>
<line number="24" hits="1"/> <line number="24" hits="0"/>
<line number="29" hits="0"/> <line number="29" hits="0"/>
<line number="34" hits="0"/> <line number="34" hits="0"/>
<line number="39" hits="1"/> <line number="39" hits="0"/>
<line number="44" hits="0"/> <line number="44" hits="0"/>
<line number="49" hits="1"/> <line number="49" hits="0"/>
<line number="54" hits="0"/> <line number="54" hits="0"/>
<line number="59" hits="1"/> <line number="59" hits="0"/>
<line number="67" hits="0"/> <line number="67" hits="0"/>
<line number="75" hits="1"/> <line number="75" hits="0"/>
<line number="80" hits="0"/> <line number="80" hits="0"/>
<line number="85" hits="1"/> <line number="85" hits="0"/>
</lines> </lines>
</class> </class>
</classes> </classes>
@ -8300,7 +8304,7 @@
<methods> <methods>
<method name="__construct" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="__construct" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="26" hits="141"/> <line number="26" hits="140"/>
</lines> </lines>
</method> </method>
<method name="getId" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getId" signature="" line-rate="1" branch-rate="0" complexity="1">
@ -8310,7 +8314,7 @@
</method> </method>
<method name="setId" signature="$id" line-rate="1" branch-rate="0" complexity="1"> <method name="setId" signature="$id" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="43" hits="141"/> <line number="43" hits="140"/>
</lines> </lines>
</method> </method>
<method name="getLabel" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getLabel" signature="" line-rate="1" branch-rate="0" complexity="1">
@ -8320,7 +8324,7 @@
</method> </method>
<method name="setLabel" signature="$label" line-rate="1" branch-rate="0" complexity="1"> <method name="setLabel" signature="$label" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="59" hits="141"/> <line number="59" hits="140"/>
</lines> </lines>
</method> </method>
<method name="getEdgesCollectionContainer" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getEdgesCollectionContainer" signature="" line-rate="1" branch-rate="0" complexity="1">
@ -8374,11 +8378,11 @@
</method> </method>
</methods> </methods>
<lines> <lines>
<line number="26" hits="141"/> <line number="26" hits="140"/>
<line number="35" hits="126"/> <line number="35" hits="126"/>
<line number="43" hits="141"/> <line number="43" hits="140"/>
<line number="51" hits="117"/> <line number="51" hits="117"/>
<line number="59" hits="141"/> <line number="59" hits="140"/>
<line number="67" hits="126"/> <line number="67" hits="126"/>
<line number="75" hits="140"/> <line number="75" hits="140"/>
<line number="83" hits="126"/> <line number="83" hits="126"/>

9
src/Option/Type/Select.php
View File

@ -180,10 +180,13 @@ class Select extends Base
$obj->options = []; $obj->options = [];
$obj->mode = 'normal'; $obj->mode = 'normal';
foreach ($this->options as $opt) { if ($this->container == '') {
$obj->options[] = $opt->generateJson(); foreach ($this->options as $opt) {
$obj->options[] = $opt->generateJson();
}
} else {
$obj->options = [];
} }
return $obj; return $obj;
} }
} }