Regression test

phpstan · Sep 29, 2022 · 8f6392f · 8f6392f
1 parent 9ee754f
commit 8f6392f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/Analyser/FileAnalyser.php b/src/Analyser/FileAnalyser.php
@@ -6,6 +6,7 @@
 use PhpParser\Node;
 use PHPStan\AnalysedCodeException;
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
+use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
 use PHPStan\BetterReflection\Reflection\Exception\NotAClassReflection;
 use PHPStan\BetterReflection\Reflection\Exception\NotAnInterfaceReflection;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
@@ -103,7 +104,7 @@ public function analyseFile(
 						} catch (IdentifierNotFound $e) {
 							$fileErrors[] = new Error(sprintf('Reflection error: %s not found.', $e->getIdentifier()->getName()), $file, $node->getLine(), $e, null, null, 'Learn more at https://phpstan.org/user-guide/discovering-symbols');
 							continue;
-						} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+						} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection | CircularReference $e) {
 							$fileErrors[] = new Error(sprintf('Reflection error: %s', $e->getMessage()), $file, $node->getLine(), $e);
 							continue;
 						}
@@ -139,7 +140,7 @@ public function analyseFile(
 						} catch (IdentifierNotFound $e) {
 							$fileErrors[] = new Error(sprintf('Reflection error: %s not found.', $e->getIdentifier()->getName()), $file, $node->getLine(), $e, null, null, 'Learn more at https://phpstan.org/user-guide/discovering-symbols');
 							continue;
-						} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+						} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection | CircularReference $e) {
 							$fileErrors[] = new Error(sprintf('Reflection error: %s', $e->getMessage()), $file, $node->getLine(), $e);
 							continue;
 						}
@@ -227,7 +228,7 @@ public function analyseFile(
 				$fileErrors[] = new Error($e->getMessage(), $file, null, $e, null, null, $e->getTip());
 			} catch (IdentifierNotFound $e) {
 				$fileErrors[] = new Error(sprintf('Reflection error: %s not found.', $e->getIdentifier()->getName()), $file, null, $e, null, null, 'Learn more at https://phpstan.org/user-guide/discovering-symbols');
-			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection | CircularReference $e) {
 				$fileErrors[] = new Error(sprintf('Reflection error: %s', $e->getMessage()), $file, null, $e);
 			}
 		} elseif (is_dir($file)) {

diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -11,6 +11,7 @@
 use PHPStan\Analyser\ScopeContext;
 use PHPStan\Analyser\ScopeFactory;
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
+use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
 use PHPStan\BetterReflection\Reflection\Exception\NotAClassReflection;
 use PHPStan\BetterReflection\Reflection\Exception\NotAnInterfaceReflection;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
@@ -158,7 +159,7 @@ private function getCollectedDataErrors(array $collectedData): array
 			} catch (IdentifierNotFound $e) {
 				$errors[] = new Error(sprintf('Reflection error: %s not found.', $e->getIdentifier()->getName()), $file, $node->getLine(), $e, null, null, 'Learn more at https://phpstan.org/user-guide/discovering-symbols');
 				continue;
-			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection | CircularReference $e) {
 				$errors[] = new Error(sprintf('Reflection error: %s', $e->getMessage()), $file, $node->getLine(), $e);
 				continue;
 			}

diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -1002,6 +1002,13 @@ public function testBug8072(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug7787(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7787.php');
+		$this->assertCount(1, $errors);
+		$this->assertSame('Reflection error: Circular reference to class "Bug7787\TestClass"', $errors[0]->getMessage());
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]

diff --git a/tests/PHPStan/Analyser/data/bug-7787.php b/tests/PHPStan/Analyser/data/bug-7787.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Bug7787;
+
+class TestClass extends TestClass {}