@@ -87,9 +87,9 @@ |
||
| 87 | 87 | * If a depth of 1 is requested child elements will also be returned. |
| 88 | 88 | * |
| 89 | 89 | * @param SearchResult[] $results |
| 90 | - * @param array $propertyNames |
|
| 90 | + * @param string[] $propertyNames |
|
| 91 | 91 | * @param int $depth |
| 92 | - * @return \Iterator |
|
| 92 | + * @return \Traversable |
|
| 93 | 93 | */ |
| 94 | 94 | private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0) { |
| 95 | 95 | $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; |
@@ -22,26 +22,14 @@ |
||
| 22 | 22 | namespace SearchDAV\DAV; |
| 23 | 23 | |
| 24 | 24 | use Sabre\DAV\Exception\BadRequest; |
| 25 | -use Sabre\DAV\Exception\Forbidden; |
|
| 26 | 25 | use Sabre\DAV\INode; |
| 27 | -use Sabre\DAV\Node; |
|
| 28 | 26 | use Sabre\DAV\PropFind; |
| 29 | 27 | use Sabre\DAV\Server; |
| 30 | 28 | use Sabre\DAV\ServerPlugin; |
| 31 | -use Sabre\DAV\Xml\Element\Response; |
|
| 32 | -use Sabre\DAV\Xml\Response\MultiStatus; |
|
| 33 | 29 | use Sabre\HTTP\RequestInterface; |
| 34 | 30 | use Sabre\HTTP\ResponseInterface; |
| 35 | 31 | use Sabre\Xml\ParseException; |
| 36 | -use Sabre\Xml\Writer; |
|
| 37 | 32 | use SearchDAV\Backend\ISearchBackend; |
| 38 | -use SearchDAV\Backend\SearchPropertyDefinition; |
|
| 39 | -use SearchDAV\Backend\SearchResult; |
|
| 40 | -use SearchDAV\XML\BasicSearch; |
|
| 41 | -use SearchDAV\XML\BasicSearchSchema; |
|
| 42 | -use SearchDAV\XML\PropDesc; |
|
| 43 | -use SearchDAV\XML\QueryDiscoverResponse; |
|
| 44 | -use SearchDAV\XML\Scope; |
|
| 45 | 33 | use SearchDAV\XML\SupportedQueryGrammar; |
| 46 | 34 | |
| 47 | 35 | class SearchPlugin extends ServerPlugin { |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | /** @var BasicSearch $query */ |
| 62 | 62 | $query = $xml['{DAV:}basicsearch']; |
| 63 | 63 | $scopes = $query->from; |
| 64 | - $results = array_map(function (Scope $scope) { |
|
| 64 | + $results = array_map(function(Scope $scope) { |
|
| 65 | 65 | $scope->path = $this->pathHelper->getPathFromUri($scope->href); |
| 66 | 66 | if ($this->searchBackend->isValidScope($scope->href, $scope->depth, $scope->path)) { |
| 67 | 67 | $searchProperties = $this->searchBackend->getPropertyDefinitionsForScope($scope->href, $scope->path); |