@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Lechimp\Dicto\Indexer\Insert; |
| 15 | 15 | use Lechimp\Dicto\Indexer\Location; |
| 16 | 16 | use Lechimp\Dicto\Analysis\Query; |
| 17 | -use Lechimp\Dicto\Analysis\Violation; |
|
| 18 | 17 | use \Lechimp\Dicto\Variables\Variable; |
| 19 | 18 | |
| 20 | 19 | /** |
@@ -126,6 +126,9 @@ |
||
| 126 | 126 | ); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | + /** |
|
| 130 | + * @param boolean $negate |
|
| 131 | + */ |
|
| 129 | 132 | protected function regexp_source_filter($regexp, $negate) { |
| 130 | 133 | assert('is_string($regexp)'); |
| 131 | 134 | assert('is_bool($negate)'); |
@@ -210,6 +210,7 @@ discard block |
||
| 210 | 210 | // IMPLEMENTATION OF Parser |
| 211 | 211 | |
| 212 | 212 | /** |
| 213 | + * @param string $source |
|
| 213 | 214 | * @return Ruleset |
| 214 | 215 | */ |
| 215 | 216 | public function parse($source) { |
@@ -270,6 +271,7 @@ discard block |
||
| 270 | 271 | |
| 271 | 272 | /** |
| 272 | 273 | * @param string |
| 274 | + * @param string $content |
|
| 273 | 275 | * @return string |
| 274 | 276 | */ |
| 275 | 277 | protected function trim_explanation($content) { |
@@ -338,7 +340,7 @@ discard block |
||
| 338 | 340 | /** |
| 339 | 341 | * Fetch a rule schema and its arguments from the stream. |
| 340 | 342 | * |
| 341 | - * @return array (R\Schema, array) |
|
| 343 | + * @return R\Schema (R\Schema, array) |
|
| 342 | 344 | */ |
| 343 | 345 | protected function schema() { |
| 344 | 346 | $t = $this->current_symbol(); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
| 100 | - * @return Iterator <[Node,mixed]> |
|
| 100 | + * @return \Generator <[Node,mixed]> |
|
| 101 | 101 | */ |
| 102 | 102 | protected function switch_run_command(\Iterator $nodes, $step) { |
| 103 | 103 | list($cmd,$par) = $step; |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
| 119 | - * @return Iterator <[Node,mixed]> |
|
| 119 | + * @return \Generator <[Node,mixed]> |
|
| 120 | 120 | */ |
| 121 | 121 | protected function run_expand(\Iterator $nodes, \Closure $clsr) { |
| 122 | 122 | while ($nodes->valid()) { |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | - * @return Iterator <[Node,mixed]> |
|
| 133 | + * @return \Generator <[Node,mixed]> |
|
| 134 | 134 | */ |
| 135 | 135 | protected function run_extract(\Iterator $nodes, \Closure $clsr) { |
| 136 | 136 | while ($nodes->valid()) { |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | /** |
| 148 | - * @return Iterator <[Node,mixed]> |
|
| 148 | + * @return \Generator <[Node,mixed]> |
|
| 149 | 149 | */ |
| 150 | 150 | protected function run_filter(\Iterator $nodes, Predicate $predicate) { |
| 151 | 151 | $clsr = $predicate->compile(); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * @return Iterator <[Node,mixed]> |
|
| 163 | + * @return \Generator <[Node,mixed]> |
|
| 164 | 164 | */ |
| 165 | 165 | protected function add_result(\Iterator $nodes, &$result) { |
| 166 | 166 | while ($nodes->valid()) { |
@@ -10,9 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Lechimp\Dicto\Indexer; |
| 12 | 12 | |
| 13 | -use Lechimp\Dicto\Variables\Variable; |
|
| 14 | -use PhpParser\Node as N; |
|
| 15 | - |
|
| 16 | 13 | /** |
| 17 | 14 | * Interface to implement Rules that visit the AST. |
| 18 | 15 | * |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | namespace Lechimp\Dicto\App; |
| 12 | 12 | |
| 13 | 13 | use Lechimp\Dicto\App\RuleLoader; |
| 14 | -use Lechimp\Dicto\Rules\Ruleset; |
|
| 15 | 14 | use Symfony\Component\Yaml\Yaml; |
| 16 | 15 | use Pimple\Container; |
| 17 | 16 | use PhpParser\ParserFactory; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | /** |
| 165 | - * @param mixed $index |
|
| 165 | + * @param Insert|null $index |
|
| 166 | 166 | * @return Graph\IndexDB |
| 167 | 167 | */ |
| 168 | 168 | protected function force_graph_index_db($index) { |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | - * @param mixed $index |
|
| 180 | + * @param Insert $index |
|
| 181 | 181 | * @return IndexDB |
| 182 | 182 | */ |
| 183 | 183 | protected function force_app_index_db($index) { |
@@ -90,6 +90,7 @@ |
||
| 90 | 90 | * If that is also not the case, we assume the class is in the global |
| 91 | 91 | * namespace. |
| 92 | 92 | * |
| 93 | + * @param string $name |
|
| 93 | 94 | * @return string |
| 94 | 95 | */ |
| 95 | 96 | protected function fully_qualified_class_name($name) { |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | * Get information about a rule. |
| 258 | 258 | * |
| 259 | 259 | * @param int $rule |
| 260 | - * @return array<string,string> with keys 'rule', 'explanation' |
|
| 260 | + * @return integer|null with keys 'rule', 'explanation' |
|
| 261 | 261 | */ |
| 262 | 262 | public function rule_info($rule) { |
| 263 | 263 | $b = $this->result_db->builder(); |