Skip to content

[CLEANUP] Avoid Hungarian notation for selector #986

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
Feb 25, 2025
Merged

[CLEANUP] Avoid Hungarian notation for selector #986

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
28 changes: 14 additions & 14 deletions src/Property/Selector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,30 @@ class Selector
/**
* @var string
*/
private $sSelector;
private $selector;

/**
* @var int|null
*/
private $iSpecificity;

/**
* @param string $sSelector
* @param string $selector
*
* @return bool
*/
public static function isValid($sSelector)
public static function isValid($selector)
{
return \preg_match(static::SELECTOR_VALIDATION_RX, $sSelector);
return \preg_match(static::SELECTOR_VALIDATION_RX, $selector);
}

/**
* @param string $sSelector
* @param string $selector
* @param bool $bCalculateSpecificity
*/
public function __construct($sSelector, $bCalculateSpecificity = false)
public function __construct($selector, $bCalculateSpecificity = false)
{
$this->setSelector($sSelector);
$this->setSelector($selector);
if ($bCalculateSpecificity) {
$this->getSpecificity();
}
Expand All @@ -101,15 +101,15 @@ public function __construct($sSelector, $bCalculateSpecificity = false)
*/
public function getSelector()
{
return $this->sSelector;
return $this->selector;
}

/**
* @param string $sSelector
* @param string $selector
*/
public function setSelector($sSelector): void
public function setSelector($selector): void
{
$this->sSelector = \trim($sSelector);
$this->selector = \trim($selector);
$this->iSpecificity = null;
}

Expand All @@ -127,9 +127,9 @@ public function getSpecificity()
$a = 0;
/// @todo should exclude \# as well as "#"
$aMatches = null;
$b = \substr_count($this->sSelector, '#');
$c = \preg_match_all(self::NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX, $this->sSelector, $aMatches);
$d = \preg_match_all(self::ELEMENTS_AND_PSEUDO_ELEMENTS_RX, $this->sSelector, $aMatches);
$b = \substr_count($this->selector, '#');
$c = \preg_match_all(self::NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX, $this->selector, $aMatches);
$d = \preg_match_all(self::ELEMENTS_AND_PSEUDO_ELEMENTS_RX, $this->selector, $aMatches);
$this->iSpecificity = ($a * 1000) + ($b * 100) + ($c * 10) + $d;
}
return $this->iSpecificity;
Expand Down