nextcloud / server

apps/dav/lib/DAV/Sharing/Plugin.php

Indentation +171 added lines, -171 removed lines

@@ -38,175 +38,175 @@
 use Sabre\HTTP\ResponseInterface;
 
 class Plugin extends ServerPlugin {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
-
-	/** @var Auth */
-	private $auth;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Auth $authBackEnd
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
-		$this->auth = $authBackEnd;
-		$this->request = $request;
-		$this->config = $config;
-	}
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		return ['oc-resource-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'oc-resource-sharing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on a dav resource.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			// Dealing with the 'share' document, which modified invitees on a
-			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
-
-				// We can only deal with IShareableCalendar objects
-				if (!$node instanceof IShareable) {
-					return;
-				}
-
-				$this->server->transactionType = 'post-oc-resource-share';
-
-				// Getting ACL info
-				$acl = $this->server->getPlugin('acl');
-
-				// If there's no ACL support, we allow everything
-				if ($acl) {
-					/** @var \Sabre\DAVACL\Plugin $acl */
-					$acl->checkPrivileges($path, '{DAV:}write');
-
-					$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-					$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-					if ($limitSharingToOwner && !$isOwner) {
-						return;
-					}
-				}
-
-				$node->updateShares($message->set, $message->remove);
-
-				$response->setStatus(200);
-				// Adding this because sending a response body may cause issues,
-				// and I wanted some type of indicator the response was handled.
-				$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-				// Breaking the event chain
-				return false;
-		}
-	}
-
-	/**
-	 * This event is triggered when properties are requested for a certain
-	 * node.
-	 *
-	 * This allows us to inject any properties early.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IShareable) {
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
-				return new Invite(
-					$node->getShares()
-				);
-			});
-		}
-	}
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+
+    /** @var Auth */
+    private $auth;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Auth $authBackEnd
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
+        $this->auth = $authBackEnd;
+        $this->request = $request;
+        $this->config = $config;
+    }
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        return ['oc-resource-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'oc-resource-sharing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on a dav resource.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            // Dealing with the 'share' document, which modified invitees on a
+            // calendar.
+            case '{' . self::NS_OWNCLOUD . '}share':
+
+                // We can only deal with IShareableCalendar objects
+                if (!$node instanceof IShareable) {
+                    return;
+                }
+
+                $this->server->transactionType = 'post-oc-resource-share';
+
+                // Getting ACL info
+                $acl = $this->server->getPlugin('acl');
+
+                // If there's no ACL support, we allow everything
+                if ($acl) {
+                    /** @var \Sabre\DAVACL\Plugin $acl */
+                    $acl->checkPrivileges($path, '{DAV:}write');
+
+                    $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                    $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                    if ($limitSharingToOwner && !$isOwner) {
+                        return;
+                    }
+                }
+
+                $node->updateShares($message->set, $message->remove);
+
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+        }
+    }
+
+    /**
+     * This event is triggered when properties are requested for a certain
+     * node.
+     *
+     * This allows us to inject any properties early.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IShareable) {
+            $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+                return new Invite(
+                    $node->getShares()
+                );
+            });
+        }
+    }
 }

apps/files_external/lib/Migration/DummyUserSession.php

Indentation +34 added lines, -34 removed lines

@@ -29,45 +29,45 @@
 
 class DummyUserSession implements IUserSession {
 
-	/**
-	 * @var IUser
-	 */
-	private $user;
+    /**
+     * @var IUser
+     */
+    private $user;
 
-	public function login($uid, $password) {
-	}
+    public function login($uid, $password) {
+    }
 
-	public function logout() {
-	}
+    public function logout() {
+    }
 
-	public function setUser($user) {
-		$this->user = $user;
-	}
+    public function setUser($user) {
+        $this->user = $user;
+    }
 
-	public function getUser() {
-		return $this->user;
-	}
+    public function getUser() {
+        return $this->user;
+    }
 
-	public function isLoggedIn() {
-		return !is_null($this->user);
-	}
+    public function isLoggedIn() {
+        return !is_null($this->user);
+    }
 
-	/**
-	 * get getImpersonatingUserID
-	 *
-	 * @return string|null
-	 * @since 17.0.0
-	 */
-	public function getImpersonatingUserID() : ?string {
-		return null;
-	}
+    /**
+     * get getImpersonatingUserID
+     *
+     * @return string|null
+     * @since 17.0.0
+     */
+    public function getImpersonatingUserID() : ?string {
+        return null;
+    }
 
-	/**
-	 * set setImpersonatingUserID
-	 *
-	 * @since 17.0.0
-	 */
-	public function setImpersonatingUserID(bool $useCurrentUser = true): void {
-		//no OP
-	}
+    /**
+     * set setImpersonatingUserID
+     *
+     * @since 17.0.0
+     */
+    public function setImpersonatingUserID(bool $useCurrentUser = true): void {
+        //no OP
+    }
 }

apps/files_external/lib/Lib/Auth/Password/UserProvided.php

Indentation +39 added lines, -39 removed lines

@@ -38,51 +38,51 @@
  * User provided Username and Password
  */
 class UserProvided extends AuthMechanism implements IUserProvided {
-	public const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/';
+    public const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/';
 
-	/** @var ICredentialsManager */
-	protected $credentialsManager;
+    /** @var ICredentialsManager */
+    protected $credentialsManager;
 
-	public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
-		$this->credentialsManager = $credentialsManager;
+    public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
+        $this->credentialsManager = $credentialsManager;
 
-		$this
-			->setIdentifier('password::userprovided')
-			->setVisibility(BackendService::VISIBILITY_ADMIN)
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('User entered, store in database'))
-			->addParameters([
-				(new DefinitionParameter('user', $l->t('Username')))
-					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD)
-					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
-			]);
-	}
+        $this
+            ->setIdentifier('password::userprovided')
+            ->setVisibility(BackendService::VISIBILITY_ADMIN)
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('User entered, store in database'))
+            ->addParameters([
+                (new DefinitionParameter('user', $l->t('Username')))
+                    ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD)
+                    ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+            ]);
+    }
 
-	private function getCredentialsIdentifier($storageId) {
-		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
-	}
+    private function getCredentialsIdentifier($storageId) {
+        return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
+    }
 
-	public function saveBackendOptions(IUser $user, $mountId, array $options) {
-		$this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($mountId), [
-			'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array
-			'password' => $options['password'] // this way we prevent users from being able to modify any other field
-		]);
-	}
+    public function saveBackendOptions(IUser $user, $mountId, array $options) {
+        $this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($mountId), [
+            'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array
+            'password' => $options['password'] // this way we prevent users from being able to modify any other field
+        ]);
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		if (!isset($user)) {
-			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
-		}
-		$uid = $user->getUID();
-		$credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId()));
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        if (!isset($user)) {
+            throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+        }
+        $uid = $user->getUID();
+        $credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId()));
 
-		if (!isset($credentials)) {
-			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
-		}
+        if (!isset($credentials)) {
+            throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+        }
 
-		$storage->setBackendOption('user', $credentials['user']);
-		$storage->setBackendOption('password', $credentials['password']);
-	}
+        $storage->setBackendOption('user', $credentials['user']);
+        $storage->setBackendOption('password', $credentials['password']);
+    }
 }

lib/private/SystemTag/SystemTagManager.php

Indentation +385 added lines, -385 removed lines

@@ -45,389 +45,389 @@
  * Manager class for system tags
  */
 class SystemTagManager implements ISystemTagManager {
-	public const TAG_TABLE = 'systemtag';
-	public const TAG_GROUP_TABLE = 'systemtag_group';
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * Prepared query for selecting tags directly
-	 *
-	 * @var \OCP\DB\QueryBuilder\IQueryBuilder
-	 */
-	private $selectTagQuery;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-		$this->dispatcher = $dispatcher;
-
-		$query = $this->connection->getQueryBuilder();
-		$this->selectTagQuery = $query->select('*')
-			->from(self::TAG_TABLE)
-			->where($query->expr()->eq('name', $query->createParameter('name')))
-			->andWhere($query->expr()->eq('visibility', $query->createParameter('visibility')))
-			->andWhere($query->expr()->eq('editable', $query->createParameter('editable')));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagsByIds($tagIds): array {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$tags = [];
-
-		// note: not all databases will fail if it's a string or starts with a number
-		foreach ($tagIds as $tagId) {
-			if (!is_numeric($tagId)) {
-				throw new \InvalidArgumentException('Tag id must be integer');
-			}
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from(self::TAG_TABLE)
-			->where($query->expr()->in('id', $query->createParameter('tagids')))
-			->addOrderBy('name', 'ASC')
-			->addOrderBy('visibility', 'ASC')
-			->addOrderBy('editable', 'ASC')
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY);
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$tags[$row['id']] = $this->createSystemTagFromRow($row);
-		}
-
-		$result->closeCursor();
-
-		if (\count($tags) !== \count($tagIds)) {
-			throw new TagNotFoundException(
-				'Tag id(s) not found', 0, null, array_diff($tagIds, array_keys($tags))
-			);
-		}
-
-		return $tags;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array {
-		$tags = [];
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from(self::TAG_TABLE);
-
-		if (!\is_null($visibilityFilter)) {
-			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
-		}
-
-		if (!empty($nameSearchPattern)) {
-			$query->andWhere(
-				$query->expr()->like(
-					'name',
-					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
-				)
-			);
-		}
-
-		$query
-			->addOrderBy('name', 'ASC')
-			->addOrderBy('visibility', 'ASC')
-			->addOrderBy('editable', 'ASC');
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$tags[$row['id']] = $this->createSystemTagFromRow($row);
-		}
-
-		$result->closeCursor();
-
-		return $tags;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
-		$result = $this->selectTagQuery
-			->setParameter('name', $tagName)
-			->setParameter('visibility', $userVisible ? 1 : 0)
-			->setParameter('editable', $userAssignable ? 1 : 0)
-			->execute();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		if (!$row) {
-			throw new TagNotFoundException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
-			);
-		}
-
-		return $this->createSystemTagFromRow($row);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::TAG_TABLE)
-			->values([
-				'name' => $query->createNamedParameter($tagName),
-				'visibility' => $query->createNamedParameter($userVisible ? 1 : 0),
-				'editable' => $query->createNamedParameter($userAssignable ? 1 : 0),
-			]);
-
-		try {
-			$query->execute();
-		} catch (UniqueConstraintViolationException $e) {
-			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
-				0,
-				$e
-			);
-		}
-
-		$tagId = $query->getLastInsertId();
-
-		$tag = new SystemTag(
-			(string)$tagId,
-			$tagName,
-			$userVisible,
-			$userAssignable
-		);
-
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
-			ManagerEvent::EVENT_CREATE, $tag
-		));
-
-		return $tag;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable) {
-		try {
-			$tags = $this->getTagsByIds($tagId);
-		} catch (TagNotFoundException $e) {
-			throw new TagNotFoundException(
-				'Tag does not exist', 0, null, [$tagId]
-			);
-		}
-
-		$beforeUpdate = array_shift($tags);
-		$afterUpdate = new SystemTag(
-			$tagId,
-			$newName,
-			$userVisible,
-			$userAssignable
-		);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->update(self::TAG_TABLE)
-			->set('name', $query->createParameter('name'))
-			->set('visibility', $query->createParameter('visibility'))
-			->set('editable', $query->createParameter('editable'))
-			->where($query->expr()->eq('id', $query->createParameter('tagid')))
-			->setParameter('name', $newName)
-			->setParameter('visibility', $userVisible ? 1 : 0)
-			->setParameter('editable', $userAssignable ? 1 : 0)
-			->setParameter('tagid', $tagId);
-
-		try {
-			if ($query->execute() === 0) {
-				throw new TagNotFoundException(
-					'Tag does not exist', 0, null, [$tagId]
-				);
-			}
-		} catch (UniqueConstraintViolationException $e) {
-			throw new TagAlreadyExistsException(
-				'Tag ("' . $newName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
-				0,
-				$e
-			);
-		}
-
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_UPDATE, new ManagerEvent(
-			ManagerEvent::EVENT_UPDATE, $afterUpdate, $beforeUpdate
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function deleteTags($tagIds) {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$tagNotFoundException = null;
-		$tags = [];
-		try {
-			$tags = $this->getTagsByIds($tagIds);
-		} catch (TagNotFoundException $e) {
-			$tagNotFoundException = $e;
-
-			// Get existing tag objects for the hooks later
-			$existingTags = array_diff($tagIds, $tagNotFoundException->getMissingTags());
-			if (!empty($existingTags)) {
-				try {
-					$tags = $this->getTagsByIds($existingTags);
-				} catch (TagNotFoundException $e) {
-					// Ignore further errors...
-				}
-			}
-		}
-
-		// delete relationships first
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(SystemTagObjectMapper::RELATION_TABLE)
-			->where($query->expr()->in('systemtagid', $query->createParameter('tagids')))
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::TAG_TABLE)
-			->where($query->expr()->in('id', $query->createParameter('tagids')))
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		foreach ($tags as $tag) {
-			$this->dispatcher->dispatch(ManagerEvent::EVENT_DELETE, new ManagerEvent(
-				ManagerEvent::EVENT_DELETE, $tag
-			));
-		}
-
-		if ($tagNotFoundException !== null) {
-			throw new TagNotFoundException(
-				'Tag id(s) not found', 0, $tagNotFoundException, $tagNotFoundException->getMissingTags()
-			);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function canUserAssignTag(ISystemTag $tag, IUser $user): bool {
-		// early check to avoid unneeded group lookups
-		if ($tag->isUserAssignable() && $tag->isUserVisible()) {
-			return true;
-		}
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		if (!$tag->isUserVisible()) {
-			return false;
-		}
-
-		$groupIds = $this->groupManager->getUserGroupIds($user);
-		if (!empty($groupIds)) {
-			$matchingGroups = array_intersect($groupIds, $this->getTagGroups($tag));
-			if (!empty($matchingGroups)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function canUserSeeTag(ISystemTag $tag, IUser $user): bool {
-		if ($tag->isUserVisible()) {
-			return true;
-		}
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private function createSystemTagFromRow($row) {
-		return new SystemTag((string)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function setTagGroups(ISystemTag $tag, array $groupIds) {
-		// delete relationships first
-		$this->connection->beginTransaction();
-		try {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete(self::TAG_GROUP_TABLE)
-				->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
-				->execute();
-
-			// add each group id
-			$query = $this->connection->getQueryBuilder();
-			$query->insert(self::TAG_GROUP_TABLE)
-				->values([
-					'systemtagid' => $query->createNamedParameter($tag->getId()),
-					'gid' => $query->createParameter('gid'),
-				]);
-			foreach ($groupIds as $groupId) {
-				if ($groupId === '') {
-					continue;
-				}
-				$query->setParameter('gid', $groupId);
-				$query->execute();
-			}
-
-			$this->connection->commit();
-		} catch (\Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagGroups(ISystemTag $tag): array {
-		$groupIds = [];
-		$query = $this->connection->getQueryBuilder();
-		$query->select('gid')
-			->from(self::TAG_GROUP_TABLE)
-			->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
-			->orderBy('gid');
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$groupIds[] = $row['gid'];
-		}
-
-		$result->closeCursor();
-
-		return $groupIds;
-	}
+    public const TAG_TABLE = 'systemtag';
+    public const TAG_GROUP_TABLE = 'systemtag_group';
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /**
+     * Prepared query for selecting tags directly
+     *
+     * @var \OCP\DB\QueryBuilder\IQueryBuilder
+     */
+    private $selectTagQuery;
+
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $connection database connection
+     * @param IGroupManager $groupManager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IGroupManager $groupManager,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+        $this->dispatcher = $dispatcher;
+
+        $query = $this->connection->getQueryBuilder();
+        $this->selectTagQuery = $query->select('*')
+            ->from(self::TAG_TABLE)
+            ->where($query->expr()->eq('name', $query->createParameter('name')))
+            ->andWhere($query->expr()->eq('visibility', $query->createParameter('visibility')))
+            ->andWhere($query->expr()->eq('editable', $query->createParameter('editable')));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagsByIds($tagIds): array {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $tags = [];
+
+        // note: not all databases will fail if it's a string or starts with a number
+        foreach ($tagIds as $tagId) {
+            if (!is_numeric($tagId)) {
+                throw new \InvalidArgumentException('Tag id must be integer');
+            }
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from(self::TAG_TABLE)
+            ->where($query->expr()->in('id', $query->createParameter('tagids')))
+            ->addOrderBy('name', 'ASC')
+            ->addOrderBy('visibility', 'ASC')
+            ->addOrderBy('editable', 'ASC')
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY);
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $tags[$row['id']] = $this->createSystemTagFromRow($row);
+        }
+
+        $result->closeCursor();
+
+        if (\count($tags) !== \count($tagIds)) {
+            throw new TagNotFoundException(
+                'Tag id(s) not found', 0, null, array_diff($tagIds, array_keys($tags))
+            );
+        }
+
+        return $tags;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array {
+        $tags = [];
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from(self::TAG_TABLE);
+
+        if (!\is_null($visibilityFilter)) {
+            $query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
+        }
+
+        if (!empty($nameSearchPattern)) {
+            $query->andWhere(
+                $query->expr()->like(
+                    'name',
+                    $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+                )
+            );
+        }
+
+        $query
+            ->addOrderBy('name', 'ASC')
+            ->addOrderBy('visibility', 'ASC')
+            ->addOrderBy('editable', 'ASC');
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $tags[$row['id']] = $this->createSystemTagFromRow($row);
+        }
+
+        $result->closeCursor();
+
+        return $tags;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
+        $result = $this->selectTagQuery
+            ->setParameter('name', $tagName)
+            ->setParameter('visibility', $userVisible ? 1 : 0)
+            ->setParameter('editable', $userAssignable ? 1 : 0)
+            ->execute();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        if (!$row) {
+            throw new TagNotFoundException(
+                'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
+            );
+        }
+
+        return $this->createSystemTagFromRow($row);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::TAG_TABLE)
+            ->values([
+                'name' => $query->createNamedParameter($tagName),
+                'visibility' => $query->createNamedParameter($userVisible ? 1 : 0),
+                'editable' => $query->createNamedParameter($userAssignable ? 1 : 0),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (UniqueConstraintViolationException $e) {
+            throw new TagAlreadyExistsException(
+                'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+                0,
+                $e
+            );
+        }
+
+        $tagId = $query->getLastInsertId();
+
+        $tag = new SystemTag(
+            (string)$tagId,
+            $tagName,
+            $userVisible,
+            $userAssignable
+        );
+
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
+            ManagerEvent::EVENT_CREATE, $tag
+        ));
+
+        return $tag;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable) {
+        try {
+            $tags = $this->getTagsByIds($tagId);
+        } catch (TagNotFoundException $e) {
+            throw new TagNotFoundException(
+                'Tag does not exist', 0, null, [$tagId]
+            );
+        }
+
+        $beforeUpdate = array_shift($tags);
+        $afterUpdate = new SystemTag(
+            $tagId,
+            $newName,
+            $userVisible,
+            $userAssignable
+        );
+
+        $query = $this->connection->getQueryBuilder();
+        $query->update(self::TAG_TABLE)
+            ->set('name', $query->createParameter('name'))
+            ->set('visibility', $query->createParameter('visibility'))
+            ->set('editable', $query->createParameter('editable'))
+            ->where($query->expr()->eq('id', $query->createParameter('tagid')))
+            ->setParameter('name', $newName)
+            ->setParameter('visibility', $userVisible ? 1 : 0)
+            ->setParameter('editable', $userAssignable ? 1 : 0)
+            ->setParameter('tagid', $tagId);
+
+        try {
+            if ($query->execute() === 0) {
+                throw new TagNotFoundException(
+                    'Tag does not exist', 0, null, [$tagId]
+                );
+            }
+        } catch (UniqueConstraintViolationException $e) {
+            throw new TagAlreadyExistsException(
+                'Tag ("' . $newName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+                0,
+                $e
+            );
+        }
+
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_UPDATE, new ManagerEvent(
+            ManagerEvent::EVENT_UPDATE, $afterUpdate, $beforeUpdate
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteTags($tagIds) {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $tagNotFoundException = null;
+        $tags = [];
+        try {
+            $tags = $this->getTagsByIds($tagIds);
+        } catch (TagNotFoundException $e) {
+            $tagNotFoundException = $e;
+
+            // Get existing tag objects for the hooks later
+            $existingTags = array_diff($tagIds, $tagNotFoundException->getMissingTags());
+            if (!empty($existingTags)) {
+                try {
+                    $tags = $this->getTagsByIds($existingTags);
+                } catch (TagNotFoundException $e) {
+                    // Ignore further errors...
+                }
+            }
+        }
+
+        // delete relationships first
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(SystemTagObjectMapper::RELATION_TABLE)
+            ->where($query->expr()->in('systemtagid', $query->createParameter('tagids')))
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::TAG_TABLE)
+            ->where($query->expr()->in('id', $query->createParameter('tagids')))
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        foreach ($tags as $tag) {
+            $this->dispatcher->dispatch(ManagerEvent::EVENT_DELETE, new ManagerEvent(
+                ManagerEvent::EVENT_DELETE, $tag
+            ));
+        }
+
+        if ($tagNotFoundException !== null) {
+            throw new TagNotFoundException(
+                'Tag id(s) not found', 0, $tagNotFoundException, $tagNotFoundException->getMissingTags()
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canUserAssignTag(ISystemTag $tag, IUser $user): bool {
+        // early check to avoid unneeded group lookups
+        if ($tag->isUserAssignable() && $tag->isUserVisible()) {
+            return true;
+        }
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        if (!$tag->isUserVisible()) {
+            return false;
+        }
+
+        $groupIds = $this->groupManager->getUserGroupIds($user);
+        if (!empty($groupIds)) {
+            $matchingGroups = array_intersect($groupIds, $this->getTagGroups($tag));
+            if (!empty($matchingGroups)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canUserSeeTag(ISystemTag $tag, IUser $user): bool {
+        if ($tag->isUserVisible()) {
+            return true;
+        }
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function createSystemTagFromRow($row) {
+        return new SystemTag((string)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTagGroups(ISystemTag $tag, array $groupIds) {
+        // delete relationships first
+        $this->connection->beginTransaction();
+        try {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete(self::TAG_GROUP_TABLE)
+                ->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
+                ->execute();
+
+            // add each group id
+            $query = $this->connection->getQueryBuilder();
+            $query->insert(self::TAG_GROUP_TABLE)
+                ->values([
+                    'systemtagid' => $query->createNamedParameter($tag->getId()),
+                    'gid' => $query->createParameter('gid'),
+                ]);
+            foreach ($groupIds as $groupId) {
+                if ($groupId === '') {
+                    continue;
+                }
+                $query->setParameter('gid', $groupId);
+                $query->execute();
+            }
+
+            $this->connection->commit();
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagGroups(ISystemTag $tag): array {
+        $groupIds = [];
+        $query = $this->connection->getQueryBuilder();
+        $query->select('gid')
+            ->from(self::TAG_GROUP_TABLE)
+            ->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
+            ->orderBy('gid');
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $groupIds[] = $row['gid'];
+        }
+
+        $result->closeCursor();
+
+        return $groupIds;
+    }
 }

lib/public/IUserSession.php

Indentation +51 added lines, -51 removed lines

@@ -43,61 +43,61 @@
  * @since 6.0.0
  */
 interface IUserSession {
-	/**
-	 * Do a user login
-	 *
-	 * @param string $uid the username
-	 * @param string $password the password
-	 * @return bool true if successful
-	 * @since 6.0.0
-	 */
-	public function login($uid, $password);
+    /**
+     * Do a user login
+     *
+     * @param string $uid the username
+     * @param string $password the password
+     * @return bool true if successful
+     * @since 6.0.0
+     */
+    public function login($uid, $password);
 
-	/**
-	 * Logs the user out including all the session data
-	 * Logout, destroys session
-	 *
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function logout();
+    /**
+     * Logs the user out including all the session data
+     * Logout, destroys session
+     *
+     * @return void
+     * @since 6.0.0
+     */
+    public function logout();
 
-	/**
-	 * set the currently active user
-	 *
-	 * @param \OCP\IUser|null $user
-	 * @since 8.0.0
-	 */
-	public function setUser($user);
+    /**
+     * set the currently active user
+     *
+     * @param \OCP\IUser|null $user
+     * @since 8.0.0
+     */
+    public function setUser($user);
 
-	/**
-	 * get the current active user
-	 *
-	 * @return \OCP\IUser|null Current user, otherwise null
-	 * @since 8.0.0
-	 */
-	public function getUser();
+    /**
+     * get the current active user
+     *
+     * @return \OCP\IUser|null Current user, otherwise null
+     * @since 8.0.0
+     */
+    public function getUser();
 
-	/**
-	 * Checks whether the user is logged in
-	 *
-	 * @return bool if logged in
-	 * @since 8.0.0
-	 */
-	public function isLoggedIn();
+    /**
+     * Checks whether the user is logged in
+     *
+     * @return bool if logged in
+     * @since 8.0.0
+     */
+    public function isLoggedIn();
 
-	/**
-	 * get getImpersonatingUserID
-	 *
-	 * @return string|null
-	 * @since 18.0.0
-	 */
-	public function getImpersonatingUserID(): ?string;
+    /**
+     * get getImpersonatingUserID
+     *
+     * @return string|null
+     * @since 18.0.0
+     */
+    public function getImpersonatingUserID(): ?string;
 
-	/**
-	 * set setImpersonatingUserID
-	 *
-	 * @since 18.0.0
-	 */
-	public function setImpersonatingUserID(bool $useCurrentUser = true): void;
+    /**
+     * set setImpersonatingUserID
+     *
+     * @since 18.0.0
+     */
+    public function setImpersonatingUserID(bool $useCurrentUser = true): void;
 }

apps/dav/lib/Events/CardCreatedEvent.php

Indentation +55 added lines, -55 removed lines

@@ -34,67 +34,67 @@
  */
 class CardCreatedEvent extends Event {
 
-	/** @var int */
-	private $addressBookId;
+    /** @var int */
+    private $addressBookId;
 
-	/** @var array */
-	private $addressBookData;
+    /** @var array */
+    private $addressBookData;
 
-	/** @var array */
-	private $shares;
+    /** @var array */
+    private $shares;
 
-	/** @var array */
-	private $cardData;
+    /** @var array */
+    private $cardData;
 
-	/**
-	 * CardCreatedEvent constructor.
-	 *
-	 * @param int $addressBookId
-	 * @param array $addressBookData
-	 * @param array $shares
-	 * @param array $cardData
-	 * @since 20.0.0
-	 */
-	public function __construct(int $addressBookId,
-								array $addressBookData,
-								array $shares,
-								array $cardData) {
-		parent::__construct();
-		$this->addressBookId = $addressBookId;
-		$this->addressBookData = $addressBookData;
-		$this->shares = $shares;
-		$this->cardData = $cardData;
-	}
+    /**
+     * CardCreatedEvent constructor.
+     *
+     * @param int $addressBookId
+     * @param array $addressBookData
+     * @param array $shares
+     * @param array $cardData
+     * @since 20.0.0
+     */
+    public function __construct(int $addressBookId,
+                                array $addressBookData,
+                                array $shares,
+                                array $cardData) {
+        parent::__construct();
+        $this->addressBookId = $addressBookId;
+        $this->addressBookData = $addressBookData;
+        $this->shares = $shares;
+        $this->cardData = $cardData;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getAddressBookId(): int {
-		return $this->addressBookId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getAddressBookId(): int {
+        return $this->addressBookId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAddressBookData(): array {
-		return $this->addressBookData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAddressBookData(): array {
+        return $this->addressBookData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getCardData(): array {
-		return $this->cardData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getCardData(): array {
+        return $this->cardData;
+    }
 }

apps/dav/lib/Events/CalendarObjectUpdatedEvent.php

Indentation +55 added lines, -55 removed lines

@@ -34,67 +34,67 @@
  */
 class CalendarObjectUpdatedEvent extends Event {
 
-	/** @var int */
-	private $calendarId;
+    /** @var int */
+    private $calendarId;
 
-	/** @var array */
-	private $calendarData;
+    /** @var array */
+    private $calendarData;
 
-	/** @var array */
-	private $shares;
+    /** @var array */
+    private $shares;
 
-	/** @var array */
-	private $objectData;
+    /** @var array */
+    private $objectData;
 
-	/**
-	 * CalendarObjectUpdatedEvent constructor.
-	 *
-	 * @param int $calendarId
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 * @since 20.0.0
-	 */
-	public function __construct(int $calendarId,
-								array $calendarData,
-								array $shares,
-								array $objectData) {
-		parent::__construct();
-		$this->calendarId = $calendarId;
-		$this->calendarData = $calendarData;
-		$this->shares = $shares;
-		$this->objectData = $objectData;
-	}
+    /**
+     * CalendarObjectUpdatedEvent constructor.
+     *
+     * @param int $calendarId
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     * @since 20.0.0
+     */
+    public function __construct(int $calendarId,
+                                array $calendarData,
+                                array $shares,
+                                array $objectData) {
+        parent::__construct();
+        $this->calendarId = $calendarId;
+        $this->calendarData = $calendarData;
+        $this->shares = $shares;
+        $this->objectData = $objectData;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getCalendarId(): int {
-		return $this->calendarId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getCalendarId(): int {
+        return $this->calendarId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getCalendarData(): array {
-		return $this->calendarData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getCalendarData(): array {
+        return $this->calendarData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getObjectData(): array {
-		return $this->objectData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getObjectData(): array {
+        return $this->objectData;
+    }
 }

apps/dav/lib/Events/AddressBookDeletedEvent.php

Indentation +43 added lines, -43 removed lines

@@ -34,53 +34,53 @@
  */
 class AddressBookDeletedEvent extends Event {
 
-	/** @var int */
-	private $addressBookId;
+    /** @var int */
+    private $addressBookId;
 
-	/** @var array */
-	private $addressBookData;
+    /** @var array */
+    private $addressBookData;
 
-	/** @var array */
-	private $shares;
+    /** @var array */
+    private $shares;
 
-	/**
-	 * AddressBookDeletedEvent constructor.
-	 *
-	 * @param int $addressBookId
-	 * @param array $addressBookData
-	 * @param array $shares
-	 * @since 20.0.0
-	 */
-	public function __construct(int $addressBookId,
-								array $addressBookData,
-								array $shares) {
-		parent::__construct();
-		$this->addressBookId = $addressBookId;
-		$this->addressBookData = $addressBookData;
-		$this->shares = $shares;
-	}
+    /**
+     * AddressBookDeletedEvent constructor.
+     *
+     * @param int $addressBookId
+     * @param array $addressBookData
+     * @param array $shares
+     * @since 20.0.0
+     */
+    public function __construct(int $addressBookId,
+                                array $addressBookData,
+                                array $shares) {
+        parent::__construct();
+        $this->addressBookId = $addressBookId;
+        $this->addressBookData = $addressBookData;
+        $this->shares = $shares;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getAddressBookId():int {
-		return $this->addressBookId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getAddressBookId():int {
+        return $this->addressBookId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAddressBookData(): array {
-		return $this->addressBookData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAddressBookData(): array {
+        return $this->addressBookData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 }

apps/dav/lib/Events/CalendarObjectDeletedEvent.php

Indentation +55 added lines, -55 removed lines

@@ -34,67 +34,67 @@
  */
 class CalendarObjectDeletedEvent extends Event {
 
-	/** @var int */
-	private $calendarId;
+    /** @var int */
+    private $calendarId;
 
-	/** @var array */
-	private $calendarData;
+    /** @var array */
+    private $calendarData;
 
-	/** @var array */
-	private $shares;
+    /** @var array */
+    private $shares;
 
-	/** @var array */
-	private $objectData;
+    /** @var array */
+    private $objectData;
 
-	/**
-	 * CalendarObjectDeletedEvent constructor.
-	 *
-	 * @param int $calendarId
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 * @since 20.0.0
-	 */
-	public function __construct(int $calendarId,
-								array $calendarData,
-								array $shares,
-								array $objectData) {
-		parent::__construct();
-		$this->calendarId = $calendarId;
-		$this->calendarData = $calendarData;
-		$this->shares = $shares;
-		$this->objectData = $objectData;
-	}
+    /**
+     * CalendarObjectDeletedEvent constructor.
+     *
+     * @param int $calendarId
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     * @since 20.0.0
+     */
+    public function __construct(int $calendarId,
+                                array $calendarData,
+                                array $shares,
+                                array $objectData) {
+        parent::__construct();
+        $this->calendarId = $calendarId;
+        $this->calendarData = $calendarData;
+        $this->shares = $shares;
+        $this->objectData = $objectData;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getCalendarId(): int {
-		return $this->calendarId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getCalendarId(): int {
+        return $this->calendarId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getCalendarData(): array {
-		return $this->calendarData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getCalendarData(): array {
+        return $this->calendarData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getObjectData(): array {
-		return $this->objectData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getObjectData(): array {
+        return $this->objectData;
+    }
 }