Skip to content

Commit 32b2a23

Browse files
committed
Merge branch 'release/1.9.0'
2 parents 9ad46d7 + 7a31081 commit 32b2a23

31 files changed

+903
-557
lines changed

.travis.yml

+3-39
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,15 @@
11
language: php
22
php:
3-
- 5.6
4-
- 7.0
5-
- 7.1
63
- 7.2
7-
- nightly
8-
9-
#env:
10-
# global:
11-
# - DB=mysql
12-
# matrix:
13-
# - GLPIVER=9.1/bugfixes
14-
# - GLPIVER=master
4+
- 7.4
155

166
before_script:
177
- composer self-update
18-
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
19-
# - composer install --no-dev
20-
# - mysql -u root -e 'create database glpitest;'
21-
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
22-
# - mv ../treeview plugins/{LNAME}
23-
# - cd plugins/treeview
24-
- composer install -o
25-
8+
- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
269

2710
script:
28-
- vendor/bin/robo --no-interaction code:cs
29-
# - mysql -u root -e 'select version();'
30-
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
31-
32-
33-
matrix:
34-
# exclude:
35-
# - php: 5.4
36-
# env: GLPIVER=master
37-
allow_failures:
38-
- php: nightly
11+
- vendor/bin/robo --no-interaction code:cs --strict
3912

4013
cache:
4114
directories:
4215
- $HOME/.composer/cache
43-
44-
#notifications:
45-
# irc:
46-
# channels:
47-
# - "irc.freenode.org#channel"
48-
# on_success: change
49-
# on_failure: always
50-
# use_notice: true
51-
# skip_join: true

composer.json

+7-2
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)