This commit is contained in:
Thomas Peterson 2025-07-18 20:38:59 +02:00
parent 4a2fed26de
commit 0ca9888d0a
2 changed files with 137 additions and 123 deletions

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.73927073249435" branch-rate="0" lines-covered="2291" lines-valid="3099" branches-covered="0" branches-valid="0" complexity="1357" version="0.4" timestamp="1752863379"> <coverage line-rate="0.73896229455366" branch-rate="0" lines-covered="2293" lines-valid="3103" branches-covered="0" branches-valid="0" complexity="1359" version="0.4" timestamp="1752863878">
<sources> <sources>
<source>/home/thomas/projekte/calc/src</source> <source>/home/thomas/projekte/calc/src</source>
</sources> </sources>
@ -6136,9 +6136,9 @@
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Parser/Select.php" line-rate="0.56944444444444" branch-rate="0" complexity="59"> <package name="Option/Parser/Select.php" line-rate="0.56756756756757" branch-rate="0" complexity="61">
<classes> <classes>
<class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.56944444444444" branch-rate="0" complexity="59"> <class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.56756756756757" branch-rate="0" complexity="61">
<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>
@ -6208,7 +6208,7 @@
<line number="119" hits="0"/> <line number="119" hits="0"/>
</lines> </lines>
</method> </method>
<method name="parseModePapierDbXML" signature="" line-rate="1" branch-rate="0" complexity="5"> <method name="parseModePapierDbXML" signature="" line-rate="1" branch-rate="0" complexity="6">
<lines> <lines>
<line number="125" hits="67"/> <line number="125" hits="67"/>
<line number="126" hits="67"/> <line number="126" hits="67"/>
@ -6225,123 +6225,127 @@
<line number="142" hits="66"/> <line number="142" hits="66"/>
<line number="143" hits="66"/> <line number="143" hits="66"/>
<line number="144" hits="66"/> <line number="144" hits="66"/>
<line number="147" hits="66"/>
<line number="148" hits="66"/>
</lines> </lines>
</method> </method>
<method name="parseModePapierDbJson" signature="" line-rate="0" branch-rate="0" complexity="5"> <method name="parseModePapierDbJson" signature="" line-rate="0" branch-rate="0" complexity="6">
<lines> <lines>
<line number="153" hits="0"/> <line number="156" hits="0"/>
<line number="154" hits="0"/>
<line number="155" hits="0"/>
<line number="157" hits="0"/> <line number="157" hits="0"/>
<line number="159" hits="0"/> <line number="158" hits="0"/>
<line number="160" hits="0"/>
<line number="162" hits="0"/> <line number="162" hits="0"/>
<line number="164" hits="0"/>
<line number="165" hits="0"/> <line number="165" hits="0"/>
<line number="166" hits="0"/>
<line number="167" hits="0"/> <line number="167" hits="0"/>
<line number="168" hits="0"/> <line number="168" hits="0"/>
<line number="169" hits="0"/> <line number="169" hits="0"/>
<line number="170" hits="0"/> <line number="170" hits="0"/>
<line number="171" hits="0"/> <line number="171" hits="0"/>
<line number="172" hits="0"/> <line number="172" hits="0"/>
<line number="173" hits="0"/>
<line number="174" hits="0"/>
<line number="175" hits="0"/>
<line number="178" hits="0"/>
<line number="179" hits="0"/>
</lines> </lines>
</method> </method>
<method name="parseModeColorDbXML" signature="" line-rate="0.2962962962963" branch-rate="0" complexity="6"> <method name="parseModeColorDbXML" signature="" line-rate="0.2962962962963" branch-rate="0" complexity="6">
<lines> <lines>
<line number="181" hits="11"/> <line number="187" hits="11"/>
<line number="183" hits="11"/> <line number="189" hits="11"/>
<line number="185" hits="11"/> <line number="191" hits="11"/>
<line number="186" hits="0"/> <line number="192" hits="0"/>
<line number="188" hits="0"/>
<line number="190" hits="0"/>
<line number="191" hits="0"/>
<line number="193" hits="0"/>
<line number="194" hits="0"/> <line number="194" hits="0"/>
<line number="196" hits="0"/>
<line number="197" hits="0"/> <line number="197" hits="0"/>
<line number="198" hits="0"/>
<line number="199" hits="0"/> <line number="199" hits="0"/>
<line number="200" hits="0"/> <line number="200" hits="0"/>
<line number="201" hits="0"/>
<line number="202" hits="0"/>
<line number="203" hits="0"/> <line number="203" hits="0"/>
<line number="204" hits="0"/> <line number="204" hits="0"/>
<line number="205" hits="0"/> <line number="205" hits="0"/>
<line number="206" hits="0"/> <line number="206" hits="0"/>
<line number="207" hits="0"/> <line number="207" hits="0"/>
<line number="208" hits="0"/> <line number="208" hits="0"/>
<line number="209" hits="0"/>
<line number="210" hits="0"/>
<line number="211" hits="0"/>
<line number="212" hits="0"/> <line number="212" hits="0"/>
<line number="213" hits="11"/> <line number="213" hits="0"/>
<line number="215" hits="11"/> <line number="214" hits="0"/>
<line number="217" hits="11"/> <line number="218" hits="0"/>
<line number="218" hits="11"/>
<line number="219" hits="11"/> <line number="219" hits="11"/>
<line number="221" hits="11"/>
<line number="223" hits="11"/>
<line number="224" hits="11"/>
<line number="225" hits="11"/>
</lines> </lines>
</method> </method>
<method name="parseModeColorDbJson" signature="" line-rate="0.2962962962963" branch-rate="0" complexity="6"> <method name="parseModeColorDbJson" signature="" line-rate="0.2962962962963" branch-rate="0" complexity="6">
<lines> <lines>
<line number="225" hits="2"/> <line number="231" hits="2"/>
<line number="227" hits="2"/> <line number="233" hits="2"/>
<line number="229" hits="2"/> <line number="235" hits="2"/>
<line number="230" hits="0"/> <line number="236" hits="0"/>
<line number="232" hits="0"/>
<line number="234" hits="0"/>
<line number="235" hits="0"/>
<line number="237" hits="0"/>
<line number="238" hits="0"/> <line number="238" hits="0"/>
<line number="240" hits="0"/>
<line number="241" hits="0"/> <line number="241" hits="0"/>
<line number="242" hits="0"/>
<line number="243" hits="0"/> <line number="243" hits="0"/>
<line number="244" hits="0"/> <line number="244" hits="0"/>
<line number="245" hits="0"/>
<line number="246" hits="0"/>
<line number="247" hits="0"/> <line number="247" hits="0"/>
<line number="248" hits="0"/> <line number="248" hits="0"/>
<line number="249" hits="0"/> <line number="249" hits="0"/>
<line number="250" hits="0"/> <line number="250" hits="0"/>
<line number="251" hits="0"/> <line number="251" hits="0"/>
<line number="252" hits="0"/> <line number="252" hits="0"/>
<line number="253" hits="0"/>
<line number="254" hits="0"/>
<line number="255" hits="0"/>
<line number="256" hits="0"/> <line number="256" hits="0"/>
<line number="257" hits="2"/> <line number="257" hits="0"/>
<line number="259" hits="2"/> <line number="258" hits="0"/>
<line number="261" hits="2"/> <line number="262" hits="0"/>
<line number="262" hits="2"/>
<line number="263" hits="2"/> <line number="263" hits="2"/>
<line number="265" hits="2"/>
<line number="267" hits="2"/>
<line number="268" hits="2"/>
<line number="269" hits="2"/>
</lines> </lines>
</method> </method>
<method name="parseModeNormalXML" signature="" line-rate="1" branch-rate="0" complexity="2"> <method name="parseModeNormalXML" signature="" line-rate="1" branch-rate="0" complexity="2">
<lines> <lines>
<line number="269" hits="126"/> <line number="275" hits="126"/>
<line number="270" hits="122"/> <line number="276" hits="122"/>
<line number="271" hits="122"/> <line number="277" hits="122"/>
<line number="272" hits="122"/> <line number="278" hits="122"/>
</lines> </lines>
</method> </method>
<method name="parseModeNormalJson" signature="" line-rate="1" branch-rate="0" complexity="2"> <method name="parseModeNormalJson" signature="" line-rate="1" branch-rate="0" complexity="2">
<lines> <lines>
<line number="278" hits="1"/> <line number="284" hits="1"/>
<line number="279" hits="1"/> <line number="285" hits="1"/>
<line number="280" hits="1"/> <line number="286" hits="1"/>
<line number="281" hits="1"/> <line number="287" hits="1"/>
</lines> </lines>
</method> </method>
<method name="getPaperContainer" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getPaperContainer" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="290" hits="67"/> <line number="296" hits="67"/>
</lines> </lines>
</method> </method>
<method name="setPaperContainer" signature="$paperContainer" line-rate="1" branch-rate="0" complexity="1"> <method name="setPaperContainer" signature="$paperContainer" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="298" hits="127"/> <line number="304" hits="127"/>
</lines> </lines>
</method> </method>
<method name="setPaperRepository" signature="$repository" line-rate="1" branch-rate="0" complexity="1"> <method name="setPaperRepository" signature="$repository" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="306" hits="125"/> <line number="312" hits="125"/>
</lines> </lines>
</method> </method>
<method name="getPaperRepository" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getPaperRepository" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="314" hits="67"/> <line number="320" hits="67"/>
</lines> </lines>
</method> </method>
</methods> </methods>
@ -6409,87 +6413,91 @@
<line number="142" hits="66"/> <line number="142" hits="66"/>
<line number="143" hits="66"/> <line number="143" hits="66"/>
<line number="144" hits="66"/> <line number="144" hits="66"/>
<line number="153" hits="0"/> <line number="147" hits="66"/>
<line number="154" hits="0"/> <line number="148" hits="66"/>
<line number="155" hits="0"/> <line number="156" hits="0"/>
<line number="157" hits="0"/> <line number="157" hits="0"/>
<line number="159" hits="0"/> <line number="158" hits="0"/>
<line number="160" hits="0"/>
<line number="162" hits="0"/> <line number="162" hits="0"/>
<line number="164" hits="0"/>
<line number="165" hits="0"/> <line number="165" hits="0"/>
<line number="166" hits="0"/>
<line number="167" hits="0"/> <line number="167" hits="0"/>
<line number="168" hits="0"/> <line number="168" hits="0"/>
<line number="169" hits="0"/> <line number="169" hits="0"/>
<line number="170" hits="0"/> <line number="170" hits="0"/>
<line number="171" hits="0"/> <line number="171" hits="0"/>
<line number="172" hits="0"/> <line number="172" hits="0"/>
<line number="181" hits="11"/> <line number="173" hits="0"/>
<line number="183" hits="11"/> <line number="174" hits="0"/>
<line number="185" hits="11"/> <line number="175" hits="0"/>
<line number="186" hits="0"/> <line number="178" hits="0"/>
<line number="188" hits="0"/> <line number="179" hits="0"/>
<line number="190" hits="0"/> <line number="187" hits="11"/>
<line number="191" hits="0"/> <line number="189" hits="11"/>
<line number="193" hits="0"/> <line number="191" hits="11"/>
<line number="192" hits="0"/>
<line number="194" hits="0"/> <line number="194" hits="0"/>
<line number="196" hits="0"/>
<line number="197" hits="0"/> <line number="197" hits="0"/>
<line number="198" hits="0"/>
<line number="199" hits="0"/> <line number="199" hits="0"/>
<line number="200" hits="0"/> <line number="200" hits="0"/>
<line number="201" hits="0"/>
<line number="202" hits="0"/>
<line number="203" hits="0"/> <line number="203" hits="0"/>
<line number="204" hits="0"/> <line number="204" hits="0"/>
<line number="205" hits="0"/> <line number="205" hits="0"/>
<line number="206" hits="0"/> <line number="206" hits="0"/>
<line number="207" hits="0"/> <line number="207" hits="0"/>
<line number="208" hits="0"/> <line number="208" hits="0"/>
<line number="209" hits="0"/>
<line number="210" hits="0"/>
<line number="211" hits="0"/>
<line number="212" hits="0"/> <line number="212" hits="0"/>
<line number="213" hits="11"/> <line number="213" hits="0"/>
<line number="215" hits="11"/> <line number="214" hits="0"/>
<line number="217" hits="11"/> <line number="218" hits="0"/>
<line number="218" hits="11"/>
<line number="219" hits="11"/> <line number="219" hits="11"/>
<line number="225" hits="2"/> <line number="221" hits="11"/>
<line number="227" hits="2"/> <line number="223" hits="11"/>
<line number="229" hits="2"/> <line number="224" hits="11"/>
<line number="230" hits="0"/> <line number="225" hits="11"/>
<line number="232" hits="0"/> <line number="231" hits="2"/>
<line number="234" hits="0"/> <line number="233" hits="2"/>
<line number="235" hits="0"/> <line number="235" hits="2"/>
<line number="237" hits="0"/> <line number="236" hits="0"/>
<line number="238" hits="0"/> <line number="238" hits="0"/>
<line number="240" hits="0"/>
<line number="241" hits="0"/> <line number="241" hits="0"/>
<line number="242" hits="0"/>
<line number="243" hits="0"/> <line number="243" hits="0"/>
<line number="244" hits="0"/> <line number="244" hits="0"/>
<line number="245" hits="0"/>
<line number="246" hits="0"/>
<line number="247" hits="0"/> <line number="247" hits="0"/>
<line number="248" hits="0"/> <line number="248" hits="0"/>
<line number="249" hits="0"/> <line number="249" hits="0"/>
<line number="250" hits="0"/> <line number="250" hits="0"/>
<line number="251" hits="0"/> <line number="251" hits="0"/>
<line number="252" hits="0"/> <line number="252" hits="0"/>
<line number="253" hits="0"/>
<line number="254" hits="0"/>
<line number="255" hits="0"/>
<line number="256" hits="0"/> <line number="256" hits="0"/>
<line number="257" hits="2"/> <line number="257" hits="0"/>
<line number="259" hits="2"/> <line number="258" hits="0"/>
<line number="261" hits="2"/> <line number="262" hits="0"/>
<line number="262" hits="2"/>
<line number="263" hits="2"/> <line number="263" hits="2"/>
<line number="269" hits="126"/> <line number="265" hits="2"/>
<line number="270" hits="122"/> <line number="267" hits="2"/>
<line number="271" hits="122"/> <line number="268" hits="2"/>
<line number="272" hits="122"/> <line number="269" hits="2"/>
<line number="278" hits="1"/> <line number="275" hits="126"/>
<line number="279" hits="1"/> <line number="276" hits="122"/>
<line number="280" hits="1"/> <line number="277" hits="122"/>
<line number="281" hits="1"/> <line number="278" hits="122"/>
<line number="290" hits="67"/> <line number="284" hits="1"/>
<line number="298" hits="127"/> <line number="285" hits="1"/>
<line number="306" hits="125"/> <line number="286" hits="1"/>
<line number="314" hits="67"/> <line number="287" hits="1"/>
<line number="296" hits="67"/>
<line number="304" hits="127"/>
<line number="312" hits="125"/>
<line number="320" hits="67"/>
</lines> </lines>
</class> </class>
</classes> </classes>
@ -6810,7 +6818,7 @@
</method> </method>
<method name="getDefault" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getDefault" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="153" hits="166"/> <line number="153" hits="170"/>
</lines> </lines>
</method> </method>
<method name="setDefault" signature="$default" line-rate="1" branch-rate="0" complexity="1"> <method name="setDefault" signature="$default" line-rate="1" branch-rate="0" complexity="1">
@ -7006,7 +7014,7 @@
<line number="129" hits="183"/> <line number="129" hits="183"/>
<line number="137" hits="5"/> <line number="137" hits="5"/>
<line number="145" hits="89"/> <line number="145" hits="89"/>
<line number="153" hits="166"/> <line number="153" hits="170"/>
<line number="161" hits="180"/> <line number="161" hits="180"/>
<line number="166" hits="1"/> <line number="166" hits="1"/>
<line number="171" hits="43"/> <line number="171" hits="43"/>
@ -7523,9 +7531,9 @@
<method name="getSelectedOption" signature="" line-rate="1" branch-rate="0" complexity="4"> <method name="getSelectedOption" signature="" line-rate="1" branch-rate="0" complexity="4">
<lines> <lines>
<line number="15" hits="59"/> <line number="15" hits="59"/>
<line number="16" hits="55"/> <line number="16" hits="58"/>
<line number="20" hits="59"/> <line number="20" hits="7"/>
<line number="21" hits="59"/> <line number="21" hits="7"/>
<line number="23" hits="1"/> <line number="23" hits="1"/>
<line number="24" hits="1"/> <line number="24" hits="1"/>
<line number="25" hits="1"/> <line number="25" hits="1"/>
@ -7545,7 +7553,7 @@
<line number="42" hits="1"/> <line number="42" hits="1"/>
<line number="44" hits="1"/> <line number="44" hits="1"/>
<line number="46" hits="1"/> <line number="46" hits="1"/>
<line number="49" hits="58"/> <line number="49" hits="6"/>
</lines> </lines>
</method> </method>
<method name="parseAdditionalValues" signature="$variables" line-rate="1" branch-rate="0" complexity="3"> <method name="parseAdditionalValues" signature="$variables" line-rate="1" branch-rate="0" complexity="3">
@ -7676,9 +7684,9 @@
</methods> </methods>
<lines> <lines>
<line number="15" hits="59"/> <line number="15" hits="59"/>
<line number="16" hits="55"/> <line number="16" hits="58"/>
<line number="20" hits="59"/> <line number="20" hits="7"/>
<line number="21" hits="59"/> <line number="21" hits="7"/>
<line number="23" hits="1"/> <line number="23" hits="1"/>
<line number="24" hits="1"/> <line number="24" hits="1"/>
<line number="25" hits="1"/> <line number="25" hits="1"/>
@ -7698,7 +7706,7 @@
<line number="42" hits="1"/> <line number="42" hits="1"/>
<line number="44" hits="1"/> <line number="44" hits="1"/>
<line number="46" hits="1"/> <line number="46" hits="1"/>
<line number="49" hits="58"/> <line number="49" hits="6"/>
<line number="55" hits="59"/> <line number="55" hits="59"/>
<line number="57" hits="59"/> <line number="57" hits="59"/>
<line number="58" hits="6"/> <line number="58" hits="6"/>
@ -8008,7 +8016,7 @@
</method> </method>
<method name="getOptionById" signature="string $id" line-rate="1" branch-rate="0" complexity="1"> <method name="getOptionById" signature="string $id" line-rate="1" branch-rate="0" complexity="1">
<lines> <lines>
<line number="44" hits="113"/> <line number="44" hits="121"/>
</lines> </lines>
</method> </method>
<method name="addOptions" signature="array $options" line-rate="1" branch-rate="0" complexity="1"> <method name="addOptions" signature="array $options" line-rate="1" branch-rate="0" complexity="1">
@ -8028,7 +8036,7 @@
<lines> <lines>
<line number="66" hits="115"/> <line number="66" hits="115"/>
<line number="67" hits="115"/> <line number="67" hits="115"/>
<line number="68" hits="109"/> <line number="68" hits="106"/>
</lines> </lines>
</method> </method>
<method name="getValue" signature="" line-rate="1" branch-rate="0" complexity="1"> <method name="getValue" signature="" line-rate="1" branch-rate="0" complexity="1">
@ -8084,9 +8092,9 @@
</method> </method>
<method name="addSelectedOption" signature="null|Opt $opt" line-rate="0.42857142857143" branch-rate="0" complexity="4"> <method name="addSelectedOption" signature="null|Opt $opt" line-rate="0.42857142857143" branch-rate="0" complexity="4">
<lines> <lines>
<line number="131" hits="118"/> <line number="131" hits="126"/>
<line number="132" hits="118"/> <line number="132" hits="126"/>
<line number="133" hits="118"/> <line number="133" hits="126"/>
<line number="135" hits="0"/> <line number="135" hits="0"/>
<line number="136" hits="0"/> <line number="136" hits="0"/>
<line number="137" hits="0"/> <line number="137" hits="0"/>
@ -8149,7 +8157,7 @@
<line number="33" hits="136"/> <line number="33" hits="136"/>
<line number="34" hits="136"/> <line number="34" hits="136"/>
<line number="39" hits="127"/> <line number="39" hits="127"/>
<line number="44" hits="113"/> <line number="44" hits="121"/>
<line number="49" hits="11"/> <line number="49" hits="11"/>
<line number="57" hits="119"/> <line number="57" hits="119"/>
<line number="58" hits="119"/> <line number="58" hits="119"/>
@ -8157,7 +8165,7 @@
<line number="60" hits="115"/> <line number="60" hits="115"/>
<line number="66" hits="115"/> <line number="66" hits="115"/>
<line number="67" hits="115"/> <line number="67" hits="115"/>
<line number="68" hits="109"/> <line number="68" hits="106"/>
<line number="74" hits="7"/> <line number="74" hits="7"/>
<line number="75" hits="7"/> <line number="75" hits="7"/>
<line number="80" hits="0"/> <line number="80" hits="0"/>
@ -8169,9 +8177,9 @@
<line number="116" hits="117"/> <line number="116" hits="117"/>
<line number="121" hits="119"/> <line number="121" hits="119"/>
<line number="126" hits="112"/> <line number="126" hits="112"/>
<line number="131" hits="118"/> <line number="131" hits="126"/>
<line number="132" hits="118"/> <line number="132" hits="126"/>
<line number="133" hits="118"/> <line number="133" hits="126"/>
<line number="135" hits="0"/> <line number="135" hits="0"/>
<line number="136" hits="0"/> <line number="136" hits="0"/>
<line number="137" hits="0"/> <line number="137" hits="0"/>
@ -8421,7 +8429,7 @@
</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">
<lines> <lines>
<line number="35" hits="130"/> <line number="35" hits="138"/>
</lines> </lines>
</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">
@ -8491,7 +8499,7 @@
</methods> </methods>
<lines> <lines>
<line number="26" hits="140"/> <line number="26" hits="140"/>
<line number="35" hits="130"/> <line number="35" hits="138"/>
<line number="43" hits="140"/> <line number="43" hits="140"/>
<line number="51" hits="119"/> <line number="51" hits="119"/>
<line number="59" hits="140"/> <line number="59" hits="140"/>

View File

@ -144,6 +144,9 @@ class Select extends Base
$this->element->addOption($optPapier); $this->element->addOption($optPapier);
} }
} }
if ($this->element->getDefault() != '') {
$this->element->addSelectedOption($this->element->getOptionById($this->element->getDefault()));
}
} }
} }
} }
@ -172,6 +175,9 @@ class Select extends Base
$this->element->addOption($optPapier); $this->element->addOption($optPapier);
} }
} }
if ($this->element->getDefault() != '') {
$this->element->addSelectedOption($this->element->getOptionById($this->element->getDefault()));
}
} }
} }
} }