Skip to content

Commit

Permalink
Add GLPI 9.5 compatibility
Browse files Browse the repository at this point in the history
* Remove usage of dropped 'SELECT DISTINCT'
* Replace usage of deprecated 'DBMysql::fetch_assoc()'
* Replace usage of deprecated 'DBMysql::fetch_array()'
* Add marketplace compatibility
* Add icon for fields container
* Use GLPI 9.5 min required PHP version
* Add 1.11.0 version definition
  • Loading branch information
cedric-anne committed Jul 6, 2020
1 parent 1383f2f commit 702a238
Show file tree
Hide file tree
Showing 14 changed files with 628 additions and 402 deletions.
13 changes: 4 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: php
php:
- 5.6
- 7.2
- 7.4
- nightly

services:
- mysql
Expand All @@ -11,12 +10,12 @@ env:
global:
- DB=mysql
matrix:
- GLPIVER=9.4/bugfixes
- GLPIVER=9.5/bugfixes

before_script:
- composer self-update
- git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
- bin/console dependencies install
- mysql -u root -e 'create database glpitest;'
- bin/console glpi:database:install --config-dir=./tests --no-interaction --db-name=glpitest --db-host=127.0.0.1 --db-user=root
- mv ../fields plugins/fields
Expand All @@ -26,11 +25,7 @@ before_script:
script:
- vendor/bin/robo --no-interaction code:cs --strict
- mysql -u root -e 'select version();'
- ./vendor/bin/atoum --debug -bf tests/bootstrap.php -d tests/units/

matrix:
allow_failures:
- php: nightly
- php vendor/bin/atoum -p 'php -d memory_limit=512M' --debug --force-terminal --use-dot-report --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/units

cache:
directories:
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"require-dev": {
"glpi-project/tools": "^0.1",
"atoum/atoum": "^3.1"
},
"require": {
"php": ">=5.6"
"php": "^7.2"
},
"require-dev": {
"atoum/atoum": "^3.1",
"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 702a238

Please sign in to comment.