fix(field): normalize class name

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Oct 14, 2020 · a27f82e · a27f82e
1 parent 076937b
commit a27f82e
Show file tree

Hide file tree

Showing 37 changed files with 66 additions and 66 deletions.
diff --git a/inc/field.class.php → inc/abstractfield.class.php b/inc/field.class.php → inc/abstractfield.class.php
@@ -35,7 +35,7 @@
 
 require_once(realpath(dirname(__FILE__ ) . '/../../../inc/includes.php'));
 
-abstract class PluginFormcreatorField implements PluginFormcreatorFieldInterface
+abstract class PluginFormcreatorAbstractField implements PluginFormcreatorFieldInterface
 {
    /** @var array $fields Fields of an instance of PluginFormcreatorQuestion */
    protected $question = null;

diff --git a/inc/questionparameter.class.php → inc/abstractquestionparameter.class.php b/inc/questionparameter.class.php → inc/abstractquestionparameter.class.php
@@ -33,11 +33,11 @@
    die("Sorry. You can't access this file directly");
 }
 
-abstract class PluginFormcreatorQuestionParameter
+abstract class PluginFormcreatorAbstractQuestionParameter
 extends CommonDBChild
 implements PluginFormcreatorQuestionParameterInterface, PluginFormcreatorExportableInterface
 {
-   use PluginFormcreatorExportable;
+   use PluginFormcreatorExportableTrait;
 
    // From CommonDBRelation
    static public $itemtype       = PluginFormcreatorQuestion::class;

diff --git a/inc/abstracttarget.class.php b/inc/abstracttarget.class.php
@@ -40,8 +40,8 @@ abstract class PluginFormcreatorAbstractTarget extends CommonDBChild implements
 PluginFormcreatorTargetInterface,
 PluginFormcreatorConditionnableInterface
 {
-   use PluginFormcreatorConditionnable;
-   use PluginFormcreatorExportable;
+   use PluginFormcreatorConditionnableTrait;
+   use PluginFormcreatorExportableTrait;
 
    static public $itemtype = PluginFormcreatorForm::class;
    static public $items_id = 'plugin_formcreator_forms_id';

diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -37,7 +37,7 @@
 
 class PluginFormcreatorCondition extends CommonDBChild implements PluginFormcreatorExportableInterface
 {
-   use PluginFormcreatorExportable;
+   use PluginFormcreatorExportableTrait;
 
    static public $itemtype = 'itemtype';
    static public $items_id = 'items_id';

diff --git a/inc/conditionnable.class.php → inc/conditionnabletrait.class.php b/inc/conditionnable.class.php → inc/conditionnabletrait.class.php
@@ -33,7 +33,7 @@
    die("Sorry. You can't access this file directly");
 }
 
-trait PluginFormcreatorConditionnable
+trait PluginFormcreatorConditionnableTrait
 {
    public function updateConditions($input) {
       if (!isset($input['show_rule'])) {

diff --git a/inc/exportable.class.php → inc/exportabletrait.class.php b/inc/exportable.class.php → inc/exportabletrait.class.php
@@ -33,7 +33,7 @@
    die("Sorry. You can't access this file directly");
 }
 
-trait PluginFormcreatorExportable
+trait PluginFormcreatorExportableTrait
 {
     /**
      * Insert the export of sub items in the export

diff --git a/inc/field/actorfield.class.php b/inc/field/actorfield.class.php
@@ -31,7 +31,7 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use User;
 use Toolbox;
@@ -43,7 +43,7 @@
  * users from the itemtype User or email addresses. Email addresses allows to
  * add actors who don't have an account in GLPI.
  */
-class ActorField extends PluginFormcreatorField
+class ActorField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/checkboxesfield.class.php b/inc/field/checkboxesfield.class.php
@@ -31,13 +31,13 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 use Session;
 use PluginFormcreatorQuestionRange;
 
-class CheckboxesField extends PluginFormcreatorField
+class CheckboxesField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/datefield.class.php b/inc/field/datefield.class.php
@@ -31,14 +31,14 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use DateTime;
 use Toolbox;
 use Session;
 
 
-class DateField extends PluginFormcreatorField
+class DateField extends PluginFormcreatorAbstractField
 {
    const DATE_FORMAT = 'Y-m-d';
 

diff --git a/inc/field/datetimefield.class.php b/inc/field/datetimefield.class.php
@@ -31,12 +31,12 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Session;
 use Toolbox;
 use DateTime;
-class DatetimeField extends PluginFormcreatorField
+class DatetimeField extends PluginFormcreatorAbstractField
 {
    /** @var array $fields Fields of an instance of PluginFormcreatorQuestion */
    protected $fields = null;

diff --git a/inc/field/descriptionfield.class.php b/inc/field/descriptionfield.class.php
@@ -31,11 +31,11 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Session;
 use GlpiPlugin\Formcreator\Exception\ComparisonException;
 
-class DescriptionField extends PluginFormcreatorField
+class DescriptionField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -31,7 +31,7 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 use Session;
@@ -50,7 +50,7 @@
 use OLA;
 use GlpiPlugin\Formcreator\Exception\ComparisonException;
 
-class DropdownField extends PluginFormcreatorField
+class DropdownField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       $itemtype = $this->getSubItemtype();

diff --git a/inc/field/filefield.class.php b/inc/field/filefield.class.php
@@ -31,7 +31,7 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Document;
 use Html;
 use Toolbox;
@@ -41,7 +41,7 @@
 use PluginFormcreatorSection;
 use PluginFormcreatorQuestion;
 
-class FileField extends PluginFormcreatorField
+class FileField extends PluginFormcreatorAbstractField
 {
    /**@var $uploadData array uploads saved as documents   */
    private $uploadData = [];

diff --git a/inc/field/floatfield.class.php b/inc/field/floatfield.class.php
@@ -31,14 +31,14 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 use Session;
 use PluginFormcreatorQuestionRange;
 use PluginFormcreatorQuestionRegex;
 
-class FloatField extends PluginFormcreatorField
+class FloatField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/hiddenfield.class.php b/inc/field/hiddenfield.class.php
@@ -31,11 +31,11 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 
-class HiddenField extends PluginFormcreatorField
+class HiddenField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/hostnamefield.class.php b/inc/field/hostnamefield.class.php
@@ -30,11 +30,11 @@
  */
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 
-class HostnameField extends PluginFormcreatorField
+class HostnameField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/ipfield.class.php b/inc/field/ipfield.class.php
@@ -31,12 +31,12 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Toolbox;
 use GlpiPlugin\Formcreator\Exception\ComparisonException;
 
-class IpField extends PluginFormcreatorField
+class IpField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/ldapselectfield.class.php b/inc/field/ldapselectfield.class.php
@@ -31,7 +31,7 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use AuthLDAP;
 use Dropdown;
 use Exception;

diff --git a/inc/field/radiosfield.class.php b/inc/field/radiosfield.class.php
@@ -31,12 +31,12 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Session;
 use Toolbox;
 
-class RadiosField extends PluginFormcreatorField
+class RadiosField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/textareafield.class.php b/inc/field/textareafield.class.php
@@ -31,7 +31,7 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Session;
 use Toolbox;
@@ -68,7 +68,7 @@ public function getDesignSpecializationField() {
       $additions .= '</td>';
       $additions .= '</tr>';
 
-      $common = PluginFormcreatorField::getDesignSpecializationField();
+      $common = PluginFormcreatorAbstractField::getDesignSpecializationField();
       $additions .= $common['additions'];
 
       return [

diff --git a/inc/field/textfield.class.php b/inc/field/textfield.class.php
@@ -32,13 +32,13 @@
 namespace GlpiPlugin\Formcreator\Field;
 
 use Html;
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use PluginFormcreatorQuestionRange;
 use PluginFormcreatorQuestionRegex;
 use Session;
 use Toolbox;
 
-class TextField extends PluginFormcreatorField
+class TextField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;

diff --git a/inc/field/timefield.class.php b/inc/field/timefield.class.php
@@ -32,11 +32,11 @@
 namespace GlpiPlugin\Formcreator\Field;
 use DateTime;
 use Html;
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Session;
 use Toolbox;
 
-class TimeField extends PluginFormcreatorField
+class TimeField extends PluginFormcreatorAbstractField
 {
    const DATE_FORMAT = 'H:i';
 

diff --git a/inc/field/urgencyfield.class.php b/inc/field/urgencyfield.class.php
@@ -31,11 +31,11 @@
 
 namespace GlpiPlugin\Formcreator\Field;
 
-use PluginFormcreatorField;
+use PluginFormcreatorAbstractField;
 use Html;
 use Session;
 use Ticket;
-class UrgencyField extends PluginFormcreatorField
+class UrgencyField extends PluginFormcreatorAbstractField
 {
    public function isPrerequisites() {
       return true;
@@ -68,7 +68,7 @@ public function getDesignSpecializationField() {
       $additions .= '</td>';
       $additions .= '</tr>';
 
-      $common = PluginFormcreatorField::getDesignSpecializationField();
+      $common = PluginFormcreatorAbstractField::getDesignSpecializationField();
       $additions .= $common['additions'];
 
       return [

diff --git a/inc/fieldinterface.class.php b/inc/fieldinterface.class.php
@@ -166,14 +166,14 @@ public function parseAnswerValues($input, $nonDestructive = false);
    /**
     * Gets the parameters of the field
     *
-    * @return PluginFormcreatorQuestionParameter[]
+    * @return PluginFormcreatorAbstractQuestionParameter[]
     */
    public function getEmptyParameters();
 
    /**
     * Gets parameters of the field with their settings
     *
-    * @return PluginFormcreatorQuestionParameter[]
+    * @return PluginFormcreatorAbstractQuestionParameter[]
     */
    public function getParameters();
 

diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -421,7 +421,7 @@ public static function getFieldClassname($type) {
     */
    public static function fieldTypeExists($type) {
       $className = self::getFieldClassname($type);
-      return is_subclass_of($className, PluginFormcreatorField::class, true);
+      return is_subclass_of($className, PluginFormcreatorAbstractField::class, true);
    }
 
    /**
@@ -430,7 +430,7 @@ public static function fieldTypeExists($type) {
     * @param string $type type of field to get
     * @param PluginFormcreatorQuestion $question question representing the field
     * @param array $data additional data
-    * @return null|PluginFormcreatorField
+    * @return null|PluginFormcreatorAbstractField
     */
    public static function getFieldInstance($type, PluginFormcreatorQuestion $question) {
       if (!self::fieldTypeExists($type)) {

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -40,8 +40,8 @@ class PluginFormcreatorForm extends CommonDBTM implements
 PluginFormcreatorDuplicatableInterface,
 PluginFormcreatorConditionnableInterface
 {
-   use PluginFormcreatorConditionnable;
-   use PluginFormcreatorExportable;
+   use PluginFormcreatorConditionnableTrait;
+   use PluginFormcreatorExportableTrait;
 
    static $rightname = 'entity';
 
@@ -2238,7 +2238,7 @@ public function getFromDBByQuestion(PluginFormcreatorQuestion $question) {
    /**
     * Get an array of instances of all fields for the form
     *
-    * @return PluginFormcreatorField[]
+    * @return PluginFormcreatorAbstractField[]
     */
    public function getFields() {
       $fields = [];

diff --git a/inc/form_profile.class.php b/inc/form_profile.class.php
@@ -36,7 +36,7 @@
 
 class PluginFormcreatorForm_Profile extends CommonDBRelation implements PluginFormcreatorExportableInterface
 {
-   use PluginFormcreatorExportable;
+   use PluginFormcreatorExportableTrait;
 
    static public $itemtype_1 = PluginFormcreatorForm::class;
    static public $items_id_1 = 'plugin_formcreator_forms_id';