Skip to content

[CLEANUP] Avoid Hungarian notation for name(s) #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

[CLEANUP] Avoid Hungarian notation for name(s) #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/OutputFormat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions src/Value/CSSFunction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

/**
Expand All @@ -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})";
}
}
8 changes: 4 additions & 4 deletions src/Value/LineName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand Down