Skip to content

[CLEANUP] Tidy up DeclarationBlock::parse() #1294

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 7 commits into from
Jun 28, 2025
Merged

[CLEANUP] Tidy up DeclarationBlock::parse() #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a24115f
[CLEANUP] Tidy up `DeclarationBlock::parse()`
JakeQZ Jun 28, 2025
3fe6d13
Add comment about fallthrough in `switch`
JakeQZ Jun 28, 2025
4d53185
Use `is_string` rather than `isset`
JakeQZ Jun 28, 2025
d766711
Assign to `null` rather than use `unset()`
JakeQZ Jun 28, 2025
d4e79ef
Use `is_string` rather than `isset`
JakeQZ Jun 28, 2025
dfeba4a
Initialize `$stringWrapperCharacter`
JakeQZ Jun 28, 2025
5826c8b
Update PHPStan baseline with warning removed
JakeQZ Jun 28, 2025
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
6 changes: 0 additions & 6 deletions config/phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ parameters:
count: 1
path: ../src/Rule/Rule.php

-
message: '#^Loose comparison via "\!\=" is not allowed\.$#'
identifier: notEqual.notAllowed
count: 1
path: ../src/RuleSet/DeclarationBlock.php

-
message: '#^Parameters should have "string" types as the only types passed to this method$#'
identifier: typePerfect.narrowPublicClassMethodParamType
Expand Down
22 changes: 15 additions & 7 deletions src/RuleSet/DeclarationBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,25 @@ public static function parse(ParserState $parserState, ?CSSList $list = null): ?
$result = new DeclarationBlock($parserState->currentLine());
try {
$selectorParts = [];
$stringWrapperCharacter = null;
do {
$selectorParts[] = $parserState->consume(1)
. $parserState->consumeUntil(['{', '}', '\'', '"'], false, false, $comments);
if (\in_array($parserState->peek(), ['\'', '"'], true) && \substr(\end($selectorParts), -1) != '\\') {
if (!isset($stringWrapperCharacter)) {
$stringWrapperCharacter = $parserState->peek();
} elseif ($stringWrapperCharacter === $parserState->peek()) {
unset($stringWrapperCharacter);
}
$nextCharacter = $parserState->peek();
switch ($nextCharacter) {
case '\'':
// The fallthrough is intentional.
case '"':
if (!\is_string($stringWrapperCharacter)) {
$stringWrapperCharacter = $nextCharacter;
} elseif ($stringWrapperCharacter === $nextCharacter) {
if (\substr(\end($selectorParts), -1) !== '\\') {
$stringWrapperCharacter = null;
}
}
break;
}
} while (!\in_array($parserState->peek(), ['{', '}'], true) || isset($stringWrapperCharacter));
} while (!\in_array($nextCharacter, ['{', '}'], true) || \is_string($stringWrapperCharacter));
$result->setSelectors(\implode('', $selectorParts), $list);
if ($parserState->comes('{')) {
$parserState->consume(1);
Expand Down