From 311c7c8751b7406b40631b1ebc4fab0349b04aa4 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Wed, 30 Nov 2016 22:33:14 +0000 Subject: [PATCH 1/4] Require minimum of PHP 7, enabling tests on PHP 7.1 --- .travis.yml | 10 ++-------- composer.json | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42623e6cd..4ef8b3740 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: php php: - - 5.6 - 7.0 - - hhvm + - 7.1 env: matrix: @@ -17,11 +16,6 @@ script: - vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml --colors - test/demo/check-demo.sh - vendor/bin/phpunit test/compat - - vendor/bin/phpunit test/core || true after_script: - - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi - -matrix: - allow_failures: - - php: hhvm + - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi diff --git a/composer.json b/composer.json index 4123283f8..ad5721fbd 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Better Reflection - an improved code reflection API", "license": "MIT", "require": { - "php": "^5.6|^7.0", + "php": "^7.0|^7.1", "nikic/php-parser": "^3.0", "phpdocumentor/reflection-docblock": "^3.0", "phpdocumentor/type-resolver": "^0.2", From b311582debaa867f6fbd6241914f8e10df056a84 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Dec 2016 13:56:14 +0100 Subject: [PATCH 2/4] #226 `^7.0|^7.1` is redundant, and can be replaced by `^7.0` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ad5721fbd..df6274954 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Better Reflection - an improved code reflection API", "license": "MIT", "require": { - "php": "^7.0|^7.1", + "php": "^7.0", "nikic/php-parser": "^3.0", "phpdocumentor/reflection-docblock": "^3.0", "phpdocumentor/type-resolver": "^0.2", From 0b0bf2d65becae1f2b0be447d819e4f17ce54fd7 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Dec 2016 14:09:00 +0100 Subject: [PATCH 3/4] #226 bumping all internal dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index df6274954..ad4172e8f 100644 --- a/composer.json +++ b/composer.json @@ -4,15 +4,15 @@ "license": "MIT", "require": { "php": "^7.0", - "nikic/php-parser": "^3.0", - "phpdocumentor/reflection-docblock": "^3.0", - "phpdocumentor/type-resolver": "^0.2", - "zendframework/zend-code": "^3.0", + "nikic/php-parser": "^3.0.2", + "phpdocumentor/reflection-docblock": "^3.1.1", + "phpdocumentor/type-resolver": "^0.2.1", + "zendframework/zend-code": "^3.1", "jeremeamia/superclosure": "^2.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^1.12", - "phpunit/phpunit": "^5.4" + "friendsofphp/php-cs-fixer": "^1.13.1", + "phpunit/phpunit": "^5.7.4" }, "autoload": { "psr-4": { From 1a872f4a7bdeaf4537477b0ef663f6f76d156bbd Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Dec 2016 14:10:58 +0100 Subject: [PATCH 4/4] #226 explicitly locking onto PHP `7.0.*|7.1.*` since PHP isn't really semver-compliant --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ad4172e8f..d129f9c90 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Better Reflection - an improved code reflection API", "license": "MIT", "require": { - "php": "^7.0", + "php": "7.0.*|7.1.*", "nikic/php-parser": "^3.0.2", "phpdocumentor/reflection-docblock": "^3.1.1", "phpdocumentor/type-resolver": "^0.2.1",