From 5aa28de13acc673117d3d0fd943bd697df45417c Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 4 Mar 2025 19:03:10 +0100 Subject: [PATCH] [CLEANUP] Avoid Hungarian notation for `function` Part of #756 --- src/Value/CalcFunction.php | 8 ++++---- src/Value/Value.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Value/CalcFunction.php b/src/Value/CalcFunction.php index 0958803b..790c6924 100644 --- a/src/Value/CalcFunction.php +++ b/src/Value/CalcFunction.php @@ -29,13 +29,13 @@ class CalcFunction extends CSSFunction public static function parse(ParserState $parserState, bool $ignoreCase = false): CSSFunction { $aOperators = ['+', '-', '*', '/']; - $sFunction = $parserState->parseIdentifier(); + $function = $parserState->parseIdentifier(); if ($parserState->peek() != '(') { // Found ; or end of line before an opening bracket throw new UnexpectedTokenException('(', $parserState->peek(), 'literal', $parserState->currentLine()); - } elseif (!\in_array($sFunction, ['calc', '-moz-calc', '-webkit-calc'], true)) { + } elseif (!\in_array($function, ['calc', '-moz-calc', '-webkit-calc'], true)) { // Found invalid calc definition. Example calc (... - throw new UnexpectedTokenException('calc', $sFunction, 'literal', $parserState->currentLine()); + throw new UnexpectedTokenException('calc', $function, 'literal', $parserState->currentLine()); } $parserState->consume('('); $oCalcList = new CalcRuleValueList($parserState->currentLine()); @@ -100,6 +100,6 @@ public static function parse(ParserState $parserState, bool $ignoreCase = false) if (!$parserState->isEnd()) { $parserState->consume(')'); } - return new CalcFunction($sFunction, $list, ',', $parserState->currentLine()); + return new CalcFunction($function, $list, ',', $parserState->currentLine()); } } diff --git a/src/Value/Value.php b/src/Value/Value.php index 304a547e..0e6d9831 100644 --- a/src/Value/Value.php +++ b/src/Value/Value.php @@ -193,9 +193,9 @@ public static function parsePrimitiveValue(ParserState $parserState) */ private static function parseMicrosoftFilter(ParserState $parserState): CSSFunction { - $sFunction = $parserState->consumeUntil('(', false, true); + $function = $parserState->consumeUntil('(', false, true); $arguments = Value::parseValue($parserState, [',', '=']); - return new CSSFunction($sFunction, $arguments, ',', $parserState->currentLine()); + return new CSSFunction($function, $arguments, ',', $parserState->currentLine()); } /**