Skip to content

Commit

Permalink
require php 7.1, update travis.yml like Slim 4, update dev dependenci…
Browse files Browse the repository at this point in the history
…es - resolves #20
  • Loading branch information
danopz committed Nov 2, 2018
1 parent c4804af commit aa0f1b6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -12,5 +12,5 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.json]
[*.{json,yml}]
indent_size = 2
27 changes: 13 additions & 14 deletions .travis.yml
Expand Up @@ -2,27 +2,26 @@ sudo: false

language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3
- nightly
dist: trusty

matrix:
include:
- php: 7.1
env: ANALYSIS='true'
- php: 7.2
- php: 7.3
- php: nightly
allow_failures:
- php: nightly

before_script:
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then composer require satooshi/php-coveralls:^0.7 squizlabs/php_codesniffer:^2.5 -n ; fi
- if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then composer require phpstan/phpstan:^0.10 -n ; fi
- if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then composer install -n ; fi
- composer update

script:
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml ; fi
- if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then vendor/bin/phpunit ; fi
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then vendor/bin/phpcs ; fi
- if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then vendor/bin/phpstan analyse src/ ; fi
- if [[ "$ANALYSIS" != 'true' ]]; then vendor/bin/phpunit ; fi
- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpcs ; fi
- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpstan analyse ; fi

after_script:
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then php vendor/bin/coveralls -v ; fi
- if [[ "$ANALYSIS" == 'true' ]]; then php vendor/bin/coveralls --coverage_clover=clover.xml -v ; fi
10 changes: 6 additions & 4 deletions composer.json
Expand Up @@ -23,15 +23,17 @@
}
],
"require": {
"php": ">=7.0.0",
"php": ">=7.1.0",
"psr/http-message": "^1.0",
"psr/http-factory": "^1.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.5",
"phpunit/phpunit": "^6.0|^7.0",
"http-interop/http-factory-tests": "^0.5.0",
"php-coveralls/php-coveralls": "^2.1",
"php-http/psr7-integration-tests": "dev-master",
"http-interop/http-factory-tests": "^0.5.0"
"phpstan/phpstan": "^0.10",
"phpunit/phpunit": "^6.0|^7.0",
"squizlabs/php_codesniffer": "^3.3"
},
"provide": {
"psr/http-message-implementation": "1.0"
Expand Down
2 changes: 2 additions & 0 deletions phpstan.neon
@@ -1,2 +1,4 @@
parameters:
level: 3
paths:
- %currentWorkingDirectory%/src/

0 comments on commit aa0f1b6

Please sign in to comment.