From 25fb3aa2d8dce313d1b0ee92dcaad5c11b35f633 Mon Sep 17 00:00:00 2001 From: Maxime Veber Date: Tue, 12 Dec 2017 12:06:25 +0100 Subject: [PATCH] Fix test suite for PHP 7.2 --- .travis.yml | 2 -- composer.json | 7 ++++--- phpspec.yml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07d3fee3..955c7fd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,6 @@ matrix: env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"' - php: 7.1 env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"' - - php: 7.2 - env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"' branches: only: diff --git a/composer.json b/composer.json index 8ad32648..57c9acfd 100644 --- a/composer.json +++ b/composer.json @@ -35,10 +35,11 @@ "fzaninotto/faker": "^1.5" }, "require-dev": { - "bossa/phpspec2-expect": "~1.0", - "henrikbjorn/phpspec-code-coverage": "^2.1", + "bossa/phpspec2-expect": "~2.0", + "henrikbjorn/phpspec-code-coverage": "dev-master", + "phpunit/php-code-coverage": "^5.0|^4.0", "pedrotroller/php-cs-custom-fixer": "~1.4.0", - "phpspec/phpspec": "~2.5", + "phpspec/phpspec": "~3.0", "phpspec/prophecy": "~1.6" }, "config": { diff --git a/phpspec.yml b/phpspec.yml index 44307e2c..809b7e94 100644 --- a/phpspec.yml +++ b/phpspec.yml @@ -1,7 +1,7 @@ formatter.name: pretty extensions: - - PhpSpec\Extension\CodeCoverageExtension + PhpSpecCodeCoverage\CodeCoverageExtension: ~ code_coverage: format: