[BCB] Removed MissingClosureNativeReturnTypehintRule, no longer neede…

…d thanks to type inference
phpstan · Sep 12, 2021 · 1c34d8d · 1c34d8d
1 parent 1baa294
commit 1c34d8d
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 286 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/config.level0.neon b/conf/config.level0.neon
@@ -1,6 +1,5 @@
 parameters:
 	customRulesetUsed: false
-	missingClosureNativeReturnCheckObjectTypehint: false
 
 conditionalTags:
 	PHPStan\Rules\Api\ApiInstantiationRule:
@@ -23,18 +22,13 @@ conditionalTags:
 		phpstan.rules.rule: %featureToggles.classConstants%
 	PHPStan\Rules\Functions\ClosureUsesThisRule:
 		phpstan.rules.rule: %featureToggles.closureUsesThis%
-	PHPStan\Rules\Missing\MissingClosureNativeReturnTypehintRule:
-		phpstan.rules.rule: %checkMissingClosureNativeReturnTypehintRule%
 	PHPStan\Rules\Whitespace\FileWhitespaceRule:
 		phpstan.rules.rule: %featureToggles.fileWhitespace%
 	PHPStan\Rules\Properties\UninitializedPropertyRule:
 		phpstan.rules.rule: %checkUninitializedProperties%
 	PHPStan\Rules\Properties\OverridingPropertyRule:
 		phpstan.rules.rule: %featureToggles.overridingProperty%
 
-parametersSchema:
-	missingClosureNativeReturnCheckObjectTypehint: bool()
-
 rules:
 	- PHPStan\Rules\Arrays\DuplicateKeysInLiteralArraysRule
 	- PHPStan\Rules\Arrays\EmptyArrayItemRule
@@ -162,11 +156,6 @@ services:
 		tags:
 			- phpstan.rules.rule
 
-	-
-		class: PHPStan\Rules\Missing\MissingClosureNativeReturnTypehintRule
-		arguments:
-			checkObjectTypehint: %missingClosureNativeReturnCheckObjectTypehint%
-
 	-
 		class: PHPStan\Rules\Missing\MissingReturnRule
 		arguments:

diff --git a/conf/config.neon b/conf/config.neon
@@ -73,7 +73,6 @@ parameters:
 	checkPhpDocMissingReturn: false
 	checkPhpDocMethodSignatures: false
 	checkExtraArguments: false
-	checkMissingClosureNativeReturnTypehintRule: false
 	checkMissingTypehints: false
 	checkTooWideReturnTypesInProtectedAndPublicMethods: false
 	checkUninitializedProperties: false
@@ -255,7 +254,6 @@ parametersSchema:
 	checkPhpDocMissingReturn: bool()
 	checkPhpDocMethodSignatures: bool()
 	checkExtraArguments: bool()
-	checkMissingClosureNativeReturnTypehintRule: bool()
 	checkMissingTypehints: bool()
 	checkTooWideReturnTypesInProtectedAndPublicMethods: bool()
 	checkUninitializedProperties: bool()

diff --git a/src/Rules/Missing/MissingClosureNativeReturnTypehintRule.php b/src/Rules/Missing/MissingClosureNativeReturnTypehintRule.php
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -504,6 +504,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5615.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array_map_multiple.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/range-numeric-string.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/missing-closure-native-return-typehint.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/missing-closure-native-return-typehint.php b/tests/PHPStan/Analyser/data/missing-closure-native-return-typehint.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace MissingClosureNativeReturnTypehint;
+
+class Foo
+{
+
+	public function doFoo()
+	{
+		\PHPStan\Testing\assertType('void', (function () {
+
+		})());
+		\PHPStan\Testing\assertType('void', (function () {
+			return;
+		})());
+		\PHPStan\Testing\assertType('Generator<int, 1, mixed, void>', (function (bool $bool) {
+			if ($bool) {
+				return;
+			} else {
+				yield 1;
+			}
+		})());
+		\PHPStan\Testing\assertType('1|null', (function (bool $bool) {
+			if ($bool) {
+				return;
+			} else {
+				return 1;
+			}
+		})());
+		\PHPStan\Testing\assertType('1', (function (): int {
+			return 1;
+		})());
+		\PHPStan\Testing\assertType('1|null', (function (bool $bool) {
+			if ($bool) {
+				return null;
+			} else {
+				return 1;
+			}
+		})());
+		\PHPStan\Testing\assertType('1', (function (bool $bool) {
+			if ($bool) {
+				return 1;
+			}
+		})());
+
+		\PHPStan\Testing\assertType('array(\'foo\' => \'bar\')', (function () {
+			$array = [
+				'foo' => 'bar',
+			];
+
+			return $array;
+		})());
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Missing/MissingClosureNativeReturnTypehintRuleTest.php b/tests/PHPStan/Rules/Missing/MissingClosureNativeReturnTypehintRuleTest.php