From 8cd39f4a755ac34d2b0227d4910e67bc5a15eae8 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sun, 26 Jan 2025 18:06:44 +0100 Subject: [PATCH] [TASK] Avoid Hungarian notation in `CSSBlockList` (#817) Part of #756. --- src/CSSList/CSSBlockList.php | 78 ++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/CSSList/CSSBlockList.php b/src/CSSList/CSSBlockList.php index 1be8fe3a..137faff8 100644 --- a/src/CSSList/CSSBlockList.php +++ b/src/CSSList/CSSBlockList.php @@ -21,91 +21,91 @@ abstract class CSSBlockList extends CSSList { /** - * @param int $iLineNo + * @param int $lineNumber */ - public function __construct($iLineNo = 0) + public function __construct($lineNumber = 0) { - parent::__construct($iLineNo); + parent::__construct($lineNumber); } /** - * @param array $aResult + * @param array $result */ - protected function allDeclarationBlocks(array &$aResult): void + protected function allDeclarationBlocks(array &$result): void { foreach ($this->aContents as $mContent) { if ($mContent instanceof DeclarationBlock) { - $aResult[] = $mContent; + $result[] = $mContent; } elseif ($mContent instanceof CSSBlockList) { - $mContent->allDeclarationBlocks($aResult); + $mContent->allDeclarationBlocks($result); } } } /** - * @param array $aResult + * @param array $result */ - protected function allRuleSets(array &$aResult): void + protected function allRuleSets(array &$result): void { foreach ($this->aContents as $mContent) { if ($mContent instanceof RuleSet) { - $aResult[] = $mContent; + $result[] = $mContent; } elseif ($mContent instanceof CSSBlockList) { - $mContent->allRuleSets($aResult); + $mContent->allRuleSets($result); } } } /** - * @param CSSList|Rule|RuleSet|Value $oElement - * @param array $aResult - * @param string|null $sSearchString - * @param bool $bSearchInFunctionArguments + * @param CSSList|Rule|RuleSet|Value $element + * @param array $result + * @param string|null $searchString + * @param bool $searchInFunctionArguments */ protected function allValues( - $oElement, - array &$aResult, - $sSearchString = null, - $bSearchInFunctionArguments = false + $element, + array &$result, + $searchString = null, + $searchInFunctionArguments = false ): void { - if ($oElement instanceof CSSBlockList) { - foreach ($oElement->getContents() as $oContent) { - $this->allValues($oContent, $aResult, $sSearchString, $bSearchInFunctionArguments); + if ($element instanceof CSSBlockList) { + foreach ($element->getContents() as $oContent) { + $this->allValues($oContent, $result, $searchString, $searchInFunctionArguments); } - } elseif ($oElement instanceof RuleSet) { - foreach ($oElement->getRules($sSearchString) as $oRule) { - $this->allValues($oRule, $aResult, $sSearchString, $bSearchInFunctionArguments); + } elseif ($element instanceof RuleSet) { + foreach ($element->getRules($searchString) as $oRule) { + $this->allValues($oRule, $result, $searchString, $searchInFunctionArguments); } - } elseif ($oElement instanceof Rule) { - $this->allValues($oElement->getValue(), $aResult, $sSearchString, $bSearchInFunctionArguments); - } elseif ($oElement instanceof ValueList) { - if ($bSearchInFunctionArguments || !($oElement instanceof CSSFunction)) { - foreach ($oElement->getListComponents() as $mComponent) { - $this->allValues($mComponent, $aResult, $sSearchString, $bSearchInFunctionArguments); + } elseif ($element instanceof Rule) { + $this->allValues($element->getValue(), $result, $searchString, $searchInFunctionArguments); + } elseif ($element instanceof ValueList) { + if ($searchInFunctionArguments || !($element instanceof CSSFunction)) { + foreach ($element->getListComponents() as $mComponent) { + $this->allValues($mComponent, $result, $searchString, $searchInFunctionArguments); } } } else { // Non-List `Value` or `CSSString` (CSS identifier) - $aResult[] = $oElement; + $result[] = $element; } } /** - * @param array $aResult - * @param string|null $sSpecificitySearch + * @param array $result + * @param string|null $specificitySearch */ - protected function allSelectors(array &$aResult, $sSpecificitySearch = null): void + protected function allSelectors(array &$result, $specificitySearch = null): void { /** @var array $aDeclarationBlocks */ $aDeclarationBlocks = []; $this->allDeclarationBlocks($aDeclarationBlocks); foreach ($aDeclarationBlocks as $oBlock) { foreach ($oBlock->getSelectors() as $oSelector) { - if ($sSpecificitySearch === null) { - $aResult[] = $oSelector; + if ($specificitySearch === null) { + $result[] = $oSelector; } else { $sComparator = '==='; - $aSpecificitySearch = \explode(' ', $sSpecificitySearch); + $aSpecificitySearch = \explode(' ', $specificitySearch); $iTargetSpecificity = $aSpecificitySearch[0]; if (\count($aSpecificitySearch) > 1) { $sComparator = $aSpecificitySearch[0]; @@ -132,7 +132,7 @@ protected function allSelectors(array &$aResult, $sSpecificitySearch = null): vo break; } if ($bMatches) { - $aResult[] = $oSelector; + $result[] = $oSelector; } } }