2914 Fix a test

phpstan · May 10, 2020 · a66d6b1 · a66d6b1
1 parent dfd3c63
commit a66d6b1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 7 deletions.
diff --git a/src/PhpDoc/PhpDocBlock.php b/src/PhpDoc/PhpDocBlock.php
@@ -346,12 +346,6 @@ private static function resolvePhpDocBlockFromClass(
 			if ($parentReflection->isPrivate()) {
 				return null;
 			}
-			if (
-				!$parentReflection->getDeclaringClass()->isTrait()
-				&& $parentReflection->getDeclaringClass()->getName() !== $classReflection->getName()
-			) {
-				return null;
-			}
 
 			if ($parentReflection instanceof PhpPropertyReflection || $parentReflection instanceof ResolvedPropertyReflection) {
 				$traitReflection = $parentReflection->getDeclaringTrait();

diff --git a/tests/PHPStan/Analyser/data/generics.php b/tests/PHPStan/Analyser/data/generics.php
@@ -1280,3 +1280,43 @@ function arrayOfGenericClassStrings(array $a): void
 {
 	assertType('array<class-string<PHPStan\Generics\FunctionsAssertType\Foo>>', $a);
 }
+
+/**
+ * @template T
+ */
+class TagMergingGrandparent
+{
+	/** @var T */
+	public $property;
+
+	/**
+	 * @param T $one
+	 * @param int $two
+	 */
+	public function method($one, $two): void {}
+}
+
+/**
+ * @template TT
+ * @extends TagMergingGrandparent<TT>
+ */
+class TagMergingParent extends TagMergingGrandparent
+{
+	/**
+	 * @param TT $one
+	 */
+	public function method($one, $two): void {}
+}
+
+/**
+ * @extends TagMergingParent<float>
+ */
+class TagMergingChild extends TagMergingParent
+{
+	public function method($one, $two): void
+	{
+		assertType('float', $one);
+		assertType('int', $two);
+		assertType('float', $this->property);
+	}
+}
diff --git a/tests/PHPStan/Analyser/data/inherit-phpdoc-merging-var.php b/tests/PHPStan/Analyser/data/inherit-phpdoc-merging-var.php
@@ -66,7 +66,7 @@ class Six extends Five
 
 	public function method(): void
 	{
-		// assertType('InheritDocMergingVar\B', $this->property);
+		assertType('InheritDocMergingVar\B', $this->property);
 	}
 }