Merge branch 'release/1.7.0'

.travis.yml

@@ -1,51 +1,15 @@
 language: php
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
-  - nightly
-
-#env:
-#  global:
-#    - DB=mysql
-#  matrix:
-#    - GLPIVER=9.1/bugfixes
-#    - GLPIVER=master
+  - 7.4
 
 before_script:
   - composer self-update
-#  - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
-#  - composer install --no-dev
-#  - mysql -u root -e 'create database glpitest;'
-#  - php tools/cliinstall.php --db=glpi-test --user=travis --tests
-#  - mv ../{LNAME} plugins/{LNAME}
-#  - cd plugins/{LNAME}
-  - composer install -o
-
+  - composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
 
 script:
-  - vendor/bin/robo --no-interaction code:cs
-#  - mysql -u root -e 'select version();'
-#  - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
-
-
-matrix:
-#  exclude:
-#    - php: 5.4
-#      env: GLPIVER=master
-  allow_failures:
-    - php: nightly
+  - vendor/bin/robo --no-interaction code:cs --strict
 
 cache:
   directories:
     - $HOME/.composer/cache
-
-#notifications:
-#  irc:
-#    channels:
-#      - "irc.freenode.org#channel"
-#    on_success: change
-#    on_failure: always
-#    use_notice: true
-#    skip_join: true

ajax/dashboard.php

@@ -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;

ajax/homepage_link.php

@@ -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>';

composer.json

@@ -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": [
         {