Skip to content
Snippets Groups Projects

Resolve #3507579 "Revert"

Merged tonytheferg requested to merge issue/admin_toolbar-3507579:3507579-Revert into 3.x
Files
3
@@ -13,7 +13,6 @@ use Drupal\Core\Menu\MenuLinkManagerInterface;
use Drupal\Core\Plugin\CachedDiscoveryClearerInterface;
use Drupal\Core\Template\TwigEnvironment;
use Drupal\Core\Theme\Registry;
use Drupal\search\SearchPageRepositoryInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -109,13 +108,6 @@ class ToolbarController extends ControllerBase {
*/
protected $themeRegistry;
/**
* The search page repository service.
*
* @var \Drupal\search\SearchPageRepositoryInterface
*/
protected SearchPageRepositoryInterface $searchPageRepository;
/**
* Constructs a ToolbarController object.
*
@@ -143,8 +135,6 @@ class ToolbarController extends ControllerBase {
* A TwigEnvironment instance.
* @param \Drupal\Core\Theme\Registry $theme_registry
* The theme.registry service.
* @param \Drupal\search\SearchPageRepositoryInterface $search_page_repository
* The search page repository service.
*/
public function __construct(
CronInterface $cron,
@@ -158,9 +148,8 @@ class ToolbarController extends ControllerBase {
CachedDiscoveryClearerInterface $plugin_cache_clearer,
CacheBackendInterface $cache_menu,
TwigEnvironment $twig,
Registry $theme_registry,
// phpcs:ignore Drupal.Functions.MultiLineFunctionDeclaration.MissingTrailingComma
SearchPageRepositoryInterface $search_page_repository
Registry $theme_registry
) {
$this->cron = $cron;
$this->menuLinkManager = $menuLinkManager;
@@ -174,7 +163,6 @@ class ToolbarController extends ControllerBase {
$this->cacheMenu = $cache_menu;
$this->twig = $twig;
$this->themeRegistry = $theme_registry;
$this->searchPageRepository = $search_page_repository;
}
/**
@@ -193,8 +181,7 @@ class ToolbarController extends ControllerBase {
$container->get('plugin.cache_clearer'),
$container->get('cache.menu'),
$container->get('twig'),
$container->get('theme.registry'),
$container->get('search.search_page_repository')
$container->get('theme.registry')
);
}
@@ -306,18 +293,4 @@ class ToolbarController extends ControllerBase {
return new RedirectResponse($this->reloadPage());
}
/**
* Reindexes all active search pages.
*/
public function runReindexSite() {
// Ask each active search page to mark itself for re-index.
foreach ($this->searchPageRepository->getIndexableSearchPages() as $entity) {
$entity->getPlugin()->markForReindex();
}
// Run the cron to process the reindexing.
$this->cron->run();
$this->messenger()->addMessage($this->t('All search indexes have been rebuilt.'));
return new RedirectResponse($this->reloadPage());
}
}
Loading