Merge branch 'release/2.2.0'

.travis.yml

@@ -1,38 +1,14 @@
 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:
-  - 7.0
-  - 7.1
   - 7.2
-  - nightly
-
-allow_failures:
-  - php: nightly
+  - 7.4
 
 before_script:
-#  - mysql -u root -e 'create database glpitest;'
-#  - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
-#  - mv ../sccm plugins/sccm
-#  - composer install --no-dev
-#  - 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/sccm
-  - rm composer.lock
-  - composer install
+  - composer self-update
+  - composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
 
 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 --strict
 
 cache:
   directories:

composer.json

@@ -1,13 +1,15 @@
 {
     "require": {
-        "php": ">= 7.0.0"
+        "php": "^7.2"
     },
     "require-dev": {
         "glpi-project/tools": "^0.1"
     },
     "config": {
+        "optimize-autoloader": true,
         "platform": {
-            "php": "7.0"
-        }
+            "php": "7.2.0"
+        },
+        "sort-packages": true
     }
 }