@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -declare(strict_types=1); |
|
2 | +declare(strict_types = 1); |
|
3 | 3 | |
4 | 4 | namespace TheCodingMachine\WashingMachine\Clover; |
5 | 5 |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -declare(strict_types=1); |
|
2 | +declare(strict_types = 1); |
|
3 | 3 | |
4 | 4 | namespace TheCodingMachine\WashingMachine\Clover; |
5 | 5 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | |
61 | 61 | // Now, let's order the differences by crap order. |
62 | 62 | usort($differences, function(Difference $d1, Difference $d2) { |
63 | - return $d2->getCrapScore() <=> $d1->getCrapScore(); |
|
63 | + return $d2->getCrapScore() <=> $d1->getCrapScore(); |
|
64 | 64 | }); |
65 | 65 | |
66 | 66 | // Now, let's limit the number of returned differences |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -declare(strict_types=1); |
|
2 | +declare(strict_types = 1); |
|
3 | 3 | |
4 | 4 | namespace TheCodingMachine\WashingMachine\Clover; |
5 | 5 |
@@ -125,7 +125,7 @@ |
||
125 | 125 | $url = $this->getArtifactFileUrl($file->getFilename(), $gitlabUrl, $projectName, $buildId); |
126 | 126 | |
127 | 127 | $this->msg .= sprintf("\n<strong>[%s](%s)</strong>\n", $file->getFilename(), $url); |
128 | - $this->msg .= sprintf("```\n%s%s```\n", $text, $isComplete?'':"... (file truncated)\n"); |
|
128 | + $this->msg .= sprintf("```\n%s%s```\n", $text, $isComplete ? '' : "... (file truncated)\n"); |
|
129 | 129 | |
130 | 130 | if (!$isComplete) { |
131 | 131 | $this->msg .= sprintf("[Download complete file](%s)\n", $url); |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace TheCodingMachine\WashingMachine\Gitlab; |
3 | 3 | use Gitlab\Client; |
4 | -use GuzzleHttp\Psr7\Stream; |
|
5 | 4 | use GuzzleHttp\Psr7\StreamWrapper; |
6 | 5 | use Symfony\Component\Filesystem\Filesystem; |
7 | 6 |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @param string $commitId |
83 | 83 | * @param string|null $excludePipelineId A pipeline ID we want to exclude (we don't want to get the current pipeline ID). |
84 | 84 | * @param int $numIter |
85 | - * @return array |
|
85 | + * @return string |
|
86 | 86 | * @throws BuildNotFoundException |
87 | 87 | */ |
88 | 88 | public function getLatestPipelineFromCommitId(string $projectName, string $commitId, string $excludePipelineId = null, int $numIter = 0) : array |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | * @param string $projectName |
117 | 117 | * @param string $branchName |
118 | 118 | * @param string $excludePipelineId A pipeline ID we want to exclude (we don't want to get the current pipeline ID). |
119 | - * @return array |
|
119 | + * @return string |
|
120 | 120 | * @throws BuildNotFoundException |
121 | 121 | */ |
122 | 122 | public function getLatestPipelineFromBranch(string $projectName, string $branchName, string $excludePipelineId) : array |
@@ -53,9 +53,9 @@ |
||
53 | 53 | throw new \RuntimeException('Could not find the Gitlab URL in the "CI_REPOSITORY_URL" environment variable (usually set by Gitlab CI). Either set this environment variable or pass the URL via the --gitlab-url command line option.'); |
54 | 54 | } |
55 | 55 | $parsed_url = parse_url($ciProjectUrl); |
56 | - $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; |
|
56 | + $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : ''; |
|
57 | 57 | $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
58 | - $port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; |
|
58 | + $port = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : ''; |
|
59 | 59 | $gitlabUrl = $scheme.$host.$port; |
60 | 60 | } |
61 | 61 | return rtrim($gitlabUrl, '/'); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | public function getMergeBase(string $commit1, string $commit2) : string |
12 | 12 | { |
13 | 13 | try { |
14 | - $this->extractFromCommand('git merge-base --is-ancestor ' . escapeshellarg($commit1) . ' ' . escapeshellarg($commit2)); |
|
14 | + $this->extractFromCommand('git merge-base --is-ancestor '.escapeshellarg($commit1).' '.escapeshellarg($commit2)); |
|
15 | 15 | } catch (GitException $e) { |
16 | 16 | // The command will return exit code 1 if $commit1 is an ancestor of $commit2 |
17 | 17 | // Exit code one triggers an exception. We catch it. |
@@ -19,14 +19,14 @@ discard block |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | |
22 | - $results = $this->extractFromCommand('git merge-base ' . escapeshellarg($commit1). ' '. escapeshellarg($commit2)); |
|
22 | + $results = $this->extractFromCommand('git merge-base '.escapeshellarg($commit1).' '.escapeshellarg($commit2)); |
|
23 | 23 | |
24 | 24 | return $results[0]; |
25 | 25 | } |
26 | 26 | |
27 | 27 | public function getLatestCommitForBranch(string $branch) : string |
28 | 28 | { |
29 | - $results = $this->extractFromCommand('git log -n 1 --pretty=format:"%H" ' . escapeshellarg($branch)); |
|
29 | + $results = $this->extractFromCommand('git log -n 1 --pretty=format:"%H" '.escapeshellarg($branch)); |
|
30 | 30 | |
31 | 31 | return $results[0]; |
32 | 32 | } |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | |
270 | 270 | $commit = $project->commit($commitRef); |
271 | 271 | |
272 | - return $commit->committer ? $commit->committer->id : null; |
|
272 | + return $commit->committer ? $commit->committer->id : null; |
|
273 | 273 | } |
274 | 274 | |
275 | 275 | /** |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | $buildService->dumpArtifactFromBranch($projectName, $targetBranch, $buildName, $jobStage, $tmpFile, $excludePipelineId); |
290 | 290 | $zipFile = new \ZipArchive(); |
291 | - if ($zipFile->open($tmpFile)!==true) { |
|
291 | + if ($zipFile->open($tmpFile) !== true) { |
|
292 | 292 | throw new \RuntimeException('Invalid ZIP archive '.$tmpFile); |
293 | 293 | } |
294 | 294 | return $this->getMeasuresFromZipFile($zipFile, $cloverPath, $crap4JPath); |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | $pipeline = $buildService->getLatestPipelineFromCommitId($projectName, $commitId, $excludePipelineId); |
314 | 314 | $buildService->dumpArtifact($projectName, $pipeline['id'], $buildName, $jobStage, $tmpFile); |
315 | 315 | $zipFile = new \ZipArchive(); |
316 | - if ($zipFile->open($tmpFile)!==true) { |
|
316 | + if ($zipFile->open($tmpFile) !== true) { |
|
317 | 317 | throw new \RuntimeException('Invalid ZIP archive '.$tmpFile); |
318 | 318 | } |
319 | 319 | return $this->getMeasuresFromZipFile($zipFile, $cloverPath, $crap4JPath); |