From a7c8d26d31cb1cf69e0e060c53622e545fcfbbb3 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 16:48:31 +0200 Subject: Add visibility to all properties and move static keyword Signed-off-by: Christoph Wurst --- apps/settings/lib/Controller/AuthSettingsController.php | 2 +- apps/user_ldap/lib/Jobs/UpdateGroups.php | 4 ++-- apps/user_ldap/lib/Proxy.php | 2 +- apps/user_ldap/lib/Wizard.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'apps') diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php index 0296a1ac5cb..c7099f28499 100644 --- a/apps/settings/lib/Controller/AuthSettingsController.php +++ b/apps/settings/lib/Controller/AuthSettingsController.php @@ -62,7 +62,7 @@ class AuthSettingsController extends Controller { private $session; /** IUserSession */ - private $userSession; + private $userSession; /** @var string */ private $uid; diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index 19981a69bd2..810d88b3ccc 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -46,9 +46,9 @@ use OCA\User_LDAP\User\Manager; use OCP\ILogger; class UpdateGroups extends \OC\BackgroundJob\TimedJob { - static private $groupsFromDB; + private static $groupsFromDB; - static private $groupBE; + private static $groupBE; public function __construct() { $this->interval = self::getRefreshInterval(); diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php index 7698895eaf0..3cf55f8cd58 100644 --- a/apps/user_ldap/lib/Proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -38,7 +38,7 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\Manager; abstract class Proxy { - static private $accesses = []; + private static $accesses = []; private $ldap = null; /** @var \OCP\ICache|null */ diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index 01a9e19076d..b0b9374fdf6 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -43,7 +43,7 @@ use OCP\ILogger; class Wizard extends LDAPUtility { /** @var \OCP\IL10N */ - static protected $l; + protected static $l; protected $access; protected $cr; protected $configuration; -- cgit v1.2.3 From 1584c9ae9c23d2a7915750ef9203cba0bcebf766 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 16:51:06 +0200 Subject: Add visibility to all methods and position of static keyword Signed-off-by: Christoph Wurst --- apps/contactsinteraction/lib/AddressBook.php | 2 +- apps/contactsinteraction/lib/Card.php | 24 +++--- apps/dav/lib/CalDAV/CalDavBackend.php | 36 ++++---- apps/dav/lib/CalDAV/CalendarHome.php | 8 +- apps/dav/lib/CalDAV/CalendarObject.php | 2 +- apps/dav/lib/CalDAV/CalendarRoot.php | 4 +- apps/dav/lib/CalDAV/Outbox.php | 2 +- apps/dav/lib/CalDAV/Plugin.php | 2 +- apps/dav/lib/CalDAV/Principal/Collection.php | 2 +- apps/dav/lib/CalDAV/Principal/User.php | 2 +- apps/dav/lib/CalDAV/PublicCalendarRoot.php | 8 +- apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php | 6 +- .../ResourceBooking/AbstractPrincipalBackend.php | 6 +- apps/dav/lib/CalDAV/Schedule/Plugin.php | 6 +- .../lib/CalDAV/Search/Xml/Filter/CompFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/LimitFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/ParamFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/PropFilter.php | 2 +- .../CalDAV/Search/Xml/Filter/SearchTermFilter.php | 2 +- .../Search/Xml/Request/CalendarSearchReport.php | 2 +- apps/dav/lib/CardDAV/AddressBookRoot.php | 4 +- apps/dav/lib/CardDAV/CardDavBackend.php | 22 ++--- apps/dav/lib/CardDAV/HasPhotoPlugin.php | 4 +- apps/dav/lib/CardDAV/Plugin.php | 4 +- apps/dav/lib/CardDAV/UserAddressBooks.php | 4 +- apps/dav/lib/CardDAV/Xml/Groups.php | 2 +- apps/dav/lib/Command/CreateAddressBook.php | 2 +- apps/dav/lib/Command/CreateCalendar.php | 2 +- apps/dav/lib/Command/ListCalendars.php | 2 +- apps/dav/lib/Command/MoveCalendar.php | 2 +- apps/dav/lib/Command/SyncBirthdayCalendar.php | 2 +- apps/dav/lib/Command/SyncSystemAddressBook.php | 2 +- apps/dav/lib/Comments/CommentNode.php | 14 ++-- apps/dav/lib/Comments/CommentsPlugin.php | 2 +- apps/dav/lib/Comments/EntityCollection.php | 12 +-- apps/dav/lib/Comments/EntityTypeCollection.php | 6 +- apps/dav/lib/Comments/RootCollection.php | 18 ++-- apps/dav/lib/Connector/Sabre/Auth.php | 2 +- apps/dav/lib/Connector/Sabre/ChecksumList.php | 2 +- .../Connector/Sabre/CommentPropertiesPlugin.php | 2 +- .../lib/Connector/Sabre/CopyEtagHeaderPlugin.php | 2 +- apps/dav/lib/Connector/Sabre/DavAclPlugin.php | 4 +- .../lib/Connector/Sabre/DummyGetResponsePlugin.php | 4 +- apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php | 4 +- apps/dav/lib/Connector/Sabre/FilesPlugin.php | 6 +- apps/dav/lib/Connector/Sabre/Principal.php | 6 +- apps/dav/lib/Connector/Sabre/ShareTypeList.php | 4 +- apps/dav/lib/Connector/Sabre/ShareeList.php | 2 +- apps/dav/lib/Connector/Sabre/TagList.php | 4 +- apps/dav/lib/DAV/GroupPrincipalBackend.php | 6 +- apps/dav/lib/DAV/PublicAuth.php | 4 +- apps/dav/lib/DAV/Sharing/IShareable.php | 4 +- apps/dav/lib/DAV/Sharing/Plugin.php | 10 +-- apps/dav/lib/DAV/Sharing/Xml/Invite.php | 6 +- apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php | 4 +- apps/dav/lib/DAV/SystemPrincipalBackend.php | 14 ++-- apps/dav/lib/Files/BrowserErrorPagePlugin.php | 2 +- apps/dav/lib/Files/FilesHome.php | 6 +- apps/dav/lib/Files/RootCollection.php | 4 +- .../dav/lib/SystemTag/SystemTagsByIdCollection.php | 18 ++-- .../SystemTagsObjectMappingCollection.php | 18 ++-- .../SystemTag/SystemTagsObjectTypeCollection.php | 18 ++-- .../SystemTag/SystemTagsRelationsCollection.php | 4 +- apps/dav/lib/Upload/ChunkingPlugin.php | 4 +- apps/dav/lib/Upload/FutureFile.php | 20 ++--- apps/dav/lib/Upload/UploadFolder.php | 20 ++--- .../tests/unit/Connector/Sabre/ObjectTreeTest.php | 2 +- .../unit/Connector/Sabre/RequestTest/Auth.php | 4 +- .../unit/Connector/Sabre/SharesPluginTest.php | 2 +- .../tests/unit/Connector/Sabre/TagsPluginTest.php | 2 +- apps/dav/tests/unit/DAV/AnonymousOptionsTest.php | 2 +- apps/dav/tests/unit/Upload/AssemblyStreamTest.php | 2 +- .../tests/Controller/SettingsControllerTest.php | 2 +- .../Controller/RequestHandlerControllerTest.php | 6 +- apps/files/tests/HelperTest.php | 2 +- apps/files_external/lib/Command/Applicable.php | 2 +- apps/files_external/lib/Command/Backends.php | 2 +- apps/files_external/lib/Command/Config.php | 2 +- apps/files_external/lib/Command/Create.php | 2 +- apps/files_external/lib/Command/Delete.php | 2 +- apps/files_external/lib/Command/Import.php | 2 +- apps/files_external/lib/Command/ListCommand.php | 2 +- apps/files_external/lib/Command/Notify.php | 2 +- apps/files_external/lib/Command/Verify.php | 2 +- .../lib/Lib/Backend/InvalidBackend.php | 2 +- .../lib/Lib/Storage/SFTPReadStream.php | 2 +- .../lib/Lib/Storage/SFTPWriteStream.php | 2 +- .../tests/Controller/StoragesControllerTest.php | 2 +- .../files_external/tests/OwnCloudFunctionsTest.php | 2 +- .../tests/Service/GlobalStoragesServiceTest.php | 8 +- apps/files_sharing/lib/Updater.php | 6 +- apps/files_sharing/tests/ApiTest.php | 50 +++++------ apps/files_sharing/tests/CacheTest.php | 12 +-- apps/files_sharing/tests/ExternalStorageTest.php | 2 +- apps/files_sharing/tests/PermissionsTest.php | 4 +- apps/files_sharing/tests/WatcherTest.php | 6 +- apps/files_trashbin/lib/Command/CleanUp.php | 2 +- apps/files_trashbin/lib/Command/Expire.php | 2 +- apps/files_trashbin/lib/Command/ExpireTrash.php | 2 +- apps/files_versions/lib/Command/CleanUp.php | 2 +- apps/files_versions/lib/Command/Expire.php | 2 +- apps/files_versions/lib/Command/ExpireVersions.php | 2 +- apps/files_versions/lib/Sabre/Plugin.php | 4 +- .../lib/Controller/RenewPasswordController.php | 2 +- apps/user_ldap/lib/Jobs/UpdateGroups.php | 14 ++-- apps/workflowengine/lib/Settings/ASettings.php | 2 +- apps/workflowengine/lib/Settings/Admin.php | 2 +- apps/workflowengine/lib/Settings/Personal.php | 2 +- build/license.php | 6 +- lib/base.php | 2 +- lib/private/App/AppStore/Bundles/Bundle.php | 6 +- lib/private/App/Platform.php | 2 +- lib/private/Archive/Archive.php | 28 +++---- lib/private/Archive/TAR.php | 2 +- lib/private/Authentication/Login/ALoginCommand.php | 2 +- .../WebAuthn/Db/PublicKeyCredentialEntity.php | 4 +- lib/private/DB/MDB2SchemaWriter.php | 2 +- lib/private/Files/Cache/Cache.php | 2 +- lib/private/Files/Cache/Wrapper/CacheWrapper.php | 2 +- lib/private/Files/Filesystem.php | 96 +++++++++++----------- lib/private/Files/ObjectStore/S3ObjectTrait.php | 6 +- .../Files/ObjectStore/StorageObjectStore.php | 8 +- lib/private/Files/Stream/Quota.php | 2 +- lib/private/Memcache/APCu.php | 2 +- lib/private/Memcache/ArrayCache.php | 2 +- lib/private/Memcache/Memcached.php | 2 +- lib/private/Memcache/NullCache.php | 2 +- lib/private/Memcache/Redis.php | 2 +- lib/private/Server.php | 4 +- lib/private/TemplateLayout.php | 4 +- lib/private/legacy/OC_DB.php | 6 +- lib/private/legacy/OC_FileChunking.php | 2 +- lib/private/legacy/OC_Helper.php | 6 +- lib/private/legacy/OC_Hook.php | 8 +- lib/private/legacy/OC_Response.php | 4 +- lib/public/Files.php | 6 +- lib/public/Util.php | 4 +- tests/lib/APITest.php | 4 +- tests/lib/App/DependencyAnalyzerTest.php | 18 ++-- tests/lib/AppFramework/Http/RequestStream.php | 14 ++-- tests/lib/AppFramework/Http/RequestTest.php | 2 +- tests/lib/AppFramework/Http/ResponseTest.php | 6 +- tests/lib/Cache/CappedMemoryCacheTest.php | 4 +- tests/lib/Cache/FileCacheTest.php | 2 +- tests/lib/Cache/TestCache.php | 4 +- tests/lib/Command/AsyncBusTest.php | 2 +- tests/lib/DateTimeFormatterTest.php | 2 +- tests/lib/ErrorHandlerTest.php | 4 +- tests/lib/Files/Cache/CacheTest.php | 24 +++--- tests/lib/Files/Cache/ScannerTest.php | 14 ++-- tests/lib/Files/Cache/WatcherTest.php | 2 +- tests/lib/Files/Cache/Wrapper/CacheJailTest.php | 14 ++-- tests/lib/Files/Node/NodeTest.php | 8 +- tests/lib/Files/ObjectStore/NoopScannerTest.php | 6 +- tests/lib/Files/ObjectStore/S3Test.php | 2 +- tests/lib/Files/Storage/HomeStorageQuotaTest.php | 4 +- tests/lib/Files/Storage/Storage.php | 2 +- tests/lib/Files/Stream/EncryptionTest.php | 2 +- tests/lib/HelperStorageTest.php | 14 ++-- tests/lib/ImageTest.php | 2 +- tests/lib/LegacyHelperTest.php | 12 +-- tests/lib/Memcache/MemcachedTest.php | 2 +- tests/lib/Memcache/RedisTest.php | 2 +- tests/lib/Security/CertificateManagerTest.php | 16 ++-- tests/lib/Security/CertificateTest.php | 2 +- tests/lib/Security/CryptoTest.php | 10 +-- tests/lib/Security/SecureRandomTest.php | 6 +- tests/lib/Share/ShareTest.php | 10 +-- tests/lib/TestCase.php | 18 ++-- tests/lib/UrlGeneratorTest.php | 4 +- tests/lib/UtilTest.php | 18 ++-- 172 files changed, 545 insertions(+), 545 deletions(-) (limited to 'apps') diff --git a/apps/contactsinteraction/lib/AddressBook.php b/apps/contactsinteraction/lib/AddressBook.php index ac433c7ce73..e8479cb186a 100644 --- a/apps/contactsinteraction/lib/AddressBook.php +++ b/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"); } diff --git a/apps/contactsinteraction/lib/Card.php b/apps/contactsinteraction/lib/Card.php index 56dca77b011..6285025f1eb 100644 --- a/apps/contactsinteraction/lib/Card.php +++ b/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(); } } diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index dd3cb048483..b620b20d4d5 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -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([ diff --git a/apps/dav/lib/CalDAV/CalendarHome.php b/apps/dav/lib/CalDAV/CalendarHome.php index ce29ed12db6..adc016192ac 100644 --- a/apps/dav/lib/CalDAV/CalendarHome.php +++ b/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); } diff --git a/apps/dav/lib/CalDAV/CalendarObject.php b/apps/dav/lib/CalDAV/CalendarObject.php index 8bdde256628..df77a2b6498 100644 --- a/apps/dav/lib/CalDAV/CalendarObject.php +++ b/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()) { diff --git a/apps/dav/lib/CalDAV/CalendarRoot.php b/apps/dav/lib/CalDAV/CalendarRoot.php index ace8482d9c7..4dd3e9986f0 100644 --- a/apps/dav/lib/CalDAV/CalendarRoot.php +++ b/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); diff --git a/apps/dav/lib/CalDAV/Outbox.php b/apps/dav/lib/CalDAV/Outbox.php index 87af86d06dd..468a6e54268 100644 --- a/apps/dav/lib/CalDAV/Outbox.php +++ b/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'); diff --git a/apps/dav/lib/CalDAV/Plugin.php b/apps/dav/lib/CalDAV/Plugin.php index 6d88244bbf1..c298a3f5ab6 100644 --- a/apps/dav/lib/CalDAV/Plugin.php +++ b/apps/dav/lib/CalDAV/Plugin.php @@ -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; diff --git a/apps/dav/lib/CalDAV/Principal/Collection.php b/apps/dav/lib/CalDAV/Principal/Collection.php index 6e7e20223c8..23868172ddf 100644 --- a/apps/dav/lib/CalDAV/Principal/Collection.php +++ b/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); } } diff --git a/apps/dav/lib/CalDAV/Principal/User.php b/apps/dav/lib/CalDAV/Principal/User.php index f10773769ca..3507ca63829 100644 --- a/apps/dav/lib/CalDAV/Principal/User.php +++ b/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', diff --git a/apps/dav/lib/CalDAV/PublicCalendarRoot.php b/apps/dav/lib/CalDAV/PublicCalendarRoot.php index a79fffa598a..3dd7cfcc7ca 100644 --- a/apps/dav/lib/CalDAV/PublicCalendarRoot.php +++ b/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 []; } } diff --git a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php b/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php index 2a750c5a32b..4314e0dcdd1 100644 --- a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php +++ b/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); diff --git a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php b/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php index 2a28c9fc02c..a460c731387 100644 --- a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php +++ b/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; diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php index 7ad4a3904ed..3b2f0374b46 100644 --- a/apps/dav/lib/CalDAV/Schedule/Plugin.php +++ b/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 */ diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php index c1adb1a5b86..f9d05f09c68 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php +++ b/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']; diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php index 765f3377feb..2dc0ee8b7a1 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php +++ b/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'); diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php index ac282a0ca60..335ea0d7756 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php +++ b/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'); diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php index 10b065fc426..51d55c98b13 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php +++ b/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']; diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php index fb3bf139bbf..4a0455e47f8 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php +++ b/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']; diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php index 71a4e85c21f..0b7bbcf3a22 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php +++ b/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'); diff --git a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php b/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php index f63366e2e19..2b23da5a38c 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php +++ b/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', diff --git a/apps/dav/lib/CardDAV/AddressBookRoot.php b/apps/dav/lib/CardDAV/AddressBookRoot.php index 771e44b7d32..57fc6b71010 100644 --- a/apps/dav/lib/CardDAV/AddressBookRoot.php +++ b/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(); } diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 47551c8f170..782bc4c0f58 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -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 ]); diff --git a/apps/dav/lib/CardDAV/HasPhotoPlugin.php b/apps/dav/lib/CardDAV/HasPhotoPlugin.php index 3cf9e0f9a61..bb847e74a37 100644 --- a/apps/dav/lib/CardDAV/HasPhotoPlugin.php +++ b/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) { diff --git a/apps/dav/lib/CardDAV/Plugin.php b/apps/dav/lib/CardDAV/Plugin.php index 430fda4578d..1a89bf58f9b 100644 --- a/apps/dav/lib/CardDAV/Plugin.php +++ b/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) { diff --git a/apps/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php index 18fc286fdd9..ce03ce43548 100644 --- a/apps/dav/lib/CardDAV/UserAddressBooks.php +++ b/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[] = [ diff --git a/apps/dav/lib/CardDAV/Xml/Groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php index 0e001835c38..701aa679b44 100644 --- a/apps/dav/lib/CardDAV/Xml/Groups.php +++ b/apps/dav/lib/CardDAV/Xml/Groups.php @@ -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); } diff --git a/apps/dav/lib/Command/CreateAddressBook.php b/apps/dav/lib/Command/CreateAddressBook.php index 5756c4b37b5..ac91e727953 100644 --- a/apps/dav/lib/Command/CreateAddressBook.php +++ b/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(); diff --git a/apps/dav/lib/Command/CreateCalendar.php b/apps/dav/lib/Command/CreateCalendar.php index d2e19ef99d9..d7597b8b1f6 100644 --- a/apps/dav/lib/Command/CreateCalendar.php +++ b/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; diff --git a/apps/dav/lib/Command/ListCalendars.php b/apps/dav/lib/Command/ListCalendars.php index e63fbd2066e..8687207ef31 100644 --- a/apps/dav/lib/Command/ListCalendars.php +++ b/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; diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php index 845e8970698..366e51ad189 100644 --- a/apps/dav/lib/Command/MoveCalendar.php +++ b/apps/dav/lib/Command/MoveCalendar.php @@ -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, diff --git a/apps/dav/lib/Command/SyncBirthdayCalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php index 211df745e41..14e77e08d73 100644 --- a/apps/dav/lib/Command/SyncBirthdayCalendar.php +++ b/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; diff --git a/apps/dav/lib/Command/SyncSystemAddressBook.php b/apps/dav/lib/Command/SyncSystemAddressBook.php index f707e733add..1f139de236a 100644 --- a/apps/dav/lib/Command/SyncSystemAddressBook.php +++ b/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; } diff --git a/apps/dav/lib/Comments/CommentNode.php b/apps/dav/lib/Comments/CommentNode.php index e02eef1cd51..d21f13ebccd 100644 --- a/apps/dav/lib/Comments/CommentNode.php +++ b/apps/dav/lib/Comments/CommentNode.php @@ -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 = []; diff --git a/apps/dav/lib/Comments/CommentsPlugin.php b/apps/dav/lib/Comments/CommentsPlugin.php index ebdf3fde318..ecfb5e5cfab 100644 --- a/apps/dav/lib/Comments/CommentsPlugin.php +++ b/apps/dav/lib/Comments/CommentsPlugin.php @@ -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; diff --git a/apps/dav/lib/Comments/EntityCollection.php b/apps/dav/lib/Comments/EntityCollection.php index 94ee3d2a250..d64c5c36423 100644 --- a/apps/dav/lib/Comments/EntityCollection.php +++ b/apps/dav/lib/Comments/EntityCollection.php @@ -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)) { diff --git a/apps/dav/lib/Comments/EntityTypeCollection.php b/apps/dav/lib/Comments/EntityTypeCollection.php index 275b41c87e0..59f7cf4748d 100644 --- a/apps/dav/lib/Comments/EntityTypeCollection.php +++ b/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); } } diff --git a/apps/dav/lib/Comments/RootCollection.php b/apps/dav/lib/Comments/RootCollection.php index b6703a13a11..560d0105de9 100644 --- a/apps/dav/lib/Comments/RootCollection.php +++ b/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; } } diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index 8457670be6b..ba33d3234b3 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -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) { diff --git a/apps/dav/lib/Connector/Sabre/ChecksumList.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php index f5c0a3d9b01..7c9204cbe75 100644 --- a/apps/dav/lib/Connector/Sabre/ChecksumList.php +++ b/apps/dav/lib/Connector/Sabre/ChecksumList.php @@ -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); } diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php index 31ea282308e..5ae8dcdb938 100644 --- a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php @@ -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']); } diff --git a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php index 6462359aaff..5c1951cf7d8 100644 --- a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php +++ b/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(); diff --git a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php index 67be788eb04..f0dc8619ace 100644 --- a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php +++ b/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 diff --git a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php index 9c68b065dbb..71098aac1d0 100644 --- a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php +++ b/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+'); diff --git a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php index bca15e15688..1ab4f3d385a 100644 --- a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php +++ b/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); }); diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 5f2bbdd12e3..e14fd691f45 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -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)) { diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index b6a96053cb3..673b8c237e9 100644 --- a/apps/dav/lib/Connector/Sabre/Principal.php +++ b/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) { diff --git a/apps/dav/lib/Connector/Sabre/ShareTypeList.php b/apps/dav/lib/Connector/Sabre/ShareTypeList.php index ab85c80aa55..ed32b7a00b1 100644 --- a/apps/dav/lib/Connector/Sabre/ShareTypeList.php +++ b/apps/dav/lib/Connector/Sabre/ShareTypeList.php @@ -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); } diff --git a/apps/dav/lib/Connector/Sabre/ShareeList.php b/apps/dav/lib/Connector/Sabre/ShareeList.php index 67b42aad919..d303305fe47 100644 --- a/apps/dav/lib/Connector/Sabre/ShareeList.php +++ b/apps/dav/lib/Connector/Sabre/ShareeList.php @@ -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()); diff --git a/apps/dav/lib/Connector/Sabre/TagList.php b/apps/dav/lib/Connector/Sabre/TagList.php index 72c3fb31b07..c73f698c188 100644 --- a/apps/dav/lib/Connector/Sabre/TagList.php +++ b/apps/dav/lib/Connector/Sabre/TagList.php @@ -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); } diff --git a/apps/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php index f03c7cc2bdd..cfa896c4f2c 100644 --- a/apps/dav/lib/DAV/GroupPrincipalBackend.php +++ b/apps/dav/lib/DAV/GroupPrincipalBackend.php @@ -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) { diff --git a/apps/dav/lib/DAV/PublicAuth.php b/apps/dav/lib/DAV/PublicAuth.php index 407f1a2853f..d37c2dd46f6 100644 --- a/apps/dav/lib/DAV/PublicAuth.php +++ b/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) { } /** diff --git a/apps/dav/lib/DAV/Sharing/IShareable.php b/apps/dav/lib/DAV/Sharing/IShareable.php index 1293721040a..ffe9e3691dc 100644 --- a/apps/dav/lib/DAV/Sharing/IShareable.php +++ b/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 diff --git a/apps/dav/lib/DAV/Sharing/Plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php index 67eed9c9b4a..148afa323dd 100644 --- a/apps/dav/lib/DAV/Sharing/Plugin.php +++ b/apps/dav/lib/DAV/Sharing/Plugin.php @@ -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( diff --git a/apps/dav/lib/DAV/Sharing/Xml/Invite.php b/apps/dav/lib/DAV/Sharing/Xml/Invite.php index 68aab171ab7..315ede2ce9c 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/Invite.php +++ b/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)) { diff --git a/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php index d76e65aa232..c973908f5a8 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php +++ b/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', diff --git a/apps/dav/lib/DAV/SystemPrincipalBackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php index c369f4da375..ebe1d61db4a 100644 --- a/apps/dav/lib/DAV/SystemPrincipalBackend.php +++ b/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'); } } diff --git a/apps/dav/lib/Files/BrowserErrorPagePlugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php index 47de5020d56..5f9c5916d89 100644 --- a/apps/dav/lib/Files/BrowserErrorPagePlugin.php +++ b/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); } diff --git a/apps/dav/lib/Files/FilesHome.php b/apps/dav/lib/Files/FilesHome.php index c0f243b34fe..71c663b2e2b 100644 --- a/apps/dav/lib/Files/FilesHome.php +++ b/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'); } } diff --git a/apps/dav/lib/Files/RootCollection.php b/apps/dav/lib/Files/RootCollection.php index 22142b46e1c..b83e944edcc 100644 --- a/apps/dav/lib/Files/RootCollection.php +++ b/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'; } } diff --git a/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php index e44150aaabe..c50fb03dd40 100644 --- a/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php +++ b/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; } diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php index bb74884419a..03cab4c9dc1 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php +++ b/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; } diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index 80741342991..0e3560ab330 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php +++ b/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; } } diff --git a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php index bc4e6a8c4c4..b4d81a8e053 100644 --- a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php +++ b/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'); } } diff --git a/apps/dav/lib/Upload/ChunkingPlugin.php b/apps/dav/lib/Upload/ChunkingPlugin.php index 704cbf8f578..35487f61429 100644 --- a/apps/dav/lib/Upload/ChunkingPlugin.php +++ b/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 diff --git a/apps/dav/lib/Upload/FutureFile.php b/apps/dav/lib/Upload/FutureFile.php index 34a5981bda2..335696f0e30 100644 --- a/apps/dav/lib/Upload/FutureFile.php +++ b/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(); } } diff --git a/apps/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php index 6778a30b8a2..d74154c6ac9 100644 --- a/apps/dav/lib/Upload/UploadFolder.php +++ b/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(); } } diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php index c6d0a6a340f..188a39c89af 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php +++ b/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 [ diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php index 8dd73e98bd7..a703b417e32 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/Auth.php +++ b/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. } } diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index dd1cc70046d..ea4eef1690a 100644 --- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php @@ -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]], diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php index 0cfa9c5229c..49519431151 100644 --- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php @@ -211,7 +211,7 @@ class TagsPluginTest extends \Test\TestCase { $this->assertEquals($expectedProperties, $result); } - function tagsGetPropertiesDataProvider() { + public function tagsGetPropertiesDataProvider() { return [ // request both, receive both [ diff --git a/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php index cd7f4c24340..6aabb4845fe 100644 --- a/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php +++ b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php @@ -87,6 +87,6 @@ class SapiMock extends Sapi { * * @return void */ - static function sendResponse(ResponseInterface $response) { + public static function sendResponse(ResponseInterface $response) { } } diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php index f7b34315106..d8ba21c47f9 100644 --- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -72,7 +72,7 @@ class AssemblyStreamTest extends \Test\TestCase { $this->assertEquals(substr($expected, $offset), $content); } - function providesNodes() { + public function providesNodes() { $data8k = $this->makeData(8192); $dataLess8k = $this->makeData(8191); diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index 0cd69c8c1c4..f0935f1b788 100644 --- a/apps/encryption/tests/Controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -245,7 +245,7 @@ class SettingsControllerTest extends TestCase { $data['message']); } - function testSetEncryptHomeStorage() { + public function testSetEncryptHomeStorage() { $value = true; $this->utilMock->expects($this->once())->method('setEncryptHomeStorage')->with($value); $this->controller->setEncryptHomeStorage($value); diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index df138333de6..5674f700cb6 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -144,7 +144,7 @@ class RequestHandlerControllerTest extends \Test\TestCase { ); } - function testCreateShare() { + public function testCreateShare() { // simulate a post request $_POST['remote'] = 'localhost'; $_POST['token'] = 'token'; @@ -185,7 +185,7 @@ class RequestHandlerControllerTest extends \Test\TestCase { $this->assertInstanceOf(DataResponse::class, $result); } - function testDeclineShare() { + public function testDeclineShare() { $id = 42; $_POST['token'] = 'token'; @@ -209,7 +209,7 @@ class RequestHandlerControllerTest extends \Test\TestCase { } - function testAcceptShare() { + public function testAcceptShare() { $id = 42; $_POST['token'] = 'token'; diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php index 867d2dab4b0..974d1187f2a 100644 --- a/apps/files/tests/HelperTest.php +++ b/apps/files/tests/HelperTest.php @@ -61,7 +61,7 @@ class HelperTest extends \Test\TestCase { ]; } - function sortDataProvider() { + public function sortDataProvider() { return [ [ 'name', diff --git a/apps/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php index 8dfbf396a20..0e28d2bf79f 100644 --- a/apps/files_external/lib/Command/Applicable.php +++ b/apps/files_external/lib/Command/Applicable.php @@ -51,7 +51,7 @@ class Applicable extends Base { */ private $groupManager; - function __construct( + public function __construct( GlobalStoragesService $globalService, IUserManager $userManager, IGroupManager $groupManager diff --git a/apps/files_external/lib/Command/Backends.php b/apps/files_external/lib/Command/Backends.php index 5618b3fd16d..3e51f6d3b08 100644 --- a/apps/files_external/lib/Command/Backends.php +++ b/apps/files_external/lib/Command/Backends.php @@ -35,7 +35,7 @@ class Backends extends Base { /** @var BackendService */ private $backendService; - function __construct(BackendService $backendService + public function __construct(BackendService $backendService ) { parent::__construct(); diff --git a/apps/files_external/lib/Command/Config.php b/apps/files_external/lib/Command/Config.php index f58b1561e68..a42689ddec1 100644 --- a/apps/files_external/lib/Command/Config.php +++ b/apps/files_external/lib/Command/Config.php @@ -38,7 +38,7 @@ class Config extends Base { */ protected $globalService; - function __construct(GlobalStoragesService $globalService) { + public function __construct(GlobalStoragesService $globalService) { parent::__construct(); $this->globalService = $globalService; } diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php index 7926da60b9e..a094ff49572 100644 --- a/apps/files_external/lib/Command/Create.php +++ b/apps/files_external/lib/Command/Create.php @@ -64,7 +64,7 @@ class Create extends Base { /** @var IUserSession */ private $userSession; - function __construct(GlobalStoragesService $globalService, + public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserManager $userManager, IUserSession $userSession, diff --git a/apps/files_external/lib/Command/Delete.php b/apps/files_external/lib/Command/Delete.php index 21f4217445d..f8bef4c79ac 100644 --- a/apps/files_external/lib/Command/Delete.php +++ b/apps/files_external/lib/Command/Delete.php @@ -58,7 +58,7 @@ class Delete extends Base { */ protected $userManager; - function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { + public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { parent::__construct(); $this->globalService = $globalService; $this->userService = $userService; diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php index e006bb9f560..a1f61bd9f1d 100644 --- a/apps/files_external/lib/Command/Import.php +++ b/apps/files_external/lib/Command/Import.php @@ -66,7 +66,7 @@ class Import extends Base { /** @var BackendService */ private $backendService; - function __construct(GlobalStoragesService $globalService, + public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager, diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index 6fa493a6598..e7f43ce2a0e 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -60,7 +60,7 @@ class ListCommand extends Base { const ALL = -1; - function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { + public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { parent::__construct(); $this->globalService = $globalService; $this->userService = $userService; diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php index 6b83c570c67..96b39de6e1e 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -52,7 +52,7 @@ class Notify extends Base { /** @var ILogger */ private $logger; - function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) { + public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) { parent::__construct(); $this->globalService = $globalService; $this->connection = $connection; diff --git a/apps/files_external/lib/Command/Verify.php b/apps/files_external/lib/Command/Verify.php index 062a0c6ea5f..bd80c2267e7 100644 --- a/apps/files_external/lib/Command/Verify.php +++ b/apps/files_external/lib/Command/Verify.php @@ -42,7 +42,7 @@ class Verify extends Base { */ protected $globalService; - function __construct(GlobalStoragesService $globalService) { + public function __construct(GlobalStoragesService $globalService) { parent::__construct(); $this->globalService = $globalService; } diff --git a/apps/files_external/lib/Lib/Backend/InvalidBackend.php b/apps/files_external/lib/Lib/Backend/InvalidBackend.php index fc9b0992197..36e033cfc90 100644 --- a/apps/files_external/lib/Lib/Backend/InvalidBackend.php +++ b/apps/files_external/lib/Lib/Backend/InvalidBackend.php @@ -43,7 +43,7 @@ class InvalidBackend extends Backend { * * @param string $invalidId id of the backend that did not exist */ - function __construct($invalidId) { + public function __construct($invalidId) { $this->invalidId = $invalidId; $this ->setIdentifier($invalidId) diff --git a/apps/files_external/lib/Lib/Storage/SFTPReadStream.php b/apps/files_external/lib/Lib/Storage/SFTPReadStream.php index a3023d1a22b..a1e3696a46e 100644 --- a/apps/files_external/lib/Lib/Storage/SFTPReadStream.php +++ b/apps/files_external/lib/Lib/Storage/SFTPReadStream.php @@ -50,7 +50,7 @@ class SFTPReadStream implements File { private $buffer = ''; - static function register($protocol = 'sftpread') { + public static function register($protocol = 'sftpread') { if (in_array($protocol, stream_get_wrappers(), true)) { return false; } diff --git a/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php b/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php index 50faf8f466c..c817789dad6 100644 --- a/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php +++ b/apps/files_external/lib/Lib/Storage/SFTPWriteStream.php @@ -50,7 +50,7 @@ class SFTPWriteStream implements File { private $buffer = ''; - static function register($protocol = 'sftpwrite') { + public static function register($protocol = 'sftpwrite') { if (in_array($protocol, stream_get_wrappers(), true)) { return false; } diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index 40d0154d992..617ad11c459 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -173,7 +173,7 @@ abstract class StoragesControllerTest extends \Test\TestCase { $this->assertEquals($storageConfig, $data); } - function mountPointNamesProvider() { + public function mountPointNamesProvider() { return [ [''], ['/'], diff --git a/apps/files_external/tests/OwnCloudFunctionsTest.php b/apps/files_external/tests/OwnCloudFunctionsTest.php index 7ce72ce62d6..47544312576 100644 --- a/apps/files_external/tests/OwnCloudFunctionsTest.php +++ b/apps/files_external/tests/OwnCloudFunctionsTest.php @@ -35,7 +35,7 @@ namespace OCA\Files_External\Tests; * @package OCA\Files_External\Tests */ class OwnCloudFunctionsTest extends \Test\TestCase { - function configUrlProvider() { + public function configUrlProvider() { return [ [ [ diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php index b977a4b3eb6..e35649dacf5 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -63,7 +63,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { ]); } - function storageDataProvider() { + public function storageDataProvider() { return [ // all users [ @@ -191,7 +191,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { $this->assertEquals(0, $newStorage->getStatus()); } - function hooksAddStorageDataProvider() { + public function hooksAddStorageDataProvider() { return [ // applicable all [ @@ -320,7 +320,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { } } - function hooksUpdateStorageDataProvider() { + public function hooksUpdateStorageDataProvider() { return [ [ // nothing to multiple users and groups @@ -551,7 +551,7 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { } } - function hooksDeleteStorageDataProvider() { + public function hooksDeleteStorageDataProvider() { return [ [ ['user1', 'user2'], diff --git a/apps/files_sharing/lib/Updater.php b/apps/files_sharing/lib/Updater.php index 828453be765..1e290e28f77 100644 --- a/apps/files_sharing/lib/Updater.php +++ b/apps/files_sharing/lib/Updater.php @@ -31,7 +31,7 @@ class Updater { /** * @param array $params */ - static public function renameHook($params) { + public static function renameHook($params) { self::renameChildren($params['oldpath'], $params['newpath']); self::moveShareToShare($params['newpath']); } @@ -46,7 +46,7 @@ class Updater { * * @param string $path */ - static private function moveShareToShare($path) { + private static function moveShareToShare($path) { $userFolder = \OC::$server->getUserFolder(); // If the user folder can't be constructed (e.g. link share) just return. @@ -90,7 +90,7 @@ class Updater { * @param string $oldPath old path relative to data/user/files * @param string $newPath new path relative to data/user/files */ - static private function renameChildren($oldPath, $newPath) { + private static function renameChildren($oldPath, $newPath) { $absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath); $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath); diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index 2d262a0104a..bb478044a2f 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -130,7 +130,7 @@ class ApiTest extends TestCase { ); } - function testCreateShareUserFile() { + public function testCreateShareUserFile() { $this->setUp(); // for some reasons phpunit refuses to do this for us only for this test $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->filename, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2); @@ -148,7 +148,7 @@ class ApiTest extends TestCase { $ocs->cleanup(); } - function testCreateShareUserFolder() { + public function testCreateShareUserFolder() { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2); $ocs->cleanup(); @@ -165,7 +165,7 @@ class ApiTest extends TestCase { } - function testCreateShareGroupFile() { + public function testCreateShareGroupFile() { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->filename, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_GROUP, self::TEST_FILES_SHARING_API_GROUP1); $ocs->cleanup(); @@ -181,7 +181,7 @@ class ApiTest extends TestCase { $ocs->cleanup(); } - function testCreateShareGroupFolder() { + public function testCreateShareGroupFolder() { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_GROUP, self::TEST_FILES_SHARING_API_GROUP1); $ocs->cleanup(); @@ -245,7 +245,7 @@ class ApiTest extends TestCase { $ocs->cleanup(); } - function testEnforceLinkPassword() { + public function testEnforceLinkPassword() { $password = md5(time()); $config = \OC::$server->getConfig(); $config->setAppValue('core', 'shareapi_enforce_links_password', 'yes'); @@ -299,7 +299,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testSharePermissions() { + public function testSharePermissions() { // sharing file to a user should work if shareapi_exclude_groups is set // to no \OC::$server->getConfig()->setAppValue('core', 'shareapi_exclude_groups', 'no'); @@ -350,7 +350,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testGetAllShares() { + public function testGetAllShares() { $node = $this->userFolder->get($this->filename); $share = $this->shareManager->newShare(); @@ -371,7 +371,7 @@ class ApiTest extends TestCase { $this->shareManager->deleteShare($share); } - function testGetAllSharesWithMe() { + public function testGetAllSharesWithMe() { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -407,7 +407,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testPublicLinkUrl() { + public function testPublicLinkUrl() { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK); $ocs->cleanup(); @@ -456,7 +456,7 @@ class ApiTest extends TestCase { * @depends testCreateShareUserFile * @depends testCreateShareLink */ - function testGetShareFromSource() { + public function testGetShareFromSource() { $node = $this->userFolder->get($this->filename); $share = $this->shareManager->newShare(); $share->setNode($node) @@ -489,7 +489,7 @@ class ApiTest extends TestCase { * @depends testCreateShareUserFile * @depends testCreateShareLink */ - function testGetShareFromSourceWithReshares() { + public function testGetShareFromSourceWithReshares() { $node = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node) @@ -530,7 +530,7 @@ class ApiTest extends TestCase { * @medium * @depends testCreateShareUserFile */ - function testGetShareFromId() { + public function testGetShareFromId() { $node = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node) @@ -554,7 +554,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testGetShareFromFolder() { + public function testGetShareFromFolder() { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -584,7 +584,7 @@ class ApiTest extends TestCase { $this->shareManager->deleteShare($share2); } - function testGetShareFromFolderWithFile() { + public function testGetShareFromFolderWithFile() { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -610,7 +610,7 @@ class ApiTest extends TestCase { * share a folder, than reshare a file within the shared folder and check if we construct the correct path * @medium */ - function testGetShareFromFolderReshares() { + public function testGetShareFromFolderReshares() { $node1 = $this->userFolder->get($this->folder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -670,7 +670,7 @@ class ApiTest extends TestCase { * reshare a sub folder and check if we get the correct path * @medium */ - function testGetShareFromSubFolderReShares() { + public function testGetShareFromSubFolderReShares() { $node1 = $this->userFolder->get($this->folder . $this->subfolder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -712,7 +712,7 @@ class ApiTest extends TestCase { * test re-re-share of folder if the path gets constructed correctly * @medium */ - function XtestGetShareFromFolderReReShares() { + public function XtestGetShareFromFolderReReShares() { $node1 = $this->userFolder->get($this->folder . $this->subfolder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -789,7 +789,7 @@ class ApiTest extends TestCase { * test multiple shared folder if the path gets constructed correctly * @medium */ - function testGetShareMultipleSharedFolder() { + public function testGetShareMultipleSharedFolder() { $this->setUp(); $node1 = $this->userFolder->get($this->folder . $this->subfolder); $share1 = $this->shareManager->newShare(); @@ -854,7 +854,7 @@ class ApiTest extends TestCase { * test re-re-share of folder if the path gets constructed correctly * @medium */ - function testGetShareFromFileReReShares() { + public function testGetShareFromFileReReShares() { $node1 = $this->userFolder->get($this->folder . $this->subfolder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -909,7 +909,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testGetShareFromUnknownId() { + public function testGetShareFromUnknownId() { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3); try { $ocs->getShare(0); @@ -925,7 +925,7 @@ class ApiTest extends TestCase { * @depends testCreateShareUserFile * @depends testCreateShareLink */ - function testUpdateShare() { + public function testUpdateShare() { $password = md5(time()); $node1 = $this->userFolder->get($this->filename); @@ -976,7 +976,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testUpdateShareUpload() { + public function testUpdateShareUpload() { $node1 = $this->userFolder->get($this->folder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -1006,7 +1006,7 @@ class ApiTest extends TestCase { /** * @medium */ - function testUpdateShareExpireDate() { + public function testUpdateShareExpireDate() { $node1 = $this->userFolder->get($this->folder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -1078,7 +1078,7 @@ class ApiTest extends TestCase { * @medium * @depends testCreateShareUserFile */ - function testDeleteShare() { + public function testDeleteShare() { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) @@ -1110,7 +1110,7 @@ class ApiTest extends TestCase { /** * test unshare of a reshared file */ - function testDeleteReshare() { + public function testDeleteReshare() { $node1 = $this->userFolder->get($this->folder); $share1 = $this->shareManager->newShare(); $share1->setNode($node1) diff --git a/apps/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php index 355a1a8bb1b..09fc9f6f5a7 100644 --- a/apps/files_sharing/tests/CacheTest.php +++ b/apps/files_sharing/tests/CacheTest.php @@ -147,7 +147,7 @@ class CacheTest extends TestCase { parent::tearDown(); } - function searchDataProvider() { + public function searchDataProvider() { return [ ['%another%', [ @@ -211,7 +211,7 @@ class CacheTest extends TestCase { * we cannot use a dataProvider because that would cause the stray hook detection to remove the hooks * that were added in setUpBeforeClass. */ - function testSearch() { + public function testSearch() { foreach ($this->searchDataProvider() as $data) { list($pattern, $expectedFiles) = $data; @@ -223,7 +223,7 @@ class CacheTest extends TestCase { /** * Test searching by mime type */ - function testSearchByMime() { + public function testSearchByMime() { $results = $this->sharedStorage->getCache()->searchByMime('text'); $check = [ [ @@ -242,7 +242,7 @@ class CacheTest extends TestCase { $this->verifyFiles($check, $results); } - function testGetFolderContentsInRoot() { + public function testGetFolderContentsInRoot() { $results = $this->user2View->getDirectoryContent('/'); // we should get the shared items "shareddir" and "shared single file.txt" @@ -274,7 +274,7 @@ class CacheTest extends TestCase { ); } - function testGetFolderContentsInSubdir() { + public function testGetFolderContentsInSubdir() { $results = $this->user2View->getDirectoryContent('/shareddir'); $this->verifyFiles( @@ -305,7 +305,7 @@ class CacheTest extends TestCase { ); } - function testGetFolderContentsWhenSubSubdirShared() { + public function testGetFolderContentsWhenSubSubdirShared() { self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1); diff --git a/apps/files_sharing/tests/ExternalStorageTest.php b/apps/files_sharing/tests/ExternalStorageTest.php index fa8df930a4e..b8c1db6c9da 100644 --- a/apps/files_sharing/tests/ExternalStorageTest.php +++ b/apps/files_sharing/tests/ExternalStorageTest.php @@ -39,7 +39,7 @@ use OCP\Http\Client\IResponse; * @group DB */ class ExternalStorageTest extends \Test\TestCase { - function optionsProvider() { + public function optionsProvider() { return [ [ 'http://remoteserver:8080/owncloud', diff --git a/apps/files_sharing/tests/PermissionsTest.php b/apps/files_sharing/tests/PermissionsTest.php index edbaf2f555a..4d21b3e0eb7 100644 --- a/apps/files_sharing/tests/PermissionsTest.php +++ b/apps/files_sharing/tests/PermissionsTest.php @@ -137,7 +137,7 @@ class PermissionsTest extends TestCase { /** * Test that the permissions of shared directory are returned correctly */ - function testGetPermissions() { + public function testGetPermissions() { $sharedDirPerms = $this->sharedStorage->getPermissions(''); $this->assertEquals(31, $sharedDirPerms); $sharedDirPerms = $this->sharedStorage->getPermissions('textfile.txt'); @@ -151,7 +151,7 @@ class PermissionsTest extends TestCase { /** * Test that the permissions of shared directory are returned correctly */ - function testGetDirectoryPermissions() { + public function testGetDirectoryPermissions() { $contents = $this->secondView->getDirectoryContent('files/shareddir'); $this->assertEquals('subdir', $contents[0]['name']); $this->assertEquals(31, $contents[0]['permissions']); diff --git a/apps/files_sharing/tests/WatcherTest.php b/apps/files_sharing/tests/WatcherTest.php index e483b2e1d92..e105bf16161 100644 --- a/apps/files_sharing/tests/WatcherTest.php +++ b/apps/files_sharing/tests/WatcherTest.php @@ -111,7 +111,7 @@ class WatcherTest extends TestCase { * Tests that writing a file using the shared storage will propagate the file * size to the owner's parent folders. */ - function testFolderSizePropagationToOwnerStorage() { + public function testFolderSizePropagationToOwnerStorage() { $initialSizes = self::getOwnerDirSizes('files/container/shareddir'); $textData = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; @@ -141,7 +141,7 @@ class WatcherTest extends TestCase { * Tests that writing a file using the shared storage will propagate the file * size to the owner's parent folders. */ - function testSubFolderSizePropagationToOwnerStorage() { + public function testSubFolderSizePropagationToOwnerStorage() { $initialSizes = self::getOwnerDirSizes('files/container/shareddir/subdir'); $textData = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; @@ -173,7 +173,7 @@ class WatcherTest extends TestCase { * where the key is the path and the value is the size. * @param string $path */ - function getOwnerDirSizes($path) { + public function getOwnerDirSizes($path) { $result = []; while ($path != '' && $path != '' && $path != '.') { diff --git a/apps/files_trashbin/lib/Command/CleanUp.php b/apps/files_trashbin/lib/Command/CleanUp.php index 59acbdcd000..a9bbe95af56 100644 --- a/apps/files_trashbin/lib/Command/CleanUp.php +++ b/apps/files_trashbin/lib/Command/CleanUp.php @@ -52,7 +52,7 @@ class CleanUp extends Command { * @param IUserManager $userManager * @param IDBConnection $dbConnection */ - function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { + public function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { parent::__construct(); $this->userManager = $userManager; $this->rootFolder = $rootFolder; diff --git a/apps/files_trashbin/lib/Command/Expire.php b/apps/files_trashbin/lib/Command/Expire.php index fb4417774e6..66bf4ed306e 100644 --- a/apps/files_trashbin/lib/Command/Expire.php +++ b/apps/files_trashbin/lib/Command/Expire.php @@ -41,7 +41,7 @@ class Expire implements ICommand { /** * @param string $user */ - function __construct($user) { + public function __construct($user) { $this->user = $user; } diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php index fdf7f89b2ce..c4d8992379d 100644 --- a/apps/files_trashbin/lib/Command/ExpireTrash.php +++ b/apps/files_trashbin/lib/Command/ExpireTrash.php @@ -100,7 +100,7 @@ class ExpireTrash extends Command { } } - function expireTrashForUser(IUser $user) { + public function expireTrashForUser(IUser $user) { $uid = $user->getUID(); if (!$this->setupFS($uid)) { return; diff --git a/apps/files_versions/lib/Command/CleanUp.php b/apps/files_versions/lib/Command/CleanUp.php index 397a1450578..fb8538adefc 100644 --- a/apps/files_versions/lib/Command/CleanUp.php +++ b/apps/files_versions/lib/Command/CleanUp.php @@ -42,7 +42,7 @@ class CleanUp extends Command { * @param IRootFolder $rootFolder * @param IUserManager $userManager */ - function __construct(IRootFolder $rootFolder, IUserManager $userManager) { + public function __construct(IRootFolder $rootFolder, IUserManager $userManager) { parent::__construct(); $this->userManager = $userManager; $this->rootFolder = $rootFolder; diff --git a/apps/files_versions/lib/Command/Expire.php b/apps/files_versions/lib/Command/Expire.php index 55f88aba688..a98eba2ece9 100644 --- a/apps/files_versions/lib/Command/Expire.php +++ b/apps/files_versions/lib/Command/Expire.php @@ -46,7 +46,7 @@ class Expire implements ICommand { * @param string $user * @param string $fileName */ - function __construct($user, $fileName) { + public function __construct($user, $fileName) { $this->user = $user; $this->fileName = $fileName; } diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php index 944e0136691..4d9dbc25238 100644 --- a/apps/files_versions/lib/Command/ExpireVersions.php +++ b/apps/files_versions/lib/Command/ExpireVersions.php @@ -99,7 +99,7 @@ class ExpireVersions extends Command { } } - function expireVersionsForUser(IUser $user) { + public function expireVersionsForUser(IUser $user) { $uid = $user->getUID(); if (!$this->setupFS($uid)) { return; diff --git a/apps/files_versions/lib/Sabre/Plugin.php b/apps/files_versions/lib/Sabre/Plugin.php index 41c3ff5a5a8..0c8858d3bb8 100644 --- a/apps/files_versions/lib/Sabre/Plugin.php +++ b/apps/files_versions/lib/Sabre/Plugin.php @@ -41,11 +41,11 @@ class Plugin extends ServerPlugin { /** @var IRequest */ private $request; - function __construct(IRequest $request) { + public function __construct(IRequest $request) { $this->request = $request; } - function initialize(Server $server) { + public function initialize(Server $server) { $this->server = $server; $server->on('afterMethod:GET', [$this, 'afterGet']); diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php index 499a25e0d28..3395d10c488 100644 --- a/apps/user_ldap/lib/Controller/RenewPasswordController.php +++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php @@ -54,7 +54,7 @@ class RenewPasswordController extends Controller { * @param IConfig $config * @param IURLGenerator $urlGenerator */ - function __construct($appName, IRequest $request, IUserManager $userManager, + public function __construct($appName, IRequest $request, IUserManager $userManager, IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) { parent::__construct($appName, $request); $this->userManager = $userManager; diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index 810d88b3ccc..6241483cb92 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -61,7 +61,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { self::updateGroups(); } - static public function updateGroups() { + public static function updateGroups() { \OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', ILogger::DEBUG); $knownGroups = array_keys(self::getKnownGroups()); @@ -84,7 +84,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @return int */ - static private function getRefreshInterval() { + private static function getRefreshInterval() { //defaults to every hour return \OC::$server->getConfig()->getAppValue('user_ldap', 'bgjRefreshInterval', 3600); } @@ -92,7 +92,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $groups */ - static private function handleKnownGroups($groups) { + private static function handleKnownGroups($groups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', ILogger::DEBUG); $query = \OC_DB::prepare(' UPDATE `*PREFIX*ldap_group_members` @@ -130,7 +130,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $createdGroups */ - static private function handleCreatedGroups($createdGroups) { + private static function handleCreatedGroups($createdGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', ILogger::DEBUG); $query = \OC_DB::prepare(' INSERT @@ -152,7 +152,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @param string[] $removedGroups */ - static private function handleRemovedGroups($removedGroups) { + private static function handleRemovedGroups($removedGroups) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', ILogger::DEBUG); $query = \OC_DB::prepare(' DELETE @@ -173,7 +173,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy */ - static private function getGroupBE() { + private static function getGroupBE() { if (!is_null(self::$groupBE)) { return self::$groupBE; } @@ -209,7 +209,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { /** * @return array */ - static private function getKnownGroups() { + private static function getKnownGroups() { if (is_array(self::$groupsFromDB)) { return self::$groupsFromDB; } diff --git a/apps/workflowengine/lib/Settings/ASettings.php b/apps/workflowengine/lib/Settings/ASettings.php index b2db7d12364..a3f2ad2495f 100644 --- a/apps/workflowengine/lib/Settings/ASettings.php +++ b/apps/workflowengine/lib/Settings/ASettings.php @@ -83,7 +83,7 @@ abstract class ASettings implements ISettings { $this->config = $config; } - abstract function getScope(): int; + abstract public function getScope(): int; /** * @return TemplateResponse diff --git a/apps/workflowengine/lib/Settings/Admin.php b/apps/workflowengine/lib/Settings/Admin.php index 11e9096bc56..cc6269c168b 100644 --- a/apps/workflowengine/lib/Settings/Admin.php +++ b/apps/workflowengine/lib/Settings/Admin.php @@ -28,7 +28,7 @@ namespace OCA\WorkflowEngine\Settings; use OCP\WorkflowEngine\IManager; class Admin extends ASettings { - function getScope(): int { + public function getScope(): int { return IManager::SCOPE_ADMIN; } } diff --git a/apps/workflowengine/lib/Settings/Personal.php b/apps/workflowengine/lib/Settings/Personal.php index af922726121..8d95dba5de8 100644 --- a/apps/workflowengine/lib/Settings/Personal.php +++ b/apps/workflowengine/lib/Settings/Personal.php @@ -28,7 +28,7 @@ namespace OCA\WorkflowEngine\Settings; use OCP\WorkflowEngine\IManager; class Personal extends ASettings { - function getScope(): int { + public function getScope(): int { return IManager::SCOPE_USER; } diff --git a/build/license.php b/build/license.php index 9e2b5f94df4..7bd9e1054c0 100644 --- a/build/license.php +++ b/build/license.php @@ -78,7 +78,7 @@ EOD; * @param string|string[] $folder * @param string|bool $gitRoot */ - function exec($folder, $gitRoot = false) { + public function exec($folder, $gitRoot = false) { if (is_array($folder)) { foreach ($folder as $f) { $this->exec($f, $gitRoot); @@ -121,7 +121,7 @@ EOD; $this->printFilesToCheck(); } - function writeAuthorsFile() { + public function writeAuthorsFile() { ksort($this->authors); $template = "Nextcloud is written by: @AUTHORS@ @@ -139,7 +139,7 @@ With help from many libraries and frameworks including: file_put_contents(__DIR__.'/../AUTHORS', $template); } - function handleFile($path, $gitRoot) { + public function handleFile($path, $gitRoot) { $source = file_get_contents($path); if ($this->isMITLicensed($source)) { echo "MIT licensed file: $path" . PHP_EOL; diff --git a/lib/base.php b/lib/base.php index f6eb79ab270..b1f9569926f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1043,7 +1043,7 @@ class OC { * @param OCP\IRequest $request * @return boolean */ - static function handleLogin(OCP\IRequest $request) { + public static function handleLogin(OCP\IRequest $request) { $userSession = self::$server->getUserSession(); if (OC_User::handleApacheAuth()) { return true; diff --git a/lib/private/App/AppStore/Bundles/Bundle.php b/lib/private/App/AppStore/Bundles/Bundle.php index d6b74ff3b6b..16458121b36 100644 --- a/lib/private/App/AppStore/Bundles/Bundle.php +++ b/lib/private/App/AppStore/Bundles/Bundle.php @@ -41,7 +41,7 @@ abstract class Bundle { * * @return string */ - public final function getIdentifier() { + final public function getIdentifier() { return substr(strrchr(get_class($this), '\\'), 1); } @@ -50,12 +50,12 @@ abstract class Bundle { * * @return string */ - public abstract function getName(); + abstract public function getName(); /** * Get the list of app identifiers in the bundle * * @return array */ - public abstract function getAppIdentifiers(); + abstract public function getAppIdentifiers(); } diff --git a/lib/private/App/Platform.php b/lib/private/App/Platform.php index 45b00c20219..f03e241e9a0 100644 --- a/lib/private/App/Platform.php +++ b/lib/private/App/Platform.php @@ -38,7 +38,7 @@ class Platform { /** * @param IConfig $config */ - function __construct(IConfig $config) { + public function __construct(IConfig $config) { $this->config = $config; } diff --git a/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php index 5150e6ddee3..43b44e5a23a 100644 --- a/lib/private/Archive/Archive.php +++ b/lib/private/Archive/Archive.php @@ -34,88 +34,88 @@ abstract class Archive { /** * @param $source */ - public abstract function __construct($source); + abstract public function __construct($source); /** * add an empty folder to the archive * @param string $path * @return bool */ - public abstract function addFolder($path); + abstract public function addFolder($path); /** * add a file to the archive * @param string $path * @param string $source either a local file or string data * @return bool */ - public abstract function addFile($path, $source=''); + abstract public function addFile($path, $source=''); /** * rename a file or folder in the archive * @param string $source * @param string $dest * @return bool */ - public abstract function rename($source, $dest); + abstract public function rename($source, $dest); /** * get the uncompressed size of a file in the archive * @param string $path * @return int */ - public abstract function filesize($path); + abstract public function filesize($path); /** * get the last modified time of a file in the archive * @param string $path * @return int */ - public abstract function mtime($path); + abstract public function mtime($path); /** * get the files in a folder * @param string $path * @return array */ - public abstract function getFolder($path); + abstract public function getFolder($path); /** * get all files in the archive * @return array */ - public abstract function getFiles(); + abstract public function getFiles(); /** * get the content of a file * @param string $path * @return string */ - public abstract function getFile($path); + abstract public function getFile($path); /** * extract a single file from the archive * @param string $path * @param string $dest * @return bool */ - public abstract function extractFile($path, $dest); + abstract public function extractFile($path, $dest); /** * extract the archive * @param string $dest * @return bool */ - public abstract function extract($dest); + abstract public function extract($dest); /** * check if a file or folder exists in the archive * @param string $path * @return bool */ - public abstract function fileExists($path); + abstract public function fileExists($path); /** * remove a file or folder from the archive * @param string $path * @return bool */ - public abstract function remove($path); + abstract public function remove($path); /** * get a file handler * @param string $path * @param string $mode * @return resource */ - public abstract function getStream($path, $mode); + abstract public function getStream($path, $mode); /** * add a folder and all its content * @param string $path diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php index d90e21305c3..f6e7c12d02d 100644 --- a/lib/private/Archive/TAR.php +++ b/lib/private/Archive/TAR.php @@ -63,7 +63,7 @@ class TAR extends Archive { * @param string $file * @return integer */ - static public function getTarType($file) { + public static function getTarType($file) { if (strpos($file, '.')) { $extension = substr($file, strrpos($file, '.')); switch ($extension) { diff --git a/lib/private/Authentication/Login/ALoginCommand.php b/lib/private/Authentication/Login/ALoginCommand.php index 8ad162842bf..effc9adf1c0 100644 --- a/lib/private/Authentication/Login/ALoginCommand.php +++ b/lib/private/Authentication/Login/ALoginCommand.php @@ -43,5 +43,5 @@ abstract class ALoginCommand { } } - public abstract function process(LoginData $loginData): LoginResult; + abstract public function process(LoginData $loginData): LoginResult; } diff --git a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php index c9ebf8ce456..2a4740bef4b 100644 --- a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php +++ b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php @@ -62,7 +62,7 @@ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { $this->addType('data', 'string'); } - static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource): PublicKeyCredentialEntity { + public static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource): PublicKeyCredentialEntity { $publicKeyCredentialEntity = new self(); $publicKeyCredentialEntity->setName($name); @@ -73,7 +73,7 @@ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { return $publicKeyCredentialEntity; } - function toPublicKeyCredentialSource(): PublicKeyCredentialSource { + public function toPublicKeyCredentialSource(): PublicKeyCredentialSource { return PublicKeyCredentialSource::createFromArray( json_decode($this->getData(), true) ); diff --git a/lib/private/DB/MDB2SchemaWriter.php b/lib/private/DB/MDB2SchemaWriter.php index 3cabff9d8f1..4af68709387 100644 --- a/lib/private/DB/MDB2SchemaWriter.php +++ b/lib/private/DB/MDB2SchemaWriter.php @@ -36,7 +36,7 @@ class MDB2SchemaWriter { * @param \OC\DB\Connection $conn * @return bool */ - static public function saveSchemaToFile($file, \OC\DB\Connection $conn) { + public static function saveSchemaToFile($file, \OC\DB\Connection $conn) { $config = \OC::$server->getConfig(); $xml = new \SimpleXMLElement(''); diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 2dfefeff662..78749da0cac 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -963,7 +963,7 @@ class Cache implements ICache { * @return array first element holding the storage id, second the path * @deprecated use getPathById() instead */ - static public function getById($id) { + public static function getById($id) { $query = \OC::$server->getDatabaseConnection()->getQueryBuilder(); $query->select('path', 'storage') ->from('filecache') diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 302758bbc22..4901a530799 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -319,7 +319,7 @@ class CacheWrapper extends Cache { * @param int $id * @return array first element holding the storage id, second the path */ - static public function getById($id) { + public static function getById($id) { return parent::getById($id); } } diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 248b6d2d854..1e9902f8871 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -277,7 +277,7 @@ class Filesystem { * @param string $path * @return string */ - static public function getMountPoint($path) { + public static function getMountPoint($path) { if (!self::$mounts) { \OC_Util::setupFS(); } @@ -295,7 +295,7 @@ class Filesystem { * @param string $path * @return string[] */ - static public function getMountPoints($path) { + public static function getMountPoints($path) { if (!self::$mounts) { \OC_Util::setupFS(); } @@ -349,7 +349,7 @@ class Filesystem { * @param string $path * @return array an array consisting of the storage and the internal path */ - static public function resolvePath($path) { + public static function resolvePath($path) { if (!self::$mounts) { \OC_Util::setupFS(); } @@ -361,7 +361,7 @@ class Filesystem { } } - static public function init($user, $root) { + public static function init($user, $root) { if (self::$defaultInstance) { return false; } @@ -380,7 +380,7 @@ class Filesystem { return true; } - static public function initMountManager() { + public static function initMountManager() { if (!self::$mounts) { self::$mounts = \OC::$server->getMountManager(); } @@ -489,14 +489,14 @@ class Filesystem { * * @return View */ - static public function getView() { + public static function getView() { return self::$defaultInstance; } /** * tear down the filesystem, removing all storage providers */ - static public function tearDown() { + public static function tearDown() { self::clearMounts(); self::$defaultInstance = null; } @@ -508,7 +508,7 @@ class Filesystem { * * Returns path like /admin/files */ - static public function getRoot() { + public static function getRoot() { if (!self::$defaultInstance) { return null; } @@ -532,7 +532,7 @@ class Filesystem { * @param array $arguments * @param string $mountpoint */ - static public function mount($class, $arguments, $mountpoint) { + public static function mount($class, $arguments, $mountpoint) { if (!self::$mounts) { \OC_Util::setupFS(); } @@ -548,7 +548,7 @@ class Filesystem { * @param string $path * @return string */ - static public function getLocalFile($path) { + public static function getLocalFile($path) { return self::$defaultInstance->getLocalFile($path); } @@ -556,7 +556,7 @@ class Filesystem { * @param string $path * @return string */ - static public function getLocalFolder($path) { + public static function getLocalFolder($path) { return self::$defaultInstance->getLocalFolder($path); } @@ -566,7 +566,7 @@ class Filesystem { * @param string $path * @return string */ - static public function getLocalPath($path) { + public static function getLocalPath($path) { $datadir = \OC_User::getHome(\OC_User::getUser()) . '/files'; $newpath = $path; if (strncmp($newpath, $datadir, strlen($datadir)) == 0) { @@ -581,7 +581,7 @@ class Filesystem { * @param string $path * @return bool */ - static public function isValidPath($path) { + public static function isValidPath($path) { $path = self::normalizePath($path); if (!$path || $path[0] !== '/') { $path = '/' . $path; @@ -598,7 +598,7 @@ class Filesystem { * * @param array $data from hook */ - static public function isBlacklisted($data) { + public static function isBlacklisted($data) { if (isset($data['path'])) { $path = $data['path']; } elseif (isset($data['newpath'])) { @@ -615,7 +615,7 @@ class Filesystem { * @param string $filename * @return bool */ - static public function isFileBlacklisted($filename) { + public static function isFileBlacklisted($filename) { $filename = self::normalizePath($filename); $blacklist = \OC::$server->getConfig()->getSystemValue('blacklisted_files', ['.htaccess']); @@ -630,7 +630,7 @@ class Filesystem { * @param string $dir * @return boolean */ - static public function isIgnoredDir($dir) { + public static function isIgnoredDir($dir) { if ($dir === '.' || $dir === '..') { return true; } @@ -640,128 +640,128 @@ class Filesystem { /** * following functions are equivalent to their php builtin equivalents for arguments/return values. */ - static public function mkdir($path) { + public static function mkdir($path) { return self::$defaultInstance->mkdir($path); } - static public function rmdir($path) { + public static function rmdir($path) { return self::$defaultInstance->rmdir($path); } - static public function is_dir($path) { + public static function is_dir($path) { return self::$defaultInstance->is_dir($path); } - static public function is_file($path) { + public static function is_file($path) { return self::$defaultInstance->is_file($path); } - static public function stat($path) { + public static function stat($path) { return self::$defaultInstance->stat($path); } - static public function filetype($path) { + public static function filetype($path) { return self::$defaultInstance->filetype($path); } - static public function filesize($path) { + public static function filesize($path) { return self::$defaultInstance->filesize($path); } - static public function readfile($path) { + public static function readfile($path) { return self::$defaultInstance->readfile($path); } - static public function isCreatable($path) { + public static function isCreatable($path) { return self::$defaultInstance->isCreatable($path); } - static public function isReadable($path) { + public static function isReadable($path) { return self::$defaultInstance->isReadable($path); } - static public function isUpdatable($path) { + public static function isUpdatable($path) { return self::$defaultInstance->isUpdatable($path); } - static public function isDeletable($path) { + public static function isDeletable($path) { return self::$defaultInstance->isDeletable($path); } - static public function isSharable($path) { + public static function isSharable($path) { return self::$defaultInstance->isSharable($path); } - static public function file_exists($path) { + public static function file_exists($path) { return self::$defaultInstance->file_exists($path); } - static public function filemtime($path) { + public static function filemtime($path) { return self::$defaultInstance->filemtime($path); } - static public function touch($path, $mtime = null) { + public static function touch($path, $mtime = null) { return self::$defaultInstance->touch($path, $mtime); } /** * @return string */ - static public function file_get_contents($path) { + public static function file_get_contents($path) { return self::$defaultInstance->file_get_contents($path); } - static public function file_put_contents($path, $data) { + public static function file_put_contents($path, $data) { return self::$defaultInstance->file_put_contents($path, $data); } - static public function unlink($path) { + public static function unlink($path) { return self::$defaultInstance->unlink($path); } - static public function rename($path1, $path2) { + public static function rename($path1, $path2) { return self::$defaultInstance->rename($path1, $path2); } - static public function copy($path1, $path2) { + public static function copy($path1, $path2) { return self::$defaultInstance->copy($path1, $path2); } - static public function fopen($path, $mode) { + public static function fopen($path, $mode) { return self::$defaultInstance->fopen($path, $mode); } /** * @return string */ - static public function toTmpFile($path) { + public static function toTmpFile($path) { return self::$defaultInstance->toTmpFile($path); } - static public function fromTmpFile($tmpFile, $path) { + public static function fromTmpFile($tmpFile, $path) { return self::$defaultInstance->fromTmpFile($tmpFile, $path); } - static public function getMimeType($path) { + public static function getMimeType($path) { return self::$defaultInstance->getMimeType($path); } - static public function hash($type, $path, $raw = false) { + public static function hash($type, $path, $raw = false) { return self::$defaultInstance->hash($type, $path, $raw); } - static public function free_space($path = '/') { + public static function free_space($path = '/') { return self::$defaultInstance->free_space($path); } - static public function search($query) { + public static function search($query) { return self::$defaultInstance->search($query); } /** * @param string $query */ - static public function searchByMime($query) { + public static function searchByMime($query) { return self::$defaultInstance->searchByMime($query); } @@ -770,7 +770,7 @@ class Filesystem { * @param string $userId owner of the tags * @return FileInfo[] array or file info */ - static public function searchByTag($tag, $userId) { + public static function searchByTag($tag, $userId) { return self::$defaultInstance->searchByTag($tag, $userId); } @@ -781,7 +781,7 @@ class Filesystem { * @param int $time * @return bool */ - static public function hasUpdated($path, $time) { + public static function hasUpdated($path, $time) { return self::$defaultInstance->hasUpdated($path, $time); } @@ -912,7 +912,7 @@ class Filesystem { * @param string $path * @return string */ - static public function getETag($path) { + public static function getETag($path) { return self::$defaultInstance->getETag($path); } } diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php index 0939dd2a23c..a0a19954a8d 100644 --- a/lib/private/Files/ObjectStore/S3ObjectTrait.php +++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php @@ -49,7 +49,7 @@ trait S3ObjectTrait { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function readObject($urn) { + public function readObject($urn) { return SeekableHttpStream::open(function ($range) use ($urn) { $command = $this->getConnection()->getCommand('GetObject', [ 'Bucket' => $this->bucket, @@ -81,7 +81,7 @@ trait S3ObjectTrait { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function writeObject($urn, $stream) { + public function writeObject($urn, $stream) { $count = 0; $countStream = CallbackWrapper::wrap($stream, function ($read) use (&$count) { $count += $read; @@ -114,7 +114,7 @@ trait S3ObjectTrait { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function deleteObject($urn) { + public function deleteObject($urn) { $this->getConnection()->deleteObject([ 'Bucket' => $this->bucket, 'Key' => $urn, diff --git a/lib/private/Files/ObjectStore/StorageObjectStore.php b/lib/private/Files/ObjectStore/StorageObjectStore.php index 0321b7cdf5f..6151214ca70 100644 --- a/lib/private/Files/ObjectStore/StorageObjectStore.php +++ b/lib/private/Files/ObjectStore/StorageObjectStore.php @@ -44,7 +44,7 @@ class StorageObjectStore implements IObjectStore { * @return string the container or bucket name where objects are stored * @since 7.0.0 */ - function getStorageId() { + public function getStorageId() { $this->storage->getId(); } @@ -54,7 +54,7 @@ class StorageObjectStore implements IObjectStore { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function readObject($urn) { + public function readObject($urn) { $handle = $this->storage->fopen($urn, 'r'); if ($handle) { return $handle; @@ -69,7 +69,7 @@ class StorageObjectStore implements IObjectStore { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function writeObject($urn, $stream) { + public function writeObject($urn, $stream) { $handle = $this->storage->fopen($urn, 'w'); if ($handle) { stream_copy_to_stream($stream, $handle); @@ -85,7 +85,7 @@ class StorageObjectStore implements IObjectStore { * @throws \Exception when something goes wrong, message will be logged * @since 7.0.0 */ - function deleteObject($urn) { + public function deleteObject($urn) { $this->storage->unlink($urn); } diff --git a/lib/private/Files/Stream/Quota.php b/lib/private/Files/Stream/Quota.php index d0609d7e459..3bf46264b83 100644 --- a/lib/private/Files/Stream/Quota.php +++ b/lib/private/Files/Stream/Quota.php @@ -44,7 +44,7 @@ class Quota extends Wrapper { * @param int $limit * @return resource */ - static public function wrap($stream, $limit) { + public static function wrap($stream, $limit) { $context = stream_context_create([ 'quota' => [ 'source' => $stream, diff --git a/lib/private/Memcache/APCu.php b/lib/private/Memcache/APCu.php index 3523ea2a86b..5886f75731a 100644 --- a/lib/private/Memcache/APCu.php +++ b/lib/private/Memcache/APCu.php @@ -150,7 +150,7 @@ class APCu extends Cache implements IMemcache { /** * @return bool */ - static public function isAvailable() { + public static function isAvailable() { if (!extension_loaded('apcu')) { return false; } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) { diff --git a/lib/private/Memcache/ArrayCache.php b/lib/private/Memcache/ArrayCache.php index 407f4af06f4..8c91d9fcbbb 100644 --- a/lib/private/Memcache/ArrayCache.php +++ b/lib/private/Memcache/ArrayCache.php @@ -154,7 +154,7 @@ class ArrayCache extends Cache implements IMemcache { /** * {@inheritDoc} */ - static public function isAvailable() { + public static function isAvailable() { return true; } } diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index e3fc1b35f1a..eff76a41c45 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -210,7 +210,7 @@ class Memcached extends Cache implements IMemcache { return $result; } - static public function isAvailable() { + public static function isAvailable() { return extension_loaded('memcached'); } diff --git a/lib/private/Memcache/NullCache.php b/lib/private/Memcache/NullCache.php index 371c9381f56..6ea90e9045b 100644 --- a/lib/private/Memcache/NullCache.php +++ b/lib/private/Memcache/NullCache.php @@ -67,7 +67,7 @@ class NullCache extends Cache implements \OCP\IMemcache { return true; } - static public function isAvailable() { + public static function isAvailable() { return true; } } diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php index 7023c6b7871..af1a6864b43 100644 --- a/lib/private/Memcache/Redis.php +++ b/lib/private/Memcache/Redis.php @@ -174,7 +174,7 @@ class Redis extends Cache implements IMemcacheTTL { self::$cache->expire($this->getNameSpace() . $key, $ttl); } - static public function isAvailable() { + public static function isAvailable() { return \OC::$server->getGetRedisFactory()->isAvailable(); } } diff --git a/lib/private/Server.php b/lib/private/Server.php index 629673418f7..1a3eabc852e 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1971,14 +1971,14 @@ class Server extends ServerContainer implements IServerContainer { /** * @return IMountManager **/ - function getMountManager() { + public function getMountManager() { return $this->query(IMountManager::class); } /** * @return IUserMountCache */ - function getUserMountCache() { + public function getUserMountCache() { return $this->query(IUserMountCache::class); } diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 89904827b2a..ddddb8704c8 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -287,7 +287,7 @@ class TemplateLayout extends \OC_Template { * @param array $styles * @return array */ - static public function findStylesheetFiles($styles, $compileScss = true) { + public static function findStylesheetFiles($styles, $compileScss = true) { // Read the selected theme from the config file $theme = \OC_Util::getTheme(); @@ -328,7 +328,7 @@ class TemplateLayout extends \OC_Template { * @param array $scripts * @return array */ - static public function findJavascriptFiles($scripts) { + public static function findJavascriptFiles($scripts) { // Read the selected theme from the config file $theme = \OC_Util::getTheme(); diff --git a/lib/private/legacy/OC_DB.php b/lib/private/legacy/OC_DB.php index 63f1447ad91..1d2e9bd1429 100644 --- a/lib/private/legacy/OC_DB.php +++ b/lib/private/legacy/OC_DB.php @@ -58,7 +58,7 @@ class OC_DB { * * SQL query via Doctrine prepare(), needs to be execute()'d! */ - static public function prepare($query , $limit = null, $offset = null, $isManipulation = null) { + public static function prepare($query , $limit = null, $offset = null, $isManipulation = null) { $connection = \OC::$server->getDatabaseConnection(); if ($isManipulation === null) { @@ -84,7 +84,7 @@ class OC_DB { * @param string $sql * @return bool */ - static public function isManipulation($sql) { + public static function isManipulation($sql) { $selectOccurrence = stripos($sql, 'SELECT'); if ($selectOccurrence !== false && $selectOccurrence < 10) { return false; @@ -113,7 +113,7 @@ class OC_DB { * @return OC_DB_StatementWrapper * @throws \OC\DatabaseException */ - static public function executeAudited($stmt, array $parameters = []) { + public static function executeAudited($stmt, array $parameters = []) { if (is_string($stmt)) { // convert to an array with 'sql' if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT diff --git a/lib/private/legacy/OC_FileChunking.php b/lib/private/legacy/OC_FileChunking.php index 37cf42a31cb..188023a960a 100644 --- a/lib/private/legacy/OC_FileChunking.php +++ b/lib/private/legacy/OC_FileChunking.php @@ -40,7 +40,7 @@ class OC_FileChunking { */ protected $ttl; - static public function decodeName($name) { + public static function decodeName($name) { preg_match('/(?P.*)-chunking-(?P\d+)-(?P\d+)-(?P\d+)/', $name, $matches); return $matches; } diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index 3439d1f8936..8cd492de117 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -135,7 +135,7 @@ class OC_Helper { * @param string $dest target folder * */ - static function copyr($src, $dest) { + public static function copyr($src, $dest) { if (is_dir($src)) { if (!is_dir($dest)) { mkdir($dest); @@ -157,7 +157,7 @@ class OC_Helper { * @param bool $deleteSelf if set to false only the content of the folder will be deleted * @return bool */ - static function rmdirr($dir, $deleteSelf = true) { + public static function rmdirr($dir, $deleteSelf = true) { if (is_dir($dir)) { $files = new RecursiveIteratorIterator( new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), @@ -193,7 +193,7 @@ class OC_Helper { * @deprecated 18.0.0 * @return \OC\Files\Type\TemplateManager */ - static public function getFileTemplateManager() { + public static function getFileTemplateManager() { if (!self::$templateManager) { self::$templateManager = new \OC\Files\Type\TemplateManager(); } diff --git a/lib/private/legacy/OC_Hook.php b/lib/private/legacy/OC_Hook.php index 4e75c9da747..980eb609259 100644 --- a/lib/private/legacy/OC_Hook.php +++ b/lib/private/legacy/OC_Hook.php @@ -51,7 +51,7 @@ class OC_Hook { * * TODO: write example */ - static public function connect($signalClass, $signalName, $slotClass, $slotName) { + public static function connect($signalClass, $signalName, $slotClass, $slotName) { // If we're trying to connect to an emitting class that isn't // yet registered, register it if (!array_key_exists($signalClass, self::$registered)) { @@ -91,7 +91,7 @@ class OC_Hook { * * TODO: write example */ - static public function emit($signalClass, $signalName, $params = []) { + public static function emit($signalClass, $signalName, $params = []) { // Return false if no hook handlers are listening to this // emitting class @@ -129,7 +129,7 @@ class OC_Hook { * @param string $signalClass * @param string $signalName */ - static public function clear($signalClass='', $signalName='') { + public static function clear($signalClass='', $signalName='') { if ($signalClass) { if ($signalName) { self::$registered[$signalClass][$signalName]=[]; @@ -145,7 +145,7 @@ class OC_Hook { * DO NOT USE! * For unit tests ONLY! */ - static public function getHooks() { + public static function getHooks() { return self::$registered; } } diff --git a/lib/private/legacy/OC_Response.php b/lib/private/legacy/OC_Response.php index bbeb6258109..89f0ee5247b 100644 --- a/lib/private/legacy/OC_Response.php +++ b/lib/private/legacy/OC_Response.php @@ -33,7 +33,7 @@ class OC_Response { * @param string $filename file name * @param string $type disposition type, either 'attachment' or 'inline' */ - static public function setContentDispositionHeader($filename, $type = 'attachment') { + public static function setContentDispositionHeader($filename, $type = 'attachment') { if (\OC::$server->getRequest()->isUserAgent( [ \OC\AppFramework\Http\Request::USER_AGENT_IE, @@ -51,7 +51,7 @@ class OC_Response { * Sets the content length header (with possible workarounds) * @param string|int|float $length Length to be sent */ - static public function setContentLengthHeader($length) { + public static function setContentLengthHeader($length) { if (PHP_INT_SIZE === 4) { if ($length > PHP_INT_MAX && stripos(PHP_SAPI, 'apache') === 0) { // Apache PHP SAPI casts Content-Length headers to PHP integers. diff --git a/lib/public/Files.php b/lib/public/Files.php index a1ff8a6d5a9..33bd3296193 100644 --- a/lib/public/Files.php +++ b/lib/public/Files.php @@ -54,7 +54,7 @@ class Files { * @since 5.0.0 * @deprecated 14.0.0 */ - static public function rmdirr($dir) { + public static function rmdirr($dir) { return \OC_Helper::rmdirr($dir); } @@ -66,7 +66,7 @@ class Files { * @since 5.0.0 * @deprecated 14.0.0 */ - static public function getMimeType($path) { + public static function getMimeType($path) { return \OC::$server->getMimeTypeDetector()->detect($path); } @@ -77,7 +77,7 @@ class Files { * @since 6.0.0 * @deprecated 14.0.0 */ - static public function searchByMime($mimetype) { + public static function searchByMime($mimetype) { return \OC\Files\Filesystem::searchByMime($mimetype); } diff --git a/lib/public/Util.php b/lib/public/Util.php index 46d818fc497..5e805af4c40 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -336,7 +336,7 @@ class Util { * TODO: write example * @since 4.0.0 */ - static public function connectHook($signalClass, $signalName, $slotClass, $slotName) { + public static function connectHook($signalClass, $signalName, $slotClass, $slotName) { return \OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName); } @@ -350,7 +350,7 @@ class Util { * TODO: write example * @since 4.0.0 */ - static public function emitHook($signalclass, $signalname, $params = []) { + public static function emitHook($signalclass, $signalname, $params = []) { return \OC_Hook::emit($signalclass, $signalname, $params); } diff --git a/tests/lib/APITest.php b/tests/lib/APITest.php index ebb03425375..7027d64eceb 100644 --- a/tests/lib/APITest.php +++ b/tests/lib/APITest.php @@ -17,7 +17,7 @@ class APITest extends \Test\TestCase { /** * @param string $message */ - function buildResponse($shipped, $data, $code, $message=null) { + public function buildResponse($shipped, $data, $code, $message=null) { $resp = new \OC\OCS\Result($data, $code, $message); $resp->addHeader('KEY', 'VALUE'); return [ @@ -32,7 +32,7 @@ class APITest extends \Test\TestCase { /** * @param \OC\OCS\Result $result */ - function checkResult($result, $success) { + public function checkResult($result, $success) { // Check response is of correct type $this->assertInstanceOf(\OC\OCS\Result::class, $result); // Check if it succeeded diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index 40cd308f886..09a939f4855 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -144,7 +144,7 @@ class DependencyAnalyzerTest extends TestCase { * @param $expectedMissing * @param $libs */ - function testLibs($expectedMissing, $libs) { + public function testLibs($expectedMissing, $libs) { $app = [ 'dependencies' => [ ] @@ -164,7 +164,7 @@ class DependencyAnalyzerTest extends TestCase { * @param $expectedMissing * @param $oss */ - function testOS($expectedMissing, $oss) { + public function testOS($expectedMissing, $oss) { $app = [ 'dependencies' => [] ]; @@ -183,7 +183,7 @@ class DependencyAnalyzerTest extends TestCase { * @param $expectedMissing * @param $oc */ - function testOC($expectedMissing, $oc) { + public function testOC($expectedMissing, $oc) { $app = [ 'dependencies' => [] ]; @@ -200,7 +200,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesOC() { + public function providesOC() { return [ // no version -> no missing dependency [ @@ -428,7 +428,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesOS() { + public function providesOS() { return [ [[], null], [[], []], @@ -440,7 +440,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesLibs() { + public function providesLibs() { return [ // we expect curl to exist [[], 'curl'], @@ -470,7 +470,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesCommands() { + public function providesCommands() { return [ [[], null], // grep is known on linux @@ -488,7 +488,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesDatabases() { + public function providesDatabases() { return [ // non BC - in case on databases are defined -> all are supported [[], null], @@ -501,7 +501,7 @@ class DependencyAnalyzerTest extends TestCase { /** * @return array */ - function providesPhpVersion() { + public function providesPhpVersion() { return [ [[], null, null, null], [[], '5.4', null, null], diff --git a/tests/lib/AppFramework/Http/RequestStream.php b/tests/lib/AppFramework/Http/RequestStream.php index 1dcfbce46d1..3868ed16505 100644 --- a/tests/lib/AppFramework/Http/RequestStream.php +++ b/tests/lib/AppFramework/Http/RequestStream.php @@ -10,7 +10,7 @@ class RequestStream { protected $position; protected $varname; - function stream_open($path, $mode, $options, &$opened_path) { + public function stream_open($path, $mode, $options, &$opened_path) { $url = parse_url($path); $this->varname = $url["host"]; $this->position = 0; @@ -18,13 +18,13 @@ class RequestStream { return true; } - function stream_read($count) { + public function stream_read($count) { $ret = substr($GLOBALS[$this->varname], $this->position, $count); $this->position += strlen($ret); return $ret; } - function stream_write($data) { + public function stream_write($data) { $left = substr($GLOBALS[$this->varname], 0, $this->position); $right = substr($GLOBALS[$this->varname], $this->position + strlen($data)); $GLOBALS[$this->varname] = $left . $data . $right; @@ -32,15 +32,15 @@ class RequestStream { return strlen($data); } - function stream_tell() { + public function stream_tell() { return $this->position; } - function stream_eof() { + public function stream_eof() { return $this->position >= strlen($GLOBALS[$this->varname]); } - function stream_seek($offset, $whence) { + public function stream_seek($offset, $whence) { switch ($whence) { case SEEK_SET: if ($offset < strlen($GLOBALS[$this->varname]) && $offset >= 0) { @@ -96,7 +96,7 @@ class RequestStream { //return false; } - function stream_metadata($path, $option, $var) { + public function stream_metadata($path, $option, $var) { if ($option == STREAM_META_TOUCH) { $url = parse_url($path); $varname = $url["host"]; diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index 2004bd2e6b5..a8e2f2248c6 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -902,7 +902,7 @@ class RequestTest extends \Test\TestCase { /** * @return array */ - function userAgentProvider() { + public function userAgentProvider() { return [ [ 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)', diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index 3978326d130..e6f88b6a6e9 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -118,7 +118,7 @@ class ResponseTest extends \Test\TestCase { } - function testSetCookies() { + public function testSetCookies() { $expected = [ 'foo' => [ 'value' => 'bar', @@ -137,7 +137,7 @@ class ResponseTest extends \Test\TestCase { } - function testInvalidateCookie() { + public function testInvalidateCookie() { $this->childResponse->addCookie('foo', 'bar'); $this->childResponse->invalidateCookie('foo'); $expected = [ @@ -153,7 +153,7 @@ class ResponseTest extends \Test\TestCase { } - function testInvalidateCookies() { + public function testInvalidateCookies() { $this->childResponse->addCookie('foo', 'bar'); $this->childResponse->addCookie('bar', 'foo'); $expected = [ diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/lib/Cache/CappedMemoryCacheTest.php index 00231004fe5..db0d2bd1193 100644 --- a/tests/lib/Cache/CappedMemoryCacheTest.php +++ b/tests/lib/Cache/CappedMemoryCacheTest.php @@ -49,7 +49,7 @@ class CappedMemoryCacheTest extends TestCache { $this->assertTrue($instance->hasKey('5')); } - function testClear() { + public function testClear() { $value = 'ipsum lorum'; $this->instance->set('1_value1', $value); $this->instance->set('1_value2', $value); @@ -63,7 +63,7 @@ class CappedMemoryCacheTest extends TestCache { $this->assertFalse($this->instance->hasKey('3_value1')); } - function testIndirectSet() { + public function testIndirectSet() { $this->instance->set('array', []); $this->instance['array'][] = 'foo'; diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/lib/Cache/FileCacheTest.php index 96c35ebf786..1a28724ae12 100644 --- a/tests/lib/Cache/FileCacheTest.php +++ b/tests/lib/Cache/FileCacheTest.php @@ -49,7 +49,7 @@ class FileCacheTest extends TestCache { * */ private $rootView; - function skip() { + public function skip() { //$this->skipUnless(OC_User::isLoggedIn()); } diff --git a/tests/lib/Cache/TestCache.php b/tests/lib/Cache/TestCache.php index b7aa01f350f..9dfc46eb5a0 100644 --- a/tests/lib/Cache/TestCache.php +++ b/tests/lib/Cache/TestCache.php @@ -22,7 +22,7 @@ abstract class TestCache extends \Test\TestCase { parent::tearDown(); } - function testSimple() { + public function testSimple() { $this->assertNull($this->instance->get('value1')); $this->assertFalse($this->instance->hasKey('value1')); @@ -51,7 +51,7 @@ abstract class TestCache extends \Test\TestCase { $this->assertFalse($this->instance->hasKey('value1')); } - function testClear() { + public function testClear() { $value='ipsum lorum'; $this->instance->set('1_value1', $value . '1'); $this->instance->set('1_value2', $value . '2'); diff --git a/tests/lib/Command/AsyncBusTest.php b/tests/lib/Command/AsyncBusTest.php index 31f28bb88c9..bfe201ed369 100644 --- a/tests/lib/Command/AsyncBusTest.php +++ b/tests/lib/Command/AsyncBusTest.php @@ -23,7 +23,7 @@ class SimpleCommand implements ICommand { class StateFullCommand implements ICommand { private $state; - function __construct($state) { + public function __construct($state) { $this->state = $state; } diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index 42870bf6281..2beb89654f6 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -176,7 +176,7 @@ class DateTimeFormatterTest extends TestCase { } - function testFormatDateWithInvalidTZ() { + public function testFormatDateWithInvalidTZ() { $this->expectException(\Exception::class); $this->formatter->formatDate(1350129205, 'long', new \DateTimeZone('Mordor/Barad-dûr')); diff --git a/tests/lib/ErrorHandlerTest.php b/tests/lib/ErrorHandlerTest.php index 32112c19787..702f64bfb99 100644 --- a/tests/lib/ErrorHandlerTest.php +++ b/tests/lib/ErrorHandlerTest.php @@ -28,7 +28,7 @@ class ErrorHandlerTest extends \Test\TestCase { * provide username, password combinations for testRemovePassword * @return array */ - function passwordProvider() { + public function passwordProvider() { return [ ['user', 'password'], ['user@owncloud.org', 'password'], @@ -43,7 +43,7 @@ class ErrorHandlerTest extends \Test\TestCase { * @param string $username * @param string $password */ - function testRemovePassword($username, $password) { + public function testRemovePassword($username, $password) { $url = 'http://'.$username.':'.$password.'@owncloud.org'; $expectedResult = 'http://xxx:xxx@owncloud.org'; $result = TestableErrorHandler::testRemovePassword($url); diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index f3e61e8e820..97663c16c02 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -265,7 +265,7 @@ class CacheTest extends \Test\TestCase { $this->assertFalse($this->cache->inCache($dir2)); } - function testStatus() { + public function testStatus() { $this->assertEquals(\OC\Files\Cache\Cache::NOT_FOUND, $this->cache->getStatus('foo')); $this->cache->put('foo', ['size' => -1]); $this->assertEquals(\OC\Files\Cache\Cache::PARTIAL, $this->cache->getStatus('foo')); @@ -296,7 +296,7 @@ class CacheTest extends \Test\TestCase { $this->assertEquals($fileName, $cacheEntry['path']); } - function testSearch() { + public function testSearch() { $file1 = 'folder'; $file2 = 'folder/foobar'; $file3 = 'folder/foo'; @@ -325,7 +325,7 @@ class CacheTest extends \Test\TestCase { $this->assertEquals(2, count($this->cache->searchByMime('foo/file'))); } - function testSearchQueryByTag() { + public function testSearchQueryByTag() { $userId = static::getUniqueID('user'); \OC::$server->getUserManager()->createUser($userId, $userId); static::loginAsUser($userId); @@ -380,7 +380,7 @@ class CacheTest extends \Test\TestCase { } } - function testSearchByQuery() { + public function testSearchByQuery() { $file1 = 'folder'; $file2 = 'folder/foobar'; $file3 = 'folder/foo'; @@ -415,7 +415,7 @@ class CacheTest extends \Test\TestCase { , 10, 0, [], $user))); } - function movePathProvider() { + public function movePathProvider() { return [ ['folder/foo', 'folder/foobar', ['1', '2']], ['folder/foo', 'foo', ['1', '2']], @@ -426,7 +426,7 @@ class CacheTest extends \Test\TestCase { /** * @dataProvider movePathProvider */ - function testMove($sourceFolder, $targetFolder, $children) { + public function testMove($sourceFolder, $targetFolder, $children) { $data = ['size' => 100, 'mtime' => 50, 'mimetype' => 'foo/bar']; $folderData = ['size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory']; @@ -461,7 +461,7 @@ class CacheTest extends \Test\TestCase { } } - function testGetIncomplete() { + public function testGetIncomplete() { $file1 = 'folder1'; $file2 = 'folder2'; $file3 = 'folder3'; @@ -478,13 +478,13 @@ class CacheTest extends \Test\TestCase { $this->assertEquals($file3, $this->cache->getIncomplete()); } - function testNonExisting() { + public function testNonExisting() { $this->assertFalse($this->cache->get('foo.txt')); $this->assertFalse($this->cache->get(-1)); $this->assertEquals([], $this->cache->getFolderContents('foo')); } - function testGetById() { + public function testGetById() { $storageId = $this->storage->getId(); $data = ['size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file']; $id = $this->cache->put('foo', $data); @@ -495,7 +495,7 @@ class CacheTest extends \Test\TestCase { $this->assertEquals([$storageId, 'foo'], \OC\Files\Cache\Cache::getById($id)); } - function testStorageMTime() { + public function testStorageMTime() { $data = ['size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file']; $this->cache->put('foo', $data); $cachedData = $this->cache->get('foo'); @@ -512,7 +512,7 @@ class CacheTest extends \Test\TestCase { $this->assertEquals(25, $cachedData['mtime']); } - function testLongId() { + public function testLongId() { $storage = new LongId([]); $cache = $storage->getCache(); $storageId = $storage->getId(); @@ -606,7 +606,7 @@ class CacheTest extends \Test\TestCase { $this->assertEquals(1, count($this->cache->getFolderContents('folder'))); } - function bogusPathNamesProvider() { + public function bogusPathNamesProvider() { return [ ['/bogus.txt', 'bogus.txt'], ['//bogus.txt', 'bogus.txt'], diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index c51ce0388d5..f9c05d52ee5 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -49,7 +49,7 @@ class ScannerTest extends \Test\TestCase { parent::tearDown(); } - function testFile() { + public function testFile() { $data = "dummy file data\n"; $this->storage->file_put_contents('foo.txt', $data); $this->scanner->scanFile('foo.txt'); @@ -70,7 +70,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($cachedData['mimetype'], 'image/png'); } - function testFile4Byte() { + public function testFile4Byte() { $data = "dummy file data\n"; $this->storage->file_put_contents('foo🙈.txt', $data); @@ -88,7 +88,7 @@ class ScannerTest extends \Test\TestCase { } } - function testFileInvalidChars() { + public function testFileInvalidChars() { $data = "dummy file data\n"; $this->storage->file_put_contents("foo\nbar.txt", $data); @@ -105,7 +105,7 @@ class ScannerTest extends \Test\TestCase { $this->storage->file_put_contents('folder/bar.txt', $textData); } - function testFolder() { + public function testFolder() { $this->fillTestFolders(); $this->scanner->scan(''); @@ -127,7 +127,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($cachedDataFolder2['size'], $cachedDataText2['size']); } - function testShallow() { + public function testShallow() { $this->fillTestFolders(); $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW); @@ -155,7 +155,7 @@ class ScannerTest extends \Test\TestCase { $this->assertNotEquals($cachedDataFolder['size'], -1); } - function testBackgroundScan() { + public function testBackgroundScan() { $this->fillTestFolders(); $this->storage->mkdir('folder2'); $this->storage->file_put_contents('folder2/bar.txt', 'foobar'); @@ -177,7 +177,7 @@ class ScannerTest extends \Test\TestCase { $this->assertFalse($this->cache->getIncomplete()); } - function testBackgroundScanOnlyRecurseIncomplete() { + public function testBackgroundScanOnlyRecurseIncomplete() { $this->fillTestFolders(); $this->storage->mkdir('folder2'); $this->storage->file_put_contents('folder2/bar.txt', 'foobar'); diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index 2a42a9e603f..42115c1c477 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -42,7 +42,7 @@ class WatcherTest extends \Test\TestCase { /** * @medium */ - function testWatcher() { + public function testWatcher() { $storage = $this->getTestStorage(); $cache = $storage->getCache(); $updater = $storage->getWatcher(); diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php index 5d7e9f8ec08..f0943ba5a03 100644 --- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php +++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php @@ -31,7 +31,7 @@ class CacheJailTest extends CacheTest { $this->cache = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, 'foo'); } - function testSearchOutsideJail() { + public function testSearchOutsideJail() { $file1 = 'foo/foobar'; $file2 = 'folder/foobar'; $data1 = ['size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder']; @@ -46,7 +46,7 @@ class CacheJailTest extends CacheTest { $this->assertEquals('foobar', $result[0]['path']); } - function testClearKeepEntriesOutsideJail() { + public function testClearKeepEntriesOutsideJail() { $file1 = 'foo/foobar'; $file2 = 'foo/foobar/asd'; $file3 = 'folder/foobar'; @@ -63,7 +63,7 @@ class CacheJailTest extends CacheTest { $this->assertTrue($this->sourceCache->inCache('folder/foobar')); } - function testGetById() { + public function testGetById() { $data1 = ['size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory']; $id = $this->sourceCache->put('foo/bar', $data1); @@ -77,12 +77,12 @@ class CacheJailTest extends CacheTest { $this->assertEquals('foo/bar', $path); } - function testGetIncomplete() { + public function testGetIncomplete() { //not supported $this->addToAssertionCount(1); } - function testMoveFromJail() { + public function testMoveFromJail() { $folderData = ['size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory']; $this->sourceCache->put('source', $folderData); @@ -98,7 +98,7 @@ class CacheJailTest extends CacheTest { $this->assertTrue($this->sourceCache->inCache('target/foo/bar')); } - function testMoveToJail() { + public function testMoveToJail() { $folderData = ['size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory']; $this->sourceCache->put('source', $folderData); @@ -114,7 +114,7 @@ class CacheJailTest extends CacheTest { $this->assertTrue($this->sourceCache->inCache('target/foo/bar')); } - function testMoveBetweenJail() { + public function testMoveBetweenJail() { $folderData = ['size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory']; $this->sourceCache->put('source', $folderData); diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php index adcf43956be..86643617959 100644 --- a/tests/lib/Files/Node/NodeTest.php +++ b/tests/lib/Files/Node/NodeTest.php @@ -66,22 +66,22 @@ abstract class NodeTest extends \Test\TestCase { * @param string $path * @return Node */ - protected abstract function createTestNode($root, $view, $path); + abstract protected function createTestNode($root, $view, $path); /** * @return string */ - protected abstract function getNodeClass(); + abstract protected function getNodeClass(); /** * @return string */ - protected abstract function getNonExistingNodeClass(); + abstract protected function getNonExistingNodeClass(); /** * @return string */ - protected abstract function getViewDeleteMethod(); + abstract protected function getViewDeleteMethod(); protected function getMockStorage() { $storage = $this->getMockBuilder(Storage::class) diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php index 570fc16ee98..7142fb6daf9 100644 --- a/tests/lib/Files/ObjectStore/NoopScannerTest.php +++ b/tests/lib/Files/ObjectStore/NoopScannerTest.php @@ -26,7 +26,7 @@ class NoopScannerTest extends \Test\TestCase { $this->scanner = new \OC\Files\ObjectStore\NoopScanner($this->storage); } - function testFile() { + public function testFile() { $data = "dummy file data\n"; $this->storage->file_put_contents('foo.txt', $data); @@ -46,7 +46,7 @@ class NoopScannerTest extends \Test\TestCase { $this->storage->file_put_contents('folder/bar.txt', $textData); } - function testFolder() { + public function testFolder() { $this->fillTestFolders(); $this->assertEquals( @@ -56,7 +56,7 @@ class NoopScannerTest extends \Test\TestCase { ); } - function testBackgroundScan() { + public function testBackgroundScan() { $this->fillTestFolders(); $this->storage->mkdir('folder2'); $this->storage->file_put_contents('folder2/bar.txt', 'foobar'); diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php index 525e020445a..c1e7948e3c4 100644 --- a/tests/lib/Files/ObjectStore/S3Test.php +++ b/tests/lib/Files/ObjectStore/S3Test.php @@ -25,7 +25,7 @@ use Icewind\Streams\Wrapper; use OC\Files\ObjectStore\S3; class MultiPartUploadS3 extends S3 { - function writeObject($urn, $stream) { + public function writeObject($urn, $stream) { $this->getConnection()->upload($this->bucket, $urn, $stream, 'private', [ 'mup_threshold' => 1, ]); diff --git a/tests/lib/Files/Storage/HomeStorageQuotaTest.php b/tests/lib/Files/Storage/HomeStorageQuotaTest.php index cfee638d5f3..177fe1b4f6c 100644 --- a/tests/lib/Files/Storage/HomeStorageQuotaTest.php +++ b/tests/lib/Files/Storage/HomeStorageQuotaTest.php @@ -30,7 +30,7 @@ class HomeStorageQuotaTest extends \Test\TestCase { /** * Tests that the home storage is not wrapped when no quota exists. */ - function testHomeStorageWrapperWithoutQuota() { + public function testHomeStorageWrapperWithoutQuota() { $user1 = $this->getUniqueID(); \OC::$server->getUserManager()->createUser($user1, 'test'); \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none'); @@ -55,7 +55,7 @@ class HomeStorageQuotaTest extends \Test\TestCase { /** * Tests that the home storage is not wrapped when no quota exists. */ - function testHomeStorageWrapperWithQuota() { + public function testHomeStorageWrapperWithQuota() { $user1 = $this->getUniqueID(); \OC::$server->getUserManager()->createUser($user1, 'test'); \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024'); diff --git a/tests/lib/Files/Storage/Storage.php b/tests/lib/Files/Storage/Storage.php index 736cbfff4f0..c37a8152989 100644 --- a/tests/lib/Files/Storage/Storage.php +++ b/tests/lib/Files/Storage/Storage.php @@ -128,7 +128,7 @@ abstract class Storage extends \Test\TestCase { ]; } - function loremFileProvider() { + public function loremFileProvider() { $root = \OC::$SERVERROOT . '/tests/data/'; return [ // small file diff --git a/tests/lib/Files/Stream/EncryptionTest.php b/tests/lib/Files/Stream/EncryptionTest.php index e1ad3ec68fa..bedce1b6f6d 100644 --- a/tests/lib/Files/Stream/EncryptionTest.php +++ b/tests/lib/Files/Stream/EncryptionTest.php @@ -240,7 +240,7 @@ class EncryptionTest extends \Test\TestCase { unlink($fileName); } - function dataFilesProvider() { + public function dataFilesProvider() { return [ ['lorem-big.txt'], ['block-aligned.txt'], diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php index 3169957fabb..4166d606366 100644 --- a/tests/lib/HelperStorageTest.php +++ b/tests/lib/HelperStorageTest.php @@ -81,7 +81,7 @@ class HelperStorageTest extends \Test\TestCase { /** * Test getting the storage info */ - function testGetStorageInfo() { + public function testGetStorageInfo() { $homeStorage = $this->getStorageMock(12); \OC\Files\Filesystem::mount($homeStorage, [], '/' . $this->user . '/files'); $homeStorage->file_put_contents('test.txt', '01234'); @@ -95,7 +95,7 @@ class HelperStorageTest extends \Test\TestCase { /** * Test getting the storage info, ignoring extra mount points */ - function testGetStorageInfoExcludingExtStorage() { + public function testGetStorageInfoExcludingExtStorage() { $homeStorage = $this->getStorageMock(12); \OC\Files\Filesystem::mount($homeStorage, [], '/' . $this->user . '/files'); $homeStorage->file_put_contents('test.txt', '01234'); @@ -115,7 +115,7 @@ class HelperStorageTest extends \Test\TestCase { /** * Test getting the storage info, including extra mount points */ - function testGetStorageInfoIncludingExtStorage() { + public function testGetStorageInfoIncludingExtStorage() { $homeStorage = new \OC\Files\Storage\Temporary([]); \OC\Files\Filesystem::mount($homeStorage, [], '/' . $this->user . '/files'); $homeStorage->file_put_contents('test.txt', '01234'); @@ -146,7 +146,7 @@ class HelperStorageTest extends \Test\TestCase { * when user has no quota set, even when quota ext storage option * was set */ - function testGetStorageInfoIncludingExtStorageWithNoUserQuota() { + public function testGetStorageInfoIncludingExtStorageWithNoUserQuota() { $homeStorage = $this->getStorageMock(12); \OC\Files\Filesystem::mount($homeStorage, [], '/' . $this->user . '/files'); $homeStorage->file_put_contents('test.txt', '01234'); @@ -173,7 +173,7 @@ class HelperStorageTest extends \Test\TestCase { /** * Test getting the storage info with quota enabled */ - function testGetStorageInfoWithQuota() { + public function testGetStorageInfoWithQuota() { $homeStorage = $this->getStorageMock(12); $homeStorage->file_put_contents('test.txt', '01234'); $homeStorage = new \OC\Files\Storage\Wrapper\Quota( @@ -193,7 +193,7 @@ class HelperStorageTest extends \Test\TestCase { /** * Test getting the storage info when data exceeds quota */ - function testGetStorageInfoWhenSizeExceedsQuota() { + public function testGetStorageInfoWhenSizeExceedsQuota() { $homeStorage = $this->getStorageMock(12); $homeStorage->file_put_contents('test.txt', '0123456789'); $homeStorage = new \OC\Files\Storage\Wrapper\Quota( @@ -215,7 +215,7 @@ class HelperStorageTest extends \Test\TestCase { * Test getting the storage info when the remaining * free storage space is less than the quota */ - function testGetStorageInfoWhenFreeSpaceLessThanQuota() { + public function testGetStorageInfoWhenFreeSpaceLessThanQuota() { $homeStorage = $this->getStorageMock(12); $homeStorage->file_put_contents('test.txt', '01234'); $homeStorage = new \OC\Files\Storage\Wrapper\Quota( diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php index 3858945d191..5b83c4ac57f 100644 --- a/tests/lib/ImageTest.php +++ b/tests/lib/ImageTest.php @@ -344,7 +344,7 @@ class ImageTest extends \Test\TestCase { $this->assertEquals($expected[1], $img->height()); } - function convertDataProvider() { + public function convertDataProvider() { return [ [ 'image/gif'], [ 'image/jpeg'], diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php index 1940d4f2d01..5c640e91284 100644 --- a/tests/lib/LegacyHelperTest.php +++ b/tests/lib/LegacyHelperTest.php @@ -47,12 +47,12 @@ class LegacyHelperTest extends \Test\TestCase { /** * @dataProvider providesComputerFileSize */ - function testComputerFileSize($expected, $input) { + public function testComputerFileSize($expected, $input) { $result = OC_Helper::computerFileSize($input); $this->assertEquals($expected, $result); } - function providesComputerFileSize() { + public function providesComputerFileSize() { return [ [0.0, "0 B"], [1024.0, "1 KB"], @@ -63,7 +63,7 @@ class LegacyHelperTest extends \Test\TestCase { ]; } - function testMb_array_change_key_case() { + public function testMb_array_change_key_case() { $arrayStart = [ "Foo" => "bar", "Bar" => "foo", @@ -89,7 +89,7 @@ class LegacyHelperTest extends \Test\TestCase { $this->assertEquals($result, $expected); } - function testRecursiveArraySearch() { + public function testRecursiveArraySearch() { $haystack = [ "Foo" => "own", "Bar" => "Cloud", @@ -103,7 +103,7 @@ class LegacyHelperTest extends \Test\TestCase { $this->assertFalse($result); } - function testBuildNotExistingFileNameForView() { + public function testBuildNotExistingFileNameForView() { $viewMock = $this->createMock(View::class); $this->assertEquals('/filename', OC_Helper::buildNotExistingFileNameForView('/', 'filename', $viewMock)); $this->assertEquals('dir/filename.ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock)); @@ -188,7 +188,7 @@ class LegacyHelperTest extends \Test\TestCase { } - function streamCopyDataProvider() { + public function streamCopyDataProvider() { return [ [0, false, false, false], [0, false, \OC::$SERVERROOT . '/tests/data/lorem.txt', false], diff --git a/tests/lib/Memcache/MemcachedTest.php b/tests/lib/Memcache/MemcachedTest.php index 96b88992665..340ce85b9aa 100644 --- a/tests/lib/Memcache/MemcachedTest.php +++ b/tests/lib/Memcache/MemcachedTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class MemcachedTest extends Cache { - static public function setUpBeforeClass(): void { + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); if (!\OC\Memcache\Memcached::isAvailable()) { diff --git a/tests/lib/Memcache/RedisTest.php b/tests/lib/Memcache/RedisTest.php index d5bf10e7af9..e7bb9c29d36 100644 --- a/tests/lib/Memcache/RedisTest.php +++ b/tests/lib/Memcache/RedisTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class RedisTest extends Cache { - static public function setUpBeforeClass(): void { + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); if (!\OC\Memcache\Redis::isAvailable()) { diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index 6a93657f8c8..d64c41c79e7 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -76,7 +76,7 @@ class CertificateManagerTest extends \Test\TestCase { $this->assertEquals($expected, $actual); } - function testListCertificates() { + public function testListCertificates() { // Test empty certificate bundle $this->assertSame([], $this->certificateManager->listCertificates()); @@ -93,7 +93,7 @@ class CertificateManagerTest extends \Test\TestCase { } - function testAddInvalidCertificate() { + public function testAddInvalidCertificate() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Certificate could not get parsed.'); @@ -115,23 +115,23 @@ class CertificateManagerTest extends \Test\TestCase { * @dataProvider dangerousFileProvider * @param string $filename */ - function testAddDangerousFile($filename) { + public function testAddDangerousFile($filename) { $this->expectException(\Exception::class); $this->expectExceptionMessage('Filename is not valid'); $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt'), $filename); } - function testRemoveDangerousFile() { + public function testRemoveDangerousFile() { $this->assertFalse($this->certificateManager->removeCertificate('../../foo.txt')); } - function testRemoveExistingFile() { + public function testRemoveExistingFile() { $this->certificateManager->addCertificate(file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'), 'GoodCertificate'); $this->assertTrue($this->certificateManager->removeCertificate('GoodCertificate')); } - function testGetCertificateBundle() { + public function testGetCertificateBundle() { $this->assertSame('/' . $this->username . '/files_external/rootcerts.crt', $this->certificateManager->getCertificateBundle()); } @@ -145,7 +145,7 @@ class CertificateManagerTest extends \Test\TestCase { * @param int $targetBundleExists * @param bool $expected */ - function testNeedRebundling($uid, + public function testNeedRebundling($uid, $CaBundleMtime, $systemWideMtime, $targetBundleMtime, @@ -194,7 +194,7 @@ class CertificateManagerTest extends \Test\TestCase { ); } - function dataTestNeedRebundling() { + public function dataTestNeedRebundling() { return [ //values: uid, CaBundleMtime, systemWideMtime, targetBundleMtime, targetBundleExists, expected diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index 986554cf967..223fb226904 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -53,7 +53,7 @@ class CertificateTest extends \Test\TestCase { } - function testCertificateStartingWithFileReference() { + public function testCertificateStartingWithFileReference() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Certificate could not get parsed.'); diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php index 2a2e6adac3e..a6f4902594a 100644 --- a/tests/lib/Security/CryptoTest.php +++ b/tests/lib/Security/CryptoTest.php @@ -30,13 +30,13 @@ class CryptoTest extends \Test\TestCase { /** * @dataProvider defaultEncryptionProvider */ - function testDefaultEncrypt($stringToEncrypt) { + public function testDefaultEncrypt($stringToEncrypt) { $ciphertext = $this->crypto->encrypt($stringToEncrypt); $this->assertEquals($stringToEncrypt, $this->crypto->decrypt($ciphertext)); } - function testWrongPassword() { + public function testWrongPassword() { $this->expectException(\Exception::class); $this->expectExceptionMessage('HMAC does not match.'); @@ -45,14 +45,14 @@ class CryptoTest extends \Test\TestCase { $this->crypto->decrypt($ciphertext, 'A wrong password!'); } - function testLaterDecryption() { + public function testLaterDecryption() { $stringToEncrypt = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt.'; $encryptedString = '44a35023cca2e7a6125e06c29fc4b2ad9d8a33d0873a8b45b0de4ef9284f260c6c46bf25dc62120644c59b8bafe4281ddc47a70c35ae6c29ef7a63d79eefacc297e60b13042ac582733598d0a6b4de37311556bb5c480fd2633de4e6ebafa868c2d1e2d80a5d24f9660360dba4d6e0c8|lhrFgK0zd9U160Wo|a75e57ab701f9124e1113543fd1dc596f21e20d456a0d1e813d5a8aaec9adcb11213788e96598b67fe9486a9f0b99642c18296d0175db44b1ae426e4e91080ee'; $this->assertEquals($stringToEncrypt, $this->crypto->decrypt($encryptedString, 'ThisIsAVeryS3cur3P4ssw0rd')); } - function testWrongIV() { + public function testWrongIV() { $this->expectException(\Exception::class); $this->expectExceptionMessage('HMAC does not match.'); @@ -61,7 +61,7 @@ class CryptoTest extends \Test\TestCase { } - function testWrongParameters() { + public function testWrongParameters() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Authenticated ciphertext could not be decoded.'); diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/lib/Security/SecureRandomTest.php index 4075a1c7109..0ffd7ae7c14 100644 --- a/tests/lib/Security/SecureRandomTest.php +++ b/tests/lib/Security/SecureRandomTest.php @@ -42,7 +42,7 @@ class SecureRandomTest extends \Test\TestCase { /** * @dataProvider stringGenerationProvider */ - function testGetLowStrengthGeneratorLength($length, $expectedLength) { + public function testGetLowStrengthGeneratorLength($length, $expectedLength) { $generator = $this->rng; $this->assertEquals($expectedLength, strlen($generator->generate($length))); @@ -51,7 +51,7 @@ class SecureRandomTest extends \Test\TestCase { /** * @dataProvider stringGenerationProvider */ - function testMediumLowStrengthGeneratorLength($length, $expectedLength) { + public function testMediumLowStrengthGeneratorLength($length, $expectedLength) { $generator = $this->rng; $this->assertEquals($expectedLength, strlen($generator->generate($length))); @@ -60,7 +60,7 @@ class SecureRandomTest extends \Test\TestCase { /** * @dataProvider stringGenerationProvider */ - function testUninitializedGenerate($length, $expectedLength) { + public function testUninitializedGenerate($length, $expectedLength) { $this->assertEquals($expectedLength, strlen($this->rng->generate($length))); } diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php index d7adc144cf4..fce963ec43a 100644 --- a/tests/lib/Share/ShareTest.php +++ b/tests/lib/Share/ShareTest.php @@ -226,13 +226,13 @@ class ShareTest extends \Test\TestCase { * @param string $url * @param string $expectedResult */ - function testRemoveProtocolFromUrl($url, $expectedResult) { + public function testRemoveProtocolFromUrl($url, $expectedResult) { $share = new \OC\Share\Share(); $result = self::invokePrivate($share, 'removeProtocolFromUrl', [$url]); $this->assertSame($expectedResult, $result); } - function urls() { + public function urls() { return [ ['http://owncloud.org', 'owncloud.org'], ['https://owncloud.org', 'owncloud.org'], @@ -245,13 +245,13 @@ class ShareTest extends \Test\TestCase { * @param array $ungrouped * @param array $grouped */ - function testGroupItems($ungrouped, $grouped) { + public function testGroupItems($ungrouped, $grouped) { $result = DummyShareClass::groupItemsTest($ungrouped); $this->compareArrays($grouped, $result); } - function compareArrays($result, $expectedResult) { + public function compareArrays($result, $expectedResult) { foreach ($expectedResult as $key => $value) { if (is_array($value)) { $this->compareArrays($result[$key], $value); @@ -261,7 +261,7 @@ class ShareTest extends \Test\TestCase { } } - function dataProviderTestGroupItems() { + public function dataProviderTestGroupItems() { return [ // one array with one share [ diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index a1708f9cf01..b28be47875a 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -266,7 +266,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param IQueryBuilder $queryBuilder */ - static protected function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) { + protected static function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) { $queryBuilder->delete('share') ->execute(); } @@ -276,7 +276,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param IQueryBuilder $queryBuilder */ - static protected function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) { + protected static function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) { $queryBuilder->delete('storages') ->execute(); } @@ -286,7 +286,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param IQueryBuilder $queryBuilder */ - static protected function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) { + protected static function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) { $queryBuilder->delete('filecache') ->execute(); } @@ -296,7 +296,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param string $dataDir */ - static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) { + protected static function tearDownAfterClassCleanStrayDataFiles($dataDir) { $knownEntries = [ 'nextcloud.log' => true, 'audit.log' => true, @@ -321,7 +321,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param string $dir */ - static protected function tearDownAfterClassCleanStrayDataUnlinkDir($dir) { + protected static function tearDownAfterClassCleanStrayDataUnlinkDir($dir) { if ($dh = @opendir($dir)) { while (($file = readdir($dh)) !== false) { if (\OC\Files\Filesystem::isIgnoredDir($file)) { @@ -342,14 +342,14 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { /** * Clean up the list of hooks */ - static protected function tearDownAfterClassCleanStrayHooks() { + protected static function tearDownAfterClassCleanStrayHooks() { \OC_Hook::clear(); } /** * Clean up the list of locks */ - static protected function tearDownAfterClassCleanStrayLocks() { + protected static function tearDownAfterClassCleanStrayLocks() { \OC::$server->getLockingProvider()->releaseAll(); } @@ -359,7 +359,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { * * @param string $user user id or empty for a generic FS */ - static protected function loginAsUser($user = '') { + protected static function loginAsUser($user = '') { self::logout(); \OC\Files\Filesystem::tearDown(); \OC_User::setUserId($user); @@ -376,7 +376,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { /** * Logout the current user and tear down the filesystem. */ - static protected function logout() { + protected static function logout() { \OC_Util::tearDownFS(); \OC_User::setUserId(''); // needed for fully logout diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 0baacda53d1..03f55ff2244 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -116,7 +116,7 @@ class UrlGeneratorTest extends \Test\TestCase { * test absolute URL construction * @dataProvider provideDocRootURLs */ - function testGetAbsoluteURLDocRoot($url, $expectedResult) { + public function testGetAbsoluteURLDocRoot($url, $expectedResult) { $this->mockBaseUrl(); \OC::$WEBROOT = ''; $result = $this->urlGenerator->getAbsoluteURL($url); @@ -128,7 +128,7 @@ class UrlGeneratorTest extends \Test\TestCase { * test absolute URL construction * @dataProvider provideSubDirURLs */ - function testGetAbsoluteURLSubDir($url, $expectedResult) { + public function testGetAbsoluteURLSubDir($url, $expectedResult) { $this->mockBaseUrl(); \OC::$WEBROOT = '/nextcloud'; $result = $this->urlGenerator->getAbsoluteURL($url); diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php index 75f62163f1e..6e25ce16e75 100644 --- a/tests/lib/UtilTest.php +++ b/tests/lib/UtilTest.php @@ -38,7 +38,7 @@ class UtilTest extends \Test\TestCase { $this->assertTrue(is_string($edition)); } - function testSanitizeHTML() { + public function testSanitizeHTML() { $badArray = [ 'While it is unusual to pass an array', 'this function actually supports it.', @@ -71,7 +71,7 @@ class UtilTest extends \Test\TestCase { $this->assertEquals('This is a good string without HTML.', $result); } - function testEncodePath() { + public function testEncodePath() { $component = '/§#@test%&^ä/-child'; $result = OC_Util::encodePath($component); $this->assertEquals("/%C2%A7%23%40test%25%26%5E%C3%A4/-child", $result); @@ -82,12 +82,12 @@ class UtilTest extends \Test\TestCase { $this->assertEquals($expected, \OC_Util::fileInfoLoaded()); } - function testGetDefaultEmailAddress() { + public function testGetDefaultEmailAddress() { $email = \OCP\Util::getDefaultEmailAddress("no-reply"); $this->assertEquals('no-reply@localhost', $email); } - function testGetDefaultEmailAddressFromConfig() { + public function testGetDefaultEmailAddressFromConfig() { $config = \OC::$server->getConfig(); $config->setSystemValue('mail_domain', 'example.com'); $email = \OCP\Util::getDefaultEmailAddress("no-reply"); @@ -95,7 +95,7 @@ class UtilTest extends \Test\TestCase { $config->deleteSystemValue('mail_domain'); } - function testGetConfiguredEmailAddressFromConfig() { + public function testGetConfiguredEmailAddressFromConfig() { $config = \OC::$server->getConfig(); $config->setSystemValue('mail_domain', 'example.com'); $config->setSystemValue('mail_from_address', 'owncloud'); @@ -105,7 +105,7 @@ class UtilTest extends \Test\TestCase { $config->deleteSystemValue('mail_from_address'); } - function testGetInstanceIdGeneratesValidId() { + public function testGetInstanceIdGeneratesValidId() { \OC::$server->getConfig()->deleteSystemValue('instanceid'); $instanceId = OC_Util::getInstanceId(); $this->assertStringStartsWith('oc', $instanceId); @@ -178,7 +178,7 @@ class UtilTest extends \Test\TestCase { * @param array $excludedGroups groups which should be excluded from sharing * @param bool $expected expected result */ - function testIsSharingDisabledForUser($groups, $membership, $excludedGroups, $expected) { + public function testIsSharingDisabledForUser($groups, $membership, $excludedGroups, $expected) { $config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock(); $groupManager = $this->getMockBuilder('OCP\IGroupManager')->disableOriginalConstructor()->getMock(); $user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); @@ -224,7 +224,7 @@ class UtilTest extends \Test\TestCase { * @dataProvider defaultAppsProvider * @group DB */ - function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) { + public function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) { $oldDefaultApps = \OC::$server->getConfig()->getSystemValue('defaultapp', ''); // CLI is doing messy stuff with the webroot, so need to work it around $oldWebRoot = \OC::$WEBROOT; @@ -249,7 +249,7 @@ class UtilTest extends \Test\TestCase { \OC_User::setUserId(null); } - function defaultAppsProvider() { + public function defaultAppsProvider() { return [ // none specified, default to files [ -- cgit v1.2.3 From 28f8eb5dba60a75f7e22debbdc26f1d3164deb18 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 16:54:27 +0200 Subject: Add visibility to all constants Signed-off-by: Christoph Wurst --- apps/comments/lib/AppInfo/Application.php | 2 +- apps/dav/lib/AppInfo/Application.php | 2 +- apps/dav/lib/CalDAV/Activity/Provider/Calendar.php | 18 ++-- apps/dav/lib/CalDAV/Activity/Provider/Event.php | 6 +- .../lib/CalDAV/BirthdayCalendar/EnablePlugin.php | 2 +- apps/dav/lib/CalDAV/BirthdayService.php | 2 +- apps/dav/lib/CalDAV/CalDavBackend.php | 22 ++-- apps/dav/lib/CalDAV/Plugin.php | 2 +- apps/dav/lib/CalDAV/Proxy/ProxyMapper.php | 4 +- apps/dav/lib/CalDAV/Publishing/PublishPlugin.php | 2 +- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 8 +- apps/dav/lib/CalDAV/Search/SearchPlugin.php | 2 +- apps/dav/lib/CalDAV/WebcalCaching/Plugin.php | 2 +- apps/dav/lib/CardDAV/CardDavBackend.php | 4 +- apps/dav/lib/CardDAV/Xml/Groups.php | 2 +- apps/dav/lib/Command/MoveCalendar.php | 2 +- apps/dav/lib/Comments/CommentNode.php | 18 ++-- apps/dav/lib/Comments/CommentsPlugin.php | 10 +- apps/dav/lib/Comments/EntityCollection.php | 2 +- apps/dav/lib/Connector/Sabre/Auth.php | 2 +- apps/dav/lib/Connector/Sabre/ChecksumList.php | 2 +- .../Connector/Sabre/CommentPropertiesPlugin.php | 6 +- .../lib/Connector/Sabre/Exception/Forbidden.php | 2 +- .../lib/Connector/Sabre/Exception/InvalidPath.php | 2 +- .../Sabre/Exception/PasswordLoginForbidden.php | 2 +- apps/dav/lib/Connector/Sabre/FilesPlugin.php | 44 ++++---- apps/dav/lib/Connector/Sabre/FilesReportPlugin.php | 8 +- apps/dav/lib/Connector/Sabre/ShareTypeList.php | 2 +- apps/dav/lib/Connector/Sabre/ShareeList.php | 2 +- apps/dav/lib/Connector/Sabre/SharesPlugin.php | 8 +- apps/dav/lib/Connector/Sabre/TagList.php | 2 +- apps/dav/lib/Connector/Sabre/TagsPlugin.php | 8 +- apps/dav/lib/DAV/GroupPrincipalBackend.php | 2 +- apps/dav/lib/DAV/Sharing/Backend.php | 6 +- apps/dav/lib/DAV/Sharing/Plugin.php | 4 +- .../Provisioning/Apple/AppleProvisioningNode.php | 2 +- apps/dav/lib/SystemTag/SystemTagPlugin.php | 14 +-- .../tests/unit/CalDAV/AbstractCalDavBackend.php | 8 +- .../tests/unit/CalDAV/PublicCalendarRootTest.php | 2 +- .../tests/unit/CalDAV/Publishing/PublisherTest.php | 2 +- .../NotificationProvider/EmailProviderTest.php | 2 +- apps/dav/tests/unit/CardDAV/CardDavBackendTest.php | 6 +- apps/dav/tests/unit/Command/ListCalendarsTest.php | 2 +- .../tests/unit/Connector/Sabre/FilesPluginTest.php | 22 ++-- .../unit/Connector/Sabre/SharesPluginTest.php | 2 +- .../tests/unit/Connector/Sabre/TagsPluginTest.php | 6 +- .../tests/unit/SystemTag/SystemTagPluginTest.php | 12 +-- apps/encryption/lib/Crypto/Crypt.php | 10 +- apps/encryption/lib/Crypto/Encryption.php | 4 +- apps/encryption/lib/Session.php | 6 +- .../lib/FederatedShareProvider.php | 2 +- apps/federatedfilesharing/lib/Notifications.php | 2 +- apps/federatedfilesharing/lib/TokenHandler.php | 2 +- apps/federatedfilesharing/tests/TestCase.php | 4 +- apps/federation/lib/TrustedServers.php | 8 +- apps/files/lib/Activity/FavoriteProvider.php | 4 +- apps/files/lib/Activity/Helper.php | 2 +- .../lib/BackgroundJob/DeleteOrphanedItems.php | 2 +- apps/files/lib/BackgroundJob/ScanFiles.php | 2 +- apps/files/lib/Command/DeleteOrphanedFiles.php | 2 +- apps/files_external/lib/Command/ListCommand.php | 2 +- .../lib/Lib/Auth/AmazonS3/AccessKey.php | 2 +- apps/files_external/lib/Lib/Auth/AuthMechanism.php | 16 +-- .../lib/Lib/Auth/Password/GlobalAuth.php | 2 +- .../lib/Lib/Auth/Password/LoginCredentials.php | 2 +- .../lib/Lib/Auth/Password/UserProvided.php | 2 +- .../files_external/lib/Lib/DefinitionParameter.php | 16 +-- apps/files_external/lib/Lib/Storage/OwnCloud.php | 2 +- apps/files_external/lib/Lib/Storage/Swift.php | 2 +- apps/files_external/lib/Lib/StorageConfig.php | 4 +- apps/files_external/lib/Service/BackendService.php | 10 +- .../files_external/lib/Service/DBConfigService.php | 10 +- apps/files_external/lib/config.php | 8 +- .../Service/UserGlobalStoragesServiceTest.php | 6 +- apps/files_sharing/lib/Activity/Filter.php | 4 +- .../lib/Activity/Providers/Downloads.php | 8 +- .../lib/Activity/Providers/Groups.php | 10 +- .../lib/Activity/Providers/PublicLinks.php | 12 +-- .../lib/Activity/Providers/RemoteShares.php | 8 +- .../files_sharing/lib/Activity/Providers/Users.php | 20 ++-- apps/files_sharing/lib/AppInfo/Application.php | 2 +- apps/files_sharing/lib/External/Manager.php | 2 +- apps/files_sharing/lib/External/MountProvider.php | 2 +- apps/files_sharing/lib/ShareBackend/File.php | 14 +-- apps/files_sharing/tests/ApiTest.php | 4 +- apps/files_sharing/tests/ShareTest.php | 2 +- apps/files_sharing/tests/TestCase.php | 10 +- apps/files_sharing/tests/UnshareChildrenTest.php | 2 +- apps/files_sharing/tests/UpdaterTest.php | 2 +- apps/files_trashbin/lib/Expiration.php | 4 +- apps/files_trashbin/lib/Sabre/PropfindPlugin.php | 8 +- apps/files_trashbin/lib/Trashbin.php | 2 +- apps/files_trashbin/tests/ExpirationTest.php | 4 +- apps/files_trashbin/tests/TrashbinTest.php | 4 +- apps/files_versions/lib/AppInfo/Application.php | 2 +- .../lib/BackgroundJob/ExpireVersions.php | 2 +- apps/files_versions/lib/Expiration.php | 2 +- apps/files_versions/lib/Storage.php | 12 +-- apps/files_versions/tests/ExpirationTest.php | 2 +- apps/files_versions/tests/VersioningTest.php | 6 +- apps/oauth2/lib/Controller/SettingsController.php | 2 +- apps/settings/lib/AppInfo/Application.php | 2 +- apps/sharebymail/lib/Activity.php | 12 +-- apps/systemtags/lib/Activity/Provider.php | 10 +- apps/testing/lib/Locking/FakeDBLockingProvider.php | 2 +- apps/user_ldap/lib/Access.php | 2 +- apps/user_ldap/lib/Configuration.php | 6 +- apps/user_ldap/lib/Jobs/Sync.php | 4 +- apps/user_ldap/lib/User/User.php | 4 +- apps/user_ldap/lib/Wizard.php | 18 ++-- apps/workflowengine/lib/AppInfo/Application.php | 2 +- apps/workflowengine/lib/Check/RequestTime.php | 4 +- core/Command/Base.php | 6 +- core/Command/Log/Manage.php | 6 +- core/Command/Maintenance/Mimetype/UpdateDB.php | 2 +- core/Command/Upgrade.php | 12 +-- core/Controller/ClientFlowLoginController.php | 2 +- core/Controller/LoginController.php | 4 +- core/Controller/SetupController.php | 2 +- core/Controller/WalledGardenController.php | 2 +- lib/private/App/AppStore/Fetcher/Fetcher.php | 2 +- lib/private/App/CodeChecker/CodeChecker.php | 16 +-- lib/private/App/CompareVersion.php | 8 +- lib/private/AppFramework/Http/Request.php | 22 ++-- lib/private/Archive/TAR.php | 6 +- lib/private/Authentication/Token/DefaultToken.php | 2 +- lib/private/Authentication/Token/IToken.php | 10 +- .../Authentication/Token/PublicKeyToken.php | 2 +- .../TwoFactorAuth/Db/ProviderUserAssignmentDao.php | 2 +- .../Authentication/TwoFactorAuth/Manager.php | 8 +- .../TwoFactorAuth/ProviderLoader.php | 2 +- lib/private/Config.php | 2 +- lib/private/DB/AdapterOCI8.php | 2 +- lib/private/DB/AdapterPgSql.php | 2 +- lib/private/DB/ConnectionFactory.php | 4 +- lib/private/DB/ReconnectWrapper.php | 2 +- lib/private/Encryption/Keys/Storage.php | 2 +- lib/private/Encryption/Util.php | 8 +- lib/private/Files/Cache/QuerySearchHelper.php | 2 +- lib/private/Files/Filesystem.php | 42 ++++---- lib/private/Files/ObjectStore/SwiftFactory.php | 2 +- lib/private/Files/Storage/Wrapper/Availability.php | 2 +- lib/private/Files/Utils/Scanner.php | 2 +- lib/private/Group/Backend.php | 2 +- lib/private/Group/MetaData.php | 6 +- lib/private/Http/CookieHelper.php | 6 +- lib/private/IntegrityCheck/Checker.php | 2 +- lib/private/L10N/Factory.php | 2 +- lib/private/LargeFileHelper.php | 4 +- lib/private/Log/ExceptionSerializer.php | 4 +- lib/private/Memcache/Factory.php | 2 +- lib/private/MemoryInfo.php | 2 +- lib/private/Remote/User.php | 2 +- .../Repair/Owncloud/SaveAccountsTableData.php | 2 +- lib/private/Repair/RepairInvalidShares.php | 2 +- lib/private/Security/Bruteforce/Throttler.php | 2 +- lib/private/Security/CredentialsManager.php | 2 +- lib/private/Session/CryptoSessionData.php | 2 +- lib/private/Session/CryptoWrapper.php | 2 +- lib/private/Share/Constants.php | 30 +++--- lib/private/Share20/DefaultShareProvider.php | 2 +- lib/private/SystemTag/SystemTagManager.php | 4 +- lib/private/SystemTag/SystemTagObjectMapper.php | 2 +- lib/private/Tags.php | 4 +- lib/private/TempManager.php | 2 +- lib/private/Updater/ChangesCheck.php | 6 +- lib/private/Updater/ChangesMapper.php | 2 +- lib/private/User/Backend.php | 18 ++-- lib/private/legacy/OC_App.php | 4 +- lib/private/legacy/OC_Files.php | 8 +- lib/public/API.php | 8 +- lib/public/Accounts/IAccountManager.php | 26 ++--- lib/public/Activity/IExtension.php | 14 +-- lib/public/App/ManagerEvent.php | 8 +- lib/public/AppFramework/Http.php | 118 ++++++++++----------- lib/public/AppFramework/Http/TemplateResponse.php | 4 +- .../Authentication/TwoFactorAuth/IProvider.php | 4 +- .../Authentication/TwoFactorAuth/IRegistry.php | 4 +- lib/public/Comments/CommentsEntityEvent.php | 2 +- lib/public/Comments/CommentsEvent.php | 8 +- lib/public/Comments/IComment.php | 2 +- lib/public/Comments/ICommentsManager.php | 2 +- lib/public/Console/ConsoleEvent.php | 2 +- lib/public/Constants.php | 14 +-- lib/public/DB/QueryBuilder/IExpressionBuilder.php | 12 +-- lib/public/DB/QueryBuilder/IQueryBuilder.php | 16 +-- lib/public/Dashboard/Model/WidgetSetting.php | 4 +- lib/public/Dashboard/Model/WidgetSetup.php | 6 +- lib/public/Files/Cache/ICache.php | 8 +- lib/public/Files/Cache/ICacheEntry.php | 2 +- lib/public/Files/Cache/IScanner.php | 12 +-- lib/public/Files/Cache/IWatcher.php | 6 +- lib/public/Files/FileInfo.php | 14 +-- lib/public/Files/Notify/IChange.php | 8 +- lib/public/Files/Search/ISearchBinaryOperator.php | 6 +- lib/public/Files/Search/ISearchComparison.php | 12 +-- lib/public/Files/Search/ISearchOrder.php | 4 +- lib/public/Files/Storage/INotifyStorage.php | 8 +- lib/public/Files/StorageNotAvailableException.php | 14 +-- lib/public/FullTextSearch/Model/IIndex.php | 38 +++---- lib/public/FullTextSearch/Model/IIndexDocument.php | 4 +- lib/public/FullTextSearch/Model/IRunner.php | 6 +- lib/public/FullTextSearch/Model/ISearchOption.php | 6 +- .../Model/ISearchRequestSimpleQuery.php | 22 ++-- lib/public/GroupInterface.php | 16 +-- lib/public/IConfig.php | 2 +- lib/public/IDBConnection.php | 8 +- lib/public/ILogger.php | 10 +- lib/public/INavigationManager.php | 6 +- lib/public/IPreview.php | 6 +- lib/public/IRequest.php | 14 +-- lib/public/Lock/ILockingProvider.php | 4 +- lib/public/Search/PagedProvider.php | 2 +- lib/public/Search/Provider.php | 2 +- lib/public/Security/ISecureRandom.php | 10 +- lib/public/Settings/IManager.php | 8 +- lib/public/SystemTag/ManagerEvent.php | 6 +- lib/public/SystemTag/MapperEvent.php | 4 +- lib/public/SystemTag/SystemTagsEntityEvent.php | 2 +- lib/public/Util.php | 10 +- lib/public/WorkflowEngine/IManager.php | 10 +- tests/Core/Controller/SvgControllerTest.php | 10 +- tests/lib/AppTest.php | 10 +- tests/lib/ConfigTest.php | 2 +- tests/lib/Files/FilesystemTest.php | 4 +- tests/lib/Files/Storage/Wrapper/EncodingTest.php | 4 +- tests/lib/Memcache/FactoryTest.php | 8 +- tests/lib/Share/Backend.php | 6 +- 228 files changed, 774 insertions(+), 774 deletions(-) (limited to 'apps') diff --git a/apps/comments/lib/AppInfo/Application.php b/apps/comments/lib/AppInfo/Application.php index 9168948d7c8..cc8bf297b91 100644 --- a/apps/comments/lib/AppInfo/Application.php +++ b/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); diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index 7a80c9b2152..29c77cad07f 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/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. diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php index 42b70f0a928..ee0d6144c92 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php +++ b/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'; - const SUBJECT_UPDATE = 'calendar_update'; - const SUBJECT_DELETE = 'calendar_delete'; - const SUBJECT_PUBLISH = 'calendar_publish'; - const SUBJECT_UNPUBLISH = 'calendar_unpublish'; - const SUBJECT_SHARE_USER = 'calendar_user_share'; - const SUBJECT_SHARE_GROUP = 'calendar_group_share'; - const SUBJECT_UNSHARE_USER = 'calendar_user_unshare'; - const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare'; + public const SUBJECT_ADD = 'calendar_add'; + public const SUBJECT_UPDATE = 'calendar_update'; + public const SUBJECT_DELETE = 'calendar_delete'; + public const SUBJECT_PUBLISH = 'calendar_publish'; + public const SUBJECT_UNPUBLISH = 'calendar_unpublish'; + public const SUBJECT_SHARE_USER = 'calendar_user_share'; + public const SUBJECT_SHARE_GROUP = 'calendar_group_share'; + public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare'; + public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare'; /** @var IFactory */ protected $languageFactory; diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php index f044c2f8208..9ca0727fab7 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php +++ b/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'; - const SUBJECT_OBJECT_UPDATE = 'object_update'; - const SUBJECT_OBJECT_DELETE = 'object_delete'; + public const SUBJECT_OBJECT_ADD = 'object_add'; + public const SUBJECT_OBJECT_UPDATE = 'object_update'; + public const SUBJECT_OBJECT_DELETE = 'object_delete'; /** @var IFactory */ protected $languageFactory; diff --git a/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php b/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php index a1ebd409f0e..1c77b8d4272 100644 --- a/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php +++ b/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 diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 2969e5f3ead..ab70d6ceb43 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/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; diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index b620b20d4d5..ddfb0a641e5 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/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; - const CALENDAR_TYPE_SUBSCRIPTION = 1; + public const CALENDAR_TYPE_CALENDAR = 0; + public const CALENDAR_TYPE_SUBSCRIPTION = 1; - const PERSONAL_CALENDAR_URI = 'personal'; - const PERSONAL_CALENDAR_NAME = 'Personal'; + public const PERSONAL_CALENDAR_URI = 'personal'; + public const PERSONAL_CALENDAR_NAME = 'Personal'; - const RESOURCE_BOOKING_CALENDAR_URI = 'calendar'; - const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar'; + public const RESOURCE_BOOKING_CALENDAR_URI = '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; - const CLASSIFICATION_PUBLIC = 0; - const CLASSIFICATION_PRIVATE = 1; - const CLASSIFICATION_CONFIDENTIAL = 2; + public const ACCESS_PUBLIC = 4; + public const CLASSIFICATION_PUBLIC = 0; + public const CLASSIFICATION_PRIVATE = 1; + public const CLASSIFICATION_CONFIDENTIAL = 2; /** * List of CalDAV properties, and how they map to database field names diff --git a/apps/dav/lib/CalDAV/Plugin.php b/apps/dav/lib/CalDAV/Plugin.php index c298a3f5ab6..4c865ba2ae7 100644 --- a/apps/dav/lib/CalDAV/Plugin.php +++ b/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. diff --git a/apps/dav/lib/CalDAV/Proxy/ProxyMapper.php b/apps/dav/lib/CalDAV/Proxy/ProxyMapper.php index bc13efc1e5a..689a6f0efc8 100644 --- a/apps/dav/lib/CalDAV/Proxy/ProxyMapper.php +++ b/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; - const PERMISSION_WRITE = 2; + public const PERMISSION_READ = 1; + public const PERMISSION_WRITE = 2; /** * ProxyMapper constructor. diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php index 214fb79464e..e3561527ce0 100644 --- a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php +++ b/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. diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 15228f9bc3d..2bbc6498dba 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/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'; - const METHOD_REPLY = 'reply'; - const METHOD_CANCEL = 'cancel'; + public const METHOD_REQUEST = 'request'; + public const METHOD_REPLY = 'reply'; + public const METHOD_CANCEL = 'cancel'; /** * @param IConfig $config diff --git a/apps/dav/lib/CalDAV/Search/SearchPlugin.php b/apps/dav/lib/CalDAV/Search/SearchPlugin.php index dc3cbdf06ba..0776e8838b8 100644 --- a/apps/dav/lib/CalDAV/Search/SearchPlugin.php +++ b/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. diff --git a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php index 2cfeb1108f1..8cfbb38b6e0 100644 --- a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php +++ b/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 diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 782bc4c0f58..71b7e846f3d 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/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'; - const PERSONAL_ADDRESSBOOK_NAME = 'Contacts'; + public const PERSONAL_ADDRESSBOOK_URI = 'contacts'; + public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts'; /** @var Principal */ private $principalBackend; diff --git a/apps/dav/lib/CardDAV/Xml/Groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php index 701aa679b44..ea195ca3e21 100644 --- a/apps/dav/lib/CardDAV/Xml/Groups.php +++ b/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; diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php index 366e51ad189..10fa69b70ca 100644 --- a/apps/dav/lib/Command/MoveCalendar.php +++ b/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 diff --git a/apps/dav/lib/Comments/CommentNode.php b/apps/dav/lib/Comments/CommentNode.php index d21f13ebccd..03bc432ccb9 100644 --- a/apps/dav/lib/Comments/CommentNode.php +++ b/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'; - const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message'; - const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName'; - const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions'; - const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention'; - const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType'; - const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId'; - const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName'; + public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}isUnread'; + public const PROPERTY_NAME_MESSAGE = '{http://owncloud.org/ns}message'; + public const PROPERTY_NAME_ACTOR_DISPLAYNAME = '{http://owncloud.org/ns}actorDisplayName'; + public const PROPERTY_NAME_MENTIONS = '{http://owncloud.org/ns}mentions'; + public const PROPERTY_NAME_MENTION = '{http://owncloud.org/ns}mention'; + public const PROPERTY_NAME_MENTION_TYPE = '{http://owncloud.org/ns}mentionType'; + public const PROPERTY_NAME_MENTION_ID = '{http://owncloud.org/ns}mentionId'; + public const PROPERTY_NAME_MENTION_DISPLAYNAME = '{http://owncloud.org/ns}mentionDisplayName'; /** @var IComment */ public $comment; diff --git a/apps/dav/lib/Comments/CommentsPlugin.php b/apps/dav/lib/Comments/CommentsPlugin.php index ecfb5e5cfab..8c73f6695b9 100644 --- a/apps/dav/lib/Comments/CommentsPlugin.php +++ b/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'; - const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit'; - const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset'; - const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime'; + public const REPORT_NAME = '{http://owncloud.org/ns}filter-comments'; + public const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit'; + public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset'; + public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime'; /** @var ICommentsManager */ protected $commentsManager; diff --git a/apps/dav/lib/Comments/EntityCollection.php b/apps/dav/lib/Comments/EntityCollection.php index d64c5c36423..683cbd62529 100644 --- a/apps/dav/lib/Comments/EntityCollection.php +++ b/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; diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index ba33d3234b3..ad042cd96ce 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/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; diff --git a/apps/dav/lib/Connector/Sabre/ChecksumList.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php index 7c9204cbe75..d0b83cff1fa 100644 --- a/apps/dav/lib/Connector/Sabre/ChecksumList.php +++ b/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; diff --git a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php index 5ae8dcdb938..22e418ee561 100644 --- a/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php +++ b/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'; - const PROPERTY_NAME_COUNT = '{http://owncloud.org/ns}comments-count'; - const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread'; + public const PROPERTY_NAME_HREF = '{http://owncloud.org/ns}comments-href'; + public const PROPERTY_NAME_COUNT = '{http://owncloud.org/ns}comments-count'; + public const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread'; /** @var \Sabre\DAV\Server */ protected $server; diff --git a/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php index 46659737e87..a9c07a0369c 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php +++ b/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 diff --git a/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php index 2871fd83e09..25fa3205b5c 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php +++ b/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 diff --git a/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php b/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php index c3e417b20ad..aac9b735839 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php +++ b/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; diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index e14fd691f45..076e5b6483b 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/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'; - const NS_NEXTCLOUD = 'http://nextcloud.org/ns'; - const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id'; - const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid'; - const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions'; - 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'; - const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL'; - const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size'; - const GETETAG_PROPERTYNAME = '{DAV:}getetag'; - const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified'; - const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id'; - const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name'; - const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums'; - const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint'; - const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview'; - const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type'; - const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted'; - const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag'; - const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time'; - const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time'; - const SHARE_NOTE = '{http://nextcloud.org/ns}note'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const NS_NEXTCLOUD = 'http://nextcloud.org/ns'; + public const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id'; + public const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid'; + public const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions'; + public const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions'; + public const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions'; + public const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL'; + public const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size'; + public const GETETAG_PROPERTYNAME = '{DAV:}getetag'; + public const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified'; + public const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id'; + public const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name'; + public const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums'; + public const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint'; + public const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview'; + public const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type'; + public const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted'; + public const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag'; + public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time'; + public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time'; + public const SHARE_NOTE = '{http://nextcloud.org/ns}note'; /** * Reference to main server object diff --git a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php index 617847626cc..0e7db3f57ce 100644 --- a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php +++ b/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'; - const REPORT_NAME = '{http://owncloud.org/ns}filter-files'; - const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag'; - const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const REPORT_NAME = '{http://owncloud.org/ns}filter-files'; + public const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag'; + public const CIRCLE_PROPERTYNAME = '{http://owncloud.org/ns}circle'; /** * Reference to main server object diff --git a/apps/dav/lib/Connector/Sabre/ShareTypeList.php b/apps/dav/lib/Connector/Sabre/ShareTypeList.php index ed32b7a00b1..5a4a1f5635f 100644 --- a/apps/dav/lib/Connector/Sabre/ShareTypeList.php +++ b/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 diff --git a/apps/dav/lib/Connector/Sabre/ShareeList.php b/apps/dav/lib/Connector/Sabre/ShareeList.php index d303305fe47..235ae9cd823 100644 --- a/apps/dav/lib/Connector/Sabre/ShareeList.php +++ b/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; diff --git a/apps/dav/lib/Connector/Sabre/SharesPlugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index ee4246011bf..63c204fda4e 100644 --- a/apps/dav/lib/Connector/Sabre/SharesPlugin.php +++ b/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'; - const NS_NEXTCLOUD = 'http://nextcloud.org/ns'; - const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types'; - const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const NS_NEXTCLOUD = 'http://nextcloud.org/ns'; + public const SHARETYPES_PROPERTYNAME = '{http://owncloud.org/ns}share-types'; + public const SHAREES_PROPERTYNAME = '{http://nextcloud.org/ns}sharees'; /** * Reference to main server object diff --git a/apps/dav/lib/Connector/Sabre/TagList.php b/apps/dav/lib/Connector/Sabre/TagList.php index c73f698c188..603087fd5fa 100644 --- a/apps/dav/lib/Connector/Sabre/TagList.php +++ b/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 diff --git a/apps/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index 33698810cfb..ad3e0611270 100644 --- a/apps/dav/lib/Connector/Sabre/TagsPlugin.php +++ b/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'; - const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags'; - const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite'; - const TAG_FAVORITE = '_$!!$_'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags'; + public const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite'; + public const TAG_FAVORITE = '_$!!$_'; /** * Reference to main server object diff --git a/apps/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php index cfa896c4f2c..15e95a9bd29 100644 --- a/apps/dav/lib/DAV/GroupPrincipalBackend.php +++ b/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; diff --git a/apps/dav/lib/DAV/Sharing/Backend.php b/apps/dav/lib/DAV/Sharing/Backend.php index ae69e33387c..6c88fa4d15e 100644 --- a/apps/dav/lib/DAV/Sharing/Backend.php +++ b/apps/dav/lib/DAV/Sharing/Backend.php @@ -45,9 +45,9 @@ class Backend { /** @var string */ private $resourceType; - const ACCESS_OWNER = 1; - const ACCESS_READ_WRITE = 2; - const ACCESS_READ = 3; + public const ACCESS_OWNER = 1; + public const ACCESS_READ_WRITE = 2; + public const ACCESS_READ = 3; /** * @param IDBConnection $db diff --git a/apps/dav/lib/DAV/Sharing/Plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php index 148afa323dd..e33d879fa0e 100644 --- a/apps/dav/lib/DAV/Sharing/Plugin.php +++ b/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'; - const NS_NEXTCLOUD = 'http://nextcloud.com/ns'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const NS_NEXTCLOUD = 'http://nextcloud.com/ns'; /** @var Auth */ private $auth; diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php index 98c9ce0b6e1..e2e192eda85 100644 --- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php +++ b/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; diff --git a/apps/dav/lib/SystemTag/SystemTagPlugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php index b05ba07ead2..c83fd3f0487 100644 --- a/apps/dav/lib/SystemTag/SystemTagPlugin.php +++ b/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'; - const ID_PROPERTYNAME = '{http://owncloud.org/ns}id'; - const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name'; - const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible'; - const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable'; - const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups'; - const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign'; + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; + public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id'; + public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name'; + public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible'; + public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable'; + public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups'; + public const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign'; /** * @var \Sabre\DAV\Server $server diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php index ff62bdaa6d2..131339ee40e 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php +++ b/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'; - const UNIT_TEST_USER1 = 'principals/users/caldav-unit-test1'; - const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group'; - const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2'; + public const UNIT_TEST_USER = 'principals/users/caldav-unit-test'; + public const UNIT_TEST_USER1 = 'principals/users/caldav-unit-test1'; + public const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group'; + public const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2'; protected function setUp(): void { parent::setUp(); diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index 0e58c36b39d..8ea6e5257f0 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/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 */ diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php index 7a555220d85..d4abf61af1a 100644 --- a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php +++ b/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); diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php index cd111c44ae4..9a22f63c1be 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php +++ b/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; diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index e7d2197a6ee..1768acb39e0 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/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'; - const UNIT_TEST_USER1 = 'principals/users/carddav-unit-test1'; - const UNIT_TEST_GROUP = 'principals/groups/carddav-unit-test-group'; + public const UNIT_TEST_USER = 'principals/users/carddav-unit-test'; + public const UNIT_TEST_USER1 = 'principals/users/carddav-unit-test1'; + public const UNIT_TEST_GROUP = 'principals/groups/carddav-unit-test-group'; private $vcardTest0 = 'BEGIN:VCARD'.PHP_EOL. 'VERSION:3.0'.PHP_EOL. diff --git a/apps/dav/tests/unit/Command/ListCalendarsTest.php b/apps/dav/tests/unit/Command/ListCalendarsTest.php index 8960a9d7721..ab3721e80b9 100644 --- a/apps/dav/tests/unit/Command/ListCalendarsTest.php +++ b/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(); diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index 2b8d145059f..9ce2837332f 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/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; - const FILEID_PROPERTYNAME = FilesPlugin::FILEID_PROPERTYNAME; - const INTERNAL_FILEID_PROPERTYNAME = FilesPlugin::INTERNAL_FILEID_PROPERTYNAME; - const SIZE_PROPERTYNAME = FilesPlugin::SIZE_PROPERTYNAME; - const PERMISSIONS_PROPERTYNAME = FilesPlugin::PERMISSIONS_PROPERTYNAME; - const LASTMODIFIED_PROPERTYNAME = FilesPlugin::LASTMODIFIED_PROPERTYNAME; - const DOWNLOADURL_PROPERTYNAME = FilesPlugin::DOWNLOADURL_PROPERTYNAME; - const OWNER_ID_PROPERTYNAME = FilesPlugin::OWNER_ID_PROPERTYNAME; - const OWNER_DISPLAY_NAME_PROPERTYNAME = FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME; - const DATA_FINGERPRINT_PROPERTYNAME = FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME; - const HAS_PREVIEW_PROPERTYNAME = FilesPlugin::HAS_PREVIEW_PROPERTYNAME; + public const GETETAG_PROPERTYNAME = FilesPlugin::GETETAG_PROPERTYNAME; + public const FILEID_PROPERTYNAME = FilesPlugin::FILEID_PROPERTYNAME; + public const INTERNAL_FILEID_PROPERTYNAME = FilesPlugin::INTERNAL_FILEID_PROPERTYNAME; + public const SIZE_PROPERTYNAME = FilesPlugin::SIZE_PROPERTYNAME; + public const PERMISSIONS_PROPERTYNAME = FilesPlugin::PERMISSIONS_PROPERTYNAME; + public const LASTMODIFIED_PROPERTYNAME = FilesPlugin::LASTMODIFIED_PROPERTYNAME; + public const DOWNLOADURL_PROPERTYNAME = FilesPlugin::DOWNLOADURL_PROPERTYNAME; + public const OWNER_ID_PROPERTYNAME = FilesPlugin::OWNER_ID_PROPERTYNAME; + public const OWNER_DISPLAY_NAME_PROPERTYNAME = FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME; + public const DATA_FINGERPRINT_PROPERTYNAME = FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME; + public const HAS_PREVIEW_PROPERTYNAME = FilesPlugin::HAS_PREVIEW_PROPERTYNAME; /** * @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index ea4eef1690a..153bc0cd93b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php +++ b/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 diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php index 49519431151..210e732438c 100644 --- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php @@ -41,9 +41,9 @@ use Sabre\DAV\Tree; * See the COPYING-README file. */ class TagsPluginTest extends \Test\TestCase { - const TAGS_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::TAGS_PROPERTYNAME; - const FAVORITE_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::FAVORITE_PROPERTYNAME; - const TAG_FAVORITE = \OCA\DAV\Connector\Sabre\TagsPlugin::TAG_FAVORITE; + public const TAGS_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::TAGS_PROPERTYNAME; + public const FAVORITE_PROPERTYNAME = \OCA\DAV\Connector\Sabre\TagsPlugin::FAVORITE_PROPERTYNAME; + public const TAG_FAVORITE = \OCA\DAV\Connector\Sabre\TagsPlugin::TAG_FAVORITE; /** * @var \Sabre\DAV\Server diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php index dc47c20f345..97e140a0ab7 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php @@ -43,12 +43,12 @@ use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; class SystemTagPluginTest extends \Test\TestCase { - const ID_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::ID_PROPERTYNAME; - const DISPLAYNAME_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::DISPLAYNAME_PROPERTYNAME; - const USERVISIBLE_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::USERVISIBLE_PROPERTYNAME; - const USERASSIGNABLE_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::USERASSIGNABLE_PROPERTYNAME; - const CANASSIGN_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::CANASSIGN_PROPERTYNAME; - const GROUPS_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::GROUPS_PROPERTYNAME; + public const ID_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::ID_PROPERTYNAME; + public const DISPLAYNAME_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::DISPLAYNAME_PROPERTYNAME; + public const USERVISIBLE_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::USERVISIBLE_PROPERTYNAME; + public const USERASSIGNABLE_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::USERASSIGNABLE_PROPERTYNAME; + public const CANASSIGN_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::CANASSIGN_PROPERTYNAME; + public const GROUPS_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::GROUPS_PROPERTYNAME; /** * @var \Sabre\DAV\Server diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 24b1f21ecd0..fe12bfaf727 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -54,16 +54,16 @@ use OCP\IUserSession; * @package OCA\Encryption\Crypto */ class Crypt { - const DEFAULT_CIPHER = 'AES-256-CTR'; + public const DEFAULT_CIPHER = 'AES-256-CTR'; // default cipher from old Nextcloud versions - const LEGACY_CIPHER = 'AES-128-CFB'; + public const LEGACY_CIPHER = 'AES-128-CFB'; // default key format, old Nextcloud version encrypted the private key directly // with the user password - const LEGACY_KEY_FORMAT = 'password'; + public const LEGACY_KEY_FORMAT = 'password'; - const HEADER_START = 'HBEGIN'; - const HEADER_END = 'HEND'; + public const HEADER_START = 'HBEGIN'; + public const HEADER_END = 'HEND'; /** @var ILogger */ private $logger; diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 57cf4e2edac..39dfece7629 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -45,8 +45,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Encryption implements IEncryptionModule { - const ID = 'OC_DEFAULT_MODULE'; - const DISPLAY_NAME = 'Default encryption module'; + public const ID = 'OC_DEFAULT_MODULE'; + public const DISPLAY_NAME = 'Default encryption module'; /** * @var Crypt diff --git a/apps/encryption/lib/Session.php b/apps/encryption/lib/Session.php index 4398f9c4e0a..3c79cd29e17 100644 --- a/apps/encryption/lib/Session.php +++ b/apps/encryption/lib/Session.php @@ -34,9 +34,9 @@ class Session { /** @var ISession */ protected $session; - const NOT_INITIALIZED = '0'; - const INIT_EXECUTED = '1'; - const INIT_SUCCESSFUL = '2'; + public const NOT_INITIALIZED = '0'; + public const INIT_EXECUTED = '1'; + public const INIT_SUCCESSFUL = '2'; /** * @param ISession $session diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index aaa3e27cfd2..228fab305b9 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -58,7 +58,7 @@ use OCP\Share\IShareProvider; * @package OCA\FederatedFileSharing */ class FederatedShareProvider implements IShareProvider { - const SHARE_TYPE_REMOTE = 6; + public const SHARE_TYPE_REMOTE = 6; /** @var IDBConnection */ private $dbConnection; diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php index 6d11ea65096..7b2105ecb0f 100644 --- a/apps/federatedfilesharing/lib/Notifications.php +++ b/apps/federatedfilesharing/lib/Notifications.php @@ -33,7 +33,7 @@ use OCP\Http\Client\IClientService; use OCP\OCS\IDiscoveryService; class Notifications { - const RESPONSE_FORMAT = 'json'; // default response format for ocs calls + public const RESPONSE_FORMAT = 'json'; // default response format for ocs calls /** @var AddressHandler */ private $addressHandler; diff --git a/apps/federatedfilesharing/lib/TokenHandler.php b/apps/federatedfilesharing/lib/TokenHandler.php index 3922765aeba..37645a855c8 100644 --- a/apps/federatedfilesharing/lib/TokenHandler.php +++ b/apps/federatedfilesharing/lib/TokenHandler.php @@ -30,7 +30,7 @@ use OCP\Security\ISecureRandom; * @package OCA\FederatedFileSharing */ class TokenHandler { - const TOKEN_LENGTH = 15; + public const TOKEN_LENGTH = 15; /** @var ISecureRandom */ private $secureRandom; diff --git a/apps/federatedfilesharing/tests/TestCase.php b/apps/federatedfilesharing/tests/TestCase.php index 813c3c8a15f..174197a1559 100644 --- a/apps/federatedfilesharing/tests/TestCase.php +++ b/apps/federatedfilesharing/tests/TestCase.php @@ -36,8 +36,8 @@ use OC\Group\Database; * Base class for sharing tests. */ abstract class TestCase extends \Test\TestCase { - const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; - const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; + public const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; + public const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 3d659e7eb95..cc1913e9475 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -42,13 +42,13 @@ use Symfony\Component\EventDispatcher\GenericEvent; class TrustedServers { /** after a user list was exchanged at least once successfully */ - const STATUS_OK = 1; + public const STATUS_OK = 1; /** waiting for shared secret or initial user list exchange */ - const STATUS_PENDING = 2; + public const STATUS_PENDING = 2; /** something went wrong, misconfigured server, software bug,... user interaction needed */ - const STATUS_FAILURE = 3; + public const STATUS_FAILURE = 3; /** remote server revoked access */ - const STATUS_ACCESS_REVOKED = 4; + public const STATUS_ACCESS_REVOKED = 4; /** @var dbHandler */ private $dbHandler; diff --git a/apps/files/lib/Activity/FavoriteProvider.php b/apps/files/lib/Activity/FavoriteProvider.php index 9cf1255765b..8692b83f008 100644 --- a/apps/files/lib/Activity/FavoriteProvider.php +++ b/apps/files/lib/Activity/FavoriteProvider.php @@ -32,8 +32,8 @@ use OCP\IURLGenerator; use OCP\L10N\IFactory; class FavoriteProvider implements IProvider { - const SUBJECT_ADDED = 'added_favorite'; - const SUBJECT_REMOVED = 'removed_favorite'; + public const SUBJECT_ADDED = 'added_favorite'; + public const SUBJECT_REMOVED = 'removed_favorite'; /** @var IFactory */ protected $languageFactory; diff --git a/apps/files/lib/Activity/Helper.php b/apps/files/lib/Activity/Helper.php index df9ed7af909..c274df2ccbb 100644 --- a/apps/files/lib/Activity/Helper.php +++ b/apps/files/lib/Activity/Helper.php @@ -27,7 +27,7 @@ use OCP\ITagManager; class Helper { /** If a user has a lot of favorites the query might get too slow and long */ - const FAVORITE_LIMIT = 50; + public const FAVORITE_LIMIT = 50; /** @var ITagManager */ protected $tagManager; diff --git a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php index b0f91b70401..ca890269a93 100644 --- a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php +++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php @@ -31,7 +31,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; * Delete all share entries that have no matching entries in the file cache table. */ class DeleteOrphanedItems extends TimedJob { - const CHUNK_SIZE = 200; + public const CHUNK_SIZE = 200; /** @var \OCP\IDBConnection */ protected $connection; diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index f1ff1a633ef..b9f37ca8116 100644 --- a/apps/files/lib/BackgroundJob/ScanFiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php @@ -48,7 +48,7 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob { private $logger; /** Amount of users that should get scanned per execution */ - const USERS_PER_SESSION = 500; + public const USERS_PER_SESSION = 500; /** * @param IConfig|null $config diff --git a/apps/files/lib/Command/DeleteOrphanedFiles.php b/apps/files/lib/Command/DeleteOrphanedFiles.php index c5072983ef4..855958511d7 100644 --- a/apps/files/lib/Command/DeleteOrphanedFiles.php +++ b/apps/files/lib/Command/DeleteOrphanedFiles.php @@ -32,7 +32,7 @@ use Symfony\Component\Console\Output\OutputInterface; * Delete all file entries that have no matching entries in the storage table. */ class DeleteOrphanedFiles extends Command { - const CHUNK_SIZE = 200; + public const CHUNK_SIZE = 200; /** * @var IDBConnection diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index e7f43ce2a0e..b238b33f6a4 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -58,7 +58,7 @@ class ListCommand extends Base { */ protected $userManager; - const ALL = -1; + public const ALL = -1; public function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { parent::__construct(); diff --git a/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php index 4822789ba2b..cd72634e58a 100644 --- a/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php +++ b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php @@ -32,7 +32,7 @@ use OCP\IL10N; * Amazon S3 access key authentication */ class AccessKey extends AuthMechanism { - const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey'; + public const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey'; public function __construct(IL10N $l) { $this diff --git a/apps/files_external/lib/Lib/Auth/AuthMechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php index c13774ea5e0..5a693b75dbf 100644 --- a/apps/files_external/lib/Lib/Auth/AuthMechanism.php +++ b/apps/files_external/lib/Lib/Auth/AuthMechanism.php @@ -52,14 +52,14 @@ use OCA\Files_External\Lib\VisibilityTrait; */ class AuthMechanism implements \JsonSerializable { /** Standard authentication schemes */ - const SCHEME_NULL = 'null'; - const SCHEME_BUILTIN = 'builtin'; - const SCHEME_PASSWORD = 'password'; - const SCHEME_OAUTH1 = 'oauth1'; - const SCHEME_OAUTH2 = 'oauth2'; - const SCHEME_PUBLICKEY = 'publickey'; - const SCHEME_OPENSTACK = 'openstack'; - const SCHEME_SMB = 'smb'; + public const SCHEME_NULL = 'null'; + public const SCHEME_BUILTIN = 'builtin'; + public const SCHEME_PASSWORD = 'password'; + public const SCHEME_OAUTH1 = 'oauth1'; + public const SCHEME_OAUTH2 = 'oauth2'; + public const SCHEME_PUBLICKEY = 'publickey'; + public const SCHEME_OPENSTACK = 'openstack'; + public const SCHEME_SMB = 'smb'; use VisibilityTrait; use FrontendDefinitionTrait; diff --git a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php index de6e34c4443..34b1b747bfe 100644 --- a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php +++ b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php @@ -36,7 +36,7 @@ use OCP\Security\ICredentialsManager; * Global Username and Password */ class GlobalAuth extends AuthMechanism { - const CREDENTIALS_IDENTIFIER = 'password::global'; + public const CREDENTIALS_IDENTIFIER = 'password::global'; /** @var ICredentialsManager */ protected $credentialsManager; diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php index 0165bb6d077..8d06707b2af 100644 --- a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php @@ -35,7 +35,7 @@ use OCP\Security\ICredentialsManager; * Username and password from login credentials, saved in DB */ class LoginCredentials extends AuthMechanism { - const CREDENTIALS_IDENTIFIER = 'password::logincredentials/credentials'; + public const CREDENTIALS_IDENTIFIER = 'password::logincredentials/credentials'; /** @var ISession */ protected $session; diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php index 552b707b544..429e0f1c261 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php @@ -37,7 +37,7 @@ use OCP\Security\ICredentialsManager; * User provided Username and Password */ class UserProvided extends AuthMechanism implements IUserProvided { - const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/'; + public const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/'; /** @var ICredentialsManager */ protected $credentialsManager; diff --git a/apps/files_external/lib/Lib/DefinitionParameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php index 2e1ce7fb1dd..519de22d70d 100644 --- a/apps/files_external/lib/Lib/DefinitionParameter.php +++ b/apps/files_external/lib/Lib/DefinitionParameter.php @@ -29,18 +29,18 @@ namespace OCA\Files_External\Lib; class DefinitionParameter implements \JsonSerializable { // placeholder value for password fields, when the client updates a storage configuration // placeholder values are ignored and the field is left unmodified - const UNMODIFIED_PLACEHOLDER = '__unmodified__'; + public const UNMODIFIED_PLACEHOLDER = '__unmodified__'; /** Value constants */ - const VALUE_TEXT = 0; - const VALUE_BOOLEAN = 1; - const VALUE_PASSWORD = 2; - const VALUE_HIDDEN = 3; + public const VALUE_TEXT = 0; + public const VALUE_BOOLEAN = 1; + public const VALUE_PASSWORD = 2; + public const VALUE_HIDDEN = 3; /** Flag constants */ - const FLAG_NONE = 0; - const FLAG_OPTIONAL = 1; - const FLAG_USER_PROVIDED = 2; + public const FLAG_NONE = 0; + public const FLAG_OPTIONAL = 1; + public const FLAG_USER_PROVIDED = 2; /** @var string name of parameter */ private $name; diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php index d8e3ee321b7..8125d87d9ee 100644 --- a/apps/files_external/lib/Lib/Storage/OwnCloud.php +++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php @@ -39,7 +39,7 @@ use Sabre\DAV\Client; * */ class OwnCloud extends \OC\Files\Storage\DAV implements IDisableEncryptionStorage { - const OC_URL_SUFFIX = 'remote.php/webdav'; + public const OC_URL_SUFFIX = 'remote.php/webdav'; public function __construct($params) { // extract context path from host if specified diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 96fb4f0ac9a..3ecb73f54af 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -101,7 +101,7 @@ class Swift extends \OC\Files\Storage\Common { return $path; } - const SUBCONTAINER_FILE = '.subcontainers'; + public const SUBCONTAINER_FILE = '.subcontainers'; /** * translate directory path to container name diff --git a/apps/files_external/lib/Lib/StorageConfig.php b/apps/files_external/lib/Lib/StorageConfig.php index 5ed65918b22..43d95b8232a 100644 --- a/apps/files_external/lib/Lib/StorageConfig.php +++ b/apps/files_external/lib/Lib/StorageConfig.php @@ -36,8 +36,8 @@ use OCA\Files_External\Lib\Backend\Backend; * External storage configuration */ class StorageConfig implements \JsonSerializable { - const MOUNT_TYPE_ADMIN = 1; - const MOUNT_TYPE_PERSONAl = 2; + public const MOUNT_TYPE_ADMIN = 1; + public const MOUNT_TYPE_PERSONAl = 2; /** * Storage config id diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php index 617b44651ae..d89e782f6f6 100644 --- a/apps/files_external/lib/Service/BackendService.php +++ b/apps/files_external/lib/Service/BackendService.php @@ -41,15 +41,15 @@ use OCP\IConfig; class BackendService { /** Visibility constants for VisibilityTrait */ - const VISIBILITY_NONE = 0; - const VISIBILITY_PERSONAL = 1; - const VISIBILITY_ADMIN = 2; + public const VISIBILITY_NONE = 0; + public const VISIBILITY_PERSONAL = 1; + public const VISIBILITY_ADMIN = 2; //const VISIBILITY_ALIENS = 4; - const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN + public const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN /** Priority constants for PriorityTrait */ - const PRIORITY_DEFAULT = 100; + public const PRIORITY_DEFAULT = 100; /** @var IConfig */ protected $config; diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php index 51373e8dda6..7a4579fd3f7 100644 --- a/apps/files_external/lib/Service/DBConfigService.php +++ b/apps/files_external/lib/Service/DBConfigService.php @@ -36,12 +36,12 @@ use OCP\Security\ICrypto; * Stores the mount config in the database */ class DBConfigService { - const MOUNT_TYPE_ADMIN = 1; - const MOUNT_TYPE_PERSONAl = 2; + public const MOUNT_TYPE_ADMIN = 1; + public const MOUNT_TYPE_PERSONAl = 2; - const APPLICABLE_TYPE_GLOBAL = 1; - const APPLICABLE_TYPE_GROUP = 2; - const APPLICABLE_TYPE_USER = 3; + public const APPLICABLE_TYPE_GLOBAL = 1; + public const APPLICABLE_TYPE_GROUP = 2; + public const APPLICABLE_TYPE_USER = 3; /** * @var IDBConnection diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index c69955c3406..745f2da6d5e 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -60,10 +60,10 @@ use phpseclib\Crypt\AES; class OC_Mount_Config { // TODO: make this class non-static and give it a proper namespace - const MOUNT_TYPE_GLOBAL = 'global'; - const MOUNT_TYPE_GROUP = 'group'; - const MOUNT_TYPE_USER = 'user'; - const MOUNT_TYPE_PERSONAL = 'personal'; + public const MOUNT_TYPE_GLOBAL = 'global'; + public const MOUNT_TYPE_GROUP = 'group'; + public const MOUNT_TYPE_USER = 'user'; + public const MOUNT_TYPE_PERSONAL = 'personal'; // whether to skip backend test (for unit tests, as this static class is not mockable) public static $skipTest = false; diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index c23d741b23d..f99b25a9fc7 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -57,9 +57,9 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest { protected $user; - const USER_ID = 'test_user'; - const GROUP_ID = 'test_group'; - const GROUP_ID2 = 'test_group2'; + public const USER_ID = 'test_user'; + public const GROUP_ID = 'test_group'; + public const GROUP_ID2 = 'test_group2'; protected function setUp(): void { parent::setUp(); diff --git a/apps/files_sharing/lib/Activity/Filter.php b/apps/files_sharing/lib/Activity/Filter.php index 4df53745c7b..4997482bddb 100644 --- a/apps/files_sharing/lib/Activity/Filter.php +++ b/apps/files_sharing/lib/Activity/Filter.php @@ -28,8 +28,8 @@ use OCP\IL10N; use OCP\IURLGenerator; class Filter implements IFilter { - const TYPE_REMOTE_SHARE = 'remote_share'; - const TYPE_SHARED = 'shared'; + public const TYPE_REMOTE_SHARE = 'remote_share'; + public const TYPE_SHARED = 'shared'; /** @var IL10N */ protected $l; diff --git a/apps/files_sharing/lib/Activity/Providers/Downloads.php b/apps/files_sharing/lib/Activity/Providers/Downloads.php index 23c55e08a26..acb4ce3837a 100644 --- a/apps/files_sharing/lib/Activity/Providers/Downloads.php +++ b/apps/files_sharing/lib/Activity/Providers/Downloads.php @@ -26,11 +26,11 @@ namespace OCA\Files_Sharing\Activity\Providers; use OCP\Activity\IEvent; class Downloads extends Base { - const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded'; - const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded'; + public const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded'; + public const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded'; - const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded'; - const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded'; + public const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded'; + public const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded'; /** * @param IEvent $event diff --git a/apps/files_sharing/lib/Activity/Providers/Groups.php b/apps/files_sharing/lib/Activity/Providers/Groups.php index c6115a8dba0..dfc3e6b521d 100644 --- a/apps/files_sharing/lib/Activity/Providers/Groups.php +++ b/apps/files_sharing/lib/Activity/Providers/Groups.php @@ -35,13 +35,13 @@ use OCP\IUserManager; use OCP\L10N\IFactory; class Groups extends Base { - const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self'; - const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by'; + public const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self'; + public const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by'; - const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self'; - const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by'; + public const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self'; + public const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by'; - const SUBJECT_EXPIRED_GROUP = 'expired_group'; + public const SUBJECT_EXPIRED_GROUP = 'expired_group'; /** @var IGroupManager */ protected $groupManager; diff --git a/apps/files_sharing/lib/Activity/Providers/PublicLinks.php b/apps/files_sharing/lib/Activity/Providers/PublicLinks.php index 0ebe6cdec0f..884296e46f5 100644 --- a/apps/files_sharing/lib/Activity/Providers/PublicLinks.php +++ b/apps/files_sharing/lib/Activity/Providers/PublicLinks.php @@ -26,12 +26,12 @@ namespace OCA\Files_Sharing\Activity\Providers; use OCP\Activity\IEvent; class PublicLinks extends Base { - const SUBJECT_SHARED_LINK_SELF = 'shared_link_self'; - const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by'; - const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self'; - const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by'; - const SUBJECT_LINK_EXPIRED = 'link_expired'; - const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired'; + public const SUBJECT_SHARED_LINK_SELF = 'shared_link_self'; + public const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by'; + public const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self'; + public const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by'; + public const SUBJECT_LINK_EXPIRED = 'link_expired'; + public const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired'; /** * @param IEvent $event diff --git a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php index 2604288d448..4a297fcf060 100644 --- a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php +++ b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php @@ -33,10 +33,10 @@ use OCP\IUserManager; use OCP\L10N\IFactory; class RemoteShares extends Base { - const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted'; - const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined'; - const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received'; - const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared'; + public const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted'; + public const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined'; + public const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received'; + public const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared'; public function __construct(IFactory $languageFactory, IURLGenerator $url, diff --git a/apps/files_sharing/lib/Activity/Providers/Users.php b/apps/files_sharing/lib/Activity/Providers/Users.php index aff5feddc01..8f90ffdf567 100644 --- a/apps/files_sharing/lib/Activity/Providers/Users.php +++ b/apps/files_sharing/lib/Activity/Providers/Users.php @@ -28,18 +28,18 @@ namespace OCA\Files_Sharing\Activity\Providers; use OCP\Activity\IEvent; class Users extends Base { - const SUBJECT_SHARED_USER_SELF = 'shared_user_self'; - const SUBJECT_RESHARED_USER_BY = 'reshared_user_by'; - const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self'; - const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by'; + public const SUBJECT_SHARED_USER_SELF = 'shared_user_self'; + public const SUBJECT_RESHARED_USER_BY = 'reshared_user_by'; + public const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self'; + public const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by'; - const SUBJECT_SHARED_WITH_BY = 'shared_with_by'; - const SUBJECT_UNSHARED_BY = 'unshared_by'; - const SUBJECT_SELF_UNSHARED = 'self_unshared'; - const SUBJECT_SELF_UNSHARED_BY = 'self_unshared_by'; + public const SUBJECT_SHARED_WITH_BY = 'shared_with_by'; + public const SUBJECT_UNSHARED_BY = 'unshared_by'; + public const SUBJECT_SELF_UNSHARED = 'self_unshared'; + public const SUBJECT_SELF_UNSHARED_BY = 'self_unshared_by'; - const SUBJECT_EXPIRED_USER = 'expired_user'; - const SUBJECT_EXPIRED = 'expired'; + public const SUBJECT_EXPIRED_USER = 'expired_user'; + public const SUBJECT_EXPIRED = 'expired'; /** * @param IEvent $event diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php index 2902b820af3..34db7441daa 100644 --- a/apps/files_sharing/lib/AppInfo/Application.php +++ b/apps/files_sharing/lib/AppInfo/Application.php @@ -65,7 +65,7 @@ use OCP\Util; use Symfony\Component\EventDispatcher\GenericEvent; class Application extends App { - const APP_ID = 'files_sharing'; + public const APP_ID = 'files_sharing'; public function __construct(array $urlParams = []) { parent::__construct(self::APP_ID, $urlParams); diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index 3923fdf09d3..8331787c6df 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -48,7 +48,7 @@ use OCP\Share; use OCP\Share\IShare; class Manager { - const STORAGE = '\OCA\Files_Sharing\External\Storage'; + public const STORAGE = '\OCA\Files_Sharing\External\Storage'; /** * @var string diff --git a/apps/files_sharing/lib/External/MountProvider.php b/apps/files_sharing/lib/External/MountProvider.php index 992aba48c66..5d26bf20b47 100644 --- a/apps/files_sharing/lib/External/MountProvider.php +++ b/apps/files_sharing/lib/External/MountProvider.php @@ -30,7 +30,7 @@ use OCP\IDBConnection; use OCP\IUser; class MountProvider implements IMountProvider { - const STORAGE = '\OCA\Files_Sharing\External\Storage'; + public const STORAGE = '\OCA\Files_Sharing\External\Storage'; /** * @var \OCP\IDBConnection diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php index 2db6c374c85..a15391162ff 100644 --- a/apps/files_sharing/lib/ShareBackend/File.php +++ b/apps/files_sharing/lib/ShareBackend/File.php @@ -37,13 +37,13 @@ namespace OCA\Files_Sharing\ShareBackend; use OCA\FederatedFileSharing\FederatedShareProvider; class File implements \OCP\Share_Backend_File_Dependent { - const FORMAT_SHARED_STORAGE = 0; - const FORMAT_GET_FOLDER_CONTENTS = 1; - const FORMAT_FILE_APP_ROOT = 2; - const FORMAT_OPENDIR = 3; - const FORMAT_GET_ALL = 4; - const FORMAT_PERMISSIONS = 5; - const FORMAT_TARGET_NAMES = 6; + public const FORMAT_SHARED_STORAGE = 0; + public const FORMAT_GET_FOLDER_CONTENTS = 1; + public const FORMAT_FILE_APP_ROOT = 2; + public const FORMAT_OPENDIR = 3; + public const FORMAT_GET_ALL = 4; + public const FORMAT_PERMISSIONS = 5; + public const FORMAT_TARGET_NAMES = 6; private $path; diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index bb478044a2f..6bbb62d6090 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -53,8 +53,8 @@ use OCP\Share\IShare; * TODO: convert to real intergration tests */ class ApiTest extends TestCase { - const TEST_FOLDER_NAME = '/folder_share_api_test'; - const APP_NAME = 'files_sharing'; + public const TEST_FOLDER_NAME = '/folder_share_api_test'; + public const APP_NAME = 'files_sharing'; private static $tempStorage; diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index 313c8d8ac56..ba6b401e65e 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -34,7 +34,7 @@ namespace OCA\Files_Sharing\Tests; * @group DB */ class ShareTest extends TestCase { - const TEST_FOLDER_NAME = '/folder_share_api_test'; + public const TEST_FOLDER_NAME = '/folder_share_api_test'; private static $tempStorage; diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 323fc06f321..f84867c0aca 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -47,12 +47,12 @@ use Test\Traits\MountProviderTrait; abstract class TestCase extends \Test\TestCase { use MountProviderTrait; - const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; - const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; - const TEST_FILES_SHARING_API_USER3 = "test-share-user3"; - const TEST_FILES_SHARING_API_USER4 = "test-share-user4"; + public const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; + public const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; + public const TEST_FILES_SHARING_API_USER3 = "test-share-user3"; + public const TEST_FILES_SHARING_API_USER4 = "test-share-user4"; - const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1"; + public const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1"; public $filename; public $data; diff --git a/apps/files_sharing/tests/UnshareChildrenTest.php b/apps/files_sharing/tests/UnshareChildrenTest.php index 56fdeb44a30..15daf9d5108 100644 --- a/apps/files_sharing/tests/UnshareChildrenTest.php +++ b/apps/files_sharing/tests/UnshareChildrenTest.php @@ -37,7 +37,7 @@ namespace OCA\Files_Sharing\Tests; class UnshareChildrenTest extends TestCase { protected $subsubfolder; - const TEST_FOLDER_NAME = '/folder_share_api_test'; + public const TEST_FOLDER_NAME = '/folder_share_api_test'; private static $tempStorage; diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php index 0abc76df433..f2227721edc 100644 --- a/apps/files_sharing/tests/UpdaterTest.php +++ b/apps/files_sharing/tests/UpdaterTest.php @@ -36,7 +36,7 @@ namespace OCA\Files_Sharing\Tests; * @group DB */ class UpdaterTest extends TestCase { - const TEST_FOLDER_NAME = '/folder_share_updater_test'; + public const TEST_FOLDER_NAME = '/folder_share_updater_test'; public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/apps/files_trashbin/lib/Expiration.php b/apps/files_trashbin/lib/Expiration.php index 9a660f9e942..3a2dc2ede03 100644 --- a/apps/files_trashbin/lib/Expiration.php +++ b/apps/files_trashbin/lib/Expiration.php @@ -32,8 +32,8 @@ use OCP\IConfig; class Expiration { // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) - const DEFAULT_RETENTION_OBLIGATION = 30; - const NO_OBLIGATION = -1; + public const DEFAULT_RETENTION_OBLIGATION = 30; + public const NO_OBLIGATION = -1; /** @var ITimeFactory */ private $timeFactory; diff --git a/apps/files_trashbin/lib/Sabre/PropfindPlugin.php b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php index 1920ed17863..ac3fcdb3192 100644 --- a/apps/files_trashbin/lib/Sabre/PropfindPlugin.php +++ b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php @@ -35,10 +35,10 @@ use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; class PropfindPlugin extends ServerPlugin { - const TRASHBIN_FILENAME = '{http://nextcloud.org/ns}trashbin-filename'; - const TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location'; - const TRASHBIN_DELETION_TIME = '{http://nextcloud.org/ns}trashbin-deletion-time'; - const TRASHBIN_TITLE = '{http://nextcloud.org/ns}trashbin-title'; + public const TRASHBIN_FILENAME = '{http://nextcloud.org/ns}trashbin-filename'; + public const TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location'; + public const TRASHBIN_DELETION_TIME = '{http://nextcloud.org/ns}trashbin-deletion-time'; + public const TRASHBIN_TITLE = '{http://nextcloud.org/ns}trashbin-title'; /** @var Server */ private $server; diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index adfdf1364be..4ceac3b04c5 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -56,7 +56,7 @@ use OCP\User; class Trashbin { // unit: percentage; 50% of available disk space/quota - const DEFAULTMAXSIZE = 50; + public const DEFAULTMAXSIZE = 50; /** * Whether versions have already be rescanned during this PHP request diff --git a/apps/files_trashbin/tests/ExpirationTest.php b/apps/files_trashbin/tests/ExpirationTest.php index 581ef247ac7..a9b4124236e 100644 --- a/apps/files_trashbin/tests/ExpirationTest.php +++ b/apps/files_trashbin/tests/ExpirationTest.php @@ -28,9 +28,9 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class ExpirationTest extends \Test\TestCase { - const SECONDS_PER_DAY = 86400; //60*60*24 + public const SECONDS_PER_DAY = 86400; //60*60*24 - const FAKE_TIME_NOW = 1000000; + public const FAKE_TIME_NOW = 1000000; public function expirationData() { $today = 100*self::SECONDS_PER_DAY; diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php index fbf1b1c1c13..136d8121cfa 100644 --- a/apps/files_trashbin/tests/TrashbinTest.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -37,8 +37,8 @@ use OCA\Files_Sharing\AppInfo\Application; * @group DB */ class TrashbinTest extends \Test\TestCase { - const TEST_TRASHBIN_USER1 = "test-trashbin-user1"; - const TEST_TRASHBIN_USER2 = "test-trashbin-user2"; + public const TEST_TRASHBIN_USER1 = "test-trashbin-user1"; + public const TEST_TRASHBIN_USER2 = "test-trashbin-user2"; private $trashRoot1; private $trashRoot2; diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php index 36d7b6d2767..23942bf8952 100644 --- a/apps/files_versions/lib/AppInfo/Application.php +++ b/apps/files_versions/lib/AppInfo/Application.php @@ -42,7 +42,7 @@ use OCP\AppFramework\IAppContainer; use OCP\EventDispatcher\IEventDispatcher; class Application extends App { - const APP_ID = 'files_versions'; + public const APP_ID = 'files_versions'; public function __construct(array $urlParams = []) { parent::__construct(self::APP_ID, $urlParams); diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php index 4c8f82a1c76..201824389d5 100644 --- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php +++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php @@ -31,7 +31,7 @@ use OCP\IUser; use OCP\IUserManager; class ExpireVersions extends \OC\BackgroundJob\TimedJob { - const ITEMS_PER_SESSION = 1000; + public const ITEMS_PER_SESSION = 1000; /** * @var Expiration diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php index c9c91d67d7f..ab1eeab6901 100644 --- a/apps/files_versions/lib/Expiration.php +++ b/apps/files_versions/lib/Expiration.php @@ -30,7 +30,7 @@ use OCP\IConfig; class Expiration { // how long do we keep files a version if no other value is defined in the config file (unit: days) - const NO_OBLIGATION = -1; + public const NO_OBLIGATION = -1; /** @var ITimeFactory */ private $timeFactory; diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index f62650e539d..cb5a02581b5 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -57,13 +57,13 @@ use OCP\Lock\ILockingProvider; use OCP\User; class Storage { - const DEFAULTENABLED=true; - const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota - const VERSIONS_ROOT = 'files_versions/'; + public const DEFAULTENABLED=true; + public const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota + public const VERSIONS_ROOT = 'files_versions/'; - const DELETE_TRIGGER_MASTER_REMOVED = 0; - const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1; - const DELETE_TRIGGER_QUOTA_EXCEEDED = 2; + public const DELETE_TRIGGER_MASTER_REMOVED = 0; + public const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1; + public const DELETE_TRIGGER_QUOTA_EXCEEDED = 2; // files for which we can remove the versions after the delete operation was successful private static $deletedFiles = []; diff --git a/apps/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php index 426d07e4b42..1979da624c7 100644 --- a/apps/files_versions/tests/ExpirationTest.php +++ b/apps/files_versions/tests/ExpirationTest.php @@ -31,7 +31,7 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class ExpirationTest extends \Test\TestCase { - const SECONDS_PER_DAY = 86400; //60*60*24 + public const SECONDS_PER_DAY = 86400; //60*60*24 public function expirationData() { $today = 100*self::SECONDS_PER_DAY; diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index c3ae186e73e..26429574364 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -47,9 +47,9 @@ use OCP\IUser; * @group DB */ class VersioningTest extends \Test\TestCase { - const TEST_VERSIONS_USER = 'test-versions-user'; - const TEST_VERSIONS_USER2 = 'test-versions-user2'; - const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions'; + public const TEST_VERSIONS_USER = 'test-versions-user'; + public const TEST_VERSIONS_USER2 = 'test-versions-user2'; + public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions'; /** * @var \OC\Files\View diff --git a/apps/oauth2/lib/Controller/SettingsController.php b/apps/oauth2/lib/Controller/SettingsController.php index 89685bbee19..db0c6957d06 100644 --- a/apps/oauth2/lib/Controller/SettingsController.php +++ b/apps/oauth2/lib/Controller/SettingsController.php @@ -53,7 +53,7 @@ class SettingsController extends Controller { /** @var IL10N */ private $l; - const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + public const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; /** * @param string $appName diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php index 809fe6cf844..0f1a529ae81 100644 --- a/apps/settings/lib/AppInfo/Application.php +++ b/apps/settings/lib/AppInfo/Application.php @@ -54,7 +54,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class Application extends App { - const APP_ID = 'settings'; + public const APP_ID = 'settings'; /** * @param array $urlParams diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php index 757b2692e86..af8157523f1 100644 --- a/apps/sharebymail/lib/Activity.php +++ b/apps/sharebymail/lib/Activity.php @@ -60,12 +60,12 @@ class Activity implements IProvider { /** @var array */ protected $contactNames = []; - const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self'; - const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by'; - const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send'; - const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self'; - const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self'; - const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by'; + public const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self'; + public const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by'; + public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send'; + public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self'; + public const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self'; + public const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by'; /** * @param IFactory $languageFactory diff --git a/apps/systemtags/lib/Activity/Provider.php b/apps/systemtags/lib/Activity/Provider.php index c60aad31d62..6c91daffe18 100644 --- a/apps/systemtags/lib/Activity/Provider.php +++ b/apps/systemtags/lib/Activity/Provider.php @@ -33,12 +33,12 @@ use OCP\IUserManager; use OCP\L10N\IFactory; class Provider implements IProvider { - const CREATE_TAG = 'create_tag'; - const UPDATE_TAG = 'update_tag'; - const DELETE_TAG = 'delete_tag'; + public const CREATE_TAG = 'create_tag'; + public const UPDATE_TAG = 'update_tag'; + public const DELETE_TAG = 'delete_tag'; - const ASSIGN_TAG = 'assign_tag'; - const UNASSIGN_TAG = 'unassign_tag'; + public const ASSIGN_TAG = 'assign_tag'; + public const UNASSIGN_TAG = 'unassign_tag'; /** @var IFactory */ protected $languageFactory; diff --git a/apps/testing/lib/Locking/FakeDBLockingProvider.php b/apps/testing/lib/Locking/FakeDBLockingProvider.php index 62cbc4d2468..2de83eac1a8 100644 --- a/apps/testing/lib/Locking/FakeDBLockingProvider.php +++ b/apps/testing/lib/Locking/FakeDBLockingProvider.php @@ -29,7 +29,7 @@ use OCP\ILogger; class FakeDBLockingProvider extends \OC\Lock\DBLockingProvider { // Lock for 10 hours just to be sure - const TTL = 36000; + public const TTL = 36000; /** * Need a new child, because parent::connection is private instead of protected... diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 6744b044cdf..71994585c73 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -64,7 +64,7 @@ use OCP\IUserManager; * @package OCA\User_LDAP */ class Access extends LDAPUtility { - const UUID_ATTRIBUTES = ['entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid']; + public const UUID_ATTRIBUTES = ['entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid']; /** @var \OCA\User_LDAP\Connection */ public $connection; diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index 4076a6e8a3d..81e33e6244f 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -41,9 +41,9 @@ namespace OCA\User_LDAP; * @property string ldapUserAvatarRule */ class Configuration { - const AVATAR_PREFIX_DEFAULT = 'default'; - const AVATAR_PREFIX_NONE = 'none'; - const AVATAR_PREFIX_DATA_ATTRIBUTE = 'data:'; + public const AVATAR_PREFIX_DEFAULT = 'default'; + public const AVATAR_PREFIX_NONE = 'none'; + public const AVATAR_PREFIX_DATA_ATTRIBUTE = 'data:'; protected $configPrefix = null; protected $configRead = false; diff --git a/apps/user_ldap/lib/Jobs/Sync.php b/apps/user_ldap/lib/Jobs/Sync.php index 1ef2d16e7c2..053ca894902 100644 --- a/apps/user_ldap/lib/Jobs/Sync.php +++ b/apps/user_ldap/lib/Jobs/Sync.php @@ -43,8 +43,8 @@ use OCP\IUserManager; use OCP\Notification\IManager; class Sync extends TimedJob { - const MAX_INTERVAL = 12 * 60 * 60; // 12h - const MIN_INTERVAL = 30 * 60; // 30min + public const MAX_INTERVAL = 12 * 60 * 60; // 12h + public const MIN_INTERVAL = 30 * 60; // 30min /** @var Helper */ protected $ldapHelper; /** @var LDAP */ diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 724db063659..7d4e6c267de 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -107,8 +107,8 @@ class User { /** * DB config keys for user preferences */ - const USER_PREFKEY_FIRSTLOGIN = 'firstLoginAccomplished'; - const USER_PREFKEY_LASTREFRESH = 'lastFeatureRefresh'; + public const USER_PREFKEY_FIRSTLOGIN = 'firstLoginAccomplished'; + public const USER_PREFKEY_LASTREFRESH = 'lastFeatureRefresh'; /** * @brief constructor, make sure the subclasses call this one! diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index b0b9374fdf6..73032bfd7f2 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -50,18 +50,18 @@ class Wizard extends LDAPUtility { protected $result; protected $resultCache = []; - const LRESULT_PROCESSED_OK = 2; - const LRESULT_PROCESSED_INVALID = 3; - const LRESULT_PROCESSED_SKIP = 4; + public const LRESULT_PROCESSED_OK = 2; + public const LRESULT_PROCESSED_INVALID = 3; + public const LRESULT_PROCESSED_SKIP = 4; - const LFILTER_LOGIN = 2; - const LFILTER_USER_LIST = 3; - const LFILTER_GROUP_LIST = 4; + public const LFILTER_LOGIN = 2; + public const LFILTER_USER_LIST = 3; + public const LFILTER_GROUP_LIST = 4; - const LFILTER_MODE_ASSISTED = 2; - const LFILTER_MODE_RAW = 1; + public const LFILTER_MODE_ASSISTED = 2; + public const LFILTER_MODE_RAW = 1; - const LDAP_NW_TIMEOUT = 4; + public const LDAP_NW_TIMEOUT = 4; /** * Constructor diff --git a/apps/workflowengine/lib/AppInfo/Application.php b/apps/workflowengine/lib/AppInfo/Application.php index c9e982a311f..70b5468c553 100644 --- a/apps/workflowengine/lib/AppInfo/Application.php +++ b/apps/workflowengine/lib/AppInfo/Application.php @@ -35,7 +35,7 @@ use OCP\WorkflowEngine\IOperationCompat; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class Application extends \OCP\AppFramework\App { - const APP_ID = 'workflowengine'; + public const APP_ID = 'workflowengine'; /** @var EventDispatcherInterface */ protected $dispatcher; diff --git a/apps/workflowengine/lib/Check/RequestTime.php b/apps/workflowengine/lib/Check/RequestTime.php index 9729129104f..df210cdae58 100644 --- a/apps/workflowengine/lib/Check/RequestTime.php +++ b/apps/workflowengine/lib/Check/RequestTime.php @@ -26,8 +26,8 @@ use OCP\IL10N; use OCP\WorkflowEngine\ICheck; class RequestTime implements ICheck { - const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; - const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; + public const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; + public const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; /** @var bool[] */ protected $cachedResults; diff --git a/core/Command/Base.php b/core/Command/Base.php index 9c20e049311..385642a7313 100644 --- a/core/Command/Base.php +++ b/core/Command/Base.php @@ -34,9 +34,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Base extends Command implements CompletionAwareInterface { - const OUTPUT_FORMAT_PLAIN = 'plain'; - const OUTPUT_FORMAT_JSON = 'json'; - const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty'; + public const OUTPUT_FORMAT_PLAIN = 'plain'; + public const OUTPUT_FORMAT_JSON = 'json'; + public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty'; protected $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN; diff --git a/core/Command/Log/Manage.php b/core/Command/Log/Manage.php index 2d7eaf9e2e6..0318e1c8d2d 100644 --- a/core/Command/Log/Manage.php +++ b/core/Command/Log/Manage.php @@ -36,9 +36,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Manage extends Command implements CompletionAwareInterface { - const DEFAULT_BACKEND = 'file'; - const DEFAULT_LOG_LEVEL = 2; - const DEFAULT_TIMEZONE = 'UTC'; + public const DEFAULT_BACKEND = 'file'; + public const DEFAULT_LOG_LEVEL = 2; + public const DEFAULT_TIMEZONE = 'UTC'; /** @var IConfig */ protected $config; diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 47b0b600777..eb81ad4991a 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -32,7 +32,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class UpdateDB extends Command { - const DEFAULT_MIMETYPE = 'application/octet-stream'; + public const DEFAULT_MIMETYPE = 'application/octet-stream'; /** @var IMimeTypeDetector */ protected $mimetypeDetector; diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 461884fabe4..f00945a29d0 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -47,12 +47,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\EventDispatcher\GenericEvent; class Upgrade extends Command { - const ERROR_SUCCESS = 0; - const ERROR_NOT_INSTALLED = 1; - const ERROR_MAINTENANCE_MODE = 2; - const ERROR_UP_TO_DATE = 0; - const ERROR_INVALID_ARGUMENTS = 4; - const ERROR_FAILURE = 5; + public const ERROR_SUCCESS = 0; + public const ERROR_NOT_INSTALLED = 1; + public const ERROR_MAINTENANCE_MODE = 2; + public const ERROR_UP_TO_DATE = 0; + public const ERROR_INVALID_ARGUMENTS = 4; + public const ERROR_FAILURE = 5; /** @var IConfig */ private $config; diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index dad43fc837a..748a4cf50d2 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -77,7 +77,7 @@ class ClientFlowLoginController extends Controller { /** @var EventDispatcherInterface */ private $eventDispatcher; - const stateName = 'client.flow.state.token'; + public const stateName = 'client.flow.state.token'; /** * @param string $appName diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 4813f15f1c5..0fcadd21c8a 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -57,8 +57,8 @@ use OCP\IUserSession; use OCP\Util; class LoginController extends Controller { - const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; - const LOGIN_MSG_USERDISABLED = 'userdisabled'; + public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; + public const LOGIN_MSG_USERDISABLED = 'userdisabled'; /** @var IUserManager */ private $userManager; diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index b57b991884c..dd7e4eefc81 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -44,7 +44,7 @@ class SetupController { /** * @param Setup $setupHelper */ - function __construct(Setup $setupHelper) { + public function __construct(Setup $setupHelper) { $this->autoConfigFile = \OC::$configDir.'autoconfig.php'; $this->setupHelper = $setupHelper; } diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php index 5bd66225076..fd2b3cbf902 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -35,7 +35,7 @@ class WalledGardenController extends Controller { * * @return Response */ - function get() { + public function get() { $resp = new Response(); $resp->setStatus(Http::STATUS_NO_CONTENT); return $resp; diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index fd0600a3ce4..a54d149df62 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -40,7 +40,7 @@ use OCP\IConfig; use OCP\ILogger; abstract class Fetcher { - const INVALIDATE_AFTER_SECONDS = 300; + public const INVALIDATE_AFTER_SECONDS = 300; /** @var IAppData */ protected $appData; diff --git a/lib/private/App/CodeChecker/CodeChecker.php b/lib/private/App/CodeChecker/CodeChecker.php index aa8f43e6af2..01969006af4 100644 --- a/lib/private/App/CodeChecker/CodeChecker.php +++ b/lib/private/App/CodeChecker/CodeChecker.php @@ -37,14 +37,14 @@ use RegexIterator; use SplFileInfo; class CodeChecker extends BasicEmitter { - const CLASS_EXTENDS_NOT_ALLOWED = 1000; - const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001; - const STATIC_CALL_NOT_ALLOWED = 1002; - const CLASS_CONST_FETCH_NOT_ALLOWED = 1003; - const CLASS_NEW_NOT_ALLOWED = 1004; - const OP_OPERATOR_USAGE_DISCOURAGED = 1005; - const CLASS_USE_NOT_ALLOWED = 1006; - const CLASS_METHOD_CALL_NOT_ALLOWED = 1007; + public const CLASS_EXTENDS_NOT_ALLOWED = 1000; + public const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001; + public const STATIC_CALL_NOT_ALLOWED = 1002; + public const CLASS_CONST_FETCH_NOT_ALLOWED = 1003; + public const CLASS_NEW_NOT_ALLOWED = 1004; + public const OP_OPERATOR_USAGE_DISCOURAGED = 1005; + public const CLASS_USE_NOT_ALLOWED = 1006; + public const CLASS_METHOD_CALL_NOT_ALLOWED = 1007; /** @var Parser */ private $parser; diff --git a/lib/private/App/CompareVersion.php b/lib/private/App/CompareVersion.php index 12cd7615769..5d38d4c358e 100644 --- a/lib/private/App/CompareVersion.php +++ b/lib/private/App/CompareVersion.php @@ -26,10 +26,10 @@ namespace OC\App; use InvalidArgumentException; class CompareVersion { - const REGEX_MAJOR = '/^\d+$/'; - const REGEX_MAJOR_MINOR = '/^\d+.\d+$/'; - const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/'; - const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/'; + public const REGEX_MAJOR = '/^\d+$/'; + public const REGEX_MAJOR_MINOR = '/^\d+.\d+$/'; + public const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/'; + public const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/'; /** * Checks if the given server version fulfills the given (app) version requirements. diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 1dcec3c3b98..c9b22dd7a1e 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -64,32 +64,32 @@ use OCP\Security\ISecureRandom; * @property mixed[] server */ class Request implements \ArrayAccess, \Countable, IRequest { - const USER_AGENT_IE = '/(MSIE)|(Trident)/'; + public const USER_AGENT_IE = '/(MSIE)|(Trident)/'; // Microsoft Edge User Agent from https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx - const USER_AGENT_MS_EDGE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+ Edge\/[0-9.]+$/'; + public const USER_AGENT_MS_EDGE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+ Edge\/[0-9.]+$/'; // Firefox User Agent from https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference - const USER_AGENT_FIREFOX = '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/[0-9.]+$/'; + public const USER_AGENT_FIREFOX = '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/[0-9.]+$/'; // Chrome User Agent from https://developer.chrome.com/multidevice/user-agent - const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\)( Ubuntu Chromium\/[0-9.]+|) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+( (Vivaldi|Brave|OPR)\/[0-9.]+|)$/'; + public const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\)( Ubuntu Chromium\/[0-9.]+|) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+( (Vivaldi|Brave|OPR)\/[0-9.]+|)$/'; // Safari User Agent from http://www.useragentstring.com/pages/Safari/ - const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; + public const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent - const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; - const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; - const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost|::1)$/'; + public const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; + public const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; + public const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost|::1)$/'; /** * @deprecated use \OCP\IRequest::USER_AGENT_CLIENT_IOS instead */ - const USER_AGENT_OWNCLOUD_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/'; + public const USER_AGENT_OWNCLOUD_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/'; /** * @deprecated use \OCP\IRequest::USER_AGENT_CLIENT_ANDROID instead */ - const USER_AGENT_OWNCLOUD_ANDROID = '/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/'; + public const USER_AGENT_OWNCLOUD_ANDROID = '/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/'; /** * @deprecated use \OCP\IRequest::USER_AGENT_CLIENT_DESKTOP instead */ - const USER_AGENT_OWNCLOUD_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/'; + public const USER_AGENT_OWNCLOUD_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/'; protected $inputStream; protected $content; diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php index f6e7c12d02d..0d4103299ce 100644 --- a/lib/private/Archive/TAR.php +++ b/lib/private/Archive/TAR.php @@ -35,9 +35,9 @@ namespace OC\Archive; use Icewind\Streams\CallbackWrapper; class TAR extends Archive { - const PLAIN = 0; - const GZIP = 1; - const BZIP = 2; + public const PLAIN = 0; + public const GZIP = 1; + public const BZIP = 2; private $fileList; private $cachedHeaders; diff --git a/lib/private/Authentication/Token/DefaultToken.php b/lib/private/Authentication/Token/DefaultToken.php index 7ca05849635..9df907dfb4a 100644 --- a/lib/private/Authentication/Token/DefaultToken.php +++ b/lib/private/Authentication/Token/DefaultToken.php @@ -43,7 +43,7 @@ use OCP\AppFramework\Db\Entity; * @method void setVersion(int $version) */ class DefaultToken extends Entity implements INamedToken { - const VERSION = 1; + public const VERSION = 1; /** @var string user UID */ protected $uid; diff --git a/lib/private/Authentication/Token/IToken.php b/lib/private/Authentication/Token/IToken.php index 1f7c736f86b..326e9554b8e 100644 --- a/lib/private/Authentication/Token/IToken.php +++ b/lib/private/Authentication/Token/IToken.php @@ -30,11 +30,11 @@ namespace OC\Authentication\Token; use JsonSerializable; interface IToken extends JsonSerializable { - const TEMPORARY_TOKEN = 0; - const PERMANENT_TOKEN = 1; - const WIPE_TOKEN = 2; - const DO_NOT_REMEMBER = 0; - const REMEMBER = 1; + public const TEMPORARY_TOKEN = 0; + public const PERMANENT_TOKEN = 1; + public const WIPE_TOKEN = 2; + public const DO_NOT_REMEMBER = 0; + public const REMEMBER = 1; /** * Get the token ID diff --git a/lib/private/Authentication/Token/PublicKeyToken.php b/lib/private/Authentication/Token/PublicKeyToken.php index 27eda0b6889..0724eabc70c 100644 --- a/lib/private/Authentication/Token/PublicKeyToken.php +++ b/lib/private/Authentication/Token/PublicKeyToken.php @@ -47,7 +47,7 @@ use OCP\AppFramework\Db\Entity; * @method bool getPasswordInvalid() */ class PublicKeyToken extends Entity implements INamedToken, IWipeableToken { - const VERSION = 2; + public const VERSION = 2; /** @var string user UID */ protected $uid; diff --git a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php index a5ddad47e01..02e6863d1c4 100644 --- a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php +++ b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php @@ -35,7 +35,7 @@ use OCP\IDBConnection; * 2FA providers */ class ProviderUserAssignmentDao { - const TABLE_NAME = 'twofactor_providers'; + public const TABLE_NAME = 'twofactor_providers'; /** @var IDBConnection */ private $conn; diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index ec414e67938..07e61175361 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -46,10 +46,10 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class Manager { - const SESSION_UID_KEY = 'two_factor_auth_uid'; - const SESSION_UID_DONE = 'two_factor_auth_passed'; - const REMEMBER_LOGIN = 'two_factor_remember_login'; - const BACKUP_CODES_PROVIDER_ID = 'backup_codes'; + public const SESSION_UID_KEY = 'two_factor_auth_uid'; + public const SESSION_UID_DONE = 'two_factor_auth_passed'; + public const REMEMBER_LOGIN = 'two_factor_remember_login'; + public const BACKUP_CODES_PROVIDER_ID = 'backup_codes'; /** @var ProviderLoader */ private $providerLoader; diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php index 0754679adf1..40385d737ae 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php @@ -35,7 +35,7 @@ use OCP\Authentication\TwoFactorAuth\IProvider; use OCP\IUser; class ProviderLoader { - const BACKUP_CODES_APP_ID = 'twofactor_backupcodes'; + public const BACKUP_CODES_APP_ID = 'twofactor_backupcodes'; /** @var IAppManager */ private $appManager; diff --git a/lib/private/Config.php b/lib/private/Config.php index 1724222f4bb..d44f713f361 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -42,7 +42,7 @@ namespace OC; * configuration file of Nextcloud. */ class Config { - const ENV_PREFIX = 'NC_'; + public const ENV_PREFIX = 'NC_'; /** @var array Associative array ($key => $value) */ protected $cache = []; diff --git a/lib/private/DB/AdapterOCI8.php b/lib/private/DB/AdapterOCI8.php index 3eb50916aab..33a30b8348d 100644 --- a/lib/private/DB/AdapterOCI8.php +++ b/lib/private/DB/AdapterOCI8.php @@ -37,7 +37,7 @@ class AdapterOCI8 extends Adapter { return $this->conn->realLastInsertId($table); } - const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; + public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; public function fixupStatement($statement) { $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement); diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php index 7457ab9a77d..bc7fa7698ee 100644 --- a/lib/private/DB/AdapterPgSql.php +++ b/lib/private/DB/AdapterPgSql.php @@ -33,7 +33,7 @@ class AdapterPgSql extends Adapter { return $this->conn->fetchColumn('SELECT lastval()'); } - const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)'; + public const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)'; public function fixupStatement($statement) { $statement = str_replace('`', '"', $statement); $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement); diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index fe97048aaac..441e4567dbd 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -41,10 +41,10 @@ use OC\SystemConfig; */ class ConnectionFactory { /** @var string default database name */ - const DEFAULT_DBNAME = 'owncloud'; + public const DEFAULT_DBNAME = 'owncloud'; /** @var string default database table prefix */ - const DEFAULT_DBTABLEPREFIX = 'oc_'; + public const DEFAULT_DBTABLEPREFIX = 'oc_'; /** * @var array diff --git a/lib/private/DB/ReconnectWrapper.php b/lib/private/DB/ReconnectWrapper.php index ebb4c56fc6a..df3a0518e35 100644 --- a/lib/private/DB/ReconnectWrapper.php +++ b/lib/private/DB/ReconnectWrapper.php @@ -28,7 +28,7 @@ use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Driver; class ReconnectWrapper extends \Doctrine\DBAL\Connection { - const CHECK_CONNECTION_INTERVAL = 60; + public const CHECK_CONNECTION_INTERVAL = 60; private $lastConnectionCheck = null; diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index 2030f26f8f5..38cbfbfdd9f 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -36,7 +36,7 @@ use OCP\Encryption\Keys\IStorage; class Storage implements IStorage { // hidden file which indicate that the folder is a valid key storage - const KEY_STORAGE_MARKER = '.oc_key_storage'; + public const KEY_STORAGE_MARKER = '.oc_key_storage'; /** @var View */ private $view; diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index a5414a66796..8b3360c30e0 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -38,11 +38,11 @@ use OCP\IConfig; use OCP\IUser; class Util { - const HEADER_START = 'HBEGIN'; - const HEADER_END = 'HEND'; - const HEADER_PADDING_CHAR = '-'; + public const HEADER_START = 'HBEGIN'; + public const HEADER_END = 'HEND'; + public const HEADER_PADDING_CHAR = '-'; - const HEADER_ENCRYPTION_MODULE_KEY = 'oc_encryption_module'; + public const HEADER_ENCRYPTION_MODULE_KEY = 'oc_encryption_module'; /** * block size will always be 8192 for a PHP stream diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index f1e8aa978f4..eba4178d9bd 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -54,7 +54,7 @@ class QuerySearchHelper { ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'lt' ]; - const TAG_FAVORITE = '_$!!$_'; + public const TAG_FAVORITE = '_$!!$_'; /** @var IMimeTypeLoader */ private $mimetypeLoader; diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 1e9902f8871..d3c4e1afc62 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -92,7 +92,7 @@ class Filesystem { * classname which used for hooks handling * used as signalclass in OC_Hooks::emit() */ - const CLASSNAME = 'OC_Filesystem'; + public const CLASSNAME = 'OC_Filesystem'; /** * signalname emitted before file renaming @@ -100,7 +100,7 @@ class Filesystem { * @param string $oldpath * @param string $newpath */ - const signal_rename = 'rename'; + public const signal_rename = 'rename'; /** * signal emitted after file renaming @@ -108,7 +108,7 @@ class Filesystem { * @param string $oldpath * @param string $newpath */ - const signal_post_rename = 'post_rename'; + public const signal_post_rename = 'post_rename'; /** * signal emitted before file/dir creation @@ -116,7 +116,7 @@ class Filesystem { * @param string $path * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_create = 'create'; + public const signal_create = 'create'; /** * signal emitted after file/dir creation @@ -124,7 +124,7 @@ class Filesystem { * @param string $path * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_post_create = 'post_create'; + public const signal_post_create = 'post_create'; /** * signal emits before file/dir copy @@ -133,7 +133,7 @@ class Filesystem { * @param string $newpath * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_copy = 'copy'; + public const signal_copy = 'copy'; /** * signal emits after file/dir copy @@ -141,7 +141,7 @@ class Filesystem { * @param string $oldpath * @param string $newpath */ - const signal_post_copy = 'post_copy'; + public const signal_post_copy = 'post_copy'; /** * signal emits before file/dir save @@ -149,14 +149,14 @@ class Filesystem { * @param string $path * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_write = 'write'; + public const signal_write = 'write'; /** * signal emits after file/dir save * * @param string $path */ - const signal_post_write = 'post_write'; + public const signal_post_write = 'post_write'; /** * signal emitted before file/dir update @@ -164,7 +164,7 @@ class Filesystem { * @param string $path * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_update = 'update'; + public const signal_update = 'update'; /** * signal emitted after file/dir update @@ -172,38 +172,38 @@ class Filesystem { * @param string $path * @param bool $run changing this flag to false in hook handler will cancel event */ - const signal_post_update = 'post_update'; + public const signal_post_update = 'post_update'; /** * signal emits when reading file/dir * * @param string $path */ - const signal_read = 'read'; + public const signal_read = 'read'; /** * signal emits when removing file/dir * * @param string $path */ - const signal_delete = 'delete'; + public const signal_delete = 'delete'; /** * parameters definitions for signals */ - const signal_param_path = 'path'; - const signal_param_oldpath = 'oldpath'; - const signal_param_newpath = 'newpath'; + public const signal_param_path = 'path'; + public const signal_param_oldpath = 'oldpath'; + public const signal_param_newpath = 'newpath'; /** * run - changing this flag to false in hook handler will cancel event */ - const signal_param_run = 'run'; + public const signal_param_run = 'run'; - const signal_create_mount = 'create_mount'; - const signal_delete_mount = 'delete_mount'; - const signal_param_mount_type = 'mounttype'; - const signal_param_users = 'users'; + public const signal_create_mount = 'create_mount'; + public const signal_delete_mount = 'delete_mount'; + public const signal_param_mount_type = 'mounttype'; + public const signal_param_users = 'users'; /** * @var \OC\Files\Storage\StorageFactory $loader diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index c7d2e691bbd..59446576400 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -56,7 +56,7 @@ class SwiftFactory { private $container = null; private $logger; - const DEFAULT_OPTIONS = [ + public const DEFAULT_OPTIONS = [ 'autocreate' => false, 'urlType' => 'publicURL', 'catalogName' => 'swift', diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php index b949c9103a7..300ba7e7f7c 100644 --- a/lib/private/Files/Storage/Wrapper/Availability.php +++ b/lib/private/Files/Storage/Wrapper/Availability.php @@ -37,7 +37,7 @@ use OCP\IConfig; * Throws a StorageNotAvailableException for storages with known failures */ class Availability extends Wrapper { - const RECHECK_TTL_SEC = 600; // 10 minutes + public const RECHECK_TTL_SEC = 600; // 10 minutes /** @var IConfig */ protected $config; diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index a729da89fb0..996380037b7 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -61,7 +61,7 @@ use OCP\ILogger; * @package OC\Files\Utils */ class Scanner extends PublicEmitter { - const MAX_ENTRIES_TO_COMMIT = 10000; + public const MAX_ENTRIES_TO_COMMIT = 10000; /** @var string $user */ private $user; diff --git a/lib/private/Group/Backend.php b/lib/private/Group/Backend.php index 0f0e2c743e8..ebd8d3620d4 100644 --- a/lib/private/Group/Backend.php +++ b/lib/private/Group/Backend.php @@ -32,7 +32,7 @@ abstract class Backend implements \OCP\GroupInterface { /** * error code for functions not provided by the group backend */ - const NOT_IMPLEMENTED = -501; + public const NOT_IMPLEMENTED = -501; protected $possibleActions = [ self::CREATE_GROUP => 'createGroup', diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index 880dbf6437c..6950a239678 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -35,9 +35,9 @@ use OCP\IGroupManager; use OCP\IUserSession; class MetaData { - const SORT_NONE = 0; - const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends - const SORT_GROUPNAME = 2; + public const SORT_NONE = 0; + public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends + public const SORT_GROUPNAME = 2; /** @var string */ protected $user; diff --git a/lib/private/Http/CookieHelper.php b/lib/private/Http/CookieHelper.php index 7083584bffa..8c20ddb9f65 100644 --- a/lib/private/Http/CookieHelper.php +++ b/lib/private/Http/CookieHelper.php @@ -27,9 +27,9 @@ declare(strict_types=1); namespace OC\Http; class CookieHelper { - const SAMESITE_NONE = 0; - const SAMESITE_LAX = 1; - const SAMESITE_STRICT = 2; + public const SAMESITE_NONE = 0; + public const SAMESITE_LAX = 1; + public const SAMESITE_STRICT = 2; public static function setCookie(string $name, string $value = '', diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index 1084a9e1dd5..af1e3555c32 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -58,7 +58,7 @@ use phpseclib\File\X509; * @package OC\IntegrityCheck */ class Checker { - const CACHE_KEY = 'oc.integritycheck.checker'; + public const CACHE_KEY = 'oc.integritycheck.checker'; /** @var EnvironmentHelper */ private $environmentHelper; /** @var AppLocator */ diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index a1afb1f4f0a..03240f48410 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -72,7 +72,7 @@ class Factory implements IFactory { */ protected $pluralFunctions = []; - const COMMON_LANGUAGE_CODES = [ + public const COMMON_LANGUAGE_CODES = [ 'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko' ]; diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index c24657a5c9c..2a6a6714eb3 100755 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -37,13 +37,13 @@ class LargeFileHelper { * pow(2, 53) as a base-10 string. * @var string */ - const POW_2_53 = '9007199254740992'; + public const POW_2_53 = '9007199254740992'; /** * pow(2, 53) - 1 as a base-10 string. * @var string */ - const POW_2_53_MINUS_1 = '9007199254740991'; + public const POW_2_53_MINUS_1 = '9007199254740991'; /** * @brief Checks whether our assumptions hold on the PHP platform we are on. diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php index 50544d7149c..237d33cfefa 100644 --- a/lib/private/Log/ExceptionSerializer.php +++ b/lib/private/Log/ExceptionSerializer.php @@ -32,7 +32,7 @@ use OC\HintException; use OC\Setup; class ExceptionSerializer { - const methodsWithSensitiveParameters = [ + public const methodsWithSensitiveParameters = [ // Session/User 'completeLogin', 'login', @@ -86,7 +86,7 @@ class ExceptionSerializer { 'update', ]; - const methodsWithSensitiveParametersByClass = [ + public const methodsWithSensitiveParametersByClass = [ SetupController::class => [ 'run', 'display', diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php index 0e6552ba436..52c5af4ef98 100644 --- a/lib/private/Memcache/Factory.php +++ b/lib/private/Memcache/Factory.php @@ -36,7 +36,7 @@ use OCP\ILogger; use OCP\IMemcache; class Factory implements ICacheFactory { - const NULL_CACHE = NullCache::class; + public const NULL_CACHE = NullCache::class; /** * @var string $globalPrefix diff --git a/lib/private/MemoryInfo.php b/lib/private/MemoryInfo.php index 520225fc6d1..0e70b500532 100644 --- a/lib/private/MemoryInfo.php +++ b/lib/private/MemoryInfo.php @@ -30,7 +30,7 @@ namespace OC; * Helper class that covers memory info. */ class MemoryInfo { - const RECOMMENDED_MEMORY_LIMIT = 512 * 1024 * 1024; + public const RECOMMENDED_MEMORY_LIMIT = 512 * 1024 * 1024; /** * Tests if the memory limit is greater or equal the recommended value. diff --git a/lib/private/Remote/User.php b/lib/private/Remote/User.php index 5519d7dc22f..31ded598b7c 100644 --- a/lib/private/Remote/User.php +++ b/lib/private/Remote/User.php @@ -26,7 +26,7 @@ namespace OC\Remote; use OCP\Remote\IUser; class User implements IUser { - const EXPECTED_KEYS = [ + public const EXPECTED_KEYS = [ 'id', 'email', 'displayname', diff --git a/lib/private/Repair/Owncloud/SaveAccountsTableData.php b/lib/private/Repair/Owncloud/SaveAccountsTableData.php index 6dd49e6c9fd..6eccf53c5a8 100644 --- a/lib/private/Repair/Owncloud/SaveAccountsTableData.php +++ b/lib/private/Repair/Owncloud/SaveAccountsTableData.php @@ -35,7 +35,7 @@ use OCP\PreConditionNotMetException; * before the data structure is changed and the information is gone */ class SaveAccountsTableData implements IRepairStep { - const BATCH_SIZE = 75; + public const BATCH_SIZE = 75; /** @var IDBConnection */ protected $db; diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php index becf8ba7594..a0fe246571a 100644 --- a/lib/private/Repair/RepairInvalidShares.php +++ b/lib/private/Repair/RepairInvalidShares.php @@ -32,7 +32,7 @@ use OCP\Migration\IRepairStep; * Repairs shares with invalid data */ class RepairInvalidShares implements IRepairStep { - const CHUNK_SIZE = 200; + public const CHUNK_SIZE = 200; /** @var \OCP\IConfig */ protected $config; diff --git a/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php index c04e0e1b383..d1fead6759f 100644 --- a/lib/private/Security/Bruteforce/Throttler.php +++ b/lib/private/Security/Bruteforce/Throttler.php @@ -48,7 +48,7 @@ use OCP\ILogger; * @package OC\Security\Bruteforce */ class Throttler { - const LOGIN_ACTION = 'login'; + public const LOGIN_ACTION = 'login'; /** @var IDBConnection */ private $db; diff --git a/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php index ab06a807613..770919dacd7 100644 --- a/lib/private/Security/CredentialsManager.php +++ b/lib/private/Security/CredentialsManager.php @@ -33,7 +33,7 @@ use OCP\Security\ICrypto; * @package OC\Security */ class CredentialsManager implements ICredentialsManager { - const DB_TABLE = 'credentials'; + public const DB_TABLE = 'credentials'; /** @var ICrypto */ protected $crypto; diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php index 892c2436040..fc7693b71b2 100644 --- a/lib/private/Session/CryptoSessionData.php +++ b/lib/private/Session/CryptoSessionData.php @@ -50,7 +50,7 @@ class CryptoSessionData implements \ArrayAccess, ISession { protected $sessionValues; /** @var bool */ protected $isModified = false; - const encryptedSessionName = 'encrypted_session_data'; + public const encryptedSessionName = 'encrypted_session_data'; /** * @param ISession $session diff --git a/lib/private/Session/CryptoWrapper.php b/lib/private/Session/CryptoWrapper.php index bb82652a01d..f4d30bee145 100644 --- a/lib/private/Session/CryptoWrapper.php +++ b/lib/private/Session/CryptoWrapper.php @@ -48,7 +48,7 @@ use OCP\Security\ISecureRandom; * @package OC\Session */ class CryptoWrapper { - const COOKIE_NAME = 'oc_sessionPassphrase'; + public const COOKIE_NAME = 'oc_sessionPassphrase'; /** @var IConfig */ protected $config; diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php index d1b47f1dd47..18f6864b6c9 100644 --- a/lib/private/Share/Constants.php +++ b/lib/private/Share/Constants.php @@ -37,50 +37,50 @@ class Constants { /** * @deprecated 17.0.0 - use IShare::TYPE_USER instead */ - const SHARE_TYPE_USER = 0; + public const SHARE_TYPE_USER = 0; /** * @deprecated 17.0.0 - use IShare::TYPE_GROUP instead */ - const SHARE_TYPE_GROUP = 1; + public const SHARE_TYPE_GROUP = 1; // const SHARE_TYPE_USERGROUP = 2; // Internal type used by DefaultShareProvider /** * @deprecated 17.0.0 - use IShare::TYPE_LINK instead */ - const SHARE_TYPE_LINK = 3; + public const SHARE_TYPE_LINK = 3; /** * @deprecated 17.0.0 - use IShare::TYPE_EMAIL instead */ - const SHARE_TYPE_EMAIL = 4; - const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it + public const SHARE_TYPE_EMAIL = 4; + public const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it /** * @deprecated 17.0.0 - use IShare::TYPE_REMOTE instead */ - const SHARE_TYPE_REMOTE = 6; + public const SHARE_TYPE_REMOTE = 6; /** * @deprecated 17.0.0 - use IShare::TYPE_CIRCLE instead */ - const SHARE_TYPE_CIRCLE = 7; + public const SHARE_TYPE_CIRCLE = 7; /** * @deprecated 17.0.0 - use IShare::TYPE_GUEST instead */ - const SHARE_TYPE_GUEST = 8; + public const SHARE_TYPE_GUEST = 8; /** * @deprecated 17.0.0 - use IShare::REMOTE_GROUP instead */ - const SHARE_TYPE_REMOTE_GROUP = 9; + public const SHARE_TYPE_REMOTE_GROUP = 9; /** * @deprecated 17.0.0 - use IShare::TYPE_ROOM instead */ - const SHARE_TYPE_ROOM = 10; + public const SHARE_TYPE_ROOM = 10; // const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider - const FORMAT_NONE = -1; - const FORMAT_STATUSES = -2; - const FORMAT_SOURCES = -3; // ToDo Check if it is still in use otherwise remove it + public const FORMAT_NONE = -1; + public const FORMAT_STATUSES = -2; + public const FORMAT_SOURCES = -3; // ToDo Check if it is still in use otherwise remove it - const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls + public const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls - const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility + public const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility protected static $shareTypeUserAndGroups = -1; protected static $shareTypeGroupUserUnique = 2; diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 41a727593b3..75745a7fe97 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -63,7 +63,7 @@ use OCP\Share\IShareProvider; class DefaultShareProvider implements IShareProvider { // Special share type for user modified group shares - const SHARE_TYPE_USERGROUP = 2; + public const SHARE_TYPE_USERGROUP = 2; /** @var IDBConnection */ private $dbConn; diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php index 2d7b1bc3ae4..a718a007e34 100644 --- a/lib/private/SystemTag/SystemTagManager.php +++ b/lib/private/SystemTag/SystemTagManager.php @@ -44,8 +44,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; * Manager class for system tags */ class SystemTagManager implements ISystemTagManager { - const TAG_TABLE = 'systemtag'; - const TAG_GROUP_TABLE = 'systemtag_group'; + public const TAG_TABLE = 'systemtag'; + public const TAG_GROUP_TABLE = 'systemtag_group'; /** @var IDBConnection */ protected $connection; diff --git a/lib/private/SystemTag/SystemTagObjectMapper.php b/lib/private/SystemTag/SystemTagObjectMapper.php index eb33d2d30bb..c6d6d09b95a 100644 --- a/lib/private/SystemTag/SystemTagObjectMapper.php +++ b/lib/private/SystemTag/SystemTagObjectMapper.php @@ -38,7 +38,7 @@ use OCP\SystemTag\TagNotFoundException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class SystemTagObjectMapper implements ISystemTagObjectMapper { - const RELATION_TABLE = 'systemtag_object_mapping'; + public const RELATION_TABLE = 'systemtag_object_mapping'; /** @var ISystemTagManager */ protected $tagManager; diff --git a/lib/private/Tags.php b/lib/private/Tags.php index a176967bd2b..6d06b3a4829 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -112,8 +112,8 @@ class Tags implements ITags { */ private $backend; - const TAG_TABLE = '*PREFIX*vcategory'; - const RELATION_TABLE = '*PREFIX*vcategory_to_object'; + public const TAG_TABLE = '*PREFIX*vcategory'; + public const RELATION_TABLE = '*PREFIX*vcategory_to_object'; /** * Constructor. diff --git a/lib/private/TempManager.php b/lib/private/TempManager.php index 13735d69d47..8b47193feaa 100644 --- a/lib/private/TempManager.php +++ b/lib/private/TempManager.php @@ -45,7 +45,7 @@ class TempManager implements ITempManager { protected $config; /** Prefix */ - const TMP_PREFIX = 'oc_tmp_'; + public const TMP_PREFIX = 'oc_tmp_'; /** * @param \OCP\ILogger $logger diff --git a/lib/private/Updater/ChangesCheck.php b/lib/private/Updater/ChangesCheck.php index 8700b9609d2..cde7517d3c5 100644 --- a/lib/private/Updater/ChangesCheck.php +++ b/lib/private/Updater/ChangesCheck.php @@ -40,9 +40,9 @@ class ChangesCheck { /** @var ILogger */ private $logger; - const RESPONSE_NO_CONTENT = 0; - const RESPONSE_USE_CACHE = 1; - const RESPONSE_HAS_CONTENT = 2; + public const RESPONSE_NO_CONTENT = 0; + public const RESPONSE_USE_CACHE = 1; + public const RESPONSE_HAS_CONTENT = 2; public function __construct(IClientService $clientService, ChangesMapper $mapper, ILogger $logger) { $this->clientService = $clientService; diff --git a/lib/private/Updater/ChangesMapper.php b/lib/private/Updater/ChangesMapper.php index b79eadbff58..b3b578f61e1 100644 --- a/lib/private/Updater/ChangesMapper.php +++ b/lib/private/Updater/ChangesMapper.php @@ -32,7 +32,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; class ChangesMapper extends QBMapper { - const TABLE_NAME = 'whats_new'; + public const TABLE_NAME = 'whats_new'; public function __construct(IDBConnection $db) { parent::__construct($db, self::TABLE_NAME); diff --git a/lib/private/User/Backend.php b/lib/private/User/Backend.php index 354e1c3fd71..477448279a5 100644 --- a/lib/private/User/Backend.php +++ b/lib/private/User/Backend.php @@ -34,19 +34,19 @@ abstract class Backend implements UserInterface { /** * error code for functions not provided by the user backend */ - const NOT_IMPLEMENTED = -501; + public const NOT_IMPLEMENTED = -501; /** * actions that user backends can define */ - const CREATE_USER = 1; // 1 << 0 - const SET_PASSWORD = 16; // 1 << 4 - const CHECK_PASSWORD = 256; // 1 << 8 - const GET_HOME = 4096; // 1 << 12 - const GET_DISPLAYNAME = 65536; // 1 << 16 - const SET_DISPLAYNAME = 1048576; // 1 << 20 - const PROVIDE_AVATAR = 16777216; // 1 << 24 - const COUNT_USERS = 268435456; // 1 << 28 + public const CREATE_USER = 1; // 1 << 0 + public const SET_PASSWORD = 16; // 1 << 4 + public const CHECK_PASSWORD = 256; // 1 << 8 + public const GET_HOME = 4096; // 1 << 12 + public const GET_DISPLAYNAME = 65536; // 1 << 16 + public const SET_DISPLAYNAME = 1048576; // 1 << 20 + public const PROVIDE_AVATAR = 16777216; // 1 << 24 + public const COUNT_USERS = 268435456; // 1 << 28 protected $possibleActions = [ self::CREATE_USER => 'createUser', diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 7b67dd3eada..2454d6be4f0 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -71,8 +71,8 @@ class OC_App { private static $loadedApps = []; private static $altLogin = []; private static $alreadyRegistered = []; - const supportedApp = 300; - const officialApp = 200; + public const supportedApp = 300; + public const officialApp = 200; /** * clean the appId diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php index e046a577026..ddb824cd6cd 100644 --- a/lib/private/legacy/OC_Files.php +++ b/lib/private/legacy/OC_Files.php @@ -50,11 +50,11 @@ use OCP\Lock\ILockingProvider; * */ class OC_Files { - const FILE = 1; - const ZIP_FILES = 2; - const ZIP_DIR = 3; + public const FILE = 1; + public const ZIP_FILES = 2; + public const ZIP_DIR = 3; - const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB + public const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB private static $multipartBoundary = ''; diff --git a/lib/public/API.php b/lib/public/API.php index ce09a4349a9..e1ccd3d02a1 100644 --- a/lib/public/API.php +++ b/lib/public/API.php @@ -44,8 +44,8 @@ class API { * API Response Codes * @since 8.1.0 */ - const RESPOND_UNAUTHORISED = 997; - const RESPOND_SERVER_ERROR = 996; - const RESPOND_NOT_FOUND = 998; - const RESPOND_UNKNOWN_ERROR = 999; + public const RESPOND_UNAUTHORISED = 997; + public const RESPOND_SERVER_ERROR = 996; + public const RESPOND_NOT_FOUND = 998; + public const RESPOND_UNKNOWN_ERROR = 999; } diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php index 9d02e0b43c0..23af0f8b0b1 100644 --- a/lib/public/Accounts/IAccountManager.php +++ b/lib/public/Accounts/IAccountManager.php @@ -38,23 +38,23 @@ use OCP\IUser; interface IAccountManager { /** nobody can see my account details */ - const VISIBILITY_PRIVATE = 'private'; + public const VISIBILITY_PRIVATE = 'private'; /** only contacts, especially trusted servers can see my contact details */ - const VISIBILITY_CONTACTS_ONLY = 'contacts'; + public const VISIBILITY_CONTACTS_ONLY = 'contacts'; /** every body ca see my contact detail, will be published to the lookup server */ - const VISIBILITY_PUBLIC = 'public'; + public const VISIBILITY_PUBLIC = 'public'; - const PROPERTY_AVATAR = 'avatar'; - const PROPERTY_DISPLAYNAME = 'displayname'; - const PROPERTY_PHONE = 'phone'; - const PROPERTY_EMAIL = 'email'; - const PROPERTY_WEBSITE = 'website'; - const PROPERTY_ADDRESS = 'address'; - const PROPERTY_TWITTER = 'twitter'; + public const PROPERTY_AVATAR = 'avatar'; + public const PROPERTY_DISPLAYNAME = 'displayname'; + public const PROPERTY_PHONE = 'phone'; + public const PROPERTY_EMAIL = 'email'; + public const PROPERTY_WEBSITE = 'website'; + public const PROPERTY_ADDRESS = 'address'; + public const PROPERTY_TWITTER = 'twitter'; - const NOT_VERIFIED = '0'; - const VERIFICATION_IN_PROGRESS = '1'; - const VERIFIED = '2'; + public const NOT_VERIFIED = '0'; + public const VERIFICATION_IN_PROGRESS = '1'; + public const VERIFIED = '2'; /** * Get the account data for a given user diff --git a/lib/public/Activity/IExtension.php b/lib/public/Activity/IExtension.php index c470ef07e04..5ba09507cbf 100644 --- a/lib/public/Activity/IExtension.php +++ b/lib/public/Activity/IExtension.php @@ -32,12 +32,12 @@ namespace OCP\Activity; * @since 8.0.0 */ interface IExtension { - const METHOD_STREAM = 'stream'; - const METHOD_MAIL = 'email'; + public const METHOD_STREAM = 'stream'; + public const METHOD_MAIL = 'email'; - const PRIORITY_VERYLOW = 10; - const PRIORITY_LOW = 20; - const PRIORITY_MEDIUM = 30; - const PRIORITY_HIGH = 40; - const PRIORITY_VERYHIGH = 50; + public const PRIORITY_VERYLOW = 10; + public const PRIORITY_LOW = 20; + public const PRIORITY_MEDIUM = 30; + public const PRIORITY_HIGH = 40; + public const PRIORITY_VERYHIGH = 50; } diff --git a/lib/public/App/ManagerEvent.php b/lib/public/App/ManagerEvent.php index e98ada424c6..b44cd3a5dcc 100644 --- a/lib/public/App/ManagerEvent.php +++ b/lib/public/App/ManagerEvent.php @@ -32,14 +32,14 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class ManagerEvent extends Event { - const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp'; - const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups'; - const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp'; + public const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp'; + public const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups'; + public const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp'; /** * @since 9.1.0 */ - const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp'; + public const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp'; /** @var string */ protected $event; diff --git a/lib/public/AppFramework/Http.php b/lib/public/AppFramework/Http.php index e0b910325a0..1106c58af85 100644 --- a/lib/public/AppFramework/Http.php +++ b/lib/public/AppFramework/Http.php @@ -34,63 +34,63 @@ namespace OCP\AppFramework; * @since 6.0.0 */ class Http { - const STATUS_CONTINUE = 100; - const STATUS_SWITCHING_PROTOCOLS = 101; - const STATUS_PROCESSING = 102; - const STATUS_OK = 200; - const STATUS_CREATED = 201; - const STATUS_ACCEPTED = 202; - const STATUS_NON_AUTHORATIVE_INFORMATION = 203; - const STATUS_NO_CONTENT = 204; - const STATUS_RESET_CONTENT = 205; - const STATUS_PARTIAL_CONTENT = 206; - const STATUS_MULTI_STATUS = 207; - const STATUS_ALREADY_REPORTED = 208; - const STATUS_IM_USED = 226; - const STATUS_MULTIPLE_CHOICES = 300; - const STATUS_MOVED_PERMANENTLY = 301; - const STATUS_FOUND = 302; - const STATUS_SEE_OTHER = 303; - const STATUS_NOT_MODIFIED = 304; - const STATUS_USE_PROXY = 305; - const STATUS_RESERVED = 306; - const STATUS_TEMPORARY_REDIRECT = 307; - const STATUS_BAD_REQUEST = 400; - const STATUS_UNAUTHORIZED = 401; - const STATUS_PAYMENT_REQUIRED = 402; - const STATUS_FORBIDDEN = 403; - const STATUS_NOT_FOUND = 404; - const STATUS_METHOD_NOT_ALLOWED = 405; - const STATUS_NOT_ACCEPTABLE = 406; - const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407; - const STATUS_REQUEST_TIMEOUT = 408; - const STATUS_CONFLICT = 409; - const STATUS_GONE = 410; - const STATUS_LENGTH_REQUIRED = 411; - const STATUS_PRECONDITION_FAILED = 412; - const STATUS_REQUEST_ENTITY_TOO_LARGE = 413; - const STATUS_REQUEST_URI_TOO_LONG = 414; - const STATUS_UNSUPPORTED_MEDIA_TYPE = 415; - const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416; - const STATUS_EXPECTATION_FAILED = 417; - const STATUS_IM_A_TEAPOT = 418; - const STATUS_UNPROCESSABLE_ENTITY = 422; - const STATUS_LOCKED = 423; - const STATUS_FAILED_DEPENDENCY = 424; - const STATUS_UPGRADE_REQUIRED = 426; - const STATUS_PRECONDITION_REQUIRED = 428; - const STATUS_TOO_MANY_REQUESTS = 429; - const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; - const STATUS_INTERNAL_SERVER_ERROR = 500; - const STATUS_NOT_IMPLEMENTED = 501; - const STATUS_BAD_GATEWAY = 502; - const STATUS_SERVICE_UNAVAILABLE = 503; - const STATUS_GATEWAY_TIMEOUT = 504; - const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505; - const STATUS_VARIANT_ALSO_NEGOTIATES = 506; - const STATUS_INSUFFICIENT_STORAGE = 507; - const STATUS_LOOP_DETECTED = 508; - const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509; - const STATUS_NOT_EXTENDED = 510; - const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511; + public const STATUS_CONTINUE = 100; + public const STATUS_SWITCHING_PROTOCOLS = 101; + public const STATUS_PROCESSING = 102; + public const STATUS_OK = 200; + public const STATUS_CREATED = 201; + public const STATUS_ACCEPTED = 202; + public const STATUS_NON_AUTHORATIVE_INFORMATION = 203; + public const STATUS_NO_CONTENT = 204; + public const STATUS_RESET_CONTENT = 205; + public const STATUS_PARTIAL_CONTENT = 206; + public const STATUS_MULTI_STATUS = 207; + public const STATUS_ALREADY_REPORTED = 208; + public const STATUS_IM_USED = 226; + public const STATUS_MULTIPLE_CHOICES = 300; + public const STATUS_MOVED_PERMANENTLY = 301; + public const STATUS_FOUND = 302; + public const STATUS_SEE_OTHER = 303; + public const STATUS_NOT_MODIFIED = 304; + public const STATUS_USE_PROXY = 305; + public const STATUS_RESERVED = 306; + public const STATUS_TEMPORARY_REDIRECT = 307; + public const STATUS_BAD_REQUEST = 400; + public const STATUS_UNAUTHORIZED = 401; + public const STATUS_PAYMENT_REQUIRED = 402; + public const STATUS_FORBIDDEN = 403; + public const STATUS_NOT_FOUND = 404; + public const STATUS_METHOD_NOT_ALLOWED = 405; + public const STATUS_NOT_ACCEPTABLE = 406; + public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407; + public const STATUS_REQUEST_TIMEOUT = 408; + public const STATUS_CONFLICT = 409; + public const STATUS_GONE = 410; + public const STATUS_LENGTH_REQUIRED = 411; + public const STATUS_PRECONDITION_FAILED = 412; + public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413; + public const STATUS_REQUEST_URI_TOO_LONG = 414; + public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415; + public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416; + public const STATUS_EXPECTATION_FAILED = 417; + public const STATUS_IM_A_TEAPOT = 418; + public const STATUS_UNPROCESSABLE_ENTITY = 422; + public const STATUS_LOCKED = 423; + public const STATUS_FAILED_DEPENDENCY = 424; + public const STATUS_UPGRADE_REQUIRED = 426; + public const STATUS_PRECONDITION_REQUIRED = 428; + public const STATUS_TOO_MANY_REQUESTS = 429; + public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; + public const STATUS_INTERNAL_SERVER_ERROR = 500; + public const STATUS_NOT_IMPLEMENTED = 501; + public const STATUS_BAD_GATEWAY = 502; + public const STATUS_SERVICE_UNAVAILABLE = 503; + public const STATUS_GATEWAY_TIMEOUT = 504; + public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505; + public const STATUS_VARIANT_ALSO_NEGOTIATES = 506; + public const STATUS_INSUFFICIENT_STORAGE = 507; + public const STATUS_LOOP_DETECTED = 508; + public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509; + public const STATUS_NOT_EXTENDED = 510; + public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511; } diff --git a/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php index 283189a774a..d6c4006433c 100644 --- a/lib/public/AppFramework/Http/TemplateResponse.php +++ b/lib/public/AppFramework/Http/TemplateResponse.php @@ -38,8 +38,8 @@ namespace OCP\AppFramework\Http; * @since 6.0.0 */ class TemplateResponse extends Response { - const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts'; - const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn'; + public const EVENT_LOAD_ADDITIONAL_SCRIPTS = self::class . '::loadAdditionalScripts'; + public const EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN = self::class . '::loadAdditionalScriptsLoggedIn'; /** * name of the template diff --git a/lib/public/Authentication/TwoFactorAuth/IProvider.php b/lib/public/Authentication/TwoFactorAuth/IProvider.php index 4de49340b7d..d2f5df2e3eb 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvider.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvider.php @@ -37,8 +37,8 @@ interface IProvider { /** * @since 14.0.0 */ - const EVENT_SUCCESS = self::class . '::success'; - const EVENT_FAILED = self::class . '::failed'; + public const EVENT_SUCCESS = self::class . '::success'; + public const EVENT_FAILED = self::class . '::failed'; /** * Get unique identifier of this 2FA provider diff --git a/lib/public/Authentication/TwoFactorAuth/IRegistry.php b/lib/public/Authentication/TwoFactorAuth/IRegistry.php index 77aad28620b..c98feee2545 100644 --- a/lib/public/Authentication/TwoFactorAuth/IRegistry.php +++ b/lib/public/Authentication/TwoFactorAuth/IRegistry.php @@ -39,8 +39,8 @@ use OCP\IUser; * @since 14.0.0 */ interface IRegistry { - const EVENT_PROVIDER_ENABLED = self::class . '::enable'; - const EVENT_PROVIDER_DISABLED = self::class . '::disable'; + public const EVENT_PROVIDER_ENABLED = self::class . '::enable'; + public const EVENT_PROVIDER_DISABLED = self::class . '::disable'; /** * Get a key-value map of providers and their enabled/disabled state for diff --git a/lib/public/Comments/CommentsEntityEvent.php b/lib/public/Comments/CommentsEntityEvent.php index 53ccd87f08d..9644c9119a6 100644 --- a/lib/public/Comments/CommentsEntityEvent.php +++ b/lib/public/Comments/CommentsEntityEvent.php @@ -32,7 +32,7 @@ use OCP\EventDispatcher\Event; * @since 9.1.0 */ class CommentsEntityEvent extends Event { - const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity'; + public const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity'; /** @var string */ protected $event; diff --git a/lib/public/Comments/CommentsEvent.php b/lib/public/Comments/CommentsEvent.php index b2116eb51ec..313df7e2ff7 100644 --- a/lib/public/Comments/CommentsEvent.php +++ b/lib/public/Comments/CommentsEvent.php @@ -32,10 +32,10 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class CommentsEvent extends Event { - const EVENT_ADD = 'OCP\Comments\ICommentsManager::addComment'; - const EVENT_PRE_UPDATE = 'OCP\Comments\ICommentsManager::preUpdateComment'; - const EVENT_UPDATE = 'OCP\Comments\ICommentsManager::updateComment'; - const EVENT_DELETE = 'OCP\Comments\ICommentsManager::deleteComment'; + public const EVENT_ADD = 'OCP\Comments\ICommentsManager::addComment'; + public const EVENT_PRE_UPDATE = 'OCP\Comments\ICommentsManager::preUpdateComment'; + public const EVENT_UPDATE = 'OCP\Comments\ICommentsManager::updateComment'; + public const EVENT_DELETE = 'OCP\Comments\ICommentsManager::deleteComment'; /** @var string */ protected $event; diff --git a/lib/public/Comments/IComment.php b/lib/public/Comments/IComment.php index 604aaefd890..fdf789b6637 100644 --- a/lib/public/Comments/IComment.php +++ b/lib/public/Comments/IComment.php @@ -34,7 +34,7 @@ namespace OCP\Comments; * @since 9.0.0 */ interface IComment { - const MAX_MESSAGE_LENGTH = 1000; + public const MAX_MESSAGE_LENGTH = 1000; /** * returns the ID of the comment diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index bb3a6fe255c..c49426422e3 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -48,7 +48,7 @@ interface ICommentsManager { * * User interfaces shall show "Deleted user" as display name, if needed. */ - const DELETED_USER = 'deleted_users'; + public const DELETED_USER = 'deleted_users'; /** * returns a comment instance diff --git a/lib/public/Console/ConsoleEvent.php b/lib/public/Console/ConsoleEvent.php index 0c3fa25f54f..78f7ae55814 100644 --- a/lib/public/Console/ConsoleEvent.php +++ b/lib/public/Console/ConsoleEvent.php @@ -32,7 +32,7 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class ConsoleEvent extends Event { - const EVENT_RUN = 'OC\Console\Application::run'; + public const EVENT_RUN = 'OC\Console\Application::run'; /** @var string */ protected $event; diff --git a/lib/public/Constants.php b/lib/public/Constants.php index 7c23745b935..b7165768733 100644 --- a/lib/public/Constants.php +++ b/lib/public/Constants.php @@ -40,16 +40,16 @@ class Constants { * CRUDS permissions. * @since 8.0.0 */ - const PERMISSION_CREATE = 4; - const PERMISSION_READ = 1; - const PERMISSION_UPDATE = 2; - const PERMISSION_DELETE = 8; - const PERMISSION_SHARE = 16; - const PERMISSION_ALL = 31; + public const PERMISSION_CREATE = 4; + public const PERMISSION_READ = 1; + public const PERMISSION_UPDATE = 2; + public const PERMISSION_DELETE = 8; + public const PERMISSION_SHARE = 16; + public const PERMISSION_ALL = 31; /** * @since 8.0.0 - Updated in 9.0.0 to allow all POSIX chars since we no * longer support windows as server platform. */ - const FILENAME_INVALID_CHARS = "\\/"; + public const FILENAME_INVALID_CHARS = "\\/"; } diff --git a/lib/public/DB/QueryBuilder/IExpressionBuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php index 5f17585a131..9501aabe53a 100644 --- a/lib/public/DB/QueryBuilder/IExpressionBuilder.php +++ b/lib/public/DB/QueryBuilder/IExpressionBuilder.php @@ -35,27 +35,27 @@ interface IExpressionBuilder { /** * @since 9.0.0 */ - const EQ = ExpressionBuilder::EQ; + public const EQ = ExpressionBuilder::EQ; /** * @since 9.0.0 */ - const NEQ = ExpressionBuilder::NEQ; + public const NEQ = ExpressionBuilder::NEQ; /** * @since 9.0.0 */ - const LT = ExpressionBuilder::LT; + public const LT = ExpressionBuilder::LT; /** * @since 9.0.0 */ - const LTE = ExpressionBuilder::LTE; + public const LTE = ExpressionBuilder::LTE; /** * @since 9.0.0 */ - const GT = ExpressionBuilder::GT; + public const GT = ExpressionBuilder::GT; /** * @since 9.0.0 */ - const GTE = ExpressionBuilder::GTE; + public const GTE = ExpressionBuilder::GTE; /** * Creates a conjunction of the given boolean expressions. diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index d65872388f9..bb0ed6b205c 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -37,36 +37,36 @@ interface IQueryBuilder { /** * @since 9.0.0 */ - const PARAM_NULL = \PDO::PARAM_NULL; + public const PARAM_NULL = \PDO::PARAM_NULL; /** * @since 9.0.0 */ - const PARAM_BOOL = \PDO::PARAM_BOOL; + public const PARAM_BOOL = \PDO::PARAM_BOOL; /** * @since 9.0.0 */ - const PARAM_INT = \PDO::PARAM_INT; + public const PARAM_INT = \PDO::PARAM_INT; /** * @since 9.0.0 */ - const PARAM_STR = \PDO::PARAM_STR; + public const PARAM_STR = \PDO::PARAM_STR; /** * @since 9.0.0 */ - const PARAM_LOB = \PDO::PARAM_LOB; + public const PARAM_LOB = \PDO::PARAM_LOB; /** * @since 9.0.0 */ - const PARAM_DATE = 'datetime'; + public const PARAM_DATE = 'datetime'; /** * @since 9.0.0 */ - const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY; + public const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY; /** * @since 9.0.0 */ - const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY; + public const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY; /** diff --git a/lib/public/Dashboard/Model/WidgetSetting.php b/lib/public/Dashboard/Model/WidgetSetting.php index 27daa76cbdf..f3586b46faf 100644 --- a/lib/public/Dashboard/Model/WidgetSetting.php +++ b/lib/public/Dashboard/Model/WidgetSetting.php @@ -48,8 +48,8 @@ use JsonSerializable; * @package OCP\Dashboard\Model */ final class WidgetSetting implements JsonSerializable { - const TYPE_INPUT = 'input'; - const TYPE_CHECKBOX = 'checkbox'; + public const TYPE_INPUT = 'input'; + public const TYPE_CHECKBOX = 'checkbox'; /** @var string */ diff --git a/lib/public/Dashboard/Model/WidgetSetup.php b/lib/public/Dashboard/Model/WidgetSetup.php index 8a502b09e58..5440b0cc93a 100644 --- a/lib/public/Dashboard/Model/WidgetSetup.php +++ b/lib/public/Dashboard/Model/WidgetSetup.php @@ -41,9 +41,9 @@ use JsonSerializable; * @package OCP\Dashboard\Model */ final class WidgetSetup implements JsonSerializable { - const SIZE_TYPE_MIN = 'min'; - const SIZE_TYPE_MAX = 'max'; - const SIZE_TYPE_DEFAULT = 'default'; + public const SIZE_TYPE_MIN = 'min'; + public const SIZE_TYPE_MAX = 'max'; + public const SIZE_TYPE_DEFAULT = 'default'; /** @var array */ diff --git a/lib/public/Files/Cache/ICache.php b/lib/public/Files/Cache/ICache.php index d1388f02b1d..643a2bad628 100644 --- a/lib/public/Files/Cache/ICache.php +++ b/lib/public/Files/Cache/ICache.php @@ -37,10 +37,10 @@ use OCP\Files\Search\ISearchQuery; * @since 9.0.0 */ interface ICache { - const NOT_FOUND = 0; - const PARTIAL = 1; //only partial data available, file not cached in the database - const SHALLOW = 2; //folder in cache, but not all child files are completely scanned - const COMPLETE = 3; + public const NOT_FOUND = 0; + public const PARTIAL = 1; //only partial data available, file not cached in the database + public const SHALLOW = 2; //folder in cache, but not all child files are completely scanned + public const COMPLETE = 3; /** * Get the numeric storage id for this cache's storage diff --git a/lib/public/Files/Cache/ICacheEntry.php b/lib/public/Files/Cache/ICacheEntry.php index 369c8b69fc1..c9766620885 100644 --- a/lib/public/Files/Cache/ICacheEntry.php +++ b/lib/public/Files/Cache/ICacheEntry.php @@ -28,7 +28,7 @@ namespace OCP\Files\Cache; * @since 9.0.0 */ interface ICacheEntry { - const DIRECTORY_MIMETYPE = 'httpd/unix-directory'; + public const DIRECTORY_MIMETYPE = 'httpd/unix-directory'; /** * Get the numeric id of a file diff --git a/lib/public/Files/Cache/IScanner.php b/lib/public/Files/Cache/IScanner.php index e12561eb0c5..c15d42315bf 100644 --- a/lib/public/Files/Cache/IScanner.php +++ b/lib/public/Files/Cache/IScanner.php @@ -28,13 +28,13 @@ namespace OCP\Files\Cache; * @since 9.0.0 */ interface IScanner { - const SCAN_RECURSIVE_INCOMPLETE = 2; // only recursive into not fully scanned folders - const SCAN_RECURSIVE = true; - const SCAN_SHALLOW = false; + public const SCAN_RECURSIVE_INCOMPLETE = 2; // only recursive into not fully scanned folders + public const SCAN_RECURSIVE = true; + public const SCAN_SHALLOW = false; - const REUSE_NONE = 0; - const REUSE_ETAG = 1; - const REUSE_SIZE = 2; + public const REUSE_NONE = 0; + public const REUSE_ETAG = 1; + public const REUSE_SIZE = 2; /** * scan a single file and store it in the cache diff --git a/lib/public/Files/Cache/IWatcher.php b/lib/public/Files/Cache/IWatcher.php index 0c8065828e7..e279c8b07e0 100644 --- a/lib/public/Files/Cache/IWatcher.php +++ b/lib/public/Files/Cache/IWatcher.php @@ -28,9 +28,9 @@ namespace OCP\Files\Cache; * @since 9.0.0 */ interface IWatcher { - const CHECK_NEVER = 0; // never check the underlying filesystem for updates - const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file - const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates + public const CHECK_NEVER = 0; // never check the underlying filesystem for updates + public const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file + public const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates /** * @param int $policy either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php index f7a36e0542d..f8b0623c3e4 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -38,38 +38,38 @@ interface FileInfo { /** * @since 7.0.0 */ - const TYPE_FILE = 'file'; + public const TYPE_FILE = 'file'; /** * @since 7.0.0 */ - const TYPE_FOLDER = 'dir'; + public const TYPE_FOLDER = 'dir'; /** * @const \OCP\Files\FileInfo::SPACE_NOT_COMPUTED Return value for a not computed space value * @since 8.0.0 */ - const SPACE_NOT_COMPUTED = -1; + public const SPACE_NOT_COMPUTED = -1; /** * @const \OCP\Files\FileInfo::SPACE_UNKNOWN Return value for unknown space value * @since 8.0.0 */ - const SPACE_UNKNOWN = -2; + public const SPACE_UNKNOWN = -2; /** * @const \OCP\Files\FileInfo::SPACE_UNLIMITED Return value for unlimited space * @since 8.0.0 */ - const SPACE_UNLIMITED = -3; + public const SPACE_UNLIMITED = -3; /** * @since 9.1.0 */ - const MIMETYPE_FOLDER = 'httpd/unix-directory'; + public const MIMETYPE_FOLDER = 'httpd/unix-directory'; /** * @const \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX Return regular expression to test filenames against (blacklisting) * @since 12.0.0 */ - const BLACKLIST_FILES_REGEX = '\.(part|filepart)$'; + public const BLACKLIST_FILES_REGEX = '\.(part|filepart)$'; /** * Get the Etag of the file or folder diff --git a/lib/public/Files/Notify/IChange.php b/lib/public/Files/Notify/IChange.php index 762030c738a..b018be77932 100644 --- a/lib/public/Files/Notify/IChange.php +++ b/lib/public/Files/Notify/IChange.php @@ -29,10 +29,10 @@ namespace OCP\Files\Notify; * @since 12.0.0 */ interface IChange { - const ADDED = 1; - const REMOVED = 2; - const MODIFIED = 3; - const RENAMED = 4; + public const ADDED = 1; + public const REMOVED = 2; + public const MODIFIED = 3; + public const RENAMED = 4; /** * Get the type of the change diff --git a/lib/public/Files/Search/ISearchBinaryOperator.php b/lib/public/Files/Search/ISearchBinaryOperator.php index a089323c9fc..554108aadf2 100644 --- a/lib/public/Files/Search/ISearchBinaryOperator.php +++ b/lib/public/Files/Search/ISearchBinaryOperator.php @@ -27,9 +27,9 @@ namespace OCP\Files\Search; * @since 12.0.0 */ interface ISearchBinaryOperator extends ISearchOperator { - const OPERATOR_AND = 'and'; - const OPERATOR_OR = 'or'; - const OPERATOR_NOT = 'not'; + public const OPERATOR_AND = 'and'; + public const OPERATOR_OR = 'or'; + public const OPERATOR_NOT = 'not'; /** * The type of binary operator diff --git a/lib/public/Files/Search/ISearchComparison.php b/lib/public/Files/Search/ISearchComparison.php index 6cfbb29ee54..e2e0a705183 100644 --- a/lib/public/Files/Search/ISearchComparison.php +++ b/lib/public/Files/Search/ISearchComparison.php @@ -27,12 +27,12 @@ namespace OCP\Files\Search; * @since 12.0.0 */ interface ISearchComparison extends ISearchOperator { - const COMPARE_EQUAL = 'eq'; - const COMPARE_GREATER_THAN = 'gt'; - const COMPARE_GREATER_THAN_EQUAL = 'gte'; - const COMPARE_LESS_THAN = 'lt'; - const COMPARE_LESS_THAN_EQUAL = 'lte'; - const COMPARE_LIKE = 'like'; + public const COMPARE_EQUAL = 'eq'; + public const COMPARE_GREATER_THAN = 'gt'; + public const COMPARE_GREATER_THAN_EQUAL = 'gte'; + public const COMPARE_LESS_THAN = 'lt'; + public const COMPARE_LESS_THAN_EQUAL = 'lte'; + public const COMPARE_LIKE = 'like'; /** * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants diff --git a/lib/public/Files/Search/ISearchOrder.php b/lib/public/Files/Search/ISearchOrder.php index 817c7e3b5b4..fdcd53447f5 100644 --- a/lib/public/Files/Search/ISearchOrder.php +++ b/lib/public/Files/Search/ISearchOrder.php @@ -27,8 +27,8 @@ namespace OCP\Files\Search; * @since 12.0.0 */ interface ISearchOrder { - const DIRECTION_ASCENDING = 'asc'; - const DIRECTION_DESCENDING = 'desc'; + public const DIRECTION_ASCENDING = 'asc'; + public const DIRECTION_DESCENDING = 'desc'; /** * The direction to sort in, either ISearchOrder::DIRECTION_ASCENDING or ISearchOrder::DIRECTION_DESCENDING diff --git a/lib/public/Files/Storage/INotifyStorage.php b/lib/public/Files/Storage/INotifyStorage.php index 60893c2f636..f460201becb 100644 --- a/lib/public/Files/Storage/INotifyStorage.php +++ b/lib/public/Files/Storage/INotifyStorage.php @@ -31,10 +31,10 @@ use OCP\Files\Notify\INotifyHandler; * @since 9.1.0 */ interface INotifyStorage { - const NOTIFY_ADDED = 1; - const NOTIFY_REMOVED = 2; - const NOTIFY_MODIFIED = 3; - const NOTIFY_RENAMED = 4; + public const NOTIFY_ADDED = 1; + public const NOTIFY_REMOVED = 2; + public const NOTIFY_MODIFIED = 3; + public const NOTIFY_RENAMED = 4; /** * Start listening for update notifications diff --git a/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php index 1a0465bda13..c0592cfc5af 100644 --- a/lib/public/Files/StorageNotAvailableException.php +++ b/lib/public/Files/StorageNotAvailableException.php @@ -44,13 +44,13 @@ use OC\HintException; * @since 6.0.0 - since 8.2.1 based on HintException */ class StorageNotAvailableException extends HintException { - const STATUS_SUCCESS = 0; - const STATUS_ERROR = 1; - const STATUS_INDETERMINATE = 2; - const STATUS_INCOMPLETE_CONF = 3; - const STATUS_UNAUTHORIZED = 4; - const STATUS_TIMEOUT = 5; - const STATUS_NETWORK_ERROR = 6; + public const STATUS_SUCCESS = 0; + public const STATUS_ERROR = 1; + public const STATUS_INDETERMINATE = 2; + public const STATUS_INCOMPLETE_CONF = 3; + public const STATUS_UNAUTHORIZED = 4; + public const STATUS_TIMEOUT = 5; + public const STATUS_NETWORK_ERROR = 6; /** * StorageNotAvailableException constructor. diff --git a/lib/public/FullTextSearch/Model/IIndex.php b/lib/public/FullTextSearch/Model/IIndex.php index fb279336c55..8272d7e78eb 100644 --- a/lib/public/FullTextSearch/Model/IIndex.php +++ b/lib/public/FullTextSearch/Model/IIndex.php @@ -45,25 +45,25 @@ namespace OCP\FullTextSearch\Model; * @package OCP\FullTextSearch\Model */ interface IIndex { - const INDEX_OK = 1; - const INDEX_IGNORE = 2; - - const INDEX_META = 4; - const INDEX_CONTENT = 8; - const INDEX_PARTS = 16; - const INDEX_FULL = 28; - const INDEX_REMOVE = 32; - const INDEX_DONE = 64; - const INDEX_FAILED = 128; - - const ERROR_FAILED = 1; - const ERROR_FAILED2 = 2; - const ERROR_FAILED3 = 4; - - const ERROR_SEV_1 = 1; - const ERROR_SEV_2 = 2; - const ERROR_SEV_3 = 3; - const ERROR_SEV_4 = 4; + public const INDEX_OK = 1; + public const INDEX_IGNORE = 2; + + public const INDEX_META = 4; + public const INDEX_CONTENT = 8; + public const INDEX_PARTS = 16; + public const INDEX_FULL = 28; + public const INDEX_REMOVE = 32; + public const INDEX_DONE = 64; + public const INDEX_FAILED = 128; + + public const ERROR_FAILED = 1; + public const ERROR_FAILED2 = 2; + public const ERROR_FAILED3 = 4; + + public const ERROR_SEV_1 = 1; + public const ERROR_SEV_2 = 2; + public const ERROR_SEV_3 = 3; + public const ERROR_SEV_4 = 4; /** diff --git a/lib/public/FullTextSearch/Model/IIndexDocument.php b/lib/public/FullTextSearch/Model/IIndexDocument.php index c7af11d7472..1858e5dc97c 100644 --- a/lib/public/FullTextSearch/Model/IIndexDocument.php +++ b/lib/public/FullTextSearch/Model/IIndexDocument.php @@ -43,8 +43,8 @@ namespace OCP\FullTextSearch\Model; * @package OC\FullTextSearch\Model */ interface IIndexDocument { - const NOT_ENCODED = 0; - const ENCODED_BASE64 = 1; + public const NOT_ENCODED = 0; + public const ENCODED_BASE64 = 1; diff --git a/lib/public/FullTextSearch/Model/IRunner.php b/lib/public/FullTextSearch/Model/IRunner.php index 230e9932c46..3692400d1dc 100644 --- a/lib/public/FullTextSearch/Model/IRunner.php +++ b/lib/public/FullTextSearch/Model/IRunner.php @@ -41,9 +41,9 @@ namespace OCP\FullTextSearch\Model; * @package OCP\FullTextSearch\Model */ interface IRunner { - const RESULT_TYPE_SUCCESS = 1; - const RESULT_TYPE_WARNING = 4; - const RESULT_TYPE_FAIL = 9; + public const RESULT_TYPE_SUCCESS = 1; + public const RESULT_TYPE_WARNING = 4; + public const RESULT_TYPE_FAIL = 9; /** diff --git a/lib/public/FullTextSearch/Model/ISearchOption.php b/lib/public/FullTextSearch/Model/ISearchOption.php index 7d57f9eb3f9..8e902296ff6 100644 --- a/lib/public/FullTextSearch/Model/ISearchOption.php +++ b/lib/public/FullTextSearch/Model/ISearchOption.php @@ -39,17 +39,17 @@ interface ISearchOption { /** * @since 16.0.0 */ - const CHECKBOX = 'checkbox'; + public const CHECKBOX = 'checkbox'; /** * @since 16.0.0 */ - const INPUT = 'input'; + public const INPUT = 'input'; /** * @since 16.0.0 */ - const INPUT_SMALL = 'small'; + public const INPUT_SMALL = 'small'; /** diff --git a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php index f9ddde86a0d..e0868c260c2 100644 --- a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php +++ b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php @@ -39,17 +39,17 @@ namespace OCP\FullTextSearch\Model; * @package OCP\FullTextSearch\Model */ interface ISearchRequestSimpleQuery { - const COMPARE_TYPE_TEXT = 1; - const COMPARE_TYPE_KEYWORD = 2; - const COMPARE_TYPE_INT_EQ = 3; - const COMPARE_TYPE_INT_GTE = 4; - const COMPARE_TYPE_INT_GT = 5; - const COMPARE_TYPE_INT_LTE = 6; - const COMPARE_TYPE_INT_LT = 7; - const COMPARE_TYPE_BOOL = 8; - const COMPARE_TYPE_ARRAY = 9; - const COMPARE_TYPE_REGEX = 10; - const COMPARE_TYPE_WILDCARD = 11; + public const COMPARE_TYPE_TEXT = 1; + public const COMPARE_TYPE_KEYWORD = 2; + public const COMPARE_TYPE_INT_EQ = 3; + public const COMPARE_TYPE_INT_GTE = 4; + public const COMPARE_TYPE_INT_GT = 5; + public const COMPARE_TYPE_INT_LTE = 6; + public const COMPARE_TYPE_INT_LT = 7; + public const COMPARE_TYPE_BOOL = 8; + public const COMPARE_TYPE_ARRAY = 9; + public const COMPARE_TYPE_REGEX = 10; + public const COMPARE_TYPE_WILDCARD = 11; /** diff --git a/lib/public/GroupInterface.php b/lib/public/GroupInterface.php index 8960a791b83..c01b53fcd97 100644 --- a/lib/public/GroupInterface.php +++ b/lib/public/GroupInterface.php @@ -47,18 +47,18 @@ interface GroupInterface { /** * actions that user backends can define */ - const CREATE_GROUP = 0x00000001; - const DELETE_GROUP = 0x00000010; - const ADD_TO_GROUP = 0x00000100; - const REMOVE_FROM_GOUP = 0x00001000; // oops - const REMOVE_FROM_GROUP = 0x00001000; + public const CREATE_GROUP = 0x00000001; + public const DELETE_GROUP = 0x00000010; + public const ADD_TO_GROUP = 0x00000100; + public const REMOVE_FROM_GOUP = 0x00001000; // oops + public const REMOVE_FROM_GROUP = 0x00001000; //OBSOLETE const GET_DISPLAYNAME = 0x00010000; - const COUNT_USERS = 0x00100000; - const GROUP_DETAILS = 0x01000000; + public const COUNT_USERS = 0x00100000; + public const GROUP_DETAILS = 0x01000000; /** * @since 13.0.0 */ - const IS_ADMIN = 0x10000000; + public const IS_ADMIN = 0x10000000; /** * Check if backend implements actions diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php index a46dff322c5..780d32d22dd 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -46,7 +46,7 @@ interface IConfig { /** * @since 8.2.0 */ - const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***'; + public const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***'; /** * Sets and deletes system wide values diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index a8822ad7e5c..5e5543f10cf 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -49,10 +49,10 @@ use OCP\DB\QueryBuilder\IQueryBuilder; * @since 6.0.0 */ interface IDBConnection { - const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES'; - const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES'; - const ADD_MISSING_COLUMNS_EVENT = self::class . '::ADD_MISSING_COLUMNS'; - const CHECK_MISSING_COLUMNS_EVENT = self::class . '::CHECK_MISSING_COLUMNS'; + public const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES'; + public const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES'; + public const ADD_MISSING_COLUMNS_EVENT = self::class . '::ADD_MISSING_COLUMNS'; + public const CHECK_MISSING_COLUMNS_EVENT = self::class . '::CHECK_MISSING_COLUMNS'; /** * Gets the QueryBuilder for the connection. diff --git a/lib/public/ILogger.php b/lib/public/ILogger.php index 878f795e113..d7f326f1f6d 100644 --- a/lib/public/ILogger.php +++ b/lib/public/ILogger.php @@ -43,23 +43,23 @@ interface ILogger { /** * @since 14.0.0 */ - const DEBUG=0; + public const DEBUG=0; /** * @since 14.0.0 */ - const INFO=1; + public const INFO=1; /** * @since 14.0.0 */ - const WARN=2; + public const WARN=2; /** * @since 14.0.0 */ - const ERROR=3; + public const ERROR=3; /** * @since 14.0.0 */ - const FATAL=4; + public const FATAL=4; /** * System is unusable. diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index 1e8e461341b..0a5e1890f42 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -47,19 +47,19 @@ interface INavigationManager { * Navigation entries of the app navigation * @since 16.0.0 */ - const TYPE_APPS = 'link'; + public const TYPE_APPS = 'link'; /** * Navigation entries of the settings navigation * @since 16.0.0 */ - const TYPE_SETTINGS = 'settings'; + public const TYPE_SETTINGS = 'settings'; /** * Navigation entries for public page footer navigation * @since 16.0.0 */ - const TYPE_GUEST = 'guest'; + public const TYPE_GUEST = 'guest'; /** * Creates a new navigation entry diff --git a/lib/public/IPreview.php b/lib/public/IPreview.php index 164cbbac2bf..602a54bea2e 100644 --- a/lib/public/IPreview.php +++ b/lib/public/IPreview.php @@ -48,10 +48,10 @@ interface IPreview { /** * @since 9.2.0 */ - const EVENT = self::class . ':' . 'PreviewRequested'; + public const EVENT = self::class . ':' . 'PreviewRequested'; - const MODE_FILL = 'fill'; - const MODE_COVER = 'cover'; + public const MODE_FILL = 'fill'; + public const MODE_COVER = 'cover'; /** * In order to improve lazy loading a closure can be registered which will be diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php index 05ba1055be3..bb646c078aa 100644 --- a/lib/public/IRequest.php +++ b/lib/public/IRequest.php @@ -73,37 +73,37 @@ interface IRequest { /** * @since 9.1.0 */ - const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/'; + public const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/'; /** * @since 13.0.0 */ - const USER_AGENT_TALK_ANDROID = '/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk v.*$/'; + public const USER_AGENT_TALK_ANDROID = '/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk v.*$/'; /** * @since 9.1.0 */ - const USER_AGENT_CLIENT_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/'; + public const USER_AGENT_CLIENT_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/'; /** * @since 9.1.0 */ - const USER_AGENT_CLIENT_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/'; + public const USER_AGENT_CLIENT_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/'; /** * @since 13.0.0 */ - const USER_AGENT_TALK_IOS = '/^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk v.*$/'; + public const USER_AGENT_TALK_IOS = '/^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk v.*$/'; /** * @since 13.0.1 */ - const USER_AGENT_OUTLOOK_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Outlook v.*$/'; + public const USER_AGENT_OUTLOOK_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Outlook v.*$/'; /** * @since 13.0.1 */ - const USER_AGENT_THUNDERBIRD_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Thunderbird v.*$/'; + public const USER_AGENT_THUNDERBIRD_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Thunderbird v.*$/'; /** * @param string $name diff --git a/lib/public/Lock/ILockingProvider.php b/lib/public/Lock/ILockingProvider.php index 4403b091993..373a68334a1 100644 --- a/lib/public/Lock/ILockingProvider.php +++ b/lib/public/Lock/ILockingProvider.php @@ -37,11 +37,11 @@ interface ILockingProvider { /** * @since 8.1.0 */ - const LOCK_SHARED = 1; + public const LOCK_SHARED = 1; /** * @since 8.1.0 */ - const LOCK_EXCLUSIVE = 2; + public const LOCK_EXCLUSIVE = 2; /** * @param string $path diff --git a/lib/public/Search/PagedProvider.php b/lib/public/Search/PagedProvider.php index 17e8aef337c..ee8d1b12508 100644 --- a/lib/public/Search/PagedProvider.php +++ b/lib/public/Search/PagedProvider.php @@ -36,7 +36,7 @@ abstract class PagedProvider extends Provider { * show all results * @since 8.0.0 */ - const SIZE_ALL = 0; + public const SIZE_ALL = 0; /** * Constructor diff --git a/lib/public/Search/Provider.php b/lib/public/Search/Provider.php index bc6f76a11c2..18594eefb8f 100644 --- a/lib/public/Search/Provider.php +++ b/lib/public/Search/Provider.php @@ -36,7 +36,7 @@ abstract class Provider { /** * @since 8.0.0 */ - const OPTION_APPS = 'apps'; + public const OPTION_APPS = 'apps'; /** * List of options diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 956026bc9e3..2268e91289a 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -44,17 +44,17 @@ interface ISecureRandom { /** * Flags for characters that can be used for generate($length, $characters) */ - const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz'; - const CHAR_DIGITS = '0123456789'; - const CHAR_SYMBOLS = '!\"#$%&\\\'()*+,-./:;<=>?@[\]^_`{|}~'; + public const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + public const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz'; + public const CHAR_DIGITS = '0123456789'; + public const CHAR_SYMBOLS = '!\"#$%&\\\'()*+,-./:;<=>?@[\]^_`{|}~'; /** * Characters that can be used for generate($length, $characters), to * generate human readable random strings. Lower- and upper-case characters and digits * are included. Characters which are ambiguous are excluded, such as I, l, and 1 and so on. */ - const CHAR_HUMAN_READABLE = 'abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789'; + public const CHAR_HUMAN_READABLE = 'abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789'; /** * Generate a random string of specified length. diff --git a/lib/public/Settings/IManager.php b/lib/public/Settings/IManager.php index 5c7d0712080..c03c3d588b8 100644 --- a/lib/public/Settings/IManager.php +++ b/lib/public/Settings/IManager.php @@ -33,22 +33,22 @@ interface IManager { /** * @since 9.1.0 */ - const KEY_ADMIN_SETTINGS = 'admin'; + public const KEY_ADMIN_SETTINGS = 'admin'; /** * @since 9.1.0 */ - const KEY_ADMIN_SECTION = 'admin-section'; + public const KEY_ADMIN_SECTION = 'admin-section'; /** * @since 13.0.0 */ - const KEY_PERSONAL_SETTINGS = 'personal'; + public const KEY_PERSONAL_SETTINGS = 'personal'; /** * @since 13.0.0 */ - const KEY_PERSONAL_SECTION = 'personal-section'; + public const KEY_PERSONAL_SECTION = 'personal-section'; /** * @param string $type 'admin' or 'personal' diff --git a/lib/public/SystemTag/ManagerEvent.php b/lib/public/SystemTag/ManagerEvent.php index 290d4f4c129..816a7585dfc 100644 --- a/lib/public/SystemTag/ManagerEvent.php +++ b/lib/public/SystemTag/ManagerEvent.php @@ -37,9 +37,9 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class ManagerEvent extends Event { - const EVENT_CREATE = 'OCP\SystemTag\ISystemTagManager::createTag'; - const EVENT_UPDATE = 'OCP\SystemTag\ISystemTagManager::updateTag'; - const EVENT_DELETE = 'OCP\SystemTag\ISystemTagManager::deleteTag'; + public const EVENT_CREATE = 'OCP\SystemTag\ISystemTagManager::createTag'; + public const EVENT_UPDATE = 'OCP\SystemTag\ISystemTagManager::updateTag'; + public const EVENT_DELETE = 'OCP\SystemTag\ISystemTagManager::deleteTag'; /** @var string */ protected $event; diff --git a/lib/public/SystemTag/MapperEvent.php b/lib/public/SystemTag/MapperEvent.php index 38268fed1da..a8f04742e90 100644 --- a/lib/public/SystemTag/MapperEvent.php +++ b/lib/public/SystemTag/MapperEvent.php @@ -36,8 +36,8 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class MapperEvent extends Event { - const EVENT_ASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::assignTags'; - const EVENT_UNASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::unassignTags'; + public const EVENT_ASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::assignTags'; + public const EVENT_UNASSIGN = 'OCP\SystemTag\ISystemTagObjectMapper::unassignTags'; /** @var string */ protected $event; diff --git a/lib/public/SystemTag/SystemTagsEntityEvent.php b/lib/public/SystemTag/SystemTagsEntityEvent.php index 011f7d09fc0..ae49323507b 100644 --- a/lib/public/SystemTag/SystemTagsEntityEvent.php +++ b/lib/public/SystemTag/SystemTagsEntityEvent.php @@ -36,7 +36,7 @@ use OCP\EventDispatcher\Event; * @since 9.1.0 */ class SystemTagsEntityEvent extends Event { - const EVENT_ENTITY = 'OCP\SystemTag\ISystemTagManager::registerEntity'; + public const EVENT_ENTITY = 'OCP\SystemTag\ISystemTagManager::registerEntity'; /** @var string */ protected $event; diff --git a/lib/public/Util.php b/lib/public/Util.php index 5e805af4c40..72f061afb45 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -60,23 +60,23 @@ class Util { /** * @deprecated 14.0.0 use \OCP\ILogger::DEBUG */ - const DEBUG=0; + public const DEBUG=0; /** * @deprecated 14.0.0 use \OCP\ILogger::INFO */ - const INFO=1; + public const INFO=1; /** * @deprecated 14.0.0 use \OCP\ILogger::WARN */ - const WARN=2; + public const WARN=2; /** * @deprecated 14.0.0 use \OCP\ILogger::ERROR */ - const ERROR=3; + public const ERROR=3; /** * @deprecated 14.0.0 use \OCP\ILogger::FATAL */ - const FATAL=4; + public const FATAL=4; /** \OCP\Share\IManager */ private static $shareManager; diff --git a/lib/public/WorkflowEngine/IManager.php b/lib/public/WorkflowEngine/IManager.php index b9ce157c222..6537666ce08 100644 --- a/lib/public/WorkflowEngine/IManager.php +++ b/lib/public/WorkflowEngine/IManager.php @@ -32,15 +32,15 @@ namespace OCP\WorkflowEngine; * @since 9.1 */ interface IManager { - const SCOPE_ADMIN = 0; - const SCOPE_USER = 1; + public const SCOPE_ADMIN = 0; + public const SCOPE_USER = 1; /** * @depreacted Will be removed in NC19. Use the dedicated events in OCP\WorkflowEngine\Events */ - const EVENT_NAME_REG_OPERATION = 'OCP\WorkflowEngine::registerOperations'; - const EVENT_NAME_REG_ENTITY = 'OCP\WorkflowEngine::registerEntities'; - const EVENT_NAME_REG_CHECK = 'OCP\WorkflowEngine::registerChecks'; + public const EVENT_NAME_REG_OPERATION = 'OCP\WorkflowEngine::registerOperations'; + public const EVENT_NAME_REG_ENTITY = 'OCP\WorkflowEngine::registerEntities'; + public const EVENT_NAME_REG_CHECK = 'OCP\WorkflowEngine::registerChecks'; /** * Listen to `OCP\WorkflowEngine\Events\RegisterEntitiesEvent` at the diff --git a/tests/Core/Controller/SvgControllerTest.php b/tests/Core/Controller/SvgControllerTest.php index 684199f5cb6..76d04d1af32 100644 --- a/tests/Core/Controller/SvgControllerTest.php +++ b/tests/Core/Controller/SvgControllerTest.php @@ -37,11 +37,11 @@ use Test\TestCase; * This class provides test cases for the svg controller */ class SvgControllerTest extends TestCase { - const TEST_IMAGES_SOURCE_PATH = __DIR__ . '/../../data/svg'; - const TEST_IMAGES_PATH = __DIR__ . '/../../../core/img/testImages'; - const TEST_IMAGE_MIXED = 'mixed-source.svg'; - const TEST_IMAGE_RECT = 'rect-black.svg'; - const TEST_IMAGES = [ + public const TEST_IMAGES_SOURCE_PATH = __DIR__ . '/../../data/svg'; + public const TEST_IMAGES_PATH = __DIR__ . '/../../../core/img/testImages'; + public const TEST_IMAGE_MIXED = 'mixed-source.svg'; + public const TEST_IMAGE_RECT = 'rect-black.svg'; + public const TEST_IMAGES = [ self::TEST_IMAGE_MIXED, self::TEST_IMAGE_RECT, ]; diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index a53e3f8e252..7ada4ec746a 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -20,11 +20,11 @@ use OCP\IAppConfig; * @group DB */ class AppTest extends \Test\TestCase { - const TEST_USER1 = 'user1'; - const TEST_USER2 = 'user2'; - const TEST_USER3 = 'user3'; - const TEST_GROUP1 = 'group1'; - const TEST_GROUP2 = 'group2'; + public const TEST_USER1 = 'user1'; + public const TEST_USER2 = 'user2'; + public const TEST_USER3 = 'user3'; + public const TEST_GROUP1 = 'group1'; + public const TEST_GROUP2 = 'group2'; public function appVersionsProvider() { return [ diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php index d5e8bd28bb3..aa6c50528cc 100644 --- a/tests/lib/ConfigTest.php +++ b/tests/lib/ConfigTest.php @@ -9,7 +9,7 @@ namespace Test; class ConfigTest extends TestCase { - const TESTCONTENT = '"bar", "beers" => array("Appenzeller", "Guinness", "Kölsch"), "alcohol_free" => false);'; + public const TESTCONTENT = '"bar", "beers" => array("Appenzeller", "Guinness", "Kölsch"), "alcohol_free" => false);'; /** @var array */ private $initialConfig = ['foo' => 'bar', 'beers' => ['Appenzeller', 'Guinness', 'Kölsch'], 'alcohol_free' => false]; diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 9fc3032fa28..d9e6de898f0 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -59,8 +59,8 @@ class DummyMountProvider implements IMountProvider { * @package Test\Files */ class FilesystemTest extends \Test\TestCase { - const TEST_FILESYSTEM_USER1 = "test-filesystem-user1"; - const TEST_FILESYSTEM_USER2 = "test-filesystem-user1"; + public const TEST_FILESYSTEM_USER1 = "test-filesystem-user1"; + public const TEST_FILESYSTEM_USER2 = "test-filesystem-user1"; /** * @var array tmpDirs diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php index 1f199239a8e..498d9f78248 100644 --- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php +++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php @@ -9,8 +9,8 @@ namespace Test\Files\Storage\Wrapper; class EncodingTest extends \Test\Files\Storage\Storage { - const NFD_NAME = 'ümlaut'; - const NFC_NAME = 'ümlaut'; + public const NFD_NAME = 'ümlaut'; + public const NFC_NAME = 'ümlaut'; /** * @var \OC\Files\Storage\Temporary diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php index cf4da7839c4..19edf4aa3dd 100644 --- a/tests/lib/Memcache/FactoryTest.php +++ b/tests/lib/Memcache/FactoryTest.php @@ -61,10 +61,10 @@ class Test_Factory_Unavailable_Cache2 extends NullCache { } class FactoryTest extends \Test\TestCase { - const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1'; - const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2'; - const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1'; - const UNAVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache2'; + public const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1'; + public const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2'; + public const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1'; + public const UNAVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache2'; public function cacheAvailabilityProvider() { return [ diff --git a/tests/lib/Share/Backend.php b/tests/lib/Share/Backend.php index 661da326e4c..18443a4e247 100644 --- a/tests/lib/Share/Backend.php +++ b/tests/lib/Share/Backend.php @@ -22,9 +22,9 @@ namespace Test\Share; class Backend implements \OCP\Share_Backend { - const FORMAT_SOURCE = 0; - const FORMAT_TARGET = 1; - const FORMAT_PERMISSIONS = 2; + public const FORMAT_SOURCE = 0; + public const FORMAT_TARGET = 1; + public const FORMAT_PERMISSIONS = 2; private $testItem1 = 'test.txt'; private $testItem2 = 'share.txt'; -- cgit v1.2.3 From 734c62bee0f46652285f782761317889d1ef5c7d Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 16:56:50 +0200 Subject: Format code according to PSR2 Signed-off-by: Christoph Wurst --- apps/dav/lib/Connector/Sabre/Directory.php | 3 +-- apps/dav/lib/Files/FileSearchBackend.php | 1 + apps/dav/tests/unit/CardDAV/ConverterTest.php | 2 +- apps/encryption/lib/Settings/Personal.php | 2 +- apps/files_trashbin/lib/Sabre/AbstractTrashFile.php | 2 +- apps/user_ldap/lib/Connection.php | 1 + core/Command/Config/System/SetConfig.php | 1 + lib/private/AppFramework/Http/Request.php | 2 +- lib/private/Files/Cache/QuerySearchHelper.php | 1 + lib/private/Files/ObjectStore/ObjectStoreStorage.php | 1 + lib/private/Files/Storage/Flysystem.php | 1 + lib/private/Group/Database.php | 4 ++-- lib/private/L10N/LanguageIterator.php | 5 +++++ lib/private/MemoryInfo.php | 2 ++ lib/private/User/Database.php | 4 ++-- 15 files changed, 22 insertions(+), 10 deletions(-) (limited to 'apps') diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index 0e4ddd1f232..a7c319b4eee 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/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 - implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { +class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { /** * Cached directory content diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index fd951961623..a69236ffd51 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -428,6 +428,7 @@ class FileSearchBackend implements ISearchBackend { } else { return null; } + // no break default: return null; } diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php index da2255a7172..d502783ba41 100644 --- a/apps/dav/tests/unit/CardDAV/ConverterTest.php +++ b/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; diff --git a/apps/encryption/lib/Settings/Personal.php b/apps/encryption/lib/Settings/Personal.php index 7ecf457e641..bd0e17f0282 100644 --- a/apps/encryption/lib/Settings/Personal.php +++ b/apps/encryption/lib/Settings/Personal.php @@ -30,7 +30,7 @@ use OCP\IConfig; use OCP\IUserSession; use OCP\Settings\ISettings; -class Personal implements ISettings { +class Personal implements ISettings { /** @var IConfig */ private $config; diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php b/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php index ad80711ff1d..7f606bbbc6e 100644 --- a/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php +++ b/apps/files_trashbin/lib/Sabre/AbstractTrashFile.php @@ -29,7 +29,7 @@ namespace OCA\Files_Trashbin\Sabre; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\IFile; -abstract class AbstractTrashFile extends AbstractTrash implements IFile , ITrash { +abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash { public function put($data) { throw new Forbidden(); } diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index cec4866b0ea..0cc93a08e6f 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -348,6 +348,7 @@ class Connection extends LDAPUtility { $result[$dbkey] = implode("\n", $config[$configkey]); break; } //else follows default + // no break default: $result[$dbkey] = $config[$configkey]; } diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 0f0d28a038d..53f007a97e2 100644 --- a/core/Command/Config/System/SetConfig.php +++ b/core/Command/Config/System/SetConfig.php @@ -150,6 +150,7 @@ class SetConfig extends Base { throw new \InvalidArgumentException('Unable to parse value as boolean'); } + // no break case 'null': return [ 'value' => null, diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index c9b22dd7a1e..2ef7b4a0995 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -282,7 +282,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { case 'parameters': case 'params': return $this->getContent(); - default; + default: return isset($this[$name]) ? $this[$name] : null; diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index eba4178d9bd..e1ecad50733 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -110,6 +110,7 @@ class QuerySearchHelper { } else { throw new \InvalidArgumentException('Binary operators inside "not" is not supported'); } + // no break case ISearchBinaryOperator::OPERATOR_AND: return call_user_func_array([$expr, 'andX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments())); case ISearchBinaryOperator::OPERATOR_OR: diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 1faa44ad888..a5112bcbba6 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -304,6 +304,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { } else { return false; } + // no break case 'w': case 'wb': case 'w+': diff --git a/lib/private/Files/Storage/Flysystem.php b/lib/private/Files/Storage/Flysystem.php index 2644bfbb1d3..fba64c64250 100644 --- a/lib/private/Files/Storage/Flysystem.php +++ b/lib/private/Files/Storage/Flysystem.php @@ -189,6 +189,7 @@ abstract class Flysystem extends Common { case 'wb': case 'wb+': $useExisting = false; + // no break case 'a': case 'ab': case 'r+': diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index b75dc097c97..1202ba09b13 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -60,8 +60,8 @@ use OCP\IDBConnection; /** * Class for group management in a SQL Database (e.g. MySQL, SQLite) */ -class Database extends ABackend - implements IAddToGroupBackend, +class Database extends ABackend implements + IAddToGroupBackend, ICountDisabledInGroup, ICountUsersBackend, ICreateGroupBackend, diff --git a/lib/private/L10N/LanguageIterator.php b/lib/private/L10N/LanguageIterator.php index 0670ac56503..a03ec114ef9 100644 --- a/lib/private/L10N/LanguageIterator.php +++ b/lib/private/L10N/LanguageIterator.php @@ -64,6 +64,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 1: $forcedLang = $this->config->getSystemValue('force_language', false); if (is_string($forcedLang) @@ -73,6 +74,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 2: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang)) { @@ -80,6 +82,7 @@ class LanguageIterator implements ILanguageIterator { } $this->next(); /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 3: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang) @@ -88,6 +91,7 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); + // no break case 4: return $this->config->getSystemValue('default_language', 'en'); /** @noinspection PhpMissingBreakStatementInspection */ @@ -97,6 +101,7 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); + // no break default: return 'en'; } diff --git a/lib/private/MemoryInfo.php b/lib/private/MemoryInfo.php index 0e70b500532..88ba69aae95 100644 --- a/lib/private/MemoryInfo.php +++ b/lib/private/MemoryInfo.php @@ -72,8 +72,10 @@ class MemoryInfo { switch ($last) { case 'g': $memoryLimit *= 1024; + // no break case 'm': $memoryLimit *= 1024; + // no break case 'k': $memoryLimit *= 1024; } diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index d5098483d61..e88549c8d81 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -76,8 +76,8 @@ use OCP\User\Backend\ISetPasswordBackend; /** * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ -class Database extends ABackend - implements ICreateUserBackend, +class Database extends ABackend implements + ICreateUserBackend, ISetPasswordBackend, ISetDisplayNameBackend, IGetDisplayNameBackend, -- cgit v1.2.3