Skip to content

Commit b666512

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '1.2'
2 parents 38d0ec4 + 740558a commit b666512

9 files changed

+187
-41
lines changed

‎PHP/CodeCoverage.php

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ protected function getLinesToBeCovered($className, $methodName)
674674
}
675675

676676
$classShortcut = preg_match_all(
677-
'(@coversDefaultClass\s+(?P<coveredClass>.*?)\s*$)m',
677+
'(@coversDefaultClass\s+(?P<coveredClass>[^\s]++)\s*$)m',
678678
$class->getDocComment(),
679679
$matches
680680
);
@@ -693,7 +693,7 @@ protected function getLinesToBeCovered($className, $methodName)
693693
}
694694

695695
$match = preg_match_all(
696-
'(@covers\s+(?P<coveredElement>.*?)\s*(\(\s*\))?\s*$)m',
696+
'(@covers\s+(?P<coveredElement>[^\s()]++)[\s()]*$)m',
697697
$docComment,
698698
$matches
699699
);
@@ -895,25 +895,9 @@ protected function getLinesToBeIgnored($filename)
895895
switch (get_class($token)) {
896896
case 'PHP_Token_COMMENT':
897897
case 'PHP_Token_DOC_COMMENT': {
898-
$count = substr_count($token, "\n");
899-
$line = $token->getLine();
900-
901-
for ($i = $line; $i < $line + $count; $i++) {
902-
$this->ignoredLines[$filename][] = $i;
903-
}
904-
905-
if ($token instanceof PHP_Token_DOC_COMMENT) {
906-
// Workaround for the fact the DOC_COMMENT token
907-
// does not include the final \n character in its
908-
// text.
909-
if (substr(trim($lines[$i-1]), -2) == '*/') {
910-
$this->ignoredLines[$filename][] = $i;
911-
}
912-
913-
break;
914-
}
915898

916899
$_token = trim($token);
900+
$_line = trim($lines[$token->getLine() - 1]);
917901

918902
if ($_token == '// @codeCoverageIgnore' ||
919903
$_token == '//@codeCoverageIgnore') {
@@ -930,6 +914,26 @@ protected function getLinesToBeIgnored($filename)
930914
$_token == '//@codeCoverageIgnoreEnd') {
931915
$stop = TRUE;
932916
}
917+
918+
// be sure the comment doesn't have some token BEFORE it on the same line...
919+
// it would not be safe to ignore the whole line in those cases.
920+
if (0 === strpos($_token, $_line)) {
921+
$count = substr_count($token, "\n");
922+
$line = $token->getLine();
923+
924+
for ($i = $line; $i < $line + $count; $i++) {
925+
$this->ignoredLines[$filename][] = $i;
926+
}
927+
928+
if ($token instanceof PHP_Token_DOC_COMMENT) {
929+
// Workaround for the fact the DOC_COMMENT token
930+
// does not include the final \n character in its
931+
// text.
932+
if (substr(trim($lines[$i-1]), -2) == '*/') {
933+
$this->ignoredLines[$filename][] = $i;
934+
}
935+
}
936+
}
933937
}
934938
break;
935939

‎PHP/CodeCoverage/Report/Text.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
*/
5959
class PHP_CodeCoverage_Report_Text
6060
{
61-
protected $outputStream;
6261
protected $lowUpperBound;
6362
protected $highLowerBound;
6463
protected $showUncoveredFiles;
@@ -73,9 +72,8 @@ class PHP_CodeCoverage_Report_Text
7372
'eol' => "\x1b[2K",
7473
);
7574

76-
public function __construct(PHPUnit_Util_Printer $outputStream, $lowUpperBound, $highLowerBound, $showUncoveredFiles, $showOnlySummary)
75+
public function __construct($lowUpperBound, $highLowerBound, $showUncoveredFiles, $showOnlySummary)
7776
{
78-
$this->outputStream = $outputStream;
7977
$this->lowUpperBound = $lowUpperBound;
8078
$this->highLowerBound = $highLowerBound;
8179
$this->showUncoveredFiles = $showUncoveredFiles;
@@ -250,7 +248,7 @@ public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
250248
}
251249
}
252250

253-
$this->outputStream->write($output . PHP_EOL);
251+
return $output . PHP_EOL;
254252
}
255253

256254
protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)

‎Tests/PHP/CodeCoverage/FilterTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,12 @@ protected function setUp()
7878
TEST_FILES_PATH . 'BankAccountTest.php',
7979
TEST_FILES_PATH . 'CoverageClassExtendedTest.php',
8080
TEST_FILES_PATH . 'CoverageClassTest.php',
81+
TEST_FILES_PATH . 'CoverageFunctionParenthesesTest.php',
82+
TEST_FILES_PATH . 'CoverageFunctionParenthesesWhitespaceTest.php',
8183
TEST_FILES_PATH . 'CoverageFunctionTest.php',
8284
TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php',
85+
TEST_FILES_PATH . 'CoverageMethodParenthesesTest.php',
86+
TEST_FILES_PATH . 'CoverageMethodParenthesesWhitespaceTest.php',
8387
TEST_FILES_PATH . 'CoverageMethodTest.php',
8488
TEST_FILES_PATH . 'CoverageNoneTest.php',
8589
TEST_FILES_PATH . 'CoverageNotPrivateTest.php',

‎Tests/PHP/CodeCoverageTest.php

Lines changed: 90 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,10 @@ public function testClear()
268268
}
269269

270270
/**
271-
* Add parenthesis to the covers annotation below in a couple of different ways to make sure it
272-
* works as expected
273-
*
274-
* @covers PHP_CodeCoverage::start()
275-
* @covers PHP_CodeCoverage::stop( )
276-
* @covers PHP_CodeCoverage::append ()
277-
* @covers PHP_CodeCoverage::applyListsFilter ( )
271+
* @covers PHP_CodeCoverage::start
272+
* @covers PHP_CodeCoverage::stop
273+
* @covers PHP_CodeCoverage::append
274+
* @covers PHP_CodeCoverage::applyListsFilter
278275
* @covers PHP_CodeCoverage::initializeFilesThatAreSeenTheFirstTime
279276
* @covers PHP_CodeCoverage::applyCoversAnnotationFilter
280277
* @covers PHP_CodeCoverage::getTests
@@ -433,6 +430,66 @@ public function testTwoCoversDefaultClassAnnoationsAreNotAllowed()
433430
);
434431
}
435432

433+
/**
434+
* @covers PHP_CodeCoverage::getLinesToBeCovered
435+
*/
436+
public function testFunctionParenthesesAreAllowed()
437+
{
438+
$this->assertSame(
439+
array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
440+
$this->getLinesToBeCovered->invoke(
441+
$this->coverage,
442+
'CoverageFunctionParenthesesTest',
443+
'testSomething'
444+
)
445+
);
446+
}
447+
448+
/**
449+
* @covers PHP_CodeCoverage::getLinesToBeCovered
450+
*/
451+
public function testFunctionParenthesesAreAllowedWithWhitespace()
452+
{
453+
$this->assertSame(
454+
array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
455+
$this->getLinesToBeCovered->invoke(
456+
$this->coverage,
457+
'CoverageFunctionParenthesesWhitespaceTest',
458+
'testSomething'
459+
)
460+
);
461+
}
462+
463+
/**
464+
* @covers PHP_CodeCoverage::getLinesToBeCovered
465+
*/
466+
public function testMethodParenthesesAreAllowed()
467+
{
468+
$this->assertSame(
469+
array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
470+
$this->getLinesToBeCovered->invoke(
471+
$this->coverage,
472+
'CoverageMethodParenthesesTest',
473+
'testSomething'
474+
)
475+
);
476+
}
477+
478+
/**
479+
* @covers PHP_CodeCoverage::getLinesToBeCovered
480+
*/
481+
public function testMethodParenthesesAreAllowedWithWhitespace()
482+
{
483+
$this->assertSame(
484+
array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
485+
$this->getLinesToBeCovered->invoke(
486+
$this->coverage,
487+
'CoverageMethodParenthesesWhitespaceTest',
488+
'testSomething'
489+
)
490+
);
491+
}
492+
436493
public function getLinesToBeCoveredProvider()
437494
{
438495
return array(
@@ -605,17 +662,32 @@ public function testGetLinesToBeIgnoredOneLineAnnotations()
605662
{
606663
$this->assertEquals(
607664
array(
608-
1,
609-
2,
610-
3,
611-
4,
612-
5,
613-
6,
614-
7,
615-
8,
616-
9,
617-
13,
618-
14
665+
0 => 1,
666+
1 => 2,
667+
2 => 3,
668+
3 => 4,
669+
4 => 5,
670+
5 => 6,
671+
6 => 7,
672+
7 => 8,
673+
8 => 9,
674+
9 => 10,
675+
10 => 11,
676+
11 => 12,
677+
12 => 13,
678+
13 => 14,
679+
14 => 17,
680+
15 => 19,
681+
16 => 22,
682+
17 => 23,
683+
18 => 27,
684+
19 => 28,
685+
20 => 29,
686+
21 => 30,
687+
22 => 31,
688+
23 => 32,
689+
24 => 33,
690+
25 => 36
619691
),
620692
$this->getLinesToBeIgnored->invoke(
621693
$this->coverage,

‎Tests/_files/CoverageFunctionParenthesesTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
3+
{
4+
/**
5+
* @covers ::globalFunction()
6+
*/
7+
public function testSomething()
8+
{
9+
globalFunction();
10+
}
11+
}

‎Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
3+
{
4+
/**
5+
* @covers ::globalFunction ( )
6+
*/
7+
public function testSomething()
8+
{
9+
globalFunction();
10+
}
11+
}

‎Tests/_files/CoverageMethodParenthesesTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
class CoverageMethodParenthesesTest extends PHPUnit_Framework_TestCase
3+
{
4+
/**
5+
* @covers CoveredClass::publicMethod()
6+
*/
7+
public function testSomething()
8+
{
9+
$o = new CoveredClass;
10+
$o->publicMethod();
11+
}
12+
}

‎Tests/_files/CoverageMethodParenthesesWhitespaceTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
3+
{
4+
/**
5+
* @covers CoveredClass::publicMethod ( )
6+
*/
7+
public function testSomething()
8+
{
9+
$o = new CoveredClass;
10+
$o->publicMethod();
11+
}
12+
}

‎Tests/_files/source_with_oneline_annotations.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,25 @@ public function bar()
1111
{
1212
}
1313
}
14+
15+
function baz()
16+
{
17+
// a one-line comment
18+
print '*'; // a one-line comment
19+
20+
/* a one-line comment */
21+
print '*'; /* a one-line comment */
22+
23+
/* a one-line comment
24+
*/
25+
print '*'; /* a one-line comment
26+
*/
27+
28+
print '*'; // @codeCoverageIgnore
29+
30+
print '*'; // @codeCoverageIgnoreStart
31+
print '*';
32+
print '*'; // @codeCoverageIgnoreEnd
33+
34+
print '*';
35+
}

0 commit comments

Comments
 (0)