Merge branch 'release/1.5.0'

Author: trasher

.atoum.php

@@ -0,0 +1,23 @@
+<?php
+
+$tests_dir = __DIR__ . '/tests/';
+$coverage_dir = $tests_dir . 'code-coverage/';
+
+if (!file_exists($coverage_dir)) {
+    mkdir($coverage_dir);
+}
+
+$coverageField = new atoum\report\fields\runner\coverage\html(
+    'GLPI Fields Plugin',
+    $coverage_dir
+);
+$coverageField->setRootUrl('file://' . realpath($coverage_dir));
+
+$script
+    ->addDefaultReport()
+    ->addField($coverageField);
+
+$script
+    ->noCodeCoverageForClasses('CommonGLPI')
+    ->noCodeCoverageForClasses('CommonDBTM');
+

.travis.yml

@@ -1,54 +1,40 @@
 language: php
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - nightly
 
 env:
-  - DB=mysql
+  global:
+    - DB=mysql
+  matrix:
+     #- GLPIVER=9.1.2 ==> not released yet!
+    - 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 ../fields plugins/fields
+  - cd plugins/fields
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.4" ]]; then sed -e "s|.*"consolidation/robo".*$||" -i composer.json && composer update; fi
   - composer install -o
-#  - mysql -u root -e 'create database glpitest;'
-#  - php tools/cliinstall.php --lang=en_US --db=glpitest --user=root --tests
-  - pear install pear/PHP_CodeSniffer
-  - phpenv rehash
 
 script:
-#  - mysql -u root -e 'select version();'
-#  - phpunit --verbose
-  - phpcs -p --ignore=vendor --ignore=js --standard=tools/phpcs-rules.xml  .
+  - mysql -u root -e 'select version();'
+  - vendor/bin/phpcs -p --ignore=vendor --ignore=js --ignore=css --standard=vendor/glpi-project/coding-standard/GlpiStandard/ .
+  - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/
 
 matrix:
-  include:
+  exclude:
     - php: 5.4
-      addons:
-        mariadb: 5.5
-    - php: 5.5
-      addons:
-        mariadb: 5.5
-#    - php: 5.6
-#      addons:
-#        mariadb: 5.5
-#    - php: 5.6
-#      addons:
-#        mariadb: 10.0
-    - php: 5.6
-      addons:
-        mariadb: 10.1
-#    - php: 7.0
-#      addons:
-#        mariadb: 10.0
-    - php: 7.0
-      addons:
-        mariadb: 10.1
-#    - php: 7.1
-#      addons:
-#        mariadb: 10.0
-    - php: 7.1
-      addons:
-        mariadb: 10.1
-    - php: nightly
-      addons:
-        mariadb: 10.1
+      env: GLPIVER=master
   allow_failures:
     - php: nightly
 

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.0] - 2017-01-27
+
+**Compatible with GLPI 9.1.2 and above**
+
+- Use post_item_form hook instead of javascript to display fields
+- Fix (and limit) dom tab possibilities
+
 ## [1.4.5] - 2017-01-13
 - Set minimal PHP version to 5.4
 - Prevent values to be kept from a new ticket to another
@@ -41,7 +48,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fix adding bloc for specific tab
 - Fix dropdown pagination links
 - Fix validation issue creating new tickets
-- Fix checks consistancy
+- Fix checks consistency
 - Ensure we target only the first tab
 
 ## [1.4.0] - 2016-12-13

README.md

@@ -1,11 +1,11 @@
-# Fields GLPi plugin
+# Fields GLPI plugin
 
 The fields plugin allows you to add custom fields on glpi types : tickets, computers, users...
 
 Addionnal data can be added :
  * In object tab
- * In main form of object (above save button)
- * In form of a tab (Warning, this feature is experimental)
+ * In main form of object, above save button
+ * In form of a tab, above save button
 
 Possible fields type are :
  * Header (title bloc)
@@ -19,10 +19,6 @@ Possible fields type are :
  * Date / Hour
  * Glpi User list
 
-There is a [migration script](https://github.com/pluginsGLPI/customfields/blob/master/scripts/migrate-to-fields.php) from "customfields" plugin.  
-**WARNING : this one is experimental and deserved to be more tested. We strongly advise you to backup your data before using it**
-
-
 ## Documentation
 
 http://glpi-plugins.rtfd.io/en/latest/fields/index.html

RoboFilePlugin.php

@@ -11,8 +11,7 @@ class RoboFilePlugin extends \Robo\Tasks
     *
     * @return void
     */
-   public function minify()
-   {
+   public function minify() {
       $this->minifyCSS()
          ->minifyJS();
    }
@@ -22,11 +21,10 @@ public function minify()
     *
     * @return void
     */
-   public function minifyCSS()
-   {
+   public function minifyCSS() {
       $css_dir = __DIR__ . '/css';
       if (is_dir($css_dir)) {
-         foreach(glob("$css_dir/*.css") as $css_file) {
+         foreach (glob("$css_dir/*.css") as $css_file) {
             if (!$this->endsWith($css_file, 'min.css')) {
                $this->taskMinify($css_file)
                   ->to(str_replace('.css', '.min.css', $css_file))
@@ -43,11 +41,10 @@ public function minifyCSS()
     *
     * @return void
     */
-   public function minifyJS()
-   {
+   public function minifyJS() {
       $js_dir = __DIR__ . '/js';
       if (is_dir($js_dir)) {
-         foreach(glob("$js_dir/*.js") as $js_file) {
+         foreach (glob("$js_dir/*.js") as $js_file) {
             if (!$this->endsWith($js_file, 'min.js')) {
                $this->taskMinify($js_file)
                   ->to(str_replace('.js', '.min.js', $js_file))
@@ -64,8 +61,7 @@ public function minifyJS()
     *
     * @return void
     */
-   public function localesExtract()
-   {
+   public function localesExtract() {
       $this->_exec('tools/extract_template.sh');
       return $this;
    }
@@ -75,19 +71,19 @@ public function localesExtract()
     *
     * @return void
     */
-   public function localesPush()
-   {
+   public function localesPush() {
       $this->_exec('tx push -s');
       return $this;
    }
 
    /**
     * Pull locales from transifex.
     *
+    * @param integer $percent Completeness percentage, defaults to 70
+    *
     * @return void
     */
-   public function localesPull($percent = 70)
-   {
+   public function localesPull($percent = 70) {
       $this->_exec('tx pull -a --minimum-perc=' .$percent);
       return $this;
    }
@@ -97,8 +93,7 @@ public function localesPull($percent = 70)
     *
     * @return void
     */
-   public function localesMo()
-   {
+   public function localesMo() {
       $this->_exec('./tools/release --compile-mo');
       return $this;
    }
@@ -108,8 +103,7 @@ public function localesMo()
     *
     * @return void
     */
-   public function localesSend()
-   {
+   public function localesSend() {
       $this->localesExtract()
            ->localesPush();
       return $this;
@@ -118,6 +112,8 @@ public function localesSend()
    /**
     * Retrieve locales and generate mo files
     *
+    * @param integer $percent Completeness percentage, defaults to 70
+    *
     * @return void
     */
    public function localesGenerate($percent = 70) {

ajax/container_subtype_dropdown.php

@@ -1,4 +1,4 @@
 <?php
 include ("../../../inc/includes.php");
 
-PluginFieldsContainer::showFormSubtype($_REQUEST);
+PluginFieldsContainer::showFormSubtype($_REQUEST, true);

ajax/load_dom_fields.php

@@ -12,7 +12,7 @@
 $id_item = $first['id'];
 
 // Réorganisation de tout les champs
-if($_POST['old_order'] < $_POST['new_order']) {
+if ($_POST['old_order'] < $_POST['new_order']) {
    $DB->query("UPDATE $table SET
                `ranking` = `ranking`-1
                WHERE plugin_fields_containers_id = {$_POST['container_id']}

ajax/reorder.php

@@ -2,6 +2,11 @@
     "require-dev": {
         "consolidation/robo": "dev-master@dev",
         "patchwork/jsqueeze": "~1.0",
-        "natxet/CssMin": "~3.0"
+        "natxet/CssMin": "~3.0",
+        "glpi-project/coding-standard": "0.5",
+        "atoum/atoum": "^2.8"
+    },
+    "scripts": {
+        "post-install-cmd": "patch -d vendor/atoum/atoum -p1 < tools/atoum-php71.patch"
     }
 }