Skip to content

Commit 183c44c

Browse files
sebastianbergmannsebastianbergmann
committed
Fix CS/WS issues
1 parent 2cf13c6 commit 183c44c

26 files changed

+317
-301
lines changed

‎src/CodeCoverage.php‎

Lines changed: 72 additions & 67 deletions
Large diffs are not rendered by default.

‎src/Driver/HHVM.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ class HHVM extends Xdebug
2424
*/
2525
public function start($determineUnusedAndDead = true)
2626
{
27-
xdebug_start_code_coverage();
27+
\xdebug_start_code_coverage();
2828
}
2929
}

‎src/Driver/PHPDBG.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct()
3030
);
3131
}
3232

33-
if (!function_exists('phpdbg_start_oplog')) {
33+
if (!\function_exists('phpdbg_start_oplog')) {
3434
throw new RuntimeException(
3535
'This build of PHPDBG does not support code coverage'
3636
);
@@ -61,9 +61,9 @@ public function stop()
6161
if ($fetchedLines == []) {
6262
$sourceLines = phpdbg_get_executable();
6363
} else {
64-
$newFiles = array_diff(
65-
get_included_files(),
66-
array_keys($fetchedLines)
64+
$newFiles = \array_diff(
65+
\get_included_files(),
66+
\array_keys($fetchedLines)
6767
);
6868

6969
if ($newFiles) {
@@ -81,7 +81,7 @@ public function stop()
8181
}
8282
}
8383

84-
$fetchedLines = array_merge($fetchedLines, $sourceLines);
84+
$fetchedLines = \array_merge($fetchedLines, $sourceLines);
8585

8686
return $this->detectExecutedLines($fetchedLines, $dbgData);
8787
}

‎src/Driver/Xdebug.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class Xdebug implements Driver
3131
*/
3232
public function __construct()
3333
{
34-
if (!extension_loaded('xdebug')) {
34+
if (!\extension_loaded('xdebug')) {
3535
throw new RuntimeException('This driver requires Xdebug');
3636
}
3737

38-
if (version_compare(phpversion('xdebug'), '2.2.1', '>=') &&
39-
!ini_get('xdebug.coverage_enable')) {
38+
if (\version_compare(\phpversion('xdebug'), '2.2.1', '>=') &&
39+
!\ini_get('xdebug.coverage_enable')) {
4040
throw new RuntimeException(
4141
'xdebug.coverage_enable=On has to be set in php.ini'
4242
);
@@ -51,9 +51,9 @@ public function __construct()
5151
public function start($determineUnusedAndDead = true)
5252
{
5353
if ($determineUnusedAndDead) {
54-
xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
54+
\xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
5555
} else {
56-
xdebug_start_code_coverage();
56+
\xdebug_start_code_coverage();
5757
}
5858
}
5959

@@ -64,8 +64,8 @@ public function start($determineUnusedAndDead = true)
6464
*/
6565
public function stop()
6666
{
67-
$data = xdebug_get_code_coverage();
68-
xdebug_stop_code_coverage();
67+
$data = \xdebug_get_code_coverage();
68+
\xdebug_stop_code_coverage();
6969

7070
return $this->cleanup($data);
7171
}
@@ -77,13 +77,13 @@ public function stop()
7777
*/
7878
private function cleanup(array $data)
7979
{
80-
foreach (array_keys($data) as $file) {
80+
foreach (\array_keys($data) as $file) {
8181
unset($data[$file][0]);
8282

83-
if (strpos($file, 'xdebug://debug-eval') !== 0 && file_exists($file)) {
83+
if (\strpos($file, 'xdebug://debug-eval') !== 0 && \file_exists($file)) {
8484
$numLines = $this->getNumberOfLinesInFile($file);
8585

86-
foreach (array_keys($data[$file]) as $line) {
86+
foreach (\array_keys($data[$file]) as $line) {
8787
if ($line > $numLines) {
8888
unset($data[$file][$line]);
8989
}
@@ -102,10 +102,10 @@ private function cleanup(array $data)
102102
private function getNumberOfLinesInFile($file)
103103
{
104104
if (!isset($this->cacheNumLines[$file])) {
105-
$buffer = file_get_contents($file);
106-
$lines = substr_count($buffer, "\n");
105+
$buffer = \file_get_contents($file);
106+
$lines = \substr_count($buffer, "\n");
107107

108-
if (substr($buffer, -1) !== "\n") {
108+
if (\substr($buffer, -1) !== "\n") {
109109
$lines++;
110110
}
111111

‎src/Exception/InvalidArgumentException.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class InvalidArgumentException extends \InvalidArgumentException implements Exce
2121
*/
2222
public static function create($argument, $type, $value = null)
2323
{
24-
$stack = debug_backtrace(0);
24+
$stack = \debug_backtrace(0);
2525

2626
return new self(
27-
sprintf(
27+
\sprintf(
2828
'Argument #%d%sof %s::%s() must be a %s',
2929
$argument,
30-
$value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
30+
$value !== null ? ' (' . \gettype($value) . '#' . $value . ')' : ' (No Value) ',
3131
$stack[1]['class'],
3232
$stack[1]['function'],
3333
$type

‎src/Filter.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix =
4646
*/
4747
public function addFileToWhitelist($filename)
4848
{
49-
$this->whitelistedFiles[realpath($filename)] = true;
49+
$this->whitelistedFiles[\realpath($filename)] = true;
5050
}
5151

5252
/**
@@ -85,7 +85,7 @@ public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $pref
8585
*/
8686
public function removeFileFromWhitelist($filename)
8787
{
88-
$filename = realpath($filename);
88+
$filename = \realpath($filename);
8989

9090
unset($this->whitelistedFiles[$filename]);
9191
}
@@ -100,17 +100,17 @@ public function removeFileFromWhitelist($filename)
100100
public function isFile($filename)
101101
{
102102
if ($filename == '-' ||
103-
strpos($filename, 'vfs://') === 0 ||
104-
strpos($filename, 'xdebug://debug-eval') !== false ||
105-
strpos($filename, 'eval()\'d code') !== false ||
106-
strpos($filename, 'runtime-created function') !== false ||
107-
strpos($filename, 'runkit created function') !== false ||
108-
strpos($filename, 'assert code') !== false ||
109-
strpos($filename, 'regexp code') !== false) {
103+
\strpos($filename, 'vfs://') === 0 ||
104+
\strpos($filename, 'xdebug://debug-eval') !== false ||
105+
\strpos($filename, 'eval()\'d code') !== false ||
106+
\strpos($filename, 'runtime-created function') !== false ||
107+
\strpos($filename, 'runkit created function') !== false ||
108+
\strpos($filename, 'assert code') !== false ||
109+
\strpos($filename, 'regexp code') !== false) {
110110
return false;
111111
}
112112

113-
return file_exists($filename);
113+
return \file_exists($filename);
114114
}
115115

116116
/**
@@ -126,7 +126,7 @@ public function isFiltered($filename)
126126
return true;
127127
}
128128

129-
$filename = realpath($filename);
129+
$filename = \realpath($filename);
130130

131131
return !isset($this->whitelistedFiles[$filename]);
132132
}
@@ -138,7 +138,7 @@ public function isFiltered($filename)
138138
*/
139139
public function getWhitelist()
140140
{
141-
return array_keys($this->whitelistedFiles);
141+
return \array_keys($this->whitelistedFiles);
142142
}
143143

144144
/**

‎src/Node/AbstractNode.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ abstract class AbstractNode implements \Countable
4848
* @param string $name
4949
* @param AbstractNode $parent
5050
*/
51-
public function __construct($name, AbstractNode $parent = null)
51+
public function __construct($name, self $parent = null)
5252
{
53-
if (substr($name, -1) == '/') {
54-
$name = substr($name, 0, -1);
53+
if (\substr($name, -1) == '/') {
54+
$name = \substr($name, 0, -1);
5555
}
5656

5757
$this->name = $name;
@@ -80,7 +80,7 @@ public function getId()
8080
$parentId = $parent->getId();
8181

8282
if ($parentId == 'index') {
83-
$this->id = str_replace(':', '_', $this->name);
83+
$this->id = \str_replace(':', '_', $this->name);
8484
} else {
8585
$this->id = $parentId . '/' . $this->name;
8686
}
@@ -239,7 +239,7 @@ public function getNumTestedClassesAndTraits()
239239
*/
240240
public function getClassesAndTraits()
241241
{
242-
return array_merge($this->getClasses(), $this->getTraits());
242+
return \array_merge($this->getClasses(), $this->getTraits());
243243
}
244244

245245
/**

‎src/Node/Builder.php‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public function build(CodeCoverage $coverage)
4747
private function addItems(Directory $root, array $items, array $tests, $cacheTokens)
4848
{
4949
foreach ($items as $key => $value) {
50-
if (substr($key, -2) == '/f') {
51-
$key = substr($key, 0, -2);
50+
if (\substr($key, -2) == '/f') {
51+
$key = \substr($key, 0, -2);
5252

53-
if (file_exists($root->getPath() . DIRECTORY_SEPARATOR . $key)) {
53+
if (\file_exists($root->getPath() . DIRECTORY_SEPARATOR . $key)) {
5454
$root->addFile($key, $value, $tests, $cacheTokens);
5555
}
5656
} else {
@@ -109,9 +109,9 @@ private function buildDirectoryStructure($files)
109109
$result = [];
110110

111111
foreach ($files as $path => $file) {
112-
$path = explode('/', $path);
112+
$path = \explode('/', $path);
113113
$pointer = &$result;
114-
$max = count($path);
114+
$max = \count($path);
115115

116116
for ($i = 0; $i < $max; $i++) {
117117
if ($i == ($max - 1)) {
@@ -177,41 +177,42 @@ private function reducePaths(&$files)
177177
}
178178

179179
$commonPath = '';
180-
$paths = array_keys($files);
180+
$paths = \array_keys($files);
181181

182-
if (count($files) == 1) {
183-
$commonPath = dirname($paths[0]) . '/';
184-
$files[basename($paths[0])] = $files[$paths[0]];
182+
if (\count($files) == 1) {
183+
$commonPath = \dirname($paths[0]) . '/';
184+
$files[\basename($paths[0])] = $files[$paths[0]];
185185

186186
unset($files[$paths[0]]);
187187

188188
return $commonPath;
189189
}
190190

191-
$max = count($paths);
191+
$max = \count($paths);
192192

193193
for ($i = 0; $i < $max; $i++) {
194194
// strip phar:// prefixes
195-
if (strpos($paths[$i], 'phar://') === 0) {
196-
$paths[$i] = substr($paths[$i], 7);
197-
$paths[$i] = strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
195+
if (\strpos($paths[$i], 'phar://') === 0) {
196+
$paths[$i] = \substr($paths[$i], 7);
197+
$paths[$i] = \strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
198198
}
199-
$paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
199+
$paths[$i] = \explode(DIRECTORY_SEPARATOR, $paths[$i]);
200200

201201
if (empty($paths[$i][0])) {
202202
$paths[$i][0] = DIRECTORY_SEPARATOR;
203203
}
204204
}
205205

206206
$done = false;
207-
$max = count($paths);
207+
$max = \count($paths);
208208

209209
while (!$done) {
210210
for ($i = 0; $i < $max - 1; $i++) {
211211
if (!isset($paths[$i][0]) ||
212212
!isset($paths[$i + 1][0]) ||
213213
$paths[$i][0] != $paths[$i + 1][0]) {
214214
$done = true;
215+
215216
break;
216217
}
217218
}
@@ -224,21 +225,21 @@ private function reducePaths(&$files)
224225
}
225226

226227
for ($i = 0; $i < $max; $i++) {
227-
array_shift($paths[$i]);
228+
\array_shift($paths[$i]);
228229
}
229230
}
230231
}
231232

232-
$original = array_keys($files);
233-
$max = count($original);
233+
$original = \array_keys($files);
234+
$max = \count($original);
234235

235236
for ($i = 0; $i < $max; $i++) {
236-
$files[implode('/', $paths[$i])] = $files[$original[$i]];
237+
$files[\implode('/', $paths[$i])] = $files[$original[$i]];
237238
unset($files[$original[$i]]);
238239
}
239240

240-
ksort($files);
241+
\ksort($files);
241242

242-
return substr($commonPath, 0, -1);
243+
return \substr($commonPath, 0, -1);
243244
}
244245
}

‎src/Node/Directory.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function count()
118118
$this->numFiles = 0;
119119

120120
foreach ($this->children as $child) {
121-
$this->numFiles += count($child);
121+
$this->numFiles += \count($child);
122122
}
123123
}
124124

@@ -150,7 +150,7 @@ public function addDirectory($name)
150150
$directory = new self($name, $this);
151151

152152
$this->children[] = $directory;
153-
$this->directories[] = &$this->children[count($this->children) - 1];
153+
$this->directories[] = &$this->children[\count($this->children) - 1];
154154

155155
return $directory;
156156
}
@@ -178,7 +178,7 @@ public function addFile($name, array $coverageData, array $testData, $cacheToken
178178
);
179179

180180
$this->children[] = $file;
181-
$this->files[] = &$this->children[count($this->children) - 1];
181+
$this->files[] = &$this->children[\count($this->children) - 1];
182182

183183
$this->numExecutableLines = -1;
184184
$this->numExecutedLines = -1;
@@ -227,7 +227,7 @@ public function getClasses()
227227
$this->classes = [];
228228

229229
foreach ($this->children as $child) {
230-
$this->classes = array_merge(
230+
$this->classes = \array_merge(
231231
$this->classes,
232232
$child->getClasses()
233233
);
@@ -248,7 +248,7 @@ public function getTraits()
248248
$this->traits = [];
249249

250250
foreach ($this->children as $child) {
251-
$this->traits = array_merge(
251+
$this->traits = \array_merge(
252252
$this->traits,
253253
$child->getTraits()
254254
);
@@ -269,7 +269,7 @@ public function getFunctions()
269269
$this->functions = [];
270270

271271
foreach ($this->children as $child) {
272-
$this->functions = array_merge(
272+
$this->functions = \array_merge(
273273
$this->functions,
274274
$child->getFunctions()
275275
);
@@ -292,8 +292,8 @@ public function getLinesOfCode()
292292
foreach ($this->children as $child) {
293293
$linesOfCode = $child->getLinesOfCode();
294294

295-
$this->linesOfCode['loc'] += $linesOfCode['loc'];
296-
$this->linesOfCode['cloc'] += $linesOfCode['cloc'];
295+
$this->linesOfCode['loc'] += $linesOfCode['loc'];
296+
$this->linesOfCode['cloc'] += $linesOfCode['cloc'];
297297
$this->linesOfCode['ncloc'] += $linesOfCode['ncloc'];
298298
}
299299
}

0 commit comments

Comments
 (0)