Bleeding edge - consider implicit throw points when the only explicit…

… one is Throw_
phpstan · Aug 21, 2024 · 22eef6d · 22eef6d
1 parent 1fcae1c
commit 22eef6d
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 7 deletions.
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -60,5 +60,6 @@ parameters:
 		validatePregQuote: true
 		noImplicitWildcard: true
 		tooWidePropertyType: true
+		explicitThrow: true
 	stubFiles:
 		- ../stubs/bleedingEdge/Rule.stub
diff --git a/conf/config.neon b/conf/config.neon
@@ -96,6 +96,7 @@ parameters:
 		noImplicitWildcard: false
 		narrowPregMatches: true
 		tooWidePropertyType: false
+		explicitThrow: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false
@@ -538,6 +539,7 @@ services:
 			universalObjectCratesClasses: %universalObjectCratesClasses%
 			paramOutType: %featureToggles.paramOutType%
 			preciseMissingReturn: %featureToggles.preciseMissingReturn%
+			explicitThrow: %featureToggles.explicitThrow%
 
 	-
 		class: PHPStan\Analyser\ConstantResolver

diff --git a/conf/parametersSchema.neon b/conf/parametersSchema.neon
@@ -91,6 +91,7 @@ parametersSchema:
 		noImplicitWildcard: bool()
 		narrowPregMatches: bool()
 		tooWidePropertyType: bool()
+		explicitThrow: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -262,6 +262,7 @@ public function __construct(
 		private readonly bool $detectDeadTypeInMultiCatch,
 		private readonly bool $paramOutType,
 		private readonly bool $preciseMissingReturn,
+		private readonly bool $explicitThrow,
 	)
 	{
 		$earlyTerminatingMethodNames = [];
@@ -1545,6 +1546,7 @@ private function processStmtNode(
 				}
 
 				// explicit only
+				$onlyExplicitIsThrow = true;
 				if (count($matchingThrowPoints) === 0) {
 					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
 						foreach ($catchTypes as $catchTypeIndex => $catchTypeItem) {
@@ -1556,13 +1558,24 @@ private function processStmtNode(
 							if (!$throwPoint->isExplicit()) {
 								continue;
 							}
+							$throwNode = $throwPoint->getNode();
+							if (
+								!$throwNode instanceof Throw_
+								&& !$throwNode instanceof Expr\Throw_
+								&& !($throwNode instanceof Node\Stmt\Expression && $throwNode->expr instanceof Expr\Throw_)
+							) {
+								$onlyExplicitIsThrow = false;
+							}
 							$matchingThrowPoints[$throwPointIndex] = $throwPoint;
 						}
 					}
 				}
 
 				// implicit only
-				if (count($matchingThrowPoints) === 0) {
+				if (
+					count($matchingThrowPoints) === 0
+					|| ($this->explicitThrow && $onlyExplicitIsThrow)
+				) {
 					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
 						if ($throwPoint->isExplicit()) {
 							continue;

diff --git a/src/Testing/RuleTestCase.php b/src/Testing/RuleTestCase.php
@@ -107,6 +107,7 @@ private function getAnalyser(DirectRuleRegistry $ruleRegistry): Analyser
 				self::getContainer()->getParameter('featureToggles')['detectDeadTypeInMultiCatch'],
 				self::getContainer()->getParameter('featureToggles')['paramOutType'],
 				self::getContainer()->getParameter('featureToggles')['preciseMissingReturn'],
+				self::getContainer()->getParameter('featureToggles')['explicitThrow'],
 			);
 			$fileAnalyser = new FileAnalyser(
 				$this->createScopeFactory($reflectionProvider, $typeSpecifier),

diff --git a/src/Testing/TypeInferenceTestCase.php b/src/Testing/TypeInferenceTestCase.php
@@ -87,6 +87,7 @@ public static function processFile(
 			self::getContainer()->getParameter('featureToggles')['detectDeadTypeInMultiCatch'],
 			self::getContainer()->getParameter('featureToggles')['paramOutType'],
 			self::getContainer()->getParameter('featureToggles')['preciseMissingReturn'],
+			self::getContainer()->getParameter('featureToggles')['explicitThrow'],
 		);
 		$resolver->setAnalysedFiles(array_map(static fn (string $file): string => $fileHelper->normalizePath($file), array_merge([$file], static::getAdditionalAnalysedFiles())));
 

diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php
@@ -743,6 +743,7 @@ private function createAnalyser(bool $enableIgnoreErrorsWithinPhpDocs): Analyser
 			self::getContainer()->getParameter('featureToggles')['detectDeadTypeInMultiCatch'],
 			self::getContainer()->getParameter('featureToggles')['paramOutType'],
 			self::getContainer()->getParameter('featureToggles')['preciseMissingReturn'],
+			self::getContainer()->getParameter('featureToggles')['explicitThrow'],
 		);
 		$lexer = new Lexer(['usedAttributes' => ['comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos']]);
 		$fileAnalyser = new FileAnalyser(

diff --git a/tests/PHPStan/Analyser/nsrt/bug-4879.php b/tests/PHPStan/Analyser/nsrt/bug-4879.php
@@ -33,7 +33,7 @@ public function sayHello2(bool $bool1): void
 
 			$this->test();
 		} catch (\Exception $ex) {
-			assertVariableCertainty(TrinaryLogic::createNo(), $var);
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $var);
 		}
 	}
 

diff --git a/tests/PHPStan/Analyser/nsrt/explicit-throws.php b/tests/PHPStan/Analyser/nsrt/explicit-throws.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace ExplicitThrows;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Testing\assertVariableCertainty;
+
+class Foo
+{
+
+	public function doFoo(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			throw new \InvalidArgumentException();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+		}
+	}
+
+	public function doBar(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			$this->throwInvalidArgument();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createYes(), $a);
+		}
+	}
+
+	public function doBaz(): void
+	{
+		try {
+			doFoo();
+			$a = 1;
+			$this->throwInvalidArgument();
+			throw new \InvalidArgumentException();
+		} catch (\InvalidArgumentException $e) {
+			assertVariableCertainty(TrinaryLogic::createYes(), $a);
+		}
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 */
+	private function throwInvalidArgument(): void
+	{
+
+	}
+
+}
diff --git a/tests/PHPStan/Analyser/nsrt/throw-points/try-catch.php b/tests/PHPStan/Analyser/nsrt/throw-points/try-catch.php
@@ -65,15 +65,15 @@ function (): void {
 		$bar = 1;
 		maybeThrows();
 	} catch (\InvalidArgumentException $e) {
-		assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $foo);
 		assertType('1|2', $foo);
 
-		assertVariableCertainty(TrinaryLogic::createNo(), $bar);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $bar);
 		assertVariableCertainty(TrinaryLogic::createNo(), $baz);
 	} catch (\RuntimeException $e) {
 		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
-		assertVariableCertainty(TrinaryLogic::createNo(), $bar);
-		assertVariableCertainty(TrinaryLogic::createYes(), $baz);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $bar);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $baz);
 		assertType('1|2', $baz);
 	} catch (\Throwable $e) {
 		assertType('Throwable~InvalidArgumentException|RuntimeException', $e);
@@ -99,7 +99,7 @@ function (): void {
 		throw new \InvalidArgumentException();
 	} catch (\InvalidArgumentException $e) {
 		assertType('1', $foo);
-		assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+		assertVariableCertainty(TrinaryLogic::createMaybe(), $foo);
 	}
 };