Skip to content

Commit a27f82e

Browse files
committed
fix(field): normalize class name
Signed-off-by: Thierry Bugier <tbugier@teclib.com>
1 parent 076937b commit a27f82e

37 files changed

+66
-66
lines changed

inc/field.class.php renamed to inc/abstractfield.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
require_once(realpath(dirname(__FILE__ ) . '/../../../inc/includes.php'));
3737

38-
abstract class PluginFormcreatorField implements PluginFormcreatorFieldInterface
38+
abstract class PluginFormcreatorAbstractField implements PluginFormcreatorFieldInterface
3939
{
4040
/** @var array $fields Fields of an instance of PluginFormcreatorQuestion */
4141
protected $question = null;

inc/questionparameter.class.php renamed to inc/abstractquestionparameter.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
die("Sorry. You can't access this file directly");
3434
}
3535

36-
abstract class PluginFormcreatorQuestionParameter
36+
abstract class PluginFormcreatorAbstractQuestionParameter
3737
extends CommonDBChild
3838
implements PluginFormcreatorQuestionParameterInterface, PluginFormcreatorExportableInterface
3939
{
40-
use PluginFormcreatorExportable;
40+
use PluginFormcreatorExportableTrait;
4141

4242
// From CommonDBRelation
4343
static public $itemtype = PluginFormcreatorQuestion::class;

inc/abstracttarget.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ abstract class PluginFormcreatorAbstractTarget extends CommonDBChild implements
4040
PluginFormcreatorTargetInterface,
4141
PluginFormcreatorConditionnableInterface
4242
{
43-
use PluginFormcreatorConditionnable;
44-
use PluginFormcreatorExportable;
43+
use PluginFormcreatorConditionnableTrait;
44+
use PluginFormcreatorExportableTrait;
4545

4646
static public $itemtype = PluginFormcreatorForm::class;
4747
static public $items_id = 'plugin_formcreator_forms_id';

inc/condition.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
class PluginFormcreatorCondition extends CommonDBChild implements PluginFormcreatorExportableInterface
3939
{
40-
use PluginFormcreatorExportable;
40+
use PluginFormcreatorExportableTrait;
4141

4242
static public $itemtype = 'itemtype';
4343
static public $items_id = 'items_id';

inc/conditionnable.class.php renamed to inc/conditionnabletrait.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
die("Sorry. You can't access this file directly");
3434
}
3535

36-
trait PluginFormcreatorConditionnable
36+
trait PluginFormcreatorConditionnableTrait
3737
{
3838
public function updateConditions($input) {
3939
if (!isset($input['show_rule'])) {

inc/exportable.class.php renamed to inc/exportabletrait.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
die("Sorry. You can't access this file directly");
3434
}
3535

36-
trait PluginFormcreatorExportable
36+
trait PluginFormcreatorExportableTrait
3737
{
3838
/**
3939
* Insert the export of sub items in the export

inc/field/actorfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use User;
3737
use Toolbox;
@@ -43,7 +43,7 @@
4343
* users from the itemtype User or email addresses. Email addresses allows to
4444
* add actors who don't have an account in GLPI.
4545
*/
46-
class ActorField extends PluginFormcreatorField
46+
class ActorField extends PluginFormcreatorAbstractField
4747
{
4848
public function isPrerequisites() {
4949
return true;

inc/field/checkboxesfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Toolbox;
3737
use Session;
3838
use PluginFormcreatorQuestionRange;
3939

40-
class CheckboxesField extends PluginFormcreatorField
40+
class CheckboxesField extends PluginFormcreatorAbstractField
4141
{
4242
public function isPrerequisites() {
4343
return true;

inc/field/datefield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use DateTime;
3737
use Toolbox;
3838
use Session;
3939

4040

41-
class DateField extends PluginFormcreatorField
41+
class DateField extends PluginFormcreatorAbstractField
4242
{
4343
const DATE_FORMAT = 'Y-m-d';
4444

inc/field/datetimefield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Session;
3737
use Toolbox;
3838
use DateTime;
39-
class DatetimeField extends PluginFormcreatorField
39+
class DatetimeField extends PluginFormcreatorAbstractField
4040
{
4141
/** @var array $fields Fields of an instance of PluginFormcreatorQuestion */
4242
protected $fields = null;

inc/field/descriptionfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Session;
3636
use GlpiPlugin\Formcreator\Exception\ComparisonException;
3737

38-
class DescriptionField extends PluginFormcreatorField
38+
class DescriptionField extends PluginFormcreatorAbstractField
3939
{
4040
public function isPrerequisites() {
4141
return true;

inc/field/dropdownfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Toolbox;
3737
use Session;
@@ -50,7 +50,7 @@
5050
use OLA;
5151
use GlpiPlugin\Formcreator\Exception\ComparisonException;
5252

53-
class DropdownField extends PluginFormcreatorField
53+
class DropdownField extends PluginFormcreatorAbstractField
5454
{
5555
public function isPrerequisites() {
5656
$itemtype = $this->getSubItemtype();

inc/field/filefield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Document;
3636
use Html;
3737
use Toolbox;
@@ -41,7 +41,7 @@
4141
use PluginFormcreatorSection;
4242
use PluginFormcreatorQuestion;
4343

44-
class FileField extends PluginFormcreatorField
44+
class FileField extends PluginFormcreatorAbstractField
4545
{
4646
/**@var $uploadData array uploads saved as documents */
4747
private $uploadData = [];

inc/field/floatfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Toolbox;
3737
use Session;
3838
use PluginFormcreatorQuestionRange;
3939
use PluginFormcreatorQuestionRegex;
4040

41-
class FloatField extends PluginFormcreatorField
41+
class FloatField extends PluginFormcreatorAbstractField
4242
{
4343
public function isPrerequisites() {
4444
return true;

inc/field/hiddenfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Toolbox;
3737

38-
class HiddenField extends PluginFormcreatorField
38+
class HiddenField extends PluginFormcreatorAbstractField
3939
{
4040
public function isPrerequisites() {
4141
return true;

inc/field/hostnamefield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
*/
3131
namespace GlpiPlugin\Formcreator\Field;
3232

33-
use PluginFormcreatorField;
33+
use PluginFormcreatorAbstractField;
3434
use Html;
3535
use Toolbox;
3636

37-
class HostnameField extends PluginFormcreatorField
37+
class HostnameField extends PluginFormcreatorAbstractField
3838
{
3939
public function isPrerequisites() {
4040
return true;

inc/field/ipfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Toolbox;
3737
use GlpiPlugin\Formcreator\Exception\ComparisonException;
3838

39-
class IpField extends PluginFormcreatorField
39+
class IpField extends PluginFormcreatorAbstractField
4040
{
4141
public function isPrerequisites() {
4242
return true;

inc/field/ldapselectfield.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use AuthLDAP;
3636
use Dropdown;
3737
use Exception;

inc/field/radiosfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Session;
3737
use Toolbox;
3838

39-
class RadiosField extends PluginFormcreatorField
39+
class RadiosField extends PluginFormcreatorAbstractField
4040
{
4141
public function isPrerequisites() {
4242
return true;

inc/field/textareafield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Session;
3737
use Toolbox;
@@ -68,7 +68,7 @@ public function getDesignSpecializationField() {
6868
$additions .= '</td>';
6969
$additions .= '</tr>';
7070

71-
$common = PluginFormcreatorField::getDesignSpecializationField();
71+
$common = PluginFormcreatorAbstractField::getDesignSpecializationField();
7272
$additions .= $common['additions'];
7373

7474
return [

inc/field/textfield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
namespace GlpiPlugin\Formcreator\Field;
3333

3434
use Html;
35-
use PluginFormcreatorField;
35+
use PluginFormcreatorAbstractField;
3636
use PluginFormcreatorQuestionRange;
3737
use PluginFormcreatorQuestionRegex;
3838
use Session;
3939
use Toolbox;
4040

41-
class TextField extends PluginFormcreatorField
41+
class TextField extends PluginFormcreatorAbstractField
4242
{
4343
public function isPrerequisites() {
4444
return true;

inc/field/timefield.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
namespace GlpiPlugin\Formcreator\Field;
3333
use DateTime;
3434
use Html;
35-
use PluginFormcreatorField;
35+
use PluginFormcreatorAbstractField;
3636
use Session;
3737
use Toolbox;
3838

39-
class TimeField extends PluginFormcreatorField
39+
class TimeField extends PluginFormcreatorAbstractField
4040
{
4141
const DATE_FORMAT = 'H:i';
4242

inc/field/urgencyfield.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
namespace GlpiPlugin\Formcreator\Field;
3333

34-
use PluginFormcreatorField;
34+
use PluginFormcreatorAbstractField;
3535
use Html;
3636
use Session;
3737
use Ticket;
38-
class UrgencyField extends PluginFormcreatorField
38+
class UrgencyField extends PluginFormcreatorAbstractField
3939
{
4040
public function isPrerequisites() {
4141
return true;
@@ -68,7 +68,7 @@ public function getDesignSpecializationField() {
6868
$additions .= '</td>';
6969
$additions .= '</tr>';
7070

71-
$common = PluginFormcreatorField::getDesignSpecializationField();
71+
$common = PluginFormcreatorAbstractField::getDesignSpecializationField();
7272
$additions .= $common['additions'];
7373

7474
return [

inc/fieldinterface.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ public function parseAnswerValues($input, $nonDestructive = false);
166166
/**
167167
* Gets the parameters of the field
168168
*
169-
* @return PluginFormcreatorQuestionParameter[]
169+
* @return PluginFormcreatorAbstractQuestionParameter[]
170170
*/
171171
public function getEmptyParameters();
172172

173173
/**
174174
* Gets parameters of the field with their settings
175175
*
176-
* @return PluginFormcreatorQuestionParameter[]
176+
* @return PluginFormcreatorAbstractQuestionParameter[]
177177
*/
178178
public function getParameters();
179179

inc/fields.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public static function getFieldClassname($type) {
421421
*/
422422
public static function fieldTypeExists($type) {
423423
$className = self::getFieldClassname($type);
424-
return is_subclass_of($className, PluginFormcreatorField::class, true);
424+
return is_subclass_of($className, PluginFormcreatorAbstractField::class, true);
425425
}
426426

427427
/**
@@ -430,7 +430,7 @@ public static function fieldTypeExists($type) {
430430
* @param string $type type of field to get
431431
* @param PluginFormcreatorQuestion $question question representing the field
432432
* @param array $data additional data
433-
* @return null|PluginFormcreatorField
433+
* @return null|PluginFormcreatorAbstractField
434434
*/
435435
public static function getFieldInstance($type, PluginFormcreatorQuestion $question) {
436436
if (!self::fieldTypeExists($type)) {

inc/form.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class PluginFormcreatorForm extends CommonDBTM implements
4040
PluginFormcreatorDuplicatableInterface,
4141
PluginFormcreatorConditionnableInterface
4242
{
43-
use PluginFormcreatorConditionnable;
44-
use PluginFormcreatorExportable;
43+
use PluginFormcreatorConditionnableTrait;
44+
use PluginFormcreatorExportableTrait;
4545

4646
static $rightname = 'entity';
4747

@@ -2238,7 +2238,7 @@ public function getFromDBByQuestion(PluginFormcreatorQuestion $question) {
22382238
/**
22392239
* Get an array of instances of all fields for the form
22402240
*
2241-
* @return PluginFormcreatorField[]
2241+
* @return PluginFormcreatorAbstractField[]
22422242
*/
22432243
public function getFields() {
22442244
$fields = [];

inc/form_profile.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
class PluginFormcreatorForm_Profile extends CommonDBRelation implements PluginFormcreatorExportableInterface
3838
{
39-
use PluginFormcreatorExportable;
39+
use PluginFormcreatorExportableTrait;
4040

4141
static public $itemtype_1 = PluginFormcreatorForm::class;
4242
static public $items_id_1 = 'plugin_formcreator_forms_id';

0 commit comments

Comments
 (0)