16
16
class Color extends CSSFunction
17
17
{
18
18
/**
19
- * @param array<array-key , Value|string> $colorValues
19
+ * @param array<non-empty-string , Value|string> $colorValues
20
20
* @param int<0, max> $lineNumber
21
21
*/
22
22
public function __construct (array $ colorValues , int $ lineNumber = 0 )
@@ -32,17 +32,16 @@ public function __construct(array $colorValues, int $lineNumber = 0)
32
32
*/
33
33
public static function parse (ParserState $ parserState , bool $ ignoreCase = false ): CSSFunction
34
34
{
35
- return
36
- $ parserState ->comes ('# ' )
37
- ? self ::parseHexColor ($ parserState )
38
- : self ::parseColorFunction ($ parserState );
35
+ return $ parserState ->comes ('# ' )
36
+ ? self ::parseHexColor ($ parserState )
37
+ : self ::parseColorFunction ($ parserState );
39
38
}
40
39
41
40
/**
42
41
* @throws UnexpectedEOFException
43
42
* @throws UnexpectedTokenException
44
43
*/
45
- private static function parseHexColor (ParserState $ parserState ): CSSFunction
44
+ private static function parseHexColor (ParserState $ parserState ): Color
46
45
{
47
46
$ parserState ->consume ('# ' );
48
47
$ hexValue = $ parserState ->parseIdentifier (false );
@@ -183,10 +182,9 @@ private static function parseColorFunction(ParserState $parserState): CSSFunctio
183
182
}
184
183
$ parserState ->consume (') ' );
185
184
186
- return
187
- $ containsVar
188
- ? new CSSFunction ($ colorMode , \array_values ($ colorValues ), ', ' , $ parserState ->currentLine ())
189
- : new Color ($ colorValues , $ parserState ->currentLine ());
185
+ return $ containsVar
186
+ ? new CSSFunction ($ colorMode , \array_values ($ colorValues ), ', ' , $ parserState ->currentLine ())
187
+ : new Color ($ colorValues , $ parserState ->currentLine ());
190
188
}
191
189
192
190
private static function mapRange (float $ value , float $ fromMin , float $ fromMax , float $ toMin , float $ toMax ): float
@@ -196,19 +194,20 @@ private static function mapRange(float $value, float $fromMin, float $fromMax, f
196
194
$ multiplier = $ toRange / $ fromRange ;
197
195
$ newValue = $ value - $ fromMin ;
198
196
$ newValue *= $ multiplier ;
197
+
199
198
return $ newValue + $ toMin ;
200
199
}
201
200
202
201
/**
203
- * @return array<array-key , Value|string>
202
+ * @return array<non-empty-string , Value|string>
204
203
*/
205
- public function getColor ()
204
+ public function getColor (): array
206
205
{
207
206
return $ this ->components ;
208
207
}
209
208
210
209
/**
211
- * @param array<array-key , Value|string> $colorValues
210
+ * @param array<non-empty-string , Value|string> $colorValues
212
211
*/
213
212
public function setColor (array $ colorValues ): void
214
213
{
0 commit comments