Skip to content

[CLEANUP] Improve some variable names in RuleSet #1039

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 1 commit into from
Mar 3, 2025
Merged

[CLEANUP] Improve some variable names in RuleSet #1039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 19 additions & 17 deletions src/RuleSet/RuleSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ public function getLineNo(): int

public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
{
$sRule = $ruleToAdd->getRule();
if (!isset($this->rules[$sRule])) {
$this->rules[$sRule] = [];
$propertyName = $ruleToAdd->getRule();
if (!isset($this->rules[$propertyName])) {
$this->rules[$propertyName] = [];
}

$position = \count($this->rules[$sRule]);
$position = \count($this->rules[$propertyName]);

if ($sibling !== null) {
$iSiblingPos = \array_search($sibling, $this->rules[$sRule], true);
$iSiblingPos = \array_search($sibling, $this->rules[$propertyName], true);
if ($iSiblingPos !== false) {
$position = $iSiblingPos;
$ruleToAdd->setPosition($sibling->getLineNo(), $sibling->getColNo() - 1);
Expand All @@ -127,7 +127,7 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
}
}

\array_splice($this->rules[$sRule], $position, 0, [$ruleToAdd]);
\array_splice($this->rules[$propertyName], $position, 0, [$ruleToAdd]);
}

/**
Expand All @@ -153,14 +153,15 @@ public function getRules($searchPattern = null)
}
/** @var array<int, Rule> $result */
$result = [];
foreach ($this->rules as $sName => $rules) {
foreach ($this->rules as $propertyName => $rules) {
// Either no search rule is given or the search rule matches the found rule exactly
// or the search rule ends in “-” and the found rule starts with the search rule.
if (
!$searchPattern || $sName === $searchPattern
!$searchPattern || $propertyName === $searchPattern
|| (
\strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
&& (\strpos($sName, $searchPattern) === 0 || $sName === \substr($searchPattern, 0, -1))
&& (\strpos($propertyName, $searchPattern) === 0
|| $propertyName === \substr($searchPattern, 0, -1))
)
) {
$result = \array_merge($result, $rules);
Expand Down Expand Up @@ -230,26 +231,27 @@ public function getRulesAssoc($searchPattern = null)
public function removeRule($searchPattern): void
{
if ($searchPattern instanceof Rule) {
$sRule = $searchPattern->getRule();
if (!isset($this->rules[$sRule])) {
$propertyName = $searchPattern->getRule();
if (!isset($this->rules[$propertyName])) {
return;
}
foreach ($this->rules[$sRule] as $key => $rule) {
foreach ($this->rules[$propertyName] as $key => $rule) {
if ($rule === $searchPattern) {
unset($this->rules[$sRule][$key]);
unset($this->rules[$propertyName][$key]);
}
}
} else {
foreach ($this->rules as $sName => $rules) {
foreach ($this->rules as $propertyName => $rules) {
// Either no search rule is given or the search rule matches the found rule exactly
// or the search rule ends in “-” and the found rule starts with the search rule or equals it
// (without the trailing dash).
if (
!$searchPattern || $sName === $searchPattern
!$searchPattern || $propertyName === $searchPattern
|| (\strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
&& (\strpos($sName, $searchPattern) === 0 || $sName === \substr($searchPattern, 0, -1)))
&& (\strpos($propertyName, $searchPattern) === 0
|| $propertyName === \substr($searchPattern, 0, -1)))
) {
unset($this->rules[$sName]);
unset($this->rules[$propertyName]);
}
}
}
Expand Down