nextcloud / server

apps/files_external/lib/Migration/StorageMigrator.php

Indentation +83 added lines, -83 removed lines

@@ -42,97 +42,97 @@
  * Migrate mount config from mount.json to the database
  */
 class StorageMigrator {
-	/**
-	 * @var BackendService
-	 */
-	private $backendService;
+    /**
+     * @var BackendService
+     */
+    private $backendService;
 
-	/**
-	 * @var DBConfigService
-	 */
-	private $dbConfig;
+    /**
+     * @var DBConfigService
+     */
+    private $dbConfig;
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/** @var IUserMountCache  */
-	private $userMountCache;
+    /** @var IUserMountCache  */
+    private $userMountCache;
 
-	/**
-	 * StorageMigrator constructor.
-	 *
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IConfig $config,
-		IDBConnection $connection,
-		ILogger $logger,
-		IUserMountCache $userMountCache
-	) {
-		$this->backendService = $backendService;
-		$this->dbConfig = $dbConfig;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->userMountCache = $userMountCache;
-	}
+    /**
+     * StorageMigrator constructor.
+     *
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IConfig $config,
+        IDBConnection $connection,
+        ILogger $logger,
+        IUserMountCache $userMountCache
+    ) {
+        $this->backendService = $backendService;
+        $this->dbConfig = $dbConfig;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->userMountCache = $userMountCache;
+    }
 
-	private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
-		$existingStorage = $legacyService->getAllStorages();
+    private function migrate(LegacyStoragesService $legacyService, StoragesService $storageService) {
+        $existingStorage = $legacyService->getAllStorages();
 
-		$this->connection->beginTransaction();
-		try {
-			foreach ($existingStorage as $storage) {
-				$mountOptions = $storage->getMountOptions();
-				if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
-					// existing mounts must have sharing enabled by default to avoid surprises
-					$mountOptions['enable_sharing'] = true;
-					$storage->setMountOptions($mountOptions);
-				}
-				$storageService->addStorage($storage);
-			}
-			$this->connection->commit();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			$this->connection->rollBack();
-		}
-	}
+        $this->connection->beginTransaction();
+        try {
+            foreach ($existingStorage as $storage) {
+                $mountOptions = $storage->getMountOptions();
+                if (!empty($mountOptions) && !isset($mountOptions['enable_sharing'])) {
+                    // existing mounts must have sharing enabled by default to avoid surprises
+                    $mountOptions['enable_sharing'] = true;
+                    $storage->setMountOptions($mountOptions);
+                }
+                $storageService->addStorage($storage);
+            }
+            $this->connection->commit();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            $this->connection->rollBack();
+        }
+    }
 
-	/**
-	 * Migrate personal storages configured by the current user
-	 *
-	 * @param IUser $user
-	 */
-	public function migrateUser(IUser $user) {
-		$dummySession = new DummyUserSession();
-		$dummySession->setUser($user);
-		$userId = $user->getUID();
-		$userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
-		if (version_compare($userVersion, '0.5.0', '<')) {
-			$this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
-			$legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
-			$storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
+    /**
+     * Migrate personal storages configured by the current user
+     *
+     * @param IUser $user
+     */
+    public function migrateUser(IUser $user) {
+        $dummySession = new DummyUserSession();
+        $dummySession->setUser($user);
+        $userId = $user->getUID();
+        $userVersion = $this->config->getUserValue($userId, 'files_external', 'config_version', '0.0.0');
+        if (version_compare($userVersion, '0.5.0', '<')) {
+            $this->config->setUserValue($userId, 'files_external', 'config_version', '0.5.0');
+            $legacyService = new UserLegacyStoragesService($this->backendService, $dummySession);
+            $storageService = new UserStoragesService($this->backendService, $this->dbConfig, $dummySession, $this->userMountCache);
 
-			$this->migrate($legacyService, $storageService);
-		}
-	}
+            $this->migrate($legacyService, $storageService);
+        }
+    }
 }

apps/files_sharing/lib/Scanner.php

Indentation +43 added lines, -43 removed lines

@@ -31,52 +31,52 @@
  * Scanner for SharedStorage
  */
 class Scanner extends \OC\Files\Cache\Scanner {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage;
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage;
 
-	private $sourceScanner;
+    private $sourceScanner;
 
-	/**
-	 * Returns metadata from the shared storage, but
-	 * with permissions from the source storage.
-	 *
-	 * @param string $path path of the file for which to retrieve metadata
-	 *
-	 * @return array an array of metadata of the file
-	 */
-	public function getData($path) {
-		$data = parent::getData($path);
-		if ($data === null) {
-			return null;
-		}
-		$internalPath = $this->storage->getUnjailedPath($path);
-		$data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
-		return $data;
-	}
+    /**
+     * Returns metadata from the shared storage, but
+     * with permissions from the source storage.
+     *
+     * @param string $path path of the file for which to retrieve metadata
+     *
+     * @return array an array of metadata of the file
+     */
+    public function getData($path) {
+        $data = parent::getData($path);
+        if ($data === null) {
+            return null;
+        }
+        $internalPath = $this->storage->getUnjailedPath($path);
+        $data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
+        return $data;
+    }
 
-	private function getSourceScanner() {
-		if ($this->sourceScanner) {
-			return $this->sourceScanner;
-		}
-		if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OC\Files\Storage\Storage $storage */
-			list($storage) = $this->storage->resolvePath('');
-			$this->sourceScanner = $storage->getScanner();
-			return $this->sourceScanner;
-		} else {
-			return null;
-		}
-	}
+    private function getSourceScanner() {
+        if ($this->sourceScanner) {
+            return $this->sourceScanner;
+        }
+        if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OC\Files\Storage\Storage $storage */
+            list($storage) = $this->storage->resolvePath('');
+            $this->sourceScanner = $storage->getScanner();
+            return $this->sourceScanner;
+        } else {
+            return null;
+        }
+    }
 
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		$sourceScanner = $this->getSourceScanner();
-		if ($sourceScanner instanceof NoopScanner) {
-			return [];
-		} else {
-			return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
-		}
-	}
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        $sourceScanner = $this->getSourceScanner();
+        if ($sourceScanner instanceof NoopScanner) {
+            return [];
+        } else {
+            return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
+        }
+    }
 }
 

apps/testing/lib/Controller/RateLimitTestController.php

Indentation +23 added lines, -23 removed lines

@@ -25,28 +25,28 @@
 use OCP\AppFramework\Http\JSONResponse;
 
 class RateLimitTestController extends Controller {
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @UserRateThrottle(limit=5, period=100)
-	 * @AnonRateThrottle(limit=1, period=100)
-	 *
-	 * @return JSONResponse
-	 */
-	public function userAndAnonProtected() {
-		return new JSONResponse();
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @UserRateThrottle(limit=5, period=100)
+     * @AnonRateThrottle(limit=1, period=100)
+     *
+     * @return JSONResponse
+     */
+    public function userAndAnonProtected() {
+        return new JSONResponse();
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @AnonRateThrottle(limit=1, period=10)
-	 *
-	 * @return JSONResponse
-	 */
-	public function onlyAnonProtected() {
-		return new JSONResponse();
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @AnonRateThrottle(limit=1, period=10)
+     *
+     * @return JSONResponse
+     */
+    public function onlyAnonProtected() {
+        return new JSONResponse();
+    }
 }

lib/private/Security/RateLimiting/Exception/RateLimitExceededException.php

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@
 use OCP\AppFramework\Http;
 
 class RateLimitExceededException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Rate limit exceeded', Http::STATUS_TOO_MANY_REQUESTS);
-	}
+    public function __construct() {
+        parent::__construct('Rate limit exceeded', Http::STATUS_TOO_MANY_REQUESTS);
+    }
 }

lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php

Indentation +77 added lines, -77 removed lines

@@ -48,87 +48,87 @@
  * @package OC\AppFramework\Middleware\Security
  */
 class RateLimitingMiddleware extends Middleware {
-	/** @var IRequest $request */
-	private $request;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Limiter */
-	private $limiter;
+    /** @var IRequest $request */
+    private $request;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Limiter */
+    private $limiter;
 
-	/**
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param ControllerMethodReflector $reflector
-	 * @param Limiter $limiter
-	 */
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								ControllerMethodReflector $reflector,
-								Limiter $limiter) {
-		$this->request = $request;
-		$this->userSession = $userSession;
-		$this->reflector = $reflector;
-		$this->limiter = $limiter;
-	}
+    /**
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param ControllerMethodReflector $reflector
+     * @param Limiter $limiter
+     */
+    public function __construct(IRequest $request,
+                                IUserSession $userSession,
+                                ControllerMethodReflector $reflector,
+                                Limiter $limiter) {
+        $this->request = $request;
+        $this->userSession = $userSession;
+        $this->reflector = $reflector;
+        $this->limiter = $limiter;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 * @throws RateLimitExceededException
-	 */
-	public function beforeController($controller, $methodName) {
-		parent::beforeController($controller, $methodName);
+    /**
+     * {@inheritDoc}
+     * @throws RateLimitExceededException
+     */
+    public function beforeController($controller, $methodName) {
+        parent::beforeController($controller, $methodName);
 
-		$anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
-		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
-		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
-		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
-			$this->limiter->registerUserRequest(
-				$rateLimitIdentifier,
-				$userLimit,
-				$userPeriod,
-				$this->userSession->getUser()
-			);
-		} elseif ($anonLimit !== '' && $anonPeriod !== '') {
-			$this->limiter->registerAnonRequest(
-				$rateLimitIdentifier,
-				$anonLimit,
-				$anonPeriod,
-				$this->request->getRemoteAddress()
-			);
-		}
-	}
+        $anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
+        $anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
+        $userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
+        $userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
+        $rateLimitIdentifier = get_class($controller) . '::' . $methodName;
+        if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
+            $this->limiter->registerUserRequest(
+                $rateLimitIdentifier,
+                $userLimit,
+                $userPeriod,
+                $this->userSession->getUser()
+            );
+        } elseif ($anonLimit !== '' && $anonPeriod !== '') {
+            $this->limiter->registerAnonRequest(
+                $rateLimitIdentifier,
+                $anonLimit,
+                $anonPeriod,
+                $this->request->getRemoteAddress()
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if($exception instanceof RateLimitExceededException) {
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
-				$response = new JSONResponse(
-					[
-						'message' => $exception->getMessage(),
-					],
-					$exception->getCode()
-				);
-			} else {
-					$response = new TemplateResponse(
-						'core',
-						'403',
-							[
-								'file' => $exception->getMessage()
-							],
-						'guest'
-					);
-					$response->setStatus($exception->getCode());
-			}
+    /**
+     * {@inheritDoc}
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if($exception instanceof RateLimitExceededException) {
+            if (stripos($this->request->getHeader('Accept'),'html') === false) {
+                $response = new JSONResponse(
+                    [
+                        'message' => $exception->getMessage(),
+                    ],
+                    $exception->getCode()
+                );
+            } else {
+                    $response = new TemplateResponse(
+                        'core',
+                        '403',
+                            [
+                                'file' => $exception->getMessage()
+                            ],
+                        'guest'
+                    );
+                    $response->setStatus($exception->getCode());
+            }
 
-			return $response;
-		}
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }

lib/public/BackgroundJob/IJobList.php

Indentation +86 added lines, -86 removed lines

@@ -32,100 +32,100 @@
  * @since 7.0.0
  */
 interface IJobList {
-	/**
-	 * Add a job to the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument The argument to be passed to $job->run() when the job is exectured
-	 * @since 7.0.0
-	 */
-	public function add($job, $argument = null);
+    /**
+     * Add a job to the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument The argument to be passed to $job->run() when the job is exectured
+     * @since 7.0.0
+     */
+    public function add($job, $argument = null);
 
-	/**
-	 * Remove a job from the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function remove($job, $argument = null);
+    /**
+     * Remove a job from the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function remove($job, $argument = null);
 
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param \OCP\BackgroundJob\IJob|string $job
-	 * @param mixed $argument
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public function has($job, $argument);
+    /**
+     * check if a job is in the list
+     *
+     * @param \OCP\BackgroundJob\IJob|string $job
+     * @param mixed $argument
+     * @return bool
+     * @since 7.0.0
+     */
+    public function has($job, $argument);
 
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return \OCP\BackgroundJob\IJob[]
-	 * @since 7.0.0
-	 * @deprecated 9.0.0 - This method is dangerous since it can cause load and
-	 * memory problems when creating too many instances.
-	 */
-	public function getAll();
+    /**
+     * get all jobs in the list
+     *
+     * @return \OCP\BackgroundJob\IJob[]
+     * @since 7.0.0
+     * @deprecated 9.0.0 - This method is dangerous since it can cause load and
+     * memory problems when creating too many instances.
+     */
+    public function getAll();
 
-	/**
-	 * get the next job in the list
-	 *
-	 * @return \OCP\BackgroundJob\IJob|null
-	 * @since 7.0.0
-	 */
-	public function getNext();
+    /**
+     * get the next job in the list
+     *
+     * @return \OCP\BackgroundJob\IJob|null
+     * @since 7.0.0
+     */
+    public function getNext();
 
-	/**
-	 * @param int $id
-	 * @return \OCP\BackgroundJob\IJob|null
-	 * @since 7.0.0
-	 */
-	public function getById($id);
+    /**
+     * @param int $id
+     * @return \OCP\BackgroundJob\IJob|null
+     * @since 7.0.0
+     */
+    public function getById($id);
 
-	/**
-	 * set the job that was last ran to the current time
-	 *
-	 * @param \OCP\BackgroundJob\IJob $job
-	 * @since 7.0.0
-	 */
-	public function setLastJob(IJob $job);
+    /**
+     * set the job that was last ran to the current time
+     *
+     * @param \OCP\BackgroundJob\IJob $job
+     * @since 7.0.0
+     */
+    public function setLastJob(IJob $job);
 
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @param IJob $job
-	 * @since 9.1.0
-	 */
-	public function unlockJob(IJob $job);
+    /**
+     * Remove the reservation for a job
+     *
+     * @param IJob $job
+     * @since 9.1.0
+     */
+    public function unlockJob(IJob $job);
 
-	/**
-	 * get the id of the last ran job
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
-	 *    only tells you which job finished last, but since we now allow multiple
-	 *    executors to run in parallel, it's not used to calculate the next job.
-	 */
-	public function getLastJob();
+    /**
+     * get the id of the last ran job
+     *
+     * @return int
+     * @since 7.0.0
+     * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
+     *    only tells you which job finished last, but since we now allow multiple
+     *    executors to run in parallel, it's not used to calculate the next job.
+     */
+    public function getLastJob();
 
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @param IJob $job
-	 * @since 7.0.0
-	 */
-	public function setLastRun(IJob $job);
+    /**
+     * set the lastRun of $job to now
+     *
+     * @param IJob $job
+     * @since 7.0.0
+     */
+    public function setLastRun(IJob $job);
 
-	/**
-	 * set the run duration of $job
-	 *
-	 * @param IJob $job
-	 * @param $timeTaken
-	 * @since 12.0.0
-	 */
-	public function setExecutionTime(IJob $job, $timeTaken);
+    /**
+     * set the run duration of $job
+     *
+     * @param IJob $job
+     * @param $timeTaken
+     * @since 12.0.0
+     */
+    public function setExecutionTime(IJob $job, $timeTaken);
 }

apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php

Indentation +129 added lines, -129 removed lines

@@ -35,133 +35,133 @@
  */
 class CalendarSearchReport implements XmlDeserializable {
 
-	/**
-	 * An array with requested properties.
-	 *
-	 * @var array
-	 */
-	public $properties;
-
-	/**
-	 * List of property/component filters.
-	 *
-	 * @var array
-	 */
-	public $filters;
-
-	/**
-	 * @var int
-	 */
-	public $limit;
-
-	/**
-	 * @var int
-	 */
-	public $offset;
-
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statically, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$elems = $reader->parseInnerTree([
-			'{http://nextcloud.com/ns}comp-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
-			'{http://nextcloud.com/ns}prop-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
-			'{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
-			'{http://nextcloud.com/ns}search-term'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
-			'{http://nextcloud.com/ns}limit'        => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
-			'{http://nextcloud.com/ns}offset'       => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
-			'{DAV:}prop'                            => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
-
-		$newProps = [
-			'filters'    => [],
-			'properties' => [],
-			'limit'      => null,
-			'offset'     => null
-		];
-
-		if (!is_array($elems)) {
-			$elems = [];
-		}
-
-		foreach ($elems as $elem) {
-			switch ($elem['name']) {
-				case '{DAV:}prop':
-					$newProps['properties'] = array_keys($elem['value']);
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}filter':
-					foreach ($elem['value'] as $subElem) {
-						if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
-							if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
-								$newProps['filters']['comps'] = [];
-							}
-							$newProps['filters']['comps'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
-							if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
-								$newProps['filters']['props'] = [];
-							}
-							$newProps['filters']['props'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
-							if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
-								$newProps['filters']['params'] = [];
-							}
-							$newProps['filters']['params'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
-							$newProps['filters']['search-term'] = $subElem['value'];
-						}
-					}
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}limit':
-					$newProps['limit'] = $elem['value'];
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}offset':
-					$newProps['offset'] = $elem['value'];
-					break;
-
-			}
-		}
-
-		if (empty($newProps['filters'])) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
-		}
-
-		$propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
-		$noCompsDefined = empty($newProps['filters']['comps']);
-		if ($propsOrParamsDefined && $noCompsDefined) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
-		}
-
-		if (!isset($newProps['filters']['search-term'])) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
-		}
-
-		if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
-			throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
-		}
-
-
-		$obj = new self();
-		foreach ($newProps as $key => $value) {
-			$obj->$key = $value;
-		}
-		return $obj;
-	}
+    /**
+     * An array with requested properties.
+     *
+     * @var array
+     */
+    public $properties;
+
+    /**
+     * List of property/component filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * @var int
+     */
+    public $limit;
+
+    /**
+     * @var int
+     */
+    public $offset;
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statically, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $elems = $reader->parseInnerTree([
+            '{http://nextcloud.com/ns}comp-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
+            '{http://nextcloud.com/ns}prop-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
+            '{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
+            '{http://nextcloud.com/ns}search-term'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
+            '{http://nextcloud.com/ns}limit'        => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
+            '{http://nextcloud.com/ns}offset'       => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
+            '{DAV:}prop'                            => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
+
+        $newProps = [
+            'filters'    => [],
+            'properties' => [],
+            'limit'      => null,
+            'offset'     => null
+        ];
+
+        if (!is_array($elems)) {
+            $elems = [];
+        }
+
+        foreach ($elems as $elem) {
+            switch ($elem['name']) {
+                case '{DAV:}prop':
+                    $newProps['properties'] = array_keys($elem['value']);
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}filter':
+                    foreach ($elem['value'] as $subElem) {
+                        if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
+                            if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
+                                $newProps['filters']['comps'] = [];
+                            }
+                            $newProps['filters']['comps'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
+                            if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
+                                $newProps['filters']['props'] = [];
+                            }
+                            $newProps['filters']['props'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
+                            if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
+                                $newProps['filters']['params'] = [];
+                            }
+                            $newProps['filters']['params'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
+                            $newProps['filters']['search-term'] = $subElem['value'];
+                        }
+                    }
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}limit':
+                    $newProps['limit'] = $elem['value'];
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}offset':
+                    $newProps['offset'] = $elem['value'];
+                    break;
+
+            }
+        }
+
+        if (empty($newProps['filters'])) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
+        }
+
+        $propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
+        $noCompsDefined = empty($newProps['filters']['comps']);
+        if ($propsOrParamsDefined && $noCompsDefined) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
+        }
+
+        if (!isset($newProps['filters']['search-term'])) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
+        }
+
+        if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
+            throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
+        }
+
+
+        $obj = new self();
+        foreach ($newProps as $key => $value) {
+            $obj->$key = $value;
+        }
+        return $obj;
+    }
 }

lib/private/App/AppStore/Bundles/CoreBundle.php

Indentation +14 added lines, -14 removed lines

@@ -23,20 +23,20 @@
 
 class CoreBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return 'Core bundle';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return 'Core bundle';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'bruteforcesettings',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'bruteforcesettings',
+        ];
+    }
 
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	public final function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    public final function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	public abstract function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    public abstract function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	public abstract function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    public abstract function getAppIdentifiers();
 }