Fix throwpoint in elseif condition

phpstan · Apr 16, 2021 · fb62e5e · fb62e5e
1 parent 2911f68
commit fb62e5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -712,6 +712,7 @@ private function processStmtNode(
 				$nodeCallback($elseif, $scope);
 				$elseIfConditionType = $condScope->getType($elseif->cond)->toBoolean();
 				$condResult = $this->processExprNode($elseif->cond, $condScope, $nodeCallback, ExpressionContext::createDeep());
+				$throwPoints = array_merge($throwPoints, $condResult->getThrowPoints());
 				$condScope = $condResult->getScope();
 				$branchScopeStatementResult = $this->processStmtNodes($elseif, $elseif->stmts, $condResult->getTruthyScope(), $nodeCallback);
 

diff --git a/tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php b/tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php
@@ -121,4 +121,17 @@ public function doAmet2()
 		}
 	}
 
+	public function doConsecteur()
+	{
+		try {
+			if (false) {
+
+			} elseif ($this->doAmet()) {
+
+			}
+		} catch (\InvalidArgumentException $e) {
+
+		}
+	}
+
 }