Skip to content

Commit 458c2a9

Browse files
sebastianbergmannsebastianbergmann
committed
CS fixes
1 parent afe2aa6 commit 458c2a9

37 files changed

+828
-802
lines changed

‎src/CodeCoverage.php‎

Lines changed: 93 additions & 76 deletions
Large diffs are not rendered by default.

‎src/CodeCoverage/Driver/Xdebug.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct()
6868

6969
if (!ini_get('xdebug.coverage_enable')) {
7070
throw new PHP_CodeCoverage_Exception(
71-
'You need to set xdebug.coverage_enable=On in your php.ini.'
71+
'You need to set xdebug.coverage_enable=On in your php.ini.'
7272
);
7373
}
7474
}

‎src/CodeCoverage/Filter.php‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class PHP_CodeCoverage_Filter
7373
/**
7474
* @var boolean
7575
*/
76-
private $blacklistPrefilled = FALSE;
76+
private $blacklistPrefilled = false;
7777

7878
/**
7979
* Adds a directory to the blacklist (recursively).
@@ -85,9 +85,7 @@ class PHP_CodeCoverage_Filter
8585
public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
8686
{
8787
$facade = new File_Iterator_Facade;
88-
$files = $facade->getFilesAsArray(
89-
$directory, $suffix, $prefix
90-
);
88+
$files = $facade->getFilesAsArray($directory, $suffix, $prefix);
9189

9290
foreach ($files as $file) {
9391
$this->addFileToBlacklist($file);
@@ -101,7 +99,7 @@ public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix =
10199
*/
102100
public function addFileToBlacklist($filename)
103101
{
104-
$this->blacklistedFiles[realpath($filename)] = TRUE;
102+
$this->blacklistedFiles[realpath($filename)] = true;
105103
}
106104

107105
/**
@@ -126,9 +124,7 @@ public function addFilesToBlacklist(array $files)
126124
public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
127125
{
128126
$facade = new File_Iterator_Facade;
129-
$files = $facade->getFilesAsArray(
130-
$directory, $suffix, $prefix
131-
);
127+
$files = $facade->getFilesAsArray($directory, $suffix, $prefix);
132128

133129
foreach ($files as $file) {
134130
$this->removeFileFromBlacklist($file);
@@ -159,9 +155,7 @@ public function removeFileFromBlacklist($filename)
159155
public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
160156
{
161157
$facade = new File_Iterator_Facade;
162-
$files = $facade->getFilesAsArray(
163-
$directory, $suffix, $prefix
164-
);
158+
$files = $facade->getFilesAsArray($directory, $suffix, $prefix);
165159

166160
foreach ($files as $file) {
167161
$this->addFileToWhitelist($file);
@@ -175,7 +169,7 @@ public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix =
175169
*/
176170
public function addFileToWhitelist($filename)
177171
{
178-
$this->whitelistedFiles[realpath($filename)] = TRUE;
172+
$this->whitelistedFiles[realpath($filename)] = true;
179173
}
180174

181175
/**
@@ -200,9 +194,7 @@ public function addFilesToWhitelist(array $files)
200194
public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
201195
{
202196
$facade = new File_Iterator_Facade;
203-
$files = $facade->getFilesAsArray(
204-
$directory, $suffix, $prefix
205-
);
197+
$files = $facade->getFilesAsArray($directory, $suffix, $prefix);
206198

207199
foreach ($files as $file) {
208200
$this->removeFileFromWhitelist($file);
@@ -231,15 +223,15 @@ public function removeFileFromWhitelist($filename)
231223
public function isFile($filename)
232224
{
233225
if ($filename == '-' ||
234-
strpos($filename, 'eval()\'d code') !== FALSE ||
235-
strpos($filename, 'runtime-created function') !== FALSE ||
236-
strpos($filename, 'runkit created function') !== FALSE ||
237-
strpos($filename, 'assert code') !== FALSE ||
238-
strpos($filename, 'regexp code') !== FALSE) {
239-
return FALSE;
226+
strpos($filename, 'eval()\'d code') !== false ||
227+
strpos($filename, 'runtime-created function') !== false ||
228+
strpos($filename, 'runkit created function') !== false ||
229+
strpos($filename, 'assert code') !== false ||
230+
strpos($filename, 'regexp code') !== false) {
231+
return false;
240232
}
241233

242-
return TRUE;
234+
return true;
243235
}
244236

245237
/**
@@ -324,7 +316,7 @@ private function prefillBlacklist()
324316
$this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Exporter\Exporter');
325317
$this->addDirectoryContainingClassToBlacklist('SebastianBergmann\Version');
326318

327-
$this->blacklistPrefilled = TRUE;
319+
$this->blacklistPrefilled = true;
328320
}
329321

330322
/**

‎src/CodeCoverage/Report/Clover.php‎

Lines changed: 60 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ class PHP_CodeCoverage_Report_Clover
6262
* @param string $name
6363
* @return string
6464
*/
65-
public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL)
65+
public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
6666
{
6767
$xmlDocument = new DOMDocument('1.0', 'UTF-8');
68-
$xmlDocument->formatOutput = TRUE;
68+
$xmlDocument->formatOutput = true;
6969

7070
$xmlCoverage = $xmlDocument->createElement('coverage');
7171
$xmlCoverage->setAttribute('generated', (int) $_SERVER['REQUEST_TIME']);
@@ -105,8 +105,9 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
105105
$classMethods = 0;
106106

107107
foreach ($class['methods'] as $methodName => $method) {
108-
if ($method['executableLines'] == 0)
108+
if ($method['executableLines'] == 0) {
109109
continue;
110+
}
110111

111112
$classMethods++;
112113
$classStatements += $method['executableLines'];
@@ -119,16 +120,16 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
119120
for ($i = $method['startLine'];
120121
$i <= $method['endLine'];
121122
$i++) {
122-
if (isset($coverage[$i]) && ($coverage[$i] !== NULL)) {
123+
if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
123124
$methodCount = max($methodCount, count($coverage[$i]));
124125
}
125126
}
126127

127128
$lines[$method['startLine']] = array(
128-
'count' => $methodCount,
129-
'crap' => $method['crap'],
130-
'type' => 'method',
131-
'name' => $methodName
129+
'count' => $methodCount,
130+
'crap' => $method['crap'],
131+
'type' => 'method',
132+
'name' => $methodName
132133
);
133134
}
134135

@@ -142,25 +143,29 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
142143

143144
if (!empty($class['package']['fullPackage'])) {
144145
$xmlClass->setAttribute(
145-
'fullPackage', $class['package']['fullPackage']
146+
'fullPackage',
147+
$class['package']['fullPackage']
146148
);
147149
}
148150

149151
if (!empty($class['package']['category'])) {
150152
$xmlClass->setAttribute(
151-
'category', $class['package']['category']
153+
'category',
154+
$class['package']['category']
152155
);
153156
}
154157

155158
if (!empty($class['package']['package'])) {
156159
$xmlClass->setAttribute(
157-
'package', $class['package']['package']
160+
'package',
161+
$class['package']['package']
158162
);
159163
}
160164

161165
if (!empty($class['package']['subpackage'])) {
162166
$xmlClass->setAttribute(
163-
'subpackage', $class['package']['subpackage']
167+
'subpackage',
168+
$class['package']['subpackage']
164169
);
165170
}
166171

@@ -173,29 +178,31 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
173178
$xmlMetrics->setAttribute('coveredconditionals', 0);
174179
$xmlMetrics->setAttribute('statements', $classStatements);
175180
$xmlMetrics->setAttribute(
176-
'coveredstatements', $coveredClassStatements
181+
'coveredstatements',
182+
$coveredClassStatements
177183
);
178184
$xmlMetrics->setAttribute(
179-
'elements',
180-
$classMethods +
181-
$classStatements
182-
/* + conditionals */);
185+
'elements',
186+
$classMethods +
187+
$classStatements
188+
/* + conditionals */
189+
);
183190
$xmlMetrics->setAttribute(
184-
'coveredelements',
185-
$coveredMethods +
186-
$coveredClassStatements
187-
/* + coveredconditionals */
191+
'coveredelements',
192+
$coveredMethods +
193+
$coveredClassStatements
194+
/* + coveredconditionals */
188195
);
189196
$xmlClass->appendChild($xmlMetrics);
190197
}
191198

192199
foreach ($coverage as $line => $data) {
193-
if ($data === NULL || isset($lines[$line])) {
200+
if ($data === null || isset($lines[$line])) {
194201
continue;
195202
}
196203

197204
$lines[$line] = array(
198-
'count' => count($data), 'type' => 'stmt'
205+
'count' => count($data), 'type' => 'stmt'
199206
);
200207
}
201208

@@ -226,27 +233,28 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
226233
$xmlMetrics->setAttribute('classes', $item->getNumClassesAndTraits());
227234
$xmlMetrics->setAttribute('methods', $item->getNumMethods());
228235
$xmlMetrics->setAttribute(
229-
'coveredmethods', $item->getNumTestedMethods()
236+
'coveredmethods',
237+
$item->getNumTestedMethods()
230238
);
231239
$xmlMetrics->setAttribute('conditionals', 0);
232240
$xmlMetrics->setAttribute('coveredconditionals', 0);
233241
$xmlMetrics->setAttribute(
234-
'statements', $item->getNumExecutableLines()
242+
'statements',
243+
$item->getNumExecutableLines()
235244
);
236245
$xmlMetrics->setAttribute(
237-
'coveredstatements', $item->getNumExecutedLines()
246+
'coveredstatements',
247+
$item->getNumExecutedLines()
238248
);
239249
$xmlMetrics->setAttribute(
240-
'elements',
241-
$item->getNumMethods() +
242-
$item->getNumExecutableLines()
243-
/* + conditionals */
250+
'elements',
251+
$item->getNumMethods() + $item->getNumExecutableLines()
252+
/* + conditionals */
244253
);
245254
$xmlMetrics->setAttribute(
246-
'coveredelements',
247-
$item->getNumTestedMethods() +
248-
$item->getNumExecutedLines()
249-
/* + coveredconditionals */
255+
'coveredelements',
256+
$item->getNumTestedMethods() + $item->getNumExecutedLines()
257+
/* + coveredconditionals */
250258
);
251259
$xmlFile->appendChild($xmlMetrics);
252260

@@ -255,7 +263,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
255263
} else {
256264
if (!isset($packages[$namespace])) {
257265
$packages[$namespace] = $xmlDocument->createElement(
258-
'package'
266+
'package'
259267
);
260268

261269
$packages[$namespace]->setAttribute('name', $namespace);
@@ -273,37 +281,40 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
273281
$xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
274282
$xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
275283
$xmlMetrics->setAttribute(
276-
'classes', $report->getNumClassesAndTraits()
284+
'classes',
285+
$report->getNumClassesAndTraits()
277286
);
278287
$xmlMetrics->setAttribute('methods', $report->getNumMethods());
279288
$xmlMetrics->setAttribute(
280-
'coveredmethods', $report->getNumTestedMethods()
289+
'coveredmethods',
290+
$report->getNumTestedMethods()
281291
);
282292
$xmlMetrics->setAttribute('conditionals', 0);
283293
$xmlMetrics->setAttribute('coveredconditionals', 0);
284294
$xmlMetrics->setAttribute(
285-
'statements', $report->getNumExecutableLines()
295+
'statements',
296+
$report->getNumExecutableLines()
286297
);
287298
$xmlMetrics->setAttribute(
288-
'coveredstatements', $report->getNumExecutedLines()
299+
'coveredstatements',
300+
$report->getNumExecutedLines()
289301
);
290302
$xmlMetrics->setAttribute(
291-
'elements',
292-
$report->getNumMethods() +
293-
$report->getNumExecutableLines()
294-
/* + conditionals */
303+
'elements',
304+
$report->getNumMethods() + $report->getNumExecutableLines()
305+
/* + conditionals */
295306
);
296307
$xmlMetrics->setAttribute(
297-
'coveredelements',
298-
$report->getNumTestedMethods() +
299-
$report->getNumExecutedLines()
300-
/* + coveredconditionals */
308+
'coveredelements',
309+
$report->getNumTestedMethods() + $report->getNumExecutedLines()
310+
/* + coveredconditionals */
301311
);
312+
302313
$xmlProject->appendChild($xmlMetrics);
303314

304-
if ($target !== NULL) {
315+
if ($target !== null) {
305316
if (!is_dir(dirname($target))) {
306-
mkdir(dirname($target), 0777, TRUE);
317+
mkdir(dirname($target), 0777, true);
307318
}
308319

309320
return $xmlDocument->save($target);

‎src/CodeCoverage/Report/Crap4j.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ class PHP_CodeCoverage_Report_Crap4j
6262
* @param string $name
6363
* @return string
6464
*/
65-
public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL)
65+
public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
6666
{
6767
$document = new DOMDocument('1.0', 'UTF-8');
68-
$document->formatOutput = TRUE;
68+
$document->formatOutput = true;
6969

7070
$root = $document->createElement('crap_result');
7171
$document->appendChild($root);
@@ -134,9 +134,9 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
134134
$root->appendChild($stats);
135135
$root->appendChild($methodsNode);
136136

137-
if ($target !== NULL) {
137+
if ($target !== null) {
138138
if (!is_dir(dirname($target))) {
139-
mkdir(dirname($target), 0777, TRUE);
139+
mkdir(dirname($target), 0777, true);
140140
}
141141

142142
return $document->save($target);

0 commit comments

Comments
 (0)