Type::getObjectClassReflections()

phpstan · Feb 20, 2023 · 4c7046e · 4c7046e
1 parent 93113cb
commit 4c7046e
Show file tree

Hide file tree

Showing 33 changed files with 172 additions and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -484,7 +484,7 @@ parameters:
 			path: src/Rules/Comparison/ImpossibleCheckTypeHelper.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
 			count: 1
 			path: src/Rules/Comparison/ImpossibleCheckTypeHelper.php
 
@@ -904,7 +904,7 @@ parameters:
 			path: src/Type/Generic/GenericObjectType.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
 			count: 1
 			path: src/Type/Generic/GenericObjectType.php
 
@@ -1210,7 +1210,7 @@ parameters:
 			path: src/Type/Php/DefinedConstantTypeSpecifyingExtension.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
 			count: 1
 			path: src/Type/Php/DsMapDynamicReturnTypeExtension.php
 
@@ -1423,7 +1423,7 @@ parameters:
 			path: src/Type/TypeUtils.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone and deprecated\\. Use Type\\:\\:getObjectClassNames\\(\\) or Type\\:\\:getObjectClassReflections\\(\\) instead\\.$#"
 			count: 1
 			path: src/Type/TypeUtils.php
 

diff --git a/src/Rules/Api/ApiInstanceofTypeRule.php b/src/Rules/Api/ApiInstanceofTypeRule.php
@@ -51,7 +51,7 @@ class ApiInstanceofTypeRule implements Rule
 {
 
 	private const MAP = [
-		TypeWithClassName::class => 'Type::getObjectClassNames()',
+		TypeWithClassName::class => 'Type::getObjectClassNames() or Type::getObjectClassReflections()',
 		EnumCaseObjectType::class => 'Type::getEnumCases()',
 		ConstantArrayType::class => 'Type::getConstantArrays()',
 		ArrayType::class => 'Type::isArray() or Type::getArrays()',

diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -54,6 +54,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getArrays(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -55,6 +55,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -56,6 +56,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -57,6 +57,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -55,6 +55,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/HasMethodType.php b/src/Type/Accessory/HasMethodType.php
@@ -49,6 +49,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	private function getCanonicalMethodName(): string
 	{
 		return strtolower($this->methodName);

diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -67,6 +67,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -66,6 +66,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/HasPropertyType.php b/src/Type/Accessory/HasPropertyType.php
@@ -46,6 +46,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -51,6 +51,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getArrays(): array
 	{
 		return [];

diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -49,6 +49,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getArrays(): array
 	{
 		return [];

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -77,6 +77,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getArrays(): array
 	{
 		return [$this];

diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -80,6 +80,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -100,7 +100,12 @@ public function getReferencedClasses(): array
 
 	public function getObjectClassNames(): array
 	{
-		return [$this->objectType->getClassName()];
+		return $this->objectType->getObjectClassNames();
+	}
+
+	public function getObjectClassReflections(): array
+	{
+		return $this->objectType->getObjectClassReflections();
 	}
 
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic

diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -52,6 +52,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -122,6 +122,18 @@ public function getObjectClassNames(): array
 		return array_values(array_unique($objectClassNames));
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		$reflections = [];
+		foreach ($this->types as $type) {
+			foreach ($type->getObjectClassReflections() as $reflection) {
+				$reflections[] = $reflection;
+			}
+		}
+
+		return $reflections;
+	}
+
 	public function getArrays(): array
 	{
 		$arrays = [];

diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -66,6 +66,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -21,6 +21,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		return $this->acceptsWithReason($type, $strictTypes)->result;

diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -69,6 +69,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getArrays(): array
 	{
 		return [];

diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -62,6 +62,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -47,6 +47,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -236,6 +236,16 @@ public function getObjectClassNames(): array
 		return [$this->className];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		$classReflection = $this->getClassReflection();
+		if ($classReflection === null) {
+			return [];
+		}
+
+		return [$classReflection];
+	}
+
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		return $this->acceptsWithReason($type, $strictTypes)->result;

diff --git a/src/Type/ObjectWithoutClassType.php b/src/Type/ObjectWithoutClassType.php
@@ -45,6 +45,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
 		return $this->acceptsWithReason($type, $strictTypes)->result;

diff --git a/src/Type/OffsetAccessType.php b/src/Type/OffsetAccessType.php
@@ -35,6 +35,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array
 	{
 		return array_merge(

diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -109,6 +109,11 @@ public function getObjectClassNames(): array
 		return $this->getStaticObjectType()->getObjectClassNames();
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return $this->getStaticObjectType()->getObjectClassReflections();
+	}
+
 	public function getArrays(): array
 	{
 		return $this->getStaticObjectType()->getArrays();

diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
@@ -39,6 +39,11 @@ public function getObjectClassNames(): array
 		return [];
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];

diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -28,6 +28,11 @@ public function getObjectClassNames(): array
 		return $this->resolve()->getObjectClassNames();
 	}
 
+	public function getObjectClassReflections(): array
+	{
+		return $this->resolve()->getObjectClassReflections();
+	}
+
 	public function getArrays(): array
 	{
 		return $this->resolve()->getArrays();