Commit 164ae1b9 authored by Andrey Postnikov's avatar Andrey Postnikov Committed by Kristof De Jaeger
Browse files

Issue #2893807 by andypost: Properly use Request in controller

parent 60e00111

modules/ds_devel/src/Controller/DsDevelController.php

+5 −14
Original line number Diff line number Diff line
@@ -23,13 +23,6 @@ class DsDevelController extends ControllerBase { 
   */

  protected $entityDisplayRepository;



  /**

   * The current request.

   *

   * @var \Symfony\Component\HttpFoundation\Request

   */

  protected $currentRequest;



  /**

   * The renderer.

   *
@@ -40,15 +33,12 @@ class DsDevelController extends ControllerBase { 
  /**

   * DsDevelController constructor.

   *

   * @param \Symfony\Component\HttpFoundation\Request $currentRequest

   *   The current request.

   * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $displayRepository

   *   The display repository.

   * @param \Drupal\Core\Render\RendererInterface $renderer

   *   The renderer service.

   */

  public function __construct(Request $currentRequest, EntityDisplayRepositoryInterface $displayRepository, RendererInterface $renderer) {

    $this->currentRequest = $currentRequest;

  public function __construct(EntityDisplayRepositoryInterface $displayRepository, RendererInterface $renderer) {

    $this->entityDisplayRepository = $displayRepository;

    $this->renderer = $renderer;

  }
@@ -58,7 +48,6 @@ class DsDevelController extends ControllerBase { 
   */

  public static function create(ContainerInterface $container) {

    return new static(

      $container->get('request_stack')->getCurrentRequest(),

      $container->get('entity_display.repository'),

      $container->get('renderer')

    );
@@ -69,18 +58,20 @@ class DsDevelController extends ControllerBase { 
   *

   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match

   *   A RouteMatch object.

   * @param \Symfony\Component\HttpFoundation\Request $request

   *   The request.

   *

   * @return array

   *   The Views fields report page.

   */

  public function entityMarkup(RouteMatchInterface $route_match) {

  public function entityMarkup(RouteMatchInterface $route_match, Request $request) {



    $parameter_name = $route_match->getRouteObject()

      ->getOption('_devel_entity_type_id');

    $entity = $route_match->getParameter($parameter_name);

    $entity_type_id = $entity->getEntityTypeId();



    $key = $this->currentRequest->get('key', 'default');

    $key = $request->query->get('key', 'default');



    $built_entity = $this->entityTypeManager()

      ->getViewBuilder($entity_type_id)