Skip to content

Commit 1acd24d

Browse files
authored
[CLEANUP] Avoid Hungarian notation for parserSettings (#938)
Part of #756
1 parent 3e9bc30 commit 1acd24d

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/Parser.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class Parser
2222
* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
2323
* @param int<0, max> $lineNumber the line number (starting from 1, not from 0)
2424
*/
25-
public function __construct($sText, ?Settings $oParserSettings = null, $lineNumber = 1)
25+
public function __construct($sText, ?Settings $parserSettings = null, $lineNumber = 1)
2626
{
27-
if ($oParserSettings === null) {
28-
$oParserSettings = Settings::create();
27+
if ($parserSettings === null) {
28+
$parserSettings = Settings::create();
2929
}
30-
$this->parserState = new ParserState($sText, $oParserSettings, $lineNumber);
30+
$this->parserState = new ParserState($sText, $parserSettings, $lineNumber);
3131
}
3232

3333
/**

src/Parsing/ParserState.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ParserState
2222
/**
2323
* @var Settings
2424
*/
25-
private $oParserSettings;
25+
private $parserSettings;
2626

2727
/**
2828
* @var string
@@ -60,12 +60,12 @@ class ParserState
6060
* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
6161
* @param int<0, max> $lineNumber
6262
*/
63-
public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)
63+
public function __construct($sText, Settings $parserSettings, $lineNumber = 1)
6464
{
65-
$this->oParserSettings = $oParserSettings;
65+
$this->parserSettings = $parserSettings;
6666
$this->sText = $sText;
6767
$this->lineNumber = $lineNumber;
68-
$this->setCharset($this->oParserSettings->sDefaultCharset);
68+
$this->setCharset($this->parserSettings->sDefaultCharset);
6969
}
7070

7171
/**
@@ -113,7 +113,7 @@ public function currentColumn()
113113
*/
114114
public function getSettings()
115115
{
116-
return $this->oParserSettings;
116+
return $this->parserSettings;
117117
}
118118

119119
public function anchor(): Anchor
@@ -175,7 +175,7 @@ public function parseCharacter($bIsForIdentifier)
175175
{
176176
if ($this->peek() === '\\') {
177177
if (
178-
$bIsForIdentifier && $this->oParserSettings->bLenientParsing
178+
$bIsForIdentifier && $this->parserSettings->bLenientParsing
179179
&& ($this->comes('\\0') || $this->comes('\\9'))
180180
) {
181181
// Non-strings can contain \0 or \9 which is an IE hack supported in lenient parsing.
@@ -239,7 +239,7 @@ public function consumeWhiteSpace(): array
239239
while (\preg_match('/\\s/isSu', $this->peek()) === 1) {
240240
$this->consume(1);
241241
}
242-
if ($this->oParserSettings->bLenientParsing) {
242+
if ($this->parserSettings->bLenientParsing) {
243243
try {
244244
$oComment = $this->consumeComment();
245245
} catch (UnexpectedEOFException $e) {
@@ -440,7 +440,7 @@ public function backtrack($iAmount): void
440440
*/
441441
public function strlen($sString): int
442442
{
443-
if ($this->oParserSettings->bMultibyteSupport) {
443+
if ($this->parserSettings->bMultibyteSupport) {
444444
return \mb_strlen($sString, $this->sCharset);
445445
} else {
446446
return \strlen($sString);
@@ -473,7 +473,7 @@ private function substr($iStart, $iLength): string
473473
*/
474474
private function strtolower($sString): string
475475
{
476-
if ($this->oParserSettings->bMultibyteSupport) {
476+
if ($this->parserSettings->bMultibyteSupport) {
477477
return \mb_strtolower($sString, $this->sCharset);
478478
} else {
479479
return \strtolower($sString);
@@ -487,7 +487,7 @@ private function strtolower($sString): string
487487
*/
488488
private function strsplit($sString)
489489
{
490-
if ($this->oParserSettings->bMultibyteSupport) {
490+
if ($this->parserSettings->bMultibyteSupport) {
491491
if ($this->streql($this->sCharset, 'utf-8')) {
492492
return \preg_split('//u', $sString, -1, PREG_SPLIT_NO_EMPTY);
493493
} else {
@@ -516,7 +516,7 @@ private function strsplit($sString)
516516
*/
517517
private function strpos($sString, $sNeedle, $iOffset)
518518
{
519-
if ($this->oParserSettings->bMultibyteSupport) {
519+
if ($this->parserSettings->bMultibyteSupport) {
520520
return \mb_strpos($sString, $sNeedle, $iOffset, $this->sCharset);
521521
} else {
522522
return \strpos($sString, $sNeedle, $iOffset);

0 commit comments

Comments
 (0)