@@ -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. |
@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Psalm\Type\Atomic; |
3 | 3 | |
4 | -use Psalm\CodeLocation; |
|
5 | -use Psalm\StatementsSource; |
|
6 | 4 | use function preg_quote; |
7 | 5 | use function preg_replace; |
8 | 6 | use function stripos; |
@@ -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 |
@@ -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 |