Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 000e75715644 · 2021-08-16T18:08:22.000+02:00
* 5.4:
  Run php-cs-fixer
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -234,7 +234,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)
         return min($errors, 1);
     }
 
-    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, ?GithubActionReporter $githubReporter = null)
+    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null)
     {
         $line = $exception->getTemplateLine();
 

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)`
`234`	`234`	`return min($errors, 1);`
`235`	`235`	`}`
`236`	`236`
`237`		`- private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, ?GithubActionReporter $githubReporter = null)`
	`237`	`+ private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null)`
`238`	`238`	`{`
`239`	`239`	`$line = $exception->getTemplateLine();`
`240`	`240`