Merge branch 'release/1.3.0'

pluginsGLPI · Sep 4, 2018 · fc2c687 · fc2c687
2 parents 2558824 + b08667b
commit fc2c687
Show file tree

Hide file tree

Showing 27 changed files with 2,514 additions and 914 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,51 @@
+language: php
+php:
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
+
+#env:
+#  global:
+#    - DB=mysql
+#  matrix:
+#    - GLPIVER=9.1/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
+#  - mv ../{LNAME} plugins/{LNAME}
+#  - cd plugins/{LNAME}
+  - 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/
+
+
+matrix:
+#  exclude:
+#    - php: 5.4
+#      env: GLPIVER=master
+  allow_failures:
+    - php: nightly
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+#notifications:
+#  irc:
+#    channels:
+#      - "irc.freenode.org#channel"
+#    on_success: change
+#    on_failure: always
+#    use_notice: true
+#    skip_join: true
diff --git a/.tx/config b/.tx/config
@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-plugin-airwatch.airwatch-090pot]
+[glpi-plugin-airwatch.airwatch-pot]
 file_filter = locales/<lang>.po
 source_file = locales/airwatch.pot
 source_lang = en
-
+type = PO
diff --git a/README.md b/README.md
@@ -15,6 +15,9 @@ To help translating the plugin, please join  [Transifex](http://transifex.com).
 * php curl extension must be installed.
 * GLPi 9.1 or higher is required.
 * FusionInventory plugin must be installed and enabled.
+* FI4GLPI version 0.90+1.3 or lated is required, otherwise you must patch the source code with the following commit :
+```
+```
 
 ## How does it work
 

diff --git a/RoboFile.php b/RoboFile.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This is project's console commands configuration for Robo task runner.
+ *
+ * @see http://robo.li/
+ */
+
+require_once 'vendor/autoload.php';
+
+class RoboFile extends Glpi\Tools\RoboFile
+{
+    //Own plugin's robo stuff
+}
diff --git a/airwatch.xml b/airwatch.xml
@@ -6,12 +6,14 @@
    <logo>https://raw.githubusercontent.com/pluginsGLPI/airwatch/master/airwatch.png</logo>
    <description>
       <short>
-         <fr><![CDATA[Connecteur pour récupérer les données d'inventaire depuis Airwatch]]></fr>
          <en><![CDATA[Connector to gather inventory information from Airwatch]]></en>
+         <cs><![CDATA[Napojení pro získávání inventárních údajů z Airwatch]]></cs>
+         <fr><![CDATA[Connecteur pour récupérer les données d'inventaire depuis Airwatch]]></fr>
       </short>
       <long>
-	 <fr><![CDATA[Récupération des données d'inventaire de l'outil de MDM Airwatch. Import des données au format XML FusionInventory. Possibilité de forcer l'inventaire manuellement d'un device. Ce plugin fait partie de la souscription GLPi Network.]]></fr>
          <en><![CDATA[Gather inventory data from Airwatch MDM tool. Data import using FusionInventory XML format. Ability to manually force a device inventory. This plugin is part of the GLPi Network subscription.]]></en>
+         <cs><![CDATA[Získávání inventárních údajů z MDM nástroje Ariwatch. Import dat ve formátu FusionInventory XML. Schopnost ručního vynucení inventarizace zařízení. Tento zásuvný modul je součástí předplatného služby GLPi Network.]]></cs>
+         <fr><![CDATA[Récupération des données d'inventaire de l'outil de MDM Airwatch. Import des données au format XML FusionInventory. Possibilité de forcer l'inventaire manuellement d'un device. Ce plugin fait partie de la souscription GLPi Network.]]></fr>
       </long>
    </description>
    <homepage>https://github.com/pluginsGLPI/airwatch</homepage>
@@ -23,44 +25,58 @@
       <author>Walid Nouh</author>
    </authors>
    <versions>
-    <version>
-          <num>1.2.0</num>
-          <compatibility>9.1</compatibility>
+      <version>
+         <num>1.3.0</num>
+         <compatibility>9.2</compatibility>
+         <compatibility>9.3</compatibility>
+      </version>
+      <version>
+         <num>1.2.0</num>
+         <compatibility>9.1</compatibility>
       </version>
-    <version>
-          <num>0.90+1.1</num>
-          <compatibility>0.85</compatibility>
-          <compatibility>0.90</compatibility>
-          <compatibility>9.1</compatibility>
+      <version>
+         <num>0.90+1.1</num>
+         <compatibility>0.85</compatibility>
+         <compatibility>0.90</compatibility>
+         <compatibility>9.1</compatibility>
       </version>
-    <version>
-          <num>0.90+1.0</num>
-          <compatibility>0.85</compatibility>
-          <compatibility>0.90</compatibility>
-          <compatibility>9.1</compatibility>
+      <version>
+         <num>0.90+1.0</num>
+         <compatibility>0.85</compatibility>
+         <compatibility>0.90</compatibility>
+         <compatibility>9.1</compatibility>
       </version>
    </versions>
    <langs>
-      <lang>fr_FR</lang>
+      <lang>cs_CZ</lang>
       <lang>en_GB</lang>
+      <lang>fr_FR</lang>
    </langs>
    <tags>
-         <fr>
-            <tag>inventaire</tag>
-            <tag>smartphone</tag>
-            <tag>connecteur</tag>
-            <tag>airwatch</tag>
-            <tag>helpdesk</tag>
-            <tag>réservations</tag>
-         </fr>
-         <en>
-            <tag>inventory</tag>
-            <tag>smartphone</tag>
-            <tag>connector</tag>
-            <tag>airwatch</tag>
-            <tag>helpdesk</tag>
-            <tag>loans</tag>
-         </en>
+      <en>
+         <tag>inventory</tag>
+         <tag>smartphone</tag>
+         <tag>connector</tag>
+         <tag>airwatch</tag>
+         <tag>helpdesk</tag>
+         <tag>loans</tag>
+      </en>
+      <cs>
+         <tag>inventář</tag>
+         <tag>chytrý telefon</tag>
+         <tag>connector</tag>
+         <tag>airwatch</tag>
+         <tag>služba podpory</tag>
+         <tag>zápůjčky</tag>
+      </cs>
+      <fr>
+         <tag>inventaire</tag>
+         <tag>smartphone</tag>
+         <tag>connecteur</tag>
+         <tag>airwatch</tag>
+         <tag>helpdesk</tag>
+         <tag>réservations</tag>
+      </fr>
    </tags>
    <license>GPL v2+</license>
 </root>
diff --git a/composer.json b/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "glpi-project/tools": "^0.1"
+    },
+    "config": {
+        "platform": {
+            "php": "5.6"
+        }
+    }
+}