@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | ', ', |
98 | 98 | array_map( |
99 | 99 | /** |
100 | - * @param string|int $name |
|
100 | + * @param boolean $name |
|
101 | 101 | * @param Union $type |
102 | 102 | * |
103 | 103 | * @return string |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | ', ', |
150 | 150 | array_map( |
151 | 151 | /** |
152 | - * @param string|int $name |
|
152 | + * @param string|null $name |
|
153 | 153 | * @param Union $type |
154 | 154 | * |
155 | 155 | * @return string |
@@ -6,13 +6,10 @@ |
||
6 | 6 | use function count; |
7 | 7 | use function implode; |
8 | 8 | use Psalm\Codebase; |
9 | -use Psalm\CodeLocation; |
|
10 | -use Psalm\StatementsSource; |
|
11 | 9 | use Psalm\Type; |
12 | 10 | use Psalm\Type\Atomic; |
13 | 11 | use Psalm\Type\Union; |
14 | 12 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
15 | -use Psalm\Internal\Type\TypeCombination; |
|
16 | 13 | use Psalm\Internal\Type\TemplateResult; |
17 | 14 | use Psalm\Internal\Type\UnionTemplateHandler; |
18 | 15 | use function array_merge; |
@@ -3,12 +3,9 @@ |
||
3 | 3 | |
4 | 4 | use function implode; |
5 | 5 | use Psalm\Codebase; |
6 | -use Psalm\CodeLocation; |
|
7 | 6 | use Psalm\Internal\Type\TemplateResult; |
8 | -use Psalm\StatementsSource; |
|
9 | 7 | use Psalm\Type; |
10 | 8 | use Psalm\Type\Union; |
11 | -use Psalm\Storage\MethodStorage; |
|
12 | 9 | use function array_map; |
13 | 10 | use function strtolower; |
14 | 11 |
@@ -440,7 +440,7 @@ |
||
440 | 440 | * @param string $key |
441 | 441 | * @param array<string,Type\Union> $existing_keys |
442 | 442 | * @param array<string,mixed> $new_assertions |
443 | - * @param string[][] $new_type_parts |
|
443 | + * @param null|CodeLocation $code_location |
|
444 | 444 | * |
445 | 445 | * @return Type\Union|null |
446 | 446 | */ |
@@ -11,8 +11,6 @@ discard block |
||
11 | 11 | use Psalm\Codebase; |
12 | 12 | use Psalm\CodeLocation; |
13 | 13 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
14 | -use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer; |
|
15 | -use Psalm\Internal\Analyzer\TraitAnalyzer; |
|
16 | 14 | use Psalm\Internal\Type\AssertionReconciler; |
17 | 15 | use Psalm\Issue\DocblockTypeContradiction; |
18 | 16 | use Psalm\Issue\PsalmInternalError; |
@@ -22,34 +20,21 @@ discard block |
||
22 | 20 | use Psalm\IssueBuffer; |
23 | 21 | use Psalm\Type; |
24 | 22 | use Psalm\Type\Atomic\ObjectLike; |
25 | -use Psalm\Type\Atomic\Scalar; |
|
26 | 23 | use Psalm\Type\Atomic\TArray; |
27 | -use Psalm\Type\Atomic\TArrayKey; |
|
28 | -use Psalm\Type\Atomic\TBool; |
|
29 | -use Psalm\Type\Atomic\TCallable; |
|
30 | -use Psalm\Type\Atomic\TCallableObjectLikeArray; |
|
31 | -use Psalm\Type\Atomic\TClassString; |
|
32 | 24 | use Psalm\Type\Atomic\TEmpty; |
33 | 25 | use Psalm\Type\Atomic\TFalse; |
34 | -use Psalm\Type\Atomic\TInt; |
|
35 | 26 | use Psalm\Type\Atomic\TMixed; |
36 | 27 | use Psalm\Type\Atomic\TNamedObject; |
37 | 28 | use Psalm\Type\Atomic\TNull; |
38 | -use Psalm\Type\Atomic\TNumeric; |
|
39 | -use Psalm\Type\Atomic\TNumericString; |
|
40 | 29 | use Psalm\Type\Atomic\TObject; |
41 | -use Psalm\Type\Atomic\TResource; |
|
42 | -use Psalm\Type\Atomic\TScalar; |
|
43 | 30 | use Psalm\Type\Atomic\TString; |
44 | 31 | use Psalm\Type\Atomic\TTemplateParam; |
45 | -use Psalm\Type\Atomic\TTrue; |
|
46 | 32 | use function sort; |
47 | 33 | use function str_replace; |
48 | 34 | use function str_split; |
49 | 35 | use function strpos; |
50 | 36 | use function strtolower; |
51 | 37 | use function substr; |
52 | -use Exception; |
|
53 | 38 | |
54 | 39 | class Reconciler |
55 | 40 | { |
@@ -1653,6 +1653,7 @@ |
||
1653 | 1653 | * @param array<string> $suppressed_issues |
1654 | 1654 | * @param array<string, bool> $phantom_classes |
1655 | 1655 | * @param bool $inferred |
1656 | + * @param string $calling_method_id |
|
1656 | 1657 | * |
1657 | 1658 | * @return bool |
1658 | 1659 | */ |
@@ -18,7 +18,6 @@ |
||
18 | 18 | use Psalm\Storage\FileStorage; |
19 | 19 | use Psalm\Type; |
20 | 20 | use Psalm\Type\Atomic\TFloat; |
21 | -use Psalm\Type\Atomic\TGenericObject; |
|
22 | 21 | use Psalm\Type\Atomic\TInt; |
23 | 22 | use Psalm\Type\Atomic\TIterable; |
24 | 23 | use Psalm\Type\Atomic\TLiteralFloat; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | $if_clauses = array_values( |
60 | 60 | array_map( |
61 | 61 | /** |
62 | - * @return \Psalm\Internal\Clause |
|
62 | + * @return boolean |
|
63 | 63 | */ |
64 | 64 | function (\Psalm\Internal\Clause $c) use ($mixed_var_ids) { |
65 | 65 | $keys = array_keys($c->possibilities); |
@@ -61,7 +61,6 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
64 | - * @param array<PhpParser\Node\Arg> $call_args |
|
65 | 64 | * |
66 | 65 | * @return ?bool |
67 | 66 | */ |
@@ -61,7 +61,6 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
64 | - * @param array<PhpParser\Node\Arg> $call_args |
|
65 | 64 | * |
66 | 65 | * @return ?bool |
67 | 66 | */ |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use function file_put_contents; |
8 | 8 | use function is_array; |
9 | 9 | use function is_readable; |
10 | -use Psalm\Internal\Analyzer\IssueData; |
|
11 | 10 | use Psalm\Config; |
12 | 11 | use function serialize; |
13 | 12 | use function unserialize; |
@@ -61,7 +61,6 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
64 | - * @param array<PhpParser\Node\Arg> $call_args |
|
65 | 64 | * |
66 | 65 | * @return ?bool |
67 | 66 | */ |