Commit 9343b57c authored by Atul Ghate's avatar Atul Ghate Committed by Dmitry Kiselev
Browse files

Issue #3284638 by atul ghate, JatinGupta40, Indra patil, kala4ek: Implement Dependency injection

parent 15b1f48a
Loading
Loading
Loading
Loading
+15 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
use Drupal\Core\Path\PathMatcherInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Render\RendererInterface;

/**
 * Language Switch Form.
@@ -61,6 +62,13 @@ class LanguageDropdownForm extends FormBase {
   */
  protected $moduleHandler;

  /**
   * The renderer service.
   *
   * @var Drupal\Core\Render\RendererInterface
   */
  protected $renderer;

  /**
   * {@inheritdoc}
   */
@@ -81,13 +89,16 @@ class LanguageDropdownForm extends FormBase {
   *   The current route match.
   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
   *   The module handler.
   * @param \Drupal\Core\Render\RendererInterface $renderer
   *   The Renderer
   */
  public function __construct(LanguageManagerInterface $language_manager, RequestStack $request_stack, PathMatcherInterface $path_matcher, RouteMatchInterface $route_match, ModuleHandlerInterface $module_handler) {
  public function __construct(LanguageManagerInterface $language_manager, RequestStack $request_stack, PathMatcherInterface $path_matcher, RouteMatchInterface $route_match, ModuleHandlerInterface $module_handler, RendererInterface $renderer) {
    $this->languageManager = $language_manager;
    $this->requestStack = $request_stack;
    $this->pathMatcher = $path_matcher;
    $this->routeMatch = $route_match;
    $this->moduleHandler = $module_handler;
    $this->renderer = $renderer;
  }

  /**
@@ -99,7 +110,8 @@ class LanguageDropdownForm extends FormBase {
      $container->get('request_stack'),
      $container->get('path.matcher'),
      $container->get('current_route_match'),
      $container->get('module_handler')
      $container->get('module_handler'),
      $container->get('renderer')
    );
  }

@@ -210,7 +222,7 @@ class LanguageDropdownForm extends FormBase {
        '#language' => $language,
        '#title' => $language->getName(),
      ];
      $selected_option_language_icon = \Drupal::service('renderer')->renderPlain($selected_option_language_icon);
      $selected_option_language_icon = $this->renderer->renderPlain($selected_option_language_icon);
    }

    // Add required files and settings for JS widget.