Skip to content

Commit b9d5161

Browse files
ek9ek9
committed
initial update to phpunit/php-code-coverage ~2.2 -> 4.0.8 (~4.0||~5.0)
1 parent b00320e commit b9d5161

31 files changed

+109
-79
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"require": {
2828
"php": ">=5.3.10",
29-
"phpunit/php-code-coverage": "2.2.*",
29+
"phpunit/php-code-coverage": "~4.0||~5.0",
3030
"behat/behat": "~3.0",
3131
"guzzlehttp/guzzle": "~3.0",
3232
"symfony/config": "~2.3||~3.0",
@@ -36,7 +36,7 @@
3636
"symfony/http-foundation": "~2.3||~3.0"
3737
},
3838
"require-dev": {
39-
"phpunit/phpunit": "~4.0",
39+
"phpunit/phpunit": "~5.0",
4040
"mikey179/vfsStream": "1.3.*"
4141
},
4242
"suggest": {

‎src/Common/Driver/Factory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace LeanPHP\Behat\CodeCoverage\Common\Driver;
1010

11-
use PHP_CodeCoverage_Driver as DriverInterface;
11+
use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;
1212

1313
/**
1414
* Driver factory

‎src/Common/Driver/HHVM.php‎

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

99
namespace LeanPHP\Behat\CodeCoverage\Common\Driver;
1010

11-
use PHP_CodeCoverage_Driver as DriverInterface;
11+
use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
1213

1314
/**
1415
* HHVM (Hip Hop VM) Driver
@@ -22,19 +23,19 @@ class HHVM implements DriverInterface
2223
/**
2324
* Constructor
2425
*
25-
* @throws \PHP_CodeCoverage_Exception if PHP code coverage not enabled
26+
* @throws SebastianBergmann\CodeCoverage\Exception if PHP code coverage not enabled
2627
*/
2728
public function __construct()
2829
{
2930
if ( ! defined('HPHP_VERSION')) {
30-
throw new \PHP_CodeCoverage_Exception('This driver requires HHVM');
31+
throw new \SebastianBergmann\CodeCoverage\Exception('This driver requires HHVM');
3132
}
3233
}
3334

3435
/**
3536
* {@inheritdoc}
3637
*/
37-
public function start()
38+
public function start($determineUnusedAndDead = true)
3839
{
3940
fb_enable_code_coverage();
4041
}

‎src/Common/Driver/Stub.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace LeanPHP\Behat\CodeCoverage\Common\Driver;
1010

11-
use PHP_CodeCoverage_Driver as DriverInterface;
11+
use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;
1212

1313
/**
1414
* Stub driver
@@ -42,7 +42,7 @@ public function getDriver()
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function start()
45+
public function start($determineUnusedAndDead = true)
4646
{
4747
if ($this->driver) {
4848
$this->driver->start();

‎src/Common/Driver/XCache.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace LeanPHP\Behat\CodeCoverage\Common\Driver;
1010

11-
use PHP_CodeCoverage_Driver as DriverInterface;
11+
use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;
1212

1313
/**
1414
* XCache Driver
@@ -27,7 +27,7 @@ class XCache implements DriverInterface
2727
public function __construct()
2828
{
2929
if ( ! extension_loaded('xcache')) {
30-
throw new \PHP_CodeCoverage_Exception('This driver requires XCache');
30+
throw new \SebastianBergmann\CodeCoverage\Exception('This driver requires XCache');
3131
}
3232

3333
if (version_compare(phpversion('xcache'), '1.2.0', '<') ||
@@ -40,7 +40,7 @@ public function __construct()
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function start()
43+
public function start($determineUnusedAndDead = true)
4444
{
4545
xcache_coverager_start();
4646
}

‎src/Common/Report/Clover.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
namespace LeanPHP\Behat\CodeCoverage\Common\Report;
1010

1111
use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Report\Clover as CloverCC;
1214

1315
/**
1416
* Clover report
@@ -18,7 +20,7 @@
1820
class Clover implements ReportInterface
1921
{
2022
/**
21-
* @var \PHP_CodeCoverage_Report_Clover
23+
* @var \SebastianBergmann\CodeCoverage\Report\Clover
2224
*/
2325
private $report;
2426

@@ -40,14 +42,14 @@ public function __construct(array $options)
4042
$options['name'] = null;
4143
}
4244

43-
$this->report = new \PHP_CodeCoverage_Report_Clover();
45+
$this->report = new CloverCC();
4446
$this->options = $options;
4547
}
4648

4749
/**
4850
* {@inheritdoc}
4951
*/
50-
public function process(\PHP_CodeCoverage $coverage)
52+
public function process(PHP_CodeCoverage $coverage)
5153
{
5254
return $this->report->process(
5355
$coverage,

‎src/Common/Report/Crap4j.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
namespace LeanPHP\Behat\CodeCoverage\Common\Report;
1010

1111
use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
12-
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Report\Crap4j as Crap4jCC;
1314
/**
1415
* Crap4j report
1516
*
@@ -18,7 +19,7 @@
1819
class Crap4j implements ReportInterface
1920
{
2021
/**
21-
* @var \PHP_CodeCoverage_Report_Crap4j
22+
* @var Crap4jCC
2223
*/
2324
private $report;
2425

@@ -32,8 +33,8 @@ class Crap4j implements ReportInterface
3233
*/
3334
public function __construct(array $options)
3435
{
35-
if ( ! class_exists('\PHP_CodeCoverage_Report_Crap4j')) {
36-
throw new \Exception('Crap4j requires PHP_CodeCoverage 1.3+');
36+
if ( ! class_exists('Crap4jCC')) {
37+
throw new \Exception('Crap4j requires PHP_CodeCoverage 4.0+');
3738
}
3839

3940
if ( ! isset($options['target'])) {
@@ -44,14 +45,14 @@ public function __construct(array $options)
4445
$options['name'] = null;
4546
}
4647

47-
$this->report = new \PHP_CodeCoverage_Report_Crap4j();
48+
$this->report = new Crap4jCC();
4849
$this->options = $options;
4950
}
5051

5152
/**
5253
* {@inheritdoc}
5354
*/
54-
public function process(\PHP_CodeCoverage $coverage)
55+
public function process(PHP_CodeCoverage $coverage)
5556
{
5657
return $this->report->process(
5758
$coverage,

‎src/Common/Report/Html.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
namespace LeanPHP\Behat\CodeCoverage\Common\Report;
1010

1111
use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Report\HTML as HTMLCC;
1214

1315
/**
1416
* HTML report
@@ -18,7 +20,7 @@
1820
class Html implements ReportInterface
1921
{
2022
/**
21-
* @var \PHP_CodeCoverage_Report_HTML
23+
* @var HTMLCC
2224
*/
2325
private $report;
2426

@@ -56,7 +58,7 @@ public function __construct(array $options)
5658
$options['generator'] = '';
5759
}
5860

59-
$this->report = new \PHP_CodeCoverage_Report_HTML(
61+
$this->report = new HTMLCC(
6062
$options['charset'],
6163
$options['highlight'],
6264
$options['lowUpperBound'],
@@ -70,7 +72,7 @@ public function __construct(array $options)
7072
/**
7173
* {@inheritdoc}
7274
*/
73-
public function process(\PHP_CodeCoverage $coverage)
75+
public function process(PHP_CodeCoverage $coverage)
7476
{
7577
return $this->report->process(
7678
$coverage,

‎src/Common/Report/Php.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
namespace LeanPHP\Behat\CodeCoverage\Common\Report;
1010

1111
use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Report\Clover as Clover;
14+
use SebastianBergmann\CodeCoverage\Report\PHP as PHPCC;
1215

1316
/**
1417
* PHP report
@@ -18,7 +21,7 @@
1821
class Php implements ReportInterface
1922
{
2023
/**
21-
* @var \PHP_CodeCoverage_Report_Clover
24+
* @var \SebastianBergmann\CodeCoverage\Report\Clover
2225
*/
2326
private $report;
2427

@@ -36,14 +39,14 @@ public function __construct(array $options)
3639
$options['target'] = null;
3740
}
3841

39-
$this->report = new \PHP_CodeCoverage_Report_PHP();
42+
$this->report = new PHPCC();
4043
$this->options = $options;
4144
}
4245

4346
/**
4447
* {@inheritdoc}
4548
*/
46-
public function process(\PHP_CodeCoverage $coverage)
49+
public function process(PHP_CodeCoverage $coverage)
4750
{
4851
return $this->report->process(
4952
$coverage,

‎src/Common/Report/Text.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
namespace LeanPHP\Behat\CodeCoverage\Common\Report;
1010

1111
use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
12+
use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Report\Text as TextCC;
1214

1315
/**
1416
* Text report
@@ -18,7 +20,7 @@
1820
class Text implements ReportInterface
1921
{
2022
/**
21-
* @var \PHP_CodeCoverage_Report_Text
23+
* @var \SebastianBergmann\CodeCoverage\Report\Text
2224
*/
2325
private $report;
2426

@@ -55,7 +57,7 @@ public function __construct(array $options)
5557
if ($this->getVersion() === '1.2') {
5658
$outputStream = new \PHPUnit_Util_Printer($options['printer']);
5759

58-
$this->report = new \PHP_CodeCoverage_Report_Text(
60+
$this->report = new TextCC(
5961
$outputStream,
6062
$options['lowUpperBound'],
6163
$options['highUpperBound'],
@@ -66,7 +68,7 @@ public function __construct(array $options)
6668
$options['showOnlySummary'] = false;
6769
}
6870

69-
$this->report = new \PHP_CodeCoverage_Report_Text(
71+
$this->report = new TextCC(
7072
$options['lowUpperBound'],
7173
$options['highUpperBound'],
7274
$options['showUncoveredFiles'],
@@ -80,7 +82,7 @@ public function __construct(array $options)
8082
/**
8183
* {@inheritdoc}
8284
*/
83-
public function process(\PHP_CodeCoverage $coverage)
85+
public function process(PHP_CodeCoverage $coverage)
8486
{
8587
return $this->report->process(
8688
$coverage,
@@ -90,7 +92,7 @@ public function process(\PHP_CodeCoverage $coverage)
9092

9193
private function getVersion()
9294
{
93-
$reflectionMethod = new \ReflectionMethod('PHP_CodeCoverage_Report_Text', '__construct');
95+
$reflectionMethod = new \ReflectionMethod('TextCC', '__construct');
9496
$parameters = $reflectionMethod->getParameters();
9597

9698
if (reset($parameters)->name === 'outputStream') {

0 commit comments

Comments
 (0)