Remove tentative return types

ondrejmirtes · ondrejmirtes · commit eb23e720f43d · 2022-04-17T22:50:53.000+02:00
diff --git a/extractor/extract.php b/extractor/extract.php
@@ -360,6 +360,11 @@ private function compareStatementsInNamespace(array $oldStmts, array $newStmts,
 	 */
 	private function compareFunctions(Node\FunctionLike $old, Node\FunctionLike $new, string $updateTo): array
 	{
+		if ($old->getReturnType() === null && $new->getReturnType() !== null) {
+			if ($new->getDocComment() !== null && strpos($new->getDocComment()->getText(), '@tentative-return-type') !== 0) {
+				$new->returnType = null; // @phpstan-ignore-line
+			}
+		}
 		if ($this->printType($old->getReturnType()) !== $this->printType($new->getReturnType())) {
 			return $this->functionDiff($old, $new, $updateTo);
 		}

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,11 @@ private function compareStatementsInNamespace(array $oldStmts, array $newStmts,`
`360`	`360`	`*/`
`361`	`361`	`private function compareFunctions(Node\FunctionLike $old, Node\FunctionLike $new, string $updateTo): array`
`362`	`362`	`{`
	`363`	`+ if ($old->getReturnType() === null && $new->getReturnType() !== null) {`
	`364`	`+ if ($new->getDocComment() !== null && strpos($new->getDocComment()->getText(), '@tentative-return-type') !== 0) {`
	`365`	`+ $new->returnType = null; // @phpstan-ignore-line`
	`366`	`+ }`
	`367`	`+ }`
`363`	`368`	`if ($this->printType($old->getReturnType()) !== $this->printType($new->getReturnType())) {`
`364`	`369`	`return $this->functionDiff($old, $new, $updateTo);`
`365`	`370`	`}`