fix more tests due to mismatching namespaces

ek9 · ek9 · commit 65b33ffab43b · 2017-04-08T21:57:32.000+02:00
diff --git a/src/Common/Driver/HHVM.php b/src/Common/Driver/HHVM.php
@@ -9,12 +9,12 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Driver;
 
 use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 
 /**
  * HHVM (Hip Hop VM) Driver
  *
- * {@internal Derived from PHP_CodeCoverage_Driver_Xdebug.}
+ * {@internal Derived from SebastianBergmann\CodeCoverage\Driver\Xdebug.}
  *
  * @author Anthon Pang <apang@softwaredevelopment.ca>
  */
diff --git a/src/Common/Driver/XCache.php b/src/Common/Driver/XCache.php
@@ -13,7 +13,7 @@
 /**
  * XCache Driver
  *
- * {@internal Derived from PHP_CodeCoverage_Driver_Xdebug.}
+ * {@internal Derived from SebastianBergmann\CodeCoverage\Driver\Xdebug.}
  *
  * @author Anthon Pang <apang@softwaredevelopment.ca>
  */
@@ -33,7 +33,7 @@ public function __construct()
         if (version_compare(phpversion('xcache'), '1.2.0', '<') ||
             ! ini_get('xcache.coverager')
         ) {
-            throw new \PHP_CodeCoverage_Exception('xcache.coverager=On has to be set in php.ini');
+            throw new \SebastianBergmann\CodeCoverage\RuntimeException('xcache.coverager=On has to be set in php.ini');
         }
     }
 
diff --git a/src/Common/Report/Clover.php b/src/Common/Report/Clover.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Clover as CloverCC;
 
 /**
@@ -49,7 +49,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/Report/Crap4j.php b/src/Common/Report/Crap4j.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Crap4j as Crap4jCC;
 /**
  * Crap4j report
@@ -34,7 +34,7 @@ class Crap4j implements ReportInterface
     public function __construct(array $options)
     {
         if ( ! class_exists('Crap4jCC')) {
-            throw new \Exception('Crap4j requires PHP_CodeCoverage 4.0+');
+            throw new \Exception('Crap4j requires CodeCoverage 4.0+');
         }
 
         if ( ! isset($options['target'])) {
@@ -52,7 +52,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/Report/Html.php b/src/Common/Report/Html.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\HTML as HTMLCC;
 
 /**
@@ -72,7 +72,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/Report/Php.php b/src/Common/Report/Php.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Clover as Clover;
 use SebastianBergmann\CodeCoverage\Report\PHP as PHPCC;
 
@@ -46,7 +46,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/Report/Text.php b/src/Common/Report/Text.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Text as TextCC;
 
 /**
@@ -82,7 +82,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/Report/Xml.php b/src/Common/Report/Xml.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Common\Report;
 
 use LeanPHP\Behat\CodeCoverage\Common\ReportInterface;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\XML as XMLCC;
 
 /**
@@ -35,7 +35,7 @@ class Xml implements ReportInterface
     public function __construct(array $options)
     {
         if ( ! class_exists('XMLCC')) {
-            throw new \Exception('XML requires PHP_CodeCoverage 4.0+');
+            throw new \Exception('XML requires CodeCoverage 4.0+');
         }
 
         if ( ! isset($options['target'])) {
@@ -49,7 +49,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage)
     {
         return $this->report->process(
             $coverage,
diff --git a/src/Common/ReportInterface.php b/src/Common/ReportInterface.php
@@ -8,7 +8,7 @@
 
 namespace LeanPHP\Behat\CodeCoverage\Common;
 
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 
 /**
  * Report interface
@@ -27,9 +27,9 @@ public function __construct(array $options);
     /**
      * Generate report
      *
-     * @param PHP_CodeCoverage $coverage
+     * @param CodeCoverage $coverage
      *
      * @return string|null
      */
-    public function process(PHP_CodeCoverage $coverage);
+    public function process(CodeCoverage $coverage);
 }
diff --git a/src/Listener/EventListener.php b/src/Listener/EventListener.php
@@ -12,7 +12,7 @@
 use Behat\Behat\EventDispatcher\Event\ScenarioTested;
 use Behat\Testwork\EventDispatcher\Event\ExerciseCompleted;
 use LeanPHP\Behat\CodeCoverage\Service\ReportService;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -24,7 +24,7 @@
 class EventListener implements EventSubscriberInterface
 {
     /**
-     * @var PHP_CodeCoverage
+     * @var CodeCoverage
      */
     private $coverage;
 
@@ -36,10 +36,10 @@ class EventListener implements EventSubscriberInterface
     /**
      * Constructor
      *
-     * @param PHP_CodeCoverage                                    $coverage
+     * @param CodeCoverage                                      $coverage
      * @param \LeanPHP\Behat\CodeCoverage\Service\ReportService $reportService
      */
-    public function __construct(PHP_CodeCoverage $coverage, ReportService $reportService)
+    public function __construct(CodeCoverage $coverage, ReportService $reportService)
     {
         $this->coverage      = $coverage;
         $this->reportService = $reportService;
diff --git a/src/Resources/config/services-2.3.xml b/src/Resources/config/services-2.3.xml
@@ -52,7 +52,7 @@
         <service id="behat.code_coverage.php_code_coverage_filter" class="SebastianBergmann\CodeCoverage\Filter" />
 
         <!-- The filter compiler pass will configure the injected coverage filter -->
-        <service id="behat.code_coverage.php_code_coverage" class="SebastianBergmann\CodeCoverage\PHP_CodeCoverage">
+        <service id="behat.code_coverage.php_code_coverage" class="SebastianBergmann\CodeCoverage\CodeCoverage">
             <argument type="service" id="behat.code_coverage.driver.proxy" />
             <argument type="service" id="behat.code_coverage.php_code_coverage_filter" />
         </service>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -52,7 +52,7 @@
         <service id="behat.code_coverage.php_code_coverage_filter" class="SebastianBergmann\CodeCoverage\Filter" />
 
         <!-- The filter compiler pass will configure the injected coverage filter -->
-        <service id="behat.code_coverage.php_code_coverage" class="SebastianBergmann\CodeCoverage\PHP_CodeCoverage">
+        <service id="behat.code_coverage.php_code_coverage" class="SebastianBergmann\CodeCoverage\CodeCoverage">
             <argument type="service" id="behat.code_coverage.driver.proxy" />
             <argument type="service" id="behat.code_coverage.php_code_coverage_filter" />
         </service>
diff --git a/src/Service/ReportService.php b/src/Service/ReportService.php
@@ -9,7 +9,7 @@
 namespace LeanPHP\Behat\CodeCoverage\Service;
 
 use LeanPHP\Behat\CodeCoverage\Common\Report\Factory;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 
 /**
  * Code coverage report service
@@ -43,9 +43,9 @@ public function __construct(array $config, Factory $factory)
     /**
      * Generate report
      *
-     * @param PHP_CodeCoverage $coverage
+     * @param CodeCoverage $coverage
      */
-    public function generateReport(PHP_CodeCoverage $coverage)
+    public function generateReport(CodeCoverage $coverage)
     {
         $format = $this->config['report']['format'];
         $options = $this->config['report']['options'];
diff --git a/tests/Common/Report/CloverTest.php b/tests/Common/Report/CloverTest.php
@@ -10,7 +10,7 @@
 
 use VIPSoft\TestCase;
 use LeanPHP\Behat\CodeCoverage\Common\Report\Factory;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Node\File;
 
 /**
@@ -26,7 +26,7 @@ public function testProcess()
                        ->disableOriginalConstructor()
                        ->getMock();
 
-        $coverage = $this->getMock('PHP_CodeCoverage');
+        $coverage = $this->getMock('CodeCoverage');
         $coverage->expects($this->once())
                  ->method('getReport')
                  ->will($this->returnValue($report));
diff --git a/tests/Common/Report/Crap4jTest.php b/tests/Common/Report/Crap4jTest.php
@@ -21,7 +21,7 @@ class Crap4jTest extends TestCase
 {
     public function testProcess()
     {
-        if ( ! class_exists('PHP_CodeCoverage_Report_Crap4j')) {
+        if ( ! class_exists('SebastianBergmann\CodeCoverage\Report\Crap4j')) {
             $this->markTestSkipped();
 
             return;
diff --git a/tests/Common/Report/FactoryTest.php b/tests/Common/Report/FactoryTest.php
@@ -60,7 +60,7 @@ public function testCreate($expected, $reportType)
         try {
             $this->assertEquals($expected, get_class($factory->create($reportType, array())));
         } catch (\Exception $e) {
-            $this->assertTrue(strpos($e->getMessage(), 'requires PHP_CodeCoverage 4.0+') !== false);
+            $this->assertTrue(strpos($e->getMessage(), 'requires CodeCoverage 4.0+') !== false);
         }
     }
 
diff --git a/tests/Common/Report/HtmlTest.php b/tests/Common/Report/HtmlTest.php
@@ -11,7 +11,7 @@
 use VIPSoft\TestCase;
 use LeanPHP\Behat\CodeCoverage\Common\Report\Factory;
 use org\bovigo\vfs\vfsStream;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 
 /**
  * HTML report test
@@ -27,10 +27,10 @@ public function testProcess()
 
         file_put_contents($target . '/file', "test\n");
 
-        $report = new \PHP_CodeCoverage_Report_Node_Directory($target);
+        $report = new \SebastianBergmann\CodeCoverage\Report\Node\Directory($target);
         $report->addFile('file', array('class' => array(1 => 1)), array(), false);
 
-        $coverage = $this->getMock('PHP_CodeCoverage');
+        $coverage = $this->getMock('SebastianBergmann\CodeCoverage\CodeCoverage');
         $coverage->expects($this->once())
                  ->method('getReport')
                  ->will($this->returnValue($report));
diff --git a/tests/Common/Report/PhpTest.php b/tests/Common/Report/PhpTest.php
@@ -11,7 +11,7 @@
 use VIPSoft\TestCase;
 use LeanPHP\Behat\CodeCoverage\Common\Report\Factory;
 use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 /**
  * PHP report test
  *
@@ -21,7 +21,7 @@ class PhpTest extends TestCase
 {
     public function testProcess()
     {
-        $coverage = $this->getMock('PHP_CodeCoverage');
+        $coverage = $this->getMock('SebastianBergmann\CodeCoverage\CodeCoverage');
         $filter = $this->getMock('Filter');
         $filter
             ->expects($this->once())
diff --git a/tests/Common/Report/TextTest.php b/tests/Common/Report/TextTest.php
@@ -10,7 +10,7 @@
 
 use VIPSoft\TestCase;
 use LeanPHP\Behat\CodeCoverage\Common\Report\Factory;
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Report\Node\File;
 
 /**
@@ -27,7 +27,7 @@ public function testProcess()
                        ->disableOriginalConstructor()
                        ->getMock();
 
-        $coverage = $this->getMock('PHP_CodeCoverage');
+        $coverage = $this->getMock('SebastianBergmann\CodeCoverage\CodeCoverage');
         $coverage->expects($this->once())
                  ->method('getReport')
                  ->will($this->returnValue($report));
diff --git a/tests/Listener/EventListenerTest.php b/tests/Listener/EventListenerTest.php
@@ -14,8 +14,6 @@
 use Behat\Gherkin\Node\OutlineNode;
 use Behat\Gherkin\Node\ScenarioNode;
 
-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;
-
 /**
  * Event listener test
  *
@@ -33,7 +31,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->coverage = $this->getMock('PHP_CodeCoverage');
+        $this->coverage = $this->getMock('SebastianBergmann\CodeCoverage\CodeCoverage');
 
         $this->service  = $this->getMockBuilder('LeanPHP\Behat\CodeCoverage\Service\ReportService')
                                ->disableOriginalConstructor()
diff --git a/tests/Service/ReportServiceTest.php b/tests/Service/ReportServiceTest.php
@@ -50,7 +50,7 @@ public function testGenerateReport()
                 ->method('create')
                 ->will($this->returnValue($report));
 
-        $coverage = $this->getMock('PHP_CodeCoverage');
+        $coverage = $this->getMock('SebastianBergmann\CodeCoverage\CodeCoverage');
 
         $service = new ReportService(array('report' => array('format' => 'html', 'options' => array())), $factory);
         $service->generateReport($coverage);

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`namespace LeanPHP\Behat\CodeCoverage\Common\Driver;`
`10`	`10`
`11`	`11`	`use SebastianBergmann\CodeCoverage\Driver\Driver as DriverInterface;`
`12`		`-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;`
	`12`	`+use SebastianBergmann\CodeCoverage\CodeCoverage;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* HHVM (Hip Hop VM) Driver`
`16`	`16`	`*`
`17`		`- * {@internal Derived from PHP_CodeCoverage_Driver_Xdebug.}`
	`17`	`+ * {@internal Derived from SebastianBergmann\CodeCoverage\Driver\Xdebug.}`
`18`	`18`	`*`
`19`	`19`	`* @author Anthon Pang <[email protected]>`
`20`	`20`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* XCache Driver`
`15`	`15`	`*`
`16`		`- * {@internal Derived from PHP_CodeCoverage_Driver_Xdebug.}`
	`16`	`+ * {@internal Derived from SebastianBergmann\CodeCoverage\Driver\Xdebug.}`
`17`	`17`	`*`
`18`	`18`	`* @author Anthon Pang <[email protected]>`
`19`	`19`	`*/`
`@@ -33,7 +33,7 @@ public function __construct()`
`33`	`33`	`if (version_compare(phpversion('xcache'), '1.2.0', '<') \|\|`
`34`	`34`	`! ini_get('xcache.coverager')`
`35`	`35`	`) {`
`36`		`- throw new \PHP_CodeCoverage_Exception('xcache.coverager=On has to be set in php.ini');`
	`36`	`+ throw new \SebastianBergmann\CodeCoverage\RuntimeException('xcache.coverager=On has to be set in php.ini');`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace LeanPHP\Behat\CodeCoverage\Common;`
`10`	`10`
`11`		`-use SebastianBergmann\CodeCoverage\PHP_CodeCoverage;`
	`11`	`+use SebastianBergmann\CodeCoverage\CodeCoverage;`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* Report interface`
`@@ -27,9 +27,9 @@ public function __construct(array $options);`
`27`	`27`	`/**`
`28`	`28`	`* Generate report`
`29`	`29`	`*`
`30`		`- * @param PHP_CodeCoverage $coverage`
	`30`	`+ * @param CodeCoverage $coverage`
`31`	`31`	`*`
`32`	`32`	`* @return string\|null`
`33`	`33`	`*/`
`34`		`- public function process(PHP_CodeCoverage $coverage);`
	`34`	`+ public function process(CodeCoverage $coverage);`
`35`	`35`	`}`