Support union exception types in catch block

phpstan · Aug 20, 2017 · ba190f0 · ba190f0
1 parent 22488d5
commit ba190f0
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/src/Analyser/Scope.php b/src/Analyser/Scope.php
@@ -1187,11 +1187,9 @@ public function enterForeach(Expr $iteratee, string $valueName, string $keyName
 	 */
 	public function enterCatch(array $classes, string $variableName): self
 	{
-		if (count($classes) === 1) {
-			$type = new ObjectType((string) $classes[0]);
-		} else {
-			$type = new MixedType();
-		}
+		$type = TypeCombinator::combine(...array_map(function (string $class): ObjectType {
+			return new ObjectType($class);
+		}, $classes));
 
 		return $this->assignVariable($variableName, $type, TrinaryLogic::createYes());
 	}

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -506,6 +506,34 @@ public function dataAssignInIf(): array
 		];
 	}
 
+	public function dataUnionInCatch(): array
+	{
+		return [
+			[
+				'CatchUnion\BarException|CatchUnion\FooException',
+				'$e',
+			],
+		];
+	}
+
+	/**
+	 * @requires PHP 7.1
+	 * @dataProvider dataUnionInCatch
+	 * @param string $description
+	 * @param string $expression
+	 */
+	public function testUnionInCatch(
+		string $description,
+		string $expression
+	)
+	{
+		$this->assertTypes(
+			__DIR__ . '/data/catch-union.php',
+			$description,
+			$expression
+		);
+	}
+
 	/**
 	 * @dataProvider dataAssignInIf
 	 * @param \PHPStan\Analyser\Scope $scope

diff --git a/tests/PHPStan/Analyser/data/catch-union.php b/tests/PHPStan/Analyser/data/catch-union.php
@@ -0,0 +1,9 @@
+<?php // lint >= 7.1
+
+namespace CatchUnion;
+
+try {
+
+} catch (FooException | BarException $e) {
+	die;
+}