robin/searchdav
1
0
Fork 0
mirror of https://codeberg.org/icewind/SearchDAV.git synced 2026-06-03 17:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

"where" is optional

Browse source
This commit is contained in:
Robin Appelman 2019-02-20 18:02:24 +01:00
commit aeb7610589
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/DAV/SearchHandler.php
View file

@ -62,11 +62,6 @@ class SearchHandler {
}
/** @var BasicSearch $query */
$query = $xml['{DAV:}basicsearch'];
if (!$query->where) {
$response->setStatus(400);
$response->setBody('Parse error: Missing {DAV:}where from {DAV:}basicsearch');
return false;
}
if (!$query->select) {
$response->setStatus(400);
$response->setBody('Parse error: Missing {DAV:}select from {DAV:}basicsearch');
@ -123,7 +118,7 @@ class SearchHandler {
}, $xml->select);
$select = array_filter($select);
$where = $this->transformOperator($xml->where, $allProps);
$where = $xml->where ? $this->transformOperator($xml->where, $allProps) : null;
return new Query($select, $xml->from, $where, $orderBy, $xml->limit);
}

4
src/Query/Query.php
View file

@ -65,11 +65,11 @@ class Query {
* Query constructor.
* @param SearchPropertyDefinition[] $select
* @param Scope[] $from
* @param Operator $where
* @param Operator|null $where
* @param Order[] $orderBy
* @param Limit $limit
*/
public function __construct(array $select, array $from, Operator $where, array $orderBy, Limit $limit) {
public function __construct(array $select, array $from, ?Operator $where, array $orderBy, Limit $limit) {
$this->select = $select;
$this->from = $from;
$this->where = $where;