From 0022c5e115ca86f8092402f74dba2883c21cf12c Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 30 Apr 2017 00:04:05 +0100
Subject: [PATCH] Issue #2869903 by martin107: ContextualController: remove
ContainerAwareTrait
---
.../contextual/src/ContextualController.php | 34 ++++++++++++++++---
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/core/modules/contextual/src/ContextualController.php b/core/modules/contextual/src/ContextualController.php
index b1fe245c040e..0451a10e218d 100644
--- a/core/modules/contextual/src/ContextualController.php
+++ b/core/modules/contextual/src/ContextualController.php
@@ -2,8 +2,9 @@
namespace Drupal\contextual;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Render\RendererInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -11,9 +12,32 @@
/**
* Returns responses for Contextual module routes.
*/
-class ContextualController implements ContainerAwareInterface {
+class ContextualController implements ContainerInjectionInterface {
- use ContainerAwareTrait;
+ /**
+ * The renderer.
+ * @var \Drupal\Core\Render\RendererInterface
+ */
+ protected $render;
+
+ /**
+ * Constructors a new ContextualController
+ *
+ * @param \Drupal\Core\Render\RendererInterface $renderer
+ * The renderer.
+ */
+ public function __construct(RendererInterface $renderer) {
+ $this->renderer = $renderer;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('renderer')
+ );
+ }
/**
* Returns the requested rendered contextual links.
@@ -38,7 +62,7 @@ public function render(Request $request) {
'#type' => 'contextual_links',
'#contextual_links' => _contextual_id_to_links($id),
];
- $rendered[$id] = $this->container->get('renderer')->renderRoot($element);
+ $rendered[$id] = $this->renderer->renderRoot($element);
}
return new JsonResponse($rendered);
--
GitLab