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 'getAllDatasFromTable()'
* Replace usage of deprecated 'DBMysql::fetch_assoc()'
* Use TIMESTAMP instead of DATETIME in DB for new installations
* Fix 'Declaration of PluginMreportingCommon::getIcon() should be compatible with CommonDBTM::getIcon()'
* Add marketplace compatibility
* Fix curly braces deprecated usage
* Add menu icon
* Use GLPI 9.5 min required PHP version
* Add 1.7.0 version definition
  • Loading branch information
cedric-anne committed Jul 6, 2020
1 parent 3469868 commit a8be88d
Show file tree
Hide file tree
Showing 22 changed files with 652 additions and 442 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: 3 additions & 2 deletions ajax/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@

//load protovis lib for dashboard render
$version = Plugin::getInfo('mreporting', 'version');
echo Html::script("/plugins/mreporting/lib/protovis/protovis.min.js", ['version' => $version]);
echo Html::script("/plugins/mreporting/lib/protovis-msie/protovis-msie.min.js", ['version' => $version]);
$php_dir = Plugin::getPhpDir('mreporting', false);
echo Html::script($php_dir . "/lib/protovis/protovis.min.js", ['version' => $version]);
echo Html::script($php_dir . "/lib/protovis-msie/protovis-msie.min.js", ['version' => $version]);

Html::popFooter();
break;
Expand Down
4 changes: 2 additions & 2 deletions ajax/homepage_link.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

Session::checkLoginUser();

echo '<li id="menu99"><a href="' . $GLOBALS['CFG_GLPI']['root_doc'] .
'/plugins/mreporting/front/dashboard.form.php" class="itemP">&nbsp;&nbsp;'.
echo '<li id="menu99"><a href="' . Plugin::getWebDir('mreporting') .
'/front/dashboard.form.php" class="itemP">&nbsp;&nbsp;'.
__("Dashboard", 'mreporting'). '&nbsp;&nbsp;</a></li>';
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"require-dev": {
"glpi-project/tools": "^0.1"
},
"require": {
"php": "^7.2",
"masnathan/odtphp": "dev-teclib"
},
"require-dev": {
"glpi-project/tools": "^0.1"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "5.6"
}
"php": "7.2.0"
},
"sort-packages": true
},
"repositories": [
{
Expand Down
Loading

0 comments on commit a8be88d

Please sign in to comment.