Commit b201c054 authored by alexpott's avatar alexpott

Issue #2111209 by Xano: Fixed Rename FormInterface::getFormID() to FormInterface::getFormId().

parent a6d19bf7
......@@ -506,7 +506,7 @@ function entity_form_state_defaults(EntityInterface $entity, $operation = 'defau
*/
function entity_form_submit(EntityInterface $entity, $operation = 'default', &$form_state = array()) {
$form_state += entity_form_state_defaults($entity, $operation);
$form_id = $form_state['build_info']['callback_object']->getFormID();
$form_id = $form_state['build_info']['callback_object']->getFormId();
drupal_form_submit($form_id, $form_state);
}
......
......@@ -131,7 +131,7 @@ function _drupal_form_id($form_arg, &$form_state) {
if ($form_arg instanceof BaseFormIdInterface) {
$form_state['build_info']['base_form_id'] = $form_arg->getBaseFormID();
}
return $form_arg->getFormID();
return $form_arg->getFormId();
}
// Otherwise, the $form_arg is the form ID.
......
......@@ -15,9 +15,9 @@
abstract class ConditionPluginBase extends ExecutablePluginBase implements ConditionInterface {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
$definition = $this->getPluginDefinition();
return implode('_', array($definition['module'], $definition['id'], 'condition'));
}
......
......@@ -63,7 +63,7 @@ public function getBaseFormID() {
// it is different from the actual form ID, since callbacks would be invoked
// twice otherwise.
$base_form_id = $this->entity->entityType() . '_form';
if ($base_form_id == $this->getFormID()) {
if ($base_form_id == $this->getFormId()) {
$base_form_id = '';
}
return $base_form_id;
......@@ -72,7 +72,7 @@ public function getBaseFormID() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
$entity_type = $this->entity->entityType();
$bundle = $this->entity->bundle();
$form_id = $entity_type;
......
......@@ -383,7 +383,7 @@ protected function getController($entity_type, $controller_type) {
*/
public function getForm(EntityInterface $entity, $operation = 'default', array $form_state = array()) {
$form_state += entity_form_state_defaults($entity, $operation);
$form_id = $form_state['build_info']['callback_object']->getFormID();
$form_id = $form_state['build_info']['callback_object']->getFormId();
return drupal_build_form($form_id, $form_state);
}
......
......@@ -18,7 +18,7 @@ interface FormInterface {
* @return string
* The unique string identifying the form.
*/
public function getFormID();
public function getFormId();
/**
* Form constructor.
......
......@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'action_admin_manage';
}
......
......@@ -15,7 +15,7 @@ class CategorizeCategoryForm extends AggregatorCategorizeFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_page_category_form';
}
......
......@@ -17,7 +17,7 @@ class CategorizeFeedForm extends AggregatorCategorizeFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_page_source_form';
}
......
......@@ -73,7 +73,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_form_category';
}
......
......@@ -94,7 +94,7 @@ public function getCancelRoute() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_category_delete';
}
......
......@@ -84,7 +84,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_opml_add';
}
......
......@@ -95,7 +95,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'aggregator_admin_form';
}
......
......@@ -42,7 +42,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'ban_ip_form';
}
......
......@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'ban_ip_delete_form';
}
......
......@@ -127,9 +127,9 @@ public function render($theme = NULL, Request $request = NULL) {
}
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'block_admin_display_form';
}
......
......@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'book_admin_edit';
}
......
......@@ -17,7 +17,7 @@ class BookSettingsForm extends ConfigFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'book_admin_settings';
}
......
......@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'comment_multiple_delete_confirm';
}
......
......@@ -17,7 +17,7 @@ class ConfigExportForm extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'config_export_form';
}
......
......@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'config_import_form';
}
......
......@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'config_admin_import_form';
}
......
......@@ -35,7 +35,7 @@ class TranslatableForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'content_translation_translatable_form';
}
......
......@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'edit_field_form';
}
......
......@@ -22,7 +22,7 @@ class EditorImageDialog extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'editor_image_dialog';
}
......
......@@ -22,7 +22,7 @@ class EditorLinkDialog extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'editor_link_dialog';
}
......
......@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'field_ui_display_overview_form';
}
......
......@@ -77,7 +77,7 @@ public function getRegions() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'field_ui_field_overview_form';
}
......
......@@ -51,7 +51,7 @@ class FieldEditForm extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'field_ui_field_edit_form';
}
......
......@@ -54,7 +54,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'field_ui_field_instance_edit_form';
}
......
......@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'field_ui_form_display_overview_form';
}
......
......@@ -16,7 +16,7 @@ class FileTestForm implements FormInterface {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return '_file_test_form';
}
......
......@@ -69,7 +69,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'filter_admin_overview';
}
......
......@@ -25,7 +25,7 @@ class DeleteForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'forum_confirm_delete';
}
......
......@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'forum_overview';
}
......
......@@ -17,7 +17,7 @@ class ForumSettingsForm extends ConfigFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'forum_admin_settings';
}
......
......@@ -58,7 +58,7 @@ public function getCancelRoute() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'image_effect_delete_form';
}
......
......@@ -36,7 +36,7 @@ abstract class ImageEffectFormBase extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'image_effect_form';
}
......
......@@ -71,7 +71,7 @@ protected function entitySupported() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_content_settings_form';
}
......
......@@ -18,7 +18,7 @@ class LanguageAddForm extends LanguageFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
// @todo Remove in favour of base method.
return 'language_admin_add_form';
}
......
......@@ -78,7 +78,7 @@ public function getConfirmText() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_delete_form';
}
......
......@@ -17,7 +17,7 @@ class LanguageEditForm extends LanguageFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
// @todo Remove in favour of base method.
return 'language_admin_edit_form';
}
......
......@@ -38,7 +38,7 @@ public function getCancelRoute() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_negotiation_configure_browser_delete_form';
}
......
......@@ -50,7 +50,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_negotiation_configure_browser_form';
}
......
......@@ -16,9 +16,9 @@
class NegotiationSelectedForm extends ConfigFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_negotiation_configure_selected_form';
}
......
......@@ -15,9 +15,9 @@
class NegotiationSessionForm extends ConfigFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_negotiation_configure_session_form';
}
......
......@@ -15,9 +15,9 @@
class NegotiationUrlForm extends ConfigFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_negotiation_configure_url_form';
}
......
......@@ -34,7 +34,7 @@ public function load() {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'language_admin_overview_form';
}
......
......@@ -14,9 +14,9 @@
class LocaleSettingsForm extends ConfigFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'locale_translate_settings';
}
......
......@@ -18,7 +18,7 @@ class TranslateEditForm extends TranslateFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'locale_translate_edit_form';
}
......
......@@ -15,7 +15,7 @@ class TranslateFilterForm extends TranslateFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'locale_translate_filter_form';
}
......
......@@ -15,9 +15,9 @@
class MenuSettingsForm extends ConfigFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'menu_configure';
}
......
......@@ -68,7 +68,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'node_multiple_delete_confirm';
}
......
......@@ -78,7 +78,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'node_revision_delete_confirm';
}
......
......@@ -54,7 +54,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'node_revision_revert_confirm';
}
......
......@@ -14,7 +14,7 @@ class RebuildPermissionsForm extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'node_configure_rebuild_confirm';
}
......
......@@ -51,9 +51,9 @@ public static function create(ContainerInterface $container) {
}
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'path_alias_delete';
}
......
......@@ -15,9 +15,9 @@
class ReindexConfirm extends ConfirmFormBase {
/**
* Implements \Drupal\Core\Form\FormInterface::getFormID().
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'search_reindex_confirm';
}
......
......@@ -26,7 +26,7 @@ class SearchBlockForm extends FormBase implements FormInterface {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'search_block_form';
}
......
......@@ -86,7 +86,7 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'search_admin_settings';
}
......
......@@ -25,7 +25,7 @@ class LinkDelete extends ConfirmFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'shortcut_link_delete';
}
......
......@@ -86,7 +86,7 @@ public function __construct(Connection $database) {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'simpletest_results_form';
}
......
......@@ -17,7 +17,7 @@ class SimpletestSettingsForm extends ConfigFormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'simpletest_settings_form';
}
......
......@@ -17,7 +17,7 @@ class SimpletestTestForm extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormID() {
public function getFormId() {
return 'simpletest_test_form';
}
......
......@@ -52,9 +52,9 @@ public static function create(ContainerInterface $container) {
}
/**