@@ -71,7 +71,7 @@ |
||
71 | 71 | $this->_validator = new Validator($context); |
72 | 72 | } elseif(is_callable($context)) { |
73 | 73 | $this->_validator = new DelegateValidator($context); |
74 | - }elseif($context instanceof Validator) { |
|
74 | + } elseif($context instanceof Validator) { |
|
75 | 75 | $this->_validator = $context; |
76 | 76 | } else { |
77 | 77 | throw new \InvalidArgumentException('$context must be valid Validator'); |
@@ -107,7 +107,9 @@ |
||
107 | 107 | public function all() |
108 | 108 | { |
109 | 109 | $items = $this->getArrayCopy(); |
110 | - if(empty($items)) return []; |
|
110 | + if(empty($items)) { |
|
111 | + return []; |
|
112 | + } |
|
111 | 113 | |
112 | 114 | return call_user_func_array('array_merge', $items); |
113 | 115 | } |
@@ -151,7 +151,7 @@ |
||
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
154 | - * @return Token|null|false |
|
154 | + * @return Token |
|
155 | 155 | */ |
156 | 156 | public function getEnd() |
157 | 157 | { |
@@ -226,7 +226,7 @@ |
||
226 | 226 | } |
227 | 227 | } elseif (($rule = Helper::cmp($b->rule->priority, $a->rule->priority)) !== 0) { |
228 | 228 | return $multiplier*$rule; |
229 | - } else { |
|
229 | + } else { |
|
230 | 230 | return $multiplier*($a->id < $b->id ? -1 : 1); |
231 | 231 | } |
232 | 232 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | /** |
26 | 26 | * RegexMatcher constructor. |
27 | 27 | * |
28 | - * @param $regex |
|
28 | + * @param string $regex |
|
29 | 29 | * @param callable $callable |
30 | 30 | */ |
31 | 31 | public function __construct($regex, callable $callable) |
@@ -64,8 +64,8 @@ |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | - * @param Language|callable|string $language |
|
68 | - * @param array[string] $aliases |
|
67 | + * @param string $language |
|
68 | + * @param string[] $aliases |
|
69 | 69 | */ |
70 | 70 | public function registerLanguage($language, $aliases) |
71 | 71 | { |
@@ -108,6 +108,9 @@ discard block |
||
108 | 108 | return $this->_parser->process($tokens); |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $source |
|
113 | + */ |
|
111 | 114 | public function tokenize($source, $additional = [], $offset = 0, $embedded = false) |
112 | 115 | { |
113 | 116 | return new TokenIterator( |
@@ -145,7 +148,7 @@ discard block |
||
145 | 148 | /** |
146 | 149 | * @param bool $embedded |
147 | 150 | * |
148 | - * @return Rule[] |
|
151 | + * @return \Generator |
|
149 | 152 | */ |
150 | 153 | private function _rules($embedded = false) |
151 | 154 | { |
@@ -177,7 +180,7 @@ discard block |
||
177 | 180 | * |
178 | 181 | * @param $embedded |
179 | 182 | * |
180 | - * @return Rule|\Kadet\Highlighter\Parser\Rule[] |
|
183 | + * @return Rule |
|
181 | 184 | */ |
182 | 185 | public function getEnds($embedded = false) |
183 | 186 | { |