Revert Too wide throws type - skip Throwable

Author: ondrejmirtes

src/Reflection/BetterReflection/Reflector/MemoizingClassReflector.php

@@ -4,7 +4,6 @@
 
 use PHPStan\BetterReflection\Reflection\Reflection;
 use PHPStan\BetterReflection\Reflector\ClassReflector;
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 
 final class MemoizingClassReflector extends ClassReflector
 {
@@ -17,7 +16,7 @@ final class MemoizingClassReflector extends ClassReflector
 	 *
 	 * @return \PHPStan\BetterReflection\Reflection\ReflectionClass
 	 *
-	 * @throws IdentifierNotFound
+	 * @throws \PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound
 	 */
 	public function reflect(string $className): Reflection
 	{
@@ -31,9 +30,6 @@ public function reflect(string $className): Reflection
 
 		try {
 			return $this->reflections[$lowerClassName] = parent::reflect($className);
-		} catch (IdentifierNotFound $e) {
-			$this->reflections[$lowerClassName] = $e;
-			throw $e;
 		} catch (\Throwable $e) {
 			$this->reflections[$lowerClassName] = $e;
 			throw $e;

src/Reflection/BetterReflection/Reflector/MemoizingConstantReflector.php

@@ -4,7 +4,6 @@
 
 use PHPStan\BetterReflection\Reflection\Reflection;
 use PHPStan\BetterReflection\Reflector\ConstantReflector;
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 
 final class MemoizingConstantReflector extends ConstantReflector
 {
@@ -17,7 +16,7 @@ final class MemoizingConstantReflector extends ConstantReflector
 	 *
 	 * @return \PHPStan\BetterReflection\Reflection\ReflectionConstant
 	 *
-	 * @throws IdentifierNotFound
+	 * @throws \PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound
 	 */
 	public function reflect(string $constantName): Reflection
 	{
@@ -30,9 +29,6 @@ public function reflect(string $constantName): Reflection
 
 		try {
 			return $this->reflections[$constantName] = parent::reflect($constantName);
-		} catch (IdentifierNotFound $e) {
-			$this->reflections[$constantName] = $e;
-			throw $e;
 		} catch (\Throwable $e) {
 			$this->reflections[$constantName] = $e;
 			throw $e;

src/Reflection/BetterReflection/Reflector/MemoizingFunctionReflector.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Reflection\BetterReflection\Reflector;
 
 use PHPStan\BetterReflection\Reflection\Reflection;
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\BetterReflection\Reflector\FunctionReflector;
 
 final class MemoizingFunctionReflector extends FunctionReflector
@@ -17,7 +16,7 @@ final class MemoizingFunctionReflector extends FunctionReflector
 	 *
 	 * @return \PHPStan\BetterReflection\Reflection\ReflectionFunction
 	 *
-	 * @throws IdentifierNotFound
+	 * @throws \PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound
 	 */
 	public function reflect(string $functionName): Reflection
 	{
@@ -31,9 +30,6 @@ public function reflect(string $functionName): Reflection
 
 		try {
 			return $this->reflections[$lowerFunctionName] = parent::reflect($functionName);
-		} catch (IdentifierNotFound $e) {
-			$this->reflections[$lowerFunctionName] = $e;
-			throw $e;
 		} catch (\Throwable $e) {
 			$this->reflections[$lowerFunctionName] = $e;
 			throw $e;

src/Rules/Exceptions/TooWideThrowTypeCheck.php

@@ -4,7 +4,6 @@
 
 use PHPStan\Analyser\ThrowPoint;
 use PHPStan\Type\NeverType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -30,12 +29,7 @@ public function check(Type $throwType, array $throwPoints): array
 				return new NeverType();
 			}
 
-			$type = $throwPoint->getType();
-			if ($type->isSuperTypeOf(new ObjectType(\Throwable::class))->yes()) {
-				return new NeverType();
-			}
-
-			return $type;
+			return $throwPoint->getType();
 		}, $throwPoints));
 
 		$throwClasses = [];

tests/PHPStan/Rules/Exceptions/TooWideMethodThrowTypeRuleTest.php

@@ -40,10 +40,6 @@ public function testRule(): void
 				'Method TooWideThrowsMethod\ParentClass::doFoo() has LogicException in PHPDoc @throws tag but it\'s not thrown.',
 				77,
 			],
-			[
-				'Method TooWideThrowsMethod\SkipThrowable::doFoo() has DomainException in PHPDoc @throws tag but it\'s not thrown.',
-				112,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Exceptions/data/too-wide-throws-method.php

@@ -118,4 +118,32 @@ public function doFoo(\Throwable $t)
 		throw $t;
 	}
 
+	/**
+	 * @throws \InvalidArgumentException
+	 */
+	public function doBar(): void
+	{
+		try {
+			throw new \InvalidArgumentException();
+		} catch (\Throwable $e) {
+			throw $e;
+		}
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 */
+	public function doBaz(): void
+	{
+		try {
+			if (rand(0, 1)) {
+				throw new \InvalidArgumentException();
+			}
+
+			doFoo();
+		} catch (\Throwable $e) {
+			throw $e;
+		}
+	}
+
 }