From 2bbabe0059f9ff91eeb22a537e8ca58f836601f7 Mon Sep 17 00:00:00 2001 From: Bastian Lederer Date: Wed, 25 Mar 2026 09:16:55 +0100 Subject: [PATCH] `Controller::createColumnControl()`: Add phpdoc and remove `$resolver` param --- library/Icingadb/Web/Controller.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php index b0862c4a..d0fa71c7 100644 --- a/library/Icingadb/Web/Controller.php +++ b/library/Icingadb/Web/Controller.php @@ -84,7 +84,9 @@ class Controller extends CompatController * * @param Query $query * @param ViewModeSwitcher $viewModeSwitcher + * @param Url $suggestionUrl * @param array $defaultColumns + * @param Url $redirectUrl * * @return ColumnChooser provided columns */ @@ -92,18 +94,16 @@ class Controller extends CompatController Query $query, ViewModeSwitcher $viewModeSwitcher, Url $suggestionUrl, - Resolver $resolver, array $defaultColumns, Url $redirectUrl ): ColumnChooser { - // All of that is essentially what `ColumnControl::apply()` should do $viewMode = $viewModeSwitcher->getViewMode(); $columnsDef = $this->params->shift('columns'); if (! $columnsDef) { if ($viewMode === 'tabular') { $columns = $defaultColumns; } else { - return new ColumnChooser($suggestionUrl, $resolver); + return new ColumnChooser($suggestionUrl, $query->getResolver()); } } else { $columns = []; @@ -125,7 +125,7 @@ class Controller extends CompatController $viewModeSwitcher->setViewMode('tabular'); } - return (new ColumnChooser($suggestionUrl, $resolver, $columns)) + return (new ColumnChooser($suggestionUrl, $query->getResolver(), $columns)) ->setAction((string) Url::fromRequest()) ->on(ColumnChooser::ON_SENT, function (ColumnChooser $form) use ($redirectUrl) { if ($form->hasBeenSubmitted()) {