alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert accidental PHP version update to develop branch

This commit is contained in:
MarkBaker 2018-12-28 22:31:14 +01:00
parent 8c99d9d8c0
commit 50ed769b38
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -2,6 +2,7 @@ language: php
dist: trusty dist: trusty
php: php:
- 5.6
- 7.0 - 7.0
- 7.1 - 7.1
- 7.2 - 7.2
@ -25,13 +26,13 @@ jobs:
include: include:
- stage: Code style - stage: Code style
php: 7.3 php: 7.2
script: script:
- ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run - ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
- ./vendor/bin/phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR2 -n - ./vendor/bin/phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR2 -n
- stage: Coverage - stage: Coverage
php: 7.3 php: 7.2
env: KEEP_XDEBUG=1 env: KEEP_XDEBUG=1
script: script:
- travis_wait 40 ./vendor/bin/phpunit --debug --coverage-clover coverage-clover.xml - travis_wait 40 ./vendor/bin/phpunit --debug --coverage-clover coverage-clover.xml
@ -40,7 +41,7 @@ jobs:
- php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml
- stage: API documentation - stage: API documentation
php: 7.3 php: 7.2
before_script: before_script:
- curl -O https://get.sensiolabs.org/sami.phar - curl -O https://get.sensiolabs.org/sami.phar
script: script:

2
composer.json
View File

@ -39,7 +39,7 @@
] ]
}, },
"require": { "require": {
"php": "^7.0", "php": "^5.6|^7.0",
"ext-ctype": "*", "ext-ctype": "*",
"ext-dom": "*", "ext-dom": "*",
"ext-gd": "*", "ext-gd": "*",