Merge branch 'release/4.1.0'

Author: cedric-anne

.travis.yml

@@ -1,24 +1,21 @@
 language: php
-
-env:
-  global:
-#    - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.2/bugfixes" 
-    - PHPUNIT_ARGS="--verbose --debug"
-    - CS=7.2
-  matrix:
-#    - GLPI_BRANCH=9.2.1
-#    - GLPI_BRANCH=9.2/bugfixes
-#    - GLPI_BRANCH=master
-    
-php: 
+php:
   - 5.6
   - 7.0
   - 7.1
   - 7.2
   - nightly
 
-allow_failures:
-  - php: nightly
+env:
+#  global:
+#  matrix:
+#    - GLPI_BRANCH=9.2.1
+#    - GLPI_BRANCH=9.2/bugfixes
+#    - GLPI_BRANCH=master
+
+matrix:
+  allow_failures:
+    - php: nightly
 
 before_script:
 #  - mysql -u root -e 'create database glpitest;'
@@ -28,12 +25,11 @@ before_script:
 #  - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi
 #  - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi
 #  - cd plugins/formcreator
-  - rm composer.lock
+  - composer self-update
   - composer install
 
 script:
-#  - vendor/bin/phpunit $PHPUNIT_ARGS
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ]] ; then vendor/bin/robo --no-interaction code:cs; fi
+  - vendor/bin/robo --no-interaction code:cs
 
 cache:
   directories:

.tx/config

@@ -1,7 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-plugin-mantisbt.en_gbpo]
+[glpi-plugin-mantisbt.mantis-pot]
 file_filter = locales/<lang>.po
 source_file = locales/mantis.pot
 source_lang = en_GB
+type = PO

ajax/ajax.php

@@ -252,21 +252,21 @@
                      }
 
                      if ($conf->fields['status_after_escalation'] != 0) {
-                        $res = $ticket->update(array(
+                        $res = $ticket->update([
                               'id' => $ticket->fields['id'],
                               'status' => $conf->fields['status_after_escalation']
-                        ));
+                        ]);
 
                         if ($_POST['linkedTicket'] == 'true' && $_POST['itemType'] == 'Ticket') {
                            $tickets = Ticket_Ticket::getLinkedTicketsTo($id_ticket);
 
                            foreach ($tickets as $link_ticket) {
                               $t = new ticket();
                               $t->getFromDB($link_ticket['tickets_id']);
-                              $t->update(array(
+                              $t->update([
                                     'id' => $t->fields['id'],
                                     'status' => $conf->fields['status_after_escalation']
-                              ));
+                              ]);
                            }
                         }
                      }

composer.json

@@ -1,11 +1,13 @@
 {
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": ">= 5.6.0"
     },
     "require-dev": {
-        "glpi-project/tools": "^0.1.0",
-        "glpi-project/coding-standard": "0.5.0"
+        "glpi-project/tools": "^0.1"
+    },
+    "config": {
+        "platform": {
+            "php": "5.6"
+        }
     }
 }