@@ -33,7 +33,7 @@ |
||
| 33 | 33 | * |
| 34 | 34 | * @param string $href |
| 35 | 35 | * @param BasicSearchSchema|null $schema |
| 36 | - * @param null|int|string $httpStatus |
|
| 36 | + * @param integer $httpStatus |
|
| 37 | 37 | */ |
| 38 | 38 | function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) { |
| 39 | 39 | parent::__construct($href, [], $httpStatus); |
@@ -43,18 +43,18 @@ |
||
| 43 | 43 | '{DAV:}searchrequest' => Element\KeyValue::class, |
| 44 | 44 | '{DAV:}query-schema-discovery' => Element\KeyValue::class, |
| 45 | 45 | '{DAV:}basicsearch' => BasicSearch::class, |
| 46 | - '{DAV:}select' => function (Reader $reader) { |
|
| 46 | + '{DAV:}select' => function(Reader $reader) { |
|
| 47 | 47 | return \Sabre\Xml\Deserializer\keyValue($reader, '{DAV:}scope')['{DAV:}prop']; |
| 48 | 48 | }, |
| 49 | - '{DAV:}from' => function (Reader $reader) { |
|
| 49 | + '{DAV:}from' => function(Reader $reader) { |
|
| 50 | 50 | return \Sabre\Xml\Deserializer\repeatingElements($reader, '{DAV:}scope'); |
| 51 | 51 | }, |
| 52 | - '{DAV:}orderby' => function (Reader $reader) { |
|
| 52 | + '{DAV:}orderby' => function(Reader $reader) { |
|
| 53 | 53 | return \Sabre\Xml\Deserializer\repeatingElements($reader, '{DAV:}order'); |
| 54 | 54 | }, |
| 55 | 55 | '{DAV:}scope' => Scope::class, |
| 56 | - '{DAV:}where' => function (Reader $reader) { |
|
| 57 | - $operators = array_map(function ($element) { |
|
| 56 | + '{DAV:}where' => function(Reader $reader) { |
|
| 57 | + $operators = array_map(function($element) { |
|
| 58 | 58 | return $element['value']; |
| 59 | 59 | }, $reader->parseGetElements()); |
| 60 | 60 | return (isset($operators[0])) ? $operators[0] : null; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | if ($this->selectable) { |
| 49 | 49 | $data['{DAV:}selectable'] = null; |
| 50 | 50 | } |
| 51 | - $writer->write(array_map(function ($propName) { |
|
| 51 | + $writer->write(array_map(function($propName) { |
|
| 52 | 52 | return [ |
| 53 | 53 | 'name' => '{DAV:}prop', |
| 54 | 54 | 'value' => $propName |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @param string $href |
| 55 | - * @param int|string $depth |
|
| 55 | + * @param integer $depth |
|
| 56 | 56 | * @param string|null $path |
| 57 | 57 | */ |
| 58 | 58 | public function __construct($href = '', $depth = 1, $path = null) { |
@@ -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); |