From 5ec328b270dfb83ef31d737d29906496673ded82 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 13 Jul 2014 09:54:57 +0100
Subject: [PATCH] Issue #2301597 by joshi.rohit100: Remove
drupal_prepare_form() as it is deprecated.
---
core/includes/form.inc | 12 ------------
.../modules/field/src/Tests/FieldAttachOtherTest.php | 2 +-
.../src/Tests/Form/ElementsTableSelectTest.php | 2 +-
core/modules/system/src/Tests/Form/FormTest.php | 2 +-
core/modules/system/system.api.php | 4 ++--
5 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 926b149d9678..0add7ccc5f03 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -275,18 +275,6 @@ function drupal_process_form($form_id, &$form, &$form_state) {
\Drupal::formBuilder()->processForm($form_id, $form, $form_state);
}
-/**
- * Prepares a structured form array.
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- * Use \Drupal::formBuilder()->prepareForm().
- *
- * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm().
- */
-function drupal_prepare_form($form_id, &$form, &$form_state) {
- \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
-}
-
/**
* Validates user-submitted form data in the $form_state array.
*
diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php
index 8e54bc1f5a0b..5046b1d7917c 100644
--- a/core/modules/field/src/Tests/FieldAttachOtherTest.php
+++ b/core/modules/field/src/Tests/FieldAttachOtherTest.php
@@ -342,7 +342,7 @@ function testEntityFormDisplayExtractFormValues() {
$values_2[1]['value'] = 0;
// Pretend the form has been built.
- drupal_prepare_form('field_test_entity_form', $form, $form_state);
+ \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
drupal_process_form('field_test_entity_form', $form, $form_state);
$form_state['values'][$this->field_name] = $values;
$form_state['values'][$this->field_name_2] = $values_2;
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index e6bfddaf61a6..47435f676834 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -217,7 +217,7 @@ private function formSubmitHelper($form, $edit) {
$form_state['input'] = $edit;
$form_state['input']['form_id'] = $form_id;
- drupal_prepare_form($form_id, $form, $form_state);
+ \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
drupal_process_form($form_id, $form, $form_state);
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index a380bd79c71c..a82943ecec14 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -112,7 +112,7 @@ function testRequiredFields() {
// The form token CSRF protection should not interfere with this test,
// so we bypass it by setting the token to FALSE.
$form['#token'] = FALSE;
- drupal_prepare_form($form_id, $form, $form_state);
+ \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
drupal_process_form($form_id, $form, $form_state);
$errors = form_get_errors($form_state);
// Form elements of type 'radios' throw all sorts of PHP notices
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 857145b1ca0a..8ff4b544eef0 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -740,7 +740,7 @@ function hook_form_alter(&$form, &$form_state, $form_id) {
*
* @see hook_form_alter()
* @see hook_form_BASE_FORM_ID_alter()
- * @see drupal_prepare_form()
+ * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm()
* @see forms_api_reference.html
*/
function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
@@ -786,7 +786,7 @@ function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
*
* @see hook_form_alter()
* @see hook_form_FORM_ID_alter()
- * @see drupal_prepare_form()
+ * @see \Drupal\Core\Form\FormBuilderInterface::prepareForm()
*/
function hook_form_BASE_FORM_ID_alter(&$form, &$form_state, $form_id) {
// Modification for the form with the given BASE_FORM_ID goes here. For
--
GitLab