Skip to content

Commit 486dd63

Browse files
sebastianbergmannsebastianbergmann
committed
Avoid API change and major version bump
1 parent e61ea60 commit 486dd63

File tree

14 files changed

+75
-49
lines changed

14 files changed

+75
-49
lines changed

‎ChangeLog-6.0.md‎ renamed to ‎ChangeLog-5.1.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Changes in PHP_CodeCoverage 6.0
1+
# Changes in PHP_CodeCoverage 5.1
22

3-
All notable changes of the PHP_CodeCoverage 6.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
3+
All notable changes of the PHP_CodeCoverage 5.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
44

5-
## [6.0.0] - 2017-MM-DD
5+
## [5.1.0] - 2017-MM-DD
66

77
## Changed
88

99
* Implemented [#516](https://github.com/sebastianbergmann/php-code-coverage/pull/516): Add more information to XML code coverage report
1010

11-
[6.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.0...6.0.0
11+
[5.1.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/5.0...5.1.0
1212

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
2121
"irc": "irc://irc.freenode.net/phpunit"
2222
},
23-
"minimum-stability": "dev",
2423
"require": {
2524
"php": "^7.0",
2625
"ext-dom": "*",
@@ -33,7 +32,7 @@
3332
"sebastian/version": "^2.0"
3433
},
3534
"require-dev": {
36-
"phpunit/phpunit": "^6.1",
35+
"phpunit/phpunit": "^6.0",
3736
"ext-xdebug": "^2.5"
3837
},
3938
"suggest": {
@@ -46,7 +45,7 @@
4645
},
4746
"extra": {
4847
"branch-alias": {
49-
"dev-master": "6.0.x-dev"
48+
"dev-master": "5.1.x-dev"
5049
}
5150
}
5251
}

‎src/CodeCoverage.php‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ class CodeCoverage
129129
*/
130130
private $shouldCheckForDeadAndUnused = true;
131131

132+
/**
133+
* @var Directory
134+
*/
135+
private $report;
136+
132137
/**
133138
* Constructor.
134139
*
@@ -160,9 +165,13 @@ public function __construct(Driver $driver = null, Filter $filter = null)
160165
*/
161166
public function getReport()
162167
{
163-
$builder = new Builder;
168+
if ($this->report === null) {
169+
$builder = new Builder;
164170

165-
return $builder->build($this);
171+
$this->report = $builder->build($this);
172+
}
173+
174+
return $this->report;
166175
}
167176

168177
/**
@@ -174,6 +183,7 @@ public function clear()
174183
$this->currentId = null;
175184
$this->data = [];
176185
$this->tests = [];
186+
$this->report = null;
177187
}
178188

179189
/**
@@ -210,7 +220,8 @@ public function getData($raw = false)
210220
*/
211221
public function setData(array $data)
212222
{
213-
$this->data = $data;
223+
$this->data = $data;
224+
$this->report = null;
214225
}
215226

216227
/**
@@ -375,6 +386,8 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
375386
}
376387
}
377388
}
389+
390+
$this->report = null;
378391
}
379392

380393
/**
@@ -410,7 +423,8 @@ public function merge(CodeCoverage $that)
410423
}
411424
}
412425

413-
$this->tests = array_merge($this->tests, $that->getTests());
426+
$this->tests = array_merge($this->tests, $that->getTests());
427+
$this->report = null;
414428
}
415429

416430
/**

‎src/Report/Clover.php‎

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

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

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

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

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

4850
foreach ($report as $item) {
4951
if (!$item instanceof File) {

‎src/Report/Crap4j.php‎

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

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

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

61+
$report = $coverage->getReport();
62+
unset($coverage);
63+
6164
$fullMethodCount = 0;
6265
$fullCrapMethodCount = 0;
6366
$fullCrapLoad = 0;

‎src/Report/Html/Facade.php‎

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

1111
namespace SebastianBergmann\CodeCoverage\Report\Html;
1212

13+
use SebastianBergmann\CodeCoverage\CodeCoverage;
1314
use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
1415
use SebastianBergmann\CodeCoverage\RuntimeException;
1516

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

5657
/**
57-
* @param DirectoryNode $report
58-
* @param string $target
58+
* @param CodeCoverage $coverage
59+
* @param string $target
5960
*/
60-
public function process(DirectoryNode $report, $target)
61+
public function process(CodeCoverage $coverage, $target)
6162
{
6263
$target = $this->getDirectory($target);
64+
$report = $coverage->getReport();
65+
unset($coverage);
6366

6467
if (!isset($_SERVER['REQUEST_TIME'])) {
6568
$_SERVER['REQUEST_TIME'] = time();

‎src/Report/Text.php‎

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

1111
namespace SebastianBergmann\CodeCoverage\Report;
1212

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

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

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

6264
$colors = [
6365
'header' => '',

‎src/Report/Xml/Facade.php‎

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

4646
/**
47-
* @param DirectoryNode $report
48-
* @param CodeCoverage $coverage
49-
* @param string $target
47+
* @param CodeCoverage $coverage
48+
* @param string $target
5049
*
5150
* @throws RuntimeException
5251
*/
53-
public function process(DirectoryNode $report, CodeCoverage $coverage, $target)
52+
public function process(CodeCoverage $coverage, $target)
5453
{
5554
if (substr($target, -1, 1) != DIRECTORY_SEPARATOR) {
5655
$target .= DIRECTORY_SEPARATOR;
@@ -59,7 +58,11 @@ public function process(DirectoryNode $report, CodeCoverage $coverage, $target)
5958
$this->target = $target;
6059
$this->initTargetDirectory($target);
6160

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

6467
$this->setBuildInformation();
6568
$this->processTests($coverage->getTests());

‎src/Version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Version
2222
public static function id()
2323
{
2424
if (self::$version === null) {
25-
$version = new VersionId('6.0', dirname(__DIR__));
25+
$version = new VersionId('5.1', dirname(__DIR__));
2626
self::$version = $version->getVersion();
2727
}
2828

‎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()->getReport(), null, 'BankAccount')
26+
$clover->process($this->getCoverageForBankAccount(), 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()->getReport())
36+
$clover->process($this->getCoverageForFileWithIgnoredLines())
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()->getReport())
46+
$clover->process($this->getCoverageForClassWithAnonymousFunction())
4747
);
4848
}
4949
}

0 commit comments

Comments
 (0)