Skip to content

Handle malformed RGB HEX values #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Handle malformed RGB HEX values #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0d6246
Handle parsing of invalid HEX values nicely
raxbg Dec 18, 2019
94b8bae
Merge branch 'rgb_parsing_fix' into catchup/rgb_parsing_fix
raxbg Sep 17, 2022
7e23f3b
Merge branch 'upstream_master' into catchup/rgb_parsing_fix
raxbg Sep 17, 2022
04aebb4
Fixes for CI
raxbg Sep 17, 2022
508c2f9
Merge branch 'upstream_master' into rgb_parsing_fix
raxbg Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Value/Color.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ public static function parse(ParserState $oParserState, $bIgnoreCase = false)
$oParserState->currentLine()
),
];
} else {
} elseif ($oParserState->strlen($sValue) === 6) {
$aColor = [
'r' => new Size(intval($sValue[0] . $sValue[1], 16), null, true, $oParserState->currentLine()),
'g' => new Size(intval($sValue[2] . $sValue[3], 16), null, true, $oParserState->currentLine()),
'b' => new Size(intval($sValue[4] . $sValue[5], 16), null, true, $oParserState->currentLine()),
];
} else {
throw new UnexpectedTokenException("RGB(A) HEX val", $sValue, 'literal', $oParserState->currentLine());
}
} else {
$sColorMode = $oParserState->parseIdentifier(true);
Expand Down Expand Up @@ -166,7 +168,7 @@ public function render(OutputFormat $oOutputFormat)
$this->aComponents['b']->getSize()
);
return '#' . (($sResult[0] == $sResult[1]) && ($sResult[2] == $sResult[3]) && ($sResult[4] == $sResult[5])
? "$sResult[0]$sResult[2]$sResult[4]" : $sResult);
? "$sResult[0]$sResult[2]$sResult[4]" : $sResult);
}
return parent::render($oOutputFormat);
}
Expand Down
11 changes: 11 additions & 0 deletions tests/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,17 @@ public function innerColors()
self::assertSame($sExpected, $oDoc->render());
}

/**
* @test
*/
public function incorrectRGBColors()
{
$oParser = new Parser(".info-img {border:1px solid #8C0000;background-color:#fffff;}");
$sExpected = ".info-img {border: 1px solid #8c0000;}";
$oDoc = $oParser->parse();
self::assertSame($sExpected, $oDoc->render());
}

/**
* @test
*/
Expand Down