Skip to content

Commit

Permalink
Dropping laravel < 5.4 support. Updating phpcsfixer & grumphp
Browse files Browse the repository at this point in the history
  • Loading branch information
nWidart committed Aug 3, 2017
1 parent 34cde4d commit f41b35b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,9 @@ cache:
directories:
- $HOME/.composer/cache

env:
matrix:
- COMPOSER_FLAGS="--prefer-lowest"
- COMPOSER_FLAGS=""

before_script:
- travis_retry composer self-update
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
- travis_retry composer update --no-interaction --prefer-dist

script:
- ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
}
],
"require": {
"php": ">=5.5.9",
"illuminate/support": "5.2.*|5.3.*|5.4.*",
"illuminate/config": "5.2.*|5.3.*|5.4.*",
"illuminate/view": "5.2.*|5.3.*|5.4.*",
"laravelcollective/html": "5.2.*|5.3.*|5.4.*"
"php": ">=5.6.9",
"illuminate/support": "5.4.*",
"illuminate/config": "5.4.*",
"illuminate/view": "5.4.*",
"laravelcollective/html": "5.4.*"
},
"require-dev": {
"phpunit/phpunit": "~5.7",
"mockery/mockery": "~0.9",
"orchestra/testbench": "3.2.*| 3.3.*|3.4.*",
"phpro/grumphp": "^0.9.1",
"friendsofphp/php-cs-fixer": "^1.11"
"orchestra/testbench": "3.4.*",
"phpro/grumphp": "^0.11",
"friendsofphp/php-cs-fixer": "^2.4"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions grumphp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
bin_dir: vendor/bin
stop_on_failure: true
tasks:
phpcsfixer:
config_file: .php_cs
phpcsfixer2:
config: .php_cs.dist
composer:
file: ./composer.json

0 comments on commit f41b35b

Please sign in to comment.