opensourcemirror
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: apply changes from Nextcloud coding standards 1.1.1 

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
This commit is contained in:
Joas Schilling 2023-11-23 10:22:34 +01:00 committed by Benjamin Gaussorgues
parent 272719ed1c
commit aa5f037af7
No known key found for this signature in database
GPG Key ID: 5DAC1CAFAA6DB883
805 changed files with 2736 additions and 2813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/admin_audit/lib/Actions/Action.php
View File

@ -34,7 +34,8 @@ class Action {
public function __construct(
private IAuditLogger $logger,
) {}
) {
}
/**
* Log a single action with a log level of info
@ -45,9 +46,9 @@ class Action {
* @param bool $obfuscateParameters
*/
public function log(string $text,
array $params,
array $elements,
bool $obfuscateParameters = false): void {
array $params,
array $elements,
bool $obfuscateParameters = false): void {
foreach ($elements as $element) {
if (!isset($params[$element])) {
if ($obfuscateParameters) {

2
apps/admin_audit/lib/Actions/UserManagement.php
View File

@ -61,7 +61,7 @@ class UserManagement extends Action {
*/
public function assign(string $uid): void {
$this->log(
'UserID assigned: "%s"',
'UserID assigned: "%s"',
[ 'uid' => $uid ],
[ 'uid' ]
);

14
apps/admin_audit/lib/AppInfo/Application.php
View File

@ -101,7 +101,7 @@ class Application extends App implements IBootstrap {
* Register hooks in order to log them
*/
private function registerHooks(IAuditLogger $logger,
ContainerInterface $serverContainer): void {
ContainerInterface $serverContainer): void {
$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
$this->authHooks($logger);
@ -122,7 +122,7 @@ class Application extends App implements IBootstrap {
}
private function userManagementHooks(IAuditLogger $logger,
IUserSession $userSession): void {
IUserSession $userSession): void {
$userActions = new UserManagement($logger);
Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
@ -136,7 +136,7 @@ class Application extends App implements IBootstrap {
}
private function groupHooks(IAuditLogger $logger,
IGroupManager $groupManager): void {
IGroupManager $groupManager): void {
$groupActions = new GroupManagement($logger);
assert($groupManager instanceof GroupManager);
@ -167,7 +167,7 @@ class Application extends App implements IBootstrap {
}
private function appHooks(IAuditLogger $logger,
IEventDispatcher $eventDispatcher): void {
IEventDispatcher $eventDispatcher): void {
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
$appActions = new AppManagement($logger);
$appActions->enableApp($event->getAppID());
@ -183,7 +183,7 @@ class Application extends App implements IBootstrap {
}
private function consoleHooks(IAuditLogger $logger,
IEventDispatcher $eventDispatcher): void {
IEventDispatcher $eventDispatcher): void {
$eventDispatcher->addListener(ConsoleEvent::class, function (ConsoleEvent $event) use ($logger) {
$appActions = new Console($logger);
$appActions->runCommand($event->getArguments());
@ -191,7 +191,7 @@ class Application extends App implements IBootstrap {
}
private function fileHooks(IAuditLogger $logger,
IEventDispatcher $eventDispatcher): void {
IEventDispatcher $eventDispatcher): void {
$fileActions = new Files($logger);
$eventDispatcher->addListener(
BeforePreviewFetchedEvent::class,
@ -264,7 +264,7 @@ class Application extends App implements IBootstrap {
}
private function securityHooks(IAuditLogger $logger,
IEventDispatcher $eventDispatcher): void {
IEventDispatcher $eventDispatcher): void {
$eventDispatcher->addListener(TwoFactorProviderChallengePassed::class, function (TwoFactorProviderChallengePassed $event) use ($logger) {
$security = new Security($logger);
$security->twofactorSuccess($event->getUser(), $event->getProvider());

2
apps/admin_audit/lib/BackgroundJobs/Rotate.php
View File

@ -27,8 +27,8 @@ declare(strict_types=1);
*/
namespace OCA\AdminAudit\BackgroundJobs;
use OCP\BackgroundJob\TimedJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IConfig;
use OCP\Log\RotationTrait;

12
apps/cloud_federation_api/appinfo/routes.php
View File

@ -38,11 +38,11 @@ return [
'verb' => 'POST',
'root' => '/ocm',
],
// [
// 'name' => 'RequestHandler#inviteAccepted',
// 'url' => '/invite-accepted',
// 'verb' => 'POST',
// 'root' => '/ocm',
// ]
// [
// 'name' => 'RequestHandler#inviteAccepted',
// 'url' => '/invite-accepted',
// 'verb' => 'POST',
// 'root' => '/ocm',
// ]
],
];

1
apps/cloud_federation_api/lib/ResponseDefinitions.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**

4
apps/comments/lib/AppInfo/Application.php
View File

@ -34,8 +34,8 @@ use OCA\Comments\Listener\LoadAdditionalScripts;
use OCA\Comments\Listener\LoadSidebarScripts;
use OCA\Comments\MaxAutoCompleteResultsInitialState;
use OCA\Comments\Notification\Notifier;
use OCA\Comments\Search\LegacyProvider;
use OCA\Comments\Search\CommentsSearchProvider;
use OCA\Comments\Search\LegacyProvider;
use OCA\Files\Event\LoadAdditionalScriptsEvent;
use OCA\Files\Event\LoadSidebar;
use OCP\AppFramework\App;
@ -43,9 +43,9 @@ use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Comments\CommentsEntityEvent;
use OCP\Comments\ICommentsManager;
use OCP\ISearch;
use OCP\IServerContainer;
use OCP\Comments\ICommentsManager;
class Application extends App implements IBootstrap {
public const APP_ID = 'comments';

2
apps/comments/lib/Controller/NotificationsController.php
View File

@ -25,10 +25,10 @@
namespace OCA\Comments\Controller;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http;
use OCP\Comments\IComment;
use OCP\Comments\ICommentsManager;
use OCP\Files\IRootFolder;

2
apps/comments/lib/Search/LegacyProvider.php
View File

@ -26,12 +26,12 @@ declare(strict_types=1);
namespace OCA\Comments\Search;
use OCP\Comments\IComment;
use OCP\Comments\ICommentsManager;
use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\Search\Provider;
use OCP\Comments\ICommentsManager;
use function count;
class LegacyProvider extends Provider {

6
apps/contactsinteraction/lib/Db/CardSearchDao.php
View File

@ -39,9 +39,9 @@ class CardSearchDao {
}
public function findExisting(IUser $user,
?string $uid,
?string $email,
?string $cloudId): ?string {
?string $uid,
?string $email,
?string $cloudId): ?string {
$addressbooksQuery = $this->db->getQueryBuilder();
$cardQuery = $this->db->getQueryBuilder();
$propQuery = $this->db->getQueryBuilder();

6
apps/contactsinteraction/lib/Db/RecentContactMapper.php
View File

@ -74,9 +74,9 @@ class RecentContactMapper extends QBMapper {
* @return RecentContact[]
*/
public function findMatch(IUser $user,
?string $uid,
?string $email,
?string $cloudId): array {
?string $uid,
?string $email,
?string $cloudId): array {
$qb = $this->db->getQueryBuilder();
$or = $qb->expr()->orX();

2
apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
View File

@ -38,9 +38,7 @@ use OCP\IL10N;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;
use Sabre\VObject\Component\VCard;
use Sabre\VObject\Reader;
use Sabre\VObject\UUIDUtil;
use Throwable;
class ContactInteractionListener implements IEventListener {

13
apps/dashboard/lib/Controller/DashboardApiController.php
View File

@ -29,25 +29,24 @@ declare(strict_types=1);
namespace OCA\Dashboard\Controller;
use OCA\Dashboard\ResponseDefinitions;
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\Dashboard\IAPIWidget;
use OCP\Dashboard\IAPIWidgetV2;
use OCP\Dashboard\IButtonWidget;
use OCP\Dashboard\IIconWidget;
use OCP\Dashboard\IOptionWidget;
use OCP\Dashboard\IManager;
use OCP\Dashboard\IOptionWidget;
use OCP\Dashboard\IReloadableWidget;
use OCP\Dashboard\IWidget;
use OCP\Dashboard\Model\WidgetButton;
use OCP\Dashboard\Model\WidgetItem;
use OCP\Dashboard\Model\WidgetOptions;
use OCP\IConfig;
use OCP\IRequest;
use OCP\Dashboard\IAPIWidget;
use OCP\Dashboard\IAPIWidgetV2;
use OCP\Dashboard\Model\WidgetItem;
use OCP\Dashboard\Model\WidgetItems;
/**
* @psalm-import-type DashboardWidget from ResponseDefinitions
* @psalm-import-type DashboardWidgetItem from ResponseDefinitions

1
apps/dashboard/lib/ResponseDefinitions.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**

2
apps/dav/appinfo/v1/caldav.php
View File

@ -28,8 +28,8 @@
// Backends
use OC\KnownUser\KnownUserService;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\Connector\LegacyDAVACL;
use OCA\DAV\CalDAV\CalendarRoot;
use OCA\DAV\Connector\LegacyDAVACL;
use OCA\DAV\Connector\Sabre\Auth;
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
use OCA\DAV\Connector\Sabre\MaintenancePlugin;

26
apps/dav/lib/AppInfo/Application.php
View File

@ -69,10 +69,6 @@ use OCA\DAV\Events\CardDeletedEvent;
use OCA\DAV\Events\CardUpdatedEvent;
use OCA\DAV\Events\SubscriptionCreatedEvent;
use OCA\DAV\Events\SubscriptionDeletedEvent;
use OCA\DAV\Listener\OutOfOfficeListener;
use OCP\Accounts\UserUpdatedEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Federation\Events\TrustedServerRemovedEvent;
use OCA\DAV\HookManager;
use OCA\DAV\Listener\ActivityUpdaterListener;
use OCA\DAV\Listener\AddressbookListener;
@ -84,6 +80,7 @@ use OCA\DAV\Listener\CalendarPublicationListener;
use OCA\DAV\Listener\CalendarShareUpdateListener;
use OCA\DAV\Listener\CardListener;
use OCA\DAV\Listener\ClearPhotoCacheListener;
use OCA\DAV\Listener\OutOfOfficeListener;
use OCA\DAV\Listener\SubscriptionListener;
use OCA\DAV\Listener\TrustedServerRemovedListener;
use OCA\DAV\Listener\UserPreferenceListener;
@ -93,6 +90,7 @@ use OCA\DAV\Search\TasksSearchProvider;
use OCA\DAV\SetupChecks\NeedsSystemAddressBookSync;
use OCA\DAV\UserMigration\CalendarMigrator;
use OCA\DAV\UserMigration\ContactsMigrator;
use OCP\Accounts\UserUpdatedEvent;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
@ -102,6 +100,8 @@ use OCP\Calendar\IManager as ICalendarManager;
use OCP\Config\BeforePreferenceDeletedEvent;
use OCP\Config\BeforePreferenceSetEvent;
use OCP\Contacts\IManager as IContactsManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Federation\Events\TrustedServerRemovedEvent;
use OCP\Files\AppData\IAppDataFactory;
use OCP\IUser;
use OCP\User\Events\OutOfOfficeChangedEvent;
@ -224,8 +224,8 @@ class Application extends App implements IBootstrap {
}
public function registerHooks(HookManager $hm,
IEventDispatcher $dispatcher,
IAppContainer $container) {
IEventDispatcher $dispatcher,
IAppContainer $container) {
$hm->setup();
// first time login event setup
@ -268,8 +268,8 @@ class Application extends App implements IBootstrap {
}
private function setupContactsProvider(IContactsManager $contactsManager,
IAppContainer $container,
string $userID): void {
IAppContainer $container,
string $userID): void {
/** @var ContactsManager $cm */
$cm = $container->query(ContactsManager::class);
$urlGenerator = $container->getServer()->getURLGenerator();
@ -277,7 +277,7 @@ class Application extends App implements IBootstrap {
}
private function setupSystemContactsProvider(IContactsManager $contactsManager,
IAppContainer $container): void {
IAppContainer $container): void {
/** @var ContactsManager $cm */
$cm = $container->query(ContactsManager::class);
$urlGenerator = $container->getServer()->getURLGenerator();
@ -285,7 +285,7 @@ class Application extends App implements IBootstrap {
}
public function registerCalendarManager(ICalendarManager $calendarManager,
IAppContainer $container): void {
IAppContainer $container): void {
$calendarManager->register(function () use ($container, $calendarManager) {
$user = \OC::$server->getUserSession()->getUser();
if ($user !== null) {
@ -295,14 +295,14 @@ class Application extends App implements IBootstrap {
}
private function setupCalendarProvider(ICalendarManager $calendarManager,
IAppContainer $container,
$userId) {
IAppContainer $container,
$userId) {
$cm = $container->query(CalendarManager::class);
$cm->setupCalendarProvider($calendarManager, $userId);
}
public function registerCalendarReminders(NotificationProviderManager $manager,
LoggerInterface $logger): void {
LoggerInterface $logger): void {
try {
$manager->registerProvider(AudioProvider::class);
$manager->registerProvider(EmailProvider::class);

8
apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php
View File

@ -59,10 +59,10 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
* BuildReminderIndexBackgroundJob constructor.
*/
public function __construct(IDBConnection $db,
ReminderService $reminderService,
LoggerInterface $logger,
IJobList $jobList,
ITimeFactory $timeFactory) {
ReminderService $reminderService,
LoggerInterface $logger,
IJobList $jobList,
ITimeFactory $timeFactory) {
parent::__construct($timeFactory);
$this->db = $db;
$this->reminderService = $reminderService;

2
apps/dav/lib/BackgroundJob/CalendarRetentionJob.php
View File

@ -34,7 +34,7 @@ class CalendarRetentionJob extends TimedJob {
private $service;
public function __construct(ITimeFactory $time,
RetentionService $service) {
RetentionService $service) {
parent::__construct($time);
$this->service = $service;

4
apps/dav/lib/BackgroundJob/EventReminderJob.php
View File

@ -40,8 +40,8 @@ class EventReminderJob extends TimedJob {
private $config;
public function __construct(ITimeFactory $time,
ReminderService $reminderService,
IConfig $config) {
ReminderService $reminderService,
IConfig $config) {
parent::__construct($time);
$this->reminderService = $reminderService;
$this->config = $config;

4
apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php
View File

@ -39,8 +39,8 @@ class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
private $config;
public function __construct(ITimeFactory $time,
BirthdayService $birthdayService,
IConfig $config) {
BirthdayService $birthdayService,
IConfig $config) {
parent::__construct($time);
$this->birthdayService = $birthdayService;

4
apps/dav/lib/BackgroundJob/PruneOutdatedSyncTokensJob.php
View File

@ -25,11 +25,11 @@ declare(strict_types=1);
*/
namespace OCA\DAV\BackgroundJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCA\DAV\AppInfo\Application;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CardDAV\CardDavBackend;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IConfig;
use Psr\Log\LoggerInterface;

4
apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php
View File

@ -49,8 +49,8 @@ class RegisterRegenerateBirthdayCalendars extends QueuedJob {
* @param IJobList $jobList
*/
public function __construct(ITimeFactory $time,
IUserManager $userManager,
IJobList $jobList) {
IUserManager $userManager,
IJobList $jobList) {
parent::__construct($time);
$this->userManager = $userManager;
$this->jobList = $jobList;

56
apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php
View File

@ -55,10 +55,10 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
private $calDavBackend;
public function __construct(ITimeFactory $time,
IResourceManager $resourceManager,
IRoomManager $roomManager,
IDBConnection $dbConnection,
CalDavBackend $calDavBackend) {
IResourceManager $resourceManager,
IRoomManager $roomManager,
IDBConnection $dbConnection,
CalDavBackend $calDavBackend) {
parent::__construct($time);
$this->resourceManager = $resourceManager;
$this->roomManager = $roomManager;
@ -101,10 +101,10 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param string $principalPrefix
*/
private function runForBackend($backendManager,
string $dbTable,
string $dbTableMetadata,
string $foreignKey,
string $principalPrefix): void {
string $dbTable,
string $dbTableMetadata,
string $foreignKey,
string $principalPrefix): void {
$backends = $backendManager->getBackends();
foreach ($backends as $backend) {
@ -194,8 +194,8 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @return int Insert id
*/
private function addToCache(string $table,
string $backendId,
$remote): int {
string $backendId,
$remote): int {
$query = $this->dbConnection->getQueryBuilder();
$query->insert($table)
->values([
@ -219,9 +219,9 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param array $metadata
*/
private function addMetadataToCache(string $table,
string $foreignKey,
int $foreignId,
array $metadata): void {
string $foreignKey,
int $foreignId,
array $metadata): void {
foreach ($metadata as $key => $value) {
$query = $this->dbConnection->getQueryBuilder();
$query->insert($table)
@ -241,7 +241,7 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param int $id
*/
private function deleteFromCache(string $table,
int $id): void {
int $id): void {
$query = $this->dbConnection->getQueryBuilder();
$query->delete($table)
->where($query->expr()->eq('id', $query->createNamedParameter($id)))
@ -254,8 +254,8 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param int $id
*/
private function deleteMetadataFromCache(string $table,
string $foreignKey,
int $id): void {
string $foreignKey,
int $id): void {
$query = $this->dbConnection->getQueryBuilder();
$query->delete($table)
->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
@ -270,8 +270,8 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param IResource|IRoom $remote
*/
private function updateCache(string $table,
int $id,
$remote): void {
int $id,
$remote): void {
$query = $this->dbConnection->getQueryBuilder();
$query->update($table)
->set('email', $query->createNamedParameter($remote->getEMail()))
@ -292,10 +292,10 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param array $cachedMetadata
*/
private function updateMetadataCache(string $dbTable,
string $foreignKey,
int $id,
array $metadata,
array $cachedMetadata): void {
string $foreignKey,
int $id,
array $metadata,
array $cachedMetadata): void {
$newMetadata = array_diff_key($metadata, $cachedMetadata);
$deletedMetadata = array_diff_key($cachedMetadata, $metadata);
@ -371,8 +371,8 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @return array
*/
private function getAllMetadataOfCache(string $table,
string $foreignKey,
int $id): array {
string $foreignKey,
int $id): array {
$query = $this->dbConnection->getQueryBuilder();
$query->select(['key', 'value'])
->from($table)
@ -398,7 +398,7 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @return array
*/
private function getAllCachedByBackend(string $tableName,
string $backendId): array {
string $backendId): array {
$query = $this->dbConnection->getQueryBuilder();
$query->select('resource_id')
->from($tableName)
@ -417,7 +417,7 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @param $principalUri
*/
private function deleteCalendarDataForResource(string $principalPrefix,
string $principalUri): void {
string $principalUri): void {
$calendar = $this->calDavBackend->getCalendarByUri(
implode('/', [$principalPrefix, $principalUri]),
CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
@ -438,8 +438,8 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @return int
*/
private function getIdForBackendAndResource(string $table,
string $backendId,
string $resourceId): int {
string $backendId,
string $resourceId): int {
$query = $this->dbConnection->getQueryBuilder();
$query->select('id')
->from($table)

1
apps/dav/lib/BackgroundJob/UploadCleanup.php
View File

@ -32,7 +32,6 @@ use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\TimedJob;
use OCP\Files\Node;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;

10
apps/dav/lib/BackgroundJob/UserStatusAutomation.php
View File

@ -46,11 +46,11 @@ class UserStatusAutomation extends TimedJob {
protected IConfig $config;
public function __construct(ITimeFactory $timeFactory,
IDBConnection $connection,
IJobList $jobList,
LoggerInterface $logger,
IManager $manager,
IConfig $config) {
IDBConnection $connection,
IJobList $jobList,
LoggerInterface $logger,
IManager $manager,
IConfig $config) {
parent::__construct($timeFactory);
$this->connection = $connection;
$this->jobList = $jobList;

8
apps/dav/lib/BulkUpload/BulkUploadPlugin.php
View File

@ -23,15 +23,15 @@
namespace OCA\DAV\BulkUpload;
use OCA\DAV\Connector\Sabre\MtimeSanitizer;
use OCP\AppFramework\Http;
use OCP\Files\DavUtil;
use OCP\Files\Folder;
use Psr\Log\LoggerInterface;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use OCP\Files\DavUtil;
use OCP\Files\Folder;
use OCP\AppFramework\Http;
use OCA\DAV\Connector\Sabre\MtimeSanitizer;
class BulkUploadPlugin extends ServerPlugin {
private Folder $userFolder;

4
apps/dav/lib/BulkUpload/MultipartRequestParser.php
View File

@ -22,11 +22,11 @@
namespace OCA\DAV\BulkUpload;
use Sabre\HTTP\RequestInterface;
use OCP\AppFramework\Http;
use Sabre\DAV\Exception;
use Sabre\DAV\Exception\BadRequest;
use Sabre\DAV\Exception\LengthRequired;
use OCP\AppFramework\Http;
use Sabre\HTTP\RequestInterface;
class MultipartRequestParser {

3
apps/dav/lib/CalDAV/AppCalendar/AppCalendar.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
@ -25,8 +26,8 @@ declare(strict_types=1);
namespace OCA\DAV\CalDAV\AppCalendar;
use OCA\DAV\CalDAV\Plugin;
use OCA\DAV\CalDAV\Integration\ExternalCalendar;
use OCA\DAV\CalDAV\Plugin;
use OCP\Calendar\ICalendar;
use OCP\Calendar\ICreateFromString;
use OCP\Constants;

1
apps/dav/lib/CalDAV/AppCalendar/AppCalendarPlugin.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**

1
apps/dav/lib/CalDAV/AppCalendar/CalendarObject.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**

40
apps/dav/lib/CalDAV/BirthdayService.php
View File

@ -67,11 +67,11 @@ class BirthdayService {
* BirthdayService constructor.
*/
public function __construct(CalDavBackend $calDavBackEnd,
CardDavBackend $cardDavBackEnd,
GroupPrincipalBackend $principalBackend,
IConfig $config,
IDBConnection $dbConnection,
IL10N $l10n) {
CardDavBackend $cardDavBackEnd,
GroupPrincipalBackend $principalBackend,
IConfig $config,
IDBConnection $dbConnection,
IL10N $l10n) {
$this->calDavBackEnd = $calDavBackEnd;
$this->cardDavBackEnd = $cardDavBackEnd;
$this->principalBackend = $principalBackend;
@ -81,8 +81,8 @@ class BirthdayService {
}
public function onCardChanged(int $addressBookId,
string $cardUri,
string $cardData): void {
string $cardUri,
string $cardData): void {
if (!$this->isGloballyEnabled()) {
return;
}
@ -117,7 +117,7 @@ class BirthdayService {
}
public function onCardDeleted(int $addressBookId,
string $cardUri): void {
string $cardUri): void {
if (!$this->isGloballyEnabled()) {
return;
}
@ -164,9 +164,9 @@ class BirthdayService {
* @throws InvalidDataException
*/
public function buildDateFromContact(string $cardData,
string $dateField,
string $postfix,
?string $reminderOffset):?VCalendar {
string $dateField,
string $postfix,
?string $reminderOffset):?VCalendar {
if (empty($cardData)) {
return null;
}
@ -322,7 +322,7 @@ class BirthdayService {
* @return bool
*/
public function birthdayEvenChanged(string $existingCalendarData,
VCalendar $newCalendarData):bool {
VCalendar $newCalendarData):bool {
try {
$existingBirthday = Reader::read($existingCalendarData);
} catch (Exception $ex) {
@ -366,11 +366,11 @@ class BirthdayService {
* @throws \Sabre\DAV\Exception\BadRequest
*/
private function updateCalendar(string $cardUri,
string $cardData,
array $book,
int $calendarId,
array $type,
?string $reminderOffset):void {
string $cardData,
array $book,
int $calendarId,
array $type,
?string $reminderOffset):void {
$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix'], $reminderOffset);
$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
@ -469,9 +469,9 @@ class BirthdayService {
* @return string The formatted title
*/
private function formatTitle(string $field,
string $name,
int $year = null,
bool $supports4Byte = true):string {
string $name,
int $year = null,
bool $supports4Byte = true):string {
if ($supports4Byte) {
switch ($field) {
case 'BDAY':

5
apps/dav/lib/CalDAV/CalendarImpl.php
View File

@ -33,7 +33,6 @@ use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
use OCP\Calendar\Exceptions\CalendarException;
use OCP\Calendar\ICreateFromString;
use OCP\Calendar\IHandleImipMessage;
use OCP\Calendar\ISchedulingInformation;
use OCP\Constants;
use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp;
use Sabre\DAV\Exception\Conflict;
@ -52,8 +51,8 @@ class CalendarImpl implements ICreateFromString, IHandleImipMessage {
private array $calendarInfo;
public function __construct(Calendar $calendar,
array $calendarInfo,
CalDavBackend $backend) {
array $calendarInfo,
CalDavBackend $backend) {
$this->calendar = $calendar;
$this->calendarInfo = $calendarInfo;
$this->backend = $backend;

4
apps/dav/lib/CalDAV/CalendarObject.php
View File

@ -45,8 +45,8 @@ class CalendarObject extends \Sabre\CalDAV\CalendarObject {
* @param array $objectData
*/
public function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
array $calendarInfo,
array $objectData) {
array $calendarInfo,
array $objectData) {
parent::__construct($caldavBackend, $calendarInfo, $objectData);
if ($this->isShared()) {

6
apps/dav/lib/CalDAV/EventComparisonService.php
View File

@ -25,15 +25,9 @@ declare(strict_types=1);
*/
namespace OCA\DAV\CalDAV;
use OCA\DAV\AppInfo\Application;
use OCA\DAV\CalDAV\Schedule\IMipService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IConfig;
use Sabre\VObject\Component\VCalendar;
use Sabre\VObject\Component\VEvent;
use Sabre\VObject\Component\VTimeZone;
use Sabre\VObject\Component\VTodo;
use function max;
class EventComparisonService {

3
apps/dav/lib/CalDAV/FreeBusy/FreeBusyGenerator.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* *
@ -25,8 +26,6 @@ declare(strict_types=1);
namespace OCA\DAV\CalDAV\FreeBusy;
use DateTimeInterface;
use DateTimeZone;
use Sabre\VObject\Component\VCalendar;
/**

2
apps/dav/lib/CalDAV/PublicCalendarRoot.php
View File

@ -52,7 +52,7 @@ class PublicCalendarRoot extends Collection {
* @param IConfig $config
*/
public function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
IConfig $config, LoggerInterface $logger) {
IConfig $config, LoggerInterface $logger) {
$this->caldavBackend = $caldavBackend;
$this->l10n = $l10n;
$this->config = $config;

104
apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
View File

@ -114,7 +114,7 @@ class PublishPlugin extends ServerPlugin {
$this->server = $server;
$this->server->on('method:POST', [$this, 'httpPost']);
$this->server->on('propFind', [$this, 'propFind']);
$this->server->on('propFind', [$this, 'propFind']);
}
public function propFind(PropFind $propFind, INode $node) {
@ -184,72 +184,72 @@ class PublishPlugin extends ServerPlugin {
case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {
return;
}
$this->server->transactionType = 'post-publish-calendar';
// Getting ACL info
$acl = $this->server->getPlugin('acl');
// If there's no ACL support, we allow everything
if ($acl) {
/** @var \Sabre\DAVACL\Plugin $acl */
$acl->checkPrivileges($path, '{DAV:}write');
$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
if ($limitSharingToOwner && !$isOwner) {
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {
return;
}
}
$this->server->transactionType = 'post-publish-calendar';
$node->setPublishStatus(true);
// Getting ACL info
$acl = $this->server->getPlugin('acl');
// iCloud sends back the 202, so we will too.
$response->setStatus(202);
// If there's no ACL support, we allow everything
if ($acl) {
/** @var \Sabre\DAVACL\Plugin $acl */
$acl->checkPrivileges($path, '{DAV:}write');
// Adding this because sending a response body may cause issues,
// and I wanted some type of indicator the response was handled.
$response->setHeader('X-Sabre-Status', 'everything-went-well');
$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
if ($limitSharingToOwner && !$isOwner) {
return;
}
}
// Breaking the event chain
return false;
$node->setPublishStatus(true);
// iCloud sends back the 202, so we will too.
$response->setStatus(202);
// Adding this because sending a response body may cause issues,
// and I wanted some type of indicator the response was handled.
$response->setHeader('X-Sabre-Status', 'everything-went-well');
// Breaking the event chain
return false;
case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {
return;
}
$this->server->transactionType = 'post-unpublish-calendar';
// Getting ACL info
$acl = $this->server->getPlugin('acl');
// If there's no ACL support, we allow everything
if ($acl) {
/** @var \Sabre\DAVACL\Plugin $acl */
$acl->checkPrivileges($path, '{DAV:}write');
$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
if ($limitSharingToOwner && !$isOwner) {
// We can only deal with IShareableCalendar objects
if (!$node instanceof Calendar) {
return;
}
}
$this->server->transactionType = 'post-unpublish-calendar';
$node->setPublishStatus(false);
// Getting ACL info
$acl = $this->server->getPlugin('acl');
$response->setStatus(200);
// If there's no ACL support, we allow everything
if ($acl) {
/** @var \Sabre\DAVACL\Plugin $acl */
$acl->checkPrivileges($path, '{DAV:}write');
// Adding this because sending a response body may cause issues,
// and I wanted some type of indicator the response was handled.
$response->setHeader('X-Sabre-Status', 'everything-went-well');
$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
if ($limitSharingToOwner && !$isOwner) {
return;
}
}
// Breaking the event chain
return false;
$node->setPublishStatus(false);
$response->setStatus(200);
// Adding this because sending a response body may cause issues,
// and I wanted some type of indicator the response was handled.
$response->setHeader('X-Sabre-Status', 'everything-went-well');
// Breaking the event chain
return false;
}
}

26
apps/dav/lib/CalDAV/Reminder/Backend.php
View File

@ -51,7 +51,7 @@ class Backend {
* @param ITimeFactory $timeFactory
*/
public function __construct(IDBConnection $db,
ITimeFactory $timeFactory) {
ITimeFactory $timeFactory) {
$this->db = $db;
$this->timeFactory = $timeFactory;
}
@ -114,17 +114,17 @@ class Backend {
* @return int The insert id
*/
public function insertReminder(int $calendarId,
int $objectId,
string $uid,
bool $isRecurring,
int $recurrenceId,
bool $isRecurrenceException,
string $eventHash,
string $alarmHash,
string $type,
bool $isRelative,
int $notificationDate,
bool $isRepeatBased):int {
int $objectId,
string $uid,
bool $isRecurring,
int $recurrenceId,
bool $isRecurrenceException,
string $eventHash,
string $alarmHash,
string $type,
bool $isRelative,
int $notificationDate,
bool $isRepeatBased):int {
$query = $this->db->getQueryBuilder();
$query->insert('calendar_reminders')
->values([
@ -153,7 +153,7 @@ class Backend {
* @param int $newNotificationDate
*/
public function updateReminder(int $reminderId,
int $newNotificationDate):void {
int $newNotificationDate):void {
$query = $this->db->getQueryBuilder();
$query->update('calendar_reminders')
->set('notification_date', $query->createNamedParameter($newNotificationDate))

6
apps/dav/lib/CalDAV/Reminder/INotificationProvider.php
View File

@ -48,7 +48,7 @@ interface INotificationProvider {
* @return void
*/
public function send(VEvent $vevent,
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []): void;
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []): void;
}

12
apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php
View File

@ -69,9 +69,9 @@ abstract class AbstractProvider implements INotificationProvider {
protected $config;
public function __construct(LoggerInterface $logger,
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator,
IConfig $config) {
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator,
IConfig $config) {
$this->logger = $logger;
$this->l10nFactory = $l10nFactory;
$this->urlGenerator = $urlGenerator;
@ -88,9 +88,9 @@ abstract class AbstractProvider implements INotificationProvider {
* @return void
*/
abstract public function send(VEvent $vevent,
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []): void;
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []): void;
/**
* @return string

24
apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
View File

@ -58,10 +58,10 @@ class EmailProvider extends AbstractProvider {
private IMailer $mailer;
public function __construct(IConfig $config,
IMailer $mailer,
LoggerInterface $logger,
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator) {
IMailer $mailer,
LoggerInterface $logger,
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator) {
parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
$this->mailer = $mailer;
}
@ -76,9 +76,9 @@ class EmailProvider extends AbstractProvider {
* @throws \Exception
*/
public function send(VEvent $vevent,
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []):void {
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []):void {
$fallbackLanguage = $this->getFallbackLanguage();
$organizerEmailAddress = null;
@ -162,9 +162,9 @@ class EmailProvider extends AbstractProvider {
* @param array $eventData
*/
private function addBulletList(IEMailTemplate $template,
IL10N $l10n,
string $calendarDisplayName,
VEvent $vevent):void {
IL10N $l10n,
string $calendarDisplayName,
VEvent $vevent):void {
$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
$this->getAbsoluteImagePath('actions/info.png'));
@ -220,7 +220,7 @@ class EmailProvider extends AbstractProvider {
* @return array<string, string[]>
*/
private function sortEMailAddressesByLanguage(array $emails,
string $defaultLanguage):array {
string $defaultLanguage):array {
$sortedByLanguage = [];
foreach ($emails as $emailAddress => $parameters) {
@ -435,7 +435,7 @@ class EmailProvider extends AbstractProvider {
}
private function isDayEqual(DateTime $dtStart,
DateTime $dtEnd):bool {
DateTime $dtEnd):bool {
return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
}

16
apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
View File

@ -59,11 +59,11 @@ class PushProvider extends AbstractProvider {
private $timeFactory;
public function __construct(IConfig $config,
IManager $manager,
LoggerInterface $logger,
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory) {
IManager $manager,
LoggerInterface $logger,
L10NFactory $l10nFactory,
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory) {
parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
$this->manager = $manager;
$this->timeFactory = $timeFactory;
@ -79,9 +79,9 @@ class PushProvider extends AbstractProvider {
* @throws \Exception
*/
public function send(VEvent $vevent,
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []):void {
?string $calendarDisplayName,
array $principalEmailAddresses,
array $users = []):void {
if ($this->config->getAppValue('dav', 'sendEventRemindersPush', 'yes') !== 'yes') {
return;
}

8
apps/dav/lib/CalDAV/Reminder/Notifier.php
View File

@ -66,8 +66,8 @@ class Notifier implements INotifier {
* @param ITimeFactory $timeFactory
*/
public function __construct(IFactory $factory,
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory) {
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory) {
$this->l10nFactory = $factory;
$this->urlGenerator = $urlGenerator;
$this->timeFactory = $timeFactory;
@ -102,7 +102,7 @@ class Notifier implements INotifier {
* @throws \Exception
*/
public function prepare(INotification $notification,
string $languageCode):INotification {
string $languageCode):INotification {
if ($notification->getApp() !== Application::APP_ID) {
throw new \InvalidArgumentException('Notification not from this app');
}
@ -289,7 +289,7 @@ class Notifier implements INotifier {
* @return bool
*/
private function isDayEqual(DateTime $dtStart,
DateTime $dtEnd):bool {
DateTime $dtEnd):bool {
return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
}

34
apps/dav/lib/CalDAV/Reminder/ReminderService.php
View File

@ -98,14 +98,14 @@ class ReminderService {
];
public function __construct(Backend $backend,
NotificationProviderManager $notificationProviderManager,
IUserManager $userManager,
IGroupManager $groupManager,
CalDavBackend $caldavBackend,
ITimeFactory $timeFactory,
IConfig $config,
LoggerInterface $logger,
Principal $principalConnector) {
NotificationProviderManager $notificationProviderManager,
IUserManager $userManager,
IGroupManager $groupManager,
CalDavBackend $caldavBackend,
ITimeFactory $timeFactory,
IConfig $config,
LoggerInterface $logger,
Principal $principalConnector) {
$this->backend = $backend;
$this->notificationProviderManager = $notificationProviderManager;
$this->userManager = $userManager;
@ -390,12 +390,12 @@ class ReminderService {
* @return array
*/
private function getRemindersForVAlarm(VAlarm $valarm,
array $objectData,
DateTimeZone $calendarTimeZone,
string $eventHash = null,
string $alarmHash = null,
bool $isRecurring = false,
bool $isRecurrenceException = false):array {
array $objectData,
DateTimeZone $calendarTimeZone,
string $eventHash = null,
string $alarmHash = null,
bool $isRecurring = false,
bool $isRecurrenceException = false):array {
if ($eventHash === null) {
$eventHash = $this->getEventHash($valarm->parent);
}
@ -490,7 +490,7 @@ class ReminderService {
* @param VEvent $vevent
*/
private function deleteOrProcessNext(array $reminder,
VObject\Component\VEvent $vevent):void {
VObject\Component\VEvent $vevent):void {
if ($reminder['is_repeat_based'] ||
!$reminder['is_recurring'] ||
!$reminder['is_relative'] ||
@ -673,8 +673,8 @@ class ReminderService {
* @return VEvent|null
*/
private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
int $recurrenceId,
bool $isRecurrenceException):?VEvent {
int $recurrenceId,
bool $isRecurrenceException):?VEvent {
$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
if (count($vevents) === 0) {
return null;

20
apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php
View File

@ -75,13 +75,13 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
private $cuType;
public function __construct(IDBConnection $dbConnection,
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper,
string $principalPrefix,
string $dbPrefix,
string $cuType) {
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper,
string $principalPrefix,
string $dbPrefix,
string $cuType) {
$this->db = $dbConnection;
$this->userSession = $userSession;
$this->groupManager = $groupManager;
@ -165,7 +165,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
}
[, $name] = \Sabre\Uri\split($path);
[$backendId, $resourceId] = explode('-', $name, 2);
[$backendId, $resourceId] = explode('-', $name, 2);
$query = $this->db->getQueryBuilder();
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@ -309,7 +309,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
case IRoomMetadata::CAPACITY:
case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
$results[] = $this->searchPrincipalsByCapacity($prop,$value);
$results[] = $this->searchPrincipalsByCapacity($prop, $value);
break;
default:
@ -470,7 +470,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
}
[, $name] = \Sabre\Uri\split($path);
[$backendId, $resourceId] = explode('-', $name, 2);
[$backendId, $resourceId] = explode('-', $name, 2);
$query = $this->db->getQueryBuilder();
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])

8
apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php
View File

@ -39,10 +39,10 @@ class ResourcePrincipalBackend extends AbstractPrincipalBackend {
* ResourcePrincipalBackend constructor.
*/
public function __construct(IDBConnection $dbConnection,
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper) {
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper) {
parent::__construct($dbConnection, $userSession, $groupManager, $logger,
$proxyMapper, 'principals/calendar-resources', 'resource', 'RESOURCE');
}

8
apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php
View File

@ -39,10 +39,10 @@ class RoomPrincipalBackend extends AbstractPrincipalBackend {
* RoomPrincipalBackend constructor.
*/
public function __construct(IDBConnection $dbConnection,
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper) {
IUserSession $userSession,
IGroupManager $groupManager,
LoggerInterface $logger,
ProxyMapper $proxyMapper) {
parent::__construct($dbConnection, $userSession, $groupManager, $logger,
$proxyMapper, 'principals/calendar-rooms', 'room', 'ROOM');
}

4
apps/dav/lib/CalDAV/RetentionService.php
View File

@ -44,8 +44,8 @@ class RetentionService {
private $calDavBackend;
public function __construct(IConfig $config,
ITimeFactory $time,
CalDavBackend $calDavBackend) {
ITimeFactory $time,
CalDavBackend $calDavBackend) {
$this->config = $config;
$this->time = $time;
$this->calDavBackend = $calDavBackend;

20
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View File

@ -86,14 +86,14 @@ class IMipPlugin extends SabreIMipPlugin {
private EventComparisonService $eventComparisonService;
public function __construct(IConfig $config,
IMailer $mailer,
LoggerInterface $logger,
ITimeFactory $timeFactory,
Defaults $defaults,
IUserManager $userManager,
$userId,
IMipService $imipService,
EventComparisonService $eventComparisonService) {
IMailer $mailer,
LoggerInterface $logger,
ITimeFactory $timeFactory,
Defaults $defaults,
IUserManager $userManager,
$userId,
IMipService $imipService,
EventComparisonService $eventComparisonService) {
parent::__construct('');
$this->userId = $userId;
$this->config = $config;
@ -305,9 +305,9 @@ class IMipPlugin extends SabreIMipPlugin {
$itip_msg = $iTipMessage->message->serialize();
$message->attachInline(
$itip_msg,
$itip_msg,
'event.ics',
'text/calendar; method=' . $iTipMessage->method,
'text/calendar; method=' . $iTipMessage->method,
);
try {

18
apps/dav/lib/CalDAV/Schedule/IMipService.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* DAV App
@ -57,10 +58,10 @@ class IMipService {
];
public function __construct(URLGenerator $urlGenerator,
IConfig $config,
IDBConnection $db,
ISecureRandom $random,
L10NFactory $l10nFactory) {
IConfig $config,
IDBConnection $db,
ISecureRandom $random,
L10NFactory $l10nFactory) {
$this->urlGenerator = $urlGenerator;
$this->config = $config;
$this->db = $db;
@ -99,7 +100,7 @@ class IMipService {
return $default;
}
$newstring = $vevent->$property->getValue();
if(isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring ) {
if(isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
$oldstring = $oldVEvent->$property->getValue();
return sprintf($strikethrough, $oldstring, $newstring);
}
@ -162,7 +163,7 @@ class IMipService {
if(!empty($oldVEvent)) {
$oldMeetingWhen = $this->generateWhenString($oldVEvent);
$data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
$data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
$data['meeting_description_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'DESCRIPTION', $data['meeting_description']);
$data['meeting_location_html'] = $this->generateLinkifiedDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
@ -281,7 +282,8 @@ class IMipService {
$strikethrough = "<span style='text-decoration: line-through'>%s</span>";
$newMeetingWhen = $this->generateWhenString($vEvent);
$newSummary = isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event');;
$newSummary = isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event');
;
$newDescription = isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal;
$newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
$newLocation = isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal;
@ -483,7 +485,7 @@ class IMipService {
htmlspecialchars($organizer->getNormalizedValue()),
htmlspecialchars($organizerName ?: $organizerEmail));
$organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
if(isset($organizer['PARTSTAT']) ) {
if(isset($organizer['PARTSTAT'])) {
/** @var Parameter $partstat */
$partstat = $organizer['PARTSTAT'];
if(strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {

2
apps/dav/lib/CalDAV/Schedule/Plugin.php
View File

@ -36,7 +36,6 @@ use OCA\DAV\CalDAV\CalendarHome;
use OCP\IConfig;
use Psr\Log\LoggerInterface;
use Sabre\CalDAV\ICalendar;
use Sabre\CalDAV\Schedule\IOutbox;
use Sabre\DAV\INode;
use Sabre\DAV\IProperties;
use Sabre\DAV\PropFind;
@ -45,7 +44,6 @@ use Sabre\DAV\Xml\Property\LocalHref;
use Sabre\DAVACL\IPrincipal;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use Sabre\VObject;
use Sabre\VObject\Component;
use Sabre\VObject\Component\VCalendar;
use Sabre\VObject\Component\VEvent;

3
apps/dav/lib/CalDAV/Status/Status.php
View File

@ -27,7 +27,8 @@ namespace OCA\DAV\CalDAV\Status;
class Status {
public function __construct(private string $status = '', private ?string $message = null, private ?string $customMessage = null){}
public function __construct(private string $status = '', private ?string $message = null, private ?string $customMessage = null) {
}
public function getStatus(): string {
return $this->status;

15
apps/dav/lib/CalDAV/Status/StatusService.php
View File

@ -48,16 +48,13 @@ declare(strict_types=1);
*/
namespace OCA\DAV\CalDAV\Status;
use DateTimeZone;
use OC\Calendar\CalendarQuery;
use OCA\DAV\CalDAV\CalendarImpl;
use OCA\DAV\CalDAV\FreeBusy\FreeBusyGenerator;
use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
use OCA\DAV\CalDAV\IUser;
use OCA\DAV\CalDAV\Schedule\Plugin as SchedulePlugin;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Calendar\IManager;
use OCP\Calendar\ISchedulingInformation;
use OCP\IL10N;
use OCP\IUser as User;
use OCP\UserStatus\IUserStatus;
@ -66,7 +63,6 @@ use Sabre\DAV\Exception\NotAuthenticated;
use Sabre\DAVACL\Exception\NeedPrivileges;
use Sabre\DAVACL\Plugin as AclPlugin;
use Sabre\VObject\Component;
use Sabre\VObject\Component\VCalendar;
use Sabre\VObject\Component\VEvent;
use Sabre\VObject\Parameter;
use Sabre\VObject\Property;
@ -74,10 +70,11 @@ use Sabre\VObject\Reader;
class StatusService {
public function __construct(private ITimeFactory $timeFactory,
private IManager $calendarManager,
private InvitationResponseServer $server,
private IL10N $l10n,
private FreeBusyGenerator $generator){}
private IManager $calendarManager,
private InvitationResponseServer $server,
private IL10N $l10n,
private FreeBusyGenerator $generator) {
}
public function processCalendarAvailability(User $user, ?string $availability): ?Status {
$userId = $user->getUID();
@ -172,7 +169,7 @@ class StatusService {
foreach ($calendarEvents as $calendarEvent) {
$vEvent = new VEvent($calendar, 'VEVENT');
foreach($calendarEvent['objects'] as $component) {
foreach ($component as $key => $value) {
foreach ($component as $key => $value) {
$vEvent->add($key, $value[0]);
}
}

6
apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
View File

@ -48,9 +48,9 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
private $calDavBackend;
public function __construct(string $name,
array $objectData,
string $principalUri,
CalDavBackend $calDavBackend) {
array $objectData,
string $principalUri,
CalDavBackend $calDavBackend) {
$this->name = $name;
$this->objectData = $objectData;
$this->calDavBackend = $calDavBackend;

2
apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
View File

@ -45,7 +45,7 @@ class DeletedCalendarObjectsCollection implements ICalendarObjectContainer {
private $principalInfo;
public function __construct(CalDavBackend $caldavBackend,
array $principalInfo) {
array $principalInfo) {
$this->caldavBackend = $caldavBackend;
$this->principalInfo = $principalInfo;
}

2
apps/dav/lib/CalDAV/Trashbin/Plugin.php
View File

@ -56,7 +56,7 @@ class Plugin extends ServerPlugin {
private $server;
public function __construct(IRequest $request,
RetentionService $retentionService) {
RetentionService $retentionService) {
$this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
$this->retentionService = $retentionService;
}

2
apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php
View File

@ -50,7 +50,7 @@ class TrashbinHome implements IACL, ICollection, IProperties {
private $principalInfo;
public function __construct(CalDavBackend $caldavBackend,
array $principalInfo) {
array $principalInfo) {
$this->caldavBackend = $caldavBackend;
$this->principalInfo = $principalInfo;
}

2
apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
View File

@ -46,9 +46,9 @@ use Sabre\DAV\Xml\Property\Href;
use Sabre\VObject\Component;
use Sabre\VObject\DateTimeParser;
use Sabre\VObject\InvalidDataException;
use Sabre\VObject\Recur\NoInstancesException;
use Sabre\VObject\ParseException;
use Sabre\VObject\Reader;
use Sabre\VObject\Recur\NoInstancesException;
use Sabre\VObject\Splitter\ICalendar;
use Sabre\VObject\UUIDUtil;
use function count;

8
apps/dav/lib/CardDAV/Activity/Backend.php
View File

@ -55,10 +55,10 @@ class Backend {
protected $userManager;
public function __construct(IActivityManager $activityManager,
IGroupManager $groupManager,
IUserSession $userSession,
IAppManager $appManager,
IUserManager $userManager) {
IGroupManager $groupManager,
IUserSession $userSession,
IAppManager $appManager,
IUserManager $userManager) {
$this->activityManager = $activityManager;
$this->groupManager = $groupManager;
$this->userSession = $userSession;

10
apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
View File

@ -53,11 +53,11 @@ class Addressbook extends Base {
protected $eventMerger;
public function __construct(IFactory $languageFactory,
IURLGenerator $url,
IManager $activityManager,
IUserManager $userManager,
IGroupManager $groupManager,
IEventMerger $eventMerger) {
IURLGenerator $url,
IManager $activityManager,
IUserManager $userManager,
IGroupManager $groupManager,
IEventMerger $eventMerger) {
parent::__construct($userManager, $groupManager, $url);
$this->languageFactory = $languageFactory;
$this->activityManager = $activityManager;

4
apps/dav/lib/CardDAV/Activity/Provider/Base.php
View File

@ -51,8 +51,8 @@ abstract class Base implements IProvider {
protected $url;
public function __construct(IUserManager $userManager,
IGroupManager $groupManager,
IURLGenerator $urlGenerator) {
IGroupManager $groupManager,
IURLGenerator $urlGenerator) {
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->url = $urlGenerator;

12
apps/dav/lib/CardDAV/Activity/Provider/Card.php
View File

@ -53,12 +53,12 @@ class Card extends Base {
protected $appManager;
public function __construct(IFactory $languageFactory,
IURLGenerator $url,
IManager $activityManager,
IUserManager $userManager,
IGroupManager $groupManager,
IEventMerger $eventMerger,
IAppManager $appManager) {
IURLGenerator $url,
IManager $activityManager,
IUserManager $userManager,
IGroupManager $groupManager,
IEventMerger $eventMerger,
IAppManager $appManager) {
parent::__construct($userManager, $groupManager, $url);
$this->languageFactory = $languageFactory;
$this->activityManager = $activityManager;

8
apps/dav/lib/CardDAV/AddressBookImpl.php
View File

@ -63,10 +63,10 @@ class AddressBookImpl implements IAddressBook {
* @param IUrlGenerator $urlGenerator
*/
public function __construct(
AddressBook $addressBook,
array $addressBookInfo,
CardDavBackend $backend,
IURLGenerator $urlGenerator) {
AddressBook $addressBook,
array $addressBookInfo,
CardDavBackend $backend,
IURLGenerator $urlGenerator) {
$this->addressBook = $addressBook;
$this->addressBookInfo = $addressBookInfo;
$this->backend = $backend;

10
apps/dav/lib/CardDAV/AddressBookRoot.php
View File

@ -41,11 +41,11 @@ class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
* @param string $principalPrefix
*/
public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend,
\Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
PluginManager $pluginManager,
?IUser $user,
?IGroupManager $groupManager,
string $principalPrefix = 'principals') {
\Sabre\CardDAV\Backend\BackendInterface $carddavBackend,
PluginManager $pluginManager,
?IUser $user,
?IGroupManager $groupManager,
string $principalPrefix = 'principals') {
parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
$this->pluginManager = $pluginManager;
$this->user = $user;

3
apps/dav/lib/CardDAV/Card.php
View File

@ -24,8 +24,7 @@ declare(strict_types=1);
*/
namespace OCA\DAV\CardDAV;
class Card extends \Sabre\CardDAV\Card
{
class Card extends \Sabre\CardDAV\Card {
public function getId(): int {
return (int) $this->cardData['id'];
}

22
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -35,6 +35,7 @@
*/
namespace OCA\DAV\CardDAV;
use OC\Search\Filter\DateTimeFilter;
use OCA\DAV\Connector\Sabre\Principal;
use OCA\DAV\DAV\Sharing\Backend;
use OCA\DAV\DAV\Sharing\IShareable;
@ -53,7 +54,6 @@ use OCP\EventDispatcher\IEventDispatcher;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUserManager;
use OC\Search\Filter\DateTimeFilter;
use PDO;
use Sabre\CardDAV\Backend\BackendInterface;
use Sabre\CardDAV\Backend\SyncSupport;
@ -98,10 +98,10 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @param IEventDispatcher $dispatcher
*/
public function __construct(IDBConnection $db,
Principal $principalBackend,
IUserManager $userManager,
IGroupManager $groupManager,
IEventDispatcher $dispatcher) {
Principal $principalBackend,
IUserManager $userManager,
IGroupManager $groupManager,
IEventDispatcher $dispatcher) {
$this->db = $db;
$this->principalBackend = $principalBackend;
$this->userManager = $userManager;
@ -1093,9 +1093,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @return array
*/
public function searchPrincipalUri(string $principalUri,
string $pattern,
array $searchProperties,
array $options = []): array {
string $pattern,
array $searchProperties,
array $options = []): array {
return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
$addressBookIds = array_map(static function ($row):int {
return (int) $row['id'];
@ -1123,9 +1123,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @return array
*/
private function searchByAddressBookIds(array $addressBookIds,
string $pattern,
array $searchProperties,
array $options = []): array {
string $pattern,
array $searchProperties,
array $options = []): array {
if (empty($addressBookIds)) {
return [];
}

2
apps/dav/lib/CardDAV/Converter.php
View File

@ -29,8 +29,8 @@ namespace OCA\DAV\CardDAV;
use Exception;
use OCP\Accounts\IAccountManager;
use OCP\IURLGenerator;
use OCP\IImage;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use Sabre\VObject\Component\VCard;

2
apps/dav/lib/CardDAV/PhotoCache.php
View File

@ -34,12 +34,12 @@ use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use Psr\Log\LoggerInterface;
use Sabre\CardDAV\Card;
use Sabre\VObject\Document;
use Sabre\VObject\Parameter;
use Sabre\VObject\Property\Binary;
use Sabre\VObject\Reader;
use Psr\Log\LoggerInterface;
class PhotoCache {

15
apps/dav/lib/CardDAV/SyncService.php
View File

@ -30,7 +30,6 @@
*/
namespace OCA\DAV\CardDAV;
use OC\Accounts\AccountManager;
use OCP\AppFramework\Db\TTransactional;
use OCP\AppFramework\Http;
use OCP\IDBConnection;
@ -57,10 +56,10 @@ class SyncService {
protected string $certPath;
public function __construct(CardDavBackend $backend,
IUserManager $userManager,
IDBConnection $dbConnection,
LoggerInterface $logger,
Converter $converter) {
IUserManager $userManager,
IDBConnection $dbConnection,
LoggerInterface $logger,
Converter $converter) {
$this->backend = $backend;
$this->userManager = $userManager;
$this->logger = $logger;
@ -97,7 +96,7 @@ class SyncService {
$cardUri = basename($resource);
if (isset($status[200])) {
$vCard = $this->download($url, $userName, $sharedSecret, $resource);
$this->atomic(function() use ($addressBookId, $cardUri, $vCard) {
$this->atomic(function () use ($addressBookId, $cardUri, $vCard) {
$existingCard = $this->backend->getCard($addressBookId, $cardUri);
if ($existingCard === false) {
$this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
@ -117,7 +116,7 @@ class SyncService {
* @throws \Sabre\DAV\Exception\BadRequest
*/
public function ensureSystemAddressBookExists(string $principal, string $uri, array $properties): ?array {
return $this->atomic(function() use ($principal, $uri, $properties) {
return $this->atomic(function () use ($principal, $uri, $properties) {
$book = $this->backend->getAddressBooksByUri($principal, $uri);
if (!is_null($book)) {
return $book;
@ -226,7 +225,7 @@ class SyncService {
$cardId = self::getCardUri($user);
if ($user->isEnabled()) {
$this->atomic(function() use ($addressBookId, $cardId, $user) {
$this->atomic(function () use ($addressBookId, $cardId, $user) {
$card = $this->backend->getCard($addressBookId, $cardId);
if ($card === false) {
$vCard = $this->converter->createCardFromUser($user);

2
apps/dav/lib/CardDAV/SystemAddressbook.php
View File

@ -36,8 +36,8 @@ use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUserSession;
use Sabre\CardDAV\Backend\SyncSupport;
use Sabre\CardDAV\Backend\BackendInterface;
use Sabre\CardDAV\Backend\SyncSupport;
use Sabre\CardDAV\Card;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;

14
apps/dav/lib/CardDAV/UserAddressBooks.php
View File

@ -29,8 +29,8 @@ declare(strict_types=1);
namespace OCA\DAV\CardDAV;
use OCA\DAV\AppInfo\PluginManager;
use OCA\DAV\CardDAV\Integration\IAddressBookProvider;
use OCA\DAV\CardDAV\Integration\ExternalAddressBook;
use OCA\DAV\CardDAV\Integration\IAddressBookProvider;
use OCA\Federation\TrustedServers;
use OCP\AppFramework\QueryException;
use OCP\IConfig;
@ -42,10 +42,10 @@ use OCP\IUserSession;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Sabre\CardDAV\Backend;
use Sabre\DAV\Exception\MethodNotAllowed;
use Sabre\CardDAV\IAddressBook;
use function array_map;
use Sabre\DAV\Exception\MethodNotAllowed;
use Sabre\DAV\MkCol;
use function array_map;
class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
/** @var IL10N */
@ -60,10 +60,10 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
private ?IGroupManager $groupManager;
public function __construct(Backend\BackendInterface $carddavBackend,
string $principalUri,
PluginManager $pluginManager,
?IUser $user,
?IGroupManager $groupManager) {
string $principalUri,
PluginManager $pluginManager,
?IUser $user,
?IGroupManager $groupManager) {
parent::__construct($carddavBackend, $principalUri);
$this->pluginManager = $pluginManager;
$this->user = $user;

8
apps/dav/lib/Command/CreateAddressBook.php
View File

@ -44,11 +44,11 @@ class CreateAddressBook extends Command {
->setName('dav:create-addressbook')
->setDescription('Create a dav addressbook')
->addArgument('user',
InputArgument::REQUIRED,
'User for whom the addressbook will be created')
InputArgument::REQUIRED,
'User for whom the addressbook will be created')
->addArgument('name',
InputArgument::REQUIRED,
'Name of the addressbook');
InputArgument::REQUIRED,
'Name of the addressbook');
}
protected function execute(InputInterface $input, OutputInterface $output): int {

2
apps/dav/lib/Comments/CommentsPlugin.php
View File

@ -247,7 +247,7 @@ class CommentsPlugin extends ServerPlugin {
throw new BadRequest('Invalid input values', 0, $e);
} catch (\OCP\Comments\MessageTooLongException $e) {
$msg = 'Message exceeds allowed character limit of ';
throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e);
throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e);
}
}
}

6
apps/dav/lib/Connector/PublicAuth.php
View File

@ -51,9 +51,9 @@ class PublicAuth extends AbstractBasic {
private IThrottler $throttler;
public function __construct(IRequest $request,
IManager $shareManager,
ISession $session,
IThrottler $throttler) {
IManager $shareManager,
ISession $session,
IThrottler $throttler) {
$this->request = $request;
$this->shareManager = $shareManager;
$this->session = $session;

39
apps/dav/lib/Connector/Sabre/AppleQuirksPlugin.php
View File

@ -50,40 +50,37 @@ class AppleQuirksPlugin extends ServerPlugin {
private $isMacOSDavAgent = false;
/**
* Sets up the plugin.
*
* This method is automatically called by the server class.
* Sets up the plugin.
*
* This method is automatically called by the server class.
*
* @return void
*/
public function initialize(Server $server)
{
*/
public function initialize(Server $server) {
$server->on('beforeMethod:REPORT', [$this, 'beforeReport'], 0);
$server->on('report', [$this, 'report'], 0);
}
/**
* Triggered before any method is handled.
* Triggered before any method is handled.
*
* @return void
*/
public function beforeReport(RequestInterface $request, ResponseInterface $response)
{
*/
public function beforeReport(RequestInterface $request, ResponseInterface $response) {
$userAgent = $request->getRawServerValue('HTTP_USER_AGENT') ?? 'unknown';
$this->isMacOSDavAgent = $this->isMacOSUserAgent($userAgent);
}
/**
* This method handles HTTP REPORT requests.
*
* @param string $reportName
* @param mixed $report
* @param mixed $path
* This method handles HTTP REPORT requests.
*
* @param string $reportName
* @param mixed $report
* @param mixed $path
*
* @return bool
*/
public function report($reportName, $report, $path)
{
*/
public function report($reportName, $report, $path) {
if ($reportName == '{DAV:}principal-property-search' && $this->isMacOSDavAgent) {
/** @var \Sabre\DAVACL\Xml\Request\PrincipalPropertySearchReport $report */
$report->applyToPrincipalCollectionSet = true;
@ -98,8 +95,7 @@ class AppleQuirksPlugin extends ServerPlugin {
*
* @return bool
*/
protected function isMacOSUserAgent(string $userAgent):bool
{
protected function isMacOSUserAgent(string $userAgent):bool {
return str_starts_with(self::OSX_AGENT_PREFIX, $userAgent);
}
@ -110,8 +106,7 @@ class AppleQuirksPlugin extends ServerPlugin {
*
* @return null|array
*/
protected function decodeMacOSAgentString(string $userAgent):?array
{
protected function decodeMacOSAgentString(string $userAgent):?array {
// OSX agent string is like: macOS/13.2.1 (22D68) dataaccessd/1.0
if (preg_match('|^' . self::OSX_AGENT_PREFIX . '/([0-9]+)\\.([0-9]+)\\.([0-9]+)\s+\((\w+)\)\s+([^/]+)/([0-9]+)(?:\\.([0-9]+))?(?:\\.([0-9]+))?$|i', $userAgent, $matches)) {
return [

12
apps/dav/lib/Connector/Sabre/Auth.php
View File

@ -61,11 +61,11 @@ class Auth extends AbstractBasic {
private IThrottler $throttler;
public function __construct(ISession $session,
Session $userSession,
IRequest $request,
Manager $twoFactorManager,
IThrottler $throttler,
string $principalPrefix = 'principals/users/') {
Session $userSession,
IRequest $request,
Manager $twoFactorManager,
IThrottler $throttler,
string $principalPrefix = 'principals/users/') {
$this->session = $session;
$this->userSession = $userSession;
$this->twoFactorManager = $twoFactorManager;
@ -223,7 +223,7 @@ class Auth extends AbstractBasic {
if (!$this->userSession->isLoggedIn() && in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
$response->addHeader('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
$response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
$response->setStatus(401);
throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
}

6
apps/dav/lib/Connector/Sabre/BearerAuth.php
View File

@ -37,9 +37,9 @@ class BearerAuth extends AbstractBearer {
private string $principalPrefix;
public function __construct(IUserSession $userSession,
ISession $session,
IRequest $request,
$principalPrefix = 'principals/users/') {
ISession $session,
IRequest $request,
$principalPrefix = 'principals/users/') {
$this->userSession = $userSession;
$this->session = $session;
$this->request = $request;

2
apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
View File

@ -27,9 +27,9 @@ namespace OCA\DAV\Connector\Sabre;
use OCP\IConfig;
use OCP\IRequest;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
use Sabre\DAV\Server;
/**
* Class BlockLegacyClientPlugin is used to detect old legacy sync clients and

2
apps/dav/lib/Connector/Sabre/ChecksumUpdatePlugin.php
View File

@ -23,10 +23,10 @@ declare(strict_types=1);
namespace OCA\DAV\Connector\Sabre;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use Sabre\DAV\Server;
class ChecksumUpdatePlugin extends ServerPlugin {
protected ?Server $server = null;

3
apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
View File

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
@ -29,8 +30,8 @@ namespace OCA\DAV\Connector\Sabre;
use OCP\Comments\ICommentsManager;
use OCP\IUserSession;
use Sabre\DAV\PropFind;
use Sabre\DAV\ServerPlugin;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
class CommentPropertiesPlugin extends ServerPlugin {
public const PROPERTY_NAME_HREF = '{http://owncloud.org/ns}comments-href';

2
apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
View File

@ -25,9 +25,9 @@
namespace OCA\DAV\Connector\Sabre;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Server;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use Sabre\DAV\Server;
/**
* Copies the "Etag" header to "OC-Etag" after any request.

2
apps/dav/lib/Connector/Sabre/Directory.php
View File

@ -49,6 +49,7 @@ use OCP\IRequest;
use OCP\L10N\IFactory;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use OCP\Share\IManager as IShareManager;
use Psr\Log\LoggerInterface;
use Sabre\DAV\Exception\BadRequest;
use Sabre\DAV\Exception\Locked;
@ -56,7 +57,6 @@ use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\IFile;
use Sabre\DAV\INode;
use OCP\Share\IManager as IShareManager;
class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget, \Sabre\DAV\ICopyTarget {
/**

4
apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
View File

@ -26,9 +26,9 @@
*/
namespace OCA\DAV\Connector\Sabre;
use Sabre\DAV\Server;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use Sabre\DAV\Server;
/**
* Class DummyGetResponsePlugin is a plugin used to not show a "Not implemented"
@ -63,7 +63,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
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+');
$stream = fopen('php://memory', 'r+');
fwrite($stream, $string);
rewind($stream);

6
apps/dav/lib/Connector/Sabre/Exception/Forbidden.php
View File

@ -48,17 +48,17 @@ class Forbidden extends \Sabre\DAV\Exception\Forbidden {
* @param \DOMElement $errorNode
* @return void
*/
public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
// set ownCloud namespace
$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
// adding the retry node
$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
$errorNode->appendChild($error);
// adding the message node
$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
$errorNode->appendChild($error);
}
}

6
apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
View File

@ -60,17 +60,17 @@ class InvalidPath extends Exception {
* @param \DOMElement $errorNode
* @return void
*/
public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
// set ownCloud namespace
$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
// adding the retry node
$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
$errorNode->appendChild($error);
// adding the message node
$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
$errorNode->appendChild($error);
}
}

1
apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
View File

@ -42,7 +42,6 @@ use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\NotImplemented;
use Sabre\DAV\Exception\PreconditionFailed;
use Sabre\DAV\Exception\RequestedRangeNotSatisfiable;
use Sabre\DAV\Exception\ServiceUnavailable;
class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
protected $nonFatalExceptions = [

4
apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php
View File

@ -125,7 +125,7 @@ class FakeLockerPlugin extends ServerPlugin {
* @return bool
*/
public function fakeLockProvider(RequestInterface $request,
ResponseInterface $response) {
ResponseInterface $response) {
$lockInfo = new LockInfo();
$lockInfo->token = md5($request->getPath());
$lockInfo->uri = $request->getPath();
@ -151,7 +151,7 @@ class FakeLockerPlugin extends ServerPlugin {
* @return bool
*/
public function fakeUnlockProvider(RequestInterface $request,
ResponseInterface $response) {
ResponseInterface $response) {
$response->setStatus(204);
$response->setHeader('Content-Length', '0');
return false;

12
apps/dav/lib/Connector/Sabre/FilesPlugin.php
View File

@ -105,12 +105,12 @@ class FilesPlugin extends ServerPlugin {
private IPreview $previewManager;
public function __construct(Tree $tree,
IConfig $config,
IRequest $request,
IPreview $previewManager,
IUserSession $userSession,
bool $isPublic = false,
bool $downloadAttachment = true) {
IConfig $config,
IRequest $request,
IPreview $previewManager,
IUserSession $userSession,
bool $isPublic = false,
bool $downloadAttachment = true) {
$this->tree = $tree;
$this->config = $config;
$this->request = $request;

16
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View File

@ -119,14 +119,14 @@ class FilesReportPlugin extends ServerPlugin {
* @param IAppManager $appManager
*/
public function __construct(Tree $tree,
View $view,
ISystemTagManager $tagManager,
ISystemTagObjectMapper $tagMapper,
ITagManager $fileTagger,
IUserSession $userSession,
IGroupManager $groupManager,
Folder $userFolder,
IAppManager $appManager
View $view,
ISystemTagManager $tagManager,
ISystemTagObjectMapper $tagMapper,
ITagManager $fileTagger,
IUserSession $userSession,
IGroupManager $groupManager,
Folder $userFolder,
IAppManager $appManager
) {
$this->tree = $tree;
$this->fileView = $view;

20
apps/dav/lib/Connector/Sabre/Principal.php
View File

@ -100,16 +100,16 @@ class Principal implements BackendInterface {
private $languageFactory;
public function __construct(IUserManager $userManager,
IGroupManager $groupManager,
IAccountManager $accountManager,
IShareManager $shareManager,
IUserSession $userSession,
IAppManager $appManager,
ProxyMapper $proxyMapper,
KnownUserService $knownUserService,
IConfig $config,
IFactory $languageFactory,
string $principalPrefix = 'principals/users/') {
IGroupManager $groupManager,
IAccountManager $accountManager,
IShareManager $shareManager,
IUserSession $userSession,
IAppManager $appManager,
ProxyMapper $proxyMapper,
KnownUserService $knownUserService,
IConfig $config,
IFactory $languageFactory,
string $principalPrefix = 'principals/users/') {
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->accountManager = $accountManager;

4
apps/dav/lib/Connector/Sabre/RequestIdHeaderPlugin.php
View File

@ -1,4 +1,6 @@
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl>
*

10
apps/dav/lib/Connector/Sabre/ServerFactory.php
View File

@ -31,11 +31,11 @@
*/
namespace OCA\DAV\Connector\Sabre;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Folder;
use OCA\DAV\AppInfo\PluginManager;
use OCA\DAV\DAV\ViewOnlyPlugin;
use OCA\DAV\Files\BrowserErrorPagePlugin;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Folder;
use OCP\Files\Mount\IMountManager;
use OCP\IConfig;
use OCP\IDBConnection;
@ -88,9 +88,9 @@ class ServerFactory {
* @param callable $viewCallBack callback that should return the view for the dav endpoint
*/
public function createServer(string $baseUri,
string $requestUri,
Plugin $authPlugin,
callable $viewCallBack): Server {
string $requestUri,
Plugin $authPlugin,
callable $viewCallBack): Server {
// Fire up server
$objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree();
$server = new \OCA\DAV\Connector\Sabre\Server($objectTree);

4
apps/dav/lib/Connector/Sabre/SharesPlugin.php
View File

@ -33,11 +33,11 @@ use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IUserSession;
use OCP\Share\IShare;
use OCP\Share\IManager;
use OCP\Share\IShare;
use Sabre\DAV\PropFind;
use Sabre\DAV\Tree;
use Sabre\DAV\Server;
use Sabre\DAV\Tree;
/**
* Sabre Plugin to provide share-related properties

2
apps/dav/lib/Connector/Sabre/TagsPlugin.php
View File

@ -222,7 +222,7 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin {
&& $propFind->getDepth() !== 0
&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
)) {
)) {
// note: pre-fetching only supported for depth <= 1
$folderContent = $node->getChildren();
$fileIds[] = (int)$node->getId();

8
apps/dav/lib/Controller/BirthdayCalendarController.php
View File

@ -74,10 +74,10 @@ class BirthdayCalendarController extends Controller {
* @param CalDavBackend $calDavBackend
*/
public function __construct($appName, IRequest $request,
IDBConnection $db, IConfig $config,
IJobList $jobList,
IUserManager $userManager,
CalDavBackend $calDavBackend) {
IDBConnection $db, IConfig $config,
IJobList $jobList,
IUserManager $userManager,
CalDavBackend $calDavBackend) {
parent::__construct($appName, $request);
$this->db = $db;
$this->config = $config;

19
apps/dav/lib/Controller/DirectController.php
View File

@ -32,11 +32,10 @@ use OCA\DAV\Db\DirectMapper;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\EventDispatcher\GenericEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Events\BeforeDirectFileDownloadEvent;
use OCP\Files\File;
@ -69,14 +68,14 @@ class DirectController extends OCSController {
private $eventDispatcher;
public function __construct(string $appName,
IRequest $request,
IRootFolder $rootFolder,
string $userId,
DirectMapper $mapper,
ISecureRandom $random,
ITimeFactory $timeFactory,
IURLGenerator $urlGenerator,
IEventDispatcher $eventDispatcher) {
IRequest $request,
IRootFolder $rootFolder,
string $userId,
DirectMapper $mapper,
ISecureRandom $random,
ITimeFactory $timeFactory,
IURLGenerator $urlGenerator,
IEventDispatcher $eventDispatcher) {
parent::__construct($appName, $request);
$this->rootFolder = $rootFolder;

4
apps/dav/lib/Controller/InvitationResponseController.php
View File

@ -60,8 +60,8 @@ class InvitationResponseController extends Controller {
* @param InvitationResponseServer $responseServer
*/
public function __construct(string $appName, IRequest $request,
IDBConnection $db, ITimeFactory $timeFactory,
InvitationResponseServer $responseServer) {
IDBConnection $db, ITimeFactory $timeFactory,
InvitationResponseServer $responseServer) {
parent::__construct($appName, $request);
$this->db = $db;
$this->timeFactory = $timeFactory;

2
apps/dav/lib/DAV/GroupPrincipalBackend.php
View File

@ -104,7 +104,7 @@ class GroupPrincipalBackend implements BackendInterface {
* @return array
*/
public function getPrincipalByPath($path) {
$elements = explode('/', $path, 3);
$elements = explode('/', $path, 3);
if ($elements[0] !== 'principals') {
return null;
}

4
apps/dav/lib/DAV/Sharing/Backend.php
View File

@ -31,10 +31,10 @@ namespace OCA\DAV\DAV\Sharing;
use OCA\DAV\Connector\Sabre\Principal;
use OCP\AppFramework\Db\TTransactional;
use OCP\Cache\CappedMemoryCache;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUserManager;
use OCP\DB\QueryBuilder\IQueryBuilder;
class Backend {
use TTransactional;
@ -211,7 +211,7 @@ class Backend {
}
public function preloadShares(array $resourceIds): void {
$resourceIds = array_filter($resourceIds, function(int $resourceId) {
$resourceIds = array_filter($resourceIds, function (int $resourceId) {
return !isset($this->shareCache[$resourceId]);
});
if (count($resourceIds) === 0) {

2
apps/dav/lib/DAV/Sharing/Plugin.php
View File

@ -113,7 +113,7 @@ class Plugin extends ServerPlugin {
$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
$this->server->on('method:POST', [$this, 'httpPost']);
$this->server->on('propFind', [$this, 'propFind']);
$this->server->on('propFind', [$this, 'propFind']);
}
/**

Some files were not shown because too many files have changed in this diff Show More