update from master

.gitignore

@@ -4,8 +4,9 @@ build/coverage
 build/logs
 build/pdepend
 cache.properties
-phpunit.xml
+/tests/_files/tmp
 /vendor
 /composer.lock
 /composer.phar
 /.idea
+/.php_cs.cache

.php_cs

@@ -0,0 +1,69 @@
+<?php
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->files()
+    ->in('src')
+    ->in('tests')
+    ->exclude('_files')
+    ->name('*.php');
+
+return Symfony\CS\Config\Config::create()
+    ->setUsingCache(true)
+    ->level(\Symfony\CS\FixerInterface::NONE_LEVEL)
+    ->fixers(
+        array(
+            'align_double_arrow',
+            'align_equals',
+            'braces',
+            'concat_with_spaces',
+            'duplicate_semicolon',
+            'elseif',
+            'empty_return',
+            'encoding',
+            'eof_ending',
+            'extra_empty_lines',
+            'function_call_space',
+            'function_declaration',
+            'indentation',
+            'join_function',
+            'line_after_namespace',
+            'linefeed',
+            'list_commas',
+            'lowercase_constants',
+            'lowercase_keywords',
+            'method_argument_space',
+            'multiple_use',
+            'namespace_no_leading_whitespace',
+            'no_blank_lines_after_class_opening',
+            'no_empty_lines_after_phpdocs',
+            'parenthesis',
+            'php_closing_tag',
+            'phpdoc_indent',
+            'phpdoc_no_access',
+            'phpdoc_no_empty_return',
+            'phpdoc_no_package',
+            'phpdoc_params',
+            'phpdoc_scalar',
+            'phpdoc_separation',
+            'phpdoc_to_comment',
+            'phpdoc_trim',
+            'phpdoc_types',
+            'phpdoc_var_without_name',
+            'remove_lines_between_uses',
+            'return',
+            'self_accessor',
+            'short_array_syntax',
+            'short_tag',
+            'single_line_after_imports',
+            'single_quote',
+            'spaces_before_semicolon',
+            'spaces_cast',
+            'ternary_spaces',
+            'trailing_spaces',
+            'trim_array_spaces',
+            'unused_use',
+            'visibility',
+            'whitespacy_lines'
+        )
+    )
+    ->finder($finder);
+

.travis.yml

@@ -1,20 +1,22 @@
 language: php
 
 php:
-    - 5.3.3
-    - 5.3
-    - 5.4
-    - 5.5
     - 5.6
+    - 7.0
+    - nightly
 
-before_script:
-    - COMPOSER_ROOT_VERSION=dev-master composer install --prefer-source
+sudo: false
 
-script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
+before_install:
+    - composer self-update
+
+install:
+    - travis_retry composer install --no-interaction --prefer-source
+
+script:
+
+    - vendor/bin/phpunit --configuration build
 
 notifications:
   email: false
-  irc:
-    channels:
-      - "irc.freenode.org#phpunit"
-    use_notice: true
+

CONTRIBUTING.md

@@ -1,5 +1 @@
-Pull Requests for bug fixes should be made against the current release branch (2.0).
-
-Pull Requests for new features should be made against master.
-
-For further notes please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md)
+Please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md) for details on how to contribute to this project.

ChangeLog-2.2.md

@@ -0,0 +1,56 @@
+# Changes in PHP_CodeCoverage 2.2
+
+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.4] - 2015-10-06
+
+### Fixed
+
+* Fixed [#391](https://github.com/sebastianbergmann/php-code-coverage/pull/391): Missing `</abbr>` tag
+
+## [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
+
+* Reintroduced the `PHP_CodeCoverage_Driver_HHVM` driver as an extension of `PHP_CodeCoverage_Driver_Xdebug` that does not use `xdebug_start_code_coverage()` with options not supported by HHVM
+
+### Changed
+
+* Bumped required version of `sebastian/environment` to 1.3.2 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
+
+## [2.2.1] - 2015-08-02
+
+### Changed
+
+* Bumped required version of `sebastian/environment` to 1.3.1 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
+
+## [2.2.0] - 2015-08-01
+
+### Added
+
+* Added a driver for PHPDBG (requires PHP 7)
+* Added `PHP_CodeCoverage::setDisableIgnoredLines()` to disable the ignoring of lines using annotations such as `@codeCoverageIgnore`
+
+### Changed
+
+* Annotating a method with `@deprecated` now has the same effect as annotating it with `@codeCoverageIgnore`
+
+### Removed
+
+* The dedicated driver for HHVM, `PHP_CodeCoverage_Driver_HHVM` has been removed
+
+[2.2.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.3...2.2.4
+[2.2.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.2...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
+

ChangeLog-3.0.md

@@ -0,0 +1,31 @@
+# Changes in PHP_CodeCoverage 3.0
+
+All notable changes of the PHP_CodeCoverage 3.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [3.0.2] - 2015-11-12
+
+### Changed
+
+* It is now optional that `@deprecated` code is ignored
+
+## [3.0.1] - 2015-10-06
+
+### Fixed
+
+* Fixed [#391](https://github.com/sebastianbergmann/php-code-coverage/pull/391): Missing `</abbr>` tag
+
+## [3.0.0] - 2015-10-02
+
+### Changed
+
+* It is now mandatory to configure a whitelist
+
+### Removed
+
+* The blacklist functionality has been removed
+* PHP_CodeCoverage is no longer supported on PHP 5.3, PHP 5.4, and PHP 5.5
+
+[3.0.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.0.1...3.0.2
+[3.0.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.0.0...3.0.1
+[3.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2...3.0.0
+

ChangeLog-3.1.md

@@ -0,0 +1,30 @@
+# Changes in PHP_CodeCoverage 3.1
+
+All notable changes of the PHP_CodeCoverage 3.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [3.1.1] - 2016-02-04
+
+### Changed
+
+* Allow version 2.0.x of `sebastian/version` dependency
+
+## [3.1.0] - 2016-01-11
+
+### Added
+
+* Implemented [#234](https://github.com/sebastianbergmann/php-code-coverage/issues/234): Optionally raise an exception when a specified unit of code is not executed
+
+### Changed
+
+* The Clover XML report now contains cyclomatic complexity information
+* The Clover XML report now contains method visibility information
+* Cleanup and refactoring of various areas of code
+* Added missing test cases
+
+### Removed
+
+* The functionality controlled by the `mapTestClassNameToCoveredClassName` setting has been removed
+
+[3.1.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.1.0...3.1.1
+[3.1.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.0...3.1.0
+

ChangeLog-3.2.md

@@ -0,0 +1,23 @@
+# Changes in PHP_CodeCoverage 3.2
+
+All notable changes of the PHP_CodeCoverage 3.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [3.2.1] - 2016-02-18
+
+### Changed
+
+* Updated dependency information in `composer.json`
+
+## [3.2.0] - 2016-02-13
+
+### Added
+
+* Added optional check for missing `@covers` annotation when the usage of `@covers` annotations is forced
+
+### Changed
+
+* Improved `PHP_CodeCoverage_UnintentionallyCoveredCodeException` message
+
+[3.2.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.1...3.2.0
+

ChangeLog-3.3.md

@@ -0,0 +1,19 @@
+# Changes in PHP_CodeCoverage 3.3
+
+All notable changes of the PHP_CodeCoverage 3.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [3.3.1] - 2016-04-08
+
+### Fixed
+
+* Fixed handling of lines that contain `declare` statements
+
+## [3.3.0] - 2016-03-03
+
+### Added
+
+* Added support for whitelisting classes for the unintentionally covered code unit check
+
+[3.3.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.3.0...3.3.1
+[3.3.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.2...3.3.0
+

ChangeLog-4.0.md

@@ -0,0 +1,12 @@
+# Changes in PHP_CodeCoverage 4.0
+
+All notable changes of the PHP_CodeCoverage 4.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
+
+## [4.0.0] - 2016-MM-DD
+
+### Changed
+
+* This component now uses namespaces
+
+[4.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/3.3...4.0.0
+

README.md

@@ -7,16 +7,27 @@
 
 ## Requirements
 
-* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
-* [Xdebug](http://xdebug.org/) 2.1.3 is required but using the latest version of Xdebug is highly recommended
+PHP 5.6 is required but using the latest version of PHP is highly recommended.
+
+### PHP 5
+
+[Xdebug](http://xdebug.org/) is the only source of raw code coverage data supported for PHP 5. Version 2.2.1 of Xdebug is required but using the latest version is highly recommended.
+
+### PHP 7
+
+Version 2.4.0 (or later) of [Xdebug](http://xdebug.org/) as well as [phpdbg](http://phpdbg.com/docs) are supported sources of raw code coverage data for PHP 7.
+
+### HHVM
+
+A version of HHVM that implements the Xdebug API for code coverage (`xdebug_*_code_coverage()`) is required.
 
 ## Installation
 
-To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 2.0:
+To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 3.0:
 
     {
         "require": {
-            "phpunit/php-code-coverage": "~2.0"
+            "phpunit/php-code-coverage": "^4"
         }
     }
 
@@ -37,4 +48,3 @@ $writer->process($coverage, '/tmp/clover.xml');
 $writer = new PHP_CodeCoverage_Report_HTML;
 $writer->process($coverage, '/tmp/code-coverage-report');
 ```
-

build/phpunit.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.3/phpunit.xsd"
+         bootstrap="../tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+    <testsuite>
+        <directory suffix="Test.php">../tests/tests</directory>
+    </testsuite>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">../src</directory>
+        </whitelist>
+    </filter>
+</phpunit>