[CLEANUP] Avoid Hungarian notation in Settings (#1008)

We'll change the direct accesses to use the accessors in a later chance. Part of #756
MyIntervals · Feb 27, 2025 · 215c199 · 215c199
1 parent f661c96
commit 215c199
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/src/CSSList/CSSList.php b/src/CSSList/CSSList.php
@@ -74,7 +74,7 @@ public static function parseList(ParserState $parserState, CSSList $list): void
         if (\is_string($parserState)) {
             $parserState = new ParserState($parserState, Settings::create());
         }
-        $usesLenientParsing = $parserState->getSettings()->bLenientParsing;
+        $usesLenientParsing = $parserState->getSettings()->lenientParsing;
         $comments = [];
         while (!$parserState->isEnd()) {
             $comments = \array_merge($comments, $parserState->consumeWhiteSpace());
@@ -138,7 +138,7 @@ private static function parseListItem(ParserState $parserState, CSSList $list)
             return $atRule;
         } elseif ($parserState->comes('}')) {
             if ($isRoot) {
-                if ($parserState->getSettings()->bLenientParsing) {
+                if ($parserState->getSettings()->lenientParsing) {
                     return DeclarationBlock::parse($parserState);
                 } else {
                     throw new SourceException('Unopened {', $parserState->currentLine());
@@ -215,7 +215,7 @@ private static function parseAtRule(ParserState $parserState)
             // Unknown other at rule (font-face or such)
             $arguments = \trim($parserState->consumeUntil('{', false, true));
             if (\substr_count($arguments, '(') != \substr_count($arguments, ')')) {
-                if ($parserState->getSettings()->bLenientParsing) {
+                if ($parserState->getSettings()->lenientParsing) {
                     return null;
                 } else {
                     throw new SourceException('Unmatched brace count in media query', $parserState->currentLine());

diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
@@ -58,7 +58,7 @@ public function __construct($text, Settings $parserSettings, $lineNumber = 1)
         $this->parserSettings = $parserSettings;
         $this->text = $text;
         $this->lineNumber = $lineNumber;
-        $this->setCharset($this->parserSettings->sDefaultCharset);
+        $this->setCharset($this->parserSettings->defaultCharset);
     }
 
     /**
@@ -151,7 +151,7 @@ public function parseCharacter($isForIdentifier)
     {
         if ($this->peek() === '\\') {
             if (
-                $isForIdentifier && $this->parserSettings->bLenientParsing
+                $isForIdentifier && $this->parserSettings->lenientParsing
                 && ($this->comes('\\0') || $this->comes('\\9'))
             ) {
                 // Non-strings can contain \0 or \9 which is an IE hack supported in lenient parsing.
@@ -215,7 +215,7 @@ public function consumeWhiteSpace(): array
             while (\preg_match('/\\s/isSu', $this->peek()) === 1) {
                 $this->consume(1);
             }
-            if ($this->parserSettings->bLenientParsing) {
+            if ($this->parserSettings->lenientParsing) {
                 try {
                     $comment = $this->consumeComment();
                 } catch (UnexpectedEOFException $e) {
@@ -416,7 +416,7 @@ public function backtrack($numberOfCharacters): void
      */
     public function strlen($string): int
     {
-        if ($this->parserSettings->bMultibyteSupport) {
+        if ($this->parserSettings->multibyteSupport) {
             return \mb_strlen($string, $this->charset);
         } else {
             return \strlen($string);
@@ -449,7 +449,7 @@ private function substr($offset, $length): string
      */
     private function strtolower($string): string
     {
-        if ($this->parserSettings->bMultibyteSupport) {
+        if ($this->parserSettings->multibyteSupport) {
             return \mb_strtolower($string, $this->charset);
         } else {
             return \strtolower($string);
@@ -465,7 +465,7 @@ private function strtolower($string): string
      */
     private function strsplit($string)
     {
-        if ($this->parserSettings->bMultibyteSupport) {
+        if ($this->parserSettings->multibyteSupport) {
             if ($this->streql($this->charset, 'utf-8')) {
                 $result = \preg_split('//u', $string, -1, PREG_SPLIT_NO_EMPTY);
                 if (!\is_array($result)) {
@@ -498,7 +498,7 @@ private function strsplit($string)
      */
     private function strpos($haystack, $needle, $offset)
     {
-        if ($this->parserSettings->bMultibyteSupport) {
+        if ($this->parserSettings->multibyteSupport) {
             return \mb_strpos($haystack, $needle, $offset, $this->charset);
         } else {
             return \strpos($haystack, $needle, $offset);

diff --git a/src/Rule/Rule.php b/src/Rule/Rule.php
@@ -91,7 +91,7 @@ public static function parse(ParserState $parserState): Rule
         $parserState->consume(':');
         $value = Value::parseValue($parserState, self::listDelimiterForRule($rule->getRule()));
         $rule->setValue($value);
-        if ($parserState->getSettings()->bLenientParsing) {
+        if ($parserState->getSettings()->lenientParsing) {
             while ($parserState->comes('\\')) {
                 $parserState->consume('\\');
                 $rule->addIeHack($parserState->consume());

diff --git a/src/RuleSet/DeclarationBlock.php b/src/RuleSet/DeclarationBlock.php
@@ -61,7 +61,7 @@ public static function parse(ParserState $parserState, $list = null)
                 $parserState->consume(1);
             }
         } catch (UnexpectedTokenException $e) {
-            if ($parserState->getSettings()->bLenientParsing) {
+            if ($parserState->getSettings()->lenientParsing) {
                 if (!$parserState->comes('}')) {
                     $parserState->consumeUntil('}', false, true);
                 }

diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -64,7 +64,7 @@ public static function parseRuleSet(ParserState $parserState, RuleSet $ruleSet):
         }
         while (!$parserState->comes('}')) {
             $rule = null;
-            if ($parserState->getSettings()->bLenientParsing) {
+            if ($parserState->getSettings()->lenientParsing) {
                 try {
                     $rule = Rule::parse($parserState);
                 } catch (UnexpectedTokenException $e) {

diff --git a/src/Settings.php b/src/Settings.php
@@ -21,7 +21,7 @@ class Settings
      *
      * @internal since 8.8.0, will be made private in 9.0.0
      */
-    public $bMultibyteSupport;
+    public $multibyteSupport;
 
     /**
      * The default charset for the CSS if no `@charset` declaration is found. Defaults to utf-8.
@@ -30,7 +30,7 @@ class Settings
      *
      * @internal since 8.8.0, will be made private in 9.0.0
      */
-    public $sDefaultCharset = 'utf-8';
+    public $defaultCharset = 'utf-8';
 
     /**
      * Whether the parser silently ignore invalid rules instead of choking on them.
@@ -39,11 +39,11 @@ class Settings
      *
      * @internal since 8.8.0, will be made private in 9.0.0
      */
-    public $bLenientParsing = true;
+    public $lenientParsing = true;
 
     private function __construct()
     {
-        $this->bMultibyteSupport = \extension_loaded('mbstring');
+        $this->multibyteSupport = \extension_loaded('mbstring');
     }
 
     public static function create(): self
@@ -59,9 +59,9 @@ public static function create(): self
      *
      * @return $this fluent interface
      */
-    public function withMultibyteSupport(bool $bMultibyteSupport = true): self
+    public function withMultibyteSupport(bool $multibyteSupport = true): self
     {
-        $this->bMultibyteSupport = $bMultibyteSupport;
+        $this->multibyteSupport = $multibyteSupport;
         return $this;
     }
 
@@ -70,9 +70,9 @@ public function withMultibyteSupport(bool $bMultibyteSupport = true): self
      *
      * @return $this fluent interface
      */
-    public function withDefaultCharset(string $sDefaultCharset): self
+    public function withDefaultCharset(string $defaultCharset): self
     {
-        $this->sDefaultCharset = $sDefaultCharset;
+        $this->defaultCharset = $defaultCharset;
         return $this;
     }
 
@@ -83,7 +83,7 @@ public function withDefaultCharset(string $sDefaultCharset): self
      */
     public function withLenientParsing(bool $usesLenientParsing = true): self
     {
-        $this->bLenientParsing = $usesLenientParsing;
+        $this->lenientParsing = $usesLenientParsing;
         return $this;
     }
 

diff --git a/src/Value/LineName.php b/src/Value/LineName.php
@@ -32,7 +32,7 @@ public static function parse(ParserState $parserState): LineName
         $parserState->consumeWhiteSpace();
         $aNames = [];
         do {
-            if ($parserState->getSettings()->bLenientParsing) {
+            if ($parserState->getSettings()->lenientParsing) {
                 try {
                     $aNames[] = $parserState->parseIdentifier();
                 } catch (UnexpectedTokenException $e) {

diff --git a/src/Value/Value.php b/src/Value/Value.php
@@ -166,7 +166,7 @@ public static function parsePrimitiveValue(ParserState $parserState)
             $oValue = Color::parse($parserState);
         } elseif ($parserState->comes("'") || $parserState->comes('"')) {
             $oValue = CSSString::parse($parserState);
-        } elseif ($parserState->comes('progid:') && $parserState->getSettings()->bLenientParsing) {
+        } elseif ($parserState->comes('progid:') && $parserState->getSettings()->lenientParsing) {
             $oValue = self::parseMicrosoftFilter($parserState);
         } elseif ($parserState->comes('[')) {
             $oValue = LineName::parse($parserState);

diff --git a/tests/Unit/SettingsTest.php b/tests/Unit/SettingsTest.php
@@ -48,7 +48,7 @@ public function createReturnsANewInstanceForEachCall(): void
      */
     public function multibyteSupportByDefaultStateOfMbStringExtension(): void
     {
-        self::assertSame(\extension_loaded('mbstring'), $this->subject->bMultibyteSupport);
+        self::assertSame(\extension_loaded('mbstring'), $this->subject->multibyteSupport);
     }
 
     /**
@@ -78,15 +78,15 @@ public function withMultibyteSupportSetsMultibyteSupport(bool $value): void
     {
         $this->subject->withMultibyteSupport($value);
 
-        self::assertSame($value, $this->subject->bMultibyteSupport);
+        self::assertSame($value, $this->subject->multibyteSupport);
     }
 
     /**
      * @test
      */
     public function defaultCharsetByDefaultIsUtf8(): void
     {
-        self::assertSame('utf-8', $this->subject->sDefaultCharset);
+        self::assertSame('utf-8', $this->subject->defaultCharset);
     }
 
     /**
@@ -105,15 +105,15 @@ public function withDefaultCharsetSetsDefaultCharset(): void
         $charset = 'ISO-8859-1';
         $this->subject->withDefaultCharset($charset);
 
-        self::assertSame($charset, $this->subject->sDefaultCharset);
+        self::assertSame($charset, $this->subject->defaultCharset);
     }
 
     /**
      * @test
      */
     public function lenientParsingByDefaultIsTrue(): void
     {
-        self::assertTrue($this->subject->bLenientParsing);
+        self::assertTrue($this->subject->lenientParsing);
     }
 
     /**
@@ -132,7 +132,7 @@ public function withLenientParsingSetsLenientParsing(bool $value): void
     {
         $this->subject->withLenientParsing($value);
 
-        self::assertSame($value, $this->subject->bLenientParsing);
+        self::assertSame($value, $this->subject->lenientParsing);
     }
 
     /**
@@ -150,6 +150,6 @@ public function beStrictSetsLenientParsingToFalse(): void
     {
         $this->subject->beStrict();
 
-        self::assertFalse($this->subject->bLenientParsing);
+        self::assertFalse($this->subject->lenientParsing);
     }
 }