Skip to content

Commit dc8cb96

Browse files
committed
Merge branch 'release/2.4.0'
2 parents 331c5eb + 1a343ee commit dc8cb96

39 files changed

Lines changed: 794 additions & 500 deletions

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
language: php
22
php:
3-
- 5.6
3+
- 7.2
44
- 7.4
5-
- nightly
65

76
before_script:
87
- composer self-update
98
- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
109

1110
script:
12-
- vendor/bin/robo --no-interaction code:cs
13-
14-
matrix:
15-
allow_failures:
16-
- php: nightly
11+
- vendor/bin/robo --no-interaction code:cs --strict
1712

1813
cache:
1914
directories:

composer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
2+
"require": {
3+
"php": "^7.2"
4+
},
25
"require-dev": {
36
"glpi-project/tools": "^0.1"
47
},
58
"config": {
9+
"optimize-autoloader": true,
610
"platform": {
7-
"php": "5.6"
8-
}
11+
"php": "7.2.0"
12+
},
13+
"sort-packages": true
914
}
1015
}

0 commit comments

Comments
 (0)