update for latest PHPStan's getType on properties

nextras · Mar 23, 2024 · 9ba5388 · 9ba5388
1 parent d0b92fb
commit 9ba5388
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Reflection/EntityDateTimePropertyReflectionExtension.php b/src/Reflection/EntityDateTimePropertyReflectionExtension.php
@@ -8,6 +8,7 @@
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\TypeCombinator;
@@ -29,7 +30,10 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 			return false;
 		}
 
-		$propertyType = TypeCombinator::removeNull($property->getType()); // remove null to properly match subtype
+		$type = $property->getReadableType() ?? $property->getWritableType();
+		if ($type === null) throw new ShouldNotHappenException();
+
+		$propertyType = TypeCombinator::removeNull($type); // remove null to properly match subtype
 		$dateTimeType = new ObjectType(\DateTimeImmutable::class);
 		$hasDateTime = $dateTimeType->isSuperTypeOf($propertyType)->yes();
 
@@ -40,14 +44,14 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
 	{
 		$property = $classReflection->getPropertyTags()[$propertyName] ?? null;
-		if ($property === null) {
+		if ($property === null || $property->getReadableType() === null) {
 			throw new ShouldNotHappenException();
 		}
 
 		return new AnnotationPropertyReflection(
 			$classReflection,
-			$property->getType(),
-			TypeCombinator::union($property->getType(), new StringType()),
+			$property->getReadableType(),
+			TypeCombinator::union($property->getWritableType() ?? new NeverType(), new StringType()),
 			$property->isReadable(),
 			$property->isWritable()
 		);

diff --git a/src/Reflection/EntityRelationshipPropertyReflectionExtension.php b/src/Reflection/EntityRelationshipPropertyReflectionExtension.php
@@ -9,6 +9,7 @@
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\TypeCombinator;
 
 
@@ -41,14 +42,14 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
 	{
 		$property = $classReflection->getPropertyTags()[$propertyName] ?? null;
-		if ($property === null) {
+		if ($property === null || $property->getReadableType() === null) {
 			throw new ShouldNotHappenException();
 		}
 
 		return new AnnotationPropertyReflection(
 			$classReflection,
-			$property->getType(),
-			TypeCombinator::union($property->getType(), new IntegerType()),
+			$property->getReadableType(),
+			TypeCombinator::union($property->getWritableType() ?? new NeverType(), new IntegerType()),
 			$property->isReadable(),
 			$property->isWritable()
 		);