Merge branch 'release/2.0.0-rc.1'

.atoum.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * LICENSE
+ *
+ * Copyright © 2016-2018 Teclib'
+ * Copyright © 2010-2018 by the FusionInventory Development Team.
+ *
+ * This file is part of Flyve MDM Plugin for GLPI.
+ *
+ * Flyve MDM Plugin for GLPI is a subproject of Flyve MDM. Flyve MDM is a mobile
+ * device management software.
+ *
+ * Flyve MDM Plugin for GLPI is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * Flyve MDM Plugin for GLPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Flyve MDM Plugin for GLPI. If not, see http://www.gnu.org/licenses/.
+ * ------------------------------------------------------------------------------
+ * @author    Thierry Bugier
+ * @copyright Copyright © 2018 Teclib
+ * @license   AGPLv3+ http://www.gnu.org/licenses/agpl.txt
+ * @link      https://github.com/flyve-mdm/glpi-plugin
+ * @link      https://flyve-mdm.com/
+ * ------------------------------------------------------------------------------
+ */
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+use mageekguy\atoum\reports\coverage;
+use mageekguy\atoum\writers\std;
+
+$branch = getenv('TRAVIS_BRANCH');
+if ($branch && in_array($branch, ['master', 'develop', 'docs/code_coverage'])) {
+   $script->addDefaultReport();
+   $coverage = new coverage\html();
+   $coverage->addWriter(new std\out());
+   $coverage->setOutPutDirectory(__DIR__ . '/build/tests/coverage');
+   $runner->addReport($coverage);
+}

.github/ISSUE_TEMPLATE.md

@@ -1,34 +1,9 @@
-### Expected behaviour
+<!-- File a GitHub issue only for bugs or feature requests related to the code **in this repository**. For other topics you can get more information in the README file. -->
+
+#### Observed Results:
 
-### Actual behaviour
+<!-- This could be a description, error output, steps to reproduce, a feature missed, etc. -->
+
+#### Expected behavior:
 
-### Environment Details
-
-- HTTP server version:
-- GLPi version:
-- Flyve MDM version:
-- FusionInventory version:
-- Mosquitto version:
-- Mosquitto's auth plugin  version:
-
-### Steps to reproduce the behaviour
-
-1.
-2.
-3.
-
-### Screenshots, backtraces or logs
-
-Please check your logs for passwords, device serial numbers, IP addresses or any sensitive content
-
-php-errors.log
-```
-```
-
-sql-errors.log
-```
-```
-
-HTTP server error log
-```
-```
+<!-- What did you expect to happen? -->

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+### Changes description
+
+<!-- Describe results, user mentions, screenshots, screencast (gif) -->
+
+### Checklist
+
+Please check if your PR fulfills the following specifications:
+
+- [ ] Tests for the changes have been added
+- [ ] Docs have been added/updated
+
+### Estimated time
+
+<!-- Add the number of pomodoros spent on this task -->
+
+|Assignee|:tomato:|
+|:---|:---:|
+|@ |1|
+
+<!--- Task not finished? Please give an update of the time --->
+
+### References
+
+<!-- issues related (for reference or to be closed), dependencies and/or links of discuss -->
+
+Closes #N/A
+Related #N/A
+Depends on #N/A

.github/invite-contributors.yml

@@ -0,0 +1,3 @@
+isOutside: true
+# Team Name
+contributors

.github/settings.yml

@@ -0,0 +1,74 @@
+repository:
+  name: glpi-plugin
+  description: Flyve MDM Plugin for GLPI
+  homepage: http://flyve.org/glpi-plugin/
+  topics: flyve-mdm, glpi, plugin
+  private: false
+  has_issues: true
+  has_wiki: false
+  has_downloads: true
+  default_branch: develop
+  allow_squash_merge: true
+  allow_merge_commit: false
+  allow_rebase_merge: true
+labels:
+  - name: api
+    color: 0052cc
+  - name: bug
+    color: f44336
+  - name: build
+    color: 795548
+  - name: cherry-pick
+    color: af1c46
+  - name: ci
+    color: fbca04
+  - name: cleanup
+    color: c2e0c6
+  - name: cli
+    color: 444444
+  - name: device communication
+    color: 006b75
+  - name: documentation
+    color: 607d8b
+  - name: duplicate
+    color: 9e9e9e
+  - name: enrollment
+    color: 5319e7
+  - name: feature
+    color: 3f51b5
+  - name: good first issue
+    color: 7057ff
+  - name: greenkeeper
+    color: 00c775
+  - name: hacktoberfest
+    color: ff625f
+  - name: help wanted
+    color: 33aa3f
+  - name: install
+    color: ffa31a
+  - name: invalid
+    color: cddc39
+  - name: inventory
+    color: 40bf80
+  - name: locales
+    color: d4c5f9
+  - name: notification
+    color: cc6699
+  - name: performance
+    color: 009688
+  - name: policy
+    color: 7575f0
+  - name: question
+    color: ff5722
+  - name: refactor
+    color: 9c27b0
+  - name: style
+    color: 2196f3
+  - name: test
+    color: 8bc34a
+  - name: ui
+    color: bfdadc
+  - name: user
+    color: 0066cc
+  - name: wontfix
+    color: ffffff

.gitignore

@@ -3,5 +3,8 @@
 .buildpath
 .idea/*
 *.iml
+tests/logs/*
+vendor
 node_modules/
-npm-debug.log
+npm-debug.log
+.DS_Store

.travis.yml

@@ -1,29 +1,61 @@
 language: php
 
+sudo: required
+
+env:
+  global:
+    - GLPI_SOURCE="https://github.com/glpi-project/glpi"
+    - FI_SOURCE="https://github.com/fusioninventory/fusioninventory-for-glpi"
+    - CS=7.2
+    - DBNAME=glpitest
+    - AFTER_SUCCESS_BRANCH=9.3/bugfixes
+    - secure: Y9sG3lZ3Fn3t5BXvcMJQxWsdSUVQgF4M08E6oouYrRc95HEj3ZwZOqp6Df58u8CQFA0EKJyvCBLn8UicvHGMKAD0RwGLBdSP4Ji9gJRZkyMZi79awSshdva/c8dqVQrRd4asuTNQfcagVJpNDnY8sYusw504JUilK3vFVp+39nNZUkcvT69NGVIlXzgHTYinBkVuqDhf5eVtcLcaESLEshrg+5ZERdm+0KifdJVREzhicJxofnmTl/wBsIP7XiQqspljf2/SxLqreGmWXYXUfqIwIOVtsd9fkZChQCz8USC7P427tH6styRDYuMCtvA9b/T/XacSdKFbuDezff3NbIM3b5BebDyCrOK5MGSOdRUY5RuyZN4R5LjePUE++9QNCUPeDSkfb23v0VfuqXIRAxfdtik517GzFy6O7/e6FU1msVZlGQED7Uek9nqnupj+0lIq+99Jcm1UCNJu1NTL2Tv80XXqySaxyE4Sedq/FiYAsy1bo2cg2367I2b4FhFXaJCKkFHcdjHXAeurkRy/brSPhBNoOO5/GA3RepUErgly4P8TLZqHNZv8rgMUoQ88sdwDyXG7dY4UwWiTlCkxMBTqBqJanlTMA9zn2bYyMDioTGnA7+VYAA8cddjFOMVrmmuFJ+YV2x1+5B5qd+Wt8RPwcPQDyqaiN5amb1HGeMA=
+  matrix:
+    - GLPI_BRANCH=9.2.1 FI_BRANCH=glpi9.2+2.0
+    - GLPI_BRANCH=9.2/bugfixes FI_BRANCH=glpi9.2+2.0
+    - GLPI_BRANCH=9.3.0 FI_BRANCH=glpi9.3+1.0
+    - GLPI_BRANCH=9.3/bugfixes FI_BRANCH=glpi9.3+1.0
+    - GLPI_BRANCH=master FI_BRANCH=master
+
 php:
-  - '5.5'
-  - '5.6'
-  - '7.0'
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
 
-before_script:
-  - git clone https://github.com/flyve-mdm/glpi -b 9.1.1-backport ../glpi && cd ../glpi
-  - composer install --no-dev
-  - php tools/cliinstall.php --db=glpi-test --user=travis --tests
-  - mkdir plugins/fusioninventory && git clone https://github.com/fusioninventory/fusioninventory-for-glpi -b glpi9.1+1.0 plugins/fusioninventory
-  - mv ../flyve-mdm-glpi plugins/storkmdm
-  - cd plugins/storkmdm && composer install
-  - cd ../..
+allow_failures:
+  - php: nightly
+  - env: GLPI_BRANCH=master FI_BRANCH=master
+
+before_install:
+  - "./tests/before_install.sh"
 
+before_script:
+- "./tests/before_script.sh"
 script:
-  - cd plugins/storkmdm
-  - php -S localhost:8088 -t ../.. ../../tests/router.php &>/dev/null &
-  - phpunit --verbose
-  - vendor/bin/phpcs -p --standard=tools/phpcs-rules.xml *.php install/ inc/ front/ ajax/ tests/
+  - if [ "${TRAVIS_PHP_VERSION:0:3}" = "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then COVERAGE="--nccfc CommonTreeDropdown CommonDropdown CommonDBTM CommonGLPI"; else COVERAGE="-ncc"; fi
+  - vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-install -ncc
+  - #php scripts/mqtt.php --tests > /dev/null 2>&1 &
+  - vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-unit $COVERAGE
+  - vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-integration -mcn 1 $COVERAGE
+  - vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-uninstall -ncc
+  - if [ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ *.php install/ inc/ front/ ajax/ tests/ RoboFile.php; fi
+
+after_success:
+  # let's update the documentation and locales
+  - if [ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then tests/after_success.sh; fi
+
+cache:
+  directories:
+  - "$HOME/.composer/cache"
 
 notifications:
-  webhooks:
-    urls:
-      - https://integram.org/ckNa3mjYlqw
-    on_success: always
-    on_failure: always
-    on_start: always
+  webhooks: https://hooks.aethonan.pro/travisci/-1001061475099/
+
+addons:
+  apt:
+    update: true
+    packages:
+      - mosquitto
+      - mosquitto-clients

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[glpi-plugin.flyvemdmpot]
+file_filter = locales/<lang>.po
+source_file = locales/flyvemdm.pot
+source_lang = en
+type = PO