Commit 823a7b38 authored by Oleh Tarasiuk's avatar Oleh Tarasiuk
Browse files

#3294909 Use DI instead of service

parent b6f427ef

src/Form/MenuContentTreeForm.php

+17 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ use Drupal\content_hub_tree\HelperService; 
use Drupal\menu_link_content\MenuLinkContentStorageInterface;

use Drupal\system\Entity\Menu;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Drupal\Core\Config\ConfigFactory;



/**

 * Base form for menu edit forms.
@@ -69,6 +70,13 @@ class MenuContentTreeForm extends EntityForm { 
   */

  protected $overviewTreeForm = ['#tree' => TRUE];



  /**

   * The configuration factory.

   *

   * @var \Drupal\Core\Config\ConfigFactoryInterface

   */

  protected $configFactory;



  /**

   * Nodes.

   *
@@ -102,15 +110,20 @@ class MenuContentTreeForm extends EntityForm { 
   * @param \Drupal\menu_link_content\MenuLinkContentStorageInterface $menu_link_content_storage

   *   The menu link content storage handler.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager

   *   Provides an interface for entity type managers.

   * @param \Drupal\content_hub_tree\HelperService $helper_service

   *   The service object.

   * @param \Drupal\Core\Config\ConfigFactory $configFactory

   *   The configuration object.

   */

  public function __construct(MenuLinkManagerInterface $menu_link_manager, MenuLinkTreeInterface $menu_tree, LinkGeneratorInterface $link_generator, MenuLinkContentStorageInterface $menu_link_content_storage, EntityTypeManagerInterface $entity_type_manager, HelperService $helper_service) {

  public function __construct(MenuLinkManagerInterface $menu_link_manager, MenuLinkTreeInterface $menu_tree, LinkGeneratorInterface $link_generator, MenuLinkContentStorageInterface $menu_link_content_storage, EntityTypeManagerInterface $entity_type_manager, HelperService $helper_service, ConfigFactory $configFactory) {

    $this->menuLinkManager = $menu_link_manager;

    $this->menuTree = $menu_tree;

    $this->linkGenerator = $link_generator;

    $this->menuLinkContentStorage = $menu_link_content_storage;

    $this->entityTypeManager = $entity_type_manager;

    $this->helper = $helper_service;

    $this->configFactory = $configFactory;

  }



  /**
@@ -123,7 +136,8 @@ class MenuContentTreeForm extends EntityForm { 
      $container->get('link_generator'),

      $container->get('entity_type.manager')->getStorage('menu_link_content'),

      $container->get('entity_type.manager'),

      $container->get('content_hub_tree.helper')

      $container->get('content_hub_tree.helper'),

      $container->get('config.factory')

    );

  }
@@ -207,7 +221,7 @@ class MenuContentTreeForm extends EntityForm { 
        $url = $link->getUrlObject();



        if ($url->getRouteName() === '<front>') {

          $url = Url::fromUserInput(\Drupal::configFactory()->get('system.site')

          $url = Url::fromUserInput($this->configFactory->get('system.site')

            ->get('page.front'));

        }

        if ($url->getRouteName() === 'entity.node.canonical') {