refactor: require bool of fields

btry · btry · commit 8ac96318b154 · 2019-08-22T10:38:27.000+02:00
remove dead code for fields

Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
diff --git a/inc/fieldinterface.class.php b/inc/fieldinterface.class.php
@@ -41,7 +41,7 @@ interface PluginFormcreatorFieldInterface
     */
    public static function getName();
 
-   public static function getPrefs();
+   public static function canRequire();
 
    /**
     * Are the prerequisites met to use this field ?
diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
@@ -238,19 +238,8 @@ public function isValid() {
       return true;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 0,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function prepareQuestionInputForSave($input) {
diff --git a/inc/fields/checkboxesfield.class.php b/inc/fields/checkboxesfield.class.php
@@ -265,19 +265,8 @@ public function getDocumentsForTarget() {
       return [];
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 1,
-         'range'          => 1,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function getEmptyParameters() {
diff --git a/inc/fields/datefield.class.php b/inc/fields/datefield.class.php
@@ -94,19 +94,8 @@ public static function getName() {
       return __('Date');
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function equals($value) {
diff --git a/inc/fields/datetimefield.class.php b/inc/fields/datetimefield.class.php
@@ -97,19 +97,8 @@ public static function getName() {
       return __('Date & time', 'formcreator');
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function equals($value) {
diff --git a/inc/fields/descriptionfield.class.php b/inc/fields/descriptionfield.class.php
@@ -100,19 +100,8 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 0,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return false;
    }
 
    public function equals($value) {
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -424,19 +424,8 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 1,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 1,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    /**
diff --git a/inc/fields/emailfield.class.php b/inc/fields/emailfield.class.php
@@ -110,19 +110,8 @@ public static function getName() {
       return _n('Email', 'Emails', 1);
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function prepareQuestionInputForSave($input) {
diff --git a/inc/fields/filefield.class.php b/inc/fields/filefield.class.php
@@ -109,19 +109,8 @@ public static function getName() {
       return __('File');
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    /**
diff --git a/inc/fields/floatfield.class.php b/inc/fields/floatfield.class.php
@@ -220,19 +220,8 @@ public function parseAnswerValues($input, $nonDestructive = false) {
        return true;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 0,
-         'range'          => 1,
-         'show_empty'     => 0,
-         'regex'          => 1,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function getEmptyParameters() {
diff --git a/inc/fields/glpiselectfield.class.php b/inc/fields/glpiselectfield.class.php
@@ -139,19 +139,8 @@ public function isValid() {
       return true;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 1,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 1,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function equals($value) {
diff --git a/inc/fields/hiddenfield.class.php b/inc/fields/hiddenfield.class.php
@@ -108,19 +108,8 @@ public function getDocumentsForTarget() {
       return [];
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 0,
-         'default_values' => 1,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 0,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return false;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
diff --git a/inc/fields/hostnamefield.class.php b/inc/fields/hostnamefield.class.php
@@ -65,19 +65,8 @@ public static function getName() {
       return _n('Hostname', 'Hostname', 1);
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 0,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 0,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return false;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
diff --git a/inc/fields/integerfield.class.php b/inc/fields/integerfield.class.php
@@ -208,19 +208,8 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 0,
-         'range'          => 1,
-         'show_empty'     => 0,
-         'regex'          => 1,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function getEmptyParameters() {
diff --git a/inc/fields/ipfield.class.php b/inc/fields/ipfield.class.php
@@ -102,19 +102,8 @@ public static function getName() {
       return _n('IP address', 'Adresses IP', 1);
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 0,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 0,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return false;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
diff --git a/inc/fields/ldapselectfield.class.php b/inc/fields/ldapselectfield.class.php
@@ -228,19 +228,8 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 0,
-         'values'         => 0,
-         'range'          => 0,
-         'show_empty'     => 1,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 1,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
diff --git a/inc/fields/multiselectfield.class.php b/inc/fields/multiselectfield.class.php
@@ -241,19 +241,8 @@ public static function getName() {
       return __('Multiselect', 'formcreator');
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 1,
-         'range'          => 1,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
diff --git a/inc/fields/radiosfield.class.php b/inc/fields/radiosfield.class.php
@@ -164,19 +164,8 @@ public function parseAnswerValues($input, $nonDestructive = false) {
        return true;
    }
 
-   public static function getPrefs() {
-      return [
-         'required'       => 1,
-         'default_values' => 1,
-         'values'         => 1,
-         'range'          => 0,
-         'show_empty'     => 0,
-         'regex'          => 0,
-         'show_type'      => 1,
-         'dropdown_value' => 0,
-         'glpi_objects'   => 0,
-         'ldap_values'    => 0,
-      ];
+   public static function canRequire() {
+      return true;
    }
 
    public function parseDefaultValue($defaultValue) {
diff --git a/inc/fields/selectfield.class.php b/inc/fields/selectfield.class.php
diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
diff --git a/inc/question.class.php b/inc/question.class.php
