Skip to content

Commit 47377d4

Browse files
sebastianbergmannsebastianbergmann
committed
Changes required for sebastianbergmann/phpunit@bac4359 
1 parent 108c1e0 commit 47377d4

File tree

10 files changed

+37
-50
lines changed

10 files changed

+37
-50
lines changed

‎src/Report/Clover.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

13-
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Node\Directory;
1414
use SebastianBergmann\CodeCoverage\Node\File;
1515

1616
/**
@@ -19,13 +19,13 @@
1919
class Clover
2020
{
2121
/**
22-
* @param CodeCoverage $coverage
23-
* @param string $target
24-
* @param string $name
22+
* @param Directory $report
23+
* @param string $target
24+
* @param string $name
2525
*
2626
* @return string
2727
*/
28-
public function process(CodeCoverage $coverage, $target = null, $name = null)
28+
public function process(Directory $report, $target = null, $name = null)
2929
{
3030
$xmlDocument = new \DOMDocument('1.0', 'UTF-8');
3131
$xmlDocument->formatOutput = true;
@@ -44,8 +44,6 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
4444
$xmlCoverage->appendChild($xmlProject);
4545

4646
$packages = [];
47-
$report = $coverage->getReport();
48-
unset($coverage);
4947

5048
foreach ($report as $item) {
5149
if (!$item instanceof File) {

‎src/Report/Crap4j.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

13-
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Node\Directory;
1414
use SebastianBergmann\CodeCoverage\Node\File;
1515
use SebastianBergmann\CodeCoverage\InvalidArgumentException;
1616

@@ -37,13 +37,13 @@ public function __construct($threshold = 30)
3737
}
3838

3939
/**
40-
* @param CodeCoverage $coverage
41-
* @param string $target
42-
* @param string $name
40+
* @param Directory $report
41+
* @param string $target
42+
* @param string $name
4343
*
4444
* @return string
4545
*/
46-
public function process(CodeCoverage $coverage, $target = null, $name = null)
46+
public function process(Directory $report, $target = null, $name = null)
4747
{
4848
$document = new \DOMDocument('1.0', 'UTF-8');
4949
$document->formatOutput = true;
@@ -58,9 +58,6 @@ public function process(CodeCoverage $coverage, $target = null, $name = null)
5858
$stats = $document->createElement('stats');
5959
$methodsNode = $document->createElement('methods');
6060

61-
$report = $coverage->getReport();
62-
unset($coverage);
63-
6461
$fullMethodCount = 0;
6562
$fullCrapMethodCount = 0;
6663
$fullCrapLoad = 0;

‎src/Report/Html/Facade.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
namespace SebastianBergmann\CodeCoverage\Report\Html;
1212

13-
use SebastianBergmann\CodeCoverage\CodeCoverage;
1413
use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
1514
use SebastianBergmann\CodeCoverage\RuntimeException;
1615

@@ -55,14 +54,12 @@ public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generato
5554
}
5655

5756
/**
58-
* @param CodeCoverage $coverage
59-
* @param string $target
57+
* @param DirectoryNode $report
58+
* @param string $target
6059
*/
61-
public function process(CodeCoverage $coverage, $target)
60+
public function process(DirectoryNode $report, $target)
6261
{
6362
$target = $this->getDirectory($target);
64-
$report = $coverage->getReport();
65-
unset($coverage);
6663

6764
if (!isset($_SERVER['REQUEST_TIME'])) {
6865
$_SERVER['REQUEST_TIME'] = time();

‎src/Report/Text.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

13-
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Node\Directory;
1414
use SebastianBergmann\CodeCoverage\Node\File;
1515
use SebastianBergmann\CodeCoverage\Util;
1616

@@ -50,16 +50,14 @@ public function __construct($lowUpperBound = 50, $highLowerBound = 90, $showUnco
5050
}
5151

5252
/**
53-
* @param CodeCoverage $coverage
54-
* @param bool $showColors
53+
* @param Directory $report
54+
* @param bool $showColors
5555
*
5656
* @return string
5757
*/
58-
public function process(CodeCoverage $coverage, $showColors = false)
58+
public function process(Directory $report, $showColors = false)
5959
{
6060
$output = PHP_EOL . PHP_EOL;
61-
$report = $coverage->getReport();
62-
unset($coverage);
6361

6462
$colors = [
6563
'header' => '',

‎src/Report/Xml/Facade.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ public function __construct($version)
4444
}
4545

4646
/**
47-
* @param CodeCoverage $coverage
48-
* @param string $target
47+
* @param DirectoryNode $report
48+
* @param CodeCoverage $coverage
49+
* @param string $target
4950
*
5051
* @throws RuntimeException
5152
*/
52-
public function process(CodeCoverage $coverage, $target)
53+
public function process(DirectoryNode $report, CodeCoverage $coverage, $target)
5354
{
5455
if (substr($target, -1, 1) != DIRECTORY_SEPARATOR) {
5556
$target .= DIRECTORY_SEPARATOR;
@@ -58,11 +59,7 @@ public function process(CodeCoverage $coverage, $target)
5859
$this->target = $target;
5960
$this->initTargetDirectory($target);
6061

61-
$report = $coverage->getReport();
62-
63-
$this->project = new Project(
64-
$coverage->getReport()->getName()
65-
);
62+
$this->project = new Project($coverage->getReport()->getName());
6663

6764
$this->setBuildInformation();
6865
$this->processTests($coverage->getTests());

‎tests/tests/CloverTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testCloverForBankAccountTest()
2323

2424
$this->assertStringMatchesFormatFile(
2525
TEST_FILES_PATH . 'BankAccount-clover.xml',
26-
$clover->process($this->getCoverageForBankAccount(), null, 'BankAccount')
26+
$clover->process($this->getCoverageForBankAccount()->getReport(), null, 'BankAccount')
2727
);
2828
}
2929

@@ -33,7 +33,7 @@ public function testCloverForFileWithIgnoredLines()
3333

3434
$this->assertStringMatchesFormatFile(
3535
TEST_FILES_PATH . 'ignored-lines-clover.xml',
36-
$clover->process($this->getCoverageForFileWithIgnoredLines())
36+
$clover->process($this->getCoverageForFileWithIgnoredLines()->getReport())
3737
);
3838
}
3939

@@ -43,7 +43,7 @@ public function testCloverForClassWithAnonymousFunction()
4343

4444
$this->assertStringMatchesFormatFile(
4545
TEST_FILES_PATH . 'class-with-anonymous-function-clover.xml',
46-
$clover->process($this->getCoverageForClassWithAnonymousFunction())
46+
$clover->process($this->getCoverageForClassWithAnonymousFunction()->getReport())
4747
);
4848
}
4949
}

‎tests/tests/Crap4jTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testForBankAccountTest()
2323

2424
$this->assertStringMatchesFormatFile(
2525
TEST_FILES_PATH . 'BankAccount-crap4j.xml',
26-
$crap4j->process($this->getCoverageForBankAccount(), null, 'BankAccount')
26+
$crap4j->process($this->getCoverageForBankAccount()->getReport(), null, 'BankAccount')
2727
);
2828
}
2929

@@ -33,7 +33,7 @@ public function testForFileWithIgnoredLines()
3333

3434
$this->assertStringMatchesFormatFile(
3535
TEST_FILES_PATH . 'ignored-lines-crap4j.xml',
36-
$crap4j->process($this->getCoverageForFileWithIgnoredLines(), null, 'CoverageForFileWithIgnoredLines')
36+
$crap4j->process($this->getCoverageForFileWithIgnoredLines()->getReport(), null, 'CoverageForFileWithIgnoredLines')
3737
);
3838
}
3939

@@ -43,7 +43,7 @@ public function testForClassWithAnonymousFunction()
4343

4444
$this->assertStringMatchesFormatFile(
4545
TEST_FILES_PATH . 'class-with-anonymous-function-crap4j.xml',
46-
$crap4j->process($this->getCoverageForClassWithAnonymousFunction(), null, 'CoverageForClassWithAnonymousFunction')
46+
$crap4j->process($this->getCoverageForClassWithAnonymousFunction()->getReport(), null, 'CoverageForClassWithAnonymousFunction')
4747
);
4848
}
4949
}

‎tests/tests/HTMLTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testForBankAccountTest()
4444
$expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForBankAccount';
4545

4646
$report = new Facade;
47-
$report->process($this->getCoverageForBankAccount(), self::$TEST_TMP_PATH);
47+
$report->process($this->getCoverageForBankAccount()->getReport(), self::$TEST_TMP_PATH);
4848

4949
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
5050
}
@@ -54,7 +54,7 @@ public function testForFileWithIgnoredLines()
5454
$expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForFileWithIgnoredLines';
5555

5656
$report = new Facade;
57-
$report->process($this->getCoverageForFileWithIgnoredLines(), self::$TEST_TMP_PATH);
57+
$report->process($this->getCoverageForFileWithIgnoredLines()->getReport(), self::$TEST_TMP_PATH);
5858

5959
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
6060
}
@@ -65,7 +65,7 @@ public function testForClassWithAnonymousFunction()
6565
self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';
6666

6767
$report = new Facade;
68-
$report->process($this->getCoverageForClassWithAnonymousFunction(), self::$TEST_TMP_PATH);
68+
$report->process($this->getCoverageForClassWithAnonymousFunction()->getReport(), self::$TEST_TMP_PATH);
6969

7070
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
7171
}

‎tests/tests/TextTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testTextForBankAccountTest()
2323

2424
$this->assertStringMatchesFormatFile(
2525
TEST_FILES_PATH . 'BankAccount-text.txt',
26-
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForBankAccount()))
26+
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForBankAccount()->getReport()))
2727
);
2828
}
2929

@@ -33,7 +33,7 @@ public function testTextForFileWithIgnoredLines()
3333

3434
$this->assertStringMatchesFormatFile(
3535
TEST_FILES_PATH . 'ignored-lines-text.txt',
36-
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForFileWithIgnoredLines()))
36+
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForFileWithIgnoredLines()->getReport()))
3737
);
3838
}
3939

@@ -43,7 +43,7 @@ public function testTextForClassWithAnonymousFunction()
4343

4444
$this->assertStringMatchesFormatFile(
4545
TEST_FILES_PATH . 'class-with-anonymous-function-text.txt',
46-
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForClassWithAnonymousFunction()))
46+
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForClassWithAnonymousFunction()->getReport()))
4747
);
4848
}
4949
}

‎tests/tests/XMLTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testForBankAccountTest()
4040
$expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForBankAccount';
4141

4242
$xml = new Facade('1.0.0');
43-
$xml->process($this->getCoverageForBankAccount(), self::$TEST_TMP_PATH);
43+
$xml->process($this->getCoverageForBankAccount()->getReport(), $this->getCoverageForBankAccount(), self::$TEST_TMP_PATH);
4444

4545
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
4646
}
@@ -50,7 +50,7 @@ public function testForFileWithIgnoredLines()
5050
$expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForFileWithIgnoredLines';
5151

5252
$xml = new Facade('1.0.0');
53-
$xml->process($this->getCoverageForFileWithIgnoredLines(), self::$TEST_TMP_PATH);
53+
$xml->process($this->getCoverageForFileWithIgnoredLines()->getReport(), $this->getCoverageForFileWithIgnoredLines(), self::$TEST_TMP_PATH);
5454

5555
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
5656
}
@@ -61,7 +61,7 @@ public function testForClassWithAnonymousFunction()
6161
self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';
6262

6363
$xml = new Facade('1.0.0');
64-
$xml->process($this->getCoverageForClassWithAnonymousFunction(), self::$TEST_TMP_PATH);
64+
$xml->process($this->getCoverageForClassWithAnonymousFunction()->getReport(), $this->getCoverageForClassWithAnonymousFunction(), self::$TEST_TMP_PATH);
6565

6666
$this->assertFilesEquals($expectedFilesPath, self::$TEST_TMP_PATH);
6767
}

0 commit comments

Comments
 (0)