Merge branch 'release/2.6.0'

pluginsGLPI · Jul 7, 2020 · f97ee34 · f97ee34
2 parents 37bb88a + ff49f31
commit f97ee34
Show file tree

Hide file tree

Showing 59 changed files with 10,764 additions and 9,678 deletions.
diff --git a/.travis.yml b/.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
diff --git a/ajax/detail.php b/ajax/detail.php
@@ -54,13 +54,15 @@
    "validate",
 ];
 
+$order_url = Plugin::getWebDir('order');
+
 foreach ($fields as $field) {
    $paramsaction['update'] = $field;
    Ajax::updateItem("show_$field",
-                    $CFG_GLPI["root_doc"] . "/plugins/order/ajax/referencedetail.php",
+                    "$order_url/ajax/referencedetail.php",
                     $paramsaction, "dropdown_reference$rand");
    Ajax::updateItemOnSelectEvent("dropdown_reference$rand",
                                  "show_$field",
-                                 $CFG_GLPI["root_doc"]."/plugins/order/ajax/referencedetail.php",
+                                 "$order_url/ajax/referencedetail.php",
                                  $paramsaction);
 }
diff --git a/ajax/dropdownContact.php b/ajax/dropdownContact.php
@@ -77,7 +77,7 @@
 
 if ($DB->numrows($result)) {
    $prev = -1;
-   while ($data = $DB->fetch_array($result)) {
+   while ($data = $DB->fetchArray($result)) {
       if ($data["entities_id"] != $prev) {
          if ($prev > 0) {
             echo "</optgroup>";

diff --git a/ajax/dropdownReference.php b/ajax/dropdownReference.php
@@ -48,7 +48,7 @@
    $number = $DB->numrows($result);
    $values = [0 => Dropdown::EMPTY_VALUE];
    if ($number) {
-      while ($data = $DB->fetch_assoc($result)) {
+      while ($data = $DB->fetchAssoc($result)) {
          $values[$data['id']] = $data['name']." - ".$data['reference_code'];
       }
    }

diff --git a/ajax/dropdownSupplier.php b/ajax/dropdownSupplier.php
@@ -49,7 +49,7 @@
 
    $values = [0 => Dropdown::EMPTY_VALUE];
    if ($number) {
-      while ($data = $DB->fetch_assoc($result)) {
+      while ($data = $DB->fetchAssoc($result)) {
          $values[$data['id']] = formatUserName('', '', $data['name'], $data['firstname']);
       }
    }

diff --git a/ajax/referencetree.php b/ajax/referencetree.php
@@ -38,7 +38,7 @@
 Session::checkLoginUser();
 
 if (!isset($_GET['target'])) {
-   $_GET['target'] = $CFG_GLPI['root_doc']."/plugins/order/front/reference.php";
+   $_GET['target'] = Plugin::getWebDir('order')."/front/reference.php";
 }
 
 PluginOrderReference::showSelector($_GET['target']);

diff --git a/ajax/referencetreetypes.php b/ajax/referencetreetypes.php
@@ -58,7 +58,7 @@
          if ($DB->numrows($result)) {
             $pos = 0;
 
-            while ($row = $DB->fetch_array($result)) {
+            while ($row = $DB->fetchArray($result)) {
                $class             = $row['itemtype'];
                $item              = new $class();
                $path['text']      = $item->getTypeName();
@@ -73,8 +73,8 @@
                           Dropdown::getDropdownName("glpi_entities", $entity)."&field[1]=80";
                }
 
-               $path['href'] = $CFG_GLPI["root_doc"].
-                  "/plugins/order/front/$target?is_deleted=0&field[0]=3&searchtype[0]=equals&contains[0]=".
+               $path['href'] = Plugin::getWebDir('order').
+                  "/front/$target?is_deleted=0&field[0]=3&searchtype[0]=equals&contains[0]=".
                   rawurlencode($class)."&$link&itemtype=PluginOrderReference&start=0";
 
                // Check if node is a leaf or a folder.

diff --git a/composer.json b/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": [
         {