Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Jul 7, 2020
2 parents 331c5eb + 1a343ee commit dc8cb96
Show file tree
Hide file tree
Showing 39 changed files with 794 additions and 500 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
language: php
php:
- 5.6
- 7.2
- 7.4
- nightly

before_script:
- composer self-update
- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest

script:
- vendor/bin/robo --no-interaction code:cs

matrix:
allow_failures:
- php: nightly
- vendor/bin/robo --no-interaction code:cs --strict

cache:
directories:
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"require": {
"php": "^7.2"
},
"require-dev": {
"glpi-project/tools": "^0.1"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "5.6"
}
"php": "7.2.0"
},
"sort-packages": true
}
}
Loading

0 comments on commit dc8cb96

Please sign in to comment.