Skip to content

[CLEANUP] Avoid Hungarian notation for sMediaQuery #860

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
Feb 1, 2025
Merged

[CLEANUP] Avoid Hungarian notation for sMediaQuery #860

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
10 changes: 5 additions & 5 deletions src/CSSList/CSSList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,15 @@ private static function parseAtRule(ParserState $parserState)
if ($sIdentifier === 'import') {
$oLocation = URL::parse($parserState);
$parserState->consumeWhiteSpace();
$sMediaQuery = null;
$mediaQuery = null;
if (!$parserState->comes(';')) {
$sMediaQuery = \trim($parserState->consumeUntil([';', ParserState::EOF]));
if ($sMediaQuery === '') {
$sMediaQuery = null;
$mediaQuery = \trim($parserState->consumeUntil([';', ParserState::EOF]));
if ($mediaQuery === '') {
$mediaQuery = null;
}
}
$parserState->consumeUntil([';', ParserState::EOF], true, true);
return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
return new Import($oLocation, $mediaQuery, $iIdentifierLineNum);
} elseif ($sIdentifier === 'charset') {
$oCharsetString = CSSString::parse($parserState);
$parserState->consumeWhiteSpace();
Expand Down
16 changes: 8 additions & 8 deletions src/Property/Import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Import implements AtRule
/**
* @var string
*/
private $sMediaQuery;
private $mediaQuery;

/**
* @var int
Expand All @@ -34,13 +34,13 @@ class Import implements AtRule
protected $comments;

/**
* @param string $sMediaQuery
* @param string $mediaQuery
* @param int $lineNumber
*/
public function __construct(URL $oLocation, $sMediaQuery, $lineNumber = 0)
public function __construct(URL $oLocation, $mediaQuery, $lineNumber = 0)
{
$this->oLocation = $oLocation;
$this->sMediaQuery = $sMediaQuery;
$this->mediaQuery = $mediaQuery;
$this->lineNumber = $lineNumber;
$this->comments = [];
}
Expand Down Expand Up @@ -77,7 +77,7 @@ public function __toString(): string
public function render(OutputFormat $oOutputFormat): string
{
return $oOutputFormat->comments($this) . '@import ' . $this->oLocation->render($oOutputFormat)
. ($this->sMediaQuery === null ? '' : ' ' . $this->sMediaQuery) . ';';
. ($this->mediaQuery === null ? '' : ' ' . $this->mediaQuery) . ';';
}

public function atRuleName(): string
Expand All @@ -91,8 +91,8 @@ public function atRuleName(): string
public function atRuleArgs(): array
{
$aResult = [$this->oLocation];
if ($this->sMediaQuery) {
\array_push($aResult, $this->sMediaQuery);
if ($this->mediaQuery) {
\array_push($aResult, $this->mediaQuery);
}
return $aResult;
}
Expand Down Expand Up @@ -126,6 +126,6 @@ public function setComments(array $comments): void
*/
public function getMediaQuery()
{
return $this->sMediaQuery;
return $this->mediaQuery;
}
}