Skip to content

Commit 35f07bc

Browse files
theseertheseer
committed
Adjust formatting to make PHPCS happy
1 parent 84afef3 commit 35f07bc

File tree

11 files changed

+137
-81
lines changed

11 files changed

+137
-81
lines changed

‎PHP/CodeCoverage/Report/XML.php‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ public function process(PHP_CodeCoverage $coverage, $target)
2828
$this->processDirectory($report, $this->project);
2929

3030
$index = $this->project->asDom();
31-
$index->formatOutput = true;
32-
$index->preserveWhiteSpace = false;
31+
$index->formatOutput = TRUE;
32+
$index->preserveWhiteSpace = FALSE;
3333
$index->save($target . '/index.xml');
3434
}
3535

36-
private function initTargetDirectory($dir) {
36+
private function initTargetDirectory($dir)
37+
{
3738
if (file_exists($dir)) {
3839

3940
if (!is_dir($dir)) {
@@ -43,15 +44,17 @@ private function initTargetDirectory($dir) {
4344
if (!is_writable($dir)) {
4445
throw new PHP_CodeCoverage_Exception("'$dir' exists but is not writable.");
4546
}
46-
} else if (!@mkdir($dir, 0777, true)) {
47+
}
48+
else if (!@mkdir($dir, 0777, TRUE)) {
4749
throw new PHP_CodeCoverage_Exception("'$dir' could not be created.");
4850
}
4951
}
5052

51-
private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $directory, PHP_CodeCoverage_Report_XML_Node $context) {
53+
private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $directory, PHP_CodeCoverage_Report_XML_Node $context)
54+
{
5255
$dirObject = $context->addDirectory($directory->getName());
5356
$this->setTotals($directory, $dirObject->getTotals());
54-
foreach($directory as $node) {
57+
foreach ($directory as $node) {
5558
if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
5659
$this->processDirectory($node, $dirObject);
5760
continue;
@@ -64,42 +67,45 @@ private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $direct
6467
}
6568
}
6669

67-
private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCoverage_Report_XML_Directory $context) {
70+
private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCoverage_Report_XML_Directory $context)
71+
{
6872
$fileObject = $context->addFile($file->getName(), $file->getId() . '.xml');
6973
$this->setTotals($file, $fileObject->getTotals());
7074

7175
$fileReport = new PHP_CodeCoverage_Report_XML_File_Report($file->getName());
7276
$this->setTotals($file, $fileReport->getTotals());
7377

74-
foreach($file->getClassesAndTraits() as $unit) {
78+
foreach ($file->getClassesAndTraits() as $unit) {
7579
$this->processUnit($unit, $fileReport);
7680
}
7781

78-
foreach($file->getFunctions() as $function) {
82+
foreach ($file->getFunctions() as $function) {
7983
$this->processFunction($function, $fileReport);
8084
}
8185

82-
foreach($file->getCoverageData() as $line => $tests) {
86+
foreach ($file->getCoverageData() as $line => $tests) {
8387
if (!is_array($tests) || count($tests) == 0) {
8488
continue;
8589
}
8690
$coverage = $fileReport->getLineCoverage($line);
87-
foreach($tests as $test) {
91+
foreach ($tests as $test) {
8892
$coverage->addTest($test);
8993
}
9094
}
9195

9296
$this->initTargetDirectory($this->target . dirname($file->getId()) . '/');
9397
$fileDom = $fileReport->asDom();
94-
$fileDom->formatOutput = true;
95-
$fileDom->preserveWhiteSpace = false;
98+
$fileDom->formatOutput = TRUE;
99+
$fileDom->preserveWhiteSpace = FALSE;
96100
$fileDom->save($this->target . $file->getId() . '.xml');
97101
}
98102

99-
private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $report) {
103+
private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $report)
104+
{
100105
if (isset($unit['className'])) {
101106
$unitObject = $report->getClassObject($unit['className']);
102-
} else {
107+
}
108+
else {
103109
$unitObject = $report->getTraitObject($unit['traitName']);
104110
}
105111

@@ -119,7 +125,7 @@ private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $rep
119125

120126
$unitObject->setNamespace($unit['package']['namespace']);
121127

122-
foreach($unit['methods'] as $method) {
128+
foreach ($unit['methods'] as $method) {
123129
$methodObject = $unitObject->addMethod($method['methodName']);
124130
$methodObject->setSignature($method['signature']);
125131
$methodObject->setLines($method['startLine'], $method['endLine']);
@@ -128,25 +134,28 @@ private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $rep
128134
}
129135
}
130136

131-
private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Report $report) {
137+
private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Report $report)
138+
{
132139
$functionObject = $report->getFunctionObject($function['functionName']);
133140
$functionObject->setSignature($function['signature']);
134141
$functionObject->setLines($function['startLine']);
135142
$functionObject->setCrap($function['crap']);
136143
$functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage']);
137144
}
138145

139-
private function processTests(array $tests) {
146+
private function processTests(array $tests)
147+
{
140148
$testsObject = $this->project->getTests();
141-
foreach($tests as $test => $result) {
149+
foreach ($tests as $test => $result) {
142150
if ($test == 'UNCOVERED_FILES_FROM_WHITELIST') {
143151
continue;
144152
}
145153
$testsObject->addTest($test, $result);
146154
}
147155
}
148156

149-
private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_Report_XML_Totals $totals) {
157+
private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_Report_XML_Totals $totals)
158+
{
150159
$loc = $node->getLinesOfCode();
151160
$totals->setNumLines(
152161
$loc['loc'],
@@ -177,4 +186,4 @@ private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_
177186
);
178187
}
179188

180-
}
189+
}

‎PHP/CodeCoverage/Report/XML/Directory.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<?php
22
class PHP_CodeCoverage_Report_XML_Directory extends PHP_CodeCoverage_Report_XML_Node {
3-
43
}

‎PHP/CodeCoverage/Report/XML/File.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ class PHP_CodeCoverage_Report_XML_File {
1111
*/
1212
protected $contextNode;
1313

14-
public function __construct(\DOMElement $context) {
14+
public function __construct(\DOMElement $context)
15+
{
1516
$this->contextNode = $context;
1617
$this->dom = $context->ownerDocument;
1718
}
1819

19-
public function getTotals() {
20+
public function getTotals()
21+
{
2022
$totalsContainer = $this->contextNode->firstChild;
2123
if (!$totalsContainer) {
2224
$totalsContainer = $this->contextNode->appendChild(
@@ -26,7 +28,8 @@ public function getTotals() {
2628
return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
2729
}
2830

29-
public function getLineCoverage($line) {
31+
public function getLineCoverage($line)
32+
{
3033
$coverage = $this->contextNode->getElementsByTagNameNS('http://xml.phpunit.de/coverage/1.0', 'coverage')->item(0);
3134
if (!$coverage) {
3235
$coverage = $this->contextNode->appendChild(
@@ -39,4 +42,4 @@ public function getLineCoverage($line) {
3942
return new PHP_CodeCoverage_Report_XML_File_Coverage($lineNode, $line);
4043
}
4144

42-
}
45+
}

‎PHP/CodeCoverage/Report/XML/File/Coverage.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ class PHP_CodeCoverage_Report_XML_File_Coverage {
33

44
private $contextNode;
55

6-
public function __construct(\DOMElement $context, $line) {
6+
public function __construct(\DOMElement $context, $line)
7+
{
78
$this->contextNode = $context;
89
$this->setLine($line);
910
}
1011

11-
private function setLine($line) {
12+
private function setLine($line)
13+
{
1214
$this->contextNode->setAttribute('nr', $line);
1315
}
1416

15-
public function addTest($test) {
17+
public function addTest($test)
18+
{
1619
$covered = $this->contextNode->appendChild(
1720
$this->contextNode->ownerDocument->createElementNS('http://xml.phpunit.de/coverage/1.0', 'covered')
1821
);
1922
$covered->setAttribute('by', $test);
2023
}
2124

22-
}
25+
}

‎PHP/CodeCoverage/Report/XML/File/Method.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,40 @@ class PHP_CodeCoverage_Report_XML_File_Method {
33

44
private $contextNode;
55

6-
public function __construct(\DOMElement $context, $name) {
6+
public function __construct(\DOMElement $context, $name)
7+
{
78
$this->contextNode = $context;
89
$this->setName($name);
910
}
1011

11-
private function setName($name) {
12+
private function setName($name)
13+
{
1214
$this->contextNode->setAttribute('name', $name);
1315
}
1416

15-
public function setSignature($signature) {
17+
public function setSignature($signature)
18+
{
1619
$this->contextNode->setAttribute('signature', $signature);
1720
}
1821

19-
public function setLines($start, $end = NULL) {
22+
public function setLines($start, $end = NULL)
23+
{
2024
$this->contextNode->setAttribute('start', $start);
2125
if ($end !== NULL) {
2226
$this->contextNode->setAttribute('end', $end);
2327
}
2428
}
2529

26-
public function setTotals($executable, $executed, $coverage) {
30+
public function setTotals($executable, $executed, $coverage)
31+
{
2732
$this->contextNode->setAttribute('executable', $executable);
2833
$this->contextNode->setAttribute('executed', $executed);
2934
$this->contextNode->setAttribute('coverage', $coverage);
3035
}
3136

32-
public function setCrap($crap) {
37+
public function setCrap($crap)
38+
{
3339
$this->contextNode->setAttribute('crap', $crap);
3440
}
3541

36-
}
42+
}

‎PHP/CodeCoverage/Report/XML/File/Report.php‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,44 @@
11
<?php
22
class PHP_CodeCoverage_Report_XML_File_Report extends PHP_CodeCoverage_Report_XML_File {
33

4-
public function __construct($name) {
4+
public function __construct($name)
5+
{
56
$this->dom = new \DOMDocument();
67
$this->dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://xml.phpunit.de/coverage/1.0"><file /></phpunit>');
78
$this->contextNode = $this->dom->getElementsByTagNameNS('http://xml.phpunit.de/coverage/1.0', 'file')->item(0);
89
$this->setName($name);
910
}
1011

11-
private function setName($name) {
12+
private function setName($name)
13+
{
1214
$this->contextNode->setAttribute('name', $name);
1315
}
1416

15-
public function asDom() {
17+
public function asDom()
18+
{
1619
return $this->dom;
1720
}
1821

19-
public function getFunctionObject($name) {
22+
public function getFunctionObject($name)
23+
{
2024
$node = $this->contextNode->appendChild(
2125
$this->dom->createElementNS('http://xml.phpunit.de/coverage/1.0', 'function')
2226
);
2327
return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
2428
}
2529

26-
public function getClassObject($name) {
30+
public function getClassObject($name)
31+
{
2732
return $this->getUnitObject('class', $name);
2833
}
2934

30-
public function getTraitObject($name) {
35+
public function getTraitObject($name)
36+
{
3137
return $this->getUnitObject('trait', $name);
3238
}
3339

34-
private function getUnitObject($tagName, $name) {
40+
private function getUnitObject($tagName, $name)
41+
{
3542
$node = $this->contextNode->appendChild(
3643
$this->dom->createElementNS('http://xml.phpunit.de/coverage/1.0', $tagName)
3744
);

‎PHP/CodeCoverage/Report/XML/File/Unit.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,31 @@ class PHP_CodeCoverage_Report_XML_File_Unit {
33

44
private $contextNode;
55

6-
public function __construct(\DOMElement $context, $name) {
6+
public function __construct(\DOMElement $context, $name)
7+
{
78
$this->contextNode = $context;
89
$this->setName($name);
910
}
1011

11-
private function setName($name) {
12+
private function setName($name)
13+
{
1214
$this->contextNode->setAttribute('name', $name);
1315
}
1416

15-
public function setLines($start, $executable, $executed) {
17+
public function setLines($start, $executable, $executed)
18+
{
1619
$this->contextNode->setAttribute('start', $start);
1720
$this->contextNode->setAttribute('executable', $executable);
1821
$this->contextNode->setAttribute('executed', $executed);
1922
}
2023

21-
public function setCrap($crap) {
24+
public function setCrap($crap)
25+
{
2226
$this->contextNode->setAttribute('crap', $crap);
2327
}
2428

25-
public function setPackage($full, $package, $sub, $category) {
29+
public function setPackage($full, $package, $sub, $category)
30+
{
2631
$node = $this->contextNode->getElementsByTagNameNS('http://xml.phpunit.de/coverage/1.0', 'package')->item(0);
2732
if (!$node) {
2833
$node = $this->contextNode->appendChild(
@@ -35,7 +40,8 @@ public function setPackage($full, $package, $sub, $category) {
3540
$node->setAttribute('category', $category);
3641
}
3742

38-
public function setNamespace($namespace) {
43+
public function setNamespace($namespace)
44+
{
3945
$node = $this->contextNode->getElementsByTagNameNS('http://xml.phpunit.de/coverage/1.0', 'namespace')->item(0);
4046
if (!$node) {
4147
$node = $this->contextNode->appendChild(
@@ -45,10 +51,12 @@ public function setNamespace($namespace) {
4551
$node->setAttribute('name', $namespace);
4652
}
4753

48-
public function addMethod($name) {
54+
public function addMethod($name)
55+
{
4956
$node = $this->contextNode->appendChild(
5057
$this->contextNode->ownerDocument->createElementNS('http://xml.phpunit.de/coverage/1.0', 'method')
5158
);
5259
return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
5360
}
54-
}
61+
62+
}

0 commit comments

Comments
 (0)