Merge branch 'release/1.5.0'

pluginsGLPI · Jun 28, 2018 · 7d44925 · 7d44925
2 parents 79dd146 + 74cd0fd
commit 7d44925
Show file tree

Hide file tree

Showing 88 changed files with 3,875 additions and 3,759 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - nightly
 
 #env:

diff --git a/.tx/config b/.tx/config
@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-project-plugin-mreporting.mreportingpot]
+[glpi-project-plugin-mreporting.mreporting-pot]
 file_filter = locales/<lang>.po
 source_file = locales/mreporting.pot
 source_lang = en_GB
-
+type = PO
diff --git a/ajax/dropdownExport.php b/ajax/dropdownExport.php
@@ -37,10 +37,10 @@
       && !empty($_POST['ext'])) {
    if ($_POST['ext'] == "odt") {
       echo "&nbsp;";
-      $option = array();
+      $option = [];
       $option[1] = __("With data", 'mreporting');
       $option[0] = __("Without data", 'mreporting');
-      Dropdown::showFromArray("withdata", $option, array());
+      Dropdown::showFromArray("withdata", $option, []);
 
    }
 

diff --git a/composer.json b/composer.json
@@ -1,12 +1,15 @@
 {
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require-dev": {
-        "glpi-project/tools": "^0.1.0"
+        "glpi-project/tools": "^0.1"
     },
     "require": {
         "masnathan/odtphp": "dev-teclib"
     },
+    "config": {
+        "platform": {
+            "php": "5.6"
+        }
+    },
     "repositories": [
         {
             "type": "vcs",