@@ -35,7 +35,6 @@ |
||
35 | 35 | use Psalm\Storage\FunctionLikeStorage; |
36 | 36 | use Psalm\Storage\MethodStorage; |
37 | 37 | use Psalm\Type; |
38 | -use Psalm\Internal\Type\TypeCombination; |
|
39 | 38 | use function strtolower; |
40 | 39 | use function substr; |
41 | 40 | use function count; |
@@ -9,8 +9,6 @@ |
||
9 | 9 | use Psalm\CodeLocation; |
10 | 10 | use Psalm\Context; |
11 | 11 | use Psalm\Internal\Analyzer\Statements\Expression\CallAnalyzer; |
12 | -use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer; |
|
13 | -use Psalm\Internal\Codebase\InternalCallMapHandler; |
|
14 | 12 | use Psalm\Internal\Type\ArrayType; |
15 | 13 | use Psalm\StatementsSource; |
16 | 14 | use Psalm\Type; |
@@ -439,6 +439,7 @@ |
||
439 | 439 | |
440 | 440 | /** |
441 | 441 | * @param non-empty-list<Type\Union> $union_types |
442 | + * @param Codebase|null $codebase |
|
442 | 443 | */ |
443 | 444 | public static function combineUnionTypeArray(array $union_types, ?Codebase $codebase) : Type\Union |
444 | 445 | { |
@@ -3,10 +3,6 @@ discard block |
||
3 | 3 | namespace Psalm\Internal\Codebase; |
4 | 4 | |
5 | 5 | use Psalm\CodeLocation; |
6 | -use Psalm\Internal\Analyzer\StatementsAnalyzer; |
|
7 | -use Psalm\Internal\Provider\ClassLikeStorageProvider; |
|
8 | -use Psalm\Internal\Provider\FileReferenceProvider; |
|
9 | -use Psalm\Internal\Provider\FileStorageProvider; |
|
10 | 6 | use Psalm\Internal\Taint\Path; |
11 | 7 | use Psalm\Internal\Taint\Sink; |
12 | 8 | use Psalm\Internal\Taint\Source; |
@@ -17,7 +13,6 @@ discard block |
||
17 | 13 | use function array_merge; |
18 | 14 | use function array_merge_recursive; |
19 | 15 | use function strtolower; |
20 | -use UnexpectedValueException; |
|
21 | 16 | use function count; |
22 | 17 | use function implode; |
23 | 18 | use function substr; |
@@ -69,6 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | /** |
71 | 71 | * |
72 | + * @param PhpParser\Node\Expr|null $assign_value |
|
72 | 73 | * @return false|null |
73 | 74 | */ |
74 | 75 | public static function updateArrayType( |
@@ -777,6 +778,7 @@ discard block |
||
777 | 778 | |
778 | 779 | /** |
779 | 780 | * @param list<int|string> $key_values |
781 | + * @param string|null $array_var_id |
|
780 | 782 | */ |
781 | 783 | private static function taintArrayAssignment( |
782 | 784 | StatementsAnalyzer $statements_analyzer, |
@@ -2,11 +2,9 @@ |
||
2 | 2 | namespace Psalm\Type\Atomic; |
3 | 3 | |
4 | 4 | use Psalm\Codebase; |
5 | -use Psalm\CodeLocation; |
|
6 | 5 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
7 | 6 | use Psalm\Internal\Type\TemplateResult; |
8 | 7 | use Psalm\Internal\Type\UnionTemplateHandler; |
9 | -use Psalm\StatementsSource; |
|
10 | 8 | use Psalm\Type\Atomic; |
11 | 9 | use function preg_quote; |
12 | 10 | use function preg_replace; |
@@ -224,6 +224,7 @@ discard block |
||
224 | 224 | * @param Context $context |
225 | 225 | * @param CodeLocation $code_location |
226 | 226 | * @param StatementsAnalyzer $statements_analyzer |
227 | + * @param TemplateResult|null $class_template_result |
|
227 | 228 | */ |
228 | 229 | protected static function checkMethodArgs( |
229 | 230 | ?\Psalm\Internal\MethodIdentifier $method_id, |
@@ -328,6 +329,8 @@ discard block |
||
328 | 329 | /** |
329 | 330 | * @return array<string, array<string, array{Type\Union}>> |
330 | 331 | * @param array<string, non-empty-array<string, array{Type\Union}>> $existing_template_types |
332 | + * @param ClassLikeStorage|null $declaring_class_storage |
|
333 | + * @param ClassLikeStorage|null $calling_class_storage |
|
331 | 334 | */ |
332 | 335 | public static function getTemplateTypesForCall( |
333 | 336 | \Psalm\Codebase $codebase, |