Controller::setupPaginationControl: Avoid passing magic property to p…

…arameter `$query`
Icinga · Feb 21, 2024 · fa2c836 · fa2c836
1 parent d6881e0
commit fa2c836
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -5,6 +5,7 @@
 
 use Exception;
 use Icinga\Application\Version;
+use Icinga\Data\SimpleQuery;
 use InvalidArgumentException;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
@@ -129,13 +130,14 @@ public function modulesAction()
                 'url'   => 'config/modules'
             ))
             ->activate('modules');
-        $this->view->modules = Icinga::app()->getModuleManager()->select()
+        $modules = Icinga::app()->getModuleManager()->select()
             ->from('modules')
             ->order('enabled', 'desc')
             ->order('installed', 'asc')
             ->order('name');
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->modules);
+        $this->setupPaginationControl($modules);
+        $this->view->modules = $modules;
         $this->view->title = $this->translate('Modules');
     }
 

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
@@ -50,10 +50,11 @@ public function applicationlogAction()
                 . 'T[0-9]{2}(?::[0-9]{2}){2}(?:[\+\-][0-9]{2}:[0-9]{2})?)'  // time
                 . ' - (?<loglevel>[A-Za-z]+) - (?<message>.*)(?!.)/msS'     // loglevel, message
         )));
-        $this->view->logData = $resource->select()->order('DESC');
+        $logData = $resource->select()->order('DESC');
 
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->logData);
+        $this->setupPaginationControl($logData);
+        $this->view->logData = $logData;
         $this->view->title = $this->translate('Application Log');
     }
 }
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
@@ -59,7 +59,7 @@ public function indexAction()
     public function listAction()
     {
         $this->createListTabs()->activate('role/list');
-        $this->view->roles = (new RolesConfig())
+        $roles = (new RolesConfig())
             ->select();
 
         $sortAndFilterColumns = [
@@ -69,10 +69,11 @@ public function listAction()
             'permissions' => $this->translate('Permissions')
         ];
 
-        $this->setupFilterControl($this->view->roles, $sortAndFilterColumns, ['name']);
+        $this->setupFilterControl($roles, $sortAndFilterColumns, ['name']);
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->roles);
-        $this->setupSortControl($sortAndFilterColumns, $this->view->roles, ['name']);
+        $this->setupPaginationControl($roles);
+        $this->setupSortControl($sortAndFilterColumns, $roles, ['name']);
+        $this->view->roles = $roles;
     }
 
     /**

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
@@ -6,6 +6,7 @@
 use Icinga\Data\Filter\FilterEqual;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Url;
 
@@ -91,7 +92,7 @@ public function contactAction()
             $this->applyRestriction('monitoring/filter/objects', $notifications);
             $this->view->notifications = $notifications;
             $this->setupLimitControl();
-            $this->setupPaginationControl($this->view->notifications);
+            $this->setupPaginationControl($notifications);
             $this->view->title = $contact->contact_name;
         }
 

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -117,11 +117,12 @@ public function showAction()
     public function historyAction()
     {
         $this->getTabs()->activate('history');
-        $this->view->history = $this->object->fetchEventhistory()->eventhistory;
-        $this->applyRestriction('monitoring/filter/objects', $this->view->history);
+        $history = $this->object->fetchEventhistory()->eventhistory;
+        $this->applyRestriction('monitoring/filter/objects', $history);
 
         $this->setupLimitControl(50);
-        $this->setupPaginationControl($this->view->history, 50);
+        $this->setupPaginationControl($history, 50);
+        $this->view->history = $history;
         $this->view->object = $this->object;
         $this->render('object/detail-history', null, true);
     }