@@ -2,7 +2,6 @@ |
||
2 | 2 | require_once('command_functions.php'); |
3 | 3 | |
4 | 4 | use Psalm\Internal\Analyzer\ProjectAnalyzer; |
5 | -use Psalm\Config; |
|
6 | 5 | use Psalm\IssueBuffer; |
7 | 6 | use Psalm\Progress\DebugProgress; |
8 | 7 | use Psalm\Progress\DefaultProgress; |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | /** |
881 | 881 | * Whether or not a given method exists |
882 | 882 | * |
883 | - * @param string|\Psalm\Internal\MethodIdentifier $method_id |
|
883 | + * @param string $method_id |
|
884 | 884 | * @param string|\Psalm\Internal\MethodIdentifier|null $calling_method_id |
885 | 885 | * |
886 | 886 | @return bool |
@@ -988,7 +988,7 @@ discard block |
||
988 | 988 | /** |
989 | 989 | * @param string|\Psalm\Internal\MethodIdentifier $method_id |
990 | 990 | * |
991 | - * @return array<string> |
|
991 | + * @return Internal\MethodIdentifier[] |
|
992 | 992 | */ |
993 | 993 | public function getOverriddenMethodIds($method_id) |
994 | 994 | { |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use function preg_replace; |
12 | 12 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
13 | 13 | use Psalm\Internal\Clause; |
14 | -use Psalm\Internal\MethodIdentifier; |
|
15 | 14 | use Psalm\Storage\FunctionLikeStorage; |
16 | 15 | use Psalm\Internal\Type\AssertionReconciler; |
17 | 16 | use Psalm\Type\Union; |
@@ -181,7 +181,6 @@ |
||
181 | 181 | * https://github.com/facebook/libphutil/blob/master/src/parser/docblock/PhutilDocblockParser.php |
182 | 182 | * |
183 | 183 | * @param \PhpParser\Comment\Doc $docblock |
184 | - * @param bool $preserve_format |
|
185 | 184 | * |
186 | 185 | * @return array Array of the main comment and specials |
187 | 186 | * @psalm-return array{description:string, specials:array<string, array<int, string>>} |
@@ -958,6 +958,9 @@ |
||
958 | 958 | } |
959 | 959 | } |
960 | 960 | |
961 | + /** |
|
962 | + * @param string|null $parent_fq_class_name |
|
963 | + */ |
|
961 | 964 | public static function addContextProperties( |
962 | 965 | StatementsSource $statements_source, |
963 | 966 | ClassLikeStorage $storage, |
@@ -211,6 +211,7 @@ discard block |
||
211 | 211 | * @param string $fq_class_name |
212 | 212 | * @param array<string> $suppressed_issues |
213 | 213 | * @param bool $inferred - whether or not the type was inferred |
214 | + * @param null|string $calling_fq_class_name |
|
214 | 215 | * |
215 | 216 | * @return bool|null |
216 | 217 | */ |
@@ -538,7 +539,6 @@ discard block |
||
538 | 539 | |
539 | 540 | /** |
540 | 541 | * @param string $property_id |
541 | - * @param string|null $calling_context |
|
542 | 542 | * @param SourceAnalyzer $source |
543 | 543 | * @param CodeLocation $code_location |
544 | 544 | * @param string[] $suppressed_issues |
@@ -348,7 +348,6 @@ |
||
348 | 348 | } |
349 | 349 | |
350 | 350 | /** |
351 | - * @param int $line_number |
|
352 | 351 | * |
353 | 352 | * @throws DocblockParseException if there was a problem parsing the docblock |
354 | 353 | * |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | if ($storage instanceof MethodStorage) { |
399 | 399 | $non_null_param_types = array_filter( |
400 | 400 | $storage->params, |
401 | - /** @return bool */ |
|
401 | + /** @return null|false */ |
|
402 | 402 | function (FunctionLikeParameter $p) { |
403 | 403 | return $p->type !== null && $p->has_docblock_type; |
404 | 404 | } |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | } else { |
407 | 407 | $non_null_param_types = array_filter( |
408 | 408 | $storage->params, |
409 | - /** @return bool */ |
|
409 | + /** @return null|false */ |
|
410 | 410 | function (FunctionLikeParameter $p) { |
411 | 411 | return $p->type !== null; |
412 | 412 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | ) { |
420 | 420 | $types_without_docblocks = array_filter( |
421 | 421 | $storage->params, |
422 | - /** @return bool */ |
|
422 | + /** @return null|false */ |
|
423 | 423 | function (FunctionLikeParameter $p) { |
424 | 424 | return !$p->type || !$p->has_docblock_type; |
425 | 425 | } |
@@ -804,6 +804,9 @@ discard block |
||
804 | 804 | return null; |
805 | 805 | } |
806 | 806 | |
807 | + /** |
|
808 | + * @param \Psalm\Storage\ClassLikeStorage|null $class_storage |
|
809 | + */ |
|
807 | 810 | private function checkParamReferences( |
808 | 811 | StatementsAnalyzer $statements_analyzer, |
809 | 812 | FunctionLikeStorage $storage, |
@@ -1441,7 +1444,6 @@ discard block |
||
1441 | 1444 | /** |
1442 | 1445 | * Adds return types for the given function |
1443 | 1446 | * |
1444 | - * @param string $return_type |
|
1445 | 1447 | * @param Context $context |
1446 | 1448 | * |
1447 | 1449 | * @return void |
@@ -141,7 +141,7 @@ |
||
141 | 141 | /** |
142 | 142 | * @param CodeLocation $code_location |
143 | 143 | * @param string[] $suppressed_issues |
144 | - * @param lowercase-string|null $calling_method_id |
|
144 | + * @param string $calling_method_id |
|
145 | 145 | * |
146 | 146 | * @return bool|null |
147 | 147 | */ |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use Psalm\IssueBuffer; |
13 | 13 | use Psalm\StatementsSource; |
14 | 14 | use Psalm\Storage\MethodStorage; |
15 | -use Psalm\Type; |
|
16 | 15 | use function strtolower; |
17 | 16 | use function in_array; |
18 | 17 |