Merge branch 'release/1.7.0'

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
- - 5.5
  - 5.6
  - 7.0
  - 7.1
@@ -11,28 +10,25 @@ env:
  - DB=mysql
  matrix:
  #- GLPIVER=9.1.2 ==> not released yet!
- - GLPIVER=9.1/bugfixes
+ - GLPIVER=9.2/bugfixes
  - GLPIVER=master
 
 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
+ - php tools/cliinstall.php --db=glpitest --user=root --tests
  - mv ../fields plugins/fields
  - cd plugins/fields
  - composer install -o
 
 script:
  - vendor/bin/robo --no-interaction code:cs
  - mysql -u root -e 'select version();'
- - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
+ - ./vendor/bin/atoum --debug -bf tests/bootstrap.php -d tests/units/
 
 matrix:
- exclude:
- - php: 5.4
- env: GLPIVER=master
  allow_failures:
  - php: nightly
 

ajax/reorder.php

@@ -1,7 +1,7 @@
 <?php
 include ("../../../inc/includes.php");
 
-$table = getTableForItemType('PluginFieldsField');
+$table = PluginFieldsField::getTable();
 
 // Récupération de l'ID du champ à modifier
 $query = "SELECT id FROM $table

ajax/viewtranslations.php

@@ -50,7 +50,7 @@
 if ($canedit) {
  $translation->showForm($_POST['itemtype'], $_POST['items_id'], $_POST['id']);
 } else {
- _e('Access denied');
+ echo __('Access denied');
 }
 
 Html::ajaxFooter();

composer.json

@@ -3,12 +3,16 @@
  "prefer-stable": true,
  "require-dev": {
  "glpi-project/tools": "^0.1.0",
- "atoum/atoum": "^2.8"
- },
- "scripts": {
- "post-install-cmd": "if [ $COMPOSER_DEV_MODE -eq 1 ]; then patch -d vendor/atoum/atoum -p1 < tools/atoum-php71.patch; fi"
+ "atoum/atoum": "^3.1"
  },
  "require": {
+ "php": ">=5.6.0",
  "zendframework/zend-loader": "^2.5"
+ },
+ "config": {
+ "optimize-autoloader": true,
+ "platform": {
+ "php": "5.6.0"
+ }
  }
 }