Skip to content

Commit 70a3e07

Browse files
janedbalondrejmirtes
janedbal
authored and
ondrejmirtes
committed
Spread list usages in Reflection, Scope, Type
1 parent b009a44 commit 70a3e07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+74
-129
lines changed

Diff for: ‎src/Analyser/MutatingScope.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ public function getVariableType(string $variableName): Type
552552

553553
/**
554554
* @api
555-
* @return array<int, string>
555+
* @return list<string>
556556
*/
557557
public function getDefinedVariables(): array
558558
{
@@ -573,7 +573,7 @@ public function getDefinedVariables(): array
573573

574574
/**
575575
* @api
576-
* @return array<int, string>
576+
* @return list<string>
577577
*/
578578
public function getMaybeDefinedVariables(): array
579579
{

Diff for: ‎src/Analyser/StatementResult.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function getExitPoints(): array
8181

8282
/**
8383
* @param class-string<Stmt\Continue_>|class-string<Stmt\Break_> $stmtClass
84-
* @return StatementExitPoint[]
84+
* @return list<StatementExitPoint>
8585
*/
8686
public function getExitPointsByType(string $stmtClass): array
8787
{
@@ -115,7 +115,7 @@ public function getExitPointsByType(string $stmtClass): array
115115
}
116116

117117
/**
118-
* @return StatementExitPoint[]
118+
* @return list<StatementExitPoint>
119119
*/
120120
public function getExitPointsForOuterLoop(): array
121121
{

Diff for: ‎src/PhpDoc/TypeNodeResolver.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
use Traversable;
108108
use function array_key_exists;
109109
use function array_map;
110+
use function array_values;
110111
use function count;
111112
use function explode;
112113
use function get_class;
@@ -927,7 +928,7 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $
927928
$mainType = $this->resolve($typeNode->identifier, $nameScope);
928929

929930
$isVariadic = false;
930-
$parameters = array_map(
931+
$parameters = array_values(array_map(
931932
function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadic): NativeParameterReflection {
932933
$isVariadic = $isVariadic || $parameterNode->isVariadic;
933934
$parameterName = $parameterNode->parameterName;
@@ -945,7 +946,7 @@ function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadi
945946
);
946947
},
947948
$typeNode->parameters,
948-
);
949+
));
949950

950951
$returnType = $this->resolve($typeNode->returnType, $nameScope);
951952

@@ -1196,7 +1197,7 @@ private function expandIntMaskToType(Type $type): ?Type
11961197
/**
11971198
* @api
11981199
* @param TypeNode[] $typeNodes
1199-
* @return Type[]
1200+
* @return list<Type>
12001201
*/
12011202
public function resolveMultiple(array $typeNodes, NameScope $nameScope): array
12021203
{

Diff for: ‎src/Reflection/Annotations/AnnotationMethodReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
final class AnnotationMethodReflection implements ExtendedMethodReflection
1818
{
1919

20-
/** @var ExtendedFunctionVariant[]|null */
20+
/** @var list<ExtendedFunctionVariant>|null */
2121
private ?array $variants = null;
2222

2323
/**
24-
* @param AnnotationsMethodParameterReflection[] $parameters
24+
* @param list<AnnotationsMethodParameterReflection> $parameters
2525
*/
2626
public function __construct(
2727
private string $name,

Diff for: ‎src/Reflection/Callables/FunctionCallableVariant.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getResolvedTemplateTypeMap(): TemplateTypeMap
5252
}
5353

5454
/**
55-
* @return array<int, ExtendedParameterReflection>
55+
* @return list<ExtendedParameterReflection>
5656
*/
5757
public function getParameters(): array
5858
{

Diff for: ‎src/Reflection/ClassReflection.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ final class ClassReflection
130130

131131
private false|ResolvedPhpDocBlock $traitContextResolvedPhpDocBlock = false;
132132

133-
/** @var ClassReflection[]|null */
133+
/** @var array<string, ClassReflection>|null */
134134
private ?array $cachedInterfaces = null;
135135

136136
private ClassReflection|false|null $cachedParentClass = false;
@@ -360,7 +360,7 @@ public function getClassHierarchyDistances(): array
360360
}
361361

362362
/**
363-
* @return ReflectionClass[]
363+
* @return list<ReflectionClass>
364364
*/
365365
private function collectTraits(ReflectionClass|ReflectionEnum $class): array
366366
{
@@ -845,7 +845,7 @@ public function implementsInterface(string $className): bool
845845
}
846846

847847
/**
848-
* @return ClassReflection[]
848+
* @return list<ClassReflection>
849849
*/
850850
public function getParents(): array
851851
{
@@ -860,7 +860,7 @@ public function getParents(): array
860860
}
861861

862862
/**
863-
* @return ClassReflection[]
863+
* @return array<string, ClassReflection>
864864
*/
865865
public function getInterfaces(): array
866866
{
@@ -894,7 +894,7 @@ public function getInterfaces(): array
894894
}
895895

896896
/**
897-
* @return ClassReflection[]
897+
* @return array<string, ClassReflection>
898898
*/
899899
private function collectInterfaces(ClassReflection $interface): array
900900
{
@@ -910,7 +910,7 @@ private function collectInterfaces(ClassReflection $interface): array
910910
}
911911

912912
/**
913-
* @return ClassReflection[]
913+
* @return array<string, ClassReflection>
914914
*/
915915
public function getImmediateInterfaces(): array
916916
{
@@ -1102,7 +1102,7 @@ public function hasTraitUse(string $traitName): bool
11021102
}
11031103

11041104
/**
1105-
* @return string[]
1105+
* @return list<string>
11061106
*/
11071107
private function getTraitNames(): array
11081108
{
@@ -1459,7 +1459,7 @@ public function varianceMapFromList(array $variances): TemplateTypeVarianceMap
14591459
return new TemplateTypeVarianceMap($map);
14601460
}
14611461

1462-
/** @return array<int, Type> */
1462+
/** @return list<Type> */
14631463
public function typeMapToList(TemplateTypeMap $typeMap): array
14641464
{
14651465
$resolvedPhpDoc = $this->getResolvedPhpDoc();
@@ -1475,7 +1475,7 @@ public function typeMapToList(TemplateTypeMap $typeMap): array
14751475
return $list;
14761476
}
14771477

1478-
/** @return array<int, TemplateTypeVariance> */
1478+
/** @return list<TemplateTypeVariance> */
14791479
public function varianceMapToList(TemplateTypeVarianceMap $varianceMap): array
14801480
{
14811481
$resolvedPhpDoc = $this->getResolvedPhpDoc();
@@ -1775,7 +1775,7 @@ public function getMethodTags(): array
17751775
}
17761776

17771777
/**
1778-
* @return array<Type>
1778+
* @return list<Type>
17791779
*/
17801780
public function getResolvedMixinTypes(): array
17811781
{

Diff for: ‎src/Reflection/Dummy/ChangedTypeMethodReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ final class ChangedTypeMethodReflection implements ExtendedMethodReflection
1717
{
1818

1919
/**
20-
* @param ExtendedParametersAcceptor[] $variants
21-
* @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
20+
* @param list<ExtendedParametersAcceptor> $variants
21+
* @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
2222
*/
2323
public function __construct(private ClassReflection $declaringClass, private ExtendedMethodReflection $reflection, private array $variants, private ?array $namedArgumentsVariants)
2424
{

Diff for: ‎src/Reflection/ExtendedCallableFunctionVariant.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ final class ExtendedCallableFunctionVariant extends ExtendedFunctionVariant impl
1515
{
1616

1717
/**
18-
* @param array<int, ExtendedParameterReflection> $parameters
18+
* @param list<ExtendedParameterReflection> $parameters
1919
* @param SimpleThrowPoint[] $throwPoints
2020
* @param SimpleImpurePoint[] $impurePoints
2121
* @param InvalidateExprNode[] $invalidateExpressions

Diff for: ‎src/Reflection/ExtendedFunctionVariant.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ExtendedFunctionVariant extends FunctionVariant implements ExtendedParamet
1313
{
1414

1515
/**
16-
* @param array<int, ExtendedParameterReflection> $parameters
16+
* @param list<ExtendedParameterReflection> $parameters
1717
* @api
1818
*/
1919
public function __construct(
@@ -38,11 +38,11 @@ public function __construct(
3838
}
3939

4040
/**
41-
* @return array<int, ExtendedParameterReflection>
41+
* @return list<ExtendedParameterReflection>
4242
*/
4343
public function getParameters(): array
4444
{
45-
/** @var array<int, ExtendedParameterReflection> $parameters */
45+
/** @var list<ExtendedParameterReflection> $parameters */
4646
$parameters = parent::getParameters();
4747

4848
return $parameters;

Diff for: ‎src/Reflection/ExtendedMethodReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface ExtendedMethodReflection extends MethodReflection
2323
{
2424

2525
/**
26-
* @return ExtendedParametersAcceptor[]
26+
* @return list<ExtendedParametersAcceptor>
2727
*/
2828
public function getVariants(): array;
2929

@@ -33,7 +33,7 @@ public function getVariants(): array;
3333
public function getOnlyVariant(): ExtendedParametersAcceptor;
3434

3535
/**
36-
* @return ExtendedParametersAcceptor[]|null
36+
* @return list<ExtendedParametersAcceptor>|null
3737
*/
3838
public function getNamedArgumentsVariants(): ?array;
3939

Diff for: ‎src/Reflection/ExtendedParametersAcceptor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface ExtendedParametersAcceptor extends ParametersAcceptor
1010
{
1111

1212
/**
13-
* @return array<int, ExtendedParameterReflection>
13+
* @return list<ExtendedParameterReflection>
1414
*/
1515
public function getParameters(): array;
1616

Diff for: ‎src/Reflection/FunctionReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function getName(): string;
1414
public function getFileName(): ?string;
1515

1616
/**
17-
* @return ExtendedParametersAcceptor[]
17+
* @return list<ExtendedParametersAcceptor>
1818
*/
1919
public function getVariants(): array;
2020

@@ -24,7 +24,7 @@ public function getVariants(): array;
2424
public function getOnlyVariant(): ExtendedParametersAcceptor;
2525

2626
/**
27-
* @return ExtendedParametersAcceptor[]|null
27+
* @return list<ExtendedParametersAcceptor>|null
2828
*/
2929
public function getNamedArgumentsVariants(): ?array;
3030

Diff for: ‎src/Reflection/FunctionVariant.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class FunctionVariant implements ParametersAcceptor
1616

1717
/**
1818
* @api
19-
* @param array<int, ParameterReflection> $parameters
19+
* @param list<ParameterReflection> $parameters
2020
*/
2121
public function __construct(
2222
private TemplateTypeMap $templateTypeMap,
@@ -46,7 +46,7 @@ public function getCallSiteVarianceMap(): TemplateTypeVarianceMap
4646
}
4747

4848
/**
49-
* @return array<int, ParameterReflection>
49+
* @return list<ParameterReflection>
5050
*/
5151
public function getParameters(): array
5252
{

Diff for: ‎src/Reflection/InaccessibleMethod.php

-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public function getCallSiteVarianceMap(): TemplateTypeVarianceMap
3737
return TemplateTypeVarianceMap::createEmpty();
3838
}
3939

40-
/**
41-
* @return array<int, ParameterReflection>
42-
*/
4340
public function getParameters(): array
4441
{
4542
return [];

Diff for: ‎src/Reflection/MethodReflection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function getName(): string;
1414
public function getPrototype(): ClassMemberReflection;
1515

1616
/**
17-
* @return ParametersAcceptor[]
17+
* @return list<ParametersAcceptor>
1818
*/
1919
public function getVariants(): array;
2020

Diff for: ‎src/Reflection/Native/NativeFunctionReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ final class NativeFunctionReflection implements FunctionReflection
1818
private TrinaryLogic $returnsByReference;
1919

2020
/**
21-
* @param ExtendedParametersAcceptor[] $variants
22-
* @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
21+
* @param list<ExtendedParametersAcceptor> $variants
22+
* @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
2323
*/
2424
public function __construct(
2525
private string $name,

Diff for: ‎src/Reflection/Native/NativeMethodReflection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ final class NativeMethodReflection implements ExtendedMethodReflection
2222
{
2323

2424
/**
25-
* @param ExtendedParametersAcceptor[] $variants
26-
* @param ExtendedParametersAcceptor[]|null $namedArgumentsVariants
25+
* @param list<ExtendedParametersAcceptor> $variants
26+
* @param list<ExtendedParametersAcceptor>|null $namedArgumentsVariants
2727
*/
2828
public function __construct(
2929
private ReflectionProvider $reflectionProvider,

Diff for: ‎src/Reflection/ParametersAcceptor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function getTemplateTypeMap(): TemplateTypeMap;
2020
public function getResolvedTemplateTypeMap(): TemplateTypeMap;
2121

2222
/**
23-
* @return array<int, ParameterReflection>
23+
* @return list<ParameterReflection>
2424
*/
2525
public function getParameters(): array;
2626

0 commit comments

Comments
 (0)