Skip to content

Commit d0c929d

Browse files
Do not use $class['package'] element (and its sub-elements)
These array elements were populated with information from the category, package, and subpackage annotations in code comments that were used in PEAR packages.
1 parent 03f2098 commit d0c929d

File tree

2 files changed

+5
-36
lines changed

2 files changed

+5
-36
lines changed

src/Report/Clover.php

+5-32
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
7373
$coveredMethods = 0;
7474
$classMethods = 0;
7575

76+
// Assumption: one namespace per file
77+
if ($class['namespace'] !== '') {
78+
$namespace = $class['namespace'];
79+
}
80+
7681
foreach ($class['methods'] as $methodName => $method) {
7782
if ($method['executableLines'] == 0) {
7883
continue;
@@ -104,42 +109,10 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
104109
];
105110
}
106111

107-
if (!empty($class['package']['namespace'])) {
108-
$namespace = $class['package']['namespace'];
109-
}
110-
111112
$xmlClass = $xmlDocument->createElement('class');
112113
$xmlClass->setAttribute('name', $className);
113114
$xmlClass->setAttribute('namespace', $namespace);
114115

115-
if (!empty($class['package']['fullPackage'])) {
116-
$xmlClass->setAttribute(
117-
'fullPackage',
118-
$class['package']['fullPackage'],
119-
);
120-
}
121-
122-
if (!empty($class['package']['category'])) {
123-
$xmlClass->setAttribute(
124-
'category',
125-
$class['package']['category'],
126-
);
127-
}
128-
129-
if (!empty($class['package']['package'])) {
130-
$xmlClass->setAttribute(
131-
'package',
132-
$class['package']['package'],
133-
);
134-
}
135-
136-
if (!empty($class['package']['subpackage'])) {
137-
$xmlClass->setAttribute(
138-
'subpackage',
139-
$class['package']['subpackage'],
140-
);
141-
}
142-
143116
$xmlFile->appendChild($xmlClass);
144117

145118
$xmlMetrics = $xmlDocument->createElement('metrics');

src/Report/Cobertura.php

-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
117117
$complexity += $class['ccn'];
118118
$packageComplexity += $class['ccn'];
119119

120-
if (!empty($class['package']['namespace'])) {
121-
$className = $class['package']['namespace'] . '\\' . $className;
122-
}
123-
124120
$linesValid = $class['executableLines'];
125121
$linesCovered = $class['executedLines'];
126122
$lineRate = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);

0 commit comments

Comments
 (0)