Merge pull request #20426 from nextcloud/techdebt/psr2

It is done

apps/comments/lib/AppInfo/Application.php

@@ -42,7 +42,7 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Util;
 
 class Application extends App {
-	const APP_ID = 'comments';
+	public const APP_ID = 'comments';
 
 	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);

apps/contactsinteraction/lib/AddressBook.php

@@ -73,7 +73,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	/**
 	 * @inheritDoc
 	 */
-	function createFile($name, $data = null) {
+	public function createFile($name, $data = null) {
 		throw new Exception("This addressbook is immutable");
 	}
 

apps/contactsinteraction/lib/Card.php

@@ -52,84 +52,84 @@ class Card implements ICard, IACL {
 	/**
 	 * @inheritDoc
 	 */
-	function getOwner(): ?string {
+	public function getOwner(): ?string {
 		$this->principal;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getACL(): array {
+	public function getACL(): array {
 		return $this->acls;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function setAcls(array $acls): void {
+	public function setAcls(array $acls): void {
 		throw new NotImplemented();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function put($data): ?string {
+	public function put($data): ?string {
 		throw new NotImplemented();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function get() {
+	public function get() {
 		return $this->contact->getCard();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getContentType(): ?string {
+	public function getContentType(): ?string {
 		return 'text/vcard; charset=utf-8';
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getETag(): ?string {
+	public function getETag(): ?string {
 		return null;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getSize(): int {
+	public function getSize(): int {
 		throw new NotImplemented();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function delete(): void {
+	public function delete(): void {
 		throw new NotImplemented();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getName(): string {
+	public function getName(): string {
 		return (string) $this->contact->getId();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function setName($name): void {
+	public function setName($name): void {
 		throw new NotImplemented();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	function getLastModified(): ?int {
+	public function getLastModified(): ?int {
 		return $this->contact->getLastContact();
 	}
 }

apps/dav/lib/AppInfo/Application.php

@@ -53,7 +53,7 @@ use OCP\IUser;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
-	const APP_ID = 'dav';
+	public const APP_ID = 'dav';
 
 	/**
 	 * Application constructor.

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

@@ -36,15 +36,15 @@ use OCP\IUserManager;
 use OCP\L10N\IFactory;
 
 class Calendar extends Base {
-	const SUBJECT_ADD = 'calendar_add';
+	public const SUBJECT_ADD = 'calendar_add';
-	const SUBJECT_UPDATE = 'calendar_update';
+	public const SUBJECT_UPDATE = 'calendar_update';
-	const SUBJECT_DELETE = 'calendar_delete';
+	public const SUBJECT_DELETE = 'calendar_delete';
-	const SUBJECT_PUBLISH = 'calendar_publish';
+	public const SUBJECT_PUBLISH = 'calendar_publish';
-	const SUBJECT_UNPUBLISH = 'calendar_unpublish';
+	public const SUBJECT_UNPUBLISH = 'calendar_unpublish';
-	const SUBJECT_SHARE_USER = 'calendar_user_share';
+	public const SUBJECT_SHARE_USER = 'calendar_user_share';
-	const SUBJECT_SHARE_GROUP = 'calendar_group_share';
+	public const SUBJECT_SHARE_GROUP = 'calendar_group_share';
-	const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
+	public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
-	const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
+	public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
 
 	/** @var IFactory */
 	protected $languageFactory;

apps/dav/lib/CalDAV/Activity/Provider/Event.php

@@ -34,9 +34,9 @@ use OCP\IUserManager;
 use OCP\L10N\IFactory;
 
 class Event extends Base {
-	const SUBJECT_OBJECT_ADD = 'object_add';
+	public const SUBJECT_OBJECT_ADD = 'object_add';
-	const SUBJECT_OBJECT_UPDATE = 'object_update';
+	public const SUBJECT_OBJECT_UPDATE = 'object_update';
-	const SUBJECT_OBJECT_DELETE = 'object_delete';
+	public const SUBJECT_OBJECT_DELETE = 'object_delete';
 
 	/** @var IFactory */
 	protected $languageFactory;

apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php

@@ -39,7 +39,7 @@ use Sabre\HTTP\ResponseInterface;
  * @package OCA\DAV\CalDAV\BirthdayCalendar
  */
 class EnablePlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
+	public const NS_Nextcloud = 'http://nextcloud.com/ns';
 
 	/**
 	 * @var IConfig

apps/dav/lib/CalDAV/BirthdayService.php

@@ -49,7 +49,7 @@ use Sabre\VObject\Reader;
  * @package OCA\DAV\CalDAV
  */
 class BirthdayService {
-	const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
+	public const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
 
 	/** @var GroupPrincipalBackend */
 	private $principalBackend;

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -77,14 +77,14 @@ use Symfony\Component\EventDispatcher\GenericEvent;
  * @package OCA\DAV\CalDAV
  */
 class CalDavBackend extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
-	const CALENDAR_TYPE_CALENDAR = 0;
+	public const CALENDAR_TYPE_CALENDAR = 0;
-	const CALENDAR_TYPE_SUBSCRIPTION = 1;
+	public const CALENDAR_TYPE_SUBSCRIPTION = 1;
 
-	const PERSONAL_CALENDAR_URI = 'personal';
+	public const PERSONAL_CALENDAR_URI = 'personal';
-	const PERSONAL_CALENDAR_NAME = 'Personal';
+	public const PERSONAL_CALENDAR_NAME = 'Personal';
 
-	const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
+	public const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
-	const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
+	public const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
 
 	/**
 	 * We need to specify a max date, because we need to stop *somewhere*
@@ -94,12 +94,12 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * in 2038-01-19 to avoid problems when the date is converted
 	 * to a unix timestamp.
 	 */
-	const MAX_DATE = '2038-01-01';
+	public const MAX_DATE = '2038-01-01';
 
-	const ACCESS_PUBLIC = 4;
+	public const ACCESS_PUBLIC = 4;
-	const CLASSIFICATION_PUBLIC = 0;
+	public const CLASSIFICATION_PUBLIC = 0;
-	const CLASSIFICATION_PRIVATE = 1;
+	public const CLASSIFICATION_PRIVATE = 1;
-	const CLASSIFICATION_CONFIDENTIAL = 2;
+	public const CLASSIFICATION_CONFIDENTIAL = 2;
 
 	/**
 	 * List of CalDAV properties, and how they map to database field names
@@ -253,7 +253,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $principalUri
 	 * @return array
 	 */
-	function getCalendarsForUser($principalUri) {
+	public function getCalendarsForUser($principalUri) {
 		$principalUriOriginal = $principalUri;
 		$principalUri = $this->convertPrincipal($principalUri, true);
 		$fields = array_values($this->propertyMap);
@@ -722,7 +722,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @return int
 	 * @suppress SqlInjectionChecker
 	 */
-	function createCalendar($principalUri, $calendarUri, array $properties) {
+	public function createCalendar($principalUri, $calendarUri, array $properties) {
 		$values = [
 			'principaluri' => $this->convertPrincipal($principalUri, true),
 			'uri'          => $calendarUri,
@@ -790,7 +790,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param PropPatch $propPatch
 	 * @return void
 	 */
-	function updateCalendar($calendarId, PropPatch $propPatch) {
+	public function updateCalendar($calendarId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->propertyMap);
 		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
 
@@ -840,7 +840,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param mixed $calendarId
 	 * @return void
 	 */
-	function deleteCalendar($calendarId) {
+	public function deleteCalendar($calendarId) {
 		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', new GenericEvent(
 			'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar',
 			[
@@ -873,7 +873,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $principaluri
 	 * @return void
 	 */
-	function deleteAllSharesByUser($principaluri) {
+	public function deleteAllSharesByUser($principaluri) {
 		$this->calendarSharingBackend->deleteAllSharesByUser($principaluri);
 	}
 
@@ -1048,7 +1048,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param int $calendarType
 	 * @return string
 	 */
-	function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
 		$extraData = $this->getDenormalizedData($calendarData);
 
 		$q = $this->db->getQueryBuilder();
@@ -1131,7 +1131,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param int $calendarType
 	 * @return string
 	 */
-	function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
 		$extraData = $this->getDenormalizedData($calendarData);
 		$query = $this->db->getQueryBuilder();
 		$query->update('calendarobjects')
@@ -1207,7 +1207,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param int $calendarType
 	 * @return void
 	 */
-	function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
 		$data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
 		if (is_array($data)) {
 			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
@@ -1688,7 +1688,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $uid
 	 * @return string|null
 	 */
-	function getCalendarObjectByUID($principalUri, $uid) {
+	public function getCalendarObjectByUID($principalUri, $uid) {
 		$query = $this->db->getQueryBuilder();
 		$query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
 			->from('calendarobjects', 'co')
@@ -1763,7 +1763,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param int $calendarType
 	 * @return array
 	 */
-	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
+	public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
 		$stmt->execute([ $calendarId ]);
@@ -1854,7 +1854,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $principalUri
 	 * @return array
 	 */
-	function getSubscriptionsForUser($principalUri) {
+	public function getSubscriptionsForUser($principalUri) {
 		$fields = array_values($this->subscriptionPropertyMap);
 		$fields[] = 'id';
 		$fields[] = 'uri';
@@ -1906,7 +1906,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param array $properties
 	 * @return mixed
 	 */
-	function createSubscription($principalUri, $uri, array $properties) {
+	public function createSubscription($principalUri, $uri, array $properties) {
 		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
 			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
 		}
@@ -1969,7 +1969,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param PropPatch $propPatch
 	 * @return void
 	 */
-	function updateSubscription($subscriptionId, PropPatch $propPatch) {
+	public function updateSubscription($subscriptionId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->subscriptionPropertyMap);
 		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
 
@@ -2015,7 +2015,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param mixed $subscriptionId
 	 * @return void
 	 */
-	function deleteSubscription($subscriptionId) {
+	public function deleteSubscription($subscriptionId) {
 		$this->dispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription', new GenericEvent(
 			'\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
 			[
@@ -2061,7 +2061,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $objectUri
 	 * @return array
 	 */
-	function getSchedulingObject($principalUri, $objectUri) {
+	public function getSchedulingObject($principalUri, $objectUri) {
 		$query = $this->db->getQueryBuilder();
 		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
 			->from('schedulingobjects')
@@ -2095,7 +2095,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $principalUri
 	 * @return array
 	 */
-	function getSchedulingObjects($principalUri) {
+	public function getSchedulingObjects($principalUri) {
 		$query = $this->db->getQueryBuilder();
 		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
 				->from('schedulingobjects')
@@ -2123,7 +2123,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $objectUri
 	 * @return void
 	 */
-	function deleteSchedulingObject($principalUri, $objectUri) {
+	public function deleteSchedulingObject($principalUri, $objectUri) {
 		$query = $this->db->getQueryBuilder();
 		$query->delete('schedulingobjects')
 				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
@@ -2139,7 +2139,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $objectData
 	 * @return void
 	 */
-	function createSchedulingObject($principalUri, $objectUri, $objectData) {
+	public function createSchedulingObject($principalUri, $objectUri, $objectData) {
 		$query = $this->db->getQueryBuilder();
 		$query->insert('schedulingobjects')
 			->values([

apps/dav/lib/CalDAV/CalendarHome.php

@@ -73,7 +73,7 @@ class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 	/**
 	 * @inheritdoc
 	 */
-	function createExtendedCollection($name, MkCol $mkCol) {
+	public function createExtendedCollection($name, MkCol $mkCol) {
 		$reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
 
 		if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
@@ -86,7 +86,7 @@ class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 	/**
 	 * @inheritdoc
 	 */
-	function getChildren() {
+	public function getChildren() {
 		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
 		$objects = [];
 		foreach ($calendars as $calendar) {
@@ -128,7 +128,7 @@ class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 	/**
 	 * @inheritdoc
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		// Special nodes
 		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
 			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
@@ -182,7 +182,7 @@ class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 	 * @param integer|null $limit
 	 * @param integer|null $offset
 	 */
-	function calendarSearch(array $filters, $limit=null, $offset=null) {
+	public function calendarSearch(array $filters, $limit=null, $offset=null) {
 		$principalUri = $this->principalInfo['uri'];
 		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
 	}

apps/dav/lib/CalDAV/CalendarObject.php

@@ -59,7 +59,7 @@ class CalendarObject extends \Sabre\CalDAV\CalendarObject {
 	/**
 	 * @inheritdoc
 	 */
-	function get() {
+	public function get() {
 		$data = parent::get();
 
 		if (!$this->isShared()) {

apps/dav/lib/CalDAV/CalendarRoot.php

@@ -26,11 +26,11 @@
 namespace OCA\DAV\CalDAV;
 
 class CalendarRoot extends \Sabre\CalDAV\CalendarRoot {
-	function getChildForPrincipal(array $principal) {
+	public function getChildForPrincipal(array $principal) {
 		return new CalendarHome($this->caldavBackend, $principal);
 	}
 
-	function getName() {
+	public function getName() {
 		if ($this->principalPrefix === 'principals/calendar-resources' ||
 			$this->principalPrefix === 'principals/calendar-rooms') {
 			$parts = explode('/', $this->principalPrefix);

apps/dav/lib/CalDAV/Outbox.php

@@ -63,7 +63,7 @@ class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
 	 *
 	 * @return array
 	 */
-	function getACL() {
+	public function getACL() {
 		// getACL is called so frequently that we cache the config result
 		if ($this->disableFreeBusy === null) {
 			$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');

apps/dav/lib/CalDAV/Plugin.php

@@ -25,7 +25,7 @@
 namespace OCA\DAV\CalDAV;
 
 class Plugin extends \Sabre\CalDAV\Plugin {
-	const SYSTEM_CALENDAR_ROOT = 'system-calendars';
+	public const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
 	/**
 	 * Returns the path to a principal's calendar home.
@@ -37,7 +37,7 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 	 * @param string $principalUrl
 	 * @return string|null
 	 */
-	function getCalendarHomeForPrincipal($principalUrl) {
+	public function getCalendarHomeForPrincipal($principalUrl) {
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::CALENDAR_ROOT . '/' . $principalId;

apps/dav/lib/CalDAV/Principal/Collection.php

@@ -36,7 +36,7 @@ class Collection extends \Sabre\CalDAV\Principal\Collection {
 	 * @param array $principalInfo
 	 * @return User
 	 */
-	function getChildForPrincipal(array $principalInfo) {
+	public function getChildForPrincipal(array $principalInfo) {
 		return new User($this->principalBackend, $principalInfo);
 	}
 }

apps/dav/lib/CalDAV/Principal/User.php

@@ -42,7 +42,7 @@ class User extends \Sabre\CalDAV\Principal\User {
 	 *
 	 * @return array
 	 */
-	function getACL() {
+	public function getACL() {
 		$acl = parent::getACL();
 		$acl[] = [
 			'privilege' => '{DAV:}read',

apps/dav/lib/CalDAV/Proxy/ProxyMapper.php

@@ -36,8 +36,8 @@ use OCP\IDBConnection;
  * @package OCA\DAV\CalDAV\Proxy
  */
 class ProxyMapper extends QBMapper {
-	const PERMISSION_READ  = 1;
+	public const PERMISSION_READ  = 1;
-	const PERMISSION_WRITE = 2;
+	public const PERMISSION_WRITE = 2;
 
 	/**
 	 * ProxyMapper constructor.

apps/dav/lib/CalDAV/PublicCalendarRoot.php

@@ -48,7 +48,7 @@ class PublicCalendarRoot extends Collection {
 	 * @param IL10N $l10n
 	 * @param IConfig $config
 	 */
-	function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
+	public function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
 						 IConfig $config) {
 		$this->caldavBackend = $caldavBackend;
 		$this->l10n = $l10n;
@@ -58,14 +58,14 @@ class PublicCalendarRoot extends Collection {
 	/**
 	 * @inheritdoc
 	 */
-	function getName() {
+	public function getName() {
 		return 'public-calendars';
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		$calendar = $this->caldavBackend->getPublicCalendar($name);
 		return new PublicCalendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
 	}
@@ -73,7 +73,7 @@ class PublicCalendarRoot extends Collection {
 	/**
 	 * @inheritdoc
 	 */
-	function getChildren() {
+	public function getChildren() {
 		return [];
 	}
 }

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

@@ -40,7 +40,7 @@ use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
 class PublishPlugin extends ServerPlugin {
-	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+	public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
 
 	/**
 	 * Reference to SabreDAV server object.

apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php

@@ -43,7 +43,7 @@ class Publisher implements XmlSerializable {
 	 * @param string $publishUrl
 	 * @param boolean $isPublished
 	 */
-	function __construct($publishUrl, $isPublished) {
+	public function __construct($publishUrl, $isPublished) {
 		$this->publishUrl = $publishUrl;
 		$this->isPublished = $isPublished;
 	}
@@ -51,7 +51,7 @@ class Publisher implements XmlSerializable {
 	/**
 	 * @return string
 	 */
-	function getValue() {
+	public function getValue() {
 		return $this->publishUrl;
 	}
 
@@ -74,7 +74,7 @@ class Publisher implements XmlSerializable {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		if (!$this->isPublished) {
 			// for pre-publish-url
 			$writer->write($this->publishUrl);

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

@@ -229,7 +229,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
 	 * @param PropPatch $propPatch
 	 * @return int
 	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
+	public function updatePrincipal($path, PropPatch $propPatch) {
 		return 0;
 	}
 
@@ -239,7 +239,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
 	 * @param string $test
 	 * @return array
 	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
 		$results = [];
 		if (\count($searchProperties) === 0) {
 			return [];
@@ -370,7 +370,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
 	 * @param string $principalPrefix
 	 * @return null|string
 	 */
-	function findByUri($uri, $principalPrefix) {
+	public function findByUri($uri, $principalPrefix) {
 		$user = $this->userSession->getUser();
 		if (!$user) {
 			return null;

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

@@ -102,11 +102,11 @@ class IMipPlugin extends SabreIMipPlugin {
 	/** @var IUserManager */
 	private $userManager;
 
-	const MAX_DATE = '2038-01-01';
+	public const MAX_DATE = '2038-01-01';
 
-	const METHOD_REQUEST = 'request';
+	public const METHOD_REQUEST = 'request';
-	const METHOD_REPLY = 'reply';
+	public const METHOD_REPLY = 'reply';
-	const METHOD_CANCEL = 'cancel';
+	public const METHOD_CANCEL = 'cancel';
 
 	/**
 	 * @param IConfig $config

apps/dav/lib/CalDAV/Schedule/Plugin.php

@@ -62,7 +62,7 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 	 * @param Server $server
 	 * @return void
 	 */
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		parent::initialize($server);
 		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
 		$server->on('afterWriteContent', [$this, 'dispatchSchedulingResponses']);
@@ -78,7 +78,7 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFind(PropFind $propFind, INode $node) {
+	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
 			// overwrite Sabre/Dav's implementation
 			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
@@ -259,7 +259,7 @@ EOF;
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+	public function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
 		if ($node instanceof IPrincipal) {
 			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function () use ($node) {
 				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */

apps/dav/lib/CalDAV/Search/SearchPlugin.php

@@ -32,7 +32,7 @@ use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 
 class SearchPlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
+	public const NS_Nextcloud = 'http://nextcloud.com/ns';
 
 	/**
 	 * Reference to SabreDAV server object.

apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php

@@ -36,7 +36,7 @@ class CompFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return string
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$att = $reader->parseAttributes();
 		$componentName = $att['name'];
 

apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php

@@ -37,7 +37,7 @@ class LimitFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return int
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_int($value) && !is_string($value)) {
 			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');

apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php

@@ -37,7 +37,7 @@ class OffsetFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return int
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_int($value) && !is_string($value)) {
 			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}offset has illegal value');

apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php

@@ -36,7 +36,7 @@ class ParamFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return string
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$att = $reader->parseAttributes();
 		$property = $att['property'];
 		$parameter = $att['name'];

apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php

@@ -36,7 +36,7 @@ class PropFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return string
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$att = $reader->parseAttributes();
 		$componentName = $att['name'];
 

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

@@ -36,7 +36,7 @@ class SearchTermFilter implements XmlDeserializable {
 	 * @throws BadRequest
 	 * @return string
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_string($value)) {
 			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');

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

@@ -84,7 +84,7 @@ class CalendarSearchReport implements XmlDeserializable {
 	 * @param Reader $reader
 	 * @return mixed
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public 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',

apps/dav/lib/CalDAV/WebcalCaching/Plugin.php

@@ -43,7 +43,7 @@ class Plugin extends ServerPlugin {
 	 *
 	 * @var string[]
 	 */
-	const ENABLE_FOR_CLIENTS = [];
+	public const ENABLE_FOR_CLIENTS = [];
 
 	/**
 	 * @var bool

apps/dav/lib/CardDAV/AddressBookRoot.php

@@ -56,11 +56,11 @@ class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
 	 *
 	 * @return \Sabre\DAV\INode
 	 */
-	function getChildForPrincipal(array $principal) {
+	public function getChildForPrincipal(array $principal) {
 		return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->pluginManager);
 	}
 
-	function getName() {
+	public function getName() {
 		if ($this->principalPrefix === 'principals') {
 			return parent::getName();
 		}

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -55,8 +55,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class CardDavBackend implements BackendInterface, SyncSupport {
-	const PERSONAL_ADDRESSBOOK_URI = 'contacts';
+	public const PERSONAL_ADDRESSBOOK_URI = 'contacts';
-	const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
+	public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
 
 	/** @var Principal */
 	private $principalBackend;
@@ -143,7 +143,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string $principalUri
 	 * @return array
 	 */
-	function getAddressBooksForUser($principalUri) {
+	public function getAddressBooksForUser($principalUri) {
 		$principalUriOriginal = $principalUri;
 		$principalUri = $this->convertPrincipal($principalUri, true);
 		$query = $this->db->getQueryBuilder();
@@ -353,7 +353,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param \Sabre\DAV\PropPatch $propPatch
 	 * @return void
 	 */
-	function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
+	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 		$supportedProperties = [
 			'{DAV:}displayname',
 			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
@@ -398,7 +398,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @return int
 	 * @throws BadRequest
 	 */
-	function createAddressBook($principalUri, $url, array $properties) {
+	public function createAddressBook($principalUri, $url, array $properties) {
 		$values = [
 			'displayname' => null,
 			'description' => null,
@@ -447,7 +447,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param mixed $addressBookId
 	 * @return void
 	 */
-	function deleteAddressBook($addressBookId) {
+	public function deleteAddressBook($addressBookId) {
 		$query = $this->db->getQueryBuilder();
 		$query->delete('cards')
 			->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
@@ -490,7 +490,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param mixed $addressBookId
 	 * @return array
 	 */
-	function getCards($addressBookId) {
+	public function getCards($addressBookId) {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
 			->from('cards')
@@ -521,7 +521,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string $cardUri
 	 * @return array
 	 */
-	function getCard($addressBookId, $cardUri) {
+	public function getCard($addressBookId, $cardUri) {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
 			->from('cards')
@@ -552,7 +552,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string[] $uris
 	 * @return array
 	 */
-	function getMultipleCards($addressBookId, array $uris) {
+	public function getMultipleCards($addressBookId, array $uris) {
 		if (empty($uris)) {
 			return [];
 		}
@@ -605,7 +605,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string $cardData
 	 * @return string
 	 */
-	function createCard($addressBookId, $cardUri, $cardData) {
+	public function createCard($addressBookId, $cardUri, $cardData) {
 		$etag = md5($cardData);
 		$uid = $this->getUID($cardData);
 
@@ -672,7 +672,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string $cardData
 	 * @return string
 	 */
-	function updateCard($addressBookId, $cardUri, $cardData) {
+	public function updateCard($addressBookId, $cardUri, $cardData) {
 		$uid = $this->getUID($cardData);
 		$etag = md5($cardData);
 		$query = $this->db->getQueryBuilder();
@@ -705,7 +705,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param string $cardUri
 	 * @return bool
 	 */
-	function deleteCard($addressBookId, $cardUri) {
+	public function deleteCard($addressBookId, $cardUri) {
 		try {
 			$cardId = $this->getCardId($addressBookId, $cardUri);
 		} catch (\InvalidArgumentException $e) {
@@ -790,7 +790,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	 * @param int $limit
 	 * @return array
 	 */
-	function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
+	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*addressbooks` WHERE `id` = ?');
 		$stmt->execute([ $addressBookId ]);

apps/dav/lib/CardDAV/HasPhotoPlugin.php

@@ -45,7 +45,7 @@ class HasPhotoPlugin extends ServerPlugin {
 	 * @param Server $server
 	 * @return void
 	 */
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		$server->on('propFind', [$this, 'propFind']);
 	}
 
@@ -56,7 +56,7 @@ class HasPhotoPlugin extends ServerPlugin {
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFind(PropFind $propFind, INode $node) {
+	public function propFind(PropFind $propFind, INode $node) {
 		$ns = '{http://nextcloud.com/ns}';
 
 		if ($node instanceof Card) {

apps/dav/lib/CardDAV/Plugin.php

@@ -30,7 +30,7 @@ use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
 
 class Plugin extends \Sabre\CardDAV\Plugin {
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		$server->on('propFind', [$this, 'propFind']);
 		parent::initialize($server);
 	}
@@ -63,7 +63,7 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFind(PropFind $propFind, INode $node) {
+	public function propFind(PropFind $propFind, INode $node) {
 		$ns = '{http://owncloud.org/ns}';
 
 		if ($node instanceof AddressBook) {

apps/dav/lib/CardDAV/UserAddressBooks.php

@@ -62,7 +62,7 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
 	 *
 	 * @return IAddressBook[]
 	 */
-	function getChildren() {
+	public function getChildren() {
 		if ($this->l10n === null) {
 			$this->l10n = \OC::$server->getL10N('dav');
 		}
@@ -107,7 +107,7 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
 	 *
 	 * @return array
 	 */
-	function getACL() {
+	public function getACL() {
 		$acl = parent::getACL();
 		if ($this->principalUri === 'principals/system/system') {
 			$acl[] = [

apps/dav/lib/CardDAV/Xml/Groups.php

@@ -27,7 +27,7 @@ use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
 class Groups implements XmlSerializable {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/** @var string[] of TYPE:CHECKSUM */
 	private $groups;
@@ -39,7 +39,7 @@ class Groups implements XmlSerializable {
 		$this->groups = $groups;
 	}
 
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		foreach ($this->groups as $group) {
 			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
 		}

apps/dav/lib/Command/CreateAddressBook.php

@@ -43,7 +43,7 @@ class CreateAddressBook extends Command {
 	 * @param IUserManager $userManager
 	 * @param CardDavBackend $cardDavBackend
 	 */
-	function __construct(IUserManager $userManager,
+	public function __construct(IUserManager $userManager,
 						 CardDavBackend $cardDavBackend
 	) {
 		parent::__construct();

apps/dav/lib/Command/CreateCalendar.php

@@ -53,7 +53,7 @@ class CreateCalendar extends Command {
 	 * @param IGroupManager $groupManager
 	 * @param IDBConnection $dbConnection
 	 */
-	function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
+	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
 		parent::__construct();
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;

apps/dav/lib/Command/ListCalendars.php

@@ -46,7 +46,7 @@ class ListCalendars extends Command {
 	 * @param IUserManager $userManager
 	 * @param CalDavBackend $caldav
 	 */
-	function __construct(IUserManager $userManager, CalDavBackend $caldav) {
+	public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
 		parent::__construct();
 		$this->userManager = $userManager;
 		$this->caldav = $caldav;

apps/dav/lib/Command/MoveCalendar.php

@@ -62,7 +62,7 @@ class MoveCalendar extends Command {
 	/** @var CalDavBackend */
 	private $calDav;
 
-	const URI_USERS = 'principals/users/';
+	public const URI_USERS = 'principals/users/';
 
 	/**
 	 * @param IUserManager $userManager
@@ -72,7 +72,7 @@ class MoveCalendar extends Command {
 	 * @param IL10N $l10n
 	 * @param CalDavBackend $calDav
 	 */
-	function __construct(
+	public function __construct(
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IShareManager $shareManager,

apps/dav/lib/Command/SyncBirthdayCalendar.php

@@ -52,7 +52,7 @@ class SyncBirthdayCalendar extends Command {
 	 * @param IConfig $config
 	 * @param BirthdayService $birthdayService
 	 */
-	function __construct(IUserManager $userManager, IConfig $config,
+	public function __construct(IUserManager $userManager, IConfig $config,
 						 BirthdayService $birthdayService) {
 		parent::__construct();
 		$this->birthdayService = $birthdayService;

apps/dav/lib/Command/SyncSystemAddressBook.php

@@ -37,7 +37,7 @@ class SyncSystemAddressBook extends Command {
 	/**
 	 * @param SyncService $syncService
 	 */
-	function __construct(SyncService $syncService) {
+	public function __construct(SyncService $syncService) {
 		parent::__construct();
 		$this->syncService = $syncService;
 	}

apps/dav/lib/Comments/CommentNode.php

@@ -35,16 +35,16 @@ use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\PropPatch;
 
 class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
+	public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread';
-	const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
+	public const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message';
-	const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
+	public const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName';
-	const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
+	public const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions';
-	const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
+	public const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention';
-	const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
+	public const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType';
-	const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
+	public const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId';
-	const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
+	public const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName';
 
 	/** @var  IComment */
 	public $comment;
@@ -104,7 +104,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 *
 	 * @return array
 	 */
-	static public function getPropertyNames() {
+	public static function getPropertyNames() {
 		return [
 			'{http://owncloud.org/ns}id',
 			'{http://owncloud.org/ns}parentId',
@@ -144,7 +144,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 *
 	 * @return void
 	 */
-	function delete() {
+	public function delete() {
 		$this->checkWriteAccessOnComment();
 		$this->commentsManager->delete($this->comment->getId());
 	}
@@ -156,7 +156,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 *
 	 * @return string
 	 */
-	function getName() {
+	public function getName() {
 		return $this->comment->getId();
 	}
 
@@ -166,7 +166,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 * @param string $name The new name
 	 * @throws MethodNotAllowed
 	 */
-	function setName($name) {
+	public function setName($name) {
 		throw new MethodNotAllowed();
 	}
 
@@ -175,7 +175,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 *
 	 * @return int
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return null;
 	}
 
@@ -215,7 +215,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 * @param PropPatch $propPatch
 	 * @return void
 	 */
-	function propPatch(PropPatch $propPatch) {
+	public function propPatch(PropPatch $propPatch) {
 		// other properties than 'message' are read only
 		$propPatch->handle(self::PROPERTY_NAME_MESSAGE, [$this, 'updateComment']);
 	}
@@ -235,7 +235,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 	 * @param array $properties
 	 * @return array
 	 */
-	function getProperties($properties) {
+	public function getProperties($properties) {
 		$properties = array_keys($this->properties);
 
 		$result = [];

apps/dav/lib/Comments/CommentsPlugin.php

@@ -45,12 +45,12 @@ use Sabre\Xml\Writer;
  */
 class CommentsPlugin extends ServerPlugin {
 	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-comments';
+	public const REPORT_NAME            = '{http://owncloud.org/ns}filter-comments';
-	const REPORT_PARAM_LIMIT     = '{http://owncloud.org/ns}limit';
+	public const REPORT_PARAM_LIMIT     = '{http://owncloud.org/ns}limit';
-	const REPORT_PARAM_OFFSET    = '{http://owncloud.org/ns}offset';
+	public const REPORT_PARAM_OFFSET    = '{http://owncloud.org/ns}offset';
-	const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
+	public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
 
 	/** @var ICommentsManager  */
 	protected $commentsManager;
@@ -83,7 +83,7 @@ class CommentsPlugin extends ServerPlugin {
 	 * @param Server $server
 	 * @return void
 	 */
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		$this->server = $server;
 		if (strpos($this->server->getRequestUri(), 'comments/') !== 0) {
 			return;

apps/dav/lib/Comments/EntityCollection.php

@@ -41,7 +41,7 @@ use Sabre\DAV\PropPatch;
  * @package OCA\DAV\Comments
  */
 class EntityCollection extends RootCollection implements IProperties {
-	const PROPERTY_NAME_READ_MARKER  = '{http://owncloud.org/ns}readMarker';
+	public const PROPERTY_NAME_READ_MARKER  = '{http://owncloud.org/ns}readMarker';
 
 	/** @var  string */
 	protected $id;
@@ -98,7 +98,7 @@ class EntityCollection extends RootCollection implements IProperties {
 	 * @return \Sabre\DAV\INode
 	 * @throws NotFound
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		try {
 			$comment = $this->commentsManager->get($name);
 			return new CommentNode(
@@ -118,7 +118,7 @@ class EntityCollection extends RootCollection implements IProperties {
 	 *
 	 * @return \Sabre\DAV\INode[]
 	 */
-	function getChildren() {
+	public function getChildren() {
 		return $this->findChildren();
 	}
 
@@ -131,7 +131,7 @@ class EntityCollection extends RootCollection implements IProperties {
 	 * @param \DateTime|null $datetime
 	 * @return CommentNode[]
 	 */
-	function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) {
+	public function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) {
 		$comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime);
 		$result = [];
 		foreach ($comments as $comment) {
@@ -152,7 +152,7 @@ class EntityCollection extends RootCollection implements IProperties {
 	 * @param string $name
 	 * @return bool
 	 */
-	function childExists($name) {
+	public function childExists($name) {
 		try {
 			$this->commentsManager->get($name);
 			return true;
@@ -177,14 +177,14 @@ class EntityCollection extends RootCollection implements IProperties {
 	/**
 	 * @inheritdoc
 	 */
-	function propPatch(PropPatch $propPatch) {
+	public function propPatch(PropPatch $propPatch) {
 		$propPatch->handle(self::PROPERTY_NAME_READ_MARKER, [$this, 'setReadMarker']);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getProperties($properties) {
+	public function getProperties($properties) {
 		$marker = null;
 		$user = $this->userSession->getUser();
 		if (!is_null($user)) {

apps/dav/lib/Comments/EntityTypeCollection.php

@@ -90,7 +90,7 @@ class EntityTypeCollection extends RootCollection {
 	 * @return \Sabre\DAV\INode
 	 * @throws NotFound
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		if (!$this->childExists($name)) {
 			throw new NotFound('Entity does not exist or is not available');
 		}
@@ -110,7 +110,7 @@ class EntityTypeCollection extends RootCollection {
 	 * @return \Sabre\DAV\INode[]
 	 * @throws MethodNotAllowed
 	 */
-	function getChildren() {
+	public function getChildren() {
 		throw new MethodNotAllowed('No permission to list folder contents');
 	}
 
@@ -120,7 +120,7 @@ class EntityTypeCollection extends RootCollection {
 	 * @param string $name
 	 * @return bool
 	 */
-	function childExists($name) {
+	public function childExists($name) {
 		return call_user_func($this->childExistsFunction, $name);
 	}
 }

apps/dav/lib/Comments/RootCollection.php

@@ -118,7 +118,7 @@ class RootCollection implements ICollection {
 	 * @return null|string
 	 * @throws Forbidden
 	 */
-	function createFile($name, $data = null) {
+	public function createFile($name, $data = null) {
 		throw new Forbidden('Cannot create comments by id');
 	}
 
@@ -128,7 +128,7 @@ class RootCollection implements ICollection {
 	 * @param string $name
 	 * @throws Forbidden
 	 */
-	function createDirectory($name) {
+	public function createDirectory($name) {
 		throw new Forbidden('Permission denied to create collections');
 	}
 
@@ -142,7 +142,7 @@ class RootCollection implements ICollection {
 	 * @return \Sabre\DAV\INode
 	 * @throws NotFound
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		$this->initCollections();
 		if (isset($this->entityTypeCollections[$name])) {
 			return $this->entityTypeCollections[$name];
@@ -155,7 +155,7 @@ class RootCollection implements ICollection {
 	 *
 	 * @return \Sabre\DAV\INode[]
 	 */
-	function getChildren() {
+	public function getChildren() {
 		$this->initCollections();
 		return $this->entityTypeCollections;
 	}
@@ -166,7 +166,7 @@ class RootCollection implements ICollection {
 	 * @param string $name
 	 * @return bool
 	 */
-	function childExists($name) {
+	public function childExists($name) {
 		$this->initCollections();
 		return isset($this->entityTypeCollections[$name]);
 	}
@@ -176,7 +176,7 @@ class RootCollection implements ICollection {
 	 *
 	 * @throws Forbidden
 	 */
-	function delete() {
+	public function delete() {
 		throw new Forbidden('Permission denied to delete this collection');
 	}
 
@@ -187,7 +187,7 @@ class RootCollection implements ICollection {
 	 *
 	 * @return string
 	 */
-	function getName() {
+	public function getName() {
 		return $this->name;
 	}
 
@@ -197,7 +197,7 @@ class RootCollection implements ICollection {
 	 * @param string $name The new name
 	 * @throws Forbidden
 	 */
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this collection');
 	}
 
@@ -206,7 +206,7 @@ class RootCollection implements ICollection {
 	 *
 	 * @return int
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return null;
 	}
 }

apps/dav/lib/Connector/Sabre/Auth.php

@@ -50,7 +50,7 @@ use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
 class Auth extends AbstractBasic {
-	const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
+	public const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
 
 	/** @var ISession */
 	private $session;
@@ -151,7 +151,7 @@ class Auth extends AbstractBasic {
 	 * @throws NotAuthenticated
 	 * @throws ServiceUnavailable
 	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+	public function check(RequestInterface $request, ResponseInterface $response) {
 		try {
 			return $this->auth($request, $response);
 		} catch (NotAuthenticated $e) {

apps/dav/lib/Connector/Sabre/ChecksumList.php

@@ -32,7 +32,7 @@ use Sabre\Xml\XmlSerializable;
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/** @var string[] of TYPE:CHECKSUM */
 	private $checksums;
@@ -63,7 +63,7 @@ class ChecksumList implements XmlSerializable {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
 			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
 		}

apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php

@@ -32,9 +32,9 @@ use Sabre\DAV\PropFind;
 use Sabre\DAV\ServerPlugin;
 
 class CommentPropertiesPlugin extends ServerPlugin {
-	const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
+	public const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
-	const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
+	public const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
+	public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
 
 	/** @var  \Sabre\DAV\Server */
 	protected $server;
@@ -65,7 +65,7 @@ class CommentPropertiesPlugin extends ServerPlugin {
 	 * @param \Sabre\DAV\Server $server
 	 * @return void
 	 */
-	function initialize(\Sabre\DAV\Server $server) {
+	public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
 		$this->server->on('propFind', [$this, 'handleGetProperties']);
 	}

apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php

@@ -72,7 +72,7 @@ class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
 	 * @param string $destination
 	 * @return void
 	 */
-	function afterMove($source, $destination) {
+	public function afterMove($source, $destination) {
 		$node = $this->server->tree->getNodeForPath($destination);
 		if ($node instanceof File) {
 			$eTag = $node->getETag();

apps/dav/lib/Connector/Sabre/DavAclPlugin.php

@@ -48,7 +48,7 @@ class DavAclPlugin extends \Sabre\DAVACL\Plugin {
 		$this->allowUnauthenticatedAccess = false;
 	}
 
-	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+	public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
 		if ($access === false && $throwExceptions) {
 			/** @var INode $node */
@@ -90,7 +90,7 @@ class DavAclPlugin extends \Sabre\DAVACL\Plugin {
 		return parent::propFind($propFind, $node);
 	}
 
-	function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 		$path = $request->getPath();
 
 		// prevent the plugin from causing an unneeded overhead for file requests

apps/dav/lib/Connector/Sabre/Directory.php

@@ -50,8 +50,7 @@ use Sabre\DAV\Exception\ServiceUnavailable;
 use Sabre\DAV\IFile;
 use Sabre\DAV\INode;
 
-class Directory extends \OCA\DAV\Connector\Sabre\Node
+class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget {
-	implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget {
 
 	/**
 	 * Cached directory content

apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php

@@ -50,7 +50,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
 	 * @param \Sabre\DAV\Server $server
 	 * @return void
 	 */
-	function initialize(\Sabre\DAV\Server $server) {
+	public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
 		$this->server->on('method:GET', [$this, 'httpGet'], 200);
 	}
@@ -60,7 +60,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
 	 * @param ResponseInterface $response
 	 * @return false
 	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
 		$string = 'This is the WebDAV interface. It can only be accessed by ' .
 			'WebDAV clients such as the Nextcloud desktop sync client.';
 		$stream = fopen('php://memory','r+');

apps/dav/lib/Connector/Sabre/Exception/Forbidden.php

@@ -23,7 +23,7 @@
 namespace OCA\DAV\Connector\Sabre\Exception;
 
 class Forbidden extends \Sabre\DAV\Exception\Forbidden {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/**
 	 * @var bool

apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php

@@ -26,7 +26,7 @@ namespace OCA\DAV\Connector\Sabre\Exception;
 use Sabre\DAV\Exception;
 
 class InvalidPath extends Exception {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/**
 	 * @var bool

apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php

@@ -29,7 +29,7 @@ use Sabre\DAV\Exception\NotAuthenticated;
 use Sabre\DAV\Server;
 
 class PasswordLoginForbidden extends NotAuthenticated {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	public function getHTTPCode() {
 		return 401;

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

@@ -77,7 +77,7 @@ class FakeLockerPlugin extends ServerPlugin {
 	 *
 	 * @return integer[]
 	 */
-	function getFeatures() {
+	public function getFeatures() {
 		return [2];
 	}
 
@@ -88,7 +88,7 @@ class FakeLockerPlugin extends ServerPlugin {
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFind(PropFind $propFind, INode $node) {
+	public function propFind(PropFind $propFind, INode $node) {
 		$propFind->handle('{DAV:}supportedlock', function () {
 			return new SupportedLock(true);
 		});

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -54,28 +54,28 @@ use Sabre\HTTP\ResponseInterface;
 class FilesPlugin extends ServerPlugin {
 
 	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+	public const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
+	public const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
-	const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
+	public const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
-	const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
+	public const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
-	const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
+	public const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
-	const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
+	public const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
-	const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
+	public const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
-	const GETETAG_PROPERTYNAME = '{DAV:}getetag';
+	public const GETETAG_PROPERTYNAME = '{DAV:}getetag';
-	const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
+	public const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
-	const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
+	public const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
-	const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
+	public const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
-	const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
+	public const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
-	const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
+	public const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
-	const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
+	public const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
-	const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
+	public const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
-	const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
+	public const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
-	const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag';
+	public const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag';
-	const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time';
+	public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time';
-	const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time';
+	public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time';
-	const SHARE_NOTE = '{http://nextcloud.org/ns}note';
+	public const SHARE_NOTE = '{http://nextcloud.org/ns}note';
 
 	/**
 	 * Reference to main server object
@@ -197,7 +197,7 @@ class FilesPlugin extends ServerPlugin {
 	 * @throws Forbidden
 	 * @throws NotFound
 	 */
-	function checkMove($source, $destination) {
+	public function checkMove($source, $destination) {
 		$sourceNode = $this->tree->getNodeForPath($source);
 		if (!$sourceNode instanceof Node) {
 			return;
@@ -225,7 +225,7 @@ class FilesPlugin extends ServerPlugin {
 	 * @param RequestInterface $request
 	 * @param ResponseInterface $response
 	 */
-	function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
+	public function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
 		$queryParams = $request->getQueryParameters();
 
 		/**
@@ -249,7 +249,7 @@ class FilesPlugin extends ServerPlugin {
 	 * @param RequestInterface $request
 	 * @param ResponseInterface $response
 	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
 		// Only handle valid files
 		$node = $this->tree->getNodeForPath($request->getPath());
 		if (!($node instanceof IFile)) {

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

@@ -48,10 +48,10 @@ use Sabre\DAV\Xml\Response\MultiStatus;
 class FilesReportPlugin extends ServerPlugin {
 
 	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
+	public const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
-	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+	public const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
-	const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
+	public const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle';
 
 	/**
 	 * Reference to main server object

apps/dav/lib/Connector/Sabre/Principal.php

@@ -224,7 +224,7 @@ class Principal implements BackendInterface {
 	 * @param PropPatch $propPatch
 	 * @return int
 	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
+	public function updatePrincipal($path, PropPatch $propPatch) {
 		return 0;
 	}
 
@@ -371,7 +371,7 @@ class Principal implements BackendInterface {
 	 * @param string $test
 	 * @return array
 	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
 		if (count($searchProperties) === 0) {
 			return [];
 		}
@@ -390,7 +390,7 @@ class Principal implements BackendInterface {
 	 * @param string $principalPrefix
 	 * @return string
 	 */
-	function findByUri($uri, $principalPrefix) {
+	public function findByUri($uri, $principalPrefix) {
 		// If sharing is disabled, return the empty array
 		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
 		if (!$shareAPIEnabled) {

apps/dav/lib/Connector/Sabre/ShareTypeList.php

@@ -32,7 +32,7 @@ use Sabre\Xml\Writer;
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/**
 	 * Share types
@@ -63,7 +63,7 @@ class ShareTypeList implements Element {
 	 * @param Reader $reader
 	 * @return mixed
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$shareTypes = [];
 
 		$tree = $reader->parseInnerTree();
@@ -84,7 +84,7 @@ class ShareTypeList implements Element {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
 			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
 		}

apps/dav/lib/Connector/Sabre/ShareeList.php

@@ -35,7 +35,7 @@ use Sabre\Xml\XmlSerializable;
  * This property contains multiple "sharee" elements, each containing a share sharee
  */
 class ShareeList implements XmlSerializable {
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 
 	/** @var IShare[] */
 	private $shares;
@@ -50,7 +50,7 @@ class ShareeList implements XmlSerializable {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shares as $share) {
 			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
 			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());

apps/dav/lib/Connector/Sabre/SharesPlugin.php

@@ -35,10 +35,10 @@ use Sabre\DAV\PropFind;
  * Sabre Plugin to provide share-related properties
  */
 class SharesPlugin extends \Sabre\DAV\ServerPlugin {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
+	public const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types';
-	const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees';
+	public const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees';
 
 	/**
 	 * Reference to main server object

apps/dav/lib/Connector/Sabre/TagList.php

@@ -34,7 +34,7 @@ use Sabre\Xml\Writer;
  * This property contains multiple "tag" elements, each containing a tag name.
  */
 class TagList implements Element {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
 	/**
 	 * tags
@@ -80,7 +80,7 @@ class TagList implements Element {
 	 * @param Reader $reader
 	 * @return mixed
 	 */
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$tags = [];
 
 		$tree = $reader->parseInnerTree();
@@ -114,7 +114,7 @@ class TagList implements Element {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		foreach ($this->tags as $tag) {
 			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
 		}

apps/dav/lib/Connector/Sabre/TagsPlugin.php

@@ -55,10 +55,10 @@ use Sabre\DAV\PropPatch;
 class TagsPlugin extends \Sabre\DAV\ServerPlugin {
 
 	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+	public const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+	public const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
+	public const TAG_FAVORITE = '_$!<Favorite>!$_';
 
 	/**
 	 * Reference to main server object

apps/dav/lib/DAV/GroupPrincipalBackend.php

@@ -36,7 +36,7 @@ use Sabre\DAV\PropPatch;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
 
 class GroupPrincipalBackend implements BackendInterface {
-	const PRINCIPAL_PREFIX = 'principals/groups';
+	public const PRINCIPAL_PREFIX = 'principals/groups';
 
 	/** @var IGroupManager */
 	private $groupManager;
@@ -167,7 +167,7 @@ class GroupPrincipalBackend implements BackendInterface {
 	 * @param PropPatch $propPatch
 	 * @return int
 	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
+	public function updatePrincipal($path, PropPatch $propPatch) {
 		return 0;
 	}
 
@@ -177,7 +177,7 @@ class GroupPrincipalBackend implements BackendInterface {
 	 * @param string $test
 	 * @return array
 	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
 		$results = [];
 
 		if (\count($searchProperties) === 0) {
@@ -257,7 +257,7 @@ class GroupPrincipalBackend implements BackendInterface {
 	 * @param string $principalPrefix
 	 * @return string
 	 */
-	function findByUri($uri, $principalPrefix) {
+	public function findByUri($uri, $principalPrefix) {
 		// If sharing is disabled, return the empty array
 		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
 		if (!$shareAPIEnabled) {

apps/dav/lib/DAV/PublicAuth.php

@@ -67,7 +67,7 @@ class PublicAuth implements BackendInterface {
 	 * @param ResponseInterface $response
 	 * @return array
 	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+	public function check(RequestInterface $request, ResponseInterface $response) {
 		if ($this->isRequestPublic($request)) {
 			return [true, "principals/system/public"];
 		}
@@ -77,7 +77,7 @@ class PublicAuth implements BackendInterface {
 	/**
 	 * @inheritdoc
 	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
+	public function challenge(RequestInterface $request, ResponseInterface $response) {
 	}
 
 	/**

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

@@ -45,9 +45,9 @@ class Backend {
 	/** @var string */
 	private $resourceType;
 
-	const ACCESS_OWNER = 1;
+	public const ACCESS_OWNER = 1;
-	const ACCESS_READ_WRITE = 2;
+	public const ACCESS_READ_WRITE = 2;
-	const ACCESS_READ = 3;
+	public const ACCESS_READ = 3;
 
 	/**
 	 * @param IDBConnection $db

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

@@ -49,7 +49,7 @@ interface IShareable extends INode {
 	 * @param array $remove
 	 * @return void
 	 */
-	function updateShares(array $add, array $remove);
+	public function updateShares(array $add, array $remove);
 
 	/**
 	 * Returns the list of people whom this resource is shared with.
@@ -63,7 +63,7 @@ interface IShareable extends INode {
 	 *
 	 * @return array
 	 */
-	function getShares();
+	public function getShares();
 
 	/**
 	 * @return int

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

@@ -37,8 +37,8 @@ use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
 class Plugin extends ServerPlugin {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+	public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
 
 	/** @var Auth */
 	private $auth;
@@ -72,7 +72,7 @@ class Plugin extends ServerPlugin {
 	 *
 	 * @return string[]
 	 */
-	function getFeatures() {
+	public function getFeatures() {
 		return ['oc-resource-sharing'];
 	}
 
@@ -84,7 +84,7 @@ class Plugin extends ServerPlugin {
 	 *
 	 * @return string
 	 */
-	function getPluginName() {
+	public function getPluginName() {
 		return 'oc-resource-sharing';
 	}
 
@@ -99,7 +99,7 @@ class Plugin extends ServerPlugin {
 	 * @param Server $server
 	 * @return void
 	 */
-	function initialize(Server $server) {
+	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;
@@ -115,7 +115,7 @@ class Plugin extends ServerPlugin {
 	 * @param ResponseInterface $response
 	 * @return null|false
 	 */
-	function httpPost(RequestInterface $request, ResponseInterface $response) {
+	public function httpPost(RequestInterface $request, ResponseInterface $response) {
 		$path = $request->getPath();
 
 		// Only handling xml
@@ -188,7 +188,7 @@ class Plugin extends ServerPlugin {
 	 * @param INode $node
 	 * @return void
 	 */
-	function propFind(PropFind $propFind, INode $node) {
+	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IShareable) {
 			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
 				return new Invite(

apps/dav/lib/DAV/Sharing/Xml/Invite.php

@@ -84,7 +84,7 @@ class Invite implements XmlSerializable {
 	 *
 	 * @param array $users
 	 */
-	function __construct(array $users, array $organizer = null) {
+	public function __construct(array $users, array $organizer = null) {
 		$this->users = $users;
 		$this->organizer = $organizer;
 	}
@@ -94,7 +94,7 @@ class Invite implements XmlSerializable {
 	 *
 	 * @return array
 	 */
-	function getValue() {
+	public function getValue() {
 		return $this->users;
 	}
 
@@ -117,7 +117,7 @@ class Invite implements XmlSerializable {
 	 * @param Writer $writer
 	 * @return void
 	 */
-	function xmlSerialize(Writer $writer) {
+	public function xmlSerialize(Writer $writer) {
 		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
 
 		if (!is_null($this->organizer)) {

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

@@ -38,12 +38,12 @@ class ShareRequest implements XmlDeserializable {
 	 * @param array $set
 	 * @param array $remove
 	 */
-	function __construct(array $set, array $remove) {
+	public function __construct(array $set, array $remove) {
 		$this->set = $set;
 		$this->remove = $remove;
 	}
 
-	static function xmlDeserialize(Reader $reader) {
+	public static function xmlDeserialize(Reader $reader) {
 		$elements = $reader->parseInnerTree([
 			'{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
 			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',

apps/dav/lib/DAV/SystemPrincipalBackend.php

@@ -43,7 +43,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param string $prefixPath
 	 * @return array
 	 */
-	function getPrincipalsByPrefix($prefixPath) {
+	public function getPrincipalsByPrefix($prefixPath) {
 		$principals = [];
 
 		if ($prefixPath === 'principals/system') {
@@ -68,7 +68,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param string $path
 	 * @return array
 	 */
-	function getPrincipalByPath($path) {
+	public function getPrincipalByPath($path) {
 		if ($path === 'principals/system/system') {
 			$principal = [
 				'uri' => 'principals/system/system',
@@ -103,7 +103,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param \Sabre\DAV\PropPatch $propPatch
 	 * @return void
 	 */
-	function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch) {
+	public function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch) {
 	}
 
 	/**
@@ -135,7 +135,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param string $test
 	 * @return array
 	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
 		return [];
 	}
 
@@ -145,7 +145,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param string $principal
 	 * @return array
 	 */
-	function getGroupMemberSet($principal) {
+	public function getGroupMemberSet($principal) {
 		// TODO: for now the group principal has only one member, the user itself
 		$principal = $this->getPrincipalByPath($principal);
 		if (!$principal) {
@@ -161,7 +161,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param string $principal
 	 * @return array
 	 */
-	function getGroupMembership($principal) {
+	public function getGroupMembership($principal) {
 		list($prefix, ) = \Sabre\Uri\split($principal);
 
 		if ($prefix === 'principals/system') {
@@ -184,7 +184,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @param array $members
 	 * @return void
 	 */
-	function setGroupMemberSet($principal, array $members) {
+	public function setGroupMemberSet($principal, array $members) {
 		throw new \Sabre\DAV\Exception('Setting members of the group is not supported yet');
 	}
 }

apps/dav/lib/Files/BrowserErrorPagePlugin.php

@@ -48,7 +48,7 @@ class BrowserErrorPagePlugin extends ServerPlugin {
 	 * @param Server $server
 	 * @return void
 	 */
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		$this->server = $server;
 		$server->on('exception', [$this, 'logException'], 1000);
 	}

apps/dav/lib/Files/FileSearchBackend.php

@@ -428,6 +428,7 @@ class FileSearchBackend implements ISearchBackend {
 				} else {
 					return null;
 				}
+				// no break
 			default:
 				return null;
 		}

apps/dav/lib/Files/FilesHome.php

@@ -49,16 +49,16 @@ class FilesHome extends Directory {
 		parent::__construct($view, $userFolder);
 	}
 
-	function delete() {
+	public function delete() {
 		throw new Forbidden('Permission denied to delete home folder');
 	}
 
-	function getName() {
+	public function getName() {
 		list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
 		return $name;
 	}
 
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this folder');
 	}
 }

apps/dav/lib/Files/RootCollection.php

@@ -42,7 +42,7 @@ class RootCollection extends AbstractPrincipalCollection {
 	 * @param array $principalInfo
 	 * @return INode
 	 */
-	function getChildForPrincipal(array $principalInfo) {
+	public function getChildForPrincipal(array $principalInfo) {
 		list(,$name) = \Sabre\Uri\split($principalInfo['uri']);
 		$user = \OC::$server->getUserSession()->getUser();
 		if (is_null($user) || $name !== $user->getUID()) {
@@ -58,7 +58,7 @@ class RootCollection extends AbstractPrincipalCollection {
 		return new FilesHome($principalInfo, $userFolder);
 	}
 
-	function getName() {
+	public function getName() {
 		return 'files';
 	}
 }

apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php

@@ -30,7 +30,7 @@ use Sabre\DAV\IProperties;
 use Sabre\DAV\PropPatch;
 
 class AppleProvisioningNode implements INode, IProperties {
-	const FILENAME = 'apple-provisioning.mobileconfig';
+	public const FILENAME = 'apple-provisioning.mobileconfig';
 
 	protected $timeFactory;
 

apps/dav/lib/SystemTag/SystemTagPlugin.php

@@ -50,13 +50,13 @@ use Sabre\HTTP\ResponseInterface;
 class SystemTagPlugin extends \Sabre\DAV\ServerPlugin {
 
 	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+	public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
+	public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
-	const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
+	public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
-	const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
+	public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
-	const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
+	public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
-	const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
+	public const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
 
 	/**
 	 * @var \Sabre\DAV\Server $server

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php

@@ -86,21 +86,21 @@ class SystemTagsByIdCollection implements ICollection {
 	 * @param resource|string $data Initial payload
 	 * @throws Forbidden
 	 */
-	function createFile($name, $data = null) {
+	public function createFile($name, $data = null) {
 		throw new Forbidden('Cannot create tags by id');
 	}
 
 	/**
 	 * @param string $name
 	 */
-	function createDirectory($name) {
+	public function createDirectory($name) {
 		throw new Forbidden('Permission denied to create collections');
 	}
 
 	/**
 	 * @param string $name
 	 */
-	function getChild($name) {
+	public function getChild($name) {
 		try {
 			$tag = $this->tagManager->getTagsByIds([$name]);
 			$tag = current($tag);
@@ -115,7 +115,7 @@ class SystemTagsByIdCollection implements ICollection {
 		}
 	}
 
-	function getChildren() {
+	public function getChildren() {
 		$visibilityFilter = true;
 		if ($this->isAdmin()) {
 			$visibilityFilter = null;
@@ -130,7 +130,7 @@ class SystemTagsByIdCollection implements ICollection {
 	/**
 	 * @param string $name
 	 */
-	function childExists($name) {
+	public function childExists($name) {
 		try {
 			$tag = $this->tagManager->getTagsByIds([$name]);
 			$tag = current($tag);
@@ -145,15 +145,15 @@ class SystemTagsByIdCollection implements ICollection {
 		}
 	}
 
-	function delete() {
+	public function delete() {
 		throw new Forbidden('Permission denied to delete this collection');
 	}
 
-	function getName() {
+	public function getName() {
 		return 'systemtags';
 	}
 
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this collection');
 	}
 
@@ -162,7 +162,7 @@ class SystemTagsByIdCollection implements ICollection {
 	 *
 	 * @return int
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return null;
 	}
 

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

@@ -92,7 +92,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
 		$this->user = $user;
 	}
 
-	function createFile($tagId, $data = null) {
+	public function createFile($tagId, $data = null) {
 		try {
 			$tags = $this->tagManager->getTagsByIds([$tagId]);
 			$tag = current($tags);
@@ -109,11 +109,11 @@ class SystemTagsObjectMappingCollection implements ICollection {
 		}
 	}
 
-	function createDirectory($name) {
+	public function createDirectory($name) {
 		throw new Forbidden('Permission denied to create collections');
 	}
 
-	function getChild($tagId) {
+	public function getChild($tagId) {
 		try {
 			if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
 				$tag = $this->tagManager->getTagsByIds([$tagId]);
@@ -130,7 +130,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
 		}
 	}
 
-	function getChildren() {
+	public function getChildren() {
 		$tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
 		if (empty($tagIds)) {
 			return [];
@@ -147,7 +147,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
 		}, $tags));
 	}
 
-	function childExists($tagId) {
+	public function childExists($tagId) {
 		try {
 			$result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
 
@@ -167,15 +167,15 @@ class SystemTagsObjectMappingCollection implements ICollection {
 		}
 	}
 
-	function delete() {
+	public function delete() {
 		throw new Forbidden('Permission denied to delete this collection');
 	}
 
-	function getName() {
+	public function getName() {
 		return $this->objectId;
 	}
 
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this collection');
 	}
 
@@ -184,7 +184,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
 	 *
 	 * @return int
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return null;
 	}
 

apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php

@@ -101,7 +101,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 * @return null|string
 	 * @throws Forbidden
 	 */
-	function createFile($name, $data = null) {
+	public function createFile($name, $data = null) {
 		throw new Forbidden('Permission denied to create nodes');
 	}
 
@@ -109,7 +109,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 * @param string $name
 	 * @throws Forbidden
 	 */
-	function createDirectory($name) {
+	public function createDirectory($name) {
 		throw new Forbidden('Permission denied to create collections');
 	}
 
@@ -118,7 +118,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 * @return SystemTagsObjectMappingCollection
 	 * @throws NotFound
 	 */
-	function getChild($objectId) {
+	public function getChild($objectId) {
 		// make sure the object exists and is reachable
 		if (!$this->childExists($objectId)) {
 			throw new NotFound('Entity does not exist or is not available');
@@ -132,7 +132,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 		);
 	}
 
-	function getChildren() {
+	public function getChildren() {
 		// do not list object ids
 		throw new MethodNotAllowed();
 	}
@@ -143,15 +143,15 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 * @param string $name
 	 * @return bool
 	 */
-	function childExists($name) {
+	public function childExists($name) {
 		return call_user_func($this->childExistsFunction, $name);
 	}
 
-	function delete() {
+	public function delete() {
 		throw new Forbidden('Permission denied to delete this collection');
 	}
 
-	function getName() {
+	public function getName() {
 		return $this->objectType;
 	}
 
@@ -159,7 +159,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 * @param string $name
 	 * @throws Forbidden
 	 */
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this collection');
 	}
 
@@ -168,7 +168,7 @@ class SystemTagsObjectTypeCollection implements ICollection {
 	 *
 	 * @return int
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return null;
 	}
 }

apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php

@@ -84,11 +84,11 @@ class SystemTagsRelationsCollection extends SimpleCollection {
 		parent::__construct('root', $children);
 	}
 
-	function getName() {
+	public function getName() {
 		return 'systemtags-relations';
 	}
 
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this collection');
 	}
 }

apps/dav/lib/Upload/ChunkingPlugin.php

@@ -37,7 +37,7 @@ class ChunkingPlugin extends ServerPlugin {
 	/**
 	 * @inheritdoc
 	 */
-	function initialize(Server $server) {
+	public function initialize(Server $server) {
 		$server->on('beforeMove', [$this, 'beforeMove']);
 		$this->server = $server;
 	}
@@ -46,7 +46,7 @@ class ChunkingPlugin extends ServerPlugin {
 	 * @param string $sourcePath source path
 	 * @param string $destination destination path
 	 */
-	function beforeMove($sourcePath, $destination) {
+	public function beforeMove($sourcePath, $destination) {
 		$this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
 		if (!$this->sourceNode instanceof FutureFile) {
 			// skip handling as the source is not a chunked FutureFile

apps/dav/lib/Upload/FutureFile.php

@@ -47,7 +47,7 @@ class FutureFile implements \Sabre\DAV\IFile {
 	 * @param Directory $root
 	 * @param string $name
 	 */
-	function __construct(Directory $root, $name) {
+	public function __construct(Directory $root, $name) {
 		$this->root = $root;
 		$this->name = $name;
 	}
@@ -55,14 +55,14 @@ class FutureFile implements \Sabre\DAV\IFile {
 	/**
 	 * @inheritdoc
 	 */
-	function put($data) {
+	public function put($data) {
 		throw new Forbidden('Permission denied to put into this file');
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function get() {
+	public function get() {
 		$nodes = $this->root->getChildren();
 		return AssemblyStream::wrap($nodes);
 	}
@@ -70,21 +70,21 @@ class FutureFile implements \Sabre\DAV\IFile {
 	/**
 	 * @inheritdoc
 	 */
-	function getContentType() {
+	public function getContentType() {
 		return 'application/octet-stream';
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getETag() {
+	public function getETag() {
 		return $this->root->getETag();
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getSize() {
+	public function getSize() {
 		$children = $this->root->getChildren();
 		$sizes = array_map(function ($node) {
 			/** @var IFile $node */
@@ -97,28 +97,28 @@ class FutureFile implements \Sabre\DAV\IFile {
 	/**
 	 * @inheritdoc
 	 */
-	function delete() {
+	public function delete() {
 		$this->root->delete();
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getName() {
+	public function getName() {
 		return $this->name;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this file');
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	function getLastModified() {
+	public function getLastModified() {
 		return $this->root->getLastModified();
 	}
 }

apps/dav/lib/Upload/UploadFolder.php

@@ -35,56 +35,56 @@ class UploadFolder implements ICollection {
 	/** @var CleanupService */
 	private $cleanupService;
 
-	function __construct(Directory $node, CleanupService $cleanupService) {
+	public function __construct(Directory $node, CleanupService $cleanupService) {
 		$this->node = $node;
 		$this->cleanupService = $cleanupService;
 	}
 
-	function createFile($name, $data = null) {
+	public function createFile($name, $data = null) {
 		// TODO: verify name - should be a simple number
 		$this->node->createFile($name, $data);
 	}
 
-	function createDirectory($name) {
+	public function createDirectory($name) {
 		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
 	}
 
-	function getChild($name) {
+	public function getChild($name) {
 		if ($name === '.file') {
 			return new FutureFile($this->node, '.file');
 		}
 		return $this->node->getChild($name);
 	}
 
-	function getChildren() {
+	public function getChildren() {
 		$children = $this->node->getChildren();
 		$children[] = new FutureFile($this->node, '.file');
 		return $children;
 	}
 
-	function childExists($name) {
+	public function childExists($name) {
 		if ($name === '.file') {
 			return true;
 		}
 		return $this->node->childExists($name);
 	}
 
-	function delete() {
+	public function delete() {
 		$this->node->delete();
 
 		// Background cleanup job is not needed anymore
 		$this->cleanupService->removeJob($this->getName());
 	}
 
-	function getName() {
+	public function getName() {
 		return $this->node->getName();
 	}
 
-	function setName($name) {
+	public function setName($name) {
 		throw new Forbidden('Permission denied to rename this folder');
 	}
 
-	function getLastModified() {
+	public function getLastModified() {
 		return $this->node->getLastModified();
 	}
 }

apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php

@@ -68,10 +68,10 @@ abstract class AbstractCalDavBackend extends TestCase {
 	/** @var ILogger */
 	private $logger;
 
-	const UNIT_TEST_USER = 'principals/users/caldav-unit-test';
+	public const UNIT_TEST_USER = 'principals/users/caldav-unit-test';
-	const UNIT_TEST_USER1 = 'principals/users/caldav-unit-test1';
+	public const UNIT_TEST_USER1 = 'principals/users/caldav-unit-test1';
-	const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group';
+	public const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group';
-	const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2';
+	public const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2';
 
 	protected function setUp(): void {
 		parent::setUp();

apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php

@@ -52,7 +52,7 @@ use Test\TestCase;
  * @package OCA\DAV\Tests\unit\CalDAV
  */
 class PublicCalendarRootTest extends TestCase {
-	const UNIT_TEST_USER = '';
+	public const UNIT_TEST_USER = '';
 	/** @var CalDavBackend */
 	private $backend;
 	/** @var PublicCalendarRoot */

apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php

@@ -31,7 +31,7 @@ use Sabre\Xml\Writer;
 use Test\TestCase;
 
 class PublisherTest extends TestCase {
-	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+	public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
 
 	public function testSerializePublished() {
 		$publish = new Publisher('urltopublish', true);

apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php

@@ -43,7 +43,7 @@ use OCP\Mail\IMessage;
 use Sabre\VObject\Component\VCalendar;
 
 class EmailProviderTest extends AbstractNotificationProviderTest {
-	const USER_EMAIL = 'frodo@hobb.it';
+	public const USER_EMAIL = 'frodo@hobb.it';
 
 	/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
 	protected $logger;

apps/dav/tests/unit/CardDAV/CardDavBackendTest.php

@@ -86,9 +86,9 @@ class CardDavBackendTest extends TestCase {
 	/** @var string */
 	private $dbCardsPropertiesTable = 'cards_properties';
 
-	const UNIT_TEST_USER = 'principals/users/carddav-unit-test';
+	public const UNIT_TEST_USER = 'principals/users/carddav-unit-test';
-	const UNIT_TEST_USER1 = 'principals/users/carddav-unit-test1';
+	public const UNIT_TEST_USER1 = 'principals/users/carddav-unit-test1';
-	const UNIT_TEST_GROUP = 'principals/groups/carddav-unit-test-group';
+	public const UNIT_TEST_GROUP = 'principals/groups/carddav-unit-test-group';
 
 	private $vcardTest0 = 'BEGIN:VCARD'.PHP_EOL.
 						 'VERSION:3.0'.PHP_EOL.

apps/dav/tests/unit/CardDAV/ConverterTest.php

@@ -34,7 +34,7 @@ use OCP\IUser;
 use PHPUnit_Framework_MockObject_MockObject;
 use Test\TestCase;
 
-class ConverterTest extends  TestCase {
+class ConverterTest extends TestCase {
 
 	/** @var  AccountManager | PHPUnit_Framework_MockObject_MockObject */
 	private $accountManager;

apps/dav/tests/unit/Command/ListCalendarsTest.php

@@ -48,7 +48,7 @@ class ListCalendarsTest extends TestCase {
 	/** @var ListCalendars */
 	private $command;
 
-	const USERNAME = 'username';
+	public const USERNAME = 'username';
 
 	protected function setUp(): void {
 		parent::setUp();

apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php

@@ -56,17 +56,17 @@ use Test\TestCase;
  * See the COPYING-README file.
  */
 class FilesPluginTest extends TestCase {
-	const GETETAG_PROPERTYNAME = FilesPlugin::GETETAG_PROPERTYNAME;
+	public const GETETAG_PROPERTYNAME = FilesPlugin::GETETAG_PROPERTYNAME;
-	const FILEID_PROPERTYNAME = FilesPlugin::FILEID_PROPERTYNAME;
+	public const FILEID_PROPERTYNAME = FilesPlugin::FILEID_PROPERTYNAME;
-	const INTERNAL_FILEID_PROPERTYNAME = FilesPlugin::INTERNAL_FILEID_PROPERTYNAME;
+	public const INTERNAL_FILEID_PROPERTYNAME = FilesPlugin::INTERNAL_FILEID_PROPERTYNAME;
-	const SIZE_PROPERTYNAME = FilesPlugin::SIZE_PROPERTYNAME;
+	public const SIZE_PROPERTYNAME = FilesPlugin::SIZE_PROPERTYNAME;
-	const PERMISSIONS_PROPERTYNAME = FilesPlugin::PERMISSIONS_PROPERTYNAME;
+	public const PERMISSIONS_PROPERTYNAME = FilesPlugin::PERMISSIONS_PROPERTYNAME;
-	const LASTMODIFIED_PROPERTYNAME = FilesPlugin::LASTMODIFIED_PROPERTYNAME;
+	public const LASTMODIFIED_PROPERTYNAME = FilesPlugin::LASTMODIFIED_PROPERTYNAME;
-	const DOWNLOADURL_PROPERTYNAME = FilesPlugin::DOWNLOADURL_PROPERTYNAME;
+	public const DOWNLOADURL_PROPERTYNAME = FilesPlugin::DOWNLOADURL_PROPERTYNAME;
-	const OWNER_ID_PROPERTYNAME = FilesPlugin::OWNER_ID_PROPERTYNAME;
+	public const OWNER_ID_PROPERTYNAME = FilesPlugin::OWNER_ID_PROPERTYNAME;
-	const OWNER_DISPLAY_NAME_PROPERTYNAME = FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME;
+	public const OWNER_DISPLAY_NAME_PROPERTYNAME = FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME;
-	const DATA_FINGERPRINT_PROPERTYNAME = FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME;
+	public const DATA_FINGERPRINT_PROPERTYNAME = FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME;
-	const HAS_PREVIEW_PROPERTYNAME = FilesPlugin::HAS_PREVIEW_PROPERTYNAME;
+	public const HAS_PREVIEW_PROPERTYNAME = FilesPlugin::HAS_PREVIEW_PROPERTYNAME;
 
 	/**
 	 * @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject

apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php

@@ -198,7 +198,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		unset($_SERVER['HTTP_OC_CHUNKED']);
 	}
 
-	function nodeForPathProvider() {
+	public function nodeForPathProvider() {
 		return [
 			// regular file
 			[

apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php

@@ -78,7 +78,7 @@ class Auth implements BackendInterface {
 	 * @param ResponseInterface $response
 	 * @return array
 	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+	public function check(RequestInterface $request, ResponseInterface $response) {
 		$userSession = \OC::$server->getUserSession();
 		$result = $userSession->login($this->user, $this->password);
 		if ($result) {
@@ -113,7 +113,7 @@ class Auth implements BackendInterface {
 	 * @param ResponseInterface $response
 	 * @return void
 	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
+	public function challenge(RequestInterface $request, ResponseInterface $response) {
 		// TODO: Implement challenge() method.
 	}
 }

apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php

@@ -40,7 +40,7 @@ use OCP\Share\IShare;
 use Sabre\DAV\Tree;
 
 class SharesPluginTest extends \Test\TestCase {
-	const SHARETYPES_PROPERTYNAME = \OCA\DAV\Connector\Sabre\SharesPlugin::SHARETYPES_PROPERTYNAME;
+	public const SHARETYPES_PROPERTYNAME = \OCA\DAV\Connector\Sabre\SharesPlugin::SHARETYPES_PROPERTYNAME;
 
 	/**
 	 * @var \Sabre\DAV\Server
@@ -267,7 +267,7 @@ class SharesPluginTest extends \Test\TestCase {
 		$this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
 	}
 
-	function sharesGetPropertiesDataProvider() {
+	public function sharesGetPropertiesDataProvider() {
 		return [
 			[[]],
 			[[\OCP\Share::SHARE_TYPE_USER]],