Skip to content

Commit 491b6a9

Browse files
williamdeswilliamdes
committed
Fix all phpstan reported issues
1 parent 62118f7 commit 491b6a9

13 files changed

+45
-9
lines changed

‎src/ErrorFormatter/CheckstyleErrorFormatter.php

+3
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ private function groupByFile(AnalysisResult $analysisResult): array
132132
/** @var \CodeLts\CliTools\Error $fileSpecificError */
133133
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
134134
$absolutePath = $fileSpecificError->getFile();
135+
if ($absolutePath === null) {
136+
continue;
137+
}
135138
$relativeFilePath = $this->relativePathHelper->getRelativePath(
136139
$absolutePath
137140
);

‎src/ErrorFormatter/GithubErrorFormatter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
6363

6464
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
6565
$metas = [
66-
'file' => $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()),
66+
'file' => $fileSpecificError->getFile() !== null ? $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()) : '?',
6767
'line' => $fileSpecificError->getLine(),
6868
'col' => 0,
6969
];

‎src/ErrorFormatter/GitlabErrorFormatter.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,24 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
5252
$errorsArray = [];
5353

5454
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
55+
$file = $fileSpecificError->getFile();
56+
if ($file === null) {
57+
continue;
58+
}
5559
$error = [
5660
'description' => $fileSpecificError->getMessage(),
5761
'fingerprint' => hash(
5862
'sha256',
5963
implode(
6064
[
61-
$fileSpecificError->getFile(),
65+
$file,
6266
$fileSpecificError->getLine(),
6367
$fileSpecificError->getMessage(),
6468
]
6569
)
6670
),
6771
'location' => [
68-
'path' => $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()),
72+
'path' => $this->relativePathHelper->getRelativePath($file),
6973
'lines' => [
7074
'begin' => $fileSpecificError->getLine(),
7175
],
@@ -94,7 +98,7 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
9498

9599
$json = json_encode($errorsArray, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
96100

97-
$output->writeRaw($json);
101+
$output->writeRaw((string) $json);
98102

99103
return $analysisResult->hasErrors() ? 1 : 0;
100104
}

‎src/ErrorFormatter/JsonErrorFormatter.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
5656

5757
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
5858
$file = $fileSpecificError->getFile();
59+
if ($file === null) {
60+
continue;
61+
}
5962
if (!array_key_exists($file, $errorsArray['files'])) {
6063
$errorsArray['files'][$file] = [
6164
'errors' => 0,
@@ -77,7 +80,7 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
7780

7881
$json = json_encode($errorsArray, $this->pretty ? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT : JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
7982

80-
$output->writeRaw($json);
83+
$output->writeRaw((string) $json);
8184

8285
return $analysisResult->hasErrors() ? 1 : 0;
8386
}

‎src/ErrorFormatter/JunitErrorFormatter.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ public function formatErrors(
5858
);
5959

6060
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
61-
$fileName = $this->relativePathHelper->getRelativePath($fileSpecificError->getFile());
61+
$file = $fileSpecificError->getFile();
62+
if ($file === null) {
63+
continue;
64+
}
65+
66+
$fileName = $this->relativePathHelper->getRelativePath($file);
6267
$result .= $this->createTestCase(
6368
sprintf('%s:%s', $fileName, (string) $fileSpecificError->getLine()),
6469
'ERROR',

‎src/ErrorFormatter/TeamcityErrorFormatter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
6969
$result .= $this->createTeamcityLine('inspection', [
7070
'typeId' => 'cli-tools',
7171
'message' => $fileSpecificError->getMessage(),
72-
'file' => $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()),
72+
'file' => $fileSpecificError->getFile() !== null ? $this->relativePathHelper->getRelativePath($fileSpecificError->getFile()) : '?',
7373
'line' => $fileSpecificError->getLine(),
7474
// additional attributes
7575
'SEVERITY' => 'ERROR',

‎tests/ErrorFormatter/CheckstyleErrorFormatterTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
class CheckstyleErrorFormatterTest extends ErrorFormatterTestCase
3737
{
3838

39+
/**
40+
* @return iterable<array>
41+
*/
3942
public function dataFormatterOutputProvider(): iterable
4043
{
4144
yield [

‎tests/ErrorFormatter/GithubErrorFormatterTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
class GithubErrorFormatterTest extends ErrorFormatterTestCase
3737
{
3838

39+
/**
40+
* @return iterable<array>
41+
*/
3942
public function dataFormatterOutputProvider(): iterable
4043
{
4144
yield [
@@ -192,7 +195,7 @@ public function testFormatErrors(
192195
$relativePathHelper = new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH);
193196
$formatter = new GithubErrorFormatter(
194197
$relativePathHelper,
195-
new TableErrorFormatter($relativePathHelper, false)
198+
new TableErrorFormatter($relativePathHelper)
196199
);
197200

198201
$this->assertSame($exitCode, $formatter->formatErrors(

‎tests/ErrorFormatter/GitlabFormatterTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
class GitlabFormatterTest extends ErrorFormatterTestCase
3535
{
3636

37+
/**
38+
* @return iterable<array>
39+
*/
3740
public function dataFormatterOutputProvider(): iterable
3841
{
3942
yield [

‎tests/ErrorFormatter/JsonErrorFormatterTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
class JsonErrorFormatterTest extends ErrorFormatterTestCase
3434
{
3535

36+
/**
37+
* @return iterable<array>
38+
*/
3639
public function dataFormatterOutputProvider(): iterable
3740
{
3841
yield [

‎tests/ErrorFormatter/RawErrorFormatterTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
class RawErrorFormatterTest extends ErrorFormatterTestCase
3434
{
3535

36+
/**
37+
* @return iterable<array>
38+
*/
3639
public function dataFormatterOutputProvider(): iterable
3740
{
3841
yield [

‎tests/ErrorFormatter/TableErrorFormatterTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
class TableErrorFormatterTest extends ErrorFormatterTestCase
3636
{
3737

38+
/**
39+
* @return iterable<array>
40+
*/
3841
public function dataFormatterOutputProvider(): iterable
3942
{
4043
yield [
@@ -174,7 +177,7 @@ public function testFormatErrors(
174177
string $expected
175178
): void
176179
{
177-
$formatter = new TableErrorFormatter(new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH), false);
180+
$formatter = new TableErrorFormatter(new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH));
178181

179182
$this->assertSame($exitCode, $formatter->formatErrors(
180183
$this->getAnalysisResult($numFileErrors, $numGenericErrors),

‎tests/ErrorFormatter/TeamcityErrorFormatterTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
class TeamcityErrorFormatterTest extends ErrorFormatterTestCase
3737
{
3838

39+
/**
40+
* @return iterable<array>
41+
*/
3942
public function dataFormatterOutputProvider(): iterable
4043
{
4144
yield [

0 commit comments

Comments
 (0)