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

Fix Calc

Browse Source
This commit is contained in:
Thomas Peterson 2025-02-17 11:56:05 +01:00
parent 32e3b9739b
commit 31014bc855
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.phpunit.result.cache
View File

File diff suppressed because one or more lines are too long

6
src/Option/Parser/Select.php
View File

@ -113,9 +113,9 @@ class Select extends Base
$optColor = new \PSC\Library\Calc\Option\Type\Select\ColorOpt(); $optColor = new \PSC\Library\Calc\Option\Type\Select\ColorOpt();
$optColor->setId($color->getName()); $optColor->setId($color->getName());
$optColor->setLabel(sprintf("%s %s %s", $system->getColorSystemPrefix(), $color->getValue("name"), $system->getColorSystemSuffix())); $optColor->setLabel(sprintf("%s %s %s", $system->getColorSystemPrefix(), $color->getValue("name"), $system->getColorSystemSuffix()));
$optColor->setColorHex($color->getHex()); $optColor->setColorHex((string)$color->getHex());
$optColor->setColorCMYK($color->getCMYK()); $optColor->setColorCMYK((string)$color->getCMYK());
$optColor->setColorRGB($color->getRGB()); $optColor->setColorRGB((string)$color->getRGB());
$optColor->setValue((string)$color->getHEX()); $optColor->setValue((string)$color->getHEX());
$this->element->addOption($optColor); $this->element->addOption($optColor);
} }

12
src/Option/Type/Select/ColorOpt.php
View File

@ -25,32 +25,32 @@ class ColorOpt extends Opt
return $this->value; return $this->value;
} }
public function getColorHex(): HEX|null public function getColorHex(): string|null
{ {
return $this->colorHex; return $this->colorHex;
} }
public function setColorHex(Hex $colorHex): void public function setColorHex(string $colorHex): void
{ {
$this->colorHex = $colorHex; $this->colorHex = $colorHex;
} }
public function getColorCMYK(): CMYK|null public function getColorCMYK(): string|null
{ {
return $this->colorCMYK; return $this->colorCMYK;
} }
public function setColorCMYK(CMYK $colorCMYK): void public function setColorCMYK(string $colorCMYK): void
{ {
$this->colorCMYK = $colorCMYK; $this->colorCMYK = $colorCMYK;
} }
public function getColorRGB(): RGB|null public function getColorRGB(): string|null
{ {
return $this->colorRGB; return $this->colorRGB;
} }
public function setColorRGB(RGB $colorRGB): void public function setColorRGB(string $colorRGB): void
{ {
$this->colorRGB = $colorRGB; $this->colorRGB = $colorRGB;
} }