Solve todo

Author: VincentLanglet

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -218,7 +218,6 @@ public function getNativeProperty(ClassReflection $classReflection, string $prop
 		return $this->nativeProperties[$classReflection->getCacheKey()][$propertyName];
 	}
 
-	// TODO: Find the difference between createInstanceProperty and createStaticProperty
 	private function createProperty(
 		ClassReflection $classReflection,
 		string $propertyName,

src/Type/Accessory/HasPropertyType.php

@@ -72,8 +72,10 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 	{
-		// TODO
-		return new IsSuperTypeOfResult($type->hasProperty($this->propertyName), []);
+		return new IsSuperTypeOfResult(
+			$type->hasInstanceProperty($this->propertyName)->or($type->hasStaticProperty($this->propertyName)),
+			[],
+		);
 	}
 
 	public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
@@ -88,8 +90,10 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 			$limit = IsSuperTypeOfResult::createMaybe();
 		}
 
-		// TODO
-		return $limit->and(new IsSuperTypeOfResult($otherType->hasProperty($this->propertyName), []));
+		return $limit->and(new IsSuperTypeOfResult(
+			$otherType->hasInstanceProperty($this->propertyName)->or($otherType->hasStaticProperty($this->propertyName)),
+			[],
+		));
 	}
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult
@@ -117,7 +121,6 @@ public function hasProperty(string $propertyName): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	// TODO
 	public function hasInstanceProperty(string $propertyName): TrinaryLogic
 	{
 		if ($this->propertyName === $propertyName) {
@@ -127,7 +130,6 @@ public function hasInstanceProperty(string $propertyName): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	// TODO
 	public function hasStaticProperty(string $propertyName): TrinaryLogic
 	{
 		if ($this->propertyName === $propertyName) {

src/Type/ObjectShapeType.php

@@ -137,6 +137,21 @@ public function getUnresolvedInstancePropertyPrototype(string $propertyName, Cla
 		);
 	}
 
+	public function hasStaticProperty(string $propertyName): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function getStaticProperty(string $propertyName, ClassMemberAccessAnswerer $scope): ExtendedPropertyReflection
+	{
+		throw new ShouldNotHappenException();
+	}
+
+	public function getUnresolvedStaticPropertyPrototype(string $propertyName, ClassMemberAccessAnswerer $scope): UnresolvedPropertyPrototypeReflection
+	{
+		throw new ShouldNotHappenException();
+	}
+
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
 		if ($type instanceof CompoundType) {