Commit c0d2635

authored

Merge 5.0 into 5.1 (#3195)

2 parents 8afd666 + 9577c37 commit c0d2635Copy full SHA for c0d2635

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ parameters:`
`13`	`13`
`14`	`14`	`ignoreErrors:`
`15`	`15`	`- '#Unsafe usage of new static#'`
`16`		`- - '#Call to an undefined method [a-zA-Z0-9\\_\<\>]+::[a-zA-Z]+#'`
	`16`	`+ - '#Call to an undefined method [a-zA-Z0-9\\_\<\>]+::[a-zA-Z]+#'`
`17`	`17`
`18`	`18`	`services:`
`19`	`19`	`errorFormatter.sarif:`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in`
`63`	`63`	`'uri' => $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()),`
`64`	`64`	`'uriBaseId' => self::URI_BASE_ID,`
`65`	`65`	`],`
`66`		`- 'region' => [`
`67`		`- 'startLine' => $fileSpecificError->getLine(),`
`68`		`- ],`
`69`	`66`	`],`
`70`	`67`	`],`
`71`	`68`	`],`
`@@ -78,6 +75,10 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in`
`78`	`75`	`$result['properties']['tip'] = $fileSpecificError->getTip();`
`79`	`76`	`}`
`80`	`77`
	`78`	`+ if ($fileSpecificError->getLine() !== null) {`
	`79`	`+ $result['locations'][0]['physicalLocation']['region']['startLine'] = $fileSpecificError->getLine();`
	`80`	`+ }`
	`81`	`+`
`81`	`82`	`$results[] = $result;`
`82`	`83`	`}`
`83`	`84`

Comments

(0)