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 ...@@ -506,7 +506,7 @@ function entity_form_state_defaults(EntityInterface $entity, $operation = 'defau
*/ */
function entity_form_submit(EntityInterface $entity, $operation = 'default', &$form_state = array()) { function entity_form_submit(EntityInterface $entity, $operation = 'default', &$form_state = array()) {
$form_state += entity_form_state_defaults($entity, $operation); $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); drupal_form_submit($form_id, $form_state);
} }
......
...@@ -131,7 +131,7 @@ function _drupal_form_id($form_arg, &$form_state) { ...@@ -131,7 +131,7 @@ function _drupal_form_id($form_arg, &$form_state) {
if ($form_arg instanceof BaseFormIdInterface) { if ($form_arg instanceof BaseFormIdInterface) {
$form_state['build_info']['base_form_id'] = $form_arg->getBaseFormID(); $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. // Otherwise, the $form_arg is the form ID.
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
abstract class ConditionPluginBase extends ExecutablePluginBase implements ConditionInterface { abstract class ConditionPluginBase extends ExecutablePluginBase implements ConditionInterface {
/** /**
* Implements \Drupal\Core\Form\FormInterface::getFormID(). * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
$definition = $this->getPluginDefinition(); $definition = $this->getPluginDefinition();
return implode('_', array($definition['module'], $definition['id'], 'condition')); return implode('_', array($definition['module'], $definition['id'], 'condition'));
} }
......
...@@ -63,7 +63,7 @@ public function getBaseFormID() { ...@@ -63,7 +63,7 @@ public function getBaseFormID() {
// it is different from the actual form ID, since callbacks would be invoked // it is different from the actual form ID, since callbacks would be invoked
// twice otherwise. // twice otherwise.
$base_form_id = $this->entity->entityType() . '_form'; $base_form_id = $this->entity->entityType() . '_form';
if ($base_form_id == $this->getFormID()) { if ($base_form_id == $this->getFormId()) {
$base_form_id = ''; $base_form_id = '';
} }
return $base_form_id; return $base_form_id;
...@@ -72,7 +72,7 @@ public function getBaseFormID() { ...@@ -72,7 +72,7 @@ public function getBaseFormID() {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
$entity_type = $this->entity->entityType(); $entity_type = $this->entity->entityType();
$bundle = $this->entity->bundle(); $bundle = $this->entity->bundle();
$form_id = $entity_type; $form_id = $entity_type;
......
...@@ -383,7 +383,7 @@ protected function getController($entity_type, $controller_type) { ...@@ -383,7 +383,7 @@ protected function getController($entity_type, $controller_type) {
*/ */
public function getForm(EntityInterface $entity, $operation = 'default', array $form_state = array()) { public function getForm(EntityInterface $entity, $operation = 'default', array $form_state = array()) {
$form_state += entity_form_state_defaults($entity, $operation); $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); return drupal_build_form($form_id, $form_state);
} }
......
...@@ -18,7 +18,7 @@ interface FormInterface { ...@@ -18,7 +18,7 @@ interface FormInterface {
* @return string * @return string
* The unique string identifying the form. * The unique string identifying the form.
*/ */
public function getFormID(); public function getFormId();
/** /**
* Form constructor. * Form constructor.
......
...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) { ...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'action_admin_manage'; return 'action_admin_manage';
} }
......
...@@ -15,7 +15,7 @@ class CategorizeCategoryForm extends AggregatorCategorizeFormBase { ...@@ -15,7 +15,7 @@ class CategorizeCategoryForm extends AggregatorCategorizeFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_page_category_form'; return 'aggregator_page_category_form';
} }
......
...@@ -17,7 +17,7 @@ class CategorizeFeedForm extends AggregatorCategorizeFormBase { ...@@ -17,7 +17,7 @@ class CategorizeFeedForm extends AggregatorCategorizeFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_page_source_form'; return 'aggregator_page_source_form';
} }
......
...@@ -73,7 +73,7 @@ public static function create(ContainerInterface $container) { ...@@ -73,7 +73,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_form_category'; return 'aggregator_form_category';
} }
......
...@@ -94,7 +94,7 @@ public function getCancelRoute() { ...@@ -94,7 +94,7 @@ public function getCancelRoute() {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_category_delete'; return 'aggregator_category_delete';
} }
......
...@@ -84,7 +84,7 @@ public static function create(ContainerInterface $container) { ...@@ -84,7 +84,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_opml_add'; return 'aggregator_opml_add';
} }
......
...@@ -95,7 +95,7 @@ public static function create(ContainerInterface $container) { ...@@ -95,7 +95,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'aggregator_admin_form'; return 'aggregator_admin_form';
} }
......
...@@ -42,7 +42,7 @@ public static function create(ContainerInterface $container) { ...@@ -42,7 +42,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'ban_ip_form'; return 'ban_ip_form';
} }
......
...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) { ...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'ban_ip_delete_form'; return 'ban_ip_delete_form';
} }
......
...@@ -127,9 +127,9 @@ public function render($theme = NULL, Request $request = NULL) { ...@@ -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'; return 'block_admin_display_form';
} }
......
...@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) { ...@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'book_admin_edit'; return 'book_admin_edit';
} }
......
...@@ -17,7 +17,7 @@ class BookSettingsForm extends ConfigFormBase { ...@@ -17,7 +17,7 @@ class BookSettingsForm extends ConfigFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'book_admin_settings'; return 'book_admin_settings';
} }
......
...@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container) { ...@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'comment_multiple_delete_confirm'; return 'comment_multiple_delete_confirm';
} }
......
...@@ -17,7 +17,7 @@ class ConfigExportForm extends FormBase { ...@@ -17,7 +17,7 @@ class ConfigExportForm extends FormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'config_export_form'; return 'config_export_form';
} }
......
...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) { ...@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'config_import_form'; return 'config_import_form';
} }
......
...@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container) { ...@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'config_admin_import_form'; return 'config_admin_import_form';
} }
......
...@@ -35,7 +35,7 @@ class TranslatableForm extends ConfirmFormBase { ...@@ -35,7 +35,7 @@ class TranslatableForm extends ConfirmFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'content_translation_translatable_form'; return 'content_translation_translatable_form';
} }
......
...@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) { ...@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'edit_field_form'; return 'edit_field_form';
} }
......
...@@ -22,7 +22,7 @@ class EditorImageDialog extends FormBase { ...@@ -22,7 +22,7 @@ class EditorImageDialog extends FormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'editor_image_dialog'; return 'editor_image_dialog';
} }
......
...@@ -22,7 +22,7 @@ class EditorLinkDialog extends FormBase { ...@@ -22,7 +22,7 @@ class EditorLinkDialog extends FormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'editor_link_dialog'; return 'editor_link_dialog';
} }
......
...@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) { ...@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'field_ui_display_overview_form'; return 'field_ui_display_overview_form';
} }
......
...@@ -77,7 +77,7 @@ public function getRegions() { ...@@ -77,7 +77,7 @@ public function getRegions() {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'field_ui_field_overview_form'; return 'field_ui_field_overview_form';
} }
......
...@@ -51,7 +51,7 @@ class FieldEditForm extends FormBase { ...@@ -51,7 +51,7 @@ class FieldEditForm extends FormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'field_ui_field_edit_form'; return 'field_ui_field_edit_form';
} }
......
...@@ -54,7 +54,7 @@ public static function create(ContainerInterface $container) { ...@@ -54,7 +54,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'field_ui_field_instance_edit_form'; return 'field_ui_field_instance_edit_form';
} }
......
...@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) { ...@@ -31,7 +31,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'field_ui_form_display_overview_form'; return 'field_ui_form_display_overview_form';
} }
......
...@@ -16,7 +16,7 @@ class FileTestForm implements FormInterface { ...@@ -16,7 +16,7 @@ class FileTestForm implements FormInterface {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return '_file_test_form'; return '_file_test_form';
} }
......
...@@ -69,7 +69,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ ...@@ -69,7 +69,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'filter_admin_overview'; return 'filter_admin_overview';
} }
......
...@@ -25,7 +25,7 @@ class DeleteForm extends ConfirmFormBase { ...@@ -25,7 +25,7 @@ class DeleteForm extends ConfirmFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'forum_confirm_delete'; return 'forum_confirm_delete';
} }
......
...@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container) { ...@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container) {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'forum_overview'; return 'forum_overview';
} }
......
...@@ -17,7 +17,7 @@ class ForumSettingsForm extends ConfigFormBase { ...@@ -17,7 +17,7 @@ class ForumSettingsForm extends ConfigFormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'forum_admin_settings'; return 'forum_admin_settings';
} }
......
...@@ -58,7 +58,7 @@ public function getCancelRoute() { ...@@ -58,7 +58,7 @@ public function getCancelRoute() {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'image_effect_delete_form'; return 'image_effect_delete_form';
} }
......
...@@ -36,7 +36,7 @@ abstract class ImageEffectFormBase extends FormBase { ...@@ -36,7 +36,7 @@ abstract class ImageEffectFormBase extends FormBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {
return 'image_effect_form'; return 'image_effect_form';
} }
......
...@@ -71,7 +71,7 @@ protected function entitySupported() { ...@@ -71,7 +71,7 @@ protected function entitySupported() {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getFormID() { public function getFormId() {