Skip to content

Commit ba8ae35

Browse files
committed
Ruleset: decouple "supported tokenizers" deprecation from setting the value
1 parent d43248a commit ba8ae35

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

src/Ruleset.php

+19-18
Original file line numberDiff line numberDiff line change
@@ -1472,30 +1472,31 @@ public function populateTokenListeners()
14721472

14731473
$tokenizers = [];
14741474
$vars = get_class_vars($sniffClass);
1475-
if (empty($vars['supportedTokenizers']) === false) {
1476-
foreach ($vars['supportedTokenizers'] as $tokenizer) {
1477-
$tokenizers[$tokenizer] = $tokenizer;
1475+
if (empty($vars['supportedTokenizers']) === false
1476+
&& $isDeprecated === false
1477+
&& in_array('PHP', $vars['supportedTokenizers'], true) === false
1478+
) {
1479+
if (in_array('CSS', $vars['supportedTokenizers'], true) === true
1480+
|| in_array('JS', $vars['supportedTokenizers'], true) === true
1481+
) {
1482+
$message = 'Scanning CSS/JS files is deprecated and support will be removed in PHP_CodeSniffer 4.0.'.PHP_EOL;
1483+
} else {
1484+
// Just in case someone has an integration with a custom tokenizer.
1485+
$message = 'Support for custom tokenizers will be removed in PHP_CodeSniffer 4.0.'.PHP_EOL;
14781486
}
14791487

1480-
if ($isDeprecated === false
1481-
&& in_array('PHP', $vars['supportedTokenizers'], true) === false
1482-
) {
1483-
if (in_array('CSS', $vars['supportedTokenizers'], true) === true
1484-
|| in_array('JS', $vars['supportedTokenizers'], true) === true
1485-
) {
1486-
$message = 'Scanning CSS/JS files is deprecated and support will be removed in PHP_CodeSniffer 4.0.'.PHP_EOL;
1487-
} else {
1488-
// Just in case someone has an integration with a custom tokenizer.
1489-
$message = 'Support for custom tokenizers will be removed in PHP_CodeSniffer 4.0.'.PHP_EOL;
1490-
}
1488+
$message .= 'The %s sniff is listening for %s.';
1489+
$message = sprintf($message, $sniffCode, implode(', ', $vars['supportedTokenizers']));
1490+
$this->msgCache->add($message, MessageCollector::DEPRECATED);
1491+
}
14911492

1492-
$message .= 'The %s sniff is listening for %s.';
1493-
$message = sprintf($message, $sniffCode, implode(', ', $vars['supportedTokenizers']));
1494-
$this->msgCache->add($message, MessageCollector::DEPRECATED);
1493+
if (isset($vars['supportedTokenizers']) === true) {
1494+
foreach ($vars['supportedTokenizers'] as $tokenizer) {
1495+
$tokenizers[$tokenizer] = $tokenizer;
14951496
}
14961497
} else {
14971498
$tokenizers = ['PHP' => 'PHP'];
1498-
}//end if
1499+
}
14991500

15001501
$tokens = $this->sniffs[$sniffClass]->register();
15011502
if (is_array($tokens) === false) {

0 commit comments

Comments
 (0)