Skip to content

Commit

Permalink
Add GLPI 9.5 compatibility
Browse files Browse the repository at this point in the history
* Replace usage of deprecated 'DBMysql::fetch_assoc()'
* Add marketplace compatibility
* Use GLPI 9.5 min required PHP version
* Add 1.0.0 version definition
  • Loading branch information
cedric-anne committed Jul 6, 2020
1 parent 3218b47 commit b83ea17
Show file tree
Hide file tree
Showing 8 changed files with 725 additions and 369 deletions.
7 changes: 1 addition & 6 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

before_script:
- composer self-update
Expand All @@ -11,10 +10,6 @@ before_script:
script:
- vendor/bin/robo --no-interaction code:cs --strict

matrix:
allow_failures:
- php: nightly

cache:
directories:
- $HOME/.composer/cache
5 changes: 4 additions & 1 deletion RoboFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@

class RoboFile extends Glpi\Tools\RoboFile
{
//Own plugin's robo stuff
public function __construct() {
$this->csignore[] = '/js/store2.min.js';
$this->csignore[] = '/js/xivo/';
}
}
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"require-dev": {
"glpi-project/tools": "^0.1"
},
"require": {
"php": "^7.2",
"guzzlehttp/guzzle": "^6.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 b83ea17

Please sign in to comment.