ExceptionTypeResolver - pass Scope

phpstan · May 20, 2021 · dec03af · dec03af
1 parent a125304
commit dec03af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/Rules/Exceptions/DefaultExceptionTypeResolver.php b/src/Rules/Exceptions/DefaultExceptionTypeResolver.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\Exceptions;
 
 use Nette\Utils\Strings;
+use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
 
 class DefaultExceptionTypeResolver implements ExceptionTypeResolver
@@ -44,7 +45,7 @@ public function __construct(
 		$this->checkedExceptionClasses = $checkedExceptionClasses;
 	}
 
-	public function isCheckedException(string $className): bool
+	public function isCheckedException(string $className, Scope $scope): bool
 	{
 		foreach ($this->uncheckedExceptionRegexes as $regex) {
 			if (Strings::match($className, $regex) !== null) {

diff --git a/src/Rules/Exceptions/ExceptionTypeResolver.php b/src/Rules/Exceptions/ExceptionTypeResolver.php
@@ -2,9 +2,11 @@
 
 namespace PHPStan\Rules\Exceptions;
 
+use PHPStan\Analyser\Scope;
+
 interface ExceptionTypeResolver
 {
 
-	public function isCheckedException(string $className): bool;
+	public function isCheckedException(string $className, Scope $scope): bool;
 
 }
diff --git a/src/Rules/Exceptions/MissingCheckedExceptionInThrowsCheck.php b/src/Rules/Exceptions/MissingCheckedExceptionInThrowsCheck.php
@@ -49,7 +49,7 @@ public function check(?Type $throwType, array $throwPoints): array
 
 				if (
 					$throwPointType instanceof TypeWithClassName
-					&& !$this->exceptionTypeResolver->isCheckedException($throwPointType->getClassName())
+					&& !$this->exceptionTypeResolver->isCheckedException($throwPointType->getClassName(), $throwPoint->getScope())
 				) {
 					continue;
 				}

diff --git a/tests/PHPStan/Rules/Exceptions/DefaultExceptionTypeResolverTest.php b/tests/PHPStan/Rules/Exceptions/DefaultExceptionTypeResolverTest.php
@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\Exceptions;
 
+use PHPStan\Analyser\ScopeContext;
+use PHPStan\Analyser\ScopeFactory;
 use PHPStan\Testing\TestCase;
 
 class DefaultExceptionTypeResolverTest extends TestCase
@@ -140,7 +142,7 @@ public function testIsCheckedException(
 	): void
 	{
 		$resolver = new DefaultExceptionTypeResolver($this->createBroker(), $uncheckedExceptionRegexes, $uncheckedExceptionClasses, $checkedExceptionRegexes, $checkedExceptionClasses);
-		$this->assertSame($expectedResult, $resolver->isCheckedException($className));
+		$this->assertSame($expectedResult, $resolver->isCheckedException($className, self::getContainer()->getByType(ScopeFactory::class)->create(ScopeContext::create(__DIR__))));
 	}
 
 }