tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MNT Deprecate unusable property

Browse Source 
This property must always have the value 'AND' or an exception will be
thrown - it should be deprecated. Also, no need to process the query
before throwing.
This commit is contained in:
Guy Sartorelli 2022-06-30 10:53:02 +12:00
parent 76be4578d6
commit 4e53c35b53
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ORM/Search/SearchContext.php
View File

@ -74,7 +74,8 @@ class SearchContext
protected $searchParams = []; protected $searchParams = [];
/** /**
* The logical connective used to join WHERE clauses. Defaults to AND. * The logical connective used to join WHERE clauses. Must be "AND".
* @deprecated 5.0
* @var string * @var string
*/ */
public $connective = 'AND'; public $connective = 'AND';
@ -146,6 +147,10 @@ class SearchContext
*/ */
public function getQuery($searchParams, $sort = false, $limit = false, $existingQuery = null) public function getQuery($searchParams, $sort = false, $limit = false, $existingQuery = null)
{ {
if ($this->connective != "AND") {
throw new Exception("SearchContext connective '$this->connective' not supported after ORM-rewrite.");
}
/** DataList $query */ /** DataList $query */
$query = null; $query = null;
if ($existingQuery) { if ($existingQuery) {
@ -204,10 +209,6 @@ class SearchContext
} }
} }
if ($this->connective != "AND") {
throw new Exception("SearchContext connective '$this->connective' not supported after ORM-rewrite.");
}
return $query; return $query;
} }