Skip to content

Commit f6c614e

Browse files
VincentLangletVincentLanglet
committed
More
1 parent 003b829 commit f6c614e

File tree

7 files changed

+68
-77
lines changed

7 files changed

+68
-77
lines changed

‎src/Reflection/RequireExtension/RequireExtendsPropertiesClassReflectionExtension.php

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ public function hasInstanceProperty(ClassReflection $classReflection, string $pr
4444
return $this->findProperty(
4545
$classReflection,
4646
$propertyName,
47-
// TODO: Use hasInstanceProperty
48-
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasProperty($propertyName),
49-
// TODO: Use getInstanceProperty
50-
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getProperty($propertyName, new OutOfClassScope())
47+
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasInstanceProperty($propertyName),
48+
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getInstanceProperty($propertyName, new OutOfClassScope())
5149
) !== null;
5250
}
5351

@@ -56,10 +54,8 @@ public function getInstanceProperty(ClassReflection $classReflection, string $pr
5654
$property = $this->findProperty(
5755
$classReflection,
5856
$propertyName,
59-
// TODO: Use hasInstanceProperty
60-
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasProperty($propertyName),
61-
// TODO: Use getInstanceProperty
62-
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getProperty($propertyName, new OutOfClassScope())
57+
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasInstanceProperty($propertyName),
58+
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getInstanceProperty($propertyName, new OutOfClassScope())
6359
);
6460
if ($property === null) {
6561
throw new ShouldNotHappenException();
@@ -73,10 +69,8 @@ public function hasStaticProperty(ClassReflection $classReflection, string $prop
7369
return $this->findProperty(
7470
$classReflection,
7571
$propertyName,
76-
// TODO: Use hasStaticProperty
77-
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasProperty($propertyName),
78-
// TODO: Use getStaticProperty
79-
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getProperty($propertyName, new OutOfClassScope())
72+
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasStaticProperty($propertyName),
73+
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getStaticProperty($propertyName, new OutOfClassScope())
8074
) !== null;
8175
}
8276

@@ -85,10 +79,8 @@ public function getStaticProperty(ClassReflection $classReflection, string $prop
8579
$property = $this->findProperty(
8680
$classReflection,
8781
$propertyName,
88-
// TODO: Use hasStaticProperty
89-
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasProperty($propertyName),
90-
// TODO: Use getStaticProperty
91-
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getProperty($propertyName, new OutOfClassScope())
82+
static fn (Type $type, string $propertyName): TrinaryLogic => $type->hasStaticProperty($propertyName),
83+
static fn (Type $type, string $propertyName): ExtendedPropertyReflection => $type->getStaticProperty($propertyName, new OutOfClassScope())
9284
);
9385
if ($property === null) {
9486
throw new ShouldNotHappenException();

‎src/Rules/Properties/AccessPropertiesCheck.php

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
6767
$scope,
6868
NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->var),
6969
sprintf('Access to property $%s on an unknown class %%s.', SprintfHelper::escapeFormatString($name)),
70-
// TODO use hasInstanceProperty
71-
static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasProperty($name)->yes(),
70+
static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasInstanceProperty($name)->yes(),
7271
);
7372
$type = $typeResult->getType();
7473
if ($type instanceof ErrorType) {
@@ -94,8 +93,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
9493
];
9594
}
9695

97-
// TODO use hasInstanceProperty
98-
$has = $type->hasProperty($name);
96+
$has = $type->hasInstanceProperty($name);
9997
if (!$has->no() && $this->canAccessUndefinedProperties($scope, $node)) {
10098
return [];
10199
}
@@ -159,6 +157,16 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
159157
}
160158
}
161159

160+
if ($type->hasStaticProperty($name)->yes()) {
161+
return [
162+
RuleErrorBuilder::message(sprintf(
163+
'Non-static access to static property %s::$%s.',
164+
$type->getStaticProperty($name, $scope)->getDeclaringClass()->getDisplayName(),
165+
$name,
166+
))->identifier('staticProperty.nonStaticAccess')->build(),
167+
];
168+
}
169+
162170
$ruleErrorBuilder = RuleErrorBuilder::message(sprintf(
163171
'Access to an undefined property %s::$%s.',
164172
$typeForDescribe->describe(VerbosityLevel::typeOnly()),
@@ -175,18 +183,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
175183
];
176184
}
177185

178-
// TODO use getInstanceProperty
179-
$propertyReflection = $type->getProperty($name, $scope);
180-
if ($propertyReflection->isStatic()) {
181-
return [
182-
RuleErrorBuilder::message(sprintf(
183-
'Non-static access to static property %s::$%s.',
184-
$propertyReflection->getDeclaringClass()->getDisplayName(),
185-
$name,
186-
))->identifier('staticProperty.nonStaticAccess')->build(),
187-
];
188-
}
189-
186+
$propertyReflection = $type->getInstanceProperty($name, $scope);
190187
if ($write) {
191188
if ($scope->canWriteProperty($propertyReflection)) {
192189
return [];

‎src/Rules/Properties/AccessStaticPropertiesRule.php

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
151151
$scope,
152152
NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->class),
153153
sprintf('Access to static property $%s on an unknown class %%s.', SprintfHelper::escapeFormatString($name)),
154-
// TODO Use hasStaticProperty
155-
static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasProperty($name)->yes(),
154+
static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasStaticProperty($name)->yes(),
156155
);
157156
$classType = $classTypeResult->getType();
158157
if ($classType instanceof ErrorType) {
@@ -184,8 +183,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
184183
]);
185184
}
186185

187-
// TODO Use hasStaticProperty
188-
$has = $classType->hasProperty($name);
186+
$has = $classType->hasStaticProperty($name);
189187
if (!$has->no() && $scope->isUndefinedExpressionAllowed($node)) {
190188
return [];
191189
}
@@ -218,6 +216,23 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
218216
}
219217
}
220218

219+
if ($classType->hasInstanceProperty($name)->yes()) {
220+
$hasPropertyTypes = TypeUtils::getHasPropertyTypes($classType);
221+
foreach ($hasPropertyTypes as $hasPropertyType) {
222+
if ($hasPropertyType->getPropertyName() === $name) {
223+
return [];
224+
}
225+
}
226+
227+
return array_merge($messages, [
228+
RuleErrorBuilder::message(sprintf(
229+
'Static access to instance property %s::$%s.',
230+
$classType->getInstanceProperty($name, $scope)->getDeclaringClass()->getDisplayName(),
231+
$name,
232+
))->identifier('property.staticAccess')->build(),
233+
]);
234+
}
235+
221236
return array_merge($messages, [
222237
RuleErrorBuilder::message(sprintf(
223238
'Access to an undefined static property %s::$%s.',
@@ -227,25 +242,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
227242
]);
228243
}
229244

230-
// TODO Use getStaticProperty and update the if
231245
$property = $classType->getProperty($name, $scope);
232-
if (!$property->isStatic()) {
233-
$hasPropertyTypes = TypeUtils::getHasPropertyTypes($classType);
234-
foreach ($hasPropertyTypes as $hasPropertyType) {
235-
if ($hasPropertyType->getPropertyName() === $name) {
236-
return [];
237-
}
238-
}
239-
240-
return array_merge($messages, [
241-
RuleErrorBuilder::message(sprintf(
242-
'Static access to instance property %s::$%s.',
243-
$property->getDeclaringClass()->getDisplayName(),
244-
$name,
245-
))->identifier('property.staticAccess')->build(),
246-
]);
247-
}
248-
249246
if (!$scope->canReadProperty($property)) {
250247
return array_merge($messages, [
251248
RuleErrorBuilder::message(sprintf(

‎src/Type/Accessory/HasPropertyType.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
7272

7373
public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
7474
{
75+
// TODO
7576
return new IsSuperTypeOfResult($type->hasProperty($this->propertyName), []);
7677
}
7778

@@ -87,6 +88,7 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
8788
$limit = IsSuperTypeOfResult::createMaybe();
8889
}
8990

91+
// TODO
9092
return $limit->and(new IsSuperTypeOfResult($otherType->hasProperty($this->propertyName), []));
9193
}
9294

@@ -120,6 +122,26 @@ public function hasProperty(string $propertyName): TrinaryLogic
120122
return TrinaryLogic::createMaybe();
121123
}
122124

125+
// TODO
126+
public function hasInstanceProperty(string $propertyName): TrinaryLogic
127+
{
128+
if ($this->propertyName === $propertyName) {
129+
return TrinaryLogic::createYes();
130+
}
131+
132+
return TrinaryLogic::createMaybe();
133+
}
134+
135+
// TODO
136+
public function hasStaticProperty(string $propertyName): TrinaryLogic
137+
{
138+
if ($this->propertyName === $propertyName) {
139+
return TrinaryLogic::createYes();
140+
}
141+
142+
return TrinaryLogic::createMaybe();
143+
}
144+
123145
public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array
124146
{
125147
return [new TrivialParametersAcceptor()];

‎src/Type/ObjectShapeType.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,23 +137,6 @@ public function getUnresolvedInstancePropertyPrototype(string $propertyName, Cla
137137
);
138138
}
139139

140-
public function hasStaticProperty(string $propertyName): TrinaryLogic
141-
{
142-
// TODO Change the implementation
143-
return $this->hasInstanceProperty($propertyName);
144-
}
145-
146-
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
147-
{
148-
return $this->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->getTransformedProperty();
149-
}
150-
151-
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
152-
{
153-
// TODO Change the implementation
154-
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope);
155-
}
156-
157140
public function accepts(Type $type, bool $strictTypes): AcceptsResult
158141
{
159142
if ($type instanceof CompoundType) {

‎src/Type/Traits/ObjectTypeTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function hasInstanceProperty(string $propertyName): TrinaryLogic
8080

8181
public function getInstanceProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
8282
{
83-
return $this->getUnresolvedPropertyPrototype($propertyName, $scope)->getTransformedProperty();
83+
return $this->getUnresolvedInstancePropertyPrototype($propertyName, $scope)->getTransformedProperty();
8484
}
8585

8686
public function getUnresolvedInstancePropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
@@ -101,7 +101,7 @@ public function hasStaticProperty(string $propertyName): TrinaryLogic
101101

102102
public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
103103
{
104-
return $this->getUnresolvedPropertyPrototype($propertyName, $scope)->getTransformedProperty();
104+
return $this->getUnresolvedStaticPropertyPrototype($propertyName, $scope)->getTransformedProperty();
105105
}
106106

107107
public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection

‎tests/PHPStan/Type/BenevolentUnionTypeTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testCanAccessProperties(BenevolentUnionType $type, TrinaryLogic
4848
);
4949
}
5050

51-
public function dataHasProperty(): Iterator
51+
public function dataHasInstanceProperty(): Iterator
5252
{
5353
yield [
5454
new BenevolentUnionType([
@@ -75,10 +75,10 @@ public function dataHasProperty(): Iterator
7575
];
7676
}
7777

78-
/** @dataProvider dataHasProperty */
79-
public function testHasProperty(BenevolentUnionType $type, string $propertyName, TrinaryLogic $expectedResult): void
78+
/** @dataProvider dataHasInstanceProperty */
79+
public function testHasInstanceProperty(BenevolentUnionType $type, string $propertyName, TrinaryLogic $expectedResult): void
8080
{
81-
$actualResult = $type->hasProperty($propertyName);
81+
$actualResult = $type->hasInstanceProperty($propertyName);
8282
$this->assertSame(
8383
$expectedResult->describe(),
8484
$actualResult->describe(),

0 commit comments

Comments
 (0)