Do not complain about unmatched ignored errors when internal errors o…

…ccur
phpstan · Mar 15, 2020 · ecef44f · ecef44f
1 parent 3193ae9
commit ecef44f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Analyser/IgnoredErrorHelperResult.php b/src/Analyser/IgnoredErrorHelperResult.php
@@ -76,7 +76,7 @@ public function getWarnings(): array
 	 * @param Error[] $errors
 	 * @return string[]|Error[]
 	 */
-	public function process(array $errors, bool $onlyFiles, bool $reachedInternalErrorsCountLimit): array
+	public function process(array $errors, bool $onlyFiles, bool $hasInternalErrors): array
 	{
 		$unmatchedIgnoredErrors = $this->ignoreErrors;
 		$addErrors = [];
@@ -206,7 +206,7 @@ public function process(array $errors, bool $onlyFiles, bool $reachedInternalErr
 
 		$errors = array_merge($errors, $addErrors);
 
-		if ($this->reportUnmatchedIgnoredErrors && !$reachedInternalErrorsCountLimit) {
+		if ($this->reportUnmatchedIgnoredErrors && !$hasInternalErrors) {
 			foreach ($unmatchedIgnoredErrors as $unmatchedIgnoredError) {
 				if (
 					isset($unmatchedIgnoredError['count'])

diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -118,12 +118,13 @@ public function analyse(
 			);
 			$analyserResult = $this->resultCacheManager->process($intermediateAnalyserResult, $resultCache);
 			$hasInferrablePropertyTypesFromConstructor = $analyserResult->hasInferrablePropertyTypesFromConstructor();
-			$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $analyserResult->hasReachedInternalErrorsCountLimit());
+			$internalErrors = $analyserResult->getInternalErrors();
+			$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, count($internalErrors) > 0 || $analyserResult->hasReachedInternalErrorsCountLimit());
 			$warnings = $ignoredErrorHelperResult->getWarnings();
 			if ($analyserResult->hasReachedInternalErrorsCountLimit()) {
 				$errors[] = sprintf('Reached internal errors count limit of %d, exiting...', $this->internalErrorsCountLimit);
 			}
-			$errors = array_merge($errors, $analyserResult->getInternalErrors());
+			$errors = array_merge($errors, $internalErrors);
 		}
 
 		$errors = array_merge($stubErrors, $errors);