Changeset 1782b02

Timestamp:

10/31/11 10:43:29 (7 months ago)

Author:

mrook

Branches:

master

Children:

1576bb0

Parents:

e551855

git-author:

Michiel Rook <mrook@…> (10/31/11 10:43:29)

git-committer:

Michiel Rook <mrook@…> (10/31/11 10:43:29)

Message:

Refs #812 - various fixes for PHPUnit 3.6 / PHP_CodeCoverage 1.1.0

Files:

• build/BuildPhingPEARPackageTask.php (modified) (1 diff)
• classes/phing/tasks/ext/coverage/CoverageMerger.php (modified) (3 diffs)
• classes/phing/tasks/ext/coverage/CoverageSetupTask.php (modified) (1 diff)
• classes/phing/tasks/ext/phpunit/PHPUnitTask.php (modified) (5 diffs)
• classes/phing/tasks/ext/phpunit/PHPUnitTestRunner.php (modified) (6 diffs)
• classes/phing/tasks/ext/phpunit/formatter/CloverPHPUnitResultFormatter.php (modified) (1 diff)

build/BuildPhingPEARPackageTask.php

@@ -198 +198 @@
             $package->addPackageDepWithChannel( 'optional', 'VersionControl_SVN', 'pear.php.net', '0.3.4');
             $package->addPackageDepWithChannel( 'optional', 'VersionControl_Git', 'pear.php.net', '0.4.3');
-            $package->addPackageDepWithChannel( 'optional', 'PHPUnit', 'pear.phpunit.de', '3.4.0');
+            $package->addPackageDepWithChannel( 'optional', 'PHPUnit', 'pear.phpunit.de', '3.6.0');
+            $package->addPackageDepWithChannel( 'optional', 'PHP_CodeCoverage', 'pear.phpunit.de', '1.1.0');
             $package->addPackageDepWithChannel( 'optional', 'PhpDocumentor', 'pear.php.net', '1.4.0');
             $package->addPackageDepWithChannel( 'optional', 'Xdebug', 'pecl.php.net', '2.0.5');

classes/phing/tasks/ext/coverage/CoverageMerger.php

@@ -39 +39 @@
         reset($right);
 
-        while (current($left) && current($right)) {
+        while (current($left) !== false && current($right) !== false) {
             $linenr_left = key($left);
             $linenr_right = key($right);
@@ -61 +61 @@
         }
 
-        while (current($left)) {
+        while (current($left) !== false) {
             $coverageMerged[key($left)] = current($left);
             next($left);
         }
 
-        while (current($right)) {
+        while (current($right) !== false) {
             $coverageMerged[key($right)] = current($right);
             next($right);
@@ -90 +90 @@
         
         foreach ($coverageTotal as $filename => $data) {
-            if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >=0) {
-                $ignoreLines = PHP_CodeCoverage_Util::getLinesToBeIgnored($filename);
-            } else {
-                // FIXME retrieve ignored lines for PHPUnit Version < 3.5.0
-                $ignoreLines = array();
-            }
+            $ignoreLines = PHP_CodeCoverage_Util::getLinesToBeIgnored($filename);
             
             $lines = array();

classes/phing/tasks/ext/coverage/CoverageSetupTask.php

@@ -167 +167 @@
             
             if ($newFilter) {
-                PHP_CodeCoverage_Filter::getInstance()->addFileToWhiteList($file['fullname']);
+                //PHP_CodeCoverage_Filter::getInstance()->addFileToWhiteList($file['fullname']);
             } else {
                 PHPUnit_Util_Filter::addFileToWhitelist($file['fullname']);

classes/phing/tasks/ext/phpunit/PHPUnitTask.php

@@ -50 +50 @@
     private $testfailed = false;
     private $testfailuremessage = "";
-    private $codecoverage = false;
+    private $codecoverage = null;
     private $groups = array();
     private $excludeGroups = array();
@@ -63 +63 @@
      */
     public function init() {
-        if (version_compare(PHP_VERSION, '5.0.3') < 0)
-        {
-            throw new BuildException("PHPUnitTask requires PHP version >= 5.0.3", $this->getLocation());
-        }
-        
         /**
          * Determine PHPUnit version number
@@ -79 +74 @@
         $version = PHPUnit_Runner_Version::id();
 
-        if (version_compare($version, '3.2.0') < 0)
-        {
-            throw new BuildException("PHPUnitTask requires PHPUnit version >= 3.2.0", $this->getLocation());
+        if (version_compare($version, '3.6.0') < 0)
+        {
+            throw new BuildException("PHPUnitTask requires PHPUnit version >= 3.6.0", $this->getLocation());
         }
             
@@ -98 +93 @@
             define('PHPUnit_MAIN_METHOD', 'PHPUnitTask::undefined');
         }
-        
-        /**
-         * Add some defaults to the PHPUnit filter
-         */
-        $pwd = dirname(__FILE__);
-        $path = realpath($pwd . '/../../../');
-        
-        if (version_compare($version, '3.5.0') >= 0) {
-            PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist($path);
-        } else {
-            require_once 'PHPUnit/Framework.php';
-            require_once 'PHPUnit/Util/Filter.php';
-            
-            PHPUnit_Util_Filter::addDirectoryToFilter($path);
-        }
     }
     
@@ -315 +295 @@
         $runner = new PHPUnitTestRunner($this->project, $this->groups, $this->excludeGroups, $this->processIsolation);
         
-        $runner->setCodecoverage($this->codecoverage);
+        if ($this->codecoverage) {
+            /**
+             * Add some defaults to the PHPUnit filter
+             */
+            $pwd = dirname(__FILE__);
+            $path = realpath($pwd . '/../../../');
+            
+            $filter = new PHP_CodeCoverage_Filter();
+            $filter->addDirectoryToBlacklist($path);
+            $runner->setCodecoverage(new PHP_CodeCoverage(null, $filter));
+        }
+        
         $runner->setUseCustomErrorHandler($this->usecustomerrorhandler);
 

classes/phing/tasks/ext/phpunit/PHPUnitTestRunner.php

@@ -20 +20 @@
  */
 
-// phpunit 3.5 ships with autoloader
-// @todo - find out sane model for Phing and PHPUnit autoloaders/hooks co-existense
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >=0) {
-    require_once 'PHPUnit/Autoload.php';
-}
-require_once 'PHPUnit/Util/ErrorHandler.php';
-require_once 'PHPUnit/Util/Filter.php';
-require_once 'PHPUnit/Runner/BaseTestRunner.php';
-require_once 'PHPUnit/Framework/TestListener.php';
+require_once 'PHPUnit/Autoload.php';
 require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
 require_once 'phing/system/util/Timer.php';
@@ -55 +47 @@
     private $formatters = array();
     
-    private $codecoverage = false;
+    private $codecoverage = null;
     
     private $project = NULL;
@@ -90 +82 @@
     }
     
-    public static function handleError($level, $message, $file, $line)
+    public function handleError($level, $message, $file, $line)
     {
         $isFiltered = false;
-        if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >=0) {
-            $isFiltered = PHP_CodeCoverage::getInstance()->filter()->isFiltered(
+        
+        if ($this->codecoverage) {
+            $isFiltered = $this->codecoverage->filter()->isFiltered(
                 $file, array(), true
             );
-        } else {
-            $isFiltered = PHPUnit_Util_Filter::isFiltered($file, true, true);
-        }
+        }
+        
         if (!$isFiltered) {
             return PHPUnit_Util_ErrorHandler::handleError($level, $message, $file, $line);
@@ -114 +106 @@
         if ($this->codecoverage)
         {
-            $res->collectCodeCoverageInformation(TRUE);
+            $res->setCodeCoverage($this->codecoverage);
         }
         
@@ -127 +119 @@
         if ($this->useCustomErrorHandler)
         {
-            $oldErrorHandler = set_error_handler(array('PHPUnitTestRunner', 'handleError'), E_ALL | E_STRICT);
+            $oldErrorHandler = set_error_handler(array($this, 'handleError'), E_ALL | E_STRICT);
         }
         
@@ -145 +137 @@
         if ($this->codecoverage)
         {
-            if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >=0) {
-                $coverage = $res->getCodeCoverage();
-            
-                $summary = $coverage->getSummary();
-            } else {
-                $coverageInformation = $res->getCodeCoverageInformation();
-                PHPUnit_Util_CodeCoverage::clearSummary();
-                $summary = PHPUnit_Util_CodeCoverage::getSummary($coverageInformation);
-            }
-
-            CoverageMerger::merge($this->project, $summary);
+            CoverageMerger::merge($this->project, $this->codecoverage->getData());
         }
         

classes/phing/tasks/ext/phpunit/formatter/CloverPHPUnitResultFormatter.php

@@ -67 +67 @@
     public function endTestRun()
     {
-        if (version_compare($this->version, '3.5.0') >=0) {
-            require_once 'PHP/CodeCoverage/Report/Clover.php';
-            
-            $coverage = $this->result->getCodeCoverage();
-            
-            $clover = new PHP_CodeCoverage_Report_Clover();
-            
-            $contents = $clover->process($coverage);
-        } else {
-            require_once 'PHPUnit/Util/Log/CodeCoverage/XML/Clover.php';
-            
-            $clover = new PHPUnit_Util_Log_CodeCoverage_XML_Clover(null);
-            
-            ob_start();
-            
-            $clover->process($this->result);
-            $contents = ob_get_contents();
-            
-            ob_end_clean();
-        }
+        require_once 'PHP/CodeCoverage/Report/Clover.php';
+        
+        $coverage = $this->result->getCodeCoverage();
+        
+        $clover = new PHP_CodeCoverage_Report_Clover();
+        
+        $contents = $clover->process($coverage);
 
         if ($this->out)