Skip to content

Commit e9fe52f

Browse files
VincentLangletondrejmirtes
VincentLanglet
authored and
ondrejmirtes
committed
Introduce new methods
1 parent 3a4f9e0 commit e9fe52f

20 files changed

+838
-6
lines changed

‎src/Analyser/MutatingScope.php‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6204,7 +6204,10 @@ private function methodCallReturnType(Type $typeWithMethod, string $methodName,
62046204
return $this->transformVoidToNull($parametersAcceptor->getReturnType(), $methodCall);
62056205
}
62066206

6207-
/** @api */
6207+
/**
6208+
* @api
6209+
* @deprecated Use getInstancePropertyReflection or getStaticPropertyReflection instead
6210+
*/
62086211
public function getPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection
62096212
{
62106213
if ($typeWithProperty instanceof UnionType) {
@@ -6217,6 +6220,32 @@ public function getPropertyReflection(Type $typeWithProperty, string $propertyNa
62176220
return $typeWithProperty->getProperty($propertyName, $this);
62186221
}
62196222

6223+
/** @api */
6224+
public function getInstancePropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection
6225+
{
6226+
if ($typeWithProperty instanceof UnionType) {
6227+
$typeWithProperty = $typeWithProperty->filterTypes(static fn (Type $innerType) => $innerType->hasInstanceProperty($propertyName)->yes());
6228+
}
6229+
if (!$typeWithProperty->hasInstanceProperty($propertyName)->yes()) {
6230+
return null;
6231+
}
6232+
6233+
return $typeWithProperty->getInstanceProperty($propertyName, $this);
6234+
}
6235+
6236+
/** @api */
6237+
public function getStaticPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection
6238+
{
6239+
if ($typeWithProperty instanceof UnionType) {
6240+
$typeWithProperty = $typeWithProperty->filterTypes(static fn (Type $innerType) => $innerType->hasStaticProperty($propertyName)->yes());
6241+
}
6242+
if (!$typeWithProperty->hasStaticProperty($propertyName)->yes()) {
6243+
return null;
6244+
}
6245+
6246+
return $typeWithProperty->getStaticProperty($propertyName, $this);
6247+
}
6248+
62206249
/**
62216250
* @param PropertyFetch|Node\Expr\StaticPropertyFetch $propertyFetch
62226251
*/

‎src/Analyser/Scope.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ public function getMaybeDefinedVariables(): array;
7575

7676
public function hasConstant(Name $name): bool;
7777

78+
/** @deprecated Use getInstancePropertyReflection or getStaticPropertyReflection instead */
7879
public function getPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection;
7980

81+
public function getInstancePropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection;
82+
83+
public function getStaticPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection;
84+
8085
public function getMethodReflection(Type $typeWithMethod, string $methodName): ?ExtendedMethodReflection;
8186

8287
public function getConstantReflection(Type $typeWithConstant, string $constantName): ?ClassConstantReflection;

‎src/Type/ClosureType.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,36 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
316316
return $this->objectType->getUnresolvedPropertyPrototype($propertyName, $scope);
317317
}
318318

319+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
320+
{
321+
return $this->objectType->hasInstanceProperty($propertyName);
322+
}
323+
324+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
325+
{
326+
return $this->objectType->getInstanceProperty($propertyName, $scope);
327+
}
328+
329+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
330+
{
331+
return $this->objectType->getUnresolvedInstancePropertyPrototype($propertyName, $scope);
332+
}
333+
334+
public function hasStaticProperty(string $propertyName): TrinaryLogic
335+
{
336+
return $this->objectType->hasStaticProperty($propertyName);
337+
}
338+
339+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
340+
{
341+
return $this->objectType->getStaticProperty($propertyName, $scope);
342+
}
343+
344+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
345+
{
346+
return $this->objectType->getUnresolvedStaticPropertyPrototype($propertyName, $scope);
347+
}
348+
319349
public function canCallMethods(): TrinaryLogic
320350
{
321351
return $this->objectType->canCallMethods();

‎src/Type/Enum/EnumCaseObjectType.php‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
99
use PHPStan\Reflection\ClassMemberAccessAnswerer;
1010
use PHPStan\Reflection\ClassReflection;
11+
use PHPStan\Reflection\ExtendedPropertyReflection;
1112
use PHPStan\Reflection\Php\EnumPropertyReflection;
1213
use PHPStan\Reflection\Php\EnumUnresolvedPropertyPrototypeReflection;
1314
use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
@@ -127,10 +128,15 @@ public function tryRemove(Type $typeToRemove): ?Type
127128
}
128129

129130
public function getUnresolvedPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
131+
{
132+
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope);
133+
}
134+
135+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
130136
{
131137
$classReflection = $this->getClassReflection();
132138
if ($classReflection === null) {
133-
return parent::getUnresolvedPropertyPrototype($propertyName, $scope);
139+
return parent::getUnresolvedInstancePropertyPrototype($propertyName, $scope);
134140

135141
}
136142
if ($propertyName === 'name') {
@@ -153,7 +159,22 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
153159
}
154160
}
155161

156-
return parent::getUnresolvedPropertyPrototype($propertyName, $scope);
162+
return parent::getUnresolvedInstancePropertyPrototype($propertyName, $scope);
163+
}
164+
165+
public function hasStaticProperty(string $propertyName): TrinaryLogic
166+
{
167+
return TrinaryLogic::createNo();
168+
}
169+
170+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
171+
{
172+
throw new ShouldNotHappenException();
173+
}
174+
175+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
176+
{
177+
throw new ShouldNotHappenException();
157178
}
158179

159180
public function getBackingValueType(): ?Type

‎src/Type/Generic/GenericObjectType.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,30 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
232232
return $prototype->doNotResolveTemplateTypeMapToBounds();
233233
}
234234

235+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
236+
{
237+
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope)->getTransformedProperty();
238+
}
239+
240+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
241+
{
242+
$prototype = parent::getUnresolvedInstancePropertyPrototype($propertyName, $scope);
243+
244+
return $prototype->doNotResolveTemplateTypeMapToBounds();
245+
}
246+
247+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
248+
{
249+
return $this->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->getTransformedProperty();
250+
}
251+
252+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
253+
{
254+
$prototype = parent::getUnresolvedStaticPropertyPrototype($propertyName, $scope);
255+
256+
return $prototype->doNotResolveTemplateTypeMapToBounds();
257+
}
258+
235259
public function getMethod(string $methodName, ClassMemberAccessAnswerer $scope): ExtendedMethodReflection
236260
{
237261
return $this->getUnresolvedMethodPrototype($methodName, $scope)->getTransformedMethod();

‎src/Type/IntersectionType.php‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,72 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
538538
return new IntersectionTypeUnresolvedPropertyPrototypeReflection($propertyName, $propertyPrototypes);
539539
}
540540

541+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
542+
{
543+
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->hasInstanceProperty($propertyName));
544+
}
545+
546+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
547+
{
548+
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope)->getTransformedProperty();
549+
}
550+
551+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
552+
{
553+
$propertyPrototypes = [];
554+
foreach ($this->types as $type) {
555+
if (!$type->hasProperty($propertyName)->yes()) {
556+
continue;
557+
}
558+
559+
$propertyPrototypes[] = $type->getUnresolvedInstancePropertyPrototype($propertyName, $scope)->withFechedOnType($this);
560+
}
561+
562+
$propertiesCount = count($propertyPrototypes);
563+
if ($propertiesCount === 0) {
564+
throw new ShouldNotHappenException();
565+
}
566+
567+
if ($propertiesCount === 1) {
568+
return $propertyPrototypes[0];
569+
}
570+
571+
return new IntersectionTypeUnresolvedPropertyPrototypeReflection($propertyName, $propertyPrototypes);
572+
}
573+
574+
public function hasStaticProperty(string $propertyName): TrinaryLogic
575+
{
576+
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->hasStaticProperty($propertyName));
577+
}
578+
579+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
580+
{
581+
return $this->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->getTransformedProperty();
582+
}
583+
584+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
585+
{
586+
$propertyPrototypes = [];
587+
foreach ($this->types as $type) {
588+
if (!$type->hasStaticProperty($propertyName)->yes()) {
589+
continue;
590+
}
591+
592+
$propertyPrototypes[] = $type->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->withFechedOnType($this);
593+
}
594+
595+
$propertiesCount = count($propertyPrototypes);
596+
if ($propertiesCount === 0) {
597+
throw new ShouldNotHappenException();
598+
}
599+
600+
if ($propertiesCount === 1) {
601+
return $propertyPrototypes[0];
602+
}
603+
604+
return new IntersectionTypeUnresolvedPropertyPrototypeReflection($propertyName, $propertyPrototypes);
605+
}
606+
541607
public function canCallMethods(): TrinaryLogic
542608
{
543609
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->canCallMethods());

‎src/Type/MixedType.php‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,48 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
422422
);
423423
}
424424

425+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
426+
{
427+
return TrinaryLogic::createYes();
428+
}
429+
430+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
431+
{
432+
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope)->getTransformedProperty();
433+
}
434+
435+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
436+
{
437+
$property = new DummyPropertyReflection();
438+
return new CallbackUnresolvedPropertyPrototypeReflection(
439+
$property,
440+
$property->getDeclaringClass(),
441+
false,
442+
static fn (Type $type): Type => $type,
443+
);
444+
}
445+
446+
public function hasStaticProperty(string $propertyName): TrinaryLogic
447+
{
448+
return TrinaryLogic::createYes();
449+
}
450+
451+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
452+
{
453+
return $this->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->getTransformedProperty();
454+
}
455+
456+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
457+
{
458+
$property = new DummyPropertyReflection();
459+
return new CallbackUnresolvedPropertyPrototypeReflection(
460+
$property,
461+
$property->getDeclaringClass(),
462+
false,
463+
static fn (Type $type): Type => $type,
464+
);
465+
}
466+
425467
public function canCallMethods(): TrinaryLogic
426468
{
427469
return TrinaryLogic::createYes();

‎src/Type/NeverType.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,36 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
138138
throw new ShouldNotHappenException();
139139
}
140140

141+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
142+
{
143+
return TrinaryLogic::createNo();
144+
}
145+
146+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
147+
{
148+
throw new ShouldNotHappenException();
149+
}
150+
151+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
152+
{
153+
throw new ShouldNotHappenException();
154+
}
155+
156+
public function hasStaticProperty(string $propertyName): TrinaryLogic
157+
{
158+
return TrinaryLogic::createNo();
159+
}
160+
161+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
162+
{
163+
throw new ShouldNotHappenException();
164+
}
165+
166+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
167+
{
168+
throw new ShouldNotHappenException();
169+
}
170+
141171
public function canCallMethods(): TrinaryLogic
142172
{
143173
return TrinaryLogic::createYes();

‎src/Type/NonexistentParentClassType.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,36 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
7777
throw new ShouldNotHappenException();
7878
}
7979

80+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
81+
{
82+
return TrinaryLogic::createNo();
83+
}
84+
85+
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
86+
{
87+
throw new ShouldNotHappenException();
88+
}
89+
90+
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
91+
{
92+
throw new ShouldNotHappenException();
93+
}
94+
95+
public function hasStaticProperty(string $propertyName): TrinaryLogic
96+
{
97+
return TrinaryLogic::createNo();
98+
}
99+
100+
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
101+
{
102+
throw new ShouldNotHappenException();
103+
}
104+
105+
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
106+
{
107+
throw new ShouldNotHappenException();
108+
}
109+
80110
public function canCallMethods(): TrinaryLogic
81111
{
82112
return TrinaryLogic::createNo();

0 commit comments

Comments
 (0)