Skip to content

Commit db52ee1

Browse files
authored
[CLEANUP] Avoid Hungarian notation for name(s) (#1079)
Part of #756
1 parent e6f56ba commit db52ee1

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

src/OutputFormat.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ public function __construct() {}
185185
/**
186186
* @return string|int|bool|null
187187
*/
188-
public function get(string $sName)
188+
public function get(string $name)
189189
{
190190
$aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
191191
foreach ($aVarPrefixes as $prefix) {
192-
$sFieldName = $prefix . \ucfirst($sName);
192+
$sFieldName = $prefix . \ucfirst($name);
193193
if (isset($this->$sFieldName)) {
194194
return $this->$sFieldName;
195195
}
@@ -198,28 +198,28 @@ public function get(string $sName)
198198
}
199199

200200
/**
201-
* @param array<array-key, string>|string $aNames
201+
* @param array<array-key, string>|string $names
202202
* @param mixed $value
203203
*
204204
* @return self|false
205205
*/
206-
public function set($aNames, $value)
206+
public function set($names, $value)
207207
{
208208
$aVarPrefixes = ['a', 's', 'm', 'b', 'f', 'o', 'c', 'i'];
209-
if (\is_string($aNames) && \strpos($aNames, '*') !== false) {
210-
$aNames =
209+
if (\is_string($names) && \strpos($names, '*') !== false) {
210+
$names =
211211
[
212-
\str_replace('*', 'Before', $aNames),
213-
\str_replace('*', 'Between', $aNames),
214-
\str_replace('*', 'After', $aNames),
212+
\str_replace('*', 'Before', $names),
213+
\str_replace('*', 'Between', $names),
214+
\str_replace('*', 'After', $names),
215215
];
216-
} elseif (!\is_array($aNames)) {
217-
$aNames = [$aNames];
216+
} elseif (!\is_array($names)) {
217+
$names = [$names];
218218
}
219219
foreach ($aVarPrefixes as $prefix) {
220220
$bDidReplace = false;
221-
foreach ($aNames as $sName) {
222-
$sFieldName = $prefix . \ucfirst($sName);
221+
foreach ($names as $name) {
222+
$sFieldName = $prefix . \ucfirst($name);
223223
if (isset($this->$sFieldName)) {
224224
$this->$sFieldName = $value;
225225
$bDidReplace = true;

src/Value/CSSFunction.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ class CSSFunction extends ValueList
2121
*
2222
* @internal since 8.8.0
2323
*/
24-
protected $sName;
24+
protected $name;
2525

2626
/**
27-
* @param string $sName
27+
* @param string $name
2828
* @param RuleValueList|array<array-key, Value|string> $arguments
2929
* @param string $separator
3030
* @param int<0, max> $lineNumber
3131
*/
32-
public function __construct($sName, $arguments, $separator = ',', $lineNumber = 0)
32+
public function __construct($name, $arguments, $separator = ',', $lineNumber = 0)
3333
{
3434
if ($arguments instanceof RuleValueList) {
3535
$separator = $arguments->getListSeparator();
3636
$arguments = $arguments->getListComponents();
3737
}
38-
$this->sName = $sName;
38+
$this->name = $name;
3939
$this->lineNumber = $lineNumber;
4040
parent::__construct($arguments, $separator, $lineNumber);
4141
}
@@ -49,11 +49,11 @@ public function __construct($sName, $arguments, $separator = ',', $lineNumber =
4949
*/
5050
public static function parse(ParserState $parserState, bool $ignoreCase = false): CSSFunction
5151
{
52-
$sName = self::parseName($parserState, $ignoreCase);
52+
$name = self::parseName($parserState, $ignoreCase);
5353
$parserState->consume('(');
5454
$arguments = self::parseArguments($parserState);
5555

56-
$result = new CSSFunction($sName, $arguments, ',', $parserState->currentLine());
56+
$result = new CSSFunction($name, $arguments, ',', $parserState->currentLine());
5757
$parserState->consume(')');
5858

5959
return $result;
@@ -86,15 +86,15 @@ private static function parseArguments(ParserState $parserState)
8686
*/
8787
public function getName()
8888
{
89-
return $this->sName;
89+
return $this->name;
9090
}
9191

9292
/**
93-
* @param string $sName
93+
* @param string $name
9494
*/
95-
public function setName($sName): void
95+
public function setName($name): void
9696
{
97-
$this->sName = $sName;
97+
$this->name = $name;
9898
}
9999

100100
/**
@@ -116,6 +116,6 @@ public function __toString(): string
116116
public function render(OutputFormat $outputFormat): string
117117
{
118118
$arguments = parent::render($outputFormat);
119-
return "{$this->sName}({$arguments})";
119+
return "{$this->name}({$arguments})";
120120
}
121121
}

src/Value/LineName.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ public static function parse(ParserState $parserState): LineName
3030
{
3131
$parserState->consume('[');
3232
$parserState->consumeWhiteSpace();
33-
$aNames = [];
33+
$names = [];
3434
do {
3535
if ($parserState->getSettings()->usesLenientParsing()) {
3636
try {
37-
$aNames[] = $parserState->parseIdentifier();
37+
$names[] = $parserState->parseIdentifier();
3838
} catch (UnexpectedTokenException $e) {
3939
if (!$parserState->comes(']')) {
4040
throw $e;
4141
}
4242
}
4343
} else {
44-
$aNames[] = $parserState->parseIdentifier();
44+
$names[] = $parserState->parseIdentifier();
4545
}
4646
$parserState->consumeWhiteSpace();
4747
} while (!$parserState->comes(']'));
4848
$parserState->consume(']');
49-
return new LineName($aNames, $parserState->currentLine());
49+
return new LineName($names, $parserState->currentLine());
5050
}
5151

5252
/**

0 commit comments

Comments
 (0)