@@ -453,7 +453,7 @@ |
||
453 | 453 | $this->extra_types |
454 | 454 | && array_filter( |
455 | 455 | $this->extra_types, |
456 | - /** @param Atomic $a */ |
|
456 | + /** @param Codebase $a */ |
|
457 | 457 | function (Atomic $a) use ($codebase) : bool { |
458 | 458 | return $a->hasArrayAccessInterface($codebase); |
459 | 459 | } |
@@ -9,21 +9,9 @@ |
||
9 | 9 | use function get_class; |
10 | 10 | use function is_numeric; |
11 | 11 | use Psalm\Codebase; |
12 | -use Psalm\CodeLocation; |
|
13 | -use Psalm\Internal\Analyzer\ClassLikeAnalyzer; |
|
14 | -use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer; |
|
15 | 12 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
16 | -use Psalm\Internal\Analyzer\TypeAnalyzer; |
|
17 | 13 | use Psalm\Internal\Type\TemplateResult; |
18 | 14 | use Psalm\Internal\Type\TypeAlias; |
19 | -use Psalm\Issue\InvalidTemplateParam; |
|
20 | -use Psalm\Issue\MissingTemplateParam; |
|
21 | -use Psalm\Issue\ReservedWord; |
|
22 | -use Psalm\Issue\TooManyTemplateParams; |
|
23 | -use Psalm\Issue\UndefinedConstant; |
|
24 | -use Psalm\IssueBuffer; |
|
25 | -use Psalm\StatementsSource; |
|
26 | -use Psalm\Storage\FileStorage; |
|
27 | 15 | use Psalm\Type; |
28 | 16 | use Psalm\Type\Atomic\ObjectLike; |
29 | 17 | use Psalm\Type\Atomic\TArray; |
@@ -5,11 +5,9 @@ |
||
5 | 5 | use function count; |
6 | 6 | use function implode; |
7 | 7 | use Psalm\Codebase; |
8 | -use Psalm\CodeLocation; |
|
9 | 8 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
10 | 9 | use Psalm\Internal\Type\TemplateResult; |
11 | 10 | use Psalm\Internal\Type\UnionTemplateHandler; |
12 | -use Psalm\StatementsSource; |
|
13 | 11 | use Psalm\Storage\FunctionLikeParameter; |
14 | 12 | use Psalm\Type; |
15 | 13 | use Psalm\Type\Atomic; |
@@ -4,17 +4,9 @@ |
||
4 | 4 | use function array_map; |
5 | 5 | use function implode; |
6 | 6 | use Psalm\Codebase; |
7 | -use Psalm\CodeLocation; |
|
8 | 7 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
9 | -use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer; |
|
10 | -use Psalm\Internal\Analyzer\TypeAnalyzer; |
|
11 | 8 | use Psalm\Internal\Type\TemplateResult; |
12 | 9 | use Psalm\Internal\Type\UnionTemplateHandler; |
13 | -use Psalm\IssueBuffer; |
|
14 | -use Psalm\Issue\InvalidTemplateParam; |
|
15 | -use Psalm\Issue\MissingTemplateParam; |
|
16 | -use Psalm\Issue\TooManyTemplateParams; |
|
17 | -use Psalm\StatementsSource; |
|
18 | 10 | use Psalm\Type; |
19 | 11 | use Psalm\Type\Atomic; |
20 | 12 | use Psalm\Type\Union; |
@@ -19,6 +19,8 @@ |
||
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @param array<string, string> $aliased_classes |
22 | + * @param string|null $namespace |
|
23 | + * @param string|null $this_class |
|
22 | 24 | */ |
23 | 25 | private function getNamespacedIntersectionTypes( |
24 | 26 | ?string $namespace, |
@@ -4,9 +4,7 @@ |
||
4 | 4 | use function array_map; |
5 | 5 | use function implode; |
6 | 6 | use Psalm\Codebase; |
7 | -use Psalm\CodeLocation; |
|
8 | 7 | use Psalm\Internal\Type\TemplateResult; |
9 | -use Psalm\StatementsSource; |
|
10 | 8 | use Psalm\Type; |
11 | 9 | use Psalm\Type\Atomic; |
12 | 10 |
@@ -9,8 +9,6 @@ |
||
9 | 9 | use function is_int; |
10 | 10 | use function sort; |
11 | 11 | use Psalm\Codebase; |
12 | -use Psalm\CodeLocation; |
|
13 | -use Psalm\StatementsSource; |
|
14 | 12 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
15 | 13 | use Psalm\Internal\Type\TypeCombination; |
16 | 14 | use Psalm\Internal\Type\TemplateResult; |
@@ -4,8 +4,6 @@ |
||
4 | 4 | use function count; |
5 | 5 | use function get_class; |
6 | 6 | use Psalm\Type\Atomic; |
7 | -use Psalm\CodeLocation; |
|
8 | -use Psalm\StatementsSource; |
|
9 | 7 | |
10 | 8 | /** |
11 | 9 | * Represents an array with generic type parameters. |
@@ -3,8 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use function get_class; |
5 | 5 | use Psalm\Codebase; |
6 | -use Psalm\CodeLocation; |
|
7 | -use Psalm\StatementsSource; |
|
8 | 6 | use Psalm\Internal\Analyzer\StatementsAnalyzer; |
9 | 7 | use Psalm\Internal\Type\TemplateResult; |
10 | 8 | use Psalm\Internal\Type\UnionTemplateHandler; |
@@ -3,9 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use function count; |
5 | 5 | use function implode; |
6 | -use Psalm\CodeLocation; |
|
7 | -use Psalm\Internal\Type\TemplateResult; |
|
8 | -use Psalm\StatementsSource; |
|
9 | 6 | use Psalm\Type\Atomic; |
10 | 7 | use function substr; |
11 | 8 | use function array_merge; |
@@ -3,9 +3,7 @@ |
||
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\Atomic; |
11 | 9 | use function substr; |
@@ -130,6 +130,9 @@ |
||
130 | 130 | return $this->value !== 'static'; |
131 | 131 | } |
132 | 132 | |
133 | + /** |
|
134 | + * @param Codebase $codebase |
|
135 | + */ |
|
133 | 136 | public function replaceTemplateTypesWithArgTypes( |
134 | 137 | TemplateResult $template_result, |
135 | 138 | ?Codebase $codebase |