Skip to content

Commit c296ac2

Browse files
jiripudilondrejmirtes
authored andcommitted
refactor ClassReflection call-site variance methods
1 parent 7e4cff9 commit c296ac2

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/Reflection/ClassReflection.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class ClassReflection
9797

9898
private ?TemplateTypeMap $activeTemplateTypeMap = null;
9999

100-
private ?TemplateTypeVarianceMap $templateTypeVarianceMap = null;
100+
private ?TemplateTypeVarianceMap $defaultCallSiteVarianceMap = null;
101101

102-
private ?TemplateTypeVarianceMap $activeTemplateTypeVarianceMap = null;
102+
private ?TemplateTypeVarianceMap $callSiteVarianceMap = null;
103103

104104
/** @var array<string,ClassReflection>|null */
105105
private ?array $ancestors = null;
@@ -147,7 +147,7 @@ public function __construct(
147147
private ?TemplateTypeMap $resolvedTemplateTypeMap,
148148
private ?ResolvedPhpDocBlock $stubPhpDocBlock,
149149
private ?string $extraCacheKey = null,
150-
private ?TemplateTypeVarianceMap $resolvedTemplateTypeVarianceMap = null,
150+
private ?TemplateTypeVarianceMap $resolvedCallSiteVarianceMap = null,
151151
)
152152
{
153153
}
@@ -252,7 +252,7 @@ public function getDisplayName(bool $withTemplateTypes = true): string
252252
return $name . '<' . implode(',', array_map(
253253
static fn (Type $type, TemplateTypeVariance $variance): string => TypeProjectionHelper::describe($type, $variance, VerbosityLevel::typeOnly()),
254254
$this->getActiveTemplateTypeMap()->getTypes(),
255-
$this->getActiveTemplateTypeVarianceMap()->getVariances(),
255+
$this->getCallSiteVarianceMap()->getVariances(),
256256
)) . '>';
257257
}
258258

@@ -269,7 +269,7 @@ public function getCacheKey(): string
269269
$cacheKey .= '<' . implode(',', array_map(
270270
static fn (Type $type, TemplateTypeVariance $variance): string => TypeProjectionHelper::describe($type, $variance, VerbosityLevel::cache()),
271271
$this->getActiveTemplateTypeMap()->getTypes(),
272-
$this->getActiveTemplateTypeVarianceMap()->getVariances(),
272+
$this->getCallSiteVarianceMap()->getVariances(),
273273
)) . '>';
274274
}
275275

@@ -1255,30 +1255,30 @@ public function getPossiblyIncompleteActiveTemplateTypeMap(): TemplateTypeMap
12551255
return $this->resolvedTemplateTypeMap ?? $this->getTemplateTypeMap();
12561256
}
12571257

1258-
public function getTemplateTypeVarianceMap(): TemplateTypeVarianceMap
1258+
private function getDefaultCallSiteVarianceMap(): TemplateTypeVarianceMap
12591259
{
1260-
if ($this->templateTypeVarianceMap !== null) {
1261-
return $this->templateTypeVarianceMap;
1260+
if ($this->defaultCallSiteVarianceMap !== null) {
1261+
return $this->defaultCallSiteVarianceMap;
12621262
}
12631263

12641264
$resolvedPhpDoc = $this->getResolvedPhpDoc();
12651265
if ($resolvedPhpDoc === null) {
1266-
$this->templateTypeVarianceMap = TemplateTypeVarianceMap::createEmpty();
1267-
return $this->templateTypeVarianceMap;
1266+
$this->defaultCallSiteVarianceMap = TemplateTypeVarianceMap::createEmpty();
1267+
return $this->defaultCallSiteVarianceMap;
12681268
}
12691269

12701270
$map = [];
12711271
foreach ($this->getTemplateTags() as $templateTag) {
12721272
$map[$templateTag->getName()] = TemplateTypeVariance::createInvariant();
12731273
}
12741274

1275-
$this->templateTypeVarianceMap = new TemplateTypeVarianceMap($map);
1276-
return $this->templateTypeVarianceMap;
1275+
$this->defaultCallSiteVarianceMap = new TemplateTypeVarianceMap($map);
1276+
return $this->defaultCallSiteVarianceMap;
12771277
}
12781278

1279-
public function getActiveTemplateTypeVarianceMap(): TemplateTypeVarianceMap
1279+
public function getCallSiteVarianceMap(): TemplateTypeVarianceMap
12801280
{
1281-
return $this->activeTemplateTypeVarianceMap ??= $this->resolvedTemplateTypeVarianceMap ?? $this->getTemplateTypeVarianceMap();
1281+
return $this->callSiteVarianceMap ??= $this->resolvedCallSiteVarianceMap ?? $this->getDefaultCallSiteVarianceMap();
12821282
}
12831283

12841284
public function isGeneric(): bool
@@ -1387,7 +1387,7 @@ public function withTypes(array $types): self
13871387
$this->typeMapFromList($types),
13881388
$this->stubPhpDocBlock,
13891389
null,
1390-
$this->resolvedTemplateTypeVarianceMap,
1390+
$this->resolvedCallSiteVarianceMap,
13911391
);
13921392
}
13931393

‎src/Type/ObjectType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static function createFromReflection(ClassReflection $reflection): self
126126
$reflection->typeMapToList($reflection->getActiveTemplateTypeMap()),
127127
null,
128128
null,
129-
$reflection->varianceMapToList($reflection->getActiveTemplateTypeVarianceMap()),
129+
$reflection->varianceMapToList($reflection->getCallSiteVarianceMap()),
130130
);
131131
}
132132

‎src/Type/StaticType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getStaticObjectType(): ObjectType
8585
if ($this->staticObjectType === null) {
8686
if ($this->classReflection->isGeneric()) {
8787
$typeMap = $this->classReflection->getActiveTemplateTypeMap()->map(static fn (string $name, Type $type): Type => TemplateTypeHelper::toArgument($type));
88-
$varianceMap = $this->classReflection->getActiveTemplateTypeVarianceMap();
88+
$varianceMap = $this->classReflection->getCallSiteVarianceMap();
8989
return $this->staticObjectType = new GenericObjectType(
9090
$this->classReflection->getName(),
9191
$this->classReflection->typeMapToList($typeMap),

0 commit comments

Comments
 (0)