Fixed new $object with a template type

phpstan · Sep 16, 2021 · 956a7f4 · 956a7f4
1 parent 18adc8c
commit 956a7f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4974,12 +4974,12 @@ private function getTypeToInstantiateForNew(Type $type): Type
 			if ($type instanceof ConstantStringType) {
 				return new ObjectType($type->getValue());
 			}
-			if ($type instanceof TypeWithClassName) {
-				return $type;
-			}
 			if ($type instanceof GenericClassStringType) {
 				return $type->getGenericType();
 			}
+			if ((new ObjectWithoutClassType())->isSuperTypeOf($type)->yes()) {
+				return $type;
+			}
 			return null;
 		};
 

diff --git a/tests/PHPStan/Analyser/data/generics.php b/tests/PHPStan/Analyser/data/generics.php
@@ -1462,3 +1462,28 @@ function foooo(UnionT $foo): void
 {
 	assertType('string|null', $foo->doFoo('a'));
 }
+
+/**
+ * @template T1 of object
+ * @param T1 $type
+ * @return T1
+ */
+function newObject($type): void
+{
+	assertType('T1 of object (function PHPStan\Generics\FunctionsAssertType\newObject(), argument)', new $type);
+}
+
+function newStdClass(\stdClass $std): void
+{
+	assertType('stdClass', new $std);
+}
+
+/**
+ * @template T1 of object
+ * @param class-string<T1> $type
+ * @return T1
+ */
+function newClassString($type): void
+{
+	assertType('T1 of object (function PHPStan\Generics\FunctionsAssertType\newClassString(), argument)', new $type);
+}