Merge pull request #4 from leanphp/3.0.x-dev

3.0.x-dev (master) + Symonfy 2.x / 3.x compatibility

Author: ek9

.travis.yml

@@ -1,4 +1,5 @@
 language: php
+
 matrix:
   include:
     - php: 5.3
@@ -10,18 +11,9 @@ matrix:
     - php: 7.0
     - php: 7.1
 
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
 before_script:
-    - if [[ $deps = low ]]; then composer update --prefer-lowest --prefer-stable; fi
-
-script:
   - composer validate
-  - composer update
-  - bin/phpunit -vvv
+  - if [[ $deps = low ]]; then composer update --prefer-lowest --prefer-stable; else composer update; fi
 
-install:
-    - travis_retry composer install
+script: ./bin/phpunit -vvv
 

CHANGELOG.md

@@ -6,7 +6,19 @@ documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.5.5] - 2017-04-05 (backported v2.5.0.5, original release on 2014-02-10)
+## [3.0.x-dev] - UNRELEASED (backported 3.0.x-dev from vipsoft/code-coverage-extension)
+
+- Merged commits from `3.0.x-dev` (`master` branch) of
+  `vipsoft/code-coverage-extension` (adds support for Behat `~3.0`)
+- Fixed compatibility with Symfony `~2.3` and `~3.0` components (tested with
+  versions `2.3`,`2.4`,`2.5`,`2.6`,`2.7`,`2.8`,`3.0`,`3.1`,`3.2`). As a result
+  there are 2 different service definitions `services-2.3.xml` for Symfony
+  `2.x` and `services.xml` for Symfony `3.x`).
+- Update TravisCI to test against all supported version of PHP.
+- Added `symfony/expression-language` as a dependency for users using older
+  versions of PHP and symonfy `2.x` / `3.x`.
+
+## [2.5.5] - 2017-04-04 (backported v2.5.0.5, original release on 2014-02-10)
 
 **Note!** This version is a direct backport of `2.5.0.5` of
 [vipsoft/code-coverage-extension][1] package with updated namespaces to work
@@ -23,6 +35,7 @@ disappear, this extension would still work.
 - Updated `vfsStream` from `1.2.*` to `1.3.*` to fix failing/skipped test
 - Updated versions of dependencies and code is tested to run with Behat `2.5`.
 
+[3.0.x-dev]: https://github.com/leanphp/behat-code-coverage/compare/v2.5.5...master
 [2.5.5]: https://github.com/leanphp/behat-code-coverage/releases/tag/v2.5.5
 
 [0]: https://github.com/leanphp/behat-code-coverage

README.md

@@ -18,10 +18,10 @@ compatible version numbers for stable releases.
 
 ## Requirements
 
-- PHP 5.3.10+
-- [Behat v2.4+][3]
-- [Mink 1.4+][4]
-- [Xdebug][5] extension enabled in PHP
+- PHP 5.3.10+ / 7.0+
+- [Behat v3][3]
+- [Xdebug][5] or [phpdbg][6] extension enabled (PHP 7+ is required for code
+  generation to work with [phpdbg][6]).
 
 ## Change Log
 
@@ -61,6 +61,15 @@ If you execute `bin/behat` command, you will see code coverage generated in
 
     $ bin/behat
 
+### Running with phpdbg
+
+This extension now supports [phpdbg][6], which results in faster execution when
+using more recent versions of PHP. Run `phpspec` via [phpdbg][6]:
+
+    $ phpdbg -qrr behat run
+
+**Note!** PHP 7+ is required for code generation to work with [phpdbg][6].
+
 ## Configuration
 
 You can see fully annotated `behat.yml` example file below, which can be used
@@ -159,6 +168,7 @@ Licensed under [BSD-2-Clause License](LICENSE).
 [3]: http://behat.org/en/v2.5/
 [4]: http://mink.behat.org
 [5]: https://xdebug.org/
+[6]: http://phpdbg.com/
 
 [travis-image]: https://travis-ci.org/leanphp/behat-code-coverage.svg
 [travis-url]: https://travis-ci.org/leanphp/behat-code-coverage

composer.json

@@ -26,13 +26,14 @@
     },
     "require": {
         "php": ">=5.3.10",
-        "phpunit/php-code-coverage": "~2.2",
-        "behat/behat": "~2.4",
+        "phpunit/php-code-coverage": "2.2.*",
+        "behat/behat": "~3.0",
         "guzzle/http": "~3.0",
-        "symfony/config": "~2.2,<2.4",
-        "symfony/dependency-injection": "~2.2,<2.4",
-        "symfony/http-kernel": "~2.2,<2.4",
-        "symfony/http-foundation": "~2.2,<2.4"
+        "symfony/config": "~2.3||~3.0",
+        "symfony/dependency-injection": "~2.2||~3.0",
+        "symfony/expression-language": "~2.2||~3.0",
+        "symfony/http-kernel": "~2.3||~3.0",
+        "symfony/http-foundation": "~2.3||~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
@@ -43,5 +44,10 @@
     },
     "config": {
         "bin-dir": "bin"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0.x-dev"
+        }
     }
 }