From 0d4acb30ff650f53d34634aa5a741efccbf2850c Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Thu, 31 Oct 2013 11:37:55 +0000
Subject: [PATCH] Issue #2102443 by disasm, vijaycs85, rteijeiro: Remove
 drupal_set_title() in config_test() module controllers.

---
 .../lib/Drupal/config_test/ConfigTestController.php       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
index 7b4d95e8a9a..169cf890e9d 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config_test;
 
+use Drupal\Core\Controller\ControllerBase;
 use Drupal\config_test\Entity\ConfigTest;
 use Drupal\Component\Utility\String;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -15,7 +16,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
 /**
  * Route controller class for the config_test module.
  */
-class ConfigTestController {
+class ConfigTestController extends ControllerBase {
 
   /**
    * Presents the ConfigTest edit form.
@@ -27,8 +28,9 @@ class ConfigTestController {
    *   A form array as expected by drupal_render().
    */
   public function edit(ConfigTest $config_test) {
-    drupal_set_title(String::format('Edit %label', array('%label' => $config_test->label())), PASS_THROUGH);
-    return \Drupal::entityManager()->getForm($config_test);
+    $form = $this->entityManager()->getForm($config_test);
+    $form['#title'] = String::format('Edit %label', array('%label' => $config_test->label()));
+    return $form;
   }
 
   /**