Convert whitesmoke to hex before parsing it

nickygerritsen · nickygerritsen · commit ad989aed333e · 2024-11-23T15:39:08.000+01:00
This fixes many deprecation errors on the mobile scoreboard.
diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -1136,7 +1136,7 @@ public function problemBadge(ContestProblem $problem, bool $grayedOut = false):
     {
         $rgb        = Utils::convertToHex($problem->getColor() ?? '#ffffff');
         if ($grayedOut) {
-            $rgb = 'whitesmoke';
+            $rgb = Utils::convertToHex('whitesmoke');
         }
         $background = Utils::parseHexColor($rgb);
 
@@ -1166,7 +1166,7 @@ public function problemBadgeMaybe(ContestProblem $problem, ScoreboardMatrixItem
     {
         $rgb        = Utils::convertToHex($problem->getColor() ?? '#ffffff');
         if (!$matrixItem->isCorrect) {
-            $rgb = 'whitesmoke';
+            $rgb = Utils::convertToHex('whitesmoke');
         }
         $background = Utils::parseHexColor($rgb);
 

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ public function problemBadge(ContestProblem $problem, bool $grayedOut = false):`
`1136`	`1136`	`{`
`1137`	`1137`	`$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');`
`1138`	`1138`	`if ($grayedOut) {`
`1139`		`- $rgb = 'whitesmoke';`
	`1139`	`+ $rgb = Utils::convertToHex('whitesmoke');`
`1140`	`1140`	`}`
`1141`	`1141`	`$background = Utils::parseHexColor($rgb);`
`1142`	`1142`
`@@ -1166,7 +1166,7 @@ public function problemBadgeMaybe(ContestProblem $problem, ScoreboardMatrixItem`
`1166`	`1166`	`{`
`1167`	`1167`	`$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');`
`1168`	`1168`	`if (!$matrixItem->isCorrect) {`
`1169`		`- $rgb = 'whitesmoke';`
	`1169`	`+ $rgb = Utils::convertToHex('whitesmoke');`
`1170`	`1170`	`}`
`1171`	`1171`	`$background = Utils::parseHexColor($rgb);`
`1172`	`1172`