Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Please also have a look at our
- Use more native type declarations and strict mode
(#641, #772, #774, #778, #804, #841, #873, #875, #891, #922, #923, #933, #958,
#964, #967, #1000, #1044, #1134, #1136, #1137, #1139, #1140, #1141, #1145,
#1162, #1163, #1166, #1172, #1174, #1178, #1179, #1181, #1184)
#1162, #1163, #1166, #1172, #1174, #1178, #1179, #1181, #1183, #1184)
- Add visibility to all class/interface constants (#469)

### Deprecated
Expand Down
6 changes: 0 additions & 6 deletions config/phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ parameters:
count: 1
path: ../src/CSSList/AtRuleBlockList.php

-
message: '#^Parameter &\$result by\-ref type of method Sabberworm\\CSS\\CSSList\\CSSBlockList\:\:allValues\(\) expects array\<int, Sabberworm\\CSS\\Value\\Value\>, array\<int, Sabberworm\\CSS\\CSSList\\CSSList\|Sabberworm\\CSS\\Value\\Value\> given\.$#'
identifier: parameterByRef.type
count: 1
path: ../src/CSSList/CSSBlockList.php

-
message: '#^Loose comparison via "\!\=" is not allowed\.$#'
identifier: notEqual.notAllowed
Expand Down
19 changes: 7 additions & 12 deletions src/CSSList/CSSBlockList.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getAllDeclarationBlocks(): array
}

/**
* @param array<int, DeclarationBlock> $result
* @param list<DeclarationBlock> $result
*/
protected function allDeclarationBlocks(array &$result): void
{
Expand Down Expand Up @@ -76,15 +76,13 @@ public function getAllRuleSets(): array

/**
* @param CSSList|Rule|RuleSet|Value $element
* @param array<int, Value> $result
* @param string|null $searchString
* @param bool $searchInFunctionArguments
* @param list<Value> $result
*/
protected function allValues(
$element,
array &$result,
$searchString = null,
$searchInFunctionArguments = false
?string $searchString = null,
bool $searchInFunctionArguments = false
): void {
if ($element instanceof CSSBlockList) {
foreach ($element->getContents() as $content) {
Expand All @@ -102,19 +100,16 @@ protected function allValues(
$this->allValues($component, $result, $searchString, $searchInFunctionArguments);
}
}
} else {
// Non-List `Value` or `CSSString` (CSS identifier)
} elseif ($element instanceof Value) {
$result[] = $element;
}
}

/**
* @param array<int, Selector> $result
* @param string|null $specificitySearch
* @param list<Selector> $result
*/
protected function allSelectors(array &$result, $specificitySearch = null): void
protected function allSelectors(array &$result, ?string $specificitySearch = null): void
{
/** @var array<int, DeclarationBlock> $declarationBlocks */
$declarationBlocks = [];
$this->allDeclarationBlocks($declarationBlocks);
foreach ($declarationBlocks as $declarationBlock) {
Expand Down