@@ -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; |
@@ -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 | |
@@ -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 | { |