Skip to content

Commit

Permalink
Highlighter::getTokenType(): refactor to lower complexity
Browse files Browse the repository at this point in the history
Rewrite the method to use predefined token lists.

Includes removing the PHPCS ruleset tweak put in place in an earlier commit.

Fixes 11
  • Loading branch information
jrfnl committed Dec 19, 2021
1 parent 0f73c93 commit 378d0b8
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 33 deletions.
4 changes: 0 additions & 4 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@

<rule ref="PHPParallelLint"/>

<rule ref="Generic.Metrics.CyclomaticComplexity.MaxExceeded">
<type>warning</type>
</rule>

<rule ref="Generic.Files.LineLength">
<exclude-pattern>*/tests/*</exclude-pattern>
</rule>
Expand Down
85 changes: 56 additions & 29 deletions src/Highlighter.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,50 @@ class Highlighter
self::LINE_NUMBER => 'dark_gray',
);

/** @var array */
private $phpTagTokens = array(
T_OPEN_TAG => T_OPEN_TAG,
T_OPEN_TAG_WITH_ECHO => T_OPEN_TAG_WITH_ECHO,
T_CLOSE_TAG => T_CLOSE_TAG,
);

/** @var array */
private $magicConstantTokens = array(
T_DIR => T_DIR,
T_FILE => T_FILE,
T_LINE => T_LINE,
T_CLASS_C => T_CLASS_C,
T_FUNC_C => T_FUNC_C,
T_METHOD_C => T_METHOD_C,
T_NS_C => T_NS_C,
T_TRAIT_C => T_TRAIT_C,
);

/** @var array */
private $miscTokens = array(
T_STRING => T_STRING, // Labels.
T_VARIABLE => T_VARIABLE,
T_DNUMBER => T_DNUMBER, // Floats.
T_LNUMBER => T_LNUMBER, // Integers.
);

/** @var array */
private $commentTokens = array(
T_COMMENT => T_COMMENT,
T_DOC_COMMENT => T_DOC_COMMENT,
);

/** @var array */
private $textStringTokens = array(
T_ENCAPSED_AND_WHITESPACE => T_ENCAPSED_AND_WHITESPACE,
T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING,
);

/** @var array */
private $htmlTokens = array(
T_INLINE_HTML => T_INLINE_HTML,
);

/**
* @param ConsoleColor $color
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
Expand Down Expand Up @@ -152,48 +196,31 @@ private function tokenize($source)
*/
private function getTokenType($arrayToken)
{
switch ($arrayToken[0]) {
case T_OPEN_TAG:
case T_OPEN_TAG_WITH_ECHO:
case T_CLOSE_TAG:
case T_STRING:
case T_VARIABLE:
// Constants
case T_DIR:
case T_FILE:
case T_METHOD_C:
case T_DNUMBER:
case T_LNUMBER:
case T_NS_C:
case T_LINE:
case T_CLASS_C:
case T_FUNC_C:
case T_TRAIT_C:
switch (true) {
case isset($this->phpTagTokens[$arrayToken[0]]):
case isset($this->magicConstantTokens[$arrayToken[0]]):
case isset($this->miscTokens[$arrayToken[0]]):
return self::TOKEN_DEFAULT;

case T_COMMENT:
case T_DOC_COMMENT:
case isset($this->commentTokens[$arrayToken[0]]):
return self::TOKEN_COMMENT;

case T_ENCAPSED_AND_WHITESPACE:
case T_CONSTANT_ENCAPSED_STRING:
case isset($this->textStringTokens[$arrayToken[0]]):
return self::TOKEN_STRING;

case T_INLINE_HTML:
case isset($this->htmlTokens[$arrayToken[0]]):
return self::TOKEN_HTML;
}

// phpcs:disable PHPCompatibility.Constants.NewConstants -- The new token constants are only used when defined.

// Handle PHP >= 8.0 namespaced name tokens.
// https://www.php.net/manual/en/migration80.incompatible.php#migration80.incompatible.tokenizer
if (defined('T_NAME_QUALIFIED') && $arrayToken[0] === T_NAME_QUALIFIED) {
return self::TOKEN_DEFAULT;
}
if (defined('T_NAME_FULLY_QUALIFIED') && $arrayToken[0] === T_NAME_FULLY_QUALIFIED) {
return self::TOKEN_DEFAULT;
}
if (defined('T_NAME_RELATIVE') && $arrayToken[0] === T_NAME_RELATIVE) {
if (
(defined('T_NAME_QUALIFIED') && $arrayToken[0] === T_NAME_QUALIFIED)
|| (defined('T_NAME_FULLY_QUALIFIED') && $arrayToken[0] === T_NAME_FULLY_QUALIFIED)
|| (defined('T_NAME_RELATIVE') && $arrayToken[0] === T_NAME_RELATIVE)
) {
return self::TOKEN_DEFAULT;
}

Expand Down

0 comments on commit 378d0b8

Please sign in to comment.