Merge branch 'release/1.6.0'

Author: orthagh

.gitattributes

@@ -1,6 +1,5 @@
 language: php
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -23,12 +22,11 @@ before_script:
   - php tools/cliinstall.php --db=glpi-test --user=travis --tests
   - mv ../fields plugins/fields
   - cd plugins/fields
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.4" ]]; then sed -e "s|.*"consolidation/robo".*$||" -i composer.json && composer update; fi
   - composer install -o
 
 script:
+  - vendor/bin/robo --no-interaction code:cs
   - mysql -u root -e 'select version();'
-  - vendor/bin/phpcs -p --ignore=vendor --ignore=js --ignore=css --standard=vendor/glpi-project/coding-standard/GlpiStandard/ .
   - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
 
 matrix:

.travis.yml

@@ -5,9 +5,9 @@
  * @see http://robo.li/
  */
 
-require_once 'RoboFilePlugin.php';
+require_once 'vendor/autoload.php';
 
-class RoboFile extends RoboFilePlugin
+class RoboFile extends Glpi\Tools\RoboFile
 {
     //Own plugin's robo stuff
 }

RoboFile.php

@@ -1,12 +1,14 @@
 {
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require-dev": {
-        "consolidation/robo": "dev-master@dev",
-        "patchwork/jsqueeze": "~1.0",
-        "natxet/CssMin": "~3.0",
-        "glpi-project/coding-standard": "0.5",
+        "glpi-project/tools": "^0.1.0",
         "atoum/atoum": "^2.8"
     },
     "scripts": {
-        "post-install-cmd": "patch -d vendor/atoum/atoum -p1 < tools/atoum-php71.patch"
+        "post-install-cmd": "if [ $COMPOSER_DEV_MODE -eq 1 ]; then patch -d vendor/atoum/atoum -p1 < tools/atoum-php71.patch; fi"
+    },
+    "require": {
+        "fedora/autoloader": "^0.2.1"
     }
 }