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

Fixes

Browse Source
This commit is contained in:
Thomas Peterson 2025-07-25 11:39:08 +02:00
parent 19fe1e8e7f
commit f53a45e89a
2 changed files with 105 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
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.74867477393202" branch-rate="0" lines-covered="2401" lines-valid="3207" branches-covered="0" branches-valid="0" complexity="1389" version="0.4" timestamp="1753434619"> <coverage line-rate="0.74041757556871" branch-rate="0" lines-covered="2376" lines-valid="3209" branches-covered="0" branches-valid="0" complexity="1390" version="0.4" timestamp="1753435947">
<sources> <sources>
<source>/home/thomas/projekte/calc/src</source> <source>/home/thomas/projekte/calc/src</source>
</sources> </sources>
@ -6242,9 +6242,9 @@
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Parser/Select.php" line-rate="0.69594594594595" branch-rate="0" complexity="61"> <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.69594594594595" branch-rate="0" complexity="61"> <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>
@ -6356,30 +6356,30 @@
<line number="179" hits="0"/> <line number="179" hits="0"/>
</lines> </lines>
</method> </method>
<method name="parseModeColorDbXML" signature="" line-rate="1" branch-rate="0" complexity="6"> <method name="parseModeColorDbXML" signature="" line-rate="0.2962962962963" branch-rate="0" complexity="6">
<lines> <lines>
<line number="187" hits="13"/> <line number="187" hits="13"/>
<line number="189" hits="13"/> <line number="189" hits="13"/>
<line number="191" hits="13"/> <line number="191" hits="13"/>
<line number="192" hits="1"/> <line number="192" hits="0"/>
<line number="194" hits="1"/> <line number="194" hits="0"/>
<line number="196" hits="1"/> <line number="196" hits="0"/>
<line number="197" hits="1"/> <line number="197" hits="0"/>
<line number="199" hits="1"/> <line number="199" hits="0"/>
<line number="200" hits="1"/> <line number="200" 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="209" hits="1"/> <line number="209" hits="0"/>
<line number="210" hits="1"/> <line number="210" hits="0"/>
<line number="211" hits="1"/> <line number="211" hits="0"/>
<line number="212" hits="1"/> <line number="212" hits="0"/>
<line number="213" hits="1"/> <line number="213" hits="0"/>
<line number="214" hits="1"/> <line number="214" hits="0"/>
<line number="218" hits="1"/> <line number="218" hits="0"/>
<line number="219" hits="13"/> <line number="219" hits="13"/>
<line number="221" hits="13"/> <line number="221" hits="13"/>
<line number="223" hits="13"/> <line number="223" hits="13"/>
@ -6541,25 +6541,25 @@
<line number="187" hits="13"/> <line number="187" hits="13"/>
<line number="189" hits="13"/> <line number="189" hits="13"/>
<line number="191" hits="13"/> <line number="191" hits="13"/>
<line number="192" hits="1"/> <line number="192" hits="0"/>
<line number="194" hits="1"/> <line number="194" hits="0"/>
<line number="196" hits="1"/> <line number="196" hits="0"/>
<line number="197" hits="1"/> <line number="197" hits="0"/>
<line number="199" hits="1"/> <line number="199" hits="0"/>
<line number="200" hits="1"/> <line number="200" 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="209" hits="1"/> <line number="209" hits="0"/>
<line number="210" hits="1"/> <line number="210" hits="0"/>
<line number="211" hits="1"/> <line number="211" hits="0"/>
<line number="212" hits="1"/> <line number="212" hits="0"/>
<line number="213" hits="1"/> <line number="213" hits="0"/>
<line number="214" hits="1"/> <line number="214" hits="0"/>
<line number="218" hits="1"/> <line number="218" hits="0"/>
<line number="219" hits="13"/> <line number="219" hits="13"/>
<line number="221" hits="13"/> <line number="221" hits="13"/>
<line number="223" hits="13"/> <line number="223" hits="13"/>
@ -6772,37 +6772,39 @@
</class> </class>
</classes> </classes>
</package> </package>
<package name="Option/Parser/Text.php" line-rate="0.64705882352941" branch-rate="0" complexity="8"> <package name="Option/Parser/Text.php" line-rate="0.57894736842105" branch-rate="0" complexity="9">
<classes> <classes>
<class name="PSC\Library\Calc\Option\Parser\Text" filename="Option/Parser/Text.php" line-rate="0.64705882352941" branch-rate="0" complexity="8"> <class name="PSC\Library\Calc\Option\Parser\Text" filename="Option/Parser/Text.php" line-rate="0.57894736842105" branch-rate="0" complexity="9">
<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="14" hits="56"/> <line number="14" hits="56"/>
</lines> </lines>
</method> </method>
<method name="parseJSON" signature="" line-rate="0" branch-rate="0" complexity="3"> <method name="parseJSON" signature="" line-rate="0" branch-rate="0" complexity="4">
<lines> <lines>
<line number="19" hits="0"/> <line number="19" hits="0"/>
<line number="21" hits="0"/> <line number="21" hits="0"/>
<line number="22" hits="0"/> <line number="22" hits="0"/>
<line number="23" hits="0"/> <line number="25" hits="0"/>
<line number="24" hits="0"/> <line number="26" hits="0"/>
<line number="27" hits="0"/> <line number="27" hits="0"/>
<line number="28" hits="0"/>
<line number="31" hits="0"/>
</lines> </lines>
</method> </method>
<method name="parseXML" signature="" line-rate="1" branch-rate="0" complexity="4"> <method name="parseXML" signature="" line-rate="1" branch-rate="0" complexity="4">
<lines> <lines>
<line number="33" hits="56"/> <line number="36" hits="56"/>
<line number="35" hits="56"/> <line number="38" hits="56"/>
<line number="36" hits="6"/> <line number="39" hits="6"/>
<line number="39" hits="56"/> <line number="42" hits="56"/>
<line number="40" hits="39"/> <line number="43" hits="39"/>
<line number="43" hits="56"/>
<line number="44" hits="56"/>
<line number="45" hits="56"/>
<line number="46" hits="56"/> <line number="46" hits="56"/>
<line number="47" hits="56"/>
<line number="48" hits="56"/>
<line number="49" hits="56"/> <line number="49" hits="56"/>
<line number="52" hits="56"/>
</lines> </lines>
</method> </method>
</methods> </methods>
@ -6811,19 +6813,21 @@
<line number="19" hits="0"/> <line number="19" hits="0"/>
<line number="21" hits="0"/> <line number="21" hits="0"/>
<line number="22" hits="0"/> <line number="22" hits="0"/>
<line number="23" hits="0"/> <line number="25" hits="0"/>
<line number="24" hits="0"/> <line number="26" hits="0"/>
<line number="27" hits="0"/> <line number="27" hits="0"/>
<line number="33" hits="56"/> <line number="28" hits="0"/>
<line number="35" hits="56"/> <line number="31" hits="0"/>
<line number="36" hits="6"/> <line number="36" hits="56"/>
<line number="39" hits="56"/> <line number="38" hits="56"/>
<line number="40" hits="39"/> <line number="39" hits="6"/>
<line number="43" hits="56"/> <line number="42" hits="56"/>
<line number="44" hits="56"/> <line number="43" hits="39"/>
<line number="45" hits="56"/>
<line number="46" hits="56"/> <line number="46" hits="56"/>
<line number="47" hits="56"/>
<line number="48" hits="56"/>
<line number="49" hits="56"/> <line number="49" hits="56"/>
<line number="52" hits="56"/>
</lines> </lines>
</class> </class>
</classes> </classes>
@ -8462,13 +8466,13 @@
</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">
@ -8481,9 +8485,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">
@ -8491,9 +8495,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">
@ -8501,9 +8505,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">
@ -8511,9 +8515,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">
@ -8521,25 +8525,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>
@ -8660,7 +8664,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">
@ -8670,7 +8674,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">
@ -8680,7 +8684,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">
@ -8734,11 +8738,11 @@
</method> </method>
</methods> </methods>
<lines> <lines>
<line number="26" hits="141"/> <line number="26" hits="140"/>
<line number="35" hits="142"/> <line number="35" hits="142"/>
<line number="43" hits="141"/> <line number="43" hits="140"/>
<line number="51" hits="119"/> <line number="51" hits="119"/>
<line number="59" hits="141"/> <line number="59" hits="140"/>
<line number="67" hits="127"/> <line number="67" hits="127"/>
<line number="75" hits="140"/> <line number="75" hits="140"/>
<line number="83" hits="127"/> <line number="83" hits="127"/>

18
src/Option/Parser/Text.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace PSC\Library\Calc\Option\Parser; namespace PSC\Library\Calc\Option\Parser;
use PSC\Library\Calc\General\Parser\EdgeCollectionContainer; use PSC\Library\Calc\General\Parser\EdgeCollectionContainer;
@ -6,7 +7,6 @@ use PSC\Library\Calc\Option\Type\Text as PSCText;
class Text extends Base class Text extends Base
{ {
protected $element; protected $element;
public function __construct() public function __construct()
@ -18,7 +18,11 @@ class Text extends Base
{ {
parent::parseJson(); parent::parseJson();
if(isset($this->json['dependencys']) && count($this->json['dependencys']) > 0) { if ($this->json['default']) {
$this->element->setValue((string) $this->json['default']);
}
if (isset($this->json['dependencys']) && count($this->json['dependencys']) > 0) {
$edgeCollectionContainerParser = new EdgeCollectionContainer(); $edgeCollectionContainerParser = new EdgeCollectionContainer();
$edgeCollectionContainerParser->fromJson($this->json['dependencys']); $edgeCollectionContainerParser->fromJson($this->json['dependencys']);
$this->element->setEdgesCollectionContainer($edgeCollectionContainerParser->parseJson()); $this->element->setEdgesCollectionContainer($edgeCollectionContainerParser->parseJson());
@ -27,20 +31,19 @@ class Text extends Base
return $this->element; return $this->element;
} }
public function parseXML(): PSCText public function parseXML(): PSCText
{ {
parent::parseXML(); parent::parseXML();
if($this->node->data) { if ($this->node->data) {
$this->element->setValue((string)$this->node->data); $this->element->setValue((string) $this->node->data);
} }
if($this->element->getDefault() != null) { if ($this->element->getDefault() != null) {
$this->element->setValue($this->element->getDefault()); $this->element->setValue($this->element->getDefault());
} }
if($this->node->children()) { if ($this->node->children()) {
$edgeCollectionContainerParser = new EdgeCollectionContainer(); $edgeCollectionContainerParser = new EdgeCollectionContainer();
$edgeCollectionContainerParser->fromXML($this->node); $edgeCollectionContainerParser->fromXML($this->node);
$this->element->setEdgesCollectionContainer($edgeCollectionContainerParser->parseXML()); $this->element->setEdgesCollectionContainer($edgeCollectionContainerParser->parseXML());
@ -48,5 +51,4 @@ class Text extends Base
return $this->element; return $this->element;
} }
} }