Fix issues reported by phpstan

kadet1090 · Jan 16, 2024 · 18d39a0 · 18d39a0
1 parent 4a145ef
commit 18d39a0
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/Language/GreedyLanguage.php b/Language/GreedyLanguage.php
@@ -135,7 +135,7 @@ private function _tokens($source, $offset = 0, $additional = [], $embedded = fal
     {
         $result = new UnprocessedTokens();
 
-        /** @var Language $language */
+        /** @var Rule $rule */
         foreach ($this->_rules($embedded) as $rule) {
             foreach ($rule->match($source) as $token) {
                 $result->add($token, $offset);
@@ -174,7 +174,7 @@ private function _rules($embedded = false)
      *
      * @param $embedded
      *
-     * @return Rule|Rule[]
+     * @return Rule|Rule[]|array<string, array<int, Rule>>
      */
     public function getEnds($embedded = false)
     {

diff --git a/Language/Php.php b/Language/Php.php
@@ -134,8 +134,7 @@ function (
                             $match,
                             TokenFactoryInterface $factory
                         ) use (
-                            $annotationNameRule,
-                            $allowedInAttributes
+                            $annotationNameRule
                         ) {
                             yield $factory->create(
                                 Token::NAME,

diff --git a/Matcher/RegexMatcher.php b/Matcher/RegexMatcher.php
@@ -28,8 +28,8 @@ class RegexMatcher implements MatcherInterface
     /**
      * RegexMatcher constructor.
      *
-     * @param            $regex
-     * @param array|null $groups
+     * @param       $regex
+     * @param array $groups
      */
     public function __construct($regex, array $groups = [1 => null])
     {

diff --git a/Matcher/WordMatcher.php b/Matcher/WordMatcher.php
@@ -67,12 +67,12 @@ public function __construct(array $words, array $options = [])
 
     public function merge(array $words)
     {
-        return new static(array_merge($this->words, $words), $this->options);
+        return new self(array_merge($this->words, $words), $this->options);
     }
 
     public function subtract(array $words)
     {
-        return new static(array_diff($this->words, $words), $this->options);
+        return new self(array_diff($this->words, $words), $this->options);
     }
 
     public function getWords()

diff --git a/Parser/DelegateTokenFactory.php b/Parser/DelegateTokenFactory.php
@@ -28,8 +28,8 @@ class DelegateTokenFactory implements TokenFactoryInterface
     /**
      * DelegateTokenFactory constructor.
      *
-     * @param callable (TokenFactoryInterface $factory, array $params) $function
-     * @param TokenFactoryInterface|null                               $factory
+     * @param callable (TokenFactoryInterface, array $params): Token $function
+     * @param TokenFactoryInterface|null                             $factory
      */
     public function __construct(callable $function, TokenFactoryInterface $factory = null)
     {

diff --git a/Parser/OpenRule.php b/Parser/OpenRule.php
@@ -25,7 +25,7 @@ class OpenRule extends Rule
     /**
      * @param $source
      *
-     * @return Token[]
+     * @return Token[]|iterable<Token>
      */
     public function match($source)
     {

diff --git a/Parser/Rule.php b/Parser/Rule.php
@@ -29,7 +29,7 @@
  *
  * @package Kadet\Highlighter\Parser
  *
- * @property Language              $language
+ * @property Language|false|null   $language
  * @property Language              $inject
  * @property integer               $priority
  * @property string                $type
@@ -40,7 +40,7 @@
 class Rule
 {
     /**
-     * @var Validator
+     * @var Validator|false
      */
     public $validator = false;
     private $_matcher;
@@ -106,7 +106,7 @@ public function setMatcher(MatcherInterface $matcher)
     /**
      * @param $source
      *
-     * @return Token[]|\Iterator
+     * @return iterable<Token>|\Iterator
      */
     public function match($source)
     {
@@ -120,7 +120,7 @@ public function __get($option)
 
     public function __set($option, $value)
     {
-        return $this->_options[$option] = $value;
+        $this->_options[$option] = $value;
     }
 
     public function enable()

diff --git a/Parser/Token/Token.php b/Parser/Token/Token.php
@@ -26,6 +26,13 @@
 use Kadet\Highlighter\Parser\Validator\Validator;
 use Kadet\Highlighter\Utils\Helper;
 
+/**
+ * Class Token
+ *
+ * @package Kadet\Highlighter\Parser\Token
+ *
+ * @mixin Rule
+ */
 class Token
 {
     public const NAME  = null;
@@ -37,7 +44,10 @@ class Token
     public $pos;
     public $name;
     public $id;
+
+    /** @var Rule */
     public $rule;
+
     public $options;
 
     # region >>> cache

diff --git a/Utils/Console.php b/Utils/Console.php
@@ -21,7 +21,7 @@
 class Console
 {
     /**
-     * @var ConsoleHelper
+     * @var ConsoleHelper|null
      */
     private static $_instance;