fmt

src/Backend/SearchResult.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Backend;
 
-
 use Sabre\DAV\INode;
 
 class SearchResult {

src/DAV/SearchHandler.php

@@ -85,8 +85,10 @@ class SearchHandler {
 			$response->setBody($e->getMessage());
 			return false;
 		}
-		$data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results,
+		$data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults(
-			$query->select)), false);
+			$results,
+			$query->select
+		)), false);
 		$response->setBody($data);
 		return false;
 	}

src/Query/Limit.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Query;
 
-
 class Limit {
 	/**
 	 * @var integer

src/Query/Literal.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Query;
 
-
 class Literal {
 	/**
 	 * @var string|boolean|\DateTime|integer

src/Query/Order.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Query;
 
-
 use SearchDAV\Backend\SearchPropertyDefinition;
 
 class Order {

src/Query/Query.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Query;
 
-
 use SearchDAV\Backend\SearchPropertyDefinition;
 
 class Query {

src/Query/Scope.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\Query;
 
-
 class Scope {
 	/**
 	 * @var string

src/XML/BasicSearch.php

@@ -70,7 +70,7 @@ class BasicSearch implements XmlDeserializable {
 	 * @return BasicSearch
 	 * @throws ParseException
 	 */
-	static function xmlDeserialize(Reader $reader): BasicSearch {
+	public static function xmlDeserialize(Reader $reader): BasicSearch {
 		$search = new self();
 
 		$elements = \Sabre\Xml\Deserializer\keyValue($reader);

src/XML/BasicSearchSchema.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
@@ -38,7 +37,7 @@ class BasicSearchSchema implements XmlSerializable {
 		$this->properties = $properties;
 	}
 
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		$childs = array_map(function (PropDesc $propDesc) {
 			return [
 				'name'  => '{DAV:}propdesc',

src/XML/Limit.php

@@ -29,7 +29,7 @@ use SearchDAV\DAV\SearchPlugin;
  * The limit and offset of a search query
  */
 class Limit extends \SearchDAV\Query\Limit implements XmlDeserializable {
-	static function xmlDeserialize(Reader $reader): Limit {
+	public static function xmlDeserialize(Reader $reader): Limit {
 		$limit = new self();
 
 		$elements = \Sabre\Xml\Deserializer\keyValue($reader);

src/XML/Literal.php

@@ -21,12 +21,11 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
 
 class Literal extends \SearchDAV\Query\Literal implements XmlDeserializable {
-	static function xmlDeserialize(Reader $reader): Literal {
+	public static function xmlDeserialize(Reader $reader): Literal {
 		$literal = new self();
 
 		if ($reader->isEmptyElement) {

src/XML/Operator.php

@@ -56,7 +56,7 @@ class Operator implements XmlDeserializable {
 		$this->arguments = $arguments;
 	}
 
-	static function xmlDeserialize(Reader $reader): Operator {
+	public static function xmlDeserialize(Reader $reader): Operator {
 		$operator = new self();
 
 		$operator->type = $reader->getClark() ?? '';

src/XML/Order.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
 
@@ -50,7 +49,7 @@ class Order implements XmlDeserializable {
 		$this->order = $order;
 	}
 
-	static function xmlDeserialize(Reader $reader): Order {
+	public static function xmlDeserialize(Reader $reader): Order {
 		$order = new self();
 
 		$childs = \Sabre\Xml\Deserializer\keyValue($reader);

src/XML/PropDesc.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
@@ -47,7 +46,7 @@ class PropDesc implements XmlSerializable {
 	 */
 	public $sortable;
 
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		$data = [
 			'{DAV:}dataType' => [$this->dataType => null]
 		];

src/XML/QueryDiscoverResponse.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\DAV\Xml\Element\Response;
 use Sabre\Xml\Writer;
 
@@ -38,16 +37,15 @@ class QueryDiscoverResponse extends Response {
 	 * @param BasicSearchSchema|null $schema
 	 * @param null|int|string $httpStatus
 	 */
-	function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) {
+	public function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) {
 		if ($httpStatus !== null) {
 			$httpStatus = (string)$httpStatus;
 		}
 		parent::__construct($href, [], $httpStatus);
 		$this->schema = $schema;
-
 	}
 
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		if ($status = $this->getHTTPStatus()) {
 			$writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
 		}

src/XML/Scope.php

@@ -25,7 +25,7 @@ use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
 
 class Scope extends \SearchDAV\Query\Scope implements XmlDeserializable {
-	static function xmlDeserialize(Reader $reader): Scope {
+	public static function xmlDeserialize(Reader $reader): Scope {
 		$scope = new self();
 
 		$values = \Sabre\Xml\Deserializer\keyValue($reader);

src/XML/SupportedQueryGrammar.php

@@ -21,7 +21,6 @@
 
 namespace SearchDAV\XML;
 
-
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
@@ -30,7 +29,7 @@ class SupportedQueryGrammar implements XmlSerializable {
 
 	public $grammar = self::GRAMMAR_BASICSEARCH;
 
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		$writer->startElement('{DAV:}supported-query-grammar');
 		$writer->startElement('{DAV:}grammar');
 		$writer->startElement($this->grammar);

tests/DummyBackend.php

@@ -54,6 +54,5 @@ class DummyBackend implements ISearchBackend {
 	}
 
 	public function preloadPropertyFor(array $nodes, array $requestProperties): void {
-
 	}
 }

tests/QueryParserTest.php

@@ -33,7 +33,6 @@ use SearchDAV\XML\Order;
 use SearchDAV\XML\Scope;
 use SearchDAV\XML\SupportedQueryGrammar;
 
-
 class QueryParserTest extends TestCase {
 	public function testParseBasicQuery() {
 		$query = file_get_contents(__DIR__ . '/basicquery.xml');

tests/SearchPluginTest.php

@@ -180,12 +180,22 @@ class SearchPluginTest extends TestCase {
 		$this->searchBackend->expects($this->once())
 			->method('getPropertyDefinitionsForScope')
 			->willReturn([
-				new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true,
+				new SearchPropertyDefinition(
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					'{DAV:}getcontentlength',
+					true,
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
 				new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
 				new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
-				new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true,
+				new SearchPropertyDefinition(
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					'{http://ns.nextcloud.com:}fileid',
+					false,
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
 			]);
 
 		$plugin->searchHandler($request, $response);
@@ -274,8 +284,13 @@ class SearchPluginTest extends TestCase {
 			->method('isValidScope')
 			->willReturn(true);
 
-		$lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true,
+		$lengthProp = new SearchPropertyDefinition(
-			SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER);
+			'{DAV:}getcontentlength',
+			true,
+			true,
+			true,
+			SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+		);
 		$orderBy = [
 			new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC),
 		];
@@ -347,8 +362,13 @@ class SearchPluginTest extends TestCase {
 			->method('getArbiterPath')
 			->willReturn('foo');
 
-		$lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true,
+		$lengthProp = new SearchPropertyDefinition(
-			SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER);
+			'{DAV:}getcontentlength',
+			true,
+			true,
+			true,
+			SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+		);
 		$plugin = new SearchPlugin($this->searchBackend);
 		$server = new Server();
 		$plugin->initialize($server);
@@ -483,8 +503,13 @@ class SearchPluginTest extends TestCase {
 		$this->searchBackend->expects($this->once())
 			->method('getPropertyDefinitionsForScope')
 			->willReturn([
-				new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true,
+				new SearchPropertyDefinition(
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					'{http://ns.nextcloud.com:}fileid',
+					false,
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
 			]);
 
 		$plugin->searchHandler($request, $response);
@@ -518,10 +543,20 @@ class SearchPluginTest extends TestCase {
 		$this->searchBackend->expects($this->any())
 			->method('getPropertyDefinitionsForScope')
 			->willReturn([
-				new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true,
+				new SearchPropertyDefinition(
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					'{http://ns.nextcloud.com:}fileid',
-				new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true,
+					false,
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
+				new SearchPropertyDefinition(
+					'{DAV:}getcontentlength',
+					true,
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
 			]);
 
 		$plugin->searchHandler($request, $response);
@@ -555,15 +590,24 @@ class SearchPluginTest extends TestCase {
 		$this->searchBackend->expects($this->any())
 			->method('getPropertyDefinitionsForScope')
 			->willReturn([
-				new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true,
+				new SearchPropertyDefinition(
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					'{http://ns.nextcloud.com:}fileid',
-				new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true,
+					false,
-					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
+				new SearchPropertyDefinition(
+					'{DAV:}getcontentlength',
+					true,
+					true,
+					true,
+					SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER
+				),
 			]);
 
 		$plugin->searchHandler($request, $response);
 
 		$this->assertEquals(400, $response->getStatus());
 	}
-
 }