From 15692fa6d4f2d7d15e3c0df8937612d9bdda93bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sat, 30 Jul 2016 23:59:24 +0200 Subject: [PATCH] Move HTMLFormField subclasses to a separate directory It's getting more difficult to navigate the files in includes/htmlform/ with every new field and every new helper class that is being added. Change-Id: I92ce2356baf6151f17b2440970d5abdf86503820 --- autoload.php | 56 +++++++++---------- .../htmlform/{ => fields}/HTMLApiField.php | 0 .../HTMLAutoCompleteSelectField.php | 0 .../htmlform/{ => fields}/HTMLButtonField.php | 0 .../htmlform/{ => fields}/HTMLCheckField.php | 0 .../htmlform/{ => fields}/HTMLCheckMatrix.php | 0 .../{ => fields}/HTMLComboboxField.php | 0 .../htmlform/{ => fields}/HTMLEditTools.php | 0 .../htmlform/{ => fields}/HTMLFloatField.php | 0 .../{ => fields}/HTMLFormFieldCloner.php | 0 .../{ => fields}/HTMLFormFieldWithButton.php | 0 .../htmlform/{ => fields}/HTMLHiddenField.php | 0 .../htmlform/{ => fields}/HTMLInfoField.php | 0 .../htmlform/{ => fields}/HTMLIntField.php | 0 .../{ => fields}/HTMLMultiSelectField.php | 0 .../htmlform/{ => fields}/HTMLRadioField.php | 0 .../{ => fields}/HTMLSelectAndOtherField.php | 0 .../htmlform/{ => fields}/HTMLSelectField.php | 0 .../{ => fields}/HTMLSelectLimitField.php | 0 .../{ => fields}/HTMLSelectNamespace.php | 0 .../HTMLSelectNamespaceWithButton.php | 0 .../{ => fields}/HTMLSelectOrOtherField.php | 0 .../htmlform/{ => fields}/HTMLSubmitField.php | 0 .../htmlform/{ => fields}/HTMLTagFilter.php | 0 .../{ => fields}/HTMLTextAreaField.php | 0 .../htmlform/{ => fields}/HTMLTextField.php | 0 .../{ => fields}/HTMLTextFieldWithButton.php | 0 .../{ => fields}/HTMLTitleTextField.php | 0 .../{ => fields}/HTMLUserTextField.php | 0 29 files changed, 28 insertions(+), 28 deletions(-) rename includes/htmlform/{ => fields}/HTMLApiField.php (100%) rename includes/htmlform/{ => fields}/HTMLAutoCompleteSelectField.php (100%) rename includes/htmlform/{ => fields}/HTMLButtonField.php (100%) rename includes/htmlform/{ => fields}/HTMLCheckField.php (100%) rename includes/htmlform/{ => fields}/HTMLCheckMatrix.php (100%) rename includes/htmlform/{ => fields}/HTMLComboboxField.php (100%) rename includes/htmlform/{ => fields}/HTMLEditTools.php (100%) rename includes/htmlform/{ => fields}/HTMLFloatField.php (100%) rename includes/htmlform/{ => fields}/HTMLFormFieldCloner.php (100%) rename includes/htmlform/{ => fields}/HTMLFormFieldWithButton.php (100%) rename includes/htmlform/{ => fields}/HTMLHiddenField.php (100%) rename includes/htmlform/{ => fields}/HTMLInfoField.php (100%) rename includes/htmlform/{ => fields}/HTMLIntField.php (100%) rename includes/htmlform/{ => fields}/HTMLMultiSelectField.php (100%) rename includes/htmlform/{ => fields}/HTMLRadioField.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectAndOtherField.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectField.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectLimitField.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectNamespace.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectNamespaceWithButton.php (100%) rename includes/htmlform/{ => fields}/HTMLSelectOrOtherField.php (100%) rename includes/htmlform/{ => fields}/HTMLSubmitField.php (100%) rename includes/htmlform/{ => fields}/HTMLTagFilter.php (100%) rename includes/htmlform/{ => fields}/HTMLTextAreaField.php (100%) rename includes/htmlform/{ => fields}/HTMLTextField.php (100%) rename includes/htmlform/{ => fields}/HTMLTextFieldWithButton.php (100%) rename includes/htmlform/{ => fields}/HTMLTitleTextField.php (100%) rename includes/htmlform/{ => fields}/HTMLUserTextField.php (100%) diff --git a/autoload.php b/autoload.php index 5808040e41..50d544c1f9 100644 --- a/autoload.php +++ b/autoload.php @@ -514,41 +514,41 @@ $wgAutoloadLocalClasses = [ 'GitInfo' => __DIR__ . '/includes/GitInfo.php', 'GlobalDependency' => __DIR__ . '/includes/cache/CacheDependency.php', 'GlobalVarConfig' => __DIR__ . '/includes/config/GlobalVarConfig.php', - 'HTMLApiField' => __DIR__ . '/includes/htmlform/HTMLApiField.php', - 'HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/HTMLAutoCompleteSelectField.php', - 'HTMLButtonField' => __DIR__ . '/includes/htmlform/HTMLButtonField.php', + 'HTMLApiField' => __DIR__ . '/includes/htmlform/fields/HTMLApiField.php', + 'HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLAutoCompleteSelectField.php', + 'HTMLButtonField' => __DIR__ . '/includes/htmlform/fields/HTMLButtonField.php', 'HTMLCacheUpdate' => __DIR__ . '/includes/deferred/HTMLCacheUpdate.php', 'HTMLCacheUpdateJob' => __DIR__ . '/includes/jobqueue/jobs/HTMLCacheUpdateJob.php', - 'HTMLCheckField' => __DIR__ . '/includes/htmlform/HTMLCheckField.php', - 'HTMLCheckMatrix' => __DIR__ . '/includes/htmlform/HTMLCheckMatrix.php', - 'HTMLComboboxField' => __DIR__ . '/includes/htmlform/HTMLComboboxField.php', - 'HTMLEditTools' => __DIR__ . '/includes/htmlform/HTMLEditTools.php', + 'HTMLCheckField' => __DIR__ . '/includes/htmlform/fields/HTMLCheckField.php', + 'HTMLCheckMatrix' => __DIR__ . '/includes/htmlform/fields/HTMLCheckMatrix.php', + 'HTMLComboboxField' => __DIR__ . '/includes/htmlform/fields/HTMLComboboxField.php', + 'HTMLEditTools' => __DIR__ . '/includes/htmlform/fields/HTMLEditTools.php', 'HTMLFileCache' => __DIR__ . '/includes/cache/HTMLFileCache.php', - 'HTMLFloatField' => __DIR__ . '/includes/htmlform/HTMLFloatField.php', + 'HTMLFloatField' => __DIR__ . '/includes/htmlform/fields/HTMLFloatField.php', 'HTMLForm' => __DIR__ . '/includes/htmlform/HTMLForm.php', 'HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php', - 'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/HTMLFormFieldCloner.php', + 'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldCloner.php', 'HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php', - 'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLFormFieldWithButton.php', - 'HTMLHiddenField' => __DIR__ . '/includes/htmlform/HTMLHiddenField.php', - 'HTMLInfoField' => __DIR__ . '/includes/htmlform/HTMLInfoField.php', - 'HTMLIntField' => __DIR__ . '/includes/htmlform/HTMLIntField.php', - 'HTMLMultiSelectField' => __DIR__ . '/includes/htmlform/HTMLMultiSelectField.php', + 'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldWithButton.php', + 'HTMLHiddenField' => __DIR__ . '/includes/htmlform/fields/HTMLHiddenField.php', + 'HTMLInfoField' => __DIR__ . '/includes/htmlform/fields/HTMLInfoField.php', + 'HTMLIntField' => __DIR__ . '/includes/htmlform/fields/HTMLIntField.php', + 'HTMLMultiSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLMultiSelectField.php', 'HTMLNestedFilterable' => __DIR__ . '/includes/htmlform/HTMLNestedFilterable.php', - 'HTMLRadioField' => __DIR__ . '/includes/htmlform/HTMLRadioField.php', - 'HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/HTMLSelectAndOtherField.php', - 'HTMLSelectField' => __DIR__ . '/includes/htmlform/HTMLSelectField.php', - 'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/HTMLSelectLimitField.php', - 'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/HTMLSelectNamespace.php', - 'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/HTMLSelectNamespaceWithButton.php', - 'HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/HTMLSelectOrOtherField.php', - 'HTMLSubmitField' => __DIR__ . '/includes/htmlform/HTMLSubmitField.php', - 'HTMLTagFilter' => __DIR__ . '/includes/htmlform/HTMLTagFilter.php', - 'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/HTMLTextAreaField.php', - 'HTMLTextField' => __DIR__ . '/includes/htmlform/HTMLTextField.php', - 'HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLTextFieldWithButton.php', - 'HTMLTitleTextField' => __DIR__ . '/includes/htmlform/HTMLTitleTextField.php', - 'HTMLUserTextField' => __DIR__ . '/includes/htmlform/HTMLUserTextField.php', + 'HTMLRadioField' => __DIR__ . '/includes/htmlform/fields/HTMLRadioField.php', + 'HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectAndOtherField.php', + 'HTMLSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectField.php', + 'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLimitField.php', + 'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespace.php', + 'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php', + 'HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectOrOtherField.php', + 'HTMLSubmitField' => __DIR__ . '/includes/htmlform/fields/HTMLSubmitField.php', + 'HTMLTagFilter' => __DIR__ . '/includes/htmlform/fields/HTMLTagFilter.php', + 'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/fields/HTMLTextAreaField.php', + 'HTMLTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTextField.php', + 'HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLTextFieldWithButton.php', + 'HTMLTitleTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTitleTextField.php', + 'HTMLUserTextField' => __DIR__ . '/includes/htmlform/fields/HTMLUserTextField.php', 'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php', 'HashBagOStuff' => __DIR__ . '/includes/libs/objectcache/HashBagOStuff.php', 'HashConfig' => __DIR__ . '/includes/config/HashConfig.php', diff --git a/includes/htmlform/HTMLApiField.php b/includes/htmlform/fields/HTMLApiField.php similarity index 100% rename from includes/htmlform/HTMLApiField.php rename to includes/htmlform/fields/HTMLApiField.php diff --git a/includes/htmlform/HTMLAutoCompleteSelectField.php b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php similarity index 100% rename from includes/htmlform/HTMLAutoCompleteSelectField.php rename to includes/htmlform/fields/HTMLAutoCompleteSelectField.php diff --git a/includes/htmlform/HTMLButtonField.php b/includes/htmlform/fields/HTMLButtonField.php similarity index 100% rename from includes/htmlform/HTMLButtonField.php rename to includes/htmlform/fields/HTMLButtonField.php diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/fields/HTMLCheckField.php similarity index 100% rename from includes/htmlform/HTMLCheckField.php rename to includes/htmlform/fields/HTMLCheckField.php diff --git a/includes/htmlform/HTMLCheckMatrix.php b/includes/htmlform/fields/HTMLCheckMatrix.php similarity index 100% rename from includes/htmlform/HTMLCheckMatrix.php rename to includes/htmlform/fields/HTMLCheckMatrix.php diff --git a/includes/htmlform/HTMLComboboxField.php b/includes/htmlform/fields/HTMLComboboxField.php similarity index 100% rename from includes/htmlform/HTMLComboboxField.php rename to includes/htmlform/fields/HTMLComboboxField.php diff --git a/includes/htmlform/HTMLEditTools.php b/includes/htmlform/fields/HTMLEditTools.php similarity index 100% rename from includes/htmlform/HTMLEditTools.php rename to includes/htmlform/fields/HTMLEditTools.php diff --git a/includes/htmlform/HTMLFloatField.php b/includes/htmlform/fields/HTMLFloatField.php similarity index 100% rename from includes/htmlform/HTMLFloatField.php rename to includes/htmlform/fields/HTMLFloatField.php diff --git a/includes/htmlform/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php similarity index 100% rename from includes/htmlform/HTMLFormFieldCloner.php rename to includes/htmlform/fields/HTMLFormFieldCloner.php diff --git a/includes/htmlform/HTMLFormFieldWithButton.php b/includes/htmlform/fields/HTMLFormFieldWithButton.php similarity index 100% rename from includes/htmlform/HTMLFormFieldWithButton.php rename to includes/htmlform/fields/HTMLFormFieldWithButton.php diff --git a/includes/htmlform/HTMLHiddenField.php b/includes/htmlform/fields/HTMLHiddenField.php similarity index 100% rename from includes/htmlform/HTMLHiddenField.php rename to includes/htmlform/fields/HTMLHiddenField.php diff --git a/includes/htmlform/HTMLInfoField.php b/includes/htmlform/fields/HTMLInfoField.php similarity index 100% rename from includes/htmlform/HTMLInfoField.php rename to includes/htmlform/fields/HTMLInfoField.php diff --git a/includes/htmlform/HTMLIntField.php b/includes/htmlform/fields/HTMLIntField.php similarity index 100% rename from includes/htmlform/HTMLIntField.php rename to includes/htmlform/fields/HTMLIntField.php diff --git a/includes/htmlform/HTMLMultiSelectField.php b/includes/htmlform/fields/HTMLMultiSelectField.php similarity index 100% rename from includes/htmlform/HTMLMultiSelectField.php rename to includes/htmlform/fields/HTMLMultiSelectField.php diff --git a/includes/htmlform/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php similarity index 100% rename from includes/htmlform/HTMLRadioField.php rename to includes/htmlform/fields/HTMLRadioField.php diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/fields/HTMLSelectAndOtherField.php similarity index 100% rename from includes/htmlform/HTMLSelectAndOtherField.php rename to includes/htmlform/fields/HTMLSelectAndOtherField.php diff --git a/includes/htmlform/HTMLSelectField.php b/includes/htmlform/fields/HTMLSelectField.php similarity index 100% rename from includes/htmlform/HTMLSelectField.php rename to includes/htmlform/fields/HTMLSelectField.php diff --git a/includes/htmlform/HTMLSelectLimitField.php b/includes/htmlform/fields/HTMLSelectLimitField.php similarity index 100% rename from includes/htmlform/HTMLSelectLimitField.php rename to includes/htmlform/fields/HTMLSelectLimitField.php diff --git a/includes/htmlform/HTMLSelectNamespace.php b/includes/htmlform/fields/HTMLSelectNamespace.php similarity index 100% rename from includes/htmlform/HTMLSelectNamespace.php rename to includes/htmlform/fields/HTMLSelectNamespace.php diff --git a/includes/htmlform/HTMLSelectNamespaceWithButton.php b/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php similarity index 100% rename from includes/htmlform/HTMLSelectNamespaceWithButton.php rename to includes/htmlform/fields/HTMLSelectNamespaceWithButton.php diff --git a/includes/htmlform/HTMLSelectOrOtherField.php b/includes/htmlform/fields/HTMLSelectOrOtherField.php similarity index 100% rename from includes/htmlform/HTMLSelectOrOtherField.php rename to includes/htmlform/fields/HTMLSelectOrOtherField.php diff --git a/includes/htmlform/HTMLSubmitField.php b/includes/htmlform/fields/HTMLSubmitField.php similarity index 100% rename from includes/htmlform/HTMLSubmitField.php rename to includes/htmlform/fields/HTMLSubmitField.php diff --git a/includes/htmlform/HTMLTagFilter.php b/includes/htmlform/fields/HTMLTagFilter.php similarity index 100% rename from includes/htmlform/HTMLTagFilter.php rename to includes/htmlform/fields/HTMLTagFilter.php diff --git a/includes/htmlform/HTMLTextAreaField.php b/includes/htmlform/fields/HTMLTextAreaField.php similarity index 100% rename from includes/htmlform/HTMLTextAreaField.php rename to includes/htmlform/fields/HTMLTextAreaField.php diff --git a/includes/htmlform/HTMLTextField.php b/includes/htmlform/fields/HTMLTextField.php similarity index 100% rename from includes/htmlform/HTMLTextField.php rename to includes/htmlform/fields/HTMLTextField.php diff --git a/includes/htmlform/HTMLTextFieldWithButton.php b/includes/htmlform/fields/HTMLTextFieldWithButton.php similarity index 100% rename from includes/htmlform/HTMLTextFieldWithButton.php rename to includes/htmlform/fields/HTMLTextFieldWithButton.php diff --git a/includes/htmlform/HTMLTitleTextField.php b/includes/htmlform/fields/HTMLTitleTextField.php similarity index 100% rename from includes/htmlform/HTMLTitleTextField.php rename to includes/htmlform/fields/HTMLTitleTextField.php diff --git a/includes/htmlform/HTMLUserTextField.php b/includes/htmlform/fields/HTMLUserTextField.php similarity index 100% rename from includes/htmlform/HTMLUserTextField.php rename to includes/htmlform/fields/HTMLUserTextField.php -- 2.20.1