Cleanup

Author: nicoSWD

src/Compiler/StandardCompiler.php

@@ -28,6 +28,7 @@ class StandardCompiler implements CompilerInterface
     private int $openParenthesis = 0;
     private int $closedParenthesis = 0;
 
+    /** @throws ParserException */
     public function getCompiledRule(): string
     {
         if ($this->isIncompleteCondition()) {

src/Grammar/Grammar.php

@@ -9,7 +9,7 @@
 
 abstract class Grammar
 {
-    /** @return array<int, array<int, mixed>> */
+    /** @return array<int, <mixed>> */
     abstract public function getDefinition(): array;
 
     /** @return array<string, string> */

src/Grammar/JavaScript/Methods/Replace.php

@@ -45,7 +45,7 @@ public function call(?BaseToken ...$parameters): BaseToken
 
     private function doRegexReplace(string $search, string $replace): string
     {
-        list($expression, $modifiers) = $this->splitRegex($search);
+        [$expression, $modifiers] = $this->splitRegex($search);
 
         $modifiers = str_replace('g', '', $modifiers, $count);
         $limit = $count > 0 ? -1 : 1;

src/Highlighter/Highlighter.php

@@ -15,19 +15,19 @@ final class Highlighter
 {
     /** @var string[] */
     private array $styles = [
-        TokenType::COMMENT        => 'color: #948a8a; font-style: italic;',
-        TokenType::LOGICAL        => 'color: #c72d2d;',
-        TokenType::OPERATOR       => 'color: #000;',
-        TokenType::PARENTHESIS    => 'color: #000;',
-        TokenType::SPACE          => '',
-        TokenType::UNKNOWN        => '',
-        TokenType::VALUE          => 'color: #e36700; font-style: italic;',
-        TokenType::VARIABLE       => 'color: #007694; font-weight: 900;',
-        TokenType::METHOD         => 'color: #000',
+        TokenType::COMMENT => 'color: #948a8a; font-style: italic;',
+        TokenType::LOGICAL => 'color: #c72d2d;',
+        TokenType::OPERATOR => 'color: #000;',
+        TokenType::PARENTHESIS => 'color: #000;',
+        TokenType::SPACE => '',
+        TokenType::UNKNOWN => '',
+        TokenType::VALUE => 'color: #e36700; font-style: italic;',
+        TokenType::VARIABLE => 'color: #007694; font-weight: 900;',
+        TokenType::METHOD => 'color: #000',
         TokenType::SQUARE_BRACKET => '',
-        TokenType::COMMA          => '',
-        TokenType::FUNCTION       => '',
-        TokenType::INT_VALUE      => '',
+        TokenType::COMMA => '',
+        TokenType::FUNCTION => '',
+        TokenType::INT_VALUE => '',
     ];
 
     public function __construct(private TokenizerInterface $tokenizer)

src/TokenStream/AST.php

@@ -19,24 +19,16 @@
 
 class AST
 {
-    private TokenizerInterface $tokenizer;
-    private TokenFactory $tokenFactory;
-    private TokenStreamFactory $tokenStreamFactory;
-    private CallableUserMethodFactoryInterface $userMethodFactory;
     private array $functions = [];
     private array $methods = [];
     private array $variables = [];
 
     public function __construct(
-        TokenizerInterface $tokenizer,
-        TokenFactory $tokenFactory,
-        TokenStreamFactory $tokenStreamFactory,
-        CallableUserMethodFactoryInterface $userMethodFactory
+        private TokenizerInterface $tokenizer,
+        private TokenFactory $tokenFactory,
+        private TokenStreamFactory $tokenStreamFactory,
+        private CallableUserMethodFactoryInterface $userMethodFactory
     ) {
-        $this->tokenizer = $tokenizer;
-        $this->tokenFactory = $tokenFactory;
-        $this->tokenStreamFactory = $tokenStreamFactory;
-        $this->userMethodFactory = $userMethodFactory;
     }
 
     public function getStream(string $rule): TokenStream

src/TokenStream/CallableUserMethod.php

@@ -65,19 +65,17 @@ private function getCallable(BaseToken $token, string $methodName): Closure
     private function findCallableMethod(object $object, string $methodName): callable
     {
         $this->assertNonMagicMethod($methodName);
-
-        $callableMethod = [$object, $methodName];
         $index = 0;
 
         do {
             if (!isset($this->methodPrefixes[$index])) {
                 throw new Exception\UndefinedMethodException();
             }
 
-            $callableMethod[1] = $this->methodPrefixes[$index++] . $methodName;
-        } while (!is_callable($callableMethod));
+            $callableMethod = $this->methodPrefixes[$index++] . $methodName;
+        } while (!is_callable([$object, $callableMethod]));
 
-        return $callableMethod;
+        return [$object, $callableMethod];
     }
 
     private function getTokenValues(array $params): array

src/TokenStream/Token/TokenFactory.php

@@ -7,7 +7,6 @@
  */
 namespace nicoSWD\Rule\TokenStream\Token;
 
-use InvalidArgumentException;
 use nicoSWD\Rule\Parser\Exception\ParserException;
 use nicoSWD\Rule\TokenStream\TokenCollection;
 
@@ -28,6 +27,7 @@ public function createFromPHPType(mixed $value): BaseToken
         };
     }
 
+    /** @throws ParserException */
     public function createFromTokenName(string $tokenName): string
     {
         return match ($tokenName) {