Merge branch 'release/2.7.0'

pluginsGLPI · Jul 7, 2020 · 130551f · 130551f
2 parents 3e473b9 + 354b0be
commit 130551f
Show file tree

Hide file tree

Showing 35 changed files with 2,153 additions and 1,613 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
 language: php
 php:
-  - 5.6
+  - 7.2
   - 7.4
-  - nightly
 
 before_script:
   - composer self-update
@@ -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
diff --git a/ajax/dropdownReplaceFindDevice.php b/ajax/dropdownReplaceFindDevice.php
@@ -104,7 +104,7 @@
           ORDER BY `name`
           $LIMIT";
 $result = $DB->query($query);
-while ($data = $DB->fetch_assoc($result)) {
+while ($data = $DB->fetchAssoc($result)) {
    $outputval = Toolbox::unclean_cross_side_scripting_deep($data["name"]);
 
    if ($displaywith) {

diff --git a/composer.json b/composer.json
@@ -1,10 +1,15 @@
 {
+    "require": {
+        "php": "^7.2"
+    },
     "require-dev": {
         "glpi-project/tools": "^0.1"
     },
     "config": {
+        "optimize-autoloader": true,
         "platform": {
-            "php": "5.6"
-        }
+            "php": "7.2.0"
+        },
+        "sort-packages": true
     }
 }