Skip to content

Commit ef50957

Browse files
authored
[6.x] Remove deprecated blacklist (#45722)
Removes code deprecated in favour of forbiddenlist Original PR with explanation of the deprecation #32030
1 parent 5bc85e3 commit ef50957

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

libraries/src/MVC/Model/ListModel.php

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,6 @@ class ListModel extends BaseDatabaseModel implements FormFactoryAwareInterface,
8989
*/
9090
protected $htmlFormName = 'adminForm';
9191

92-
/**
93-
* A list of filter variables to not merge into the model's state
94-
*
95-
* @var array
96-
* @since 3.4.5
97-
* @deprecated 4.0 will be removed in 6.0
98-
* Use $filterForbiddenList instead
99-
*/
100-
protected $filterBlacklist = [];
101-
10292
/**
10393
* A list of forbidden filter variables to not merge into the model's state
10494
*
@@ -107,16 +97,6 @@ class ListModel extends BaseDatabaseModel implements FormFactoryAwareInterface,
10797
*/
10898
protected $filterForbiddenList = [];
10999

110-
/**
111-
* A list of forbidden variables to not merge into the model's state
112-
*
113-
* @var array
114-
* @since 3.4.5
115-
* @deprecated 4.0 will be removed in 6.0
116-
* Use $listForbiddenList instead
117-
*/
118-
protected $listBlacklist = ['select'];
119-
120100
/**
121101
* A list of forbidden variables to not merge into the model's state
122102
*
@@ -147,22 +127,6 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
147127
if (empty($this->context)) {
148128
$this->context = strtolower($this->option . '.' . $this->getName());
149129
}
150-
151-
/**
152-
* @deprecated 4.0 will be removed in 6.0
153-
* Use $this->filterForbiddenList instead
154-
*/
155-
if (!empty($this->filterBlacklist)) {
156-
$this->filterForbiddenList = array_merge($this->filterBlacklist, $this->filterForbiddenList);
157-
}
158-
159-
/**
160-
* @deprecated 4.0 will be removed in 6.0
161-
* Use $this->listForbiddenList instead
162-
*/
163-
if (!empty($this->listBlacklist)) {
164-
$this->listForbiddenList = array_merge($this->listBlacklist, $this->listForbiddenList);
165-
}
166130
}
167131

168132
/**

0 commit comments

Comments
 (0)