Skip to content

Commit ab84bb7

Browse files
jrauh01jrauh01
committed
Remove superfluous $filter property
1 parent 84361d5 commit ab84bb7

6 files changed

Lines changed: 6 additions & 113 deletions

File tree

‎application/controllers/ChannelsController.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Icinga\Web\Widget\Tabs;
1717
use ipl\Html\Contract\Form;
1818
use ipl\Sql\Expression;
19-
use ipl\Stdlib\Filter;
2019
use ipl\Web\Compat\CompatController;
2120
use ipl\Web\Compat\SearchControls;
2221
use ipl\Web\Control\LimitControl;
@@ -29,9 +28,6 @@ class ChannelsController extends CompatController
2928
{
3029
use SearchControls;
3130

32-
/** @var ?Filter\Rule Filter from query string parameters */
33-
private ?Filter\Rule $filter = null;
34-
3531
public function init(): void
3632
{
3733
$this->assertPermission('config/modules');
@@ -64,7 +60,7 @@ public function indexAction(): void
6460

6561
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
6662
if ($searchBar->hasBeenSubmitted()) {
67-
$filter = $this->getFilter();
63+
$filter = QueryString::parse((string) $this->params);
6864
} else {
6965
$this->addControl($searchBar);
7066
$this->sendMultipartUpdate();
@@ -147,20 +143,6 @@ public function searchEditorAction(): void
147143
$this->setTitle($this->translate('Adjust Filter'));
148144
}
149145

150-
/**
151-
* Get the filter created from query string parameters
152-
*
153-
* @return Filter\Rule
154-
*/
155-
protected function getFilter(): Filter\Rule
156-
{
157-
if ($this->filter === null) {
158-
$this->filter = QueryString::parse((string) $this->params);
159-
}
160-
161-
return $this->filter;
162-
}
163-
164146
/**
165147
* Merge tabs with other tabs contained in this tab panel
166148
*

‎application/controllers/ContactGroupsController.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
use ipl\Html\HtmlString;
2121
use ipl\Html\TemplateString;
2222
use ipl\Sql\Expression;
23-
use ipl\Stdlib\Filter;
2423
use ipl\Web\Compat\CompatController;
2524
use ipl\Web\Compat\SearchControls;
2625
use ipl\Web\Control\LimitControl;
@@ -35,9 +34,6 @@ class ContactGroupsController extends CompatController
3534
use ConfigurationTabs;
3635
use SearchControls;
3736

38-
/** @var ?Filter\Rule Filter from query string parameters */
39-
private ?Filter\Rule $filter = null;
40-
4137
public function init(): void
4238
{
4339
$this->assertPermission('notifications/config/contacts');
@@ -70,7 +66,7 @@ public function indexAction(): void
7066

7167
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
7268
if ($searchBar->hasBeenSubmitted()) {
73-
$filter = $this->getFilter();
69+
$filter = QueryString::parse((string) $this->params);
7470
} else {
7571
$this->addControl($searchBar);
7672
$this->sendMultipartUpdate();
@@ -203,18 +199,4 @@ public function suggestMemberAction(): void
203199

204200
$this->getDocument()->addHtml($members);
205201
}
206-
207-
/**
208-
* Get the filter created from query string parameters
209-
*
210-
* @return Filter\Rule
211-
*/
212-
private function getFilter(): Filter\Rule
213-
{
214-
if ($this->filter === null) {
215-
$this->filter = QueryString::parse((string) $this->params);
216-
}
217-
218-
return $this->filter;
219-
}
220202
}

‎application/controllers/ContactsController.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use ipl\Html\TemplateString;
1919
use ipl\Sql\Connection;
2020
use ipl\Sql\Expression;
21-
use ipl\Stdlib\Filter;
2221
use ipl\Web\Compat\CompatController;
2322
use ipl\Web\Compat\SearchControls;
2423
use ipl\Web\Control\LimitControl;
@@ -36,9 +35,6 @@ class ContactsController extends CompatController
3635
/** @var Connection */
3736
private Connection $db;
3837

39-
/** @var ?Filter\Rule Filter from query string parameters */
40-
private ?Filter\Rule $filter = null;
41-
4238
public function init(): void
4339
{
4440
$this->assertPermission('notifications/config/contacts');
@@ -73,7 +69,7 @@ public function indexAction(): void
7369

7470
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
7571
if ($searchBar->hasBeenSubmitted()) {
76-
$filter = $this->getFilter();
72+
$filter = QueryString::parse((string) $this->params);
7773
} else {
7874
$this->addControl($searchBar);
7975
$this->sendMultipartUpdate();
@@ -164,18 +160,4 @@ public function searchEditorAction(): void
164160
$this->getDocument()->add($editor);
165161
$this->setTitle($this->translate('Adjust Filter'));
166162
}
167-
168-
/**
169-
* Get the filter created from query string parameters
170-
*
171-
* @return Filter\Rule
172-
*/
173-
protected function getFilter(): Filter\Rule
174-
{
175-
if ($this->filter === null) {
176-
$this->filter = QueryString::parse((string) $this->params);
177-
}
178-
179-
return $this->filter;
180-
}
181163
}

‎application/controllers/EventsController.php‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ class EventsController extends CompatController
2525
use Auth;
2626
use SearchControls;
2727

28-
/** @var ?Filter\Rule Filter from query string parameters */
29-
private ?Filter\Rule $filter = null;
30-
3128
public function indexAction(): void
3229
{
3330
$this->addTitleTab(t('Events'));
@@ -56,7 +53,7 @@ public function indexAction(): void
5653

5754
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
5855
if ($searchBar->hasBeenSubmitted()) {
59-
$filter = $this->getFilter();
56+
$filter = QueryString::parse((string) $this->params);
6057
} else {
6158
$this->addControl($searchBar);
6259
$this->sendMultipartUpdate();
@@ -130,18 +127,4 @@ public function searchEditorAction(): void
130127
$this->getDocument()->add($editor);
131128
$this->setTitle(t('Adjust Filter'));
132129
}
133-
134-
/**
135-
* Get the filter created from query string parameters
136-
*
137-
* @return Filter\Rule
138-
*/
139-
protected function getFilter(): Filter\Rule
140-
{
141-
if ($this->filter === null) {
142-
$this->filter = QueryString::parse((string) $this->params);
143-
}
144-
145-
return $this->filter;
146-
}
147130
}

‎application/controllers/IncidentsController.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Icinga\Module\Notifications\View\IncidentRenderer;
1212
use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
1313
use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
14-
use ipl\Stdlib\Filter;
1514
use ipl\Web\Compat\CompatController;
1615
use ipl\Web\Compat\SearchControls;
1716
use ipl\Web\Control\LimitControl;
@@ -26,9 +25,6 @@ class IncidentsController extends CompatController
2625
use Auth;
2726
use SearchControls;
2827

29-
/** @var ?Filter\Rule Filter from query string parameters */
30-
private ?Filter\Rule $filter = null;
31-
3228
public function indexAction(): void
3329
{
3430
$this->addTitleTab(t('Incidents'));
@@ -55,7 +51,7 @@ public function indexAction(): void
5551

5652
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
5753
if ($searchBar->hasBeenSubmitted()) {
58-
$filter = $this->getFilter();
54+
$filter = QueryString::parse((string) $this->params);
5955
} else {
6056
$this->addControl($searchBar);
6157
$this->sendMultipartUpdate();
@@ -114,18 +110,4 @@ protected function getPageSize($default)
114110
{
115111
return parent::getPageSize($default ?? 50);
116112
}
117-
118-
/**
119-
* Get the filter created from query string parameters
120-
*
121-
* @return Filter\Rule
122-
*/
123-
public function getFilter(): Filter\Rule
124-
{
125-
if ($this->filter === null) {
126-
$this->filter = QueryString::parse((string) $this->params);
127-
}
128-
129-
return $this->filter;
130-
}
131113
}

‎application/controllers/SchedulesController.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Icinga\Module\Notifications\View\ScheduleRenderer;
1212
use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
1313
use Icinga\Module\Notifications\Widget\ItemList\ObjectList;
14-
use ipl\Stdlib\Filter;
1514
use ipl\Web\Compat\CompatController;
1615
use ipl\Web\Compat\SearchControls;
1716
use ipl\Web\Control\LimitControl;
@@ -24,9 +23,6 @@ class SchedulesController extends CompatController
2423
use ConfigurationTabs;
2524
use SearchControls;
2625

27-
/** @var ?Filter\Rule Filter from query string parameters */
28-
private ?Filter\Rule $filter = null;
29-
3026
public function init(): void
3127
{
3228
$this->assertPermission('notifications/config/schedules');
@@ -56,7 +52,7 @@ public function indexAction(): void
5652

5753
if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
5854
if ($searchBar->hasBeenSubmitted()) {
59-
$filter = $this->getFilter();
55+
$filter = QueryString::parse((string) $this->params);
6056
} else {
6157
$this->addControl($searchBar);
6258
$this->sendMultipartUpdate();
@@ -108,18 +104,4 @@ public function searchEditorAction(): void
108104
$this->getDocument()->add($editor);
109105
$this->setTitle(t('Adjust Filter'));
110106
}
111-
112-
/**
113-
* Get the filter created from query string parameters
114-
*
115-
* @return Filter\Rule
116-
*/
117-
private function getFilter(): Filter\Rule
118-
{
119-
if ($this->filter === null) {
120-
$this->filter = QueryString::parse((string) $this->params);
121-
}
122-
123-
return $this->filter;
124-
}
125107
}

0 commit comments

Comments
 (0)