Regression tests

Closes phpstan/phpstan#3034
Closes phpstan/phpstan#3117

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -406,4 +406,19 @@ public function testBug1903(): void
 		]);
 	}
 
+	public function testBug3117(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3117.php'], [
+			[
+				'Method Bug3117\SimpleTemporal::adjustInto() should return T of Bug3117\Temporal but returns $this(Bug3117\SimpleTemporal).',
+				35,
+			],
+		]);
+	}
+
+	public function testBug3034(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3034.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-3034.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Bug3034;
+
+/**
+ * @implements \IteratorAggregate<int, array{name: string, value: string}>
+ */
+class HelloWorld implements \IteratorAggregate
+{
+	/**
+	 * @var array<int, array{name: string, value: string}>
+	 */
+	private $list;
+
+	/**
+	 * @return \ArrayIterator<int, array{name: string, value: string}>
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->list);
+	}
+}

tests/PHPStan/Rules/Methods/data/bug-3117.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Bug3117;
+
+interface Temporal
+{
+
+	/**
+	 * @return static
+	 */
+	public function adjustedWith(TemporalAdjuster $adjuster): Temporal;
+
+}
+
+interface TemporalAdjuster
+{
+
+	/**
+	 * @template T of Temporal
+	 *
+	 * @param T $temporal
+	 *
+	 * @return T
+	 */
+	public function adjustInto(Temporal $temporal) : Temporal;
+
+}
+
+final class SimpleTemporal implements Temporal, TemporalAdjuster
+{
+
+	public function adjustInto(Temporal $temporal): Temporal
+	{
+		if ($temporal instanceof self) {
+			return $this;
+		}
+
+		return $temporal->adjustedWith($this);
+	}
+
+	/**
+	 * @return static
+	 */
+	public function adjustedWith(TemporalAdjuster $adjuster): Temporal
+	{
+		return $this;
+	}
+
+}