Merge branch 'release/2.7.0-beta.1'

pluginsGLPI · Dec 5, 2018 · b9d0828 · b9d0828
2 parents 2ba9620 + 5459515
commit b9d0828
Show file tree

Hide file tree

Showing 229 changed files with 22,158 additions and 16,209 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ vendor/
 .settings
 .buildpath
 .project
+/.gtm/
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,12 @@ language: php
 env:
   global:
     - GLPI_SOURCE="https://github.com/glpi-project/glpi"
-    - PHPUNIT_ARGS="--verbose --debug"
     - CS=7.2
+    - DBNAME=glpitest
+    - OLDDBNAME=glpiupgradetest
+    - AFTER_SUCCESS_BRANCH=9.3/bugfixes
   matrix:
-    - GLPI_BRANCH=9.2.1
-    - GLPI_BRANCH=9.2/bugfixes
+    - GLPI_BRANCH=9.3.0
     - GLPI_BRANCH=9.3/bugfixes
     - GLPI_BRANCH=master
 
@@ -24,18 +25,22 @@ matrix:
     - env: GLPI_BRANCH=master
 
 before_script:
-  - mysql -u root -e 'create database glpitest;'
-  - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
-  - mv ../formcreator plugins/formcreator
-  - 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/formcreator
-  - rm composer.lock
-  - composer install
+  - "./tests/before_script.sh"
 
 script:
-  - vendor/bin/phpunit $PHPUNIT_ARGS
+  - if [ "${TRAVIS_PHP_VERSION:0:3}" = "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then COVERAGE="--nccfc CommonTreeDropdown CommonDropdown CommonDBTM CommonGLPI"; else COVERAGE="-ncc"; fi
+  - if [ -e ../../scripts/cliinstall.php ] ; then php ../../scripts/cliinstall.php --db=$OLDDBNAME --user=root --tests ; fi
+  - if [ -e ../../tools/cliinstall.php ] ; then php  ../../tools/cliinstall.php --db=$OLDDBNAME --user=root --tests ; fi
+  - mysql -u root $OLDDBNAME < tests/plugin_formcreator_empty_2.5.0.sql
+  - mysql -u root $OLDDBNAME < tests/plugin_formcreator_config_2.5.0.sql
+  - php scripts/cliinstall.php --tests
+  - rm ../../tests/config_db.php
+  - if [ -e ../../scripts/cliinstall.php ] ; then php ../../scripts/cliinstall.php --db=$DBNAME --user=root --tests ; fi
+  - if [ -e ../../tools/cliinstall.php ] ; then php ../../tools/cliinstall.php --db=$DBNAME --user=root --tests ; fi
+  - 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
   - if [ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ] && [ "$GLPI_BRANCH" = "$AFTER_SUCCESS_BRANCH" ]; then vendor/bin/robo --no-interaction code:cs; fi
 
 cache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/RoboFile.php b/RoboFile.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/RoboFilePlugin.php b/RoboFilePlugin.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/dropdown_values.php b/ajax/dropdown_values.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator
@@ -33,7 +33,7 @@
 
 include ('../../../inc/includes.php');
 
-Session::checkRight("entity", UPDATE);
+Session::checkRight('entity', UPDATE);
 
 if ($_REQUEST['dropdown_itemtype'] == '0' || !class_exists($_REQUEST['dropdown_itemtype'])) {
    Dropdown::showFromArray("dropdown_default_value", [], ['display_emptychoice'   => true]);

diff --git a/ajax/homepage_forms.php b/ajax/homepage_forms.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/homepage_link.php b/ajax/homepage_link.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/homepage_wizard.php b/ajax/homepage_wizard.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/ldap_filter.php b/ajax/ldap_filter.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/question.php b/ajax/question.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/question_condition.php b/ajax/question_condition.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/section.php b/ajax/section.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/ajax/showfields.php b/ajax/showfields.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator
@@ -33,7 +33,6 @@
 
 include ('../../../inc/includes.php');
 
-$currentValues  = json_decode(stripslashes($_POST['values']), true);
-$visibility = PluginFormcreatorFields::updateVisibility($currentValues);
+$visibility = PluginFormcreatorFields::updateVisibility($_POST);
 echo json_encode($visibility);
 exit();
diff --git a/ajax/target.php b/ajax/target.php
@@ -24,7 +24,7 @@
  * @author    Thierry Bugier
  * @author    Jérémy Moreau
  * @copyright Copyright © 2011 - 2018 Teclib'
- * @license   GPLv3+ http://www.gnu.org/licenses/gpl.txt
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
  * @link      https://github.com/pluginsGLPI/formcreator/
  * @link      https://pluginsglpi.github.io/formcreator/
  * @link      http://plugins.glpi-project.org/#/plugin/formcreator

diff --git a/composer.json b/composer.json
@@ -8,7 +8,8 @@
       "platform": {
           "php": "5.6.0"
       },
-      "optimize-autoloader": true
+      "optimize-autoloader": true,
+      "apcu-autoloader": true
   },
   "require": {
         "php": ">= 5.6.0",
@@ -18,8 +19,14 @@
     "require-dev": {
         "ext-bz2": "*",
         "pear/archive_tar": "^1.4",
-        "phpunit/phpunit": "^4.8 || ^5.7 || ^6.0",
+        "atoum/atoum": "^3.3",
+        "atoum/stubs": "^2.5",
         "glpi-project/tools": "^0.1.0",
-        "glpi-project/coding-standard": "0.5.0"
+        "glpi-project/coding-standard": "0.7.1"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "GlpiPlugin\\Formcreator\\Tests\\": "tests/src/"
+        }
     }
 }