Skip to content

Commit ac9bed8

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '2.1'
2 parents c48ccfd + f37ca23 commit ac9bed8

File tree

18 files changed

+148
-150
lines changed

18 files changed

+148
-150
lines changed

‎src/CodeCoverage.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ class PHP_CodeCoverage
2828
private $filter;
2929

3030
/**
31-
* @var boolean
31+
* @var bool
3232
*/
3333
private $cacheTokens = false;
3434

3535
/**
36-
* @var boolean
36+
* @var bool
3737
*/
3838
private $checkForUnintentionallyCoveredCode = false;
3939

4040
/**
41-
* @var boolean
41+
* @var bool
4242
*/
4343
private $forceCoversAnnotation = false;
4444

4545
/**
46-
* @var boolean
46+
* @var bool
4747
*/
4848
private $mapTestClassNameToCoveredClassName = false;
4949

5050
/**
51-
* @var boolean
51+
* @var bool
5252
*/
5353
private $addUncoveredFilesFromWhitelist = true;
5454

5555
/**
56-
* @var boolean
56+
* @var bool
5757
*/
5858
private $processUncoveredFilesFromWhitelist = false;
5959

@@ -89,8 +89,8 @@ class PHP_CodeCoverage
8989
/**
9090
* Constructor.
9191
*
92-
* @param PHP_CodeCoverage_Driver $driver
93-
* @param PHP_CodeCoverage_Filter $filter
92+
* @param PHP_CodeCoverage_Driver $driver
93+
* @param PHP_CodeCoverage_Filter $filter
9494
* @throws PHP_CodeCoverage_Exception
9595
*/
9696
public function __construct(PHP_CodeCoverage_Driver $driver = null, PHP_CodeCoverage_Filter $filter = null)
@@ -151,7 +151,7 @@ public function filter()
151151
* Returns the collected code coverage data.
152152
* Set $raw = true to bypass all filters.
153153
*
154-
* @param bool $raw
154+
* @param bool $raw
155155
* @return array
156156
* @since Method available since Release 1.1.0
157157
*/
@@ -207,7 +207,7 @@ public function setTests(array $tests)
207207
* Start collection of code coverage information.
208208
*
209209
* @param mixed $id
210-
* @param boolean $clear
210+
* @param bool $clear
211211
* @throws PHP_CodeCoverage_Exception
212212
*/
213213
public function start($id, $clear = false)
@@ -231,7 +231,7 @@ public function start($id, $clear = false)
231231
/**
232232
* Stop collection of code coverage information.
233233
*
234-
* @param boolean $append
234+
* @param bool $append
235235
* @param mixed $linesToBeCovered
236236
* @param array $linesToBeUsed
237237
* @return array
@@ -266,7 +266,7 @@ public function stop($append = true, $linesToBeCovered = array(), array $linesTo
266266
*
267267
* @param array $data
268268
* @param mixed $id
269-
* @param boolean $append
269+
* @param bool $append
270270
* @param mixed $linesToBeCovered
271271
* @param array $linesToBeUsed
272272
* @throws PHP_CodeCoverage_Exception
@@ -380,7 +380,7 @@ public function merge(PHP_CodeCoverage $that)
380380
}
381381

382382
/**
383-
* @param boolean $flag
383+
* @param bool $flag
384384
* @throws PHP_CodeCoverage_Exception
385385
* @since Method available since Release 1.1.0
386386
*/
@@ -405,7 +405,7 @@ public function getCacheTokens()
405405
}
406406

407407
/**
408-
* @param boolean $flag
408+
* @param bool $flag
409409
* @throws PHP_CodeCoverage_Exception
410410
* @since Method available since Release 2.0.0
411411
*/
@@ -422,7 +422,7 @@ public function setCheckForUnintentionallyCoveredCode($flag)
422422
}
423423

424424
/**
425-
* @param boolean $flag
425+
* @param bool $flag
426426
* @throws PHP_CodeCoverage_Exception
427427
*/
428428
public function setForceCoversAnnotation($flag)
@@ -438,7 +438,7 @@ public function setForceCoversAnnotation($flag)
438438
}
439439

440440
/**
441-
* @param boolean $flag
441+
* @param bool $flag
442442
* @throws PHP_CodeCoverage_Exception
443443
*/
444444
public function setMapTestClassNameToCoveredClassName($flag)
@@ -454,7 +454,7 @@ public function setMapTestClassNameToCoveredClassName($flag)
454454
}
455455

456456
/**
457-
* @param boolean $flag
457+
* @param bool $flag
458458
* @throws PHP_CodeCoverage_Exception
459459
*/
460460
public function setAddUncoveredFilesFromWhitelist($flag)
@@ -470,7 +470,7 @@ public function setAddUncoveredFilesFromWhitelist($flag)
470470
}
471471

472472
/**
473-
* @param boolean $flag
473+
* @param bool $flag
474474
* @throws PHP_CodeCoverage_Exception
475475
*/
476476
public function setProcessUncoveredFilesFromWhitelist($flag)
@@ -716,7 +716,7 @@ private function getLinesToBeIgnored($filename)
716716

717717
if (!$ignore) {
718718
$start = $token->getLine();
719-
$end = $start + substr_count($token, "\n");
719+
$end = $start + substr_count($token, "\n");
720720

721721
// Do not ignore the first line when there is a token
722722
// before the comment

‎src/CodeCoverage/Driver/Xdebug.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private function cleanup(array $data)
6666
unset($data[$file][0]);
6767
}
6868

69-
if ($file != "xdebug://debug-eval" && file_exists($file)) {
69+
if ($file != 'xdebug://debug-eval' && file_exists($file)) {
7070
$numLines = $this->getNumberOfLinesInFile($file);
7171

7272
foreach (array_keys($data[$file]) as $line) {
@@ -82,7 +82,7 @@ private function cleanup(array $data)
8282

8383
/**
8484
* @param string $file
85-
* @return integer
85+
* @return int
8686
* @since Method available since Release 2.0.0
8787
*/
8888
private function getNumberOfLinesInFile($file)

‎src/CodeCoverage/Filter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function isFile($filename)
197197
* When the whitelist is not empty, whitelisting is used.
198198
*
199199
* @param string $filename
200-
* @return boolean
200+
* @return bool
201201
* @throws PHP_CodeCoverage_Exception
202202
*/
203203
public function isFiltered($filename)
@@ -238,7 +238,7 @@ public function getWhitelist()
238238
/**
239239
* Returns whether this filter has a whitelist.
240240
*
241-
* @return boolean
241+
* @return bool
242242
* @since Method available since Release 1.1.0
243243
*/
244244
public function hasWhitelist()

‎src/CodeCoverage/Report/Clover.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class PHP_CodeCoverage_Report_Clover
2323
*/
2424
public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
2525
{
26-
$xmlDocument = new DOMDocument('1.0', 'UTF-8');
26+
$xmlDocument = new DOMDocument('1.0', 'UTF-8');
2727
$xmlDocument->formatOutput = true;
2828

2929
$xmlCoverage = $xmlDocument->createElement('coverage');

‎src/CodeCoverage/Report/Crap4j.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct($threshold = 30)
4141
*/
4242
public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
4343
{
44-
$document = new DOMDocument('1.0', 'UTF-8');
44+
$document = new DOMDocument('1.0', 'UTF-8');
4545
$document->formatOutput = true;
4646

4747
$root = $document->createElement('crap_result');
@@ -136,9 +136,9 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
136136
}
137137

138138
/**
139-
* @param float $crapValue
140-
* @param integer $cyclomaticComplexity
141-
* @param float $coveragePercent
139+
* @param float $crapValue
140+
* @param int $cyclomaticComplexity
141+
* @param float $coveragePercent
142142
* @return float
143143
*/
144144
private function getCrapLoad($crapValue, $cyclomaticComplexity, $coveragePercent)

‎src/CodeCoverage/Report/Factory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class PHP_CodeCoverage_Report_Factory
1717
{
1818
/**
19-
* @param PHP_CodeCoverage $coverage
19+
* @param PHP_CodeCoverage $coverage
2020
* @return PHP_CodeCoverage_Report_Node_Directory
2121
*/
2222
public function create(PHP_CodeCoverage $coverage)
@@ -42,7 +42,7 @@ public function create(PHP_CodeCoverage $coverage)
4242
* @param PHP_CodeCoverage_Report_Node_Directory $root
4343
* @param array $items
4444
* @param array $tests
45-
* @param boolean $cacheTokens
45+
* @param bool $cacheTokens
4646
*/
4747
private function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
4848
{
@@ -231,7 +231,7 @@ private function reducePaths(&$files)
231231
$max = count($original);
232232

233233
for ($i = 0; $i < $max; $i++) {
234-
$files[join('/', $paths[$i])] = $files[$original[$i]];
234+
$files[implode('/', $paths[$i])] = $files[$original[$i]];
235235
unset($files[$original[$i]]);
236236
}
237237

‎src/CodeCoverage/Report/HTML.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ class PHP_CodeCoverage_Report_HTML
2626
private $generator;
2727

2828
/**
29-
* @var integer
29+
* @var int
3030
*/
3131
private $lowUpperBound;
3232

3333
/**
34-
* @var integer
34+
* @var int
3535
*/
3636
private $highLowerBound;
3737

3838
/**
3939
* Constructor.
4040
*
41-
* @param integer $lowUpperBound
42-
* @param integer $highLowerBound
43-
* @param string $generator
41+
* @param int $lowUpperBound
42+
* @param int $highLowerBound
43+
* @param string $generator
4444
*/
4545
public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generator = '')
4646
{

‎src/CodeCoverage/Report/HTML/Renderer.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
3333
protected $date;
3434

3535
/**
36-
* @var integer
36+
* @var int
3737
*/
3838
protected $lowUpperBound;
3939

4040
/**
41-
* @var integer
41+
* @var int
4242
*/
4343
protected $highLowerBound;
4444

@@ -50,11 +50,11 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
5050
/**
5151
* Constructor.
5252
*
53-
* @param string $templatePath
54-
* @param string $generator
55-
* @param string $date
56-
* @param integer $lowUpperBound
57-
* @param integer $highLowerBound
53+
* @param string $templatePath
54+
* @param string $generator
55+
* @param string $date
56+
* @param int $lowUpperBound
57+
* @param int $highLowerBound
5858
*/
5959
public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
6060
{
@@ -123,21 +123,21 @@ protected function renderItemTemplate(Text_Template $template, array $data)
123123

124124
$template->setVar(
125125
array(
126-
'icon' => isset($data['icon']) ? $data['icon'] : '',
127-
'crap' => isset($data['crap']) ? $data['crap'] : '',
128-
'name' => $data['name'],
129-
'lines_bar' => $linesBar,
126+
'icon' => isset($data['icon']) ? $data['icon'] : '',
127+
'crap' => isset($data['crap']) ? $data['crap'] : '',
128+
'name' => $data['name'],
129+
'lines_bar' => $linesBar,
130130
'lines_executed_percent' => $data['linesExecutedPercentAsString'],
131-
'lines_level' => $linesLevel,
132-
'lines_number' => $linesNumber,
133-
'methods_bar' => $methodsBar,
131+
'lines_level' => $linesLevel,
132+
'lines_number' => $linesNumber,
133+
'methods_bar' => $methodsBar,
134134
'methods_tested_percent' => $data['testedMethodsPercentAsString'],
135-
'methods_level' => $methodsLevel,
136-
'methods_number' => $methodsNumber,
137-
'classes_bar' => $classesBar,
135+
'methods_level' => $methodsLevel,
136+
'methods_number' => $methodsNumber,
137+
'classes_bar' => $classesBar,
138138
'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
139-
'classes_level' => $classesLevel,
140-
'classes_number' => $classesNumber
139+
'classes_level' => $classesLevel,
140+
'classes_number' => $classesNumber
141141
)
142142
);
143143

@@ -245,13 +245,13 @@ protected function getCoverageBar($percent)
245245
'}}'
246246
);
247247

248-
$template->setVar(array('level' => $level, 'percent' => sprintf("%.2F", $percent)));
248+
$template->setVar(array('level' => $level, 'percent' => sprintf('%.2F', $percent)));
249249

250250
return $template->render();
251251
}
252252

253253
/**
254-
* @param integer $percent
254+
* @param int $percent
255255
* @return string
256256
*/
257257
protected function getColorLevel($percent)

‎src/CodeCoverage/Report/HTML/Renderer/Dashboard.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function complexity(array $classes, $baseLink)
9292
}
9393

9494
return array(
95-
'class' => json_encode($result['class']),
95+
'class' => json_encode($result['class']),
9696
'method' => json_encode($result['method'])
9797
);
9898
}
@@ -161,7 +161,7 @@ protected function coverageDistribution(array $classes)
161161
}
162162

163163
return array(
164-
'class' => json_encode(array_values($result['class'])),
164+
'class' => json_encode(array_values($result['class'])),
165165
'method' => json_encode(array_values($result['method']))
166166
);
167167
}

‎src/CodeCoverage/Report/HTML/Renderer/Directory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
4747

4848
/**
4949
* @param PHP_CodeCoverage_Report_Node $item
50-
* @param boolean $total
50+
* @param bool $total
5151
* @return string
5252
*/
5353
protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = false)

0 commit comments

Comments
 (0)