Reworked tests

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -9869,6 +9869,15 @@ public function dataBug3009(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3009.php');
 	}
 
+	public function dataInheritPhpDocMerging(): array
+	{
+		return array_merge(
+			$this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-var.php'),
+			$this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-param.php'),
+			$this->gatherAssertTypes(__DIR__ . '/data/inherit-phpdoc-merging-return.php')
+		);
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9912,6 +9921,7 @@ public function dataBug3009(): array
 	 * @dataProvider dataBug2001
 	 * @dataProvider dataBug2232
 	 * @dataProvider dataBug3009
+	 * @dataProvider dataInheritPhpDocMerging
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */

tests/PHPStan/Analyser/data/inherit-phpdoc-merging-param.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types = 1);
+
+namespace InheritDocMergingParam;
+
+use function PHPStan\Analyser\assertType;
+
+class A {}
+class B extends A {}
+class C extends B {}
+
+class GrandparentClass
+{
+	/** @param A $one */
+	public function method($one, $two): void {}
+}
+
+class ParentClass extends GrandparentClass
+{
+	/** @param B $dos */
+	public function method($uno, $dos): void
+	{
+		assertType('InheritDocMergingParam\A', $uno);
+		assertType('InheritDocMergingParam\B', $dos);
+	}
+}
+
+class ChildClass extends ParentClass
+{
+	/** @param C $one */
+	public function method($one, $two): void
+	{
+		assertType('InheritDocMergingParam\C', $one);
+		assertType('InheritDocMergingParam\B', $two);
+	}
+
+}

tests/PHPStan/Analyser/data/inherit-phpdoc-merging-return.php

@@ -0,0 +1,60 @@
+<?php declare(strict_types = 1);
+
+namespace InheritDocMergingReturn;
+
+use function PHPStan\Analyser\assertType;
+
+class A {}
+class B extends A {}
+class C extends B {}
+class D extends A {}
+
+class GrandparentClass
+{
+	/** @return B */
+	public function method() { return new B(); }
+}
+
+interface InterfaceC
+{
+	/** @return C */
+	public function method();
+}
+
+interface InterfaceA
+{
+	/** @return A */
+	public function method();
+}
+
+class ParentClass extends GrandparentClass implements InterfaceC, InterfaceA
+{
+	/** Some comment */
+	public function method() { }
+}
+
+class ChildClass extends ParentClass
+{
+	public function method() { }
+}
+
+class ChildClass2 extends ParentClass
+{
+	/**
+	 * @return D
+	 */
+	public function method() { }
+}
+
+
+function (ParentClass $foo): void {
+	assertType('InheritDocMergingReturn\C', $foo->method());
+};
+
+function (ChildClass $foo): void {
+	assertType('InheritDocMergingReturn\C', $foo->method());
+};
+
+function (ChildClass2 $foo): void {
+	assertType('InheritDocMergingReturn\D', $foo->method());
+};

tests/PHPStan/Analyser/data/inherit-phpdoc-merging-var.php

@@ -0,0 +1,82 @@
+<?php declare(strict_types = 1);
+
+namespace InheritDocMergingVar;
+
+use function PHPStan\Analyser\assertType;
+
+class A {}
+class B extends A {}
+
+class One
+{
+	/** @var A */
+	protected $property;
+
+	public function method(): void
+	{
+		assertType('InheritDocMergingVar\A', $this->property);
+	}
+}
+
+class Two extends One
+{
+	/** @var B */
+	protected $property;
+
+	public function method(): void
+	{
+		assertType('InheritDocMergingVar\B', $this->property);
+	}
+}
+
+class Three extends Two
+{
+	/** Some comment */
+	protected $property;
+
+	public function method(): void
+	{
+		assertType('InheritDocMergingVar\B', $this->property);
+	}
+}
+
+class Four extends Three
+{
+	protected $property;
+
+	public function method(): void
+	{
+		assertType('InheritDocMergingVar\B', $this->property);
+	}
+}
+
+class Five extends Four
+{
+
+	public function method(): void
+	{
+		assertType('InheritDocMergingVar\B', $this->property);
+	}
+
+}
+
+class Six extends Five
+{
+	protected $property;
+
+	public function method(): void
+	{
+		// assertType('InheritDocMergingVar\B', $this->property);
+	}
+}
+
+class Seven extends One
+{
+
+	/**
+	 * @inheritDoc
+	 * @var B
+	 */
+	protected $property;
+
+}