Skip to content

Use local vars instead of class props #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Use local vars instead of class props #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07c8ee2
fix: use local vars
mohanrajpac Jun 26, 2024
e4631ab
fix: use local vars
mohanrajpac Jun 26, 2024
74cd8db
Merge branch 'main' into fix/coverage-avg
m0hanraj Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/BadgeComposer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ class BadgeComposer
* @var int[]
*/
private array $totalCoverage = [];
private int $totalConditionals = 0;
private int $coveredConditionals = 0;
private int $totalStatements = 0;
private int $coveredStatements = 0;
private int $totalMethods = 0;
private int $coveredMethods = 0;

/**
* @throws Exception
Expand Down Expand Up @@ -119,17 +113,25 @@ private function processFile(string $inputFile): void
}
$xml = new SimpleXMLElement($content);
$metrics = $xml->xpath('//metrics');

$totalConditionals = 0;
$totalStatements = 0;
$totalMethods = 0;
$coveredStatements = 0;
$coveredConditionals = 0;
$coveredMethods = 0;

foreach ($metrics as $metric) {
$this->totalConditionals += (int) $metric['conditionals'];
$this->coveredConditionals += (int) $metric['coveredconditionals'];
$this->totalStatements += (int) $metric['statements'];
$this->coveredStatements += (int) $metric['coveredstatements'];
$this->totalMethods += (int) $metric['methods'];
$this->coveredMethods += (int) $metric['coveredmethods'];
$totalConditionals = (int) $metric['conditionals'];
$coveredConditionals = (int) $metric['coveredconditionals'];
$totalStatements = (int) $metric['statements'];
$coveredStatements = (int) $metric['coveredstatements'];
$totalMethods = (int) $metric['methods'];
$coveredMethods = (int) $metric['coveredmethods'];
}

$totalElements = $this->totalConditionals + $this->totalStatements + $this->totalMethods;
$coveredElements = $this->coveredConditionals + $this->coveredStatements + $this->coveredMethods;
$totalElements = $totalConditionals + $totalStatements + $totalMethods;
$coveredElements = $coveredConditionals + $coveredStatements + $coveredMethods;
$coverageRatio = $totalElements ? $coveredElements / $totalElements : 0;
$this->totalCoverage[] = (int) round($coverageRatio * 100);

Expand All @@ -152,7 +154,7 @@ private function finalizeCoverage(): void
throw new Exception('Error reading badge template file');
}

$template = str_replace('{{ total }}', (string) $totalCoverage, $template);
$template = str_replace('{{ total }}', (string) round($totalCoverage), $template);

$template = str_replace('{{ coverage }}', $this->coverageName, $template);

Expand Down
2 changes: 1 addition & 1 deletion tests/BadgeComposerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function testProcessMultipleCloverFilesAndCalculateTheCoverage(): void
$this->processFile($this->inputFile);
$this->processFile($this->inputFile2);

$this->assertEquals(69, $this->badgeComposer->getTotalCoverage());
$this->assertEquals(43, $this->badgeComposer->getTotalCoverage());
}

/**
Expand Down