Merge branch '2.2'

Author: sebastianbergmann

ChangeLog-2.2.md

@@ -2,6 +2,15 @@
 
 All notable changes of the PHP_CodeCoverage 2.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [2.2.3] - 2015-09-14
+
+### Fixed
+
+* Fixed [#368](https://github.com/sebastianbergmann/php-code-coverage/pull/368): Blacklists and whitelists are not merged when merging data sets
+* Fixed [#370](https://github.com/sebastianbergmann/php-code-coverage/issues/370): Confusing statistics for source file that declares a class without methods
+* Fixed [#372](https://github.com/sebastianbergmann/php-code-coverage/pull/372): Nested classes and functions are not handled correctly
+* Fixed [#382](https://github.com/sebastianbergmann/php-code-coverage/issues/382): Crap4J report generates incorrect XML logfile
+
 ## [2.2.2] - 2015-08-04
 
 ### Added
@@ -33,6 +42,7 @@ All notable changes of the PHP_CodeCoverage 2.2 release series are documented in
 
 * The dedicated driver for HHVM, `PHP_CodeCoverage_Driver_HHVM` has been removed
 
+[2.2.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.3...2.2.3
 [2.2.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.1...2.2.2
 [2.2.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.1...2.2.0

src/CodeCoverage/Report/Crap4j.php

@@ -116,7 +116,7 @@ public function process(PHP_CodeCoverage $coverage, $target = null, $name = null
         if ($fullMethodCount > 0) {
             $crapMethodPercent = $this->roundValue((100 * $fullCrapMethodCount) / $fullMethodCount);
         } else {
-            $crapMethodPercent = '';
+            $crapMethodPercent = 0;
         }
 
         $stats->appendChild($document->createElement('crapMethodPercent', $crapMethodPercent));

src/CodeCoverage/Report/HTML/Renderer.php

@@ -58,7 +58,7 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      */
     public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
     {
-        $version = new SebastianBergmann\Version('2.2.2', dirname(dirname(dirname(dirname(__DIR__)))));
+        $version = new SebastianBergmann\Version('2.2.3', dirname(dirname(dirname(dirname(__DIR__)))));
 
         $this->templatePath   = $templatePath;
         $this->generator      = $generator;