Merge branch 'release/2.4.0'

pluginsGLPI · Jun 28, 2018 · 4d1cee2 · 4d1cee2
2 parents 5bf1f95 + e881fbb
commit 4d1cee2
Show file tree

Hide file tree

Showing 31 changed files with 1,792 additions and 1,232 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,9 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-plugin-uninstall.uninstall-230pot]
+[glpi-plugin-uninstall.uninstall-pot]
 file_filter = locales/<lang>.po
 source_file = locales/uninstall.pot
 source_lang = en
-minimum_perc: 100
-
+type = PO
diff --git a/ajax/dropdownReplaceFindDevice.php b/ajax/dropdownReplaceFindDevice.php
@@ -35,9 +35,9 @@
 $itemtypeisplugin = isPluginItemType($_REQUEST['itemtype']);
 $item             = new $_REQUEST['itemtype']();
 $table            = getTableForItemType($_REQUEST['itemtype']);
-$options          = array();
+$options          = [];
 $count            = 0;
-$datastoadd       = array();
+$datastoadd       = [];
 
 $displaywith = false;
 if (isset($_REQUEST['displaywith'])) {
@@ -122,12 +122,12 @@
        || (strlen($outputval) == 0)) {
       $outputval = sprintf(__('%1$s (%2$s)'), $outputval, $ID);
    }
-   array_push($options, array('id'     => $ID,
-                               'text'  => $outputval,
-                               'title' => $title));
+   array_push($options, ['id'     => $ID,
+                         'text'  => $outputval,
+                         'title' => $title]);
    $count++;
 }
 
 
-echo json_encode(array('results' => $options,
-                      'count'    => $count));
+echo json_encode(['results' => $options,
+                  'count'    => $count]);
diff --git a/ajax/groups.php b/ajax/groups.php
@@ -40,10 +40,10 @@
          break;
 
       case 'set' :
-         Group::dropdown(array('value'       => $_POST["groups_id"],
-                               'entity'      => $_POST["entities_id"],
-                               'entity_sons' => $_POST["entity_sons"],
-                               'emptylabel'  => __('None')));
+         Group::dropdown(['value'       => $_POST["groups_id"],
+                          'entity'      => $_POST["entities_id"],
+                          'entity_sons' => $_POST["entity_sons"],
+                          'emptylabel'  => __('None')]);
          break;
    }
 }
diff --git a/ajax/locations.php b/ajax/locations.php
@@ -37,9 +37,9 @@
    $location = PluginUninstallPreference::getLocationByUserByEntity($_POST["users_id"],
                                                                     $_POST["templates_id"],
                                                                     $_POST["entity"]);
-   Location::dropdown(array('value'     => ($location == '' ? 0 : $location),
-                            'comments'  => 1,
-                            'entity'    => $_POST["entity"],
-                            'toadd'     => array(-1 => __('Keep previous location', 'uninstall'),
-                                                 0  => __('Empty location', 'uninstall'))));
+   Location::dropdown(['value'     => ($location == '' ? 0 : $location),
+                       'comments'  => 1,
+                       'entity'    => $_POST["entity"],
+                       'toadd'     => [-1 => __('Keep previous location', 'uninstall'),
+                                       0  => __('Empty location', 'uninstall')]]);
 }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,10 @@
 {
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require-dev": {
-        "glpi-project/tools": "^0.1.0"
+        "glpi-project/tools": "^0.1"
+    },
+    "config": {
+        "platform": {
+            "php": "5.6"
+        }
     }
 }
-Original file line number
+Diff line change
@@ -1,9 +1,9 @@
     language: php
     php:
-      - 5.5
       - 5.6
       - 7.0
       - 7.1
+      - 7.2
       - nightly
     #env:
@@ Expand Down @@