Commit d9fe623

authored

Merge branch refs/heads/1.12.x into 2.1.x

2 parents 5b4bf80 + 43c44ee commit d9fe623Copy full SHA for d9fe623

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -290,15 +290,15 @@ public function analyseFile(`
`290`	`290`	`InternalError::STACK_TRACE_METADATA_KEY => InternalError::prepareTrace($e),`
`291`	`291`	`InternalError::STACK_TRACE_AS_STRING_METADATA_KEY => $e->getTraceAsString(),`
`292`	`292`	`]);`
	`293`	`+ } finally {`
	`294`	`+ $this->restoreCollectErrorsHandler();`
`293`	`295`	`}`
`294`	`296`	`} elseif (is_dir($file)) {`
`295`	`297`	`$fileErrors[] = (new Error(sprintf('File %s is a directory.', $file), $file, canBeIgnored: false))->withIdentifier('phpstan.path');`
`296`	`298`	`} else {`
`297`	`299`	`$fileErrors[] = (new Error(sprintf('File %s does not exist.', $file), $file, canBeIgnored: false))->withIdentifier('phpstan.path');`
`298`	`300`	`}`
`299`	`301`
`300`		`- $this->restoreCollectErrorsHandler();`
`301`		`-`
`302`	`302`	`foreach ($linesToIgnore as $fileKey => $lines) {`
`303`	`303`	`if (count($lines) > 0) {`
`304`	`304`	`continue;`

Comments

(0)