From 9de73791231856bf4dff3d8bb9fa1365abaa0545 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Thu, 23 Jan 2014 22:17:57 -0800
Subject: [PATCH] Issue #2166863 by tim.plunkett, pwolanin: Add a formBuilder()
 method to ControllerBase.

---
 .../Drupal/Core/Controller/ControllerBase.php | 19 +++++++++++++++++++
 .../locale/Controller/LocaleController.php    |  4 ++--
 .../Drupal/user/Controller/UserController.php |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 96828fa5837..23a2cac0fb6 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -93,6 +93,13 @@ abstract class ControllerBase {
    */
   protected $moduleHandler;
 
+  /**
+   * The form builder.
+   *
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected $formBuilder;
+
   /**
    * Retrieves the entity manager service.
    *
@@ -188,6 +195,18 @@ abstract class ControllerBase {
     return $this->moduleHandler;
   }
 
+  /**
+   * Returns the form builder service.
+   *
+   * @return \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected function formBuilder() {
+    if (!$this->formBuilder) {
+      $this->formBuilder = $this->container()->get('form_builder');
+    }
+    return $this->formBuilder;
+  }
+
   /**
    * Returns the URL generator service.
    *
diff --git a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
index d9807eb35ba..36e693887ac 100644
--- a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
+++ b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
@@ -49,8 +49,8 @@ class LocaleController extends ControllerBase {
    */
   public function translatePage() {
     return array(
-      'filter' => drupal_get_form('Drupal\locale\Form\TranslateFilterForm'),
-      'form' => drupal_get_form('Drupal\locale\Form\TranslateEditForm'),
+      'filter' => $this->formBuilder()->getForm('Drupal\locale\Form\TranslateFilterForm'),
+      'form' => $this->formBuilder()->getForm('Drupal\locale\Form\TranslateEditForm'),
     );
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserController.php b/core/modules/user/lib/Drupal/user/Controller/UserController.php
index b7196bf64f5..6710afb2a61 100644
--- a/core/modules/user/lib/Drupal/user/Controller/UserController.php
+++ b/core/modules/user/lib/Drupal/user/Controller/UserController.php
@@ -38,7 +38,7 @@ class UserController extends ControllerBase {
     else {
       // Sets the proper request.
       // @todo Remove when the request object is synchronized.
-      $form_builder = \Drupal::formBuilder();
+      $form_builder = $this->formBuilder();
       $form_builder->setRequest($request);
       $response = $form_builder->getForm('Drupal\user\Form\UserLoginForm');
     }