[BE] Consider implicit throw points when the only explicit one is Throw_

Author: ondrejmirtes

changelog-2.0.md

@@ -92,7 +92,6 @@ Bleeding edge (TODO move to other sections)
 * More precise types for bcmath function parameters ([#2217](https://github.com/phpstan/phpstan-src/pull/2217)), thanks @Warxcell!
 * Enforce `@no-named-arguments` (https://github.com/phpstan/phpstan-src/commit/74ba8c23696948f2647d880df72f375346f41010), #5968
 * Check too wide private property type (https://github.com/phpstan/phpstan-src/commit/7453f4f75fae3d635063589467842aae29d88b54)
-* Consider implicit throw points when the only explicit one is Throw_ (https://github.com/phpstan/phpstan-src/commit/22eef6d5ab9a4afafb2305258fea273be6cc06e4)
 * Check existing classes in `@param-out` (https://github.com/phpstan/phpstan-src/commit/30c4b9e80f51af8b5f166ba3aae93d8409c9c0ea), #10260
 * Check existing classes in `@param-closure-this` (https://github.com/phpstan/phpstan-src/commit/2fa539a39e06bcc3155b109fd8d246703ceb176d), #10933
 * Check invalid `@param-closure-this` (https://github.com/phpstan/phpstan-src/commit/95c0a5806c65c975201b9d3a464873f75a04c8b8), #10932
@@ -139,6 +138,7 @@ Improvements 🔧
 * New `RuleLevelHelper::accepts()` behaviour (https://github.com/phpstan/phpstan-src/commit/941fc815db49315b8783dc466cf593e0d8a85d23)
 * Infer explicit mixed when instantiating generic class with unknown template types (https://github.com/phpstan/phpstan-src/commit/089d4c6fb6eb709c44123548d33990113d174b86), #6398
 * Use explicit mixed for global array variables ([#1411](https://github.com/phpstan/phpstan-src/pull/1411)), thanks @herndlm!
+* Consider implicit throw points when the only explicit one is `Throw_` (https://github.com/phpstan/phpstan-src/commit/22eef6d5ab9a4afafb2305258fea273be6cc06e4)
 
 Bugfixes 🐛
 =====================

conf/bleedingEdge.neon

@@ -49,6 +49,5 @@ parameters:
 		preciseMissingReturn: true
 		validatePregQuote: true
 		tooWidePropertyType: true
-		explicitThrow: true
 		absentTypeChecks: true
 		requireFileExists: true

conf/config.neon

@@ -87,7 +87,6 @@ parameters:
 		requireFileExists: false
 		narrowPregMatches: true
 		tooWidePropertyType: false
-		explicitThrow: false
 		absentTypeChecks: false
 	fileExtensions:
 		- php
@@ -534,7 +533,6 @@ services:
 			universalObjectCratesClasses: %universalObjectCratesClasses%
 			paramOutType: %featureToggles.paramOutType%
 			preciseMissingReturn: %featureToggles.preciseMissingReturn%
-			explicitThrow: %featureToggles.explicitThrow%
 
 	-
 		class: PHPStan\Analyser\ConstantResolver

conf/parametersSchema.neon

@@ -80,7 +80,6 @@ parametersSchema:
 		validatePregQuote: bool()
 		narrowPregMatches: bool()
 		tooWidePropertyType: bool()
-		explicitThrow: bool()
 		absentTypeChecks: bool()
 		requireFileExists: bool()
 	])

src/Analyser/NodeScopeResolver.php

@@ -262,7 +262,6 @@ public function __construct(
 		private readonly bool $detectDeadTypeInMultiCatch,
 		private readonly bool $paramOutType,
 		private readonly bool $preciseMissingReturn,
-		private readonly bool $explicitThrow,
 	)
 	{
 		$earlyTerminatingMethodNames = [];
@@ -1565,10 +1564,7 @@ private function processStmtNode(
 				}
 
 				// implicit only
-				if (
-					count($matchingThrowPoints) === 0
-					|| ($this->explicitThrow && $onlyExplicitIsThrow)
-				) {
+				if (count($matchingThrowPoints) === 0 || $onlyExplicitIsThrow) {
 					foreach ($throwPoints as $throwPointIndex => $throwPoint) {
 						if ($throwPoint->isExplicit()) {
 							continue;

src/Testing/RuleTestCase.php

@@ -108,7 +108,6 @@ 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),

src/Testing/TypeInferenceTestCase.php

@@ -88,7 +88,6 @@ 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())));
 

tests/PHPStan/Analyser/AnalyserTest.php

@@ -731,7 +731,6 @@ private function createAnalyser(): Analyser
 			self::getContainer()->getParameter('featureToggles')['detectDeadTypeInMultiCatch'],
 			self::getContainer()->getParameter('featureToggles')['paramOutType'],
 			self::getContainer()->getParameter('featureToggles')['preciseMissingReturn'],
-			self::getContainer()->getParameter('featureToggles')['explicitThrow'],
 		);
 		$lexer = new Lexer();
 		$fileAnalyser = new FileAnalyser(