Merge branch 'release/2.5.0'

pluginsGLPI · Jun 12, 2017 · 045ef22 · 045ef22
2 parents 9b0452f + 90f910b
commit 045ef22
Show file tree

Hide file tree

Showing 180 changed files with 23,601 additions and 16,705 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+dist/
+vendor/
+.gh_token
+*.min.*
+.idea
+.settings
+.buildpath
+.project
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,29 @@
 language: php
 
 php:
+  - '5.5'
   - '5.6'
   - '7.0'
+  - '7.1'
+  - nightly
 
 before_script:
-  - git clone https://github.com/glpi-project/glpi -b 9.1 ../glpi && cd ../glpi
+  - git clone https://github.com/glpi-project/glpi --depth 1 -b 9.1.2 ../glpi && cd ../glpi
   - mv ../formcreator plugins/formcreator
   - composer install --no-dev
   - php tools/cliinstall.php --db=glpi-test --user=travis --tests
-
-script:
   - cd plugins/formcreator
+  - rm composer.lock
   - composer install
-  - php tools/cliinstall.php --tests
+
+script:
   - vendor/bin/phpunit --verbose
+  - vendor/bin/robo --no-interaction code:cs
+
+matrix:
+  allow_failures:
+    - php: nightly
+
+cache:
+  directories:
+    - $HOME/.composer/cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,21 @@
 GLPI Formcreator ChangeLog
 ===============================
 
+Version 2.5.0
+-------------
+
+## Features:
+* forms can target tickets and changes
+* complex question conditions with multiple criterias
+* set ticket category and urgency from a form's field
+* show list of answers of a form
+* print answers of a form
+
+## Bugfixes:
+* single quotes upgrade issues 
+* LDAP field
+
+
 Version 2.4.2
 -------------
 

diff --git a/README.md b/README.md
@@ -70,3 +70,4 @@ Après la mise à jour de FormCreator vers la version 2.4.0 ou supérieur, les u
 ![3.-Configuration](/screenshot.png "Configuration")
 
 ![3.9.-Formcreators-helpdesk](/screenshot_2.png "Service catalog")
+
diff --git a/RoboFile.php b/RoboFile.php
@@ -4,8 +4,12 @@
  *
  * @see http://robo.li/
  */
-require_once 'RoboFilePlugin.php';
-class RoboFile extends RoboFilePlugin
+
+require_once 'vendor/autoload.php';
+
+class RoboFile extends Glpi\Tools\RoboFile
 {
+
+   protected $csignore = ['/vendor/', '/lib/'];
     //Own plugin's robo stuff
-}
+}
diff --git a/RoboFilePlugin.php b/RoboFilePlugin.php
diff --git a/ajax/dropdown_values.php b/ajax/dropdown_values.php
@@ -3,7 +3,7 @@
 
 Session::checkRight("entity", UPDATE);
 
-if($_REQUEST['dropdown_itemtype'] == '0' || !class_exists($_REQUEST['dropdown_itemtype'])) {
+if ($_REQUEST['dropdown_itemtype'] == '0' || !class_exists($_REQUEST['dropdown_itemtype'])) {
    Dropdown::showFromArray("dropdown_default_value", array(), array('display_emptychoice'   => true));
 } else {
    Dropdown::show($_REQUEST['dropdown_itemtype'], array(

diff --git a/ajax/homepage_link.php b/ajax/homepage_link.php
@@ -3,6 +3,6 @@
 
 echo '<li id="menu5">";
       <a href="'.$CFG_GLPI['root_doc'].'/plugins/formcreator/front/formlist.php" class="itemP">'.
-      _n('Form','Forms', 2, 'formcreator').
+      _n('Form', 'Forms', 2, 'formcreator').
       '</a>
       </li>';
diff --git a/ajax/homepage_wizard.php b/ajax/homepage_wizard.php
@@ -17,7 +17,7 @@
    $keywords = isset($_REQUEST['keywords']) ? $_REQUEST['keywords'] : '';
    $helpdeskHome = isset($_REQUEST['helpdeskHome']) ? $_REQUEST['helpdeskHome'] != '0' : false;
    plugin_formcreator_showWizardForms($categoriesId, $keywords, $helpdeskHome);
-} elseif ($_REQUEST['wizard'] == 'toggle_menu') {
+} else if ($_REQUEST['wizard'] == 'toggle_menu') {
    $_SESSION['plugin_formcreator_toggle_menu'] = isset($_SESSION['plugin_formcreator_toggle_menu'])
                                                    ? !$_SESSION['plugin_formcreator_toggle_menu']
                                                    : true;
@@ -28,7 +28,7 @@ function plugin_formcreator_showWizardCategories($helpdesk = true) {
    echo json_encode($tree, JSON_UNESCAPED_SLASHES);
 }
 
-function plugin_formcreator_showWizardForms($rootCategory = 0, $keywords, $helpdeskHome = false) {
+function plugin_formcreator_showWizardForms($rootCategory = 0, $keywords = '', $helpdeskHome = false) {
    $form = new PluginFormcreatorForm();
    $formList = $form->showFormList($rootCategory, $keywords, $helpdeskHome);
    echo json_encode($formList, JSON_UNESCAPED_SLASHES);