Skip to content

Commit 8769461

Browse files
committed
Merge branch 'release/2.5.0'
2 parents abde1a7 + 784f9bc commit 8769461

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4000
-3407
lines changed

.travis.yml

Lines changed: 3 additions & 39 deletions
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 ../test plugins/{LNAME}
23-
# - cd plugins/test
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

barcode.xml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,9 @@
2323
</authors>
2424
<versions>
2525
<version>
26-
<num>2.5.0-rc3</num>
26+
<num>2.5.0</num>
2727
<compatibility>~9.5.0</compatibility>
28-
<download_url>https://github.com/pluginsGLPI/barcode/releases/download/2.5.0-rc3/glpi-barcode-2.5.0-rc3.tar.bz2</download_url>
29-
</version>
30-
<version>
31-
<num>2.5.0-rc2</num>
32-
<compatibility>~9.5.0</compatibility>
33-
<download_url>https://github.com/pluginsGLPI/barcode/releases/download/2.5.0-rc2/glpi-barcode-2.5.0-rc2.tar.bz2</download_url>
34-
</version>
35-
<version>
36-
<num>2.5.0-rc1</num>
37-
<compatibility>~9.5.0</compatibility>
38-
<download_url>https://github.com/pluginsGLPI/barcode/releases/download/2.5.0-rc1/glpi-barcode-2.5.0-rc1.tar.bz2</download_url>
28+
<download_url>https://github.com/pluginsGLPI/barcode/releases/download/2.5.0/glpi-barcode-2.5.0.tar.bz2</download_url>
3929
</version>
4030
<version>
4131
<num>2.4.1</num>

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"require": {
3+
"php": "^7.2",
34
"deltalab/phpqrcode": "^1.1",
45
"pear/image_barcode": "^1.1",
56
"pear/pear": "^1.9",
@@ -10,9 +11,11 @@
1011
"glpi-project/tools": "^0.1"
1112
},
1213
"config": {
14+
"optimize-autoloader": true,
1315
"platform": {
14-
"php": "5.6"
15-
}
16+
"php": "7.2.0"
17+
},
18+
"sort-packages": true
1619
},
1720
"autoload": {
1821
"files": [

0 commit comments

Comments
 (0)