From 0af66d8876692fb0996ca0353aef4f220923a31a Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Tue, 4 Mar 2025 23:17:11 +0100
Subject: [PATCH] [CLEANUP] Avoid Hungarian notation for `name(s)`

Part of #756
---
 src/OutputFormat.php      | 26 +++++++++++++-------------
 src/Value/CSSFunction.php | 22 +++++++++++-----------
 src/Value/LineName.php    |  8 ++++----
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/OutputFormat.php b/src/OutputFormat.php
index d7f1a096..58b33637 100644
--- a/src/OutputFormat.php
+++ b/src/OutputFormat.php
@@ -185,11 +185,11 @@ public function __construct() {}
     /**
      * @return string|int|bool|null
      */
-    public function get(string $sName)
+    public function get(string $name)
     {
         $aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
         foreach ($aVarPrefixes as $prefix) {
-            $sFieldName = $prefix . \ucfirst($sName);
+            $sFieldName = $prefix . \ucfirst($name);
             if (isset($this->$sFieldName)) {
                 return $this->$sFieldName;
             }
@@ -198,28 +198,28 @@ public function get(string $sName)
     }
 
     /**
-     * @param array<array-key, string>|string $aNames
+     * @param array<array-key, string>|string $names
      * @param mixed $value
      *
      * @return self|false
      */
-    public function set($aNames, $value)
+    public function set($names, $value)
     {
         $aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
-        if (\is_string($aNames) && \strpos($aNames, '*') !== false) {
-            $aNames =
+        if (\is_string($names) && \strpos($names, '*') !== false) {
+            $names =
                 [
-                    \str_replace('*', 'Before', $aNames),
-                    \str_replace('*', 'Between', $aNames),
-                    \str_replace('*', 'After', $aNames),
+                    \str_replace('*', 'Before', $names),
+                    \str_replace('*', 'Between', $names),
+                    \str_replace('*', 'After', $names),
                 ];
-        } elseif (!\is_array($aNames)) {
-            $aNames = [$aNames];
+        } elseif (!\is_array($names)) {
+            $names = [$names];
         }
         foreach ($aVarPrefixes as $prefix) {
             $bDidReplace = false;
-            foreach ($aNames as $sName) {
-                $sFieldName = $prefix . \ucfirst($sName);
+            foreach ($names as $name) {
+                $sFieldName = $prefix . \ucfirst($name);
                 if (isset($this->$sFieldName)) {
                     $this->$sFieldName = $value;
                     $bDidReplace = true;
diff --git a/src/Value/CSSFunction.php b/src/Value/CSSFunction.php
index 4ef67ac1..985a7a24 100644
--- a/src/Value/CSSFunction.php
+++ b/src/Value/CSSFunction.php
@@ -21,21 +21,21 @@ class CSSFunction extends ValueList
      *
      * @internal since 8.8.0
      */
-    protected $sName;
+    protected $name;
 
     /**
-     * @param string $sName
+     * @param string $name
      * @param RuleValueList|array<array-key, Value|string> $arguments
      * @param string $separator
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sName, $arguments, $separator = ',', $lineNumber = 0)
+    public function __construct($name, $arguments, $separator = ',', $lineNumber = 0)
     {
         if ($arguments instanceof RuleValueList) {
             $separator = $arguments->getListSeparator();
             $arguments = $arguments->getListComponents();
         }
-        $this->sName = $sName;
+        $this->name = $name;
         $this->lineNumber = $lineNumber;
         parent::__construct($arguments, $separator, $lineNumber);
     }
@@ -49,11 +49,11 @@ public function __construct($sName, $arguments, $separator = ',', $lineNumber =
      */
     public static function parse(ParserState $parserState, bool $ignoreCase = false): CSSFunction
     {
-        $sName = self::parseName($parserState, $ignoreCase);
+        $name = self::parseName($parserState, $ignoreCase);
         $parserState->consume('(');
         $arguments = self::parseArguments($parserState);
 
-        $result = new CSSFunction($sName, $arguments, ',', $parserState->currentLine());
+        $result = new CSSFunction($name, $arguments, ',', $parserState->currentLine());
         $parserState->consume(')');
 
         return $result;
@@ -86,15 +86,15 @@ private static function parseArguments(ParserState $parserState)
      */
     public function getName()
     {
-        return $this->sName;
+        return $this->name;
     }
 
     /**
-     * @param string $sName
+     * @param string $name
      */
-    public function setName($sName): void
+    public function setName($name): void
     {
-        $this->sName = $sName;
+        $this->name = $name;
     }
 
     /**
@@ -116,6 +116,6 @@ public function __toString(): string
     public function render(OutputFormat $outputFormat): string
     {
         $arguments = parent::render($outputFormat);
-        return "{$this->sName}({$arguments})";
+        return "{$this->name}({$arguments})";
     }
 }
diff --git a/src/Value/LineName.php b/src/Value/LineName.php
index 25a3605b..66b76378 100644
--- a/src/Value/LineName.php
+++ b/src/Value/LineName.php
@@ -30,23 +30,23 @@ public static function parse(ParserState $parserState): LineName
     {
         $parserState->consume('[');
         $parserState->consumeWhiteSpace();
-        $aNames = [];
+        $names = [];
         do {
             if ($parserState->getSettings()->usesLenientParsing()) {
                 try {
-                    $aNames[] = $parserState->parseIdentifier();
+                    $names[] = $parserState->parseIdentifier();
                 } catch (UnexpectedTokenException $e) {
                     if (!$parserState->comes(']')) {
                         throw $e;
                     }
                 }
             } else {
-                $aNames[] = $parserState->parseIdentifier();
+                $names[] = $parserState->parseIdentifier();
             }
             $parserState->consumeWhiteSpace();
         } while (!$parserState->comes(']'));
         $parserState->consume(']');
-        return new LineName($aNames, $parserState->currentLine());
+        return new LineName($names, $parserState->currentLine());
     }
 
     /**